0 files changed, 0 insertions, 0 deletions
diff --git a/.document b/.document
index 2116ca6d26..fb27ba325d 100644
--- a/.document
+++ b/.document
@@ -5,13 +5,10 @@
 
 # Process all the C source files
 *.c
-*.y
 
 # prelude
 prelude.rb
 
-rbconfig.rb
-
 # the lib/ directory (which has its own .document file)
 lib
 
@@ -19,18 +16,11 @@ lib
 ext
 
 # rdoc files
+ChangeLog
+
 NEWS
 
 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 cb2729fff9..67abf4b978 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,26 +2,15 @@ root = true
 
 [*]
 end_of_line = lf
-indent_size = 4
-indent_style = space
 insert_final_newline = true
-tab_width = 8
 trim_trailing_whitespace = true
+tab_width = 8
+indent_style = tab
+indent_size = 4
 
-[*.bat]
+[**.bat]
 end_of_line = crlf
 
-[*.gemspec]
-indent_size = 2
-
-[*.rb]
-indent_size = 2
-
-[*.yml]
-indent_size = 2
-
-[{*[Mm]akefile*,*.mak,*.mk,depend}]
-indent_style = tab
-
-[reg*.[ch]]
+[**.rb]
+indent_style = space
 indent_size = 2
diff --git a/.gdbinit b/.gdbinit
index 1806196a42..d31ccaa7df 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,5 +1,3 @@
-set startup-with-shell off
-
 define hook-run
   set $color_type = 0
   set $color_highlite = 0
@@ -65,15 +63,7 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
     printf "%sT_OBJECT%s: ", $color_type, $color_end
-    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
+    print (struct RObject *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
     printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
@@ -99,15 +89,14 @@ 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) @ $len
+	    ((struct RString*)$regsrc)->as.ary)
     set print address on
-    printf " len:%ld ", $len
+    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)
     if $flags & RUBY_FL_USER6
       printf "(none) "
     end
@@ -128,7 +117,7 @@ define rp
       if ($len == 0)
 	printf "{(empty)} "
       else
-	print/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
 	printf " "
       end
     else
@@ -144,7 +133,7 @@ define rp
       if ($len == 0)
 	printf "{(empty)} "
       else
-	print/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
 	printf " "
       end
     end
@@ -156,27 +145,34 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
     printf "%sT_HASH%s: ", $color_type, $color_end,
-    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_ARRAY_LEN_MASK) >> RHASH_ARRAY_LEN_SHIFT), \
-        ((((struct RHash *)($arg0))->basic->flags & RHASH_ARRAY_BOUND_MASK) >> RHASH_ARRAY_BOUND_SHIFT)
+    if ((struct RHash *)($arg0))->ntbl
+      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
     end
     print (struct RHash *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
-    set $len = (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+    printf "%sT_STRUCT%s: len=%ld ", $color_type, $color_end, \
+      (($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)
-    output/x *(($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
-              ((struct RStruct *)($arg0))->as.ary : \
-              ((struct RStruct *)($arg0))->as.heap.ptr) @ $len
+    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+          ((struct RStruct *)($arg0))->as.ary : \
+          ((struct RStruct *)($arg0))->as.heap.ptr)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
-    rp_bignum $arg0
+    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)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
     printf "%sT_RATIONAL%s: ", $color_type, $color_end
@@ -251,7 +247,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)&RUBY_IMEMO_MASK)
+    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask)
     printf "): "
     rp_imemo $arg0
   else
@@ -331,9 +327,6 @@ define rp_id
   if $id == idLTLT
     printf "(:<<)\n"
   else
-  if $id == idGTGT
-    printf "(:>>)\n"
-  else
   if $id == idLE
     printf "(:<=)\n"
   else
@@ -361,18 +354,6 @@ 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
@@ -404,13 +385,12 @@ define rp_id
       end
     end
     printf "(%ld): ", $id
-    print_id $id
-    echo \n
-  end
-  end
-  end
-  end
-  end
+    set $str = lookup_id_str($id)
+    if $str
+      rp_string $str
+    else
+      echo undef\n
+    end
   end
   end
   end
@@ -435,33 +415,21 @@ end
 
 define output_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
-    output *(char *)(($flags & RUBY_FL_USER1) ? \
+  printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
 	    ((struct RString*)($arg0))->as.heap.ptr : \
-	    ((struct RString*)($arg0))->as.ary) @ $len
-  else
-    output ""
-  end
+	    ((struct RString*)($arg0))->as.ary)
 end
 
-define print_string
+define rp_string
   set $flags = ((struct RBasic*)($arg0))->flags
-  set $len = ($flags & RUBY_FL_USER1) ? \
+  set print address off
+  output (char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary)
+  set print address on
+  printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
           ((struct RString*)($arg0))->as.heap.len : \
           (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
-  if $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
@@ -492,51 +460,6 @@ 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
@@ -544,7 +467,7 @@ define rp_class
   end
   printf "\n"
   rb_classname $arg0
-  print/x *(struct RClass *)($arg0)
+  print *(struct RClass *)($arg0)
   print *((struct RClass *)($arg0))->ptr
 end
 document rp_class
@@ -552,7 +475,7 @@ document rp_class
 end
 
 define rp_imemo
-  set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & RUBY_IMEMO_MASK)
+  set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & imemo_mask)
   if $flags == imemo_cref
     printf "(rb_cref_t *) %p\n", (void*)$arg0
     print *(rb_cref_t *)$arg0
@@ -704,6 +627,12 @@ 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
@@ -742,6 +671,12 @@ 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
@@ -768,6 +703,12 @@ 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
@@ -785,6 +726,17 @@ 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
@@ -846,7 +798,7 @@ end
 
 define nd_tree
   set $buf = (struct RString *)rb_str_buf_new(0)
-  call dump_node((VALUE)($buf), rb_str_tmp_new(0), 0, ($arg0))
+  call dump_node((VALUE)($buf), rb_str_new(0, 0), 0, ($arg0))
   printf "%s\n", $buf->as.heap.ptr
 end
 
@@ -917,7 +869,8 @@ end
 
 define rb_classname
   # up to 128bit int
-  set $rb_classname = rb_mod_name($arg0)
+  set $rb_classname_permanent = "0123456789ABCDEF"
+  set $rb_classname = classname($arg0, $rb_classname_permanent)
   if $rb_classname != RUBY_Qnil
     rp $rb_classname
   else
@@ -966,7 +919,7 @@ define iseq
 end
 
 define rb_ps
-  rb_ps_vm ruby_current_vm_ptr
+  rb_ps_vm ruby_current_vm
 end
 document rb_ps
 Dump all threads and their callstacks
@@ -998,74 +951,45 @@ define print_lineno
     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
+  set $i = 0
+  set $size = $iseq->body->line_info_size
+  set $table = $iseq->body->line_info_table
   #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
+    set $i = 1
+    while $i < $size
+      #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $table[$i].position, $table[$i].line_no, $pos
+      if $table[$i].position > $pos
+        loop_break
       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
+      set $i = $i + 1
+      if $table[$i].position == $pos
+        loop_break
       end
     end
-    printf "%d", $table[$index-1].line_no
-  end
+    printf "%d", $table[$i-1].line_no
   end
 end
 
 define check_method_entry
+  # get $immeo and $can_be_svar and return $me
   set $imemo = (struct RBasic *)$arg0
+  set $can_be_svar = $arg1
   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
+      set $imemo == ((struct vm_svar *)$imemo)->cref_or_me
+      check_method_entry $imemo 0
     end
     end
   end
 end
 
-define print_id
+define output_id
   set $id = $arg0
   # rb_id_to_serial
   if $id > tLAST_OP_ID
@@ -1097,59 +1021,31 @@ define print_id
           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
+        output_string $result
       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
-  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
+  set $cfp = $ps_thread_th->cfp
+  set $cfpend = (rb_control_frame_t *)($ps_thread_th->stack + $ps_thread_th->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
+        output_string $location.path
         printf ":"
         print_lineno $cfp
         printf ":in `"
-        print_string $location.label
+        output_string $location.label
         printf "'\n"
       else
-        printf "%d: ???.rb:???:in `???'\n", $cfpend-$cfp
-      end
+        printf "???.rb:???:in `???'\n"
       end
     else
       # if VM_FRAME_TYPE($cfp->flag) == VM_FRAME_MAGIC_CFUNC
@@ -1161,7 +1057,7 @@ define rb_ps_thread
         set $env_specval = $ep[-1]
         set $env_me_cref = $ep[-2]
         while ($env_specval & 0x02) != 0
-          check_method_entry $env_me_cref
+          check_method_entry $env_me_cref 0
           if $me != 0
             loop_break
           end
@@ -1170,18 +1066,17 @@ define rb_ps_thread
           set $env_me_cref = $ep[-2]
         end
         if $me == 0
-          check_method_entry $env_me_cref
+          check_method_entry $env_me_cref 1
         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
+        output_id $mid
         printf "'\n"
       else
-        printf "%d:unknown_frame:???:in `???'\n", $cfpend-$cfp
+        printf "unknown_frame:???:in `???'\n"
       end
     end
     set $cfp = $cfp + 1
@@ -1189,7 +1084,7 @@ define rb_ps_thread
 end
 
 define rb_count_objects
-  set $objspace = ruby_current_vm_ptr->objspace
+  set $objspace = ruby_current_vm->objspace
   set $counts_00 = 0
   set $counts_01 = 0
   set $counts_02 = 0
@@ -1313,34 +1208,3 @@ 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 6ca2f89462..d9785fad00 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,5 @@
 *.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
diff --git a/.gitignore b/.gitignore
index 50bf27f28a..9757768786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.a
 *.bak
 *.bc
-*.bundle
 *.dSYM
 *.dmyh
 *.dylib
@@ -14,15 +13,11 @@
 *.log
 *.o
 *.obj
-*.old
 *.orig
-*.pch
 *.pdb
 *.rej
 *.s
 *.sav
-*.sl
-*.so
 *.swp
 *.yarb
 *~
@@ -30,21 +25,17 @@
 .*.list
 .*.time
 .DS_Store
-.bundle
 .ccmalloc
 .ext
 .pc
 .ppack
 .svn
 Makefile
+Makefile.old
 cygruby*.def
 extconf.h
 y.output
 y.tab.c
-*.gcda
-*.gcno
-*.gcov
-lcov*.info
 
 # /
 /*-fake.rb
@@ -55,8 +46,12 @@ lcov*.info
 /*.rc
 /*_prelude.c
 /COPYING.LIB
+/ChangeLog-*
+/ChangeLog.pre-alpha
+/ChangeLog.pre1_1
 /Doxyfile
 /GNUmakefile
+/GNUmakefile.old
 /README.atheos
 /README.fat-patch
 /README.v6
@@ -64,7 +59,6 @@ lcov*.info
 /archive
 /autom4te*.cache
 /automake
-/benchmark/benchmark-driver
 /beos
 /bmlog-*
 /breakpoints.gdb
@@ -88,9 +82,6 @@ lcov*.info
 /goruby
 /id.[ch]
 /largefile.h
-/lcov-c-out
-/lcov-rb-out
-/lcov-out
 /lex.c
 /libruby*.*
 /miniprelude.c
@@ -106,7 +97,6 @@ lcov*.info
 /ppack
 /prelude.c
 /preview
-/probes.dmyh
 /probes.h
 /rbconfig.rb
 /rename2.h
@@ -118,10 +108,8 @@ lcov*.info
 /ruby-runner
 /ruby-runner.h
 /ruby-man.rd.gz
-/run.gdb
 /sizes.c
 /test.rb
-/test-coverage.dat
 /tmp
 /transdb.h
 /uncommon.mk
@@ -131,7 +119,6 @@ lcov*.info
 /yasmdata.rb
 
 # /benchmark/
-/benchmark/bm_require.data
 /benchmark/bmx_*.rb
 /benchmark/fasta.output.*
 /benchmark/wc.input
@@ -139,13 +126,8 @@ lcov*.info
 /enc/*.def
 /enc/*.exp
 /enc/*.lib
-/enc/jis/props.h
 /enc/unicode/data
 
-# /coroutine/
-!/coroutine/**/*.s
-/coroutine/**/.time
-
 # /enc/trans/
 /enc/trans/*.c
 /enc/trans/*.def
@@ -153,21 +135,17 @@ lcov*.info
 /enc/trans/*.lib
 /enc/trans/.time
 
-# /exe/
-/exe/goruby
-/exe/ruby
-/exe/.time
-
 # /ext/
 /ext/extinit.c
-/ext/configure-ext.mk
-/ext/*/exts.mk
 
 # /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
 
@@ -176,7 +154,6 @@ lcov*.info
 
 # /ext/rbconfig/
 /ext/rbconfig/sizeof/sizes.c
-/ext/rbconfig/sizeof/limits.c
 
 # /ext/ripper/
 /ext/ripper/eventids1.c
@@ -192,11 +169,10 @@ lcov*.info
 
 # /gems
 /gems/*.gem
-/gems/src
-/gems/*-*
 
-# /spec/bundler
-/.rspec_status
+# /spec/
+/spec/mspec
+/spec/rubyspec
 
 # /tool/
 /tool/config.guess
@@ -205,8 +181,3 @@ lcov*.info
 # /win32/
 /win32/*.ico
 /win32/.time
-
-# MJIT
-/rb_mjit_header.h
-/mjit_config.h
-/include/ruby-*/*/rb_mjit_min_header-*.h
diff --git a/.travis.yml b/.travis.yml
index f860bb79b4..24ce0c9113 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,365 +16,81 @@
 #
 # is also a good place to look at.
 
+# Language specification.
 language: c
-
-dist: xenial
-
-git:
-  quiet: true
-
-addons:
-  apt:
-    config:
-      retries: true
-    update: true
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-8
-      - libffi-dev
-      - libgdbm-dev
-      - libgmp-dev
-      - libjemalloc-dev
-      - libncurses5-dev
-      - libncursesw5-dev
-      - libreadline6-dev
-      - libssl-dev
-      - libyaml-dev
-      - openssl
-      - valgrind
-      - zlib1g-dev
-  homebrew:
-    update: true
-    packages:
-      - gdbm
-      - gmp
-      - libffi
-      - openssl@1.1
-      - zlib
-      - ccache
-
-cache:
-  ccache: true
-  directories:
-    - $HOME/config_2nd
-    - $HOME/.downloaded-cache
-
-env:
-  global:
-    - CONFIGURE_TTY=no
-    - CCACHE_COMPILERCHECK=none
-    - CCACHE_NOCOMPRESS=1
-    - CCACHE_MAXSIZE=512Mi
-    - >-
-      NPROC="`case ${TRAVIS_OS_NAME} in
-      osx)   sysctl -n hw.activecpu ;;
-      linux) nproc ;;
-      esac`"
-    # JOBS and SETARCH are overridden when necessary; see below.
-    - JOBS=-j$((1+${NPROC}))
-    - SETARCH=
-    - RUBY_PREFIX=/tmp/ruby-prefix
-    - GEMS_FOR_TEST='timezone tzinfo'
-
-.org.ruby-lang.ci.matrix-definitions:
-
-  - &cron-only
-    if: (type = cron) AND (branch = trunk) AND (fork = false)
-
-  - &make-test-only
-    script:
-      - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
-
-  - &linux
-    os: linux
-    compiler: gcc-8
-
-  - &osx
-    os: osx
-    compiler: clang
-    before_install:
-      - /usr/local/opt/openssl@1.1/bin/openssl version
-
-  # --------
-
-  - &x86_64-linux
-    name: x86_64-linux
-    <<: *linux
-
-  - &jemalloc
-    name: --with-jemalloc
-    <<: *linux
-    <<: *cron-only
-    env:
-      - CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind'
-
-  - &VM_CHECK_MODE
-    name: VM_CHECK_MODE=3
-    <<: *linux
-    <<: *cron-only
-    <<: *make-test-only
-    env:
-      - cppflags=-DVM_CHECK_MODE=0x0003
-
-  - &FIBER_USE_sjlj
-    name: FIBER_USE_NATIVE=0
-    <<: *linux
-    <<: *cron-only
-    env:
-      - cppflags=-DFIBER_USE_NATIVE=0
-
-  - &TOKEN_THREADED_CODE
-    name: TOKEN_THREADED_CODE
-    <<: *linux
-    <<: *cron-only
-    <<: *make-test-only
-    env:
-      - cppflags=-DOPT_THREADED_CODE=1
-
-  - &CALL_THREADED_CODE
-    name: CALL_THREADED_CODE
-    <<: *linux
-    <<: *cron-only
-    <<: *make-test-only
-    env:
-      - cppflags=-DOPT_THREADED_CODE=2
-
-  - &NO_THREADED_CODE
-    name: NO_THREADED_CODE
-    <<: *linux
-    <<: *cron-only
-    <<: *make-test-only
-    env:
-      - cppflags=-DOPT_THREADED_CODE=3
-
-  - &ASAN
-    name: -fsanitize=address
-    <<: *linux
-    #<<: *cron-only
-    <<: *make-test-only
-    compiler: clang
-    env:
-      - ASAN_OPTIONS=detect_leaks=0
-      - cflags='-march=native -fsanitize=address -fno-omit-frame-pointer'
-      - debugflags=-ggdb3
-      - optflags=-O1
-      - LD=clang
-      - LDFLAGS=-fsanitize=address
-
-  - &MSAN
-    name: -fsanitize=memory
-    <<: *linux
-    #<<: *cron-only
-    <<: *make-test-only
-    compiler: clang
-    env:
-      - cflags='-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer'
-      - optflags=-O1
-      - LD=clang
-      - LDFLAGS=-fsanitize=memory
-      - CONFIG_FLAG=--with-out-ext=openssl
-
-  - &UBSAN
-    name: -fsanitize=undefined
-    <<: *linux
-    #<<: *cron-only
-    <<: *make-test-only
-    compiler: clang
-    env:
-      - cflags='-fsanitize=undefined,integer,nullability -fno-omit-frame-pointer'
-      - cppflags=-DUNALIGNED_WORD_ACCESS=0
-      - debugflags=-ggdb3
-      - optflags='-O1 -march=native'
-      - LD=clang
-      - LDFLAGS=-fsanitize=undefined,integer,nullability
-
-  - &i686-linux
-    name: i686-linux
-    <<: *linux
-    env:
-      - GCC_FLAGS=-m32
-      - debugflags=-g0
-      - SETARCH='setarch i686 --verbose --3gb'
-    addons:
-      apt:
-        config:
-          retries: true
-        update: true
-        sources:
-          - ubuntu-toolchain-r-test
-        packages:
-          - gcc-8-multilib
-          - 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
-
-  - &rubyspec
-    name: ruby/spec on Ruby 2.3 # to ensure version guards are correctly added
-    <<: *linux
-    language: ruby
-    rvm: 2.3.8
-    addons:
-      apt:
-        packages:
-    before_install:
-    install:
-    before_script: chmod -R u+w spec/ruby
-    # -j randomly hangs. Using -fs to make sure we can know problematic spec on failure.
-    script: ruby -C spec/ruby ../mspec/bin/mspec -fs .
-
-  - &x86_64-darwin17
-    name: x86_64-darwin17
-    osx_image: xcode10.1
-    <<: *osx
-    env:
-      - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib
-      - TEST_ALL_OPTS="--tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
-      # Disabling -j3 because it seems to cause a hang on building Ruby: https://travis-ci.org/ruby/ruby/jobs/471021727
-      - JOBS=
-
-  - &x86_64-darwin18
-    name: x86_64-darwin18
-    osx_image: xcode11
-    <<: *osx
-    env:
-      - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib
-      - TEST_ALL_OPTS="--tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
-      # Disabling -j3 because it seems to cause a hang on building Ruby: https://travis-ci.org/ruby/ruby/jobs/471021727
-      - JOBS=
-
-  - &universal-darwin17
-    name: uinversal.x86_64h-darwin17
-    osx_image: xcode10.1
-    <<: *osx
-    <<: *cron-only
-    <<: *make-test-only
-    env:
-      - CONFIG_FLAG=--with-arch=x86_64h,x86_64,i386
-      - TEST_ALL_OPTS="$JOBS -q --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
-
-matrix:
-  include:
-    # to reduce time for finishing all jobs, run the slowest osx build first.
-    - <<: *x86_64-darwin18
-    - <<: *x86_64-linux
-    - <<: *i686-linux
-    - <<: *jemalloc
-    - <<: *ASAN
-    - <<: *MSAN
-    - <<: *UBSAN
-    - <<: *VM_CHECK_MODE
-    - <<: *FIBER_USE_sjlj
-    - <<: *TOKEN_THREADED_CODE
-    - <<: *CALL_THREADED_CODE
-    - <<: *NO_THREADED_CODE
-    - <<: *rubyspec
-  allow_failures:
-    - name: uinversal.x86_64h-darwin17
-    - name: -fsanitize=address
-    - name: -fsanitize=memory
-    - name: -fsanitize=undefined
-  fast_finish: true
-
+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.
 before_script:
-  - echo JOBS=${JOBS} SETARCH=${SETARCH}
-  - $SETARCH uname -a
-  - $SETARCH uname -r
-  - rm -fr .ext autom4te.cache
-  - echo $TERM
-  - |-
-    [ -d ~/.downloaded-cache ] ||
-    mkdir ~/.downloaded-cache
-  - ln -s ~/.downloaded-cache
-  - "> config.status"
-  - sed -f tool/prereq.status Makefile.in common.mk > Makefile
-  - make -s $JOBS update-download
-  - make -s $JOBS srcs
-  - rm 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
-  - ccache --show-stats
-  - |-
-    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 install
-  - ccache --show-stats
-  - |-
-    [ -z "${GEMS_FOR_TEST}" ] ||
-    $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
-
+  - "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"
 script:
-  - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
-  - travis_wait 30 $SETARCH make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}"
-  - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
+  - "make test TESTOPTS=--color=never"
+  - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'"
+  - "make test-rubyspec MSPECOPT=-fm"
 
 # 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
-    - ruby_2_4
-    - ruby_2_5
-    - ruby_2_6
     - /^feature\//
     - /^bug\//
-    - /^travis-/
 
 # We want to be notified when something happens.
 notifications:
   irc:
     channels:
-      - "chat.freenode.net#ruby-core"
-      - "chat.freenode.net#ruby-ja"
+      - "irc.freenode.org#ruby-core"
+      - "irc.freenode.org#ruby-ja"
     on_success: change # [always|never|change] # default: always
     on_failure: always # [always|never|change] # default: always
     template:
       - "%{message} by @%{author}: See %{build_url}"
 
-  slack:
-    rooms:
-      - secure: i1GLETSKye85ea6dGNA3MxI/5myChmMFiZtBd5C69xK+s1sBFqEgOSbaSf9KHc0CYrHVyNhQMaZRruieV7xS+6Pfs0Zvxf1DO6QQTWC2KhkqwFDLvZncAzjoyASdR90hbr+iRPOngQ+HJuE94zemALAwEqNAinzA74PMiJXktqY= # ruby:<token>#commits
-      - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:<token>#alerts
-    on_pull_requests: false
-    on_success: change
-    on_failure: always
+  # 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
 
   email:
     - ko1c-failure@atdot.net
+    - shibata.hiroshi@gmail.com
 
 # Local Variables:
 # mode: YAML
diff --git a/COPYING b/COPYING
index f06056fb45..426810a7fb 100644
--- a/COPYING
+++ b/COPYING
@@ -11,8 +11,8 @@ You can redistribute it and/or modify it under either the terms of the
 
        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.
+	  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.
@@ -26,11 +26,11 @@ You can redistribute it and/or modify it under either the terms of the
      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.
+	  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.
+	  the software.
 
        c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000000..1fd1fd9ac1
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,8061 @@
+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 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 0fe24dfc3c..cd1cce2de1 100644
--- a/LEGAL
+++ b/LEGAL
@@ -1,27 +1,23 @@
-# -*- rdoc -*-
-
-= LEGAL NOTICE INFORMATION
---------------------------
+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::
+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/
+    http://creativecommons.org/choose/zero/
 
-ccan/list/list.h::
+ccan/list/list.h
 
   This file is licensed under the 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
@@ -40,192 +36,149 @@ ccan/list/list.h::
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
-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::
-
-  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/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.
+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.
+
+enc/trans/GB/GB12345%UCS.src:
+enc/trans/GB/UCS%GB12345.src:
+
+    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.
+
+
+enc/trans/GB/GB2312%UCS.src:
+enc/trans/GB/UCS%GB2312.src:
+
+    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.
+
+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:
 
-  >>>
     © 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/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:
 
-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::
+ 	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.
 
-  These files are copyrighted as the following.
+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:
 
-  >>>
-    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.
+ 	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.
 
-configure::
+configure:
 
   This file is free software.
 
-  >>>
-    Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+    Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-tool/config.guess::
-tool/config.sub::
+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 1992-2018 Free Software Foundation, Inc.
+      Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+      Free Software Foundation, Inc.
 
     This file is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful, but
@@ -234,55 +187,53 @@ 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, see <https://www.gnu.org/licenses/>.
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
     As a special exception to the GNU General Public License, if you
     distribute this file as part of a program that contains a
     configuration script generated by Autoconf, you may include it under
-    the same distribution terms that you use for the rest of that
-    program.  This Exception is an additional permission under section 7
-    of the GNU General Public License, version 3 ("GPLv3").
+    the same distribution terms that you use for the rest of that program.
 
-parse.c::
+parse.c:
 
   This file is licensed under the GPL, but is 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-2015, 2018 Free Software Foundation, Inc.
+     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+     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 3 of the License, 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 2, or (at your option)
+     any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+     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, see <http://www.gnu.org/licenses/>.
+     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.  */
 
-    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)::
+util.c (partly):
 
-  This file contains the source code under these licenses.
-
-  >>>
     Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
 
     Permission to use, copy, modify, and distribute this software for any
@@ -296,49 +247,48 @@ util.c (partly)::
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
-  >>>
-    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,h}::
+win32/win32.[ch]:
 
   You can apply the Artistic License to these files. (or GPL,
   alternatively)
 
-  >>>
     Copyright (c) 1993, Intergraph Corporation
 
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the perl README file.
 
-random.c::
+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.
 
-  This file contains the source code under the new-style BSD license.
+random.c
+
+  This file is under the new-style BSD license.
 
-  >>>
     A C-program for MT19937, with initialization improved 2002/2/10.
-    Coded by Takuji Nishimura and Makoto Matsumoto.  
+    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.
 
@@ -352,16 +302,16 @@ random.c::
     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
@@ -380,14 +330,11 @@ random.c::
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
-  The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html
-
-vm_dump.c:procstat_vm::
+vm_dump.c:procstat_vm
 
-  This file contains the source code under the new-style BSD license.
+  This file is under the new-style BSD license.
 
-  >>>
-    Copyright (c) 2007 Robert N. M. Watson  
+    Copyright (c) 2007 Robert N. M. Watson
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -413,14 +360,13 @@ 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.
 
-  >>>
-    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.
@@ -454,40 +400,39 @@ vsnprintf.c::
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
-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::
-ext/sdbm/_sdbm.c::
-ext/sdbm/sdbm.h::
+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/strtol.c:
+missing/tgamma.c:
+ext/date/date_strftime.c:
+ext/digest/sha1/sha1.[ch]:
+ext/sdbm/_sdbm.c:
+ext/sdbm/sdbm.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.
 
-  >>>
-    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.
@@ -516,16 +461,15 @@ missing/crypt.c::
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-missing/setproctitle.c::
+missing/setproctitle.c
 
   This file is under the old-style BSD license.  Note that the
   paragraph 3 below is now null and void.
 
-  >>>
-    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.
+    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.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -551,12 +495,11 @@ missing/setproctitle.c::
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-missing/strlcat.c::
-missing/strlcpy.c::
+missing/strlcat.c
+missing/strlcpy.c
 
   These files are under an ISC-style license.
 
-  >>>
     Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
 
     Permission to use, copy, modify, and distribute this software for any
@@ -571,25 +514,22 @@ missing/strlcpy.c::
     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.c::
-ext/digest/md5/md5.h::
+ext/digest/md5/md5.[ch]:
 
   These files are under the following license.  Ruby uses modified
   versions of them.
 
-  >>>
     Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
 
     This software is provided 'as-is', without any express or implied
@@ -611,26 +551,22 @@ ext/digest/md5/md5.h::
     L. Peter Deutsch
     ghost@aladdin.com
 
-ext/digest/rmd160/rmd160.c::
-ext/digest/rmd160/rmd160.h::
+ext/digest/rmd160/rmd160.[ch]:
 
   These files have the following copyright information, and by the
   author we are allowed to use it under the new-style BSD license.
 
-  >>>
-    AUTHOR::  Antoon Bosselaers, ESAT-COSIC
+    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
     1996, All Rights Reserved
 
-ext/digest/sha2/sha2.c::
-ext/digest/sha2/sha2.h::
+ext/digest/sha2/sha2.[ch]:
 
   These files are under the new-style BSD license.
 
-  >>>
     Copyright 2000 Aaron D. Gifford.  All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -657,108 +593,50 @@ ext/digest/sha2/sha2.h::
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/json/generator/generator.c::
+ext/json/generator/generator.c:
 
-  The file contains the following copyright notice.
-
-  >>>
     Copyright 2001-2004 Unicode, Inc.
 
-    Disclaimer::
+    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.
+    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::
+    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.
+    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::
+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.
-
-ext/psych::
-test/psych::
-
-  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/socket/addrinfo.h::
-ext/socket/getaddrinfo.c::
-ext/socket/getnameinfo.c::
+       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/socket/addrinfo.h:
+ext/socket/getaddrinfo.c:
+ext/socket/getnameinfo.c:
 
   These files are under the new-style BSD license.
 
-  >>>
     Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
     All rights reserved.
 
@@ -786,12 +664,11 @@ 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.
     Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
 
@@ -802,134 +679,8 @@ ext/win32ole/win32ole.c::
     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::
+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 (see the file MIT.txt), 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::
-
-      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/Makefile.in b/Makefile.in
index fa1e19ef37..9c8748aa4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,6 @@ top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
 PLATFORM_DIR = @PLATFORM_DIR@
 
-CC_WRAPPER = @XCC_WRAPPER@
 CC = @CC@
 CPP = @CPP@
 LD = @LD@
@@ -45,17 +44,7 @@ arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
 archlibdir = @archlibdir@
-includedir = @includedir@
-archincludedir = @archincludedir@
-rubylibprefix = @rubylibprefix@
-rubylibdir = @rubylibdir@
-rubyarchprefix = @rubyarchprefix@
-rubyarchdir = @rubyarchdir@
-rubyhdrdir = @rubyhdrdir@
-rubyarchhdrdir = @rubyarchhdrdir@
 ruby_version = @ruby_version@
-RUBY_VERSION_NAME = @RUBY_VERSION_NAME@
-UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@
 
 TESTUI = console
 TESTS =
@@ -63,7 +52,6 @@ INSTALLDOC = @INSTALLDOC@
 DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
-TIMESTAMPDIR  = $(EXTOUT)/.timestamp
 arch_hdrdir = $(EXTOUT)/include/$(arch)
 VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
 
@@ -71,7 +59,6 @@ empty =
 CC_VERSION = @CC_VERSION@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
-CPPOUTFLAG = $(COUTFLAG)
 ARCH_FLAG = @ARCH_FLAG@
 CFLAGS_NO_ARCH = @CFLAGS@
 CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
@@ -80,38 +67,17 @@ optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@ @strict_warnflags@
 cppflags = @cppflags@
-MATHN = @MATHN@
-XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONICALIZATION_FOR_MATHN)
-USE_RUBYGEMS = @USE_RUBYGEMS@
-USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
-MJIT_SUPPORT = @MJIT_SUPPORT@
-MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
-MJIT_HEADER_SUFFIX =
-MJIT_HEADER_ARCH =
-MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@
-MJIT_CC = @MJIT_CC@
-MJIT_CFLAGS = @MJIT_CFLAGS@
-MJIT_OPTFLAGS = @MJIT_OPTFLAGS@
-MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@
-MJIT_LDSHARED = @MJIT_LDSHARED@
-MJIT_DLDFLAGS = @DLDFLAGS@
-MJIT_HEADER   = rb_mjit_header.h
-MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h
-MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME)
-MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch)
+XCFLAGS = @XCFLAGS@
+CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = @EXTLDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
 EXTLIBS =
 LIBS = @LIBS@ $(EXTLIBS)
 MISSING = @LIBOBJS@ @ALLOCA@
-ENABLE_SHARED = @ENABLE_SHARED@
 LDSHARED = @LIBRUBY_LDSHARED@
-DLDSHARED = @DLDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
 SOLIBS = @SOLIBS@
-ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
 MAINLIBS = @MAINLIBS@
 ARCHMINIOBJS = @MINIOBJS@
 DLNOBJ = @DLNOBJ@
@@ -124,7 +90,6 @@ POSTLINK = @POSTLINK@
 
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
-RUBY_API_VERSION=@RUBY_API_VERSION@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@
@@ -151,9 +116,6 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
 BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
-COROUTINE_H = @X_FIBER_COROUTINE_H@
-COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@)
-
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@
@@ -163,7 +125,6 @@ RUBY_PROGRAM_VERSION = @RUBY_PROGRAM_VERSION@
 
 LIBRUBY_A     = @LIBRUBY_A@
 LIBRUBY_SO    = @LIBRUBY_SO@
-LIBRUBY_SONAME= @LIBRUBY_SONAME@
 LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
 LIBRUBY	      = @LIBRUBY@
 LIBRUBYARG    = @LIBRUBYARG@
@@ -203,18 +164,17 @@ RMDIRS        = @RMDIRS@
 RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
-ARFLAGS       = @ARFLAGS@$(empty)
+ARFLAGS       = @ARFLAGS@
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
 IFCHANGE      = $(srcdir)/tool/ifchange
+SET_LC_MESSAGES = env LC_MESSAGES=C
 OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
-HAVE_GIT      = @HAVE_GIT@
-GIT           = @GIT@
 VCS           = @VCS@
 VCSUP         = @VCSUP@
-DTRACE        = @DTRACE@ @DTRACE_OPT@
+DTRACE        = @DTRACE@
 DTRACE_EXT    = @DTRACE_EXT@
 DTRACE_OBJ    = @DTRACE_OBJ@
 DTRACE_REBUILD= @DTRACE_REBUILD@
@@ -222,7 +182,6 @@ DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT))
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
-SOEXT         = @SOEXT@
 DLEXT         = @DLEXT@
 MANTYPE	      = @MANTYPE@
 SYMBOL_PREFIX = @SYMBOL_PREFIX@
@@ -232,11 +191,8 @@ INSTALLED_LIST= .installed.list
 NEWLINE_C     = enc/trans/newline.c
 MINIPRELUDE_C = miniprelude.c
 PRELUDE_C     = prelude.c
-GOLF_PRELUDE_C= golf_prelude.c
 RBCONFIG      = .rbconfig.time
 
-MAINSRC = $(MAINOBJ:@OBJEXT@=c)
-
 SRC_FILE      = $<
 OS_SRC_FILE   = $<
 DEST_FILE     = $@
@@ -252,7 +208,7 @@ DESTDIR       = @DESTDIR@
 configure_args = @configure_args@
 #### End of variables
 
-.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
 
 all:
 
@@ -263,7 +219,6 @@ 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)$@
-		$(Q) $(POSTLINK)
 
 $(PROGRAM):
 		@$(RM) $@
@@ -271,45 +226,39 @@ $(PROGRAM):
 		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
 		$(Q) $(POSTLINK)
 
-PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(exec) $(RM) $(LIBRUBY_EXTS)
-
 # 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) $@
-		@-[ -z "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE)
 		$(ECHO) linking static-library $@
 		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS)
 		@-$(RANLIB) $@ 2> /dev/null || true
-
-verify-static-library: $(LIBRUBY_A)
 		$(ECHO) verifying static-library $@
 		@$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT)
-		@$(RMALL) conftest$(EXEEXT) conftest.c conftest.dSYM
+		@$(RM) conftest$(EXEEXT) conftest.c
 
 $(LIBRUBY_SO):
-		@-[ -n "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE)
+		@-$(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_*' -L '$(SYMBOL_PREFIX)*_ec_*' $@
+			-L '$(SYMBOL_PREFIX)*_threadptr_*' $@
 		$(Q) $(POSTLINK)
-		@-$(MINIRUBY) -e 'so, *aliases = ARGV; aliases.uniq!; aliases.delete(File.basename(so)); \
-				  aliases.each { |link| File.delete link rescue nil; File.symlink so, link }' \
-				$(LIBRUBY_SO) $(LIBRUBY_ALIASES) || true
-
-LIBRUBY_WITH_EXT = @LIBRUBY_WITH_EXT@
-$(LIBRUBY_$(LIBRUBY_WITH_EXT)): $(LIBRUBY_SO_UPDATE)
+		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \
+						  File.symlink "$(LIBRUBY_SO)", link}' \
+				$(LIBRUBY_ALIASES) || true
 
 ruby_pc = @ruby_pc@
-ruby.pc: $(ruby_pc)
-$(ruby_pc): config.status
+$(ruby_pc):
 		@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
 
-ruby-runner.h: template/ruby-runner.h.in config.status
+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)
@@ -351,16 +300,15 @@ uncommon.mk: $(srcdir)/common.mk
 .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-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; \
-	warnflags="@warnflags@"; export warnflags; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
 	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
 $(srcdir)/aclocal.m4:
@@ -368,8 +316,6 @@ $(srcdir)/aclocal.m4:
 	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
 	touch $(@F)
 
-prereq: $(srcdir)/$(CONFIGURE)
-
 incs: id.h
 all-incs: probes.h
 
@@ -388,7 +334,7 @@ lex.c: defs/keywords
 	else \
 	  [ $(Q) ] && echo generating $@ || set -x; \
 	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
-	  | sed -f $(srcdir)/tool/gperf.sed \
+	  | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
 	  > $@.tmp && \
 	  $(MV) $@.tmp $@ && \
 	  $(CP) $? $(srcdir)/defs/lex.c.src && \
@@ -397,7 +343,7 @@ lex.c: defs/keywords
 
 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
 
-$(srcdir)/enc/jis/props.h: enc/jis/props.kwd
+enc/jis/props.h: enc/jis/props.kwd
 	$(MAKEDIRS) $(@D)
 	@set +e; \
 	if cmp -s $(?:.kwd=.src) $?; then \
@@ -406,7 +352,7 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 	else \
 	  set -x; \
 	  gperf $(JIS_PROPS_OPTIONS) $? | \
-	  sed -f $(srcdir)/tool/gperf.sed > $@ && \
+	  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
@@ -415,11 +361,11 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 	@$(ECHO) compiling $<
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
 
-.$(ASMEXT).@OBJEXT@:
+.s.@OBJEXT@:
 	@$(ECHO) assembling $<
-	$(Q) $(CC) $(ASFLAGS) -o $@ -c $<
+	$(Q) $(AS) $(ASFLAGS) -o $@ $<
 
-.c.$(ASMEXT):
+.c.S:
 	@$(ECHO) translating $<
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
 
@@ -445,21 +391,11 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
 	fi
 	$(Q) touch $@
 
-probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
+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)
 
-main: mjit-headers
-yes-mjit-headers: $(MJIT_MIN_HEADER)
-clean-local::
-	$(Q)$(RM) $(MJIT_HEADER) $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h
-	$(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h
-	$(Q)$(RM) $(MJIT_HEADER_INSTALL_DIR)/rb_mjit_min_header-*.h
-	$(Q)$(RM) $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time mjit_config.h
-	$(Q)$(RM) -r mjit_build_dir.*
-	-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) 2> $(NULL) || exit 0
-
 # DTrace static library hacks described here:
 # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
 ruby-glommed.$(OBJEXT):
@@ -470,7 +406,6 @@ clean-local::
 	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
 		enc/encinit.c enc/encinit.$(OBJEXT)
 	-$(Q)$(RM) $(pkgconfig_DATA)
-	-$(Q)$(RMALL) exe/ ruby-runner.$(OBJEXT) ruby-runner.h *.dSYM
 
 distclean-local::
 	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
@@ -478,43 +413,28 @@ distclean-local::
 	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h verconf.h
 	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
 
-ext/clean.sub gems/clean.sub:: ext/clean.mk
-ext/distclean.sub gems/distclean.sub:: ext/distclean.mk
-ext/realclean.sub gems/realclean.sub:: ext/realclean.mk
-
-ext/clean.mk ext/distclean.mk ext/realclean.mk::
-	-$(Q) if [ -f $(EXTS_MK) ]; then exec $(MAKE) -f $(EXTS_MK) $(@F:.mk=); fi
-
-ext/clean:: ext/clean.sub
-ext/distclean:: ext/distclean.sub
-ext/realclean:: ext/realclean.sub
-gems/clean:: gems/clean.sub
-gems/distclean:: gems/distclean.sub
-gems/realclean:: gems/realclean.sub
-
-ext/clean.sub ext/distclean.sub ext/realclean.sub \
-gems/clean.sub gems/distclean.sub gems/realclean.sub::
-	$(Q) set dummy `echo "${EXTS}" | tr , ' '`; shift; \
+clean-ext distclean-ext realclean-ext::
+	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	set dummy `\
-	    cd $(@D) 2>/dev/null && \
-	    find "$$@" \( -name Makefile -o -name exts.mk \) -print | \
-	    sed -n 's:^\./::;s:^:$(@D)/:;s:/[^/][^/]*$$::p' | sort -u; \
+	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \
 	`; shift; \
+	cd ..; \
 	for dir do \
-	    $(RM) "$$dir/exts.mk"; \
-	    if [ -f "$$dir/Makefile" ]; then \
-		echo $(@F:.sub=)ing "$$dir"; \
-		(cd "$$dir" && exec $(MAKE) $(mflags) $(@F:.sub=)); \
-	    fi; \
-	done || true
-
-ext/distclean ext/realclean gems/distclean gems/realclean::
-	$(Q) set dummy `echo "${EXTS}" | tr , ' '`; shift; \
-	test "$$#" = 0 && set .; \
-	cd $(@D) 2>/dev/null && \
-	find "$$@" -type d -empty -exec $(RMDIRS) {} + 2> /dev/null || true
-	$(Q) $(RMDIRS) $(@D) 2> /dev/null || true
+	    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; \
@@ -527,59 +447,93 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 
 enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
 
-cont.$(OBJEXT): $(COROUTINE_H)
-
-test-bundled-gems-run:
-	$(Q) set -e; while read gem _; do \
-	  echo testing $$gem gem && \
-	  $(XRUBY) -C $(srcdir)/gems/src/$$gem -Ilib ../../../.bundle/bin/rake; \
-	done < $(srcdir)/gems/bundled_gems
-
 update-src::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
 update-download:: update-config_files
 
-after-update:: prereq
-
-gcov:
-	$(Q) $(BASERUBY) $(srcdir)/tool/run-gcov.rb
+after-update:: common-srcs
 
-lcov:
-	$(Q) $(BASERUBY) $(srcdir)/tool/run-lcov.rb
+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
 
-update-benchmark-driver:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/benchmark $(Q1:0=-q) \
-		--branch $(BENCHMARK_DRIVER_GIT_REF) \
-		$(BENCHMARK_DRIVER_GIT_URL) benchmark-driver $(GIT_OPTS)
+test-rubyspec-precheck:
+	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
 
 update-doclie:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
-		--branch $(DOCLIE_GIT_REF) \
-		$(DOCLIE_GIT_URL) doclie $(GIT_OPTS)
+	@$(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:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
-		--branch $(SIMPLECOV_HTML_GIT_REF) \
-		$(SIMPLECOV_HTML_GIT_URL) simplecov-html $(GIT_OPTS)
+	@$(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:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
-		--branch $(SIMPLECOV_GIT_REF)  \
-		$(SIMPLECOV_GIT_URL) simplecov $(GIT_OPTS)
+	@$(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
 
-update-known-errors:
-	errno --list | cut -d' ' -f1 | sort -u - $(srcdir)/defs/known_errors.def | \
-	$(IFCHANGE) $(srcdir)/defs/known_errors.def -
-
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
-	  vmtc.inc vm.inc mjit_compile.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/insns2vm.rb
+	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 
@@ -593,41 +547,3 @@ loadpath: verconf.h
 un-runnable:
 	$(ECHO) cannot make runnable, configure with --enable-load-relative.
 	$(Q) exit 1
-
-mjit_config.h:
-	$(ECHO) making $@
-	@{ \
-	. $(srcdir)/tool/mjit_archflag.sh; \
-	parse_arch_flags "$(UNIVERSAL_ARCHNAMES)" $(ARCH_FLAG); \
-	test "$(Q)" = @ || set -x; \
-	echo '#ifndef RUBY_MJIT_CONFIG_H'; \
-	echo '#define RUBY_MJIT_CONFIG_H 1'; \
-	echo; \
-	sep=; \
-	echo '#ifdef LOAD_RELATIVE'; \
-	quote MJIT_HEADER_INSTALL_DIR "/$(MJIT_HEADER_INSTALL_DIR)"; \
-	echo '#else'; \
-	quote MJIT_HEADER_INSTALL_DIR "$(rubyarchhdrdir)"; \
-	echo '#endif'; \
-	quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \
-	sep=,; \
-	quote "MJIT_CC_COMMON  " $(MJIT_CC); \
-	quote "MJIT_CFLAGS      MJIT_ARCHFLAG" $(MJIT_CFLAGS); \
-	quote "MJIT_OPTFLAGS   " $(MJIT_OPTFLAGS); \
-	quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
-	quote "MJIT_LDSHARED   " $(MJIT_LDSHARED); \
-	quote "MJIT_DLDFLAGS    MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
-	quote "MJIT_LIBS       " $(LIBRUBYARG_SHARED); \
-	quote 'PRELOADENV       "@PRELOADENV@"'; \
-	indent=$${archs:+'  '}; \
-	define_arch_flags; \
-	echo; \
-	echo '#endif /* RUBY_MJIT_CONFIG_H */'; \
-	} > $@
-
-yes-test-almost yes-test-all: mjit_build_dir.$(SOEXT)
-mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) $(srcdir)/ruby-runner.c ruby-runner.h
-	$(ECHO) making $@
-	$(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(CPPFLAGS) \
-		-DMAKE_MJIT_BUILD_DIR=1 -DMJIT_MIN_HEADER='"$(MJIT_MIN_HEADER)"' \
-		$(OUTFLAG)$@ $(srcdir)/ruby-runner.c
diff --git a/NEWS b/NEWS
index e7684e15bb..986db329b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,686 +1,211 @@
 # -*- rdoc -*-
 
-= NEWS for Ruby 2.6.0
+= 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
+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
+== Changes since the 2.3.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) { }
-
-* 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]
-
-* Non-Symbol keys in a keyword arguments hash was prohibited at 2.6.0, but
-  now allowed again.  [Bug #15658]
+* Multiple assignment in conditional expression is now allowed.
+  [Feature #10617]
 
 === Core classes updates (outstanding ones only)
 
-[Array]
-
-  [New methods]
-
-    * Added Array#union and Array#difference instance methods.  [Feature #14097]
-
-  [Modified methods]
-
-    * 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 methods]
-
-    * 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 methods]
-
-    * 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 methods]
-
-    * Enumerable#to_h now accepts a block that maps elements to new key/value pairs.  [Feature #15143]
-
-  [Aliased methods]
-
-    * 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 methods]
-
-    * 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 methods]
-
-    * 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]
+* Array
 
-    * Hash#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+  * 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.
 
-  [Aliased methods]
+  * Array#sum  [Feature #12217]
+    This is different from Enumerable#sum in that Array#sum doesn't depend on
+    the definition of each method.
 
-    * Hash#filter is a new alias for Hash#select.  [Feature #13784]
+* Comparable
 
-    * Hash#filter! is a new alias for Hash#select!. [Feature #13784]
+  * Comparable#clamp.  [Feature #10594]
 
-[IO]
+* Dir
 
-  [New options]
+  * Dir.empty?.  [Feature #10121]
 
-    * Added new mode character <code>'x'</code> to open files for exclusive
-      access. [Feature #11258]
+* Enumerable
 
-[Kernel]
+  * Enumerable#sum  [Feature #12217]
+  * Enumerable#uniq  [Feature #11090]
 
-  [Aliased methods]
+* Enumerator::Lazy
 
-    * Kernel#then is a new alias for Kernel#yield_self. [Feature #14594]
+  * Enumerator::Lazy#uniq  [Feature #11090]
 
-  [New options]
+* File
 
-    * Kernel#Complex, Kernel#Float, Kernel#Integer, and
-      Kernel#Rational take an +:exception+ option to specify the way of
-      error handling.  [Feature #12732]
+  * File.empty?.  [Feature #9969]
 
-    * Kernel#system takes an +:exception+ option to raise an exception
-      on failure.  [Feature #14386]
+* Float
 
-  [Incompatible changes]
+  * Float#ceil, Float#floor, and Float#truncate now take an optional
+    digits, as well as Float#round.  [Feature #12245]
 
-    * 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]
+* Hash
 
-[KeyError]
+  * Hash#transform_values and Hash#transform_values!  [Feature #12512]
 
-  [New options]
+* Integer
 
-    * KeyError.new accepts +:receiver+ and +:key+ options to set receiver and
-      key in Ruby code.  [Feature #14313]
+  * Integer#ceil, Integer#floor, and Integer#truncate now take an optional
+    digits, as well as Integer#round.  [Feature #12245]
 
-[Method]
+  * Fixnum and Bignum are unified into Integer  [Feature #12005]
 
-  [New methods]
+  * Integer#digits for extracting columns of place-value notation [Feature #12447]
 
-    * Added Method#<< and Method#>> for Proc composition.  [Feature #6284]
+* Kernel
 
-[Module]
+  * Kernel#clone now takes an optional keyword argument, freeze flag.
+    [Feature #12300]
 
-  [Modified methods]
+* MatchData
 
-    * 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]
+  * MatchData#named_captures [Feature #11999]
+  * MatchData#values_at supports named captures [Feature #9179]
 
-[NameError]
+* Regexp
 
-  [New options]
+  * Regexp#match? [Feature #8110]
+    This returns bool and doesn't save backref.
 
-    * NameError.new accepts a +:receiver+ option to set receiver in Ruby
-      code.  [Feature #14313]
+* Regexp/String: Updated Unicode version from 8.0.0 to 9.0.0 [Feature #12513]
 
-[NilClass]
+* RubyVM::Env
 
-  [New methods]
+  * RubyVM::Env was removed.
 
-    * NilClass#=~ is added for compatibility.  [Feature #15231]
+* String
 
-[NoMethodError]
+  * 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]
 
-  [New options]
+  * String.new(capacity: size) [Feature #12024]
 
-    * NoMethodError.new accepts a +:receiver+ option to set receiver in Ruby
-      code.  [Feature #14313]
+* Symbol
 
-[Numeric]
+  * Symbol#match now returns MatchData.  [Bug #11991]
 
-  [Incompatible changes]
+  * 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]
 
-    * Numeric#step now returns an instance of the Enumerator::ArithmeticSequence
-      class rather than one of the Enumerator class.
+* Thread
 
-[OpenStruct]
-
-  [Modified methods]
-
-    * 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 methods]
-
-    * Added Random.bytes.  [Feature #4938]
-
-[Range]
-
-  [New methods]
-
-    * 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 to 12.1.0, adding support for
-      U+32FF SQUARE ERA NAME REIWA [Feature #15195]
-
-    * Update Unicode version and Emoji version from 11.0.0 to
-      12.0.0. [Feature #15321]
-
-    * 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 methods]
-
-    * 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 methods]
-
-    * 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 methods]
-
-    * TracePoint#enable accepts new keywords "target:" and "target_line:".
-      [Feature #15289]
+  * Thread#report_on_exception and Thread.report_on_exception
+    [Feature #6647]
 
 === 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 methods]
-
-  * BigDecimal() accepts the new keyword "exception:" similar to Float().
+* CSV
 
-  [Note for the differences among recent versions]
+  * Add a liberal_parsing option. [Feature #11839]
 
-  You should want to know the differences among recent versions of bigdecimal.
-  Please select the suitable version of bigdecimal according to the following
-  information.
+* Logger
 
-  * 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.
+	* Allow specifying logger parameters in constructor such
+	  as level, progname, datetime_format, formatter. [Feature #12224]
+	* Add shift_period_suffix option. [Feature #10772]
 
-  * 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.
+* OpenSSL
 
-  * 2.0.0 will be released soon after releasing Ruby 2.6.0.  This version
-    will not have the BigDecimal.new method.
+  * OpenSSL is extracted as a gem and the upstream has been migrated to
+    https://github.com/ruby/openssl. OpenSSL still remains as a default gem.
+    Refer to its History.md for the full release note. [Feature #9612]
 
-[Bundler]
+* optparse
 
-  * 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]
-
-  [Net::IMAP]
-
-    * Add Server Name Indication (SNI) support.  [Feature #15594]
-
-[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
-
-[CSV]
-
-  * Upgrade to 3.0.9.
-    See https://github.com/ruby/csv/blob/master/NEWS.md.
-
-[Date]
-
-  * Date.jisx0301, Date#jisx0301, and Date.parse provisionally support the
-    new Japanese era as an informal extension, until the new JIS X 0301 is
-    issued.  [Feature #15742]
-
-[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 methods]
-
-    * 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]
+  * Add an into option. [Feature #11191]
 
 === 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]
+* 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.
+  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)
 
-* These standard libraries have been promoted to default gems.
+* DateTime
 
-  * e2mmap
-  * forwardable
-  * irb
-  * logger
-  * matrix
-  * mutex_m
-  * ostruct
-  * prime
-  * rexml
-  * rss
-  * shell
-  * sync
-  * thwait
-  * tracer
+  * DateTime#to_time now preserves timezone.  [Bug #12189]
 
-[BigDecimal]
+* Time
 
-  * The following methods are removed.
+  * Time#to_time now preserves timezone.  [Bug #12271]
 
-    * BigDecimal.allocate
-    * BigDecimal.ver
+* thread
 
-  * Every BigDecimal object is frozen. [Feature #13984]
+  * 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.
 
-  * 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].
+* Tk
+  * Tk is removed from stdlib.  [Feature #8539]
+    https://github.com/ruby/tk is the new upstream.
 
 === C API updates
 
-=== Implementation improvements
-
-* Speedup Proc#call because we don't need to care about <code>$SAFE</code>
-  any more. [Feature #14318]
+* 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.
 
-  With +lc_fizzbuzz+ benchmark which uses Proc#call many times we can
-  measure x1.4 improvements.  [Bug #10212]
+=== Supported platform changes
 
-* Speedup block.call where +block+ is passed block parameter. [Feature #14330]
+* FreeBSD < 4 is no longer supported
 
-  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
+=== Implementation improvements
 
-  [After]
-    * libruby.2.6.dylib
-    * libruby.dylib -> libruby.2.6.dylib
+* 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)`.
 
-* Extracted misc/*.el files to https://github.com/ruby/elisp
+* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214]
diff --git a/README.ja.md b/README.ja.md
index 3ecdc9d7d3..9d6131e416 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,7 +1,3 @@
-[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=trunk)](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)
-[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/trunk "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef)
-
 # Rubyとは
 
 Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です． Rubyは純粋なオブジェクト指向言語として設計されているので，
@@ -20,40 +16,40 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい
 *   イテレータとクロージャ
 *   ガーベージコレクタ
 *   ダイナミックローディング (アーキテクチャによる)
-*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， macOS，
-    Haikuなどの上でも動く cf.
-    https://github.com/ruby/ruby/blob/trunk/doc/contributing.rdoc#platform-maintainers
+*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， Mac OS
+    X，BeOSなどの上でも動く cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
 
 
 ## 入手法
 
-サードパーティーツールを使った方法を含むRubyのインストール方法の一覧は
+### FTPで
 
-https://www.ruby-lang.org/ja/downloads/
+以下の場所においてあります．
 
-を参照してください．
+ftp://ftp.ruby-lang.org/pub/ruby/
 
 ### Subversionで
 
 開発先端のソースコードは次のコマンドで取得できます．
 
-    $ svn co https://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
 
 他に開発中のブランチの一覧は次のコマンドで見られます．
 
-    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
 
 ### Gitで
 
 SubversionのミラーをGitHubに公開しています． 以下のコマンドでリポジトリを取得できます．
 
-    $ git clone https://github.com/ruby/ruby.git
+    $ git clone git://github.com/ruby/ruby.git
 
 ## ホームページ
 
 RubyのホームページのURLは
 
-https://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
 です．
 
@@ -82,7 +78,7 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス�
 
 以下の手順で行ってください．
 
-1.  もし `configure` ファイルが見つからない，もしくは `configure.ac` より古いようなら， `autoconf` を実行して
+1.  もし `configure` ファイルが見つからない，もしくは `configure.in` より古いようなら， `autoconf` を実行して
     新しく `configure` を生成する
 
 2.  `configure` を実行して `Makefile` などを生成する
@@ -160,9 +156,9 @@ UNIXであれば `configure` がほとんどの差異を吸収してくれるは
 ## フィードバック
 
 Rubyに関する質問は Ruby-Talk（英語）や Ruby-List（日本語） (https://www.ruby-lang.org/ja/community/mailing-lists) や，
-stackoverflow (https://ja.stackoverflow.com/) などのWebサイトに投稿してください．
+stackoverflow (http://ja.stackoverflow.com/) などのWebサイトに投稿してください．
 
-バグ報告は https://bugs.ruby-lang.org で受け付けています．
+バグ報告は http://bugs.ruby-lang.org で受け付けています．
 
 
 ## 著者
diff --git a/README.md b/README.md
index 1e76fda4f0..f79ba9c718 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,26 @@
-[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=trunk)](https://travis-ci.org/ruby/ruby)
+[![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)
-[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/trunk "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef)
 
 # 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
+programming.  It has many features to process text files and to do system
+management tasks (as in Perl).  It is simple, straight-forward, and
 extensible.
 
 ## Features of Ruby
 
 *   Simple Syntax
 *   **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, macOS, Haiku, etc.) cf.
-    https://github.com/ruby/ruby/blob/trunk/doc/contributing.rdoc#platform-maintainers
+    well as Windows, Mac OS X, BeOS, etc.) cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
 
 
 ## How to get Ruby
@@ -29,31 +28,35 @@ extensible.
 For a complete list of ways to install Ruby, including using third-party tools
 like rvm, see:
 
-https://www.ruby-lang.org/en/downloads/
+http://www.ruby-lang.org/en/downloads/
+
+The Ruby distribution files can be found on the following FTP site:
+
+ftp://ftp.ruby-lang.org/pub/ruby/
 
 The trunk of the Ruby source tree can be checked out with the following
 command:
 
-    $ svn co https://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
 
 Or if you are using git then use the following command:
 
-    $ git clone https://github.com/ruby/ruby.git
+    $ git clone git://github.com/ruby/ruby.git
 
-There are some other branches under development. Try the following command
+There are some other branches under development.  Try the following command
 to see the list of branches:
 
-    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
 
 Or if you are using git then use the following command:
 
-    $ git ls-remote https://github.com/ruby/ruby.git
+    $ git ls-remote git://github.com/ruby/ruby.git
 
 ## Ruby home page
 
 The URL of the Ruby home page is:
 
-https://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
 ## Mailing list
 
@@ -63,22 +66,22 @@ send the following phrase:
     subscribe
 
 in the mail body (not subject) to the address
-<ruby-talk-request@ruby-lang.org>.
+<mailto:ruby-talk-request@ruby-lang.org>.
 
 ## How to compile and install
 
 This is what you need to do to compile and install Ruby:
 
-1.  If you want to use Microsoft Visual C++ to compile Ruby, read
-    [win32/README.win32](win32/README.win32) instead of this document.
+1.  If you want to use Microsoft Visual C++ to compile ruby, read
+    win32/README.win32 instead of this document.
 
-2.  If `./configure` does not exist or is older than `configure.ac`, run
+2.  If `./configure` does not exist or is older than configure.in, run
     `autoconf` to (re)generate configure.
 
 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.
@@ -94,19 +97,11 @@ 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).
-
-8.  Optionally, run `make update-gems` and `make extract-gems`.
-
-    If you want to install bundled gems, run `make update-gems` and
-    `make extract-gems` before running `make install`.
+    ruby works as it should (hopefully).
 
-9.  Run '`make install`'.
+8.  Run '`make install`'
 
     This command will create the following directories and install files into
     them.
@@ -135,10 +130,10 @@ 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
@@ -152,14 +147,14 @@ See the file [COPYING](COPYING).
 ## Feedback
 
 Questions about the Ruby language can be asked on the Ruby-Talk mailing list
-(https://www.ruby-lang.org/en/community/mailing-lists) or on websites like
-(https://stackoverflow.com).
+(http://www.ruby-lang.org/en/community/mailing-lists) or on websites like
+(http://stackoverflow.com).
 
-Bug reports should be filed at https://bugs.ruby-lang.org. Read [HowToReport] for more information.
+Bug reports should be filed at http://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)
 
@@ -169,4 +164,4 @@ See the file [CONTRIBUTING.md](CONTRIBUTING.md)
 Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in
 1995.
 
-<matz@ruby-lang.org>
+<mailto:matz@ruby-lang.org>
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000000..99b24e6d93
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,46 @@
+# -*- 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 b0fe3eb959..56e944be8f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# 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,
@@ -12,35 +12,4 @@
 # 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([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_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_ldflags.m4])
-m4_include([tool/m4/ruby_type_attribute.m4])
-m4_include([tool/m4/ruby_universal_arch.m4])
-m4_include([tool/m4/ruby_werror_flag.m4])
+m4_include([acinclude.m4])
diff --git a/addr2line.c b/addr2line.c
index b2c31b39ad..a20e5000c4 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -8,28 +8,14 @@
 
 **********************************************************************/
 
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wpedantic"
-#pragma clang diagnostic ignored "-Wgcc-compat"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-
 #include "ruby/config.h"
-#include "ruby/defines.h"
 #include "ruby/missing.h"
 #include "addr2line.h"
 
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#else
-#include "missing/stdbool.h"
-#endif
-
-#if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)
+#ifdef USE_ELF
 
 #include <fcntl.h>
 #include <limits.h>
@@ -42,6 +28,12 @@
 #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
@@ -65,20 +57,24 @@ void *alloca();
 # include <dlfcn.h>
 #endif
 
-#ifdef HAVE_MACH_O_LOADER_H
-# include <mach-o/fat.h>
-# include <mach-o/ldsyms.h>
-# include <mach-o/loader.h>
-# include <mach-o/nlist.h>
-# include <mach-o/stab.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 USE_ELF
-# ifdef __OpenBSD__
-#  include <elf_abi.h>
-# else
-#  include <elf.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 */
 
 #ifndef ElfW
 # if SIZEOF_VOIDP == 8
@@ -94,44 +90,13 @@ 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
 
-#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 */
-
-/* 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);
+int kprintf(const char *fmt, ...);
 
-typedef struct line_info {
+typedef struct {
     const char *dirname;
     const char *filename;
     const char *path; /* object path */
@@ -140,52 +105,15 @@ typedef struct line_info {
     uintptr_t base_addr;
     uintptr_t saddr;
     const char *sname; /* function name */
-
-    struct line_info *next;
 } line_info_t;
-
-struct dwarf_section {
-    char *ptr;
-    size_t size;
-    uint64_t flags;
-};
-
-typedef struct obj_info {
+typedef struct obj_info obj_info_t;
+struct obj_info {
     const char *path; /* object path */
-    char *mapped;
+    int fd;
+    void *mapped;
     size_t mapped_size;
-    void *uncompressed;
     uintptr_t base_addr;
-    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;
+    obj_info_t *next;
 };
 
 /* Avoid consuming stack as this module may be used from signal handler */
@@ -249,7 +177,8 @@ get_nth_dirname(unsigned long dir, char *p)
 }
 
 static void
-fill_filename(int file, char *include_directories, char *filenames, line_info_t *line, obj_info_t *obj)
+fill_filename(int file, char *include_directories, char *filenames,
+	      line_info_t *line)
 {
     int i;
     char *p = filenames;
@@ -259,8 +188,8 @@ fill_filename(int file, char *include_directories, char *filenames, line_info_t
 	filename = p;
 	if (!*p) {
 	    /* Need to output binary file name? */
-	    kprintf("Unexpected file number %d in %s at %tx\n",
-		    file, binary_filename, filenames - obj->mapped);
+	    kprintf("Unexpected file number %d in %s\n",
+		    file, binary_filename);
 	    return;
 	}
 	while (*p) p++;
@@ -284,128 +213,100 @@ 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 - obj->vmaddr;
+    addr += obj->base_addr;
     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], obj);
+	    fill_filename(file, include_directories, filenames, &lines[i]);
 	    lines[i].line = 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;
-};
-
-static int
-parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
+static void
+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 = *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;
+    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;
+
+    unit_length = *(unsigned int *)p;
+    p += sizeof(unsigned int);
+    if (unit_length == 0xffffffff) {
+	unit_length = *(unsigned long *)p;
+	p += sizeof(unsigned long);
     }
 
-    header->cu_end = p + header->unit_length;
+    cu_end = p + unit_length;
 
-    header->version = *(uint16_t *)p;
-    p += sizeof(uint16_t);
-    if (header->version > 4) return -1;
+    /*dwarf_version = *(unsigned short *)p;*/
+    p += 2;
 
-    header->header_length = header->format == 4 ? *(uint32_t *)p : *(uint64_t *)p;
-    p += header->format;
-    header->cu_start = p + header->header_length;
+    header_length = *(unsigned int *)p;
+    p += sizeof(unsigned int);
 
-    header->minimum_instruction_length = *(uint8_t *)p++;
+    cu_start = p + header_length;
 
-    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++;
-    }
+    minimum_instruction_length = *(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;
+    is_stmt = default_is_stmt = *(unsigned char *)p;
+    p++;
 
-    header->include_directories = p;
+    line_base = *(signed char *)p;
+    p++;
 
-    /* temporary measure for compress-debug-sections */
-    if (p >= header->cu_end) return -1;
+    line_range = *(unsigned char *)p;
+    p++;
+
+    opcode_base = *(unsigned char *)p;
+    p++;
+
+    /* standard_opcode_lengths = (unsigned char *)p - 1; */
+    p += opcode_base - 1;
+
+    include_directories = p;
 
     /* skip include directories */
     while (*p) {
-	p = memchr(p, '\0', header->cu_end - p);
-	if (!p) return -1;
+	while (*p) p++;
 	p++;
     }
     p++;
 
-    header->filenames = p;
-
-    *pp = header->cu_start;
+    filenames = p;
 
-    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; */
-
-    if (parse_debug_line_header(&p, &header))
-        return -1;
-    is_stmt = header.default_is_stmt;
+    p = cu_start;
 
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
-                  (char *)header.include_directories,               \
-                  (char *)header.filenames,                         \
+		  include_directories, filenames,		    \
 		  obj, lines, offset);				    \
 	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
     } while (0)
 
-    while (p < header.cu_end) {
+    while (p < cu_end) {
 	unsigned long a;
 	unsigned char op = *p++;
 	switch (op) {
@@ -413,19 +314,19 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    FILL_LINE();
 	    break;
 	case DW_LNS_advance_pc:
-	    a = uleb128((char **)&p);
+	    a = uleb128(&p);
 	    addr += a;
 	    break;
 	case DW_LNS_advance_line: {
-	    long a = sleb128((char **)&p);
+	    long a = sleb128(&p);
 	    line += a;
 	    break;
 	}
 	case DW_LNS_set_file:
-	    file = (unsigned int)uleb128((char **)&p);
+	    file = (unsigned int)uleb128(&p);
 	    break;
 	case DW_LNS_set_column:
-	    /*column = (unsigned int)*/(void)uleb128((char **)&p);
+	    /*column = (unsigned int)*/(void)uleb128(&p);
 	    break;
 	case DW_LNS_negate_stmt:
 	    is_stmt = !is_stmt;
@@ -434,8 +335,8 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    /*basic_block = 1; */
 	    break;
 	case DW_LNS_const_add_pc:
-	    a = ((255 - header.opcode_base) / header.line_range) *
-		header.minimum_instruction_length;
+	    a = ((255 - opcode_base) / line_range) *
+		minimum_instruction_length;
 	    addr += a;
 	    break;
 	case DW_LNS_fixed_advance_pc:
@@ -449,7 +350,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((char **)&p);
+	    /* isa = (unsigned int)*/(void)uleb128(&p);
 	    break;
 	case 0:
 	    a = *(unsigned char *)p++;
@@ -462,7 +363,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 		file = 1;
 		line = 1;
 		/* column = 0; */
-		is_stmt = header.default_is_stmt;
+		is_stmt = default_is_stmt;
 		/* end_sequence = 0; */
 		/* isa = 0; */
 		break;
@@ -476,7 +377,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 		break;
 	    case DW_LNE_set_discriminator:
 		/* TODO:currently ignore */
-		uleb128((char **)&p);
+		uleb128(&p);
 		break;
 	    default:
 		kprintf("Unknown extended opcode: %d in %s\n",
@@ -484,34 +385,33 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    }
 	    break;
 	default: {
-            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);
+	    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;
 	    FILL_LINE();
 	}
 	}
     }
-    *debug_line = (char *)p;
-    return 0;
+    *debug_line = p;
 }
 
-static int
+static void
 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) {
-	if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
-	    return -1;
+	parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset);
     }
     if (debug_line != debug_line_end) {
 	kprintf("Unexpected size of .debug_line in %s\n",
 		binary_filename);
     }
-    return 0;
 }
 
 /* read file and fill lines */
@@ -520,26 +420,22 @@ 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
 static void
-follow_debuglink(const char *debuglink, int num_traces, void **traces,
+follow_debuglink(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";
-    const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
-    char *p;
+    char *p, *subdir;
     obj_info_t *o1 = *objp, *o2;
-    size_t len;
 
     p = strrchr(binary_filename, '/');
     if (!p) {
@@ -547,13 +443,11 @@ follow_debuglink(const char *debuglink, int num_traces, void **traces,
     }
     p[1] = '\0';
 
-    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);
+    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);
 
     append_obj(objp);
     o2 = *objp;
@@ -561,1054 +455,6 @@ follow_debuglink(const 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;
-}
-
-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 refered 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)
-{
-    uint64_t n;
-    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 (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)
-{
-    int i;
-    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 (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)
-{
-#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);
-#endif
-    return 0;
-}
 
 /* read file and fill lines */
 static uintptr_t
@@ -1617,9 +463,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) *gnu_debuglink_shdr = NULL;
+    ElfW(Shdr) *debug_line_shdr = NULL, *gnu_debuglink_shdr = NULL;
     int fd;
     off_t filesize;
     char *file;
@@ -1655,7 +502,6 @@ 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) {
@@ -1663,8 +509,11 @@ 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;
 
@@ -1674,7 +523,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++) {
-        char *section_name = shstr + shdr[i].sh_name;
+	section_name = shstr + shdr[i].sh_name;
 	switch (shdr[i].sh_type) {
 	  case SHT_STRTAB:
 	    if (!strcmp(section_name, ".strtab")) {
@@ -1693,34 +542,12 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	    dynsym_shdr = shdr + i;
 	    break;
 	  case SHT_PROGBITS:
-	    if (!strcmp(section_name, ".gnu_debuglink")) {
+	    if (!strcmp(section_name, ".debug_line")) {
+		debug_line_shdr = shdr + i;
+	    }
+	    else 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;
 	}
     }
@@ -1732,22 +559,20 @@ 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)));
-            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);
-            }
+	    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;
+		}
+	    }
 	    if (ehdr->e_type == ET_EXEC) {
 		obj->base_addr = 0;
 	    }
@@ -1758,48 +583,33 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	}
     }
 
-    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 (!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_line.ptr) {
+    if (!debug_line_shdr) {
 	/* This file doesn't have .debug_line section,
 	   let's check .gnu_debuglink section instead. */
 	if (gnu_debuglink_shdr && check_debuglink) {
@@ -1810,233 +620,15 @@ use_symtab:
 	goto finish;
     }
 
-    if (parse_debug_line(num_traces, traces,
-            obj->debug_line.ptr,
-            obj->debug_line.size,
-            obj, lines, offset) == -1)
-        goto fail;
-
+    parse_debug_line(num_traces, traces,
+		     file + debug_line_shdr->sh_offset,
+		     debug_line_shdr->sh_size,
+		     obj, lines, offset);
 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 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, _mh_execute_header.cputype,_mh_execute_header.cpusubtype, cputype,cpusubtype); */
-            if (_mh_execute_header.cputype == cputype &&
-                    (_mh_execute_header.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;
-                uint32_t j;
-                uintptr_t saddr;
-                /* 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__)
@@ -2049,7 +641,7 @@ fail:
  * it is NUL terminated.
  */
 #if defined(__linux__)
-static ssize_t
+ssize_t
 main_exe_path(void)
 {
 # define PROC_SELF_EXE "/proc/self/exe"
@@ -2058,7 +650,7 @@ main_exe_path(void)
     return len;
 }
 #elif defined(__FreeBSD__)
-static ssize_t
+ssize_t
 main_exe_path(void)
 {
     int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
@@ -2075,53 +667,6 @@ main_exe_path(void)
 #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)
 {
@@ -2173,11 +718,8 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 	    path = info.dli_fname;
 	    obj->path = path;
 	    lines[i].path = path;
-            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;
+	    strcpy(binary_filename, path);
+	    fill_lines(num_traces, traces, 1, &obj, lines, i);
 	}
 next_line:
 	continue;
@@ -2185,36 +727,46 @@ next_line:
 
     /* output */
     for (i = 0; i < num_traces; i++) {
-        print_line(&lines[i], 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);
+	}
 	/* FreeBSD's backtrace may show _start and so on */
-	if (lines[i].sname && strcmp("main", lines[i].sname) == 0)
+	if (line->sname && strcmp("main", line->sname) == 0)
 	    break;
     }
 
     /* free */
     while (obj) {
 	obj_info_t *o = obj;
-        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;
+	if (o->fd) {
+	    munmap(o->mapped, o->mapped_size);
+	    close(o->fd);
+	}
 	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);
 }
@@ -2260,7 +812,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])
-static const char hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+char const 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);
 
@@ -2274,7 +826,7 @@ static void putce(int c)
     (void)ret;
 }
 
-static int
+int
 kprintf(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/addr2line.h b/addr2line.h
index 4f6cf179ef..d99f010934 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -11,7 +11,7 @@
 #ifndef RUBY_ADDR2LINE_H
 #define RUBY_ADDR2LINE_H
 
-#if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H))
+#ifdef USE_ELF
 
 void
 rb_dump_backtrace_with_lines(int num_traces, void **traces);
diff --git a/appveyor.yml b/appveyor.yml
index 3bf1568cd9..2cda4817a6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,145 +1,37 @@
 ---
-version: '{build}'
 shallow_clone: true
-platform:
-  - x64
-environment:
-  ruby_version: "24-%Platform%"
-  zlib_version: "1.2.11"
-  matrix:
-    # to reduce time for finishing all jobs, run the slowest msys2 build first.
-    - build: msys2
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    - build: vs
-      vs: 120
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-    - build: vs
-      vs: 140
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  GEMS_FOR_TEST: "timezone tzinfo"
-notifications:
-  - provider: Webhook
-    url:
-      secure: iMINHMS0nZabaDsxN9omRDsekxzVvAAzEq5ev7lN6vZ6r9zNhl3/F/7POIVyahAwVFpRDeQT/iUugpAGWmOt3eGL/lZIdqiJFZ9DjPSkP68= # #alerts
-    method: POST
-    # "icon_url" is the url used by `provider: Slack`
-    body: >-
-      {{^isPullRequest}}
-        {
-          "attachments": [
-            {
-              "title": "Build {{projectName}} {{buildVersion}} {{status}}",
-              "fallback": "AppVeyor Build {{projectName}} {{buildVersion}} {{status}}",
-              "title_link": "{{buildUrl}}",
-              "text": "Commit <{{commitUrl}}|{{commitId}}> by {{commitAuthor}} on {{commitDate}}: _{{commitMessage}}_",
-              {{#passed}}
-                "color": "#44ee44"
-              {{/passed}}
-              {{#failed}}
-                "color": "#ee4444"
-              {{/failed}}
-            }
-          ],
-          "icon_url": "https://slack-files2.s3-us-west-2.amazonaws.com/bot_icons/2018-02-10/314363543719_48.png",
-          "username": "AppVeyor CI"
-        }
-      {{/isPullRequest}}
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: true
-for:
--
-  matrix:
-    only:
-      - build: vs
-  install:
-    - ver
-    - chcp
-    - SET BITS=%Platform:x86=32%
-    - SET BITS=%BITS:x=%
-    - SET OPENSSL_DIR=c:\OpenSSL-Win%BITS%
-    - 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% up incs UNICODE_FILES=.
-    - del Makefile
-    - mkdir \usr\local\bin
-    - mkdir \usr\local\include
-    - mkdir \usr\local\lib
-    - appveyor DownloadFile https://zlib.net/zlib%zlib_version:.=%.zip
-    - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib%zlib_version:.=%.zip
-    - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
-    - mkdir %Platform%-mswin_%vs%
-    - ps: Get-ChildItem "win32" -Recurse | foreach {$_.Attributes = 'Readonly'}
-    - ps: Get-Item $env:Platform"-mswin_"$env:vs | foreach {$_.Attributes = 'Normal'}
-  build_script:
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - cd %Platform%-mswin_%vs%
-    - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --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%
-  test_script:
-    - set /a JOBS=%NUMBER_OF_PROCESSORS%
-    - nmake -l "TESTOPTS=-v -q" btest
-    - nmake -l "TESTOPTS=-v -q" test-basic
-    - nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --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 --subprocess-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
--
-  matrix:
-    only:
-      - build: msys2
-  install:
-    - ver
-    - chcp
-    - set /a JOBS=%NUMBER_OF_PROCESSORS%
-    - set MSYS_NO_PATHCONV=1
-    - SET MSYSTEM=%Platform:x86=32%
-    - SET MSYSTEM=%MSYSTEM:x=MINGW%
-    - SET MSYS2_ARCH=%Platform:x86=i686%
-    - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64%
-    - set MSYSTEM_PREFIX=/mingw64
-    - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32
-    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
-    - cd ..
-    - mkdir build
-    - mkdir install
-    - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
-    - ruby --version
-  build_script:
-    # always update database
-    - pacman -Sy
-    - pacman -S --noconfirm --needed --noprogressbar mingw-w64-x86_64-toolchain
-    - pacman -S --noconfirm --needed --noprogressbar mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-ncurses mingw-w64-x86_64-readline mingw-w64-x86_64-zlib
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe
-    - set CXXFLAGS=%CFLAGS%
-    - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048
-    - set LDFLAGS=-pipe
-    - sh -c "autoreconf -fi"
-    - cd ..\build
-    - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST%
-    - mingw32-make -j%JOBS% up
-    - mingw32-make -j%JOBS%
-    - mingw32-make DESTDIR=../install install-nodoc
-    - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
-  test_script:
-    - mingw32-make test
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
-    # separately execute tests without -j which may crash worker with -j.
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
-    - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
+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.7-windows.zip'
+  - 7z x libressl-2.3.7-windows.zip
+  - copy libressl-2.3.7-windows\x64\libcrypto-37.lib \usr\local\lib\crypto.lib
+  - copy libressl-2.3.7-windows\x64\libssl-38.lib    \usr\local\lib\ssl.lib
+  - copy libressl-2.3.7-windows\x64\libcrypto-37.dll \usr\local\bin
+  - copy libressl-2.3.7-windows\x64\libssl-38.dll    \usr\local\bin
+  - xcopy /e libressl-2.3.7-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 --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
diff --git a/array.c b/array.c
index ec6f232662..4e60177121 100644
--- a/array.c
+++ b/array.c
@@ -11,29 +11,23 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
 #include "probes.h"
 #include "id.h"
-#include "debug_counter.h"
-#include "gc.h"
-#include "transient_heap.h"
-#include "internal.h"
 
-#if !ARRAY_DEBUG
+#ifndef ARRAY_DEBUG
 # define NDEBUG
 #endif
 #include "ruby_assert.h"
 
 VALUE rb_cArray;
 
-/* for OPTIMIZED_CMP: */
-#define id_cmp idCmp
+static ID id_cmp, id_div, id_power;
 
 #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)), \
@@ -44,21 +38,17 @@ VALUE rb_cArray;
 
 #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)), 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)), ARY_HEAP_CAPA(a) * sizeof(VALUE))
+#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_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 { \
@@ -108,7 +98,7 @@ VALUE rb_cArray;
 } while (0)
 
 #define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
-                       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : ARY_HEAP_CAPA(ary))
+		       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
 #define ARY_SET_CAPA(ary, n) do { \
     assert(!ARY_EMBED_P(ary)); \
     assert(!ARY_SHARED_P(ary)); \
@@ -136,82 +126,11 @@ VALUE rb_cArray;
 } 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))
 
-
-#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;
-        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 (RARRAY_TRANSIENT_P(ary)) {
-        assert(rb_transient_heap_managed_ptr_p(RARRAY_CONST_PTR_TRANSIENT(ary)));
-    }
-
-    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)
 {
@@ -223,7 +142,7 @@ rb_mem_clear(register VALUE *mem, register long size)
 static void
 ary_mem_clear(VALUE ary, long beg, long size)
 {
-    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+    RARRAY_PTR_USE(ary, ptr, {
 	rb_mem_clear(ptr + beg, size);
     });
 }
@@ -239,7 +158,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_TRANSIENT(ary, ptr, {
+    RARRAY_PTR_USE(ary, ptr, {
 	memfill(ptr + beg, size, val);
 	RB_OBJ_WRITTEN(ary, Qundef, val);
     });
@@ -248,22 +167,28 @@ 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_TRANSIENT(ary, ptr, {
-            MEMCPY(ptr+beg, argv, VALUE, argc);
-        });
+	rb_gc_writebarrier_remember(buff_owner_ary);
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMCPY(ptr+beg, argv, VALUE, argc);
+	});
     }
     else {
-        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]);
-            }
-        });
+	int i;
+	RARRAY_PTR_USE(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
@@ -272,175 +197,49 @@ 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 = ary_heap_alloc(ary, capacity);
-
+            VALUE *ptr = ALLOC_N(VALUE, (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 {
-            ary_heap_realloc(ary, capacity);
+	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity, RARRAY(ary)->as.heap.aux.capa);
         }
-        ARY_SET_CAPA(ary, capacity);
+        ARY_SET_CAPA(ary, (capacity));
     }
     else {
         if (!ARY_EMBED_P(ary)) {
-            long len = ARY_HEAP_LEN(ary);
-            long old_capa = ARY_HEAP_CAPA(ary);
-            const VALUE *ptr = ARY_HEAP_PTR(ary);
+            long len = RARRAY_LEN(ary);
+	    const VALUE *ptr = RARRAY_CONST_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 = ARY_HEAP_CAPA(ary);
+    long old_capa = RARRAY(ary)->as.heap.aux.capa;
     assert(!ARY_SHARED_P(ary));
     assert(old_capa >= capacity);
-    if (old_capa > capacity) ary_heap_realloc(ary, capacity);
-
-    ary_verify(ary);
+    if (old_capa > capacity)
+	REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity);
 }
 
 static void
@@ -456,8 +255,6 @@ ary_double_capa(VALUE ary, long min)
     }
     new_capa += min;
     ary_resize_capa(ary, new_capa);
-
-    ary_verify(ary);
 }
 
 static void
@@ -513,7 +310,6 @@ static inline void
 rb_ary_modify_check(VALUE ary)
 {
     rb_check_frozen(ary);
-    ary_verify(ary);
 }
 
 void
@@ -523,9 +319,6 @@ rb_ary_modify(VALUE ary)
     if (ARY_SHARED_P(ary)) {
 	long shared_len, len = RARRAY_LEN(ary);
 	VALUE shared = ARY_SHARED(ary);
-
-        ary_verify(shared);
-
         if (len <= RARRAY_EMBED_LEN_MAX) {
 	    const VALUE *ptr = ARY_HEAP_PTR(ary);
             FL_UNSET_SHARED(ary);
@@ -535,19 +328,19 @@ rb_ary_modify(VALUE ary)
             ARY_SET_EMBED_LEN(ary, len);
         }
 	else if (ARY_SHARED_OCCUPIED(shared) && len > ((shared_len = RARRAY_LEN(shared))>>1)) {
-            long shift = RARRAY_CONST_PTR_TRANSIENT(ary) - RARRAY_CONST_PTR_TRANSIENT(shared);
+	    long shift = RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared);
 	    FL_UNSET_SHARED(ary);
-            ARY_SET_PTR(ary, RARRAY_CONST_PTR_TRANSIENT(shared));
+	    ARY_SET_PTR(ary, RARRAY_CONST_PTR(shared));
 	    ARY_SET_CAPA(ary, shared_len);
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	    RARRAY_PTR_USE(ary, ptr, {
 		MEMMOVE(ptr, ptr+shift, VALUE, len);
 	    });
 	    FL_SET_EMBED(shared);
 	    rb_ary_decrement_share(shared);
 	}
         else {
-            VALUE *ptr = ary_heap_alloc(ary, len);
-            MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len);
+            VALUE *ptr = ALLOC_N(VALUE, len);
+            MEMCPY(ptr, RARRAY_CONST_PTR(ary), VALUE, len);
             rb_ary_unshare(ary);
             ARY_SET_CAPA(ary, len);
             ARY_SET_PTR(ary, ptr);
@@ -555,7 +348,6 @@ rb_ary_modify(VALUE ary)
 
 	rb_gc_writebarrier_remember(ary);
     }
-    ary_verify(ary);
 }
 
 static VALUE
@@ -572,12 +364,9 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
 	if (new_len > RARRAY_EMBED_LEN_MAX) {
 	    VALUE shared = ARY_SHARED(ary);
 	    if (ARY_SHARED_OCCUPIED(shared)) {
-                if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared) + new_len <= RARRAY_LEN(shared)) {
+		if (RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared) + new_len <= RARRAY_LEN(shared)) {
 		    rb_ary_modify_check(ary);
-
-                    ary_verify(ary);
-                    ary_verify(shared);
-                    return shared;
+		    return shared;
 		}
 		else {
 		    /* if array is shared, then it is likely it participate in push/shift pattern */
@@ -586,23 +375,17 @@ 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;
 }
 
@@ -622,6 +405,21 @@ 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
@@ -675,7 +473,7 @@ ary_new(VALUE klass, long capa)
 
     ary = ary_alloc(klass);
     if (capa > RARRAY_EMBED_LEN_MAX) {
-        ptr = ary_heap_alloc(ary, capa);
+	ptr = ALLOC_N(VALUE, capa);
         FL_UNSET_EMBED(ary);
         ARY_SET_PTR(ary, ptr);
         ARY_SET_CAPA(ary, capa);
@@ -716,12 +514,12 @@ VALUE
     return ary;
 }
 
-MJIT_FUNC_EXPORTED VALUE
-rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts)
+VALUE
+rb_ary_new_from_values(long n, const VALUE *elts)
 {
     VALUE ary;
 
-    ary = ary_new(klass, n);
+    ary = rb_ary_new2(n);
     if (n > 0 && elts) {
 	ary_memcpy(ary, 0, n, elts);
 	ARY_SET_LEN(ary, n);
@@ -731,17 +529,9 @@ rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts)
 }
 
 VALUE
-rb_ary_new_from_values(long n, const VALUE *elts)
-{
-    return rb_ary_tmp_new_from_values(rb_cArray, n, elts);
-}
-
-VALUE
 rb_ary_tmp_new(long capa)
 {
-    VALUE ary = ary_new(0, capa);
-    rb_ary_transient_heap_evacuate(ary, TRUE);
-    return ary;
+    return ary_new(0, capa);
 }
 
 VALUE
@@ -750,7 +540,6 @@ 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;
 }
 
@@ -758,16 +547,7 @@ void
 rb_ary_free(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-        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);
+	ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
     }
 }
 
@@ -775,7 +555,7 @@ RUBY_FUNC_EXPORTED size_t
 rb_ary_memsize(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	return ARY_CAPA(ary) * sizeof(VALUE);
+	return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
     }
     else {
 	return 0;
@@ -787,15 +567,13 @@ ary_discard(VALUE ary)
 {
     rb_ary_free(ary);
     RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
-    RBASIC(ary)->flags &= ~(RARRAY_EMBED_LEN_MASK | RARRAY_TRANSIENT_FLAG);
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
 }
 
 static VALUE
 ary_make_shared(VALUE ary)
 {
     assert(!ARY_EMBED_P(ary));
-    ary_verify(ary);
-
     if (ARY_SHARED_P(ary)) {
 	return ARY_SHARED(ary);
     }
@@ -803,7 +581,6 @@ ary_make_shared(VALUE 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);
@@ -811,25 +588,18 @@ ary_make_shared(VALUE 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));
-
-        rb_ary_transient_heap_evacuate(ary, TRUE);
-        ptr = ARY_HEAP_PTR(ary);
-
         FL_UNSET_EMBED(shared);
+
 	ARY_SET_LEN((VALUE)shared, capa);
-        ARY_SET_PTR((VALUE)shared, ptr);
-        ary_mem_clear((VALUE)shared, len, capa - len);
+	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_SET_SHARED(ary);
 	ARY_SET_SHARED(ary, (VALUE)shared);
 	OBJ_FREEZE(shared);
-
-        ary_verify((VALUE)shared);
-        ary_verify(ary);
-        return (VALUE)shared;
+	return (VALUE)shared;
     }
 }
 
@@ -840,7 +610,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_TRANSIENT(ary));
+	ary_memcpy(subst, 0, len, RARRAY_CONST_PTR(ary));
         ARY_SET_EMBED_LEN(subst, len);
         return subst;
     }
@@ -855,23 +625,16 @@ rb_assoc_new(VALUE car, VALUE cdr)
     return rb_ary_new3(2, car, cdr);
 }
 
-VALUE
-rb_to_array_type(VALUE ary)
+static VALUE
+to_ary(VALUE ary)
 {
-    return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
+    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
-#define to_ary rb_to_array_type
 
 VALUE
 rb_check_array_type(VALUE 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);
+    return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
 /*
@@ -925,7 +688,7 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
  *  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}
+ *    Array.new(3){ |index| index ** 2 }
  *    # => [0, 1, 4]
  *
  *  == Common gotchas
@@ -949,7 +712,7 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
  *  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 = Array.new(2) { Hash.new }
  *     a[0]['cat'] = 'feline'
  *     a # => [{"cat"=>"feline"}, {}]
  *
@@ -963,8 +726,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 
     rb_ary_modify(ary);
     if (argc == 0) {
-        if (ARY_OWNS_HEAP_P(ary) && ARY_HEAP_PTR(ary) != NULL) {
-            ary_heap_free(ary);
+	if (ARY_OWNS_HEAP_P(ary) && RARRAY_CONST_PTR(ary) != 0) {
+	    ruby_sized_xfree((void *)RARRAY_CONST_PTR(ary), ARY_HEAP_SIZE(ary));
 	}
         rb_ary_unshare_safe(ary);
         FL_SET_EMBED(ary);
@@ -1015,7 +778,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/]
  */
@@ -1071,7 +834,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_TRANSIENT(ary) + offset);
+	ary_memcpy(result, 0, len, RARRAY_CONST_PTR(ary) + offset);
         ARY_SET_EMBED_LEN(result, len);
         return result;
     }
@@ -1080,15 +843,12 @@ 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_TRANSIENT(ary));
+        ARY_SET_PTR(result, RARRAY_CONST_PTR(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;
     }
 }
@@ -1108,17 +868,13 @@ 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;
 
-    argc = rb_check_arity(argc, 0, 1);
-    /* the case optional argument is ommited should be handled in
-     * callers of this function.  if another arity case is added,
-     * this arity check needs to rewrite. */
-    RUBY_ASSERT_WHEN(TRUE, argc == 1);
-
-    n = NUM2LONG(argv[0]);
+    rb_scan_args(argc, argv, "1", &nv);
+    n = NUM2LONG(nv);
     len = RARRAY_LEN(ary);
     if (n > len) {
 	n = len;
@@ -1140,10 +896,7 @@ ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos
  *  expression returns the array itself, so several appends
  *  may be chained together.
  *
- *     a = [ 1, 2 ]
- *     a << "c" << "d" << [ 3, 4 ]
- *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
- *     a
+ *     [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
  *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
  *
  */
@@ -1151,13 +904,12 @@ ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos
 VALUE
 rb_ary_push(VALUE ary, VALUE item)
 {
-    long idx = RARRAY_LEN((ary_verify(ary), ary));
+    long idx = RARRAY_LEN(ary);
     VALUE target_ary = ary_ensure_room_for_push(ary, 1);
-    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+    RARRAY_PTR_USE(ary, ptr, {
 	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
     });
     ARY_SET_LEN(ary, idx + 1);
-    ary_verify(ary);
     return ary;
 }
 
@@ -1173,8 +925,7 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 
 /*
  *  call-seq:
- *     ary.push(obj, ...)    -> ary
- *     ary.append(obj, ...)  -> ary
+ *     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
@@ -1209,7 +960,6 @@ rb_ary_pop(VALUE ary)
     }
     --n;
     ARY_SET_LEN(ary, n);
-    ary_verify(ary);
     return RARRAY_AREF(ary, n);
 }
 
@@ -1243,7 +993,6 @@ 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;
 }
 
@@ -1258,11 +1007,10 @@ rb_ary_shift(VALUE ary)
     top = RARRAY_AREF(ary, 0);
     if (!ARY_SHARED_P(ary)) {
 	if (len < ARY_DEFAULT_SIZE) {
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	    RARRAY_PTR_USE(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 */
@@ -1271,13 +1019,11 @@ rb_ary_shift(VALUE ary)
 	ary_make_shared(ary);
     }
     else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
-        RARRAY_PTR_USE_TRANSIENT(ary, ptr, ptr[0] = Qnil);
+	RARRAY_PTR_USE(ary, ptr, ptr[0] = Qnil);
     }
     ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
     ARY_INCREASE_LEN(ary, -1);
 
-    ary_verify(ary);
-
     return top;
 }
 
@@ -1317,17 +1063,6 @@ 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);
-    rb_ary_behead(ary,n);
-
-    return result;
-}
-
-MJIT_FUNC_EXPORTED VALUE
-rb_ary_behead(VALUE ary, long n)
-{
-    if(n<=0) return ary;
-
-    rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
 	if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
 	  setup_occupied_shared:
@@ -1337,8 +1072,8 @@ rb_ary_behead(VALUE ary, long n)
     }
     else {
 	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-                MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
+	    RARRAY_PTR_USE(ary, ptr, {
+		MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
 	    }); /* WB: no new reference */
 	}
 	else {
@@ -1348,8 +1083,7 @@ rb_ary_behead(VALUE ary, long n)
     }
     ARY_INCREASE_LEN(ary, -n);
 
-    ary_verify(ary);
-    return ary;
+    return result;
 }
 
 static VALUE
@@ -1368,9 +1102,8 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 	VALUE shared = ARY_SHARED(ary);
 	capa = RARRAY_LEN(shared);
 	if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) {
-            rb_ary_modify_check(ary);
-            head = RARRAY_CONST_PTR_TRANSIENT(ary);
-            sharedp = RARRAY_CONST_PTR_TRANSIENT(shared);
+	    head = RARRAY_CONST_PTR(ary);
+	    sharedp = RARRAY_CONST_PTR(shared);
 	    goto makeroom_if_need;
 	}
     }
@@ -1383,13 +1116,11 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 
     /* use shared array for big "queues" */
     if (new_len > ARY_DEFAULT_SIZE * 4) {
-        ary_verify(ary);
-
-        /* make a room for unshifted items */
+	/* make a room for unshifted items */
 	capa = ARY_CAPA(ary);
 	ary_make_shared(ary);
 
-        head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary);
+	head = sharedp = RARRAY_CONST_PTR(ary);
 	goto makeroom;
       makeroom_if_need:
 	if (head - sharedp < argc) {
@@ -1402,17 +1133,14 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 	}
 	ARY_SET_PTR(ary, head - argc);
 	assert(ARY_SHARED_OCCUPIED(ARY_SHARED(ary)));
-
-        ary_verify(ary);
 	return ARY_SHARED(ary);
     }
     else {
 	/* sliding items */
-        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	RARRAY_PTR_USE(ary, ptr, {
 	    MEMMOVE(ptr + argc, ptr, VALUE, len);
 	});
 
-        ary_verify(ary);
 	return ary;
     }
 }
@@ -1420,7 +1148,6 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 /*
  *  call-seq:
  *     ary.unshift(obj, ...)  -> ary
- *     ary.prepend(obj, ...)  -> ary
  *
  *  Prepends objects to the front of +self+, moving other elements upwards.
  *  See also Array#shift for the opposite effect.
@@ -1468,7 +1195,17 @@ rb_ary_elt(VALUE ary, long offset)
 VALUE
 rb_ary_entry(VALUE ary, long offset)
 {
-    return rb_ary_entry_internal(ary, 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];
 }
 
 VALUE
@@ -1528,29 +1265,21 @@ rb_ary_subseq(VALUE ary, long beg, long len)
 VALUE
 rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
-    rb_check_arity(argc, 1, 2);
+    VALUE arg;
+    long beg, len;
+
     if (argc == 2) {
-	return rb_ary_aref2(ary, argv[0], argv[1]);
+	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_aref1(ary, argv[0]);
-}
-
-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);
+    if (argc != 1) {
+	rb_scan_args(argc, argv, "11", NULL, NULL);
     }
-    return rb_ary_subseq(ary, beg, len);
-}
-
-MJIT_FUNC_EXPORTED VALUE
-rb_ary_aref1(VALUE ary, VALUE arg)
-{
-    long beg, len;
-
+    arg = argv[0];
     /* special case - speeding up */
     if (FIXNUM_P(arg)) {
 	return rb_ary_entry(ary, FIX2LONG(arg));
@@ -1645,7 +1374,7 @@ 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
+ *     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
@@ -1653,15 +1382,14 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary)
  *  +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.
+ *  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"}
+ *     a.fetch(100) { |i| puts "#{i} is out of bounds" }
  *                              #=> "100 is out of bounds"
  */
 
@@ -1696,10 +1424,10 @@ 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 { |item| block } ->  int or nil
  *     ary.find_index                  ->  Enumerator
  *     ary.index(obj)             ->  int or nil
- *     ary.index {|item| block}   ->  int or nil
+ *     ary.index { |item| block } ->  int or nil
  *     ary.index                  ->  Enumerator
  *
  *  Returns the _index_ of the first object in +ary+ such that the object is
@@ -1716,14 +1444,15 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
  *     a = [ "a", "b", "c" ]
  *     a.index("b")              #=> 1
  *     a.index("z")              #=> nil
- *     a.index {|x| x == "b"}    #=> 1
+ *     a.index { |x| x == "b" }  #=> 1
  */
 
 static VALUE
 rb_ary_index(int argc, VALUE *argv, VALUE ary)
 {
+    const VALUE *ptr;
     VALUE val;
-    long i;
+    long i, len;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
@@ -1738,11 +1467,20 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
     val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	VALUE e = RARRAY_AREF(ary, i);
-	if (rb_equal(e, val)) {
+    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:
 	    return LONG2NUM(i);
+	  case Qfalse:
+	    continue;
 	}
+	len = RARRAY_LEN(ary);
+	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
@@ -1750,7 +1488,7 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
 /*
  *  call-seq:
  *     ary.rindex(obj)             ->  int or nil
- *     ary.rindex {|item| block}   ->  int or nil
+ *     ary.rindex { |item| block } ->  int or nil
  *     ary.rindex                  ->  Enumerator
  *
  *  Returns the _index_ of the last object in +self+ <code>==</code> to +obj+.
@@ -1768,12 +1506,13 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
  *     a = [ "a", "b", "b", "b", "c" ]
  *     a.rindex("b")             #=> 3
  *     a.rindex("z")             #=> nil
- *     a.rindex {|x| x == "b"}   #=> 3
+ *     a.rindex { |x| x == "b" } #=> 3
  */
 
 static VALUE
 rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
 {
+    const VALUE *ptr;
     VALUE val;
     long i = RARRAY_LEN(ary), len;
 
@@ -1792,11 +1531,21 @@ 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 = RARRAY_AREF(ary, i);
-	if (rb_equal(e, val)) {
+	VALUE e = ptr[i];
+	switch (rb_equal_opt(e, val)) {
+	  case Qundef:
+	    if (!rb_equal(e, val)) break;
+	  case Qtrue:
 	    return LONG2NUM(i);
+	  case Qfalse:
+	    continue;
 	}
+	if (i > (len = RARRAY_LEN(ary))) {
+	    i = len;
+	}
+	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
@@ -1830,7 +1579,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
     }
 
     {
-        const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary);
+	const VALUE *optr = RARRAY_CONST_PTR(ary);
 	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
     }
 
@@ -1843,7 +1592,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 	len = beg + rlen;
 	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-            if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
+	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
 	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
 	}
 	ARY_SET_LEN(ary, len);
@@ -1861,21 +1610,14 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 	}
 
 	if (len != rlen) {
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr,
-                                     MEMMOVE(ptr + beg + rlen, ptr + beg + len,
-                                             VALUE, olen - (beg + len)));
+	    RARRAY_PTR_USE(ary, ptr,
+			   MEMMOVE(ptr + beg + rlen, ptr + beg + len,
+				   VALUE, olen - (beg + len)));
 	    ARY_SET_LEN(ary, alen);
 	}
 	if (rlen > 0) {
-            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));
+	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
+	    MEMMOVE(RARRAY_PTR(ary) + beg, rptr, VALUE, rlen);
 	}
     }
 }
@@ -1933,12 +1675,11 @@ rb_ary_resize(VALUE ary, long len)
     }
     else {
 	if (olen > len + ARY_DEFAULT_SIZE) {
-            ary_heap_realloc(ary, len);
+	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len, RARRAY(ary)->as.heap.aux.capa);
 	    ARY_SET_CAPA(ary, len);
 	}
 	ARY_SET_HEAP_LEN(ary, len);
     }
-    ary_verify(ary);
     return ary;
 }
 
@@ -1999,7 +1740,7 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 	/* check if idx is Range */
       range:
 	rpl = rb_ary_to_ary(argv[argc-1]);
-        rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR_TRANSIENT(rpl), RARRAY_LEN(rpl));
+	rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR(rpl), RARRAY_LEN(rpl));
 	RB_GC_GUARD(rpl);
 	return argv[argc-1];
     }
@@ -2033,17 +1774,12 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     rb_ary_modify_check(ary);
-    pos = NUM2LONG(argv[0]);
     if (argc == 1) return ary;
+    pos = NUM2LONG(argv[0]);
     if (pos == -1) {
 	pos = RARRAY_LEN(ary);
     }
-    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);
-	}
+    if (pos < 0) {
 	pos++;
     }
     rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
@@ -2061,7 +1797,7 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.each {|item| block}    -> ary
+ *     ary.each { |item| block }  -> ary
  *     ary.each                   -> Enumerator
  *
  *  Calls the given block once for each element in +self+, passing that element
@@ -2081,7 +1817,7 @@ 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));
@@ -2091,7 +1827,7 @@ rb_ary_each(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.each_index {|index| block}    -> ary
+ *     ary.each_index { |index| block }  -> ary
  *     ary.each_index                    -> Enumerator
  *
  *  Same as Array#each, but passes the +index+ of the element instead of the
@@ -2121,7 +1857,7 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse_each {|item| block}    -> ary
+ *     ary.reverse_each { |item| block }  -> ary
  *     ary.reverse_each                   -> Enumerator
  *
  *  Same as Array#each, but traverses +self+ in reverse order.
@@ -2191,18 +1927,15 @@ rb_ary_dup(VALUE ary)
 {
     long len = RARRAY_LEN(ary);
     VALUE dup = rb_ary_new2(len);
-    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary));
+    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR(ary));
     ARY_SET_LEN(dup, len);
-
-    ary_verify(ary);
-    ary_verify(dup);
     return dup;
 }
 
 VALUE
 rb_ary_resurrect(VALUE ary)
 {
-    return ary_make_partial(ary, rb_cArray, 0, RARRAY_LEN(ary));
+    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
 }
 
 extern VALUE rb_output_fs;
@@ -2256,10 +1989,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 	if (RB_TYPE_P(val, T_STRING)) {
 	  str_join:
 	    rb_str_buf_append(result, val);
-	    if (*first) {
-		rb_enc_copy(result, val);
-		*first = FALSE;
-	    }
+	    *first = FALSE;
 	}
 	else if (RB_TYPE_P(val, T_ARRAY)) {
 	    obj = val;
@@ -2270,7 +2000,6 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 	    else {
 		VALUE args[4];
 
-		*first = FALSE;
 		args[0] = val;
 		args[1] = sep;
 		args[2] = result;
@@ -2284,13 +2013,17 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 		val = tmp;
 		goto str_join;
 	    }
-	    tmp = rb_check_array_type(val);
+	    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;
 	}
     }
@@ -2341,16 +2074,11 @@ rb_ary_join(VALUE ary, VALUE sep)
  *
  *  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 <code>$,</code>.
- *  If both the +separator+ and <code>$,</code> are +nil+,
- *  it uses an empty string.
+ *  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"
- *
- *  For nested arrays, join is applied recursively:
- *
- *     [ "a", [1, 2, [:x, :y]], "b" ].join("-")   #=> "a-1-2-x-y-b"
  */
 
 static VALUE
@@ -2358,12 +2086,8 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE sep;
 
-    if (rb_check_arity(argc, 0, 1) == 0) {
-        sep = rb_output_fs;
-    }
-    else if (NIL_P(sep = argv[0])) {
-        sep = rb_output_fs;
-    }
+    rb_scan_args(argc, argv, "01", &sep);
+    if (NIL_P(sep)) sep = rb_output_fs;
 
     return rb_ary_join(ary, sep);
 }
@@ -2434,32 +2158,22 @@ rb_ary_to_a(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.to_h            -> hash
- *     ary.to_h { block }  -> hash
+ *     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}
- *
- *  If a block is given, the results of the block on each element of
- *  the array will be used as pairs.
- *
- *     ["foo", "bar"].to_h {|s| [s.ord, s]}
- *       # => {102=>"foo", 98=>"bar"}
  */
 
 static VALUE
 rb_ary_to_h(VALUE ary)
 {
     long i;
-    VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary));
-    int block_given = rb_block_given_p();
-
+    VALUE hash = rb_hash_new();
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	const VALUE e = rb_ary_elt(ary, i);
-	const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e;
+	const VALUE elt = rb_ary_elt(ary, i);
 	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)",
@@ -2505,9 +2219,9 @@ rb_ary_reverse(VALUE ary)
 
     rb_ary_modify(ary);
     if (len > 1) {
-        RARRAY_PTR_USE_TRANSIENT(ary, p1, {
-            p2 = p1 + len - 1;	/* points last item */
-            ary_reverse(p1, p2);
+	RARRAY_PTR_USE(ary, p1, {
+	    p2 = p1 + len - 1;	/* points last item */
+	    ary_reverse(p1, p2);
 	}); /* WB: no new reference */
     }
     return ary;
@@ -2547,8 +2261,8 @@ rb_ary_reverse_m(VALUE ary)
     VALUE dup = rb_ary_new2(len);
 
     if (len > 0) {
-        const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary);
-        VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1;
+	const VALUE *p1 = RARRAY_CONST_PTR(ary);
+	VALUE *p2 = (VALUE *)RARRAY_CONST_PTR(dup) + len - 1;
 	do *p2-- = *p1++; while (--len > 0);
     }
     ARY_SET_LEN(dup, RARRAY_LEN(ary));
@@ -2561,27 +2275,24 @@ 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)
-{
-    --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) {
-        long len = RARRAY_LEN(ary);
-        if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt));
-            return ary;
-        }
+	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;
+	}
     }
+
     return Qnil;
 }
 
@@ -2605,7 +2316,13 @@ rb_ary_rotate(VALUE ary, long cnt)
 static VALUE
 rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 {
-    long n = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
+    long n = 1;
+
+    switch (argc) {
+      case 1: n = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
     rb_ary_rotate(ary, n);
     return ary;
 }
@@ -2632,14 +2349,19 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE rotated;
     const VALUE *ptr;
-    long len;
-    long cnt = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
+    long len, cnt = 1;
+
+    switch (argc) {
+      case 1: cnt = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
 
     len = RARRAY_LEN(ary);
     rotated = rb_ary_new2(len);
     if (len > 0) {
 	cnt = rotate_count(cnt, len);
-        ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
+	ptr = RARRAY_CONST_PTR(ary);
 	len -= cnt;
 	ary_memcpy(rotated, 0, len, ptr + cnt);
 	ary_memcpy(rotated, len, cnt, ptr);
@@ -2668,12 +2390,9 @@ 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;
 
-    args[0] = a;
-    args[1] = b;
-    retval = rb_yield_values2(2, args);
+    retval = rb_yield_values(2, a, b);
     n = rb_cmpint(retval, a, b);
     sort_reentered(data->ary);
     return n;
@@ -2695,9 +2414,6 @@ 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);
@@ -2709,7 +2425,7 @@ sort_2(const void *ap, const void *bp, void *dummy)
 /*
  *  call-seq:
  *     ary.sort!                   -> ary
- *     ary.sort! {|a, b| block}    -> ary
+ *     ary.sort! { |a, b| block }  -> ary
  *
  *  Sorts +self+ in place.
  *
@@ -2720,14 +2436,11 @@ sort_2(const void *ap, const void *bp, void *dummy)
  *  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+.
  *
- *  The result is not guaranteed to be stable.  When the comparison of two
- *  elements returns +0+, the order of the elements is unpredictable.
- *
- *     ary = [ "d", "a", "e", "c", "b" ]
- *     ary.sort!                     #=> ["a", "b", "c", "d", "e"]
- *     ary.sort! {|a, b| b <=> a}    #=> ["e", "d", "c", "b", "a"]
- *
  *  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"]
  */
 
 VALUE
@@ -2739,13 +2452,14 @@ 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)) {
@@ -2771,29 +2485,28 @@ rb_ary_sort_bang(VALUE ary)
                     rb_ary_unshare(ary);
                 }
                 else {
-                    ary_heap_free(ary);
+		    ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
                 }
-                ARY_SET_PTR(ary, ARY_HEAP_PTR(tmp));
+                ARY_SET_PTR(ary, RARRAY_CONST_PTR(tmp));
                 ARY_SET_HEAP_LEN(ary, len);
-                ARY_SET_CAPA(ary, ARY_HEAP_LEN(tmp));
+                ARY_SET_CAPA(ary, RARRAY_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
+ *     ary.sort { |a, b| block }  -> new_ary
  *
  *  Returns a new array created by sorting +self+.
  *
@@ -2804,14 +2517,12 @@ rb_ary_sort_bang(VALUE ary)
  *  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+.
  *
- *  The result is not guaranteed to be stable.  When the comparison of two
- *  elements returns +0+, the order of the elements is unpredictable.
- *
- *     ary = [ "d", "a", "e", "c", "b" ]
- *     ary.sort                     #=> ["a", "b", "c", "d", "e"]
- *     ary.sort {|a, b| b <=> a}    #=> ["e", "d", "c", "b", "a"]
  *
  *  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"]
  */
 
 VALUE
@@ -2831,12 +2542,12 @@ static VALUE rb_ary_bsearch_index(VALUE ary);
  *  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 modes: a find-minimum mode and
+ *  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 cases),
- *  the block must always return true or false, and there must be an index i
+ *  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
@@ -2854,7 +2565,7 @@ static VALUE rb_ary_bsearch_index(VALUE ary);
  *     ary.bsearch {|x| x >= 100 } #=> nil
  *
  *  In find-any mode (this behaves like libc's bsearch(3)), the block
- *  must always return a number, and there must be two indices i and j
+ *  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,
@@ -2895,8 +2606,8 @@ rb_ary_bsearch(VALUE ary)
  *  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. They are
- *  exactly the same as in the case of the #bsearch method, with the only difference
+ *  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.
  */
@@ -2957,18 +2668,14 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 
 /*
  *  call-seq:
- *     ary.sort_by! {|obj| block}      -> ary
+ *     ary.sort_by! { |obj| block }    -> ary
  *     ary.sort_by!                    -> Enumerator
  *
  *  Sorts +self+ in place using a set of keys generated by mapping the
  *  values in +self+ 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.
  *
- *  See also Enumerable#sort_by.
  */
 
 static VALUE
@@ -2986,8 +2693,8 @@ rb_ary_sort_by_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.collect {|item| block}    -> new_ary
- *     ary.map     {|item| block}    -> new_ary
+ *     ary.collect { |item| block }  -> new_ary
+ *     ary.map     { |item| block }  -> new_ary
  *     ary.collect                   -> Enumerator
  *     ary.map                       -> Enumerator
  *
@@ -3000,8 +2707,8 @@ rb_ary_sort_by_bang(VALUE ary)
  *  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.collect { |x| x + "!" }         #=> ["a!", "b!", "c!", "d!"]
+ *     a.map.with_index { |x, i| x * i } #=> ["", "b", "cc", "ddd"]
  *     a                                 #=> ["a", "b", "c", "d"]
  */
 
@@ -3014,7 +2721,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;
 }
@@ -3080,34 +2787,6 @@ 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
@@ -3129,36 +2808,26 @@ append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx)
 static VALUE
 rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 {
-    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;
+    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
 }
 
 
 /*
  *  call-seq:
- *     ary.select {|item| block}   -> new_ary
+ *     ary.select { |item| block } -> new_ary
  *     ary.select                  -> Enumerator
- *     ary.filter {|item| block}   -> new_ary
- *     ary.filter                  -> 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.
  *
- *     [1,2,3,4,5].select {|num| num.even? }     #=> [2, 4]
+ *     [1,2,3,4,5].select { |num|  num.even?  }   #=> [2, 4]
  *
- *     a = %w[ a b c d e f ]
- *     a.select {|v| v =~ /[aeiou]/ }    #=> ["a", "e"]
+ *     a = %w{ a b c d e f }
+ *     a.select { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
  *
  *  See also Enumerable#select.
- *
- *  Array#filter is an alias for Array#select.
  */
 
 static VALUE
@@ -3208,25 +2877,21 @@ select_bang_ensure(VALUE a)
     long len = RARRAY_LEN(ary);
     long i1 = arg->len[0], i2 = arg->len[1];
 
-    if (i2 < len && i2 < i1) {
-	long tail = 0;
+    if (i2 < i1) {
 	if (i1 < len) {
-	    tail = len - i1;
-            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-		    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
+	    RARRAY_PTR_USE(ary, ptr, {
+		    MEMMOVE(ptr + i2, ptr + i1, VALUE, len - i1);
 		});
 	}
-	ARY_SET_LEN(ary, i2 + tail);
+	ARY_SET_LEN(ary, len - i1 + i2);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.select! {|item| block } -> ary or nil
- *     ary.select!                 -> Enumerator
- *     ary.filter! {|item| block } -> ary or nil
- *     ary.filter!                 -> Enumerator
+ *     ary.select!  {|item| block } -> ary or nil
+ *     ary.select!                  -> Enumerator
  *
  *  Invokes the given block passing in successive elements from +self+,
  *  deleting elements for which the block returns a +false+ value.
@@ -3235,11 +2900,10 @@ select_bang_ensure(VALUE a)
  *
  *  If changes were made, it will return +self+, otherwise it returns +nil+.
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  See also Array#keep_if
  *
- *  See also Array#keep_if.
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  Array#filter! is an alias for Array#select!.
  */
 
 static VALUE
@@ -3257,19 +2921,18 @@ rb_ary_select_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.keep_if {|item| block}   -> ary
+ *     ary.keep_if { |item| block } -> ary
  *     ary.keep_if                  -> Enumerator
  *
  *  Deletes every element of +self+ for which the given block evaluates to
- *  +false+, and returns +self+.
+ *  +false+.
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  See also Array#select!
  *
- *     a = %w[ a b c d e f ]
- *     a.keep_if {|v| v =~ /[aeiou]/ }    #=> ["a", "e"]
- *     a                                  #=> ["a", "e"]
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  See also Array#select!.
+ *     a = %w{ a b c d e f }
+ *     a.keep_if { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
  */
 
 static VALUE
@@ -3296,7 +2959,7 @@ ary_resize_smaller(VALUE ary, long len)
 /*
  *  call-seq:
  *     ary.delete(obj)            -> item or nil
- *     ary.delete(obj) {block}    -> item or result of block
+ *     ary.delete(obj) { block }  -> item or result of block
  *
  *  Deletes all items from +self+ that are equal to +obj+.
  *
@@ -3310,7 +2973,7 @@ ary_resize_smaller(VALUE ary, long len)
  *     a.delete("b")                   #=> "b"
  *     a                               #=> ["a", "c"]
  *     a.delete("z")                   #=> nil
- *     a.delete("z") {"not found"}     #=> "not found"
+ *     a.delete("z") { "not found" }   #=> "not found"
  */
 
 VALUE
@@ -3340,7 +3003,6 @@ rb_ary_delete(VALUE ary, VALUE item)
 
     ary_resize_smaller(ary, i2);
 
-    ary_verify(ary);
     return v;
 }
 
@@ -3381,11 +3043,11 @@ rb_ary_delete_at(VALUE ary, long pos)
 
     rb_ary_modify(ary);
     del = RARRAY_AREF(ary, pos);
-    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-        MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
+    RARRAY_PTR_USE(ary, ptr, {
+	MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
     });
     ARY_INCREASE_LEN(ary, -1);
-    ary_verify(ary);
+
     return del;
 }
 
@@ -3453,13 +3115,16 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 	    len = orig_len - pos;
 	}
 	if (len == 0) return rb_ary_new2(0);
-        arg2 = rb_ary_new4(len, RARRAY_CONST_PTR_TRANSIENT(ary)+pos);
+	arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos);
 	RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
 	rb_ary_splice(ary, pos, len, 0, 0);
 	return arg2;
     }
 
-    rb_check_arity(argc, 1, 2);
+    if (argc != 1) {
+	/* error report */
+	rb_scan_args(argc, argv, "11", NULL, NULL);
+    }
     arg1 = argv[0];
 
     if (!FIXNUM_P(arg1)) {
@@ -3486,8 +3151,7 @@ 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);
 	}
     }
@@ -3516,6 +3180,7 @@ 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;
@@ -3524,7 +3189,7 @@ ary_reject_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reject! {|item| block}    -> ary or nil
+ *     ary.reject! { |item| block }  -> ary or nil
  *     ary.reject!                   -> Enumerator
  *
  *  Deletes every element of +self+ for which the block evaluates to +true+,
@@ -3541,7 +3206,6 @@ 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);
 }
 
@@ -3571,7 +3235,7 @@ rb_ary_reject(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.delete_if {|item| block}    -> ary
+ *     ary.delete_if { |item| block }  -> ary
  *     ary.delete_if                   -> Enumerator
  *
  *  Deletes every element of +self+ for which block evaluates to +true+.
@@ -3590,7 +3254,6 @@ rb_ary_reject(VALUE ary)
 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;
@@ -3600,8 +3263,7 @@ static VALUE
 take_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, cbarg))
 {
     VALUE *args = (VALUE *)cbarg;
-    if (args[1] == 0) rb_iter_break();
-    else args[1]--;
+    if (args[1]-- == 0) rb_iter_break();
     if (argc > 1) val = rb_ary_new4(argc, argv);
     rb_ary_push(args[0], val);
     return Qnil;
@@ -3626,7 +3288,7 @@ take_items(VALUE obj, long n)
 /*
  *  call-seq:
  *     ary.zip(arg, ...)                  -> new_ary
- *     ary.zip(arg, ...) {|arr| block}    -> nil
+ *     ary.zip(arg, ...) { |arr| block }  -> nil
  *
  *  Converts any arguments to arrays, then merges elements of +self+ with
  *  corresponding elements from each argument.
@@ -3770,14 +3432,14 @@ rb_ary_replace(VALUE copy, VALUE orig)
         VALUE shared = 0;
 
         if (ARY_OWNS_HEAP_P(copy)) {
-            ary_heap_free(copy);
+	    RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
 	}
         else if (ARY_SHARED_P(copy)) {
             shared = ARY_SHARED(copy);
             FL_UNSET_SHARED(copy);
         }
         FL_SET_EMBED(copy);
-        ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig));
+	ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig));
         if (shared) {
             rb_ary_decrement_share(shared);
         }
@@ -3786,17 +3448,16 @@ rb_ary_replace(VALUE copy, VALUE orig)
     else {
         VALUE shared = ary_make_shared(orig);
         if (ARY_OWNS_HEAP_P(copy)) {
-            ary_heap_free(copy);
+	    RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
         }
         else {
             rb_ary_unshare_safe(copy);
         }
         FL_UNSET_EMBED(copy);
-        ARY_SET_PTR(copy, ARY_HEAP_PTR(orig));
-        ARY_SET_LEN(copy, ARY_HEAP_LEN(orig));
+        ARY_SET_PTR(copy, RARRAY_CONST_PTR(orig));
+        ARY_SET_LEN(copy, RARRAY_LEN(orig));
         rb_ary_set_shared(copy, shared);
     }
-    ary_verify(copy);
     return copy;
 }
 
@@ -3814,20 +3475,16 @@ 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 {
-        ARY_SET_LEN(ary, 0);
-        if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-            ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
-        }
+    else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+	ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
     }
-    ary_verify(ary);
     return ary;
 }
 
@@ -3835,10 +3492,10 @@ rb_ary_clear(VALUE 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
+ *     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+.
@@ -3857,8 +3514,8 @@ rb_ary_clear(VALUE ary)
  *     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]
+ *     a.fill { |i| i*i }       #=> [0, 1, 4, 9]
+ *     a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
  */
 
 static VALUE
@@ -3960,8 +3617,8 @@ rb_ary_plus(VALUE x, VALUE y)
     len = xlen + ylen;
     z = rb_ary_new2(len);
 
-    ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR_TRANSIENT(x));
-    ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR_TRANSIENT(y));
+    ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR(x));
+    ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR(y));
     ARY_SET_LEN(z, len);
     return z;
 }
@@ -3971,23 +3628,23 @@ 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_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR(y), n);
     }
     return x;
 }
 
 /*
  *  call-seq:
- *     ary.concat(other_ary1, other_ary2, ...)   -> ary
+ *     ary.concat(other_ary1, other_ary2,...)   -> ary
  *
- *  Appends the elements of <code>other_ary</code>s to +self+.
+ *  Appends the elements of +other_ary+s to +self+.
  *
- *     [ "a", "b" ].concat( ["c", "d"])   #=> [ "a", "b", "c", "d" ]
- *     [ "a" ].concat( ["b"], ["c", "d"]) #=> [ "a", "b", "c", "d" ]
+ *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
+ *     [ "a" ].concat( ["b"], ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
  *     [ "a" ].concat #=> [ "a" ]
  *
  *     a = [ 1, 2, 3 ]
- *     a.concat( [ 4, 5 ])
+ *     a.concat( [ 4, 5 ] )
  *     a                                 #=> [ 1, 2, 3, 4, 5 ]
  *
  *     a = [ 1, 2 ]
@@ -4001,10 +3658,7 @@ rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
 {
     rb_ary_modify_check(ary);
 
-    if (argc == 1) {
-	rb_ary_concat(ary, argv[0]);
-    }
-    else if (argc > 1) {
+    if (argc > 0) {
 	int i;
 	VALUE args = rb_ary_tmp_new(argc);
 	for (i = 0; i < argc; i++) {
@@ -4013,7 +3667,6 @@ rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
 	ary_append(ary, args);
     }
 
-    ary_verify(ary);
     return ary;
 }
 
@@ -4068,16 +3721,16 @@ rb_ary_times(VALUE ary, VALUE times)
     ary2 = ary_new(rb_obj_class(ary), len);
     ARY_SET_LEN(ary2, len);
 
-    ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
+    ptr = RARRAY_CONST_PTR(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_TRANSIENT(ary2));
+	    ary_memcpy(ary2, t, t, RARRAY_CONST_PTR(ary2));
             t *= 2;
         }
         if (t < len) {
-            ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR_TRANSIENT(ary2));
+	    ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR(ary2));
         }
     }
   out:
@@ -4163,7 +3816,6 @@ 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);
@@ -4176,8 +3828,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;
@@ -4214,7 +3866,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_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
+    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
 }
 
@@ -4245,7 +3897,7 @@ 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_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
+    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
 }
 
@@ -4275,7 +3927,7 @@ rb_ary_hash(VALUE ary)
 	h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
-    return ST2FIX(h);
+    return LONG2FIX(h);
 }
 
 /*
@@ -4298,27 +3950,17 @@ rb_ary_includes(VALUE ary, VALUE item)
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	e = RARRAY_AREF(ary, i);
-	if (rb_equal(e, item)) {
+	switch (rb_equal_opt(e, item)) {
+	  case Qundef:
+	    if (rb_equal(e, item)) return Qtrue;
+	    break;
+	  case Qtrue:
 	    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)
@@ -4400,10 +4042,9 @@ ary_add_hash(VALUE hash, VALUE ary)
 }
 
 static inline VALUE
-ary_tmp_hash_new(VALUE ary)
+ary_tmp_hash_new(void)
 {
-    long size = RARRAY_LEN(ary);
-    VALUE hash = rb_hash_new_with_size(size);
+    VALUE hash = rb_hash_new();
 
     RBASIC_CLEAR_CLASS(hash);
     return hash;
@@ -4412,7 +4053,7 @@ ary_tmp_hash_new(VALUE ary)
 static VALUE
 ary_make_hash(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new(ary);
+    VALUE hash = ary_tmp_hash_new();
     return ary_add_hash(hash, ary);
 }
 
@@ -4431,19 +4072,19 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 static VALUE
 ary_make_hash_by(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new(ary);
+    VALUE hash = ary_tmp_hash_new();
     return ary_add_hash_by(hash, ary);
 }
 
 static inline void
 ary_recycle_hash(VALUE hash)
 {
-    assert(RBASIC_CLASS(hash) == 0);
-    if (RHASH_ST_TABLE_P(hash)) {
-        st_table *tbl = RHASH_ST_TABLE(hash);
+    if (RHASH(hash)->ntbl) {
+	st_table *tbl = RHASH(hash)->ntbl;
+	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
-        RHASH_ST_CLEAR(hash);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
@@ -4461,8 +4102,6 @@ ary_recycle_hash(VALUE hash)
  *     [ 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.
- *
- *  See also Array#difference.
  */
 
 static VALUE
@@ -4472,21 +4111,11 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
     VALUE hash;
     long i;
 
-    ary2 = to_ary(ary2);
+    hash = ary_make_hash(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 (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue;
+	if (st_lookup(rb_hash_tbl_raw(hash), RARRAY_AREF(ary1, i), 0)) continue;
 	rb_ary_push(ary3, rb_ary_elt(ary1, i));
     }
     ary_recycle_hash(hash);
@@ -4495,63 +4124,6 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *     ary.difference(other_ary1, other_ary2, ...)   -> ary
- *
- *  Array Difference
- *
- *  Returns a new array that is a copy of the receiver, removing any items
- *  that also appear in any of the arrays given as arguments.
- *  The order is preserved from the original array.
- *
- *  It compares elements using their #hash and #eql? methods for efficiency.
- *
- *     [ 1, 1, 2, 2, 3, 3, 4, 5 ].difference([ 1, 2, 4 ])     #=> [ 3, 3, 5 ]
- *     [ 1, 'c', :s, 'yep' ].difference([ 1 ], [ 'a', 'c' ])  #=> [ :s, "yep" ]
- *
- *  If you need set-like behavior, see the library class Set.
- *
- *  See also 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:
  *     ary & other_ary      -> new_ary
  *
  *  Set Intersection --- Returns a new array containing unique elements common to the
@@ -4570,29 +4142,20 @@ 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(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;
-    }
-
+    if (RARRAY_LEN(ary2) == 0) 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 (rb_hash_stlike_delete(hash, &vv, 0)) {
+	if (st_delete(table, &vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -4609,29 +4172,6 @@ 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
@@ -4644,25 +4184,24 @@ rb_ary_union_hash(VALUE hash, VALUE ary2)
  *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
  *     [ "c", "d", "a" ] | [ "a", "b", "c" ]    #=> [ "c", "d", "a", "b" ]
  *
- *  See also Array#union.
+ *  See also Array#uniq.
  */
 
 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;
@@ -4670,71 +4209,25 @@ rb_ary_or(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *     ary.union(other_ary1, other_ary2, ...)   -> ary
- *
- *  Set Union --- Returns a new array by joining <code>other_ary</code>s with +self+,
- *  excluding any duplicates and preserving the order from the given arrays.
- *
- *  It compares elements using their #hash and #eql? methods for efficiency.
- *
- *     [ "a", "b", "c" ].union( [ "c", "d", "a" ] )    #=> [ "a", "b", "c", "d" ]
- *     [ "a" ].union( ["e", "b"], ["a", "c", "b"] )    #=> [ "a", "e", "b", "c" ]
- *     [ "a" ].union #=> [ "a" ]
- *
- *  See also 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;
-}
-
-/*
- *  call-seq:
  *     ary.max                     -> obj
- *     ary.max {|a, b| block}      -> obj
+ *     ary.max { |a, b| block }    -> obj
  *     ary.max(n)                  -> array
- *     ary.max(n) {|a, b| block}   -> array
+ *     ary.max(n) { |a, b| block } -> array
  *
  *  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>.
  *
- *     ary = %w(albatross dog horse)
- *     ary.max                                   #=> "horse"
- *     ary.max {|a, b| a.length <=> b.length}    #=> "albatross"
+ *     a = %w(albatross dog horse)
+ *     a.max                                   #=> "horse"
+ *     a.max { |a, b| a.length <=> b.length }  #=> "albatross"
  *
  *  If the +n+ argument is given, maximum +n+ elements are returned
  *  as an array.
  *
- *     ary = %w[albatross dog horse]
- *     ary.max(2)                                  #=> ["horse", "dog"]
- *     ary.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
+ *     a = %w[albatross dog horse]
+ *     a.max(2)                                  #=> ["horse", "dog"]
+ *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
  */
 static VALUE
 rb_ary_max(int argc, VALUE *argv, VALUE ary)
@@ -4744,7 +4237,9 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
     VALUE num;
     long i;
 
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+    rb_scan_args(argc, argv, "01", &num);
+
+    if (!NIL_P(num))
        return rb_nmin_run(ary, num, 0, 1, 1);
 
     if (rb_block_given_p()) {
@@ -4778,16 +4273,16 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
  *  first form assumes all objects implement <code>Comparable</code>;
  *  the second uses the block to return <em>a <=> b</em>.
  *
- *     ary = %w(albatross dog horse)
- *     ary.min                                   #=> "albatross"
- *     ary.min {|a, b| a.length <=> b.length}    #=> "dog"
+ *     a = %w(albatross dog horse)
+ *     a.min                                   #=> "albatross"
+ *     a.min { |a, b| a.length <=> b.length }  #=> "dog"
  *
  *  If the +n+ argument is given, minimum +n+ elements are returned
  *  as an array.
  *
- *     ary = %w[albatross dog horse]
- *     ary.min(2)                                  #=> ["albatross", "dog"]
- *     ary.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
+ *     a = %w[albatross dog horse]
+ *     a.min(2)                                  #=> ["albatross", "dog"]
+ *     a.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
  */
 static VALUE
 rb_ary_min(int argc, VALUE *argv, VALUE ary)
@@ -4797,7 +4292,9 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
     VALUE num;
     long i;
 
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+    rb_scan_args(argc, argv, "01", &num);
+
+    if (!NIL_P(num))
        return rb_nmin_run(ary, num, 0, 0, 1);
 
     if (rb_block_given_p()) {
@@ -4830,7 +4327,7 @@ 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
+ *     ary.uniq! { |item| ... } -> ary or nil
  *
  *  Removes duplicate elements from +self+.
  *
@@ -4850,7 +4347,7 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
  *     b.uniq!   # => nil
  *
  *     c = [["student","sam"], ["student","george"], ["teacher","matz"]]
- *     c.uniq! {|s| s.first}   # => [["student", "sam"], ["teacher", "matz"]]
+ *     c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
  *
  */
 
@@ -4879,7 +4376,7 @@ rb_ary_uniq_bang(VALUE ary)
 	FL_SET_EMBED(ary);
     }
     ary_resize_capa(ary, hash_size);
-    rb_hash_foreach(hash, push_value, ary);
+    st_foreach(rb_hash_tbl_raw(hash), push_value, ary);
     ary_recycle_hash(hash);
 
     return ary;
@@ -4888,7 +4385,7 @@ rb_ary_uniq_bang(VALUE ary)
 /*
  *  call-seq:
  *     ary.uniq                -> new_ary
- *     ary.uniq {|item| ...}   -> new_ary
+ *     ary.uniq { |item| ... } -> new_ary
  *
  *  Returns a new array by removing duplicate values in +self+.
  *
@@ -4902,7 +4399,7 @@ rb_ary_uniq_bang(VALUE ary)
  *     a.uniq   # => ["a", "b", "c"]
  *
  *     b = [["student","sam"], ["student","george"], ["teacher","matz"]]
- *     b.uniq {|s| s.first}   # => [["student", "sam"], ["teacher", "matz"]]
+ *     b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
  *
  */
 
@@ -4946,14 +4443,14 @@ rb_ary_compact_bang(VALUE ary)
     long n;
 
     rb_ary_modify(ary);
-    p = t = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); /* WB: no new reference */
+    p = t = (VALUE *)RARRAY_CONST_PTR(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_TRANSIENT(ary);
+    n = p - RARRAY_CONST_PTR(ary);
     if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
@@ -4984,7 +4481,7 @@ rb_ary_compact(VALUE ary)
  *  call-seq:
  *     ary.count                   -> int
  *     ary.count(obj)              -> int
- *     ary.count {|item| block}    -> int
+ *     ary.count { |item| block }  -> int
  *
  *  Returns the number of elements.
  *
@@ -4997,7 +4494,7 @@ rb_ary_compact(VALUE ary)
  *     ary = [1, 2, 4, 2]
  *     ary.count                  #=> 4
  *     ary.count(2)               #=> 2
- *     ary.count {|x| x%2 == 0}   #=> 3
+ *     ary.count { |x| x%2 == 0 } #=> 3
  *
  */
 
@@ -5006,7 +4503,7 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 {
     long i, n = 0;
 
-    if (rb_check_arity(argc, 0, 1) == 0) {
+    if (argc == 0) {
 	VALUE v;
 
 	if (!rb_block_given_p())
@@ -5018,8 +4515,9 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {
-        VALUE obj = argv[0];
+	VALUE obj;
 
+	rb_scan_args(argc, argv, "1", &obj);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
@@ -5115,7 +4613,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
     int mod = 0, level = -1;
     VALUE result, lv;
 
-    lv = (rb_check_arity(argc, 0, 1) ? argv[0] : Qnil);
+    rb_scan_args(argc, argv, "01", &lv);
     rb_ary_modify_check(ary);
     if (!NIL_P(lv)) level = NUM2INT(lv);
     if (level == 0) return Qnil;
@@ -5158,12 +4656,11 @@ static VALUE
 rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 {
     int mod = 0, level = -1;
-    VALUE result;
+    VALUE result, lv;
 
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0])) {
-        level = NUM2INT(argv[0]);
-        if (level == 0) return ary_make_shared_copy(ary);
-    }
+    rb_scan_args(argc, argv, "01", &lv);
+    if (!NIL_P(lv)) level = NUM2INT(lv);
+    if (level == 0) return ary_make_shared_copy(ary);
 
     result = flatten(ary, level, &mod);
     OBJ_INFECT(result, ary);
@@ -5216,8 +4713,8 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
 	while (i) {
 	    long j = RAND_UPTO(i);
 	    VALUE tmp;
-            if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) {
-                rb_raise(rb_eRuntimeError, "modified during shuffle");
+	    if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) {
+		rb_raise(rb_eRuntimeError, "modified during shuffle");
 	    }
 	    tmp = ptr[--i];
 	    ptr[i] = ptr[j];
@@ -5269,14 +4766,11 @@ rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
  *  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]
- *
- *  The optional +rng+ argument will be used as the random number generator.
- *
- *     a.sample(random: Random.new(1))     #=> 6
- *     a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
  */
 
 
@@ -5287,7 +4781,6 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
     VALUE opts, randgen = rb_cRandom;
     long n, len, i, j, k, idx[10];
     long rnds[numberof(idx)];
-    long memo_threshold;
 
     if (OPTHASH_GIVEN_P(opts)) {
 	VALUE rnd;
@@ -5300,7 +4793,7 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	}
     }
     len = RARRAY_LEN(ary);
-    if (rb_check_arity(argc, 0, 1) == 0) {
+    if (argc == 0) {
 	if (len < 2)
 	    i = 0;
 	else
@@ -5308,7 +4801,7 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 
 	return rb_ary_elt(ary, i);
     }
-    nv = argv[0];
+    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;
@@ -5347,11 +4840,6 @@ 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];
@@ -5365,43 +4853,11 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	    sorted[j] = idx[i] = k;
 	}
 	result = rb_ary_new_capa(n);
-        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;
+		ptr_result[i] = RARRAY_AREF(ary, idx[i]);
 	    }
-	    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);
@@ -5431,16 +4887,16 @@ 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(HUGE_VAL);
+    if (n == Qnil) return DBL2NUM(INFINITY);
     mul = NUM2LONG(n);
     if (mul <= 0) return INT2FIX(0);
     n = LONG2FIX(mul);
-    return rb_fix_mul_fix(rb_ary_length(self), n);
+    return rb_funcallv(rb_ary_length(self), '*', 1, &n);
 }
 
 /*
  *  call-seq:
- *     ary.cycle(n=nil) {|obj| block}    -> nil
+ *     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
@@ -5453,8 +4909,8 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
  *  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.
+ *     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.
  *
  */
 
@@ -5462,15 +4918,16 @@ static VALUE
 rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 {
     long n, i;
+    VALUE nv = Qnil;
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", &nv);
 
     RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size);
-    if (argc == 0 || NIL_P(argv[0])) {
+    if (NIL_P(nv)) {
         n = -1;
     }
     else {
-        n = NUM2LONG(argv[0]);
+        n = NUM2LONG(nv);
         if (n <= 0) return Qnil;
     }
 
@@ -5482,6 +4939,8 @@ 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))
 
@@ -5494,9 +4953,11 @@ 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++) RARRAY_ASET(result, i, RARRAY_AREF(values, p[i]));
+    for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
     ARY_SET_LEN(result, r);
     rb_yield(result);
     return !RBASIC(values)->klass;
@@ -5556,16 +5017,10 @@ permute0(const long n, const long r, long *const p, char *const used, const VALU
 static VALUE
 descending_factorial(long from, long how_many)
 {
-    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);
+    VALUE cnt = LONG2FIX(how_many >= 0);
+    while (how_many-- > 0) {
+	VALUE v = LONG2FIX(from--);
+	cnt = rb_funcallv(cnt, '*', 1, &v);
     }
     return cnt;
 }
@@ -5573,23 +5028,16 @@ descending_factorial(long from, long how_many)
 static VALUE
 binomial_coefficient(long comb, long size)
 {
-    VALUE r;
-    long i;
+    VALUE r, v;
     if (comb > size-comb) {
 	comb = size-comb;
     }
     if (comb < 0) {
 	return LONG2FIX(0);
     }
-    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;
+    r = descending_factorial(size, comb);
+    v = descending_factorial(comb, comb);
+    return rb_funcallv(r, id_div, 1, &v);
 }
 
 static VALUE
@@ -5603,9 +5051,9 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.permutation {|p| block}            -> ary
+ *     ary.permutation { |p| block }          -> ary
  *     ary.permutation                        -> Enumerator
- *     ary.permutation(n) {|p| block}         -> ary
+ *     ary.permutation(n) { |p| block }       -> ary
  *     ary.permutation(n)                     -> Enumerator
  *
  * When invoked with a block, yield all permutations of length +n+ of the
@@ -5632,13 +5080,13 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 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 */
-    r = n;
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0]))
-        r = NUM2LONG(argv[0]);            /* Permutation size from argument */
+    rb_scan_args(argc, argv, "01", &num);
+    r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
 
     if (r < 0 || n < r) {
 	/* no permutations: yield nothing */
@@ -5699,7 +5147,7 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.combination(n) {|c| block}      -> ary
+ *     ary.combination(n) { |c| block }    -> ary
  *     ary.combination(n)                  -> Enumerator
  *
  * When invoked with a block, yields all combinations of length +n+ of elements
@@ -5737,7 +5185,7 @@ rb_ary_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	for (i = 0; i < len; i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5794,19 +5242,19 @@ 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);
     }
-    if (n <= 0) {
-	return LONG2FIX(!k);
-    }
-    return rb_int_positive_pow(n, (unsigned long)k);
+
+    v = LONG2NUM(k);
+    return rb_funcallv(LONG2NUM(n), id_power, 1, &v);
 }
 
 /*
  *  call-seq:
- *     ary.repeated_permutation(n) {|p| block}   -> ary
+ *     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
@@ -5896,7 +5344,7 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.repeated_combination(n) {|c| block}   -> ary
+ *     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
@@ -5936,7 +5384,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	for (i = 0; i < len; i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5959,7 +5407,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 /*
  *  call-seq:
  *     ary.product(other_ary, ...)                -> new_ary
- *     ary.product(other_ary, ...) {|p| block}    -> ary
+ *     ary.product(other_ary, ...) { |p| block }  -> ary
  *
  *  Returns an array of all combinations of elements from all arrays.
  *
@@ -5982,14 +5430,15 @@ 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 = Qundef;
+    volatile VALUE t1 = tmpbuf(n, sizeof(int));
     VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
-    int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */
+    int *counters = (int*)RSTRING_PTR(t1); /* 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);
@@ -6060,7 +5509,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     }
 done:
     tmpary_discard(t0);
-    ALLOCV_END(t1);
+    tmpbuf_discard(t1);
 
     return NIL_P(result) ? ary : result;
 }
@@ -6092,7 +5541,7 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *     ary.take_while {|obj| block}    -> new_ary
+ *     ary.take_while { |obj| block }  -> new_ary
  *     ary.take_while                  -> Enumerator
  *
  *  Passes elements to the block until the block returns +nil+ or +false+, then
@@ -6103,7 +5552,7 @@ rb_ary_take(VALUE obj, VALUE n)
  *  See also Array#drop_while
  *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3}    #=> [1, 2]
+ *     a.take_while { |i| i < 3 }  #=> [1, 2]
  *
  */
 
@@ -6151,7 +5600,7 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *     ary.drop_while {|obj| block}     -> new_ary
+ *     ary.drop_while { |obj| block }   -> new_ary
  *     ary.drop_while                  -> Enumerator
  *
  *  Drops elements up to, but not including, the first element for which the
@@ -6181,31 +5630,20 @@ rb_ary_drop_while(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.any? [{|obj| block}  ]   -> true or false
- *     ary.any?(pattern)            -> true or false
+ *     ary.any? [{ |obj| block }]   -> true or false
  *
  *  See also Enumerable#any?
  */
 
 static VALUE
-rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
+rb_ary_any_p(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 (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;
-        }
+    if (!rb_block_given_p()) {
+	for (i = 0; i < len; ++i) if (RTEST(ptr[i])) return Qtrue;
     }
     else {
 	for (i = 0; i < RARRAY_LEN(ary); ++i) {
@@ -6216,124 +5654,6 @@ rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
 }
 
 /*
- *  call-seq:
- *     ary.all? [{|obj| block}  ]   -> true or false
- *     ary.all?(pattern)            -> true or false
- *
- *  See also Enumerable#all?
- */
-
-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:
- *     ary.none? [{|obj| block}  ]   -> true or false
- *     ary.none?(pattern)            -> true or false
- *
- *  See also 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:
- *     ary.one? [{|obj| block}  ]   -> true or false
- *     ary.one?(pattern)            -> true or false
- *
- *  See also 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:
  *   ary.dig(idx, ...)                 -> object
  *
@@ -6345,11 +5665,11 @@ rb_ary_one_p(int argc, VALUE *argv, VALUE ary)
  *
  *   a.dig(0, 1, 1)                    #=> 3
  *   a.dig(1, 2, 3)                    #=> nil
- *   a.dig(0, 0, 0)                    #=> TypeError: Integer does not have #dig method
+ *   a.dig(0, 0, 0)                    #=> TypeError: Fixnum does not have #dig method
  *   [42, {foo: :bar}].dig(1, :foo)    #=> :bar
  */
 
-static VALUE
+VALUE
 rb_ary_dig(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
@@ -6359,26 +5679,6 @@ 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) {
-	/* r can be an 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);
-    }
-    else if (!n && z) {
-        v = rb_fix_plus(LONG2FIX(0), v);
-    }
-    return v;
-}
-
 /*
  * call-seq:
  *   ary.sum(init=0)                    -> number
@@ -6409,15 +5709,14 @@ finish_exact_sum(long n, VALUE r, VALUE v, int z)
  *   ["a", "b", "c"].sum("")            #=> "abc"
  *   [[1], [[2]], [3]].sum([])          #=> [1, [2], 3]
  *
- * However, Array#join and Array#flatten is faster than Array#sum for
- * array of strings and array of arrays.
+ * 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 Integer#+.
+ * such as Fixnum#+.
  *
  */
 
@@ -6428,7 +5727,8 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
     long i, n;
     int block_given;
 
-    v = (rb_check_arity(argc, 0, 1) ? argv[0] : LONG2FIX(0));
+    if (rb_scan_args(argc, argv, "01", &v) == 0)
+        v = LONG2FIX(0);
 
     block_given = rb_block_given_p();
 
@@ -6459,24 +5759,41 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
         else
             goto not_exact;
     }
-    v = finish_exact_sum(n, r, v, argc!=0);
+    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);
+    }
     return v;
 
   not_exact:
-    v = finish_exact_sum(n, r, v, i!=0);
+    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);
+    }
 
     if (RB_FLOAT_TYPE_P(e)) {
-        /*
-         * Kahan-Babuska balancing compensated summation algorithm
-         * See http://link.springer.com/article/10.1007/s00607-005-0139-x
-         */
+        /* Kahan's compensated summation algorithm */
         double f, c;
 
         f = NUM2DBL(v);
         c = 0.0;
         goto has_float_value;
         for (; i < RARRAY_LEN(ary); i++) {
-            double x, t;
+            double x, y, t;
             e = RARRAY_AREF(ary, i);
             if (block_given)
                 e = rb_yield(e);
@@ -6492,28 +5809,11 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
             else
                 goto not_float;
 
-            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);
+            y = x - c;
+            t = f + y;
+            c = (t - f) - y;
             f = t;
         }
-        f += c;
         return DBL2NUM(f);
 
       not_float:
@@ -6564,12 +5864,11 @@ 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) {|i| i.to_s } #=> ["0", "1", "2", "3"]
+ *     Array.new(4) { Hash.new } #=> [{}, {}, {}, {}]
  *
  *  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
@@ -6716,7 +6015,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]
  *
@@ -6725,15 +6024,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
@@ -6747,9 +6046,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
@@ -6760,11 +6059,11 @@ 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]
  *
  */
@@ -6789,6 +6088,7 @@ 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);
@@ -6801,15 +6101,11 @@ Init_Array(void)
     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_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, "<<", 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);
@@ -6834,8 +6130,6 @@ 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);
@@ -6890,12 +6184,12 @@ 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, -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, "any?", rb_ary_any_p, 0);
     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("**");
 }
diff --git a/ast.c b/ast.c
deleted file mode 100644
index f0e8dd2eaf..0000000000
--- a/ast.c
+++ /dev/null
@@ -1,760 +0,0 @@
-/* indent-tabs-mode: nil */
-#include "ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/util.h"
-#include "internal.h"
-#include "node.h"
-#include "vm_core.h"
-#include "iseq.h"
-
-static VALUE rb_mAST;
-static VALUE rb_cNode;
-
-struct ASTNodeData {
-    rb_ast_t *ast;
-    NODE *node;
-};
-
-static void
-node_gc_mark(void *ptr)
-{
-    struct ASTNodeData *data = (struct ASTNodeData *)ptr;
-    rb_gc_mark((VALUE)data->ast);
-}
-
-static const rb_data_type_t rb_node_type = {
-    "AST/node",
-    {node_gc_mark, RUBY_TYPED_DEFAULT_FREE, 0,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static VALUE rb_ast_node_alloc(VALUE klass);
-
-static void
-setup_node(VALUE obj, rb_ast_t *ast, 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, 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);
-}
-
-/*
- *  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(NODE_SCOPE(0) 1:0, 1:9): >
- */
-static VALUE
-rb_ast_s_parse(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);
-}
-
-/*
- *  call-seq:
- *     RubyVM::AbstractSyntaxTree.parse_file(pathname) -> RubyVM::AbstractSyntaxTree::Node
- *
- *   Reads the file from <code>pathname</code>, then parses it like ::parse,
- *   returning the root node of the abstract syntax tree.
- *
- *   SyntaxError is raised if <code>pathname</code>'s contents are not
- *   valid Ruby syntax.
- *
- *     RubyVM::AbstractSyntaxTree.parse_file("my-app/app.rb")
- *     # => #<RubyVM::AbstractSyntaxTree::Node(NODE_SCOPE(0) 1:0, 31:3): >
- */
-static VALUE
-rb_ast_s_parse_file(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*, 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;
-}
-
-/*
- *  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(NODE_SCOPE(0) 1:35, 1:42): >
- *
- *     def hello
- *       puts "hello, world"
- *     end
- *
- *     RubyVM::AbstractSyntaxTree.of(method(:hello))
- *     # => #<RubyVM::AbstractSyntaxTree::Node(NODE_SCOPE(0) 1:0, 3:3): >
- */
-static VALUE
-rb_ast_s_of(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_"));
-}
-
-/*
- *  call-seq:
- *     node.type -> symbol
- *
- *  Returns the type of this node as a symbol.
- *
- *    root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
- *    root.type # => :SCOPE
- *    call = root.children[2]
- *    call.type # => :OPCALL
- */
-static VALUE
-rb_ast_node_type(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, 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, 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_ARRAY) {
-        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
-node_children(rb_ast_t *ast, 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_WHEN:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
-      case NODE_WHILE:
-        goto loop;
-      case NODE_UNTIL:
-      loop:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_cond, node->nd_body);
-      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:
-        goto jump;
-      case NODE_NEXT:
-        goto jump;
-      case NODE_RETURN:
-      jump:
-        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:
-        goto andor;
-      case NODE_OR:
-      andor:
-        {
-            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);
-        }
-        return rb_ary_new_from_node_args(ast, 2, node->nd_value, node->nd_head);
-      case NODE_LASGN:
-        goto asgn;
-      case NODE_DASGN:
-        goto asgn;
-      case NODE_DASGN_CURR:
-        goto asgn;
-      case NODE_IASGN:
-        goto asgn;
-      case NODE_CVASGN:
-      asgn:
-        if (NODE_REQUIRED_KEYWORD_P(node)) {
-            return rb_ary_new_from_args(1, var_name(node->nd_vid));
-        }
-        return rb_ary_new_from_args(2, var_name(node->nd_vid), NEW_CHILD(ast, node->nd_value));
-      case NODE_GASGN:
-        goto asgn;
-      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(4, NEW_CHILD(ast, node->nd_recv),
-                                    node->nd_next->nd_aid ? Qtrue : Qfalse,
-                                    ID2SYM(node->nd_next->nd_vid),
-                                    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_ARRAY:
-        goto ary;
-      case NODE_VALUES:
-      ary:
-        return dump_array(ast, node);
-      case NODE_ZARRAY:
-        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_MATCH:
-        goto lit;
-      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_LIT:
-        goto lit;
-      case NODE_STR:
-        goto lit;
-      case NODE_XSTR:
-      lit:
-        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:
-        goto dlit;
-      case NODE_DXSTR:
-        goto dlit;
-      case NODE_DREGX:
-        goto dlit;
-      case NODE_DSYM:
-      dlit:
-        return rb_ary_new_from_args(3, node->nd_lit,
-                                    NEW_CHILD(ast, node->nd_next->nd_head),
-                                    NEW_CHILD(ast, node->nd_next->nd_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:
-        goto dot;
-      case NODE_DOT3:
-        goto dot;
-      case NODE_FLIP2:
-        goto dot;
-      case NODE_FLIP3:
-      dot:
-        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_node_args(ast, 1, 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),
-                                        var_name(ainfo->rest_arg),
-                                        NEW_CHILD(ast, ainfo->kw_args),
-                                        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_ARGS_AUX:
-      case NODE_LAST:
-        break;
-    }
-
-    rb_bug("node_children: unknown node: %s", ruby_node_name(type));
-}
-
-/*
- *  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>.
- */
-static VALUE
-rb_ast_node_children(VALUE self)
-{
-    struct ASTNodeData *data;
-    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-
-    return node_children(data->ast, data->node);
-}
-
-/*
- *  call-seq:
- *     node.first_lineno -> integer
- *
- *  The line number in the source code where this AST's text began.
- */
-static VALUE
-rb_ast_node_first_lineno(VALUE self)
-{
-    struct ASTNodeData *data;
-    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-
-    return INT2NUM(nd_first_lineno(data->node));
-}
-
-/*
- *  call-seq:
- *     node.first_column -> integer
- *
- *  The column number in the source code where this AST's text began.
- */
-static VALUE
-rb_ast_node_first_column(VALUE self)
-{
-    struct ASTNodeData *data;
-    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-
-    return INT2NUM(nd_first_column(data->node));
-}
-
-/*
- *  call-seq:
- *     node.last_lineno -> integer
- *
- *  The line number in the source code where this AST's text ended.
- */
-static VALUE
-rb_ast_node_last_lineno(VALUE self)
-{
-    struct ASTNodeData *data;
-    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-
-    return INT2NUM(nd_last_lineno(data->node));
-}
-
-/*
- *  call-seq:
- *     node.last_column -> integer
- *
- *  The column number in the source code where this AST's text ended.
- */
-static VALUE
-rb_ast_node_last_column(VALUE self)
-{
-    struct ASTNodeData *data;
-    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-
-    return INT2NUM(nd_last_column(data->node));
-}
-
-/*
- *  call-seq:
- *     node.inspect -> string
- *
- *  Returns debugging information about this node as a string.
- */
-static VALUE
-rb_ast_node_inspect(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;
-}
-
-void
-Init_ast(void)
-{
-    /*
-     * AbstractSyntaxTree provides methods to parse Ruby code into
-     * abstract syntax trees. The nodes in the tree
-     * are instances of RubyVM::AbstractSyntaxTree::Node.
-     */
-    rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree");
-    /*
-     * RubyVM::AbstractSyntaxTree::Node instances are created by parse methods in
-     * RubyVM::AbstractSyntaxTree.
-     */
-    rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject);
-
-    rb_undef_alloc_func(rb_cNode);
-    rb_define_singleton_method(rb_mAST, "parse", rb_ast_s_parse, 1);
-    rb_define_singleton_method(rb_mAST, "parse_file", rb_ast_s_parse_file, 1);
-    rb_define_singleton_method(rb_mAST, "of", rb_ast_s_of, 1);
-    rb_define_method(rb_cNode, "type", rb_ast_node_type, 0);
-    rb_define_method(rb_cNode, "first_lineno", rb_ast_node_first_lineno, 0);
-    rb_define_method(rb_cNode, "first_column", rb_ast_node_first_column, 0);
-    rb_define_method(rb_cNode, "last_lineno", rb_ast_node_last_lineno, 0);
-    rb_define_method(rb_cNode, "last_column", rb_ast_node_last_column, 0);
-    rb_define_method(rb_cNode, "children", rb_ast_node_children, 0);
-    rb_define_method(rb_cNode, "inspect", rb_ast_node_inspect, 0);
-}
diff --git a/basictest/runner.rb b/basictest/runner.rb
index 0f398e7acc..0330b6d506 100755
--- a/basictest/runner.rb
+++ b/basictest/runner.rb
@@ -17,8 +17,8 @@ $stderr.reopen($stdout)
 error = ''
 
 srcdir = File.expand_path('..', File.dirname(__FILE__))
-if env = ENV["RUBYOPT"]
-  ENV["RUBYOPT"] = env + " -W1"
+if opt = ENV["RUBYOPT"]
+  ENV["RUBYOPT"] = opt + " -W1"
 end
 `#{ruby} #{opt} -W1 #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line|
   if line =~ /^end of test/
diff --git a/basictest/test.rb b/basictest/test.rb
index 25d52ca1ef..8472a0d14a 100755
--- a/basictest/test.rb
+++ b/basictest/test.rb
@@ -2242,11 +2242,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
@@ -2258,7 +2258,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
deleted file mode 100644
index 24a2669143..0000000000
--- a/benchmark/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 vm1 benchmarks
-make benchmark ITEM=vm1
-
-# Run some limited benchmarks in ITEM-matched files
-make benchmark ITEM=vm1 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=vm2_bigarray OPTS="-r peak"
-```
diff --git a/benchmark/app_erb.yml b/benchmark/app_erb.yml
deleted file mode 100644
index 31e29b7644..0000000000
--- a/benchmark/app_erb.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/app_pentomino.rb b/benchmark/app_pentomino.rb
deleted file mode 100644
index 47be7b203f..0000000000
--- a/benchmark/app_pentomino.rb
+++ /dev/null
@@ -1,130 +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)
diff --git a/benchmark/array_sample_100k_10.rb b/benchmark/array_sample_100k_10.rb
deleted file mode 100644
index 5f41ecc32b..0000000000
--- a/benchmark/array_sample_100k_10.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 18b1715319..0000000000
--- a/benchmark/array_sample_100k_11.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 22863afe89..0000000000
--- a/benchmark/array_sample_100k__100.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 4cd79e6c67..0000000000
--- a/benchmark/array_sample_100k__1k.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b3d264249e..0000000000
--- a/benchmark/array_sample_100k__6k.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5dd55ec058..0000000000
--- a/benchmark/array_sample_100k___10k.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 1506732c3c..0000000000
--- a/benchmark/array_sample_100k___50k.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-arr = [*0...100000]
-10_000.times {arr.sample 50_000}
diff --git a/benchmark/array_small_and.rb b/benchmark/array_small_and.rb
deleted file mode 100644
index e53a6edae6..0000000000
--- a/benchmark/array_small_and.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 9661ee48db..0000000000
--- a/benchmark/array_small_diff.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index c58b5fd1ff..0000000000
--- a/benchmark/array_small_or.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 3579786056..0000000000
--- a/benchmark/array_sort_block.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 9a6e2f8bd2..0000000000
--- a/benchmark/array_sort_float.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 6cb394cb9f..0000000000
--- a/benchmark/array_values_at_int.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5b53806d1c..0000000000
--- a/benchmark/array_values_at_range.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-ary = Array.new(10000) {|i| i}
-100000.times { ary.values_at(1..2000) }
diff --git a/benchmark/bighash.rb b/benchmark/bighash.rb
deleted file mode 100644
index e2ad5a5c94..0000000000
--- a/benchmark/bighash.rb
+++ /dev/null
@@ -1 +0,0 @@
-h = {}; 5000000.times {|n| h[n] = n }
diff --git a/benchmark/app_answer.rb b/benchmark/bm_app_answer.rb
index 3cd8a8fd37..3cd8a8fd37 100644
--- a/benchmark/app_answer.rb
+++ b/benchmark/bm_app_answer.rb
diff --git a/benchmark/app_aobench.rb b/benchmark/bm_app_aobench.rb
index 2bd6acfaf8..2bd6acfaf8 100644
--- a/benchmark/app_aobench.rb
+++ b/benchmark/bm_app_aobench.rb
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
new file mode 100644
index 0000000000..77c66a7949
--- /dev/null
+++ b/benchmark/bm_app_erb.rb
@@ -0,0 +1,26 @@
+#
+# 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/app_factorial.rb b/benchmark/bm_app_factorial.rb
index 45f471dfdb..45f471dfdb 100644
--- a/benchmark/app_factorial.rb
+++ b/benchmark/bm_app_factorial.rb
diff --git a/benchmark/app_fib.rb b/benchmark/bm_app_fib.rb
index 34a7b2e725..34a7b2e725 100644
--- a/benchmark/app_fib.rb
+++ b/benchmark/bm_app_fib.rb
diff --git a/benchmark/app_lc_fizzbuzz.rb b/benchmark/bm_app_lc_fizzbuzz.rb
index f09574bbeb..f09574bbeb 100644
--- a/benchmark/app_lc_fizzbuzz.rb
+++ b/benchmark/bm_app_lc_fizzbuzz.rb
diff --git a/benchmark/app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
index 801b75e8e2..801b75e8e2 100644
--- a/benchmark/app_mandelbrot.rb
+++ b/benchmark/bm_app_mandelbrot.rb
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
new file mode 100644
index 0000000000..59c63f358e
--- /dev/null
+++ b/benchmark/bm_app_pentomino.rb
@@ -0,0 +1,259 @@
+#!/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/app_raise.rb b/benchmark/bm_app_raise.rb
index 5db8f95d50..5db8f95d50 100644
--- a/benchmark/app_raise.rb
+++ b/benchmark/bm_app_raise.rb
diff --git a/benchmark/app_strconcat.rb b/benchmark/bm_app_strconcat.rb
index 7eed7c1aed..7eed7c1aed 100644
--- a/benchmark/app_strconcat.rb
+++ b/benchmark/bm_app_strconcat.rb
diff --git a/benchmark/app_tak.rb b/benchmark/bm_app_tak.rb
index efe5380f4e..efe5380f4e 100644
--- a/benchmark/app_tak.rb
+++ b/benchmark/bm_app_tak.rb
diff --git a/benchmark/app_tarai.rb b/benchmark/bm_app_tarai.rb
index 4c146f5ccf..4c146f5ccf 100644
--- a/benchmark/app_tarai.rb
+++ b/benchmark/bm_app_tarai.rb
diff --git a/benchmark/app_uri.rb b/benchmark/bm_app_uri.rb
index 586edfd5dc..586edfd5dc 100644
--- a/benchmark/app_uri.rb
+++ b/benchmark/bm_app_uri.rb
diff --git a/benchmark/array_shift.rb b/benchmark/bm_array_shift.rb
index 798bb9e3f4..798bb9e3f4 100644
--- a/benchmark/array_shift.rb
+++ b/benchmark/bm_array_shift.rb
diff --git a/benchmark/hash_aref_dsym.rb b/benchmark/bm_hash_aref_dsym.rb
index af4f8c36d4..af4f8c36d4 100644
--- a/benchmark/hash_aref_dsym.rb
+++ b/benchmark/bm_hash_aref_dsym.rb
diff --git a/benchmark/hash_aref_dsym_long.rb b/benchmark/bm_hash_aref_dsym_long.rb
index 9d7759379e..9d7759379e 100644
--- a/benchmark/hash_aref_dsym_long.rb
+++ b/benchmark/bm_hash_aref_dsym_long.rb
diff --git a/benchmark/hash_aref_fix.rb b/benchmark/bm_hash_aref_fix.rb
index 1346890582..1346890582 100644
--- a/benchmark/hash_aref_fix.rb
+++ b/benchmark/bm_hash_aref_fix.rb
diff --git a/benchmark/hash_aref_flo.rb b/benchmark/bm_hash_aref_flo.rb
index 2217274c82..2217274c82 100644
--- a/benchmark/hash_aref_flo.rb
+++ b/benchmark/bm_hash_aref_flo.rb
diff --git a/benchmark/hash_aref_miss.rb b/benchmark/bm_hash_aref_miss.rb
index b0913dd4bb..b0913dd4bb 100644
--- a/benchmark/hash_aref_miss.rb
+++ b/benchmark/bm_hash_aref_miss.rb
diff --git a/benchmark/hash_aref_str.rb b/benchmark/bm_hash_aref_str.rb
index 19439b061b..19439b061b 100644
--- a/benchmark/hash_aref_str.rb
+++ b/benchmark/bm_hash_aref_str.rb
diff --git a/benchmark/hash_aref_sym.rb b/benchmark/bm_hash_aref_sym.rb
index f75d163fe6..f75d163fe6 100644
--- a/benchmark/hash_aref_sym.rb
+++ b/benchmark/bm_hash_aref_sym.rb
diff --git a/benchmark/hash_aref_sym_long.rb b/benchmark/bm_hash_aref_sym_long.rb
index 9dab8df7be..9dab8df7be 100644
--- a/benchmark/hash_aref_sym_long.rb
+++ b/benchmark/bm_hash_aref_sym_long.rb
diff --git a/benchmark/hash_flatten.rb b/benchmark/bm_hash_flatten.rb
index e944aae9f2..e944aae9f2 100644
--- a/benchmark/hash_flatten.rb
+++ b/benchmark/bm_hash_flatten.rb
diff --git a/benchmark/hash_ident_flo.rb b/benchmark/bm_hash_ident_flo.rb
index 0c7edfed3e..0c7edfed3e 100644
--- a/benchmark/hash_ident_flo.rb
+++ b/benchmark/bm_hash_ident_flo.rb
diff --git a/benchmark/hash_ident_num.rb b/benchmark/bm_hash_ident_num.rb
index b226736c6f..b226736c6f 100644
--- a/benchmark/hash_ident_num.rb
+++ b/benchmark/bm_hash_ident_num.rb
diff --git a/benchmark/hash_ident_obj.rb b/benchmark/bm_hash_ident_obj.rb
index 4b3b58edec..4b3b58edec 100644
--- a/benchmark/hash_ident_obj.rb
+++ b/benchmark/bm_hash_ident_obj.rb
diff --git a/benchmark/hash_ident_str.rb b/benchmark/bm_hash_ident_str.rb
index 8582b38e31..8582b38e31 100644
--- a/benchmark/hash_ident_str.rb
+++ b/benchmark/bm_hash_ident_str.rb
diff --git a/benchmark/hash_ident_sym.rb b/benchmark/bm_hash_ident_sym.rb
index 4c81e3d28e..4c81e3d28e 100644
--- a/benchmark/hash_ident_sym.rb
+++ b/benchmark/bm_hash_ident_sym.rb
diff --git a/benchmark/hash_keys.rb b/benchmark/bm_hash_keys.rb
index 6863cd01f9..6863cd01f9 100644
--- a/benchmark/hash_keys.rb
+++ b/benchmark/bm_hash_keys.rb
diff --git a/benchmark/hash_shift.rb b/benchmark/bm_hash_shift.rb
index a645671a5b..a645671a5b 100644
--- a/benchmark/hash_shift.rb
+++ b/benchmark/bm_hash_shift.rb
diff --git a/benchmark/hash_shift_u16.rb b/benchmark/bm_hash_shift_u16.rb
index ec800d0342..ec800d0342 100644
--- a/benchmark/hash_shift_u16.rb
+++ b/benchmark/bm_hash_shift_u16.rb
diff --git a/benchmark/hash_shift_u24.rb b/benchmark/bm_hash_shift_u24.rb
index de4e0fa696..de4e0fa696 100644
--- a/benchmark/hash_shift_u24.rb
+++ b/benchmark/bm_hash_shift_u24.rb
diff --git a/benchmark/hash_shift_u32.rb b/benchmark/bm_hash_shift_u32.rb
index 656aa55583..656aa55583 100644
--- a/benchmark/hash_shift_u32.rb
+++ b/benchmark/bm_hash_shift_u32.rb
diff --git a/benchmark/hash_to_proc.rb b/benchmark/bm_hash_to_proc.rb
index 2b675bf509..2b675bf509 100644
--- a/benchmark/hash_to_proc.rb
+++ b/benchmark/bm_hash_to_proc.rb
diff --git a/benchmark/hash_values.rb b/benchmark/bm_hash_values.rb
index 069441302f..069441302f 100644
--- a/benchmark/hash_values.rb
+++ b/benchmark/bm_hash_values.rb
diff --git a/benchmark/io_file_create.rb b/benchmark/bm_io_file_create.rb
index 2f205c1333..2f205c1333 100644
--- a/benchmark/io_file_create.rb
+++ b/benchmark/bm_io_file_create.rb
diff --git a/benchmark/io_file_read.rb b/benchmark/bm_io_file_read.rb
index b9e796ed30..b9e796ed30 100644
--- a/benchmark/io_file_read.rb
+++ b/benchmark/bm_io_file_read.rb
diff --git a/benchmark/io_file_write.rb b/benchmark/bm_io_file_write.rb
index aa1be0e5fe..aa1be0e5fe 100644
--- a/benchmark/io_file_write.rb
+++ b/benchmark/bm_io_file_write.rb
diff --git a/benchmark/io_nonblock_noex.rb b/benchmark/bm_io_nonblock_noex.rb
index da9357fdc6..da9357fdc6 100644
--- a/benchmark/io_nonblock_noex.rb
+++ b/benchmark/bm_io_nonblock_noex.rb
diff --git a/benchmark/io_nonblock_noex2.rb b/benchmark/bm_io_nonblock_noex2.rb
index 56819d049b..56819d049b 100644
--- a/benchmark/io_nonblock_noex2.rb
+++ b/benchmark/bm_io_nonblock_noex2.rb
diff --git a/benchmark/io_select.rb b/benchmark/bm_io_select.rb
index 19248daeb1..19248daeb1 100644
--- a/benchmark/io_select.rb
+++ b/benchmark/bm_io_select.rb
diff --git a/benchmark/io_select2.rb b/benchmark/bm_io_select2.rb
index 10e37d71b2..10e37d71b2 100644
--- a/benchmark/io_select2.rb
+++ b/benchmark/bm_io_select2.rb
diff --git a/benchmark/io_select3.rb b/benchmark/bm_io_select3.rb
index 7d0ba1f092..7d0ba1f092 100644
--- a/benchmark/io_select3.rb
+++ b/benchmark/bm_io_select3.rb
diff --git a/benchmark/loop_for.rb b/benchmark/bm_loop_for.rb
index 0fc4cc1511..0fc4cc1511 100644
--- a/benchmark/loop_for.rb
+++ b/benchmark/bm_loop_for.rb
diff --git a/benchmark/loop_generator.rb b/benchmark/bm_loop_generator.rb
index d3375c744c..d3375c744c 100644
--- a/benchmark/loop_generator.rb
+++ b/benchmark/bm_loop_generator.rb
diff --git a/benchmark/loop_times.rb b/benchmark/bm_loop_times.rb
index 521f72ad1a..521f72ad1a 100644
--- a/benchmark/loop_times.rb
+++ b/benchmark/bm_loop_times.rb
diff --git a/benchmark/loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
index 0072822c06..0072822c06 100644
--- a/benchmark/loop_whileloop.rb
+++ b/benchmark/bm_loop_whileloop.rb
diff --git a/benchmark/loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
index 47d02dffc4..47d02dffc4 100644
--- a/benchmark/loop_whileloop2.rb
+++ b/benchmark/bm_loop_whileloop2.rb
diff --git a/benchmark/marshal_dump_flo.rb b/benchmark/bm_marshal_dump_flo.rb
index 9b8d0c6afb..9b8d0c6afb 100644
--- a/benchmark/marshal_dump_flo.rb
+++ b/benchmark/bm_marshal_dump_flo.rb
diff --git a/benchmark/marshal_dump_load_geniv.rb b/benchmark/bm_marshal_dump_load_geniv.rb
index 8252ad90fa..8252ad90fa 100644
--- a/benchmark/marshal_dump_load_geniv.rb
+++ b/benchmark/bm_marshal_dump_load_geniv.rb
diff --git a/benchmark/marshal_dump_load_time.rb b/benchmark/bm_marshal_dump_load_time.rb
index e29743b791..e29743b791 100644
--- a/benchmark/marshal_dump_load_time.rb
+++ b/benchmark/bm_marshal_dump_load_time.rb
diff --git a/benchmark/bm_require.rb b/benchmark/bm_require.rb
new file mode 100644
index 0000000000..b8abc88f41
--- /dev/null
+++ b/benchmark/bm_require.rb
@@ -0,0 +1,7 @@
+$:.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
new file mode 100644
index 0000000000..e54db6c6e5
--- /dev/null
+++ b/benchmark/bm_require_thread.rb
@@ -0,0 +1,15 @@
+$:.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/securerandom.rb b/benchmark/bm_securerandom.rb
index a082ea6d5b..a082ea6d5b 100644
--- a/benchmark/securerandom.rb
+++ b/benchmark/bm_securerandom.rb
diff --git a/benchmark/so_ackermann.rb b/benchmark/bm_so_ackermann.rb
index 7db5be9050..7db5be9050 100644
--- a/benchmark/so_ackermann.rb
+++ b/benchmark/bm_so_ackermann.rb
diff --git a/benchmark/so_array.rb b/benchmark/bm_so_array.rb
index 2b8fce8f99..2b8fce8f99 100644
--- a/benchmark/so_array.rb
+++ b/benchmark/bm_so_array.rb
diff --git a/benchmark/so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
index b1693e4109..b1693e4109 100644
--- a/benchmark/so_binary_trees.rb
+++ b/benchmark/bm_so_binary_trees.rb
diff --git a/benchmark/so_concatenate.rb b/benchmark/bm_so_concatenate.rb
index 873214de7c..873214de7c 100644
--- a/benchmark/so_concatenate.rb
+++ b/benchmark/bm_so_concatenate.rb
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
new file mode 100644
index 0000000000..65f6337a4a
--- /dev/null
+++ b/benchmark/bm_so_count_words.rb
@@ -0,0 +1,19 @@
+#!/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/so_exception.rb b/benchmark/bm_so_exception.rb
index deb003a594..deb003a594 100644
--- a/benchmark/so_exception.rb
+++ b/benchmark/bm_so_exception.rb
diff --git a/benchmark/so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
index bac5ecd44c..bac5ecd44c 100644
--- a/benchmark/so_fannkuch.rb
+++ b/benchmark/bm_so_fannkuch.rb
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
new file mode 100644
index 0000000000..3f759ba7ae
--- /dev/null
+++ b/benchmark/bm_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/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
new file mode 100644
index 0000000000..dadab3e79c
--- /dev/null
+++ b/benchmark/bm_so_k_nucleotide.rb
@@ -0,0 +1,48 @@
+# 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/so_lists.rb b/benchmark/bm_so_lists.rb
index e8f4a2a5f7..e8f4a2a5f7 100644
--- a/benchmark/so_lists.rb
+++ b/benchmark/bm_so_lists.rb
diff --git a/benchmark/so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
index 76331c64b8..76331c64b8 100644
--- a/benchmark/so_mandelbrot.rb
+++ b/benchmark/bm_so_mandelbrot.rb
diff --git a/benchmark/so_matrix.rb b/benchmark/bm_so_matrix.rb
index e2c5c8e559..e2c5c8e559 100644
--- a/benchmark/so_matrix.rb
+++ b/benchmark/bm_so_matrix.rb
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
new file mode 100644
index 0000000000..64a7d46afe
--- /dev/null
+++ b/benchmark/bm_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/so_nbody.rb b/benchmark/bm_so_nbody.rb
index d6c5bb9e61..d6c5bb9e61 100644
--- a/benchmark/so_nbody.rb
+++ b/benchmark/bm_so_nbody.rb
diff --git a/benchmark/so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
index a0513f8c47..a0513f8c47 100644
--- a/benchmark/so_nested_loop.rb
+++ b/benchmark/bm_so_nested_loop.rb
diff --git a/benchmark/so_nsieve.rb b/benchmark/bm_so_nsieve.rb
index a65cc78233..a65cc78233 100644
--- a/benchmark/so_nsieve.rb
+++ b/benchmark/bm_so_nsieve.rb
diff --git a/benchmark/so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
index 6f958ee44e..6f958ee44e 100644
--- a/benchmark/so_nsieve_bits.rb
+++ b/benchmark/bm_so_nsieve_bits.rb
diff --git a/benchmark/so_object.rb b/benchmark/bm_so_object.rb
index e8607c7199..e8607c7199 100644
--- a/benchmark/so_object.rb
+++ b/benchmark/bm_so_object.rb
diff --git a/benchmark/so_partial_sums.rb b/benchmark/bm_so_partial_sums.rb
index 630b45cb8d..630b45cb8d 100644
--- a/benchmark/so_partial_sums.rb
+++ b/benchmark/bm_so_partial_sums.rb
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
new file mode 100644
index 0000000000..c7d6fbfb4d
--- /dev/null
+++ b/benchmark/bm_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/so_random.rb b/benchmark/bm_so_random.rb
index a66b9e8e63..a66b9e8e63 100644
--- a/benchmark/so_random.rb
+++ b/benchmark/bm_so_random.rb
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
new file mode 100644
index 0000000000..82ea666994
--- /dev/null
+++ b/benchmark/bm_so_reverse_complement.rb
@@ -0,0 +1,30 @@
+#!/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/so_sieve.rb b/benchmark/bm_so_sieve.rb
index 43dc302648..43dc302648 100644
--- a/benchmark/so_sieve.rb
+++ b/benchmark/bm_so_sieve.rb
diff --git a/benchmark/so_spectralnorm.rb b/benchmark/bm_so_spectralnorm.rb
index 6b97206689..6b97206689 100644
--- a/benchmark/so_spectralnorm.rb
+++ b/benchmark/bm_so_spectralnorm.rb
diff --git a/benchmark/bm_vm1_attr_ivar.rb b/benchmark/bm_vm1_attr_ivar.rb
new file mode 100644
index 0000000000..16906f3605
--- /dev/null
+++ b/benchmark/bm_vm1_attr_ivar.rb
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..7e7a6b48c0
--- /dev/null
+++ b/benchmark/bm_vm1_attr_ivar_set.rb
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..a9f56b15ea
--- /dev/null
+++ b/benchmark/bm_vm1_block.rb
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..ac59ebccf1
--- /dev/null
+++ b/benchmark/bm_vm1_const.rb
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000..a1596145f2
--- /dev/null
+++ b/benchmark/bm_vm1_ensure.rb
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000..d4581439ff
--- /dev/null
+++ b/benchmark/bm_vm1_float_simple.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..e78bca5668
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_lived.rb
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..b66052dee0
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_complex_long.rb
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000000..298dbc845b
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_long.rb
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..6b15c1b7bf
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_symbol.rb
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 0000000000..881528845b
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_ary.rb
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..3c8279c956
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_ary_promoted.rb
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..a4067af36b
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_obj.rb
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000000..eee07a0248
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_obj_promoted.rb
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000..68a73cf92f
--- /dev/null
+++ b/benchmark/bm_vm1_ivar.rb
@@ -0,0 +1,8 @@
+@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
new file mode 100644
index 0000000000..bd81b06c34
--- /dev/null
+++ b/benchmark/bm_vm1_ivar_set.rb
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..353de3ab0e
--- /dev/null
+++ b/benchmark/bm_vm1_length.rb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..36f2068811
--- /dev/null
+++ b/benchmark/bm_vm1_lvar_init.rb
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000..222e864134
--- /dev/null
+++ b/benchmark/bm_vm1_lvar_set.rb
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000000..bbb4ae07a4
--- /dev/null
+++ b/benchmark/bm_vm1_neq.rb
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000..b09ecdcc21
--- /dev/null
+++ b/benchmark/bm_vm1_not.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..b0d3e2bdfa
--- /dev/null
+++ b/benchmark/bm_vm1_rescue.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..63f9f21675
--- /dev/null
+++ b/benchmark/bm_vm1_simplereturn.rb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..918f8b2112
--- /dev/null
+++ b/benchmark/bm_vm1_swap.rb
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000..775597cea6
--- /dev/null
+++ b/benchmark/bm_vm1_yield.rb
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..df9037c83c
--- /dev/null
+++ b/benchmark/bm_vm2_array.rb
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000000..b02509d6a2
--- /dev/null
+++ b/benchmark/bm_vm2_bigarray.rb
@@ -0,0 +1,106 @@
+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
new file mode 100644
index 0000000000..5e3f437bb8
--- /dev/null
+++ b/benchmark/bm_vm2_bighash.rb
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000000..adc6e4df0a
--- /dev/null
+++ b/benchmark/bm_vm2_case.rb
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..c62b294e0e
--- /dev/null
+++ b/benchmark/bm_vm2_case_lit.rb
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..053ed6c912
--- /dev/null
+++ b/benchmark/bm_vm2_defined_method.rb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..58c0f7bbc3
--- /dev/null
+++ b/benchmark/bm_vm2_dstr.rb
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..307cfc28ef
--- /dev/null
+++ b/benchmark/bm_vm2_eval.rb
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..a8ccff7138
--- /dev/null
+++ b/benchmark/bm_vm2_method.rb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..2badc73101
--- /dev/null
+++ b/benchmark/bm_vm2_method_missing.rb
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..b4efb4f520
--- /dev/null
+++ b/benchmark/bm_vm2_method_with_block.rb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..5d16480c6b
--- /dev/null
+++ b/benchmark/bm_vm2_mutex.rb
@@ -0,0 +1,9 @@
+require 'thread'
+
+m = Thread::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
new file mode 100644
index 0000000000..6422c9b0d0
--- /dev/null
+++ b/benchmark/bm_vm2_newlambda.rb
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000000..c82c0e4bce
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method.rb
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000000..aa5fd1dd38
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method_ov.rb
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000000..65e5217371
--- /dev/null
+++ b/benchmark/bm_vm2_proc.rb
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..aa5387987f
--- /dev/null
+++ b/benchmark/bm_vm2_raise1.rb
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000..1f61c63157
--- /dev/null
+++ b/benchmark/bm_vm2_raise2.rb
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000..55f9e957a3
--- /dev/null
+++ b/benchmark/bm_vm2_regexp.rb
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..6a3ab6fdab
--- /dev/null
+++ b/benchmark/bm_vm2_send.rb
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..1d73036849
--- /dev/null
+++ b/benchmark/bm_vm2_string_literal.rb
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000000..22cb26b0a5
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aref_hi.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..5e61a7087e
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aref_lo.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..5a1c3d16f3
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aset.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..fff940a80a
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_href_hi.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..5e4085d59d
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_href_lo.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..9c0cee4141
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_hset.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..8eaa555b41
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_aref.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..ecd0f95669
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_aset.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..2c88fee6bf
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_href.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..33c36d20f1
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_hset.rb
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..afd8579e7b
--- /dev/null
+++ b/benchmark/bm_vm2_super.rb
@@ -0,0 +1,20 @@
+
+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
new file mode 100644
index 0000000000..1774625942
--- /dev/null
+++ b/benchmark/bm_vm2_unif1.rb
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000..2a43e62217
--- /dev/null
+++ b/benchmark/bm_vm2_zsuper.rb
@@ -0,0 +1,20 @@
+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/vm3_backtrace.rb b/benchmark/bm_vm3_backtrace.rb
index 0fbf73e1ca..0fbf73e1ca 100644
--- a/benchmark/vm3_backtrace.rb
+++ b/benchmark/bm_vm3_backtrace.rb
diff --git a/benchmark/vm3_clearmethodcache.rb b/benchmark/bm_vm3_clearmethodcache.rb
index 9661323cd2..9661323cd2 100644
--- a/benchmark/vm3_clearmethodcache.rb
+++ b/benchmark/bm_vm3_clearmethodcache.rb
diff --git a/benchmark/vm3_gc.rb b/benchmark/bm_vm3_gc.rb
index e668026915..e668026915 100644
--- a/benchmark/vm3_gc.rb
+++ b/benchmark/bm_vm3_gc.rb
diff --git a/benchmark/vm3_gc_old_full.rb b/benchmark/bm_vm3_gc_old_full.rb
index cfdfc8c5a5..cfdfc8c5a5 100644
--- a/benchmark/vm3_gc_old_full.rb
+++ b/benchmark/bm_vm3_gc_old_full.rb
diff --git a/benchmark/vm3_gc_old_immediate.rb b/benchmark/bm_vm3_gc_old_immediate.rb
index ad22feb655..ad22feb655 100644
--- a/benchmark/vm3_gc_old_immediate.rb
+++ b/benchmark/bm_vm3_gc_old_immediate.rb
diff --git a/benchmark/vm3_gc_old_lazy.rb b/benchmark/bm_vm3_gc_old_lazy.rb
index b74d44baf1..b74d44baf1 100644
--- a/benchmark/vm3_gc_old_lazy.rb
+++ b/benchmark/bm_vm3_gc_old_lazy.rb
diff --git a/benchmark/vm_symbol_block_pass.rb b/benchmark/bm_vm_symbol_block_pass.rb
index 1d433353e1..1d433353e1 100644
--- a/benchmark/vm_symbol_block_pass.rb
+++ b/benchmark/bm_vm_symbol_block_pass.rb
diff --git a/benchmark/vm_thread_alive_check1.rb b/benchmark/bm_vm_thread_alive_check1.rb
index c993accdda..c993accdda 100644
--- a/benchmark/vm_thread_alive_check1.rb
+++ b/benchmark/bm_vm_thread_alive_check1.rb
diff --git a/benchmark/vm_thread_close.rb b/benchmark/bm_vm_thread_close.rb
index 3e9a265ce8..3e9a265ce8 100644
--- a/benchmark/vm_thread_close.rb
+++ b/benchmark/bm_vm_thread_close.rb
diff --git a/benchmark/vm_thread_create_join.rb b/benchmark/bm_vm_thread_create_join.rb
index 393cd45df9..393cd45df9 100644
--- a/benchmark/vm_thread_create_join.rb
+++ b/benchmark/bm_vm_thread_create_join.rb
diff --git a/benchmark/vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
index 66e42c85e1..66e42c85e1 100644
--- a/benchmark/vm_thread_mutex1.rb
+++ b/benchmark/bm_vm_thread_mutex1.rb
diff --git a/benchmark/vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
index 6e6c804c31..6e6c804c31 100644
--- a/benchmark/vm_thread_mutex2.rb
+++ b/benchmark/bm_vm_thread_mutex2.rb
diff --git a/benchmark/vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
index c750dc542a..c750dc542a 100644
--- a/benchmark/vm_thread_mutex3.rb
+++ b/benchmark/bm_vm_thread_mutex3.rb
diff --git a/benchmark/vm_thread_pass.rb b/benchmark/bm_vm_thread_pass.rb
index b5b3c0bc85..b5b3c0bc85 100644
--- a/benchmark/vm_thread_pass.rb
+++ b/benchmark/bm_vm_thread_pass.rb
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
new file mode 100644
index 0000000000..27157d1a6f
--- /dev/null
+++ b/benchmark/bm_vm_thread_pass_flood.rb
@@ -0,0 +1,8 @@
+1000.times{
+  Thread.new{loop{Thread.pass}}
+}
+
+i = 0
+while i<10000
+  i += 1
+end
diff --git a/benchmark/vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
index 112a621905..112a621905 100644
--- a/benchmark/vm_thread_pipe.rb
+++ b/benchmark/bm_vm_thread_pipe.rb
diff --git a/benchmark/vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb
index 274ceda366..274ceda366 100644
--- a/benchmark/vm_thread_queue.rb
+++ b/benchmark/bm_vm_thread_queue.rb
diff --git a/benchmark/dir_empty_p.rb b/benchmark/dir_empty_p.rb
deleted file mode 100644
index 8329c757cf..0000000000
--- a/benchmark/dir_empty_p.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-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
new file mode 100644
index 0000000000..eb976b4a90
--- /dev/null
+++ b/benchmark/driver.rb
@@ -0,0 +1,427 @@
+#
+# 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_grep_v_100.rb b/benchmark/enum_lazy_grep_v_100.rb
deleted file mode 100644
index 8832392e65..0000000000
--- a/benchmark/enum_lazy_grep_v_100.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 329509fa8f..0000000000
--- a/benchmark/enum_lazy_grep_v_20.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 02ea4d4e71..0000000000
--- a/benchmark/enum_lazy_grep_v_50.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 2e6434d9c4..0000000000
--- a/benchmark/enum_lazy_uniq_100.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 75e6398fee..0000000000
--- a/benchmark/enum_lazy_uniq_20.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 59a39b78ff..0000000000
--- a/benchmark/enum_lazy_uniq_50.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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/erb_render.yml b/benchmark/erb_render.yml
deleted file mode 100644
index 15f6c3880b..0000000000
--- a/benchmark/erb_render.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-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.rb b/benchmark/fiber_chain.rb
deleted file mode 100755
index 7e0a7f9d45..0000000000
--- a/benchmark/fiber_chain.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Check performance of fiber creation and transfer.
-
-def make_link(previous)
-  Fiber.new do
-    while message = previous.resume
-      Fiber.yield(message)
-    end
-  end
-end
-
-def make_chain(length, &block)
-  chain = Fiber.new(&block)
-
-  (length - 1).times do
-    chain = make_link(chain)
-  end
-
-  return chain
-end
-
-def run_benchmark(length, repeats, message = :hello)
-  chain = nil
-
-  chain = make_chain(length) do
-    while true
-      Fiber.yield(message)
-    end
-  end
-
-  repeats.times do
-    abort "invalid result" unless chain.resume == message
-  end
-end
-
-n = (ARGV[0] || 1000).to_i
-m = (ARGV[1] || 1000).to_i
-
-5.times do
-  run_benchmark(n, m)
-end
diff --git a/benchmark/file_chmod.rb b/benchmark/file_chmod.rb
deleted file mode 100644
index 1cd4760c9d..0000000000
--- a/benchmark/file_chmod.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index bbb44aebac..0000000000
--- a/benchmark/file_rename.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 275f58b924..2eed7abc83 100644
--- a/benchmark/gc/aobench.rb
+++ b/benchmark/gc/aobench.rb
@@ -1 +1 @@
-require_relative '../app_aobench'
+require_relative '../bm_app_aobench.rb'
diff --git a/benchmark/gc/binary_trees.rb b/benchmark/gc/binary_trees.rb
index 83347cdd20..af8ea722aa 100644
--- a/benchmark/gc/binary_trees.rb
+++ b/benchmark/gc/binary_trees.rb
@@ -1 +1 @@
-require_relative '../so_binary_trees'
+require_relative '../bm_so_binary_trees.rb'
diff --git a/benchmark/gc/gcbench.rb b/benchmark/gc/gcbench.rb
index 23d0b91c6c..09a404466a 100644
--- a/benchmark/gc/gcbench.rb
+++ b/benchmark/gc/gcbench.rb
@@ -3,12 +3,11 @@ require 'pp'
 require 'optparse'
 
 $list = true
-$gcprof = false
+$gcprof = true
 
 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 8ebdff7d1d..94ba74be89 100644
--- a/benchmark/gc/pentomino.rb
+++ b/benchmark/gc/pentomino.rb
@@ -1 +1 @@
-require_relative '../app_pentomino'
+require_relative '../bm_app_pentomino.rb'
diff --git a/benchmark/hash_literal_small2.rb b/benchmark/hash_literal_small2.rb
deleted file mode 100644
index c188529260..0000000000
--- a/benchmark/hash_literal_small2.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 739f71b5b0..0000000000
--- a/benchmark/hash_literal_small4.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 53d80af535..0000000000
--- a/benchmark/hash_literal_small8.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 03d9109602..0000000000
--- a/benchmark/hash_long.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-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/hash_small2.rb b/benchmark/hash_small2.rb
deleted file mode 100644
index 45485d9c71..0000000000
--- a/benchmark/hash_small2.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 2.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small4.rb b/benchmark/hash_small4.rb
deleted file mode 100644
index acd4084334..0000000000
--- a/benchmark/hash_small4.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 4.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small8.rb b/benchmark/hash_small8.rb
deleted file mode 100644
index 9cffcc91b6..0000000000
--- a/benchmark/hash_small8.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 8.times{|j| a[j]=j}; a}
diff --git a/benchmark/int_quo.rb b/benchmark/int_quo.rb
deleted file mode 100644
index e22a3f8c30..0000000000
--- a/benchmark/int_quo.rb
+++ /dev/null
@@ -1 +0,0 @@
-5000000.times { 42.quo(3) }
diff --git a/benchmark/io_copy_stream_write.rb b/benchmark/io_copy_stream_write.rb
deleted file mode 100644
index 3fd87250a4..0000000000
--- a/benchmark/io_copy_stream_write.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
deleted file mode 100644
index 11f369bd0d..0000000000
--- a/benchmark/io_copy_stream_write_socket.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/io_pipe_rw.rb b/benchmark/io_pipe_rw.rb
deleted file mode 100644
index 6862a8ae61..0000000000
--- a/benchmark/io_pipe_rw.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/lib/benchmark_driver/output/driver.rb b/benchmark/lib/benchmark_driver/output/driver.rb
deleted file mode 100644
index d22236e9fb..0000000000
--- a/benchmark/lib/benchmark_driver/output/driver.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 3c3453e527..0000000000
--- a/benchmark/lib/benchmark_driver/runner/cstime.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index e139962ef2..0000000000
--- a/benchmark/lib/benchmark_driver/runner/cutime.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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/peak.rb b/benchmark/lib/benchmark_driver/runner/peak.rb
deleted file mode 100644
index 0ba8af42c5..0000000000
--- a/benchmark/lib/benchmark_driver/runner/peak.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-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('../../../../test/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
deleted file mode 100644
index 1b31f901c7..0000000000
--- a/benchmark/lib/benchmark_driver/runner/size.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 4577fb0bf8..0000000000
--- a/benchmark/lib/benchmark_driver/runner/stime.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 64dc14f84e..0000000000
--- a/benchmark/lib/benchmark_driver/runner/total.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-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
deleted file mode 100644
index b61d83a188..0000000000
--- a/benchmark/lib/benchmark_driver/runner/utime.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100755
index 4d73a63323..0000000000
--- a/benchmark/lib/load.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-$:.unshift(File.join(__dir__, '../benchmark-driver/lib'))
-require 'benchmark_driver'
diff --git a/benchmark/make_fasta_output.rb b/benchmark/make_fasta_output.rb
new file mode 100644
index 0000000000..b6d787ae27
--- /dev/null
+++ b/benchmark/make_fasta_output.rb
@@ -0,0 +1,19 @@
+# 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/memory_wrapper.rb b/benchmark/memory_wrapper.rb
new file mode 100644
index 0000000000..3f4451a037
--- /dev/null
+++ b/benchmark/memory_wrapper.rb
@@ -0,0 +1,16 @@
+
+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/prepare_require.rb b/benchmark/prepare_require.rb
new file mode 100644
index 0000000000..c4786f04ad
--- /dev/null
+++ b/benchmark/prepare_require.rb
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000000..339ecb8b39
--- /dev/null
+++ b/benchmark/prepare_require_thread.rb
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..ee2138cdb2
--- /dev/null
+++ b/benchmark/prepare_so_count_words.rb
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 0000000000..d83aeb7a7e
--- /dev/null
+++ b/benchmark/prepare_so_k_nucleotide.rb
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..da3ec2df14
--- /dev/null
+++ b/benchmark/prepare_so_reverse_complement.rb
@@ -0,0 +1,2 @@
+require_relative 'make_fasta_output'
+prepare_fasta_output(2_500_000)
diff --git a/benchmark/report.rb b/benchmark/report.rb
new file mode 100644
index 0000000000..d2dc56b1e1
--- /dev/null
+++ b/benchmark/report.rb
@@ -0,0 +1,79 @@
+#
+# 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
deleted file mode 100644
index 711d8e11e9..0000000000
--- a/benchmark/require.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-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|
-      f = File.open("#{data_dir}/c#{i}.rb", "w")
-      f.puts <<-END
-        class C#{i}
-        end
-      END
-    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
deleted file mode 100644
index 87e0ba888b..0000000000
--- a/benchmark/require_thread.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-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|
-      f = File.open("#{data_dir}/c#{i}.rb", "w")
-      f.puts <<-END
-        class C#{i}
-        end
-      END
-    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
new file mode 100644
index 0000000000..0cd2363849
--- /dev/null
+++ b/benchmark/run.rb
@@ -0,0 +1,127 @@
+#
+# 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
new file mode 100644
index 0000000000..97c5cef045
--- /dev/null
+++ b/benchmark/runc.rb
@@ -0,0 +1,27 @@
+#
+#
+#
+
+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/so_count_words.yml b/benchmark/so_count_words.yml
deleted file mode 100644
index d0a6c8dd3e..0000000000
--- a/benchmark/so_count_words.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-prelude: |
-  #!/usr/bin/ruby
-  # -*- mode: 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_fasta.rb b/benchmark/so_fasta.rb
deleted file mode 100644
index dcc6b39507..0000000000
--- a/benchmark/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/so_k_nucleotide.yml b/benchmark/so_k_nucleotide.yml
deleted file mode 100644
index d7df086c39..0000000000
--- a/benchmark/so_k_nucleotide.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-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/so_meteor_contest.rb b/benchmark/so_meteor_contest.rb
deleted file mode 100644
index 8c136baa6c..0000000000
--- a/benchmark/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/so_pidigits.rb b/benchmark/so_pidigits.rb
deleted file mode 100644
index 9a537b2d1c..0000000000
--- a/benchmark/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/so_reverse_complement.yml b/benchmark/so_reverse_complement.yml
deleted file mode 100644
index de05eedfc4..0000000000
--- a/benchmark/so_reverse_complement.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-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/string_index.rb b/benchmark/string_index.rb
deleted file mode 100644
index 7783111082..0000000000
--- a/benchmark/string_index.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b0d60201a9..0000000000
--- a/benchmark/string_scan_re.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 42440bd948..0000000000
--- a/benchmark/string_scan_str.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-str = Array.new(1_000, 'abc').join(',')
-1_000.times { str.scan('abc') }
diff --git a/benchmark/time_subsec.rb b/benchmark/time_subsec.rb
deleted file mode 100644
index 505021c701..0000000000
--- a/benchmark/time_subsec.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-t = Time.now
-4000000.times { t.subsec }
diff --git a/benchmark/vm1_attr_ivar.yml b/benchmark/vm1_attr_ivar.yml
deleted file mode 100644
index f714dd9bd9..0000000000
--- a/benchmark/vm1_attr_ivar.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-prelude: |
-  class C
-    attr_reader :a, :b
-    def initialize
-      @a = nil
-      @b = nil
-    end
-  end
-  obj = C.new
-benchmark:
-  vm1_attr_ivar: |
-    j = obj.a
-    k = obj.b
-loop_count: 30000000
diff --git a/benchmark/vm1_attr_ivar_set.yml b/benchmark/vm1_attr_ivar_set.yml
deleted file mode 100644
index f383e59ef4..0000000000
--- a/benchmark/vm1_attr_ivar_set.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-prelude: |
-  class C
-    attr_accessor :a, :b
-    def initialize
-      @a = nil
-      @b = nil
-    end
-  end
-  obj = C.new
-benchmark:
-  vm1_attr_ivar_set: |
-    obj.a = 1
-    obj.b = 2
-loop_count: 30000000
diff --git a/benchmark/vm1_block.yml b/benchmark/vm1_block.yml
deleted file mode 100644
index ac7c940f93..0000000000
--- a/benchmark/vm1_block.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-prelude: |
-  def m
-    yield
-  end
-benchmark:
-  vm1_block: |
-    m{
-    }
-loop_count: 30000000
diff --git a/benchmark/vm1_blockparam.yml b/benchmark/vm1_blockparam.yml
deleted file mode 100644
index 947b8c53d5..0000000000
--- a/benchmark/vm1_blockparam.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  def m &b
-  end
-benchmark:
-  vm1_blockparam: |
-    m{}
-loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_call.yml b/benchmark/vm1_blockparam_call.yml
deleted file mode 100644
index e2817a3ce2..0000000000
--- a/benchmark/vm1_blockparam_call.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  def m &b
-    b.call
-  end
-benchmark:
-  vm1_blockparam_call: |
-    m{}
-loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_pass.yml b/benchmark/vm1_blockparam_pass.yml
deleted file mode 100644
index ca1bef3369..0000000000
--- a/benchmark/vm1_blockparam_pass.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-prelude: |
-  def bp_yield
-    yield
-  end
-
-  def bp_pass &b
-    bp_yield &b
-  end
-benchmark:
-  vm1_blockparam_pass: |
-    bp_pass{}
-loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_yield.yml b/benchmark/vm1_blockparam_yield.yml
deleted file mode 100644
index 56ae617798..0000000000
--- a/benchmark/vm1_blockparam_yield.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  def bp_yield &b
-    yield
-  end
-benchmark:
-  vm1_blockparam_yield: |
-    bp_yield{}
-loop_count: 30000000
diff --git a/benchmark/vm1_const.yml b/benchmark/vm1_const.yml
deleted file mode 100644
index b98db1545c..0000000000
--- a/benchmark/vm1_const.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  Const = 1
-benchmark:
-  vm1_const: |
-    j = Const
-    k = Const
-loop_count: 30000000
diff --git a/benchmark/vm1_ensure.yml b/benchmark/vm1_ensure.yml
deleted file mode 100644
index afbbe38bec..0000000000
--- a/benchmark/vm1_ensure.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Not utilizing loop_count since using it for this is too unstable for now
-benchmark:
-  vm1_ensure: |
-    i = 0
-    while i<30_000_000
-      i += 1
-      begin
-        begin
-        ensure
-        end
-      ensure
-      end
-    end
-loop_count: 1
diff --git a/benchmark/vm1_float_simple.yml b/benchmark/vm1_float_simple.yml
deleted file mode 100644
index 4e9ad1852b..0000000000
--- a/benchmark/vm1_float_simple.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  f = 0.0
-benchmark:
-  vm1_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/vm1_gc_short_lived.yml b/benchmark/vm1_gc_short_lived.yml
deleted file mode 100644
index 8fdcb7371d..0000000000
--- a/benchmark/vm1_gc_short_lived.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-benchmark:
-  vm1_gc_short_lived: |
-    a = '' # short-lived String
-    b = ''
-    c = ''
-    d = ''
-    e = ''
-    f = ''
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_complex_long.yml b/benchmark/vm1_gc_short_with_complex_long.yml
deleted file mode 100644
index c22ea74a60..0000000000
--- a/benchmark/vm1_gc_short_with_complex_long.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-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:
-  vm1_gc_short_with_complex_long: |
-    a = '' # short-lived String
-    b = ''
-    c = ''
-    d = ''
-    e = ''
-    f = ''
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_long.yml b/benchmark/vm1_gc_short_with_long.yml
deleted file mode 100644
index c731aae548..0000000000
--- a/benchmark/vm1_gc_short_with_long.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-prelude: |
-  long_lived = Array.new(1_000_000){|i| "#{i}"}
-  GC.start
-  GC.start
-benchmark:
-  vm1_gc_short_with_long: |
-    a = '' # short-lived String
-    b = ''
-    c = ''
-    d = ''
-    e = ''
-    f = ''
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_symbol.yml b/benchmark/vm1_gc_short_with_symbol.yml
deleted file mode 100644
index 7fc1abedd8..0000000000
--- a/benchmark/vm1_gc_short_with_symbol.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-prelude: |
-  50_000.times{|i| sym = "sym#{i}".to_sym}
-  GC.start
-  GC.start
-benchmark:
-  vm1_gc_short_with_symbol: |
-    a = '' # short-lived String
-    b = ''
-    c = ''
-    d = ''
-    e = ''
-    f = ''
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_ary.yml b/benchmark/vm1_gc_wb_ary.yml
deleted file mode 100644
index 50fb4b6f84..0000000000
--- a/benchmark/vm1_gc_wb_ary.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-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:
-  vm1_gc_wb_ary: |
-    short_lived_ary[0] = short_lived # write barrier
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_ary_promoted.yml b/benchmark/vm1_gc_wb_ary_promoted.yml
deleted file mode 100644
index cf9b5de005..0000000000
--- a/benchmark/vm1_gc_wb_ary_promoted.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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:
-  vm1_gc_wb_ary_promoted: |
-    long_lived[0] = short_lived # write barrier
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_obj.yml b/benchmark/vm1_gc_wb_obj.yml
deleted file mode 100644
index 9dc08e7e1a..0000000000
--- a/benchmark/vm1_gc_wb_obj.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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:
-  vm1_gc_wb_obj: |
-    short_lived_obj.foo = short_lived # write barrier
-loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_obj_promoted.yml b/benchmark/vm1_gc_wb_obj_promoted.yml
deleted file mode 100644
index 26859d2a52..0000000000
--- a/benchmark/vm1_gc_wb_obj_promoted.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-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:
-  vm1_gc_wb_obj_promoted: |
-    long_lived.foo = short_lived # write barrier
-loop_count: 30000000
diff --git a/benchmark/vm1_ivar.yml b/benchmark/vm1_ivar.yml
deleted file mode 100644
index 7aa6fac729..0000000000
--- a/benchmark/vm1_ivar.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-prelude: "@a = 1\n"
-benchmark:
-  vm1_ivar: |
-    j = @a
-    k = @a
-loop_count: 30000000
diff --git a/benchmark/vm1_ivar_set.yml b/benchmark/vm1_ivar_set.yml
deleted file mode 100644
index 6f19412d16..0000000000
--- a/benchmark/vm1_ivar_set.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-benchmark:
-  vm1_ivar_set: |
-    @a = 1
-    @b = 2
-loop_count: 30000000
diff --git a/benchmark/vm1_length.yml b/benchmark/vm1_length.yml
deleted file mode 100644
index a18e2ca2e6..0000000000
--- a/benchmark/vm1_length.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  a = 'abc'
-  b = [1, 2, 3]
-benchmark:
-  vm1_length: |
-    a.length
-    b.length
-loop_count: 30000000
diff --git a/benchmark/vm1_lvar_init.yml b/benchmark/vm1_lvar_init.yml
deleted file mode 100644
index 10e2becef9..0000000000
--- a/benchmark/vm1_lvar_init.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# while loop cost is not removed because `i` is used in the script
-benchmark:
-  vm1_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/vm1_lvar_set.yml b/benchmark/vm1_lvar_set.yml
deleted file mode 100644
index df8f6b6ea4..0000000000
--- a/benchmark/vm1_lvar_set.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm1_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/vm1_neq.yml b/benchmark/vm1_neq.yml
deleted file mode 100644
index 65a8128dda..0000000000
--- a/benchmark/vm1_neq.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  obj1 = Object.new
-  obj2 = Object.new
-benchmark:
-  vm1_neq: |
-    obj1 != obj2
-loop_count: 30000000
diff --git a/benchmark/vm1_not.yml b/benchmark/vm1_not.yml
deleted file mode 100644
index 0fb7b282a9..0000000000
--- a/benchmark/vm1_not.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-prelude: |
-  obj = Object.new
-benchmark:
-  vm1_not: |
-    !obj
-loop_count: 30000000
diff --git a/benchmark/vm1_rescue.yml b/benchmark/vm1_rescue.yml
deleted file mode 100644
index a175b823af..0000000000
--- a/benchmark/vm1_rescue.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-benchmark:
-  vm1_rescue: |
-    begin
-    rescue
-    end
-loop_count: 30000000
diff --git a/benchmark/vm1_simplereturn.yml b/benchmark/vm1_simplereturn.yml
deleted file mode 100644
index 3564aac7e2..0000000000
--- a/benchmark/vm1_simplereturn.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  def m
-    return 1
-  end
-benchmark:
-  vm1_simplereturn: m
-loop_count: 30000000
diff --git a/benchmark/vm1_swap.yml b/benchmark/vm1_swap.yml
deleted file mode 100644
index fed87ccd62..0000000000
--- a/benchmark/vm1_swap.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  a = 1
-  b = 2
-benchmark:
-  vm1_swap: |
-    a, b = b, a
-loop_count: 30000000
diff --git a/benchmark/vm1_yield.yml b/benchmark/vm1_yield.yml
deleted file mode 100644
index ae1f9316f9..0000000000
--- a/benchmark/vm1_yield.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# while loop cost is not removed due to benchmark_driver.gem's limitation
-benchmark:
-  vm1_yield: |
-    def m
-      i = 0
-      while i<30_000_000
-        i += 1
-        yield
-      end
-    end
-
-    m{}
-loop_count: 1
diff --git a/benchmark/vm2_array.yml b/benchmark/vm2_array.yml
deleted file mode 100644
index 7373098d5e..0000000000
--- a/benchmark/vm2_array.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_array: |
-    a = [1,2,3,4,5,6,7,8,9,10]
-loop_count: 6000000
diff --git a/benchmark/vm2_bigarray.yml b/benchmark/vm2_bigarray.yml
deleted file mode 100644
index 2ad6da3905..0000000000
--- a/benchmark/vm2_bigarray.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-benchmark:
-  vm2_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/vm2_bighash.yml b/benchmark/vm2_bighash.yml
deleted file mode 100644
index e9154e4ba9..0000000000
--- a/benchmark/vm2_bighash.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_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/vm2_case.yml b/benchmark/vm2_case.yml
deleted file mode 100644
index 7716783c09..0000000000
--- a/benchmark/vm2_case.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-benchmark:
-  vm2_case: |
-    case :foo
-    when :bar
-      raise
-    when :baz
-      raise
-    when :boo
-      raise
-    when :foo
-      # noop
-    end
-loop_count: 6000000
diff --git a/benchmark/vm2_case_lit.yml b/benchmark/vm2_case_lit.yml
deleted file mode 100644
index c49b8dfe5e..0000000000
--- a/benchmark/vm2_case_lit.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_defined_method.yml b/benchmark/vm2_defined_method.yml
deleted file mode 100644
index e1b0d55674..0000000000
--- a/benchmark/vm2_defined_method.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  class Object
-    define_method(:m){}
-  end
-benchmark:
-  vm2_defined_method: |
-    m; m; m; m; m; m; m; m;
-loop_count: 6000000
diff --git a/benchmark/vm2_dstr.yml b/benchmark/vm2_dstr.yml
deleted file mode 100644
index f8bd6e0133..0000000000
--- a/benchmark/vm2_dstr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-prelude: |
-  x = y = 'z'
-benchmark:
-  vm2_dstr: |
-    str = "foo#{x}bar#{y}baz"
-loop_count: 6000000
diff --git a/benchmark/vm2_eval.yml b/benchmark/vm2_eval.yml
deleted file mode 100644
index d506a9c079..0000000000
--- a/benchmark/vm2_eval.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_eval: |
-    eval("1")
-loop_count: 6000000
diff --git a/benchmark/vm2_fiber_switch.yml b/benchmark/vm2_fiber_switch.yml
deleted file mode 100644
index f3e4c91283..0000000000
--- a/benchmark/vm2_fiber_switch.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-prelude: |
-  # based on benchmark for [ruby-core:65518] [Feature #10341] by Knut Franke
-  fib = Fiber.new do
-    loop { Fiber.yield }
-  end
-benchmark:
-  vm2_fiber_switch: |
-    fib.resume
-loop_count: 6000000
diff --git a/benchmark/vm2_freezestring.yml b/benchmark/vm2_freezestring.yml
deleted file mode 100644
index b78af91a20..0000000000
--- a/benchmark/vm2_freezestring.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-prelude: |
-  class String
-    def freeze
-      -self
-    end
-  end
-benchmark:
-  vm2_freezestring: |
-    "tXnL1BP5T1WPXMjuFNLQtallEtRcay1t2lHtJSrlVsDgvunlbtfpr/DGdH0NGYE9".freeze
-loop_count: 6000000
diff --git a/benchmark/vm2_method.yml b/benchmark/vm2_method.yml
deleted file mode 100644
index cc7b9b28ff..0000000000
--- a/benchmark/vm2_method.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  def m
-    nil
-  end
-benchmark:
-  vm2_method: |
-    m; m; m; m; m; m; m; m;
-loop_count: 6000000
diff --git a/benchmark/vm2_method_missing.yml b/benchmark/vm2_method_missing.yml
deleted file mode 100644
index cbfb794b25..0000000000
--- a/benchmark/vm2_method_missing.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-prelude: |
-  class C
-    def method_missing mid
-    end
-  end
-
-  obj = C.new
-benchmark:
-  vm2_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/vm2_method_with_block.yml b/benchmark/vm2_method_with_block.yml
deleted file mode 100644
index 6e522adccc..0000000000
--- a/benchmark/vm2_method_with_block.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  def m
-    nil
-  end
-benchmark:
-  vm2_method_with_block: |
-    m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
-loop_count: 6000000
diff --git a/benchmark/vm2_module_ann_const_set.yml b/benchmark/vm2_module_ann_const_set.yml
deleted file mode 100644
index b0becd9d3d..0000000000
--- a/benchmark/vm2_module_ann_const_set.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_module_ann_const_set: |
-    Module.new.const_set(:X, Module.new)
-loop_count: 6000000
diff --git a/benchmark/vm2_module_const_set.yml b/benchmark/vm2_module_const_set.yml
deleted file mode 100644
index 05a640069c..0000000000
--- a/benchmark/vm2_module_const_set.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  module M
-  end
-  $VERBOSE = nil
-benchmark:
-  vm2_module_const_set: |
-    M.const_set(:X, Module.new)
-loop_count: 6000000
diff --git a/benchmark/vm2_mutex.yml b/benchmark/vm2_mutex.yml
deleted file mode 100644
index c40a90444a..0000000000
--- a/benchmark/vm2_mutex.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-prelude: |
-  require 'thread'
-
-  m = Thread::Mutex.new
-benchmark:
-  vm2_mutex: |
-    m.synchronize{}
-loop_count: 6000000
diff --git a/benchmark/vm2_newlambda.yml b/benchmark/vm2_newlambda.yml
deleted file mode 100644
index 93133f9f30..0000000000
--- a/benchmark/vm2_newlambda.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_newlambda: |
-    lambda {}
-loop_count: 6000000
diff --git a/benchmark/vm2_poly_method.yml b/benchmark/vm2_poly_method.yml
deleted file mode 100644
index 0104bdfb66..0000000000
--- a/benchmark/vm2_poly_method.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_poly_method_ov.yml b/benchmark/vm2_poly_method_ov.yml
deleted file mode 100644
index 3748073ba2..0000000000
--- a/benchmark/vm2_poly_method_ov.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_poly_singleton.yml b/benchmark/vm2_poly_singleton.yml
deleted file mode 100644
index e58d7bfb37..0000000000
--- a/benchmark/vm2_poly_singleton.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_proc.yml b/benchmark/vm2_proc.yml
deleted file mode 100644
index 5c36e936d9..0000000000
--- a/benchmark/vm2_proc.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-prelude: |
-  def m &b
-    b
-  end
-
-  pr = m{
-    a = 1
-  }
-benchmark:
-  vm2_proc: |
-    pr.call
-loop_count: 6000000
diff --git a/benchmark/vm2_raise1.yml b/benchmark/vm2_raise1.yml
deleted file mode 100644
index f6eb308968..0000000000
--- a/benchmark/vm2_raise1.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-prelude: |
-  def rec n
-    if n > 0
-      rec n-1
-    else
-      raise
-    end
-  end
-benchmark:
-  vm2_raise1: |
-    begin
-      rec 1
-    rescue
-      # ignore
-    end
-loop_count: 6000000
diff --git a/benchmark/vm2_raise2.yml b/benchmark/vm2_raise2.yml
deleted file mode 100644
index 7d51b1b314..0000000000
--- a/benchmark/vm2_raise2.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-prelude: |
-  def rec n
-    if n > 0
-      rec n-1
-    else
-      raise
-    end
-  end
-benchmark:
-  vm2_raise2: |
-    begin
-      rec 10
-    rescue
-      # ignore
-    end
-loop_count: 6000000
diff --git a/benchmark/vm2_regexp.yml b/benchmark/vm2_regexp.yml
deleted file mode 100644
index 0f3968a99b..0000000000
--- a/benchmark/vm2_regexp.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-prelude: |
-  str = 'xxxhogexxx'
-benchmark:
-  vm2_regexp: |
-    /hoge/ =~ str
-loop_count: 6000000
diff --git a/benchmark/vm2_send.yml b/benchmark/vm2_send.yml
deleted file mode 100644
index 44a12a27d9..0000000000
--- a/benchmark/vm2_send.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-prelude: |
-  class C
-    def m
-    end
-  end
-
-  o = C.new
-benchmark:
-  vm2_send: |
-    o.__send__ :m
-loop_count: 6000000
diff --git a/benchmark/vm2_string_literal.yml b/benchmark/vm2_string_literal.yml
deleted file mode 100644
index 54b0aec1fe..0000000000
--- a/benchmark/vm2_string_literal.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-benchmark:
-  vm2_string_literal: |
-    x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aref_hi.yml b/benchmark/vm2_struct_big_aref_hi.yml
deleted file mode 100644
index eed1846d28..0000000000
--- a/benchmark/vm2_struct_big_aref_hi.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
-benchmark:
-  vm2_struct_big_aref_hi: |
-    x.z # x[25]
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aref_lo.yml b/benchmark/vm2_struct_big_aref_lo.yml
deleted file mode 100644
index 0915435b76..0000000000
--- a/benchmark/vm2_struct_big_aref_lo.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
-benchmark:
-  vm2_struct_big_aref_lo: |
-    x.k # x[10]
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aset.yml b/benchmark/vm2_struct_big_aset.yml
deleted file mode 100644
index 6af50103d3..0000000000
--- a/benchmark/vm2_struct_big_aset.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_struct_big_href_hi.yml b/benchmark/vm2_struct_big_href_hi.yml
deleted file mode 100644
index 60aa7fddf3..0000000000
--- a/benchmark/vm2_struct_big_href_hi.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
-benchmark:
-  vm2_struct_big_href_hi: |
-    x[:z]
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_href_lo.yml b/benchmark/vm2_struct_big_href_lo.yml
deleted file mode 100644
index c55c0bd16c..0000000000
--- a/benchmark/vm2_struct_big_href_lo.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
-benchmark:
-  vm2_struct_big_href_lo: |
-    x[:k]
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_hset.yml b/benchmark/vm2_struct_big_hset.yml
deleted file mode 100644
index d199c5bd47..0000000000
--- a/benchmark/vm2_struct_big_hset.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_struct_small_aref.yml b/benchmark/vm2_struct_small_aref.yml
deleted file mode 100644
index 83381bed3a..0000000000
--- a/benchmark/vm2_struct_small_aref.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(:a, :b, :c)
-  x = s.new
-benchmark:
-  vm2_struct_small_aref: |
-    x.a
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_small_aset.yml b/benchmark/vm2_struct_small_aset.yml
deleted file mode 100644
index 3e84a61dd0..0000000000
--- a/benchmark/vm2_struct_small_aset.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# loop_count is not utilized since `i` is involved in the script
-benchmark:
-  vm2_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/vm2_struct_small_href.yml b/benchmark/vm2_struct_small_href.yml
deleted file mode 100644
index b744f070d1..0000000000
--- a/benchmark/vm2_struct_small_href.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(:a, :b, :c)
-  x = s.new
-benchmark:
-  vm2_struct_small_href: |
-    x[:a]
-loop_count: 6000000
diff --git a/benchmark/vm2_struct_small_hset.yml b/benchmark/vm2_struct_small_hset.yml
deleted file mode 100644
index d43845d6e0..0000000000
--- a/benchmark/vm2_struct_small_hset.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  s = Struct.new(:a, :b, :c)
-  x = s.new
-benchmark:
-  vm2_struct_small_hset: |
-    x[:a] = 1
-loop_count: 6000000
diff --git a/benchmark/vm2_super.yml b/benchmark/vm2_super.yml
deleted file mode 100644
index 674743762a..0000000000
--- a/benchmark/vm2_super.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-prelude: |
-  class C
-    def m
-      1
-    end
-  end
-
-  class CC < C
-    def m
-      super()
-    end
-  end
-
-  obj = CC.new
-benchmark:
-  vm2_super: obj.m
-loop_count: 6000000
diff --git a/benchmark/vm2_unif1.yml b/benchmark/vm2_unif1.yml
deleted file mode 100644
index caef13279f..0000000000
--- a/benchmark/vm2_unif1.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-prelude: |
-  def m a, b
-  end
-benchmark:
-  vm2_unif1: |
-    m 100, 200
-loop_count: 6000000
diff --git a/benchmark/vm2_zsuper.yml b/benchmark/vm2_zsuper.yml
deleted file mode 100644
index f760cfd48e..0000000000
--- a/benchmark/vm2_zsuper.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-prelude: |
-  class C
-    def m a
-      1
-    end
-  end
-
-  class CC < C
-    def m a
-      super
-    end
-  end
-
-  obj = CC.new
-benchmark:
-  vm2_zsuper: |
-    obj.m 10
-loop_count: 6000000
diff --git a/benchmark/vm_thread_condvar1.rb b/benchmark/vm_thread_condvar1.rb
deleted file mode 100644
index cf5706b23e..0000000000
--- a/benchmark/vm_thread_condvar1.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
deleted file mode 100644
index 7c8dc19481..0000000000
--- a/benchmark/vm_thread_condvar2.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/vm_thread_pass_flood.rb b/benchmark/vm_thread_pass_flood.rb
deleted file mode 100644
index a660aafc18..0000000000
--- a/benchmark/vm_thread_pass_flood.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# n.b. this is a good test for GVL when pinned to a single CPU
-
-1000.times{
-  Thread.new{loop{Thread.pass}}
-}
-
-i = 0
-while i<10000
-  i += 1
-end
diff --git a/benchmark/vm_thread_sized_queue.rb b/benchmark/vm_thread_sized_queue.rb
deleted file mode 100644
index 7b9af5482b..0000000000
--- a/benchmark/vm_thread_sized_queue.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index de9f55e978..0000000000
--- a/benchmark/vm_thread_sized_queue2.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index ce5f1796d8..0000000000
--- a/benchmark/vm_thread_sized_queue3.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index a9b7d80ec0..0000000000
--- a/benchmark/vm_thread_sized_queue4.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-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/wc.input.base b/benchmark/wc.input.base
new file mode 100644
index 0000000000..41143fbac0
--- /dev/null
+++ b/benchmark/wc.input.base
@@ -0,0 +1,25 @@
+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 ee3b49fd04..741fa2d21e 100644
--- a/bignum.c
+++ b/bignum.c
@@ -12,7 +12,6 @@
 #include "internal.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
-#include "id.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -65,6 +64,7 @@ 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,11 +138,6 @@ 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);
 
@@ -385,7 +380,6 @@ 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);
 
@@ -394,12 +388,11 @@ bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
     if (xn > yn)
         return 1;
 
-    for (i = 0; i < xn; i++)
-        if (xds[xn - i - 1] != yds[yn - i - 1])
-            break;
-    if (i == xn)
+    while (xn-- && xds[xn] == yds[xn])
+        ;
+    if (xn == (size_t)-1)
         return 0;
-    return xds[xn - i - 1] < yds[yn - i - 1] ? -1 : 1;
+    return xds[xn] < yds[xn] ? -1 : 1;
 }
 
 static BDIGIT
@@ -420,22 +413,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);
-    for (i = 0; i < n; i++) {
-        BDIGIT x = xds[n - i - 1];
-	num = (num | x) >> shift;
-        zds[n - i - 1] = BIGLO(num);
+    while (n--) {
+	num = (num | xds[n]) >> shift;
+        x = xds[n];
+	zds[n] = BIGLO(num);
 	num = BIGUP(x);
     }
 }
 
 static int
-bary_zero_p(const BDIGIT *xds, size_t xn)
+bary_zero_p(BDIGIT *xds, size_t xn)
 {
     if (xn == 0)
         return 1;
@@ -448,9 +441,8 @@ bary_zero_p(const BDIGIT *xds, size_t xn)
 static void
 bary_neg(BDIGIT *ds, size_t n)
 {
-    size_t i;
-    for (i = 0; i < n; i++)
-        ds[n - i - 1] = BIGLO(~ds[n - i - 1]);
+    while (n--)
+        ds[n] = BIGLO(~ds[n]);
 }
 
 static int
@@ -620,12 +612,8 @@ static int
 bytes_2comp(unsigned char *buf, size_t len)
 {
     size_t 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] = ~buf[i];
     for (i = 0; i < len; i++) {
         buf[i]++;
         if (buf[i] != 0)
@@ -675,7 +663,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 % RUBY_ALIGNOF(uint16_t) == 0) {
+                if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
                     uint16_t u = (uint16_t)(d = dp[0]);
                     if (need_swap) u = swap16(u);
                     *((uint16_t *)words) = u;
@@ -683,7 +671,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 % RUBY_ALIGNOF(uint32_t) == 0) {
+                if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
                     uint32_t u = (uint32_t)(d = dp[0]);
                     if (need_swap) u = swap32(u);
                     *((uint32_t *)words) = u;
@@ -691,7 +679,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 % RUBY_ALIGNOF(uint64_t) == 0) {
+                if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
                     uint64_t u = (uint64_t)(d = dp[0]);
                     if (need_swap) u = swap64(u);
                     *((uint64_t *)words) = u;
@@ -706,7 +694,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 % RUBY_ALIGNOF(uint16_t) == 0) {
+                if (wordsize == 2 && (uintptr_t)words % 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;
@@ -715,7 +703,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 % RUBY_ALIGNOF(uint32_t) == 0) {
+                if (wordsize == 4 && (uintptr_t)words % 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;
@@ -724,7 +712,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 % RUBY_ALIGNOF(uint64_t) == 0) {
+                if (wordsize == 8 && (uintptr_t)words % 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;
@@ -767,7 +755,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 % RUBY_ALIGNOF(BDIGIT) == 0) {
+            wordsize % SIZEOF_BDIGIT == 0 && (uintptr_t)words % 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;
@@ -910,6 +898,8 @@ 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;
 
@@ -1087,13 +1077,6 @@ 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)
 {
@@ -1114,24 +1097,23 @@ 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 % RUBY_ALIGNOF(uint16_t) == 0) {
-                uint16_t u = *reinterpret_cast(const uint16_t *, buf);
+            if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                uint16_t u = *(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 % RUBY_ALIGNOF(uint32_t) == 0) {
-                uint32_t u = *reinterpret_cast(const uint32_t *, buf);
+            if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
+                uint32_t u = *(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 % RUBY_ALIGNOF(uint64_t) == 0) {
-                uint64_t u = *reinterpret_cast(const uint64_t *, buf);
+            if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
+                uint64_t u = *(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) &&
@@ -1447,9 +1429,7 @@ bary_add_one(BDIGIT *ds, size_t n)
 {
     size_t i;
     for (i = 0; i < n; i++) {
-        BDIGIT_DBL n = ds[i];
-        n += 1;
-        ds[i] = BIGLO(n);
+	ds[i] = BIGLO(ds[i]+1);
         if (ds[i] != 0)
             return 0;
     }
@@ -1517,16 +1497,15 @@ bigdivrem_mulsub(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
     i = 0;
 
     do {
-        BDIGIT_DBL_SIGNED ee;
+        BDIGIT_DBL ee;
         t2 += (BDIGIT_DBL)yds[i] * x;
         ee = num - BIGLO(t2);
-        num = (BDIGIT_DBL_SIGNED)zds[i] + ee;
+        num = (BDIGIT_DBL)zds[i] + ee;
         if (ee) zds[i] = BIGLO(num);
         num = BIGDN(num);
         t2 = BIGDN(t2);
     } while (++i < yn);
-    num -= (BDIGIT_DBL_SIGNED)t2;
-    num += (BDIGIT_DBL_SIGNED)zds[yn]; /* borrow from high digit; don't update */
+    num += zds[i] - t2; /* borrow from high digit; don't update */
     return num;
 }
 
@@ -2508,8 +2487,13 @@ 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_MUL_DIGITS) {
+        if (xn < naive_threshold) {
             if (xds == yds && xn == yn)
                 bary_sq_fast(zds, zn, xds, xn);
             else
@@ -2518,7 +2502,7 @@ bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds
         }
     }
     else {
-        if (yn < NAIVE_MUL_DIGITS) {
+        if (yn < naive_threshold) {
             bary_short_mul(zds, zn, yds, yn, xds, xn);
             return;
         }
@@ -2594,9 +2578,10 @@ bigdivrem_single1(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT x_higher_bdi
         size_t i;
         BDIGIT_DBL t2;
         t2 = x_higher_bdigit;
-        for (i = 0; i < xn; i++) {
-            t2 = BIGUP(t2) + xds[xn - i - 1];
-            qds[xn - i - 1] = (BDIGIT)(t2 / y);
+        i = xn;
+        while (i--) {
+            t2 = BIGUP(t2) + xds[i];
+            qds[i] = (BDIGIT)(t2 / y);
             t2 %= y;
         }
         return (BDIGIT)t2;
@@ -3154,7 +3139,7 @@ rb_big_norm(VALUE x)
 }
 
 VALUE
-rb_uint2big(uintptr_t n)
+rb_uint2big(VALUE n)
 {
     long i;
     VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
@@ -3176,7 +3161,7 @@ rb_uint2big(uintptr_t n)
 }
 
 VALUE
-rb_int2big(intptr_t n)
+rb_int2big(SIGNED_VALUE n)
 {
     long neg = 0;
     VALUE u;
@@ -3197,14 +3182,14 @@ rb_int2big(intptr_t n)
 }
 
 VALUE
-rb_uint2inum(uintptr_t n)
+rb_uint2inum(VALUE n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(intptr_t n)
+rb_int2inum(SIGNED_VALUE n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_int2big(n);
@@ -4026,28 +4011,22 @@ 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_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
-		  int base, int flags)
+rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 {
     const char *const s = str;
     char sign = 1;
     int c;
-    VALUE z = Qnil;
+    VALUE z;
 
     unsigned long val;
     int ov;
 
     const char *digits_start, *digits_end;
-    size_t num_digits = 0;
+    size_t num_digits;
     size_t num_bdigits;
     const ssize_t len0 = len;
     const int badcheck = !endp;
@@ -4065,10 +4044,9 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
     if (!str) {
       bad:
 	if (endp) *endp = (char *)str;
-	if (ndigits) *ndigits = num_digits;
-	return z;
+	return Qnil;
     }
-    if (len && (flags & RB_INT_PARSE_SIGN)) {
+    if (len) {
 	while (ISSPACE(*str)) ADV(1);
 
 	if (str[0] == '+') {
@@ -4079,6 +4057,9 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
 	    sign = 0;
 	}
 	ASSERT_LEN();
+	if (str[0] == '+' || str[0] == '-') {
+	    goto bad;
+	}
     }
     if (base <= 0) {
 	if (str[0] == '0' && len > 1) {
@@ -4110,7 +4091,7 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
 	    base = 10;
 	}
     }
-    else if (len == 1 || !(flags & RB_INT_PARSE_PREFIX)) {
+    else if (len == 1) {
 	/* no prefix */
     }
     else if (base == 2) {
@@ -4137,19 +4118,15 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
         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;
-	++num_digits;
-	while ((c = *++str) == '0' ||
-	       ((flags & RB_INT_PARSE_UNDERSCORE) && c == '_')) {
+	while ((c = *++str) == '0' || c == '_') {
 	    if (c == '_') {
 		if (++us >= 2)
 		    break;
 	    }
 	    else {
-		++num_digits;
 		us = 0;
 	    }
 	    if (str == end) break;
@@ -4161,18 +4138,14 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
     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 == '_' && (flags & RB_INT_PARSE_UNDERSCORE))
-	    goto bigparse;
+	if (num_digits > 0 && *end == '_') 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) {
@@ -4199,8 +4172,6 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
     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)) {
@@ -4233,14 +4204,7 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
 }
 
 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_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception)
+rb_str_to_inum(VALUE str, int base, int badcheck)
 {
     VALUE ret;
     const char *s;
@@ -4252,22 +4216,13 @@ rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception)
     RSTRING_GETMEM(str, s, len);
     ret = rb_cstr_parse_inum(s, len, (badcheck ? NULL : &end), base);
     if (NIL_P(ret)) {
-        if (badcheck) {
-            if (!raise_exception) return Qnil;
-            invalid_integer(str);
-        }
-        ret = INT2FIX(0);
+	if (badcheck) 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;
@@ -4509,7 +4464,7 @@ rb_uint128t2big(uint128_t n)
     return big;
 }
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_int128t2big(int128_t n)
 {
     int neg = 0;
@@ -5093,9 +5048,6 @@ 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;
@@ -5110,9 +5062,9 @@ big2ulong(VALUE x, const char *type)
     num = (unsigned long)ds[0];
 #else
     num = 0;
-    for (i = 0; i < len; i++) {
+    while (len--) {
 	num <<= BITSPERDIG;
-        num += (unsigned long)ds[len - i - 1]; /* overflow is already checked */
+	num += (unsigned long)ds[len]; /* overflow is already checked */
     }
 #endif
     return num;
@@ -5154,9 +5106,6 @@ 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);
@@ -5169,9 +5118,9 @@ big2ull(VALUE x, const char *type)
     num = (unsigned LONG_LONG)ds[0];
 #else
     num = 0;
-    for (i = 0; i < len; i++) {
+    while (len--) {
 	num = BIGUP(num);
-        num += ds[len - i - 1];
+	num += ds[len];
     }
 #endif
     return num;
@@ -5278,13 +5227,8 @@ big2dbl(VALUE x)
 		    }
 		}
 		if (carry) {
-                    BDIGIT mask = BDIGMAX;
-                    BDIGIT bit = 1;
-                    mask <<= bits;
-                    bit <<= bits;
-                    dl &= mask;
-                    dl += bit;
-                    dl = BIGLO(dl);
+		    dl &= BDIGMAX << bits;
+		    dl = BIGLO(dl + ((BDIGIT)1 << bits));
 		    if (!dl) d += 1;
 		}
 	    }
@@ -5423,7 +5367,7 @@ rb_big_cmp(VALUE x, VALUE y)
         return rb_integer_float_cmp(x, y);
     }
     else {
-	return rb_num_coerce_cmp(x, y, idCmp);
+	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
     return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
 }
@@ -5441,7 +5385,7 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     VALUE rel;
     int n;
 
-    if (RB_INTEGER_TYPE_P(y)) {
+    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
 	rel = rb_big_cmp(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
@@ -5451,9 +5395,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 = idGE; break;
+	  case big_op_ge: id = rb_intern(">="); break;
 	  case big_op_lt: id = '<'; break;
-	  case big_op_le: id = idLE; break;
+	  case big_op_le: id = rb_intern("<="); break;
 	}
 	return rb_num_coerce_relop(x, y, id);
     }
@@ -5499,8 +5443,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>Integer#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Integer</code>.
+ *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
+ *  requires <i>obj</i> to be a <code>Bignum</code>.
  *
  *     68719476736 == 68719476736.0   #=> true
  */
@@ -5878,10 +5822,17 @@ bigsq(VALUE x)
     xds = BDIGITS(x);
     zds = BDIGITS(z);
 
-    if (xn < NAIVE_MUL_DIGITS)
+#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)
         bary_sq_fast(zds, zn, xds, xn);
     else
         bary_mul(zds, zn, xds, xn, xds, xn);
+#endif
 
     RB_GC_GUARD(x);
     return z;
@@ -5963,7 +5914,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((uintptr_t)dd);
+	    *modp = rb_uint2big((VALUE)dd);
 	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
@@ -6053,15 +6004,12 @@ rb_big_divide(VALUE x, VALUE y, ID op)
     }
     else if (RB_FLOAT_TYPE_P(y)) {
 	if (op == '/') {
-            double dx = rb_big2dbl(x);
-            return rb_flo_div_flo(DBL2NUM(dx), y);
+	    return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
 	}
 	else {
-            VALUE v;
 	    double dy = RFLOAT_VALUE(y);
 	    if (dy == 0.0) rb_num_zerodiv();
-            v = rb_big_divide(x, y, '/');
-            return rb_dbl2big(RFLOAT_VALUE(v));
+	    return rb_dbl2big(rb_big2dbl(x) / dy);
 	}
     }
     else {
@@ -6142,11 +6090,10 @@ big_shift(VALUE x, long n)
     return x;
 }
 
-enum {DBL_BIGDIG = ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)};
-
-static double
+static VALUE
 big_fdiv(VALUE x, VALUE y, long ey)
 {
+#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
     VALUE z;
     long l, ex;
 
@@ -6154,8 +6101,6 @@ 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);
@@ -6163,14 +6108,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 HUGE_VAL;
-	if (l < INT_MIN) return 0.0;
+	if (l > INT_MAX) return DBL2NUM(INFINITY);
+	if (l < INT_MIN) return DBL2NUM(0.0);
     }
 #endif
-    return ldexp(big2dbl(z), (int)l);
+    return DBL2NUM(ldexp(big2dbl(z), (int)l));
 }
 
-static double
+static VALUE
 big_fdiv_int(VALUE x, VALUE y)
 {
     long l, ey;
@@ -6182,7 +6127,7 @@ big_fdiv_int(VALUE x, VALUE y)
     return big_fdiv(x, y, ey);
 }
 
-static double
+static VALUE
 big_fdiv_float(VALUE x, VALUE y)
 {
     int i;
@@ -6190,11 +6135,10 @@ big_fdiv_float(VALUE x, VALUE y)
     return big_fdiv(x, y, i - DBL_MANT_DIG);
 }
 
-double
-rb_big_fdiv_double(VALUE x, VALUE y)
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
 {
     double dx, dy;
-    VALUE v;
 
     dx = big2dbl(x);
     if (FIXNUM_P(y)) {
@@ -6203,26 +6147,21 @@ rb_big_fdiv_double(VALUE x, VALUE y)
 	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	return big_fdiv_int(x, y);
+	dy = rb_big2dbl(y);
+	if (isinf(dx) || isinf(dy))
+	    return big_fdiv_int(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
 	dy = RFLOAT_VALUE(y);
 	if (isnan(dy))
-	    return dy;
+	    return y;
 	if (isinf(dx))
 	    return big_fdiv_float(x, y);
     }
     else {
-	return NUM2DBL(rb_num_coerce_bin(x, y, rb_intern("fdiv")));
+	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
-    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));
+    return DBL2NUM(dx / dy);
 }
 
 VALUE
@@ -6233,12 +6172,10 @@ 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))) {
-            return rb_dbl_complex_new_polar_pi(pow(-rb_big2dbl(x), d), d);
-	}
+	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x)) && d != round(d))
+	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
 	y = bignorm(y);
@@ -6250,13 +6187,8 @@ rb_big_pow(VALUE x, VALUE y)
     else if (FIXNUM_P(y)) {
 	yy = FIX2LONG(y);
 
-        if (yy < 0) {
-            x = rb_big_pow(x, INT2NUM(-yy));
-            if (RB_INTEGER_TYPE_P(x))
-                return rb_rational_raw(INT2FIX(1), x);
-            else
-                return DBL2NUM(1.0 / NUM2DBL(x));
-        }
+	if (yy < 0)
+	    return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
 	else {
 	    VALUE z = 0;
 	    SIGNED_VALUE mask;
@@ -6281,7 +6213,7 @@ rb_big_pow(VALUE x, VALUE y)
 	}
     }
     else {
-	return rb_num_coerce_bin(x, y, idPow);
+	return rb_num_coerce_bin(x, y, rb_intern("**"));
     }
     return DBL2NUM(pow(rb_big2dbl(x), d));
 }
@@ -6353,7 +6285,7 @@ rb_big_and(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '&');
     }
 
@@ -6472,7 +6404,7 @@ rb_big_or(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '|');
     }
 
@@ -6566,7 +6498,7 @@ rb_big_xor(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '^');
     }
 
@@ -6713,7 +6645,7 @@ rb_big_hash(VALUE x)
     st_index_t hash;
 
     hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*BIGNUM_LEN(x)) ^ BIGNUM_SIGN(x);
-    return ST2FIX(hash);
+    return INT2FIX(hash);
 }
 
 /*
@@ -6733,7 +6665,7 @@ rb_big_hash(VALUE x)
 static VALUE
 rb_int_coerce(VALUE x, VALUE y)
 {
-    if (RB_INTEGER_TYPE_P(y)) {
+    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
         return rb_assoc_new(y, x);
     }
     else {
@@ -6753,12 +6685,6 @@ rb_big_abs(VALUE x)
     return x;
 }
 
-int
-rb_big_sign(VALUE x)
-{
-    return BIGNUM_SIGN(x);
-}
-
 size_t
 rb_big_size(VALUE big)
 {
@@ -6830,308 +6756,6 @@ 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) {
-	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)
-{
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
-    mpz_t z, x, y, m;
-    size_t count;
-    mpz_init(x);
-    mpz_init(y);
-    mpz_init(m);
-    mpz_init(z);
-    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
-    mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
-    mpz_import(m, mn, -1, sizeof(BDIGIT), 0, nails, mds);
-    mpz_powm(z, x, y, m);
-    mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z);
-    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 <= 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();
-            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
@@ -7156,9 +6780,7 @@ 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
deleted file mode 100755
index 1a0b06b005..0000000000
--- a/bin/bundle
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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
deleted file mode 100755
index e15eb39ed7..0000000000
--- a/bin/bundler
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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 d5e51ee969..6a88c3b26a 100755
--- a/bin/erb
+++ b/bin/erb
@@ -75,7 +75,6 @@ class ERB
           when '-r'                        # require
             require ARGV.req_arg
           when '-S'                        # security level
-            warn 'warning: -S option of erb command is deprecated. Please do not use this.'
             arg = ARGV.req_arg
             raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/
             safe_level = arg.to_i
@@ -113,26 +112,22 @@ class ERB
   -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
+  -U               set default encoding to UTF-8.
   -T trim_mode     specify trim_mode (0..2, -)
-  -P               disable ruby code evaluation for lines beginning with %
+  -P               ignore lines which start with "%"
   var=value        set variable
 EOU
         exit 1
       end
 
-      $<.set_encoding(Encoding::UTF_8, nil)
+      $<.set_encoding(Encoding::ASCII_8BIT, nil)
       src = $<.read
       filename = $FILENAME
       exit 2 unless src
       trim = trim_mode_opt(trim_mode, disable_percent)
-      if safe_level.nil?
-        erb = factory.new(src.untaint, trim_mode: trim)
-      else
-        # [deprecated] This will be removed at Ruby 2.7.
-        erb = factory.new(src.untaint, safe_level, trim_mode: trim)
-      end
+      erb = factory.new(src.untaint, safe_level, trim)
       erb.filename = filename
       if output
         if number
diff --git a/bin/irb b/bin/irb
index ae6d358c9d..c64ee85fbd 100755
--- a/bin/irb
+++ b/bin/irb
@@ -1,27 +1,11 @@
 #!/usr/bin/env ruby
 #
-# This file was generated by RubyGems.
+#   irb.rb - interactive ruby
+#   	$Release Version: 0.9.6 $
+#   	$Revision$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
-# The application 'irb' 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
+require "irb"
 
-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
+IRB.start(__FILE__)
diff --git a/bin/rdoc b/bin/rdoc
index 8fa948cddb..aaa23292df 100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -1,27 +1,44 @@
 #!/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.
+#  RDoc: Documentation tool for source code
+#        (see lib/rdoc/rdoc.rb for more information)
 #
+#  Copyright (c) 2003 Dave Thomas
+#  Released under the same terms as Ruby
 
-require 'rubygems'
+begin
+  gem 'rdoc'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
+rescue Gem::LoadError
+end
 
-version = ">= 0.a"
+require 'rdoc/rdoc'
 
-str = ARGV.first
-if str
-  str = str.b[/\A_(.*)_\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
-    ARGV.shift
+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"
   end
-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)
+  exit 1
 end
+
diff --git a/bin/ri b/bin/ri
index 0cc2f73bb6..7fbed0c099 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,27 +1,12 @@
 #!/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.
-#
 
-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
+begin
+  gem 'rdoc'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
+rescue Gem::LoadError
 end
 
-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
+require 'rdoc/ri/driver'
+
+RDoc::RI::Driver.run ARGV
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 58619fae7e..8945c16bd7 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -6,7 +6,6 @@
 # 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'
@@ -255,25 +254,30 @@ def show_progress(message = '')
     end
   end
 rescue Interrupt
-  $stderr.puts "\##{@count} #{@location}"
-  raise
+  raise Interrupt
 rescue Exception => err
   $stderr.print 'E'
   $stderr.puts if @verbose
   error err.message, message
 end
 
-def assert_check(testsrc, message = '', opt = '', **argh)
+# 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']
+end
+
+def assert_check(testsrc, message = '', opt = '')
   show_progress(message) {
-    result = get_result_string(testsrc, opt, **argh)
+    result = get_result_string(testsrc, opt)
     check_coredump
     yield(result)
   }
 end
 
-def assert_equal(expected, testsrc, message = '', opt = '', **argh)
+def assert_equal(expected, testsrc, message = '')
   newtest
-  assert_check(testsrc, message, opt, **argh) {|result|
+  assert_check(testsrc, message) {|result|
     if expected == result
       nil
     else
@@ -314,10 +318,13 @@ def assert_valid_syntax(testsrc, message = '')
   }
 end
 
-def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
+def assert_normal_exit(testsrc, *rest)
   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)
@@ -367,7 +374,6 @@ def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
 end
 
 def assert_finish(timeout_seconds, testsrc, message = '')
-  timeout_seconds *= 3 if RubyVM::MJIT.enabled? # for --jit-wait
   newtest
   show_progress(message) {
     faildesc = nil
@@ -376,24 +382,12 @@ def assert_finish(timeout_seconds, testsrc, message = '')
     pid = io.pid
     waited = false
     tlimit = Time.now + timeout_seconds
-    diff = timeout_seconds
-    while diff > 0
+    while Time.now < tlimit
       if Process.waitpid pid, Process::WNOHANG
         waited = true
         break
       end
-      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
+      sleep 0.1
     end
     if !waited
       Process.kill(:KILL, pid)
@@ -411,7 +405,7 @@ def flunk(message = '')
 end
 
 def pretty(src, desc, result)
-  src = src.sub(/\A\s*\n/, '')
+  src = src.sub(/\A.*\n/, '')
   (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
 end
 
@@ -425,19 +419,18 @@ def untabify(str)
   str.gsub(/^\t+/) {' ' * (8 * $&.size) }
 end
 
-def make_srcfile(src, frozen_string_literal: nil)
+def make_srcfile(src)
   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 = '', **argh)
+def get_result_string(src, opt = '')
   if @ruby
-    filename = make_srcfile(src, **argh)
+    filename = make_srcfile(src)
     begin
       `#{@ruby} -W0 #{opt} #{filename}`
     ensure
diff --git a/bootstraptest/test_env.rb b/bootstraptest/test_env.rb
deleted file mode 100644
index 7d1b45b75e..0000000000
--- a/bootstraptest/test_env.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-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_exception.rb b/bootstraptest/test_exception.rb
index 0fb6f552b8..35c8d25e37 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 'divided by 0', %q{
+assert_equal 'exception class/object expected', %q{
   class ZeroDivisionError
     def self.new(message)
       42
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index 9da6d45cbd..0390062a24 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -589,13 +589,3 @@ 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 83923dad97..1cd9f7ac6c 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -21,9 +21,7 @@ assert_finish 10, %q{
   end
 }, '[ruby-core:22158]'
 
-# 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
+assert_normal_exit(<<'End', '[ruby-dev:37934]')
   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
deleted file mode 100644
index 88f36bd0c2..0000000000
--- a/bootstraptest/test_insns.rb
+++ /dev/null
@@ -1,420 +0,0 @@
-# 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
-  $FIXNUM_MAX = RbConfig::LIMITS["FIXNUM_MAX"]
-  $FIXNUM_MIN = RbConfig::LIMITS["FIXNUM_MIN"]
-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{ @@x = true }, ],
-  [ 'getclassvariable', %q{ @@x = true; @@x }, ],
-
-  [ '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}[//] }, ],
-  [ 'putiseq',                  %q{ -> { true }.() }, ],
-  [ 'putstring',                %q{ "true" }, ],
-  [ 'tostring / concatstrings', %q{ "#{true}" }, ],
-  [ 'freezestring',             %q{ "#{true}" }, fsl, ],
-  [ 'freezestring',             %q{ "#{true}" }, '-d', fsl, ],
-  [ 'toregexp',                 %q{ /#{true}/ =~ "true" && $~ }, ],
-  [ 'intern',                   %q{ :"#{true}" }, ],
-
-  [ 'newarray',    %q{ ["true"][0] }, ],
-  [ '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_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_succ',  %q{ x = Time.at(0); x.succ == Time.at(1) }, ],
-
-  [ 'opt_not',  %q{ ! false }, ],
-  [ 'opt_neq', <<~'},', ],       # {
-    class X; def !; true; end; end
-    ! X.new
-  },
-
-  [ 'opt_regexpmatch1',  %q{ /true/ =~ 'true' && $~ }, ],
-  [ 'opt_regexpmatch1', <<~'},', ],       # {
-    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/
-  },
-
-  [ 'opt_call_c_function', 'Struct.new(:x).new.x = true', ],
-]
-
-# normal path
-tests.compact.each {|(insn, expr, *a)| assert_equal 'true', expr, insn, *a }
-
-# with trace
-tests.compact.each {|(insn, expr, *a)|
-  progn = "set_trace_func(proc{})\n" + expr
-  assert_equal 'true', progn, insn, *a
-}
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index 89c00d0b88..1d2b19368a 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)
+  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
   :ok
 }
 
@@ -69,7 +69,7 @@ assert_equal 'ok', %q{
   STDIN.print "a"
   STDIN.reopen(save)
   rw.close
-  File.unlink(tmpname)
+  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
   :ok
 }
 
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index 9b3c10d519..e79092e411 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -65,8 +65,10 @@ assert_equal ':a3c',            ':"a#{1+2}c".inspect'
 assert_equal 'Symbol',          ':"a#{1+2}c".class'
 
 # xstring
-assert_equal "foo\n",           %q(`echo foo`)
-assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
+unless nacl?
+  assert_equal "foo\n",           %q(`echo foo`)
+  assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
+end
 
 # regexp
 assert_equal '',                '//.source'
@@ -223,24 +225,6 @@ 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_proc.rb b/bootstraptest/test_proc.rb
index 1e384411dc..c23394e8d2 100644
--- a/bootstraptest/test_proc.rb
+++ b/bootstraptest/test_proc.rb
@@ -224,14 +224,14 @@ assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
   Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
   ]
 }
-assert_equal %q{1}, %q{
+assert_equal %q{0}, %q{
   pr = proc{
     $SAFE
   }
   $SAFE = 1
   pr.call
 }
-assert_equal %q{[1, 1]}, %q{
+assert_equal %q{[1, 0]}, %q{
   pr = proc{
     $SAFE += 1
   }
diff --git a/ccan/list/list.h b/ccan/list/list.h
index 59ab45ee53..ca9f9f1f7f 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,21 +238,6 @@ 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.
  *
@@ -662,12 +647,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 assumption made is that @i points
+ * nor care about the type of @i. The only assumtion made is that @i points
  * to a chunk of memory that at some @offset, relative to @i, contains a
- * 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
+ * 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
  * remember that given the wrong pointer/offset couple this macro will
- * happily churn all you memory until SEGFAULT stops it, in other words
+ * happilly churn all you memory untill SEGFAULT stops it, in other words
  * caveat emptor.
  *
  * It is worth mentioning that one of legitimate use-cases for that wrapper
diff --git a/class.c b/class.c
index 9244f020f3..6c7dfa5c17 100644
--- a/class.c
+++ b/class.c
@@ -616,7 +616,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.
  */
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_class_inherited(VALUE super, VALUE klass)
 {
     ID inherited;
@@ -849,23 +849,14 @@ rb_include_class_new(VALUE module, VALUE super)
 
 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");
-    }
-    OBJ_INFECT(klass, module);
-}
-
 void
 rb_include_module(VALUE klass, VALUE module)
 {
     int changed = 0;
 
-    ensure_includable(klass, module);
+    rb_frozen_class_p(klass);
+    Check_Type(module, T_MODULE);
+    OBJ_INFECT(klass, module);
 
     changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE);
     if (changed < 0)
@@ -975,7 +966,9 @@ rb_prepend_module(VALUE klass, VALUE module)
     VALUE origin;
     int changed = 0;
 
-    ensure_includable(klass, module);
+    rb_frozen_class_p(klass);
+    Check_Type(module, T_MODULE);
+    OBJ_INFECT(klass, module);
 
     origin = RCLASS_ORIGIN(klass);
     if (origin == klass) {
@@ -1178,10 +1171,17 @@ 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 = TRUE, prepended = 0;
+    int recur, prepended = 0;
     struct method_entry_arg me_arg;
 
-    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+    if (argc == 0) {
+	recur = TRUE;
+    }
+    else {
+	VALUE r;
+	rb_scan_args(argc, argv, "01", &r);
+	recur = RTEST(r);
+    }
 
     if (!recur && RCLASS_ORIGIN(mod) != mod) {
 	mod = RCLASS_ORIGIN(mod);
@@ -1410,21 +1410,25 @@ rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj)
 VALUE
 rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 {
-    VALUE ary, klass, origin;
+    VALUE recur, ary, klass, origin;
     struct method_entry_arg me_arg;
     struct rb_id_table *mtbl;
-    int recur = TRUE;
 
-    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+    if (argc == 0) {
+	recur = Qtrue;
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &recur);
+    }
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
     me_arg.list = st_init_numtable();
-    me_arg.recur = recur;
+    me_arg.recur = RTEST(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 (recur) {
+    if (RTEST(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);
@@ -1524,23 +1528,6 @@ 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);
-    }
-}
-
 /*!
  * \}
  */
@@ -1598,18 +1585,13 @@ singleton_class_of(VALUE obj)
 	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)) goto no_singleton;
-	    break;
 	}
     }
 
     klass = RBASIC(obj)->klass;
     if (!(FL_TEST(klass, FL_SINGLETON) &&
 	  rb_ivar_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)) {
@@ -1618,7 +1600,7 @@ singleton_class_of(VALUE obj)
     else {
 	FL_UNSET(klass, FL_TAINT);
     }
-    RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
+    if (OBJ_FROZEN(obj)) OBJ_FREEZE_RAW(klass);
 
     return klass;
 }
@@ -1661,7 +1643,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 Integer or a Symbol.
+ * \throw TypeError if \a obj is a Fixnum or a Symbol.
  * \return the singleton class.
  *
  * \post \a obj has its own singleton class.
@@ -1762,23 +1744,32 @@ rb_define_attr(VALUE klass, const char *name, int read, int write)
     rb_attr(klass, rb_intern(name), read, write, FALSE);
 }
 
-MJIT_FUNC_EXPORTED VALUE
+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
 rb_keyword_error_new(const char *error, VALUE keys)
 {
-    long i = 0, len = RARRAY_LEN(keys);
-    VALUE error_message = rb_sprintf("%s keyword%.*s", error, len > 1, "s");
-
-    if (len > 0) {
-	rb_str_cat_cstr(error_message, ": ");
-	while (1) {
-            const VALUE k = RARRAY_AREF(keys, i);
-	    Check_Type(k, T_SYMBOL); /* wrong hash is given to rb_get_kwargs */
-	    rb_str_append(error_message, rb_sym2str(k));
-	    if (++i >= len) break;
-	    rb_str_cat_cstr(error_message, ", ");
-	}
+    const char *msg = "";
+    VALUE error_message;
+
+    if (RARRAY_LEN(keys) == 1) {
+	keys = RARRAY_AREF(keys, 0);
+    }
+    else {
+	keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
+	msg = "s";
     }
 
+    error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys);
+
     return rb_exc_new_str(rb_eArgError, error_message);
 }
 
@@ -1793,19 +1784,23 @@ 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]);
-        rb_hash_stlike_delete(hash, &key, NULL);
+	st_delete(tbl, &key, NULL);
     }
-    rb_keyword_error("unknown", rb_hash_keys(hash));
+    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);
 }
 
-
 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);
@@ -1822,11 +1817,8 @@ rb_extract_keywords(VALUE *orighash)
 	*orighash = 0;
 	return hash;
     }
-    rb_hash_foreach(hash, separate_symbol, (st_data_t)&parthash);
+    st_foreach(rb_hash_tbl_raw(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];
 }
 
@@ -1840,8 +1832,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 ? \
-     rb_hash_stlike_delete(keyword_hash, &key, (val)) : \
-     rb_hash_stlike_lookup(keyword_hash, key, (val)))
+     st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \
+     st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
 
     if (NIL_P(keyword_hash)) keyword_hash = 0;
 
@@ -1882,7 +1874,7 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
 	}
     }
     if (!rest && keyword_hash) {
-	if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
+	if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
 	    unknown_keyword_error(keyword_hash, table, required+optional);
 	}
     }
@@ -1900,8 +1892,8 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
     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, last_idx = -1;
-    VALUE hash = Qnil, last_hash = 0;
+    int argi = 0;
+    VALUE hash = Qnil;
 
     if (ISDIGIT(*p)) {
 	n_lead = *p - '0';
@@ -1952,8 +1944,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	    hash = rb_check_hash_type(last);
 	    if (!NIL_P(hash)) {
 		VALUE opts = rb_extract_keywords(&hash);
-		if (!(last_hash = hash)) argc--;
-		else last_idx = argc - 1;
+		if (!hash) argc--;
 		hash = opts ? opts : Qnil;
 	    }
 	}
@@ -1961,14 +1952,14 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
     /* capture leading mandatory arguments */
     for (i = n_lead; i-- > 0; ) {
 	var = va_arg(vargs, VALUE *);
-	if (var) *var = (argi == last_idx) ? last_hash : argv[argi];
+	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 = (argi == last_idx) ? last_hash : argv[argi];
+	    if (var) *var = argv[argi];
 	    argi++;
 	}
 	else {
@@ -1981,11 +1972,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 
 	var = va_arg(vargs, VALUE *);
 	if (0 < n_var) {
-	    if (var) {
-		int f_last = (last_idx + 1 == argc - n_trail);
-		*var = rb_ary_new4(n_var-f_last, &argv[argi]);
-		if (f_last) rb_ary_push(*var, last_hash);
-	    }
+	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
 	    argi += n_var;
 	}
 	else {
@@ -1995,7 +1982,7 @@ 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 = (argi == last_idx) ? last_hash : argv[argi];
+	if (var) *var = argv[argi];
 	argi++;
     }
     /* capture an option hash - phase 2: assignment */
diff --git a/common.mk b/common.mk
index c5947ff766..c2a2d8fd90 100644
--- a/common.mk
+++ b/common.mk
@@ -2,7 +2,7 @@ bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
@@ -11,20 +11,13 @@ Q = $(Q1:0=@)
 ECHO0 = $(ECHO1:0=echo)
 ECHO = @$(ECHO0)
 
-mflags = $(MFLAGS)
-gnumake_recursive =
-enable_shared = $(ENABLE_SHARED:no=)
-
-UNICODE_VERSION = 12.1.0
-UNICODE_EMOJI_VERSION = 12.0
-UNICODE_BETA = YES
+UNICODE_VERSION = 9.0.0
 
 ### 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_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)
 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 \
@@ -42,13 +35,15 @@ GEM_HOME =
 GEM_PATH =
 GEM_VENDOR =
 
-BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
-BENCHMARK_DRIVER_GIT_REF = v0.14.11
-SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git
-SIMPLECOV_GIT_REF = v0.15.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
+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
 
 STATIC_RUBY   = static-ruby
@@ -62,7 +57,6 @@ ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
 RDOCOUT       = $(EXTOUT)/rdoc
 HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
-INSTALL_DOC_OPTS = --rdoc-output="$(RDOCOUT)" --html-output="$(HTMLOUT)"
 
 INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
@@ -72,10 +66,9 @@ EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT)
 ENC_MK        = enc.mk
 MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags)
+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS)
 
 COMMONOBJS    = array.$(OBJEXT) \
-		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
@@ -83,7 +76,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		complex.$(OBJEXT) \
 		cont.$(OBJEXT) \
 		debug.$(OBJEXT) \
-		debug_counter.$(OBJEXT) \
 		dir.$(OBJEXT) \
 		dln_find.$(OBJEXT) \
 		encoding.$(OBJEXT) \
@@ -100,8 +92,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		load.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
-		mjit.$(OBJEXT) \
-		mjit_compile.$(OBJEXT) \
 		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
@@ -131,7 +121,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		thread.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
-		transient_heap.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
@@ -139,7 +128,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		vm_backtrace.$(OBJEXT) \
 		vm_dump.$(OBJEXT) \
 		vm_trace.$(OBJEXT) \
-		$(COROUTINE_OBJ) \
 		$(DTRACE_OBJ) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
@@ -156,7 +144,7 @@ ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
 DEFAULT_PRELUDES = $(GEM_PRELUDE)
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES)
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
 GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
 PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
 GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
@@ -178,6 +166,9 @@ 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
 TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
 EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
@@ -190,55 +181,15 @@ COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmp
 
 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
 	@$(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
-	$(ECHO) building $(@F:.time=.h)
-	$(Q) $(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 \
-		$(srcdir)/tool/transform_mjit_header.rb $(PREP) \
-		$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h
-	$(ECHO) building $@
-	$(MINIRUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC) $(ARCH_FLAG)" $(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)" \
@@ -247,9 +198,6 @@ showflags:
 	"	CPPFLAGS = $(CPPFLAGS)" \
 	"	DLDFLAGS = $(DLDFLAGS)" \
 	"	SOLIBS = $(SOLIBS)" \
-	"	LANG = $(LANG)" \
-	"	LC_ALL = $(LC_ALL)" \
-	"	LC_CTYPE = $(LC_CTYPE)" \
 	$(MESSAGE_END)
 	-@$(CC_VERSION)
 
@@ -259,43 +207,20 @@ 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): ext/configure-ext.mk $(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/template/exts.mk.tmpl
-	$(Q)$(MAKE) -f ext/configure-ext.mk $(mflags) V=$(V) EXTSTATIC=$(EXTSTATIC) \
-		gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \
-		EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
+$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) $(TIMESTAMPDIR)/.$(arch).time
 	$(ECHO) generating makefile $@
-	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
-	    $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake)
-
-ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \
-		$(srcdir)/template/configure-ext.mk.tmpl
-	$(ECHO) generating makefiles $@
-	$(Q)$(MAKEDIRS) $(@D)
-	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
-	    $(srcdir)/template/$(@F).tmpl --srcdir="$(srcdir)" \
-	    --miniruby="$(MINIRUBY)" --script-args='$(SCRIPT_ARGS)'
+	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
 
 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
-	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
-	    $(srcdir)/template/extinit.c.tmpl $(EXTINITS)
 
 prog: program wprogram
-programs: $(PROGRAM) $(WPROGRAM)
 
 $(PREP): $(MKFILES)
 
@@ -304,23 +229,15 @@ miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
 objs: $(ALLOBJS)
 
 GORUBY = go$(RUBY_INSTALL_NAME)
-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
+golf: $(LIBRUBY) $(GOLFOBJS) PHONY
+	$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) 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)
 	$(ECHO) generating $@
@@ -335,22 +252,18 @@ $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP
 
 $(LIBRUBY_A):	$(LIBRUBY_A_OBJS) $(MAINOBJ) $(INITOBJS) $(ARCHFILE)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(BUILTIN_ENCOBJS)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
 
 $(LIBRUBY_EXTS):
 	@exit > $@
 
 $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	$(Q)$(RM) $@
-	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
+	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
 ruby.imp: $(COMMONOBJS)
-	$(Q){ \
-	$(NM) -Pgp $(COMMONOBJS) | \
-	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$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) \
-	} | \
+	$(Q)$(NM) -Pgp $(COMMONOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|\.)/{print $$1}' | \
 	sort -u -o $@
 
 install: install-$(INSTALLDOC)
@@ -361,7 +274,7 @@ $(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
 do-install-all: pre-install-all
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
 post-install-all:: post-install-local post-install-ext post-install-doc
 	@$(NULLCMD)
 
@@ -443,7 +356,7 @@ 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 $(INSTALL_DOC_OPTS)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
 post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
 	@$(NULLCMD)
 
@@ -530,7 +443,7 @@ 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 $(INSTALL_DOC_OPTS)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-install-doc::
 	@$(NULLCMD)
 
@@ -543,15 +456,15 @@ post-install-gem::
 
 rdoc: PHONY main
 	@echo Generating RDoc documentation
-	$(Q) $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
 
 html: PHONY main
 	@echo Generating RDoc HTML files
-	$(Q) $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --op "$(HTMLOUT)" $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --op "$(HTMLOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
 
 rdoc-coverage: PHONY main
 	@echo Generating RDoc coverage report
-	$(Q) $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
 
 RDOCBENCHOUT=/tmp/rdocbench
 
@@ -569,7 +482,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 $(INSTALL_DOC_OPTS)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-no-install-doc::
 	@$(NULLCMD)
 
@@ -580,12 +493,11 @@ 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-docs clean-extout clean-local clean-platform clean-spec
+clean: clean-ext clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-local clean-platform
 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)
-	$(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp
+	$(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
@@ -602,10 +514,8 @@ clean-platform: PHONY
 clean-extout: PHONY
 	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
 clean-docs: clean-rdoc clean-html clean-capi
-clean-spec: PHONY
-clean-rubyspec: clean-spec
 
-distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-spec
+distclean: distclean-ext distclean-enc distclean-golf distclean-extout distclean-local distclean-platform
 distclean-local:: clean-local
 	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES)
 	$(Q)$(RM) config.cache config.status config.status.lineno
@@ -613,71 +523,29 @@ distclean-local:: clean-local
 	-$(Q)$(RMALL) $(srcdir)/autom4te.cache
 distclean-ext:: PHONY
 distclean-golf: clean-golf
-distclean-rdoc: clean-rdoc
-distclean-html: clean-html
-distclean-capi: clean-capi
-distclean-docs: clean-docs
+distclean-rdoc: PHONY
+distclean-html: PHONY
+distclean-capi: PHONY
 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-srcs-local
-
-clean-srcs:: clean-srcs-local clean-srcs-ext
-realclean-srcs:: realclean-srcs-local realclean-srcs-ext
-
-clean-srcs-local::
+realclean-local:: distclean-local
 	$(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h
-	$(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)$(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
-
-clean-srcs-ext::
-realclean-srcs-ext:: clean-srcs-ext
-
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
 	$(Q)$(RM) $(GOLFPRELUDES)
-realclean-rdoc: distclean-rdoc
-realclean-html: distclean-html
-realclean-capi: distclean-capi
-realclean-docs: distclean-docs
+realclean-capi: PHONY
 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 gems/clean:: ext/clean.mk
-ext/distclean gems/distclean:: ext/distclean.mk
-ext/realclean gems/realclean:: ext/realclean.mk
-
-timestamp/clean:: ext/clean gems/clean
-timestamp/distclean:: ext/distclean gems/distclean
-timestamp/realclean:: ext/realclean gems/realclean
-
-timestamp/clean timestamp/distclean timestamp/realclean::
-	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/$(arch)/.time
-	$(Q)$(RMDIRS) $(TIMESTAMPDIR)/$(arch) 2> $(NULL) || exit 0
-
-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) || exit 0
+clean-ext distclean-ext realclean-ext::
+	$(Q)$(RM) $(EXTS_MK)
+	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/.$(arch).time $(TIMESTAMPDIR)/$(arch)/.time
+	$(Q)$(RMDIR) $(TIMESTAMPDIR)/$(arch) $(TIMESTAMPDIR) 2> $(NULL) || exit 0
 
 clean-enc distclean-enc realclean-enc: PHONY
 
@@ -703,12 +571,7 @@ clean-platform:
 	$(Q) $(RM) $(PLATFORM_D)
 	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
 
-RUBYSPEC_CAPIEXT = spec/ruby/optional/capi/ext
-clean-spec: PHONY
-	-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
-	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || exit 0
-
-check: main test test-testframework test-almost test-spec
+check: main test test-testframework test-almost
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
@@ -727,12 +590,12 @@ $(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb ver
 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) $(BTESTS)
+	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS)
 
 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) $(BTESTS)
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS)
 
 test-basic: $(TEST_RUNNABLE)-test-basic
 no-test-basic: PHONY
@@ -747,31 +610,30 @@ yes-test-knownbug: prog PHONY
 
 test-testframework: $(TEST_RUNNABLE)-test-testframework
 yes-test-testframework: prog PHONY
-	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
 no-test-testframework: PHONY
 
-test-sample: test-basic # backward compatibility for mswin-build
-test-short: btest-ruby test-knownbug test-basic
-test: test-short
+test-sample: test-basic # backword compatibility for mswin-build
+test: btest-ruby test-knownbug test-basic
 
 # $ 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: programs PHONY
-	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
+yes-test-all: prog PHONY
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
-	$(gnumake_recursive)$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
 
 test-almost: $(TEST_RUNNABLE)-test-almost
 yes-test-almost: prog PHONY
-	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
 no-test-almost: PHONY
 
 test-ruby: $(TEST_RUNNABLE)-test-ruby
 no-test-ruby: PHONY
 yes-test-ruby: prog encs PHONY
-	$(gnumake_recursive)$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
 
 extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
@@ -784,24 +646,18 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
 	-e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \
 	$(UNICODE_VERSION) $(UNICODE_DATA_HEADERS)
 	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
+		-cross_compiling=$(CROSS_COMPILING) \
 		-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: test-spec
-yes-test-rubyspec: yes-test-spec
-
-test-spec-precheck: $(arch)-fake.rb programs
+test-rubyspec-precheck:
 
-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 $(MSPECOPT) $(SPECOPTS)
-no-test-spec:
+test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@@ -818,7 +674,6 @@ encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP
 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 $@
@@ -832,10 +687,9 @@ $(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: 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: 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:
 
@@ -847,7 +701,7 @@ PHONY:
 	$(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
 	$(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]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
+	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!parse\.tmp\.[iy]!parse.y!" -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
@@ -856,30 +710,14 @@ $(PLATFORM_D):
 	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@exit > $@
 
-exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h
-	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c
-	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS)
-	$(Q) $(POSTLINK)
-	$(Q) ./miniruby$(EXEEXT) \
-	    -e 'prog, dest = ARGV; dest += "/ruby"' \
-	    -e 'unless prog=="ruby"' \
-	    -e '  begin File.unlink(dest); rescue Errno::ENOENT; end' \
-	    -e '  File.symlink(prog, dest)' \
-	    -e 'end' \
-	$(@F) $(@D)
-
-exe/.time:
-	$(Q) $(MAKEDIRS) $(@D)
-	@exit > $@
-
 $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
 
 $(ENC_TRANS_D):
 	$(Q) $(MAKEDIRS) enc/trans $(@D)
 	@exit > $@
 
-$(TIMESTAMPDIR)/$(arch)/.time:
-	$(Q)$(MAKEDIRS) $(@D) $(EXTOUT)/$(arch)
+$(TIMESTAMPDIR)/.$(arch).time:
+	$(Q)$(MAKEDIRS) $(@D) $(TIMESTAMPDIR)/$(arch)
 	@exit > $@
 
 ###
@@ -909,15 +747,11 @@ 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_H:.h=).$(ASMEXT) \
-	$(COROUTINE_H:/Context.h=/.time)
-$(COROUTINE_H:/Context.h=/.time):
-	$(Q) $(MAKEDIRS) $(@D)
-	@exit > $@
 
 ###
 
@@ -931,8 +765,7 @@ 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) \
-  {$(VPATH)}vm.h $(PLATFORM_D)
+  {$(VPATH)}internal.h {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
 win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \
   $(RUBY_H_INCLUDES) $(PLATFORM_D)
 
@@ -951,28 +784,24 @@ $(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
 
 INSNS2VMOPT = --srcdir="$(srcdir)"
 
-srcs_vpath = {$(VPATH)}
-
-# TODO: dependencies on tool/ruby_vm scripts.
-inc_common_headers = $(srcdir)/tool/ruby_vm/views/_copyright.erb $(srcdir)/tool/ruby_vm/views/_notice.erb
-$(srcs_vpath)opt_sc.inc: $(srcdir)/tool/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers)
-$(srcs_vpath)optinsn.inc: $(srcdir)/tool/ruby_vm/views/optinsn.inc.erb $(inc_common_headers)
-$(srcs_vpath)optunifs.inc: $(srcdir)/tool/ruby_vm/views/optunifs.inc.erb $(inc_common_headers)
-$(srcs_vpath)insns.inc: $(srcdir)/tool/ruby_vm/views/insns.inc.erb $(inc_common_headers)
-$(srcs_vpath)insns_info.inc: $(srcdir)/tool/ruby_vm/views/insns_info.inc.erb $(inc_common_headers) \
-  $(srcdir)/tool/ruby_vm/views/_insn_type_chars.erb $(srcdir)/tool/ruby_vm/views/_insn_name_info.erb \
-  $(srcdir)/tool/ruby_vm/views/_insn_len_info.erb $(srcdir)/tool/ruby_vm/views/_insn_operand_info.erb \
-  $(srcdir)/tool/ruby_vm/views/_attributes.erb $(srcdir)/tool/ruby_vm/views/_insn_stack_increase.erb
-$(srcs_vpath)vmtc.inc: $(srcdir)/tool/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
-$(srcs_vpath)vm.inc: $(srcdir)/tool/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
-  $(srcdir)/tool/ruby_vm/views/_insn_entry.erb $(srcdir)/tool/ruby_vm/views/_trace_instruction.erb
-$(srcs_vpath)mjit_compile.inc: $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \
-  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_send.erb \
-  $(srcdir)/tool/ruby_vm/views/_mjit_compile_ivar.erb \
-  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn_body.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb
-
-common-srcs: $(srcs_vpath)parse.c $(srcs_vpath)lex.c $(srcs_vpath)enc/trans/newline.c $(srcs_vpath)id.c \
-	     srcs-lib srcs-ext incs
+{$(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
+
+common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \
+	     srcs-lib srcs-ext
 
 missing-srcs: $(srcdir)/missing/des_tables.c
 
@@ -980,22 +809,14 @@ 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: $(EXTRA_SRCS)
-realclean-srcs-extra::
-	$(Q)$(RM) $(EXTRA_SRCS)
+srcs-extra: $(srcdir)/ext/json/parser/parser.c \
+	    $(srcdir)/ext/date/zonetab.h \
+	    $(empty)
 
 LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
 
@@ -1024,9 +845,9 @@ id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
 		$(srcdir)/template/id.c.tmpl
 
-node_name.inc: $(srcdir)/tool/node_name.rb $(srcdir)/node.h
+node_name.inc: {$(VPATH)}node.h
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $(srcdir)/node.h > $@
+	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
 
 encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
 	$(ECHO) generating $@
@@ -1057,17 +878,11 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
 
-$(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
+{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl golf_prelude.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 $(srcdir)/tool/gen_dummy_probes.rb
 
 probes.dmyh:
@@ -1082,57 +897,42 @@ preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
 $(srcdir)/revision.h:
-	$(Q)$(gnumake:yes=#) $(RM) $(@F)
-	$(Q)$(gnumake:yes=#) exit > $@ || exit > $(@F)
+	@exit > $@
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
-	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp
 	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
 
-$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h
+$(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h
 	$(ECHO) generating $@
-	$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
-	sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
-	$(exec) $(MAKE) -f - $(mflags) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+	$(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)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
 	$(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
 	$(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/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
-		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac
+		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
 	$(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/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \
-		$(srcdir)/tool/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)
+	$(exec) $(MAKE) -f - $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
 
 $(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend
 	$(Q) $(CHDIR) $(@D) && \
 	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) \
+	$(exec) $(MAKE) -f - $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
 ##
@@ -1144,7 +944,7 @@ runruby: $(PROGRAM) PHONY
 	$(RUNRUBY) $(TESTRUN_SCRIPT)
 
 parse: fake miniruby$(EXEEXT) PHONY
-	$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
+	$(BTESTRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
 
 bisect: PHONY
 	$(srcdir)/tool/bisect.sh miniruby $(srcdir)
@@ -1154,19 +954,27 @@ bisect-ruby: PHONY
 
 COMPARE_RUBY = $(BASERUBY)
 ITEM =
-ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
 OPTS =
 
 # You can pass several options through OPTS environment variable.
-# $ make benchmark ARGS="--help" displays more detail.
+# $ 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) 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::$(MINIRUBY) -r$(srcdir)/prelude --disable-gem" \
-	            $(ARGS) $(OPTS)
+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)
 
 run.gdb:
 	echo set breakpoint pending on         > run.gdb
@@ -1189,53 +997,40 @@ gdb: miniruby$(EXEEXT) run.gdb PHONY
 gdb-ruby: $(PROGRAM) run.gdb PHONY
 	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
 
-LLDB_INIT = command script import -r $(srcdir)/misc/lldb_cruby.py
-
-lldb: miniruby$(EXEEXT) PHONY
-	lldb -o '$(LLDB_INIT)' miniruby$(EXEEXT) -- $(TESTRUN_SCRIPT)
-
-lldb-ruby: $(PROGRAM) PHONY
-	lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
-
-DISTPKGS = gzip,zip,all
 dist:
 	$(BASERUBY) $(srcdir)/tool/make-snapshot \
-	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
+	-srcdir=$(srcdir) \
 	-unicode-version=$(UNICODE_VERSION) \
 	tmp $(RELNAME)
 
 up:: update-remote
 
 up::
-	-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
 
 up::
-	-$(Q)$(MAKE) $(mflags) Q=$(Q) after-update
+	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update
 
 after-update:: extract-extlibs
 
-update-remote:: update-src update-download
+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/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
+	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
+	    ../tool/downloader.rb -e gnu \
 	    config.guess config.sub
 
 update-gems: PHONY
 	$(ECHO) Downloading bundled gem files...
-	$(Q) $(BASERUBY) -C "$(srcdir)" \
-	    -I./tool -rdownloader -answ \
+	$(Q) $(BASERUBY) -C "$(srcdir)/gems" \
+	    -I../tool -rdownloader -answ \
 	    -e 'gem, ver = *$$F' \
-	    -e 'old = Dir.glob("gems/#{gem}-*.gem")' \
+	    -e 'old = Dir.glob("#{gem}-*.gem")' \
 	    -e 'gem = "#{gem}-#{ver}.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")})' \
-	    gems/bundled_gems
+	    -e 'Downloader::RubyGems.download(gem, nil, nil) and' \
+	    -e 'File.unlink(*(old-[gem]))' \
+	    bundled_gems
 
 extract-gems: PHONY
 	$(ECHO) Extracting bundled gem files...
@@ -1248,44 +1043,12 @@ extract-gems: PHONY
 update-bundled_gems: PHONY
 	$(Q) $(RUNRUBY) -rrubygems \
 	    -pla \
-	    -e '(gem,src), = Gem::SpecFetcher.fetcher.detect(:latest) {'"|s|" \
-	    -e   's.platform=="ruby"&&s.name==$$F[0]' \
+	    -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {|s|' \
+	    -e   'break "#{s.name} #{s.version}" if s.platform=="ruby"&&s.name==$$F[0]' \
 	    -e '}' \
-	    -e 'gem = src.fetch_spec(gem)' \
-	    -e '$$_ = [gem.name, gem.version, gem.metadata["source_code_uri"]||gem.homepage].join(" ")' \
 	     "$(srcdir)/gems/bundled_gems" | \
 	"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
 
-test-bundled-gems-precheck: $(arch)-fake.rb programs
-
-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
-	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
-
-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:
-test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
-
-test-bundler-precheck: $(arch)-fake.rb programs
-
-yes-test-bundler-prepare: test-bundler-precheck
-	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "rspec:~> 3.5"
-
-RSPECOPTS = --format progress
-BUNDLER_SPECS =
-test-bundler: $(TEST_RUNNABLE)-test-bundler
-yes-test-bundler: yes-test-bundler-prepare
-	$(gnumake_recursive)$(Q) \
-	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
-		--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
-no-test-bundler:
-
 UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
 		$(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \
@@ -1303,57 +1066,20 @@ UNICODE_PROPERTY_FILES =  \
 		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
 		$(empty)
 
-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)
+update-unicode: $(UNICODE_FILES)
 
-CACHE_DIR = $(srcdir)/.downloaded-cache
 UNICODE_DOWNLOAD = \
-	$(BASERUBY) $(srcdir)/tool/downloader.rb \
-	    --cache-dir=$(CACHE_DIR) \
-	    --unicode-beta $(UNICODE_BETA) \
-	    -d $(UNICODE_SRC_DATA_DIR) \
+	$(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
+	    -d $(UNICODE_DATA_DIR) \
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
-UNICODE_AUXILIARY_DOWNLOAD = \
-	$(BASERUBY) $(srcdir)/tool/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) $(srcdir)/tool/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_PROPERTY_FILES): update-unicode-property-files
-update-unicode-property-files:
+$(UNICODE_PROPERTY_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) property files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
 	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES)
-	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
-	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
-	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
-	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
-
-$(UNICODE_FILES): update-unicode-files
-update-unicode-files:
+
+$(UNICODE_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
 	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES)
@@ -1361,36 +1087,27 @@ update-unicode-files:
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
 	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
 
-$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
-	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
-
-touch-unicode-files:
-	$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR)
-	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
+$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNICODE_FILES)
 
 $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
-		$(srcdir)/template/unicode_norm_gen.tmpl \
-		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
-	$(Q) $(MAKE) $(@D)
+		$(srcdir)/template/unicode_norm_gen.tmpl
+	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
 		-c -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):
-	$(Q) $(exec) $(MAKEDIRS) $@ || exit && echo $(MAKE)
+# UPDATE_NAME2CTYPE=    : toplevel
+# UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h
+$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h:
+	$(Q) $(MAKE) $(MFLAGS) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@
 
-$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \
-		$(srcdir)/tool/enc-unicode.rb \
+$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \
 		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_PROPERTY_FILES)
-
-$(UNICODE_HDR_DIR)/name2ctype.h:
 	$(MAKEDIRS) $(@D)
-	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header \
-		$(UNICODE_SRC_DATA_DIR) $(UNICODE_SRC_EMOJI_DATA_DIR) > $@.new
-	$(MV) $@.new $@
+	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header $(UNICODE_SRC_DATA_DIR) > $@
 
 # the next non-comment line was:
 # $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
@@ -1398,12 +1115,12 @@ $(UNICODE_HDR_DIR)/name2ctype.h:
 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:
+$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb
+	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
 	$(MAKEDIRS) $(@D)
 	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
 		--output-file=$@ \
@@ -1436,14 +1153,12 @@ info-arch: PHONY
 change: PHONY
 	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
 
-exam: check
+exam: check test-rubyspec
 
-love: sudo-precheck up all test exam install
+love: sudo-precheck up all test install check
 	@echo love is all you need
 
-great: exam
-
-yes-test-all no-test-all: sudo-precheck
+yes-test-all: sudo-precheck
 
 sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)
@@ -1459,37 +1174,33 @@ help: PHONY
 	"                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" \
-	"  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-all test-spec" \
-	"  exam:                equals make check" \
-	"  test:                ruby core tests" \
-	"  test-all:            all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
-	"  test-spec:           run the Ruby spec suite" \
-	"  test-rubyspec:       same as test-spec" \
-	"  test-bundler:        run the Bundler spec" \
-	"  test-bundled-gems:   run the test suite of bundled gems" \
-	"  up:                  update local copy and autogenerated files" \
-	"  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" \
-	"  goruby:              same as golf" \
+	"  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" \
 	"" \
 	"see DeveloperHowto for more detail: " \
 	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
@@ -1499,70 +1210,35 @@ help: PHONY
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.h
 addr2line.$(OBJEXT): {$(VPATH)}config.h
-addr2line.$(OBJEXT): {$(VPATH)}defines.h
 addr2line.$(OBJEXT): {$(VPATH)}missing.h
 array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 array.$(OBJEXT): $(top_srcdir)/include/ruby.h
 array.$(OBJEXT): {$(VPATH)}array.c
 array.$(OBJEXT): {$(VPATH)}config.h
-array.$(OBJEXT): {$(VPATH)}debug_counter.h
 array.$(OBJEXT): {$(VPATH)}defines.h
 array.$(OBJEXT): {$(VPATH)}encoding.h
-array.$(OBJEXT): {$(VPATH)}gc.h
 array.$(OBJEXT): {$(VPATH)}id.h
 array.$(OBJEXT): {$(VPATH)}intern.h
 array.$(OBJEXT): {$(VPATH)}internal.h
 array.$(OBJEXT): {$(VPATH)}io.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
-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/ruby.h
-ast.$(OBJEXT): $(top_srcdir)/include/ruby.h
-ast.$(OBJEXT): {$(VPATH)}ast.c
-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)}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/ruby.h
 bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h
 bignum.$(OBJEXT): {$(VPATH)}bignum.c
 bignum.$(OBJEXT): {$(VPATH)}config.h
 bignum.$(OBJEXT): {$(VPATH)}defines.h
 bignum.$(OBJEXT): {$(VPATH)}encoding.h
-bignum.$(OBJEXT): {$(VPATH)}id.h
 bignum.$(OBJEXT): {$(VPATH)}intern.h
 bignum.$(OBJEXT): {$(VPATH)}internal.h
 bignum.$(OBJEXT): {$(VPATH)}io.h
 bignum.$(OBJEXT): {$(VPATH)}missing.h
-bignum.$(OBJEXT): {$(VPATH)}onigmo.h
 bignum.$(OBJEXT): {$(VPATH)}oniguruma.h
 bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h
 bignum.$(OBJEXT): {$(VPATH)}st.h
@@ -1588,7 +1264,6 @@ class.$(OBJEXT): {$(VPATH)}io.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
@@ -1622,7 +1297,6 @@ 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
@@ -1632,7 +1306,6 @@ 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
@@ -1645,7 +1318,6 @@ 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_core.h
 compile.$(OBJEXT): {$(VPATH)}vm_debug.h
 compile.$(OBJEXT): {$(VPATH)}vm_opts.h
@@ -1655,12 +1327,10 @@ 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)}intern.h
 complex.$(OBJEXT): {$(VPATH)}internal.h
 complex.$(OBJEXT): {$(VPATH)}io.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
@@ -1671,7 +1341,6 @@ cont.$(OBJEXT): $(CCAN_DIR)/list/list.h
 cont.$(OBJEXT): $(CCAN_DIR)/str/str.h
 cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 cont.$(OBJEXT): $(top_srcdir)/include/ruby.h
-cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
 cont.$(OBJEXT): {$(VPATH)}config.h
 cont.$(OBJEXT): {$(VPATH)}cont.c
 cont.$(OBJEXT): {$(VPATH)}defines.h
@@ -1684,9 +1353,7 @@ cont.$(OBJEXT): {$(VPATH)}internal.h
 cont.$(OBJEXT): {$(VPATH)}io.h
 cont.$(OBJEXT): {$(VPATH)}method.h
 cont.$(OBJEXT): {$(VPATH)}missing.h
-cont.$(OBJEXT): {$(VPATH)}mjit.h
 cont.$(OBJEXT): {$(VPATH)}node.h
-cont.$(OBJEXT): {$(VPATH)}onigmo.h
 cont.$(OBJEXT): {$(VPATH)}oniguruma.h
 cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
 cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -1708,7 +1375,6 @@ debug.$(OBJEXT): {$(VPATH)}debug.c
 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)}intern.h
 debug.$(OBJEXT): {$(VPATH)}internal.h
@@ -1716,34 +1382,17 @@ 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)}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_core.h
 debug.$(OBJEXT): {$(VPATH)}vm_debug.h
 debug.$(OBJEXT): {$(VPATH)}vm_opts.h
-debug_counter.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-debug_counter.$(OBJEXT): $(top_srcdir)/include/ruby.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)}encoding.h
-debug_counter.$(OBJEXT): {$(VPATH)}intern.h
-debug_counter.$(OBJEXT): {$(VPATH)}internal.h
-debug_counter.$(OBJEXT): {$(VPATH)}io.h
-debug_counter.$(OBJEXT): {$(VPATH)}missing.h
-debug_counter.$(OBJEXT): {$(VPATH)}onigmo.h
-debug_counter.$(OBJEXT): {$(VPATH)}oniguruma.h
-debug_counter.$(OBJEXT): {$(VPATH)}st.h
-debug_counter.$(OBJEXT): {$(VPATH)}subst.h
 dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 dir.$(OBJEXT): $(top_srcdir)/include/ruby.h
 dir.$(OBJEXT): {$(VPATH)}config.h
@@ -1751,25 +1400,20 @@ dir.$(OBJEXT): {$(VPATH)}defines.h
 dir.$(OBJEXT): {$(VPATH)}dir.c
 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)}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/ruby.h
-dln.$(OBJEXT): $(top_srcdir)/include/ruby.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)}missing.h
 dln.$(OBJEXT): {$(VPATH)}st.h
 dln.$(OBJEXT): {$(VPATH)}subst.h
@@ -1808,15 +1452,14 @@ 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): $(hdrdir)/ruby/ruby.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)}intern.h
 enc/unicode.$(OBJEXT): {$(VPATH)}missing.h
-enc/unicode.$(OBJEXT): {$(VPATH)}onigmo.h
 enc/unicode.$(OBJEXT): {$(VPATH)}oniguruma.h
 enc/unicode.$(OBJEXT): {$(VPATH)}regenc.h
 enc/unicode.$(OBJEXT): {$(VPATH)}regint.h
@@ -1847,7 +1490,6 @@ encoding.$(OBJEXT): {$(VPATH)}intern.h
 encoding.$(OBJEXT): {$(VPATH)}internal.h
 encoding.$(OBJEXT): {$(VPATH)}io.h
 encoding.$(OBJEXT): {$(VPATH)}missing.h
-encoding.$(OBJEXT): {$(VPATH)}onigmo.h
 encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
 encoding.$(OBJEXT): {$(VPATH)}regenc.h
 encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -1865,12 +1507,9 @@ enum.$(OBJEXT): {$(VPATH)}intern.h
 enum.$(OBJEXT): {$(VPATH)}internal.h
 enum.$(OBJEXT): {$(VPATH)}io.h
 enum.$(OBJEXT): {$(VPATH)}missing.h
-enum.$(OBJEXT): {$(VPATH)}onigmo.h
 enum.$(OBJEXT): {$(VPATH)}oniguruma.h
 enum.$(OBJEXT): {$(VPATH)}st.h
 enum.$(OBJEXT): {$(VPATH)}subst.h
-enum.$(OBJEXT): {$(VPATH)}symbol.h
-enum.$(OBJEXT): {$(VPATH)}transient_heap.h
 enum.$(OBJEXT): {$(VPATH)}util.h
 enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enumerator.$(OBJEXT): $(top_srcdir)/include/ruby.h
@@ -1878,12 +1517,10 @@ 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)}missing.h
-enumerator.$(OBJEXT): {$(VPATH)}onigmo.h
 enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
 enumerator.$(OBJEXT): {$(VPATH)}st.h
 enumerator.$(OBJEXT): {$(VPATH)}subst.h
@@ -1905,7 +1542,6 @@ 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
@@ -1937,9 +1573,7 @@ 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
@@ -1965,16 +1599,13 @@ 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)}intern.h
 file.$(OBJEXT): {$(VPATH)}internal.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
@@ -1985,7 +1616,6 @@ gc.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -1998,9 +1628,7 @@ gc.$(OBJEXT): {$(VPATH)}internal.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
@@ -2015,7 +1643,6 @@ gc.$(OBJEXT): {$(VPATH)}subst.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_core.h
 gc.$(OBJEXT): {$(VPATH)}vm_debug.h
@@ -2030,7 +1657,6 @@ 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
@@ -2039,7 +1665,6 @@ 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)}onigmo.h
 golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
 golf_prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
 golf_prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2066,25 +1691,20 @@ goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
 hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 hash.$(OBJEXT): $(top_srcdir)/include/ruby.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)}gc.h
 hash.$(OBJEXT): {$(VPATH)}hash.c
 hash.$(OBJEXT): {$(VPATH)}id.h
 hash.$(OBJEXT): {$(VPATH)}intern.h
 hash.$(OBJEXT): {$(VPATH)}internal.h
 hash.$(OBJEXT): {$(VPATH)}io.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
 inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 inits.$(OBJEXT): $(top_srcdir)/include/ruby.h
@@ -2096,14 +1716,9 @@ inits.$(OBJEXT): {$(VPATH)}intern.h
 inits.$(OBJEXT): {$(VPATH)}internal.h
 inits.$(OBJEXT): {$(VPATH)}io.h
 inits.$(OBJEXT): {$(VPATH)}missing.h
-inits.$(OBJEXT): {$(VPATH)}onigmo.h
 inits.$(OBJEXT): {$(VPATH)}oniguruma.h
 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/ruby.h
 io.$(OBJEXT): $(top_srcdir)/include/ruby.h
 io.$(OBJEXT): {$(VPATH)}config.h
@@ -2116,21 +1731,13 @@ io.$(OBJEXT): {$(VPATH)}intern.h
 io.$(OBJEXT): {$(VPATH)}internal.h
 io.$(OBJEXT): {$(VPATH)}io.c
 io.$(OBJEXT): {$(VPATH)}io.h
-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)}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
@@ -2144,7 +1751,6 @@ 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
@@ -2154,10 +1760,8 @@ 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
@@ -2188,7 +1792,6 @@ 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
@@ -2224,7 +1827,6 @@ localeinit.$(OBJEXT): {$(VPATH)}internal.h
 localeinit.$(OBJEXT): {$(VPATH)}io.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
@@ -2252,7 +1854,6 @@ marshal.$(OBJEXT): {$(VPATH)}internal.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
@@ -2267,7 +1868,6 @@ math.$(OBJEXT): {$(VPATH)}internal.h
 math.$(OBJEXT): {$(VPATH)}io.h
 math.$(OBJEXT): {$(VPATH)}math.c
 math.$(OBJEXT): {$(VPATH)}missing.h
-math.$(OBJEXT): {$(VPATH)}onigmo.h
 math.$(OBJEXT): {$(VPATH)}oniguruma.h
 math.$(OBJEXT): {$(VPATH)}st.h
 math.$(OBJEXT): {$(VPATH)}subst.h
@@ -2278,76 +1878,11 @@ miniinit.$(OBJEXT): {$(VPATH)}encoding.h
 miniinit.$(OBJEXT): {$(VPATH)}intern.h
 miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
 miniinit.$(OBJEXT): {$(VPATH)}missing.h
-miniinit.$(OBJEXT): {$(VPATH)}onigmo.h
 miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
 miniinit.$(OBJEXT): {$(VPATH)}st.h
 miniinit.$(OBJEXT): {$(VPATH)}subst.h
 miniprelude.$(OBJEXT): {$(VPATH)}iseq.h
 miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
-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/ruby.h
-mjit.$(OBJEXT): $(top_srcdir)/include/ruby.h
-mjit.$(OBJEXT): {$(VPATH)}config.h
-mjit.$(OBJEXT): {$(VPATH)}constant.h
-mjit.$(OBJEXT): {$(VPATH)}debug.h
-mjit.$(OBJEXT): {$(VPATH)}defines.h
-mjit.$(OBJEXT): {$(VPATH)}dln.h
-mjit.$(OBJEXT): {$(VPATH)}gc.h
-mjit.$(OBJEXT): {$(VPATH)}id.h
-mjit.$(OBJEXT): {$(VPATH)}id_table.h
-mjit.$(OBJEXT): {$(VPATH)}intern.h
-mjit.$(OBJEXT): {$(VPATH)}internal.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)}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_core.h
-mjit.$(OBJEXT): {$(VPATH)}vm_opts.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/ruby.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
-mjit_compile.$(OBJEXT): {$(VPATH)}config.h
-mjit_compile.$(OBJEXT): {$(VPATH)}defines.h
-mjit_compile.$(OBJEXT): {$(VPATH)}id.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)}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_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
@@ -2365,7 +1900,6 @@ node.$(OBJEXT): {$(VPATH)}method.h
 node.$(OBJEXT): {$(VPATH)}missing.h
 node.$(OBJEXT): {$(VPATH)}node.c
 node.$(OBJEXT): {$(VPATH)}node.h
-node.$(OBJEXT): {$(VPATH)}onigmo.h
 node.$(OBJEXT): {$(VPATH)}oniguruma.h
 node.$(OBJEXT): {$(VPATH)}ruby_assert.h
 node.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2387,7 +1921,6 @@ numeric.$(OBJEXT): {$(VPATH)}internal.h
 numeric.$(OBJEXT): {$(VPATH)}io.h
 numeric.$(OBJEXT): {$(VPATH)}missing.h
 numeric.$(OBJEXT): {$(VPATH)}numeric.c
-numeric.$(OBJEXT): {$(VPATH)}onigmo.h
 numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
 numeric.$(OBJEXT): {$(VPATH)}st.h
 numeric.$(OBJEXT): {$(VPATH)}subst.h
@@ -2404,7 +1937,6 @@ object.$(OBJEXT): {$(VPATH)}internal.h
 object.$(OBJEXT): {$(VPATH)}io.h
 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
@@ -2420,7 +1952,6 @@ pack.$(OBJEXT): {$(VPATH)}intern.h
 pack.$(OBJEXT): {$(VPATH)}internal.h
 pack.$(OBJEXT): {$(VPATH)}io.h
 pack.$(OBJEXT): {$(VPATH)}missing.h
-pack.$(OBJEXT): {$(VPATH)}onigmo.h
 pack.$(OBJEXT): {$(VPATH)}oniguruma.h
 pack.$(OBJEXT): {$(VPATH)}pack.c
 pack.$(OBJEXT): {$(VPATH)}st.h
@@ -2438,7 +1969,6 @@ 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
@@ -2460,7 +1990,6 @@ prelude.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -2469,10 +1998,8 @@ prelude.$(OBJEXT): {$(VPATH)}iseq.h
 prelude.$(OBJEXT): {$(VPATH)}method.h
 prelude.$(OBJEXT): {$(VPATH)}missing.h
 prelude.$(OBJEXT): {$(VPATH)}node.h
-prelude.$(OBJEXT): {$(VPATH)}onigmo.h
 prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
 prelude.$(OBJEXT): {$(VPATH)}prelude.c
-prelude.$(OBJEXT): {$(VPATH)}prelude.rb
 prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
 prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 prelude.$(OBJEXT): {$(VPATH)}st.h
@@ -2501,7 +2028,6 @@ 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
@@ -2523,7 +2049,6 @@ process.$(OBJEXT): {$(VPATH)}config.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)}intern.h
 process.$(OBJEXT): {$(VPATH)}internal.h
@@ -2531,7 +2056,6 @@ process.$(OBJEXT): {$(VPATH)}io.h
 process.$(OBJEXT): {$(VPATH)}method.h
 process.$(OBJEXT): {$(VPATH)}missing.h
 process.$(OBJEXT): {$(VPATH)}node.h
-process.$(OBJEXT): {$(VPATH)}onigmo.h
 process.$(OBJEXT): {$(VPATH)}oniguruma.h
 process.$(OBJEXT): {$(VPATH)}process.c
 process.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -2554,7 +2078,6 @@ random.$(OBJEXT): {$(VPATH)}intern.h
 random.$(OBJEXT): {$(VPATH)}internal.h
 random.$(OBJEXT): {$(VPATH)}io.h
 random.$(OBJEXT): {$(VPATH)}missing.h
-random.$(OBJEXT): {$(VPATH)}onigmo.h
 random.$(OBJEXT): {$(VPATH)}oniguruma.h
 random.$(OBJEXT): {$(VPATH)}random.c
 random.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2572,7 +2095,6 @@ range.$(OBJEXT): {$(VPATH)}intern.h
 range.$(OBJEXT): {$(VPATH)}internal.h
 range.$(OBJEXT): {$(VPATH)}io.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
@@ -2582,12 +2104,10 @@ rational.$(OBJEXT): $(top_srcdir)/include/ruby.h
 rational.$(OBJEXT): {$(VPATH)}config.h
 rational.$(OBJEXT): {$(VPATH)}defines.h
 rational.$(OBJEXT): {$(VPATH)}encoding.h
-rational.$(OBJEXT): {$(VPATH)}id.h
 rational.$(OBJEXT): {$(VPATH)}intern.h
 rational.$(OBJEXT): {$(VPATH)}internal.h
 rational.$(OBJEXT): {$(VPATH)}io.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
@@ -2603,7 +2123,6 @@ re.$(OBJEXT): {$(VPATH)}intern.h
 re.$(OBJEXT): {$(VPATH)}internal.h
 re.$(OBJEXT): {$(VPATH)}io.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
@@ -2618,7 +2137,6 @@ regcomp.$(OBJEXT): {$(VPATH)}config.h
 regcomp.$(OBJEXT): {$(VPATH)}defines.h
 regcomp.$(OBJEXT): {$(VPATH)}intern.h
 regcomp.$(OBJEXT): {$(VPATH)}missing.h
-regcomp.$(OBJEXT): {$(VPATH)}onigmo.h
 regcomp.$(OBJEXT): {$(VPATH)}oniguruma.h
 regcomp.$(OBJEXT): {$(VPATH)}regcomp.c
 regcomp.$(OBJEXT): {$(VPATH)}regenc.h
@@ -2631,7 +2149,6 @@ regenc.$(OBJEXT): {$(VPATH)}config.h
 regenc.$(OBJEXT): {$(VPATH)}defines.h
 regenc.$(OBJEXT): {$(VPATH)}intern.h
 regenc.$(OBJEXT): {$(VPATH)}missing.h
-regenc.$(OBJEXT): {$(VPATH)}onigmo.h
 regenc.$(OBJEXT): {$(VPATH)}oniguruma.h
 regenc.$(OBJEXT): {$(VPATH)}regenc.c
 regenc.$(OBJEXT): {$(VPATH)}regenc.h
@@ -2643,7 +2160,6 @@ regerror.$(OBJEXT): {$(VPATH)}config.h
 regerror.$(OBJEXT): {$(VPATH)}defines.h
 regerror.$(OBJEXT): {$(VPATH)}intern.h
 regerror.$(OBJEXT): {$(VPATH)}missing.h
-regerror.$(OBJEXT): {$(VPATH)}onigmo.h
 regerror.$(OBJEXT): {$(VPATH)}oniguruma.h
 regerror.$(OBJEXT): {$(VPATH)}regenc.h
 regerror.$(OBJEXT): {$(VPATH)}regerror.c
@@ -2655,7 +2171,6 @@ regexec.$(OBJEXT): {$(VPATH)}config.h
 regexec.$(OBJEXT): {$(VPATH)}defines.h
 regexec.$(OBJEXT): {$(VPATH)}intern.h
 regexec.$(OBJEXT): {$(VPATH)}missing.h
-regexec.$(OBJEXT): {$(VPATH)}onigmo.h
 regexec.$(OBJEXT): {$(VPATH)}oniguruma.h
 regexec.$(OBJEXT): {$(VPATH)}regenc.h
 regexec.$(OBJEXT): {$(VPATH)}regexec.c
@@ -2667,7 +2182,6 @@ regparse.$(OBJEXT): {$(VPATH)}config.h
 regparse.$(OBJEXT): {$(VPATH)}defines.h
 regparse.$(OBJEXT): {$(VPATH)}intern.h
 regparse.$(OBJEXT): {$(VPATH)}missing.h
-regparse.$(OBJEXT): {$(VPATH)}onigmo.h
 regparse.$(OBJEXT): {$(VPATH)}oniguruma.h
 regparse.$(OBJEXT): {$(VPATH)}regenc.h
 regparse.$(OBJEXT): {$(VPATH)}regint.h
@@ -2680,14 +2194,12 @@ regsyntax.$(OBJEXT): {$(VPATH)}config.h
 regsyntax.$(OBJEXT): {$(VPATH)}defines.h
 regsyntax.$(OBJEXT): {$(VPATH)}intern.h
 regsyntax.$(OBJEXT): {$(VPATH)}missing.h
-regsyntax.$(OBJEXT): {$(VPATH)}onigmo.h
 regsyntax.$(OBJEXT): {$(VPATH)}oniguruma.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)}ruby-runner.c
 ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.h
 ruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
@@ -2695,7 +2207,6 @@ 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/ruby.h
-ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
 ruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
 ruby.$(OBJEXT): {$(VPATH)}config.h
 ruby.$(OBJEXT): {$(VPATH)}defines.h
@@ -2708,9 +2219,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal.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
@@ -2740,7 +2249,6 @@ safe.$(OBJEXT): {$(VPATH)}io.h
 safe.$(OBJEXT): {$(VPATH)}method.h
 safe.$(OBJEXT): {$(VPATH)}missing.h
 safe.$(OBJEXT): {$(VPATH)}node.h
-safe.$(OBJEXT): {$(VPATH)}onigmo.h
 safe.$(OBJEXT): {$(VPATH)}oniguruma.h
 safe.$(OBJEXT): {$(VPATH)}ruby_assert.h
 safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2769,7 +2277,6 @@ signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
 signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 signal.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -2780,7 +2287,6 @@ signal.$(OBJEXT): {$(VPATH)}io.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)}ruby_assert.h
 signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2802,7 +2308,6 @@ sprintf.$(OBJEXT): {$(VPATH)}intern.h
 sprintf.$(OBJEXT): {$(VPATH)}internal.h
 sprintf.$(OBJEXT): {$(VPATH)}io.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
@@ -2823,7 +2328,6 @@ st.$(OBJEXT): {$(VPATH)}intern.h
 st.$(OBJEXT): {$(VPATH)}internal.h
 st.$(OBJEXT): {$(VPATH)}io.h
 st.$(OBJEXT): {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}onigmo.h
 st.$(OBJEXT): {$(VPATH)}oniguruma.h
 st.$(OBJEXT): {$(VPATH)}st.c
 st.$(OBJEXT): {$(VPATH)}st.h
@@ -2837,7 +2341,6 @@ strftime.$(OBJEXT): {$(VPATH)}intern.h
 strftime.$(OBJEXT): {$(VPATH)}internal.h
 strftime.$(OBJEXT): {$(VPATH)}io.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
@@ -2847,7 +2350,6 @@ string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 string.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -2857,7 +2359,6 @@ string.$(OBJEXT): {$(VPATH)}intern.h
 string.$(OBJEXT): {$(VPATH)}internal.h
 string.$(OBJEXT): {$(VPATH)}io.h
 string.$(OBJEXT): {$(VPATH)}missing.h
-string.$(OBJEXT): {$(VPATH)}onigmo.h
 string.$(OBJEXT): {$(VPATH)}oniguruma.h
 string.$(OBJEXT): {$(VPATH)}probes.dmyh
 string.$(OBJEXT): {$(VPATH)}probes.h
@@ -2867,7 +2368,6 @@ string.$(OBJEXT): {$(VPATH)}ruby_assert.h
 string.$(OBJEXT): {$(VPATH)}st.h
 string.$(OBJEXT): {$(VPATH)}string.c
 string.$(OBJEXT): {$(VPATH)}subst.h
-string.$(OBJEXT): {$(VPATH)}util.h
 strlcat.$(OBJEXT): {$(VPATH)}config.h
 strlcat.$(OBJEXT): {$(VPATH)}missing.h
 strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
@@ -2890,7 +2390,6 @@ struct.$(OBJEXT): {$(VPATH)}io.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
@@ -2899,7 +2398,6 @@ 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
@@ -2917,7 +2415,6 @@ symbol.$(OBJEXT): {$(VPATH)}intern.h
 symbol.$(OBJEXT): {$(VPATH)}internal.h
 symbol.$(OBJEXT): {$(VPATH)}io.h
 symbol.$(OBJEXT): {$(VPATH)}missing.h
-symbol.$(OBJEXT): {$(VPATH)}onigmo.h
 symbol.$(OBJEXT): {$(VPATH)}oniguruma.h
 symbol.$(OBJEXT): {$(VPATH)}probes.dmyh
 symbol.$(OBJEXT): {$(VPATH)}probes.h
@@ -2933,22 +2430,17 @@ thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
 thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 thread.$(OBJEXT): $(top_srcdir)/include/ruby.h
 thread.$(OBJEXT): {$(VPATH)}config.h
-thread.$(OBJEXT): {$(VPATH)}debug.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)}intern.h
 thread.$(OBJEXT): {$(VPATH)}internal.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)}ruby_assert.h
 thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2969,12 +2461,10 @@ time.$(OBJEXT): $(top_srcdir)/include/ruby.h
 time.$(OBJEXT): {$(VPATH)}config.h
 time.$(OBJEXT): {$(VPATH)}defines.h
 time.$(OBJEXT): {$(VPATH)}encoding.h
-time.$(OBJEXT): {$(VPATH)}id.h
 time.$(OBJEXT): {$(VPATH)}intern.h
 time.$(OBJEXT): {$(VPATH)}internal.h
 time.$(OBJEXT): {$(VPATH)}io.h
 time.$(OBJEXT): {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}onigmo.h
 time.$(OBJEXT): {$(VPATH)}oniguruma.h
 time.$(OBJEXT): {$(VPATH)}st.h
 time.$(OBJEXT): {$(VPATH)}subst.h
@@ -2989,29 +2479,11 @@ transcode.$(OBJEXT): {$(VPATH)}intern.h
 transcode.$(OBJEXT): {$(VPATH)}internal.h
 transcode.$(OBJEXT): {$(VPATH)}io.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): $(hdrdir)/ruby/ruby.h
-transient_heap.$(OBJEXT): $(top_srcdir)/include/ruby.h
-transient_heap.$(OBJEXT): {$(VPATH)}config.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)}intern.h
-transient_heap.$(OBJEXT): {$(VPATH)}internal.h
-transient_heap.$(OBJEXT): {$(VPATH)}missing.h
-transient_heap.$(OBJEXT): {$(VPATH)}node.h
-transient_heap.$(OBJEXT): {$(VPATH)}ruby_assert.h
-transient_heap.$(OBJEXT): {$(VPATH)}st.h
-transient_heap.$(OBJEXT): {$(VPATH)}subst.h
-transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.c
-transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.h
-transient_heap.$(OBJEXT): {$(VPATH)}vm_debug.h
 util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 util.$(OBJEXT): $(top_srcdir)/include/ruby.h
 util.$(OBJEXT): {$(VPATH)}config.h
@@ -3021,7 +2493,6 @@ util.$(OBJEXT): {$(VPATH)}intern.h
 util.$(OBJEXT): {$(VPATH)}internal.h
 util.$(OBJEXT): {$(VPATH)}io.h
 util.$(OBJEXT): {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}onigmo.h
 util.$(OBJEXT): {$(VPATH)}oniguruma.h
 util.$(OBJEXT): {$(VPATH)}st.h
 util.$(OBJEXT): {$(VPATH)}subst.h
@@ -3035,7 +2506,6 @@ variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 variable.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -3043,49 +2513,23 @@ variable.$(OBJEXT): {$(VPATH)}id_table.h
 variable.$(OBJEXT): {$(VPATH)}intern.h
 variable.$(OBJEXT): {$(VPATH)}internal.h
 variable.$(OBJEXT): {$(VPATH)}io.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)}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)}vm_core.h
-variable.$(OBJEXT): {$(VPATH)}vm_opts.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/ruby.h
 version.$(OBJEXT): $(hdrdir)/ruby/version.h
-version.$(OBJEXT): $(top_srcdir)/include/ruby.h
 version.$(OBJEXT): $(top_srcdir)/revision.h
 version.$(OBJEXT): $(top_srcdir)/version.h
 version.$(OBJEXT): {$(VPATH)}config.h
 version.$(OBJEXT): {$(VPATH)}defines.h
-version.$(OBJEXT): {$(VPATH)}id.h
 version.$(OBJEXT): {$(VPATH)}intern.h
-version.$(OBJEXT): {$(VPATH)}internal.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
@@ -3094,9 +2538,7 @@ vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm.$(OBJEXT): $(top_srcdir)/include/ruby.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
@@ -3104,16 +2546,13 @@ 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)}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
@@ -3158,7 +2597,6 @@ 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
@@ -3188,7 +2626,6 @@ 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)}onigmo.h
 vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -3215,12 +2652,9 @@ 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)}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)}ruby_assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
diff --git a/compile.c b/compile.c
index 4ceb8951b7..dac26c6ce0 100644
--- a/compile.c
+++ b/compile.c
@@ -9,15 +9,13 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
-#include "ruby/re.h"
-#include "ruby/util.h"
 #include "internal.h"
+#include "ruby/re.h"
 #include "encindex.h"
 #include <math.h>
 
+#define USE_INSN_STACK_INCREASE 1
 #include "vm_core.h"
-#include "vm_debug.h"
 #include "iseq.h"
 #include "insns.inc"
 #include "insns_info.inc"
@@ -36,11 +34,10 @@
 
 typedef struct iseq_link_element {
     enum {
-	ISEQ_ELEMENT_ANCHOR,
+	ISEQ_ELEMENT_NONE,
 	ISEQ_ELEMENT_LABEL,
 	ISEQ_ELEMENT_INSN,
-	ISEQ_ELEMENT_ADJUST,
-	ISEQ_ELEMENT_TRACE
+	ISEQ_ELEMENT_ADJUST
     } type;
     struct iseq_link_element *next;
     struct iseq_link_element *prev;
@@ -67,19 +64,15 @@ 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 {
@@ -88,12 +81,6 @@ 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;
@@ -101,7 +88,7 @@ struct ensure_range {
 };
 
 struct iseq_compile_data_ensure_node_stack {
-    const NODE *ensure_node;
+    NODE *ensure_node;
     struct iseq_compile_data_ensure_node_stack *prev;
     struct ensure_range *erange;
 };
@@ -156,18 +143,30 @@ struct iseq_compile_data_ensure_node_stack {
 
 #define debug_node_start(node)  ((void) \
   (compile_debug_print_indent(1) && \
-   (ruby_debug_print_node(1, CPDEBUG, "", (const NODE *)(node)), gl_node_level)), \
+   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)(node)), gl_node_level)), \
    gl_node_level++)
 
 #define debug_node_end()  gl_node_level --
 
 #else
 
-#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)
+static inline ID
+r_id(ID id)
+{
+    return id;
+}
+
+static inline VALUE
+r_value(VALUE value)
+{
+    return value;
+}
+
+#define debugi(header, id)                 r_id(id)
+#define debugp(header, value)              r_value(value)
+#define debugp_verbose(header, value)      r_value(value)
+#define debugp_verbose_node(header, value) r_value(value)
+#define debugp_param(header, value)        r_value(value)
 #define debug_node_start(node)             ((void)0)
 #define debug_node_end()                   ((void)0)
 #endif
@@ -185,7 +184,9 @@ struct iseq_compile_data_ensure_node_stack {
 
 /* create new label */
 #define NEW_LABEL(l) new_label_body(iseq, (l))
-#define LABEL_FORMAT "<L%03d>"
+
+#define iseq_path(iseq) ((iseq)->body->location.path)
+#define iseq_absolute_path(iseq) ((iseq)->body->location.absolute_path)
 
 #define NEW_ISEQ(node, name, type, line_no) \
   new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no))
@@ -201,27 +202,18 @@ struct iseq_compile_data_ensure_node_stack {
 #define ADD_INSN(seq, line, insn) \
   ADD_ELEM((seq), (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))
+/* 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))
 
 /* 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 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 *) \
+/* 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 *) \
            new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
 
 #define LABEL_REF(label) ((label)->refcnt++)
@@ -259,51 +251,29 @@ struct iseq_compile_data_ensure_node_stack {
 #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, 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)))
-
-
-#define DECL_BRANCH_BASE(branches, first_line, first_column, last_line, last_column, type) \
+#define ADD_TRACE(seq, line, event) \
   do { \
-      if (ISEQ_COVERAGE(iseq) && \
-	  ISEQ_BRANCH_COVERAGE(iseq) && \
-	  (first_line) > 0) { \
-	  VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0); \
-	  branches = rb_ary_tmp_new(0); \
-	  rb_ary_push(structure, branches); \
-	  rb_ary_push(branches, ID2SYM(rb_intern(type))); \
-	  rb_ary_push(branches, INT2FIX(first_line)); \
-	  rb_ary_push(branches, INT2FIX(first_column)); \
-	  rb_ary_push(branches, INT2FIX(last_line)); \
-	  rb_ary_push(branches, INT2FIX(last_column)); \
+      if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \
+	  (line) > 0 && \
+	  (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)); \
       } \
-  } while (0)
-#define ADD_TRACE_BRANCH_COVERAGE(seq, first_line, first_column, last_line, last_column, type, branches) \
-  do { \
-      if (ISEQ_COVERAGE(iseq) && \
-	  ISEQ_BRANCH_COVERAGE(iseq) && \
-	  (first_line) > 0) { \
-	  VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1); \
-	  long counter_idx = RARRAY_LEN(counters); \
-	  rb_ary_push(counters, INT2FIX(0)); \
-	  rb_ary_push(branches, ID2SYM(rb_intern(type))); \
-	  rb_ary_push(branches, INT2FIX(first_line)); \
-	  rb_ary_push(branches, INT2FIX(first_column)); \
-	  rb_ary_push(branches, INT2FIX(last_line)); \
-	  rb_ary_push(branches, INT2FIX(last_column)); \
-	  rb_ary_push(branches, INT2FIX(counter_idx)); \
-          ADD_TRACE_WITH_DATA(seq, RUBY_EVENT_COVERAGE_BRANCH, counter_idx); \
-          ADD_INSN(seq, last_line, nop); \
+      if (ISEQ_COMPILE_DATA(iseq)->option->trace_instruction) { \
+	  ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
       } \
   } while (0)
 
-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) \
+  do { \
+      ADD_INSN2((seq), (line), getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \
+  } while (0)
 
-#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))
+#define ADD_SETLOCAL(seq, line, idx, level) \
+  do { \
+      ADD_INSN2((seq), (line), setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \
+  } while (0)
 
 /* add label */
 #define ADD_LABEL(seq, label) \
@@ -318,15 +288,13 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line,
 #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);			\
-    LABEL_UNREMOVABLE(ls);							\
-    LABEL_REF(le);								\
-    LABEL_REF(lc);								\
+    if (ls) LABEL_REF(ls);							\
+    if (le) LABEL_REF(le);							\
+    if (lc) LABEL_REF(lc);							\
     rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e));	\
 } while (0)
 
@@ -336,14 +304,14 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line,
                  iseq_compile_each(iseq, (anchor), (node), 0)))
 
 /* compile node, this node's value will be popped */
-#define COMPILE_POPPED(anchor, desc, node)    \
+#define COMPILE_POPED(anchor, desc, node)    \
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), 1)))
 
-/* compile node, which is popped when 'popped' is true */
-#define COMPILE_(anchor, desc, node, popped)  \
+/* compile node, which is popped when 'poped' is true */
+#define COMPILE_(anchor, desc, node, poped)  \
   (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, (anchor), (node), (popped))))
+                 iseq_compile_each(iseq, (anchor), (node), (poped))))
 
 #define COMPILE_RECV(anchor, desc, node) \
     (private_recv_p(node) ? \
@@ -359,22 +327,17 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line,
 #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 */
-#if CPDEBUG > 0
-NORETURN(static void append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...));
-#endif
+typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...);
 
 static void
-append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...)
+append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...)
 {
     VALUE err_info = ISEQ_COMPILE_DATA(iseq)->err_info;
-    VALUE file = rb_iseq_path(iseq);
-    VALUE err = err_info == Qtrue ? Qfalse : err_info;
+    VALUE file = iseq->body->location.path;
+    VALUE err = err_info;
     va_list args;
 
     va_start(args, fmt);
@@ -384,68 +347,66 @@ append_compile_error(const 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) 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(rb_iseq_path(iseq), line, fmt, args);
+    rb_report_bug_valist(iseq->body->location.path, line, fmt, args);
     va_end(args);
     abort();
 }
-#endif
 
-#define COMPILE_ERROR append_compile_error
+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 ERROR_ARGS_AT(n) iseq, nd_line(n),
 #define ERROR_ARGS ERROR_ARGS_AT(node)
 
-#define EXPECT_NODE(prefix, node, ndtype, errval) \
+#define EXPECT_NODE(prefix, node, ndtype) \
 do { \
-    const NODE *error_node = (node); \
+    NODE *error_node = (node); \
     enum node_type error_type = nd_type(error_node); \
     if (error_type != (ndtype)) { \
-	COMPILE_ERROR(ERROR_ARGS_AT(error_node) \
-		      prefix ": " #ndtype " is expected, but %s", \
-		      ruby_node_name(error_type)); \
-	return errval; \
+	compile_bug(ERROR_ARGS_AT(error_node) \
+		    prefix ": " #ndtype " is expected, but %s", \
+		    ruby_node_name(error_type)); \
     } \
 } while (0)
 
-#define EXPECT_NODE_NONULL(prefix, parent, ndtype, errval) \
+#define EXPECT_NODE_NONULL(prefix, parent, ndtype) \
 do { \
-    COMPILE_ERROR(ERROR_ARGS_AT(parent) \
-		  prefix ": must be " #ndtype ", but 0"); \
-    return errval; \
+    compile_bug(ERROR_ARGS_AT(parent) \
+		prefix ": must be " #ndtype ", but 0"); \
 } while (0)
 
-#define UNKNOWN_NODE(prefix, node, errval) \
+#define UNKNOWN_NODE(prefix, node) \
 do { \
-    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; \
+    NODE *error_node = (node); \
+    compile_bug(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
+		ruby_node_name(nd_type(error_node))); \
 } while (0)
 
 #define COMPILE_OK 1
 #define COMPILE_NG 0
 
-#define CHECK(sub) if (!(sub)) {BEFORE_RETURN;return COMPILE_NG;}
-#define BEFORE_RETURN
 
 /* leave name uninitialized so that compiler warn if INIT_ANCHOR is
  * missing */
 #define DECL_ANCHOR(name) \
-    LINK_ANCHOR name[1] = {{{ISEQ_ELEMENT_ANCHOR,},}}
+  LINK_ANCHOR *name, name##_body__ = {{0,},}
 #define INIT_ANCHOR(name) \
-    (name->last = &name->anchor)
+  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
 
 static inline VALUE
 freeze_hide_obj(VALUE obj)
@@ -473,8 +434,7 @@ freeze_hide_obj(VALUE obj)
 #define gl_node_level ISEQ_COMPILE_DATA(iseq)->node_level
 #endif
 
-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 void dump_disasm_list(LINK_ELEMENT *elem);
 
 static int insn_data_length(INSN *iobj);
 static int calc_sp_depth(int depth, INSN *iobj);
@@ -482,32 +442,27 @@ 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, 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_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
+static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
 
 static int iseq_set_local_table(rb_iseq_t *iseq, 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 *const anchor, const NODE *const node);
+static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
 
-static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
-static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
 static int iseq_set_exception_table(rb_iseq_t *iseq);
 static int iseq_set_optargs_table(rb_iseq_t *iseq);
 
-static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr);
-
 /*
  * To make Array to LinkedList, use link_anchor
  */
 
 static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
 {
 #if CPDEBUG
     int flag = 0;
@@ -542,7 +497,7 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
  * elem1, elem2 => elem1, elem2, elem
  */
 static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
 {
     elem->prev = anchor->last;
     anchor->last->next = elem;
@@ -554,7 +509,7 @@ ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
  * elem1, before, elem2 => elem1, before, elem, elem2
  */
 static void
-APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
+APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
 {
     elem->prev = before;
     elem->next = before->next;
@@ -568,23 +523,24 @@ APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LI
 #define APPEND_ELEM(anchor, before, elem) APPEND_ELEM(iseq, (anchor), (before), (elem))
 #endif
 
-#define ISEQ_LAST_LINE(iseq) (ISEQ_COMPILE_DATA(iseq)->last_line)
-
 static int
-iseq_add_mark_object_compile_time(const rb_iseq_t *iseq, VALUE v)
+iseq_add_mark_object(const rb_iseq_t *iseq, VALUE v)
 {
     if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, v);
+	rb_iseq_add_mark_object(iseq, v);
     }
     return COMPILE_OK;
 }
 
-static inline VALUE
-freeze_literal(rb_iseq_t *iseq, VALUE lit)
+#define ruby_sourcefile		RSTRING_PTR(iseq->body->location.path)
+
+static int
+iseq_add_mark_object_compile_time(const rb_iseq_t *iseq, VALUE v)
 {
-    lit = rb_fstring(lit);
-    rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, lit);
-    return lit;
+    if (!SPECIAL_CONST_P(v)) {
+	rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, v);
+    }
+    return COMPILE_OK;
 }
 
 static int
@@ -596,7 +552,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_sym2str((VALUE)name));
+			  rb_id2str((ID)name));
 	} while (0);
     }
     return ST_CONTINUE;
@@ -607,37 +563,21 @@ 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_ifunc(rb_iseq_t *iseq, const struct vm_ifunc *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)
+rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
 {
     DECL_ANCHOR(ret);
     INIT_ANCHOR(ret);
 
-    if (imemo_type_p((VALUE)node, imemo_ifunc)) {
-        rb_raise(rb_eArgError, "unexpected imemo_ifunc");
-    }
-
     if (node == 0) {
 	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);
@@ -652,70 +592,67 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
 		start->rescued = LABEL_RESCUE_BEG;
 		end->rescued = LABEL_RESCUE_END;
 
-		ADD_TRACE(ret, RUBY_EVENT_B_CALL);
-		ADD_INSN (ret, FIX2INT(iseq->body->location.first_lineno), nop);
+		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_B_CALL);
 		ADD_LABEL(ret, start);
-		CHECK(COMPILE(ret, "block body", node->nd_body));
+		COMPILE(ret, "block body", node->nd_body);
 		ADD_LABEL(ret, end);
-		ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
-		ISEQ_COMPILE_DATA(iseq)->last_line = iseq->body->location.code_location.end_pos.lineno;
+		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
 
 		/* wide range catch handler must put at last */
-		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
-		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
+		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
+		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
 		break;
 	    }
 	  case ISEQ_TYPE_CLASS:
 	    {
-		ADD_TRACE(ret, 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);
+		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);
 		break;
 	    }
 	  case ISEQ_TYPE_METHOD:
 	    {
-		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);
+		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);
 		break;
 	    }
 	  default: {
-	    CHECK(COMPILE(ret, "scoped node", node->nd_body));
+	    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 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_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 ISEQ_TYPE_RESCUE:
 	    iseq_set_exception_local_table(iseq);
-	    CHECK(COMPILE(ret, "rescue", node));
+	    COMPILE(ret, "rescue", node);
 	    break;
 	  case ISEQ_TYPE_ENSURE:
 	    iseq_set_exception_local_table(iseq);
-	    CHECK(COMPILE_POPPED(ret, "ensure", node));
+	    COMPILE_POPED(ret, "ensure", node);
 	    break;
-	  case ISEQ_TYPE_PLAIN:
-	    CHECK(COMPILE(ret, "ensure", node));
+	  case ISEQ_TYPE_DEFINED_GUARD:
+	    iseq_set_exception_local_table(iseq);
+	    COMPILE(ret, "defined guard", node);
 	    break;
 	  default:
-	    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;
+	    compile_bug(ERROR_ARGS "unknown scope");
 	}
     }
 
@@ -734,7 +671,6 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
 	validate_labels(iseq, labels_table);
     }
 #endif
-    CHECK(iseq_setup_insn(iseq, ret));
     return iseq_setup(iseq, ret);
 }
 
@@ -752,11 +688,26 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 	encoded[i] = (VALUE)table[insn];
 	i += len;
     }
-    FL_SET(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 */
 {
@@ -856,7 +807,7 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size)
 	    alloc_size *= 2;
 	}
 	storage->next = (void *)ALLOC_N(char, alloc_size +
-					offsetof(struct iseq_compile_data_storage, buff));
+					SIZEOF_ISEQ_COMPILE_DATA_STORAGE);
 	storage = ISEQ_COMPILE_DATA(iseq)->storage_current = storage->next;
 	storage->next = 0;
 	storage->pos = 0;
@@ -893,17 +844,11 @@ 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
-ELEM_INSERT_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->next = elem1->next;
     elem2->prev = elem1;
@@ -917,7 +862,7 @@ ELEM_INSERT_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
  * elem1, elemX => elemX, elem2, elem1
  */
 static void
-ELEM_INSERT_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1;
@@ -927,11 +872,12 @@ ELEM_INSERT_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     }
 }
 
+#if 0
 /*
  * elemX, elem1, elemY => elemX, elem2, elemY
  */
 static void
-ELEM_REPLACE(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1->next;
@@ -942,9 +888,10 @@ ELEM_REPLACE(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 	elem1->next->prev = elem2;
     }
 }
+#endif
 
 static void
-ELEM_REMOVE(LINK_ELEMENT *elem)
+REMOVE_ELEM(LINK_ELEMENT *elem)
 {
     elem->prev->next = elem->next;
     if (elem->next) {
@@ -953,19 +900,19 @@ ELEM_REMOVE(LINK_ELEMENT *elem)
 }
 
 static LINK_ELEMENT *
-FIRST_ELEMENT(const LINK_ANCHOR *const anchor)
+FIRST_ELEMENT(LINK_ANCHOR *anchor)
 {
     return anchor->anchor.next;
 }
 
 static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *const anchor)
+LAST_ELEMENT(LINK_ANCHOR *anchor)
 {
     return anchor->last;
 }
 
 static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *elem = anchor->last;
     anchor->last = anchor->last->prev;
@@ -977,42 +924,14 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const 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_INSN_SIZE_ONE(const LINK_ANCHOR *const anchor)
+LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
 {
-    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 FALSE;
-    }
-}
-
-static int
-LIST_INSN_SIZE_ZERO(const LINK_ANCHOR *const anchor)
-{
-    if (ELEM_FIRST_INSN(FIRST_ELEMENT(anchor)) == NULL) {
-	return TRUE;
+    if (anchor->anchor.next == 0) {
+	return 1;
     }
     else {
-	return FALSE;
+	return 0;
     }
 }
 
@@ -1024,7 +943,7 @@ LIST_INSN_SIZE_ZERO(const LINK_ANCHOR *const anchor)
  * anc2: e4, e5 (broken)
  */
 static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 {
     if (anc2->anchor.next) {
 	anc1->last->next = anc2->anchor.next;
@@ -1045,7 +964,7 @@ APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
  * anc2: e4, e5 (broken)
  */
 static void
-INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
+INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 {
     if (anc2->anchor.next) {
 	LINK_ELEMENT *first = anc1->anchor.next;
@@ -1068,7 +987,7 @@ INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 
 #if CPDEBUG && 0
 static void
-debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
     printf("----\n");
@@ -1087,23 +1006,8 @@ debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
 #if CPDEBUG < 0
 #define debug_list(anc) debug_list(iseq, (anc))
 #endif
-#else
-#define debug_list(anc) ((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)
 {
@@ -1118,7 +1022,6 @@ 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;
 }
 
@@ -1130,7 +1033,7 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
     adjust->link.next = 0;
     adjust->label = label;
     adjust->line_no = line;
-    LABEL_UNREMOVABLE(label);
+    if (label) LABEL_REF(label);
     return adjust;
 }
 
@@ -1139,14 +1042,12 @@ 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->insn_info.line_no = line_no;
-    iobj->insn_info.events = 0;
+    iobj->line_no = line_no;
     iobj->operands = argv;
     iobj->operand_size = argc;
     iobj->sc_state = 0;
@@ -1192,7 +1093,7 @@ new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_cal
 	iseq->body->ci_size++;
     }
 
-    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT)) &&
+    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) &&
 	kw_arg == NULL && !has_blockiseq) {
 	ci->flag |= VM_CALL_ARGS_SIMPLE;
     }
@@ -1210,121 +1111,23 @@ new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *
 }
 
 static rb_iseq_t *
-new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
+new_child_iseq(rb_iseq_t *iseq, NODE *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(&ast, name,
-				    rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+    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);
     debugs("[new_child_iseq]< ---------------------------------------\n");
-    iseq_add_mark_object_compile_time(iseq, (VALUE)ret_iseq);
+    iseq_add_mark_object(iseq, (VALUE)ret_iseq);
     return ret_iseq;
 }
 
-static rb_iseq_t *
-new_child_iseq_ifunc(rb_iseq_t *iseq, const struct vm_ifunc *ifunc,
-		     VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
-{
-    rb_iseq_t *ret_iseq;
-
-    debugs("[new_child_iseq_ifunc]> ---------------------------------------\n");
-    ret_iseq = rb_iseq_new_ifunc(ifunc, name,
-				 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
-				 INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
-    debugs("[new_child_iseq_ifunc]< ---------------------------------------\n");
-    iseq_add_mark_object_compile_time(iseq, (VALUE)ret_iseq);
-    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 = &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;
-    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_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *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)
@@ -1350,18 +1153,6 @@ iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const 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);
-
-    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)
@@ -1376,8 +1167,6 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
     if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG;
 
-    update_catch_except_flags(iseq->body);
-
     if (compile_debug > 1) {
 	VALUE str = rb_iseq_disasm(iseq);
 	printf("%s\n", StringValueCStr(str));
@@ -1433,8 +1222,7 @@ 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) {
-        COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq),
-                      "get_local_var_idx: %d", idx);
+	rb_bug("get_local_var_idx: %d", idx);
     }
 
     return idx;
@@ -1444,7 +1232,6 @@ 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);
@@ -1456,8 +1243,7 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
     }
 
     if (idx < 0) {
-        COMPILE_ERROR(topmost_iseq, ISEQ_LAST_LINE(topmost_iseq),
-                      "get_dyna_var_idx: -1");
+	rb_bug("get_dyna_var_idx: -1");
     }
 
     *level = lv;
@@ -1465,136 +1251,68 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
     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
-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));
-    }
-}
-
-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));
-    }
-}
-
-
-
 static void
 iseq_calc_param_size(rb_iseq_t *iseq)
 {
-    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_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) {
 
-	if (body->param.flags.has_block) {
-	    body->param.size = body->param.block_start + 1;
+	if (iseq->body->param.flags.has_block) {
+	    iseq->body->param.size = iseq->body->param.block_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_kwrest) {
+	    iseq->body->param.size = iseq->body->param.keyword->rest_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_kw) {
+	    iseq->body->param.size = iseq->body->param.keyword->bits_start + 1;
 	}
-	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_post) {
+	    iseq->body->param.size = iseq->body->param.post_start + iseq->body->param.post_num;
 	}
-	else if (body->param.flags.has_rest) {
-	    body->param.size = body->param.rest_start + 1;
+	else if (iseq->body->param.flags.has_rest) {
+	    iseq->body->param.size = iseq->body->param.rest_start + 1;
 	}
-	else if (body->param.flags.has_opt) {
-	    body->param.size = body->param.lead_num + body->param.opt_num;
+	else if (iseq->body->param.flags.has_opt) {
+	    iseq->body->param.size = iseq->body->param.lead_num + iseq->body->param.opt_num;
 	}
 	else {
-            UNREACHABLE;
+	    rb_bug("unreachable");
 	}
     }
     else {
-	body->param.size = body->param.lead_num;
+	iseq->body->param.size = iseq->body->param.lead_num;
     }
 }
 
-static int
-iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
-			    const struct rb_args_info *args, int arg_size)
+static void
+iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct rb_args_info *args)
 {
-    const NODE *node = args->kw_args;
-    struct rb_iseq_constant_body *const body = iseq->body;
+    NODE *node = args->kw_args;
     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;
 
-    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++;
+    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);
 
-    node = args->kw_args;
     while (node) {
-	const NODE *val_node = node->nd_body->nd_value;
+	NODE *val_node = node->nd_body->nd_value;
 	VALUE dv;
 
-	if (val_node == (const NODE *)-1) {
+	if (val_node == (NODE *)-1) {
 	    ++rkw;
 	}
 	else {
 	    switch (nd_type(val_node)) {
 	      case NODE_LIT:
 		dv = val_node->nd_lit;
-		iseq_add_mark_object_compile_time(iseq, dv);
+		iseq_add_mark_object(iseq, dv);
 		break;
 	      case NODE_NIL:
 		dv = Qnil;
@@ -1606,7 +1324,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
 		dv = Qfalse;
 		break;
 	      default:
-		COMPILE_POPPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+		COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
 		dv = complex_mark;
 	    }
 
@@ -1614,17 +1332,18 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
 	    rb_ary_push(default_values, dv);
 	}
 
+	kw++;
 	node = node->nd_next;
     }
 
     keyword->num = kw;
 
-    if (args->kw_rest_arg->nd_vid != 0) {
-	keyword->rest_start = arg_size++;
-	body->param.flags.has_kwrest = TRUE;
+    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;
     }
     keyword->required_num = rkw;
-    keyword->table = &body->local_table[keyword->bits_start - keyword->num];
+    keyword->table = &iseq->body->local_table[keyword->bits_start - keyword->num];
 
     {
 	VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
@@ -1632,35 +1351,29 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
 	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 *const optargs, const NODE *const node_args)
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 {
     debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
 
     if (node_args) {
-	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, COMPILE_NG);
+	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS);
 
-	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);
+	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);
 
 	rest_id = args->rest_arg;
 	if (rest_id == 1) {
@@ -1669,8 +1382,14 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 	}
 	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) {
-	    const NODE *node = args->opt_args;
+	    NODE *node = args->opt_args;
 	    LABEL *label;
 	    VALUE labels = rb_ary_tmp_new(1);
 	    VALUE *opt_table;
@@ -1680,7 +1399,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 		label = NEW_LABEL(nd_line(node));
 		rb_ary_push(labels, (VALUE)label | 1);
 		ADD_LABEL(optargs, label);
-		COMPILE_POPPED(optargs, "optarg", node->nd_body);
+		COMPILE_POPED(optargs, "optarg", node->nd_body);
 		node = node->nd_next;
 		i += 1;
 	    }
@@ -1692,70 +1411,61 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 
 	    opt_table = ALLOC_N(VALUE, i+1);
 
-            MEMCPY(opt_table, RARRAY_CONST_PTR_TRANSIENT(labels), VALUE, i+1);
+	    MEMCPY(opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1);
 	    for (j = 0; j < i+1; j++) {
 		opt_table[j] &= ~1;
 	    }
 	    rb_ary_clear(labels);
 
-	    body->param.flags.has_opt = TRUE;
-	    body->param.opt_num = i;
-	    body->param.opt_table = opt_table;
-	    arg_size += i;
-	}
-
-	if (rest_id) {
-	    body->param.rest_start = arg_size++;
-	    body->param.flags.has_rest = TRUE;
-	    assert(body->param.rest_start != -1);
-	}
-
-	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;
-	    }
+	    iseq->body->param.flags.has_opt = TRUE;
+	    iseq->body->param.opt_num = i;
+	    iseq->body->param.opt_table = opt_table;
 	}
 
 	if (args->kw_args) {
-	    arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
+	    iseq_set_arguments_keywords(iseq, optargs, args);
 	}
 	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;
+	    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 (block_id) {
-	    body->param.block_start = arg_size++;
-	    body->param.flags.has_block = TRUE;
+	if (args->pre_init) { /* m_init */
+	    COMPILE_POPED(optargs, "init arguments (m)", args->pre_init);
+	}
+	if (args->post_init) { /* p_init */
+	    COMPILE_POPED(optargs, "init arguments (p)", args->post_init);
 	}
 
-	iseq_calc_param_size(iseq);
-	body->param.size = arg_size;
+	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 (args->pre_init) { /* m_init */
-	    COMPILE_POPPED(optargs, "init arguments (m)", args->pre_init);
+	    if (iseq->body->param.post_start == 0) { /* TODO: why that? */
+		iseq->body->param.post_start = iseq->body->param.rest_start + 1;
+	    }
 	}
-	if (args->post_init) { /* p_init */
-	    COMPILE_POPPED(optargs, "init arguments (p)", args->post_init);
+
+	if (block_id) {
+	    iseq->body->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id);
+	    iseq->body->param.flags.has_block = TRUE;
 	}
 
-	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) {
+	iseq_calc_param_size(iseq);
+
+	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->param.lead_num == 1 && last_comma == 0) {
+		if (iseq->body->param.lead_num == 1 && last_comma == 0) {
 		    /* {|a|} */
-		    body->param.flags.ambiguous_param0 = TRUE;
+		    iseq->body->param.flags.ambiguous_param0 = TRUE;
 		}
 	    }
 	}
@@ -1791,57 +1501,27 @@ iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
 static int
 cdhash_cmp(VALUE val, VALUE lit)
 {
-    int tval, tlit;
-
-    if (val == lit) {
-        return 0;
-    }
-    else if ((tlit = OBJ_BUILTIN_TYPE(lit)) == -1) {
-        return val != lit;
-    }
-    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;
+    if (val == lit) return 0;
+    if (SPECIAL_CONST_P(lit)) {
+	return val != lit;
     }
-    else if (tlit == T_FLOAT) {
-        return rb_float_cmp(lit, val);
+    if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
+	return -1;
     }
-    else {
-        UNREACHABLE_RETURN(-1);
+    if (BUILTIN_TYPE(lit) == T_STRING) {
+	return rb_str_hash_cmp(lit, val);
     }
+    return !rb_eql(lit, val);
 }
 
 static st_index_t
 cdhash_hash(VALUE a)
 {
-    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));
-      default:
-        UNREACHABLE_RETURN(0);
+    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);
     }
 }
 
@@ -1885,170 +1565,18 @@ 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;
-			}
-		    }
-		}
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj = (LABEL *)list;
-		if (lobj->sp == -1) {
-		    lobj->sp = sp;
-		}
-		else {
-		    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 *const anchor)
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
-    struct iseq_insn_info_entry *insns_info;
-    struct rb_iseq_constant_body *const body = iseq->body;
-    unsigned int *positions;
+    struct iseq_line_info_entry *line_info_table;
+    unsigned int last_line = 0;
     LINK_ELEMENT *list;
     VALUE *generated_iseq;
-    rb_event_flag_t events = 0;
-    long data = 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;
+    int insn_num, code_index, line_info_index, sp, stack_max = 0, line = 0;
 
     /* fix label position */
     list = FIRST_ELEMENT(anchor);
@@ -2058,77 +1586,53 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 	  case ISEQ_ELEMENT_INSN:
 	    {
 		INSN *iobj = (INSN *)list;
-		/* update sp */
-		sp = calc_sp_depth(sp, iobj);
+		line = iobj->line_no;
+		code_index += insn_data_length(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;
-		sp = lobj->sp;
+		lobj->set = TRUE;
 		break;
 	    }
-	  case ISEQ_ELEMENT_TRACE:
+	  case ISEQ_ELEMENT_NONE:
 	    {
-		TRACE *trace = (TRACE *)list;
-		events |= trace->event;
-                if (trace->event & RUBY_EVENT_COVERAGE_BRANCH) data = trace->data;
+		/* ignore */
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
 	    {
 		ADJUST *adjust = (ADJUST *)list;
 		if (adjust->line_no != -1) {
-		    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++;
-		    }
+		    code_index += 2 /* insn + 1 operand */;
+		    insn_num++;
 		}
 		break;
 	    }
-	  default: break;
+	  default:
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+	    dump_disasm_list(list);
+	    COMPILE_ERROR(iseq, line, "error: set_sequence");
+	    return COMPILE_NG;
 	}
 	list = list->next;
     }
 
     /* make instruction sequence */
     generated_iseq = ALLOC_N(VALUE, code_index);
-    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->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * body->ci_size +
-								 sizeof(struct rb_call_info_with_kwarg) * body->ci_kw_size);
-    MEMZERO(body->ci_entries + body->ci_size, struct rb_call_info_with_kwarg,  body->ci_kw_size); /* need to clear ci_kw entries */
-    body->cc_entries = ZALLOC_N(struct rb_call_cache, body->ci_size + body->ci_kw_size);
+    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;
 
     list = FIRST_ELEMENT(anchor);
-    insns_info_index = code_index = sp = 0;
+    line_info_index = code_index = sp = 0;
 
     while (list) {
 	switch (list->type) {
@@ -2141,6 +1645,10 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const 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;
@@ -2148,6 +1656,18 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const 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); */
@@ -2156,6 +1676,14 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const 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;
 			}
@@ -2171,38 +1699,32 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			    rb_hash_rehash(map);
 			    freeze_hide_obj(map);
 			    generated_iseq[code_index + 1 + j] = map;
-			    RB_OBJ_WRITTEN(iseq, Qundef, map);
-			    FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
 			    break;
 			}
 		      case TS_LINDEX:
 		      case TS_NUM:	/* ulong */
 			generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
 			break;
-		      case TS_VALUE:	/* VALUE */
 		      case TS_ISEQ:	/* iseq */
 			{
 			    VALUE v = operands[j];
 			    generated_iseq[code_index + 1 + j] = v;
+			    break;
+			}
+		      case TS_VALUE:	/* VALUE */
+			{
+			    VALUE v = operands[j];
+			    generated_iseq[code_index + 1 + j] = v;
 			    /* to mark ruby object */
-			    if (!SPECIAL_CONST_P(v)) {
-				RB_OBJ_WRITTEN(iseq, Qundef, v);
-				FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
-			    }
+			    iseq_add_mark_object(iseq, v);
 			    break;
 			}
-		      case TS_ISE: /* inline storage entry */
-			/* Treated as an IC, but may contain a markable VALUE */
-			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
 		      case TS_IC: /* inline cache */
 			{
 			    unsigned int ic_index = FIX2UINT(operands[j]);
-			    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);
+			    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);
 			    }
 			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
 			    break;
@@ -2213,16 +1735,16 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			    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 *)&body->ci_entries[body->ci_size];
+				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 <= body->ci_kw_size);
+				assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= iseq->body->ci_kw_size);
 			    }
 			    else {
-				ci = &body->ci_entries[ISEQ_COMPILE_DATA(iseq)->ci_index++];
+				ci = &iseq->body->ci_entries[ISEQ_COMPILE_DATA(iseq)->ci_index++];
 				*ci = *base_ci;
-				assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size);
+				assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= iseq->body->ci_size);
 			    }
 
 			    generated_iseq[code_index + 1 + j] = (VALUE)ci;
@@ -2230,7 +1752,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			}
 		      case TS_CALLCACHE:
 			{
-			    struct rb_call_cache *cc = &body->cc_entries[ISEQ_COMPILE_DATA(iseq)->ci_index + ISEQ_COMPILE_DATA(iseq)->ci_kw_index - 1];
+			    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;
 			}
@@ -2248,19 +1770,30 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			generated_iseq[code_index + 1 + j] = operands[j];
 			break;
 		      default:
-			BADINSN_ERROR(iseq, iobj->insn_info.line_no,
+			xfree(generated_iseq);
+			xfree(line_info_table);
+			COMPILE_ERROR(iseq, iobj->line_no,
 				      "unknown operand type: %c", type);
 			return COMPILE_NG;
 		    }
 		}
-		if (add_insn_info(insns_info, positions, insns_info_index, code_index, iobj)) insns_info_index++;
+		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++;
+		}
 		code_index += len;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		LABEL *lobj = (LABEL *)list;
-		sp = lobj->sp;
+		if (lobj->sp == -1) {
+		    lobj->sp = sp;
+		}
+		else {
+		    sp = lobj->sp;
+		}
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
@@ -2276,27 +1809,29 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		}
 
 		if (adjust->line_no != -1) {
-		    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) {
+		    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++;
+			}
 			generated_iseq[code_index++] = BIN(adjuststack);
 			generated_iseq[code_index++] = orig_sp - sp;
 		    }
-		    else if (diff == 1) {
-			generated_iseq[code_index++] = BIN(pop);
+		    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 < 0) {
-			int label_no = adjust->label ? adjust->label->label_no : -1;
-			xfree(generated_iseq);
-			xfree(insns_info);
-			xfree(positions);
-			debug_list(anchor);
-			COMPILE_ERROR(iseq, adjust->line_no,
-				      "iseq_set_sequence: adjust bug to %d %d < %d",
-				      label_no, orig_sp, sp);
-			return COMPILE_NG;
+		    else {
+			compile_bug(iseq, adjust->line_no,
+				    "iseq_set_sequence: adjust bug %d < %d",
+				    orig_sp, sp);
 		    }
 		}
 		break;
@@ -2308,19 +1843,13 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 	list = list->next;
     }
 
-    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;
+    iseq->body->iseq_encoded = (void *)generated_iseq;
+    iseq->body->iseq_size = code_index;
+    iseq->body->stack_max = stack_max;
 
-    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;
+    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;
 
     return COMPILE_OK;
 }
@@ -2345,20 +1874,24 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     struct iseq_catch_table_entry *entry;
 
     tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
-    tptr = RARRAY_CONST_PTR_TRANSIENT(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+    tptr = RARRAY_CONST_PTR(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_TRANSIENT(tptr[i]);
+	    ptr = RARRAY_CONST_PTR(tptr[i]);
 	    entry = &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];
-	    RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
+
+	    /* register iseq as mark object */
+	    if (entry->iseq != 0) {
+		iseq_add_mark_object(iseq, (VALUE)entry->iseq);
+	    }
 
 	    /* stack depth */
 	    if (ptr[4]) {
@@ -2415,32 +1948,14 @@ 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) {
-	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;
-	    }
+	if (IS_INSN(list) || IS_ADJUST(list)) {
 	    break;
-	  default: break;
 	}
 	list = list->next;
     }
-  found:
-    if (list && IS_INSN(list)) {
-	INSN *iobj = (INSN *)list;
-	iobj->insn_info.events |= events;
-    }
     return list;
 }
 
@@ -2477,7 +1992,7 @@ unref_destination(INSN *iobj, int pos)
 {
     LABEL *lobj = (LABEL *)OPERAND_AT(iobj, pos);
     --lobj->refcnt;
-    if (!lobj->refcnt) ELEM_REMOVE(&lobj->link);
+    if (!lobj->refcnt) REMOVE_ELEM(&lobj->link);
 }
 
 static void
@@ -2489,63 +2004,14 @@ replace_destination(INSN *dobj, INSN *nobj)
     --dl->refcnt;
     ++nl->refcnt;
     OPERAND_AT(dobj, 0) = n;
-    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;
+    if (!dl->refcnt) REMOVE_ELEM(&dl->link);
 }
 
 static int
 remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *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 {
+    int removed = 0;
+    while (i) {
 	if (IS_INSN(i)) {
 	    struct rb_iseq_constant_body *body = iseq->body;
 	    VALUE insn = INSN_OF(i);
@@ -2564,152 +2030,34 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
 		}
 	    }
 	}
-	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
-same_debug_pos_p(LINK_ELEMENT *iobj1, LINK_ELEMENT *iobj2)
-{
-    VALUE debug1 = OPERAND_AT(iobj1, 0);
-    VALUE debug2 = OPERAND_AT(iobj2, 0);
-    if (debug1 == debug2) return TRUE;
-    if (!RB_TYPE_P(debug1, T_ARRAY)) return FALSE;
-    if (!RB_TYPE_P(debug2, T_ARRAY)) return FALSE;
-    if (RARRAY_LEN(debug1) != 2) return FALSE;
-    if (RARRAY_LEN(debug2) != 2) return FALSE;
-    if (RARRAY_AREF(debug1, 0) != RARRAY_AREF(debug2, 0)) return FALSE;
-    if (RARRAY_AREF(debug1, 1) != RARRAY_AREF(debug2, 1)) return FALSE;
-    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) {
-      no_branch:
-	/* 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:
-	goto no_branch;
-    }
-    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 if (IS_LABEL(i)) {
+	    if (((LABEL *)i)->refcnt > 0) break;
 	}
+	else break;
+	REMOVE_ELEM(i);
+	removed = 1;
+	i = i->next;
     }
-    INSERT_AFTER_INSN1(iobj, line, jump, dest);
-    LABEL_REF(dest);
-    if (!dup) INSERT_AFTER_INSN(iobj, line, pop);
-    return TRUE;
+    return removed;
 }
 
 static int
 iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
 {
-    INSN *const iobj = (INSN *)list;
-
+    INSN *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
+	 */
 	diobj = (INSN *)get_destination_insn(iobj);
 	niobj = (INSN *)get_next_insn(iobj);
 
@@ -2721,27 +2069,15 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     *   LABEL:
 	     */
 	    unref_destination(iobj, 0);
-	    ELEM_REMOVE(&iobj->link);
-	    return COMPILE_OK;
+	    REMOVE_ELEM(&iobj->link);
 	}
 	else if (iobj != diobj && IS_INSN_ID(diobj, jump) &&
 		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 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)) {
-	    INSN *pop;
 	    /*
 	     *  jump LABEL
 	     *  ...
@@ -2749,108 +2085,48 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     *  leave
 	     * =>
 	     *  leave
-	     *  pop
 	     *  ...
 	     * 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->operand_size = 0;
-	    iobj->insn_info = diobj->insn_info;
-	    /* adjust stack depth */
-	    pop = new_insn_body(iseq, diobj->insn_info.line_no, BIN(pop), 0);
-	    ELEM_INSERT_NEXT(&iobj->link, &pop->link);
+	    INSERT_ELEM_NEXT(&iobj->link, &popiobj->link);
 	    goto again;
 	}
-       else if (IS_INSN(iobj->link.prev) &&
-                 (piobj = (INSN *)iobj->link.prev) &&
+	/*
+	 * 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 &&
 		 (IS_INSN_ID(piobj, branchif) ||
 		  IS_INSN_ID(piobj, branchunless))) {
-	    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:
-		 */
+	    if (niobj == (INSN *)get_destination_insn(piobj)) {
 		piobj->insn_id = (IS_INSN_ID(piobj, branchif))
 		  ? BIN(branchunless) : BIN(branchif);
 		replace_destination(piobj, iobj);
-		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);
+		REMOVE_ELEM(&iobj->link);
 	    }
 	}
-	if (remove_unreachable_chunk(iseq, iobj->link.next)) {
+	else 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);
-
-	    iseq_add_mark_object_compile_time(iseq, lit_range);
-	    ELEM_REMOVE(&beg->link);
-	    ELEM_REMOVE(&end->link);
-	    range->insn_id = BIN(putobject);
-	    OPERAND_AT(range, 0) = lit_range;
-	}
-    }
-
     if (IS_INSN_ID(iobj, leave)) {
 	remove_unreachable_chunk(iseq, iobj->link.next);
     }
@@ -2937,33 +2213,21 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 			    OPERAND_AT(pobj, 0) == Qfalse :
 			    FALSE);
 		}
-		else if (IS_INSN_ID(pobj, putstring) ||
-			 IS_INSN_ID(pobj, duparray) ||
-			 IS_INSN_ID(pobj, newarray)) {
+		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;
-		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);
-		}
+		REMOVE_ELEM(iobj->link.prev);
 		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);
+		    REMOVE_ELEM(&iobj->link);
 		}
 		break;
 	    }
@@ -2983,150 +2247,12 @@ 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(dup) ||
-		previ == BIN(getlocal) ||
-		previ == BIN(getblockparam) ||
-		previ == BIN(getblockparamproxy) ||
-		/* getinstancevariable may issue a warning */
-		previ == BIN(duparray)) {
+		previ == BIN(putself) || previ == BIN(putstring)) {
 		/* just push operand or static value and pop soon, no
 		 * side effects */
-		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);
+		REMOVE_ELEM(prev);
+		REMOVE_ELEM(&iobj->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, *freeze = 0;
-	INSN *jump = 0;
-	if (IS_INSN(next) && IS_INSN_ID(next, freezestring))
-	    next = (freeze = next)->next;
-	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++;
-		if (freeze && IS_NEXT_INSN_ID(next, freezestring)) {
-		    if (same_debug_pos_p(freeze, next->next)) {
-			ELEM_REMOVE(freeze);
-		    }
-		    else {
-			next = next->next;
-		    }
-		}
-		ELEM_INSERT_NEXT(next, &label->link);
-		CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
-	    }
-	    else {
-		if (freeze) ELEM_REMOVE(freeze);
-		ELEM_REMOVE(next);
-	    }
-	}
-    }
-
-    if (IS_INSN_ID(iobj, freezestring) &&
-	NIL_P(OPERAND_AT(iobj, 0)) &&
-	IS_NEXT_INSN_ID(&iobj->link, send)) {
-	INSN *niobj = (INSN *)iobj->link.next;
-	struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0);
-	/*
-	 *  freezestring nil # no debug_info
-	 *  send <:+@, 0, ARG_SIMPLE>  # :-@, too
-	 * =>
-	 *  send <:+@, 0, ARG_SIMPLE>  # :-@, too
-	 */
-	if ((ci->mid == idUPlus || ci->mid == idUMinus) &&
-	    (ci->flag & VM_CALL_ARGS_SIMPLE) &&
-	    ci->orig_argc == 0) {
-	    ELEM_REMOVE(list);
-	    return COMPILE_OK;
 	}
     }
 
@@ -3152,15 +2278,9 @@ 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;
 		  default:
@@ -3183,41 +2303,13 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	}
     }
 
-    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);
-	    }
+    #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);
 	}
     }
 
@@ -3234,9 +2326,9 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
 	VALUE *old_operands = iobj->operands;
 	iobj->operand_size = 4;
 	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE));
-	iobj->operands[0] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
+	iobj->operands[0] = old_operands[0];
 	iobj->operands[1] = Qfalse; /* CALL_CACHE */
-	iobj->operands[2] = old_operands[0];
+	iobj->operands[2] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
 	iobj->operands[3] = Qfalse; /* CALL_CACHE */
     }
 
@@ -3258,11 +2350,11 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 		switch (ci->mid) {
 		  case idMax:
 		    iobj->insn_id = BIN(opt_newarray_max);
-		    ELEM_REMOVE(&niobj->link);
+		    REMOVE_ELEM(&niobj->link);
 		    return COMPILE_OK;
 		  case idMin:
 		    iobj->insn_id = BIN(opt_newarray_min);
-		    ELEM_REMOVE(&niobj->link);
+		    REMOVE_ELEM(&niobj->link);
 		    return COMPILE_OK;
 		}
 	    }
@@ -3300,8 +2392,6 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 		  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:
@@ -3326,10 +2416,6 @@ 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 */
@@ -3340,7 +2426,7 @@ tailcallable_p(rb_iseq_t *iseq)
 }
 
 static int
-iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *list;
     const int do_peepholeopt = ISEQ_COMPILE_DATA(iseq)->option->peephole_optimization;
@@ -3413,7 +2499,7 @@ new_unified_insn(rb_iseq_t *iseq,
 	list = list->next;
     }
 
-    return new_insn_core(iseq, iobj->insn_info.line_no, insn_id, argc, operands);
+    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
 }
 #endif
 
@@ -3423,7 +2509,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 *const anchor)
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
 #if OPT_INSTRUCTIONS_UNIFICATION
     LINK_ELEMENT *list;
@@ -3481,7 +2567,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 #include "opt_sc.inc"
 
 static int
-insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int state)
+insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
 {
     int nstate;
     int insn_id;
@@ -3496,11 +2582,11 @@ insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int s
 
 	if (lobj->sc_state != 0) {
 	    if (lobj->sc_state != nstate) {
-		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);
+		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");
 		return COMPILE_NG;
 	    }
 	}
@@ -3537,7 +2623,7 @@ label_set_sc_state(LABEL *lobj, int state)
 #endif
 
 static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
 #if OPT_STACK_CACHING
     LINK_ELEMENT *list;
@@ -3568,7 +2654,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 				new_insn_body(iseq, 0, BIN(reput), 0);
 
 			    /* replace this insn */
-			    ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj);
+			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
 			    list = (LINK_ELEMENT *)rpobj;
 			    goto redo_point;
 			}
@@ -3579,7 +2665,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			if (state == SCS_AB || state == SCS_BA) {
 			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
 
-			    ELEM_REMOVE(list);
+			    REMOVE_ELEM(list);
 			    list = list->next;
 			    goto redo_point;
 			}
@@ -3601,12 +2687,12 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			  case SCS_XX:
 			    goto normal_insn;
 			  default:
-			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+			    COMPILE_ERROR(iseq, iobj->line_no,
 					  "unreachable");
 			    return COMPILE_NG;
 			}
 			/* remove useless pop */
-			ELEM_REMOVE(list);
+			REMOVE_ELEM(list);
 			list = list->next;
 			goto redo_point;
 		    }
@@ -3614,7 +2700,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		    /* none */
 		}		/* end of switch */
 	      normal_insn:
-		state = insn_set_sc_state(iseq, anchor, iobj, state);
+		state = insn_set_sc_state(iseq, iobj, state);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
@@ -3634,32 +2720,9 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 }
 
 static int
-all_string_result_p(const NODE *node)
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
 {
-    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;
+    NODE *list = node->nd_next;
     VALUE lit = node->nd_lit;
     LINK_ELEMENT *first_lit = 0;
     int cnt = 0;
@@ -3668,30 +2731,29 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cons
     if (!NIL_P(lit)) {
 	cnt++;
 	if (!RB_TYPE_P(lit, T_STRING)) {
-	    COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
-			  rb_builtin_type_name(TYPE(lit)));
-	    return COMPILE_NG;
+	    compile_bug(ERROR_ARGS "dstr: must be string: %s",
+			rb_builtin_type_name(TYPE(lit)));
 	}
-	lit = freeze_literal(iseq, lit);
+	lit = node->nd_lit = rb_fstring(lit);
 	ADD_INSN1(ret, nd_line(node), putobject, lit);
 	if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
     }
 
     while (list) {
-	const NODE *const head = list->nd_head;
-	if (nd_type(head) == NODE_STR) {
-	    lit = freeze_literal(iseq, head->nd_lit);
-	    ADD_INSN1(ret, nd_line(head), putobject, lit);
+	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);
 	    lit = Qnil;
 	}
 	else {
-	    CHECK(COMPILE(ret, "each string", head));
+	    COMPILE(ret, "each string", node);
 	}
 	cnt++;
 	list = list->nd_next;
     }
     if (NIL_P(lit) && first_lit) {
-	ELEM_REMOVE(first_lit);
+	REMOVE_ELEM(first_lit);
 	--cnt;
     }
     *cntp = cnt;
@@ -3700,87 +2762,63 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cons
 }
 
 static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
 {
     int cnt;
-    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
+    compile_dstr_fragments(iseq, ret, node, &cnt);
     ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
     return COMPILE_OK;
 }
 
 static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
 {
     int cnt;
-    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
+    compile_dstr_fragments(iseq, ret, node, &cnt);
     ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
     return COMPILE_OK;
 }
 
 static int
-compile_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,
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
 			 LABEL *then_label, LABEL *else_label)
 {
-  again:
     switch (nd_type(cond)) {
       case NODE_AND:
 	{
 	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label,
-					   else_label));
-	    if (!label->refcnt) break;
+	    compile_branch_condition(iseq, ret, cond->nd_1st, label,
+				     else_label);
 	    ADD_LABEL(ret, label);
-	    cond = cond->nd_2nd;
-	    goto again;
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
 	}
       case NODE_OR:
 	{
 	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
-					   label));
-	    if (!label->refcnt) break;
+	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+				     label);
 	    ADD_LABEL(ret, label);
-	    cond = cond->nd_2nd;
-	    goto again;
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
 	}
-      case NODE_LIT:		/* NODE_LIT is always true */
+      case NODE_LIT:		/* NODE_LIT is always not 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_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;
@@ -3789,25 +2827,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *co
 	/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
 	ADD_INSNL(ret, nd_line(cond), jump, else_label);
 	break;
-      case NODE_ARRAY:
-      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;
-      case NODE_FLIP2:
-	CHECK(compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label));
-	break;
-      case NODE_FLIP3:
-	CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
-	break;
-      case NODE_DEFINED:
-	CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
-	goto branch;
       default:
-	CHECK(COMPILE(ret, "branch condition", cond));
-      branch:
+	COMPILE(ret, "branch condition", cond);
 	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
 	break;
@@ -3816,25 +2837,18 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *co
 }
 
 static int
-compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-			  const NODE *const root_node,
-			  struct rb_call_info_kw_arg **const kw_arg_ptr,
-			  unsigned int *flag)
+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)
 {
     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) {
-	const NODE *node = root_node->nd_head;
+	NODE *node = root_node->nd_head;
 
 	while (node) {
-	    const NODE *key_node = node->nd_head;
+	    NODE *key_node = node->nd_head;
 
 	    assert(nd_type(node) == NODE_ARRAY);
-	    if (!key_node) {
-		if (flag && !root_node->nd_alen) *flag |= VM_CALL_KW_SPLAT;
-		return FALSE;
-	    }
-	    else if (nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
+	    if (key_node && nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
 		/* can be keywords */
 	    }
 	    else {
@@ -3856,8 +2870,8 @@ compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	    *kw_arg_ptr = kw_arg;
 
 	    for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
-		const NODE *key_node = node->nd_head;
-		const NODE *val_node = node->nd_next->nd_head;
+		NODE *key_node = node->nd_head;
+		NODE *val_node = node->nd_next->nd_head;
 		keywords[i] = key_node->nd_lit;
 		COMPILE(ret, "keyword values", val_node);
 	    }
@@ -3874,65 +2888,16 @@ enum compile_array_type_t {
     COMPILE_ARRAY_TYPE_ARGS
 };
 
-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:
-        if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-      default:
-	return FALSE;
-    }
-}
-
-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;
-    }
-}
-
 static int
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_root,
-	      enum compile_array_type_t type, struct rb_call_info_kw_arg **keywords_ptr,
-	      unsigned int *flag, int popped)
+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)
 {
-    const NODE *node = node_root;
+    NODE *node = node_root;
     int line = (int)nd_line(node);
     int len = 0;
 
     if (nd_type(node) == NODE_ZARRAY) {
-	if (!popped) {
+	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;
@@ -3945,15 +2910,15 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 	int first = 1, i;
 
 	while (node) {
-	    const NODE *start_node = node, *end_node;
-	    const NODE *kw = 0;
+	    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, -1);
+		    EXPECT_NODE("compile_array", node, NODE_ARRAY);
 		}
 
 		if (type != COMPILE_ARRAY_TYPE_ARRAY && !node->nd_head) {
@@ -3966,39 +2931,35 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 		    }
 		    break;
 		}
-                if (opt_p && !static_literal_node_p(node, iseq)) {
+		if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
 		    opt_p = 0;
 		}
 
-		if (type == COMPILE_ARRAY_TYPE_ARGS &&
-		    node->nd_next == NULL /* last node */ &&
-		    compile_array_keyword_arg(iseq, anchor, node->nd_head, keywords_ptr, flag)) {
+		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, popped);
+		    COMPILE_(anchor, "array element", node->nd_head, poped);
 		}
 	    }
 
 	    if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
-		if (!popped) {
+		if (!poped) {
 		    VALUE ary = rb_ary_tmp_new(i);
 
 		    end_node = node;
 		    node = start_node;
 
 		    while (node != end_node) {
-                        rb_ary_push(ary, static_literal_value(node, iseq));
+			rb_ary_push(ary, node->nd_head->nd_lit);
 			node = node->nd_next;
 		    }
-		    while (node && node->nd_next &&
-                           static_literal_node_p(node, iseq) &&
-                           static_literal_node_p(node->nd_next, iseq)) {
-			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);
-			node = node->nd_next->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++;
 		    }
 
@@ -4012,12 +2973,9 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 			    ADD_INSN1(ret, line, duparray, ary);
 			}
 			else { /* COMPILE_ARRAY_TYPE_HASH */
-                            VALUE hash;
-
-                            hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2);
-                            rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR_TRANSIENT(ary), hash);
-                            iseq_add_mark_object_compile_time(iseq, rb_obj_hide(hash));
-                            ADD_INSN1(ret, line, duphash, 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 {
@@ -4026,14 +2984,15 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 			    ADD_INSN(ret, line, concatarray);
 			}
 			else {
-			    COMPILE_ERROR(ERROR_ARGS "core#hash_merge_ary");
-			    return -1;
+			    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 (!popped || kw) {
+		if (!poped) {
 		    switch (type) {
 		      case COMPILE_ARRAY_TYPE_ARRAY:
 			ADD_INSN1(anchor, line, newarray, INT2FIX(i));
@@ -4050,35 +3009,23 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 		      case COMPILE_ARRAY_TYPE_HASH:
 			if (i > 0) {
 			    if (first) {
-				if (!popped) {
-				    ADD_INSN1(anchor, line, newhash, INT2FIX(i));
-				}
+				ADD_INSN1(anchor, line, newhash, INT2FIX(i));
 				APPEND_LIST(ret, anchor);
 			    }
 			    else {
-				if (!popped) {
-				    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-				    ADD_INSN(ret, line, swap);
-				}
+				ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+				ADD_INSN(ret, line, swap);
 				APPEND_LIST(ret, anchor);
-				if (!popped) {
-				    ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(i + 1));
-				}
+				ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(i + 1));
 			    }
 			}
 			if (kw) {
-			    if (!popped) {
-				ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-				if (i > 0 || !first) ADD_INSN(ret, line, swap);
-				else ADD_INSN1(ret, line, newhash, INT2FIX(0));
-			    }
+			    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);
-			    if (popped) {
-				ADD_INSN(ret, line, pop);
-			    }
-			    else {
-				ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2));
-			    }
+			    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;
@@ -4088,7 +3035,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 		    }
 		}
 		else {
-		    /* popped */
+		    /* poped */
 		    APPEND_LIST(ret, anchor);
 		}
 	    }
@@ -4098,7 +3045,13 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
 }
 
 static VALUE
-case_when_optimizable_literal(const NODE *const node)
+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);
+}
+
+static VALUE
+case_when_optimizable_literal(NODE * node)
 {
     switch (nd_type(node)) {
       case NODE_LIT: {
@@ -4120,17 +3073,16 @@ case_when_optimizable_literal(const NODE *const node)
       case NODE_FALSE:
 	return Qfalse;
       case NODE_STR:
-	return rb_fstring(node->nd_lit);
+	return node->nd_lit = rb_fstring(node->nd_lit);
     }
     return Qundef;
 }
 
 static int
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
-	  LABEL *l1, int only_special_literals, VALUE literals)
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
-	const NODE *val = vals->nd_head;
+	NODE* val = vals->nd_head;
 	VALUE lit = case_when_optimizable_literal(val);
 
 	if (lit == Qundef) {
@@ -4138,8 +3090,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
 	}
 	else {
 	    if (rb_hash_lookup(literals, lit) != Qnil) {
-		VALUE file = rb_iseq_path(iseq);
-		rb_compile_warning(RSTRING_PTR(file), nd_line(val),
+		rb_compile_warning(ruby_sourcefile, nd_line(val),
 				   "duplicated when clause is ignored");
 	    }
 	    else {
@@ -4150,12 +3101,12 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
 	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);
-	    lit = freeze_literal(iseq, val->nd_lit);
-	    ADD_INSN1(cond_seq, nd_line(val), putobject, lit);
+	    ADD_INSN1(cond_seq, nd_line(val), putobject, val->nd_lit);
 	}
 	else {
-	    if (!COMPILE(cond_seq, "when cond", val)) return -1;
+	    COMPILE(cond_seq, "when cond", val);
 	}
 
 	ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
@@ -4166,48 +3117,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
 }
 
 static int
-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_ARRAY:
-        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)
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
 {
     switch (nd_type(node)) {
       case NODE_ATTRASGN: {
@@ -4216,7 +3126,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const n
 	VALUE dupidx;
 	int line = nd_line(node);
 
-	CHECK(COMPILE_POPPED(ret, "masgn lhs (NODE_ATTRASGN)", node));
+	COMPILE_POPED(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];
@@ -4235,16 +3145,16 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const n
       case NODE_MASGN: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	CHECK(COMPILE_POPPED(anchor, "nest masgn lhs", node));
-	ELEM_REMOVE(FIRST_ELEMENT(anchor));
+	COMPILE_POPED(anchor, "nest masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
 	break;
       }
       default: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	CHECK(COMPILE_POPPED(anchor, "masgn lhs", node));
-	ELEM_REMOVE(FIRST_ELEMENT(anchor));
+	COMPILE_POPED(anchor, "masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
       }
     }
@@ -4252,26 +3162,25 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const n
     return COMPILE_OK;
 }
 
-static int
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhsn)
+static void
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
 {
     if (lhsn) {
-	CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
-	CHECK(compile_massign_lhs(iseq, ret, lhsn->nd_head));
+	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
+	compile_massign_lhs(iseq, ret, lhsn->nd_head);
     }
-    return COMPILE_OK;
 }
 
 static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-		    const NODE *rhsn, const NODE *orig_lhsn)
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+		    NODE *rhsn, NODE *orig_lhsn)
 {
     VALUE mem[64];
     const int memsize = numberof(mem);
     int memindex = 0;
     int llen = 0, rlen = 0;
     int i;
-    const NODE *lhsn = orig_lhsn;
+    NODE *lhsn = orig_lhsn;
 
 #define MEMORY(v) { \
     int i; \
@@ -4287,7 +3196,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     }
 
     while (lhsn) {
-	const NODE *ln = lhsn->nd_head;
+	NODE *ln = lhsn->nd_head;
 	switch (nd_type(ln)) {
 	  case NODE_LASGN:
 	    MEMORY(ln->nd_vid);
@@ -4295,6 +3204,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	  case NODE_DASGN:
 	  case NODE_DASGN_CURR:
 	  case NODE_IASGN:
+	  case NODE_IASGN2:
 	  case NODE_CVASGN:
 	    MEMORY(ln->nd_vid);
 	    break;
@@ -4307,7 +3217,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 
     while (rhsn) {
 	if (llen <= rlen) {
-	    COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head);
+	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
 	}
 	else {
 	    COMPILE(ret, "masgn val", rhsn->nd_head);
@@ -4327,7 +3237,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 }
 
 static void
-adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *const ret, int line, int rlen, int llen)
+adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *ret, int line, int rlen, int llen)
 {
     if (rlen < llen) {
 	do {ADD_INSN(ret, line, putnil);} while (++rlen < llen);
@@ -4338,14 +3248,14 @@ adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *const ret, int line, int rlen, int ll
 }
 
 static int
-compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
 {
-    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;
+    NODE *rhsn = node->nd_value;
+    NODE *splatn = node->nd_args;
+    NODE *lhsn = node->nd_head;
+    int lhs_splat = (splatn && (VALUE)splatn != (VALUE)-1) ? 1 : 0;
 
-    if (!popped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
 	int llen = 0;
 	int expand = 1;
 	DECL_ANCHOR(lhsseq);
@@ -4353,14 +3263,14 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 	INIT_ANCHOR(lhsseq);
 
 	while (lhsn) {
-	    CHECK(compile_massign_lhs(iseq, lhsseq, lhsn->nd_head));
+	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
 	    llen += 1;
 	    lhsn = lhsn->nd_next;
 	}
 
 	COMPILE(ret, "normal masgn rhs", rhsn);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, nd_line(node), dup);
 	}
 	else if (!lhs_splat) {
@@ -4397,25 +3307,25 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 	if (lhs_splat) {
 	    if (nd_type(splatn) == NODE_POSTARG) {
 		/*a, b, *r, p1, p2 */
-		const NODE *postn = splatn->nd_2nd;
-		const NODE *restn = splatn->nd_1st;
+		NODE *postn = splatn->nd_2nd;
+		NODE *restn = splatn->nd_1st;
 		int num = (int)postn->nd_alen;
-		int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00);
+		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
 
 		ADD_INSN2(ret, nd_line(splatn), expandarray,
 			  INT2FIX(num), INT2FIX(flag));
 
-		if (NODE_NAMED_REST_P(restn)) {
-		    CHECK(compile_massign_lhs(iseq, ret, restn));
+		if ((VALUE)restn != (VALUE)-1) {
+		    compile_massign_lhs(iseq, ret, restn);
 		}
 		while (postn) {
-		    CHECK(compile_massign_lhs(iseq, ret, postn->nd_head));
+		    compile_massign_lhs(iseq, ret, postn->nd_head);
 		    postn = postn->nd_next;
 		}
 	    }
 	    else {
 		/* a, b, *r */
-		CHECK(compile_massign_lhs(iseq, ret, splatn));
+		compile_massign_lhs(iseq, ret, splatn);
 	    }
 	}
     }
@@ -4423,63 +3333,61 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 }
 
 static int
-compile_const_prefix(rb_iseq_t *iseq, const NODE *const node,
-		     LINK_ANCHOR *const pref, LINK_ANCHOR *const body)
+compile_colon2(rb_iseq_t *iseq, NODE * node,
+	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
 {
     switch (nd_type(node)) {
       case NODE_CONST:
-	debugi("compile_const_prefix - colon", node->nd_vid);
+	debugi("compile_colon2 - colon", node->nd_vid);
 	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
 	break;
       case NODE_COLON3:
-	debugi("compile_const_prefix - colon3", node->nd_mid);
+	debugi("compile_colon2 - colon3", node->nd_mid);
 	ADD_INSN(body, nd_line(node), pop);
 	ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
 	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
 	break;
       case NODE_COLON2:
-	CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
-	debugi("compile_const_prefix - colon2", node->nd_mid);
+	compile_colon2(iseq, node->nd_head, pref, body);
+	debugi("compile_colon2 - colon2", node->nd_mid);
 	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
 	break;
       default:
-	CHECK(COMPILE(pref, "const colon2 prefix", node));
+	COMPILE(pref, "const colon2 prefix", node);
 	break;
     }
     return COMPILE_OK;
 }
 
-static int
-compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
+static VALUE
+compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
 {
     if (nd_type(cpath) == NODE_COLON3) {
 	/* toplevel class ::Foo */
 	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
-	return VM_DEFINECLASS_FLAG_SCOPED;
+	return Qfalse;
     }
     else if (cpath->nd_head) {
 	/* Bar::Foo */
 	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
-	return VM_DEFINECLASS_FLAG_SCOPED;
+	return Qfalse;
     }
     else {
 	/* class at cbase Foo */
 	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
 		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	return 0;
+	return Qtrue;
     }
 }
 
 #define private_recv_p(node) (nd_type((node)->nd_recv) == NODE_SELF)
-static int
-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_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-	      const NODE *const node, LABEL **lfinish, VALUE needstr)
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+	     NODE *node, LABEL **lfinish, VALUE needstr)
 {
-    enum defined_type expr_type = DEFINED_NOT_DEFINED;
+    enum defined_type expr_type = 0;
     enum node_type type;
 
     switch (type = nd_type(node)) {
@@ -4499,10 +3407,10 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	break;
 
       case NODE_ARRAY:{
-	const NODE *vals = node;
+	NODE *vals = node;
 
 	do {
-	    defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse);
+	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
 
 	    if (!lfinish[1]) {
 		lfinish[1] = NEW_LABEL(nd_line(node));
@@ -4552,14 +3460,19 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	if (!lfinish[1]) {
 	    lfinish[1] = NEW_LABEL(nd_line(node));
 	}
-	defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse);
+	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
 	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
 
-	ADD_INSN3(ret, nd_line(node), defined,
-		  (rb_is_const_id(node->nd_mid) ?
-		   INT2FIX(DEFINED_CONST) : INT2FIX(DEFINED_METHOD)),
-		  ID2SYM(node->nd_mid), needstr);
+	if (rb_is_const_id(node->nd_mid)) {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	else {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+		      ID2SYM(node->nd_mid), needstr);
+	}
 	return 1;
       case NODE_COLON3:
 	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
@@ -4569,23 +3482,22 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 
 	/* 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_OPCALL ||
+	    (type == NODE_CALL ||
 	     (type == NODE_ATTRASGN && !private_recv_p(node)));
 
-	if (!lfinish[1] && (node->nd_args || explicit_receiver)) {
+	if (!lfinish[1]) {
 	    lfinish[1] = NEW_LABEL(nd_line(node));
 	}
 	if (node->nd_args) {
-	    defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse);
+	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
 	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
 	}
 	if (explicit_receiver) {
-	    defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse);
+	    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),
@@ -4631,6 +3543,7 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
       case NODE_GASGN:
       case NODE_IASGN:
       case NODE_CDECL:
+      case NODE_CVDECL:
       case NODE_CVASGN:
 	expr_type = DEFINED_ASGN;
 	break;
@@ -4648,18 +3561,11 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     }
     return 0;
 }
-
-static VALUE
-build_defined_rescue_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *unused)
-{
-    ADD_INSN(ret, 0, putnil);
-    iseq_set_exception_local_table(iseq);
-    return Qnil;
-}
+#undef defined_expr
 
 static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-	     const NODE *const node, LABEL **lfinish, VALUE needstr)
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+	     NODE *node, LABEL **lfinish, VALUE needstr)
 {
     LINK_ELEMENT *lcur = ret->last;
     int done = defined_expr0(iseq, ret, node, lfinish, needstr);
@@ -4667,11 +3573,11 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	int line = nd_line(node);
 	LABEL *lstart = NEW_LABEL(line);
 	LABEL *lend = NEW_LABEL(line);
-	const rb_iseq_t *rescue;
-	rescue = new_child_iseq_ifunc(iseq, IFUNC_NEW(build_defined_rescue_iseq, 0, 0),
-				      rb_str_concat(rb_str_new2("defined guard in "),
-						    iseq->body->location.label),
-				      iseq, ISEQ_TYPE_RESCUE, 0);
+	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);
 	lstart->rescued = LABEL_RESCUE_BEG;
 	lend->rescued = LABEL_RESCUE_END;
 	APPEND_LABEL(ret, lcur, lstart);
@@ -4681,31 +3587,6 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     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
 make_name_for_block(const rb_iseq_t *orig_iseq)
 {
@@ -4732,7 +3613,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, const NODE *const node)
+		  struct ensure_range *er, NODE *node)
 {
     enl->ensure_node = node;
     enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
@@ -4759,7 +3640,7 @@ add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
 }
 
 static void
-add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
+add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 {
     struct iseq_compile_data_ensure_node_stack *enlp =
 	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
@@ -4768,7 +3649,7 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 
     INIT_ANCHOR(ensure);
     while (enlp) {
-	if (enlp->erange != NULL) {
+	if (enlp->erange != 0) {
 	    DECL_ANCHOR(ensure_part);
 	    LABEL *lstart = NEW_LABEL(0);
 	    LABEL *lend = NEW_LABEL(0);
@@ -4778,7 +3659,7 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 
 	    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
 	    ADD_LABEL(ensure_part, lstart);
-	    COMPILE_POPPED(ensure_part, "ensure part", enlp->ensure_node);
+	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
 	    ADD_LABEL(ensure_part, lend);
 	    ADD_SEQ(ensure, ensure_part);
 	}
@@ -4794,8 +3675,7 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 }
 
 static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
-	   unsigned int *flag, struct rb_call_info_kw_arg **keywords)
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, struct rb_call_info_kw_arg **keywords)
 {
     VALUE argc = INT2FIX(0);
     int nsplat = 0;
@@ -4815,7 +3695,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 	switch (nd_type(argn)) {
 	  case NODE_SPLAT: {
 	    COMPILE(args, "args (splat)", argn->nd_head);
-	    ADD_INSN1(args, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse);
+	    ADD_INSN1(args, nd_line(argn), splatarray, Qfalse);
 	    argc = INT2FIX(1);
 	    nsplat++;
 	    *flag |= VM_CALL_ARGS_SPLAT;
@@ -4829,7 +3709,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 	    INIT_ANCHOR(tmp);
 	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
 	    if (nd_type(argn) == NODE_ARGSCAT) {
-		ADD_INSN1(tmp, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse);
+		ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
 	    }
 	    else {
 		ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
@@ -4837,13 +3717,9 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 	    INSERT_LIST(args_splat, tmp);
 	    nsplat++;
 	    *flag |= VM_CALL_ARGS_SPLAT;
-	    if (nd_type(argn->nd_body) == NODE_HASH)
-		*flag |= VM_CALL_KW_SPLAT;
 
 	    if (next_is_array) {
-		int len = compile_array(iseq, args, argn->nd_head, COMPILE_ARRAY_TYPE_ARGS, NULL, flag, FALSE);
-		if (len < 0) return Qnil;
-		argc = INT2FIX(len + 1);
+		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, COMPILE_ARRAY_TYPE_ARGS) + 1);
 	    }
 	    else {
 		argn = argn->nd_head;
@@ -4853,13 +3729,11 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 	  }
 	  case NODE_ARRAY:
 	    {
-		int len = compile_array(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS, keywords, flag, FALSE);
-		if (len < 0) return Qnil;
-		argc = INT2FIX(len);
+		argc = INT2FIX(compile_array_(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS, keywords, FALSE));
 		break;
 	    }
 	  default: {
-	    UNKNOWN_NODE("setup_arg", argn, Qnil);
+	    UNKNOWN_NODE("setup_arg", argn);
 	  }
 	}
     }
@@ -4867,31 +3741,22 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
     if (nsplat > 1) {
 	int i;
 	for (i=1; i<nsplat; i++) {
-	    ADD_INSN(args_splat, nd_line(argn), concatarray);
+	    ADD_INSN(args_splat, nd_line(args), concatarray);
 	}
     }
 
-    if (!LIST_INSN_SIZE_ZERO(args_splat)) {
+    if (!LIST_SIZE_ZERO(args_splat)) {
 	ADD_SEQ(args, args_splat);
     }
 
     if (*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);
-		}
-	    }
-	}
 	ADD_SEQ(args, arg_block);
     }
     return argc;
 }
 
 static VALUE
-build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *body)
+build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *body)
 {
     int line = nd_line(body);
     VALUE argc = INT2FIX(0);
@@ -4904,9 +3769,9 @@ build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *body)
 }
 
 static void
-compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
+compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
 {
-    const NODE *vars;
+    NODE *vars;
     LINK_ELEMENT *last;
     int line = nd_line(node);
     LABEL *fail_label = NEW_LABEL(line), *end_label = NEW_LABEL(line);
@@ -4925,11 +3790,11 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
 	    ADD_INSN(ret, line, dup);
 	}
 	last = ret->last;
-	COMPILE_POPPED(ret, "capture", vars->nd_head);
+	COMPILE_POPED(ret, "capture", vars->nd_head);
 	last = last->next; /* putobject :var */
 	cap = new_insn_send(iseq, line, idAREF, INT2FIX(1),
 			    NULL, INT2FIX(0), NULL);
-	ELEM_INSERT_PREV(last->next, (LINK_ELEMENT *)cap);
+	INSERT_ELEM_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 */
@@ -4954,7 +3819,7 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     ADD_INSN(ret, line, pop);
     for (vars = node; vars; vars = vars->nd_next) {
 	last = ret->last;
-	COMPILE_POPPED(ret, "capture", vars->nd_head);
+	COMPILE_POPED(ret, "capture", vars->nd_head);
 	last = last->next; /* putobject :var */
 	((INSN*)last)->insn_id = BIN(putnil);
 	((INSN*)last)->operand_size = 0;
@@ -4962,1027 +3827,734 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     ADD_LABEL(ret, end_label);
 }
 
-static int
-number_literal_p(const NODE *n)
-{
-    return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit));
-}
+/**
+  compile each node
 
+  self:  InstructionSequence
+  node:  Ruby compiled node
+  poped: This node will be poped
+ */
 static int
-compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 {
-    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);
-    const int lineno = nd_first_lineno(node);
-    const int column = nd_first_column(node);
-    const int last_lineno = nd_last_lineno(node);
-    const int last_column = nd_last_column(node);
-    DECL_ANCHOR(cond_seq);
-    DECL_ANCHOR(then_seq);
-    DECL_ANCHOR(else_seq);
-    LABEL *then_label, *else_label, *end_label;
-    VALUE branches = 0;
-    int ci_size, ci_kw_size;
+    enum node_type type;
+    LINK_ELEMENT *saved_last_element = 0;
+    int line;
 
-    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;
+    if (node == 0) {
+	if (!poped) {
+	    debugs("node: NODE_NIL(implicit)\n");
+	    ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, putnil);
+	}
+	return COMPILE_OK;
+    }
 
-    compile_branch_condition(iseq, cond_seq, node->nd_cond,
-			     then_label, else_label);
+    line = (int)nd_line(node);
 
-    ci_size = body->ci_size;
-    ci_kw_size = body->ci_kw_size;
-    CHECK(COMPILE_(then_seq, "then", node_body, popped));
-    if (!then_label->refcnt) {
-        body->ci_size = ci_size;
-        body->ci_kw_size = ci_kw_size;
+    if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
+	/* ignore */
     }
-
-    ci_size = body->ci_size;
-    ci_kw_size = body->ci_kw_size;
-    CHECK(COMPILE_(else_seq, "else", node_else, popped));
-    if (!else_label->refcnt) {
-        body->ci_size = ci_size;
-        body->ci_kw_size = ci_kw_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;
+	}
     }
 
-    ADD_SEQ(ret, cond_seq);
+    debug_node_start(node);
 
-    if (then_label->refcnt && else_label->refcnt) {
-	DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_IF ? "if" : "unless");
-    }
+    type = nd_type(node);
 
-    if (then_label->refcnt) {
-	ADD_LABEL(ret, then_label);
-	if (else_label->refcnt) {
-	    ADD_TRACE_BRANCH_COVERAGE(
-		ret,
-		node_body ? nd_first_lineno(node_body) : lineno,
-		node_body ? nd_first_column(node_body) : column,
-		node_body ? nd_last_lineno(node_body) : last_lineno,
-		node_body ? nd_last_column(node_body) : last_column,
-		type == NODE_IF ? "then" : "else",
-		branches);
-	    end_label = NEW_LABEL(line);
-	    ADD_INSNL(then_seq, line, jump, end_label);
+    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);
+
+	ADD_LABEL(ret, then_label);
 	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(
-		ret,
-		node_else ? nd_first_lineno(node_else) : lineno,
-		node_else ? nd_first_column(node_else) : column,
-		node_else ? nd_last_lineno(node_else) : last_lineno,
-		node_else ? nd_last_column(node_else) : last_column,
-		type == NODE_IF ? "else" : "then",
-		branches);
-	}
 	ADD_SEQ(ret, else_seq);
-    }
 
-    if (end_label) {
 	ADD_LABEL(ret, end_label);
-    }
 
-    return COMPILE_OK;
-}
+	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);
 
-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, lineno, column, last_lineno, last_column;
-    enum node_type type;
-    VALUE branches = 0;
+	node = node->nd_body;
+	type = nd_type(node);
+	line = nd_line(node);
 
-    INIT_ANCHOR(head);
-    INIT_ANCHOR(body_seq);
-    INIT_ANCHOR(cond_seq);
+	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;
+	}
 
-    RHASH_TBL_RAW(literals)->type = &cdhash_type;
+	endlabel = NEW_LABEL(line);
+	elselabel = NEW_LABEL(line);
 
-    CHECK(COMPILE(head, "case base", node->nd_head));
+	ADD_SEQ(ret, head);	/* case VAL */
 
-    DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "case");
+	while (type == NODE_WHEN) {
+	    LABEL *l1;
 
-    node = node->nd_body;
-    EXPECT_NODE("NODE_CASE", node, NODE_WHEN, COMPILE_NG);
-    type = nd_type(node);
-    line = nd_line(node);
-    lineno = nd_first_lineno(node);
-    column = nd_first_column(node);
-    last_lineno = nd_last_lineno(node);
-    last_column = nd_last_column(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(
-		body_seq,
-		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
-		node->nd_body ? nd_first_column(node->nd_body) : column,
-		node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
-		node->nd_body ? nd_last_column(node->nd_body) : last_column,
-		"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) {
+	    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);
+
+	    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);
+	    }
+
+	    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);
+	    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);
+	}
+
+	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);
+	}
+
+	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:
-		only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
-		if (only_special_literals < 0) return COMPILE_NG;
+		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:
-		only_special_literals = 0;
-		CHECK(when_splat_vals(iseq, cond_seq, vals, l1, only_special_literals, literals));
+		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_CASE", vals, COMPILE_NG);
+		UNKNOWN_NODE("NODE_WHEN", vals);
 	    }
+	    node = node->nd_next;
 	}
-	else {
-	    EXPECT_NODE_NONULL("NODE_CASE", node, NODE_ARRAY, COMPILE_NG);
-	}
-
-	node = node->nd_next;
-	if (!node) {
-	    break;
-	}
-	type = nd_type(node);
-	line = nd_line(node);
-	lineno = nd_first_lineno(node);
-	column = nd_first_column(node);
-	last_lineno = nd_last_lineno(node);
-	last_column = nd_last_column(node);
-    }
-    /* else */
-    if (node) {
-	ADD_LABEL(cond_seq, elselabel);
-	ADD_INSN(cond_seq, line, pop);
-	ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "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(cond_seq, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "else", branches);
-	if (!popped) {
-	    ADD_INSN(cond_seq, nd_line(orig_node), putnil);
-	}
-	ADD_INSNL(cond_seq, nd_line(orig_node), jump, endlabel);
-    }
+	/* else */
+	COMPILE_(ret, "else", node, poped);
+	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
 
-    if (only_special_literals && ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	iseq_add_mark_object_compile_time(iseq, literals);
+	ADD_SEQ(ret, body_seq);
+	ADD_LABEL(ret, endlabel);
 
-	ADD_INSN(ret, nd_line(orig_node), dup);
-	ADD_INSN2(ret, nd_line(orig_node), opt_case_dispatch, literals, elselabel);
-	LABEL_REF(elselabel);
-    }
+	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;
 
-    ADD_SEQ(ret, cond_seq);
-    ADD_SEQ(ret, body_seq);
-    ADD_LABEL(ret, endlabel);
-    return COMPILE_OK;
-}
+	struct iseq_compile_data_ensure_node_stack enl;
 
-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 = 0;
-
-    DECL_BRANCH_BASE(branches, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(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);
-	const int lineno = nd_first_lineno(node);
-	const int column = nd_first_column(node);
-	const int last_lineno = nd_last_lineno(node);
-	const int last_column = nd_last_column(node);
-	LABEL *l1 = NEW_LABEL(line);
-	ADD_LABEL(body_seq, l1);
-	ADD_TRACE_BRANCH_COVERAGE(
-		body_seq,
-		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
-		node->nd_body ? nd_first_column(node->nd_body) : column,
-		node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
-		node->nd_body ? nd_last_column(node->nd_body) : last_column,
-		"when",
-		branches);
-	CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
-	ADD_INSNL(body_seq, line, jump, endlabel);
-
-	vals = node->nd_head;
-	if (!vals) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_WHEN: must be NODE_ARRAY, but 0");
-	    return COMPILE_NG;
-	}
-	switch (nd_type(vals)) {
-	  case NODE_ARRAY:
-	    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;
-	    }
-	    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);
-	}
-	node = node->nd_next;
-    }
-    /* else */
-    ADD_TRACE_BRANCH_COVERAGE(
-	ret,
-	node ? nd_first_lineno(node) : nd_first_lineno(orig_node),
-	node ? nd_first_column(node) : nd_first_column(orig_node),
-	node ? nd_last_lineno(node) : nd_last_lineno(orig_node),
-	node ? nd_last_column(node) : nd_last_column(orig_node),
-	"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;
-}
+	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
-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);
-    const int lineno = nd_first_lineno(node);
-    const int column = nd_first_column(node);
-    const int last_lineno = nd_last_lineno(node);
-    const int last_column = nd_last_column(node);
-    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 = 0;
-
-    struct iseq_compile_data_ensure_node_stack enl;
-
-    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);
-
-    LABEL *next_catch_label = NEW_LABEL(line);
-    LABEL *tmp_label = NULL;
-
-    ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
-    push_ensure_entry(iseq, &enl, NULL, NULL);
-
-    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);
-    DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_WHILE ? "while" : "until");
-    ADD_TRACE_BRANCH_COVERAGE(
-	ret,
-	node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
-	node->nd_body ? nd_first_column(node->nd_body) : column,
-	node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
-	node->nd_body ? nd_last_column(node->nd_body) : last_column,
-	"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);
-    }
+	LABEL *next_catch_label = NEW_LABEL(line);
+	LABEL *tmp_label = NULL;
 
-    ADD_LABEL(ret, end_label);
-    ADD_ADJUST_RESTORE(ret, adjust_label);
+	ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
+	push_ensure_entry(iseq, &enl, 0, 0);
 
-    if (node->nd_state == Qundef) {
-	/* ADD_INSN(ret, line, putundef); */
-	COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
-	return COMPILE_NG;
-    }
-    else {
+	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, break_label);	/* break */
-
-    if (popped) {
+	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_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);
+	ADD_LABEL(ret, redo_label);
+	COMPILE_POPED(ret, "while body", node->nd_body);
+	ADD_LABEL(ret, next_label);	/* next */
 
-    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;
-}
+	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 */
+	}
 
-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, end_label);
+	ADD_ADJUST_RESTORE(ret, adjust_label);
 
-    ADD_LABEL(ret, retry_label);
-    if (nd_type(node) == NODE_FOR) {
-	CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
+	if (node->nd_state == Qundef) {
+	    /* ADD_INSN(ret, line, putundef); */
+	    compile_bug(ERROR_ARGS "unsupported: putundef");
+	}
+	else {
+	    ADD_INSN(ret, line, putnil);
+	}
 
-	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);
+	ADD_LABEL(ret, break_label);	/* break */
 
-    if (popped) {
-	ADD_INSN(ret, line, pop);
-    }
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
 
-    ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+	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_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, child_iseq, retry_end_l);
-    return COMPILE_OK;
-}
+	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);
 
-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;
-}
+	ADD_LABEL(ret, retry_label);
+	if (nd_type(node) == NODE_FOR) {
+	    COMPILE(ret, "iter caller (for)", node->nd_iter);
 
-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);
+	    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 if (iseq->body->type == ISEQ_TYPE_BLOCK) {
-      break_by_insn:
-	/* escape from block */
-	CHECK(COMPILE(ret, "break val (block)", node->nd_stts));
-        ADD_INSN1(ret, line, throw, INT2FIX(throw_flag | TAG_BREAK));
-	if (popped) {
+	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);
+
+	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");
-	return COMPILE_NG;
-    }
-    else {
-	const rb_iseq_t *ip = iseq->body->parent_iseq;
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
-	    }
+	ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
 
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-                throw_flag = VM_THROW_NO_ESCAPE_FLAG;
-		goto break_by_insn;
-	    }
-	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		goto break_by_insn;
+	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
+
+	break;
+      }
+      case NODE_BREAK:{
+	unsigned long level = 0;
+
+	if (ISEQ_COMPILE_DATA(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);
+
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
 	    }
-	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		goto break_in_eval;
+	}
+	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);
 	    }
-
-	    ip = ip->body->parent_iseq;
 	}
-	COMPILE_ERROR(ERROR_ARGS "Invalid break");
-	return COMPILE_NG;
-    }
-    return COMPILE_OK;
-}
+	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;
 
-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);
+	    while (ip) {
+		if (!ISEQ_COMPILE_DATA(ip)) {
+		    ip = 0;
+		    break;
+		}
+
+		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;
+		}
+
+		ip = ip->body->parent_iseq;
+	    }
+	    COMPILE_ERROR(ERROR_ARGS "Invalid break");
+	    debug_node_end();
+	    return COMPILE_NG;
 	}
-    }
-    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;
+	break;
+      }
+      case NODE_NEXT:{
+	unsigned long level = 0;
 
-	if (!popped) {
-	    ADD_INSN(ret, line, putnil);
+	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);
+	    }
 	}
-    }
-    else if (iseq->body->type == ISEQ_TYPE_EVAL) {
-      next_in_eval:
-	COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
-	return COMPILE_NG;
-    }
-    else {
-	const rb_iseq_t *ip = iseq;
+	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);
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
 	    }
+	}
+	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;
 
-            throw_flag = VM_THROW_NO_ESCAPE_FLAG;
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		/* while loop */
-		break;
+	    while (ip) {
+		if (!ISEQ_COMPILE_DATA(ip)) {
+		    ip = 0;
+		    break;
+		}
+
+		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;
+		}
+
+		ip = ip->body->parent_iseq;
 	    }
-	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		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);
+		}
 	    }
-	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		goto next_in_eval;
+	    else {
+		COMPILE_ERROR(ERROR_ARGS "Invalid next");
 	    }
-
-	    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 (popped) {
-		ADD_INSN(ret, line, pop);
+	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 {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid 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");
 	}
-    }
-    return COMPILE_OK;
-}
+	else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
+	    LABEL *splabel = NEW_LABEL(0);
 
-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);
+	    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);
+
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
 	}
-    }
-    else if (iseq->body->type == ISEQ_TYPE_EVAL) {
-      redo_in_eval:
-	COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
-	return COMPILE_NG;
-    }
-    else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
-	LABEL *splabel = NEW_LABEL(0);
+	else {
+	    const rb_iseq_t *ip = iseq;
+	    const unsigned long level = VM_THROW_NO_ESCAPE_FLAG;
 
-	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);
+	    while (ip) {
+		if (!ISEQ_COMPILE_DATA(ip)) {
+		    ip = 0;
+		    break;
+		}
 
-	if (!popped) {
-	    ADD_INSN(ret, line, putnil);
-	}
-    }
-    else {
-	const rb_iseq_t *ip = iseq;
+		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;
+		}
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
+		ip = ip->body->parent_iseq;
 	    }
+	    if (ip != 0) {
+		ADD_INSN(ret, line, putnil);
+		ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_REDO));
 
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		break;
-	    }
-	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		break;
+		if (poped) {
+		    ADD_INSN(ret, line, pop);
+		}
 	    }
-	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		goto redo_in_eval;
+	    else {
+		COMPILE_ERROR(ERROR_ARGS "Invalid redo");
 	    }
-
-	    ip = ip->body->parent_iseq;
 	}
-	if (ip != 0) {
+	break;
+      }
+      case NODE_RETRY:{
+	if (iseq->body->type == ISEQ_TYPE_RESCUE) {
 	    ADD_INSN(ret, line, putnil);
-            ADD_INSN1(ret, line, throw, INT2FIX(VM_THROW_NO_ESCAPE_FLAG | TAG_REDO));
+	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY));
 
-	    if (popped) {
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid redo");
-	    return COMPILE_NG;
+	    COMPILE_ERROR(ERROR_ARGS "Invalid retry");
 	}
-    }
-    return COMPILE_OK;
-}
-
-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));
+	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);
 
-	if (popped) {
+	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);
 	}
-    }
-    else {
-	COMPILE_ERROR(ERROR_ARGS "Invalid retry");
-	return COMPILE_NG;
-    }
-    return COMPILE_OK;
-}
-
-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;
+	ADD_INSN(ret, line, nop);
+	ADD_LABEL(ret, lcont);
 
-    while (resq) {
-	label_miss = NEW_LABEL(line);
-	label_hit = NEW_LABEL(line);
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
 
-	narg = resq->nd_args;
-	if (narg) {
-	    switch (nd_type(narg)) {
-	      case NODE_ARRAY:
-		while (narg) {
+	/* 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_GETLOCAL(ret, line, LVAR_ERRINFO, 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_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
-		    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
-		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+		    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);
-		    narg = narg->nd_next;
+		    break;
+		  default:
+		    UNKNOWN_NODE("NODE_RESBODY", narg);
 		}
-		break;
-	      case NODE_SPLAT:
-	      case NODE_ARGSCAT:
-	      case NODE_ARGSPUSH:
+	    }
+	    else {
 		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_INSN1(ret, line, putobject, rb_eStandardError);
+		ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
 		ADD_INSNL(ret, line, branchif, label_hit);
-		break;
-	      default:
-		UNKNOWN_NODE("NODE_RESBODY", narg, COMPILE_NG);
 	    }
-	}
-	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 (is == iseq) {
-		/* plain top-level, leave directly */
-		type = ISEQ_TYPE_METHOD;
+	    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);
 	    }
-	    break;
-	  default:
-	    break;
-	}
-
-	if (type == ISEQ_TYPE_METHOD) {
-	    splabel = NEW_LABEL(0);
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, 0);
+	    ADD_INSN(ret, line, leave);
+	    ADD_LABEL(ret, label_miss);
+	    resq = resq->nd_head;
 	}
+	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;
 
-	CHECK(COMPILE(ret, "return nd_stts (return val)", retval));
+	INIT_ANCHOR(ensr);
+	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
 
-	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);
+	er.begin = lstart;
+	er.end = lend;
+	er.next = 0;
+	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
 
-	    if (!popped) {
-		ADD_INSN(ret, line, putnil);
-	    }
+	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);
 	}
 	else {
-	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN));
-	    if (popped) {
-		ADD_INSN(ret, line, pop);
-	    }
+	    ADD_SEQ(ret, ensr);
 	}
-    }
-    return COMPILE_OK;
-}
+	ADD_LABEL(ret, lcont);
 
-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 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
-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);
+	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;
 	}
-    }
-
-    debug_node_start(node);
-#undef BEFORE_RETURN
-#define BEFORE_RETURN debug_node_end()
 
-    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_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));
+	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
 	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);
-	CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
-	if (!popped) {
+	COMPILE(ret, "nd_1st", node->nd_1st);
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	if (type == NODE_AND) {
@@ -5991,27 +4563,27 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	else {
 	    ADD_INSNL(ret, line, branchif, end_label);
 	}
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, pop);
 	}
-	CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
+	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
 	ADD_LABEL(ret, end_label);
 	break;
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret, node, popped);
+	compile_massign(iseq, ret, node, poped);
 	break;
       }
 
       case NODE_LASGN:{
 	ID id = node->nd_vid;
-	int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+	int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
-	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
-	CHECK(COMPILE(ret, "rvalue", node->nd_value));
+	debugs("lvar: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
+	COMPILE(ret, "rvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
@@ -6020,37 +4592,36 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_DASGN:
       case NODE_DASGN_CURR:{
 	int idx, lv, ls;
-	ID id = node->nd_vid;
-	CHECK(COMPILE(ret, "dvalue", node->nd_value));
-	debugi("dassn id", rb_id2str(id) ? id : '*');
+	COMPILE(ret, "dvalue", node->nd_value);
+	debugi("dassn id", rb_id2str(node->nd_vid) ? node->nd_vid : '*');
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 
-	idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 
 	if (idx < 0) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
-			  rb_id2str(id));
-	    goto ng;
+	    compile_bug(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
+			rb_id2str(node->nd_vid));
 	}
 	ADD_SETLOCAL(ret, line, ls - idx, lv);
 	break;
       }
       case NODE_GASGN:{
-	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+	COMPILE(ret, "lvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN1(ret, line, setglobal,
 		  ((VALUE)node->nd_entry | 1));
 	break;
       }
-      case NODE_IASGN:{
-	CHECK(COMPILE(ret, "lvalue", node->nd_value));
-	if (!popped) {
+      case NODE_IASGN:
+      case NODE_IASGN2:{
+	COMPILE(ret, "lvalue", node->nd_value);
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN2(ret, line, setinstancevariable,
@@ -6059,9 +4630,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	break;
       }
       case NODE_CDECL:{
-	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+	COMPILE(ret, "lvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 
@@ -6077,8 +4648,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	break;
       }
       case NODE_CVASGN:{
-	CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
-	if (!popped) {
+	COMPILE(ret, "cvasgn val", node->nd_value);
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN1(ret, line, setclassvariable,
@@ -6116,7 +4687,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	 *              nd_mid
 	 */
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
@@ -6129,15 +4700,15 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	  default:
 	    INIT_ANCHOR(args);
 	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag, NULL);
-	    CHECK(!NIL_P(argc));
 	    ADD_SEQ(ret, args);
 	}
 	ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
 	ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
 	flag |= asgnflag;
 
-	if (id == idOROP || id == idANDOP) {
-	    /* a[x] ||= y  or  a[x] &&= y
+	if (id == 0 || id == 1) {
+	    /* 0: or, 1: and
+	       a[x] ||= y
 
 	       unless/if a[x]
 	       a[x]= y
@@ -6149,16 +4720,18 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    LABEL *lfin = NEW_LABEL(line);
 
 	    ADD_INSN(ret, line, dup);
-	    if (id == idOROP) {
+	    if (id == 0) {
+		/* or */
 		ADD_INSNL(ret, line, branchif, label);
 	    }
-	    else { /* idANDOP */
+	    else {
+		/* and */
 		ADD_INSNL(ret, line, branchunless, label);
 	    }
 	    ADD_INSN(ret, line, pop);
 
-	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
-	    if (!popped) {
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -6184,16 +4757,16 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    ADD_INSN(ret, line, pop);
 	    ADD_INSNL(ret, line, jump, lfin);
 	    ADD_LABEL(ret, label);
-	    if (!popped) {
+	    if (!poped) {
 		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 {
-	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
 	    ADD_SEND(ret, line, id, INT2FIX(1));
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -6279,16 +4852,16 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_INSN(ret, line, dup);
 	ADD_SEND(ret, line, vid, INT2FIX(0));
 
-	if (atype == idOROP || atype == idANDOP) {
+	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
 	    ADD_INSN(ret, line, dup);
-	    if (atype == idOROP) {
+	    if (atype == 0) {
 		ADD_INSNL(ret, line, branchif, lcfin);
 	    }
-	    else { /* idANDOP */
+	    else {
 		ADD_INSNL(ret, line, branchunless, lcfin);
 	    }
 	    ADD_INSN(ret, line, pop);
-	    CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+	    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));
@@ -6302,24 +4875,21 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    if (lskip) {
 		ADD_LABEL(ret, lskip);
 	    }
-	    if (popped) {
+	    if (poped) {
 		/* we can apply more optimize */
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
 	    ADD_SEND(ret, line, atype, INT2FIX(1));
-	    if (!popped) {
+	    if (!poped) {
 		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 && !popped) {
+	    if (lskip) {
 		ADD_LABEL(ret, lskip);
 	    }
 	}
@@ -6335,16 +4905,17 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    ADD_INSN1(ret, line, putobject, rb_cObject);
 	    break;
 	  case NODE_COLON2:
-	    CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head));
+	    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)));
-	    goto ng;
+	    debug_node_end();
+	    return COMPILE_NG;
 	}
 	mid = node->nd_head->nd_mid;
 	/* cref */
-	if (node->nd_aid == idOROP) {
+	if (node->nd_aid == 0) {
 	    lassign = NEW_LABEL(line);
 	    ADD_INSN(ret, line, dup); /* cref cref */
 	    ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
@@ -6354,19 +4925,19 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_INSN(ret, line, dup); /* cref cref */
 	ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
 
-	if (node->nd_aid == idOROP || node->nd_aid == idANDOP) {
+	if (node->nd_aid == 0 || node->nd_aid == 1) {
 	    lfin = NEW_LABEL(line);
-	    if (!popped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
-	    if (node->nd_aid == idOROP)
+	    if (!poped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
+	    if (node->nd_aid == 0)
 		ADD_INSNL(ret, line, branchif, lfin);
-	    else /* idANDOP */
+	    else
 		ADD_INSNL(ret, line, branchunless, lfin);
 	    /* cref [obj] */
-	    if (!popped) ADD_INSN(ret, line, pop); /* cref */
+	    if (!poped) ADD_INSN(ret, line, pop); /* cref */
 	    if (lassign) ADD_LABEL(ret, lassign);
-	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
 	    /* cref value */
-	    if (popped)
+	    if (poped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
 	    else {
 		ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
@@ -6374,16 +4945,16 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    }
 	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
 	    ADD_LABEL(ret, lfin);			    /* cref [value] */
-	    if (!popped) ADD_INSN(ret, line, swap); /* [value] cref */
+	    if (!poped) ADD_INSN(ret, line, swap); /* [value] cref */
 	    ADD_INSN(ret, line, pop); /* [value] */
 	}
 	else {
-	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+	    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 (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
 		ADD_INSN(ret, line, swap); /* value value cref */
 	    }
@@ -6411,7 +4982,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    lassign = NEW_LABEL(line);
 	}
 
-	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
+	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) {
@@ -6423,37 +4994,27 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 
 	ADD_INSN(ret, line, pop);
 	ADD_LABEL(ret, lassign);
-	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
+	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
 	ADD_LABEL(ret, lfin);
 
-	if (popped) {
+	if (poped) {
 	    /* we can apply more optimize */
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CALL:
-      case NODE_OPCALL:
 	/* 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 &&
+	    node->nd_mid == idFreeze && node->nd_args == NULL &&
 	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
 	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	    VALUE str = freeze_literal(iseq, node->nd_recv->nd_lit);
-	    if (node->nd_mid == idUMinus) {
-		ADD_INSN3(ret, line, opt_str_uminus, str,
-                          new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE),
-                          Qundef /* CALL_CACHE */);
-	    }
-	    else {
-		ADD_INSN3(ret, line, opt_str_freeze, str,
-                          new_callinfo(iseq, idFreeze, 0, 0, NULL, FALSE),
-                          Qundef /* CALL_CACHE */);
-	    }
-	    if (popped) {
+	    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;
@@ -6465,14 +5026,14 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    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->frozen_string_literal &&
 	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	    VALUE str = freeze_literal(iseq, node->nd_args->nd_head->nd_lit);
-	    CHECK(COMPILE(ret, "recv", node->nd_recv));
-	    ADD_INSN3(ret, line, opt_aref_with, str,
+	    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 */);
-	    if (popped) {
+		      NULL/* CALL_CACHE */, str);
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	    break;
@@ -6487,9 +5048,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	*/
 	DECL_ANCHOR(recv);
 	DECL_ANCHOR(args);
-	LABEL *else_label = 0;
-	LABEL *end_label = 0;
-	VALUE branches = 0;
+	LABEL *lskip = 0;
 	ID mid = node->nd_mid;
 	VALUE argc;
 	unsigned int flag = 0;
@@ -6501,17 +5060,17 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	INIT_ANCHOR(args);
 #if SUPPORT_JOKE
 	if (nd_type(node) == NODE_VCALL) {
-            ID id_bitblt;
+	    ID id_bitblt;
 	    ID id_answer;
 
-            CONST_ID(id_bitblt, "bitblt");
+	    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) {
+	    if (mid == id_bitblt) {
+		ADD_INSN(ret, line, bitblt);
+		break;
+	    }
+	    else if (mid == id_answer) {
 		ADD_INSN(ret, line, answer);
 		break;
 	    }
@@ -6529,7 +5088,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		LABEL *label;
 		st_data_t data;
 		st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
-		VALUE label_name;
+		ID label_name;
 
 		if (!labels_table) {
 		    labels_table = st_init_numtable();
@@ -6538,7 +5097,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		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;
+		    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;
@@ -6550,7 +5109,6 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		}
 		else {
 		    COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
-		    goto ng;
 		}
 
 
@@ -6565,26 +5123,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	}
 #endif
 	/* 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 {
-		CHECK(COMPILE(recv, "recv", node->nd_recv));
-	    }
-
+	if (type == NODE_CALL || type == NODE_QCALL) {
+	    COMPILE(recv, "recv", node->nd_recv);
 	    if (type == NODE_QCALL) {
-		else_label = NEW_LABEL(line);
-		end_label = NEW_LABEL(line);
-
-		DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "&.");
+		lskip = NEW_LABEL(line);
 		ADD_INSN(recv, line, dup);
-		ADD_INSNL(recv, line, branchnil, else_label);
-		ADD_TRACE_BRANCH_COVERAGE(recv, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches);
+		ADD_INSNL(recv, line, branchnil, lskip);
 	    }
 	}
 	else if (type == NODE_FCALL || type == NODE_VCALL) {
@@ -6592,9 +5136,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	}
 
 	/* args */
-	if (type != NODE_VCALL) {
+	if (nd_type(node) != NODE_VCALL) {
 	    argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
-	    CHECK(!NIL_P(argc));
 	}
 	else {
 	    argc = INT2FIX(0);
@@ -6606,7 +5149,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	debugp_param("call args argc", argc);
 	debugp_param("call method", ID2SYM(mid));
 
-	switch ((int)type) {
+	switch (nd_type(node)) {
 	  case NODE_VCALL:
 	    flag |= VM_CALL_VCALL;
 	    /* VCALL is funcall, so fall through */
@@ -6616,13 +5159,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 
 	ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
 
-	if (else_label && end_label) {
-	    ADD_INSNL(ret, line, jump, end_label);
-	    ADD_LABEL(ret, else_label);
-	    ADD_TRACE_BRANCH_COVERAGE(ret, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
-	    ADD_LABEL(ret, end_label);
+	if (lskip) {
+	    ADD_LABEL(ret, lskip);
 	}
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -6637,56 +5177,51 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 
 	INIT_ANCHOR(args);
 	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
-	if (type == NODE_SUPER) {
+	if (nd_type(node) == 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 = 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;
+	    const rb_iseq_t *liseq = iseq->body->local_iseq;
 	    int lvar_level = get_lvar_level(iseq);
 
-	    argc = local_body->param.lead_num;
+	    argc = liseq->body->param.lead_num;
 
 	    /* normal arguments */
-	    for (i = 0; i < local_body->param.lead_num; i++) {
-		int idx = local_body->local_table_size - i;
+	    for (i = 0; i < liseq->body->param.lead_num; i++) {
+		int idx = liseq->body->local_table_size - i;
 		ADD_GETLOCAL(args, line, idx, lvar_level);
 	    }
 
-	    if (local_body->param.flags.has_opt) {
+	    if (liseq->body->param.flags.has_opt) {
 		/* optional arguments */
 		int j;
-		for (j = 0; j < local_body->param.opt_num; j++) {
-		    int idx = local_body->local_table_size - (i + j);
+		for (j = 0; j < liseq->body->param.opt_num; j++) {
+		    int idx = liseq->body->local_table_size - (i + j);
 		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
 		i += j;
 		argc = i;
 	    }
-	    if (local_body->param.flags.has_rest) {
+	    if (liseq->body->param.flags.has_rest) {
 		/* rest argument */
-		int idx = local_body->local_table_size - local_body->param.rest_start;
-
+		int idx = liseq->body->local_table_size - liseq->body->param.rest_start;
 		ADD_GETLOCAL(args, line, idx, lvar_level);
-		ADD_INSN1(args, line, splatarray, Qfalse);
 
-		argc = local_body->param.rest_start + 1;
+		argc = liseq->body->param.rest_start + 1;
 		flag |= VM_CALL_ARGS_SPLAT;
 	    }
-	    if (local_body->param.flags.has_post) {
+	    if (liseq->body->param.flags.has_post) {
 		/* post arguments */
-		int post_len = local_body->param.post_num;
-		int post_start = local_body->param.post_start;
+		int post_len = liseq->body->param.post_num;
+		int post_start = liseq->body->param.post_start;
 
-		if (local_body->param.flags.has_rest) {
+		if (liseq->body->param.flags.has_rest) {
 		    int j;
 		    for (j=0; j<post_len; j++) {
-			int idx = local_body->local_table_size - (post_start + j);
+			int idx = liseq->body->local_table_size - (post_start + j);
 			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
 		    ADD_INSN1(args, line, newarray, INT2FIX(j));
@@ -6696,46 +5231,46 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		else {
 		    int j;
 		    for (j=0; j<post_len; j++) {
-			int idx = local_body->local_table_size - (post_start + j);
+			int idx = liseq->body->local_table_size - (post_start + j);
 			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
 		    argc = post_len + post_start;
 		}
 	    }
 
-	    if (local_body->param.flags.has_kw) { /* TODO: support keywords */
-		int local_size = local_body->local_table_size;
+	    if (liseq->body->param.flags.has_kw) { /* TODO: support keywords */
+		int local_size = liseq->body->local_table_size;
 		argc++;
 
 		ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 
-		if (local_body->param.flags.has_kwrest) {
-		    int idx = local_body->local_table_size - local_kwd->rest_start;
+		if (liseq->body->param.flags.has_kwrest) {
+		    int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start;
 		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		    ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
 		}
 		else {
 		    ADD_INSN1(args, line, newhash, INT2FIX(0));
 		}
-		for (i = 0; i < local_kwd->num; ++i) {
-		    ID id = local_kwd->table[i];
+		for (i = 0; i < liseq->body->param.keyword->num; ++i) {
+		    ID id = liseq->body->param.keyword->table[i];
 		    int idx = local_size - get_local_var_idx(liseq, id);
 		    ADD_INSN1(args, line, putobject, ID2SYM(id));
 		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
 		ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
-		if (local_body->param.flags.has_rest) {
+		if (liseq->body->param.flags.has_rest) {
 		    ADD_INSN1(args, line, newarray, INT2FIX(1));
 		    ADD_INSN (args, line, concatarray);
 		    --argc;
 		}
 	    }
-	    else if (local_body->param.flags.has_kwrest) {
-		int idx = local_body->local_table_size - local_kwd->rest_start;
+	    else if (liseq->body->param.flags.has_kwrest) {
+		int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start;
 		ADD_GETLOCAL(args, line, idx, lvar_level);
 
 		ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
-		if (local_body->param.flags.has_rest) {
+		if (liseq->body->param.flags.has_rest) {
 		    ADD_INSN1(args, line, newarray, INT2FIX(1));
 		    ADD_INSN (args, line, concatarray);
 		}
@@ -6745,66 +5280,104 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    }
 	}
 
-	ADD_INSN(ret, line, putself);
+	/* dummy receiver */
+	ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
 	ADD_SEQ(ret, args);
 	ADD_INSN3(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),
+		  new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords, parent_block != NULL),
 		  Qnil, /* CALL_CACHE */
 		  parent_block);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARRAY:{
-	CHECK(compile_array(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, NULL, NULL, popped) >= 0);
+	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, NULL, poped);
 	break;
       }
       case NODE_ZARRAY:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
 	}
 	break;
       }
       case NODE_VALUES:{
-	const NODE *n = node;
-	if (popped) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
-	}
+	NODE *n = node;
 	while (n) {
-	    CHECK(COMPILE(ret, "values item", n->nd_head));
+	    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);
-	enum node_type type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
+	int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
 
 	INIT_ANCHOR(list);
 	switch (type) {
 	  case NODE_ARRAY:
-	    CHECK(compile_array(iseq, list, node->nd_head, COMPILE_ARRAY_TYPE_HASH, NULL, NULL, popped) >= 0);
+	    compile_array(iseq, list, node->nd_head, COMPILE_ARRAY_TYPE_HASH);
 	    ADD_SEQ(ret, list);
 	    break;
 
 	  case NODE_ZARRAY:
-	    if (popped) break;
 	    ADD_INSN1(ret, line, newhash, INT2FIX(0));
 	    break;
 
 	  default:
-	    COMPILE_ERROR(ERROR_ARGS_AT(node->nd_head) "can't make hash with this node: %s",
-			  ruby_node_name(type));
-	    goto ng;
+	    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:
-	CHECK(compile_return(iseq, ret, node, popped));
+      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);
+		    }
+		}
+	    }
+	}
 	break;
+      }
       case NODE_YIELD:{
 	DECL_ANCHOR(args);
 	VALUE argc;
@@ -6812,15 +5385,14 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	struct rb_call_info_kw_arg *keywords = NULL;
 
 	INIT_ANCHOR(args);
-	if (body->type == ISEQ_TYPE_TOP ||
-	    body->type == ISEQ_TYPE_MAIN) {
+	if (iseq->body->type == ISEQ_TYPE_TOP) {
 	    COMPILE_ERROR(ERROR_ARGS "Invalid yield");
-	    goto ng;
+	    debug_node_end();
+	    return COMPILE_NG;
 	}
 
 	if (node->nd_head) {
 	    argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
-	    CHECK(!NIL_P(argc));
 	}
 	else {
 	    argc = INT2FIX(0);
@@ -6829,17 +5401,17 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_SEQ(ret, args);
 	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LVAR:{
-	if (!popped) {
+	if (!poped) {
 	    ID id = node->nd_vid;
-	    int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+	    int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
-	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
+	    debugs("id: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
 	    ADD_GETLOCAL(ret, line, idx, get_lvar_level(iseq));
 	}
 	break;
@@ -6847,12 +5419,11 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_DVAR:{
 	int lv, idx, ls;
 	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
+	if (!poped) {
 	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 	    if (idx < 0) {
-		COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
-			      rb_id2str(node->nd_vid));
-		goto ng;
+		compile_bug(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
+			    rb_id2str(node->nd_vid));
 	    }
 	    ADD_GETLOCAL(ret, line, ls - idx, lv);
 	}
@@ -6861,14 +5432,14 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_GVAR:{
 	ADD_INSN1(ret, line, getglobal,
 		  ((VALUE)node->nd_entry | 1));
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_IVAR:{
 	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN2(ret, line, getinstancevariable,
 		      ID2SYM(node->nd_vid),
 		      get_ivar_ic_value(iseq,node->nd_vid));
@@ -6880,11 +5451,11 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 
 	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = body->is_size++;
+	    int ic_index = iseq->body->is_size++;
 
-            ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
-            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
+	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 	else {
@@ -6892,20 +5463,20 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CVAR:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, getclassvariable,
 		      ID2SYM(node->nd_vid));
 	}
 	break;
       }
       case NODE_NTH_REF:{
-        if (!popped) {
+        if (!poped) {
 	    if (!node->nd_nth) {
 		ADD_INSN(ret, line, putnil);
 		break;
@@ -6916,7 +5487,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	break;
       }
       case NODE_BACK_REF:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
 		      INT2FIX(0x01 | (node->nd_nth << 1)));
 	}
@@ -6937,12 +5508,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		      INT2FIX(0));
 	    break;
 	  case NODE_MATCH2:
-	    CHECK(COMPILE(recv, "receiver", node->nd_recv));
-	    CHECK(COMPILE(val, "value", node->nd_value));
+	    COMPILE(recv, "receiver", node->nd_recv);
+	    COMPILE(val, "value", node->nd_value);
 	    break;
 	  case NODE_MATCH3:
-	    CHECK(COMPILE(recv, "receiver", node->nd_value));
-	    CHECK(COMPILE(val, "value", node->nd_recv));
+	    COMPILE(recv, "receiver", node->nd_value);
+	    COMPILE(val, "value", node->nd_recv);
 	    break;
 	}
 
@@ -6971,38 +5542,36 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    compile_named_capture_assign(iseq, ret, node->nd_args);
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LIT:{
 	debugp_param("lit", node->nd_lit);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, node->nd_lit);
 	}
 	break;
       }
       case NODE_STR:{
 	debugp_param("nd_lit", node->nd_lit);
-	if (!popped) {
-	    VALUE lit = node->nd_lit;
+	if (!poped) {
+	    node->nd_lit = rb_fstring(node->nd_lit);
 	    if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		lit = freeze_literal(iseq, lit);
-		ADD_INSN1(ret, line, putstring, lit);
+		ADD_INSN1(ret, line, putstring, node->nd_lit);
 	    }
 	    else {
 		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    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);
+		    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);
 		}
 		else {
-		    lit = rb_fstring(lit);
+		    ADD_INSN1(ret, line, putobject, node->nd_lit);
 		}
-		ADD_INSN1(ret, line, putobject, lit);
-		iseq_add_mark_object_compile_time(iseq, lit);
 	    }
 	}
 	break;
@@ -7010,14 +5579,14 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_DSTR:{
 	compile_dstr(iseq, ret, node);
 
-	if (popped) {
+	if (poped) {
 	    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, rb_iseq_path(iseq), INT2FIX(line));
+		    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);
@@ -7026,11 +5595,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	break;
       }
       case NODE_XSTR:{
+	node->nd_lit = rb_fstring(node->nd_lit);
 	ADD_CALL_RECEIVER(ret, line);
-	ADD_INSN1(ret, line, putobject, freeze_literal(iseq, node->nd_lit));
+	ADD_INSN1(ret, line, putobject, node->nd_lit);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7040,70 +5610,79 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	compile_dstr(iseq, ret, node);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_EVSTR:
-	CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
+      case NODE_EVSTR:{
+	COMPILE(ret, "nd_body", node->nd_body);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	else {
+	    ADD_INSN(ret, line, tostring);
+	}
 	break;
+      }
       case NODE_DREGX:{
 	compile_dregx(iseq, ret, node);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      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);
+      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);
 
 	ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARGSCAT:{
-	if (popped) {
-	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
+	if (poped) {
+	    COMPILE(ret, "argscat head", node->nd_head);
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
-	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
+	    COMPILE(ret, "argscat body", node->nd_body);
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
 	}
 	else {
-	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
-	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
+	    COMPILE(ret, "argscat head", node->nd_head);
+	    COMPILE(ret, "argscat body", node->nd_body);
 	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_ARGSPUSH:{
-	if (popped) {
-	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
+	if (poped) {
+	    COMPILE(ret, "arsgpush head", node->nd_head);
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
-	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
 	}
 	else {
-	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
-	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
+	    COMPILE(ret, "arsgpush head", node->nd_head);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
 	    ADD_INSN1(ret, line, newarray, INT2FIX(1));
 	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_SPLAT:{
-	CHECK(COMPILE(ret, "splat", node->nd_head));
+	COMPILE(ret, "splat", node->nd_head);
 	ADD_INSN1(ret, line, splatarray, Qtrue);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7120,7 +5699,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_INSN1(ret, line, putiseq, method_iseq);
 	ADD_SEND (ret, line, id_core_define_method, INT2FIX(2));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 
@@ -7134,12 +5713,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	debugp_param("defs/iseq", rb_iseqw_new(singleton_method));
 
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	CHECK(COMPILE(ret, "defs: recv", node->nd_recv));
+	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 (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7147,22 +5726,22 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_ALIAS:{
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
-	CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
+	COMPILE(ret, "alias arg1", node->u1.node);
+	COMPILE(ret, "alias arg2", node->u2.node);
 	ADD_SEND(ret, line, id_core_set_method_alias, INT2FIX(3));
 
-	if (popped) {
+	if (poped) {
 	    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->nd_alias));
-	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_orig));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->u1.id));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->u2.id));
 	ADD_SEND(ret, line, id_core_set_variable_alias, INT2FIX(2));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7170,10 +5749,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_UNDEF:{
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	CHECK(COMPILE(ret, "undef arg", node->nd_undef));
+	COMPILE(ret, "undef arg", node->u2.node);
 	ADD_SEND(ret, line, id_core_undef_method, INT2FIX(2));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7182,14 +5761,15 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	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);
-	const int flags = VM_DEFINECLASS_TYPE_CLASS |
-	    (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
-	    compile_cpath(ret, iseq, node->nd_cpath);
+	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
+	int flags = VM_DEFINECLASS_TYPE_CLASS;
 
-	CHECK(COMPILE(ret, "super", node->nd_super));
+	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
+	if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS;
+	COMPILE(ret, "super", node->nd_super);
 	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7198,30 +5778,31 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
         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);
-	const int flags = VM_DEFINECLASS_TYPE_MODULE |
-	    compile_cpath(ret, iseq, node->nd_cpath);
+	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
+	int flags = VM_DEFINECLASS_TYPE_MODULE;
 
+	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));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_SCLASS:{
 	ID singletonclass;
-	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
+	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_str_new2("singleton class"),
 						    ISEQ_TYPE_CLASS, line);
 
-	CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
+	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));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7230,17 +5811,17 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	if (rb_is_const_id(node->nd_mid)) {
 	    /* constant */
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = body->is_size++;
+	    int ic_index = iseq->body->is_size++;
 
 	    DECL_ANCHOR(pref);
 	    DECL_ANCHOR(body);
 
 	    INIT_ANCHOR(pref);
 	    INIT_ANCHOR(body);
-	    CHECK(compile_const_prefix(iseq, node, pref, body));
-	    if (LIST_INSN_SIZE_ZERO(pref)) {
+	    compile_colon2(iseq, node, pref, body);
+	    if (LIST_SIZE_ZERO(pref)) {
 		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-                    ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
+		    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 		}
 		else {
 		    ADD_INSN(ret, line, putnil);
@@ -7249,7 +5830,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		ADD_SEQ(ret, body);
 
 		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-                    ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
+		    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
 		    ADD_LABEL(ret, lend);
 		}
 	    }
@@ -7261,23 +5842,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	else {
 	    /* function call */
 	    ADD_CALL_RECEIVER(ret, line);
-	    CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
+	    COMPILE(ret, "colon2#nd_head", node->nd_head);
 	    ADD_CALL(ret, line, node->nd_mid, INT2FIX(1));
 	}
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_COLON3:{
 	LABEL *lend = NEW_LABEL(line);
-	int ic_index = body->is_size++;
+	int ic_index = iseq->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, opt_getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 	    ADD_INSN(ret, line, pop);
 	}
 
@@ -7285,79 +5866,97 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
 
 	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
+	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DOT2:
       case NODE_DOT3:{
-	int excl = type == NODE_DOT3;
-	VALUE flag = INT2FIX(excl);
-	const NODE *b = node->nd_beg;
-	const NODE *e = node->nd_end;
-	if (number_literal_p(b) && number_literal_p(e)) {
-	    if (!popped) {
-		VALUE val = rb_range_new(b->nd_lit, e->nd_lit, excl);
-		iseq_add_mark_object_compile_time(iseq, val);
-		ADD_INSN1(ret, line, putobject, val);
-	    }
+	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);
 	}
 	else {
-	    CHECK(COMPILE_(ret, "min", b, popped));
-	    CHECK(COMPILE_(ret, "max", e, popped));
-	    if (!popped) {
-		ADD_INSN1(ret, line, newrange, flag);
-	    }
+	    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);
-	LABEL *lfalse = NEW_LABEL(line);
-	CHECK(compile_flip_flop(iseq, ret, node, type == NODE_FLIP2,
-				ltrue, lfalse));
+	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);
+
 	ADD_LABEL(ret, ltrue);
 	ADD_INSN1(ret, line, putobject, Qtrue);
-	ADD_INSNL(ret, line, jump, lend);
-	ADD_LABEL(ret, lfalse);
-	ADD_INSN1(ret, line, putobject, Qfalse);
-	ADD_LABEL(ret, lend);
+
+	ADD_LABEL(ret, lfin);
 	break;
       }
       case NODE_SELF:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putself);
 	}
 	break;
       }
       case NODE_NIL:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	break;
       }
       case NODE_TRUE:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, Qtrue);
 	}
 	break;
       }
       case NODE_FALSE:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, Qfalse);
 	}
 	break;
       }
       case NODE_ERRINFO:{
-	if (!popped) {
-	    if (body->type == ISEQ_TYPE_RESCUE) {
+	if (!poped) {
+	    if (iseq->body->type == ISEQ_TYPE_RESCUE) {
 		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
 	    }
 	    else {
@@ -7380,23 +5979,38 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	}
 	break;
       }
-      case NODE_DEFINED:
-	if (!popped) {
-	    CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
+      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]);
 	}
 	break;
+      }
       case NODE_POSTEXE:{
 	/* compiled to:
 	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
 	 */
-	int is_index = body->is_size++;
-	const rb_iseq_t *once_iseq =
-	    new_child_iseq_ifunc(iseq, IFUNC_NEW(build_postexe_iseq, node->nd_body, 0),
-				 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
+	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);
 
 	ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -7404,31 +6018,29 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
       case NODE_KW_ARG:
 	{
 	    LABEL *end_label = NEW_LABEL(nd_line(node));
-	    const NODE *default_value = node->nd_body->nd_value;
+	    NODE *default_value = node->nd_body->nd_value;
 
-	    if (default_value == (const NODE *)-1) {
+	    if (default_value == (NODE *)-1) {
 		/* required argument. do nothing */
-		COMPILE_ERROR(ERROR_ARGS "unreachable");
-		goto ng;
+		compile_bug(ERROR_ARGS "unreachable");
 	    }
 	    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_ERROR(ERROR_ARGS "unreachable");
-		goto ng;
+		compile_bug(ERROR_ARGS "unreachable");
 	    }
 	    else {
 		/* if keywordcheck(_kw_bits, nth_keyword)
 		 *   kw = default_value
 		 * end
 		 */
-		int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
-		int keyword_idx = body->param.keyword->num;
+		int kw_bits_idx = iseq->body->local_table_size - iseq->body->param.keyword->bits_start;
+		int keyword_idx = iseq->body->param.keyword->num;
 
 		ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
 		ADD_INSNL(ret, line, branchif, end_label);
-		CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
+		COMPILE_POPED(ret, "keyword default argument", node->nd_body);
 		ADD_LABEL(ret, end_label);
 	    }
 
@@ -7436,8 +6048,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	}
       case NODE_DSYM:{
 	compile_dstr(iseq, ret, node);
-	if (!popped) {
-	    ADD_INSN(ret, line, intern);
+	if (!poped) {
+	    ADD_SEND(ret, line, idIntern, INT2FIX(0));
 	}
 	else {
 	    ADD_INSN(ret, line, pop);
@@ -7449,10 +6061,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	DECL_ANCHOR(args);
 	unsigned int flag = 0;
 	ID mid = node->nd_mid;
-	LABEL *else_label = 0;
-	LABEL *end_label = 0;
+	LABEL *lskip = 0;
 	VALUE argc;
-	VALUE branches = 0;
 
 	/* optimization shortcut
 	 *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
@@ -7461,19 +6071,20 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    nd_type(node->nd_args) == NODE_ARRAY && 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 = freeze_literal(iseq, node->nd_args->nd_head->nd_lit);
-	    CHECK(COMPILE(ret, "recv", node->nd_recv));
-	    CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
-	    if (!popped) {
+	    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) {
 		ADD_INSN(ret, line, swap);
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
-	    ADD_INSN3(ret, line, opt_aset_with, str,
+	    ADD_INSN3(ret, line, opt_aset_with,
 		      new_callinfo(iseq, idASET, 2, 0, NULL, FALSE),
-		      NULL/* CALL_CACHE */);
+		      NULL/* CALL_CACHE */, str);
 	    ADD_INSN(ret, line, pop);
 	    break;
 	}
@@ -7481,7 +6092,6 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	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);
 
@@ -7492,13 +6102,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    /* safe nav attr */
 	    mid = rb_id_attrset(mid);
 	    ADD_INSN(recv, line, dup);
-            else_label = NEW_LABEL(line);
-            end_label = NEW_LABEL(line);
-            DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "&.");
-	    ADD_INSNL(recv, line, branchnil, else_label);
-            ADD_TRACE_BRANCH_COVERAGE(recv, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches);
+	    lskip = NEW_LABEL(line);
+	    ADD_INSNL(recv, line, branchnil, lskip);
 	}
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
@@ -7528,16 +6135,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	    ADD_SEQ(ret, args);
 	}
 	ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag));
-	if (else_label && end_label) {
-	    ADD_INSNL(ret, line, jump, end_label);
-            ADD_LABEL(ret, else_label);
-	    ADD_TRACE_BRANCH_COVERAGE(ret, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
-            ADD_LABEL(ret, end_label);
-        }
+	if (lskip) ADD_LABEL(ret, lskip);
 	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);
@@ -7546,18 +6160,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       default:
-	UNKNOWN_NODE("iseq_compile_each", node, COMPILE_NG);
-      ng:
-	debug_node_end();
+	UNKNOWN_NODE("iseq_compile_each", node);
 	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;
 }
@@ -7613,7 +6232,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, LABEL_FORMAT, lobj->label_no);
+		    rb_str_catf(str, "<L%03d>", lobj->label_no);
 		    break;
 		}
 		break;
@@ -7646,7 +6265,6 @@ insn_data_to_s_detail(INSN *iobj)
 		    break;
 		}
 	      case TS_IC:	/* inline cache */
-	      case TS_ISE:	/* inline storage entry */
 		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
 		break;
 	      case TS_CALLINFO: /* call info */
@@ -7667,7 +6285,7 @@ insn_data_to_s_detail(INSN *iobj)
 		break;
 	      case TS_FUNCPTR:
 		{
-		    const void *func = (const void *)OPERAND_AT(iobj, j);
+		    rb_insn_func_t func = (rb_insn_func_t)OPERAND_AT(iobj, j);
 #ifdef HAVE_DLADDR
 		    Dl_info info;
 		    if (dladdr(func, &info) && info.dli_sname) {
@@ -7691,13 +6309,7 @@ insn_data_to_s_detail(INSN *iobj)
 }
 
 static void
-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)
+dump_disasm_list(struct iseq_link_element *link)
 {
     int pos = 0;
     INSN *iobj;
@@ -7707,27 +6319,24 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
     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->insn_info.line_no);
+		printf("%04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->line_no);
 		pos += insn_data_length(iobj);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		lobj = (LABEL *)link;
-		printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
-		       dest == lobj ? " <---" : "");
+		printf("<L%03d>\n", lobj->label_no);
 		break;
 	    }
-	  case ISEQ_ELEMENT_TRACE:
+	  case ISEQ_ELEMENT_NONE:
 	    {
-		TRACE *trace = (TRACE *)link;
-		printf("trace: %0x\n", trace->event);
+		printf("[none]\n");
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
@@ -7749,16 +6358,16 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
 const char *
 rb_insns_name(int i)
 {
-    return insn_name(i);
+    return insn_name_info[i];
 }
 
 VALUE
 rb_insns_name_array(void)
 {
-    VALUE ary = rb_ary_new_capa(VM_INSTRUCTION_SIZE);
+    VALUE ary = rb_ary_new();
     int i;
-    for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
-	rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
+    for (i = 0; i < numberof(insn_name_info); i++) {
+	rb_ary_push(ary, rb_fstring(rb_str_new2(insn_name_info[i])));
     }
     return rb_obj_freeze(ary);
 }
@@ -7768,7 +6377,7 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
 {
     LABEL *label = 0;
     st_data_t tmp;
-    obj = rb_to_symbol_type(obj);
+    obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
 
     if (st_lookup(labels_table, obj, &tmp) == 0) {
 	label = NEW_LABEL(0);
@@ -7817,34 +6426,30 @@ 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_to_array_type(RARRAY_AREF(exception, i));
+	v = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
+					 "Array", "to_ary");
 	if (RARRAY_LEN(v) != 6) {
 	    rb_raise(rb_eSyntaxError, "wrong exception entry");
 	}
-        type = get_exception_sym2type(RARRAY_AREF(v, 0));
-        if (RARRAY_AREF(v, 1) == Qnil) {
+	ptr  = RARRAY_CONST_PTR(v);
+	type = get_exception_sym2type(ptr[0]);
+	if (ptr[1] == Qnil) {
 	    eiseq = NULL;
 	}
 	else {
-            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));
-
-	/* TODO: Dirty Hack!  Fix me */
-	if (type == CATCH_TYPE_RESCUE ||
-	    type == CATCH_TYPE_BREAK ||
-	    type == CATCH_TYPE_NEXT) {
-	    ++sp;
+	    eiseq = rb_iseqw_to_iseq(rb_iseq_load(ptr[1], (VALUE)iseq, Qnil));
 	}
 
-	lcont->sp = sp;
+	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]);
+
+	(void)sp;
 
 	ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
 
@@ -7884,6 +6489,7 @@ 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;
 }
 
@@ -7923,26 +6529,12 @@ 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);
 }
 
-static rb_event_flag_t
-event_name_to_flag(VALUE sym)
-{
-#define CHECK_EVENT(ev) if (sym == ID2SYM(rb_intern(#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 *const anchor,
+iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *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;
@@ -7959,17 +6551,11 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
     }
 
     for (i=0; i<len; i++) {
-        VALUE obj = RARRAY_AREF(body, i);
+	VALUE obj = ptr[i];
 
 	if (SYMBOL_P(obj)) {
-	    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);
-	    }
+	    LABEL *label = register_label(iseq, labels_table, obj);
+	    ADD_LABEL(anchor, label);
 	}
 	else if (FIXNUM_P(obj)) {
 	    line_no = NUM2INT(obj);
@@ -8013,14 +6599,12 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			break;
 		      case TS_VALUE:
 			argv[j] = op;
-			iseq_add_mark_object_compile_time(iseq, op);
+			iseq_add_mark_object(iseq, op);
 			break;
 		      case TS_ISEQ:
 			{
 			    if (op != Qnil) {
-				VALUE v = (VALUE)iseq_build_load_iseq(iseq, op);
-				argv[j] = v;
-				iseq_add_mark_object_compile_time(iseq, v);
+				argv[j] = (VALUE)iseq_build_load_iseq(iseq, op);
 			    }
 			    else {
 				argv[j] = 0;
@@ -8028,11 +6612,9 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			}
 			break;
 		      case TS_GENTRY:
-			op = rb_to_symbol_type(op);
+			op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
 			argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
 			break;
-		      case TS_ISE:
-			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
 		      case TS_IC:
 			argv[j] = op;
 			if (NUM2UINT(op) >= iseq->body->is_size) {
@@ -8046,15 +6628,16 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			argv[j] = Qfalse;
 			break;
 		      case TS_ID:
-			argv[j] = rb_to_symbol_type(op);
+			argv[j] = rb_convert_type(op, T_SYMBOL,
+						  "Symbol", "to_sym");
 			break;
 		      case TS_CDHASH:
 			{
 			    int i;
-			    VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
+			    VALUE map = rb_hash_new();
 
-                            RHASH_TBL_RAW(map)->type = &cdhash_type;
-			    op = rb_to_array_type(op);
+			    rb_hash_tbl_raw(map)->type = &cdhash_type;
+			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
 			    for (i=0; i<RARRAY_LEN(op); i+=2) {
 				VALUE key = RARRAY_AREF(op, i);
 				VALUE sym = RARRAY_AREF(op, i+1);
@@ -8064,7 +6647,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			    }
 			    RB_GC_GUARD(op);
 			    argv[j] = map;
-			    iseq_add_mark_object_compile_time(iseq, map);
+			    rb_iseq_add_mark_object(iseq, map);
 			}
 			break;
 		      case TS_FUNCPTR:
@@ -8096,18 +6679,20 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
     return iseq_setup(iseq, anchor);
 }
 
-#define CHECK_ARRAY(v)   rb_to_array_type(v)
-#define CHECK_SYMBOL(v)  rb_to_symbol_type(v)
+#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")
 
 static int
 int_param(int *dst, VALUE param, VALUE sym)
 {
     VALUE val = rb_hash_aref(param, sym);
-    if (FIXNUM_P(val)) {
+    switch (TYPE(val)) {
+      case T_NIL:
+	return FALSE;
+      case T_FIXNUM:
 	*dst = FIX2INT(val);
 	return TRUE;
-    }
-    else if (!NIL_P(val)) {
+      default:
 	rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
 		 sym, val);
     }
@@ -8131,7 +6716,7 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
 #define SYM(s) ID2SYM(rb_intern(#s))
     (void)int_param(&keyword->bits_start, params, SYM(kwbits));
     i = keyword->bits_start - keyword->num;
-    ids = (ID *)&iseq->body->local_table[i];
+    ids = (VALUE *)&iseq->body->local_table[i];
 #undef SYM
 
     /* required args */
@@ -8148,14 +6733,10 @@ 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, (unsigned int)default_len);
+    dvs = ALLOC_N(VALUE, default_len);
 
     for (j = 0; i < len; i++, j++) {
 	key = RARRAY_AREF(keywords, i);
@@ -8189,7 +6770,6 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 {
 #define SYM(s) ID2SYM(rb_intern(#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);
@@ -8214,6 +6794,11 @@ 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;
@@ -8223,16 +6808,9 @@ 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
-    }
 
-    if (RB_TYPE_P(arg_opt_labels, T_ARRAY)) {
+    switch (TYPE(arg_opt_labels)) {
+      case T_ARRAY:
 	len = RARRAY_LENINT(arg_opt_labels);
 	iseq->body->param.flags.has_opt = !!(len - 1 >= 0);
 
@@ -8248,16 +6826,19 @@ 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;
 	}
-    }
-    else if (!NIL_P(arg_opt_labels)) {
+      case T_NIL:
+	break;
+      default:
 	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
 		 arg_opt_labels);
     }
 
-    if (RB_TYPE_P(keywords, T_ARRAY)) {
+    switch (TYPE(keywords)) {
+      case T_ARRAY:
 	iseq->body->param.keyword = iseq_build_kw(iseq, params, keywords);
-    }
-    else if (!NIL_P(keywords)) {
+      case T_NIL:
+	break;
+      default:
 	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
 		 keywords);
     }
@@ -8282,10 +6863,6 @@ 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 */
@@ -8296,22 +6873,20 @@ rb_dvar_defined(ID id, const struct rb_block *base_block)
     const rb_iseq_t *iseq;
 
     if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) {
-	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
+	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
 	       ) {
 	    unsigned int i;
 
-	    for (i = 0; i < body->local_table_size; i++) {
-		if (body->local_table[i] == id) {
+	    for (i = 0; i < iseq->body->local_table_size; i++) {
+		if (iseq->body->local_table[i] == id) {
 		    return 1;
 		}
 	    }
-	    iseq = body->parent_iseq;
-	    body = iseq->body;
+	    iseq = iseq->body->parent_iseq;
 	}
     }
     return 0;
@@ -8324,10 +6899,10 @@ rb_local_defined(ID id, const struct rb_block *base_block)
 
     if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) {
 	unsigned int i;
-	const struct rb_iseq_constant_body *const body = iseq->body->local_iseq->body;
+	iseq = iseq->body->local_iseq;
 
-	for (i=0; i<body->local_table_size; i++) {
-	    if (body->local_table[i] == id) {
+	for (i=0; i<iseq->body->local_table_size; i++) {
+	    if (iseq->body->local_table[i] == id) {
 		return 1;
 	    }
 	}
@@ -8336,21 +6911,21 @@ rb_local_defined(ID id, const struct rb_block *base_block)
 }
 
 static int
-caller_location(VALUE *path, VALUE *realpath)
+caller_location(VALUE *path, VALUE *absolute_path)
 {
-    const rb_execution_context_t *ec = GET_EC();
+    const rb_thread_t *const th = GET_THREAD();
     const rb_control_frame_t *const cfp =
-        rb_vm_get_ruby_level_next_cfp(ec, ec->cfp);
+	rb_vm_get_ruby_level_next_cfp(th, th->cfp);
 
     if (cfp) {
 	int line = rb_vm_get_sourceline(cfp);
-	*path = rb_iseq_path(cfp->iseq);
-	*realpath = rb_iseq_realpath(cfp->iseq);
+	*path = cfp->iseq->body->location.path;
+	*absolute_path = cfp->iseq->body->location.absolute_path;
 	return line;
     }
     else {
-	*path = rb_fstring_lit("<compiled>");
-	*realpath = *path;
+	*path = rb_fstring_cstr("<compiled>");
+	*absolute_path = *path;
 	return 1;
     }
 }
@@ -8363,29 +6938,28 @@ typedef struct {
 
 static const rb_iseq_t *
 method_for_self(VALUE name, VALUE arg, rb_insn_func_t func,
-		VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *const, VALUE))
+		VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE))
 {
-    VALUE path, realpath;
+    VALUE path, absolute_path;
     accessor_args acc;
 
     acc.arg = arg;
     acc.func = func;
-    acc.line = caller_location(&path, &realpath);
-    return rb_iseq_new_ifunc(IFUNC_NEW(build, (VALUE)&acc, 0),
-			     rb_sym2str(name), path, realpath,
-			     INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
+    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);
 }
 
 static VALUE
-for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *const ret, VALUE a)
+for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE 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);
-    body->param.lead_num = 0;
-    body->param.size = 0;
+    iseq->body->param.lead_num = 0;
+    iseq->body->param.size = 0;
 
     ADD_INSN1(ret, line, putobject, args->arg);
     ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
@@ -8393,16 +6967,15 @@ for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *const ret, VALUE a)
 }
 
 static VALUE
-for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *const ret, VALUE a)
+for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE 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);
-    body->param.lead_num = 1;
-    body->param.size = 1;
+    iseq->body->param.lead_num = 1;
+    iseq->body->param.size = 1;
 
     ADD_GETLOCAL(ret, line, numberof(vars)-1, 0);
     ADD_INSN1(ret, line, putobject, args->arg);
@@ -8431,10 +7004,6 @@ rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func)
 
 /* ISeq binary format */
 
-#ifndef IBF_ISEQ_DEBUG
-#define IBF_ISEQ_DEBUG 0
-#endif
-
 typedef unsigned int ibf_offset_t;
 #define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
 
@@ -8454,6 +7023,15 @@ struct ibf_header {
     ibf_offset_t 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 {
     VALUE str;
     VALUE iseq_list;      /* [iseq0 offset, ...] */
@@ -8465,7 +7043,7 @@ struct ibf_dump {
 rb_iseq_t * iseq_alloc(void);
 
 struct ibf_load {
-    const RUBY_ALIGNAS(SIZEOF_VALUE) char *buff;
+    const char *buff;
     const struct ibf_header *header;
     ID *id_list;     /* [id0, ...] */
     VALUE iseq_list; /* [iseq0, ...] */
@@ -8478,32 +7056,7 @@ struct ibf_load {
 static ibf_offset_t
 ibf_dump_pos(struct ibf_dump *dump)
 {
-    long pos = RSTRING_LEN(dump->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->str, padding, sizeof(padding));
-        }
-        rb_str_cat(dump->str, padding, size);
-    }
+    return (unsigned int)rb_str_strlen(dump->str);
 }
 
 static ibf_offset_t
@@ -8533,13 +7086,10 @@ ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, int size)
     return buff;
 }
 
-#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_W(b, type, n) (type *)(VALUE)ibf_dump_write(dump, (b), sizeof(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_ZERO(variable) memset(&(variable), 0, sizeof(variable))
 
 static int
 ibf_table_lookup(struct st_table *table, st_data_t key)
@@ -8654,8 +7204,7 @@ ibf_load_gentry(const struct ibf_load *load, const struct rb_global_entry *entry
 static VALUE *
 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;
+    const int iseq_size = iseq->body->iseq_size;
     int code_index;
     VALUE *code;
     const VALUE *orig_code = rb_iseq_original_iseq(iseq);
@@ -8680,11 +7229,10 @@ ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
 		code[code_index] = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
 		break;
 	      case TS_IC:
-	      case TS_ISE:
 		{
 		    unsigned int i;
-		    for (i=0; i<body->is_size; i++) {
-			if (op == (VALUE)&body->is_entries[i]) {
+		    for (i=0; i<iseq->body->is_size; i++) {
+			if (op == (VALUE)&iseq->body->is_entries[i]) {
 			    break;
 			}
 		    }
@@ -8724,14 +7272,11 @@ ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct r
     int code_index;
     VALUE *code = IBF_R(body->iseq_encoded, VALUE, iseq_size);
 
-    struct rb_iseq_constant_body *load_body = iseq->body;
-    struct rb_call_info *ci_entries = load_body->ci_entries;
-    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&load_body->ci_entries[load_body->ci_size];
-    struct rb_call_cache *cc_entries = load_body->cc_entries;
-    union iseq_inline_storage_entry *is_entries = load_body->is_entries;
+    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;
 
-    load_body->iseq_encoded = code;
-    load_body->iseq_size = 0;
     for (code_index=0; code_index<iseq_size;) {
 	const VALUE insn = code[code_index++];
 	const char *types = insn_op_types(insn);
@@ -8743,27 +7288,11 @@ ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct r
 	    switch (types[op_index]) {
 	      case TS_CDHASH:
 	      case TS_VALUE:
-	        {
-		    VALUE v = ibf_load_object(load, op);
-		    code[code_index] = v;
-		    if (!SPECIAL_CONST_P(v)) {
-			RB_OBJ_WRITTEN(iseq, Qundef, v);
-			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
-		    }
-		    break;
-		}
+		code[code_index] = ibf_load_object(load, op);
+		break;
 	      case TS_ISEQ:
-	        {
-		    VALUE v = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op);
-		    code[code_index] = v;
-		    if (!SPECIAL_CONST_P(v)) {
-			RB_OBJ_WRITTEN(iseq, Qundef, v);
-			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
-		    }
-		    break;
-		}
-	      case TS_ISE:
-		FL_SET(iseq, ISEQ_MARKABLE_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;
@@ -8784,14 +7313,12 @@ ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct r
 		break;
 	      default:
 		/* code[code_index] = op; */
-		continue;
+		break;
 	    }
 	}
-	if (insn_len(insn) != op_index+1) {
-	    rb_raise(rb_eRuntimeError, "operand size mismatch");
-	}
-    }
-    load_body->iseq_size = code_index;
+	assert(insn_len(insn) == op_index+1);
+    };
+
 
     return code;
 }
@@ -8875,40 +7402,27 @@ ibf_load_param_keyword(const struct ibf_load *load, const struct rb_iseq_constan
     }
 }
 
-static struct iseq_insn_info_entry *
-ibf_dump_insns_info_body(struct ibf_dump *dump, const rb_iseq_t *iseq)
+static struct iseq_line_info_entry *
+ibf_dump_line_info_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    return IBF_W(iseq->body->insns_info.body, struct iseq_insn_info_entry, iseq->body->insns_info.size);
+    return IBF_W(iseq->body->line_info_table, struct iseq_line_info_entry, iseq->body->line_info_size);
 }
 
-static struct iseq_insn_info_entry *
-ibf_load_insns_info_body(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+static struct iseq_line_info_entry *
+ibf_load_line_info_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
 {
-    return IBF_R(body->insns_info.body, struct iseq_insn_info_entry, body->insns_info.size);
-}
-
-static unsigned int *
-ibf_dump_insns_info_positions(struct ibf_dump *dump, const struct rb_iseq_constant_body *body)
-{
-    return IBF_W(body->insns_info.positions, unsigned int, body->insns_info.size);
-}
-
-static unsigned int *
-ibf_load_insns_info_positions(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    return IBF_R(body->insns_info.positions, unsigned int, body->insns_info.size);
+    return IBF_R(body->line_info_table, struct iseq_line_info_entry, body->line_info_size);
 }
 
 static ID *
 ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    const struct rb_iseq_constant_body *const body = iseq->body;
-    const int size = body->local_table_size;
+    const int size = iseq->body->local_table_size;
     ID *table = ALLOCA_N(ID, size);
     int i;
 
     for (i=0; i<size; i++) {
-	table[i] = ibf_dump_id(dump, body->local_table[i]);
+	table[i] = ibf_dump_id(dump, iseq->body->local_table[i]);
     }
 
     return IBF_W(table, ID, size);
@@ -8976,10 +7490,9 @@ ibf_load_catch_table(const struct ibf_load *load, const struct rb_iseq_constant_
 static struct rb_call_info *
 ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    const struct rb_iseq_constant_body *const body = iseq->body;
-    const unsigned int ci_size = body->ci_size;
-    const unsigned int ci_kw_size = body->ci_kw_size;
-    const struct rb_call_info *ci_entries = body->ci_entries;
+    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) +
@@ -9043,40 +7556,27 @@ static ibf_offset_t
 ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
     struct rb_iseq_constant_body dump_body;
-#if VM_INSN_INFO_TABLE_IMPL == 2
-    unsigned int *positions;
-#endif
     dump_body = *iseq->body;
 
-    dump_body.location.pathobj = ibf_dump_object(dump, dump_body.location.pathobj); /* TODO: freeze */
+    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);
 
-    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.insns_info.body =      ibf_dump_insns_info_body(dump, iseq);
-#if VM_INSN_INFO_TABLE_IMPL == 2
-    positions = rb_iseq_insns_info_decode_positions(&dump_body);
-    dump_body.insns_info.positions = positions;
-    dump_body.insns_info.succ_index_table = 0;
-#endif
-    dump_body.insns_info.positions = ibf_dump_insns_info_positions(dump, &dump_body);
-#if VM_INSN_INFO_TABLE_IMPL == 2
-    ruby_xfree(positions);
-#endif
-    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.variable.coverage      = Qnil;
-    dump_body.variable.original_iseq = NULL;
+    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);
 
-    IBF_W_ALIGN(struct rb_iseq_constant_body);
-    return IBF_WV(dump_body);
+    return ibf_dump_write(dump, &dump_body, sizeof(dump_body));
 }
 
 static VALUE
@@ -9098,69 +7598,34 @@ ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t of
     /* memcpy(load_body, load->buff + offset, sizeof(*load_body)); */
     load_body->type = body->type;
     load_body->stack_max = body->stack_max;
+    load_body->iseq_size = body->iseq_size;
     load_body->param = body->param;
-    load_body->param.flags.has_kw = FALSE;
     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->insns_info.size = body->insns_info.size;
+    load_body->line_info_size = body->line_info_size;
 
-    ISEQ_COVERAGE_SET(iseq, Qnil);
-    ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
-    iseq->body->variable.flip_count = body->variable.flip_count;
-
-    {
-	VALUE realpath = Qnil, path = ibf_load_object(load, body->location.pathobj);
-	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->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->location.node_id = body->location.node_id;
-    load_body->location.code_location = body->location.code_location;
-    load_body->catch_except_p = body->catch_except_p;
-
-    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->param.flags.has_kw   = body->param.flags.has_kw;
-    load_body->insns_info.body      = ibf_load_insns_info_body(load, body);
-    load_body->insns_info.positions = ibf_load_insns_info_positions(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);
-
-    ibf_load_code(load, iseq, body);
-#if VM_INSN_INFO_TABLE_IMPL == 2
-    rb_iseq_insns_info_encode_positions(iseq);
-#endif
+
+    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);
 
     rb_iseq_translate_threaded_code(iseq);
 }
@@ -9177,7 +7642,6 @@ ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
 	list[i] = (ibf_offset_t)NUM2LONG(rb_ary_entry(dump->iseq_list, i));
     }
 
-    ibf_dump_align(dump, sizeof(ibf_offset_t));
     header->iseq_list_offset = ibf_dump_write(dump, list, sizeof(ibf_offset_t) * size);
     header->iseq_list_size = (unsigned int)size;
 }
@@ -9218,7 +7682,6 @@ ibf_dump_id_list(struct ibf_dump *dump, struct ibf_header *header)
 
     st_foreach(dump->id_table, ibf_dump_id_list_i, (st_data_t)&arg);
 
-    ibf_dump_align(dump, sizeof(long));
     header->id_list_offset = ibf_dump_write(dump, arg.list, sizeof(long) * size);
     header->id_list_size = (unsigned int)size;
 }
@@ -9237,8 +7700,6 @@ struct ibf_object_header {
     unsigned int frozen: 1;
     unsigned int internal: 1;
 };
-static const size_t ibf_object_header_align =
-    RUBY_ALIGNOF(struct ibf_object_header);
 
 enum ibf_object_class_index {
     IBF_OBJECT_CLASS_OBJECT,
@@ -9249,7 +7710,7 @@ enum ibf_object_class_index {
 struct ibf_object_string {
     long encindex;
     long len;
-    char ptr[FLEX_ARY_LEN];
+    char ptr[1];
 };
 
 struct ibf_object_regexp {
@@ -9259,12 +7720,12 @@ struct ibf_object_regexp {
 
 struct ibf_object_array {
     long len;
-    long ary[FLEX_ARY_LEN];
+    long ary[1];
 };
 
 struct ibf_object_hash {
     long len;
-    long keyval[FLEX_ARY_LEN];
+    long keyval[1];
 };
 
 struct ibf_object_struct_range {
@@ -9277,7 +7738,7 @@ struct ibf_object_struct_range {
 
 struct ibf_object_bignum {
     ssize_t slen;
-    BDIGIT digits[FLEX_ARY_LEN];
+    BDIGIT digits[1];
 };
 
 enum ibf_object_data_type {
@@ -9292,36 +7753,20 @@ struct ibf_object_symbol {
     long str;
 };
 
-#define IBF_ALIGNED_OFFSET(align, offset) /* offset > 0 */ \
-    ((((offset) - 1) / (align) + 1) * (align))
-#define IBF_OBJHEADER(offset)     (const struct ibf_object_header *)\
-    ibf_load_check_offset(load, IBF_ALIGNED_OFFSET(ibf_object_header_align, offset))
-#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 >= (size_t)RSTRING_LEN(load->str)) {
-	rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, offset);
-    }
-    return load->buff + offset;
-}
-
-NORETURN(static void ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj));
+#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))
 
 static void
 ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj)
 {
-    char buff[0x100];
-    rb_raw_obj_info(buff, sizeof(buff), obj);
-    rb_raise(rb_eNotImpError, "ibf_dump_object_unsupported: %s", buff);
+    rb_obj_info_dump(obj);
+    rb_bug("ibf_dump_object_unsupported: unsupported");
 }
 
 static VALUE
 ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    rb_raise(rb_eArgError, "unsupported");
+    rb_bug("unsupported");
     return Qnil;
 }
 
@@ -9349,7 +7794,7 @@ ibf_dump_object_class(struct ibf_dump *dump, VALUE obj)
 static VALUE
 ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const enum ibf_object_class_index *cindexp = IBF_OBJBODY(enum ibf_object_class_index, offset);
+    enum ibf_object_class_index *cindexp = IBF_OBJBODY(enum ibf_object_class_index, offset);
     enum ibf_object_class_index cindex = *cindexp;
 
     switch (cindex) {
@@ -9361,7 +7806,7 @@ ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_heade
 	return rb_eStandardError;
     }
 
-    rb_raise(rb_eArgError, "ibf_load_object_class: unknown class (%d)", (int)cindex);
+    rb_bug("ibf_load_object_class: unknown class (%d)", (int)cindex);
 }
 
 
@@ -9369,13 +7814,13 @@ static void
 ibf_dump_object_float(struct ibf_dump *dump, VALUE obj)
 {
     double dbl = RFLOAT_VALUE(obj);
-    (void)IBF_W(&dbl, double, 1);
+    ibf_dump_write(dump, &dbl, sizeof(dbl));
 }
 
 static VALUE
 ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const double *dblp = IBF_OBJBODY(double, offset);
+    double *dblp = IBF_OBJBODY(double, offset);
     return DBL2NUM(*dblp);
 }
 
@@ -9385,7 +7830,6 @@ ibf_dump_object_string(struct ibf_dump *dump, VALUE obj)
     long encindex = (long)rb_enc_get_index(obj);
     long len = RSTRING_LEN(obj);
     const char *ptr = RSTRING_PTR(obj);
-    long buff[2];
 
     if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) {
 	rb_encoding *enc = rb_enc_from_index((int)encindex);
@@ -9393,9 +7837,8 @@ ibf_dump_object_string(struct ibf_dump *dump, VALUE obj)
 	encindex = RUBY_ENCINDEX_BUILTIN_MAX + ibf_dump_object(dump, rb_str_new2(enc_name));
     }
 
-    buff[0] = encindex;
-    buff[1] = len;
-    (void)IBF_W(buff, long, 2);
+    IBF_WV(encindex);
+    IBF_WV(len);
     IBF_WP(ptr, char, len);
 }
 
@@ -9422,11 +7865,10 @@ static void
 ibf_dump_object_regexp(struct ibf_dump *dump, VALUE obj)
 {
     struct ibf_object_regexp regexp;
-    VALUE srcstr = RREGEXP_SRC(obj);
-    IBF_ZERO(regexp);
+    regexp.srcstr = RREGEXP_SRC(obj);
     regexp.option = (char)rb_reg_options(obj);
-    regexp.srcstr = (long)ibf_dump_object(dump, srcstr);
-    (void)IBF_W(&regexp, struct ibf_object_regexp, 1);
+    regexp.srcstr = (long)ibf_dump_object(dump, regexp.srcstr);
+    IBF_WV(regexp);
 }
 
 static VALUE
@@ -9446,7 +7888,7 @@ static void
 ibf_dump_object_array(struct ibf_dump *dump, VALUE obj)
 {
     long i, len = (int)RARRAY_LEN(obj);
-    (void)IBF_W(&len, long, 1);
+    IBF_WV(len);
     for (i=0; i<len; i++) {
 	long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i));
 	IBF_WV(index);
@@ -9474,10 +7916,10 @@ 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 keyval[2];
-    keyval[0] = (long)ibf_dump_object(dump, (VALUE)key);
-    keyval[1] = (long)ibf_dump_object(dump, (VALUE)val);
-    (void)IBF_W(keyval, long, 2);
+    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);
     return ST_CONTINUE;
 }
 
@@ -9485,15 +7927,15 @@ static void
 ibf_dump_object_hash(struct ibf_dump *dump, VALUE obj)
 {
     long len = RHASH_SIZE(obj);
-    (void)IBF_W(&len, long, 1);
-    if (len > 0) rb_hash_foreach(obj, ibf_dump_object_hash_i, (VALUE)dump);
+    IBF_WV(len);
+    if (len > 0) st_foreach(RHASH(obj)->ntbl, ibf_dump_object_hash_i, (st_data_t)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_with_size(hash->len);
+    VALUE obj = rb_hash_new();
     int i;
 
     for (i=0; i<hash->len; i++) {
@@ -9515,7 +7957,6 @@ 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;
-	IBF_ZERO(range);
 	range.len = 3;
 	range.class_index = 0;
 
@@ -9523,12 +7964,10 @@ ibf_dump_object_struct(struct ibf_dump *dump, VALUE obj)
 	range.beg = (long)ibf_dump_object(dump, beg);
 	range.end = (long)ibf_dump_object(dump, end);
 
-	IBF_W_ALIGN(struct ibf_object_struct_range);
 	IBF_WV(range);
     }
     else {
-        rb_raise(rb_eNotImpError, "ibf_dump_object_struct: unsupported class %"PRIsVALUE,
-                 rb_class_name(CLASS_OF(obj)));
+	rb_bug("ibf_dump_object_struct: unsupported class");
     }
 }
 
@@ -9551,7 +7990,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);
 
-    (void)IBF_W(&slen, ssize_t, 1);
+    IBF_WV(slen);
     IBF_WP(d, BDIGIT, len);
 }
 
@@ -9574,12 +8013,11 @@ 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;
-	long data[2];
-	data[0] = IBF_OBJECT_DATA_ENCODING;
-	data[1] = len;
-	(void)IBF_W(data, long, 2);
-	IBF_WP(name, char, len);
+	IBF_WV(type);
+	IBF_WV(len);
+	IBF_WP(name, char, strlen(name) + 1);
     }
     else {
 	ibf_dump_object_unsupported(dump, obj);
@@ -9589,12 +8027,11 @@ ibf_dump_object_data(struct ibf_dump *dump, VALUE obj)
 static VALUE
 ibf_load_object_data(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    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];
+    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));
 
-    switch (type) {
+    switch (*typep) {
       case IBF_OBJECT_DATA_ENCODING:
 	{
 	    VALUE encobj = rb_enc_from_encoding(rb_enc_find(data));
@@ -9608,11 +8045,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 data[2];
-    data[0] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
-    data[1] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
+    long real = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
+    long imag = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
 
-    (void)IBF_W(data, long, 2);
+    IBF_WV(real);
+    IBF_WV(imag);
 }
 
 static VALUE
@@ -9634,7 +8071,7 @@ ibf_dump_object_symbol(struct ibf_dump *dump, VALUE obj)
 {
     VALUE str = rb_sym2str(obj);
     long str_index = (long)ibf_dump_object(dump, str);
-    (void)IBF_W(&str_index, long, 1);
+    IBF_WV(str_index);
 }
 
 static VALUE
@@ -9680,20 +8117,16 @@ 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 ibf_offset_t
-ibf_dump_object_object(struct ibf_dump *dump, VALUE obj)
+lbf_dump_object_object(struct ibf_dump *dump, VALUE obj)
 {
     struct ibf_object_header obj_header;
-    ibf_offset_t current_offset;
-    IBF_ZERO(obj_header);
+    ibf_offset_t current_offset = ibf_dump_pos(dump);
     obj_header.type = TYPE(obj);
 
-    IBF_W_ALIGN(ibf_offset_t);
-    current_offset = ibf_dump_pos(dump);
-
     if (SPECIAL_CONST_P(obj)) {
 	if (RB_TYPE_P(obj, T_SYMBOL) ||
 	    RB_TYPE_P(obj, T_FLOAT)) {
@@ -9704,7 +8137,7 @@ ibf_dump_object_object(struct ibf_dump *dump, VALUE obj)
 	obj_header.frozen = TRUE;
 	obj_header.internal = TRUE;
 	IBF_WV(obj_header);
-	(void)IBF_W(&obj, VALUE, 1);
+	IBF_WV(obj);
     }
     else {
 	obj_header.internal = (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE;
@@ -9751,7 +8184,7 @@ 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
@@ -9769,25 +8202,9 @@ ibf_load_object(const struct ibf_load *load, VALUE object_index)
 	    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);
-	    size_t value_offset;
-
-#if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_object: list=%#x offsets=%p offset=%#x\n",
-	            load->header->object_list_offset, 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
-	    value_offset = (const char *)(header + 1) - load->buff;
-	    if (value_offset >= (size_t)RSTRING_LEN(load->str)) {
-		rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, value_offset);
-	    }
-	    offset = (ibf_offset_t)value_offset;
 
 	    if (header->special_const) {
-		const VALUE *vp = IBF_OBJBODY(VALUE, offset);
-#if IBF_ISEQ_DEBUG
-		fprintf(stderr, "ibf_load_object: vp=%p\n", vp);
-#endif
+		VALUE *vp = IBF_OBJBODY(VALUE, offset);
 		obj = *vp;
 	    }
 	    else {
@@ -9796,10 +8213,7 @@ ibf_load_object(const struct ibf_load *load, VALUE object_index)
 
 	    rb_ary_store(load->obj_list, (long)object_index, obj);
 	}
-#if IBF_ISEQ_DEBUG
-	fprintf(stderr, "ibf_load_object: index=%#"PRIxVALUE" obj=%#"PRIxVALUE"\n",
-	        object_index, obj);
-#endif
+	iseq_add_mark_object(load->iseq, obj);
 	return obj;
     }
 }
@@ -9812,11 +8226,10 @@ ibf_dump_object_list(struct ibf_dump *dump, struct ibf_header *header)
 
     for (i=0; i<RARRAY_LEN(dump->obj_list); i++) {
 	VALUE obj = RARRAY_AREF(dump->obj_list, i);
-	ibf_offset_t offset = ibf_dump_object_object(dump, obj);
+	ibf_offset_t offset = lbf_dump_object_object(dump, obj);
 	rb_ary_push(list, UINT2NUM(offset));
     }
     size = i;
-    IBF_W_ALIGN(ibf_offset_t);
     header->object_list_offset = ibf_dump_pos(dump);
 
     for (i=0; i<size; i++) {
@@ -9881,7 +8294,7 @@ ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj)
 }
 
 VALUE
-rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
+iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
 {
     struct ibf_dump *dump;
     struct ibf_header header = {{0}};
@@ -9940,25 +8353,14 @@ ibf_iseq_list(const struct ibf_load *load)
 }
 
 void
-rb_ibf_load_iseq_complete(rb_iseq_t *iseq)
+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;
-    const ibf_offset_t offset = ibf_iseq_list(load)[iseq->aux.loader.index];
     load->iseq = iseq;
-#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
-    if (offset % sizeof(VALUE)) {
-        rb_raise(rb_eArgError, "unaligned iseq offset: %#x @ %u",
-                 offset, iseq->aux.loader.index);
-    }
-    ibf_load_iseq_each(load, iseq, offset);
-    ISEQ_COMPILE_DATA_CLEAR(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);
-    rb_iseq_init_trace(iseq);
     load->iseq = prev_src_iseq;
 }
 
@@ -9966,7 +8368,7 @@ rb_ibf_load_iseq_complete(rb_iseq_t *iseq)
 const rb_iseq_t *
 rb_iseq_complete(const rb_iseq_t *iseq)
 {
-    rb_ibf_load_iseq_complete((rb_iseq_t *)iseq);
+    ibf_load_iseq_complete((rb_iseq_t *)iseq);
     return iseq;
 }
 #endif
@@ -9976,47 +8378,29 @@ 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",
-	    index_iseq, (void *)load->iseq_list);
-#endif
     if (iseq_index == -1) {
 	return NULL;
     }
     else {
 	VALUE iseqv = rb_ary_entry(load->iseq_list, iseq_index);
 
-#if IBF_ISEQ_DEBUG
-	fprintf(stderr, "ibf_load_iseq: iseqv=%p\n", (void *)iseqv);
-#endif
 	if (iseqv != Qnil) {
 	    return (rb_iseq_t *)iseqv;
 	}
 	else {
 	    rb_iseq_t *iseq = iseq_imemo_alloc();
-#if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: new iseq=%p\n", iseq);
-#endif
 	    FL_SET(iseq, ISEQ_NOT_LOADED_YET);
 	    iseq->aux.loader.obj = load->loader_obj;
 	    iseq->aux.loader.index = iseq_index;
-#if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: iseq=%p loader_obj=%p index=%d\n",
-		    iseq, (void *)load->loader_obj, iseq_index);
-#endif
 	    rb_ary_store(load->iseq_list, iseq_index, (VALUE)iseq);
 
 #if !USE_LAZY_LOAD
-#if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", iseq);
-#endif
-	    rb_ibf_load_iseq_complete(iseq);
+	    ibf_load_iseq_complete(iseq);
 #endif /* !USE_LAZY_LOAD */
 
-#if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n",
-		    iseq, load->iseq);
-#endif
+	    if (load->iseq) {
+		iseq_add_mark_object(load->iseq, (VALUE)iseq);
+	    }
 	    return iseq;
 	}
     }
@@ -10053,35 +8437,27 @@ ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
     if (strcmp(load->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->header->id_list_offset % RUBY_ALIGNOF(long)) {
-        rb_raise(rb_eArgError, "unaligned ID list offset: %u",
-                 load->header->id_list_offset);
-    }
-    if (load->header->object_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
-        rb_raise(rb_eArgError, "unaligned object list offset: %u",
-                 load->header->object_list_offset);
-    }
 }
 
 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->obj_list);
+    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);
+    }
 }
 
 static void
 ibf_loader_free(void *ptr)
 {
-    struct ibf_load *load = (struct ibf_load *)ptr;
-    ruby_xfree(load->id_list);
-    ruby_xfree(load);
+    if (ptr) {
+	struct ibf_load *load = (struct ibf_load *)ptr;
+	ruby_xfree(load->id_list);
+	ruby_xfree(load);
+    }
 }
 
 static size_t
@@ -10098,10 +8474,10 @@ static const rb_data_type_t ibf_load_type = {
 };
 
 const rb_iseq_t *
-rb_iseq_ibf_load(VALUE str)
+iseq_ibf_load(VALUE str)
 {
     struct ibf_load *load;
-    rb_iseq_t *iseq;
+    const 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);
@@ -10112,7 +8488,7 @@ rb_iseq_ibf_load(VALUE str)
 }
 
 VALUE
-rb_iseq_ibf_load_extra_data(VALUE str)
+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);
diff --git a/complex.c b/complex.c
index cc798cccca..7a9c56d667 100644
--- a/complex.c
+++ b/complex.c
@@ -12,7 +12,6 @@
 #endif
 #include <math.h>
 #include "internal.h"
-#include "id.h"
 
 #define NDEBUG
 #include "ruby_assert.h"
@@ -20,11 +19,7 @@
 #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);
@@ -32,16 +27,14 @@ extern int signbit(double);
 
 VALUE rb_cComplex;
 
-static ID id_abs, id_arg,
-    id_denominator, id_fdiv, id_numerator, id_quo,
-    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
+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;
 
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
 
@@ -66,32 +59,31 @@ 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)
 {
-    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);
-    }
-
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+	return x;
+    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
+	return y;
+#endif
     return rb_funcall(x, '+', 1, y);
 }
 
@@ -103,84 +95,54 @@ f_div(VALUE x, VALUE y)
     return rb_funcall(x, '/', 1, y);
 }
 
-inline static int
+inline static VALUE
 f_gt_p(VALUE x, VALUE 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));
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
+    return rb_funcall(x, '>', 1, y);
 }
 
 inline static VALUE
 f_mul(VALUE x, VALUE 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;
+#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;
     }
+#endif
     return rb_funcall(x, '*', 1, y);
 }
 
 inline static VALUE
 f_sub(VALUE x, VALUE y)
 {
-    if (FIXNUM_ZERO_P(y) &&
-        LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMINUS))) {
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
 	return x;
-    }
+#endif
     return rb_funcall(x, '-', 1, y);
 }
 
 fun1(abs)
 fun1(arg)
 fun1(denominator)
-
-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);
-}
-
+fun1(negate)
 fun1(numerator)
 fun1(real_p)
 
@@ -201,94 +163,109 @@ f_to_f(VALUE x)
 
 fun1(to_r)
 
-inline static int
+inline static VALUE
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(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);
+	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
+    return rb_funcall(x, id_eqeq_p, 1, y);
 }
 
 fun2(expt)
 fun2(fdiv)
 fun2(quo)
 
-inline static int
+inline static VALUE
 f_negative_p(VALUE x)
 {
-    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);
+    if (FIXNUM_P(x))
+	return f_boolcast(FIX2LONG(x) < 0);
+    return rb_funcall(x, '<', 1, ZERO);
 }
 
 #define f_positive_p(x) (!f_negative_p(x))
 
-inline static int
+inline static VALUE
 f_zero_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-        return FIXNUM_ZERO_P(x);
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 0);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
-        const VALUE num = RRATIONAL(x)->num;
-        return FIXNUM_ZERO_P(num);
+	VALUE num = RRATIONAL(x)->num;
+
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
     }
-    return (int)rb_equal(x, ZERO);
+    return rb_funcall(x, id_eqeq_p, 1, ZERO);
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
 
-VALUE rb_flo_is_finite_p(VALUE num);
-inline static int
-f_finite_p(VALUE x)
-{
-    if (RB_INTEGER_TYPE_P(x)) {
-        return TRUE;
-    }
-    else if (RB_FLOAT_TYPE_P(x)) {
-	return (int)rb_flo_is_finite_p(x);
-    }
-    else if (RB_TYPE_P(x, T_RATIONAL)) {
-	return TRUE;
-    }
-    return RTEST(rb_funcallv(x, id_finite_p, 0, 0));
-}
-
-VALUE rb_flo_is_infinite_p(VALUE num);
 inline static VALUE
-f_infinite_p(VALUE x)
+f_one_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-        return Qnil;
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 1);
     }
-    else if (RB_FLOAT_TYPE_P(x)) {
-	return rb_flo_is_infinite_p(x);
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
-        return Qnil;
+	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 rb_funcallv(x, id_infinite_p, 0, 0);
+    return rb_funcall(x, id_eqeq_p, 1, ONE);
 }
 
-inline static int
+inline static VALUE
 f_kind_of_p(VALUE x, VALUE c)
 {
-    return (int)rb_obj_is_kind_of(x, c);
+    return rb_obj_is_kind_of(x, c);
 }
 
-inline static int
+inline static VALUE
 k_numeric_p(VALUE x)
 {
     return f_kind_of_p(x, rb_cNumeric);
 }
 
-#define k_exact_p(x) (!RB_FLOAT_TYPE_P(x))
+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);
+}
+
+inline static VALUE
+k_rational_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cRational);
+}
+
+inline static VALUE
+k_complex_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cComplex);
+}
+
+#define k_exact_p(x) (!k_float_p(x))
 
 #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
 
@@ -305,7 +282,6 @@ nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
 
     RCOMPLEX_SET_REAL(obj, real);
     RCOMPLEX_SET_IMAG(obj, imag);
-    OBJ_FREEZE_RAW(obj);
 
     return (VALUE)obj;
 }
@@ -316,22 +292,50 @@ 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(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!k_complex_p(x));
     return nucomp_s_new_internal(klass, x, ZERO);
 }
 
 inline static VALUE
 f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
     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
@@ -346,8 +350,9 @@ nucomp_canonicalization(int f)
 inline static void
 nucomp_real_check(VALUE num)
 {
-    if (!RB_INTEGER_TYPE_P(num) &&
-	!RB_FLOAT_TYPE_P(num) &&
+    if (!RB_TYPE_P(num, T_FIXNUM) &&
+	!RB_TYPE_P(num, T_BIGNUM) &&
+	!RB_TYPE_P(num, T_FLOAT) &&
 	!RB_TYPE_P(num, T_RATIONAL)) {
 	if (!k_numeric_p(num) || !f_real_p(num))
 	    rb_raise(rb_eTypeError, "not a real");
@@ -357,24 +362,26 @@ nucomp_real_check(VALUE num)
 inline static VALUE
 nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
 {
-    int complex_r, complex_i;
-#ifdef CANONICALIZATION_FOR_MATHN
+#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
-    complex_r = RB_TYPE_P(real, T_COMPLEX);
-    complex_i = RB_TYPE_P(imag, T_COMPLEX);
-    if (!complex_r && !complex_i) {
+    if (f_real_p(real) && f_real_p(imag))
 	return nucomp_s_new_internal(klass, real, imag);
-    }
-    else if (!complex_r) {
+    else if (f_real_p(real)) {
 	get_dat1(imag);
 
 	return nucomp_s_new_internal(klass,
 				     f_sub(real, dat->imag),
 				     f_add(ZERO, dat->real));
     }
-    else if (!complex_i) {
+    else if (f_real_p(imag)) {
 	get_dat1(real);
 
 	return nucomp_s_new_internal(klass,
@@ -421,16 +428,13 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 inline static VALUE
 f_complex_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!k_complex_p(x));
     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], exception: false)  ->  numeric
+ *    Complex(x[, y])  ->  numeric
  *
  * Returns x+i*y;
  *
@@ -439,9 +443,6 @@ static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
  *    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 ;
@@ -467,22 +468,7 @@ static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
 static VALUE
 nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
 {
-    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)) {
-        static ID kwds[1];
-        VALUE exception;
-        if (!kwds[0]) {
-            kwds[0] = idException;
-        }
-        rb_get_kwargs(opts, kwds, 0, 1, &exception);
-        raise = (exception != Qfalse);
-    }
-    return nucomp_convert(rb_cComplex, a1, a2, raise);
+    return rb_funcallv(rb_cComplex, id_convert, argc, argv);
 }
 
 #define imp1(n) \
@@ -492,9 +478,20 @@ 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)
@@ -508,7 +505,7 @@ imp1(sinh)
 static VALUE
 m_cos(VALUE x)
 {
-    if (!RB_TYPE_P(x, T_COMPLEX))
+    if (f_real_p(x))
 	return m_cos_bang(x);
     {
 	get_dat1(x);
@@ -523,7 +520,7 @@ m_cos(VALUE x)
 static VALUE
 m_sin(VALUE x)
 {
-    if (!RB_TYPE_P(x, T_COMPLEX))
+    if (f_real_p(x))
 	return m_sin_bang(x);
     {
 	get_dat1(x);
@@ -535,11 +532,41 @@ m_sin(VALUE x)
     }
 }
 
+#if 0
+imp1(sqrt)
+
+VALUE
+rb_complex_sqrt(VALUE x)
+{
+    int pos;
+    VALUE a, re, im;
+    get_dat1(x);
+
+    pos = f_positive_p(dat->imag);
+    a = f_abs(x);
+    re = m_sqrt_bang(f_div(f_add(a, dat->real), TWO));
+    im = m_sqrt_bang(f_div(f_sub(a, dat->real), TWO));
+    if (!pos) im = f_negate(im);
+    return f_complex_new2(rb_cComplex, re, im);
+}
+
+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)));
+    }
+    return rb_complex_sqrt(x);
+}
+#endif
+
 static VALUE
 f_complex_polar(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
     if (f_zero_p(x) || f_zero_p(y)) {
 	if (canonicalization) return x;
 	return nucomp_s_new_internal(klass, x, RFLOAT_0);
@@ -578,28 +605,6 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
 					  f_mul(x, m_sin(y)));
 }
 
-/* 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 {
-	ang *= M_PI;
-	return rb_complex_new(DBL2NUM(abs * cos(ang)), DBL2NUM(abs * sin(ang)));
-    }
-}
-
 /*
  * call-seq:
  *    Complex.polar(abs[, arg])  ->  complex
@@ -638,8 +643,8 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
  *    Complex(7).real      #=> 7
  *    Complex(9, -4).real  #=> 9
  */
-VALUE
-rb_complex_real(VALUE self)
+static VALUE
+nucomp_real(VALUE self)
 {
     get_dat1(self);
     return dat->real;
@@ -655,8 +660,8 @@ rb_complex_real(VALUE self)
  *    Complex(7).imaginary      #=> 0
  *    Complex(9, -4).imaginary  #=> -4
  */
-VALUE
-rb_complex_imag(VALUE self)
+static VALUE
+nucomp_imag(VALUE self)
 {
     get_dat1(self);
     return dat->imag;
@@ -670,12 +675,35 @@ rb_complex_imag(VALUE self)
  *
  *    -Complex(1, 2)  #=> (-1-2i)
  */
-VALUE
-rb_complex_uminus(VALUE self)
+static VALUE
+nucomp_negate(VALUE self)
 {
-    get_dat1(self);
-    return f_complex_new2(CLASS_OF(self),
-			  f_negate(dat->real), f_negate(dat->imag));
+  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)
+{
+    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);
 }
 
 /*
@@ -693,24 +721,9 @@ rb_complex_uminus(VALUE self)
 VALUE
 rb_complex_plus(VALUE self, VALUE other)
 {
-    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, '+');
+    return f_addsub(self, other, f_add, '+');
 }
+#define nucomp_add rb_complex_plus
 
 /*
  * call-seq:
@@ -724,26 +737,10 @@ rb_complex_plus(VALUE self, VALUE other)
  *    Complex(9, 8)  - 4               #=> (5+8i)
  *    Complex(20, 9) - 9.8             #=> (10.2+9i)
  */
-VALUE
-rb_complex_minus(VALUE self, VALUE other)
+static VALUE
+nucomp_sub(VALUE self, VALUE other)
 {
-    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, '-');
+    return f_addsub(self, other, f_sub, '-');
 }
 
 static VALUE
@@ -759,19 +756,6 @@ 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
@@ -787,11 +771,21 @@ comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE
 VALUE
 rb_complex_mul(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	VALUE real, imag;
+	VALUE areal, aimag, breal, bimag;
+	int arzero, aizero, brzero, bizero;
+
 	get_dat2(self, other);
 
-        comp_mul(adat->real, adat->imag, bdat->real, bdat->imag, &real, &imag);
+	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));
 
 	return f_complex_new2(CLASS_OF(self), real, imag);
     }
@@ -804,42 +798,49 @@ rb_complex_mul(VALUE self, VALUE other)
     }
     return rb_num_coerce_bin(self, other, '*');
 }
+#define nucomp_mul rb_complex_mul
 
 inline static VALUE
 f_divide(VALUE self, VALUE other,
 	 VALUE (*func)(VALUE, VALUE), ID id)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
-        VALUE r, n, x, y;
+    if (k_complex_p(other)) {
 	int flo;
 	get_dat2(self, other);
 
-	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));
+	flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
+	       k_float_p(bdat->real) || k_float_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));
-            x = (*func)(f_add(adat->real, f_mul(adat->imag, r)), n);
-            y = (*func)(f_sub(adat->imag, f_mul(adat->real, 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));
 	}
 	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));
-            x = (*func)(f_add(f_mul(adat->real, r), adat->imag), n);
-            y = (*func)(f_sub(f_mul(adat->imag, r), adat->real), 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 = 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)) {
 	get_dat1(self);
@@ -866,13 +867,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)
  */
-VALUE
-rb_complex_div(VALUE self, VALUE other)
+static VALUE
+nucomp_div(VALUE self, VALUE other)
 {
     return f_divide(self, other, f_quo, id_quo);
 }
 
-#define nucomp_quo rb_complex_div
+#define nucomp_quo nucomp_div
 
 /*
  * call-seq:
@@ -903,23 +904,23 @@ f_reciprocal(VALUE x)
  *    Complex('i') ** 2              #=> (-1+0i)
  *    Complex(-8) ** Rational(1, 3)  #=> (1.0000000000000002+1.7320508075688772i)
  */
-VALUE
-rb_complex_pow(VALUE self, VALUE other)
+static VALUE
+nucomp_expt(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && k_exact_zero_p(other))
 	return f_complex_new_bang1(CLASS_OF(self), ONE);
 
-    if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1))
-	other = RRATIONAL(other)->num; /* c14n */
+    if (k_rational_p(other) && f_one_p(f_denominator(other)))
+	other = f_numerator(other); /* c14n */
 
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat1(other);
 
 	if (k_exact_zero_p(dat->imag))
 	    other = dat->real; /* c14n */
     }
 
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	VALUE r, theta, nr, ntheta;
 
 	get_dat1(other);
@@ -933,51 +934,44 @@ rb_complex_pow(VALUE self, VALUE other)
 		       f_mul(dat->imag, m_log_bang(r)));
 	return f_complex_polar(CLASS_OF(self), nr, ntheta);
     }
-    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);
+    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;
 	}
+	return f_expt(f_reciprocal(self), f_negate(other));
     }
     if (k_numeric_p(other) && f_real_p(other)) {
 	VALUE r, theta;
 
-	if (RB_TYPE_P(other, T_BIGNUM))
+	if (k_bignum_p(other))
 	    rb_warn("in a**b, b may be too big");
 
 	r = f_abs(self);
@@ -1004,7 +998,7 @@ rb_complex_pow(VALUE self, VALUE other)
 static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat2(self, other);
 
 	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
@@ -1015,7 +1009,7 @@ nucomp_eqeq_p(VALUE self, VALUE other)
 
 	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
     }
-    return f_boolcast(f_eqeq_p(other, self));
+    return f_eqeq_p(other, self);
 }
 
 /* :nodoc: */
@@ -1042,24 +1036,24 @@ nucomp_coerce(VALUE self, VALUE other)
  *    Complex(-1).abs         #=> 1
  *    Complex(3.0, -4.0).abs  #=> 5.0
  */
-VALUE
-rb_complex_abs(VALUE self)
+static VALUE
+nucomp_abs(VALUE self)
 {
     get_dat1(self);
 
     if (f_zero_p(dat->real)) {
 	VALUE a = f_abs(dat->imag);
-	if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag))
+	if (k_float_p(dat->real) && !k_float_p(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
     if (f_zero_p(dat->imag)) {
 	VALUE a = f_abs(dat->real);
-	if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
+	if (!k_float_p(dat->real) && k_float_p(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
-    return rb_math_hypot(dat->real, dat->imag);
+    return m_hypot(dat->real, dat->imag);
 }
 
 /*
@@ -1089,11 +1083,11 @@ nucomp_abs2(VALUE self)
  *
  *    Complex.polar(3, Math::PI/2).arg  #=> 1.5707963267948966
  */
-VALUE
-rb_complex_arg(VALUE self)
+static VALUE
+nucomp_arg(VALUE self)
 {
     get_dat1(self);
-    return rb_math_atan2(dat->imag, dat->real);
+    return m_atan2_bang(dat->imag, dat->real);
 }
 
 /*
@@ -1135,13 +1129,22 @@ nucomp_polar(VALUE self)
  *
  *    Complex(1, 2).conjugate  #=> (1-2i)
  */
-VALUE
-rb_complex_conjugate(VALUE self)
+static VALUE
+nucomp_conj(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
@@ -1154,6 +1157,23 @@ 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
@@ -1215,14 +1235,14 @@ nucomp_hash(VALUE self)
     n = rb_hash(dat->imag);
     h[1] = NUM2LONG(n);
     v = rb_memhash(h, sizeof(h));
-    return ST2FIX(v);
+    return LONG2FIX(v);
 }
 
 /* :nodoc: */
 static VALUE
 nucomp_eql_p(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat2(self, other);
 
 	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
@@ -1233,27 +1253,26 @@ nucomp_eql_p(VALUE self, VALUE other)
     return Qfalse;
 }
 
-inline static int
+inline static VALUE
 f_signbit(VALUE x)
 {
-    if (RB_FLOAT_TYPE_P(x)) {
+    if (RB_TYPE_P(x, T_FLOAT)) {
 	double f = RFLOAT_VALUE(x);
-	return !isnan(f) && signbit(f);
+	return f_boolcast(!isnan(f) && signbit(f));
     }
     return f_negative_p(x);
 }
 
-inline static int
+inline static VALUE
 f_tpositive_p(VALUE x)
 {
-    return !f_signbit(x);
+    return f_boolcast(!f_signbit(x));
 }
 
 static VALUE
 f_format(VALUE self, VALUE (*func)(VALUE))
 {
-    VALUE s;
-    int impos;
+    VALUE s, impos;
 
     get_dat1(self);
 
@@ -1312,32 +1331,40 @@ 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+.
+ * Returns +true+ if +cmp+'s magnitude is finite number,
+ * oterwise returns +false+.
  */
 static VALUE
 rb_complex_finite_p(VALUE self)
 {
-    get_dat1(self);
+    VALUE magnitude = nucomp_abs(self);
+    double f;
 
-    if (f_finite_p(dat->real) && f_finite_p(dat->imag)) {
+    switch (TYPE(magnitude)) {
+    case T_FIXNUM: case T_BIGNUM: case T_RATIONAL:
 	return Qtrue;
+
+    case T_FLOAT:
+	f = RFLOAT_VALUE(magnitude);
+	return isinf(f) ? Qfalse : Qtrue;
+
+    default:
+	return rb_funcall(magnitude, rb_intern("finite?"), 0);
     }
-    return Qfalse;
 }
 
 /*
  * call-seq:
- *    cmp.infinite?  ->  nil or 1
+ *    cmp.infinite?  ->  nil or 1 or -1
  *
- * Returns +1+ if +cmp+'s real or imaginary part is an infinite number,
- * otherwise returns +nil+.
+ * Returns values corresponding to the value of +cmp+'s magnitude:
+ *
+ * +finite+::    +nil+
+ * ++Infinity+:: ++1+
  *
  *  For example:
  *
@@ -1347,12 +1374,23 @@ rb_complex_finite_p(VALUE self)
 static VALUE
 rb_complex_infinite_p(VALUE self)
 {
-    get_dat1(self);
+    VALUE magnitude = nucomp_abs(self);
+    double f;
 
-    if (NIL_P(f_infinite_p(dat->real)) && NIL_P(f_infinite_p(dat->imag))) {
+    switch (TYPE(magnitude)) {
+    case T_FIXNUM: case T_BIGNUM: case T_RATIONAL:
 	return Qnil;
+
+    case T_FLOAT:
+	f = RFLOAT_VALUE(magnitude);
+	if (isinf(f)) {
+	    return INT2FIX(f < 0 ? -1 : 1);
+	}
+	return Qnil;
+
+    default:
+	return rb_funcall(magnitude, rb_intern("infinite?"), 0);
     }
-    return ONE;
 }
 
 /* :nodoc: */
@@ -1370,7 +1408,6 @@ 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;
 }
@@ -1414,16 +1451,12 @@ rb_complex_new(VALUE x, VALUE y)
 }
 
 VALUE
-rb_complex_new_polar(VALUE x, VALUE y)
+rb_complex_polar(VALUE x, VALUE y)
 {
     return f_complex_polar(rb_cComplex, x, y);
 }
 
-VALUE
-rb_complex_polar(VALUE x, VALUE y)
-{
-    return rb_complex_new_polar(x, y);
-}
+static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
 
 VALUE
 rb_Complex(VALUE x, VALUE y)
@@ -1434,17 +1467,24 @@ 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_dbl_complex_new(double real, double imag)
+rb_complex_set_real(VALUE cmp, VALUE r)
+{
+    RCOMPLEX_SET_REAL(cmp, r);
+    return cmp;
+}
+
+VALUE
+rb_complex_set_imag(VALUE cmp, VALUE i)
+{
+    RCOMPLEX_SET_IMAG(cmp, i);
+    return cmp;
+}
+
+VALUE
+rb_complex_abs(VALUE cmp)
 {
-    return rb_complex_raw(DBL2NUM(real), DBL2NUM(imag));
+    return nucomp_abs(cmp);
 }
 
 /*
@@ -1536,13 +1576,13 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self)
 {
     get_dat1(self);
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", NULL);
 
     if (!k_exact_zero_p(dat->imag)) {
        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
                 self);
     }
-    return rb_funcallv(dat->real, id_rationalize, argc, argv);
+    return rb_funcallv(dat->real, rb_intern("rationalize"), argc, argv);
 }
 
 /*
@@ -1782,7 +1822,7 @@ read_comp(const char **s, int strict,
 	    return 0; /* e.g. "1@-" */
 	}
 	num2 = str2num(bb);
-	*ret = rb_complex_new_polar(num, num2);
+	*ret = rb_complex_polar(num, num2);
 	if (!st)
 	    return 0; /* e.g. "1@2." */
 	else
@@ -1825,7 +1865,8 @@ 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;
@@ -1836,14 +1877,14 @@ parse_comp(const char *s, int strict, VALUE *num)
 
     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);
 
@@ -1851,7 +1892,7 @@ parse_comp(const char *s, int strict, VALUE *num)
 }
 
 static VALUE
-string_to_c_strict(VALUE self, int raise)
+string_to_c_strict(VALUE self)
 {
     char *s;
     VALUE num;
@@ -1860,10 +1901,8 @@ string_to_c_strict(VALUE self, int raise)
 
     s = RSTRING_PTR(self);
 
-    if (!s || memchr(s, '\0', RSTRING_LEN(self))) {
-        if (!raise) return Qnil;
+    if (!s || memchr(s, '\0', RSTRING_LEN(self)))
 	rb_raise(rb_eArgError, "string contains null byte");
-    }
 
     if (s && s[RSTRING_LEN(self)]) {
 	rb_str_modify(self);
@@ -1875,7 +1914,6 @@ string_to_c_strict(VALUE self, int raise)
 	s = (char *)"";
 
     if (!parse_comp(s, 1, &num)) {
-        if (!raise) return Qnil;
 	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
 		 self);
     }
@@ -1931,29 +1969,28 @@ string_to_c(VALUE self)
 }
 
 static VALUE
-to_complex(VALUE val)
+nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_convert_type(val, T_COMPLEX, "Complex", "to_c");
-}
+    VALUE a1, a2, backref;
 
-static VALUE
-nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
-{
-    if (NIL_P(a1) || NIL_P(a2)) {
-        if (!raise) return Qnil;
+    rb_scan_args(argc, argv, "11", &a1, &a2);
+
+    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
 	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, raise);
-        if (NIL_P(a1)) return Qnil;
+	a1 = string_to_c_strict(a1);
     }
 
     if (RB_TYPE_P(a2, T_STRING)) {
-	a2 = string_to_c_strict(a2, raise);
-        if (NIL_P(a2)) return Qnil;
+	a2 = string_to_c_strict(a2);
     }
 
+    rb_backref_set(backref);
+
     if (RB_TYPE_P(a1, T_COMPLEX)) {
 	{
 	    get_dat1(a1);
@@ -1973,19 +2010,16 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
     }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-	if (a2 == Qundef || (k_exact_zero_p(a2)))
+	if (argc == 1 || (k_exact_zero_p(a2)))
 	    return a1;
     }
 
-    if (a2 == Qundef) {
+    if (argc == 1) {
 	if (k_numeric_p(a1) && !f_real_p(a1))
 	    return a1;
 	/* should raise exception for consistency */
-	if (!k_numeric_p(a1)) {
-            if (!raise)
-                return rb_protect(to_complex, a1, NULL);
-	    return to_complex(a1);
-        }
+	if (!k_numeric_p(a1))
+	    return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
     }
     else {
 	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
@@ -1996,35 +2030,13 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
     }
 
     {
-        int argc;
 	VALUE argv2[2];
 	argv2[0] = a1;
-        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;
-        }
+	argv2[1] = a2;
 	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);
-}
-
 /* --- */
 
 /*
@@ -2064,6 +2076,8 @@ numeric_abs2(VALUE self)
     return f_mul(self, self);
 }
 
+#define id_PI rb_intern("PI")
+
 /*
  * call-seq:
  *    num.arg    ->  0 or float
@@ -2076,8 +2090,8 @@ static VALUE
 numeric_arg(VALUE self)
 {
     if (f_positive_p(self))
-        return INT2FIX(0);
-    return DBL2NUM(M_PI);
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
 }
 
 /*
@@ -2093,8 +2107,6 @@ numeric_rect(VALUE self)
     return rb_assoc_new(self, INT2FIX(0));
 }
 
-static VALUE float_arg(VALUE self);
-
 /*
  * call-seq:
  *    num.polar  ->  array
@@ -2104,25 +2116,7 @@ static VALUE float_arg(VALUE self);
 static VALUE
 numeric_polar(VALUE 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);
+    return rb_assoc_new(f_abs(self), f_arg(self));
 }
 
 /*
@@ -2196,26 +2190,36 @@ Init_Complex(void)
 #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_finite_p = rb_intern("finite?");
-    id_infinite_p = rb_intern("infinite?");
-    id_rationalize = rb_intern("rationalize");
-    id_PI = rb_intern("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);
@@ -2223,9 +2227,13 @@ Init_Complex(void)
 
     rb_define_global_function("Complex", nucomp_f_complex, -1);
 
-    rb_undef_methods_from(rb_cComplex, 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");
@@ -2237,35 +2245,43 @@ Init_Complex(void)
     rb_undef_method(rb_cComplex, "truncate");
     rb_undef_method(rb_cComplex, "i");
 
-    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, "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, "-@", 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, "-@", 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, "quo", nucomp_quo, 1);
     rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
-    rb_define_method(rb_cComplex, "**", rb_complex_pow, 1);
+    rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
 
     rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
     rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
 
-    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, "abs", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
     rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 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, "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, "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", rb_complex_conjugate, 0);
-    rb_define_method(rb_cComplex, "conj", rb_complex_conjugate, 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, "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);
@@ -2283,8 +2299,7 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "infinite?", rb_complex_infinite_p, 0);
 
     rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
-    /* :nodoc: */
-    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject);
+    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */
     rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
     rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
 
@@ -2327,10 +2342,6 @@ 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 */
 }
 
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 2c4d2888d2..0000000000
--- a/configure.ac
+++ /dev/null
@@ -1,4061 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT()
-{
-AC_CONFIG_AUX_DIR(tool)
-AC_CONFIG_MACRO_DIRS(tool/m4)
-
-AC_PREREQ(2.67)
-
-dnl   override AC_CHECKING
-dnl   placed here due to aclocal(1)'s
-dnl   ignoring this definition in separate files
-AC_DEFUN([AC_CHECKING],[dnl
-AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
-AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])dnl
-
-AC_DISABLE_OPTION_CHECKING
-
-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
-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" = yes -a "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42], [
-    AS_IF([test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42], [
-	BASERUBY="$BASERUBY --disable=gems"
-    ])
-    $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 ['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
-    AS_IF([eval "test \"\$$v\" = ''"], [
-	AC_MSG_ERROR(could not determine $v number from version.h)
-    ])
-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)
-AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
-RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
-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
-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))
-])
-test -z "$CC" || ac_cv_prog_CC="$CC"
-
-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}')
-
-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_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])
-
-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'
-AS_IF([test -z "${CFLAGS+set}"], [
-    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cflags="$cflags"
-    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
-])
-AS_IF([test -z "${CXXFLAGS+set}"], [
-    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cxxflags="$cxxflags"
-    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
-])
-
-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)
-    AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
-	@%:@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])
-    ])
-])
-AS_IF([test x"${build}" != x"${host}"], [
-  AC_CHECK_TOOL(CC, gcc)
-])
-
-AC_PROG_CC
-AS_CASE([$CC],
-[gcc-*], [
-    gcc_prefix=gcc- gcc_suffix=`echo "$CC" | sed 's/^gcc//'`
-    AC_PROG_CXX(g++${gcc_suffix})],
-[clang-*], [
-    gcc_prefix=clang- gcc_suffix=`echo "$CC" | sed 's/^clang//'`
-    AC_PROG_CXX(clang++${gcc_suffix})],
-[gcc_prefix= gcc_suffix=])
-
-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)
-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
-    AS_CASE(["x$CC"], [xicc], [
-      icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///'`
-    ])
-    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])
-])
-
-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})
-    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 "$srcdir/tool" && 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], [
-    RUBY_DEFAULT_ARCH("$target_cpu")
-])
-
-AS_CASE(["$target_os"], [darwin*], [
-if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then
-  ac_cv_prog_ac_ct_RANLIB=:
-  ac_cv_prog_ac_ct_AR='libtool -static'
-  rb_cv_arflags='-no_warning_for_no_symbols -o'
-fi
-])
-AC_CHECK_TOOLS(RANLIB, [${gcc_prefix}ranlib${gcc_suffix} ranlib], :)
-AC_CHECK_TOOLS(AR, [${gcc_prefix}ar${gcc_suffix} ar])
-AS_IF([test -z "$AR"], [
-  AC_CHECK_PROGS(AR, aal, ar)
-])
-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_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)
-	sysconfdir=
-    ])
-    : ${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_TOOLS(NM, [${gcc_prefix}nm${gcc_suffix} nm])
-
-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)
-
-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)
-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_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
-])
-
-: ${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/%.*//'`
-])
-
-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=declaration-after-statement \
-		 -Werror=deprecated-declarations \
-		 -Werror=division-by-zero \
-		 -Werror=duplicated-cond \
-		 -Werror=implicit-function-declaration \
-		 -Werror=implicit-int \
-		 -Werror=misleading-indentation \
-		 -Werror=pointer-arith \
-		 -Werror=restrict \
-		 -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,2259 \
-		 $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_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.
-    RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-
-    : ${MJIT_HEADER_FLAGS='-P -dD'}
-
-    # -fstack-protector
-    AS_CASE(["$target_os"],
-    [mingw*], [
-	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_TRY_COMPILE([@%:@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()
-    ],
-    [solaris*], [
-      # ANSI (no XCFLAGS because this is C only)
-      # Because "-std=gnu99" affects existance 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_TRY_LINK([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_TRY_LINK([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_TRY_COMPILE([],[ __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_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
-  ])
-
-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_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)
-		AS_IF([test "${target_os@%:@darwin}" -ge 16], [
-		    ac_cv_func___syscall=no
-		    ac_cv_func_syscall=no
-		    ac_cv_header_sys_syscall_h=no
-		    ac_cv_header_syscall_h=no
-		])
-		AS_IF([test $macosx_10_5 = yes], [
-		    ac_cv_func_getcontext=no
-		    ac_cv_func_setcontext=no
-		], [
-		    AC_DEFINE(BROKEN_SETREUID, 1)
-		    AC_DEFINE(BROKEN_SETREGID, 1)
-		])
-		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_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)])
-		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_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)
-		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_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
-		  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)
-		  ])
-		])
-		],
-[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
-		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_fiber_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"
-		# 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
-		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}
-
-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(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)
-
-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
-
-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_TRY_COMPILE([@%:@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])
-
-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)])
-AS_IF([test "$rb_cv_have_prototypes" = yes], [
-  AC_DEFINE(HAVE_PROTOTYPES)
-])
-
-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)])
-AS_IF([test "$rb_cv_tokenpaste" = ansi], [
-  AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
-], [
-  AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
-])
-
-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))
-AS_IF([test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"], [
-  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
-  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
-])
-
-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])]
-)
-AS_IF([test "$rb_cv_string_literal_concatenation" = no], [
-  AC_MSG_ERROR([No string literal concatenation])
-])
-
-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)])
-AS_IF([test "$rb_cv_stdarg" = yes], [
-  AC_DEFINE(HAVE_STDARG_PROTOTYPES)
-])
-
-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)])
-AS_IF([test "$rb_cv_va_args_macro" = yes], [
-  AC_DEFINE(HAVE_VA_ARGS_MACRO)
-])
-
-AC_CACHE_CHECK([for alignas() syntax], rb_cv_have_alignas, [
-rb_cv_have_alignas=no
-RUBY_WERROR_FLAG([
-for attr in \
-    "_Alignas(x)" \
-    "alignas(x)" \
-    "@<:@@<:@alignas(x)@:>@@:>@" \
-    "__declspec(aligned(x))" \
-    "__attribute__((__aligned__(x)))" \
-;
-do
-    # C11 _Alignas and GCC __attribute__((__aligned__)) behave
-    # slightly differently.  What we want is GCC's.  Check that
-    # here by something C11 does not allow (`struct ALIGNAS ...`)
-    AC_TRY_COMPILE(
-	[@%:@define ALIGNAS(x) $attr
-	struct ALIGNAS(128) conftest_tag { int foo; } foo; ], [],
-        [rb_cv_have_alignas="$attr"; break], [])
-done
-])])
-AS_IF([test "$rb_cv_have_alignas" != no], [
-    AC_DEFINE_UNQUOTED([RUBY_ALIGNAS(x)], $rb_cv_have_alignas)
-])
-
-AC_CACHE_CHECK([for alignof() syntax], rb_cv_have_alignof,[
-rb_cv_have_alignof=no
-RUBY_WERROR_FLAG([
-for expr in \
-    "alignof" \
-    "_Alignof" \
-    "__alignof" \
-    "__alignof__" \
-;
-do
-    AC_TRY_COMPILE([
-    @%:@ifdef HAVE_STDALIGN_H
-    @%:@include <stdalign.h>
-    @%:@endif],[return (int)$expr(int);],
-        [rb_cv_have_alignof="$expr"; break], [])
-done
-])])
-AS_IF([test "$rb_cv_have_alignof" != no], [
-    AC_DEFINE_UNQUOTED(RUBY_ALIGNOF, $rb_cv_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_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(__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)
-])
-
-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_TRY_LINK([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_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])])
-    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_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])])
-    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_TRY_LINK([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_TRY_COMPILE([@%:@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_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
-
-AC_ARG_ENABLE(mathn,
-    AS_HELP_STRING([--disable-mathn], [disable canonicalization for mathn]),
-    [mathn=$enableval], [mathn=yes])
-test "x$mathn" = xyes || mathn=
-AC_SUBST(MATHN, $mathn)
-
-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
-    ])]
-)
-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_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>])
-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])
-
-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_TRY_LINK(
-    [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
-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
-  ])
-AS_IF([test "x$ALLOCA" = "x"], [
-    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])
-    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
-
-# 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(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)
-
-# 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)])
-AS_IF([test "$rb_cv_have_signbit" = yes], [
-  AC_DEFINE(HAVE_SIGNBIT)
-], [
-  AC_LIBOBJ([signbit])
-])
-
-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(eventfd)
-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(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(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(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_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_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_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_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)
-  ])
-])
-
-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)])
-
-# 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_TRY_COMPILE([
-#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_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])])
-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_TRY_LINK([#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_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)])
-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_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)])
-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_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)])
-  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>
-])])
-])
-
-AS_IF([test x"$target_cpu" = xia64], [
-    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])])
-    AS_IF([test $rb_cv___libc_ia64_register_backing_store_base = yes], [
-      AC_DEFINE(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
-    ])
-])
-
-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_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_ENABLE(fiber-coroutine,
-    AS_HELP_STRING([--disable-fiber-coroutine], [disable native coroutine implementation for fiber]),
-    [rb_cv_fiber_coroutine=$enableval])
-AS_CASE(["$rb_cv_fiber_coroutine"], [yes|''], [
-    AC_MSG_CHECKING(native coroutine implementation for ${target_cpu}-${target_os})
-    AS_CASE(["$target_cpu-$target_os"],
-	[x*64-darwin*], [
-	    rb_cv_fiber_coroutine=amd64
-	],
-	[x*64-linux], [
-	    AS_CASE(["$ac_cv_sizeof_voidp"],
-	        [8], [ rb_cv_fiber_coroutine=amd64 ],
-	        [4], [ rb_cv_fiber_coroutine=x86 ],
-		[*], [ rb_cv_fiber_coroutine= ]
-	    )
-	],
-	[*86-linux], [
-	    rb_cv_fiber_coroutine=x86
-	],
-	[x64-mingw32], [
-	    rb_cv_fiber_coroutine=win64
-	],
-	[powerpc64le-linux], [
-	    rb_cv_fiber_coroutine=ppc64le
-	],
-	[*], [
-	    rb_cv_fiber_coroutine=
-	]
-    )
-    AC_MSG_RESULT(${rb_cv_fiber_coroutine:-no})
-])
-AS_IF([test "${rb_cv_fiber_coroutine:-no}" != no], [
-    COROUTINE_H=coroutine/$rb_cv_fiber_coroutine/Context.h
-    AC_DEFINE_UNQUOTED(FIBER_USE_COROUTINE, ["$COROUTINE_H"])
-    AC_SUBST(X_FIBER_COROUTINE_H, [$COROUTINE_H])
-])
-
-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_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])
-    ])
-    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(), 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
-	    ]
-	)
-	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_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])])
-    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_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])])
-    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_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)
-])
-}
-
-: "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_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)])
-
-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])
-    AS_IF([test "x$compress_debug_sections" = xzlib], [
-      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_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}
-			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*], [
-	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=])
-	  AS_IF([test "x$flag" != x], [
-	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
-	  ])
-	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([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_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;
-    struct sigaction sa;
-
-    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;
-    }
-    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_TRY_COMPILE([
-#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_CHECK_TOOL(STRIP, strip, :)dnl
-])
-
-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])
-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)'
-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)'
-  BOOTSTRAPRUBY='$(BASERUBY)'
-  TEST_RUNNABLE=no
-  CROSS_COMPILING=yes
-], [
-  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
-])
-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}'}
-
-  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_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_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_IF([test "$install_rdoc" != no], [
-	RDOCTARGET="rdoc"
-    ], [
-	RDOCTARGET="nodoc"
-    ])
-    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_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)
-	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_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]))
-])
-
-: ${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"'||'`
-])
-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_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 ${srcdir}/tool/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, [
-    tmpmk=confmk$$.tmp
-    {
-	AS_IF([test ${VCS+set}], [
-	    :
-	], [svn info "$srcdir" > /dev/null 2>&1], [
-	    VCS='svn'
-	], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [
-	    AS_IF([test -d "$git_dir/svn"], [
-		VCS='$(GIT) svn'
-	    ], [
-		VCS='$(GIT)'
-	    ])
-	], [
-	    VCS='echo cannot'
-	])
-	AS_CASE("$VCS",
-		[svn],          [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
-		['$(GIT) svn'], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
-		['$(GIT)'|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)'
-	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' gnumake='$gnumake' GIT='$GIT'])
-
-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,
-    [
-    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=])
-])
-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 -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 "DLDFLAGS"            "$DLDFLAGS"
-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 "JIT support"         "$MJIT_SUPPORT"
-config_summary "man page type"       "$MANTYPE"
-config_summary "search path"         "$search_path"
-config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
-echo ""
-echo "---"
-])
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000000..da0fc54997
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,4684 @@
+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}}
+: ${CSRCFLAG=''}
+AC_SUBST(OUTFLAG)
+AC_SUBST(COUTFLAG)
+AC_SUBST(CSRCFLAG)
+
+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)
+AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
+])
+# 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
+
+AC_CHECK_TYPES([sig_t],[],[],[@%:@include <signal.h>])
+
+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 fcccf07384..76b59fa047 100644
--- a/constant.h
+++ b/constant.h
@@ -46,6 +46,5 @@ 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);
-int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag);
 
 #endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
index c19bcdd447..8119b5cb23 100644
--- a/cont.c
+++ b/cont.c
@@ -13,7 +13,6 @@
 #include "vm_core.h"
 #include "gc.h"
 #include "eval_intern.h"
-#include "mjit.h"
 
 /* FIBER_USE_NATIVE enables Fiber performance improvement using system
  * dependent method such as make/setcontext on POSIX system or
@@ -26,27 +25,6 @@
  * in Proc. of 51th Programming Symposium, pp.21--28 (2010) (in Japanese).
  */
 
-/*
-  Enable FIBER_USE_COROUTINE to make fiber yield/resume much faster by using native assembly implementations.
-
-  rvm install ruby-head-ioquatix-native-fiber --url https://github.com/ioquatix/ruby --branch native-fiber
-
-  # Without libcoro
-  koyoko% ./build/bin/ruby ./fiber_benchmark.rb 10000 1000
-  setup time for 10000 fibers:   0.099961
-  execution time for 1000 messages:  19.505909
-
-  # With libcoro
-  koyoko% ./build/bin/ruby ./fiber_benchmark.rb 10000 1000
-  setup time for 10000 fibers:   0.099268
-  execution time for 1000 messages:   8.491746
-*/
-
-#ifdef FIBER_USE_COROUTINE
-#include FIBER_USE_COROUTINE
-#define FIBER_USE_NATIVE 1
-#endif
-
 #if !defined(FIBER_USE_NATIVE)
 # if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
 #   if 0
@@ -98,15 +76,8 @@ static long pagesize;
 
 enum context_type {
     CONTINUATION_CONTEXT = 0,
-    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
+    FIBER_CONTEXT = 1,
+    ROOT_FIBER_CONTEXT = 2
 };
 
 typedef struct rb_context_struct {
@@ -114,9 +85,11 @@ typedef struct rb_context_struct {
     int argc;
     VALUE self;
     VALUE value;
-
-    struct cont_saved_vm_stack saved_vm_stack;
-
+    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 {
 	VALUE *stack;
 	VALUE *stack_src;
@@ -127,79 +100,43 @@ typedef struct rb_context_struct {
 	int register_stack_size;
 #endif
     } machine;
-    rb_execution_context_t saved_ec;
+    rb_thread_t saved_thread; /* selected properties of GET_THREAD() (see cont_save_thread) */
     rb_jmpbuf_t jmpbuf;
     rb_ensure_entry_t *ensure_array;
-    /* Pointer to MJIT info about the continuation.  */
-    struct mjit_cont *mjit_cont;
+    rb_ensure_list_t *ensure_list;
 } 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 {
-    FIBER_CREATED,
-    FIBER_RESUMED,
-    FIBER_SUSPENDED,
-    FIBER_TERMINATED
+    CREATED,
+    RUNNING,
+    TERMINATED
 };
 
-#define FIBER_CREATED_P(fib)    ((fib)->status == FIBER_CREATED)
-#define FIBER_RESUMED_P(fib)    ((fib)->status == FIBER_RESUMED)
-#define FIBER_SUSPENDED_P(fib)  ((fib)->status == FIBER_SUSPENDED)
-#define FIBER_TERMINATED_P(fib) ((fib)->status == FIBER_TERMINATED)
-#define FIBER_RUNNABLE_P(fib)   (FIBER_CREATED_P(fib) || FIBER_SUSPENDED_P(fib))
-
-#if FIBER_USE_NATIVE && !defined(FIBER_USE_COROUTINE) && !defined(_WIN32)
-static inline int
-fiber_context_create(ucontext_t *context, void (*func)(), void *arg, void *ptr, size_t size)
-{
-    if (getcontext(context) < 0) return -1;
-    /*
-     * getcontext() may fail by some reasons:
-     *   1. SELinux policy banned one of "rt_sigprocmask",
-     *      "sigprocmask" or "swapcontext";
-     *   2. libseccomp (aka. syscall filter) banned one of them.
-     */
-    context->uc_link = NULL;
-    context->uc_stack.ss_sp = ptr;
-    context->uc_stack.ss_size = size;
-    makecontext(context, func, 0);
-    return 0;
-}
+#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
 
 struct rb_fiber_struct {
     rb_context_t cont;
-    VALUE first_proc;
     struct rb_fiber_struct *prev;
-    BITFIELD(enum fiber_status, status, 2);
+    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".
      */
-    unsigned int transferred : 1;
+    int transferred;
 
 #if FIBER_USE_NATIVE
-#if defined(FIBER_USE_COROUTINE)
-#define FIBER_ALLOCATE_STACK
-    coroutine_context context;
-    void *ss_sp;
-    size_t ss_size;
-#elif defined(_WIN32)
+#ifdef _WIN32
     void *fib_handle;
 #else
-#define FIBER_ALLOCATE_STACK
     ucontext_t context;
     /* Because context.uc_stack.ss_sp and context.uc_stack.ss_size
      * are not necessarily valid after makecontext() or swapcontext(),
@@ -211,245 +148,125 @@ struct rb_fiber_struct {
 #endif
 };
 
-#ifdef FIBER_ALLOCATE_STACK
-#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
-
-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 *fib)
-{
-#if VM_CHECK_MODE > 0
-    VM_ASSERT(fib->cont.saved_ec.fiber_ptr == fib);
-
-    switch (fib->status) {
-      case FIBER_RESUMED:
-	VM_ASSERT(fib->cont.saved_ec.vm_stack != NULL);
-	break;
-      case FIBER_SUSPENDED:
-	VM_ASSERT(fib->cont.saved_ec.vm_stack != NULL);
-	break;
-      case FIBER_CREATED:
-      case FIBER_TERMINATED:
-	/* TODO */
-	break;
-      default:
-	VM_UNREACHABLE(fiber_verify);
-    }
-#endif
-}
-
-#if VM_CHECK_MODE > 0
-void
-rb_ec_verify(const rb_execution_context_t *ec)
-{
-    /* TODO */
-}
-#endif
-
-static void
-fiber_status_set(rb_fiber_t *fib, enum fiber_status s)
-{
-    if (0) fprintf(stderr, "fib: %p, status: %s -> %s\n", (void *)fib, fiber_status_name(fib->status), fiber_status_name(s));
-    VM_ASSERT(!FIBER_TERMINATED_P(fib));
-    VM_ASSERT(fib->status != s);
-    fiber_verify(fib);
-    fib->status = s;
-}
-
-void
-rb_ec_set_vm_stack(rb_execution_context_t *ec, VALUE *stack, size_t size)
-{
-    ec->vm_stack = stack;
-    ec->vm_stack_size = size;
-}
-
-static inline void
-ec_switch(rb_thread_t *th, rb_fiber_t *fib)
-{
-    rb_execution_context_t *ec = &fib->cont.saved_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->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 const rb_data_type_t cont_data_type, fiber_data_type;
 static VALUE rb_cContinuation;
 static VALUE rb_cFiber;
 static VALUE rb_eFiberError;
 
-static rb_context_t *
-cont_ptr(VALUE obj)
-{
-    rb_context_t *cont;
+#define GetContPtr(obj, ptr)  \
+    TypedData_Get_Struct((obj), rb_context_t, &cont_data_type, (ptr))
 
-    TypedData_Get_Struct(obj, rb_context_t, &cont_data_type, cont);
+#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)
 
-    return cont;
-}
-
-static rb_fiber_t *
-fiber_ptr(VALUE obj)
-{
-    rb_fiber_t *fib;
-
-    TypedData_Get_Struct(obj, rb_fiber_t, &fiber_data_type, fib);
-    if (!fib) rb_raise(rb_eFiberError, "uninitialized fiber");
-
-    return fib;
-}
-
-NOINLINE(static VALUE cont_capture(volatile int *volatile stat));
+NOINLINE(static VALUE cont_capture(volatile int *stat));
 
 #define THREAD_MUST_BE_RUNNING(th) do { \
-	if (!(th)->ec->tag) rb_raise(rb_eThreadError, "not running thread");	\
+	if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread");	\
     } while (0)
 
-static VALUE
-cont_thread_value(const rb_context_t *cont)
-{
-    return cont->saved_ec.thread_ptr->self;
-}
-
 static void
 cont_mark(void *ptr)
 {
-    rb_context_t *cont = ptr;
-
     RUBY_MARK_ENTER("cont");
-    rb_gc_mark(cont->value);
+    if (ptr) {
+	rb_context_t *cont = ptr;
+	rb_gc_mark(cont->value);
 
-    rb_execution_context_mark(&cont->saved_ec);
-    rb_gc_mark(cont_thread_value(cont));
+	rb_thread_mark(&cont->saved_thread);
+	rb_gc_mark(cont->saved_thread.self);
 
-    if (cont->saved_vm_stack.ptr) {
+	if (cont->vm_stack) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	rb_gc_mark_locations(cont->saved_vm_stack.ptr,
-			     cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
+	    rb_gc_mark_locations(cont->vm_stack,
+				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
 #else
-	rb_gc_mark_locations(cont->saved_vm_stack.ptr,
-			     cont->saved_vm_stack.ptr, cont->saved_ec.stack_size);
+	    rb_gc_mark_locations(cont->vm_stack,
+				 cont->vm_stack, cont->saved_thread.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);
 	}
-	else {
-	    /* fiber */
-	    const rb_fiber_t *fib = (rb_fiber_t*)cont;
 
-	    if (!FIBER_TERMINATED_P(fib)) {
+	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 */
+		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);
-    }
+	if (cont->machine.register_stack) {
+	    rb_gc_mark_locations(cont->machine.register_stack,
+				 cont->machine.register_stack + cont->machine.register_stack_size);
+	}
 #endif
-
+    }
     RUBY_MARK_LEAVE("cont");
 }
 
-static int
-fiber_is_root_p(const rb_fiber_t *fib)
-{
-    return fib == fib->cont.saved_ec.thread_ptr->root_fiber;
-}
-
 static void
 cont_free(void *ptr)
 {
-    rb_context_t *cont = ptr;
-
     RUBY_FREE_ENTER("cont");
-    ruby_xfree(cont->saved_ec.vm_stack);
-
+    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;
-#if defined(FIBER_USE_COROUTINE)
-	coroutine_destroy(&fib->context);
-	if (fib->ss_sp != NULL) {
-	    if (fiber_is_root_p(fib)) {
-		rb_bug("Illegal root fiber parameter");
-	    }
-#ifdef _WIN32
-            VirtualFree((void*)fib->ss_sp, 0, MEM_RELEASE);
-#else
-	    munmap((void*)fib->ss_sp, fib->ss_size);
-#endif
-            fib->ss_sp = NULL;
+	if (cont->type == CONTINUATION_CONTEXT) {
+	    /* cont */
+	    ruby_xfree(cont->ensure_array);
+	    RUBY_FREE_UNLESS_NULL(cont->machine.stack);
 	}
-#elif defined(_WIN32)
-	if (!fiber_is_root_p(fib)) {
-	    /* don't delete root fiber handle */
-	    if (fib->fib_handle) {
-		DeleteFiber(fib->fib_handle);
+	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 */
-        /* fib->ss_sp == NULL is possible for root fiber */
-	if (fib->ss_sp != NULL) {
-	    munmap((void*)fib->ss_sp, fib->ss_size);
-	}
+	    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);
+	ruby_xfree(cont->ensure_array);
+	RUBY_FREE_UNLESS_NULL(cont->machine.stack);
 #endif
 #ifdef __ia64
-    RUBY_FREE_UNLESS_NULL(cont->machine.register_stack);
+	RUBY_FREE_UNLESS_NULL(cont->machine.register_stack);
 #endif
-    RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr);
+	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
 
-    if (mjit_enabled && cont->mjit_cont != NULL) {
-        mjit_cont_free(cont->mjit_cont);
+	/* free rb_cont_t or rb_fiber_t */
+	ruby_xfree(ptr);
     }
-    /* free rb_cont_t or rb_fiber_t */
-    ruby_xfree(ptr);
     RUBY_FREE_LEAVE("cont");
 }
 
@@ -460,13 +277,13 @@ cont_memsize(const void *ptr)
     size_t size = 0;
 
     size = sizeof(*cont);
-    if (cont->saved_vm_stack.ptr) {
+    if (cont->vm_stack) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	size_t n = (cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
+	size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
 #else
-	size_t n = cont->saved_ec.vm_stack_size;
+	size_t n = cont->saved_thread.stack_size;
 #endif
-	size += n * sizeof(*cont->saved_vm_stack.ptr);
+	size += n * sizeof(*cont->vm_stack);
     }
 
     if (cont->machine.stack) {
@@ -481,49 +298,37 @@ cont_memsize(const void *ptr)
 }
 
 void
-rb_fiber_mark_self(const rb_fiber_t *fib)
+rb_fiber_mark_self(rb_fiber_t *fib)
 {
-    if (fib->cont.self) {
+    if (fib)
 	rb_gc_mark(fib->cont.self);
-    }
-    else {
-	rb_execution_context_mark(&fib->cont.saved_ec);
-    }
 }
 
 static void
 fiber_mark(void *ptr)
 {
-    rb_fiber_t *fib = ptr;
     RUBY_MARK_ENTER("cont");
-    fiber_verify(fib);
-    rb_gc_mark(fib->first_proc);
-    if (fib->prev) rb_fiber_mark_self(fib->prev);
-
-#if !FIBER_USE_NATIVE
-    if (fib->status == FIBER_TERMINATED) {
-	/* FIBER_TERMINATED fiber should not mark machine stack */
-	if (fib->cont.saved_ec.machine.stack_end != NULL) {
-	    fib->cont.saved_ec.machine.stack_end = NULL;
-	}
+    if (ptr) {
+	rb_fiber_t *fib = ptr;
+	rb_fiber_mark_self(fib->prev);
+	cont_mark(&fib->cont);
     }
-#endif
-
-    cont_mark(&fib->cont);
     RUBY_MARK_LEAVE("cont");
 }
 
 static void
 fiber_free(void *ptr)
 {
-    rb_fiber_t *fib = 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);
+	}
 
-    if (fib->cont.saved_ec.local_storage) {
-	st_free_table(fib->cont.saved_ec.local_storage);
+	cont_free(&fib->cont);
     }
-
-    cont_free(&fib->cont);
     RUBY_FREE_LEAVE("fiber");
 }
 
@@ -531,15 +336,12 @@ static size_t
 fiber_memsize(const void *ptr)
 {
     const rb_fiber_t *fib = ptr;
-    size_t size = sizeof(*fib);
-    const rb_execution_context_t *saved_ec = &fib->cont.saved_ec;
-    const rb_thread_t *th = rb_ec_thread_ptr(saved_ec);
+    size_t size = 0;
 
-    /*
-     * vm.c::thread_memsize already counts th->ec->local_storage
-     */
-    if (saved_ec->local_storage && fib != th->root_fiber) {
-	size += st_memsize(saved_ec->local_storage);
+    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);
     }
     size += cont_memsize(&fib->cont);
     return size;
@@ -561,18 +363,18 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 {
     size_t size;
 
-    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+    SET_MACHINE_STACK_END(&th->machine.stack_end);
 #ifdef __ia64
-    th->ec->machine.register_stack_end = rb_ia64_bsp();
+    th->machine.register_stack_end = rb_ia64_bsp();
 #endif
 
-    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;
+    if (th->machine.stack_start > th->machine.stack_end) {
+	size = cont->machine.stack_size = th->machine.stack_start - th->machine.stack_end;
+	cont->machine.stack_src = th->machine.stack_end;
     }
     else {
-	size = cont->machine.stack_size = th->ec->machine.stack_end - th->ec->machine.stack_start;
-	cont->machine.stack_src = th->ec->machine.stack_start;
+	size = cont->machine.stack_size = th->machine.stack_end - th->machine.stack_start;
+	cont->machine.stack_src = th->machine.stack_start;
     }
 
     if (cont->machine.stack) {
@@ -587,8 +389,8 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 
 #ifdef __ia64
     rb_ia64_flushrs();
-    size = cont->machine.register_stack_size = th->ec->machine.register_stack_end - th->ec->machine.register_stack_start;
-    cont->machine.register_stack_src = th->ec->machine.register_stack_start;
+    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);
     }
@@ -609,42 +411,48 @@ static const rb_data_type_t cont_data_type = {
 static inline void
 cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 {
-    rb_execution_context_t *sec = &cont->saved_ec;
-
-    VM_ASSERT(th->status == THREAD_RUNNABLE);
+    rb_thread_t *sth = &cont->saved_thread;
 
     /* save thread context */
-    *sec = *th->ec;
-
-    /* saved_ec->machine.stack_end should be NULL */
+    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 */
     /* because it may happen GC afterward */
-    sec->machine.stack_end = NULL;
-
+    sth->machine.stack_start = 0;
+    sth->machine.stack_end = 0;
 #ifdef __ia64
-    sec->machine.register_stack_start = NULL;
-    sec->machine.register_stack_end = NULL;
+    sth->machine.register_stack_start = 0;
+    sth->machine.register_stack_end = 0;
 #endif
 }
 
 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
 cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
-    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);
+    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;
 }
 
 static rb_context_t *
@@ -661,74 +469,30 @@ cont_new(VALUE klass)
     return cont;
 }
 
-void
-rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber)
-{
-    // Currently this function is meant for root_fiber. Others go through cont_new.
-    // XXX: Is this mjit_cont `mjit_cont_free`d?
-    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 *volatile stat)
+cont_capture(volatile int *stat)
 {
-    rb_context_t *volatile cont;
+    rb_context_t *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->ec);
+    rb_vm_stack_to_heap(th);
     cont = cont_new(rb_cContinuation);
     contval = cont->self;
 
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-    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);
+    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);
 #else
-    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);
+    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
+    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
 #endif
-    rb_ec_set_vm_stack(&cont->saved_ec, NULL, 0);
+    cont->saved_thread.stack = NULL;
+
     cont_save_machine_stack(th, cont);
 
     /* backup ensure_list to array for search in another context */
@@ -736,10 +500,10 @@ cont_capture(volatile int *volatile stat)
 	rb_ensure_list_t *p;
 	int size = 0;
 	rb_ensure_entry_t *entry;
-	for (p=th->ec->ensure_list; p; p=p->next)
+	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->ec->ensure_list; p; p=p->next) {
+	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;
@@ -762,79 +526,59 @@ cont_capture(volatile int *volatile stat)
 	return contval;
     }
 }
-COMPILER_WARNING_POP
-
-static inline void
-fiber_restore_thread(rb_thread_t *th, rb_fiber_t *fib)
-{
-    ec_switch(th, fib);
-    VM_ASSERT(th->ec->fiber_ptr == fib);
-}
 
 static inline void
 cont_restore_thread(rb_context_t *cont)
 {
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
 
     /* restore thread context */
     if (cont->type == CONTINUATION_CONTEXT) {
 	/* continuation */
-	rb_execution_context_t *sec = &cont->saved_ec;
-	rb_fiber_t *fib = NULL;
+	rb_fiber_t *fib;
 
-	if (sec->fiber_ptr != NULL) {
-	    fib = sec->fiber_ptr;
-	}
-	else if (th->root_fiber) {
-	    fib = th->root_fiber;
-	}
+	th->fiber = sth->fiber;
+	fib = th->fiber ? th->fiber : th->root_fiber;
 
-	if (fib && th->ec != &fib->cont.saved_ec) {
-	    ec_switch(th, fib);
+	if (fib && fib->cont.saved_thread.stack) {
+	    th->stack_size = fib->cont.saved_thread.stack_size;
+	    th->stack = fib->cont.saved_thread.stack;
 	}
-
-        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->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);
+	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);
 #else
-	MEMCPY(th->ec->vm_stack, cont->saved_vm_stack.ptr, VALUE, sec->vm_stack_size);
+	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
 #endif
-	/* other members of ec */
-
-	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;
-
-	VM_ASSERT(th->ec->vm_stack != NULL);
     }
     else {
 	/* fiber */
-	fiber_restore_thread(th, (rb_fiber_t*)cont);
-    }
+	th->stack = sth->stack;
+	sth->stack = NULL;
+	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
-#if defined(FIBER_USE_COROUTINE)
-static COROUTINE
-fiber_entry(coroutine_context * from, coroutine_context * to)
-{
-    rb_fiber_start();
-}
-#elif defined(_WIN32)
+#ifdef _WIN32
 static void
 fiber_set_stack_location(void)
 {
@@ -842,27 +586,17 @@ fiber_set_stack_location(void)
     VALUE *ptr;
 
     SET_MACHINE_STACK_END(&ptr);
-    th->ec->machine.stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
+    th->machine.stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
 }
 
-NORETURN(static VOID CALLBACK fiber_entry(void *arg));
 static VOID CALLBACK
 fiber_entry(void *arg)
 {
     fiber_set_stack_location();
     rb_fiber_start();
 }
-#else
-NORETURN(static void fiber_entry(void *arg));
-static void
-fiber_entry(void *arg)
-{
-    rb_fiber_start();
-}
-#endif
-#endif
+#else /* _WIN32 */
 
-#ifdef FIBER_ALLOCATE_STACK
 /*
  * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
  * if MAP_STACK is passed.
@@ -874,76 +608,50 @@ fiber_entry(void *arg)
 #define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
 #endif
 
-#define ERRNOMSG strerror(errno)
-
 static char*
 fiber_machine_stack_alloc(size_t size)
 {
     char *ptr;
-#ifdef _WIN32
-    DWORD old_protect;
-#endif
 
     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 {
+	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");
-        }
-    } else {
-#ifdef _WIN32
-        ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
+	    rb_bug("machine_stack_cache size is not canonicalized");
+	}
+    }
+    else {
+	void *page;
+	STACK_GROW_DIR_DETECTION;
 
-        if (!ptr) {
-            rb_raise(rb_eFiberError, "can't allocate machine stack to fiber: %s", ERRNOMSG);
-        }
+	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));
+	}
 
-        if (!VirtualProtect(ptr, RB_PAGE_SIZE, PAGE_READWRITE | PAGE_GUARD, &old_protect)) {
-            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
-        }
-#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", ERRNOMSG);
-        }
-
-        /* 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, "can't set a guard page: %s", ERRNOMSG);
-        }
-#endif
+	/* 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");
+	}
     }
 
     return ptr;
 }
 #endif
 
-#if FIBER_USE_NATIVE
 static void
 fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
 {
-    rb_execution_context_t *sec = &fib->cont.saved_ec;
-
-#if defined(FIBER_USE_COROUTINE)
-    char *ptr;
-    STACK_GROW_DIR_DETECTION;
+    rb_thread_t *sth = &fib->cont.saved_thread;
 
-    ptr = fiber_machine_stack_alloc(size);
-    fib->ss_sp = ptr;
-    fib->ss_size = size;
-    coroutine_initialize(&fib->context, fiber_entry, ptr+size, size);
-    sec->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
-    sec->machine.stack_maxsize = size - RB_PAGE_SIZE;
-#elif defined(_WIN32)
+#ifdef _WIN32
 # if defined(_MSC_VER) && _MSC_VER <= 1200
 #   define CreateFiberEx(cs, stacksize, flags, entry, param) \
     CreateFiber((stacksize), (entry), (param))
@@ -957,19 +665,22 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
 	    rb_raise(rb_eFiberError, "can't create fiber");
 	}
     }
-    sec->machine.stack_maxsize = size;
+    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;
-    if (fiber_context_create(&fib->context, fiber_entry, NULL, fib->ss_sp, fib->ss_size)) {
-	rb_raise(rb_eFiberError, "can't get context for creating fiber: %s", ERRNOMSG);
-    }
-    sec->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
-    sec->machine.stack_maxsize = size - RB_PAGE_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;
@@ -981,44 +692,50 @@ NOINLINE(static void fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib));
 static void
 fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
 {
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = GET_THREAD(), *sth = &newfib->cont.saved_thread;
+
+    if (newfib->status != RUNNING) {
+	fiber_initialize_machine_stack_context(newfib, th->vm->default_params.fiber_machine_stack_size);
+    }
+
+    /* 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 / TODO: is it needed? */
-    if (!FIBER_TERMINATED_P(oldfib)) {
+    /* save  oldfib's machine stack */
+    if (oldfib->status != TERMINATED) {
 	STACK_GROW_DIR_DETECTION;
-	SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+	SET_MACHINE_STACK_END(&th->machine.stack_end);
 	if (STACK_DIR_UPPER(0, 1)) {
-	    oldfib->cont.machine.stack_size = th->ec->machine.stack_start - th->ec->machine.stack_end;
-	    oldfib->cont.machine.stack = th->ec->machine.stack_end;
+	    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->ec->machine.stack_end - th->ec->machine.stack_start;
-	    oldfib->cont.machine.stack = th->ec->machine.stack_start;
+	    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_ec.machine.stack_start = th->ec->machine.stack_start;
-
+    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_ec.machine.stack_end = NULL;
-
-    /* restore thread context */
-    fiber_restore_thread(th, newfib);
-
-    /* swap machine context */
-#if defined(FIBER_USE_COROUTINE)
-    coroutine_transfer(&oldfib->context, &newfib->context);
-#elif defined(_WIN32)
-    SwitchToFiber(newfib->fib_handle);
-#else
+    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
+    /* swap machine context */
+#ifdef _WIN32
+    SwitchToFiber(newfib->fib_handle);
+#else
     swapcontext(&oldfib->context, &newfib->context);
 #endif
 }
-#endif /* FIBER_USE_NATIVE */
+#endif
 
 NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
 
@@ -1280,7 +997,7 @@ 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, j;
+    size_t i;
     size_t cur_size;
     size_t target_size;
     size_t base_point;
@@ -1318,11 +1035,11 @@ rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *ta
 	cur_size--;
     }
     /* push ensure stack */
-    for (j = 0; j < i; j++) {
-        func = (VALUE (*)(ANYARGS)) lookup_rollback_func(target[i - j - 1].e_proc);
-        if ((VALUE)func != Qundef) {
-            (*func)(target[i - j - 1].data2);
-        }
+    while (i--) {
+	func = (VALUE (*)(ANYARGS)) lookup_rollback_func(target[i].e_proc);
+	if ((VALUE)func != Qundef) {
+	    (*func)(target[i].data2);
+	}
     }
 }
 
@@ -1345,25 +1062,28 @@ 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 = cont_ptr(contval);
+    rb_context_t *cont;
     rb_thread_t *th = GET_THREAD();
+    GetContPtr(contval, cont);
 
-    if (cont_thread_value(cont) != th->self) {
+    if (cont->saved_thread.self != th->self) {
 	rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+    if (cont->saved_thread.protect_tag != th->protect_tag) {
 	rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
     }
-    if (cont->saved_ec.fiber_ptr) {
-	if (th->ec->fiber_ptr != cont->saved_ec.fiber_ptr) {
+    if (cont->saved_thread.fiber) {
+	if (th->fiber != cont->saved_thread.fiber) {
 	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
 	}
     }
-    rollback_ensure_stack(contval, th->ec->ensure_list, cont->ensure_array);
+    rollback_ensure_stack(contval, th->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 */
 }
@@ -1382,9 +1102,8 @@ 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 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).
+ *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
+ *  nested function calls within the fiber block.
  *
  *  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.
@@ -1462,12 +1181,8 @@ fiber_t_alloc(VALUE fibval)
     fib->cont.self = fibval;
     fib->cont.type = FIBER_CONTEXT;
     cont_init(&fib->cont, th);
-    fib->cont.saved_ec.fiber_ptr = fib;
     fib->prev = NULL;
-
-    /* fib->status == 0 == CREATED
-     * So that we don't need to set status: fiber_status_set(fib, FIBER_CREATED); */
-    VM_ASSERT(FIBER_CREATED_P(fib));
+    fib->status = CREATED;
 
     DATA_PTR(fibval) = fib;
 
@@ -1475,7 +1190,7 @@ fiber_t_alloc(VALUE fibval)
 }
 
 rb_control_frame_t *
-rb_vm_push_frame(rb_execution_context_t *sec,
+rb_vm_push_frame(rb_thread_t *th,
 		 const rb_iseq_t *iseq,
 		 VALUE type,
 		 VALUE self,
@@ -1491,41 +1206,36 @@ fiber_init(VALUE fibval, VALUE proc)
 {
     rb_fiber_t *fib = fiber_t_alloc(fibval);
     rb_context_t *cont = &fib->cont;
-    rb_execution_context_t *sec = &cont->saved_ec;
+    rb_thread_t *th = &cont->saved_thread;
     rb_thread_t *cth = GET_THREAD();
-    rb_vm_t *vm = cth->vm;
-    size_t fib_stack_bytes = vm->default_params.fiber_vm_stack_size;
-    size_t thr_stack_bytes = vm->default_params.thread_vm_stack_size;
-    VALUE *vm_stack;
 
     /* initialize cont */
-    cont->saved_vm_stack.ptr = NULL;
-    if (fib_stack_bytes == thr_stack_bytes) {
-        vm_stack = rb_thread_recycle_stack(fib_stack_bytes / sizeof(VALUE));
-    }
-    else {
-        vm_stack = ruby_xmalloc(fib_stack_bytes);
-    }
-    rb_ec_set_vm_stack(sec, vm_stack, fib_stack_bytes / sizeof(VALUE));
-    sec->cfp = (void *)(sec->vm_stack + sec->vm_stack_size);
+    cont->vm_stack = 0;
+
+    th->stack = NULL;
+    th->stack_size = 0;
 
-    rb_vm_push_frame(sec,
+    th->stack_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
+    th->stack = ALLOC_N(VALUE, th->stack_size);
+    th->cfp = (void *)(th->stack + th->stack_size);
+
+    rb_vm_push_frame(th,
 		     NULL,
 		     VM_FRAME_MAGIC_DUMMY | VM_ENV_FLAG_LOCAL | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_CFRAME,
 		     Qnil, /* self */
 		     VM_BLOCK_HANDLER_NONE,
 		     0, /* specval */
 		     NULL, /* pc */
-		     sec->vm_stack, /* sp */
+		     th->stack, /* sp */
 		     0, /* local_size */
 		     0);
 
-    sec->tag = NULL;
-    sec->local_storage = NULL;
-    sec->local_storage_recursive_hash = Qnil;
-    sec->local_storage_recursive_hash_for_trace = Qnil;
+    th->tag = 0;
+    th->local_storage = st_init_numtable();
+    th->local_storage_recursive_hash = Qnil;
+    th->local_storage_recursive_hash_for_trace = Qnil;
 
-    fib->first_proc = proc;
+    th->first_proc = proc;
 
 #if !FIBER_USE_NATIVE
     MEMCPY(&cont->jmpbuf, &cth->root_jmpbuf, rb_jmpbuf_t, 1);
@@ -1547,130 +1257,77 @@ rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
     return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
 }
 
-static void rb_fiber_terminate(rb_fiber_t *fib, int need_interrupt);
+static void rb_fiber_terminate(rb_fiber_t *fib);
 
 void
 rb_fiber_start(void)
 {
-    rb_thread_t * volatile th = GET_THREAD();
-    rb_fiber_t *fib = th->ec->fiber_ptr;
+    rb_thread_t *th = GET_THREAD();
+    rb_fiber_t *fib = th->fiber;
     rb_proc_t *proc;
-    enum ruby_tag_type state;
-    int need_interrupt = TRUE;
+    int state;
 
-    VM_ASSERT(th->ec == ruby_current_execution_context_ptr);
-    VM_ASSERT(FIBER_RESUMED_P(fib));
-
-    EC_PUSH_TAG(th->ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    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(fib->first_proc, proc);
+	GetProcPtr(cont->saved_thread.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(fib->first_proc);
-	th->ec->root_svar = Qfalse;
+	th->errinfo = Qnil;
+	th->root_lep = rb_vm_ep_local_ep(vm_block_ep(&proc->block));
+	th->root_svar = Qfalse;
+	fib->status = RUNNING;
 
-	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, VM_BLOCK_HANDLER_NONE);
+	EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil);
+	cont->value = rb_vm_invoke_proc(th, proc, argc, argv, VM_BLOCK_HANDLER_NONE);
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
 
     if (state) {
-	VALUE err = th->ec->errinfo;
-	VM_ASSERT(FIBER_RESUMED_P(fib));
-
 	if (state == TAG_RAISE || state == TAG_FATAL) {
-	    rb_threadptr_pending_interrupt_enque(th, err);
+	    rb_threadptr_pending_interrupt_enque(th, th->errinfo);
 	}
 	else {
-	    err = rb_vm_make_jump_tag_but_local_jump(state, err);
-	    if (!NIL_P(err)) {
+	    VALUE err = rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
+	    if (!NIL_P(err))
 		rb_threadptr_pending_interrupt_enque(th, err);
-	    }
 	}
-	need_interrupt = TRUE;
+	RUBY_VM_SET_INTERRUPT(th);
     }
 
-    rb_fiber_terminate(fib, need_interrupt);
-    VM_UNREACHABLE(rb_fiber_start);
+    rb_fiber_terminate(fib);
+    rb_bug("rb_fiber_start: unreachable");
 }
 
 static rb_fiber_t *
 root_fiber_alloc(rb_thread_t *th)
 {
-    VALUE fibval = fiber_alloc(rb_cFiber);
-    rb_fiber_t *fib = th->ec->fiber_ptr;
-
-    VM_ASSERT(DATA_PTR(fibval) == NULL);
-    VM_ASSERT(fib->cont.type == FIBER_CONTEXT);
-    VM_ASSERT(fib->status == FIBER_RESUMED);
-
-    th->root_fiber = fib;
-    DATA_PTR(fibval) = fib;
-    fib->cont.self = fibval;
-
+    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
-#if defined(FIBER_USE_COROUTINE)
-    coroutine_initialize(&fib->context, NULL, NULL, 0);
-#elif defined(_WIN32)
-    /* setup fib_handle for root Fiber */
-    if (fib->fib_handle == 0) {
-        if ((fib->fib_handle = ConvertThreadToFiber(0)) == 0) {
-            rb_bug("root_fiber_alloc: ConvertThreadToFiber() failed - %s\n", rb_w32_strerror(-1));
-        }
-    }
-    else {
-        rb_bug("root_fiber_alloc: fib_handle is not NULL.");
-    }
+#ifdef _WIN32
+    fib->fib_handle = ConvertThreadToFiber(0);
 #endif
 #endif
+    fib->status = RUNNING;
 
     return fib;
 }
 
-void
-rb_threadptr_root_fiber_setup(rb_thread_t *th)
-{
-    rb_fiber_t *fib = ruby_mimmalloc(sizeof(rb_fiber_t));
-    MEMZERO(fib, rb_fiber_t, 1);
-    fib->cont.type = FIBER_CONTEXT;
-    fib->cont.saved_ec.fiber_ptr = fib;
-    fib->cont.saved_ec.thread_ptr = th;
-    fiber_status_set(fib, FIBER_RESUMED); /* skip CREATED */
-    th->ec = &fib->cont.saved_ec;
-
-    /* NOTE: On WIN32, fib_handle is not allocated yet. */
-}
-
-void
-rb_threadptr_root_fiber_release(rb_thread_t *th)
-{
-    if (th->root_fiber) {
-	/* ignore. A root fiber object will free th->ec */
-    }
-    else {
-	VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT);
-	VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
-	fiber_free(th->ec->fiber_ptr);
-
-	if (th->ec == ruby_current_execution_context_ptr) {
-	    ruby_current_execution_context_ptr = NULL;
-	}
-	th->ec = NULL;
-    }
-}
-
 static inline rb_fiber_t*
 fiber_current(void)
 {
-    rb_execution_context_t *ec = GET_EC();
-    if (ec->fiber_ptr->cont.self == 0) {
-	root_fiber_alloc(rb_ec_thread_ptr(ec));
+    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;
     }
-    return ec->fiber_ptr;
+    return th->fiber;
 }
 
 static inline rb_fiber_t*
@@ -1680,10 +1337,7 @@ return_fiber(void)
     rb_fiber_t *prev = fib->prev;
 
     if (!prev) {
-	rb_thread_t *th = GET_THREAD();
-	rb_fiber_t *root_fiber = th->root_fiber;
-
-	VM_ASSERT(root_fiber != NULL);
+	rb_fiber_t *root_fiber = GET_THREAD()->root_fiber;
 
 	if (root_fiber == fib) {
 	    rb_raise(rb_eFiberError, "can't yield from root fiber");
@@ -1707,76 +1361,58 @@ fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
 {
     rb_fiber_t *fib;
 
-    if (th->ec->fiber_ptr != NULL) {
-        fib = th->ec->fiber_ptr;
+    if (th->fiber) {
+	fib = th->fiber;
+	cont_save_thread(&fib->cont, th);
     }
     else {
-        /* create root fiber */
-        fib = root_fiber_alloc(th);
-    }
-
-    VM_ASSERT(FIBER_RESUMED_P(fib) || FIBER_TERMINATED_P(fib));
-    VM_ASSERT(FIBER_RUNNABLE_P(next_fib));
-
-#if FIBER_USE_NATIVE
-    if (FIBER_CREATED_P(next_fib)) {
-        fiber_initialize_machine_stack_context(next_fib, th->vm->default_params.fiber_machine_stack_size);
+	/* create current fiber */
+	fib = root_fiber_alloc(th);
+	th->root_fiber = th->fiber = fib;
     }
-#endif
-
-    if (FIBER_RESUMED_P(fib)) fiber_status_set(fib, FIBER_SUSPENDED);
-
-#if FIBER_USE_NATIVE == 0
-    /* should (re-)allocate stack are before fib->status change to pass fiber_verify() */
-    cont_save_machine_stack(th, &fib->cont);
-#endif
-
-    fiber_status_set(next_fib, FIBER_RESUMED);
 
 #if FIBER_USE_NATIVE
     fiber_setcontext(next_fib, fib);
     /* restored */
-#ifdef MAX_MACHINE_STACK_CACHE
+#ifndef _WIN32
     if (terminated_machine_stack.ptr) {
-        if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
-            machine_stack_cache[machine_stack_cache_index++] = terminated_machine_stack;
-        }
-        else {
-            if (terminated_machine_stack.ptr != fib->cont.machine.stack) {
-#ifdef _WIN32
-                VirtualFree(terminated_machine_stack.ptr, 0, MEM_RELEASE);
-#else
-                munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
-#endif
-            }
-            else {
-                rb_bug("terminated fiber resumed");
-            }
-        }
-        terminated_machine_stack.ptr = NULL;
-        terminated_machine_stack.size = 0;
+	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->ec->fiber_ptr;
+    fib = th->fiber;
     if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
     return fib->cont.value;
 
 #else /* FIBER_USE_NATIVE */
-    fib->cont.saved_ec.machine.stack_end = NULL;
+    cont_save_machine_stack(th, &fib->cont);
     if (ruby_setjmp(fib->cont.jmpbuf)) {
-        /* restored */
-        fib = th->ec->fiber_ptr;
-        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);
-            VM_UNREACHABLE(fiber_store);
-        }
-        return fib->cont.value;
+	/* 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;
     }
     else {
-        VALUE undef = Qundef;
-        cont_restore_0(&next_fib->cont, &undef);
-        VM_UNREACHABLE(fiber_store);
+	VALUE undef = Qundef;
+	cont_restore_0(&next_fib->cont, &undef);
+	rb_bug("rb_fiber_resume: unreachable");
     }
 #endif /* FIBER_USE_NATIVE */
 }
@@ -1788,59 +1424,53 @@ fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
     rb_context_t *cont = &fib->cont;
     rb_thread_t *th = GET_THREAD();
 
-    /* make sure the root_fiber object is available */
-    if (th->root_fiber == NULL) root_fiber_alloc(th);
-
-    if (th->ec->fiber_ptr == fib) {
+    if (th->fiber == fib) {
 	/* ignore fiber context switch
          * because destination fiber is same as current fiber
 	 */
 	return make_passing_arg(argc, argv);
     }
 
-    if (cont_thread_value(cont) != th->self) {
+    if (cont->saved_thread.self != th->self) {
 	rb_raise(rb_eFiberError, "fiber called across threads");
     }
-    else if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+    else if (cont->saved_thread.protect_tag != th->protect_tag) {
 	rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
     }
-    else if (FIBER_TERMINATED_P(fib)) {
+    else if (fib->status == TERMINATED) {
 	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
 
-	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));
-
-	    cont = &th->root_fiber->cont;
-	    cont->argc = -1;
-	    cont->value = value;
+	if (th->fiber->status != TERMINATED) rb_exc_raise(value);
+
+	/* 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->ec->fiber_ptr);
+	fiber_setcontext(th->root_fiber, th->fiber);
 #else
-	    cont_restore_0(cont, &value);
+	cont_restore_0(cont, &value);
 #endif
-	    VM_UNREACHABLE(fiber_switch);
-	}
+	/* unreachable */
     }
 
     if (is_resume) {
 	fib->prev = fiber_current();
     }
-
-    VM_ASSERT(FIBER_RUNNABLE_P(fib));
+    else {
+	/* restore `tracing' context. see [Feature #4347] */
+	th->trace_arg = cont->saved_thread.trace_arg;
+    }
 
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
+
     value = fiber_store(fib, th);
-    RUBY_VM_CHECK_INTS(th->ec);
+    RUBY_VM_CHECK_INTS(th);
 
-    EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
+    EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil);
 
     return value;
 }
@@ -1848,68 +1478,35 @@ fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
 VALUE
 rb_fiber_transfer(VALUE fibval, int argc, const VALUE *argv)
 {
-    return fiber_switch(fiber_ptr(fibval), argc, argv, 0);
-}
-
-void
-rb_fiber_close(rb_fiber_t *fib)
-{
-    rb_execution_context_t *ec = &fib->cont.saved_ec;
-    VALUE *vm_stack = ec->vm_stack;
-    size_t stack_bytes = ec->vm_stack_size * sizeof(VALUE);
-
-    fiber_status_set(fib, FIBER_TERMINATED);
-    if (stack_bytes == rb_ec_vm_ptr(ec)->default_params.thread_vm_stack_size) {
-        rb_thread_recycle_stack_release(vm_stack);
-    }
-    else {
-        ruby_xfree(vm_stack);
-    }
-    rb_ec_set_vm_stack(ec, NULL, 0);
-
-#if !FIBER_USE_NATIVE
-    /* should not mark machine stack any more */
-    ec->machine.stack_end = NULL;
-#endif
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+    return fiber_switch(fib, argc, argv, 0);
 }
 
 static void
-rb_fiber_terminate(rb_fiber_t *fib, int need_interrupt)
+rb_fiber_terminate(rb_fiber_t *fib)
 {
     VALUE value = fib->cont.value;
-    rb_fiber_t *ret_fib;
-
-    VM_ASSERT(FIBER_RESUMED_P(fib));
-    rb_fiber_close(fib);
-
-#if FIBER_USE_NATIVE
-#if defined(FIBER_USE_COROUTINE)
-    coroutine_destroy(&fib->context);
-#elif !defined(_WIN32)
-    fib->context.uc_stack.ss_sp = NULL;
-#endif
-
-#ifdef MAX_MACHINE_STACK_CACHE
+    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
-#endif
-
-    ret_fib = return_fiber();
-    if (need_interrupt) RUBY_VM_SET_INTERRUPT(&ret_fib->cont.saved_ec);
-    fiber_switch(ret_fib, 1, &value, 0);
+    fiber_switch(return_fiber(), 1, &value, 0);
 }
 
 VALUE
 rb_fiber_resume(VALUE fibval, int argc, const VALUE *argv)
 {
-    rb_fiber_t *fib = fiber_ptr(fibval);
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
 
-    if (fib->prev != 0 || fiber_is_root_p(fib)) {
+    if (fib->prev != 0 || fib->cont.type == ROOT_FIBER_CONTEXT) {
 	rb_raise(rb_eFiberError, "double resume");
     }
     if (fib->transferred != 0) {
@@ -1926,10 +1523,13 @@ rb_fiber_yield(int argc, const VALUE *argv)
 }
 
 void
-rb_fiber_reset_root_local_storage(rb_thread_t *th)
+rb_fiber_reset_root_local_storage(VALUE thval)
 {
-    if (th->root_fiber && th->root_fiber != th->ec->fiber_ptr) {
-	th->ec->local_storage = th->root_fiber->cont.saved_ec.local_storage;
+    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;
     }
 }
 
@@ -1945,7 +1545,9 @@ rb_fiber_reset_root_local_storage(rb_thread_t *th)
 VALUE
 rb_fiber_alive_p(VALUE fibval)
 {
-    return FIBER_TERMINATED_P(fiber_ptr(fibval)) ? Qfalse : Qtrue;
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+    return fib->status != TERMINATED ? Qtrue : Qfalse;
 }
 
 /*
@@ -2017,7 +1619,8 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
 static VALUE
 rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
 {
-    rb_fiber_t *fib = fiber_ptr(fibval);
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
     fib->transferred = 1;
     return fiber_switch(fib, argc, argv, 0);
 }
@@ -2052,45 +1655,7 @@ 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 fibval)
-{
-    const rb_fiber_t *fib = fiber_ptr(fibval);
-    const rb_proc_t *proc;
-    char status_info[0x10];
-
-    snprintf(status_info, 0x10, " (%s)", fiber_status_name(fib->status));
-    if (!rb_obj_is_proc(fib->first_proc)) {
-	VALUE str = rb_any_to_s(fibval);
-	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(fib->first_proc, proc);
-    return rb_block_to_s(fibval, &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
 
 /*
  *  Document-class: FiberError
@@ -2118,7 +1683,7 @@ Init_Cont(void)
 #else /* not WIN32 */
     pagesize = sysconf(_SC_PAGESIZE);
 #endif
-    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+    SET_MACHINE_STACK_END(&th->machine.stack_end);
 #endif
 
     rb_cFiber = rb_define_class("Fiber", rb_cObject);
@@ -2127,8 +1692,6 @@ Init_Cont(void)
     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, "resume", rb_fiber_m_resume, -1);
-    rb_define_method(rb_cFiber, "to_s", fiber_to_s, 0);
-    rb_define_alias(rb_cFiber, "inspect", "to_s");
 }
 
 RUBY_SYMBOL_EXPORT_BEGIN
diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S
deleted file mode 100644
index 6193993e03..0000000000
--- a/coroutine/amd64/Context.S
+++ /dev/null
@@ -1,46 +0,0 @@
-##
-##  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. All rights reserved.
-##
-
-.text
-
-# For older linkers
-.globl _coroutine_transfer
-_coroutine_transfer:
-
-.globl coroutine_transfer
-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 stack
-	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
deleted file mode 100644
index 1801c1e2c5..0000000000
--- a/coroutine/amd64/Context.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __attribute__((noreturn)) void
-
-const size_t COROUTINE_REGISTERS = 6;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    /* Force 16-byte alignment */
-    context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF);
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    *--context->stack_pointer = NULL;
-    *--context->stack_pointer = (void*)start;
-
-    context->stack_pointer -= COROUTINE_REGISTERS;
-    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-    context->stack_pointer = NULL;
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/arm32/Context.S b/coroutine/arm32/Context.S
deleted file mode 100644
index c2b93d0a34..0000000000
--- a/coroutine/arm32/Context.S
+++ /dev/null
@@ -1,14 +0,0 @@
-##
-##  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. All rights reserved.
-##
-
-.text
-
-.globl coroutine_transfer
-coroutine_transfer:
-	stmia r1!, {r4-r11,sp,lr}
-	ldmia r0!, {r4-r11,sp,pc}
-	bx lr
diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h
deleted file mode 100644
index 60732df7a0..0000000000
--- a/coroutine/arm32/Context.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __attribute__((noreturn)) void
-
-const size_t COROUTINE_REGISTERS = 9;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    context->stack_pointer = (void**)stack_pointer;
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    *--context->stack_pointer = (void*)start;
-
-    context->stack_pointer -= COROUTINE_REGISTERS;
-    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S
deleted file mode 100644
index f6e5f0a6bc..0000000000
--- a/coroutine/arm64/Context.S
+++ /dev/null
@@ -1,59 +0,0 @@
-##
-##  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. All rights reserved.
-##
-
-.text
-.align 2
-
-.global coroutine_transfer
-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
deleted file mode 100644
index 03b91fd937..0000000000
--- a/coroutine/arm64/Context.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __attribute__((noreturn)) void
-
-const size_t COROUTINE_REGISTERS = 0xb0 / 8;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    /* Force 16-byte alignment */
-    context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF);
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    context->stack_pointer -= COROUTINE_REGISTERS;
-    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
-
-    context->stack_pointer[0xa0 / 8] = (void*)start;
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/ppc64le/Context.S b/coroutine/ppc64le/Context.S
deleted file mode 100644
index 1b39086f8f..0000000000
--- a/coroutine/ppc64le/Context.S
+++ /dev/null
@@ -1,72 +0,0 @@
-.text
-.align 2
-
-.globl coroutine_transfer
-.type   coroutine_transfer, @function
-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
deleted file mode 100644
index de592f5a46..0000000000
--- a/coroutine/ppc64le/Context.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __attribute__((noreturn)) void
-
-const size_t COROUTINE_REGISTERS =
-  19  /* 18 general purpose registers (r14-r31) and 1 return address */
-  + 4;  /* space for fiber_entry() to store the link register */
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    /* Force 16-byte alignment */
-    context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF);
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    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;
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-    context->stack_pointer = NULL;
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm
deleted file mode 100644
index 2647ea4bc4..0000000000
--- a/coroutine/win32/Context.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-;;
-;;  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. All rights reserved.
-;;
-
-.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
deleted file mode 100644
index aa9f17ddab..0000000000
--- a/coroutine/win32/Context.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __declspec(noreturn) void __fastcall
-
-/* This doesn't include thread information block */
-const size_t COROUTINE_REGISTERS = 4;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef void(__fastcall * coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    context->stack_pointer = (void**)stack_pointer;
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    *--context->stack_pointer = (void*)start;
-
-    /* Windows Thread Information Block */
-    *--context->stack_pointer = 0; /* fs:[0] */
-    *--context->stack_pointer = (void*)stack_pointer; /* fs:[4] */
-    *--context->stack_pointer = (void*)((char *)stack_pointer - stack_size);  /* fs:[8] */
-
-    context->stack_pointer -= COROUTINE_REGISTERS;
-    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
-}
-
-coroutine_context * __fastcall coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/win64/Context.S b/coroutine/win64/Context.S
deleted file mode 100644
index 4b16e0ce8c..0000000000
--- a/coroutine/win64/Context.S
+++ /dev/null
@@ -1,77 +0,0 @@
-##
-##  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. All rights reserved.
-##
-
-.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
deleted file mode 100644
index 59673ffa3e..0000000000
--- a/coroutine/win64/Context.asm
+++ /dev/null
@@ -1,79 +0,0 @@
-;;
-;;  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. All rights reserved.
-;;
-
-.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
deleted file mode 100644
index 16a8f583ab..0000000000
--- a/coroutine/win64/Context.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __declspec(noreturn) void
-
-const size_t COROUTINE_REGISTERS = 8;
-const size_t COROUTINE_XMM_REGISTERS = 1+10*2;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef void(* coroutine_start)(coroutine_context *from, coroutine_context *self);
-
-void coroutine_trampoline();
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    /* Force 16-byte alignment */
-    context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF);
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    /* 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*)stack_pointer; /* gs:[0x08] */
-    *--context->stack_pointer = (void*)((char *)stack_pointer - stack_size);  /* 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);
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target);
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/coroutine/x86/Context.S b/coroutine/x86/Context.S
deleted file mode 100644
index d6a0a2def7..0000000000
--- a/coroutine/x86/Context.S
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-##  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. All rights reserved.
-##
-
-.text
-
-.globl coroutine_transfer
-coroutine_transfer:
-
-# For older linkers
-.globl _coroutine_transfer
-_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
deleted file mode 100644
index b077227a1d..0000000000
--- a/coroutine/x86/Context.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  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. All rights reserved.
-*/
-
-#pragma once
-
-#include <assert.h>
-#include <string.h>
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#define COROUTINE __attribute__((noreturn, fastcall)) void
-
-const size_t COROUTINE_REGISTERS = 4;
-
-typedef struct
-{
-    void **stack_pointer;
-} coroutine_context;
-
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self) __attribute__((fastcall));
-
-static inline void coroutine_initialize(
-    coroutine_context *context,
-    coroutine_start start,
-    void *stack_pointer,
-    size_t stack_size
-) {
-    /* Force 16-byte alignment */
-    context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF);
-
-    if (!start) {
-        assert(!context->stack_pointer);
-        /* We are main coroutine for this thread */
-        return;
-    }
-
-    *--context->stack_pointer = NULL;
-    *--context->stack_pointer = (void*)start;
-
-    context->stack_pointer -= COROUTINE_REGISTERS;
-    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
-}
-
-coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target) __attribute__((fastcall));
-
-static inline void coroutine_destroy(coroutine_context * context)
-{
-    context->stack_pointer = NULL;
-}
-
-#if __cplusplus
-}
-#endif
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 192cf43b37..2f93102efe 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,3 +1,5 @@
+override MFLAGS := $(filter-out -j%,$(MFLAGS))
+override MAKEFLAGS := $(filter-out -j%,$(MAKEFLAGS))
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
diff --git a/debug.c b/debug.c
index e4ad163ad1..8a5e69bbf5 100644
--- a/debug.c
+++ b/debug.c
@@ -11,12 +11,10 @@
 
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
-#include "ruby/io.h"
 #include "ruby/util.h"
 #include "vm_debug.h"
 #include "eval_intern.h"
 #include "vm_core.h"
-#include "symbol.h"
 #include "id.h"
 
 /* for gdb */
@@ -31,41 +29,12 @@ const union {
     enum ruby_encoding_consts   encoding_consts;
     enum ruby_coderange_type    enc_coderange_types;
     enum ruby_econv_flag_type   econv_flag_types;
-    enum ruby_robject_flags     robject_flags;
-    enum ruby_rmodule_flags     rmodule_flags;
-    enum ruby_rstring_flags     rstring_flags;
-    enum ruby_rarray_flags      rarray_flags;
     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;
@@ -137,87 +106,25 @@ ruby_debug_breakpoint(void)
     /* */
 }
 
-#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;
-
-int
-ruby_env_debug_option(const char *str, int len, void *arg)
+static void
+set_debug_option(const char *str, int len, void *arg)
 {
-    int ov;
-    size_t retlen;
-    unsigned long n;
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+    extern int ruby_w32_rtc_error;
+#endif
 #define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
 	    (var) = (val);		    \
-	    return 1;			    \
+	    return;			    \
 	}				    \
     } 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 (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
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
     SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
-# endif
 #endif
-#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);
-    }
+    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
 }
 
 void
diff --git a/debug_counter.c b/debug_counter.c
deleted file mode 100644
index 8c4004af41..0000000000
--- a/debug_counter.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/**********************************************************************
-
-  debug_counter.c -
-
-  created at: Tue Feb 21 16:51:18 2017
-
-  Copyright (C) 2017 Koichi Sasada
-
-**********************************************************************/
-
-#include "debug_counter.h"
-#if USE_DEBUG_COUNTER
-#include <stdio.h>
-#include <locale.h>
-#include "internal.h"
-
-static const char *const debug_counter_names[] = {
-    ""
-#define RB_DEBUG_COUNTER(name) #name,
-#include "debug_counter.h"
-#undef RB_DEBUG_COUNTER
-};
-
-size_t rb_debug_counter[numberof(debug_counter_names)];
-
-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]);
-	}
-    }
-}
-
-__attribute__((destructor))
-static void
-debug_counter_show_results_at_exit(void)
-{
-    rb_debug_counter_show_results("normal exit.");
-}
-#else
-void
-rb_debug_counter_show_results(const char *msg)
-{
-}
-#endif /* USE_DEBUG_COUNTER */
diff --git a/debug_counter.h b/debug_counter.h
deleted file mode 100644
index bd03204af4..0000000000
--- a/debug_counter.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/**********************************************************************
-
-  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 (mc) counts.
- *
- * * mc_inline_hit/miss: inline mc hit/miss counts (VM send insn)
- * * mc_global_hit/miss: global method cache hit/miss counts
- *                       two types: (1) inline cache miss (VM send insn)
- *                                  (2) called from C (rb_funcall).
- * * mc_global_state_miss: inline mc miss by global_state miss.
- * * mc_class_serial_miss:            ... by mc_class_serial_miss
- * * mc_cme_complement: cme complement counts.
- * * mc_cme_complement_hit: cme cache hit counts.
- * * mc_search_super: search_method() call counts.
- */
-RB_DEBUG_COUNTER(mc_inline_hit)
-RB_DEBUG_COUNTER(mc_inline_miss)
-RB_DEBUG_COUNTER(mc_global_hit)
-RB_DEBUG_COUNTER(mc_global_miss)
-RB_DEBUG_COUNTER(mc_global_state_miss)
-RB_DEBUG_COUNTER(mc_class_serial_miss)
-RB_DEBUG_COUNTER(mc_cme_complement)
-RB_DEBUG_COUNTER(mc_cme_complement_hit)
-RB_DEBUG_COUNTER(mc_search_super)
-
-/*
- * 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_oorange)
-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)
-
-/* object allocation counts:
- *
- * * obj_newobj: newobj counts
- * * obj_newobj_slowpath: newobj with slowpath counts
- * * obj_newobj_wb_unprotected: newobj for wb_unprotecte.
- * * 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_under4:     has under 4 entries
- *   * hash_ge4:        has n entries (4<=n<8)
- *   * hash_ge8:        has n entries (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_hash_empty)
-RB_DEBUG_COUNTER(obj_hash_under4)
-RB_DEBUG_COUNTER(obj_hash_ge4)
-RB_DEBUG_COUNTER(obj_hash_ge8)
-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_regexp_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_ptr)
-RB_DEBUG_COUNTER(obj_file_ptr)
-RB_DEBUG_COUNTER(obj_bignum_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_iclass_ptr)
-RB_DEBUG_COUNTER(obj_class_ptr)
-RB_DEBUG_COUNTER(obj_module_ptr)
-
-/* 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)
-
-/* 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
-
-#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
-#include "ruby/ruby.h"
-
-extern size_t rb_debug_counter[];
-
-inline static int
-rb_debug_counter_add(enum rb_debug_counter_type type, int add, int cond)
-{
-    if (cond) {
-	rb_debug_counter[(int)type] += add;
-    }
-    return cond;
-}
-
-#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))
-
-#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)
-#endif
-
-void rb_debug_counter_show_results(const char *msg);
-
-#endif /* RUBY_DEBUG_COUNTER_H */
diff --git a/defs/gmake.mk b/defs/gmake.mk
index d8a43802ef..2233627f8c 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -1,28 +1,13 @@
 # -*- makefile-gmake -*-
 gnumake = yes
-override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
-override mflags := $(filter-out -j%,$(MFLAGS))
-MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
-
-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_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-all,test test-testframework test-almost,$(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)
+
+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))
 
 ifneq ($(filter -O0 -Od,$(optflags)),)
 override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
@@ -51,25 +36,25 @@ define archcmd
 %.i: %.$(1).i
 endef
 
-$(foreach arch,$(arch_flags),\
+$(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
 	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
 endif
 
-.PHONY: $(addprefix yes-,$(TEST_TARGETS))
-
-ifneq ($(filter-out btest%,$(TEST_TARGETS)),)
-$(addprefix yes-,$(TEST_TARGETS)): $(TEST_DEPENDS)
+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
 endif
 
-ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
-	btest-ruby test-knownbug test-basic \
-	test-testframework test-ruby test-almost test-all \
-	test-spec test-bundler-prepare test-bundler \
-	)
-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)))
+$(TEST_TARGETS): $(TEST_DEPENDS)
 
 ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
 install-targets := $(filter install uninstall,$(MAKECMDGOALS))
@@ -81,6 +66,11 @@ 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 yes-test-testframework no-test-testframework
@@ -88,9 +78,6 @@ install-prereq: sudo-precheck
 yes-test-all no-test-all: install
 yes-test-almost no-test-almost: install
 endif
-ifneq ($(filter great,$(MAKECMDGOALS)),)
-love: test-rubyspec
-endif
 
 $(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c
 ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),)
@@ -109,7 +96,7 @@ endif
 STUBPROGRAM = rubystub$(EXEEXT)
 IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
 SCRIPTBINDIR := $(if $(EXEEXT),,exec/)
-SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/libexec/*)))))
+SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))))
 
 stub: $(STUBPROGRAM)
 scriptbin: $(SCRIPTPROGRAMS)
@@ -138,68 +125,3 @@ $(SCRIPTBINDIR)%$(EXEEXT): bin/% $(STUBPROGRAM) \
 $(TIMESTAMPDIR)/.exec.time:
 	$(Q) mkdir exec
 	$(Q) exit > $@
-
-.PHONY: commit
-commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS)))
-	@$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit'
-	+$(Q) \
-	{ \
-	  $(CHDIR) "$(srcdir)"; \
-	  sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \
-	  sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
-	} | \
-	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" 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
-
-ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
-extract-gems: update-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
-
-# 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)
-
-# 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) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) -- $(patsubst test/%,%,$@)
-
-clean-srcs-ext::
-	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXT_SRCS))
-
-clean-srcs-extra::
-	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXTRA_SRCS))
diff --git a/defs/id.def b/defs/id.def
index bb7cc6f922..4fe9d3ccd8 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -38,16 +38,11 @@ firstline, predefined = __LINE__+1, %[\
   to_a
   to_s
   to_i
-  to_f
-  to_r
   bt
   bt_locations
   call
   mesg
   exception
-  not                                                   NOT
-  and                                                   AND
-  or                                                    OR
 
   _                                                     UScore
   "/*NULL*/"                                            NULL
@@ -63,6 +58,8 @@ 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
 
@@ -79,6 +76,7 @@ token_ops = %[\
   UPlus         +@      UPLUS
   UMinus        -@      UMINUS
   Pow           **      POW
+  DSTAR         **
   Cmp           <=>     CMP
   PLUS          +
   MINUS         -
@@ -95,14 +93,13 @@ 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 fc30ec2d15..e0d931cd1f 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -1,8 +1,8 @@
 %{
-struct kwtable {short name, id[2], state;};
+struct kwtable {int name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct kwtable *reserved_word(const char *, unsigned int);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/defs/known_errors.def b/defs/known_errors.def
index e9694cfbda..b9c490d3a2 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -1,157 +1,148 @@
+EPERM
+ENOENT
+ESRCH
+EINTR
+EIO
+ENXIO
 E2BIG
-EACCES
-EADDRINUSE
-EADDRNOTAVAIL
-EADV
-EAFNOSUPPORT
+ENOEXEC
+EBADF
+ECHILD
 EAGAIN
-EALREADY
-EAUTH
-EBADARCH
+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
 EBADE
-EBADEXEC
-EBADF
-EBADFD
-EBADMACHO
-EBADMSG
 EBADR
-EBADRPC
+EXFULL
+ENOANO
 EBADRQC
 EBADSLT
+EDEADLOCK
 EBFONT
-EBUSY
-ECANCELED
-ECAPMODE
-ECHILD
-ECHRNG
+ENOSTR
+ENODATA
+ETIME
+ENOSR
+ENONET
+ENOPKG
+EREMOTE
+ENOLINK
+EADV
+ESRMNT
 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
-ECONNREFUSED
 ECONNRESET
-EDEADLK
-EDEADLOCK
-EDESTADDRREQ
-EDEVERR
-EDOM
-EDOOFUS
-EDOTDOT
-EDQUOT
-EEXIST
-EFAULT
-EFBIG
-EFTYPE
+ENOBUFS
+EISCONN
+ENOTCONN
+ESHUTDOWN
+ETOOMANYREFS
+ETIMEDOUT
+ECONNREFUSED
 EHOSTDOWN
 EHOSTUNREACH
-EHWPOISON
-EIDRM
-EILSEQ
+EALREADY
 EINPROGRESS
-EINTR
-EINVAL
-EIO
-EIPSEC
-EISCONN
-EISDIR
+ESTALE
+EUCLEAN
+ENOTNAM
+ENAVAIL
 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
-ENOTSOCK
-ENOTSUP
-ENOTTY
-ENOTUNIQ
-ENXIO
-EOPNOTSUPP
-EOVERFLOW
 EOWNERDEAD
-EPERM
-EPFNOSUPPORT
-EPIPE
+ERFKILL
+EAUTH
+EBADRPC
+EDOOFUS
+EFTYPE
+ENEEDAUTH
+ENOATTR
+ENOTSUP
 EPROCLIM
 EPROCUNAVAIL
 EPROGMISMATCH
 EPROGUNAVAIL
-EPROTO
-EPROTONOSUPPORT
-EPROTOTYPE
-EPWROFF
-EQFULL
-ERANGE
-EREMCHG
-EREMOTE
-EREMOTEIO
-ERESTART
-ERFKILL
-EROFS
 ERPCMISMATCH
-ESHLIBVERS
-ESHUTDOWN
-ESOCKTNOSUPPORT
-ESPIPE
-ESRCH
-ESRMNT
-ESTALE
-ESTRPIPE
-ETIME
-ETIMEDOUT
-ETOOMANYREFS
-ETXTBSY
-EUCLEAN
-EUNATCH
-EUSERS
-EWOULDBLOCK
-EXDEV
-EXFULL
+EIPSEC
+EHWPOISON
+ECAPMODE
+ENOTCAPABLE
diff --git a/defs/lex.c.src b/defs/lex.c.src
index fc30ec2d15..e0d931cd1f 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -1,8 +1,8 @@
 %{
-struct kwtable {short name, id[2], state;};
+struct kwtable {int name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct kwtable *reserved_word(const char *, unsigned int);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/defs/separated_version.mk b/defs/separated_version.mk
deleted file mode 100644
index f086f4b24a..0000000000
--- a/defs/separated_version.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# ******** FOR DEVELEPERS ONLY ********
-# Separate version.o into a shared library which varies every
-# revisions, in order to make the rest sharable.
-
-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
deleted file mode 100644
index c34a31b356..0000000000
--- a/defs/universal.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-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 38167514c0..90fc1efed9 100644
--- a/dir.c
+++ b/dir.c
@@ -11,10 +11,7 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
-#include "ruby/thread.h"
 #include "internal.h"
-#include "id.h"
 #include "encindex.h"
 
 #include <sys/types.h>
@@ -24,25 +21,6 @@
 #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
-#ifndef AT_FDCWD
-# define AT_FDCWD -1
-#endif
-
 #undef HAVE_DIRENT_NAMLEN
 #if defined HAVE_DIRENT_H && !defined _WIN32
 # include <dirent.h>
@@ -67,6 +45,10 @@
 #  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>
 
@@ -82,8 +64,6 @@ char *strchr(char*,char);
 
 #include "ruby/util.h"
 
-#define vm_initialized rb_cThread
-
 /* define system APIs */
 #ifdef _WIN32
 #undef chdir
@@ -94,7 +74,6 @@ char *strchr(char*,char);
 #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
@@ -177,7 +156,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 {
@@ -442,7 +421,7 @@ VALUE rb_cDir;
 
 struct dir_data {
     DIR *dir;
-    const VALUE path;
+    VALUE path;
     rb_encoding *enc;
 };
 
@@ -457,8 +436,9 @@ static void
 dir_free(void *ptr)
 {
     struct dir_data *dir = ptr;
-
-    if (dir->dir) closedir(dir->dir);
+    if (dir) {
+	if (dir->dir) closedir(dir->dir);
+    }
     xfree(dir);
 }
 
@@ -471,11 +451,20 @@ 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_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, 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)
 {
@@ -483,34 +472,12 @@ dir_s_alloc(VALUE klass)
     VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
 
     dirp->dir = NULL;
-    RB_OBJ_WRITE(obj, &dirp->path, Qnil);
+    dirp->path = Qnil;
     dirp->enc = NULL;
 
     return obj;
 }
 
-static void *
-nogvl_opendir(void *ptr)
-{
-    const char *path = ptr;
-
-    return (void *)opendir(path);
-}
-
-static DIR *
-opendir_without_gvl(const char *path)
-{
-    if (vm_initialized) {
-	union { const void *in; void *out; } u;
-
-	u.in = path;
-
-	return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
-    }
-    else
-	return opendir(path);
-}
-
 /*
  *  call-seq:
  *     Dir.new( string ) -> aDir
@@ -518,7 +485,7 @@ opendir_without_gvl(const char *path)
  *
  *  Returns a new directory object for the named directory.
  *
- *  The optional <i>encoding</i> keyword argument specifies the encoding of the directory.
+ *  The optional <i>enc</i> argument specifies the encoding of the directory.
  *  If not specified, the filesystem encoding is used.
  */
 static VALUE
@@ -546,7 +513,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
 	}
     }
 
-    FilePathValue(dirname);
+    GlobPathValue(dirname, FALSE);
     orig = rb_str_dup_frozen(dirname);
     dirname = rb_str_encode_ospath(dirname);
     dirname = rb_str_dup_frozen(dirname);
@@ -554,30 +521,29 @@ 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;
-    RB_OBJ_WRITE(dir, &dp->path, Qnil);
+    dp->path = Qnil;
     dp->enc = fsenc;
     path = RSTRING_PTR(dirname);
-    dp->dir = opendir_without_gvl(path);
+    dp->dir = opendir(path);
     if (dp->dir == NULL) {
-	int e = errno;
-	if (rb_gc_for_fd(e)) {
-	    dp->dir = opendir_without_gvl(path);
+	if (rb_gc_for_fd(errno)) {
+	    dp->dir = opendir(path);
 	}
 #ifdef HAVE_GETATTRLIST
-	else if (e == EIO) {
+	else if (errno == 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_without_gvl(path);
+		dp->dir = opendir(path);
 	    }
 	}
 #endif
 	if (dp->dir == NULL) {
 	    RB_GC_GUARD(dirname);
-	    rb_syserr_fail_path(e, orig);
+	    rb_sys_fail_path(orig);
 	}
     }
-    RB_OBJ_WRITE(dir, &dp->path, orig);
+    dp->path = orig;
 
     return dir;
 }
@@ -589,7 +555,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
  *     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.
+ *  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
@@ -612,8 +578,6 @@ dir_s_open(int argc, VALUE *argv, VALUE klass)
     return dir;
 }
 
-NORETURN(static void dir_closed(void));
-
 static void
 dir_closed(void)
 {
@@ -658,7 +622,7 @@ dir_inspect(VALUE dir)
 	rb_str_cat2(str, ">");
 	return str;
     }
-    return rb_funcallv(dir, idTo_s, 0, 0);
+    return rb_funcallv(dir, rb_intern("to_s"), 0, 0);
 }
 
 /* Workaround for Solaris 10 that does not have dirfd.
@@ -742,8 +706,6 @@ 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)
 {
@@ -790,20 +752,11 @@ dir_read(VALUE dir)
 	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else {
-	int e = errno;
-	if (e != 0) rb_syserr_fail(e, 0);
+	if (errno != 0) rb_sys_fail(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
@@ -827,17 +780,11 @@ dir_yield(VALUE arg, VALUE path)
 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)));
@@ -845,11 +792,6 @@ dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_o
 	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))) {
@@ -858,7 +800,7 @@ dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_o
 	else
 #endif
 	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
-	(*each)(arg, path);
+	rb_yield(path);
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
@@ -990,14 +932,6 @@ 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)
 {
@@ -1080,8 +1014,9 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path = Qnil;
 
-    if (rb_check_arity(argc, 0, 1) == 1) {
-        path = rb_str_encode_ospath(rb_get_path(argv[0]));
+    if (rb_scan_args(argc, argv, "01", &path) == 1) {
+	FilePathValue(path);
+	path = rb_str_encode_ospath(path);
     }
     else {
 	const char *dist = getenv("HOME");
@@ -1105,62 +1040,31 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 	args.done = FALSE;
 	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
-    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);
-    }
+    dir_chdir(path);
 
     return INT2FIX(0);
 }
 
-#ifndef _WIN32
 VALUE
-rb_dir_getwd_ospath(void)
+rb_dir_getwd(void)
 {
     char *path;
     VALUE cwd;
-    VALUE path_guard;
+    int fsenc = rb_enc_to_index(rb_filesystem_encoding());
 
-#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;
+    if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII;
+    path = my_getcwd();
 #ifdef __APPLE__
     cwd = rb_str_normalize_ospath(path, strlen(path));
     OBJ_TAINT(cwd);
 #else
     cwd = rb_tainted_str_new2(path);
 #endif
-    DATA_PTR(path_guard) = 0;
+    rb_enc_associate_index(cwd, fsenc);
 
     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:
@@ -1223,19 +1127,6 @@ 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
@@ -1254,34 +1145,23 @@ nogvl_mkdir(void *ptr)
 static VALUE
 dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 {
-    struct mkdir_arg m;
     VALUE path, vmode;
-    int r;
+    int mode;
 
     if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
-	m.mode = NUM2MODET(vmode);
+	mode = NUM2INT(vmode);
     }
     else {
-	m.mode = 0777;
+	mode = 0777;
     }
 
     path = check_dirname(path);
-    m.path = RSTRING_PTR(path);
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_mkdir, &m, RUBY_UBF_IO, 0);
-    if (r < 0)
+    if (mkdir(RSTRING_PTR(path), mode) == -1)
 	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
@@ -1294,13 +1174,8 @@ nogvl_rmdir(void *ptr)
 static VALUE
 dir_s_rmdir(VALUE obj, VALUE dir)
 {
-    const char *p;
-    int r;
-
     dir = check_dirname(dir);
-    p = RSTRING_PTR(dir);
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_rmdir, (void *)p, RUBY_UBF_IO, 0);
-    if (r < 0)
+    if (rmdir(RSTRING_PTR(dir)) < 0)
 	rb_sys_fail_path(dir);
 
     return INT2FIX(0);
@@ -1356,63 +1231,32 @@ 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.
  */
-ALWAYS_INLINE(static int to_be_ignored(int e));
-static inline int
-to_be_ignored(int e)
-{
-    return e == ENOENT || e == ENOTDIR;
-}
+#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
 
 #ifdef _WIN32
-#define STAT(p, s)	rb_w32_ustati128((p), (s))
+#define STAT(p, s)	rb_w32_ustati64((p), (s))
 #undef lstat
-#define lstat(p, s)	rb_w32_ulstati128((p), (s))
+#define lstat(p, s)	rb_w32_ulstati64((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(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_stat(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 || USE_OPENDIR_AT
+#if defined HAVE_LSTAT || defined lstat
 static int
-do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_lstat(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);
 
@@ -1422,85 +1266,8 @@ do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags,
 #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 int basefd, size_t baselen, const char *path, int flags, rb_encoding *enc,
-	   ruby_glob_errfunc *errfunc, VALUE arg, int *status)
+do_opendir(const char *path, int flags, rb_encoding *enc)
 {
     DIR *dirp;
 #ifdef _WIN32
@@ -1511,20 +1278,9 @@ do_opendir(const int basefd, size_t baselen, const char *path, int flags, rb_enc
 	path = RSTRING_PTR(tmp);
     }
 #endif
-    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);
-	    }
-	}
-    }
+    dirp = opendir(path);
+    if (dirp == NULL && !to_be_ignored(errno))
+	sys_warning(path, enc);
 #ifdef _WIN32
     if (tmp) rb_str_resize(tmp, 0); /* GC guard */
 #endif
@@ -1533,7 +1289,7 @@ do_opendir(const int basefd, size_t baselen, const char *path, int flags, rb_enc
 }
 
 /* Globing pattern */
-enum glob_pattern_type { PLAIN, ALPHA, BRACE, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+enum glob_pattern_type { PLAIN, ALPHA, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static enum glob_pattern_type
@@ -1541,20 +1297,15 @@ 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 '[':
-	    hasmagical = 1;
-	    break;
+	    return MAGICAL;
 
 	  case '\\':
 	    if (escape && p++ >= pend)
@@ -1579,7 +1330,7 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 	p = Next(p-1, pend, enc);
     }
 
-    return hasmagical ? MAGICAL : hasalpha ? ALPHA : PLAIN;
+    return hasalpha ? ALPHA : PLAIN;
 }
 
 /* Find separator in globbing pattern. */
@@ -1600,13 +1351,6 @@ 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;
@@ -1739,7 +1483,7 @@ glob_free_pattern(struct glob_pattern *list)
 }
 
 static char *
-join_path(const char *path, size_t len, int dirsep, const char *name, size_t namlen)
+join_path(const char *path, long len, int dirsep, const char *name, size_t namlen)
 {
     char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
 
@@ -1754,13 +1498,8 @@ join_path(const char *path, size_t len, int dirsep, const char *name, size_t nam
 }
 
 #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, const char *path)
+is_case_sensitive(DIR *dirp)
 {
     struct {
 	u_int32_t length;
@@ -1771,13 +1510,8 @@ is_case_sensitive(DIR *dirp, const char *path)
     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;
@@ -1928,8 +1662,6 @@ 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;
 };
@@ -1945,61 +1677,6 @@ 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
-
-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);
-    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;
-}
-
 static inline int
 dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct dirent *dp, int flags)
 {
@@ -2012,101 +1689,24 @@ 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 struct dirent *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);
-	    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 int
 glob_helper(
-    int fd,
     const char *path,
-    size_t baselen,
-    size_t namelen,
+    long pathlen,
     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,
-    const ruby_glob_funcs_t *funcs,
+    ruby_glob_func *func,
     VALUE arg,
     rb_encoding *enc)
 {
     struct stat st;
     int status = 0;
     struct glob_pattern **cur, **new_beg, **new_end;
-    int plain = 0, brace = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
+    int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
     int escape = !(flags & FNM_NOESCAPE);
-    size_t pathlen = baselen + namelen;
 
     for (cur = beg; cur < end; ++cur) {
 	struct glob_pattern *p = *cur;
@@ -2125,11 +1725,6 @@ glob_helper(
 	    magical = 1;
 #endif
 	    break;
-	  case BRACE:
-	    if (!recursive) {
-		brace = 1;
-	    }
-	    break;
 	  case MAGICAL:
 	    magical = 2;
 	    break;
@@ -2144,35 +1739,17 @@ 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(fd, baselen, path, &st, flags, enc) == 0) {
+	    if (do_lstat(path, &st, flags, enc) == 0) {
 		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
 		pathtype = path_noent;
 	    }
 	}
-	if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) {
-	    if (do_stat(fd, baselen, path, &st, flags, enc) == 0) {
+	if (match_dir && pathtype == path_unknown) {
+	    if (do_stat(path, &st, flags, enc) == 0) {
 		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
@@ -2180,16 +1757,13 @@ glob_helper(
 	    }
 	}
 	if (match_all && pathtype > path_noent) {
-	    const char *subpath = path + baselen + (baselen && path[baselen] == '/');
-	    status = glob_call_func(funcs->match, subpath, arg, enc);
+	    status = glob_call_func(func, path, arg, enc);
 	    if (status) return status;
 	}
 	if (match_dir && pathtype == path_directory) {
-	    int seplen = (baselen && path[baselen] == '/');
-	    const char *subpath = path + baselen + seplen;
-	    char *tmp = join_path(subpath, namelen - seplen, dirsep, "", 0);
+	    char *tmp = join_path(path, pathlen, dirsep, "", 0);
 	    if (!tmp) return -1;
-	    status = glob_call_func(funcs->match, tmp, arg, enc);
+	    status = glob_call_func(func, tmp, arg, enc);
 	    GLOB_FREE(tmp);
 	    if (status) return status;
 	}
@@ -2208,14 +1782,12 @@ glob_helper(
 	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(fd, basename, plainname, flags, enc, funcs->error, arg, &status);
+	    dirp = do_opendir(plainname, flags, enc);
 	    GLOB_FREE(plainname);
 	}
 	else
-# else
-	    ;
 # endif
-	dirp = do_opendir(fd, baselen, path, flags, enc, funcs->error, arg, &status);
+	dirp = do_opendir(*path ? path : ".", flags, enc);
 	if (dirp == NULL) {
 # if FNM_SYSCASE || NORMALIZE_UTF8PATH
 	    if ((magical < 2) && !recursive && (errno == EACCES)) {
@@ -2223,7 +1795,7 @@ glob_helper(
 		goto literally;
 	    }
 # endif
-	    return status;
+	    return 0;
 	}
 	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
 
@@ -2234,7 +1806,7 @@ glob_helper(
 	}
 # endif
 # ifdef HAVE_GETATTRLIST
-	if (is_case_sensitive(dirp, path) == 0)
+	if (is_case_sensitive(dirp) == 0)
 	    flags |= FNM_CASEFOLD;
 # endif
 	while ((dp = READDIR(dirp, enc)) != NULL) {
@@ -2245,22 +1817,21 @@ glob_helper(
 	    int dotfile = 0;
 	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
 
-	    name = dp->d_name;
-	    namlen = NAMLEN(dp);
-	    if (recursive && name[0] == '.') {
+	    if (recursive && dp->d_name[0] == '.') {
 		++dotfile;
-		if (namlen == 1) {
+		if (!dp->d_name[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 (namlen == 2 && name[1] == '.') {
+		else if (dp->d_name[1] == '.' && !dp->d_name[2]) {
 		    /* 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))) {
@@ -2275,16 +1846,16 @@ glob_helper(
 		break;
 	    }
 	    name = buf + pathlen + (dirsep != 0);
+	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) {
 #ifdef DT_UNKNOWN
-	    if (dp->d_type != DT_UNKNOWN) {
-		/* Got it. We need no more lstat. */
-		new_pathtype = dp->d_type;
-	    }
+		if ((new_pathtype = dp->d_type) != (rb_pathtype_t)DT_UNKNOWN)
+		    /* Got it. We need nothing more. */
+		    ;
+		else
+		    /* fall back to call lstat(2) */
 #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(fd, baselen, buf, &st, flags, enc) == 0)
+		if (do_lstat(buf, &st, flags, enc) == 0)
 		    new_pathtype = IFTODT(st.st_mode);
 		else
 		    new_pathtype = path_noent;
@@ -2299,24 +1870,13 @@ 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) {
-			if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
-			    *new_end++ = p; /* append recursive pattern */
-		    }
+			new_pathtype == path_exist)
+			*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 == USE_NAME_ON_FS_BY_FNMATCH
 		    if (plainname) {
@@ -2333,9 +1893,9 @@ glob_helper(
 		}
 	    }
 
-	    status = glob_helper(fd, buf, baselen, name - buf - baselen + namlen, 1,
+	    status = glob_helper(buf, name - buf + namlen, 1,
 				 new_pathtype, new_beg, new_end,
-				 flags, funcs, arg, enc);
+				 flags, func, arg, enc);
 	    GLOB_FREE(buf);
 	    GLOB_FREE(new_beg);
 	    if (status) break;
@@ -2392,16 +1952,14 @@ glob_helper(
 		}
 #if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
 		if ((*cur)->type == ALPHA) {
-		    buf = replace_real_basename(buf, pathlen + (dirsep != 0), enc,
-						IF_NORMALIZE_UTF8PATH(1)+0,
+		    long base = pathlen + (dirsep != 0);
+		    buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0,
 						flags, &new_pathtype);
-		    if (!buf) break;
 		}
 #endif
-		status = glob_helper(fd, buf, baselen,
-				     namelen + strlen(buf + pathlen), 1,
+		status = glob_helper(buf, pathlen + strlen(buf + pathlen), 1,
 				     new_pathtype, new_beg, new_end,
-				     flags, funcs, arg, enc);
+				     flags, func, arg, enc);
 		GLOB_FREE(buf);
 		GLOB_FREE(new_beg);
 		if (status) break;
@@ -2415,64 +1973,15 @@ glob_helper(
 }
 
 static int
-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)
+ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
     char *buf;
-    size_t n, baselen = 0;
-    int status, dirsep = FALSE;
+    size_t n;
+    int status;
 
     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);
@@ -2481,12 +1990,6 @@ ruby_glob0(const char *path, int fd, const char *base, int flags,
     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);
@@ -2497,9 +2000,8 @@ ruby_glob0(const char *path, int fd, const char *base, int flags,
 	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(fd, buf, baselen, n-baselen, dirsep,
-			 path_unknown, &list, &list + 1,
-			 flags, funcs, arg, enc);
+    status = glob_helper(buf, n, 0, path_unknown, &list, &list + 1,
+			 flags, func, arg, enc);
     glob_free_pattern(list);
     GLOB_FREE(buf);
 
@@ -2509,11 +2011,8 @@ ruby_glob0(const char *path, int fd, const char *base, int flags,
 int
 ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
 {
-    ruby_glob_funcs_t funcs;
-    funcs.match = func;
-    funcs.error = NULL;
-    return ruby_glob0(path, AT_FDCWD, 0, flags & ~GLOB_VERBOSE,
-		      &funcs, arg, rb_ascii8bit_encoding());
+    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
+		      rb_ascii8bit_encoding());
 }
 
 static int
@@ -2527,22 +2026,29 @@ rb_glob_caller(const char *path, VALUE a, void *enc)
     return status;
 }
 
-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)
+static int
+rb_glob2(const char *path, int flags,
+	 void (*func)(const char *, VALUE, void *), VALUE arg,
+	 rb_encoding* enc)
 {
     struct glob_args args;
-    int status;
 
     args.func = func;
     args.value = arg;
-    args.enc = rb_ascii8bit_encoding();
+    args.enc = enc;
+
+    if (flags & FNM_SYSCASE) {
+	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
+    }
 
-    status = ruby_glob0(path, AT_FDCWD, 0, GLOB_VERBOSE, &rb_glob_funcs,
-			(VALUE)&args, args.enc);
+    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
+		      enc);
+}
+
+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());
     if (status) GLOB_JUMP_TAG(status);
 }
 
@@ -2562,7 +2068,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, VALUE var)
+		  rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
@@ -2607,7 +2113,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, var);
+	    status = ruby_brace_expand(buf, flags, func, arg, enc);
 	    if (status) break;
 	}
 	GLOB_FREE(buf);
@@ -2616,12 +2122,11 @@ 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_funcs_t funcs;
+    ruby_glob_func *func;
     VALUE value;
     int flags;
 };
@@ -2631,7 +2136,7 @@ glob_brace(const char *path, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, AT_FDCWD, 0, arg->flags, &arg->funcs, arg->value, enc);
+    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
 }
 
 int
@@ -2640,11 +2145,10 @@ ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE
     struct brace_args args;
 
     flags &= ~GLOB_VERBOSE;
-    args.funcs.match = func;
-    args.funcs.error = NULL;
+    args.func = func;
     args.value = arg;
     args.flags = flags;
-    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc, Qfalse);
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
 }
 
 int
@@ -2653,11 +2157,23 @@ 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_glob(VALUE ary, VALUE str, VALUE base, int flags)
+push_caller(const char *path, VALUE val, void *enc)
 {
-    struct glob_args args;
-    int fd;
+    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)
+{
+    struct push_glob_args args;
     rb_encoding *enc = rb_enc_get(str);
 
 #if defined _WIN32 || defined __APPLE__
@@ -2668,75 +2184,48 @@ push_glob(VALUE ary, VALUE str, VALUE base, int flags)
     if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
 	enc = rb_ascii8bit_encoding();
     flags |= GLOB_VERBOSE;
-    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);
-    }
+    args.glob.func = push_pattern;
+    args.glob.value = ary;
+    args.glob.enc = enc;
+    args.flags = flags;
 #if defined _WIN32 || defined __APPLE__
     enc = rb_utf8_encoding();
 #endif
 
-    return ruby_glob0(RSTRING_PTR(str), fd, args.base, flags, &rb_glob_funcs,
-		      (VALUE)&args, enc);
+    RB_GC_GUARD(str);
+    return ruby_brace_expand(RSTRING_PTR(str), flags,
+			     push_caller, (VALUE)&args, enc);
 }
 
 static VALUE
-rb_push_glob(VALUE str, VALUE base, int flags) /* '\0' is delimiter */
+rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
 {
     long offset = 0;
-    long len;
     VALUE ary;
-    int warned = FALSE;
 
-    /* can contain null bytes as separators */
-    if (!RB_TYPE_P((str), T_STRING)) {
-	FilePathValue(str);
-    }
-    else {
-	rb_check_safe_obj(str);
-	rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding()));
-    }
+    GlobPathValue(str, TRUE);
     ary = rb_ary_new();
 
-    while (offset < (len = RSTRING_LEN(str))) {
+    while (offset < RSTRING_LEN(str)) {
+	char *p, *pend;
 	int status;
-        long rest = len - offset;
-        const char *pbeg = RSTRING_PTR(str), *p = pbeg + offset;
-        const char *pend = memchr(p, '\0', rest);
-        if (pend) {
-            if (!warned) {
-                rb_warn("use glob patterns list instead of nul-separated patterns");
-                warned = TRUE;
-            }
-            rest = ++pend - p;
-            offset = pend - pbeg;
-        }
-        else {
-            offset = len;
-        }
-	status = push_glob(ary, rb_str_subseq(str, p-pbeg, rest),
-			   base, flags);
+	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);
     }
 
     return ary;
 }
 
 static VALUE
-dir_globs(long argc, const VALUE *argv, VALUE base, int flags)
+dir_globs(long argc, const VALUE *argv, int flags)
 {
     VALUE ary = rb_ary_new();
     long i;
@@ -2744,84 +2233,47 @@ dir_globs(long argc, const VALUE *argv, VALUE base, int flags)
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	FilePathValue(str);
-	status = push_glob(ary, str, base, flags);
+	GlobPathValue(str, TRUE);
+	status = push_glob(ary, str, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
 
     return ary;
 }
 
-static void
-dir_glob_options(VALUE opt, VALUE *base, int *flags)
-{
-    ID kw[2];
-    VALUE args[2];
-    kw[0] = rb_intern("base");
-    if (flags) kw[1] = rb_intern("flags");
-    rb_get_kwargs(opt, kw, 0, flags ? 2 : 1, args);
-    if (args[0] == Qundef || NIL_P(args[0])) {
-	*base = Qnil;
-    }
-#if USE_OPENDIR_AT
-    else if (rb_typeddata_is_kind_of(args[0], &dir_data_type)) {
-	*base = args[0];
-    }
-#endif
-    else {
-	FilePathValue(args[0]);
-	if (!RSTRING_LEN(args[0])) args[0] = Qnil;
-	*base = args[0];
-    }
-    if (flags && args[1] != Qundef) {
-	*flags = NUM2INT(args[1]);
-    }
-}
-
 /*
  *  call-seq:
- *     Dir[ string [, string ...] [, base: path] ] -> array
+ *     Dir[ string [, string ...] ] -> array
  *
  *  Equivalent to calling
- *  <code>Dir.glob([</code><i>string,...</i><code>], 0)</code>.
+ *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
  *
  */
 static VALUE
 dir_s_aref(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE opts, base;
-    argc = rb_scan_args(argc, argv, "*:", NULL, &opts);
-    dir_glob_options(opts, &base, NULL);
     if (argc == 1) {
-	return rb_push_glob(argv[0], base, 0);
+	return rb_push_glob(argv[0], 0);
     }
-    return dir_globs(argc, argv, base, 0);
+    return dir_globs(argc, argv, 0);
 }
 
 /*
  *  call-seq:
- *     Dir.glob( pattern, [flags], [base: path] )                       -> array
- *     Dir.glob( pattern, [flags], [base: path] ) { |filename| block }  -> nil
+ *     Dir.glob( pattern, [flags] ) -> matches
+ *     Dir.glob( pattern, [flags] ) { |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.
+ *  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.
  *
- *  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.
- *
- *  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),
- *  as does the order in which the results are returned.
+ *  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>/ .* /mx</code> in regexp.
+ *    Equivalent to <code>/ .* /x</code> in regexp.
  *
  *    <code>*</code>::     Matches all files
  *    <code>c*</code>::    Matches all files beginning with <code>c</code>
@@ -2866,16 +2318,11 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *     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"]
  *
  *     rbfiles = File.join("**", "*.rb")
  *     Dir.glob(rbfiles)                   #=> ["main.rb",
  *                                         #    "lib/song.rb",
  *                                         #    "lib/song/karaoke.rb"]
- *
- *     Dir.glob(rbfiles, base: "lib")      #=> ["song.rb",
- *                                         #    "song/karaoke.rb"]
- *
  *     libdirs = File.join("**", "lib")
  *     Dir.glob(libdirs)                   #=> ["lib"]
  *
@@ -2889,23 +2336,21 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_s_glob(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE str, rflags, ary, opts, base;
+    VALUE str, rflags, ary;
     int flags;
 
-    argc = rb_scan_args(argc, argv, "11:", &str, &rflags, &opts);
-    if (argc == 2)
+    if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
 	flags = NUM2INT(rflags);
     else
 	flags = 0;
-    dir_glob_options(opts, &base, &flags);
 
     ary = rb_check_array_type(str);
     if (NIL_P(ary)) {
-	ary = rb_push_glob(str, base, flags);
+	ary = rb_push_glob(str, flags);
     }
     else {
 	VALUE v = ary;
-	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), base, flags);
+	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), flags);
 	RB_GC_GUARD(v);
     }
 
@@ -2959,14 +2404,6 @@ 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
@@ -2976,8 +2413,8 @@ dir_collect(VALUE dir)
  *  directory. Will raise a <code>SystemCallError</code> 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.
+ *  The optional <i>enc</i> argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
  *
  *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
  *
@@ -2988,115 +2425,7 @@ dir_entries(int argc, VALUE *argv, VALUE io)
     VALUE dir;
 
     dir = dir_open_dir(argc, argv);
-    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 }  -> nil
- *     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
- *  <code>SystemCallError</code> 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);
+    return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
 static int
@@ -3230,7 +2559,7 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
     else
 	flags = 0;
 
-    StringValueCStr(pattern);
+    StringValue(pattern);
     FilePathStringValue(path);
 
     if (flags & FNM_EXTGLOB) {
@@ -3239,7 +2568,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), pattern) > 0)
+			      (VALUE)&args, rb_enc_get(pattern)) > 0)
 	    return Qtrue;
     }
     else {
@@ -3309,38 +2638,6 @@ rb_dir_exists_p(VALUE obj, VALUE fname)
     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
@@ -3351,11 +2648,13 @@ nogvl_dir_empty_p(void *ptr)
 static VALUE
 rb_dir_s_empty_p(VALUE obj, VALUE dirname)
 {
-    VALUE result, orig;
+    DIR *dir;
+    struct dirent *dp;
+    VALUE result = Qtrue, orig;
     const char *path;
     enum {false_on_notdir = 1};
 
-    FilePathValue(dirname);
+    GlobPathValue(dirname, FALSE);
     orig = rb_str_dup_frozen(dirname);
     dirname = rb_str_encode_ospath(dirname);
     dirname = rb_str_dup_frozen(dirname);
@@ -3380,11 +2679,29 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
     }
 #endif
 
-    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);
+    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);
+	}
     }
+    errno = 0;
+    while ((dp = READDIR(dir, NULL)) != NULL) {
+	if (!to_be_skipped(dp)) {
+	    result = Qfalse;
+	    break;
+	}
+    }
+    closedir(dir);
     return result;
 }
 
@@ -3410,8 +2727,6 @@ Init_Dir(void)
     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);
@@ -3420,8 +2735,6 @@ Init_Dir(void)
     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);
diff --git a/dln.c b/dln.c
index 7acea5f888..5af9a57802 100644
--- a/dln.c
+++ b/dln.c
@@ -22,7 +22,6 @@
 static void dln_loaderror(const char *format, ...);
 #endif
 #include "dln.h"
-#include "internal.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -232,13 +231,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 const int reloc_r_rightshift[] = {
+static int reloc_r_rightshift[] = {
   0, 0, 0, 0, 0, 0, 2, 2, 10, 0, 0, 0, 0, 0, 0,
 };
-static const int reloc_r_bitsize[] = {
+static int reloc_r_bitsize[] = {
   8, 16, 32, 8, 16, 32, 30, 22, 22, 22, 13, 10, 32, 32, 16,
 };
-static const int reloc_r_length[] = {
+static int reloc_r_length[] = {
   0, 1, 2, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 };
 #  define R_PCREL(r) \
@@ -1243,20 +1242,6 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 #define translit_separator(str) (void)(str)
 #endif
 
-#ifdef USE_DLN_DLOPEN
-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");
-    return ex && ex != ruby_xmalloc;
-}
-COMPILER_WARNING_POP
-#endif
-
 void*
 dln_load(const char *file)
 {
@@ -1265,6 +1250,7 @@ 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
@@ -1344,11 +1330,10 @@ dln_load(const char *file)
 	}
 # if defined RUBY_EXPORT
 	{
-	    if (dln_incompatible_library_p(handle)) {
+	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
+	    if (ex && ex != ruby_xmalloc) {
 
-#   if defined __APPLE__ && \
-    defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
-    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
+#   if defined __APPLE__
 		/* dlclose() segfaults */
 		rb_fatal("%s - %s", incompatible, file);
 #   else
@@ -1362,8 +1347,7 @@ dln_load(const char *file)
 
 	init_fct = (void(*)())(VALUE)dlsym(handle, buf);
 	if (init_fct == NULL) {
-	    const size_t errlen = strlen(error = dln_strerror()) + 1;
-	    error = memcpy(ALLOCA_N(char, errlen), error, errlen);
+	    error = DLN_ERROR();
 	    dlclose(handle);
 	    goto failed;
 	}
diff --git a/dmydln.c b/dmydln.c
index d05cda0b8e..0fc0a5325e 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_RETURN(NULL);
+    UNREACHABLE;
 }
diff --git a/doc/.document b/doc/.document
index d739c9f6bc..b48c0387a7 100644
--- a/doc/.document
+++ b/doc/.document
@@ -1,3 +1,4 @@
 *.rdoc
+ChangeLog*
 NEWS-*
 syntax
diff --git a/doc/ChangeLog-0.60_to_1.1 b/doc/ChangeLog-0.60_to_1.1
index bd5f140dc3..33b0326892 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 3f7d6bfb3c..0d00266735 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -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 be obtained from rb_eval_string_protect()/rb_load_protect().
+	  can 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 eecfc44325..b3deb551b0 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
-	  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
+	  http://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 popped is true.  [ruby-dev:41933], [Bug #3658]
+	  results when poped 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#initialize):
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
 	  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
-	  directory or within block.  thanks to Johan Holmberg
+	  direcotry or within block.  thanks to Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:03446]
 
 Fri Sep 17 20:29:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
diff --git a/doc/ChangeLog-2.1.0 b/doc/ChangeLog-2.1.0
index 76edfd3ce7..f80b2d6bd1 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 promote as old
+	  The issue of this approach is some objects can promoted 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.
diff --git a/doc/ChangeLog-2.4.0 b/doc/ChangeLog-2.4.0
deleted file mode 100644
index 96b5ecb077..0000000000
--- a/doc/ChangeLog-2.4.0
+++ /dev/null
@@ -1,9492 +0,0 @@
-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-2016 b/doc/ChangeLog-2016
deleted file mode 100644
index 14fcba55ab..0000000000
--- a/doc/ChangeLog-2016
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------
-r57181 | matz | 2016-12-26 01:35:51 +0900 (Mon, 26 Dec 2016) | 2 lines
-
-version.h (RUBY_VERSION): 2.5.0 development has started.
-
-------------------------------------------------------------------------
diff --git a/doc/ChangeLog-2017 b/doc/ChangeLog-2017
deleted file mode 100644
index 82c4f7c623..0000000000
--- a/doc/ChangeLog-2017
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------
-r61474 | matz | 2017-12-25 23:05:59 +0900 (Mon, 25 Dec 2017) | 2 lines
-
-version.h (RUBY_VERSION): 2.6.0 development has started.
-
-------------------------------------------------------------------------
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
index a8b999dff2..6a6cfbd0c9 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 initialize routine order ([yarv-dev:1067])
+	* eval.c : change initilize 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 default
+	* configure.in : enable pthread by deafult
 
 	* 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 running threads
+	current runnning threads
 
 	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
-	occurs
+	occurres
 
 	* 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 between target name and colon
+	* depend : remove space betweeen 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 'popped'
+	* compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
 	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 5da39ff265..38571fe103 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.
 
-    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+    http://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 fedb1f6633..9cf58c9aff 100644
--- a/doc/NEWS-1.9.2
+++ b/doc/NEWS-1.9.2
@@ -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.
 
-    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+    http://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 414789dcd1..9ad7254317 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() close non-standard file descriptors
+    * system() and exec() closes 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.
@@ -497,7 +497,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
-      writable from other users.
+      accessible from other users.
 
 * yaml
   * Syck has been removed.  YAML now completely depends on libyaml being
@@ -528,3 +528,4 @@ 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.4.0 b/doc/NEWS-2.4.0
deleted file mode 100644
index 28e855cde1..0000000000
--- a/doc/NEWS-2.4.0
+++ /dev/null
@@ -1,397 +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]
-
-* 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
deleted file mode 100644
index e7613d5caa..0000000000
--- a/doc/NEWS-2.5.0
+++ /dev/null
@@ -1,567 +0,0 @@
-# -*- 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.indentical? 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.
-
-=== C API updates
-
-=== 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/contributing.rdoc b/doc/contributing.rdoc
index b92dc7427e..75d00e6f9f 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}[https://bugs.ruby-lang.org/].  Do not
+tracker available at {bugs.ruby-lang.org}[http://bugs.ruby-lang.org/].  Do not
 report security vulnerabilities here, there is a {separate
 channel}[rdoc-label:label-Reporting+Security+Issues] for them.
 
@@ -25,7 +25,7 @@ on your ticket.
 
   If you aren't already using the latest version, try installing a newer
   stable release. See
-  {Downloading Ruby}[https://www.ruby-lang.org/en/downloads/].
+  {Downloading Ruby}[http://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]
   for your problem.
@@ -53,10 +53,10 @@ on your ticket.
 
 You can report downstream issues for the following distributions via their bug tracker:
 
-* {debian}[https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=ruby-defaults]
+* {debian}[http://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}[https://trac.macports.org/query?status=assigned&status=new&status=reopened&port=~ruby]
+* {macports}[http://trac.macports.org/query?status=assigned&status=new&status=reopened&port=~ruby]
 * etc (add your distribution bug tracker here)
 
 === Platform Maintainers
@@ -66,10 +66,14 @@ maintainer for a specific platform.
 
 The current active platform maintainers are as follows:
 
-[mswin64 (Microsoft Windows)]
+[mswin32, 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]
@@ -77,8 +81,8 @@ The current active platform maintainers are as follows:
 [Solaris]
   Naohisa Goto (ngoto)
 [RHEL, CentOS]
-  KOSAKI Motohiro (kosaki)
-[macOS]
+  KOSAKI Motohiro kosaki
+[Mac OS X]
   Kenta Murata (mrkn)
 [cygwin, bcc32, djgpp, wince, ...]
   none. (Maintainer WANTED)
@@ -90,7 +94,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}[https://www.ruby-lang.org/security.asc] for the list.
+key}[http://www.ruby-lang.org/security.asc] for the list.
 
 == Reporting Other Issues
 
@@ -249,10 +253,10 @@ 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}[https://www.ruby-lang.org/en/community/ruby-core/].
+ruby-lang.org}[http://www.ruby-lang.org/en/community/ruby-core/].
 
 This guide will use git for contributing.  The {git
-homepage}[https://git-scm.com/] has installation instructions with links to
+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].
 
@@ -283,7 +287,7 @@ Now let's build CRuby:
 
 * Checkout the CRuby source code:
 
-    git clone https://github.com/ruby/ruby.git ruby-trunk
+    git clone git://github.com/ruby/ruby.git ruby-trunk
 
 * Generate the configuration files and build:
 
@@ -315,7 +319,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 https://github.com/ruby/ruby.git --branch ruby_1_9_3
+    git clone git://github.com/ruby/ruby.git --branch ruby_1_9_3
 
 Once you checked out the source code, you can update the local copy by:
 
@@ -328,11 +332,11 @@ Or, update, build, install and check, by just:
 == Contributing Documentation
 
 If you're interested in contributing documentation directly to CRuby there is
-some information available at
-{Contributing}[https://github.com/ruby/ruby#contributing].
+a wealth of information available at
+{documenting-ruby.org}[http://documenting-ruby.org/].
 
 There is also the {Ruby Reference
-Manual}[https://github.com/rurema/doctree/wiki] in Japanese.
+Manual}[https://bugs.ruby-lang.org/projects/rurema] in Japanese.
 
 == Contributing A Patch
 
@@ -356,7 +360,7 @@ 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 https://github.com/ruby/ruby.git ruby-trunk
+  git clone git://github.com/ruby/ruby.git ruby-trunk
 
 Now create a dedicated branch:
 
@@ -372,8 +376,7 @@ trunk, or edge Ruby.
 
 Here are some general rules to follow when writing Ruby and C code for CRuby:
 
-* 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 4 spaces for C with tabs for eight-space indentation (emacs default)
 * Indent 2 space tabs for Ruby
 * Do not use TABs in ruby codes
 * ANSI C style for 1.9+ for function declarations
@@ -453,7 +456,7 @@ 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'}[https://git-scm.com/docs/git-format-patch]
+You may use the {'git format-patch'}[http://git-scm.com/docs/git-format-patch]
 command to generate patch files to upload to redmine.  You may also use
-the {'git request-pull'}[https://git-scm.com/docs/git-request-pull] command for
+the {'git request-pull'}[http://git-scm.com/docs/git-request-pull] command for
 formatting pull request messages to redmine.
diff --git a/doc/contributors.rdoc b/doc/contributors.rdoc
index 7c3722032b..ced4eb1cd0 100644
--- a/doc/contributors.rdoc
+++ b/doc/contributors.rdoc
@@ -37,9 +37,6 @@ arton
 * He is the distributor of ActiveScriptRuby and experimental 1.9.0-x installers for win32.
 * Wrote patches for win32ole, gc.c, tmpdir.rb
 
-Sergey Avseyev
-* Added IO#pread and IO#pwrite.
-
 == B
 
 Daniel Berger
@@ -60,9 +57,6 @@ Oliver M. Bolzer
 Alexey Borzenkov
 * a patch for mkmf.rb
 
-Evan Brodie
-* a patch for documentation of Float#round
-
 Richard Brown
 * a patch for configure.in
 
@@ -88,7 +82,7 @@ Christoph
 * patches for set.rb
 
 Sean Chittenden
-* patches for net/http, cgi
+* pathces for net/http, cgi
 
 William D. Clinger
 * ruby_strtod is based on his paper.
@@ -109,7 +103,7 @@ Martin Duerst (duerst)
 * M17N
 
 Paul Duncan
-* patches for rdoc
+* pathces for rdoc
 
 Alexander Dymo
 * a patch for lib/benchmark.rb
@@ -603,15 +597,6 @@ Richard M. Stallman
 Robin Stocker
 * documentation
 
-Joshua Stowers
-* a patch for array.c
-
-Marcus Stollsteimer (stomar)
-* committer
-* a maintainer of www.ruby-lang.org
-* patches for cgi (HTML5 tag maker), numeric.c, bigdecimal, ostruct.rb, prime.rb, and others
-* documentation
-
 Adam Strzelecki
 * a patch for compile.c
 
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
index 58a1c852f2..1537054b6c 100644
--- a/doc/extension.ja.rdoc
+++ b/doc/extension.ja.rdoc
@@ -1,10 +1,8 @@
 # extension.ja.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
 
-= Rubyの拡張ライブラリの作り方
-
 Rubyの拡張ライブラリの作り方を説明します．
 
-== 基礎知識
+= 基礎知識
 
 Cの変数には型があり，データには型がありません．ですから，た
 とえばポインタをintの変数に代入すると，その値は整数として取
@@ -25,7 +23,7 @@ VALUEからCにとって意味のあるデータを取り出すためには
 の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
 て，最悪プログラムがcore dumpします．
 
-=== データタイプ
+== データタイプ
 
 Rubyにはユーザが使う可能性のある以下のタイプがあります．
 
@@ -59,7 +57,7 @@ T_SYMBOL   :: シンボル
 
 ほとんどのタイプはCの構造体で実装されています．
 
-=== VALUEのデータタイプをチェックする
+== VALUEのデータタイプをチェックする
 
 ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
 タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
@@ -96,7 +94,7 @@ FIXNUMとNILに関してはより高速な判別マクロが用意されてい�
   FIXNUM_P(obj)
   NIL_P(obj)
 
-=== VALUEをCのデータに変換する
+== VALUEをCのデータに変換する
 
 データタイプがT_NIL，T_FALSE，T_TRUEである時，データはそれぞ
 れnil，false，trueです．このデータタイプのオブジェクトはひと
@@ -157,7 +155,7 @@ Rubyの構造体を直接アクセスする時に気をつけなければなら�
 ないことです．直接変更した場合，オブジェクトの内容の整合性が
 とれなくなって，思わぬバグの原因になります．
 
-=== CのデータをVALUEに変換する
+== CのデータをVALUEに変換する
 
 VALUEの実際の構造は
 
@@ -184,13 +182,13 @@ FIXNUMに関しては変換マクロを経由する必要があります．Cの�
 て使い分けてください．
 
 INT2FIX() :: もとの整数が31bitまたは63bit以内に収まる自信
-             がある時
+      	     がある時
 INT2NUM() :: 任意の整数からVALUEへ
 
 INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
 してくれます(が，少し遅い)．
 
-=== Rubyのデータを操作する
+== Rubyのデータを操作する
 
 先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
 行うことは勧められません．で，Rubyのデータを操作する時には
@@ -199,7 +197,7 @@ Rubyが用意している関数を用いてください．
 ここではもっとも使われるであろう文字列と配列の生成/操作を行
 う関数をあげます(全部ではないです)．
 
-==== 文字列に対する関数
+=== 文字列に対する関数
 
 rb_str_new(const char *ptr, long len) ::
 
@@ -226,10 +224,6 @@ rb_tainted_str_new_cstr(const char *ptr) ::
 
   Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
 
-rb_str_append(VALUE str1, VALUE str2) ::
-
-  Rubyの文字列str1にRubyの文字列str2を追加する．
-
 rb_sprintf(const char *format, ...) ::
 rb_vsprintf(const char *format, va_list ap) ::
 
@@ -255,15 +249,15 @@ rb_str_vcatf(VALUE str, const char* format, va_list ap) ::
 
   Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
   整形し，Rubyの文字列strに追加する．この関数の機能は，それぞれ
-  rb_str_append(str, rb_sprintf(format, ...)) や
-  rb_str_append(str, rb_vsprintf(format, ap)) と同等である．
+  rb_str_cat2(str, rb_sprintf(format, ...)) や
+  rb_str_cat2(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_encoding *enc) ::
+rb_enc_str_new_literal(const char *ptr) ::
 
   Cのリテラル文字列から指定されたエンコーディングでRubyの文字列を生成する．
 
@@ -301,7 +295,7 @@ rb_str_set_len(VALUE str, long len) ::
   lenバイトまでの内容は保存される．lenはstrの容量を越えてい
   てはならない．
 
-==== 配列に対する関数
+=== 配列に対する関数
 
 rb_ary_new() ::
 
@@ -332,7 +326,7 @@ rb_ary_to_ary(VALUE obj) ::
 引数aryに配列を渡さなければならない. さもないと
 コアを吐く.
 
-rb_ary_aref(int argc, const VALUE *argv, VALUE ary) ::
+rb_ary_aref(argc, VALUE *argv, VALUE ary) ::
 
   Array#[]と同等.
 
@@ -359,14 +353,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では以下の機能を追加する関数が
@@ -378,7 +372,7 @@ Rubyで提供されている関数を使えばRubyインタプリタに新しい
 
 では順に紹介します．
 
-==== クラス/モジュール定義
+=== クラス/モジュール定義
 
 クラスやモジュールを定義するためには，以下の関数を使います．
 
@@ -395,15 +389,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)(ANYARGS), int argc)
+                        VALUE (*func)(), int argc)
 
   void rb_define_singleton_method(VALUE object, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
+                                  VALUE (*func)(), int argc)
 
 念のため説明すると「特異メソッド」とは，その特定のオブジェク
 トに対してだけ有効なメソッドです．RubyではよくSmalltalkにお
@@ -429,9 +423,9 @@ argcが-1の時は引数を配列に入れて渡されます．argcが-2の時�
 private/protectedなメソッドを定義するふたつの関数があります.
 
   void rb_define_private_method(VALUE klass, const char *name,
-                                VALUE (*func)(ANYARGS), int argc)
+				VALUE (*func)(), int argc)
   void rb_define_protected_method(VALUE klass, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
+			          VALUE (*func)(), int argc)
 
 privateメソッドとは関数形式でしか呼び出すことの出来ないメソッ
 ドです．
@@ -452,12 +446,12 @@ privateメソッドでもあるものです．例をあげるとMathモジュー
 通りです．
 
   void rb_define_module_function(VALUE module, const char *name,
-                                 VALUE (*func)(ANYARGS), int argc)
+		                 VALUE (*func)(), int argc)
 
 関数的メソッド(Kernelモジュールのprivate method)を定義するた
 めの関数は以下の通りです．
 
-  void rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
+  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
 
 メソッドの別名を定義するための関数は以下の通りです．
 
@@ -489,7 +483,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 
   VALUE rb_current_receiver(void)
 
-==== 定数定義
+=== 定数定義
 
 拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
 でしょう．定数を定義する関数は二つあります．
@@ -500,7 +494,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 前者は特定のクラス/モジュールに属する定数を定義するもの，後
 者はグローバルな定数を定義するものです．
 
-=== Rubyの機能をCから呼び出す
+== Rubyの機能をCから呼び出す
 
 既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
 使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
@@ -511,7 +505,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 
 それ以外にもRubyの機能を呼び出す方法はいくつかあります．
 
-==== Rubyのプログラムをevalする
+=== Rubyのプログラムをevalする
 
 CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
 与えられたRubyのプログラムを評価する以下の関数があります．
@@ -529,7 +523,7 @@ CからRubyの機能を呼び出すもっとも簡単な方法として，文字
 この関数はエラーが発生するとnilを返します．そして，成功時には
 *stateはゼロに，さもなくば非ゼロになります．
 
-==== IDまたはシンボル
+=== IDまたはシンボル
 
 Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
 す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
@@ -572,7 +566,7 @@ Rubyから引数として与えられたシンボル(または文字列)をシ�
 これらの関数は，IDの代わりにシンボルを返すことを除けば上記の
 関数と同じです．
 
-==== CからRubyのメソッドを呼び出す
+=== CからRubyのメソッドを呼び出す
 
 Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
 の関数を使います．
@@ -588,7 +582,7 @@ Cから文字列を経由せずにRubyのメソッドを呼び出すためには
 
 applyには引数としてRubyの配列を与えます．
 
-==== 変数/定数を参照/更新する
+=== 変数/定数を参照/更新する
 
 Cから関数を使って参照・更新できるのは，定数，インスタンス変
 数です．大域変数は一部のものはCの大域変数としてアクセスでき
@@ -609,11 +603,11 @@ idはrb_intern()で得られるものを使ってください．
 定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
 れている関数を使ってください．
 
-== RubyとCとの情報共有
+= RubyとCとの情報共有
 
 C言語とRubyの間で情報を共有する方法について解説します．
 
-=== Cから参照できるRubyの定数
+== Cから参照できるRubyの定数
 
 以下のRubyの定数はCのレベルから参照できます．
 
@@ -626,7 +620,7 @@ Qnil ::
 
   C言語から見た「nil」．
 
-=== CとRubyで共有される大域変数
+== CとRubyで共有される大域変数
 
 CとRubyで大域変数を使って情報を共有できます．共有できる大域
 変数にはいくつかの種類があります．そのなかでもっとも良く使わ
@@ -648,7 +642,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が，変数に値がセットされ
@@ -668,7 +662,7 @@ getterとsetterの仕様は次の通りです．
 されます.
 
   void rb_define_virtual_variable(const char *name,
-                                  VALUE (*getter)(), void (*setter)())
+				  VALUE (*getter)(), void (*setter)())
 
 この関数によって定義されたRubyの大域変数が参照された時には
 getterが，変数に値がセットされた時にはsetterが呼ばれます．
@@ -678,7 +672,7 @@ getterとsetterの仕様は以下の通りです．
   (*getter)(ID id);
   (*setter)(VALUE val, ID id);
 
-=== CのデータをRubyオブジェクトにする
+== CのデータをRubyオブジェクトにする
 
 Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
 取り扱いたい場合がありえます．このような場合はTypedData_XXX
@@ -691,7 +685,7 @@ Cの世界で定義されたデータ(構造体)をRubyのオブジェクトと�
 があります．
 ++
 
-==== 構造体からオブジェクトへ
+=== 構造体からオブジェクトへ
 
 構造体へのポインタsvalをRubyオブジェクトに変換するには次のマ
 クロを使います。
@@ -711,8 +705,6 @@ 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 {
@@ -783,8 +775,8 @@ RUBY_TYPED_WB_PROTECTED ::
   メソッドの実装に適切にライトバリアを挿入する責任があります．
   さもなくばRubyは実行時にクラッシュする可能性があります．
 
-  ライトバリアについてはdoc/extension.ja.rdocのAppendix D
-  "世代別GC"も参照してください．
+  ライトバリアについてはdoc/extension.rdocのAppendix D
+  "Generational GC"も参照してください．
 
 
 Cの構造体の割当と対応するオブジェクトの生成を同時に行うマク
@@ -801,7 +793,7 @@ klass, data_typeはData_Wrap_Structと同じ働きをします．type
 は割り当てるC構造体の型です．割り当てられた構造体は変数sval
 に代入されます．この変数の型は (type*) である必要があります．
 
-==== オブジェクトから構造体へ
+=== オブジェクトから構造体へ
 
 TypedData_Wrap_StructやTypedData_Make_Structで生成したオブジェ
 クトから構造体へのポインタを復元するには以下のマクロを用いま
@@ -814,9 +806,7 @@ Cの構造体へのポインタは変数svalに代入されます．
 これらのマクロの使い方はちょっと分かりにくいので，後で説明す
 る例題を参照してください．
 
-== 例: dbmの拡張ライブラリの作成
-
-=== ディレクトリを作る
+== ディレクトリを作る
 
   % mkdir ext/dbm
 
@@ -826,14 +816,14 @@ Ruby 1.1からは任意のディレクトリでダイナミックライブラリ
 ライブラリ用のディレクトリを作る必要があります．名前は適当に
 選んで構いません．
 
-=== 設計する
+== 設計する
 
 まあ，当然なんですけど，どういう機能を実現するかどうかまず設
 計する必要があります．どんなクラスをつくるか，そのクラスには
 どんなメソッドがあるか，クラスが提供する定数などについて設計
 します．
 
-=== Cコードを書く
+== Cコードを書く
 
 拡張ライブラリ本体となるC言語のソースを書きます．C言語のソー
 スがひとつの時には「ライブラリ名.c」を選ぶと良いでしょう．C
@@ -875,7 +865,7 @@ Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名�
 DBMライブラリはdbmのデータと対応するオブジェクトになるはずで
 すから，Cの世界のdbmをRubyの世界に取り込む必要があります．
 
-dbm.cではTypedData_Make_Structを以下のように使っています．
+dbm.cではData_Make_Structを以下のように使っています．
 
   struct dbmdata {
       int  di_size;
@@ -933,7 +923,7 @@ fdbm_delete()はこのようになっています．
       /* ... */
 
       if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-          mode = 0666;          /* default value */
+  	mode = 0666;		/* default value */
       }
 
       /* ... */
@@ -948,9 +938,6 @@ fdbm_delete()はこのようになっています．
 い，第4引数以降に指定したVALUEへの参照に値を代入してくれま
 す．
 
-引数の数をチェックするだけならrb_check_arity()が使えます．
-これは引数をリストとして扱いたいときに便利です．
-
 引数をRubyの配列として受け取るメソッドの例には
 Thread#initializeがあります．実装はこうです．
 
@@ -970,7 +957,7 @@ Cの大域変数は以下の関数を使ってRubyインタプリタに変数の
 
   void rb_global_variable(VALUE *var)
 
-=== extconf.rbを用意する
+== extconf.rbを用意する
 
 Makefileを作る場合の雛型になるextconf.rbというファイルを作り
 ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
@@ -1001,7 +988,7 @@ Makefileを作る場合の雛型になるextconf.rbというファイルを作�
 パイルしない時にはcreate_makefileを呼ばなければMakefileは生
 成されず，コンパイルも行われません．
 
-=== dependを用意する
+== dependを用意する
 
 もし，ディレクトリにdependというファイルが存在すれば，
 Makefileが依存関係をチェックしてくれます．
@@ -1010,7 +997,7 @@ Makefileが依存関係をチェックしてくれます．
 
 などで作ることが出来ます．あって損は無いでしょう．
 
-=== Makefileを生成する
+== Makefileを生成する
 
 Makefileを実際に生成するためには
 
@@ -1032,7 +1019,7 @@ vendor_ruby ディレクトリにインストールする場合には
 ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
 自動的にMakefileが生成されますので，このステップは不要です．
 
-=== makeする
+== makeする
 
 動的リンクライブラリを生成する場合にはその場でmakeしてくださ
 い．必要であれば make install でインストールされます．
@@ -1050,26 +1037,26 @@ extconf.rbを書き換えるなどしてMakefileの再生成が必要な時は�
 を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
 ストールされます．
 
-=== デバッグ
+== デバッグ
 
 まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
 クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
 ります．その分コンパイルが遅くなりますけど．
 
-=== できあがり
+== できあがり
 
 後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
 使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
 主張しません．
 
-== Appendix A. Rubyのソースコードの分類
+= Appendix A. Rubyのソースコードの分類
 
 Rubyのソースはいくつかに分類することが出来ます．このうちクラ
 スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
 ています．これらのソースは今までの説明でほとんど理解できると
 思います．
 
-=== Ruby言語のコア
+== Ruby言語のコア
 
 class.c    :: クラスとモジュール
 error.c    :: 例外クラスと例外機構
@@ -1078,14 +1065,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
@@ -1111,7 +1098,7 @@ lex.c         :: 自動生成
     -> opt*.inc            : 自動生成
     -> vm.inc              : 自動生成
 
-=== 正規表現エンジン (鬼車)
+== 正規表現エンジン (鬼車)
 
   regex.c
   regcomp.c
@@ -1121,7 +1108,7 @@ lex.c         :: 自動生成
   regparse.c
   regsyntax.c
 
-=== ユーティリティ関数
+== ユーティリティ関数
 
 debug.c    :: Cデバッガ用のデバッグシンボル
 dln.c      :: 動的ローディング
@@ -1129,7 +1116,7 @@ st.c       :: 汎用ハッシュ表
 strftime.c :: 時刻整形
 util.c     :: その他のユーティリティ
 
-=== Rubyコマンドの実装
+== Rubyコマンドの実装
 
   dmyext.c
   dmydln.c
@@ -1143,7 +1130,7 @@ util.c     :: その他のユーティリティ
   gem_prelude.rb
   prelude.rb
 
-=== クラスライブラリ
+== クラスライブラリ
 
 array.c      :: Array
 bignum.c     :: Bignum
@@ -1175,24 +1162,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 ::
 
@@ -1201,7 +1188,7 @@ VALUE ::
   体である．VALUE型をこれらにキャストするためにRで始まる構造体
   名を全て大文字にした名前のマクロが用意されている．
 
-=== 変数・定数
+== 変数・定数
 
 Qnil ::
 
@@ -1215,7 +1202,7 @@ Qfalse ::
 
   定数: falseオブジェクト
 
-=== Cデータのカプセル化
+== Cデータのカプセル化
 
 Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
@@ -1234,7 +1221,7 @@ Data_Get_Struct(data, type, sval) ::
 
   dataからtype型のポインタを取り出し変数svalに代入するマクロ．
 
-=== 型チェック
+== 型チェック
 
   RB_TYPE_P(value, type)
   TYPE(value)
@@ -1245,7 +1232,7 @@ Data_Get_Struct(data, type, sval) ::
   void Check_Type(VALUE value, int type)
   SafeStringValue(value)
 
-=== 型変換
+== 型変換
 
   FIX2INT(value), INT2FIX(i)
   FIX2LONG(value), LONG2FIX(l)
@@ -1268,7 +1255,7 @@ Data_Get_Struct(data, type, sval) ::
   StringValueCStr(value)
   rb_str_new2(s)
 
-=== クラス/モジュール定義
+== クラス/モジュール定義
 
 VALUE rb_define_class(const char *name, VALUE super) ::
 
@@ -1296,7 +1283,7 @@ void rb_extend_object(VALUE object, VALUE module) ::
 
   オブジェクトをモジュール(で定義されているメソッド)で拡張する．
 
-=== 大域変数定義
+== 大域変数定義
 
 void rb_define_variable(const char *name, VALUE *var) ::
 
@@ -1325,15 +1312,10 @@ void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(),
 
 void rb_global_variable(VALUE *var) ::
 
-  マークする必要のあるRubyオブジェクトを含む大域変数を，GC
-  によって解放されないように保護する．
+  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
+  ジェクトを含む大域変数をマークする．
 
-void rb_gc_register_mark_object(VALUE *var) ::
-
-  マークする必要のあるRubyオブジェクトを，GCによって解放さ
-  れないように登録する．
-
-=== 定数
+== 定数
 
 void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
@@ -1347,9 +1329,9 @@ void rb_define_global_const(const char *name, VALUE val) ::
 
   と同じ意味．
 
-=== メソッド定義
+== メソッド定義
 
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
   メソッドを定義する．argcはselfを除く引数の数．argcが-1の時,
   関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
@@ -1357,20 +1339,14 @@ rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc
   第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
   いう形式で与えられる．
 
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
   privateメソッドを定義する．引数はrb_define_method()と同じ．
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), 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形式で与えられた指定されたフォーマットに従って引
@@ -1424,10 +1400,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中の対応する要素にはQundefがセットされ
-  ます．keyword_hashに使用されない要素がある場合は，optionalが
-  負なら無視されますが，そうでなければ"unknown keyword"
-  ArgumentErrorが発生します．
+  ドがない場合は，values中の対応する要素は変更されません．
+  keyword_hashに使用されない要素がある場合は，optionalが負なら
+  新しいHashとして省略可能引数の次に保存されますが，そうでなけ
+  れば"unknown keyword"ArgumentErrorが発生します．
 
 VALUE rb_extract_keywords(VALUE *original_hash) ::
 
@@ -1436,7 +1412,7 @@ VALUE rb_extract_keywords(VALUE *original_hash) ::
   先には，元のHashがSymbol以外のキーを含んでいた場合はそれらが
   コピーされた別の新しいHash，そうでなければ0が保存されます．
 
-=== Rubyメソッド呼び出し
+== Rubyメソッド呼び出し
 
 VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
 
@@ -1476,7 +1452,7 @@ int rb_respond_to(VALUE obj, ID id) ::
 
   objがidで示されるメソッドを持つかどうかを返す．
 
-=== インスタンス変数
+== インスタンス変数
 
 VALUE rb_iv_get(VALUE obj, const char *name) ::
 
@@ -1489,7 +1465,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) ::
 
@@ -1514,14 +1490,14 @@ VALUE rb_yield(VALUE val) ::
 
   valを値としてイテレータブロックを呼び出す．
 
-VALUE rb_rescue(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
   関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
-  した時には func2をarg2を第一引数, 発生した例外オブジェクト
-  を第二引数として呼ぶ．戻り値は例外が発生しなかった時はfunc1
-  の戻り値, 例外が発生した時にはfunc2の戻り値である．
+  した時には func2をarg2を引数として呼ぶ．戻り値は例外が発生
+  しなかった時はfunc1の戻り値, 例外が発生した時にはfunc2の戻
+  り値である．
 
-VALUE rb_ensure(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
   関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
   発生しても) func2をarg2を引数として実行する．戻り値はfunc1
@@ -1551,7 +1527,7 @@ void rb_iter_break_value(VALUE value) ::
   現在の最も内側のブロックをvalueで終了する．ブロックは引数で
   与えられたvalueを返す．この関数は直接の呼び出し元に戻らない．
 
-=== 例外・エラー
+== 例外・エラー
 
 void rb_warning(const char *fmt, ...) ::
 
@@ -1583,7 +1559,7 @@ void rb_bug(const char *fmt, ...) ::
 きはObject#inspect)を使ったVALUEの出力に利用できる．これは
 "%i"と衝突するため，整数には"%d"を使用すること．
 
-=== Rubyの初期化・実行
+== Rubyの初期化・実行
 
 Rubyをアプリケーションに埋め込む場合には以下のインタフェース
 を使う．通常の拡張ライブラリには必要ない．
@@ -1607,7 +1583,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) ::
 
@@ -1637,19 +1613,7 @@ 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の互換性をチェックするために以下のマクロがデフォルトで定義されています．
 
@@ -1691,7 +1655,7 @@ RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
   rb_add_event_hook() がフック関数に渡す data を第3引数として
   受け取ることを意味する．
 
-== Appendix C. extconf.rbで使える関数たち
+= Appendix C. extconf.rbで使える関数たち
 
 extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
 下の通りである．
@@ -1817,7 +1781,7 @@ pkg_config(pkg, option=nil) ::
   optionが指定された場合は，上記の配列の代わりにそのオプションを
   指定して得られた出力をstripしたものを返す．
 
-== Appendix D. 世代別GC
+= Appendix D. 世代別GC
 
 Ruby 2.1から世代別GCに対応しました．我々はこれをRGenGCと呼んでいます．
 RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
@@ -1830,7 +1794,7 @@ RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つよ�
 スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
 rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
 
-そのほか，対応についての詳細は extension.rdoc の「Appendix D. Generational
+そのほか，対応についての詳細は README.EXT の「Appendix D. Generational
 GC」を参照して下さい．
 
 :enddoc: Local variables:
diff --git a/doc/extension.rdoc b/doc/extension.rdoc
index b7cba0d5e8..28052708e2 100644
--- a/doc/extension.rdoc
+++ b/doc/extension.rdoc
@@ -1,10 +1,8 @@
 # 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
@@ -20,7 +18,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:
 
@@ -54,7 +52,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
@@ -88,7 +86,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.
@@ -141,7 +139,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:
 
@@ -167,14 +165,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) ::
 
@@ -210,10 +208,6 @@ 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.
@@ -229,15 +223,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_append(str, rb_sprintf(format, ...)) and
-  rb_str_append(str, rb_vsprintf(format, ap)), respectively.
+  equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
+  rb_str_cat2(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_encoding *enc) ::
+rb_enc_str_new_literal(const char *ptr) ::
 
   Creates a new Ruby string from a C string literal with the specified
   encoding.
@@ -279,7 +273,7 @@ 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
+=== Array Functions
 
 rb_ary_new() ::
 
@@ -309,7 +303,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(int argc, const VALUE *argv, VALUE ary) ::
+rb_ary_aref(argc, VALUE *argv, VALUE ary) ::
 
   Equivalent to Array#[].
 
@@ -336,9 +330,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:
@@ -347,7 +341,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:
 
@@ -362,15 +356,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)(ANYARGS), int argc)
+		        VALUE (*func)(), int argc)
 
   void rb_define_singleton_method(VALUE object, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
+			          VALUE (*func)(), 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.
@@ -402,9 +396,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)(ANYARGS), int argc)
+			        VALUE (*func)(), int argc)
   void rb_define_protected_method(VALUE klass, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
+			          VALUE (*func)(), int argc)
 
 At last, rb_define_module_function defines a module function,
 which are private AND singleton methods of the module.
@@ -421,12 +415,12 @@ or
 To define module functions, use:
 
   void rb_define_module_function(VALUE module, const char *name,
-                                 VALUE (*func)(ANYARGS), int argc)
+				 VALUE (*func)(), 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)(ANYARGS), int argc)
+  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
 
 To define an alias for the method,
 
@@ -455,7 +449,7 @@ available), you can use:
 
   VALUE rb_current_receiver(void)
 
-==== Constant Definition
+=== Constant Definition
 
 We have 2 functions to define constants:
 
@@ -465,11 +459,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:
@@ -487,7 +481,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
@@ -538,7 +532,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
 
@@ -547,7 +541,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
@@ -566,7 +560,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
 
@@ -582,7 +576,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:
@@ -598,11 +592,11 @@ function below.
 
   void rb_define_readonly_variable(const char *name, VALUE *var)
 
-You can define hooked variables.  The accessor functions (getter and
+You can defined 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()
@@ -617,14 +611,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.
@@ -638,7 +632,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.
@@ -658,8 +652,6 @@ 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 {
@@ -743,10 +735,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
-TypedData_Get_Struct().
+Data_Get_Struct().
 
   TypedData_Get_Struct(obj, type, &data_type, sval)
 
@@ -754,23 +746,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
@@ -810,7 +802,7 @@ Here's the example of an initializing function.
   }
 
 The dbm extension wraps the dbm struct in the C environment using
-TypedData_Make_Struct.
+Data_Make_Struct.
 
   struct dbmdata {
       int  di_size;
@@ -861,7 +853,7 @@ arguments like this:
   {
       /* ... */
       if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-          mode = 0666;          /* default value */
+          mode = 0666;		/* default value */
       }
       /* ... */
   }
@@ -875,9 +867,6 @@ 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:
 
@@ -895,11 +884,7 @@ but are not exported to the Ruby world.  You need to protect them by
 
   void rb_global_variable(VALUE *var)
 
-or the objects themselves by
-
-  void rb_gc_register_mark_object(VALUE object)
-
-=== Prepare extconf.rb
+== Prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
 Makefile.
@@ -948,7 +933,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
@@ -957,7 +942,7 @@ check dependencies.  You can make this file by invoking
 
 It's harmless.  Prepare it.
 
-=== Generate Makefile
+== Generate Makefile
 
 Try generating the Makefile by:
 
@@ -972,7 +957,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
 
@@ -981,21 +966,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
@@ -1004,14 +989,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
@@ -1037,7 +1022,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
@@ -1047,7 +1032,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
@@ -1055,7 +1040,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
@@ -1069,7 +1054,7 @@ util.c     :: misc utilities
   gem_prelude.rb
   prelude.rb
 
-=== Class Library
+== Class Library
 
 array.c      :: Array
 bignum.c     :: Bignum
@@ -1101,22 +1086,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 ::
 
@@ -1124,7 +1109,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 ::
 
@@ -1138,7 +1123,7 @@ Qfalse ::
 
   false object
 
-=== C Pointer Wrapping
+== C Pointer Wrapping
 
 Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
@@ -1158,7 +1143,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) ::
 
@@ -1188,11 +1173,11 @@ void Check_Type(VALUE value, int type) ::
 
   Ensures +value+ is of the given internal +type+ or raises a TypeError
 
-SafeStringValue(value) ::
+SaveStringValue(value) ::
 
   Checks that +value+ is a String and is not tainted
 
-=== Data Type Conversion
+== Data Type Conversion
 
 FIX2INT(value), INT2FIX(i) ::
 
@@ -1276,7 +1261,7 @@ rb_str_new2(s) ::
 
   char * -> String
 
-=== Defining Classes and Modules
+== Defining Classes and Modules
 
 VALUE rb_define_class(const char *name, VALUE super) ::
 
@@ -1303,7 +1288,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) ::
 
@@ -1341,13 +1326,10 @@ void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(),
 
 void rb_global_variable(VALUE *var) ::
 
-  Tells GC to protect C global variable, which holds Ruby value to be marked.
-
-void rb_gc_register_mark_object(VALUE object) ::
-
-  Tells GC to protect the +object+, which may not be referenced anywhere.
+  GC requires C global variables which hold Ruby values to be marked.
+  rb_global_variable tells GC to protect these variables.
 
-=== Constant Definition
+== Constant Definition
 
 void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
@@ -1359,9 +1341,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)(ANYARGS), int argc) ::
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
   Defines a method for the class.  func is the function pointer.  argc
   is the number of arguments.  if argc is -1, the function will receive
@@ -1369,21 +1351,15 @@ rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), 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)(ANYARGS), int argc) ::
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
   Defines a private method for the class.  Arguments are same as
   rb_define_method().
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), 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
@@ -1446,9 +1422,10 @@ 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 set to +Qundef+.
-  If +optional+ is negative, rest of +keyword_hash+ are ignored, otherwise
-  raises "unknown keyword" +ArgumentError+.
+  +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+.
 
   Be warned, handling keyword arguments in the C API is less efficient
   than handling them in Ruby.  Consider using a Ruby wrapper method
@@ -1462,7 +1439,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, ...) ::
 
@@ -1500,7 +1477,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) ::
 
@@ -1511,7 +1488,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) ::
 
@@ -1537,15 +1514,14 @@ VALUE rb_yield(VALUE val) ::
 
   Evaluates the block with value val.
 
-VALUE rb_rescue(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
   Calls the function func1, with arg1 as the argument.  If an exception
-  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.
+  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.
 
-VALUE rb_ensure(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
   Calls the function func1 with arg1 as the argument, then calls func2
   with arg2 if execution terminated.  The return value from
@@ -1577,7 +1553,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, ...) ::
 
@@ -1612,97 +1588,7 @@ 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".
 
-=== 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
+== Initialize and Start the Interpreter
 
 The embedding API functions are below (not needed for extension libraries):
 
@@ -1727,7 +1613,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) ::
 
@@ -1757,19 +1643,7 @@ int rb_remove_event_hook(rb_event_hook_func_t func) ::
 
   Removes the specified hook function.
 
-=== 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
+== Macros for Compatibility
 
 Some macros to check API compatibilities are available by default.
 
@@ -1809,25 +1683,25 @@ 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
+= 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
-(https://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29).
+(http://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.
@@ -1846,13 +1720,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(),
@@ -1861,7 +1735,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.
@@ -1883,7 +1757,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
@@ -1898,7 +1772,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
@@ -1912,7 +1786,7 @@ 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>.
 
-== 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
@@ -1959,7 +1833,8 @@ 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 negatively affecting other systems.
+   systems/compilers without those without negatively affecting other
+   systems.
 
 :enddoc: Local variables:
 :enddoc: fill-column: 70
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
index 1e70555988..3bc7e05623 100644
--- a/doc/globals.rdoc
+++ b/doc/globals.rdoc
@@ -10,7 +10,7 @@ $'::   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.
-$=::   This variable is no longer effective. Deprecated.
+$=::   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.
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 85b6536ee4..416dec3906 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -83,6 +83,7 @@ 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
@@ -206,6 +207,9 @@ irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両
     nil: 通常モードであれば, inspect modeとなり, mathモードの時は, non
 	 inspect modeとなる.
 
+--- conf.math_mode
+    参照のみ. bcモード(分数, 行列の計算ができます)かどうか?
+
 --- conf.use_loader = true/false
     load/require時にirbのfile読み込み機能を用いるモードのスイッチ(デフォ
     ルトは用いない). このモードはIRB全体に反映される.
@@ -405,3 +409,4 @@ rubyでは, 以下のプログラムはエラーになります.
 % comment-end: "\n"
 % End:
 %
+
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index e7baf933c6..d22d09f7a4 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -34,9 +34,7 @@ Yukihiro Matsumoto (matz)
 
 Zachary Scott (zzak)
 
-== Standard Library Maintainers
-
-=== Libraries
+== Library Maintainers
 
 [lib/English.rb]
   _unmaintained_
@@ -48,22 +46,44 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/cgi.rb, lib/cgi/*]
   Takeyuki Fujioka (xibbar)
+[lib/cmath.rb]
+  _unmaintained_
+[lib/csv.rb]
+  James Edward Gray II (jeg2)
 [lib/drb.rb, lib/drb/*]
   Masatoshi SEKI (seki)
 [lib/debug.rb]
   _unmaintained_
 [lib/delegate.rb]
   _unmaintained_
+[lib/e2mmap.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/erb.rb]
-  Masatoshi SEKI (seki), Takashi Kokubun (k0kubun)
+  Masatoshi SEKI (seki)
+[lib/fileutils.rb]
+  _unmaintained_
 [lib/find.rb]
   Kazuki Tsujimoto (ktsj)
+[lib/forwardable.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/getoptlong.rb]
   _unmaintained_
+[lib/ipaddr.rb]
+  Akinori MUSHA (knu)
+[lib/irb.rb, lib/irb/*]
+  Keiju ISHITSUKA (keiju)
+[lib/logger.rb]
+  Naotoshi Seo (sonots)
+[lib/mathn.rb]
+  Keiju ISHITSUKA (keiju)
+[lib/matrix.rb]
+  Marc-Andre Lafortune (marcandre)
 [lib/mkmf.rb]
   _unmaintained_
 [lib/monitor.rb]
   Shugo Maeda (shugo)
+[lib/mutex_m.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/net/ftp.rb]
   Shugo Maeda (shugo)
 [lib/net/imap.rb]
@@ -84,10 +104,14 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/optparse.rb, lib/optparse/*]
   Nobuyuki Nakada (nobu)
+[lib/ostruct.rb]
+  Marc-Andre Lafortune (marcandre)
 [lib/pp.rb]
   Tanaka Akira (akr)
 [lib/prettyprint.rb]
   Tanaka Akira (akr)
+[lib/prime.rb]
+  Yuki Sonoda (yugui)
 [lib/profile.rb]
   _unmaintained_
 [lib/profiler.rb]
@@ -96,31 +120,48 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/racc/*]
   Aaron Patterson (tenderlove)
+[lib/rbconfig/*]
+  _unmaintained_
+[lib/rdoc.rb, lib/rdoc/*]
+  Eric Hodel (drbrain)
 [lib/resolv-replace.rb]
   Tanaka Akira (akr)
 [lib/resolv.rb]
   Tanaka Akira (akr)
+[lib/rexml/*]
+  Kouhei Sutou (kou)
 [lib/rinda/*]
   Masatoshi SEKI (seki)
+[lib/rss.rb, lib/rss/*]
+  Kouhei Sutou (kou)
 [lib/rubygems.rb, lib/ubygems.rb, lib/rubygems/*]
-  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
-  https://github.com/rubygems/rubygems
+  Eric Hodel (drbrain)
+[lib/scanf.rb]
+  David A. Black (dblack)
 [lib/set.rb]
   Akinori MUSHA (knu)
 [lib/securerandom.rb]
   Tanaka Akira (akr)
+[lib/shell.rb, lib/shell/*]
+  Keiju ISHITSUKA (keiju)
 [lib/shellwords.rb]
   Akinori MUSHA (knu)
 [lib/singleton.rb]
   Yukihiro Matsumoto (matz)
+[lib/sync.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/tempfile.rb]
   _unmaintained_
 [lib/tmpdir.rb]
   _unmaintained_
+[lib/thwait.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/time.rb]
   Tanaka Akira (akr)
 [lib/timeout.rb]
   Yukihiro Matsumoto (matz)
+[lib/tracer.rb]
+  Keiju ISHITSUKA (keiju)
 [lib/tsort.rb]
   Tanaka Akira (akr)
 [lib/un.rb]
@@ -131,31 +172,59 @@ Zachary Scott (zzak)
   YAMADA, Akira (akira)
 [lib/weakref.rb]
   _unmaintained_
+[lib/webrick.rb, lib/webrick/*]
+  Hiroshi Nakamura (nahi)
 [lib/yaml.rb, lib/yaml/*]
-  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  Aaron Patterson (tenderlove)
 
-=== Extensions
+== Extension Maintainers
 
+[ext/bigdecimal]
+  Kenta Murata (mrkn)
 [ext/cgi]
   Nobuyoshi Nakada (nobu)
 [ext/continuation]
   Koichi Sasada (ko1)
 [ext/coverage]
   Yusuke Endoh (mame)
+[ext/date]
+  _unmaintained_
+[ext/dbm]
+  _unmaintained_
 [ext/digest, ext/digest/*]
   Akinori MUSHA (knu)
+[ext/etc]
+  _unmaintained_
+[ext/fcntl]
+  _unmaintained_
 [ext/fiber]
   Koichi Sasada (ko1)
+[ext/fiddle]
+  Aaron Patterson (tenderlove)
+[ext/gdbm]
+  Yukihiro Matsumoto (matz)
+[ext/io/console]
+  Nobuyuki Nakada (nobu)
 [ext/io/nonblock]
   Nobuyuki Nakada (nobu)
 [ext/io/wait]
   Nobuyuki Nakada (nobu)
+[ext/json]
+  NARUSE, Yui (naruse)
+[ext/mathn/complex]
+  Keiju ISHITSUKA (keiju)
+[ext/mathn/rational]
+  Keiju ISHITSUKA (keiju)
 [ext/nkf]
   NARUSE, Yui (narse)
 [ext/objspace]
   _unmaintained_
+[ext/openssl]
+  Kazuki Yamaguchi (rhe)
 [ext/pathname]
   Tanaka Akira (akr)
+[ext/psych]
+  Aaron Patterson (tenderlove)
 [ext/pty]
   _unmaintained_
 [ext/racc]
@@ -164,133 +233,20 @@ Zachary Scott (zzak)
   TAKAO Kouji (kouji)
 [ext/ripper]
   _unmaintained_
+[ext/sdbm]
+  Yukihiro Matsumoto (matz)
 [ext/socket]
   * Tanaka Akira (akr)
   * API change needs matz's approval
+[ext/stringio]
+  Nobuyuki Nakada (nobu)
+[ext/strscan]
+  _unmaintained_
 [ext/syslog]
   Akinori MUSHA (knu)
 [ext/win32]
   NAKAMURA Usaku (usa)
 [ext/win32ole]
   Masaki Suketa (suke)
-
-== Default gems Maintainers
-
-=== Libraries
-
-[lib/bundler.rb, lib/bundler/*]
-  Hiroshi SHIBATA (hsbt)
-  https://github.com/bundler/bundler
-[lib/cmath.rb]
-  _unmaintained_
-  https://github.com/ruby/cmath
-[lib/csv.rb]
-  Kenta Murata (mrkn), Kouhei Sutou (kou)
-  https://github.com/ruby/csv
-[lib/e2mmap.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/fileutils.rb]
-  _unmaintained_
-  https://github.com/ruby/fileutils
-[lib/forwardable.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/ipaddr.rb]
-  Akinori MUSHA (knu)
-[lib/irb.rb, lib/irb/*]
-  Keiju ISHITSUKA (keiju)
-[lib/logger.rb]
-  Naotoshi Seo (sonots)
-[lib/matrix.rb]
-  Marc-Andre Lafortune (marcandre)
-[lib/mutex_m.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/ostruct.rb]
-  Marc-Andre Lafortune (marcandre)
-[lib/prime.rb]
-  Yuki Sonoda (yugui)
-[lib/rdoc.rb, lib/rdoc/*]
-  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
-  https://github.com/ruby/rdoc
-[lib/rexml/*]
-  Kouhei Sutou (kou)
-[lib/rss.rb, lib/rss/*]
-  Kouhei Sutou (kou)
-[lib/scanf.rb]
-  David A. Black (dblack)
-  https://github.com/ruby/scanf
-[lib/shell.rb, lib/shell/*]
-  Keiju ISHITSUKA (keiju)
-[lib/sync.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/thwait.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/tracer.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/webrick.rb, lib/webrick/*]
-  Eric Wong (normalperson)
-  https://bugs.ruby-lang.org/
-
-=== Extensions
-
-[ext/bigdecimal]
-  Kenta Murata (mrkn)
-  https://github.com/ruby/bigdecimal
-[ext/date]
-  _unmaintained_
-  https://github.com/ruby/date
-[ext/dbm]
-  _unmaintained_
-  https://github.com/ruby/dbm
-[ext/etc]
-  Ruby core team
-  https://github.com/ruby/etc
-[ext/fcntl]
-  Ruby core team
-  https://github.com/ruby/fcntl
-[ext/fiddle]
-  Aaron Patterson (tenderlove)
-  https://github.com/ruby/fiddle
-[ext/gdbm]
-  Yukihiro Matsumoto (matz)
-  https://github.com/ruby/gdbm
-[ext/io/console]
-  Nobuyuki Nakada (nobu)
-  https://github.com/ruby/io-console
-[ext/json]
-  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
-  https://github.com/flori/json
-[ext/openssl]
-  Kazuki Yamaguchi (rhe)
-  https://github.com/ruby/openssl
-[ext/psych]
-  Aaron Patterson (tenderlove), Hiroshi SHIBATA(hsbt)
-  https://github.com/ruby/psych
-[ext/sdbm]
-  Yukihiro Matsumoto (matz)
-  https://github.com/ruby/sdbm
-[ext/stringio]
-  Nobuyuki Nakada (nobu)
-  https://github.com/ruby/stringio
-[ext/strscan]
-  _unmaintained_
-  https://github.com/ruby/strscan
 [ext/zlib]
-  NARUSE, Yui (naruse)
-  https://github.com/ruby/zlib
-
-== Bundled gems upstream repositories
-
-[did_you_mean]
-  https://github.com/yuki24/did_you_mean
-[minitest]
-  https://github.com/seattlerb/minitest
-[net-telnet]
-  https://github.com/ruby/net-telnet
-[power_assert]
-  https://github.com/k-tsj/power_assert
-[rake]
-  https://github.com/ruby/rake
-[test-unit]
-  https://github.com/test-unit/test-unit
-[xmlrpc]
-  https://github.com/ruby/xmlrpc
+  _unmaintained_
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 9218a75b67..49fce51a8d 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -63,10 +63,9 @@ 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 it: <tt>\\\\</tt>.
+a backslash literally backslash-escape that: <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.
@@ -228,7 +227,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>,
@@ -541,15 +540,10 @@ 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)bc/.match('abC') #=> #<MatchData "abC">
+    /a(?i:b)c/.match('aBc') #=> #<MatchData "aBc">
+    /a(?i:b)c/.match('abc') #=> #<MatchData "abc">
 
 Options may also be used with <tt>Regexp.new</tt>:
 
@@ -613,9 +607,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"
-       # raises Encoding::CompatibilityError: incompatible encoding regexp match
-       #         (ISO-8859-1 regexp with UTF-8 string)
+    r =~"a\u3042"
+       #=> 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 d7d6464ce1..378699fb15 100644
--- a/doc/security.rdoc
+++ b/doc/security.rdoc
@@ -7,12 +7,12 @@ 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: https://www.ruby-lang.org/en/security/
-Japanese version is here: https://www.ruby-lang.org/ja/security/
+security vulnerability, at: http://www.ruby-lang.org/en/security/
+Japanese version is here: http://www.ruby-lang.org/ja/security/
 
 Security vulnerabilities should be reported via an email to
 mailto:security@ruby-lang.org ({the PGP public
-key}[https://www.ruby-lang.org/security.asc]), which is a private mailing list.
+key}[http://www.ruby-lang.org/security.asc]), which is a private mailing list.
 Reported problems will be published after fixes.
 
 == <code>$SAFE</code>
diff --git a/doc/signals.rdoc b/doc/signals.rdoc
deleted file mode 100644
index fdd9206afb..0000000000
--- a/doc/signals.rdoc
+++ /dev/null
@@ -1,106 +0,0 @@
-= 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 VM loop.
-
-== 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 09dc61bc52..3cd124bac2 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -12,15 +12,27 @@ 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
 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
 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
 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
+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)
+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
 Net::IMAP:: Ruby client api for Internet Message Access Protocol
@@ -30,100 +42,71 @@ 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
 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
 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
+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
-YAML:: Ruby client library for the Psych YAML implementation
-
-== Extensions
-
-Coverage:: Provides coverage measurement for Ruby
-Digest:: Provides a framework for message digest libraries
-IO:: Extensions for Ruby IO class, including #wait and ::console
-NKF:: Ruby extension for Network Kanji Filter
-objspace:: Extends ObjectSpace module to add methods for internal statistics
-Pathname:: Representation of the name of a file or directory on the filesystem
-PTY:: Creates and manages pseudo terminals
-Readline:: Provides an interface for GNU Readline and Edit Line (libedit)
-Ripper:: Provides an interface for parsing Ruby programs into S-expressions
-Socket:: Access underlying OS socket implementations
-Syslog:: Ruby interface for the POSIX system logging facility
-WIN32OLE:: Provides an interface for OLE Automation in Ruby
-
-= Default gems
-
-== Libraries
-
-Bundler:: Manage your Ruby application's gem dependencies
-CMath:: Provides Trigonometric and Transcendental functions for complex numbers
-CSV:: Provides an interface to read and write CSV files and data
-E2MM:: Module for defining custom exceptions with specific messages
-FileUtils:: Several file utility methods for copying, moving, removing, etc
-Forwardable:: Provides delegation of specified methods to a designated object
-IPAddr:: Provides methods to manipulate IPv4 and IPv6 IP addresses
-IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
-Logger:: Provides a simple logging utility for outputting messages
-Matrix:: Represents a mathematical matrix.
-Mutex_m:: Mixin to extend objects to be handled like a Mutex
-OpenStruct:: Class to build custom data structures, similar to a Hash
-Prime:: Prime numbers and factorization library
-RDoc:: Produces HTML and command-line documentation for Ruby
-REXML:: An XML toolkit for Ruby
-RSS:: Family of libraries that support various formats of XML "feeds"
-Scanf:: A Ruby implementation of the C function scanf(3)
-Shell:: An idiomatic Ruby interface for common UNIX shell commands
-Synchronizer:: A module that provides a two-phase lock with a counter
-ThreadsWait:: Watches for termination of multiple threads
-Tracer:: Outputs a source level execution trace of a Ruby program
 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
 
 == 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
+Digest:: Provides a framework for message digest libraries
 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::console:: Console interface
+IO:: Extensions for Ruby IO class, including #wait 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
-SDBM:: Provides a simple file-based key-value store with String keys and values
+PTY:: Creates and manages pseudo terminals
+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
-
-DidYouMean:: "Did you mean?" experience in Ruby
-MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
-Net::Telnet:: Telnet client library for Ruby
-PowerAssert:: Power Assert for Ruby.
-Rake:: Ruby build program with capabilities similar to make
-Test::Unit:: A compatibility layer for MiniTest
-XMLRPC:: Remote Procedure Call over HTTP support for Ruby
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
index b86d60ad88..ec86ef05ee 100644
--- a/doc/syntax/calling_methods.rdoc
+++ b/doc/syntax/calling_methods.rdoc
@@ -27,32 +27,13 @@ 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.
 
-=== 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
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
index 65f7b431e3..123b48b6b9 100644
--- a/doc/syntax/control_expressions.rdoc
+++ b/doc/syntax/control_expressions.rdoc
@@ -405,8 +405,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 as the result of the current
-block iteration:
++next+ accepts an argument that can be used the result of the current block
+iteration:
 
   result = [1, 2, 3].map do |value|
     next value if value.even?
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index 08eefd21de..f5b9738868 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -71,33 +71,6 @@ 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>:
@@ -135,7 +108,7 @@ sequences are as follows:
   \c\M-x         same as above
   \c? or \C-?    delete, ASCII 7Fh (DEL)
 
-Any other character following a backslash is interpreted as the
+Any other character followed by a backslash is interpreted as the
 character itself.
 
 Double-quote strings allow interpolation of other values using
@@ -333,7 +306,6 @@ 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
 
 You may create a range of any object.  See the Range documentation for details
 on the methods you need to implement.
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
index a47c1a3cbf..d41c6fcba5 100644
--- a/doc/syntax/methods.rdoc
+++ b/doc/syntax/methods.rdoc
@@ -31,7 +31,7 @@ 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 examples of valid Ruby methods:
+The following are the examples of valid ruby methods:
 
   def hello
     "hello"
@@ -45,18 +45,18 @@ 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 the method name) are called and
+The bang methods (<code>!</code> at the end of 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's core library the
+exclamation point or bang is considered dangerous. In ruby 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, the Ruby core library will have a non-bang
+receiver. Almost always, 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 the Ruby core library but
-may or may not hold true for other Ruby libraries.
+the receiver. This convention is typically true for 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
@@ -66,8 +66,8 @@ 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.
 
-These are method names for the various Ruby operators.  Each of these
-operators accepts only one argument.  Following the operator is the typical
+These are method names for the various ruby operators.  Each of these
+operators accept 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
@@ -147,18 +147,14 @@ evaluated.
     1 + 1  # this expression is never evaluated
   end
 
-Note that for assignment methods the return value will be ignored when using
-the assignment syntax.  Instead, the argument will be returned:
+Note that for assignment methods the return value will always be ignored.
+Instead, the argument will be returned:
 
   def a=(value)
     return 1 + value
   end
 
-  p(self.a = 5) # prints 5
-
-The actual return value will be returned when invoking the method directly:
-
-  p send(:a=, 5) # prints 6
+  p(a = 5) # prints 5
 
 == Scope
 
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
index fc554bb476..4cba61d396 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.  Refinements can modify both classes and modules.
+class locally.
 
 Here is a basic refinement:
 
@@ -26,7 +26,8 @@ Here is a basic refinement:
   end
 
 First, a class +C+ is defined.  Next a refinement for +C+ is created using
-Module#refine.
+Module#refine.  Refinements only modify classes, not modules so the argument
+must be a class.
 
 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
@@ -48,13 +49,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 until the end of the eval string.
+are active 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:
 
@@ -79,7 +80,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:
@@ -158,8 +159,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:
 
@@ -179,9 +180,9 @@ When not evaluated:
   end
   # not activated here
 
-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:
+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:
 
   module ToJSON
     refine Integer do
@@ -224,13 +225,12 @@ 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 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.
+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.
 
-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.
+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.
 
 == +super+
 
@@ -247,37 +247,16 @@ 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.
 
-== Methods Introspection
+== Indirect Method Calls
 
-When using introspection methods such as Kernel#method or Kernel#methods refinements are not honored.
+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.
 
 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 https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
+See http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
 current specification for implementing refinements.  The specification also
 contains more details.
diff --git a/enc/ascii.c b/enc/ascii.c
index 8b32c414fe..d34cc20582 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -29,12 +29,9 @@
  */
 
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
+#include "encindex.h"
 #ifndef ENCINDEX_ASCII
-# define ENCINDEX_ASCII 0
+#define ENCINDEX_ASCII 0
 #endif
 
 OnigEncodingDefine(ascii, ASCII) = {
@@ -54,9 +51,9 @@ 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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
 ENC_REPLICATE("IBM437", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
index ab4fb69819..fc2bcadcc1 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -300,9 +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,
+  onigenc_ascii_only_case_map,
 };
 
 /*
@@ -335,9 +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,
+  onigenc_ascii_only_case_map,
 };
 ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
 
@@ -370,7 +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,
+  onigenc_ascii_only_case_map,
 };
diff --git a/enc/cp949.c b/enc/cp949.c
index bd2c8d21a4..f832cd5758 100644
--- a/enc/cp949.c
+++ b/enc/cp949.c
@@ -211,9 +211,9 @@ 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,
+  onigenc_ascii_only_case_map,
 };
 /*
  * Name: CP949
diff --git a/enc/depend b/enc/depend
index b9e8e3ba8b..6053487653 100644
--- a/enc/depend
+++ b/enc/depend
@@ -108,11 +108,7 @@ enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %     src = "#{e}.trans"
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-%     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
+%     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
 %   end
 
@@ -158,7 +154,7 @@ clean:
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 % unless inplace
-	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
+	$(Q)$(RM) enc/unicode/name2ctype.h
 	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
 % end
@@ -169,7 +165,7 @@ clean:
 clean-srcs:
 	$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
-	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
+	$(Q)$(RM) enc/unicode/name2ctype.h
 	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=@ignore_error%>
@@ -184,21 +180,18 @@ enc/ascii.$(OBJEXT): config.h
 enc/ascii.$(OBJEXT): defines.h
 enc/ascii.$(OBJEXT): enc/ascii.c
 enc/ascii.$(OBJEXT): missing.h
-enc/ascii.$(OBJEXT): onigmo.h
 enc/ascii.$(OBJEXT): oniguruma.h
 enc/big5.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/big5.$(OBJEXT): oniguruma.h
 enc/cp949.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/cp949.$(OBJEXT): oniguruma.h
 enc/emacs_mule.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regenc.h
@@ -209,7 +202,6 @@ 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): onigmo.h
 enc/emacs_mule.$(OBJEXT): oniguruma.h
 enc/emacs_mule.$(OBJEXT): st.h
 enc/emacs_mule.$(OBJEXT): subst.h
@@ -225,7 +217,6 @@ 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
@@ -240,7 +231,6 @@ 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): onigmo.h
 enc/euc_jp.$(OBJEXT): oniguruma.h
 enc/euc_jp.$(OBJEXT): st.h
 enc/euc_jp.$(OBJEXT): subst.h
@@ -249,21 +239,18 @@ 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): onigmo.h
 enc/euc_kr.$(OBJEXT): oniguruma.h
 enc/euc_tw.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/euc_tw.$(OBJEXT): oniguruma.h
 enc/gb18030.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/gb18030.$(OBJEXT): oniguruma.h
 enc/gb2312.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/gb2312.$(OBJEXT): $(top_srcdir)/regenc.h
@@ -274,7 +261,6 @@ enc/gb2312.$(OBJEXT): enc/gb2312.c
 enc/gb2312.$(OBJEXT): encoding.h
 enc/gb2312.$(OBJEXT): intern.h
 enc/gb2312.$(OBJEXT): missing.h
-enc/gb2312.$(OBJEXT): onigmo.h
 enc/gb2312.$(OBJEXT): oniguruma.h
 enc/gb2312.$(OBJEXT): st.h
 enc/gb2312.$(OBJEXT): subst.h
@@ -283,7 +269,6 @@ enc/gbk.$(OBJEXT): config.h
 enc/gbk.$(OBJEXT): defines.h
 enc/gbk.$(OBJEXT): enc/gbk.c
 enc/gbk.$(OBJEXT): missing.h
-enc/gbk.$(OBJEXT): onigmo.h
 enc/gbk.$(OBJEXT): oniguruma.h
 enc/iso_8859_1.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_1.$(OBJEXT): config.h
@@ -291,7 +276,6 @@ 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): onigmo.h
 enc/iso_8859_1.$(OBJEXT): oniguruma.h
 enc/iso_8859_10.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_10.$(OBJEXT): config.h
@@ -299,14 +283,12 @@ 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): onigmo.h
 enc/iso_8859_10.$(OBJEXT): oniguruma.h
 enc/iso_8859_11.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/iso_8859_11.$(OBJEXT): oniguruma.h
 enc/iso_8859_13.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_13.$(OBJEXT): config.h
@@ -314,7 +296,6 @@ 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): onigmo.h
 enc/iso_8859_13.$(OBJEXT): oniguruma.h
 enc/iso_8859_14.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_14.$(OBJEXT): config.h
@@ -322,7 +303,6 @@ 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): onigmo.h
 enc/iso_8859_14.$(OBJEXT): oniguruma.h
 enc/iso_8859_15.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_15.$(OBJEXT): config.h
@@ -330,7 +310,6 @@ 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): onigmo.h
 enc/iso_8859_15.$(OBJEXT): oniguruma.h
 enc/iso_8859_16.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_16.$(OBJEXT): config.h
@@ -338,7 +317,6 @@ 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): onigmo.h
 enc/iso_8859_16.$(OBJEXT): oniguruma.h
 enc/iso_8859_2.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_2.$(OBJEXT): config.h
@@ -346,7 +324,6 @@ 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): onigmo.h
 enc/iso_8859_2.$(OBJEXT): oniguruma.h
 enc/iso_8859_3.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_3.$(OBJEXT): config.h
@@ -354,7 +331,6 @@ 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): onigmo.h
 enc/iso_8859_3.$(OBJEXT): oniguruma.h
 enc/iso_8859_4.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_4.$(OBJEXT): config.h
@@ -362,35 +338,30 @@ 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): onigmo.h
 enc/iso_8859_4.$(OBJEXT): oniguruma.h
 enc/iso_8859_5.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/iso_8859_5.$(OBJEXT): oniguruma.h
 enc/iso_8859_6.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/iso_8859_6.$(OBJEXT): oniguruma.h
 enc/iso_8859_7.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/iso_8859_7.$(OBJEXT): oniguruma.h
 enc/iso_8859_8.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/iso_8859_8.$(OBJEXT): oniguruma.h
 enc/iso_8859_9.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/iso_8859_9.$(OBJEXT): config.h
@@ -398,21 +369,18 @@ 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): onigmo.h
 enc/iso_8859_9.$(OBJEXT): oniguruma.h
 enc/koi8_r.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/koi8_r.$(OBJEXT): oniguruma.h
 enc/koi8_u.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/koi8_u.$(OBJEXT): oniguruma.h
 enc/shift_jis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/shift_jis.$(OBJEXT): $(top_srcdir)/regenc.h
@@ -423,10 +391,8 @@ 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): enc/shift_jis.h
 enc/shift_jis.$(OBJEXT): intern.h
 enc/shift_jis.$(OBJEXT): missing.h
-enc/shift_jis.$(OBJEXT): onigmo.h
 enc/shift_jis.$(OBJEXT): oniguruma.h
 enc/shift_jis.$(OBJEXT): st.h
 enc/shift_jis.$(OBJEXT): subst.h
@@ -631,19 +597,16 @@ 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): config.h
 enc/unicode.$(OBJEXT): defines.h
 enc/unicode.$(OBJEXT): enc/unicode.c
-enc/unicode.$(OBJEXT): enc/unicode/10.0.0/casefold.h
-enc/unicode.$(OBJEXT): enc/unicode/10.0.0/name2ctype.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
 enc/unicode.$(OBJEXT): intern.h
 enc/unicode.$(OBJEXT): missing.h
-enc/unicode.$(OBJEXT): onigmo.h
 enc/unicode.$(OBJEXT): oniguruma.h
 enc/unicode.$(OBJEXT): st.h
 enc/unicode.$(OBJEXT): subst.h
@@ -653,7 +616,6 @@ enc/us_ascii.$(OBJEXT): config.h
 enc/us_ascii.$(OBJEXT): defines.h
 enc/us_ascii.$(OBJEXT): enc/us_ascii.c
 enc/us_ascii.$(OBJEXT): missing.h
-enc/us_ascii.$(OBJEXT): onigmo.h
 enc/us_ascii.$(OBJEXT): oniguruma.h
 enc/utf_16be.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/utf_16be.$(OBJEXT): config.h
@@ -661,7 +623,6 @@ 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): onigmo.h
 enc/utf_16be.$(OBJEXT): oniguruma.h
 enc/utf_16le.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/utf_16le.$(OBJEXT): config.h
@@ -669,7 +630,6 @@ 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): onigmo.h
 enc/utf_16le.$(OBJEXT): oniguruma.h
 enc/utf_32be.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/utf_32be.$(OBJEXT): config.h
@@ -677,7 +637,6 @@ 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): onigmo.h
 enc/utf_32be.$(OBJEXT): oniguruma.h
 enc/utf_32le.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/utf_32le.$(OBJEXT): config.h
@@ -685,7 +644,6 @@ 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): onigmo.h
 enc/utf_32le.$(OBJEXT): oniguruma.h
 enc/utf_8.$(OBJEXT): $(top_srcdir)/encindex.h
 enc/utf_8.$(OBJEXT): $(top_srcdir)/regenc.h
@@ -693,51 +651,25 @@ enc/utf_8.$(OBJEXT): config.h
 enc/utf_8.$(OBJEXT): defines.h
 enc/utf_8.$(OBJEXT): enc/utf_8.c
 enc/utf_8.$(OBJEXT): missing.h
-enc/utf_8.$(OBJEXT): onigmo.h
 enc/utf_8.$(OBJEXT): oniguruma.h
 enc/windows_1250.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/windows_1250.$(OBJEXT): oniguruma.h
 enc/windows_1251.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/windows_1251.$(OBJEXT): oniguruma.h
 enc/windows_1252.$(OBJEXT): $(top_srcdir)/regenc.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): onigmo.h
 enc/windows_1252.$(OBJEXT): oniguruma.h
-enc/windows_1253.$(OBJEXT): $(top_srcdir)/regenc.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): 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): 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): $(hdrdir)/ruby/ruby.h
 enc/windows_31j.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/windows_31j.$(OBJEXT): $(top_srcdir)/regint.h
@@ -747,11 +679,9 @@ 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): onigmo.h
 enc/windows_31j.$(OBJEXT): oniguruma.h
 enc/windows_31j.$(OBJEXT): st.h
 enc/windows_31j.$(OBJEXT): subst.h
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
index f92eb183cf..a53f243dfe 100644
--- a/enc/emacs_mule.c
+++ b/enc/emacs_mule.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regenc.h"
+#include "regint.h"
 
 
 #define emacsmule_islead(c)    ((UChar )(c) < 0x9e)
@@ -334,9 +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,
+  onigenc_ascii_only_case_map,
 };
 
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index ded051af69..f9604b8d6e 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regenc.h"
+#include "regint.h"
 
 #define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
 
@@ -576,9 +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,
+  onigenc_ascii_only_case_map,
 };
 /*
  * Name: EUC-JP
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index 21d6ab4e1c..eb17f476e9 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -188,33 +188,8 @@ 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,
-};
-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 */
+ENC_ALIAS("eucKR", "EUC-KR")
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
index 1c5659cb1d..e7d5187c4a 100644
--- a/enc/euc_tw.c
+++ b/enc/euc_tw.c
@@ -221,8 +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,
+  onigenc_ascii_only_case_map,
 };
 ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
index 63d2e633ec..8a00332991 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -597,7 +597,8 @@ 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,
+  onigenc_ascii_only_case_map,
 };
+
diff --git a/enc/gbk.c b/enc/gbk.c
index 31032553bf..d3bb1a5864 100644
--- a/enc/gbk.c
+++ b/enc/gbk.c
@@ -211,9 +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,
+  onigenc_ascii_only_case_map,
 };
 /*
  * Name: GBK
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 7af0888c3e..2440c9f5a1 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -256,46 +256,45 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
     else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
       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)) {
+    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);
 }
 
 OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
@@ -315,8 +314,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-1", "ISO-8859-1")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
index cae4be2db0..e06f15f9d0 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -215,9 +215,9 @@ 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,
@@ -225,49 +225,48 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
-    else if (code == 0xBD || code == 0xFF)
-      ;
+    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_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)) {
+    else if ((EncISO_8859_10_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code >= 0xA0 && code <= 0xBF)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
@@ -287,8 +286,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
index 85e8f2cdb4..a5522da2e3 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -93,9 +93,9 @@ 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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("ISO8859-11", "ISO-8859-11")
 
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index fe1ddd7065..6e49e16dfb 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -208,9 +208,9 @@ 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,
@@ -218,39 +218,38 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_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)) {
+    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) {
+      if (code==0xB8 || code==0xBA || code==0xBF) {
         code -= 0x10;
       }
       else {
@@ -258,11 +257,11 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
       }
     }
     *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);
 }
 
 OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
@@ -282,8 +281,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-13", "ISO-8859-13")
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
index 647514a016..22df367dd9 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -217,9 +217,9 @@ 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,
@@ -227,58 +227,58 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
-    /* else if (code == 0xAA || code == 0xBA) ; */
+    /* 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_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)) {
+    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)
+      if(code == 0xA2 || code == 0xA5 || code == 0xB1 || code == 0xB3 || code == 0xB5 || code == 0xBE)
 	code -= 0x1;
-      else if (code == 0xAB)
+      else if(code == 0xAB)
 	code -= 0x5;
-      else if (code == 0xFF)
+      else if(code == 0xFF)
 	code -= 0x50;
-      else if (code == 0xB9)
+      else if(code == 0xB9)
 	code -= 0x2;
-      else if (code == 0xBF)
+      else if(code == 0xBF)
 	code -= 0x4;
-      else if (code == 0xB8 || code == 0xBA || code == 0xBC)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
@@ -298,8 +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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 377a3afc7b..06b00b90b3 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -211,9 +211,9 @@ 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,
@@ -221,55 +221,54 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
-    else if (code == 0xAA || code == 0xBA || code == 0xB5)
-      ;
+    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_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)) {
+    else if ((EncISO_8859_15_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xA8)
+      if (code==0xA8)
 	code -= 2;
-      else if (code == 0xB8)
+      else if (code==0xB8)
 	code -= 4;
-      else if (code == 0xBD)
+      else if (code==0xBD)
 	code -= 1;
-      else if (code == 0xFF)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
@@ -289,8 +288,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 135630eb73..c8695e65f7 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -213,9 +213,9 @@ 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,
@@ -223,57 +223,57 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_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)
+    else if ((EncISO_8859_16_CtypeTable[code]&BIT_CTYPE_LOWER)
 	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xA2 || code == 0xBD)
+      if (code==0xA2 || code==0xBD)
 	code--;
-      else if (code == 0xB3 || code == 0xBA || code == 0xBF)
+      else if (code==0xB3 || code==0xBA || code==0xBF)
 	code -= 0x10;
-      else if (code == 0xA8 || code == 0xAE)
+      else if (code==0xA8 || code==0xAE)
 	code -= 0x02;
-      else if (code == 0xB9)
+      else if (code==0xB9)
 	code -= 0x07;
-      else if (code == 0xB8)
+      else if (code==0xB8)
 	code -= 0x04;
-      else if (code == 0xFF)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
@@ -293,8 +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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index 3a05c6320d..00de8ec757 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -221,50 +221,50 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_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) {
+    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 {
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
@@ -284,8 +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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-2", "ISO-8859-2")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
index 2a343eac63..365d9a77de 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -223,46 +223,45 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 #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)
+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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
-    else if (code == 0xB5)
-      ;
+    else if (code==0xB5) ;
     else if ((EncISO_8859_3_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-        code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      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_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)
+      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) {
+      else if (code>=0xB0 && code<=0xBF ) {
 	code -= 0x10;
       }
       else {
@@ -270,11 +269,11 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
       }
     }
     *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);
 }
 
 OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
@@ -294,8 +293,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index e2134e8c0b..6d27300e22 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -232,32 +232,31 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
   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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code = ENC_ISO_8859_4_TO_LOWER_CASE(code);
     }
-    else if (code == 0xA2)
-      ;
+    else if (code==0xA2)  ;
     else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code >= 0xA0 && code <= 0xBF) {
-	if (code == 0xBF)
+      if (code>=0xA0&&code<=0xBF) {
+	if (code==0xBF)
 	  code -= 0x02;
 	else
 	  code -= 0x10;
@@ -266,11 +265,11 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
 	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);
 }
 
 OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
@@ -290,8 +289,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index 6fafc35823..5d67639f5e 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -210,35 +210,35 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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 ((EncISO_8859_5_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+	     && (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_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (0xF1 <= code && code <= 0xFF)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
@@ -258,8 +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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
index 6d852ac8c0..64dc5aceac 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -93,9 +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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("ISO8859-6", "ISO-8859-6")
 
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index ac973f74ba..475fecc19c 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -206,58 +206,58 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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 == 0xF2) {
-      if (flags & ONIGENC_CASE_UPCASE) {
+    if (code==0xF2) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	code = 0xD3;
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_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 (code==0xC0 || code==0xE0)
+	;
     else if ((EncISO_8859_7_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xDC) {
-	code -= 0x26;
+      if (code==0xDC) {
+	code-=0x26;
       }
-      else if (code >= 0xDD && code <= 0xDF) {
-	code -= 0x25;
+      else if (code>=0xDD && code<=0xDF) {
+	code-=0x25;
       }
-      else if (code == 0xFC) {
-	code -= 0x40;
+      else if (code==0xFC) {
+	code-=0x40;
       }
-      else if (code == 0xFD || code == 0xFE) {
-	code -= 0x3F;
+      else if (code==0xFD || code==0xFE) {
+	code-=0x3F;
       }
       else {
-	code -= 0x20;
+	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);
 }
 
 OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
@@ -277,8 +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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-7", "ISO-8859-7")
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
index 0a7a29e82e..4777762849 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -93,9 +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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("ISO8859-8", "ISO-8859-8")
 
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 004eec310f..064a04d480 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -204,9 +204,9 @@ 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,
@@ -216,54 +216,53 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 #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)
+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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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 (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_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      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_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)
+      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);
+    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);
 }
 
 OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
@@ -283,8 +282,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,
+  case_map,
 };
 ENC_ALIAS("ISO8859-9", "ISO-8859-9")
diff --git a/enc/jis/props.h b/enc/jis/props.h
new file mode 100644
index 0000000000..4ae2e1fd23
--- /dev/null
+++ b/enc/jis/props.h
@@ -0,0 +1,227 @@
+/* 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 54aa94f8bc..4ae2e1fd23 100644
--- a/enc/jis/props.h.blt
+++ b/enc/jis/props.h.blt
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.1 */
+/* 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) \
@@ -25,21 +25,20 @@
       && ('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>."
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-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, size_t n)
+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, (int)n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
 }
 
 enum onigenc_jis_ctype {
@@ -69,7 +68,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;
 
@@ -108,7 +107,10 @@ static unsigned char gperf_downcase[256] =
 #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)
+gperf_case_strncmp (s1, s2, n)
+     register const char *s1;
+     register const char *s2;
+     register unsigned int n;
 {
   for (; n > 0;)
     {
@@ -125,15 +127,15 @@ gperf_case_strncmp (register const char *s1, register const char *s2, register s
 }
 #endif
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
 inline
-#endif
+#elif defined(__GNUC__)
+__inline
 #endif
 static unsigned int
-onig_jis_property_hash (register const char *str, register size_t len)
+onig_jis_property_hash (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const unsigned char asso_values[] =
     {
@@ -151,7 +153,7 @@ onig_jis_property_hash (register const char *str, register size_t len)
        1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
       13, 13, 13, 13, 13, 13, 13, 13
     };
-  return (unsigned int)len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
 }
 
 struct onig_jis_property_pool_t
@@ -173,33 +175,41 @@ 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 (register const char *str, register size_t len)
+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"
-      {gperf_offsetof(onig_jis_property_pool, 5),      onigenc_jis_han},
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str5),      onigenc_jis_han},
       {-1},
 #line 49 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 7),    onigenc_jis_latin},
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str7),    onigenc_jis_latin},
 #line 50 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 8),    onigenc_jis_greek},
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str8),    onigenc_jis_greek},
       {-1},
 #line 46 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 10), onigenc_jis_hiragana},
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str10), onigenc_jis_hiragana},
 #line 47 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 11), onigenc_jis_katakana},
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str11), onigenc_jis_katakana},
 #line 51 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 12), onigenc_jis_cyrillic}
+      {(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 unsigned int key = onig_jis_property_hash (str, len);
+      register int key = onig_jis_property_hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd
index 659cf0aff4..f3235c0100 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, size_t n)
+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, (int)n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
 }
 
 enum onigenc_jis_ctype {
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
 %}
 
 struct enc_property;
diff --git a/enc/jis/props.src b/enc/jis/props.src
index 659cf0aff4..f3235c0100 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, size_t n)
+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, (int)n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
 }
 
 enum onigenc_jis_ctype {
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
 %}
 
 struct enc_property;
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index a520975774..a3c05cd27b 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -214,8 +214,9 @@ 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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("CP878", "KOI8-R")
+
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
index 50bb78bd04..f97d74d3f0 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -218,7 +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,
+  onigenc_single_byte_ascii_only_case_map,
 };
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index bc0597e3f4..4ab85f36e3 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -121,11 +121,7 @@ ENCS, ENC_DEPS = target_encodings
 ATRANS, TRANS = target_transcoders
 
 if File.exist?(depend = File.join($srcdir, "depend"))
-  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 = ERB.new(File.read(depend), nil, '%')
   erb.filename = depend
   tmp = erb.result(binding)
   dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
@@ -139,11 +135,7 @@ open(ARGV[0], 'wb') {|f|
 }
 if MODULE_TYPE == :static
   filename = "encinit.c.erb"
-  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 = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
   erb.filename = "enc/#{filename}"
   tmp = erb.result(binding)
   begin
diff --git a/enc/mktable.c b/enc/mktable.c
index 4edd5a0ff7..49acf628d0 100644
--- a/enc/mktable.c
+++ b/enc/mktable.c
@@ -2,7 +2,7 @@
   mktable.c
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * 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
@@ -31,10 +31,7 @@
 #include <stdio.h>
 #include <locale.h>
 
-#ifndef __USE_ISOC99
 #define __USE_ISOC99
-#endif
-
 #include <ctype.h>
 
 #include "regenc.h"
@@ -1111,13 +1108,11 @@ static int exec(FILE* fp, ENC_INFO* einfo)
 #define NCOL  8
 
   int c, val, enc;
-  int r;
 
   enc = einfo->num;
 
-  r = fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
-              einfo->name);
-  if (r < 0) return -1;
+  fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
+	  einfo->name);
 
   for (c = 0; c < 256; c++) {
     val = 0;
@@ -1136,33 +1131,20 @@ 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) {
-      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 % NCOL == 0) fputs("  ", fp);
+    fprintf(fp, "0x%04x", val);
+    if (c != 255) fputs(",", fp);
     if (c != 0 && c % NCOL == (NCOL-1))
-      r = fputs("\n", fp);
+      fputs("\n", fp);
     else
-      r = fputs(" ", fp);
-
-    if (r < 0) return -1;
+      fputs(" ", fp);
   }
-  r = fprintf(fp, "};\n");
-  if (r < 0) return -1;
-
+  fprintf(fp, "};\n");
   return 0;
 }
 
 extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
 {
-  int r;
   int i;
   FILE* fp = stdout;
 
@@ -1173,11 +1155,7 @@ 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++) {
-    r = exec(fp, &Info[i]);
-    if (r < 0) {
-      fprintf(stderr, "FAIL exec(): %d\n", r);
-      return -1;
-    }
+    exec(fp, &Info[i]);
   }
 
   return 0;
diff --git a/enc/prelude.rb b/enc/prelude.rb
new file mode 100644
index 0000000000..be7c0c9445
--- /dev/null
+++ b/enc/prelude.rb
@@ -0,0 +1,4 @@
+begin
+  require 'unicode_normalize'
+rescue LoadError
+end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index 65fd5102de..c1552bfd13 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -1,9 +1,9 @@
 /**********************************************************************
-  shift_jis.c -  Onigmo (Oniguruma-mod) (regular expression library)
+  sjis.c -  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>
+ * 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
@@ -28,8 +28,524 @@
  * SUCH DAMAGE.
  */
 
-#include "shift_jis.h"
+#include "regint.h"
 
+static const int EncLen_SJIS[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
+};
+
+static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
+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 */
@@ -47,9 +563,9 @@ 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,
+  onigenc_ascii_only_case_map,
 };
 /*
  * Name: Shift_JIS
@@ -65,3 +581,4 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
  */
 ENC_REPLICATE("MacJapanese", "Shift_JIS")
 ENC_ALIAS("MacJapan", "MacJapanese")
+#endif
diff --git a/enc/shift_jis.h b/enc/shift_jis.h
deleted file mode 100644
index d552401595..0000000000
--- a/enc/shift_jis.h
+++ /dev/null
@@ -1,546 +0,0 @@
-/**********************************************************************
-  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 9f1daad751..0b4115bed9 100644
--- a/enc/trans/GB/GB12345%UCS.src
+++ b/enc/trans/GB/GB12345%UCS.src
@@ -9,11 +9,62 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# 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.
+# 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>
 #
 #
 0x2121 = 0x3000
diff --git a/enc/trans/GB/GB2312%UCS.src b/enc/trans/GB/GB2312%UCS.src
index dc222203fd..d196bab535 100644
--- a/enc/trans/GB/GB2312%UCS.src
+++ b/enc/trans/GB/GB2312%UCS.src
@@ -9,11 +9,76 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# 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.
+# 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.
 #
 #
 
diff --git a/enc/trans/GB/UCS%GB12345.src b/enc/trans/GB/UCS%GB12345.src
index a876bdaca8..8ec8318438 100644
--- a/enc/trans/GB/UCS%GB12345.src
+++ b/enc/trans/GB/UCS%GB12345.src
@@ -9,11 +9,62 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# 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.
+# 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>
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/GB/UCS%GB2312.src b/enc/trans/GB/UCS%GB2312.src
index 4f4d52a54a..3293fea604 100644
--- a/enc/trans/GB/UCS%GB2312.src
+++ b/enc/trans/GB/UCS%GB2312.src
@@ -9,11 +9,76 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# 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.
+# 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.
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index cf521bed38..50f568cb94 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -18,12 +18,15 @@
   #   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")
-    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] }])
+    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
   end
 
   transcode_tblgen_singlebyte "ISO-8859-1"
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
index 4d4cafe0d8..9084a56a10 100644
--- a/enc/trans/windows-1255-tbl.rb
+++ b/enc/trans/windows-1255-tbl.rb
@@ -43,7 +43,6 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["C7",0x5B7],
   ["C8",0x5B8],
   ["C9",0x5B9],
-  ["CA",0x5BA],
   ["CB",0x5BB],
   ["CC",0x5BC],
   ["CD",0x5BD],
@@ -139,4 +138,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 6e8c3d8816..e72b2e64b2 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -139,17 +139,17 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
 
 /* 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
@@ -660,141 +660,137 @@ 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';
-            code += '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';
-	}
-      }
-    }
-    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 */
+    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';
+		}
+	    }
 	}
-	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 (!(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;
+		    }
+		}
 	    }
-	    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 (code==DOTLESS_i) { /* handle this manually, because it isn't involved in folding */
+		if (flags&ONIGENC_CASE_UPCASE)
+		    MODIFIED, code = 'I';
 	    }
-	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_DOWN_SPECIAL) {
-	      if (!(flags & ONIGENC_CASE_DOWN_SPECIAL))
-		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;
+		    }
+		}
+	    }
+	    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];
+		}
 	    }
-	    /* 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;
-	  }
-	}
-      }
-      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];
 	}
-      }
+	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);
     }
-    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);
+    *flagP = flags;
+    return (int)(to-to_start);
 }
 
 #if 0
diff --git a/enc/unicode/12.1.0/casefold.h b/enc/unicode/12.1.0/casefold.h
deleted file mode 100644
index 4c62f0faee..0000000000
--- a/enc/unicode/12.1.0/casefold.h
+++ /dev/null
@@ -1,7428 +0,0 @@
-/* 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
deleted file mode 100644
index b2270d5cac..0000000000
--- a/enc/unicode/12.1.0/name2ctype.h
+++ /dev/null
@@ -1,41810 +0,0 @@
-/* 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/9.0.0/casefold.h b/enc/unicode/9.0.0/casefold.h
new file mode 100644
index 0000000000..f8f11673a7
--- /dev/null
+++ b/enc/unicode/9.0.0/casefold.h
@@ -0,0 +1,7068 @@
+/* DO NOT EDIT THIS FILE. */
+/* Generated by enc/unicode/case-folding.rb */
+
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 9 && \
+      ONIG_UNICODE_VERSION_MINOR == 0 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "9.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 9
+#define ONIG_UNICODE_VERSION_MINOR 0
+#define ONIG_UNICODE_VERSION_TEENY 0
+
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1399])(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}}},
+  {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}}},
+  {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}}},
+  {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+1399))
+  {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 = 3623, 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[] =
+    {
+         1, 3627,    2,   28,    3,  303,  218,    5,   21,  167,
+         2,  199,  194,    7, 3627, 3627, 3627, 3627, 3627, 3627,
+      3627, 3627, 3627, 3627, 3627, 3627, 3627,   28, 3627, 3627,
+      3627, 3627, 3627, 3627, 3627,  282, 3627, 3627, 3627, 3627,
+      3627,  113, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
+      3627,  318, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 1197,
+      3627, 3627,  149,   73,  513,    1, 3627, 3627,  267,   17,
+      3627, 3627, 3627, 3627, 3627,  286, 3627, 3627,  289,  617,
+       291,   28, 1163,  444,   36,  430,  954,  110, 1767,    5,
+        11,   22, 1761,  486, 1921,  250, 1746,  122, 1905,  163,
+      1716,  262, 1880,   80, 1503,   68, 1704,  157, 1681,  376,
+      1673,  209, 1822,  203, 1406,  498, 1622,  362, 1588,  316,
+       475,  599, 1228,  538, 1160,  585, 1510,  544,  331,  685,
+      1672,  603, 1536,  840, 1684,  786, 1594,  743, 1380,  700,
+       142,  839, 1302,  865, 1173, 1329, 1730, 1043, 1449,  969,
+      1437, 1108, 1360,  925, 1497,  723,  154,  810,  391, 1083,
+      1777, 1047,  436, 1051,   47, 1342,    8,  974,   98, 1318,
+       781, 1314,  148, 1403,   39, 1357,   18, 1265,   11,  928,
+        92, 1205,    2, 1295,    3, 1181,  187, 1151,  385, 1132,
+       107, 1280,    8, 1678,   41,  511,   42, 1655,   78,  294,
+       134, 1857,   17,  784,    2, 1113,   57,  496,   52
+    };
+  return asso_values[bits_of(code, 2)+81] + asso_values[bits_of(code, 1)+2] + 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 = 0x1e921,
+      TOTAL_KEYWORDS = 1401,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 4,
+      MAX_HASH_VALUE = 3626
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1,
+      /*0x1ffb*/ 816,
+      /*0x1fe7*/ 802,
+      /*0x017b*/ 118,
+      /*0x1f88*/ 729,
+      /*0x0408*/ 305,
+      /*0x0108*/ 61,
+      /*0x10408*/ 1214,
+      /*0x0055*/ 19,
+      /*0xab88*/ 1112,
+      /*0x1f89*/ 730,
+      /*0x0409*/ 306,
+      /*0x2c67*/ 916,
+      /*0x10409*/ 1215,
+      /*0x2c08*/ 873,
+      /*0xab89*/ 1113,
+      /*0x1ff9*/ 814,
+      /*0x2c6f*/ 921,
+      /*0x0179*/ 117,
+      -1,
+      /*0x2c09*/ 874,
+      /*0x1f8a*/ 731,
+      /*0x040a*/ 307,
+      /*0x010a*/ 62,
+      /*0x1040a*/ 1216,
+      /*0x2c88*/ 931,
+      /*0xab8a*/ 1114,
+      /*0x1f80*/ 721,
+      /*0x0400*/ 297,
+      /*0x0100*/ 57,
+      /*0x10400*/ 1206,
+      /*0x2c0a*/ 875,
+      /*0xab80*/ 1104,
+      /*0x10c88*/ 1290,
+      /*0x00d5*/ 47,
+      /*0x1f83*/ 724,
+      /*0x0403*/ 300,
+      /*0x2c00*/ 865,
+      /*0x10403*/ 1209,
+      /*0x10c89*/ 1291,
+      /*0xab83*/ 1107,
+      /*0x1ff3*/ 809,
+      /*0x2c8a*/ 932,
+      /*0x1e908*/ 1373,
+      /*0x00df*/ 56,
+      /*0x2c03*/ 868,
+      /*0x1fd3*/ 791,
+      /*0x0053*/ 17,
+      /*0x2c80*/ 927,
+      /*0x1e909*/ 1374,
+      /*0x10c8a*/ 1292,
+      /*0x2183*/ 838,
+      -1,
+      /*0x017f*/ 120,
+      -1,
+      /*0xa780*/ 1059,
+      /*0x10c80*/ 1282,
+      -1,
+      /*0x017d*/ 119,
+      -1,
+      /*0x1e90a*/ 1375,
+      /*0x2c7f*/ 926,
+      -1, -1,
+      /*0x10c83*/ 1285,
+      /*0x00dd*/ 54,
+      /*0x1e900*/ 1365,
+      /*0x1f98*/ 745,
+      /*0x0418*/ 321,
+      /*0x0118*/ 69,
+      /*0x10418*/ 1230,
+      /*0x037f*/ 233,
+      /*0xab98*/ 1128,
+      /*0x00d3*/ 45,
+      /*0x1e903*/ 1368,
+      -1,
+      /*0x1e88*/ 607,
+      /*0x2c18*/ 889,
+      -1,
+      /*0x1f96*/ 743,
+      /*0x0416*/ 319,
+      /*0x0116*/ 68,
+      /*0x10416*/ 1228,
+      -1,
+      /*0xab96*/ 1126,
+      -1, -1,
+      /*0x2c75*/ 924,
+      /*0x2c98*/ 939,
+      /*0x2c16*/ 887,
+      -1,
+      /*0x1fe3*/ 799,
+      -1,
+      /*0x1e8a*/ 608,
+      -1,
+      /*0xa798*/ 1068,
+      /*0x10c98*/ 1306,
+      /*0x1fd7*/ 793,
+      /*0x0057*/ 21,
+      /*0x1e80*/ 603,
+      /*0x2c96*/ 938,
+      /*0x2c63*/ 914,
+      -1, -1, -1, -1,
+      /*0x1e918*/ 1389,
+      /*0xa796*/ 1067,
+      /*0x10c96*/ 1304,
+      /*0x1f86*/ 727,
+      /*0x0406*/ 303,
+      /*0x0106*/ 60,
+      /*0x10406*/ 1212,
+      /*0x13fb*/ 527,
+      /*0xab86*/ 1110,
+      -1,
+      /*0x2c6d*/ 919,
+      -1,
+      /*0x1e916*/ 1387,
+      /*0x2c06*/ 871,
+      -1,
+      /*0x1f90*/ 737,
+      /*0x0410*/ 313,
+      /*0x0110*/ 65,
+      /*0x10410*/ 1222,
+      -1,
+      /*0xab90*/ 1120,
+      /*0x2ced*/ 978,
+      /*0x13f9*/ 525,
+      -1,
+      /*0x2c86*/ 930,
+      /*0x2c10*/ 881,
+      -1,
+      /*0x1ff7*/ 812,
+      -1, -1, -1,
+      /*0xa786*/ 1062,
+      /*0x10c86*/ 1288,
+      /*0x1e98*/ 616,
+      -1,
+      /*0x1fbb*/ 777,
+      /*0x2c90*/ 935,
+      /*0x013b*/ 85,
+      -1, -1,
+      /*0xabbb*/ 1163,
+      /*0x1fdb*/ 797,
+      /*0x1e906*/ 1371,
+      /*0xa790*/ 1065,
+      /*0x10c90*/ 1298,
+      /*0x1e96*/ 614,
+      /*0x1e08*/ 543,
+      /*0x1fcb*/ 788,
+      /*0x004b*/ 9,
+      -1,
+      /*0x1f9a*/ 747,
+      /*0x041a*/ 323,
+      /*0x011a*/ 70,
+      /*0x1041a*/ 1232,
+      /*0x1e910*/ 1381,
+      /*0xab9a*/ 1130,
+      /*0x1f92*/ 739,
+      /*0x0412*/ 315,
+      /*0x0112*/ 66,
+      /*0x10412*/ 1224,
+      /*0x2c1a*/ 891,
+      /*0xab92*/ 1122,
+      /*0x13fd*/ 529,
+      /*0x1e0a*/ 544,
+      /*0x0388*/ 235,
+      -1,
+      /*0x2c12*/ 883,
+      /*0x03d5*/ 273,
+      /*0x00db*/ 52,
+      /*0x1e00*/ 539,
+      /*0x0389*/ 236,
+      /*0x2c9a*/ 940,
+      -1, -1,
+      /*0x00cb*/ 37,
+      /*0x1e86*/ 606,
+      /*0x03f9*/ 292,
+      /*0x2c92*/ 936,
+      /*0xa79a*/ 1069,
+      /*0x10c9a*/ 1308,
+      /*0x1fe9*/ 804,
+      /*0x038a*/ 237,
+      -1, -1,
+      /*0xa792*/ 1066,
+      /*0x10c92*/ 1300,
+      -1,
+      /*0x1e90*/ 611,
+      -1,
+      /*0x1e91a*/ 1391,
+      /*0x2c69*/ 917,
+      /*0x0508*/ 425,
+      -1, -1,
+      /*0x0555*/ 481,
+      /*0x1e912*/ 1383,
+      /*0x1fa0*/ 753,
+      /*0x0420*/ 329,
+      /*0x0120*/ 73,
+      /*0x10420*/ 1238,
+      /*0x03f1*/ 288,
+      /*0xaba0*/ 1136,
+      /*0x1f9e*/ 751,
+      /*0x041e*/ 327,
+      /*0x011e*/ 72,
+      /*0x1041e*/ 1236,
+      /*0x2c20*/ 897,
+      /*0xab9e*/ 1134,
+      /*0x050a*/ 426,
+      /*0x1e18*/ 551,
+      -1,
+      /*0x03ff*/ 296,
+      /*0x2c1e*/ 895,
+      /*0x048a*/ 362,
+      /*0x0500*/ 421,
+      /*0x0208*/ 194,
+      /*0x03fd*/ 294,
+      /*0x2ca0*/ 943,
+      -1,
+      /*0x0480*/ 361,
+      -1,
+      /*0x1e16*/ 550,
+      /*0x1e9a*/ 618,
+      /*0x2c9e*/ 942,
+      /*0xa7a0*/ 1072,
+      /*0x10ca0*/ 1314,
+      -1,
+      /*0x0398*/ 249,
+      /*0x1e92*/ 612,
+      -1,
+      /*0xa79e*/ 1071,
+      /*0x10c9e*/ 1312,
+      /*0x020a*/ 195,
+      /*0x0553*/ 479,
+      -1,
+      /*0x1e920*/ 1397,
+      -1,
+      /*0x03f5*/ 290,
+      /*0x0200*/ 190,
+      /*0x0396*/ 247,
+      /*0x104d3*/ 1281,
+      /*0x1e91e*/ 1395,
+      -1,
+      /*0x1f8e*/ 735,
+      /*0x040e*/ 311,
+      /*0x010e*/ 64,
+      /*0x1040e*/ 1220,
+      -1,
+      /*0xab8e*/ 1118,
+      -1, -1,
+      /*0x1e06*/ 542,
+      -1,
+      /*0x2c0e*/ 879,
+      /*0x0518*/ 433,
+      /*0x1f94*/ 741,
+      /*0x0414*/ 317,
+      /*0x0114*/ 67,
+      /*0x10414*/ 1226,
+      /*0x0498*/ 369,
+      /*0xab94*/ 1124,
+      /*0x2165*/ 827,
+      /*0x2167*/ 829,
+      /*0x1e10*/ 547,
+      /*0x2c8e*/ 934,
+      /*0x2c14*/ 885,
+      /*0x0516*/ 432,
+      /*0x216f*/ 837,
+      /*0x1ea0*/ 621,
+      /*0x0386*/ 234,
+      /*0x2161*/ 823,
+      /*0x0496*/ 368,
+      /*0x10c8e*/ 1296,
+      -1,
+      /*0x1e9e*/ 620,
+      -1,
+      /*0x2c94*/ 937,
+      -1,
+      /*0x0218*/ 202,
+      -1, -1,
+      /*0x0390*/ 241,
+      /*0x1e90e*/ 1379,
+      -1,
+      /*0x10c94*/ 1302,
+      -1,
+      /*0xa77b*/ 1056,
+      /*0x1ff6*/ 811,
+      /*0x0476*/ 356,
+      /*0x0176*/ 115,
+      /*0x0216*/ 201,
+      -1, -1,
+      /*0x03f7*/ 291,
+      /*0x1e914*/ 1385,
+      -1,
+      /*0x0506*/ 424,
+      -1,
+      /*0x1e1a*/ 552,
+      -1, -1,
+      /*0xa779*/ 1055,
+      -1,
+      /*0x01d5*/ 167,
+      /*0x1e12*/ 548,
+      -1,
+      /*0x0189*/ 126,
+      /*0x0376*/ 232,
+      /*0x0510*/ 429,
+      /*0x1fa6*/ 759,
+      /*0x0426*/ 335,
+      /*0x0126*/ 76,
+      /*0x10426*/ 1244,
+      /*0x0490*/ 365,
+      /*0xaba6*/ 1142,
+      /*0x1e8e*/ 610,
+      /*0x039a*/ 251,
+      /*0x018a*/ 127,
+      -1,
+      /*0x2c26*/ 903,
+      /*0x0206*/ 193,
+      -1,
+      /*0x0392*/ 243,
+      -1,
+      /*0x1faf*/ 768,
+      /*0x042f*/ 344,
+      -1,
+      /*0x1e94*/ 613,
+      /*0x053b*/ 455,
+      /*0xabaf*/ 1151,
+      /*0x2ca6*/ 946,
+      -1,
+      /*0x0210*/ 198,
+      -1, -1,
+      /*0x104bb*/ 1257,
+      /*0x01f1*/ 181,
+      /*0xa7a6*/ 1075,
+      /*0x10ca6*/ 1320,
+      -1,
+      /*0x054b*/ 471,
+      /*0xa77d*/ 1057,
+      /*0x01d3*/ 166,
+      /*0x051a*/ 434,
+      /*0x1e20*/ 555,
+      /*0x04cb*/ 395,
+      -1,
+      /*0x104cb*/ 1273,
+      /*0x049a*/ 370,
+      /*0x0512*/ 430,
+      /*0x1e1e*/ 554,
+      /*0x2163*/ 825,
+      /*0x023b*/ 217,
+      /*0x10caf*/ 1329,
+      /*0x0492*/ 366,
+      /*0x1fa4*/ 757,
+      /*0x0424*/ 333,
+      /*0x0124*/ 75,
+      /*0x10424*/ 1242,
+      /*0x1ef6*/ 664,
+      /*0xaba4*/ 1140,
+      -1,
+      /*0x03a0*/ 257,
+      /*0x0198*/ 137,
+      -1,
+      /*0x2c24*/ 901,
+      /*0x216d*/ 835,
+      /*0x021a*/ 203,
+      /*0x039e*/ 255,
+      /*0x1f9c*/ 749,
+      /*0x041c*/ 325,
+      /*0x011c*/ 71,
+      /*0x1041c*/ 1234,
+      /*0x0212*/ 199,
+      /*0xab9c*/ 1132,
+      /*0x0196*/ 135,
+      /*0x2ca4*/ 945,
+      -1,
+      /*0x1feb*/ 806,
+      /*0x2c1c*/ 893,
+      -1,
+      /*0x1ea6*/ 624,
+      -1,
+      /*0xa7a4*/ 1074,
+      /*0x10ca4*/ 1318,
+      /*0x004d*/ 11,
+      -1, -1,
+      /*0x2c6b*/ 918,
+      /*0x0520*/ 437,
+      /*0x2c9c*/ 941,
+      /*0x1e0e*/ 546,
+      -1,
+      /*0x01d7*/ 168,
+      /*0x04a0*/ 373,
+      /*0x051e*/ 436,
+      -1,
+      /*0xa79c*/ 1070,
+      /*0x10c9c*/ 1310,
+      /*0x2ceb*/ 977,
+      /*0x049e*/ 372,
+      -1, -1,
+      /*0x1e14*/ 549,
+      -1,
+      /*0x0186*/ 124,
+      -1, -1,
+      /*0x1e91c*/ 1393,
+      /*0x038e*/ 239,
+      -1,
+      /*0x00cd*/ 39,
+      -1,
+      /*0x0220*/ 206,
+      -1, -1,
+      /*0x10bb*/ 511,
+      /*0x0190*/ 131,
+      -1,
+      /*0x021e*/ 205,
+      /*0x24bb*/ 844,
+      /*0x0394*/ 245,
+      -1,
+      /*0x1f84*/ 725,
+      /*0x0404*/ 301,
+      /*0x0104*/ 59,
+      /*0x10404*/ 1210,
+      /*0x1ea4*/ 623,
+      /*0xab84*/ 1108,
+      /*0x01f7*/ 185,
+      /*0x0051*/ 15,
+      -1,
+      /*0x24cb*/ 860,
+      /*0x2c04*/ 869,
+      -1,
+      /*0x1e76*/ 598,
+      /*0x050e*/ 428,
+      /*0x1f82*/ 723,
+      /*0x0402*/ 299,
+      /*0x0102*/ 58,
+      /*0x10402*/ 1208,
+      /*0x048e*/ 364,
+      /*0xab82*/ 1106,
+      /*0x01db*/ 170,
+      /*0x2c84*/ 929,
+      -1,
+      /*0x2169*/ 831,
+      /*0x2c02*/ 867,
+      /*0x0514*/ 431,
+      /*0x01cb*/ 162,
+      -1,
+      /*0xa784*/ 1061,
+      /*0x10c84*/ 1286,
+      /*0x0494*/ 367,
+      /*0x118bb*/ 1360,
+      -1,
+      /*0x00d1*/ 43,
+      /*0x1e26*/ 558,
+      /*0x2c82*/ 928,
+      -1,
+      /*0x020e*/ 197,
+      -1,
+      /*0x1e904*/ 1369,
+      -1, -1,
+      /*0xa782*/ 1060,
+      /*0x10c82*/ 1284,
+      -1,
+      /*0x1fa7*/ 760,
+      /*0x0427*/ 336,
+      -1,
+      /*0x10427*/ 1245,
+      /*0x0214*/ 200,
+      /*0xaba7*/ 1143,
+      -1,
+      /*0x03a6*/ 262,
+      /*0x1e902*/ 1367,
+      /*0x10a0*/ 484,
+      /*0x2c27*/ 904,
+      /*0x1f8c*/ 733,
+      /*0x040c*/ 309,
+      /*0x010c*/ 63,
+      /*0x1040c*/ 1218,
+      -1,
+      /*0xab8c*/ 1116,
+      /*0x04f6*/ 416,
+      -1, -1, -1,
+      /*0x2c0c*/ 877,
+      /*0x047e*/ 360,
+      /*0x1fa2*/ 755,
+      /*0x0422*/ 331,
+      /*0x0122*/ 74,
+      /*0x10422*/ 1240,
+      /*0x1e84*/ 605,
+      /*0xaba2*/ 1138,
+      /*0x10ca7*/ 1321,
+      /*0x01a0*/ 141,
+      /*0x2c7e*/ 925,
+      /*0x2c8c*/ 933,
+      /*0x2c22*/ 899,
+      /*0x0526*/ 440,
+      /*0x1e24*/ 557,
+      /*0x1ff2*/ 808,
+      /*0x0472*/ 354,
+      /*0x0172*/ 113,
+      /*0x04a6*/ 376,
+      /*0x10c8c*/ 1294,
+      /*0x1e82*/ 604,
+      /*0x1f08*/ 669,
+      -1,
+      /*0x2ca2*/ 944,
+      /*0x1f6f*/ 720,
+      /*0x2c72*/ 923,
+      /*0x118a0*/ 1333,
+      /*0x1f09*/ 670,
+      /*0x1e1c*/ 553,
+      /*0x1e90c*/ 1377,
+      /*0xa7a2*/ 1073,
+      /*0x10ca2*/ 1316,
+      /*0x03a4*/ 260,
+      /*0xfb00*/ 1168,
+      /*0x1f5f*/ 712,
+      /*0x0372*/ 231,
+      /*0x2cf2*/ 979,
+      /*0x0226*/ 209,
+      /*0x1f0a*/ 671,
+      -1, -1,
+      /*0xfb03*/ 1171,
+      /*0x1faa*/ 763,
+      /*0x042a*/ 339,
+      /*0x012a*/ 78,
+      -1,
+      /*0x039c*/ 253,
+      /*0xabaa*/ 1146,
+      /*0x1fae*/ 767,
+      /*0x042e*/ 343,
+      /*0x012e*/ 80,
+      -1,
+      /*0x2c2a*/ 907,
+      /*0xabae*/ 1150,
+      -1,
+      /*0x1f5d*/ 711,
+      /*0x018e*/ 129,
+      -1,
+      /*0x2c2e*/ 911,
+      /*0x0524*/ 439,
+      -1, -1,
+      /*0x1e8c*/ 609,
+      /*0x2caa*/ 948,
+      /*0x04a4*/ 375,
+      -1, -1, -1,
+      /*0x0194*/ 134,
+      /*0x2cae*/ 950,
+      /*0xa7aa*/ 1077,
+      /*0x10caa*/ 1324,
+      /*0x1efe*/ 668,
+      /*0x051c*/ 435,
+      /*0x1ea2*/ 622,
+      -1,
+      /*0xa7ae*/ 1081,
+      /*0x10cae*/ 1328,
+      /*0x049c*/ 371,
+      -1, -1, -1,
+      /*0x1e04*/ 541,
+      /*0x0224*/ 208,
+      /*0x1f18*/ 677,
+      /*0xfb16*/ 1178,
+      /*0x2126*/ 818,
+      /*0x1ef2*/ 662,
+      /*0x054d*/ 473,
+      /*0x1fac*/ 765,
+      /*0x042c*/ 341,
+      /*0x012c*/ 79,
+      -1,
+      /*0x04cd*/ 396,
+      /*0xabac*/ 1148,
+      /*0x104cd*/ 1275,
+      /*0x1e02*/ 540,
+      /*0x021c*/ 204,
+      -1,
+      /*0x2c2c*/ 909,
+      /*0x01f6*/ 184,
+      /*0x10a6*/ 490,
+      -1,
+      /*0x1fa8*/ 761,
+      /*0x0428*/ 337,
+      /*0x0128*/ 77,
+      /*0x03d1*/ 272,
+      /*0x1fb2*/ 769,
+      /*0xaba8*/ 1144,
+      /*0x0132*/ 81,
+      /*0x2cac*/ 949,
+      /*0xa726*/ 1019,
+      /*0xabb2*/ 1154,
+      /*0x2c28*/ 905,
+      /*0x1eaa*/ 626,
+      /*0xfb06*/ 1174,
+      /*0x10af*/ 499,
+      /*0xa7ac*/ 1079,
+      /*0x10cac*/ 1326,
+      -1,
+      /*0x1eae*/ 628,
+      -1,
+      /*0x01a6*/ 144,
+      /*0x1f6d*/ 718,
+      /*0x2ca8*/ 947,
+      -1,
+      /*0xa688*/ 1007,
+      /*0x0504*/ 423,
+      /*0x2cb2*/ 952,
+      -1, -1,
+      /*0xa7a8*/ 1076,
+      /*0x10ca8*/ 1322,
+      /*0x0551*/ 477,
+      -1,
+      /*0xa7b2*/ 1084,
+      /*0x10cb2*/ 1332,
+      /*0x01af*/ 149,
+      /*0x1e0c*/ 545,
+      /*0x118a6*/ 1339,
+      /*0x104d1*/ 1279,
+      /*0x0502*/ 422,
+      -1,
+      /*0xa68a*/ 1008,
+      -1,
+      /*0x03a7*/ 263,
+      -1,
+      /*0x10a4*/ 488,
+      /*0x1e7e*/ 602,
+      /*0xa680*/ 1003,
+      /*0x1e22*/ 556,
+      /*0x0204*/ 192,
+      -1, -1,
+      /*0x118af*/ 1348,
+      /*0x216b*/ 833,
+      /*0x038c*/ 238,
+      /*0xa724*/ 1018,
+      /*0x1f3b*/ 694,
+      -1, -1,
+      /*0x1eac*/ 627,
+      -1,
+      /*0x1e72*/ 596,
+      /*0x1f5b*/ 710,
+      /*0x0202*/ 191,
+      /*0x03fe*/ 295,
+      -1,
+      /*0x01a4*/ 143,
+      -1,
+      /*0x1f4b*/ 702,
+      -1, -1,
+      /*0x1f1a*/ 679,
+      -1,
+      /*0x1ea8*/ 625,
+      /*0x10cd*/ 523,
+      /*0xff26*/ 1185,
+      -1,
+      /*0x1eb2*/ 630,
+      /*0x24cd*/ 862,
+      -1,
+      /*0x019c*/ 138,
+      /*0x050c*/ 427,
+      -1,
+      /*0x118a4*/ 1337,
+      -1, -1,
+      /*0x048c*/ 363,
+      /*0xa698*/ 1015,
+      /*0x1e2a*/ 560,
+      /*0x0130*/ 1400,
+      /*0xff2f*/ 1194,
+      -1,
+      /*0xabb0*/ 1152,
+      /*0x0522*/ 438,
+      /*0x1e2e*/ 562,
+      /*0x01cd*/ 163,
+      /*0x04fe*/ 420,
+      -1,
+      /*0x04a2*/ 374,
+      /*0xa696*/ 1014,
+      -1,
+      /*0x1f69*/ 714,
+      /*0x1fba*/ 776,
+      -1, -1,
+      /*0x020c*/ 196,
+      /*0x03aa*/ 266,
+      /*0xabba*/ 1162,
+      /*0x2cb0*/ 951,
+      -1, -1,
+      /*0x04f2*/ 414,
+      -1, -1, -1,
+      /*0xa7b0*/ 1082,
+      /*0x10cb0*/ 1330,
+      /*0x0222*/ 207,
+      -1, -1, -1,
+      /*0xff24*/ 1183,
+      -1,
+      /*0x2cba*/ 956,
+      -1,
+      /*0x1fca*/ 787,
+      /*0x004a*/ 8,
+      /*0x014a*/ 93,
+      -1,
+      /*0xa686*/ 1006,
+      -1, -1, -1,
+      /*0x052a*/ 442,
+      /*0x0184*/ 123,
+      /*0x1e2c*/ 561,
+      -1, -1,
+      /*0x04aa*/ 378,
+      /*0x052e*/ 444,
+      /*0x01d1*/ 165,
+      /*0xa690*/ 1011,
+      -1, -1,
+      /*0x04ae*/ 380,
+      /*0x1fb8*/ 774,
+      /*0x2cca*/ 964,
+      -1,
+      /*0x0182*/ 122,
+      /*0x1e28*/ 559,
+      /*0xabb8*/ 1160,
+      -1,
+      /*0x00ca*/ 36,
+      /*0x1e32*/ 564,
+      -1, -1, -1,
+      /*0x022a*/ 211,
+      /*0x10a7*/ 491,
+      /*0x1eb0*/ 629,
+      -1, -1, -1,
+      /*0x022e*/ 213,
+      /*0x1f0e*/ 675,
+      /*0xfb14*/ 1176,
+      /*0x2cb8*/ 955,
+      /*0x03a8*/ 264,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1eba*/ 634,
+      -1,
+      /*0xa69a*/ 1016,
+      -1, -1,
+      /*0x01a7*/ 145,
+      /*0x052c*/ 443,
+      /*0x10a2*/ 486,
+      /*0xa692*/ 1012,
+      /*0x1fd9*/ 795,
+      /*0x0059*/ 23,
+      /*0x04ac*/ 379,
+      /*0x1ffa*/ 815,
+      /*0x047a*/ 358,
+      /*0x1fb6*/ 772,
+      /*0xa77e*/ 1058,
+      /*0x0136*/ 83,
+      /*0xa722*/ 1017,
+      -1,
+      /*0xabb6*/ 1158,
+      /*0x0528*/ 441,
+      -1,
+      /*0x118a7*/ 1340,
+      /*0x1eca*/ 642,
+      /*0x0532*/ 446,
+      /*0x04a8*/ 377,
+      /*0x01fe*/ 189,
+      -1,
+      /*0x01a2*/ 142,
+      /*0x04b2*/ 382,
+      /*0x022c*/ 212,
+      /*0x104b2*/ 1248,
+      /*0x212a*/ 819,
+      -1, -1,
+      /*0x2cb6*/ 954,
+      /*0x00d9*/ 50,
+      -1,
+      /*0x1fcc*/ 789,
+      /*0x004c*/ 10,
+      /*0x014c*/ 94,
+      /*0x01f2*/ 182,
+      /*0xa7b6*/ 1087,
+      /*0x1eb8*/ 633,
+      /*0x0228*/ 210,
+      /*0x118a2*/ 1335,
+      -1,
+      /*0x10aa*/ 494,
+      /*0x0232*/ 215,
+      -1, -1, -1, -1,
+      /*0x10ae*/ 498,
+      -1, -1, -1,
+      /*0xa72a*/ 1021,
+      -1,
+      /*0x2ccc*/ 965,
+      /*0xff27*/ 1186,
+      /*0x1e30*/ 563,
+      -1,
+      /*0xa72e*/ 1023,
+      -1,
+      /*0x00cc*/ 38,
+      -1,
+      /*0x1fbc*/ 778,
+      /*0x1fb4*/ 771,
+      -1,
+      /*0x0134*/ 82,
+      /*0x1f2f*/ 690,
+      /*0xabbc*/ 1164,
+      /*0xabb4*/ 1156,
+      /*0x01ae*/ 148,
+      -1,
+      /*0x1e3a*/ 568,
+      -1, -1,
+      /*0x03b0*/ 268,
+      -1, -1, -1,
+      /*0xff22*/ 1181,
+      /*0x1efa*/ 666,
+      /*0x118aa*/ 1343,
+      /*0x1eb6*/ 632,
+      -1,
+      /*0x2cbc*/ 957,
+      /*0x2cb4*/ 953,
+      -1,
+      /*0x118ae*/ 1347,
+      -1,
+      /*0x1fbe*/ 779,
+      /*0x10ac*/ 496,
+      /*0xa68e*/ 1010,
+      /*0xa7b4*/ 1086,
+      /*0x2132*/ 821,
+      /*0xabbe*/ 1166,
+      /*0x1e4a*/ 576,
+      -1, -1, -1, -1,
+      /*0xa72c*/ 1022,
+      -1, -1,
+      /*0xa694*/ 1013,
+      /*0x10a8*/ 492,
+      -1,
+      /*0x1ecc*/ 643,
+      /*0x04b0*/ 381,
+      /*0x10b2*/ 502,
+      /*0x104b0*/ 1246,
+      /*0x2cbe*/ 958,
+      /*0x01ac*/ 147,
+      /*0x1f1c*/ 681,
+      -1,
+      /*0xa728*/ 1020,
+      /*0x1e38*/ 567,
+      -1,
+      /*0x053a*/ 454,
+      /*0xa732*/ 1024,
+      /*0xff2a*/ 1189,
+      /*0x13fa*/ 526,
+      /*0x1f6b*/ 716,
+      /*0x04ba*/ 386,
+      -1,
+      /*0x104ba*/ 1256,
+      /*0xff2e*/ 1193,
+      /*0x0230*/ 214,
+      /*0x1f4d*/ 704,
+      /*0x118ac*/ 1345,
+      /*0x01b2*/ 151,
+      -1, -1, -1, -1, -1,
+      /*0x1ebc*/ 635,
+      /*0x1eb4*/ 631,
+      -1, -1, -1,
+      /*0x054a*/ 470,
+      /*0x023a*/ 216,
+      /*0x118a8*/ 1341,
+      -1, -1, -1,
+      /*0x118b2*/ 1351,
+      /*0x104ca*/ 1272,
+      -1,
+      /*0x1fc8*/ 785,
+      /*0x0048*/ 7,
+      -1,
+      /*0x1fe2*/ 798,
+      /*0x0462*/ 346,
+      /*0x0162*/ 105,
+      /*0xfb04*/ 1172,
+      /*0x1e7a*/ 600,
+      -1,
+      /*0x1e36*/ 566,
+      -1,
+      /*0x0538*/ 452,
+      /*0x1ebe*/ 636,
+      /*0x2c62*/ 913,
+      -1,
+      /*0x024a*/ 226,
+      /*0x04b8*/ 385,
+      /*0xff2c*/ 1191,
+      /*0x104b8*/ 1254,
+      -1,
+      /*0xfb02*/ 1170,
+      /*0x2cc8*/ 963,
+      -1, -1,
+      /*0x2ce2*/ 976,
+      /*0x03fa*/ 293,
+      -1,
+      /*0x00c8*/ 34,
+      -1,
+      /*0x1f85*/ 726,
+      /*0x0405*/ 302,
+      /*0xff28*/ 1187,
+      /*0x10405*/ 1211,
+      /*0x1e4c*/ 577,
+      /*0xab85*/ 1109,
+      /*0xff32*/ 1197,
+      -1, -1, -1,
+      /*0x2c05*/ 870,
+      -1,
+      /*0x10b0*/ 500,
+      -1, -1,
+      /*0x1fc4*/ 782,
+      /*0x0044*/ 3,
+      -1, -1, -1,
+      /*0x1fd6*/ 792,
+      /*0x0056*/ 20,
+      /*0x0156*/ 99,
+      -1, -1,
+      /*0x0536*/ 450,
+      -1,
+      /*0x10ba*/ 510,
+      /*0x04fa*/ 418,
+      /*0x10c85*/ 1287,
+      /*0x04b6*/ 384,
+      /*0x24ba*/ 843,
+      /*0x104b6*/ 1252,
+      /*0x1e3c*/ 569,
+      /*0x1e34*/ 565,
+      -1,
+      /*0x2cc4*/ 961,
+      /*0xa73a*/ 1028,
+      -1,
+      /*0x1e905*/ 1370,
+      -1,
+      /*0x2cd6*/ 970,
+      /*0x00c4*/ 30,
+      /*0x1ec8*/ 641,
+      /*0x1f0c*/ 673,
+      -1,
+      /*0x1ee2*/ 654,
+      /*0x00d6*/ 48,
+      -1,
+      /*0x054c*/ 472,
+      /*0x118b0*/ 1349,
+      -1, -1, -1,
+      /*0x24ca*/ 859,
+      -1,
+      /*0x104cc*/ 1274,
+      -1,
+      /*0xa64a*/ 985,
+      /*0x1e3e*/ 570,
+      /*0xa74a*/ 1036,
+      -1, -1, -1, -1,
+      /*0x118ba*/ 1359,
+      -1, -1, -1, -1,
+      /*0x10b8*/ 508,
+      /*0x01ca*/ 161,
+      -1,
+      /*0x024c*/ 227,
+      /*0x24b8*/ 841,
+      -1, -1, -1,
+      /*0x053c*/ 456,
+      /*0x0534*/ 448,
+      /*0xa738*/ 1027,
+      -1, -1,
+      /*0x04bc*/ 387,
+      /*0x04b4*/ 383,
+      /*0x104bc*/ 1258,
+      /*0x104b4*/ 1250,
+      /*0x1ec4*/ 639,
+      /*0xff30*/ 1195,
+      /*0x1fc2*/ 780,
+      /*0x0042*/ 1,
+      /*0x01b8*/ 155,
+      /*0x1ed6*/ 648,
+      /*0xa684*/ 1005,
+      /*0x0050*/ 14,
+      /*0x0150*/ 96,
+      /*0x1f2a*/ 685,
+      /*0x1fd2*/ 790,
+      /*0x0052*/ 16,
+      /*0x0152*/ 97,
+      -1, -1,
+      /*0x1f2e*/ 689,
+      /*0xff3a*/ 1205,
+      /*0x053e*/ 458,
+      -1, -1,
+      /*0xa682*/ 1004,
+      /*0x118b8*/ 1357,
+      /*0x04be*/ 388,
+      /*0x2cc2*/ 960,
+      /*0x104be*/ 1260,
+      -1,
+      /*0x10b6*/ 506,
+      /*0x2cd0*/ 967,
+      -1,
+      /*0x00c2*/ 28,
+      /*0x24b6*/ 839,
+      /*0x2cd2*/ 968,
+      /*0x1e48*/ 575,
+      /*0x00d0*/ 42,
+      -1,
+      /*0x1e62*/ 588,
+      /*0xa736*/ 1026,
+      /*0x00d2*/ 44,
+      -1, -1, -1,
+      /*0x023e*/ 219,
+      /*0x01d9*/ 169,
+      /*0x004e*/ 12,
+      /*0x014e*/ 95,
+      /*0x01fa*/ 187,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x03e2*/ 280,
+      /*0x24cc*/ 861,
+      -1,
+      /*0x1f2c*/ 687,
+      -1,
+      /*0xa64c*/ 986,
+      /*0xff38*/ 1203,
+      /*0xa74c*/ 1037,
+      -1,
+      /*0xa68c*/ 1009,
+      /*0x2cce*/ 966,
+      /*0x118b6*/ 1355,
+      -1, -1,
+      /*0x1fc6*/ 783,
+      /*0x0046*/ 5,
+      /*0x00ce*/ 40,
+      /*0x1f28*/ 683,
+      -1,
+      /*0x1ffc*/ 817,
+      /*0x047c*/ 359,
+      /*0x1ec2*/ 638,
+      -1,
+      /*0x1e44*/ 573,
+      /*0x0548*/ 468,
+      /*0x1ed0*/ 645,
+      /*0x10bc*/ 512,
+      /*0x10b4*/ 504,
+      /*0x1e56*/ 582,
+      /*0x1ed2*/ 646,
+      /*0x24bc*/ 845,
+      /*0x104c8*/ 1270,
+      /*0x04e2*/ 406,
+      -1, -1,
+      /*0x2cc6*/ 962,
+      /*0xa73c*/ 1029,
+      /*0xa734*/ 1025,
+      /*0x1fec*/ 807,
+      /*0x046c*/ 351,
+      /*0x016c*/ 110,
+      /*0x00c6*/ 32,
+      -1, -1, -1, -1,
+      /*0x03d6*/ 274,
+      /*0x01bc*/ 156,
+      /*0x0248*/ 225,
+      /*0xff36*/ 1201,
+      -1, -1,
+      /*0x10be*/ 514,
+      -1, -1, -1,
+      /*0x24be*/ 847,
+      /*0x1fea*/ 805,
+      /*0x046a*/ 350,
+      /*0x016a*/ 109,
+      -1,
+      /*0x1ece*/ 644,
+      /*0xa73e*/ 1030,
+      -1,
+      /*0x118bc*/ 1361,
+      /*0x118b4*/ 1353,
+      /*0x1fab*/ 764,
+      /*0x042b*/ 340,
+      /*0x0544*/ 464,
+      /*0x1f81*/ 722,
+      /*0x0401*/ 298,
+      /*0xabab*/ 1147,
+      /*0x10401*/ 1207,
+      /*0x0556*/ 482,
+      /*0xab81*/ 1105,
+      /*0x104c4*/ 1266,
+      /*0x2c2b*/ 908,
+      -1,
+      /*0x04d6*/ 400,
+      /*0x2c01*/ 866,
+      -1,
+      /*0x013f*/ 87,
+      -1, -1,
+      /*0xabbf*/ 1167,
+      -1,
+      /*0x1ec6*/ 640,
+      /*0x1fe8*/ 803,
+      /*0x0468*/ 349,
+      /*0x0168*/ 108,
+      /*0x118be*/ 1363,
+      /*0x1efc*/ 667,
+      /*0x0244*/ 222,
+      -1,
+      /*0xa7ab*/ 1078,
+      /*0x10cab*/ 1325,
+      -1,
+      /*0x1e42*/ 572,
+      /*0x10c81*/ 1283,
+      -1,
+      /*0x2162*/ 824,
+      /*0x1e50*/ 579,
+      -1,
+      /*0xff34*/ 1199,
+      -1,
+      /*0x1e52*/ 580,
+      -1,
+      /*0x1c88*/ 538,
+      /*0x1e901*/ 1366,
+      -1,
+      /*0x1eec*/ 659,
+      /*0x1fe4*/ 800,
+      /*0x0464*/ 347,
+      /*0x0164*/ 106,
+      -1,
+      /*0x03c2*/ 269,
+      /*0x24c8*/ 857,
+      -1,
+      /*0x1f3a*/ 693,
+      /*0x03d0*/ 271,
+      /*0xa648*/ 984,
+      /*0x2c64*/ 915,
+      /*0xa748*/ 1035,
+      /*0xa662*/ 997,
+      -1,
+      /*0xa762*/ 1048,
+      -1, -1, -1,
+      /*0x1eea*/ 658,
+      /*0x1c80*/ 530,
+      /*0x13fc*/ 528,
+      -1,
+      /*0x01c8*/ 160,
+      /*0x1fa9*/ 762,
+      /*0x0429*/ 338,
+      /*0x01e2*/ 173,
+      /*0x1e4e*/ 578,
+      /*0x1c83*/ 533,
+      /*0xaba9*/ 1145,
+      -1,
+      /*0x1f4a*/ 701,
+      /*0x0542*/ 462,
+      -1,
+      /*0x2c29*/ 906,
+      -1,
+      /*0x0550*/ 476,
+      -1, -1,
+      /*0x104c2*/ 1264,
+      /*0x0552*/ 478,
+      /*0x04d0*/ 397,
+      -1,
+      /*0x104d0*/ 1278,
+      -1,
+      /*0x04d2*/ 398,
+      /*0x10c4*/ 520,
+      /*0x104d2*/ 1280,
+      -1,
+      /*0x1ee8*/ 657,
+      /*0x24c4*/ 853,
+      /*0x1f38*/ 691,
+      /*0x1e46*/ 574,
+      /*0x10ca9*/ 1323,
+      /*0xa644*/ 982,
+      -1,
+      /*0xa744*/ 1033,
+      /*0x1e7c*/ 601,
+      -1,
+      /*0xa656*/ 991,
+      -1,
+      /*0xa756*/ 1042,
+      /*0x0460*/ 345,
+      /*0x0160*/ 104,
+      -1, -1, -1,
+      /*0x01c4*/ 157,
+      -1, -1, -1,
+      /*0x2c60*/ 912,
+      /*0x054e*/ 474,
+      /*0x1ee4*/ 655,
+      -1, -1,
+      /*0x1e6c*/ 593,
+      /*0x046e*/ 352,
+      /*0x016e*/ 111,
+      /*0x104ce*/ 1276,
+      -1, -1,
+      /*0x2ce0*/ 975,
+      -1, -1, -1,
+      /*0x2c6e*/ 920,
+      -1, -1,
+      /*0x1f59*/ 709,
+      -1,
+      /*0x1fe6*/ 801,
+      /*0x0466*/ 348,
+      /*0x0166*/ 107,
+      /*0x03ec*/ 285,
+      /*0x1e6a*/ 592,
+      /*0x024e*/ 228,
+      /*0x0546*/ 466,
+      -1, -1,
+      /*0x013d*/ 86,
+      -1,
+      /*0x1c86*/ 536,
+      /*0xabbd*/ 1165,
+      /*0x104c6*/ 1268,
+      -1, -1,
+      /*0x04fc*/ 419,
+      -1, -1,
+      /*0x1fda*/ 796,
+      /*0x005a*/ 24,
+      /*0x015a*/ 101,
+      /*0x03ea*/ 284,
+      /*0x1fd8*/ 794,
+      /*0x0058*/ 22,
+      /*0x0158*/ 100,
+      -1,
+      /*0x1f4c*/ 703,
+      -1,
+      /*0x10c2*/ 518,
+      /*0x0246*/ 224,
+      /*0x03ab*/ 267,
+      -1,
+      /*0x24c2*/ 851,
+      /*0x1e68*/ 591,
+      /*0x04ec*/ 411,
+      -1,
+      /*0xa642*/ 981,
+      -1,
+      /*0xa742*/ 1032,
+      /*0x2cda*/ 972,
+      /*0xa650*/ 988,
+      /*0x1ee0*/ 653,
+      /*0xa750*/ 1039,
+      /*0x2cd8*/ 971,
+      /*0xa652*/ 989,
+      /*0x00da*/ 51,
+      /*0xa752*/ 1040,
+      /*0x0054*/ 18,
+      /*0x0154*/ 98,
+      /*0x00d8*/ 49,
+      -1,
+      /*0x03e8*/ 283,
+      -1,
+      /*0x04ea*/ 410,
+      /*0x2cc0*/ 959,
+      /*0x1f3c*/ 695,
+      /*0x1eee*/ 660,
+      /*0x1e64*/ 589,
+      -1, -1,
+      /*0x00c0*/ 26,
+      -1, -1,
+      /*0x015e*/ 103,
+      /*0x1fc7*/ 784,
+      /*0x0047*/ 6,
+      /*0x0147*/ 91,
+      /*0x2cd4*/ 969,
+      -1, -1,
+      /*0x053f*/ 459,
+      /*0x1ee6*/ 656,
+      /*0x24ce*/ 863,
+      /*0x00d4*/ 46,
+      -1,
+      /*0x03e4*/ 281,
+      /*0xa64e*/ 987,
+      /*0x104bf*/ 1261,
+      /*0xa74e*/ 1038,
+      -1, -1,
+      /*0x1f3e*/ 697,
+      /*0x2cde*/ 974,
+      /*0x04e8*/ 409,
+      /*0x1fb9*/ 775,
+      -1,
+      /*0x0139*/ 84,
+      -1,
+      /*0x00de*/ 55,
+      /*0xabb9*/ 1161,
+      /*0x1eda*/ 650,
+      /*0x00c7*/ 33,
+      -1, -1,
+      /*0x1ed8*/ 649,
+      -1, -1,
+      /*0x24c6*/ 855,
+      /*0x03a9*/ 265,
+      -1, -1,
+      /*0xa646*/ 983,
+      /*0x216c*/ 834,
+      /*0xa746*/ 1034,
+      -1,
+      /*0x1ec0*/ 637,
+      -1,
+      /*0x04e4*/ 407,
+      -1,
+      /*0x015c*/ 102,
+      /*0x1fa1*/ 754,
+      /*0x0421*/ 330,
+      -1,
+      /*0x10421*/ 1239,
+      -1,
+      /*0xaba1*/ 1137,
+      -1,
+      /*0x1e60*/ 587,
+      /*0x1ed4*/ 647,
+      /*0x01fc*/ 188,
+      /*0x2c21*/ 898,
+      /*0x216a*/ 832,
+      -1, -1, -1,
+      /*0xa66c*/ 1002,
+      -1,
+      /*0xa76c*/ 1053,
+      /*0x2cdc*/ 973,
+      -1,
+      /*0x212b*/ 820,
+      -1,
+      /*0x1e6e*/ 594,
+      /*0x1ede*/ 652,
+      /*0x00dc*/ 53,
+      /*0x03e0*/ 279,
+      -1, -1,
+      /*0x01ec*/ 178,
+      /*0x10ca1*/ 1315,
+      -1,
+      /*0x1f48*/ 699,
+      /*0x0045*/ 4,
+      /*0x0145*/ 90,
+      /*0xa66a*/ 1001,
+      /*0x10ab*/ 495,
+      /*0xa76a*/ 1052,
+      /*0x1e66*/ 590,
+      -1,
+      /*0x1e921*/ 1398,
+      /*0x03ee*/ 286,
+      /*0x2168*/ 830,
+      -1,
+      /*0x1fc3*/ 781,
+      /*0x0043*/ 2,
+      /*0x0143*/ 89,
+      -1,
+      /*0x01ea*/ 177,
+      /*0x10bf*/ 515,
+      /*0xfb05*/ 1173,
+      -1,
+      /*0x0345*/ 229,
+      /*0x24bf*/ 848,
+      -1, -1,
+      /*0x03e6*/ 282,
+      /*0x1e5a*/ 584,
+      /*0x04e0*/ 405,
+      /*0x00c5*/ 31,
+      /*0x0181*/ 121,
+      /*0x1e58*/ 583,
+      -1, -1, -1,
+      /*0xa668*/ 1000,
+      /*0x2164*/ 826,
+      /*0xa768*/ 1051,
+      -1, -1,
+      /*0x1edc*/ 651,
+      /*0x00c3*/ 29,
+      /*0x1e40*/ 571,
+      /*0x04ee*/ 412,
+      /*0x118ab*/ 1344,
+      /*0x03da*/ 276,
+      -1, -1,
+      /*0x01e8*/ 176,
+      /*0x03d8*/ 275,
+      -1,
+      /*0x1f56*/ 708,
+      -1, -1, -1,
+      /*0x1e54*/ 581,
+      -1,
+      /*0x118bf*/ 1364,
+      /*0x04e6*/ 408,
+      /*0xa664*/ 998,
+      /*0x053d*/ 457,
+      /*0xa764*/ 1049,
+      /*0x1fc9*/ 786,
+      /*0x0049*/ 1399,
+      /*0x0149*/ 92,
+      -1, -1,
+      /*0x104bd*/ 1259,
+      /*0x1f97*/ 744,
+      /*0x0417*/ 320,
+      /*0x1e5e*/ 586,
+      /*0x10417*/ 1229,
+      /*0x01e4*/ 174,
+      /*0xab97*/ 1127,
+      /*0x10a9*/ 493,
+      /*0x1fad*/ 766,
+      /*0x042d*/ 342,
+      /*0x04da*/ 402,
+      /*0x2c17*/ 888,
+      -1,
+      /*0xabad*/ 1149,
+      /*0x04d8*/ 401,
+      /*0xff2b*/ 1190,
+      -1,
+      /*0x023d*/ 218,
+      /*0x2c2d*/ 910,
+      -1,
+      /*0x0540*/ 460,
+      /*0x03de*/ 278,
+      /*0x00c9*/ 35,
+      -1, -1,
+      /*0x04c0*/ 389,
+      -1,
+      /*0x104c0*/ 1262,
+      /*0x01a9*/ 146,
+      /*0x2160*/ 822,
+      /*0x10c97*/ 1305,
+      -1, -1,
+      /*0x0554*/ 480,
+      /*0x1fb3*/ 770,
+      -1,
+      /*0xa7ad*/ 1080,
+      /*0x10cad*/ 1327,
+      /*0x04d4*/ 399,
+      /*0xabb3*/ 1155,
+      /*0x1e917*/ 1388,
+      -1, -1, -1,
+      /*0x216e*/ 836,
+      /*0x118a9*/ 1342,
+      -1, -1, -1,
+      /*0x1e5c*/ 585,
+      -1,
+      /*0x0547*/ 467,
+      /*0xa660*/ 996,
+      /*0x04de*/ 404,
+      /*0xa760*/ 1047,
+      -1,
+      /*0x04c7*/ 393,
+      /*0x1f50*/ 705,
+      /*0x104c7*/ 1269,
+      /*0x2166*/ 828,
+      -1,
+      /*0x1f52*/ 706,
+      /*0xa7b3*/ 1085,
+      -1, -1,
+      /*0x01e0*/ 172,
+      -1,
+      /*0x03dc*/ 277,
+      -1,
+      /*0xa76e*/ 1054,
+      /*0x03a1*/ 258,
+      /*0x0539*/ 453,
+      -1,
+      /*0x1e97*/ 615,
+      -1, -1, -1, -1,
+      /*0x104b9*/ 1255,
+      -1,
+      /*0x01ee*/ 179,
+      /*0x10bd*/ 513,
+      /*0xa666*/ 999,
+      /*0xff29*/ 1188,
+      /*0xa766*/ 1050,
+      /*0x24bd*/ 846,
+      /*0x1fa5*/ 758,
+      /*0x0425*/ 334,
+      -1,
+      /*0x10425*/ 1243,
+      -1,
+      /*0xaba5*/ 1141,
+      /*0x1fb7*/ 773,
+      -1, -1,
+      /*0x01e6*/ 175,
+      /*0x2c25*/ 902,
+      /*0xabb7*/ 1159,
+      -1,
+      /*0x04dc*/ 403,
+      -1,
+      /*0xa65a*/ 993,
+      -1,
+      /*0xa75a*/ 1044,
+      -1,
+      /*0xa658*/ 992,
+      -1,
+      /*0xa758*/ 1043,
+      /*0x10c0*/ 516,
+      -1, -1, -1,
+      /*0x24c0*/ 849,
+      -1, -1,
+      /*0x10ca5*/ 1319,
+      /*0xa640*/ 980,
+      -1,
+      /*0xa740*/ 1031,
+      /*0x118bd*/ 1362,
+      /*0x1fa3*/ 756,
+      /*0x0423*/ 332,
+      -1,
+      /*0x10423*/ 1241,
+      /*0x1c84*/ 534,
+      /*0xaba3*/ 1139,
+      -1, -1,
+      /*0x0545*/ 465,
+      /*0xa654*/ 990,
+      /*0x2c23*/ 900,
+      /*0xa754*/ 1041,
+      -1,
+      /*0x04c5*/ 392,
+      -1,
+      /*0x104c5*/ 1267,
+      -1, -1,
+      /*0x1c82*/ 532,
+      /*0x10c7*/ 522,
+      /*0x0543*/ 463,
+      -1,
+      /*0x1f6c*/ 717,
+      /*0x24c7*/ 856,
+      /*0xa65e*/ 995,
+      /*0x04c3*/ 391,
+      /*0xa75e*/ 1046,
+      /*0x104c3*/ 1265,
+      -1,
+      /*0x10ca3*/ 1317,
+      -1, -1,
+      /*0x0245*/ 223,
+      /*0x1ff4*/ 810,
+      /*0x0474*/ 355,
+      /*0x0174*/ 114,
+      -1,
+      /*0x01de*/ 171,
+      -1,
+      /*0x10b9*/ 509,
+      /*0x01c7*/ 159,
+      /*0x1f6a*/ 715,
+      /*0xfb01*/ 1169,
+      /*0x24b9*/ 842,
+      /*0x0243*/ 221,
+      -1, -1,
+      /*0x0397*/ 248,
+      -1, -1,
+      /*0x1f2b*/ 686,
+      /*0x1f9d*/ 750,
+      /*0x041d*/ 326,
+      -1,
+      /*0x1041d*/ 1235,
+      /*0xabb1*/ 1153,
+      /*0xab9d*/ 1133,
+      /*0x0470*/ 353,
+      /*0x0170*/ 112,
+      /*0x1f9b*/ 748,
+      /*0x041b*/ 324,
+      /*0x2c1d*/ 894,
+      /*0x1041b*/ 1233,
+      /*0x1f3f*/ 698,
+      /*0xab9b*/ 1131,
+      /*0x10a1*/ 485,
+      /*0x2c70*/ 922,
+      /*0xabb5*/ 1157,
+      /*0x0549*/ 469,
+      /*0x2c1b*/ 892,
+      /*0xa65c*/ 994,
+      /*0x1f68*/ 713,
+      /*0xa75c*/ 1045,
+      /*0x04c9*/ 394,
+      -1,
+      /*0x104c9*/ 1271,
+      /*0x0370*/ 230,
+      /*0x118b9*/ 1358,
+      /*0xa7b1*/ 1083,
+      /*0x10cb1*/ 1331,
+      /*0x10c9d*/ 1311,
+      -1,
+      /*0x1f99*/ 746,
+      /*0x0419*/ 322,
+      -1,
+      /*0x10419*/ 1231,
+      -1,
+      /*0xab99*/ 1129,
+      /*0x10c9b*/ 1309,
+      /*0x00b5*/ 25,
+      /*0x1e91d*/ 1394,
+      -1,
+      /*0x2c19*/ 890,
+      -1,
+      /*0x1f93*/ 740,
+      /*0x0413*/ 316,
+      /*0x10c5*/ 521,
+      /*0x10413*/ 1225,
+      /*0x1e91b*/ 1392,
+      /*0xab93*/ 1123,
+      /*0x24c5*/ 854,
+      -1, -1,
+      /*0x118a1*/ 1334,
+      /*0x2c13*/ 884,
+      /*0x1ef4*/ 663,
+      -1,
+      /*0x0533*/ 447,
+      /*0x10c3*/ 519,
+      /*0x0041*/ 0,
+      /*0x0141*/ 88,
+      /*0x10c99*/ 1307,
+      /*0x24c3*/ 852,
+      -1,
+      /*0x104b3*/ 1249,
+      /*0xff39*/ 1204,
+      -1,
+      /*0x01c5*/ 158,
+      /*0x1f29*/ 684,
+      -1, -1,
+      /*0x1e919*/ 1390,
+      -1,
+      /*0x10c93*/ 1301,
+      /*0x1f8f*/ 736,
+      /*0x040f*/ 312,
+      -1,
+      /*0x1040f*/ 1221,
+      /*0x1ef0*/ 661,
+      /*0xab8f*/ 1119,
+      -1,
+      /*0x1e9b*/ 619,
+      /*0x03a5*/ 261,
+      /*0x1e913*/ 1384,
+      /*0x2c0f*/ 880,
+      /*0x00c1*/ 27,
+      -1, -1, -1,
+      /*0x1f8b*/ 732,
+      /*0x040b*/ 308,
+      /*0xff21*/ 1180,
+      /*0x1040b*/ 1217,
+      -1,
+      /*0xab8b*/ 1115,
+      /*0x1f87*/ 728,
+      /*0x0407*/ 304,
+      /*0xab7b*/ 1099,
+      /*0x10407*/ 1213,
+      /*0x2c0b*/ 876,
+      /*0xab87*/ 1111,
+      /*0x0587*/ 483,
+      -1,
+      /*0x10c8f*/ 1297,
+      /*0x1e99*/ 617,
+      /*0x2c07*/ 872,
+      /*0x004f*/ 13,
+      -1, -1, -1,
+      /*0x24c9*/ 858,
+      -1,
+      /*0xab79*/ 1097,
+      /*0x1e90f*/ 1380,
+      -1,
+      /*0x0537*/ 451,
+      /*0x03a3*/ 259,
+      /*0xa78b*/ 1063,
+      /*0x10c8b*/ 1293,
+      /*0x10ad*/ 497,
+      /*0x1f6e*/ 719,
+      -1,
+      /*0x104b7*/ 1253,
+      -1,
+      /*0x10c87*/ 1289,
+      -1, -1, -1,
+      /*0x1e90b*/ 1376,
+      -1, -1,
+      /*0x1e74*/ 597,
+      /*0x00cf*/ 41,
+      /*0x0197*/ 136,
+      /*0x1e907*/ 1372,
+      -1,
+      /*0xab71*/ 1089,
+      /*0xab73*/ 1091,
+      -1, -1, -1, -1,
+      /*0x1f3d*/ 696,
+      -1, -1,
+      /*0x10b3*/ 503,
+      -1,
+      /*0xab7f*/ 1103,
+      -1,
+      /*0x03f4*/ 289,
+      /*0x1f9f*/ 752,
+      /*0x041f*/ 328,
+      /*0xab7d*/ 1101,
+      /*0x1041f*/ 1237,
+      /*0x1e70*/ 595,
+      /*0xab9f*/ 1135,
+      -1,
+      /*0x118ad*/ 1346,
+      -1, -1,
+      /*0x2c1f*/ 896,
+      -1, -1, -1, -1, -1,
+      /*0x01b3*/ 152,
+      /*0x039d*/ 254,
+      -1, -1, -1, -1,
+      /*0x03f0*/ 287,
+      /*0xab75*/ 1093,
+      -1,
+      /*0x039b*/ 252,
+      -1, -1, -1,
+      /*0x10c9f*/ 1313,
+      -1,
+      /*0x04f4*/ 415,
+      /*0x1f54*/ 707,
+      /*0x118b3*/ 1352,
+      -1,
+      /*0x1ff8*/ 813,
+      /*0x0478*/ 357,
+      /*0x0178*/ 116,
+      -1,
+      /*0x1e91f*/ 1396,
+      -1, -1, -1,
+      /*0x0531*/ 445,
+      -1,
+      /*0xff2d*/ 1192,
+      -1,
+      /*0x10a5*/ 489,
+      /*0x0399*/ 250,
+      -1,
+      /*0x104b1*/ 1247,
+      -1, -1,
+      /*0x10b7*/ 507,
+      /*0x04f0*/ 413,
+      /*0x0535*/ 449,
+      -1,
+      /*0x24b7*/ 840,
+      /*0x1f95*/ 742,
+      /*0x0415*/ 318,
+      /*0x0393*/ 244,
+      /*0x10415*/ 1227,
+      /*0x104b5*/ 1251,
+      /*0xab95*/ 1125,
+      -1, -1, -1, -1,
+      /*0x2c15*/ 886,
+      -1,
+      /*0x1f39*/ 692,
+      /*0xff33*/ 1198,
+      -1, -1,
+      /*0x01b7*/ 154,
+      -1, -1, -1, -1,
+      /*0xab77*/ 1095,
+      -1,
+      /*0x10a3*/ 487,
+      -1,
+      /*0x1f91*/ 738,
+      /*0x0411*/ 314,
+      /*0x118a5*/ 1338,
+      /*0x10411*/ 1223,
+      /*0x10c95*/ 1303,
+      /*0xab91*/ 1121,
+      -1,
+      /*0x038f*/ 240,
+      /*0x118b7*/ 1356,
+      -1,
+      /*0x2c11*/ 882,
+      -1, -1, -1,
+      /*0x1e915*/ 1386,
+      -1,
+      /*0x1f8d*/ 734,
+      /*0x040d*/ 310,
+      /*0x0541*/ 461,
+      /*0x1040d*/ 1219,
+      -1,
+      /*0xab8d*/ 1117,
+      -1,
+      /*0x04c1*/ 390,
+      /*0x1ef8*/ 665,
+      /*0x104c1*/ 1263,
+      /*0x2c0d*/ 878,
+      -1, -1,
+      /*0x10c91*/ 1299,
+      -1, -1, -1, -1, -1, -1,
+      /*0x118a3*/ 1336,
+      -1,
+      /*0x03cf*/ 270,
+      /*0x1e911*/ 1382,
+      /*0xff25*/ 1184,
+      -1,
+      /*0x0241*/ 220,
+      -1,
+      /*0xa78d*/ 1064,
+      /*0x10c8d*/ 1295,
+      /*0xff37*/ 1202,
+      -1,
+      /*0x10b1*/ 501,
+      -1, -1, -1,
+      /*0x01f4*/ 183,
+      -1, -1,
+      /*0x1e90d*/ 1378,
+      -1, -1, -1, -1,
+      /*0x10b5*/ 505,
+      -1, -1, -1,
+      /*0x13f8*/ 524,
+      /*0x054f*/ 475,
+      -1, -1, -1,
+      /*0x01b1*/ 150,
+      /*0x019d*/ 139,
+      -1,
+      /*0x104cf*/ 1277,
+      -1,
+      /*0xff23*/ 1182,
+      /*0x01f0*/ 180,
+      -1, -1, -1, -1, -1,
+      /*0x01b5*/ 153,
+      -1,
+      /*0x039f*/ 256,
+      -1, -1,
+      /*0x118b1*/ 1350,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x118b5*/ 1354,
+      /*0xfb17*/ 1179,
+      /*0x1e78*/ 599,
+      -1, -1, -1,
+      /*0x1f49*/ 700,
+      -1,
+      /*0x10c1*/ 517,
+      -1, -1, -1,
+      /*0x24c1*/ 850,
+      -1, -1,
+      /*0x0193*/ 133,
+      -1, -1, -1,
+      /*0x1f2d*/ 688,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff31*/ 1196,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff35*/ 1200,
+      -1, -1, -1, -1,
+      /*0x0395*/ 246,
+      -1,
+      /*0x018f*/ 130,
+      -1, -1, -1, -1, -1, -1,
+      /*0x04f8*/ 417,
+      -1, -1, -1, -1, -1,
+      /*0xab76*/ 1094,
+      /*0x24cf*/ 864,
+      /*0x018b*/ 128,
+      -1, -1, -1, -1, -1,
+      /*0x0187*/ 125,
+      -1,
+      /*0x0391*/ 242,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x01cf*/ 164,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -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,
+      /*0x1c85*/ 535,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x01f8*/ 186,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1f1d*/ 682,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1f1b*/ 680,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x0191*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1f19*/ 678,
+      /*0xfb13*/ 1175,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1f0f*/ 676,
+      -1, -1, -1, -1,
+      /*0xab7e*/ 1102,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x1f0b*/ 672,
+      -1, -1, -1, -1,
+      /*0xab72*/ 1090,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1c81*/ 531,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb15*/ 1177,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x1f0d*/ 674,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -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*/ 1098,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -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*/ 1100,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1c87*/ 537,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -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*/ 1092,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xab70*/ 1088,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -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*/ 1096
+    };
+
+  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 (*)[1266])(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}}},
+  {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, {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}}},
+  {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, {2, {0x1c88, 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}}},
+  {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}}},
+  {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+1266))
+  {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 = 2216, 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, 2219,    2,   14,    4,  807,    9,  379,   10,  179,
+        70,  161,    2,    3,  411,    4, 2219, 2219, 2219, 2219,
+      2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219,   80,
+      2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219,
+      2219, 2219, 2219,    1, 2219, 2219, 2219, 2219, 2219, 2219,
+      2219, 2219, 2219,  210, 2219, 2219, 2219, 2219, 2219, 2219,
+      2219, 2219,   53, 2219,    7,    8,  306,  607,  169,  844,
+       431,  722,  125, 1047,  489, 1394,   15,   16,  324, 1361,
+       140,  521,   47,  461,  221,  985,   70,  965,    9, 1085,
+        51, 1029,  223,   11,  430, 1168,  122, 1457,  344,  930,
+        91,  711,   31,  651,  157,  772,  224,  876,  262,  900,
+       254,  686,  221,  830, 1335,  755,  432,  623, 1382,  675,
+      1275,  587,   99,  821, 1530,  958,  195,  810, 1518,  739,
+       330,  361,  767,  313,  941,  400,  925,  384, 1142,  295,
+      1295,  242, 1103,  229, 1082,  206, 1066,  104, 1317,  137,
+      1249,  263, 1229,  115, 1154,   71,  135,   60, 1211,  158,
+      1472,  175, 1232,    1, 1345,   27, 1269,   38, 1111,   87,
+      1189,   49, 1256,  503, 1157,  574, 1410,  556, 1200,  787,
+       948,  486, 1316,  797, 1218, 1044, 1282, 1007, 1126,  996,
+       818, 1019,  218, 1072
+    };
+  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 = 0x1e943,
+      TOTAL_KEYWORDS = 1267,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 3,
+      MAX_HASH_VALUE = 2218
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1,
+      /*0x13e1*/ 542,
+      /*0x0461*/ 339,
+      /*0x04e1*/ 399,
+      /*0x0061*/ 0,
+      -1,
+      /*0x104e1*/ 1122,
+      /*0x1e61*/ 613,
+      /*0x1ee1*/ 672,
+      /*0x0161*/ 102,
+      /*0x0261*/ 210,
+      /*0x2ce1*/ 904,
+      -1,
+      /*0x049b*/ 364,
+      -1, -1,
+      /*0x24e1*/ 792,
+      /*0x1e1b*/ 578,
+      /*0x048b*/ 356,
+      /*0x011b*/ 69,
+      /*0x021b*/ 178,
+      /*0x2c9b*/ 869,
+      /*0x1e0b*/ 570,
+      /*0x1e8b*/ 634,
+      /*0x010b*/ 61,
+      /*0x020b*/ 170,
+      /*0x2c8b*/ 861,
+      /*0x13e3*/ 544,
+      /*0x0463*/ 340,
+      /*0x04e3*/ 400,
+      /*0x0063*/ 2,
+      /*0x13a4*/ 481,
+      /*0x104e3*/ 1124,
+      /*0x1e63*/ 614,
+      /*0x1ee3*/ 673,
+      /*0x0163*/ 103,
+      /*0x0263*/ 211,
+      /*0x2ce3*/ 905,
+      /*0x13e5*/ 546,
+      /*0x0465*/ 341,
+      /*0x04e5*/ 401,
+      /*0x0065*/ 4,
+      /*0x24e3*/ 794,
+      /*0x104e5*/ 1126,
+      /*0x1e65*/ 615,
+      /*0x1ee5*/ 674,
+      /*0x0165*/ 104,
+      /*0x0265*/ 212,
+      /*0xa761*/ 1016,
+      /*0x13e9*/ 550,
+      /*0x0469*/ 343,
+      /*0x04e9*/ 403,
+      /*0x0069*/ 1266,
+      /*0x24e5*/ 796,
+      /*0x104e9*/ 1130,
+      /*0x1e69*/ 617,
+      /*0x1ee9*/ 676,
+      /*0x0169*/ 106,
+      /*0x0269*/ 215,
+      -1,
+      /*0x13db*/ 536,
+      /*0x045b*/ 334,
+      /*0x04db*/ 396,
+      -1,
+      /*0x24e9*/ 800,
+      /*0x104db*/ 1116,
+      /*0x1e5b*/ 610,
+      /*0x1edb*/ 669,
+      /*0x015b*/ 99,
+      /*0x025b*/ 207,
+      /*0x2cdb*/ 901,
+      /*0x13d9*/ 534,
+      /*0x0459*/ 332,
+      /*0x04d9*/ 395,
+      /*0xa763*/ 1017,
+      /*0x24db*/ 786,
+      /*0x104d9*/ 1114,
+      /*0x1e59*/ 609,
+      /*0x1ed9*/ 668,
+      /*0x0159*/ 98,
+      /*0x0259*/ 206,
+      /*0x2cd9*/ 900,
+      -1,
+      /*0x10ce1*/ 1182,
+      -1,
+      /*0xa765*/ 1018,
+      /*0x24d9*/ 784,
+      /*0x13e7*/ 548,
+      /*0x0467*/ 342,
+      /*0x04e7*/ 402,
+      /*0x0067*/ 6,
+      /*0x13a2*/ 479,
+      /*0x104e7*/ 1128,
+      /*0x1e67*/ 616,
+      /*0x1ee7*/ 675,
+      /*0x0167*/ 105,
+      /*0xa769*/ 1020,
+      -1, -1,
+      /*0x13b8*/ 501,
+      /*0x0438*/ 299,
+      -1,
+      /*0x24e7*/ 798,
+      /*0x10438*/ 1089,
+      /*0x13d1*/ 526,
+      /*0x0451*/ 324,
+      /*0x04d1*/ 391,
+      /*0xa75b*/ 1013,
+      -1,
+      /*0x10ce3*/ 1184,
+      /*0x1e51*/ 605,
+      /*0x1ed1*/ 664,
+      /*0x0151*/ 94,
+      /*0x0251*/ 200,
+      /*0x2cd1*/ 896,
+      /*0x13d7*/ 532,
+      /*0x0457*/ 330,
+      /*0x04d7*/ 394,
+      /*0xa759*/ 1012,
+      /*0x24d1*/ 776,
+      /*0x10ce5*/ 1186,
+      /*0x1e57*/ 608,
+      /*0x1ed7*/ 667,
+      /*0x0157*/ 97,
+      /*0x0257*/ 205,
+      /*0x2cd7*/ 899,
+      -1, -1,
+      /*0x0586*/ 476,
+      -1,
+      /*0x24d7*/ 782,
+      /*0x10ce9*/ 1190,
+      -1, -1,
+      /*0xa767*/ 1019,
+      /*0x13da*/ 535,
+      /*0x045a*/ 333,
+      /*0x13d3*/ 528,
+      /*0x0453*/ 326,
+      /*0x04d3*/ 392,
+      /*0x104da*/ 1115,
+      /*0xa661*/ 965,
+      /*0x10cdb*/ 1176,
+      /*0x1e53*/ 606,
+      /*0x1ed3*/ 665,
+      /*0x0153*/ 95,
+      /*0x0253*/ 202,
+      /*0x2cd3*/ 897,
+      -1, -1,
+      /*0x24da*/ 785,
+      /*0xa751*/ 1008,
+      /*0x24d3*/ 778,
+      /*0x10cd9*/ 1174,
+      -1, -1, -1,
+      /*0x13a6*/ 483,
+      /*0x13dd*/ 538,
+      /*0x045d*/ 336,
+      /*0x04dd*/ 397,
+      /*0x03e1*/ 279,
+      /*0xa757*/ 1011,
+      /*0x104dd*/ 1118,
+      /*0x1e5d*/ 611,
+      /*0x1edd*/ 670,
+      /*0x015d*/ 100,
+      /*0xa663*/ 966,
+      /*0x2cdd*/ 902,
+      /*0x10ce7*/ 1188,
+      -1, -1,
+      /*0x0582*/ 472,
+      /*0x24dd*/ 788,
+      -1,
+      /*0x13df*/ 540,
+      /*0x045f*/ 338,
+      /*0x04df*/ 398,
+      /*0xa665*/ 967,
+      -1,
+      /*0x104df*/ 1120,
+      /*0x1e5f*/ 612,
+      /*0x1edf*/ 671,
+      /*0x015f*/ 101,
+      /*0xa753*/ 1009,
+      /*0x2cdf*/ 903,
+      /*0x10cd1*/ 1166,
+      /*0x03e3*/ 280,
+      /*0xab53*/ 1046,
+      /*0xa669*/ 969,
+      /*0x24df*/ 790,
+      -1, -1,
+      /*0x028a*/ 229,
+      /*0x028b*/ 230,
+      /*0x13bc*/ 505,
+      /*0x043c*/ 303,
+      /*0x10cd7*/ 1172,
+      /*0x03e5*/ 281,
+      /*0x1043c*/ 1093,
+      /*0xa65b*/ 962,
+      -1, -1,
+      /*0x013c*/ 84,
+      /*0x023c*/ 190,
+      /*0xa75d*/ 1014,
+      /*0x13cf*/ 524,
+      /*0x044f*/ 322,
+      /*0x04cf*/ 390,
+      /*0x03e9*/ 283,
+      /*0x1044f*/ 1112,
+      /*0xa659*/ 961,
+      /*0x1e4f*/ 604,
+      /*0x1ecf*/ 663,
+      /*0x014f*/ 93,
+      /*0x024f*/ 198,
+      /*0x2ccf*/ 895,
+      /*0x10cda*/ 1175,
+      -1,
+      /*0x10cd3*/ 1168,
+      /*0x03db*/ 276,
+      /*0x13ae*/ 491,
+      /*0xa75f*/ 1015,
+      /*0x2c61*/ 848,
+      /*0x13a8*/ 485,
+      /*0x1042e*/ 1079,
+      /*0x017e*/ 116,
+      /*0xa667*/ 968,
+      /*0x10428*/ 1073,
+      /*0x13cd*/ 522,
+      /*0x044d*/ 320,
+      /*0x03d9*/ 275,
+      -1,
+      /*0x1044d*/ 1110,
+      -1,
+      /*0x1e4d*/ 603,
+      /*0x1ecd*/ 662,
+      /*0x014d*/ 92,
+      /*0x024d*/ 197,
+      /*0x2ccd*/ 894,
+      /*0x10cdd*/ 1178,
+      -1,
+      /*0x13cb*/ 520,
+      /*0x044b*/ 318,
+      /*0xa651*/ 957,
+      -1,
+      /*0x1044b*/ 1108,
+      /*0x03e7*/ 282,
+      /*0x1e4b*/ 602,
+      /*0x1ecb*/ 661,
+      /*0x014b*/ 91,
+      /*0x024b*/ 196,
+      /*0x2ccb*/ 893,
+      /*0xa74f*/ 1007,
+      /*0x13ac*/ 489,
+      /*0xa657*/ 960,
+      -1,
+      /*0x10cdf*/ 1180,
+      /*0x1042c*/ 1077,
+      /*0x03b8*/ 252,
+      /*0x2c65*/ 849,
+      -1,
+      /*0x13aa*/ 487,
+      /*0x13d5*/ 530,
+      /*0x0455*/ 328,
+      /*0x04d5*/ 393,
+      /*0x1042a*/ 1075,
+      -1, -1,
+      /*0x1e55*/ 607,
+      /*0x1ed5*/ 666,
+      /*0x0155*/ 96,
+      /*0x118db*/ 1227,
+      /*0x2cd5*/ 898,
+      -1,
+      /*0x03d7*/ 274,
+      /*0xa74d*/ 1006,
+      /*0xa653*/ 958,
+      /*0x24d5*/ 780,
+      -1, -1, -1,
+      /*0x2c5b*/ 844,
+      /*0x118d9*/ 1225,
+      -1, -1, -1, -1,
+      /*0x10ccf*/ 1164,
+      /*0xa74b*/ 1005,
+      -1, -1, -1,
+      /*0x2c59*/ 842,
+      -1,
+      /*0x13c9*/ 518,
+      /*0x0449*/ 316,
+      -1,
+      /*0xa65d*/ 963,
+      /*0x10449*/ 1106,
+      /*0x029e*/ 234,
+      /*0x1e49*/ 601,
+      /*0x1ec9*/ 660,
+      -1,
+      /*0x0249*/ 195,
+      /*0x2cc9*/ 892,
+      /*0x1f61*/ 729,
+      -1, -1,
+      /*0x0580*/ 470,
+      /*0xa755*/ 1010,
+      /*0x10ccd*/ 1162,
+      -1,
+      /*0x13c3*/ 512,
+      /*0x0443*/ 310,
+      /*0xa65f*/ 964,
+      /*0x118d1*/ 1217,
+      /*0x10443*/ 1100,
+      /*0x03dd*/ 277,
+      /*0x1e43*/ 598,
+      /*0x1ec3*/ 657,
+      /*0x2c38*/ 809,
+      -1,
+      /*0x2cc3*/ 889,
+      /*0x10ccb*/ 1160,
+      -1,
+      /*0x2c51*/ 834,
+      /*0x118d7*/ 1223,
+      -1, -1,
+      /*0x13c0*/ 509,
+      /*0x0440*/ 307,
+      /*0x1f63*/ 731,
+      -1,
+      /*0x10440*/ 1097,
+      /*0x03df*/ 278,
+      /*0x1f24*/ 706,
+      /*0x2c57*/ 840,
+      /*0x0140*/ 86,
+      /*0x0240*/ 192,
+      -1, -1,
+      /*0xa749*/ 1004,
+      /*0x1f65*/ 733,
+      /*0x13a0*/ 477,
+      /*0x10cd5*/ 1170,
+      /*0xa64f*/ 956,
+      /*0x118da*/ 1226,
+      -1,
+      /*0x118d3*/ 1219,
+      -1, -1,
+      /*0x1f10*/ 696,
+      -1, -1,
+      /*0x03bc*/ 256,
+      -1,
+      /*0x2c5a*/ 843,
+      -1,
+      /*0x2c53*/ 836,
+      /*0xa743*/ 1001,
+      /*0x13c1*/ 510,
+      /*0x0441*/ 308,
+      -1, -1,
+      /*0x10441*/ 1098,
+      -1,
+      /*0x1e41*/ 597,
+      /*0x1ec1*/ 656,
+      /*0xa64d*/ 955,
+      /*0x118dd*/ 1229,
+      /*0x2cc1*/ 888,
+      -1, -1, -1,
+      /*0x1f14*/ 700,
+      -1,
+      /*0x10cc9*/ 1158,
+      -1,
+      /*0x01e1*/ 151,
+      /*0x2c5d*/ 846,
+      /*0x03ae*/ 243,
+      /*0xa64b*/ 954,
+      -1,
+      /*0x13c7*/ 516,
+      /*0x0447*/ 314,
+      -1,
+      /*0x118df*/ 1231,
+      /*0x10447*/ 1104,
+      /*0x03cd*/ 272,
+      /*0x1e47*/ 600,
+      /*0x1ec7*/ 659,
+      /*0x1f67*/ 735,
+      /*0x0247*/ 194,
+      /*0x2cc7*/ 891,
+      /*0x10cc3*/ 1152,
+      /*0x1f22*/ 704,
+      -1, -1,
+      /*0x0292*/ 232,
+      /*0x13c5*/ 514,
+      /*0x0445*/ 312,
+      /*0x03cb*/ 270,
+      /*0xa655*/ 959,
+      /*0x10445*/ 1102,
+      /*0x01e3*/ 152,
+      /*0x1e45*/ 599,
+      /*0x1ec5*/ 658,
+      /*0xa741*/ 1000,
+      /*0x1f51*/ 724,
+      /*0x2cc5*/ 890,
+      /*0x0561*/ 439,
+      /*0x10cc0*/ 1149,
+      /*0xff59*/ 1071,
+      /*0x03ac*/ 241,
+      -1,
+      /*0x01e5*/ 153,
+      /*0x2c3c*/ 813,
+      /*0x118cf*/ 1215,
+      -1,
+      /*0x1f57*/ 727,
+      /*0x051b*/ 428,
+      -1, -1, -1, -1,
+      /*0x050b*/ 420,
+      /*0x01e9*/ 155,
+      /*0x2c4f*/ 832,
+      -1,
+      /*0x1f06*/ 694,
+      /*0xa747*/ 1003,
+      /*0x13b2*/ 495,
+      /*0x0432*/ 293,
+      /*0x0584*/ 474,
+      /*0xa649*/ 953,
+      /*0x10432*/ 1083,
+      /*0x0563*/ 441,
+      /*0x2d16*/ 931,
+      -1,
+      /*0x2d1b*/ 936,
+      /*0x118cd*/ 1213,
+      /*0x1f53*/ 725,
+      /*0x10cc1*/ 1150,
+      /*0x2d0a*/ 919,
+      /*0x2d0b*/ 920,
+      /*0xff51*/ 1063,
+      /*0xa745*/ 1002,
+      /*0x0565*/ 443,
+      -1, -1,
+      /*0x2c4d*/ 830,
+      -1,
+      /*0xa643*/ 950,
+      /*0x118cb*/ 1211,
+      /*0x03c9*/ 268,
+      -1,
+      /*0xff57*/ 1069,
+      -1,
+      /*0x0569*/ 447,
+      /*0x2d24*/ 945,
+      -1,
+      /*0x1f26*/ 708,
+      /*0x0491*/ 359,
+      /*0x2c4b*/ 828,
+      /*0x01e7*/ 154,
+      /*0x10cc7*/ 1156,
+      /*0x1e11*/ 573,
+      /*0x1e91*/ 637,
+      /*0x0111*/ 64,
+      /*0x0211*/ 173,
+      /*0x2c91*/ 864,
+      /*0xa79b*/ 1036,
+      /*0x03c3*/ 262,
+      /*0x1f02*/ 690,
+      /*0x118d5*/ 1221,
+      /*0x2d10*/ 925,
+      /*0xff5a*/ 1072,
+      /*0x1e924*/ 1234,
+      /*0xff53*/ 1065,
+      /*0x2d18*/ 933,
+      -1,
+      /*0x10cc5*/ 1154,
+      -1,
+      /*0x0280*/ 224,
+      /*0x2c55*/ 838,
+      /*0x13f3*/ 560,
+      /*0x0473*/ 348,
+      /*0x04f3*/ 408,
+      /*0x0073*/ 17,
+      /*0x03c0*/ 260,
+      /*0x104f3*/ 1140,
+      /*0x1e73*/ 622,
+      /*0x1ef3*/ 681,
+      /*0x0173*/ 111,
+      -1,
+      /*0x2cf3*/ 908,
+      /*0x0567*/ 445,
+      -1,
+      /*0x2d14*/ 929,
+      /*0x019e*/ 126,
+      /*0xa641*/ 949,
+      /*0x028c*/ 231,
+      /*0x13eb*/ 552,
+      /*0x046b*/ 344,
+      /*0x04eb*/ 404,
+      /*0x006b*/ 9,
+      /*0x118c9*/ 1209,
+      /*0x104eb*/ 1132,
+      /*0x1e6b*/ 618,
+      /*0x1eeb*/ 677,
+      /*0x016b*/ 107,
+      /*0x026b*/ 217,
+      /*0x01da*/ 147,
+      -1, -1, -1,
+      /*0x2c49*/ 826,
+      -1, -1,
+      /*0x2d22*/ 943,
+      /*0x03c1*/ 261,
+      -1,
+      /*0x048f*/ 358,
+      /*0xa647*/ 952,
+      /*0x118c3*/ 1203,
+      /*0x1f12*/ 698,
+      /*0x1e0f*/ 572,
+      /*0x1e8f*/ 636,
+      /*0x010f*/ 63,
+      /*0x020f*/ 172,
+      /*0x2c8f*/ 863,
+      /*0xa69b*/ 985,
+      -1, -1,
+      /*0x2c43*/ 820,
+      /*0x01dd*/ 149,
+      /*0xa68b*/ 977,
+      /*0x1e922*/ 1232,
+      -1,
+      /*0xa645*/ 951,
+      -1,
+      /*0x118c0*/ 1200,
+      -1,
+      /*0x03c7*/ 266,
+      -1,
+      /*0x1e938*/ 1254,
+      -1,
+      /*0xff4f*/ 1061,
+      -1,
+      /*0xa76b*/ 1021,
+      /*0x2d1e*/ 939,
+      /*0x2c40*/ 817,
+      /*0x01df*/ 150,
+      /*0x2d06*/ 915,
+      /*0x0373*/ 236,
+      /*0x13ef*/ 556,
+      /*0x046f*/ 346,
+      /*0x04ef*/ 406,
+      /*0x006f*/ 13,
+      /*0x03c5*/ 264,
+      /*0x104ef*/ 1136,
+      /*0x1e6f*/ 620,
+      /*0x1eef*/ 679,
+      /*0x016f*/ 109,
+      /*0x026f*/ 219,
+      -1, -1,
+      /*0x1f55*/ 726,
+      /*0x2d0e*/ 923,
+      -1,
+      /*0xff4d*/ 1059,
+      -1,
+      /*0x118c1*/ 1201,
+      /*0x13ed*/ 554,
+      /*0x046d*/ 345,
+      /*0x04ed*/ 405,
+      /*0x006d*/ 11,
+      -1,
+      /*0x104ed*/ 1134,
+      /*0x1e6d*/ 619,
+      /*0x1eed*/ 678,
+      /*0x016d*/ 108,
+      /*0x2c41*/ 818,
+      /*0xff4b*/ 1057,
+      /*0x10ceb*/ 1192,
+      -1,
+      /*0x13b7*/ 500,
+      /*0x0437*/ 298,
+      /*0x04b7*/ 378,
+      -1,
+      /*0x10437*/ 1088,
+      /*0x03b2*/ 246,
+      /*0x1e37*/ 592,
+      /*0x1eb7*/ 651,
+      /*0x0137*/ 82,
+      /*0x118c7*/ 1207,
+      /*0x2cb7*/ 883,
+      /*0x2d02*/ 911,
+      /*0x0192*/ 122,
+      -1,
+      /*0x019a*/ 125,
+      /*0x01a8*/ 130,
+      /*0xa76f*/ 1023,
+      /*0x1e926*/ 1236,
+      /*0xff55*/ 1067,
+      /*0x2c47*/ 824,
+      /*0x1fe1*/ 755,
+      -1,
+      /*0x0481*/ 355,
+      /*0x0581*/ 471,
+      /*0x1f00*/ 688,
+      /*0x118c5*/ 1205,
+      /*0x1e01*/ 565,
+      /*0x1e81*/ 629,
+      /*0x0101*/ 56,
+      /*0x0201*/ 165,
+      /*0x2c81*/ 856,
+      /*0x1f43*/ 721,
+      -1, -1,
+      /*0xa76d*/ 1022,
+      /*0x2c45*/ 822,
+      /*0x13b3*/ 496,
+      /*0x0433*/ 294,
+      /*0x04b3*/ 376,
+      -1,
+      /*0x10433*/ 1084,
+      /*0x057e*/ 468,
+      /*0x1e33*/ 590,
+      /*0x1eb3*/ 649,
+      /*0x0133*/ 80,
+      /*0x0233*/ 189,
+      /*0x2cb3*/ 881,
+      /*0xa737*/ 995,
+      /*0x1f40*/ 718,
+      -1,
+      /*0xff49*/ 1055,
+      /*0x10cef*/ 1196,
+      -1, -1, -1,
+      /*0x1e93c*/ 1258,
+      /*0xa66b*/ 970,
+      /*0x1fe5*/ 756,
+      -1,
+      /*0x03f3*/ 288,
+      -1,
+      /*0x217e*/ 772,
+      /*0x1f20*/ 702,
+      /*0x2d12*/ 927,
+      /*0x13a5*/ 482,
+      /*0x2d1a*/ 935,
+      /*0x04a5*/ 369,
+      /*0x2c32*/ 803,
+      /*0xff43*/ 1049,
+      /*0x10ced*/ 1194,
+      /*0x1e25*/ 583,
+      /*0x1ea5*/ 642,
+      /*0x0125*/ 74,
+      /*0x0225*/ 182,
+      /*0x2ca5*/ 874,
+      -1,
+      /*0x03eb*/ 284,
+      -1, -1,
+      /*0x1f41*/ 719,
+      /*0x0288*/ 227,
+      /*0x1e92e*/ 1244,
+      -1,
+      /*0xa733*/ 993,
+      /*0x1e928*/ 1238,
+      -1,
+      /*0x01c9*/ 139,
+      -1,
+      /*0x13b5*/ 498,
+      /*0x0435*/ 296,
+      /*0x04b5*/ 377,
+      -1,
+      /*0x10435*/ 1086,
+      -1,
+      /*0x1e35*/ 591,
+      /*0x1eb5*/ 650,
+      /*0x0135*/ 81,
+      /*0x0180*/ 117,
+      /*0x2cb5*/ 882,
+      /*0x13ad*/ 490,
+      -1,
+      /*0x04ad*/ 373,
+      -1,
+      /*0x1042d*/ 1078,
+      -1,
+      /*0x1e2d*/ 587,
+      /*0x1ead*/ 646,
+      /*0x012d*/ 78,
+      /*0x022d*/ 186,
+      /*0x2cad*/ 878,
+      -1,
+      /*0xa725*/ 987,
+      -1, -1,
+      /*0x1e92c*/ 1242,
+      /*0x018c*/ 121,
+      /*0xff41*/ 1047,
+      -1,
+      /*0x1f45*/ 723,
+      -1, -1,
+      /*0x2c73*/ 854,
+      /*0x1e92a*/ 1240,
+      /*0x1fd1*/ 753,
+      /*0x13a3*/ 480,
+      -1,
+      /*0x04a3*/ 368,
+      /*0xa66d*/ 971,
+      -1,
+      /*0x03ef*/ 286,
+      /*0x1e23*/ 582,
+      /*0x1ea3*/ 641,
+      /*0x0123*/ 73,
+      /*0x0223*/ 181,
+      /*0x2ca3*/ 873,
+      /*0xa735*/ 994,
+      -1, -1,
+      /*0x0585*/ 475,
+      /*0xff47*/ 1053,
+      -1,
+      /*0x1e05*/ 567,
+      /*0x1e85*/ 631,
+      /*0x0105*/ 58,
+      /*0x0205*/ 167,
+      /*0x2c85*/ 858,
+      /*0xa72d*/ 991,
+      /*0x03ed*/ 285,
+      /*0x2d00*/ 909,
+      /*0x1f04*/ 692,
+      /*0x1f32*/ 712,
+      -1,
+      /*0x13bf*/ 508,
+      /*0x043f*/ 306,
+      /*0x04bf*/ 382,
+      /*0xff45*/ 1051,
+      /*0x1043f*/ 1096,
+      -1,
+      /*0x1e3f*/ 596,
+      /*0x1ebf*/ 655,
+      /*0x03b7*/ 251,
+      /*0x023f*/ 191,
+      /*0x2cbf*/ 887,
+      -1, -1, -1,
+      /*0x2d0c*/ 921,
+      -1,
+      /*0x13b1*/ 494,
+      /*0x0431*/ 292,
+      /*0x04b1*/ 375,
+      /*0xa723*/ 986,
+      /*0x10431*/ 1082,
+      /*0x1e943*/ 1265,
+      /*0x1e31*/ 589,
+      /*0x1eb1*/ 648,
+      -1,
+      /*0x0231*/ 188,
+      /*0x2cb1*/ 880,
+      /*0x1f11*/ 697,
+      /*0x13c2*/ 511,
+      /*0x0442*/ 309,
+      /*0x04c2*/ 383,
+      -1,
+      /*0x10442*/ 1099,
+      /*0x13a7*/ 484,
+      /*0x2d20*/ 941,
+      /*0x04a7*/ 370,
+      /*0x0142*/ 87,
+      /*0x0242*/ 193,
+      /*0x1e940*/ 1262,
+      /*0x1e27*/ 584,
+      /*0x1ea7*/ 643,
+      /*0x0127*/ 75,
+      /*0x0227*/ 183,
+      /*0x2ca7*/ 875,
+      /*0x03b3*/ 247,
+      -1,
+      /*0xa78c*/ 1031,
+      /*0xa73f*/ 999,
+      /*0x13f1*/ 558,
+      /*0x0471*/ 347,
+      /*0x04f1*/ 407,
+      /*0x0071*/ 15,
+      /*0x1f73*/ 739,
+      /*0x104f1*/ 1138,
+      /*0x1e71*/ 621,
+      /*0x1ef1*/ 680,
+      /*0x0171*/ 110,
+      /*0x0271*/ 220,
+      /*0x13f5*/ 562,
+      /*0x0475*/ 349,
+      /*0x04f5*/ 409,
+      /*0x0075*/ 19,
+      -1,
+      /*0x104f5*/ 1142,
+      /*0x1e75*/ 623,
+      /*0x1ef5*/ 682,
+      /*0x0175*/ 112,
+      /*0x0275*/ 222,
+      /*0x00e1*/ 26,
+      /*0x1e941*/ 1263,
+      /*0x2c37*/ 808,
+      /*0x13bd*/ 506,
+      /*0x043d*/ 304,
+      /*0x04bd*/ 381,
+      -1,
+      /*0x1043d*/ 1094,
+      -1,
+      /*0x1e3d*/ 595,
+      /*0x1ebd*/ 654,
+      -1,
+      /*0xa727*/ 988,
+      /*0x2cbd*/ 886,
+      /*0x13b9*/ 502,
+      /*0x0439*/ 300,
+      /*0x04b9*/ 379,
+      -1,
+      /*0x10439*/ 1090,
+      /*0x017c*/ 115,
+      /*0x1e39*/ 593,
+      /*0x1eb9*/ 652,
+      -1,
+      /*0x13af*/ 492,
+      /*0x2cb9*/ 884,
+      /*0x04af*/ 374,
+      /*0x00e3*/ 28,
+      /*0x1042f*/ 1080,
+      /*0x03b5*/ 249,
+      /*0x1e2f*/ 588,
+      /*0x1eaf*/ 647,
+      /*0x012f*/ 79,
+      /*0x022f*/ 187,
+      /*0x2caf*/ 879,
+      -1, -1, -1,
+      /*0x00e5*/ 30,
+      /*0x2c33*/ 804,
+      /*0x03ad*/ 242,
+      /*0x0583*/ 473,
+      -1,
+      /*0x10cc2*/ 1151,
+      /*0x1e03*/ 566,
+      /*0x1e83*/ 630,
+      /*0x0103*/ 57,
+      /*0x0203*/ 166,
+      /*0x2c83*/ 857,
+      /*0x00e9*/ 34,
+      /*0x0371*/ 235,
+      /*0xa73d*/ 998,
+      -1,
+      /*0x2d1c*/ 937,
+      /*0x2d04*/ 913,
+      -1, -1, -1,
+      /*0x01f3*/ 159,
+      /*0xa77c*/ 1025,
+      -1,
+      /*0x0188*/ 120,
+      /*0xa739*/ 996,
+      /*0x10cf1*/ 1198,
+      -1,
+      /*0x0511*/ 423,
+      -1, -1, -1, -1,
+      /*0x13a9*/ 486,
+      /*0xa72f*/ 992,
+      /*0x04a9*/ 371,
+      /*0x1e932*/ 1248,
+      /*0x10429*/ 1074,
+      /*0x01eb*/ 156,
+      /*0x1e29*/ 585,
+      /*0x1ea9*/ 644,
+      /*0x0129*/ 76,
+      /*0x0229*/ 184,
+      /*0x2ca9*/ 876,
+      /*0x037c*/ 239,
+      -1, -1,
+      /*0x2d11*/ 926,
+      -1,
+      /*0x1f37*/ 717,
+      /*0x00e7*/ 32,
+      -1, -1,
+      /*0x0573*/ 457,
+      /*0x2c35*/ 806,
+      -1,
+      /*0x03bf*/ 259,
+      /*0x13ab*/ 488,
+      -1,
+      /*0x04ab*/ 372,
+      -1,
+      /*0x1042b*/ 1076,
+      -1,
+      /*0x1e2b*/ 586,
+      /*0x1eab*/ 645,
+      /*0x012b*/ 77,
+      /*0x022b*/ 185,
+      /*0x2cab*/ 877,
+      -1,
+      /*0x1f01*/ 689,
+      /*0x056b*/ 449,
+      -1,
+      /*0x03b1*/ 245,
+      /*0x2173*/ 761,
+      -1,
+      /*0x2d08*/ 917,
+      -1, -1, -1,
+      /*0xa791*/ 1032,
+      /*0xa729*/ 989,
+      -1,
+      /*0x13c6*/ 515,
+      /*0x0446*/ 313,
+      /*0x04c6*/ 385,
+      /*0x1f33*/ 713,
+      /*0x10446*/ 1103,
+      /*0x13a1*/ 478,
+      /*0x050f*/ 422,
+      /*0x04a1*/ 367,
+      /*0x0146*/ 89,
+      /*0x01ef*/ 158,
+      -1,
+      /*0x1e21*/ 581,
+      /*0x1ea1*/ 640,
+      /*0x0121*/ 72,
+      -1,
+      /*0x2ca1*/ 872,
+      /*0x13c4*/ 513,
+      /*0x0444*/ 311,
+      /*0x04c4*/ 384,
+      -1,
+      /*0x10444*/ 1101,
+      -1,
+      /*0xa72b*/ 990,
+      /*0x13f2*/ 559,
+      /*0x0144*/ 88,
+      /*0x2d0f*/ 924,
+      /*0x0072*/ 16,
+      /*0x01ed*/ 157,
+      /*0x104f2*/ 1139,
+      -1, -1,
+      /*0x1f25*/ 707,
+      /*0x0272*/ 221,
+      /*0x13bb*/ 504,
+      /*0x043b*/ 302,
+      /*0x04bb*/ 380,
+      /*0x2c3f*/ 816,
+      /*0x1043b*/ 1092,
+      -1,
+      /*0x1e3b*/ 594,
+      /*0x1ebb*/ 653,
+      /*0x056f*/ 453,
+      /*0x0495*/ 361,
+      /*0x2cbb*/ 885,
+      -1,
+      /*0x03bd*/ 257,
+      /*0x1e15*/ 575,
+      /*0x1e95*/ 639,
+      /*0x0115*/ 66,
+      /*0x0215*/ 175,
+      /*0x2c95*/ 866,
+      -1,
+      /*0x2c31*/ 802,
+      -1,
+      /*0x118c2*/ 1202,
+      /*0x1f35*/ 715,
+      /*0x03b9*/ 253,
+      /*0xa691*/ 980,
+      -1,
+      /*0x056d*/ 451,
+      -1, -1,
+      /*0x0493*/ 360,
+      -1,
+      /*0x2c42*/ 819,
+      /*0x03af*/ 244,
+      /*0x1e13*/ 574,
+      /*0x1e93*/ 638,
+      /*0x0113*/ 65,
+      /*0x0213*/ 174,
+      /*0x2c93*/ 865,
+      -1,
+      /*0x047b*/ 352,
+      /*0x04fb*/ 412,
+      -1, -1,
+      /*0x104fb*/ 1148,
+      /*0x1e7b*/ 626,
+      /*0x1efb*/ 685,
+      -1,
+      /*0xa73b*/ 997,
+      -1,
+      /*0x10cc6*/ 1155,
+      /*0x0479*/ 351,
+      /*0x04f9*/ 411,
+      /*0x0079*/ 23,
+      -1,
+      /*0x104f9*/ 1146,
+      /*0x1e79*/ 625,
+      /*0x1ef9*/ 684,
+      -1,
+      /*0x1f23*/ 705,
+      /*0x0501*/ 415,
+      -1, -1,
+      /*0x047d*/ 353,
+      /*0x04fd*/ 413,
+      /*0x0283*/ 225,
+      /*0x10cc4*/ 1153,
+      /*0x00fe*/ 54,
+      /*0x1e7d*/ 627,
+      /*0x1efd*/ 686,
+      /*0x1f05*/ 693,
+      /*0x027d*/ 223,
+      /*0x01a5*/ 129,
+      /*0x10cf2*/ 1199,
+      /*0x0499*/ 363,
+      /*0x2c3d*/ 814,
+      -1,
+      /*0x1e937*/ 1253,
+      /*0x1e19*/ 577,
+      /*0x2d01*/ 910,
+      /*0x0119*/ 68,
+      /*0x0219*/ 177,
+      /*0x2c99*/ 868,
+      -1, -1,
+      /*0xa68f*/ 979,
+      /*0x2c39*/ 810,
+      -1,
+      /*0x0477*/ 350,
+      /*0x04f7*/ 410,
+      /*0x0077*/ 21,
+      /*0xa7b7*/ 1045,
+      /*0x104f7*/ 1144,
+      /*0x1e77*/ 624,
+      /*0x1ef7*/ 683,
+      /*0x0177*/ 113,
+      /*0x1e07*/ 568,
+      /*0x1e87*/ 632,
+      /*0x0107*/ 59,
+      /*0x0207*/ 168,
+      /*0x2c87*/ 859,
+      -1,
+      /*0x1d79*/ 563,
+      /*0x1f31*/ 711,
+      /*0x0525*/ 433,
+      -1, -1,
+      /*0x01ad*/ 131,
+      /*0x037b*/ 238,
+      /*0x13d0*/ 525,
+      /*0x0450*/ 323,
+      /*0xa781*/ 1027,
+      -1,
+      /*0x1e933*/ 1249,
+      /*0x1d7d*/ 564,
+      /*0x1f42*/ 720,
+      /*0x047f*/ 354,
+      /*0x04ff*/ 414,
+      /*0x0250*/ 199,
+      -1,
+      /*0x1f27*/ 709,
+      /*0x1e7f*/ 628,
+      /*0x1eff*/ 687,
+      /*0x2d25*/ 946,
+      /*0x24d0*/ 775,
+      /*0x13ce*/ 523,
+      /*0x044e*/ 321,
+      /*0x04ce*/ 389,
+      /*0x03c6*/ 265,
+      /*0x1044e*/ 1111,
+      /*0x0497*/ 362,
+      /*0x037d*/ 240,
+      /*0x01a3*/ 128,
+      -1,
+      /*0x1e17*/ 576,
+      /*0x1f71*/ 737,
+      /*0x0117*/ 67,
+      /*0x0217*/ 176,
+      /*0x2c97*/ 867,
+      /*0x052d*/ 437,
+      -1,
+      /*0x1e925*/ 1235,
+      -1,
+      /*0x0185*/ 119,
+      /*0x03c4*/ 263,
+      /*0x1f75*/ 741,
+      /*0x13cc*/ 521,
+      /*0x044c*/ 319,
+      /*0x04cc*/ 388,
+      -1,
+      /*0x1044c*/ 1109,
+      /*0x03f2*/ 287,
+      /*0xff42*/ 1048,
+      -1,
+      /*0x13e6*/ 547,
+      /*0xa7a5*/ 1041,
+      /*0x0377*/ 237,
+      /*0x0066*/ 5,
+      /*0x2d2d*/ 948,
+      /*0x104e6*/ 1127,
+      /*0x01bf*/ 137,
+      /*0x03bb*/ 255,
+      /*0xa77f*/ 1026,
+      /*0x0266*/ 213,
+      /*0x0523*/ 432,
+      /*0x1e935*/ 1251,
+      /*0x1f7c*/ 748,
+      -1, -1,
+      /*0x24e6*/ 797,
+      -1,
+      /*0xa681*/ 972,
+      /*0x007a*/ 24,
+      -1,
+      /*0x104fa*/ 1147,
+      /*0x0505*/ 417,
+      /*0x1e92d*/ 1243,
+      /*0x017a*/ 114,
+      -1,
+      /*0xa7b5*/ 1044,
+      /*0x118c6*/ 1206,
+      -1, -1,
+      /*0x2d23*/ 944,
+      -1,
+      /*0x13c8*/ 517,
+      /*0x0448*/ 315,
+      /*0x04c8*/ 386,
+      -1,
+      /*0x10448*/ 1105,
+      /*0x2c46*/ 823,
+      /*0x10cd0*/ 1165,
+      /*0x1f03*/ 691,
+      /*0x0148*/ 90,
+      /*0x2d05*/ 914,
+      /*0x2184*/ 774,
+      /*0x118c4*/ 1204,
+      /*0x13d8*/ 533,
+      /*0x0458*/ 331,
+      /*0x03fb*/ 290,
+      /*0x13ec*/ 553,
+      /*0x1e923*/ 1233,
+      /*0x104d8*/ 1113,
+      /*0x006c*/ 10,
+      -1,
+      /*0x104ec*/ 1133,
+      /*0x2c44*/ 821,
+      /*0x10cce*/ 1163,
+      -1,
+      /*0x026c*/ 218,
+      /*0x2cec*/ 906,
+      -1,
+      /*0x24d8*/ 783,
+      /*0x049d*/ 365,
+      -1,
+      /*0xa7a3*/ 1040,
+      /*0xa77a*/ 1024,
+      /*0x1e1d*/ 579,
+      /*0x01f5*/ 160,
+      /*0x011d*/ 70,
+      /*0x021d*/ 179,
+      /*0x2c9d*/ 870,
+      -1,
+      /*0x2c3b*/ 812,
+      -1,
+      /*0x0527*/ 434,
+      /*0xa785*/ 1029,
+      -1,
+      /*0x10ccc*/ 1161,
+      /*0x1e93f*/ 1261,
+      -1,
+      /*0x01bd*/ 136,
+      /*0x13e8*/ 549,
+      -1, -1,
+      /*0x0068*/ 7,
+      /*0x10ce6*/ 1187,
+      /*0x104e8*/ 1129,
+      -1, -1,
+      /*0x0571*/ 455,
+      /*0x0268*/ 214,
+      /*0x01b9*/ 135,
+      /*0x13f0*/ 557,
+      /*0x2d27*/ 947,
+      /*0x1e931*/ 1247,
+      /*0x0070*/ 14,
+      /*0x24e8*/ 799,
+      /*0x104f0*/ 1137,
+      -1,
+      /*0x0575*/ 459,
+      -1, -1, -1,
+      /*0x13dc*/ 537,
+      /*0x045c*/ 335,
+      -1,
+      /*0x1e942*/ 1264,
+      -1,
+      /*0x104dc*/ 1117,
+      /*0x2171*/ 759,
+      -1,
+      /*0x1e927*/ 1237,
+      /*0x025c*/ 208,
+      /*0x0076*/ 20,
+      /*0x0183*/ 118,
+      /*0x104f6*/ 1143,
+      /*0x10cc8*/ 1157,
+      /*0x0287*/ 226,
+      /*0x24dc*/ 787,
+      /*0x2175*/ 763,
+      /*0x057c*/ 466,
+      /*0x13d6*/ 531,
+      /*0x0456*/ 329,
+      -1,
+      /*0x13e0*/ 541,
+      /*0xa7a7*/ 1042,
+      -1,
+      /*0x1f21*/ 703,
+      /*0x10cd8*/ 1173,
+      /*0x104e0*/ 1121,
+      /*0x0256*/ 204,
+      /*0x10cec*/ 1193,
+      /*0x052f*/ 438,
+      /*0x0260*/ 209,
+      /*0x03ce*/ 273,
+      /*0xa685*/ 974,
+      /*0x24d6*/ 781,
+      -1,
+      /*0x1f44*/ 722,
+      /*0x24e0*/ 791,
+      /*0x217c*/ 770,
+      /*0x13d4*/ 529,
+      /*0x0454*/ 327,
+      -1, -1,
+      /*0x1f72*/ 738,
+      /*0x0503*/ 416,
+      -1,
+      /*0x13ea*/ 551,
+      /*0x1e93d*/ 1259,
+      /*0x0254*/ 203,
+      /*0x006a*/ 8,
+      -1,
+      /*0x104ea*/ 1131,
+      -1,
+      /*0x03cc*/ 271,
+      /*0x24d4*/ 779,
+      /*0x026a*/ 216,
+      -1,
+      /*0xff46*/ 1052,
+      /*0x1e939*/ 1255,
+      /*0x13e4*/ 545,
+      /*0x1f15*/ 701,
+      /*0x10ce8*/ 1189,
+      /*0x0064*/ 3,
+      /*0x2d03*/ 912,
+      /*0x104e4*/ 1125,
+      /*0x13b6*/ 499,
+      /*0x0436*/ 297,
+      /*0x1e92f*/ 1245,
+      /*0x118d0*/ 1216,
+      /*0x10436*/ 1087,
+      -1, -1,
+      /*0x10cf0*/ 1197,
+      /*0xff44*/ 1050,
+      /*0x24e4*/ 795,
+      /*0x0078*/ 22,
+      /*0x0529*/ 435,
+      /*0x104f8*/ 1145,
+      /*0x2c50*/ 833,
+      -1,
+      /*0x1f13*/ 699,
+      -1,
+      /*0x00f3*/ 44,
+      /*0x10cdc*/ 1177,
+      /*0x118ce*/ 1214,
+      /*0x13ca*/ 519,
+      /*0x044a*/ 317,
+      /*0x04ca*/ 387,
+      -1,
+      /*0x1044a*/ 1107,
+      -1,
+      /*0x1f7b*/ 747,
+      /*0x03c8*/ 267,
+      /*0x01c6*/ 138,
+      /*0x2c4e*/ 831,
+      /*0xa783*/ 1028,
+      -1, -1,
+      /*0x01a1*/ 127,
+      /*0x00eb*/ 36,
+      /*0x052b*/ 436,
+      /*0x10cd6*/ 1171,
+      /*0x1f79*/ 745,
+      -1,
+      /*0x10ce0*/ 1181,
+      /*0x118cc*/ 1212,
+      /*0x13f4*/ 561,
+      /*0x13d2*/ 527,
+      /*0x0452*/ 325,
+      /*0x0074*/ 18,
+      -1,
+      /*0x104f4*/ 1141,
+      -1,
+      /*0x1e929*/ 1239,
+      /*0x1f7d*/ 749,
+      /*0x2c4c*/ 829,
+      /*0x0252*/ 201,
+      -1, -1, -1, -1,
+      /*0x10cd4*/ 1169,
+      /*0x24d2*/ 777,
+      /*0x2c66*/ 850,
+      -1,
+      /*0x13b0*/ 493,
+      /*0x0430*/ 291,
+      /*0xa7a9*/ 1043,
+      /*0x10cea*/ 1191,
+      /*0x10430*/ 1081,
+      /*0x0521*/ 431,
+      -1, -1,
+      /*0x0195*/ 123,
+      -1,
+      /*0x13e2*/ 543,
+      /*0x029d*/ 233,
+      /*0x1e92b*/ 1241,
+      /*0x0062*/ 1,
+      /*0x1f77*/ 743,
+      /*0x104e2*/ 1123,
+      /*0x10ce4*/ 1185,
+      /*0x1f07*/ 695,
+      -1,
+      /*0x118c8*/ 1208,
+      -1, -1, -1,
+      /*0x0572*/ 456,
+      /*0x2d21*/ 942,
+      /*0x24e2*/ 793,
+      /*0x1fb1*/ 751,
+      /*0x00ef*/ 40,
+      /*0x048d*/ 357,
+      /*0x2c48*/ 825,
+      /*0xa683*/ 973,
+      /*0x118d8*/ 1224,
+      /*0x1e0d*/ 571,
+      /*0x1e8d*/ 635,
+      /*0x010d*/ 62,
+      /*0x020d*/ 171,
+      /*0x2c8d*/ 862,
+      -1, -1,
+      /*0x01fb*/ 162,
+      /*0x0515*/ 425,
+      /*0x2c58*/ 841,
+      /*0x10cca*/ 1159,
+      /*0x2172*/ 760,
+      /*0x2c6c*/ 853,
+      /*0x00ed*/ 38,
+      -1,
+      /*0x13b4*/ 497,
+      /*0x0434*/ 295,
+      -1,
+      /*0x01f9*/ 161,
+      /*0x10434*/ 1085,
+      -1, -1, -1, -1,
+      /*0xa7a1*/ 1039,
+      -1, -1,
+      /*0x2d15*/ 930,
+      /*0x0513*/ 424,
+      -1,
+      /*0x01fd*/ 163,
+      -1,
+      /*0x10cd2*/ 1167,
+      /*0x1e09*/ 569,
+      /*0x1e89*/ 633,
+      /*0x0109*/ 60,
+      /*0x0209*/ 169,
+      /*0x2c89*/ 860,
+      /*0x1e93b*/ 1257,
+      /*0x057b*/ 465,
+      /*0x0199*/ 124,
+      /*0xff50*/ 1062,
+      -1,
+      /*0x13ee*/ 555,
+      /*0x2c68*/ 851,
+      -1,
+      /*0x006e*/ 12,
+      /*0x2d13*/ 928,
+      /*0x104ee*/ 1135,
+      /*0x1f66*/ 734,
+      /*0x0579*/ 463,
+      -1, -1,
+      /*0x2cee*/ 907,
+      -1, -1,
+      /*0x118dc*/ 1228,
+      /*0xff4e*/ 1060,
+      -1,
+      /*0x217b*/ 769,
+      /*0x10ce2*/ 1183,
+      -1,
+      /*0x057d*/ 467,
+      -1,
+      /*0x1f7a*/ 746,
+      -1,
+      /*0x2c5c*/ 845,
+      -1,
+      /*0x03b6*/ 250,
+      -1,
+      /*0x2179*/ 767,
+      -1,
+      /*0x0519*/ 427,
+      /*0x2c76*/ 855,
+      /*0x118d6*/ 1222,
+      /*0x03f8*/ 289,
+      -1,
+      /*0x01d0*/ 142,
+      /*0xff4c*/ 1058,
+      /*0xa793*/ 1033,
+      -1, -1,
+      /*0x217d*/ 771,
+      /*0x01ff*/ 164,
+      /*0x2c56*/ 839,
+      -1, -1,
+      /*0x0577*/ 461,
+      /*0x03ca*/ 269,
+      -1,
+      /*0x0507*/ 418,
+      /*0x2d19*/ 934,
+      /*0x049f*/ 366,
+      /*0x01ce*/ 141,
+      /*0x118d4*/ 1220,
+      -1,
+      /*0x1e1f*/ 580,
+      -1,
+      /*0x011f*/ 71,
+      /*0x021f*/ 180,
+      /*0x2c9f*/ 871,
+      -1, -1, -1,
+      /*0x2c54*/ 837,
+      /*0x13de*/ 539,
+      /*0x045e*/ 337,
+      /*0x2177*/ 765,
+      -1,
+      /*0x2d07*/ 916,
+      /*0x104de*/ 1119,
+      /*0x2c6a*/ 852,
+      -1, -1,
+      /*0x01cc*/ 140,
+      /*0x057f*/ 469,
+      -1,
+      /*0xff48*/ 1054,
+      -1,
+      /*0xa695*/ 982,
+      /*0x24de*/ 789,
+      -1, -1,
+      /*0xa799*/ 1035,
+      -1,
+      /*0x10cee*/ 1195,
+      -1, -1,
+      /*0x0517*/ 426,
+      /*0xff58*/ 1070,
+      /*0x2c36*/ 807,
+      -1, -1, -1, -1,
+      /*0x217f*/ 773,
+      -1, -1,
+      /*0x1f70*/ 736,
+      /*0xa693*/ 981,
+      /*0x118ca*/ 1210,
+      /*0xa787*/ 1030,
+      -1, -1, -1,
+      /*0x214e*/ 757,
+      -1,
+      /*0x2d17*/ 932,
+      -1, -1,
+      /*0x2c4a*/ 827,
+      /*0x13be*/ 507,
+      /*0x043e*/ 305,
+      -1,
+      /*0x0566*/ 444,
+      /*0x1043e*/ 1095,
+      /*0x1f76*/ 742,
+      -1, -1,
+      /*0x013e*/ 85,
+      -1, -1,
+      /*0x118d2*/ 1218,
+      /*0x13ba*/ 503,
+      /*0x043a*/ 301,
+      /*0x01d8*/ 146,
+      -1,
+      /*0x1043a*/ 1091,
+      -1,
+      /*0x057a*/ 464,
+      /*0x1f60*/ 728,
+      /*0x013a*/ 83,
+      /*0x2c52*/ 835,
+      -1, -1,
+      /*0x03b4*/ 248,
+      -1, -1, -1,
+      /*0xa797*/ 1034,
+      -1, -1, -1,
+      /*0xa699*/ 984,
+      -1, -1, -1,
+      /*0x10cde*/ 1179,
+      -1,
+      /*0x217a*/ 768,
+      /*0x2c30*/ 801,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x056c*/ 450,
+      /*0xa687*/ 975,
+      -1, -1,
+      /*0xff56*/ 1068,
+      /*0x0289*/ 228,
+      -1,
+      /*0x1f64*/ 732,
+      -1, -1, -1,
+      /*0x051d*/ 429,
+      -1,
+      /*0x1f36*/ 716,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1f78*/ 744,
+      -1,
+      /*0x01dc*/ 148,
+      -1,
+      /*0xff54*/ 1066,
+      -1,
+      /*0x00f1*/ 42,
+      -1, -1, -1,
+      /*0x2d1d*/ 938,
+      -1,
+      /*0x0568*/ 446,
+      -1, -1, -1,
+      /*0x00f5*/ 46,
+      /*0x2c34*/ 805,
+      -1,
+      /*0xa697*/ 983,
+      /*0x01d6*/ 145,
+      -1, -1,
+      /*0x0570*/ 454,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1f74*/ 740,
+      -1, -1,
+      /*0x00fc*/ 52,
+      -1, -1,
+      /*0x01d4*/ 144,
+      /*0x0576*/ 460,
+      /*0xa79d*/ 1037,
+      /*0x2170*/ 758,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff4a*/ 1056,
+      -1, -1,
+      /*0x1f30*/ 710,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2176*/ 764,
+      -1,
+      /*0x1f62*/ 730,
+      -1, -1,
+      /*0x01b6*/ 134,
+      -1, -1, -1, -1, -1,
+      /*0xff52*/ 1064,
+      -1, -1, -1, -1, -1, -1,
+      /*0x056a*/ 448,
+      -1, -1, -1, -1, -1,
+      /*0x1fd0*/ 752,
+      -1, -1, -1, -1, -1,
+      /*0x03be*/ 258,
+      /*0x0564*/ 442,
+      -1, -1, -1, -1,
+      /*0x118de*/ 1230,
+      -1, -1,
+      /*0x1f34*/ 714,
+      -1, -1,
+      /*0x03ba*/ 254,
+      -1,
+      /*0x0578*/ 462,
+      -1,
+      /*0x2c5e*/ 847,
+      /*0x01d2*/ 143,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x2178*/ 766,
+      /*0x01b0*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1e936*/ 1252,
+      -1, -1, -1,
+      /*0x0574*/ 458,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2c3e*/ 815,
+      -1, -1, -1, -1, -1,
+      /*0x2174*/ 762,
+      -1, -1, -1, -1, -1,
+      /*0x2c3a*/ 811,
+      -1,
+      /*0x00f2*/ 43,
+      /*0x0562*/ 440,
+      -1, -1, -1, -1,
+      /*0x01b4*/ 133,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x050d*/ 421,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1e930*/ 1246,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2d0d*/ 922,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x00fb*/ 51,
+      -1,
+      /*0x0509*/ 419,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x00f9*/ 49,
+      -1, -1, -1, -1, -1, -1,
+      /*0x056e*/ 452,
+      -1, -1,
+      /*0x2d09*/ 918,
+      -1,
+      /*0x00fd*/ 53,
+      -1, -1, -1,
+      /*0x1e934*/ 1250,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1fe0*/ 754,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x051f*/ 430,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00ff*/ 55,
+      -1, -1, -1,
+      /*0xa68d*/ 978,
+      -1, -1, -1,
+      /*0x2d1f*/ 940,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa689*/ 976,
+      -1,
+      /*0x00e6*/ 31,
+      /*0xa79f*/ 1038,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00fa*/ 50,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1fb0*/ 750,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00ec*/ 37,
+      -1,
+      /*0x1e93e*/ 1260,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1e93a*/ 1256,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x00e8*/ 33,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00f0*/ 41,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x00f6*/ 47,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00e0*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x00ea*/ 35,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00e4*/ 29,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00f8*/ 48,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00f4*/ 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,
+      /*0x00e2*/ 27,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00ee*/ 39
+    };
+
+  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(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/9.0.0/name2ctype.h b/enc/unicode/9.0.0/name2ctype.h
new file mode 100644
index 0000000000..5f4dcfd034
--- /dev/null
+++ b/enc/unicode/9.0.0/name2ctype.h
@@ -0,0 +1,35389 @@
+/* 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[] = {
+	644,
+	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,
+	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,
+	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,
+	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,
+	0x0d01, 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,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	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,
+	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, 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,
+	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,
+	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,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	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[] = {
+	54,
+	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,
+	0x11450, 0x11459,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x11730, 0x11739,
+	0x118e0, 0x118e9,
+	0x11c50, 0x11c59,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x1d7ce, 0x1d7ff,
+	0x1e950, 0x1e959,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	643,
+	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,
+	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, 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, 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,
+	0x200b, 0x2027,
+	0x202a, 0x202e,
+	0x2030, 0x205e,
+	0x2060, 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,
+	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, 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,
+	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,
+	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,
+	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[] = {
+	640,
+	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,
+	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,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab65,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	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,
+	0x1e922, 0x1e943,
+}; /* CR_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	640,
+	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,
+	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, 0x2027,
+	0x202a, 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,
+	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,
+	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,
+	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[] = {
+	168,
+	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, 0x2e44,
+	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,
+	0x1144b, 0x1144f,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115d7,
+	0x11641, 0x11643,
+	0x11660, 0x1166c,
+	0x1173c, 0x1173e,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* 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[] = {
+	632,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	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,
+	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[] = {
+	679,
+	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,
+	0x08b6, 0x08bd,
+	0x08d4, 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,
+	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,
+	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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 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,
+	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,
+	0x1c80, 0x1c88,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 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, 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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	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,
+	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, 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,
+	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,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	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,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	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,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	678,
+	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,
+	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,
+	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,
+	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,
+	0x0d01, 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,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	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,
+	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, 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,
+	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,
+	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,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	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,
+	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[] = {
+	638,
+	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,
+	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,
+	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,
+	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[] = {
+	642,
+	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, 0x08b5,
+	0x08be, 0x08d3,
+	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,
+	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,
+	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,
+	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, 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,
+	0x1c89, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 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,
+	0x20bf, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x23ff, 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,
+	0x2e45, 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,
+	0xa7af, 0xa7af,
+	0xa7b8, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 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,
+	0x1018f, 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, 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,
+	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,
+	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, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x1145e, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171a, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 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, 0x16fdf,
+	0x16fe1, 0x16fff,
+	0x187ed, 0x187ff,
+	0x18af3, 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, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94b, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 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,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f6d3, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f7, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f90f,
+	0x1f91f, 0x1f91f,
+	0x1f928, 0x1f92f,
+	0x1f931, 0x1f932,
+	0x1f93f, 0x1f93f,
+	0x1f94c, 0x1f94f,
+	0x1f95f, 0x1f97f,
+	0x1f992, 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[] = {
+	18,
+	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,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	638,
+	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, 0x08b5,
+	0x08be, 0x08d3,
+	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,
+	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,
+	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, 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,
+	0x1c89, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 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,
+	0x20bf, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x23ff, 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,
+	0x2e45, 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,
+	0xa7af, 0xa7af,
+	0xa7b8, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 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,
+	0x1018f, 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, 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,
+	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,
+	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, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x1145e, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171a, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 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, 0x16fdf,
+	0x16fe1, 0x16fff,
+	0x187ed, 0x187ff,
+	0x18af3, 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, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94b, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 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,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f6d3, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f7, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f90f,
+	0x1f91f, 0x1f91f,
+	0x1f928, 0x1f92f,
+	0x1f931, 0x1f932,
+	0x1f93f, 0x1f93f,
+	0x1f94c, 0x1f94f,
+	0x1f95f, 0x1f97f,
+	0x1f992, 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[] = {
+	571,
+	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,
+	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,
+	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,
+	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, 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,
+	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, 0xa7ae,
+	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,
+	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, 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,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x11700, 0x11719,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e900, 0x1e943,
+	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[] = {
+	126,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab65,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	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,
+	0x1e900, 0x1e943,
+}; /* CR_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	633,
+	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,
+	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,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab65,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	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,
+	0x1e922, 0x1e943,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	57,
+	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, 0x16fe0,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	445,
+	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,
+	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,
+	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,
+	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, 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, 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,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x11700, 0x11719,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x12000, 0x12399,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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[] = {
+	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,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	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,
+	0x1e900, 0x1e921,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	250,
+	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,
+	0x08d4, 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,
+	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,
+	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,
+	0x1cf2, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df5,
+	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,
+	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,
+	0x1123e, 0x1123e,
+	0x112df, 0x112ea,
+	0x11300, 0x11303,
+	0x1133c, 0x1133c,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11435, 0x11446,
+	0x114b0, 0x114c3,
+	0x115af, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11630, 0x11640,
+	0x116ab, 0x116b7,
+	0x1171d, 0x1172b,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	155,
+	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,
+	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,
+	0x11c2f, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	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[] = {
+	285,
+	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,
+	0x08d4, 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,
+	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,
+	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, 0x1df5,
+	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,
+	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,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133c, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	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,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	115,
+	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, 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,
+	0x11450, 0x11459,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x11730, 0x1173b,
+	0x118e0, 0x118f2,
+	0x11c50, 0x11c6c,
+	0x12400, 0x1246e,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1e8c7, 0x1e8cf,
+	0x1e950, 0x1e959,
+	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[] = {
+	60,
+	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, 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,
+	0x11c5a, 0x11c6c,
+	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[] = {
+	165,
+	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,
+	0x2e43, 0x2e44,
+	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,
+	0x1144b, 0x1144f,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115d7,
+	0x11641, 0x11643,
+	0x11660, 0x1166c,
+	0x1173c, 0x1173e,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	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[] = {
+	218,
+	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,
+	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,
+	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, 0x23fe,
+	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, 0x1018e,
+	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, 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,
+}; /* 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[] = {
+	174,
+	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,
+	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, 0x23fe,
+	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, 0x1018e,
+	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, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f3fa,
+	0x1f400, 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,
+}; /* 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[] = {
+	135,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab65,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	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,
+	0x1e900, 0x1e943,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	365,
+	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,
+	0x08d4, 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,
+	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, 0x1df5,
+	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,
+	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,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133c, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	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,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe0,
+	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,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0x1f3fb, 0x1f3ff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	590,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	607,
+	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,
+	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,
+	0x1c80, 0x1c88,
+	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,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	608,
+	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,
+	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,
+	0x1c80, 0x1c88,
+	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,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	603,
+	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,
+	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,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	116,
+	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,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x1e900, 0x1e943,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	571,
+	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,
+	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,
+	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,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	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,
+	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, 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,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x11700, 0x11719,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e900, 0x1e943,
+	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[] = {
+	676,
+	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,
+	0x08b6, 0x08bd,
+	0x08d4, 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,
+	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,
+	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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 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,
+	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,
+	0x1c80, 0x1c88,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 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, 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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	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,
+	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, 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,
+	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,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	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,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	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,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	578,
+	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,
+	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,
+	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,
+	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,
+	0x1c80, 0x1c88,
+	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, 0xa7ae,
+	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,
+	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, 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,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x11700, 0x11719,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e900, 0x1e943,
+	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[] = {
+	683,
+	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,
+	0x08b6, 0x08bd,
+	0x08d4, 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,
+	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,
+	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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 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,
+	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,
+	0x1c80, 0x1c88,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 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, 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, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	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,
+	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, 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,
+	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,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	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,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	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,
+	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[] = {
+	303,
+	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,
+	0x08d4, 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,
+	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,
+	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, 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,
+	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,
+	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,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133c, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	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,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	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,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	772,
+	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,
+	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, 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, 0x0c80,
+	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, 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,
+	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, 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,
+	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, 0x1c88,
+	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, 0x23fe,
+	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, 0x2e44,
+	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, 0xa7ae,
+	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, 0x1018e,
+	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,
+	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, 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,
+	0x11400, 0x11437,
+	0x11440, 0x11441,
+	0x11445, 0x11445,
+	0x11447, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	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,
+	0x116c0, 0x116c9,
+	0x11700, 0x11719,
+	0x11720, 0x11721,
+	0x11726, 0x11726,
+	0x11730, 0x1173f,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11c40, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	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,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	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,
+	0x1e900, 0x1e943,
+	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,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	43,
+	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,
+	0x11442, 0x11442,
+	0x114c2, 0x114c2,
+	0x115bf, 0x115bf,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b6,
+	0x1172b, 0x1172b,
+	0x11c3f, 0x11c3f,
+}; /* 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,
+	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, 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, 0x23fe,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x27ff,
+	0x2900, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2bec, 0x2bef,
+	0x2e00, 0x2e44,
+	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, 0x1f1ac,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 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,
+	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, 0xa7ae,
+	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, 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[] = {
+	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[] = {
+	56,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 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[] = {
+	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,
+	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,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	9,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 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[] = {
+	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[] = {
+	7,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x11660, 0x1166c,
+}; /* 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,
+	0x1dfb, 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[] = {
+	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, 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, 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[] = {
+	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, 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, 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 */
+
+/* 'Adlam': Script */
+static const OnigCodePoint CR_Adlam[] = {
+	3,
+	0x1e900, 0x1e94a,
+	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, 0x1145d,
+}; /* 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, 0x187ec,
+	0x18800, 0x18af2,
+}; /* CR_Tangut */
+
+/* '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[] = {
+	94,
+	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,
+	0x1144b, 0x1144d,
+	0x1145b, 0x1145b,
+	0x115c2, 0x115c5,
+	0x115c9, 0x115d7,
+	0x11641, 0x11642,
+	0x1173c, 0x1173e,
+	0x11c41, 0x11c43,
+	0x11c71, 0x11c71,
+	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[] = {
+	194,
+	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,
+	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,
+	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, 0x1c35,
+	0x1cf2, 0x1cf3,
+	0x1de7, 0x1df4,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69e, 0xa69f,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	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,
+	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,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x16b30, 0x16b36,
+	0x16f51, 0x16f7e,
+	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[] = {
+	14,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fd5,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	152,
+	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,
+	0x11442, 0x11442,
+	0x11446, 0x11446,
+	0x114c2, 0x114c3,
+	0x115bf, 0x115c0,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b7,
+	0x1172b, 0x1172b,
+	0x11c3f, 0x11c3f,
+	0x16af0, 0x16af4,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e946,
+	0x1e948, 0x1e94a,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	28,
+	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,
+	0x16fe0, 0x16fe0,
+	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[] = {
+	23,
+	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, 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[] = {
+	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[] = {
+	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[] = {
+	66,
+	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,
+	0x1144b, 0x1144c,
+	0x115c2, 0x115c3,
+	0x115c9, 0x115d7,
+	0x11641, 0x11642,
+	0x1173c, 0x1173e,
+	0x11c41, 0x11c42,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b38,
+	0x16b44, 0x16b44,
+	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[] = {
+	5,
+	0x0600, 0x0605,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x110bd, 0x110bd,
+}; /* CR_Prepended_Concatenation_Mark */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	636,
+	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, 0x08b5,
+	0x08be, 0x08d3,
+	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,
+	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,
+	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, 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,
+	0x1c89, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 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,
+	0x20bf, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x23ff, 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,
+	0x2e45, 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,
+	0xa7af, 0xa7af,
+	0xa7b8, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 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,
+	0x1018f, 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, 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,
+	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,
+	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, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x1145e, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171a, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 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, 0x16fdf,
+	0x16fe1, 0x16fff,
+	0x187ed, 0x187ff,
+	0x18af3, 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, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94b, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 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,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f6d3, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f7, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f90f,
+	0x1f91f, 0x1f91f,
+	0x1f928, 0x1f92f,
+	0x1f931, 0x1f932,
+	0x1f93f, 0x1f93f,
+	0x1f94c, 0x1f94f,
+	0x1f95f, 0x1f97f,
+	0x1f992, 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 */
+
+/* '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 */
+
+#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_Cyrillic_Extended_C': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_C[] = {
+	1,
+	0x1c80, 0x1c8f,
+}; /* CR_In_Cyrillic_Extended_C */
+
+/* '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_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_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_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_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_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_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_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_Glagolitic_Supplement': Block */
+static const OnigCodePoint CR_In_Glagolitic_Supplement[] = {
+	1,
+	0x1e000, 0x1e02f,
+}; /* CR_In_Glagolitic_Supplement */
+
+/* '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_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[] = {
+	44,
+	0x0860, 0x089f,
+	0x1c90, 0x1cbf,
+	0x2fe0, 0x2fef,
+	0x10200, 0x1027f,
+	0x103e0, 0x103ff,
+	0x10570, 0x105ff,
+	0x10780, 0x107ff,
+	0x108b0, 0x108df,
+	0x10940, 0x1097f,
+	0x10aa0, 0x10abf,
+	0x10bb0, 0x10bff,
+	0x10c50, 0x10c7f,
+	0x10d00, 0x10e5f,
+	0x10e80, 0x10fff,
+	0x11250, 0x1127f,
+	0x11380, 0x113ff,
+	0x114e0, 0x1157f,
+	0x116d0, 0x116ff,
+	0x11740, 0x1189f,
+	0x11900, 0x11abf,
+	0x11b00, 0x11bff,
+	0x11cc0, 0x11fff,
+	0x12550, 0x12fff,
+	0x13430, 0x143ff,
+	0x14680, 0x167ff,
+	0x16a70, 0x16acf,
+	0x16b90, 0x16eff,
+	0x16fa0, 0x16fdf,
+	0x18b00, 0x1afff,
+	0x1b100, 0x1bbff,
+	0x1bcb0, 0x1cfff,
+	0x1d250, 0x1d2ff,
+	0x1d380, 0x1d3ff,
+	0x1dab0, 0x1dfff,
+	0x1e030, 0x1e7ff,
+	0x1e8e0, 0x1e8ff,
+	0x1e960, 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_Adlam,
+  CR_Bhaiksuki,
+  CR_Marchen,
+  CR_Newa,
+  CR_Osage,
+  CR_Tangut,
+  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_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,
+#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_Cyrillic_Extended_C,
+  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_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_Newa,
+  CR_In_Tirhuta,
+  CR_In_Siddham,
+  CR_In_Modi,
+  CR_In_Mongolian_Supplement,
+  CR_In_Takri,
+  CR_In_Ahom,
+  CR_In_Warang_Citi,
+  CR_In_Pau_Cin_Hau,
+  CR_In_Bhaiksuki,
+  CR_In_Marchen,
+  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_Ideographic_Symbols_and_Punctuation,
+  CR_In_Tangut,
+  CR_In_Tangut_Components,
+  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_Glagolitic_Supplement,
+  CR_In_Mende_Kikakui,
+  CR_In_Adlam,
+  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 735
+#else /* USE_UNICODE_AGE_PROPERTIES */
+#define TOTAL_KEYWORDS 753
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 44
+#define MIN_HASH_VALUE 3
+#define MAX_HASH_VALUE 4563
+/* maximum key range = 4561, 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 */
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      4564, 4564, 4564, 4564, 4564, 4564,    1, 4564,   13,    1,
+         2,   12,    8,   16,   10,   19,   17,   11, 4564, 4564,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564, 4564,
+      4564, 4564, 4564, 4564, 4564, 4564, 4564,   13, 1303,   20,
+       497,   25,   58,  891,  322,    4,   30, 1489,  169,    7,
+         1,  267,  633,    1,  214,   40,   92,  950,  713,  277,
+       105, 1264,   18, 4564, 4564, 4564, 4564, 4564
+#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_str24[sizeof("cn")];
+    char uniname2ctype_pool_str29[sizeof("mani")];
+    char uniname2ctype_pool_str30[sizeof("ci")];
+    char uniname2ctype_pool_str31[sizeof("inmanichaean")];
+    char uniname2ctype_pool_str35[sizeof("qaai")];
+    char uniname2ctype_pool_str37[sizeof("z")];
+    char uniname2ctype_pool_str41[sizeof("c")];
+    char uniname2ctype_pool_str49[sizeof("mc")];
+    char uniname2ctype_pool_str51[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_str76[sizeof("zzzz")];
+    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_str93[sizeof("inavestan")];
+    char uniname2ctype_pool_str100[sizeof("zs")];
+    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_str132[sizeof("mtei")];
+    char uniname2ctype_pool_str138[sizeof("cf")];
+    char uniname2ctype_pool_str140[sizeof("inspecials")];
+    char uniname2ctype_pool_str141[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str144[sizeof("inthaana")];
+    char uniname2ctype_pool_str145[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str152[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str159[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str164[sizeof("taile")];
+    char uniname2ctype_pool_str174[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str176[sizeof("sterm")];
+    char uniname2ctype_pool_str185[sizeof("lm")];
+    char uniname2ctype_pool_str191[sizeof("lina")];
+    char uniname2ctype_pool_str199[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str200[sizeof("lana")];
+    char uniname2ctype_pool_str201[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str202[sizeof("alnum")];
+    char uniname2ctype_pool_str207[sizeof("inlycian")];
+    char uniname2ctype_pool_str208[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str209[sizeof("intaitham")];
+    char uniname2ctype_pool_str211[sizeof("lc")];
+    char uniname2ctype_pool_str212[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str213[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str214[sizeof("inadlam")];
+    char uniname2ctype_pool_str220[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str222[sizeof("inlineara")];
+    char uniname2ctype_pool_str237[sizeof("taiviet")];
+    char uniname2ctype_pool_str239[sizeof("armn")];
+    char uniname2ctype_pool_str242[sizeof("armi")];
+    char uniname2ctype_pool_str247[sizeof("sinhala")];
+    char uniname2ctype_pool_str248[sizeof("armenian")];
+    char uniname2ctype_pool_str249[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str251[sizeof("inrunic")];
+    char uniname2ctype_pool_str252[sizeof("incarian")];
+    char uniname2ctype_pool_str255[sizeof("cari")];
+    char uniname2ctype_pool_str256[sizeof("inmarchen")];
+    char uniname2ctype_pool_str258[sizeof("marc")];
+    char uniname2ctype_pool_str268[sizeof("carian")];
+    char uniname2ctype_pool_str270[sizeof("merc")];
+    char uniname2ctype_pool_str273[sizeof("incyrillic")];
+    char uniname2ctype_pool_str274[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str278[sizeof("samr")];
+    char uniname2ctype_pool_str279[sizeof("latn")];
+    char uniname2ctype_pool_str281[sizeof("latin")];
+    char uniname2ctype_pool_str282[sizeof("ital")];
+    char uniname2ctype_pool_str284[sizeof("intamil")];
+    char uniname2ctype_pool_str285[sizeof("taml")];
+    char uniname2ctype_pool_str286[sizeof("inmultani")];
+    char uniname2ctype_pool_str288[sizeof("samaritan")];
+    char uniname2ctype_pool_str290[sizeof("arabic")];
+    char uniname2ctype_pool_str291[sizeof("insyriac")];
+    char uniname2ctype_pool_str294[sizeof("insharada")];
+    char uniname2ctype_pool_str295[sizeof("miao")];
+    char uniname2ctype_pool_str296[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str299[sizeof("incherokee")];
+    char uniname2ctype_pool_str302[sizeof("intaile")];
+    char uniname2ctype_pool_str303[sizeof("tale")];
+    char uniname2ctype_pool_str305[sizeof("inahom")];
+    char uniname2ctype_pool_str309[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str310[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str313[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str314[sizeof("inosmanya")];
+    char uniname2ctype_pool_str315[sizeof("innewa")];
+    char uniname2ctype_pool_str317[sizeof("ext")];
+    char uniname2ctype_pool_str320[sizeof("newa")];
+    char uniname2ctype_pool_str327[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str328[sizeof("cwcm")];
+    char uniname2ctype_pool_str331[sizeof("osma")];
+    char uniname2ctype_pool_str337[sizeof("inlatinextendede")];
+    char uniname2ctype_pool_str339[sizeof("l")];
+    char uniname2ctype_pool_str340[sizeof("han")];
+    char uniname2ctype_pool_str341[sizeof("nl")];
+    char uniname2ctype_pool_str342[sizeof("term")];
+    char uniname2ctype_pool_str344[sizeof("hani")];
+    char uniname2ctype_pool_str346[sizeof("joinc")];
+    char uniname2ctype_pool_str347[sizeof("inideographicsymbolsandpunctuation")];
+    char uniname2ctype_pool_str349[sizeof("zinh")];
+    char uniname2ctype_pool_str354[sizeof("newtailue")];
+    char uniname2ctype_pool_str355[sizeof("lt")];
+    char uniname2ctype_pool_str358[sizeof("zl")];
+    char uniname2ctype_pool_str361[sizeof("inmahajani")];
+    char uniname2ctype_pool_str366[sizeof("cham")];
+    char uniname2ctype_pool_str368[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str371[sizeof("sinh")];
+    char uniname2ctype_pool_str374[sizeof("manichaean")];
+    char uniname2ctype_pool_str375[sizeof("osage")];
+    char uniname2ctype_pool_str376[sizeof("mahj")];
+    char uniname2ctype_pool_str379[sizeof("cwcf")];
+    char uniname2ctype_pool_str382[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str386[sizeof("inethiopic")];
+    char uniname2ctype_pool_str390[sizeof("insinhala")];
+    char uniname2ctype_pool_str394[sizeof("chakma")];
+    char uniname2ctype_pool_str397[sizeof("mahajani")];
+    char uniname2ctype_pool_str400[sizeof("shavian")];
+    char uniname2ctype_pool_str410[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str411[sizeof("innewtailue")];
+    char uniname2ctype_pool_str419[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str421[sizeof("lineara")];
+    char uniname2ctype_pool_str422[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str435[sizeof("thai")];
+    char uniname2ctype_pool_str438[sizeof("math")];
+    char uniname2ctype_pool_str440[sizeof("inemoticons")];
+    char uniname2ctype_pool_str444[sizeof("thaa")];
+    char uniname2ctype_pool_str447[sizeof("ethi")];
+    char uniname2ctype_pool_str448[sizeof("hatran")];
+    char uniname2ctype_pool_str452[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str453[sizeof("sentenceterminal")];
+    char uniname2ctype_pool_str455[sizeof("tamil")];
+    char uniname2ctype_pool_str456[sizeof("cntrl")];
+    char uniname2ctype_pool_str458[sizeof("taitham")];
+    char uniname2ctype_pool_str460[sizeof("thaana")];
+    char uniname2ctype_pool_str468[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str469[sizeof("ahex")];
+    char uniname2ctype_pool_str471[sizeof("insinhalaarchaicnumbers")];
+    char uniname2ctype_pool_str478[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str484[sizeof("cwt")];
+    char uniname2ctype_pool_str489[sizeof("loe")];
+    char uniname2ctype_pool_str491[sizeof("intifinagh")];
+    char uniname2ctype_pool_str498[sizeof("tifinagh")];
+    char uniname2ctype_pool_str503[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str504[sizeof("inearlydynasticcuneiform")];
+    char uniname2ctype_pool_str507[sizeof("di")];
+    char uniname2ctype_pool_str508[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str509[sizeof("ll")];
+    char uniname2ctype_pool_str512[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str513[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str516[sizeof("oriya")];
+    char uniname2ctype_pool_str517[sizeof("mero")];
+    char uniname2ctype_pool_str521[sizeof("wara")];
+    char uniname2ctype_pool_str522[sizeof("mand")];
+    char uniname2ctype_pool_str523[sizeof("inmodi")];
+    char uniname2ctype_pool_str529[sizeof("inwarangciti")];
+    char uniname2ctype_pool_str530[sizeof("dia")];
+    char uniname2ctype_pool_str534[sizeof("mend")];
+    char uniname2ctype_pool_str537[sizeof("no")];
+    char uniname2ctype_pool_str538[sizeof("sora")];
+    char uniname2ctype_pool_str539[sizeof("inmandaic")];
+    char uniname2ctype_pool_str544[sizeof("idc")];
+    char uniname2ctype_pool_str545[sizeof("innko")];
+    char uniname2ctype_pool_str546[sizeof("sind")];
+    char uniname2ctype_pool_str547[sizeof("inarrows")];
+    char uniname2ctype_pool_str551[sizeof("inmro")];
+    char uniname2ctype_pool_str554[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str556[sizeof("co")];
+    char uniname2ctype_pool_str557[sizeof("hira")];
+    char uniname2ctype_pool_str559[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str560[sizeof("hex")];
+    char uniname2ctype_pool_str565[sizeof("inmiao")];
+    char uniname2ctype_pool_str569[sizeof("common")];
+    char uniname2ctype_pool_str576[sizeof("so")];
+    char uniname2ctype_pool_str577[sizeof("inhiragana")];
+    char uniname2ctype_pool_str579[sizeof("insundanese")];
+    char uniname2ctype_pool_str584[sizeof("ids")];
+    char uniname2ctype_pool_str585[sizeof("cher")];
+    char uniname2ctype_pool_str587[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str589[sizeof("marchen")];
+    char uniname2ctype_pool_str591[sizeof("indominotiles")];
+    char uniname2ctype_pool_str607[sizeof("hano")];
+    char uniname2ctype_pool_str613[sizeof("ahom")];
+    char uniname2ctype_pool_str621[sizeof("inogham")];
+    char uniname2ctype_pool_str622[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str627[sizeof("inolchiki")];
+    char uniname2ctype_pool_str630[sizeof("xidc")];
+    char uniname2ctype_pool_str636[sizeof("tirh")];
+    char uniname2ctype_pool_str637[sizeof("idst")];
+    char uniname2ctype_pool_str638[sizeof("cwl")];
+    char uniname2ctype_pool_str642[sizeof("inhatran")];
+    char uniname2ctype_pool_str643[sizeof("pi")];
+    char uniname2ctype_pool_str645[sizeof("hatr")];
+    char uniname2ctype_pool_str649[sizeof("idcontinue")];
+    char uniname2ctype_pool_str650[sizeof("xids")];
+    char uniname2ctype_pool_str655[sizeof("intirhuta")];
+    char uniname2ctype_pool_str656[sizeof("shaw")];
+    char uniname2ctype_pool_str662[sizeof("inshorthandformatcontrols")];
+    char uniname2ctype_pool_str664[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str668[sizeof("indeseret")];
+    char uniname2ctype_pool_str670[sizeof("pcm")];
+    char uniname2ctype_pool_str675[sizeof("pc")];
+    char uniname2ctype_pool_str684[sizeof("inlydian")];
+    char uniname2ctype_pool_str685[sizeof("pe")];
+    char uniname2ctype_pool_str688[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str690[sizeof("adlm")];
+    char uniname2ctype_pool_str693[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str698[sizeof("adlam")];
+    char uniname2ctype_pool_str703[sizeof("whitespace")];
+    char uniname2ctype_pool_str705[sizeof("lo")];
+    char uniname2ctype_pool_str712[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str713[sizeof("inlao")];
+    char uniname2ctype_pool_str715[sizeof("ps")];
+    char uniname2ctype_pool_str717[sizeof("anatolianhieroglyphs")];
+    char uniname2ctype_pool_str719[sizeof("lao")];
+    char uniname2ctype_pool_str720[sizeof("laoo")];
+    char uniname2ctype_pool_str721[sizeof("mongolian")];
+    char uniname2ctype_pool_str731[sizeof("invai")];
+    char uniname2ctype_pool_str733[sizeof("lineseparator")];
+    char uniname2ctype_pool_str737[sizeof("vai")];
+    char uniname2ctype_pool_str738[sizeof("vaii")];
+    char uniname2ctype_pool_str741[sizeof("space")];
+    char uniname2ctype_pool_str742[sizeof("format")];
+    char uniname2ctype_pool_str745[sizeof("letter")];
+    char uniname2ctype_pool_str751[sizeof("pf")];
+    char uniname2ctype_pool_str758[sizeof("mro")];
+    char uniname2ctype_pool_str759[sizeof("mroo")];
+    char uniname2ctype_pool_str761[sizeof("diacritic")];
+    char uniname2ctype_pool_str768[sizeof("joincontrol")];
+    char uniname2ctype_pool_str773[sizeof("java")];
+    char uniname2ctype_pool_str774[sizeof("inanatolianhieroglyphs")];
+    char uniname2ctype_pool_str775[sizeof("odi")];
+    char uniname2ctype_pool_str776[sizeof("nchar")];
+    char uniname2ctype_pool_str778[sizeof("incoptic")];
+    char uniname2ctype_pool_str779[sizeof("modi")];
+    char uniname2ctype_pool_str781[sizeof("inshavian")];
+    char uniname2ctype_pool_str792[sizeof("oidc")];
+    char uniname2ctype_pool_str795[sizeof("vs")];
+    char uniname2ctype_pool_str796[sizeof("injavanese")];
+    char uniname2ctype_pool_str797[sizeof("ideo")];
+    char uniname2ctype_pool_str800[sizeof("xdigit")];
+    char uniname2ctype_pool_str803[sizeof("oalpha")];
+    char uniname2ctype_pool_str804[sizeof("inolditalic")];
+    char uniname2ctype_pool_str811[sizeof("xidstart")];
+    char uniname2ctype_pool_str812[sizeof("oids")];
+    char uniname2ctype_pool_str814[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str815[sizeof("javanese")];
+    char uniname2ctype_pool_str823[sizeof("patws")];
+    char uniname2ctype_pool_str826[sizeof("palm")];
+    char uniname2ctype_pool_str834[sizeof("psalterpahlavi")];
+    char uniname2ctype_pool_str837[sizeof("incopticepactnumbers")];
+    char uniname2ctype_pool_str846[sizeof("alpha")];
+    char uniname2ctype_pool_str847[sizeof("dsrt")];
+    char uniname2ctype_pool_str848[sizeof("inlepcha")];
+    char uniname2ctype_pool_str850[sizeof("inpalmyrene")];
+    char uniname2ctype_pool_str851[sizeof("lepc")];
+    char uniname2ctype_pool_str862[sizeof("avst")];
+    char uniname2ctype_pool_str864[sizeof("avestan")];
+    char uniname2ctype_pool_str865[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str866[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str867[sizeof("idstart")];
+    char uniname2ctype_pool_str876[sizeof("dash")];
+    char uniname2ctype_pool_str877[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str878[sizeof("hanunoo")];
+    char uniname2ctype_pool_str883[sizeof("perm")];
+    char uniname2ctype_pool_str884[sizeof("incyrillicextendedc")];
+    char uniname2ctype_pool_str890[sizeof("siddham")];
+    char uniname2ctype_pool_str892[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str896[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str900[sizeof("deseret")];
+    char uniname2ctype_pool_str904[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str905[sizeof("sharada")];
+    char uniname2ctype_pool_str910[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str914[sizeof("tavt")];
+    char uniname2ctype_pool_str915[sizeof("intaiviet")];
+    char uniname2ctype_pool_str916[sizeof("inmongolian")];
+    char uniname2ctype_pool_str922[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str932[sizeof("ingrantha")];
+    char uniname2ctype_pool_str933[sizeof("radical")];
+    char uniname2ctype_pool_str936[sizeof("omath")];
+    char uniname2ctype_pool_str937[sizeof("canadianaboriginal")];
+#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_str942[sizeof("extender")];
+    char uniname2ctype_pool_str943[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str944[sizeof("inphoenician")];
+    char uniname2ctype_pool_str945[sizeof("control")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str946[sizeof("age=4.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str947[sizeof("prti")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str948[sizeof("age=6.1")];
+    char uniname2ctype_pool_str949[sizeof("age=6.2")];
+    char uniname2ctype_pool_str950[sizeof("age=3.1")];
+    char uniname2ctype_pool_str951[sizeof("age=3.2")];
+    char uniname2ctype_pool_str952[sizeof("age=2.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str953[sizeof("ingujarati")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str954[sizeof("age=5.1")];
+    char uniname2ctype_pool_str955[sizeof("age=5.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str956[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str957[sizeof("ingeneralpunctuation")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str958[sizeof("age=4.0")];
+    char uniname2ctype_pool_str959[sizeof("age=6.3")];
+    char uniname2ctype_pool_str960[sizeof("age=6.0")];
+    char uniname2ctype_pool_str961[sizeof("age=9.0")];
+    char uniname2ctype_pool_str962[sizeof("age=3.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str963[sizeof("cprt")];
+    char uniname2ctype_pool_str964[sizeof("casedletter")];
+    char uniname2ctype_pool_str965[sizeof("letternumber")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str966[sizeof("age=5.0")];
+    char uniname2ctype_pool_str967[sizeof("age=8.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str968[sizeof("otheralphabetic")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str969[sizeof("age=7.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str970[sizeof("coptic")];
+    char uniname2ctype_pool_str981[sizeof("lowercase")];
+    char uniname2ctype_pool_str990[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str991[sizeof("privateuse")];
+    char uniname2ctype_pool_str993[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str995[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str997[sizeof("nd")];
+    char uniname2ctype_pool_str1001[sizeof("tang")];
+    char uniname2ctype_pool_str1012[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str1015[sizeof("inoldnortharabian")];
+    char uniname2ctype_pool_str1016[sizeof("copt")];
+    char uniname2ctype_pool_str1026[sizeof("wspace")];
+    char uniname2ctype_pool_str1029[sizeof("incaucasianalbanian")];
+    char uniname2ctype_pool_str1031[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str1034[sizeof("xpeo")];
+    char uniname2ctype_pool_str1036[sizeof("sd")];
+    char uniname2ctype_pool_str1038[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str1039[sizeof("sundanese")];
+    char uniname2ctype_pool_str1040[sizeof("print")];
+    char uniname2ctype_pool_str1042[sizeof("sidd")];
+    char uniname2ctype_pool_str1046[sizeof("tfng")];
+    char uniname2ctype_pool_str1047[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str1049[sizeof("cuneiform")];
+    char uniname2ctype_pool_str1051[sizeof("inherited")];
+    char uniname2ctype_pool_str1053[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str1054[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str1055[sizeof("insiddham")];
+    char uniname2ctype_pool_str1056[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str1064[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str1065[sizeof("phnx")];
+    char uniname2ctype_pool_str1067[sizeof("olditalic")];
+    char uniname2ctype_pool_str1069[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str1071[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str1072[sizeof("cased")];
+    char uniname2ctype_pool_str1074[sizeof("intags")];
+    char uniname2ctype_pool_str1077[sizeof("shrd")];
+    char uniname2ctype_pool_str1078[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str1079[sizeof("saurashtra")];
+    char uniname2ctype_pool_str1089[sizeof("intangut")];
+    char uniname2ctype_pool_str1095[sizeof("otheridstart")];
+    char uniname2ctype_pool_str1102[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str1107[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str1108[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str1110[sizeof("inoldhungarian")];
+    char uniname2ctype_pool_str1111[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str1114[sizeof("other")];
+    char uniname2ctype_pool_str1115[sizeof("othersymbol")];
+    char uniname2ctype_pool_str1116[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str1118[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str1121[sizeof("othernumber")];
+    char uniname2ctype_pool_str1123[sizeof("gran")];
+    char uniname2ctype_pool_str1131[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str1132[sizeof("phli")];
+    char uniname2ctype_pool_str1140[sizeof("rjng")];
+    char uniname2ctype_pool_str1142[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str1145[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str1146[sizeof("lower")];
+    char uniname2ctype_pool_str1148[sizeof("separator")];
+    char uniname2ctype_pool_str1151[sizeof("multani")];
+    char uniname2ctype_pool_str1153[sizeof("modifierletter")];
+    char uniname2ctype_pool_str1161[sizeof("inrejang")];
+    char uniname2ctype_pool_str1162[sizeof("olower")];
+    char uniname2ctype_pool_str1166[sizeof("inpsalterpahlavi")];
+    char uniname2ctype_pool_str1167[sizeof("lisu")];
+    char uniname2ctype_pool_str1169[sizeof("po")];
+    char uniname2ctype_pool_str1170[sizeof("mong")];
+    char uniname2ctype_pool_str1173[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str1175[sizeof("caseignorable")];
+    char uniname2ctype_pool_str1177[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str1181[sizeof("lepcha")];
+    char uniname2ctype_pool_str1182[sizeof("ogam")];
+    char uniname2ctype_pool_str1183[sizeof("oldpersian")];
+    char uniname2ctype_pool_str1201[sizeof("oldpermic")];
+    char uniname2ctype_pool_str1204[sizeof("xsux")];
+    char uniname2ctype_pool_str1208[sizeof("inosage")];
+    char uniname2ctype_pool_str1210[sizeof("runic")];
+    char uniname2ctype_pool_str1212[sizeof("inugaritic")];
+    char uniname2ctype_pool_str1213[sizeof("sgnw")];
+    char uniname2ctype_pool_str1221[sizeof("saur")];
+    char uniname2ctype_pool_str1222[sizeof("mult")];
+    char uniname2ctype_pool_str1225[sizeof("hmng")];
+    char uniname2ctype_pool_str1226[sizeof("inmongoliansupplement")];
+    char uniname2ctype_pool_str1227[sizeof("osge")];
+    char uniname2ctype_pool_str1228[sizeof("talu")];
+    char uniname2ctype_pool_str1231[sizeof("hang")];
+    char uniname2ctype_pool_str1232[sizeof("insuttonsignwriting")];
+    char uniname2ctype_pool_str1233[sizeof("othermath")];
+    char uniname2ctype_pool_str1238[sizeof("phoenician")];
+    char uniname2ctype_pool_str1240[sizeof("telu")];
+    char uniname2ctype_pool_str1246[sizeof("tangut")];
+    char uniname2ctype_pool_str1247[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str1248[sizeof("indevanagari")];
+    char uniname2ctype_pool_str1252[sizeof("deva")];
+    char uniname2ctype_pool_str1259[sizeof("word")];
+    char uniname2ctype_pool_str1263[sizeof("devanagari")];
+    char uniname2ctype_pool_str1267[sizeof("p")];
+    char uniname2ctype_pool_str1268[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str1269[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str1274[sizeof("yi")];
+    char uniname2ctype_pool_str1278[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str1280[sizeof("yiii")];
+    char uniname2ctype_pool_str1281[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str1286[sizeof("zp")];
+    char uniname2ctype_pool_str1289[sizeof("otherletter")];
+    char uniname2ctype_pool_str1292[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str1300[sizeof("gothic")];
+    char uniname2ctype_pool_str1311[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str1315[sizeof("induployan")];
+    char uniname2ctype_pool_str1319[sizeof("grext")];
+    char uniname2ctype_pool_str1330[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1334[sizeof("innabataean")];
+    char uniname2ctype_pool_str1338[sizeof("ingothic")];
+    char uniname2ctype_pool_str1340[sizeof("inbhaiksuki")];
+    char uniname2ctype_pool_str1342[sizeof("bamum")];
+    char uniname2ctype_pool_str1346[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str1351[sizeof("incherokeesupplement")];
+    char uniname2ctype_pool_str1356[sizeof("inelbasan")];
+    char uniname2ctype_pool_str1362[sizeof("inarabic")];
+    char uniname2ctype_pool_str1366[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str1367[sizeof("ethiopic")];
+    char uniname2ctype_pool_str1372[sizeof("tirhuta")];
+    char uniname2ctype_pool_str1376[sizeof("innumberforms")];
+    char uniname2ctype_pool_str1383[sizeof("runr")];
+    char uniname2ctype_pool_str1386[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str1388[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str1400[sizeof("bass")];
+    char uniname2ctype_pool_str1401[sizeof("geor")];
+    char uniname2ctype_pool_str1404[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str1406[sizeof("inornamentaldingbats")];
+    char uniname2ctype_pool_str1410[sizeof("warangciti")];
+    char uniname2ctype_pool_str1413[sizeof("nbat")];
+    char uniname2ctype_pool_str1416[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1417[sizeof("number")];
+    char uniname2ctype_pool_str1422[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str1426[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str1431[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str1432[sizeof("nabataean")];
+    char uniname2ctype_pool_str1433[sizeof("inoldpermic")];
+    char uniname2ctype_pool_str1435[sizeof("intibetan")];
+    char uniname2ctype_pool_str1442[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str1443[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str1444[sizeof("indingbats")];
+    char uniname2ctype_pool_str1447[sizeof("hexdigit")];
+    char uniname2ctype_pool_str1449[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1451[sizeof("mlym")];
+    char uniname2ctype_pool_str1459[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1461[sizeof("lyci")];
+    char uniname2ctype_pool_str1464[sizeof("inmyanmarextendedb")];
+    char uniname2ctype_pool_str1465[sizeof("hiragana")];
+    char uniname2ctype_pool_str1470[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str1473[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str1474[sizeof("lycian")];
+    char uniname2ctype_pool_str1475[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str1481[sizeof("linb")];
+    char uniname2ctype_pool_str1482[sizeof("malayalam")];
+    char uniname2ctype_pool_str1487[sizeof("limb")];
+    char uniname2ctype_pool_str1490[sizeof("assigned")];
+    char uniname2ctype_pool_str1491[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str1492[sizeof("sund")];
+    char uniname2ctype_pool_str1493[sizeof("bali")];
+    char uniname2ctype_pool_str1495[sizeof("tibt")];
+    char uniname2ctype_pool_str1496[sizeof("mymr")];
+    char uniname2ctype_pool_str1499[sizeof("ogham")];
+    char uniname2ctype_pool_str1512[sizeof("tibetan")];
+    char uniname2ctype_pool_str1514[sizeof("elba")];
+    char uniname2ctype_pool_str1515[sizeof("unassigned")];
+    char uniname2ctype_pool_str1516[sizeof("inbalinese")];
+    char uniname2ctype_pool_str1517[sizeof("plrd")];
+    char uniname2ctype_pool_str1518[sizeof("inkannada")];
+    char uniname2ctype_pool_str1520[sizeof("kana")];
+    char uniname2ctype_pool_str1522[sizeof("bengali")];
+    char uniname2ctype_pool_str1525[sizeof("myanmar")];
+    char uniname2ctype_pool_str1527[sizeof("graphemebase")];
+    char uniname2ctype_pool_str1533[sizeof("cakm")];
+    char uniname2ctype_pool_str1535[sizeof("narb")];
+    char uniname2ctype_pool_str1538[sizeof("brai")];
+    char uniname2ctype_pool_str1539[sizeof("glagolitic")];
+    char uniname2ctype_pool_str1542[sizeof("syrc")];
+    char uniname2ctype_pool_str1544[sizeof("balinese")];
+    char uniname2ctype_pool_str1545[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str1547[sizeof("arab")];
+    char uniname2ctype_pool_str1548[sizeof("inchakma")];
+    char uniname2ctype_pool_str1551[sizeof("brahmi")];
+    char uniname2ctype_pool_str1552[sizeof("grantha")];
+    char uniname2ctype_pool_str1554[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1558[sizeof("elbasan")];
+    char uniname2ctype_pool_str1559[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str1560[sizeof("inoriya")];
+    char uniname2ctype_pool_str1564[sizeof("inphagspa")];
+    char uniname2ctype_pool_str1567[sizeof("mendekikakui")];
+    char uniname2ctype_pool_str1572[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str1574[sizeof("sarb")];
+    char uniname2ctype_pool_str1576[sizeof("goth")];
+    char uniname2ctype_pool_str1577[sizeof("syriac")];
+    char uniname2ctype_pool_str1581[sizeof("digit")];
+    char uniname2ctype_pool_str1584[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str1585[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str1586[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str1588[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str1595[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str1599[sizeof("osmanya")];
+    char uniname2ctype_pool_str1602[sizeof("inkaithi")];
+    char uniname2ctype_pool_str1605[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str1607[sizeof("takri")];
+    char uniname2ctype_pool_str1610[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str1620[sizeof("pauc")];
+    char uniname2ctype_pool_str1621[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1622[sizeof("inkatakana")];
+    char uniname2ctype_pool_str1629[sizeof("pd")];
+    char uniname2ctype_pool_str1630[sizeof("hangul")];
+    char uniname2ctype_pool_str1636[sizeof("softdotted")];
+    char uniname2ctype_pool_str1646[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str1651[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str1655[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str1656[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str1658[sizeof("insupplementalarrowsc")];
+    char uniname2ctype_pool_str1661[sizeof("phagspa")];
+    char uniname2ctype_pool_str1662[sizeof("ideographic")];
+    char uniname2ctype_pool_str1664[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str1667[sizeof("ogrext")];
+    char uniname2ctype_pool_str1671[sizeof("cyrl")];
+    char uniname2ctype_pool_str1672[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str1675[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1679[sizeof("kali")];
+    char uniname2ctype_pool_str1681[sizeof("intangutcomponents")];
+    char uniname2ctype_pool_str1707[sizeof("deprecated")];
+    char uniname2ctype_pool_str1711[sizeof("linearb")];
+    char uniname2ctype_pool_str1712[sizeof("variationselector")];
+    char uniname2ctype_pool_str1716[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str1720[sizeof("inbassavah")];
+    char uniname2ctype_pool_str1722[sizeof("hluw")];
+    char uniname2ctype_pool_str1723[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str1724[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str1727[sizeof("mark")];
+    char uniname2ctype_pool_str1730[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1733[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str1741[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str1744[sizeof("sylo")];
+    char uniname2ctype_pool_str1745[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str1747[sizeof("inkhmer")];
+    char uniname2ctype_pool_str1757[sizeof("ingeometricshapesextended")];
+    char uniname2ctype_pool_str1761[sizeof("phlp")];
+    char uniname2ctype_pool_str1762[sizeof("orya")];
+    char uniname2ctype_pool_str1765[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str1767[sizeof("graph")];
+    char uniname2ctype_pool_str1773[sizeof("punct")];
+    char uniname2ctype_pool_str1774[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str1791[sizeof("dep")];
+    char uniname2ctype_pool_str1803[sizeof("inkhojki")];
+    char uniname2ctype_pool_str1811[sizeof("intakri")];
+    char uniname2ctype_pool_str1812[sizeof("takr")];
+    char uniname2ctype_pool_str1816[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str1825[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str1842[sizeof("kaithi")];
+    char uniname2ctype_pool_str1847[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str1848[sizeof("idsb")];
+    char uniname2ctype_pool_str1849[sizeof("bidic")];
+    char uniname2ctype_pool_str1852[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str1856[sizeof("brah")];
+    char uniname2ctype_pool_str1863[sizeof("phag")];
+    char uniname2ctype_pool_str1864[sizeof("cyrillic")];
+    char uniname2ctype_pool_str1867[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str1868[sizeof("hebr")];
+    char uniname2ctype_pool_str1873[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str1878[sizeof("inpahawhhmong")];
+    char uniname2ctype_pool_str1879[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str1886[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1891[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str1897[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str1898[sizeof("oldhungarian")];
+    char uniname2ctype_pool_str1900[sizeof("braille")];
+    char uniname2ctype_pool_str1901[sizeof("intagalog")];
+    char uniname2ctype_pool_str1906[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str1911[sizeof("kthi")];
+    char uniname2ctype_pool_str1922[sizeof("symbol")];
+    char uniname2ctype_pool_str1938[sizeof("lydi")];
+    char uniname2ctype_pool_str1943[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str1949[sizeof("olck")];
+    char uniname2ctype_pool_str1951[sizeof("lydian")];
+    char uniname2ctype_pool_str1960[sizeof("olchiki")];
+    char uniname2ctype_pool_str1968[sizeof("glag")];
+    char uniname2ctype_pool_str1978[sizeof("ugaritic")];
+    char uniname2ctype_pool_str1990[sizeof("uideo")];
+    char uniname2ctype_pool_str2001[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str2004[sizeof("knda")];
+    char uniname2ctype_pool_str2010[sizeof("patsyn")];
+    char uniname2ctype_pool_str2015[sizeof("combiningmark")];
+    char uniname2ctype_pool_str2017[sizeof("inmendekikakui")];
+    char uniname2ctype_pool_str2027[sizeof("nko")];
+    char uniname2ctype_pool_str2028[sizeof("nkoo")];
+    char uniname2ctype_pool_str2033[sizeof("kannada")];
+    char uniname2ctype_pool_str2036[sizeof("khmr")];
+    char uniname2ctype_pool_str2042[sizeof("khar")];
+    char uniname2ctype_pool_str2047[sizeof("tglg")];
+    char uniname2ctype_pool_str2055[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str2058[sizeof("rejang")];
+    char uniname2ctype_pool_str2069[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str2071[sizeof("lu")];
+    char uniname2ctype_pool_str2072[sizeof("ugar")];
+    char uniname2ctype_pool_str2079[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str2081[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str2085[sizeof("limbu")];
+    char uniname2ctype_pool_str2087[sizeof("georgian")];
+    char uniname2ctype_pool_str2089[sizeof("gujr")];
+    char uniname2ctype_pool_str2102[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str2110[sizeof("gujarati")];
+    char uniname2ctype_pool_str2112[sizeof("khoj")];
+    char uniname2ctype_pool_str2113[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str2120[sizeof("inlisu")];
+    char uniname2ctype_pool_str2123[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str2126[sizeof("oldturkic")];
+    char uniname2ctype_pool_str2129[sizeof("inhebrew")];
+    char uniname2ctype_pool_str2138[sizeof("inbuhid")];
+    char uniname2ctype_pool_str2145[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str2156[sizeof("cherokee")];
+    char uniname2ctype_pool_str2161[sizeof("alphabetic")];
+    char uniname2ctype_pool_str2167[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str2168[sizeof("hung")];
+    char uniname2ctype_pool_str2172[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str2174[sizeof("intelugu")];
+    char uniname2ctype_pool_str2175[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str2183[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str2191[sizeof("spacingmark")];
+    char uniname2ctype_pool_str2198[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2200[sizeof("cwu")];
+    char uniname2ctype_pool_str2213[sizeof("inbengali")];
+    char uniname2ctype_pool_str2224[sizeof("beng")];
+    char uniname2ctype_pool_str2235[sizeof("hebrew")];
+    char uniname2ctype_pool_str2238[sizeof("inbuginese")];
+    char uniname2ctype_pool_str2241[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str2251[sizeof("khmer")];
+    char uniname2ctype_pool_str2252[sizeof("hyphen")];
+    char uniname2ctype_pool_str2253[sizeof("dupl")];
+    char uniname2ctype_pool_str2254[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str2271[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str2277[sizeof("bamu")];
+    char uniname2ctype_pool_str2279[sizeof("inbamum")];
+    char uniname2ctype_pool_str2287[sizeof("cypriot")];
+    char uniname2ctype_pool_str2292[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str2296[sizeof("orkh")];
+    char uniname2ctype_pool_str2303[sizeof("tagb")];
+    char uniname2ctype_pool_str2309[sizeof("oupper")];
+    char uniname2ctype_pool_str2314[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str2319[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str2327[sizeof("palmyrene")];
+    char uniname2ctype_pool_str2328[sizeof("signwriting")];
+    char uniname2ctype_pool_str2330[sizeof("tagalog")];
+    char uniname2ctype_pool_str2336[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str2370[sizeof("caucasianalbanian")];
+    char uniname2ctype_pool_str2379[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str2396[sizeof("surrogate")];
+    char uniname2ctype_pool_str2401[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str2412[sizeof("bassavah")];
+    char uniname2ctype_pool_str2431[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str2439[sizeof("prependedconcatenationmark")];
+    char uniname2ctype_pool_str2441[sizeof("inlimbu")];
+    char uniname2ctype_pool_str2464[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2469[sizeof("pahawhhmong")];
+    char uniname2ctype_pool_str2474[sizeof("bopo")];
+    char uniname2ctype_pool_str2484[sizeof("uppercase")];
+    char uniname2ctype_pool_str2485[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str2486[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str2504[sizeof("grbase")];
+    char uniname2ctype_pool_str2527[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str2533[sizeof("aghb")];
+    char uniname2ctype_pool_str2535[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str2544[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str2545[sizeof("any")];
+    char uniname2ctype_pool_str2560[sizeof("paucinhau")];
+    char uniname2ctype_pool_str2567[sizeof("inglagoliticsupplement")];
+    char uniname2ctype_pool_str2569[sizeof("inpaucinhau")];
+    char uniname2ctype_pool_str2578[sizeof("incombiningdiacriticalmarksextended")];
+    char uniname2ctype_pool_str2616[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str2623[sizeof("grek")];
+    char uniname2ctype_pool_str2638[sizeof("punctuation")];
+    char uniname2ctype_pool_str2645[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2649[sizeof("upper")];
+    char uniname2ctype_pool_str2651[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str2696[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2716[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str2733[sizeof("oldnortharabian")];
+    char uniname2ctype_pool_str2742[sizeof("insupplementalsymbolsandpictographs")];
+    char uniname2ctype_pool_str2752[sizeof("bopomofo")];
+    char uniname2ctype_pool_str2771[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str2784[sizeof("inkayahli")];
+    char uniname2ctype_pool_str2807[sizeof("inkanbun")];
+    char uniname2ctype_pool_str2817[sizeof("egyp")];
+    char uniname2ctype_pool_str2824[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str2835[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str2883[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str2893[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str2901[sizeof("batk")];
+    char uniname2ctype_pool_str2909[sizeof("inbatak")];
+    char uniname2ctype_pool_str2922[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str2941[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str2953[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str2956[sizeof("inkhudawadi")];
+    char uniname2ctype_pool_str2976[sizeof("innoblock")];
+    char uniname2ctype_pool_str2992[sizeof("unknown")];
+    char uniname2ctype_pool_str3004[sizeof("qmark")];
+    char uniname2ctype_pool_str3009[sizeof("guru")];
+    char uniname2ctype_pool_str3020[sizeof("sk")];
+    char uniname2ctype_pool_str3039[sizeof("quotationmark")];
+    char uniname2ctype_pool_str3064[sizeof("khudawadi")];
+    char uniname2ctype_pool_str3076[sizeof("buhd")];
+    char uniname2ctype_pool_str3083[sizeof("telugu")];
+    char uniname2ctype_pool_str3117[sizeof("katakana")];
+    char uniname2ctype_pool_str3152[sizeof("bugi")];
+    char uniname2ctype_pool_str3158[sizeof("bhks")];
+    char uniname2ctype_pool_str3180[sizeof("bhaiksuki")];
+    char uniname2ctype_pool_str3203[sizeof("buginese")];
+    char uniname2ctype_pool_str3268[sizeof("kayahli")];
+    char uniname2ctype_pool_str3273[sizeof("incjkunifiedideographsextensiona")];
+    char uniname2ctype_pool_str3280[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str3285[sizeof("incjkunifiedideographsextensione")];
+    char uniname2ctype_pool_str3290[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str3325[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str3369[sizeof("insupplementaryprivateuseareab")];
+    char uniname2ctype_pool_str3447[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str3469[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str3574[sizeof("buhid")];
+    char uniname2ctype_pool_str3581[sizeof("khojki")];
+    char uniname2ctype_pool_str3620[sizeof("duployan")];
+    char uniname2ctype_pool_str3704[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str3757[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str3813[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str3814[sizeof("zyyy")];
+    char uniname2ctype_pool_str4113[sizeof("greek")];
+    char uniname2ctype_pool_str4259[sizeof("grlink")];
+    char uniname2ctype_pool_str4391[sizeof("batak")];
+    char uniname2ctype_pool_str4455[sizeof("graphemelink")];
+    char uniname2ctype_pool_str4468[sizeof("blank")];
+    char uniname2ctype_pool_str4506[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str4563[sizeof("incjkunifiedideographsextensionb")];
+#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",
+    "cn",
+    "mani",
+    "ci",
+    "inmanichaean",
+    "qaai",
+    "z",
+    "c",
+    "mc",
+    "qaac",
+    "sm",
+    "incham",
+    "me",
+    "inarmenian",
+    "cc",
+    "mandaic",
+    "incuneiform",
+    "zzzz",
+    "insamaritan",
+    "cans",
+    "s",
+    "sc",
+#endif /* USE_UNICODE_PROPERTIES */
+    "ascii",
+#ifdef USE_UNICODE_PROPERTIES
+    "inavestan",
+    "zs",
+    "cs",
+    "inipaextensions",
+    "incuneiformnumbersandpunctuation",
+    "incommonindicnumberforms",
+    "inthai",
+    "mtei",
+    "cf",
+    "inspecials",
+    "initialpunctuation",
+    "inthaana",
+    "inancientsymbols",
+    "inmiscellaneousmathematicalsymbolsa",
+    "inmusicalsymbols",
+    "taile",
+    "inmyanmarextendeda",
+    "sterm",
+    "lm",
+    "lina",
+    "inmiscellaneoussymbols",
+    "lana",
+    "intransportandmapsymbols",
+    "alnum",
+    "inlycian",
+    "inmiscellaneoussymbolsandarrows",
+    "intaitham",
+    "lc",
+    "inmalayalam",
+    "inmiscellaneoussymbolsandpictographs",
+    "inadlam",
+    "incontrolpictures",
+    "inlineara",
+    "taiviet",
+    "armn",
+    "armi",
+    "sinhala",
+    "armenian",
+    "inmyanmar",
+    "inrunic",
+    "incarian",
+    "cari",
+    "inmarchen",
+    "marc",
+    "carian",
+    "merc",
+    "incyrillic",
+    "intaixuanjingsymbols",
+    "samr",
+    "latn",
+    "latin",
+    "ital",
+    "intamil",
+    "taml",
+    "inmultani",
+    "samaritan",
+    "arabic",
+    "insyriac",
+    "insharada",
+    "miao",
+    "inlinearbideograms",
+    "incherokee",
+    "intaile",
+    "tale",
+    "inahom",
+    "inmeeteimayekextensions",
+    "inruminumeralsymbols",
+    "inlatinextendeda",
+    "inosmanya",
+    "innewa",
+    "ext",
+    "newa",
+    "inlatinextendedc",
+    "cwcm",
+    "osma",
+    "inlatinextendede",
+    "l",
+    "han",
+    "nl",
+    "term",
+    "hani",
+    "joinc",
+    "inideographicsymbolsandpunctuation",
+    "zinh",
+    "newtailue",
+    "lt",
+    "zl",
+    "inmahajani",
+    "cham",
+    "connectorpunctuation",
+    "sinh",
+    "manichaean",
+    "osage",
+    "mahj",
+    "cwcf",
+    "inmiscellaneoustechnical",
+    "inethiopic",
+    "insinhala",
+    "chakma",
+    "mahajani",
+    "shavian",
+    "inenclosedcjklettersandmonths",
+    "innewtailue",
+    "inideographicdescriptioncharacters",
+    "lineara",
+    "meroiticcursive",
+    "thai",
+    "math",
+    "inemoticons",
+    "thaa",
+    "ethi",
+    "hatran",
+    "inenclosedalphanumerics",
+    "sentenceterminal",
+    "tamil",
+#endif /* USE_UNICODE_PROPERTIES */
+    "cntrl",
+#ifdef USE_UNICODE_PROPERTIES
+    "taitham",
+    "thaana",
+    "terminalpunctuation",
+    "ahex",
+    "insinhalaarchaicnumbers",
+    "inlatinextendedadditional",
+    "cwt",
+    "loe",
+    "intifinagh",
+    "tifinagh",
+    "inopticalcharacterrecognition",
+    "inearlydynasticcuneiform",
+    "di",
+    "asciihexdigit",
+    "ll",
+    "inscriptionalparthian",
+    "inenclosedalphanumericsupplement",
+    "oriya",
+    "mero",
+    "wara",
+    "mand",
+    "inmodi",
+    "inwarangciti",
+    "dia",
+    "mend",
+    "no",
+    "sora",
+    "inmandaic",
+    "idc",
+    "innko",
+    "sind",
+    "inarrows",
+    "inmro",
+    "titlecaseletter",
+    "co",
+    "hira",
+    "inlowsurrogates",
+    "hex",
+    "inmiao",
+    "common",
+    "so",
+    "inhiragana",
+    "insundanese",
+    "ids",
+    "cher",
+    "inmahjongtiles",
+    "marchen",
+    "indominotiles",
+    "hano",
+    "ahom",
+    "inogham",
+    "inscriptionalpahlavi",
+    "inolchiki",
+    "xidc",
+    "tirh",
+    "idst",
+    "cwl",
+    "inhatran",
+    "pi",
+    "hatr",
+    "idcontinue",
+    "xids",
+    "intirhuta",
+    "shaw",
+    "inshorthandformatcontrols",
+    "inspacingmodifierletters",
+    "indeseret",
+    "pcm",
+    "pc",
+    "inlydian",
+    "pe",
+    "inmathematicalalphanumericsymbols",
+    "adlm",
+    "inphaistosdisc",
+    "adlam",
+    "whitespace",
+    "lo",
+    "insylotinagri",
+    "inlao",
+    "ps",
+    "anatolianhieroglyphs",
+    "lao",
+    "laoo",
+    "mongolian",
+    "invai",
+    "lineseparator",
+    "vai",
+    "vaii",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "format",
+    "letter",
+    "pf",
+    "mro",
+    "mroo",
+    "diacritic",
+    "joincontrol",
+    "java",
+    "inanatolianhieroglyphs",
+    "odi",
+    "nchar",
+    "incoptic",
+    "modi",
+    "inshavian",
+    "oidc",
+    "vs",
+    "injavanese",
+    "ideo",
+    "xdigit",
+    "oalpha",
+    "inolditalic",
+    "xidstart",
+    "oids",
+    "decimalnumber",
+    "javanese",
+    "patws",
+    "palm",
+    "psalterpahlavi",
+    "incopticepactnumbers",
+    "alpha",
+    "dsrt",
+    "inlepcha",
+    "inpalmyrene",
+    "lepc",
+    "avst",
+    "avestan",
+    "insundanesesupplement",
+    "inmodifiertoneletters",
+    "idstart",
+    "dash",
+    "incyrillicextendeda",
+    "hanunoo",
+    "perm",
+    "incyrillicextendedc",
+    "siddham",
+    "inoldturkic",
+    "finalpunctuation",
+    "deseret",
+    "imperialaramaic",
+    "sharada",
+    "xidcontinue",
+    "tavt",
+    "intaiviet",
+    "inmongolian",
+    "inimperialaramaic",
+    "ingrantha",
+    "radical",
+    "omath",
+    "canadianaboriginal",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=1.1",
+    "age=2.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "extender",
+    "otheridcontinue",
+    "inphoenician",
+    "control",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=4.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "prti",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.1",
+    "age=6.2",
+    "age=3.1",
+    "age=3.2",
+    "age=2.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "ingujarati",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=5.1",
+    "age=5.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "noncharactercodepoint",
+    "ingeneralpunctuation",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=4.0",
+    "age=6.3",
+    "age=6.0",
+    "age=9.0",
+    "age=3.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "cprt",
+    "casedletter",
+    "letternumber",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=5.0",
+    "age=8.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "otheralphabetic",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=7.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "coptic",
+    "lowercase",
+    "inethiopicextendeda",
+    "privateuse",
+    "ininscriptionalparthian",
+    "ininscriptionalpahlavi",
+    "nd",
+    "tang",
+    "insmallformvariants",
+    "inoldnortharabian",
+    "copt",
+    "wspace",
+    "incaucasianalbanian",
+    "tagbanwa",
+    "xpeo",
+    "sd",
+    "inlatin1supplement",
+    "sundanese",
+    "print",
+    "sidd",
+    "tfng",
+    "inancientgreekmusicalnotation",
+    "cuneiform",
+    "inherited",
+    "inenclosedideographicsupplement",
+    "inoldsoutharabian",
+    "insiddham",
+    "invariationselectors",
+    "patternwhitespace",
+    "phnx",
+    "olditalic",
+    "idsbinaryoperator",
+    "spaceseparator",
+    "cased",
+    "intags",
+    "shrd",
+    "inancientgreeknumbers",
+    "saurashtra",
+    "intangut",
+    "otheridstart",
+    "inalphabeticpresentationforms",
+    "inunifiedcanadianaboriginalsyllabics",
+    "patternsyntax",
+    "inoldhungarian",
+    "inphoneticextensions",
+    "other",
+    "othersymbol",
+    "otherlowercase",
+    "invariationselectorssupplement",
+    "othernumber",
+    "gran",
+    "ingurmukhi",
+    "phli",
+    "rjng",
+    "inmathematicaloperators",
+    "closepunctuation",
+#endif /* USE_UNICODE_PROPERTIES */
+    "lower",
+#ifndef USE_UNICODE_PROPERTIES
+    "graph",
+#else /* USE_UNICODE_PROPERTIES */
+    "separator",
+    "multani",
+    "modifierletter",
+    "inrejang",
+    "olower",
+    "inpsalterpahlavi",
+    "lisu",
+    "po",
+    "mong",
+    "inphoneticextensionssupplement",
+    "caseignorable",
+    "insorasompeng",
+    "lepcha",
+    "ogam",
+    "oldpersian",
+    "oldpermic",
+    "xsux",
+    "inosage",
+    "runic",
+    "inugaritic",
+    "sgnw",
+    "saur",
+    "mult",
+    "hmng",
+    "inmongoliansupplement",
+    "osge",
+    "talu",
+    "hang",
+    "insuttonsignwriting",
+    "othermath",
+    "phoenician",
+    "telu",
+    "tangut",
+    "insaurashtra",
+    "indevanagari",
+    "deva",
+    "word",
+    "devanagari",
+    "p",
+    "lowercaseletter",
+    "ingreekandcoptic",
+    "yi",
+    "invedicextensions",
+    "yiii",
+    "inlatinextendedd",
+    "zp",
+    "otherletter",
+    "ingeometricshapes",
+    "gothic",
+    "incountingrodnumerals",
+    "induployan",
+    "grext",
+    "incyrillicsupplement",
+    "innabataean",
+    "ingothic",
+    "inbhaiksuki",
+    "bamum",
+    "inverticalforms",
+    "incherokeesupplement",
+    "inelbasan",
+    "inarabic",
+    "inbasiclatin",
+    "ethiopic",
+    "tirhuta",
+    "innumberforms",
+    "runr",
+    "inyijinghexagramsymbols",
+    "ingeorgian",
+    "bass",
+    "geor",
+    "insuperscriptsandsubscripts",
+    "inornamentaldingbats",
+    "warangciti",
+    "nbat",
+    "inoldpersian",
+    "number",
+    "inprivateusearea",
+    "inarabicpresentationformsa",
+    "inbyzantinemusicalsymbols",
+    "nabataean",
+    "inoldpermic",
+    "intibetan",
+    "inmiscellaneousmathematicalsymbolsb",
+    "inethiopicsupplement",
+    "indingbats",
+    "hexdigit",
+    "inmeroitichieroglyphs",
+    "mlym",
+    "ingreekextended",
+    "lyci",
+    "inmyanmarextendedb",
+    "hiragana",
+    "inhangulsyllables",
+    "inethiopicextended",
+    "lycian",
+    "inbraillepatterns",
+    "linb",
+    "malayalam",
+    "limb",
+    "assigned",
+    "insupplementalmathematicaloperators",
+    "sund",
+    "bali",
+    "tibt",
+    "mymr",
+    "ogham",
+    "tibetan",
+    "elba",
+    "unassigned",
+    "inbalinese",
+    "plrd",
+    "inkannada",
+    "kana",
+    "bengali",
+    "myanmar",
+    "graphemebase",
+    "cakm",
+    "narb",
+    "brai",
+    "glagolitic",
+    "syrc",
+    "balinese",
+    "inhanguljamoextendeda",
+    "arab",
+    "inchakma",
+    "brahmi",
+    "grantha",
+    "inhanunoo",
+    "elbasan",
+    "otherpunctuation",
+    "inoriya",
+    "inphagspa",
+    "mendekikakui",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "sarb",
+    "goth",
+    "syriac",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "sylotinagri",
+    "inhalfwidthandfullwidthforms",
+    "meeteimayek",
+    "inyiradicals",
+    "mathsymbol",
+    "osmanya",
+    "inkaithi",
+    "incjkcompatibilityforms",
+    "takri",
+    "incjkcompatibilityideographs",
+    "pauc",
+    "logicalorderexception",
+    "inkatakana",
+    "pd",
+    "hangul",
+    "softdotted",
+    "incjkstrokes",
+    "insupplementalarrowsa",
+    "inbrahmi",
+    "inmeeteimayek",
+    "insupplementalarrowsc",
+    "phagspa",
+    "ideographic",
+    "inlinearbsyllabary",
+    "ogrext",
+    "cyrl",
+    "incjkcompatibilityideographssupplement",
+    "inblockelements",
+    "kali",
+    "intangutcomponents",
+    "deprecated",
+    "linearb",
+    "variationselector",
+    "idstrinaryoperator",
+    "inbassavah",
+    "hluw",
+    "inhighprivateusesurrogates",
+    "incombininghalfmarks",
+    "mark",
+    "sorasompeng",
+    "inkanasupplement",
+    "inkharoshthi",
+    "sylo",
+    "inletterlikesymbols",
+    "inkhmer",
+    "ingeometricshapesextended",
+    "phlp",
+    "orya",
+    "inhanguljamo",
+    "graph",
+    "punct",
+    "indevanagariextended",
+    "dep",
+    "inkhojki",
+    "intakri",
+    "takr",
+    "changeswhencasemapped",
+    "inarabicmathematicalalphabeticsymbols",
+    "kaithi",
+    "inkhmersymbols",
+    "idsb",
+    "bidic",
+    "inglagolitic",
+    "brah",
+    "phag",
+    "cyrillic",
+    "changeswhencasefolded",
+    "hebr",
+    "otherdefaultignorablecodepoint",
+    "inpahawhhmong",
+    "meroitichieroglyphs",
+    "inarabicextendeda",
+    "inalchemicalsymbols",
+    "otheruppercase",
+    "oldhungarian",
+    "braille",
+    "intagalog",
+    "changeswhentitlecased",
+    "kthi",
+    "symbol",
+    "lydi",
+    "incurrencysymbols",
+    "olck",
+    "lydian",
+    "olchiki",
+    "glag",
+    "ugaritic",
+    "uideo",
+    "graphemeextend",
+    "knda",
+    "patsyn",
+    "combiningmark",
+    "inmendekikakui",
+    "nko",
+    "nkoo",
+    "kannada",
+    "khmr",
+    "khar",
+    "tglg",
+    "defaultignorablecodepoint",
+    "rejang",
+    "enclosingmark",
+    "lu",
+    "ugar",
+    "insupplementaryprivateuseareaa",
+    "inkatakanaphoneticextensions",
+    "limbu",
+    "georgian",
+    "gujr",
+    "inarabicsupplement",
+    "gujarati",
+    "khoj",
+    "incombiningdiacriticalmarks",
+    "inlisu",
+    "incombiningdiacriticalmarksforsymbols",
+    "oldturkic",
+    "inhebrew",
+    "inbuhid",
+    "kharoshthi",
+    "cherokee",
+    "alphabetic",
+    "incyrillicextendedb",
+    "hung",
+    "changeswhenlowercased",
+    "intelugu",
+    "incombiningdiacriticalmarkssupplement",
+    "inplayingcards",
+    "spacingmark",
+    "inmeroiticcursive",
+    "cwu",
+    "inbengali",
+    "beng",
+    "hebrew",
+    "inbuginese",
+    "dashpunctuation",
+    "khmer",
+    "hyphen",
+    "dupl",
+    "incjksymbolsandpunctuation",
+    "bidicontrol",
+    "bamu",
+    "inbamum",
+    "cypriot",
+    "inaegeannumbers",
+    "orkh",
+    "tagb",
+    "oupper",
+    "intagbanwa",
+    "modifiersymbol",
+    "palmyrene",
+    "signwriting",
+    "tagalog",
+    "incypriotsyllabary",
+    "caucasianalbanian",
+    "insupplementalpunctuation",
+    "surrogate",
+    "othergraphemeextend",
+    "bassavah",
+    "nonspacingmark",
+    "prependedconcatenationmark",
+    "inlimbu",
+    "ingeorgiansupplement",
+    "pahawhhmong",
+    "bopo",
+    "uppercase",
+    "inbopomofo",
+    "inkangxiradicals",
+    "grbase",
+    "inhighsurrogates",
+    "aghb",
+    "unifiedideograph",
+    "inbamumsupplement",
+    "any",
+    "paucinhau",
+    "inglagoliticsupplement",
+    "inpaucinhau",
+    "incombiningdiacriticalmarksextended",
+    "openpunctuation",
+    "grek",
+    "punctuation",
+    "incjkradicalssupplement",
+    "upper",
+    "inyisyllables",
+    "currencysymbol",
+    "inarabicpresentationformsb",
+    "oldnortharabian",
+    "insupplementalsymbolsandpictographs",
+    "bopomofo",
+    "uppercaseletter",
+    "inkayahli",
+    "inkanbun",
+    "egyp",
+    "incjkcompatibility",
+    "inhanguljamoextendedb",
+    "inegyptianhieroglyphs",
+    "inlatinextendedb",
+    "batk",
+    "inbatak",
+    "paragraphseparator",
+    "insupplementalarrowsb",
+    "changeswhenuppercased",
+    "inkhudawadi",
+    "innoblock",
+    "unknown",
+    "qmark",
+    "guru",
+    "sk",
+    "quotationmark",
+    "khudawadi",
+    "buhd",
+    "telugu",
+    "katakana",
+    "bugi",
+    "bhks",
+    "bhaiksuki",
+    "buginese",
+    "kayahli",
+    "incjkunifiedideographsextensiona",
+    "incjkunifiedideographsextensionc",
+    "incjkunifiedideographsextensione",
+    "incjkunifiedideographs",
+    "inbopomofoextended",
+    "insupplementaryprivateuseareab",
+    "inhangulcompatibilityjamo",
+    "oldsoutharabian",
+    "buhid",
+    "khojki",
+    "duployan",
+    "inboxdrawing",
+    "incjkunifiedideographsextensiond",
+    "egyptianhieroglyphs",
+    "zyyy",
+    "greek",
+    "grlink",
+    "batak",
+    "graphemelink",
+    "blank",
+    "gurmukhi",
+    "incjkunifiedideographsextensionb"
+#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}, {-1}, {-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,                            457},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35,                                    114},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                        51},
+      {-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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                    128},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                       49},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58,                                  399},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59,                                       32},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61,                              273},
+      {(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,                             487},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                    244},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                             280},
+      {(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}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93,                               458},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                                       54},
+      {-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,                         267},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110,        488},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                390},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124,                                  293},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132,                                    159},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                                       19},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140,                              423},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                       43},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                278},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str145,                        428},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,     349},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str159,                        504},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str164,                                   120},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str174,                      400},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str176,                                   239},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                       26},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str191,                                    183},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str199,                  347},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str200,                                    151},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201,                522},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                    13},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                                430},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,         355},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                               317},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211,                                       24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                             291},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str213,    519},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str214,                                 512},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                       341},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str222,                               444},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                                 152},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239,                                     78},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str242,                                    160},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                                  92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,                                 78},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249,                               296},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                 304},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                431},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                                    148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                               486},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str258,                                    207},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                  148},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                                    170},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str273,                              271},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str274,                    506},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str278,                                    155},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str279,                                     75},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281,                                    75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282,                                    111},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str284,                                 288},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                     88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str286,                               473},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                               155},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str290,                                   80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str291,                                276},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                               470},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str295,                                    172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str296,                      425},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                              301},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                 313},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                    120},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str305,                                  482},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                 402},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str310,                    464},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str313,                        265},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str314,                               440},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str315,                                  476},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                     224},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                    208},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                        357},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                     65},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                    124},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                        404},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                                        23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                                     109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                       36},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                                    217},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                                    109},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                   213},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,      497},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349,                                    114},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                               129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str355,                                       28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                                       52},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                              469},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                    150},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str368,                     39},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str371,                                     92},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str374,                              185},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                   209},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str376,                                    184},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                     64},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                340},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                              299},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                               292},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str394,                                  169},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str397,                                184},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,           376},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str411,                             314},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,      366},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str421,                                 183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str422,                         170},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435,                                     93},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                     55},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440,                             520},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444,                                     82},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str447,                                     99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448,                                  201},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str452,                 343},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453,                        239},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                    88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str456,                                     3},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                 151},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                                   82},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                     217},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                    220},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str471,                 471},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str478,               330},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484,                                      63},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                     236},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                              360},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str498,                                131},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str503,           342},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                489},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str507,                                       70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                           220},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                       25},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                   162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str513,        517},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str517,                                    171},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                    198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                    168},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                  479},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str529,                            483},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str530,                                     223},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str534,                                    186},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                                       37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539,                               281},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str544,                                      67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545,                                   279},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                    196},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str547,                                338},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str551,                                   493},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                          28},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                       21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str557,                                    106},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559,                         411},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                     219},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str565,                                  496},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str569,                                   74},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str576,                                       50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str577,                              368},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str579,                             320},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                      66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str585,                                    100},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                          514},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589,                                 207},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str591,                           515},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str607,                                    116},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613,                                    199},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str621,                                 303},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622,                    163},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                               323},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630,                                     69},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                    197},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                                    230},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                                      61},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str642,                                449},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643,                                       43},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                                    201},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                               67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650,                                     68},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str655,                               477},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                    123},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str662,               502},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str664,                268},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str668,                               438},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str670,                                     243},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str675,                                       39},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str684,                                451},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str685,                                       41},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str688,       508},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str690,                                    205},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str693,                          429},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                                   205},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703,                              211},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                       27},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str712,                           389},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713,                                   294},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715,                                       45},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717,                    200},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str719,                                      94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str720,                                     94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721,                               105},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str731,                                   384},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str733,                            52},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737,                                     143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str738,                                    143},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str741,                                     9},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str742,                                   19},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str745,                                   23},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751,                                       42},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                                     188},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str759,                                    188},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str761,                               223},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                             213},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str773,                                    158},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str774,                  491},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str775,                                     233},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776,                                   227},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778,                                358},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str779,                                    187},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str781,                               439},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                                    238},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str795,                                      240},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796,                              397},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                    222},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str800,                                   11},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803,                                  221},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str804,                             433},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str811,                                 68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str812,                                    237},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str814,                            35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815,                                158},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                                   241},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str826,                                    191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str834,                          194},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str837,                    432},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str846,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str847,                                    113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                322},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850,                             447},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851,                                    141},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str862,                                    153},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                                 153},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str865,                   325},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                   387},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                  66},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str876,                                    214},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str877,                     362},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                                 116},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883,                                    193},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                     324},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str890,                                 195},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str892,                             462},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str896,                         42},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str900,                                 113},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str904,                         160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str905,                                 173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str910,                              69},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str914,                                    152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str915,                               401},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str916,                             310},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str922,                       446},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str932,                               475},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str933,                                 231},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936,                                   218},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                      101},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,                                 245},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                                 247},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str942,                                224},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943,                         238},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                            450},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945,                                  18},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946,                                 252},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                                    162},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str948,                                 257},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949,                                 258},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950,                                 249},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                                 250},
+      {(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,                              286},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str954,                                 254},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str955,                                 255},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956,                   227},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str957,                    332},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str958,                                 251},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str959,                                 259},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960,                                 256},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str961,                                 262},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962,                                 248},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str963,                                    125},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str964,                              24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str965,                             36},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                 253},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str967,                                 261},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str968,                         221},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str969,                                 260},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970,                                  128},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str981,                                57},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str990,                     403},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str991,                               21},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str993,                 459},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str995,                  460},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str997,                                       35},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1001,                                    210},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1012,                     420},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1015,                       456},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1016,                                    128},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1026,                                  211},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1029,                     443},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031,                                118},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1034,                                    133},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                                      235},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1038,                      264},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039,                               140},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                                     7},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1042,                                    195},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1046,                                    131},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1047,           505},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1049,                               136},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051,                               114},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1053,         518},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1054,                       455},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1055,                               478},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1056,                    416},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1064,                       241},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                                    137},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1067,                               111},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                       229},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                           54},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    59},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1074,                                  532},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1077,                                    173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1078,                   427},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1079,                              144},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1089,                                498},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1095,                            237},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1102,           414},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107,    302},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1108,                           242},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1110,                          463},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1111,                    327},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114,                                    17},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1115,                              50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1116,                          225},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1118,          533},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1121,                              37},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1123,                                    180},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1131,                              285},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1132,                                    163},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                    146},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1142,                 339},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1145,                         41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1146,                                     6},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1148,                                51},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151,                                 202},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1153,                           26},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1161,                                395},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1162,                                  225},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1166,                        461},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1167,                                    156},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1169,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170,                                    105},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1173,          328},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1175,                            60},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1177,                           467},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1181,                                  141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1182,                                    102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1183,                              133},
+      {-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_str1201,                               193},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1204,                                    136},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1208,                                 441},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1210,                                   103},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212,                              436},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1213,                                    204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                    144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1222,                                    202},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1225,                                    181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1226,                   480},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1227,                                    209},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1228,                                    129},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1231,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1232,                     509},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1233,                               218},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1238,                              137},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1240,                                     89},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1246,                                  210},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1247,                            392},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1248,                            283},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1252,                                     83},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1259,                                     12},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1263,                               83},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1267,                                        38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1268,                          25},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1269,                        270},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1274,                                      110},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1278,                       326},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1280,                                    110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1281,                        388},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1286,                                       53},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1289,                              27},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1292,                       346},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1300,                                  112},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1311,                   507},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1315,                              501},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1319,                                    71},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1330,                    272},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334,                             448},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1338,                                434},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1340,                             485},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1342,                                   157},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1346,                         417},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1351,                    405},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1356,                               442},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1362,                                275},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1366,                            263},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1367,                                 99},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1372,                                 197},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1376,                           337},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1383,                                    103},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1386,                 379},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1388,                              297},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1400,                                    177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1401,                                     97},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1404,             333},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1406,                    521},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1410,                              198},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1413,                                    190},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1416,                            437},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1417,                                   34},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1422,                        412},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1426,              415},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1431,               503},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1432,                               190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1433,                             435},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435,                               295},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442,     353},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1443,                    300},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1444,                              348},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1447,                                219},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1449,                   452},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1451,                                     91},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1459,                         331},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1461,                                    147},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1464,                      398},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1465,                                106},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1470,                       407},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1473,                      361},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1474,                                  147},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1475,                       351},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1481,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1482,                                91},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1487,                                    119},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1490,                                 16},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1491,     354},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492,                                    140},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1493,                                    135},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1495,                                     95},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1496,                                     96},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1499,                                   102},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1512,                                  95},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1514,                                    179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1515,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516,                              319},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1517,                                    172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1518,                               290},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1520,                                    107},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1522,                                  84},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525,                                  96},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1527,                             72},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1533,                                    169},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1535,                                    189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1538,                                    126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1539,                              130},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                                     81},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1544,                                135},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1545,                   396},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1547,                                     80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1548,                                468},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1551,                                  167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1552,                                 180},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1554,                               306},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1558,                                 179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1559,                         44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1560,                                 287},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1564,                               391},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1567,                            186},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1572, 311},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1574,                                    161},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1576,                                    112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1577,                                   81},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581,                                     4},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1584,                             132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1585,            422},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1586,                             159},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1588,                            382},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1595,                               49},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1599,                                 124},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1602,                                466},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1605,                 419},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1607,                                   175},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1610,            413},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1620,                                    192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1621,                   236},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1622,                              369},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1629,                                       40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1630,                                   98},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636,                              235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1646,                            374},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1651,                   350},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1655,                                465},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1656,                           406},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1658,                   525},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1661,                                 138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662,                             222},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1664,                      424},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1667,                                  228},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1671,                                     77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1672,  531},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1675,                         345},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1679,                                    145},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1681,                      499},
+      {-1}, {-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_str1707,                              234},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1711,                                 121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1712,                       240},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1716,                      230},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1720,                              494},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1722,                                    200},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1723,              410},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1724,                    418},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1727,                                     30},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1730,                             174},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1733,                        500},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1741,                            454},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1744,                                    132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1745,                     336},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1747,                                 309},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1757,               524},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1761,                                    194},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1762,                                     87},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1765,                            298},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1767,                                     5},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1773,                                     8},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1774,                    393},
+      {-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_str1791,                                     234},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1803,                                472},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1811,                                 481},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1812,                                    175},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1816,                    65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1825,   513},
+      {-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_str1842,                                  165},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1847,                          315},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1848,                                    229},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1849,                                   212},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1852,                            356},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1856,                                    167},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1863,                                    138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1864,                                 77},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1867,                    64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1868,                                     79},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1873,          233},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1878,                           495},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1879,                     171},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1886,                       282},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1891,                     523},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1897,                          226},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1898,                            203},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1900,                                 126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1901,                               305},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1906,                    63},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1911,                                    165},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1922,                                   46},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1938,                                    149},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1943,                       334},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1949,                                    142},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1951,                                  149},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1960,                                 142},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1968,                                    130},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1978,                                122},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1990,                                   232},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2001,                           71},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2004,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2010,                                  242},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2015,                            30},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2017,                          511},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2027,                                     139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028,                                    139},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2033,                                  90},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2036,                                    104},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2042,                                    134},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2047,                                    115},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2055,                70},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2058,                                  146},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2069,                            32},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2071,                                       29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2072,                                    122},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2079,          534},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2081,            375},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2085,                                   119},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2087,                                 97},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2089,                                     86},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2102,                      277},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2110,                                 86},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2112,                                    182},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2113,             269},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2120,                                  383},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123,   335},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2126,                               164},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2129,                                274},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2138,                                 307},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2145,                              134},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2156,                                100},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2161,                               56},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2167,                     385},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2168,                                    203},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2172,                    61},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2174,                                289},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2175,   329},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2183,                          516},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2191,                              31},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2198,                       453},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2200,                                      62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2213,                               284},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2224,                                     84},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2235,                                   79},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2238,                              316},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2241,                          40},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2251,                                   104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2252,                                  215},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2253,                                    178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2254,              367},
+      {-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_str2271,                             212},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2277,                                    157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2279,                                 386},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2287,                                 125},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2292,                         426},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2296,                                    164},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2303,                                    118},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2309,                                  226},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2314,                              308},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2319,                           48},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2327,                               191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2328,                             204},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2330,                                 115},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2336,                      445},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-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_str2370,                       176},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2379,               363},
+      {-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_str2396,                                22},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2401,                     228},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2412,                                177},
+      {-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_str2431,                           33},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2439,              243},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2441,                                 312},
+      {-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_str2464,                    359},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2469,                             181},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2474,                                    108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2484,                                58},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2485,                              370},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2486,                        365},
+      {-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_str2504,                                   72},
+      {-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,                        409},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2533,                                    176},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2535,                        232},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2544,                       492},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2545,                                      15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2560,                               192},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2567,                  510},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2569,                             484},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2578,     318},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str2616,                          45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2623,                                     76},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2638,                              38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2645,                 364},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2649,                                    10},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2651,                           381},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-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_str2696,                           47},
+      {-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_str2716,              421},
+      {-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_str2733,                         189},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2742,     526},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2752,                                108},
+      {-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_str2771,                          29},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2784,                               394},
+      {-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_str2807,                                372},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2817,                                    154},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2824,                      377},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2835,                   408},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2883,                   490},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2893,                        266},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2901,                                    166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2909,                                 321},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2922,                       53},
+      {-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_str2941,                   352},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2953,                    62},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2956,                             474},
+      {-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_str2976,                               536},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2992,                                 244},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3004,                                   216},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3009,                                     85},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3020,                                       48},
+      {-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_str3039,                           216},
+      {-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_str3064,                               196},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3076,                                    117},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3083,                                   89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-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_str3117,                                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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3152,                                    127},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3158,                                    206},
+      {-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_str3180,                               206},
+      {-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_str3203,                                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}, {-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_str3268,                                 145},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3273,        378},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3280,        528},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3285,        530},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3290,                  380},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-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_str3325,                      373},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-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_str3369,          535},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3447,               371},
+      {-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_str3469,                         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}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3574,                                   117},
+#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_str3581,                                  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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3620,                                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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3704,                            344},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-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_str3757,        529},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str3813,                     154},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3814,                                     74},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str4113,                                    76},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str4259,                                   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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4391,                                   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},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4455,                             73},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4468,                                     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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4506,                                 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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4563,        527}
+#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;
+}
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 9 && \
+      ONIG_UNICODE_VERSION_MINOR == 0 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "9.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 9
+#define ONIG_UNICODE_VERSION_MINOR 0
+#define ONIG_UNICODE_VERSION_TEENY 0
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index 362d6ebfd9..ef97baf737 100755
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -16,20 +16,15 @@ 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)
-        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(", ") + ' */' : ''
+        ck = cv = ''
+        ck = ' /* ' + Array(k).pack("U*") + ' */' if @debug
+        cv = ' /* ' + Array(v).map{|c|[c].pack("U*")}.join(", ") + ' */' if @debug
         dest.print("  {#{sk}#{ck}, {#{v.length}#{mapping_data.flags(k, type, v)}, {#{hex_seq(v)}#{cv}}}},\n")
       end
       data
@@ -254,16 +249,13 @@ 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 = map(from)
+    item = @mappings[from]
+    specials_index = nil
     specials = []
     case type
     when 'CaseFold_11'
@@ -304,15 +296,17 @@ class CaseMapping
         when item.upper  then  flags += '|U'
         when item.lower  then  flags += '|D'
         else
-          raise "Unpredicted case 0 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
+          unless from=='03B9' or from=='03BC'
+            warn 'Unpredicted case 0; check data or adjust program (enc/unicode/case_folding.rb).'
+          end
         end
         unless item.upper == item.title
           if item.code == item.title
-            flags += '|IT'   # was unpredicted case 1
+            warn 'Unpredicted case 1; check data or adjust program (enc/unicode/case_folding.rb).'
           elsif item.title==to[1]
             flags += '|ST'
           else
-            raise "Unpredicted case 2 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
+            warn 'Unpredicted case 2; check data or adjust program (enc/unicode/case_folding.rb).'
           end
         end
       end
@@ -330,7 +324,7 @@ class CaseMapping
   end
 
   def specials_output
-    "static const OnigCodePoint CaseMappingSpecials[] = {\n" +
+    "OnigCodePoint CaseMappingSpecials[] = {\n" +
     @specials.map do |sps|
       '   ' + sps.map do |sp|
         chars = sp.split(/ /)
@@ -409,8 +403,8 @@ if $0 == __FILE__
     s = f.string
   end
   if dest
-    open(dest, "wb") do |file|
-      file.print(s)
+    open(dest, "wb") do |f|
+      f.print(s)
     end
   else
     STDOUT.print(s)
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
index 08f9072c43..cf835e6538 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -1,10 +1,7 @@
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
+#include "encindex.h"
 #ifndef ENCINDEX_US_ASCII
-# define ENCINDEX_US_ASCII 0
+#define ENCINDEX_US_ASCII 0
 #endif
 
 static int
@@ -32,9 +29,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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 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 f9dd7119d6..e8b97983bf 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -249,8 +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,
+  onigenc_unicode_case_map,
 };
 ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
index 2c8438d0be..67ec2ad178 100644
--- a/enc/utf_16le.c
+++ b/enc/utf_16le.c
@@ -242,7 +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,
+  onigenc_unicode_case_map,
 };
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index 17841e52a4..a57b854674 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -30,23 +30,11 @@
 #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,
-		    OnigEncoding enc)
+utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
 {
-  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);
-  }
+  return 4;
 }
 
 static int
@@ -199,8 +187,9 @@ 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,
+  onigenc_unicode_case_map,
 };
 ENC_ALIAS("UCS-4BE", "UTF-32BE")
+
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
index 18b798f102..c48089d6ed 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -30,23 +30,11 @@
 #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,
-		    OnigEncoding enc)
+utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
+		    OnigEncoding enc ARG_UNUSED)
 {
-  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);
-  }
+  return 4;
 }
 
 static int
@@ -199,8 +187,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,
+  onigenc_unicode_case_map,
 };
 ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_8.c b/enc/utf_8.c
index cdf2510d84..862b13fd9b 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -28,20 +28,17 @@
  */
 
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
+#include "encindex.h"
 #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
 
@@ -417,7 +414,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 OnigEncodingDefine(utf_8, UTF_8) = {
   mbc_enc_len,
   "UTF-8",     /* name */
-  4,           /* max byte length */
+  6,           /* max byte length */
   1,           /* min byte length */
   is_mbc_newline,
   mbc_to_code,
@@ -431,9 +428,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,
+  onigenc_unicode_case_map,
 };
 ENC_ALIAS("CP65001", "UTF-8")
 
@@ -447,3 +444,4 @@ 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 d2cf7b16bc..47317ddaf6 100644
--- a/enc/windows_1250.c
+++ b/enc/windows_1250.c
@@ -191,41 +191,40 @@ cp1250_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code = ENC_CP1250_TO_LOWER_CASE(code);
     }
-    else if (code == 0xB5)
-      ;
+    else if (code==0xB5)  ;
     else if ((EncCP1250_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xB9)
+      if (code==0xB9)
 	code = 0xA5;
-      else if (code == 0xBE)
+      else if (code==0xBE)
 	code = 0xBC;
       else if (code >= 0x8A && code <= 0xBF && code!=0xB9)
 	code -= 0x10;
@@ -233,11 +232,11 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
 	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);
 }
 
 OnigEncodingDefine(windows_1250, Windows_1250) = {
@@ -257,9 +256,9 @@ 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,
+  case_map,
 };
 /*
  * Name: windows-1250
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
index fcd0f1015d..0f9b7fa69a 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -181,50 +181,49 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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 ((EncCP1251_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code = ENC_CP1251_TO_LOWER_CASE(code);
     }
-    else if (code == 0xB5)
-      ;
+    else if (code==0xB5)  ;
     else if ((EncCP1251_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if ((0x61 <= code && code <= 0x7A) || (0xE0 <= code && code <= 0xFF))
+      if ((0x61<=code && code<=0x7A) || (0xE0<=code && code<=0xFF))
 	code -= 0x20;
-      else if (code == 0xA2 || code == 0xB3 || code == 0xBE)
+      else if (code==0xA2 || code==0xB3 || code==0xBE)
 	code -= 0x01;
-      else if (code == 0x83)
+      else if (code==0x83)
 	code = 0x81;
-      else if (code == 0xBC)
+      else if (code==0xBC)
 	code = 0xA3;
-      else if (code == 0xB4)
+      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);
+    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);
 }
 
 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,
@@ -239,9 +238,9 @@ 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,
+  case_map,
 };
 /*
  * Name: windows-1251
diff --git a/enc/windows_1252.c b/enc/windows_1252.c
index 5f90c15601..4427f8e31e 100644
--- a/enc/windows_1252.c
+++ b/enc/windows_1252.c
@@ -190,43 +190,42 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
   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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      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_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 (code==0x83 || code==0xAA || code==0xBA || code==0xB5)  ;
     else if ((EncCP1252_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
+	     && (flags&ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0x9A || code == 0x9C || code == 0x9E)
+      if (code==0x9A || code==0x9C || code==0x9E)
 	code -= 0x10;
-      else if (code == 0xFF)
+      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);
+    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);
 }
 
 OnigEncodingDefine(windows_1252, Windows_1252) = {
@@ -246,9 +245,9 @@ 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,
+  case_map,
 };
 /*
  * Name: windows-1252
diff --git a/enc/windows_1253.c b/enc/windows_1253.c
index 9e9c63a581..2157b55c99 100644
--- a/enc/windows_1253.c
+++ b/enc/windows_1253.c
@@ -214,63 +214,62 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 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 == 0xF2) {
-      if (flags & ONIGENC_CASE_UPCASE) {
+    if (code==0xF2) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	code = 0xD3;
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	code = 0xF3;
       }
     }
-    else if (code == 0xB5) {
-      if (flags & ONIGENC_CASE_UPCASE) {
+    else if (code==0xB5) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	code = 0xCC;
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	code = 0xEC;
       }
     }
-    else if (code == 0xC0 || code == 0xE0 || code == 0xB6)
-      ;
+    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_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_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xDC)
+      if (code==0xDC)
 	code = 0xA2;
-      else if (code >= 0xDD && code <= 0xDF)
+      else if (code>=0xDD && code<=0xDF)
 	code -= 0x25;
-      else if (code == 0xFC)
+      else if (code==0xFC)
 	code = 0xBC;
-      else if (code == 0xFD || code == 0xFE)
+      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);
+    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);
 }
 
 OnigEncodingDefine(windows_1253, Windows_1253) = {
@@ -290,8 +289,8 @@ OnigEncodingDefine(windows_1253, Windows_1253) = {
   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,
+  case_map,
 };
 ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/windows_1254.c b/enc/windows_1254.c
index 9ae66978a2..466041974d 100644
--- a/enc/windows_1254.c
+++ b/enc/windows_1254.c
@@ -60,9 +60,9 @@ static const UChar EncCP1254_ToLowerCaseTable[256] = {
   '\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',
+  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
   '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\377',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
   '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
   '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
   '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
@@ -70,7 +70,7 @@ static const UChar EncCP1254_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', '\151', '\376', '\337',
+  '\370', '\371', '\372', '\373', '\374', '\335', '\376', '\337',
   '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
   '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
   '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
@@ -95,9 +95,9 @@ static const unsigned short EncCP1254_CtypeTable[256] = {
   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,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
   0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
   0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
   0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
@@ -212,73 +212,16 @@ 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 ((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) = {
+OnigEncodingDefine(windows_1254, Windown_1254) = {
   onigenc_single_byte_mbc_enc_len,
   "Windows-1254",  /* name */
   1,             /* max enc length */
@@ -295,8 +238,8 @@ OnigEncodingDefine(windows_1254, Windows_1254) = {
   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,
+  onigenc_single_byte_ascii_only_case_map,
 };
 ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/windows_1257.c b/enc/windows_1257.c
index 936a94ac76..40cdb969aa 100644
--- a/enc/windows_1257.c
+++ b/enc/windows_1257.c
@@ -216,9 +216,9 @@ 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,
@@ -228,56 +228,55 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 #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)
+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) {
+    if (code==SHARP_s) {
+      if (flags&ONIGENC_CASE_UPCASE) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+	code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
       }
-      else if (flags & ONIGENC_CASE_FOLD) {
+      else if (flags&ONIGENC_CASE_FOLD) {
 	flags |= ONIGENC_CASE_MODIFIED;
 	*to++ = 's';
 	code = 's';
       }
     }
-    else if (code == 0xB5)
-      ;
+    else if (code==0xB5) ;
     else if ((EncCP1252_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      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_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)
+      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)
+      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);
+    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);
 }
 
 OnigEncodingDefine(windows_1257, Windows_1257) = {
@@ -297,8 +296,9 @@ OnigEncodingDefine(windows_1257, Windows_1257) = {
   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,
+  case_map,
 };
+
 ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/windows_31j.c b/enc/windows_31j.c
index e3a468f414..71836c1f13 100644
--- a/enc/windows_31j.c
+++ b/enc/windows_31j.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  windows_31j.c -  Onigmo (Oniguruma-mod) (regular expression library)
+  cp932.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.h"
+#include "shift_jis.c"
 
 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,9 +48,9 @@ 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,
+  onigenc_ascii_only_case_map,
 };
 /*
  * Name: Windows-31J
diff --git a/encindex.h b/encindex.h
index 658b60a9fd..dcb1646f3a 100644
--- a/encindex.h
+++ b/encindex.h
@@ -57,8 +57,6 @@ 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 10a0ab0371..f5ec1e756d 100644
--- a/encoding.c
+++ b/encoding.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
 #include "internal.h"
 #include "encindex.h"
 #include "regenc.h"
@@ -260,6 +259,11 @@ rb_find_encoding(VALUE enc)
     return rb_enc_from_index(idx);
 }
 
+void
+rb_gc_mark_encodings(void)
+{
+}
+
 static int
 enc_table_expand(int newsize)
 {
@@ -656,7 +660,7 @@ load_encoding(const char *name)
 	++s;
     }
     FL_UNSET(enclib, FL_TAINT);
-    enclib = rb_fstring(enclib);
+    OBJ_FREEZE(enclib);
     ruby_verbose = Qfalse;
     ruby_debug = Qfalse;
     errinfo = rb_errinfo();
@@ -720,17 +724,6 @@ 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)
 {
@@ -756,12 +749,6 @@ enc_capable(VALUE obj)
     }
 }
 
-int
-rb_enc_capable(VALUE obj)
-{
-    return enc_capable(obj);
-}
-
 ID
 rb_id_encoding(void)
 {
@@ -793,26 +780,24 @@ 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)) {
-	    tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
-	}
-	if (is_obj_encoding(tmp)) {
-	    i = enc_check_encoding(tmp);
-	}
-	break;
+	if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
+	else obj = tmp;
+	if (NIL_P(obj)) break;
       case T_DATA:
 	if (is_data_encoding(obj)) {
 	    i = enc_check_encoding(obj);
 	}
-	break;
-      default:
+	else {
+	    goto as_default;
+	}
 	break;
     }
     return i;
@@ -821,10 +806,6 @@ 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;
@@ -1050,8 +1031,7 @@ 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;
-    int l;
+    unsigned int c, l;
     if (e <= p)
         return -1;
     if (rb_enc_asciicompat(enc)) {
@@ -1169,7 +1149,8 @@ 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_fstring_cstr((char *)name);
+	VALUE str = rb_usascii_str_new2((char *)name);
+	OBJ_FREEZE(str);
 	rb_ary_push(arg[1], str);
     }
     return ST_CONTINUE;
@@ -1703,7 +1684,8 @@ 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_fstring_cstr((char *)name);
+    key = rb_usascii_str_new2((char *)name);
+    OBJ_FREEZE(key);
     rb_hash_aset(aliases, key, str);
     return ST_CONTINUE;
 }
diff --git a/enum.c b/enum.c
index 7b4d4b42a8..487ee55c7e 100644
--- a/enum.c
+++ b/enum.c
@@ -9,12 +9,9 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
 #include "internal.h"
 #include "ruby/util.h"
 #include "id.h"
-#include "symbol.h"
-#include "transient_heap.h"
 
 #include <assert.h>
 
@@ -22,13 +19,13 @@ VALUE rb_mEnumerable;
 
 static ID id_next;
 static ID id_div;
+static ID id_call;
+static ID id_size;
 
 #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)
@@ -42,27 +39,7 @@ rb_enum_values_pack(int argc, const VALUE *argv)
     i = rb_enum_values_pack(argc, argv); \
 } while (0)
 
-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);
-}
+#define enum_yield rb_yield_values2
 
 static VALUE
 grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
@@ -70,7 +47,7 @@ grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
+    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
 	rb_ary_push(memo->v2, i);
     }
     return Qnil;
@@ -82,8 +59,8 @@ grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, enum_yield(argc, i));
+    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
+	rb_ary_push(memo->v2, rb_yield(i));
     }
     return Qnil;
 }
@@ -143,34 +120,6 @@ enum_grep_v(VALUE obj, VALUE pat)
     return ary;
 }
 
-#define COUNT_BIGNUM IMEMO_FL_USER0
-#define MEMO_V3_SET(m, v) RB_OBJ_WRITE((m), &(m)->u3.value, (v))
-
-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
 count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
@@ -179,7 +128,7 @@ count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v1)) {
-	imemo_count_up(memo);
+	memo->u3.cnt++;
     }
     return Qnil;
 }
@@ -189,8 +138,8 @@ count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(rb_yield_values2(argc, argv))) {
-	imemo_count_up(memo);
+    if (RTEST(enum_yield(argc, argv))) {
+	memo->u3.cnt++;
     }
     return Qnil;
 }
@@ -200,7 +149,7 @@ count_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    imemo_count_up(memo);
+    memo->u3.cnt++;
     return Qnil;
 }
 
@@ -247,7 +196,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 imemo_count_value(memo);
+    return INT2NUM(memo->u3.cnt);
 }
 
 static VALUE
@@ -255,7 +204,7 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(enum_yield(argc, i))) {
+    if (RTEST(rb_yield(i))) {
 	struct MEMO *memo = MEMO_CAST(memop);
 	MEMO_V1_SET(memo, i);
 	memo->u3.cnt = 1;
@@ -278,13 +227,13 @@ 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 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
  *
  */
 
@@ -294,7 +243,7 @@ enum_find(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE if_none;
 
-    if_none = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
+    rb_scan_args(argc, argv, "01", &if_none);
     RETURN_ENUMERATOR(obj, argc, argv);
     memo = MEMO_NEW(Qundef, 0, 0);
     rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
@@ -315,10 +264,10 @@ find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v2)) {
-	MEMO_V1_SET(memo, imemo_count_value(memo));
+	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
 	rb_iter_break();
     }
-    imemo_count_up(memo);
+    memo->u3.cnt++;
     return Qnil;
 }
 
@@ -327,11 +276,11 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(rb_yield_values2(argc, argv))) {
-	MEMO_V1_SET(memo, imemo_count_value(memo));
+    if (RTEST(enum_yield(argc, argv))) {
+	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
 	rb_iter_break();
     }
-    imemo_count_up(memo);
+    memo->u3.cnt++;
     return Qnil;
 }
 
@@ -383,7 +332,7 @@ find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(enum_yield(argc, i))) {
+    if (RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
@@ -392,7 +341,9 @@ find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 static VALUE
 enum_size(VALUE self, VALUE args, VALUE eobj)
 {
-    return rb_check_funcall_default(self, id_size, 0, 0, Qnil);
+    VALUE r;
+    r = rb_check_funcall(self, id_size, 0, 0);
+    return (r == Qundef) ? Qnil : r;
 }
 
 static long
@@ -417,10 +368,8 @@ 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.
@@ -432,8 +381,6 @@ enum_size_over_p(VALUE obj, long n)
  *
  *     [1,2,3,4,5].select { |num|  num.even?  }   #=> [2, 4]
  *
- *     [:foo, :bar].filter { |x| x == :foo }   #=> [:foo]
- *
  *  See also Enumerable#reject.
  */
 
@@ -455,7 +402,7 @@ reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (!RTEST(enum_yield(argc, i))) {
+    if (!RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
@@ -467,7 +414,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 <code>false</code>.
+ *  +block+ returns false.
  *
  *  If no block is given, an Enumerator is returned instead.
  *
@@ -494,7 +441,7 @@ enum_reject(VALUE obj)
 static VALUE
 collect_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    rb_ary_push(ary, rb_yield_values2(argc, argv));
+    rb_ary_push(ary, enum_yield(argc, argv));
 
     return Qnil;
 }
@@ -529,13 +476,11 @@ 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();
-    min_argc = rb_block_min_max_arity(&max_argc);
-    rb_lambda_call(obj, id_each, 0, 0, collect_i, min_argc, max_argc, ary);
+    rb_block_call(obj, id_each, 0, 0, collect_i, ary);
 
     return ary;
 }
@@ -545,7 +490,7 @@ flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     VALUE tmp;
 
-    i = rb_yield_values2(argc, argv);
+    i = enum_yield(argc, argv);
     tmp = rb_check_array_type(i);
 
     if (NIL_P(tmp)) {
@@ -614,42 +559,38 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
 static VALUE
 enum_to_h_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
+    VALUE key_value_pair;
     ENUM_WANT_SVALUE();
     rb_thread_check_ints();
-    return rb_hash_set_pair(hash, i);
-}
-
-static VALUE
-enum_to_h_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
-{
-    rb_thread_check_ints();
-    return rb_hash_set_pair(hash, rb_yield_values2(argc, argv));
+    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;
 }
 
 /*
  *  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_func *iter = rb_block_given_p() ? enum_to_h_ii : enum_to_h_i;
-    rb_block_call(obj, id_each, argc, argv, iter, hash);
+    rb_block_call(obj, id_each, argc, argv, enum_to_h_i, hash);
     OBJ_INFECT(hash, obj);
     return hash;
 }
@@ -683,7 +624,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_funcallv(memo->v1, mid, 1, &i));
+	MEMO_V1_SET(memo, rb_funcall(memo->v1, mid, 1, i));
     }
     else {
 	VALUE args[2];
@@ -717,16 +658,15 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
 
     id = SYM2ID(op);
     if (id == idPLUS) {
-	if (RB_INTEGER_TYPE_P(v) &&
-	    rb_method_basic_definition_p(rb_cInteger, idPLUS) &&
-	    rb_obj_respond_to(v, idPLUS, FALSE)) {
+        if ((FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM)) &&
+             rb_method_basic_definition_p(rb_cInteger, idPLUS)) {
             n = 0;
             for (; i < RARRAY_LEN(ary); i++) {
                 e = RARRAY_AREF(ary, i);
                 if (FIXNUM_P(e)) {
                     n += FIX2LONG(e); /* should not overflow long type */
                     if (!FIXABLE(n)) {
-                        v = rb_big_plus(ULONG2NUM(n), v);
+                        v = rb_big_plus(LONG2NUM(n), v);
                         n = 0;
                     }
                 }
@@ -745,8 +685,7 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
         }
     }
     for (; i < RARRAY_LEN(ary); i++) {
-        VALUE arg = RARRAY_AREF(ary, i);
-        v = rb_funcallv_public(v, id, 1, &arg);
+        v = rb_funcall(v, id, 1, RARRAY_AREF(ary, i));
     }
     return v;
 }
@@ -766,9 +705,6 @@ 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
@@ -848,7 +784,7 @@ partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
     VALUE ary;
     ENUM_WANT_SVALUE();
 
-    if (RTEST(enum_yield(argc, i))) {
+    if (RTEST(rb_yield(i))) {
 	ary = memo->v1;
     }
     else {
@@ -894,7 +830,7 @@ group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 
     ENUM_WANT_SVALUE();
 
-    group = enum_yield(argc, i);
+    group = rb_yield(i);
     values = rb_hash_aref(hash, group);
     if (!RB_TYPE_P(values, T_ARRAY)) {
 	values = rb_ary_new3(1, i);
@@ -944,7 +880,7 @@ first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params))
     MEMO_V1_SET(memo, i);
     rb_iter_break();
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 static VALUE enum_take(VALUE obj, VALUE n);
@@ -987,23 +923,16 @@ 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.
- *
- *  Comparisons for the sort will be done using the items' own
- *  <code><=></code> operator or using an optional code block.
+ *  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.
  *
- *  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+.
- *
- *  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"]
+ *     %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
@@ -1028,7 +957,7 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 
     ENUM_WANT_SVALUE();
 
-    v = enum_yield(argc, i);
+    v = rb_yield(i);
 
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
@@ -1050,7 +979,6 @@ 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;
@@ -1062,7 +990,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
     a = *(VALUE *)ap;
     b = *(VALUE *)bp;
 
-    return OPTIMIZED_CMP(a, b, cmp_opt);
+    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
 }
 
 /*
@@ -1073,12 +1001,9 @@ 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
@@ -1123,7 +1048,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *  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
+ *  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.
@@ -1172,9 +1097,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");
@@ -1189,9 +1114,7 @@ enum_sort_by(VALUE obj)
     return ary;
 }
 
-#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 ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
 
 #define DEFINE_ENUMFUNCS(name) \
 static VALUE enum_##name##_func(VALUE result, struct MEMO *memo); \
@@ -1205,25 +1128,12 @@ 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(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)); \
+    return enum_##name##_func(enum_yield(argc, argv), 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)) {
@@ -1236,7 +1146,6 @@ 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
@@ -1245,23 +1154,16 @@ 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(int argc, VALUE *argv, VALUE obj)
+enum_all(VALUE obj)
 {
-    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
-    WARN_UNUSED_BLOCK(argc);
+    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
     return memo->v1;
 }
@@ -1278,7 +1180,6 @@ 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
@@ -1287,23 +1188,16 @@ 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(int argc, VALUE *argv, VALUE obj)
+enum_any(VALUE obj)
 {
-    struct MEMO *memo = MEMO_ENUM_NEW(Qfalse);
-    WARN_UNUSED_BLOCK(argc);
+    struct MEMO *memo = MEMO_NEW(Qfalse, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
     return memo->v1;
 }
@@ -1323,36 +1217,27 @@ 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: 1; /* max if 1 */
-    int by: 1; /* min_by if 1 */
+  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;
 };
 
-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;
-#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
+    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);
 }
 
 static int
@@ -1361,10 +1246,13 @@ 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);
-    cmpint_reenter_check(data, cmp);
+    if (RBASIC(data->buf)->klass) {
+	rb_raise(rb_eRuntimeError, "%s reentered", data->method);
+    }
     return rb_cmpint(cmp, a, b);
 }
 
+
 static void
 nmin_filter(struct nmin_data *data)
 {
@@ -1443,7 +1331,7 @@ nmin_filter(struct nmin_data *data)
 #undef GETPTR
 #undef SWAP
 
-    data->limit = RARRAY_AREF(data->buf, store_index*eltsize); /* the last pivot */
+    data->limit = RARRAY_PTR(data->buf)[store_index*eltsize]; /* the last pivot */
     data->curlen = data->n;
     rb_ary_resize(data->buf, data->n * eltsize);
 }
@@ -1457,7 +1345,7 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
     ENUM_WANT_SVALUE();
 
     if (data->by)
-	cmpv = enum_yield(argc, i);
+	cmpv = rb_yield(i);
     else
 	cmpv = i;
 
@@ -1504,12 +1392,14 @@ 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);
 	}
     }
     else {
@@ -1519,27 +1409,23 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
     result = data.buf;
     if (by) {
 	long 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];
-            }
-        });
+	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];
+	}
 	rb_ary_resize(result, RARRAY_LEN(result)/2);
     }
     else {
-        RARRAY_PTR_USE(result, ptr, {
-            ruby_qsort(ptr, RARRAY_LEN(result), sizeof(VALUE),
-                       data.cmpfunc, (void *)&data);
-        });
+	ruby_qsort(RARRAY_PTR(result), RARRAY_LEN(result), sizeof(VALUE),
+		   data.cmpfunc, (void *)&data);
     }
     if (rev) {
         rb_ary_reverse(result);
     }
-    RBASIC_SET_CLASS(result, rb_cArray);
+    *((VALUE *)&RBASIC(result)->klass) = rb_cArray;
     return result;
 
 }
@@ -1547,7 +1433,6 @@ 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>
@@ -1555,26 +1440,19 @@ 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(int argc, VALUE *argv, VALUE obj)
+enum_one(VALUE obj)
 {
-    struct MEMO *memo = MEMO_ENUM_NEW(Qundef);
+    struct MEMO *memo = MEMO_NEW(Qundef, 0, 0);
     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;
@@ -1593,31 +1471,23 @@ 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(int argc, VALUE *argv, VALUE obj)
+enum_none(VALUE obj)
 {
-    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
-
-    WARN_UNUSED_BLOCK(argc);
+    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
     return memo->v1;
 }
@@ -1682,12 +1552,11 @@ 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 a sorted array.
+ *  as an 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
@@ -1698,7 +1567,9 @@ enum_min(int argc, VALUE *argv, VALUE obj)
     VALUE result;
     VALUE num;
 
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+    rb_scan_args(argc, argv, "01", &num);
+
+    if (!NIL_P(num))
        return rb_nmin_run(obj, num, 0, 0, 0);
 
     m->min = Qundef;
@@ -1774,12 +1645,11 @@ 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, sorted in descending order.
+ *  as an array.
  *
  *     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
@@ -1790,7 +1660,9 @@ enum_max(int argc, VALUE *argv, VALUE obj)
     VALUE result;
     VALUE num;
 
-    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+    rb_scan_args(argc, argv, "01", &num);
+
+    if (!NIL_P(num))
        return rb_nmin_run(obj, num, 0, 1, 0);
 
     m->max = Qundef;
@@ -1962,18 +1834,17 @@ 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 = enum_yield(argc, i);
+    v = rb_yield(i);
     if (memo->v1 == Qundef) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
-    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) < 0) {
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) < 0) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
@@ -1996,8 +1867,7 @@ 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. These +n+ elements are sorted by the value from the
- *  given block.
+ *  as an array.
  *
  *     a = %w[albatross dog horse]
  *     p a.min_by(2) {|x| x.length } #=> ["dog", "horse"]
@@ -2009,11 +1879,11 @@ enum_min_by(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE num;
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", &num);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    if (argc && !NIL_P(num = argv[0]))
+    if (!NIL_P(num))
         return rb_nmin_run(obj, num, 1, 0, 0);
 
     memo = MEMO_NEW(Qundef, Qnil, 0);
@@ -2024,18 +1894,17 @@ 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 = enum_yield(argc, i);
+    v = rb_yield(i);
     if (memo->v1 == Qundef) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
-    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) > 0) {
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) > 0) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
@@ -2057,9 +1926,8 @@ 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, maximum +n+ elements are returned
- *  as an array. These +n+ elements are sorted by the value from the
- *  given block, in descending order.
+ *  If the +n+ argument is given, minimum +n+ elements are returned
+ *  as an array.
  *
  *     a = %w[albatross dog horse]
  *     a.max_by(2) {|x| x.length } #=> ["albatross", "horse"]
@@ -2116,11 +1984,11 @@ enum_max_by(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE num;
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", &num);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    if (argc && !NIL_P(num = argv[0]))
+    if (!NIL_P(num))
         return rb_nmin_run(obj, num, 1, 1, 0);
 
     memo = MEMO_NEW(Qundef, Qnil, 0);
@@ -2140,8 +2008,6 @@ 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;
@@ -2149,11 +2015,11 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 	memo->max = i2;
     }
     else {
-	if (OPTIMIZED_CMP(v1, memo->min_bv, cmp_opt) < 0) {
+	if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo->min_bv), v1, memo->min_bv) < 0) {
 	    memo->min_bv = v1;
 	    memo->min = i1;
 	}
-	if (OPTIMIZED_CMP(v2, memo->max_bv, cmp_opt) > 0) {
+	if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo->max_bv), v2, memo->max_bv) > 0) {
 	    memo->max_bv = v2;
 	    memo->max = i2;
 	}
@@ -2163,14 +2029,13 @@ 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 = enum_yield(argc, i);
+    vi = rb_yield(i);
 
     if (memo->last_bv == Qundef) {
         memo->last_bv = vi;
@@ -2181,7 +2046,7 @@ minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     j = memo->last;
     memo->last_bv = Qundef;
 
-    n = OPTIMIZED_CMP(vj, vi, cmp_opt);
+    n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi);
     if (n == 0) {
         i = j;
         vi = vj;
@@ -2276,11 +2141,9 @@ enum_member(VALUE obj, VALUE val)
 static VALUE
 each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 {
-    struct MEMO *m = MEMO_CAST(memo);
-    VALUE n = imemo_count_value(m);
+    long n = MEMO_CAST(memo)->u3.cnt++;
 
-    imemo_count_up(m);
-    return rb_yield_values(2, rb_enum_values_pack(argc, argv), n);
+    return rb_yield_values(2, rb_enum_values_pack(argc, argv), INT2NUM(n));
 }
 
 /*
@@ -2324,33 +2187,27 @@ 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 len;
+    long i;
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     ary = enum_to_a(argc, argv, obj);
 
-    len = RARRAY_LEN(ary);
-    while (len--) {
-        long nlen;
-        rb_yield(RARRAY_AREF(ary, len));
-        nlen = RARRAY_LEN(ary);
-        if (nlen < len) {
-            len = nlen;
-        }
+    for (i = RARRAY_LEN(ary); --i >= 0; ) {
+	rb_yield(RARRAY_AREF(ary, i));
     }
 
     return obj;
@@ -2361,7 +2218,7 @@ static VALUE
 each_val_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
     ENUM_WANT_SVALUE();
-    enum_yield(argc, i);
+    rb_yield(i);
     return Qnil;
 }
 
@@ -2402,22 +2259,6 @@ 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
@@ -2455,8 +2296,8 @@ enum_each_slice_size(VALUE obj, VALUE args, VALUE eobj)
     size = enum_size(obj, 0, 0);
     if (size == Qnil) return Qnil;
 
-    n = add_int(size, slice_size-1);
-    return div_int(n, slice_size);
+    n = rb_funcall(size, '+', 1, LONG2NUM(slice_size-1));
+    return rb_funcall(n, id_div, 1, LONG2FIX(slice_size));
 }
 
 /*
@@ -2521,8 +2362,6 @@ 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");
@@ -2530,8 +2369,8 @@ enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
     size = enum_size(obj, 0, 0);
     if (size == Qnil) return Qnil;
 
-    n = add_int(size, 1 - cons_size);
-    return (OPTIMIZED_CMP(n, zero, cmp_opt) == -1) ? zero : n;
+    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;
 }
 
 /*
@@ -2626,7 +2465,7 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 	}
     }
     if (NIL_P(result)) {
-	enum_yield_array(tmp);
+	rb_yield(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
@@ -2677,7 +2516,7 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 	}
     }
     if (NIL_P(result)) {
-	enum_yield_array(tmp);
+	rb_yield(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
@@ -2736,14 +2575,13 @@ 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_funcallv(argv[i], conv, 1, &sym_each);
+	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
 	}
     }
     if (!rb_block_given_p()) {
@@ -2800,7 +2638,7 @@ enum_take(VALUE obj, VALUE n)
 static VALUE
 take_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    if (!RTEST(rb_yield_values2(argc, argv))) rb_iter_break();
+    if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
     rb_ary_push(ary, rb_enum_values_pack(argc, argv));
     return Qnil;
 }
@@ -2880,7 +2718,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(enum_yield(argc, i))) {
+    if (!memo->u3.state && !RTEST(rb_yield(i))) {
 	memo->u3.state = TRUE;
     }
     if (memo->u3.state) {
@@ -2923,30 +2761,27 @@ cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    rb_ary_push(ary, argc > 1 ? i : rb_ary_new_from_values(argc, argv));
-    enum_yield(argc, i);
+    rb_ary_push(ary, i);
+    rb_yield(i);
     return Qnil;
 }
 
 static VALUE
 enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
 {
-    long mul = 0;
+    long mul;
     VALUE n = Qnil;
-    VALUE size;
+    VALUE size = enum_size(self, args, 0);
+
+    if (size == Qnil) return Qnil;
 
     if (args && (RARRAY_LEN(args) > 0)) {
 	n = RARRAY_AREF(args, 0);
-	if (!NIL_P(n)) 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 (n == Qnil) return DBL2NUM(INFINITY);
+    mul = NUM2LONG(n);
     if (mul <= 0) return INT2FIX(0);
-    n = LONG2FIX(mul);
-    return rb_funcallv(size, '*', 1, &n);
+    return rb_funcall(size, '*', 1, LONG2FIX(mul));
 }
 
 /*
@@ -2977,10 +2812,10 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     VALUE nv = Qnil;
     long n, i, len;
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", &nv);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_cycle_size);
-    if (!argc || NIL_P(nv = argv[0])) {
+    if (NIL_P(nv)) {
         n = -1;
     }
     else {
@@ -2994,7 +2829,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++) {
-	    enum_yield_array(RARRAY_AREF(ary, i));
+            rb_yield(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
@@ -3017,21 +2852,18 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 
     ENUM_WANT_SVALUE();
 
-    v = rb_funcallv(argp->categorize, id_call, 1, &i);
+    v = rb_funcall(argp->categorize, id_call, 1, i);
 
     if (v == alone) {
         if (!NIL_P(argp->prev_value)) {
-	    s = rb_assoc_new(argp->prev_value, argp->prev_elts);
-            rb_funcallv(argp->yielder, id_lshift, 1, &s);
+            rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
             argp->prev_value = argp->prev_elts = Qnil;
         }
-	v = rb_assoc_new(v, rb_ary_new3(1, i));
-        rb_funcallv(argp->yielder, id_lshift, 1, &v);
+        rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(v, rb_ary_new3(1, i)));
     }
     else if (NIL_P(v) || v == separator) {
         if (!NIL_P(argp->prev_value)) {
-	    v = rb_assoc_new(argp->prev_value, argp->prev_elts);
-            rb_funcallv(argp->yielder, id_lshift, 1, &v);
+            rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
             argp->prev_value = argp->prev_elts = Qnil;
         }
     }
@@ -3048,8 +2880,7 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
                 rb_ary_push(argp->prev_elts, i);
             }
             else {
-		s = rb_assoc_new(argp->prev_value, argp->prev_elts);
-                rb_funcallv(argp->yielder, id_lshift, 1, &s);
+                rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
                 argp->prev_value = v;
                 argp->prev_elts = rb_ary_new3(1, i);
             }
@@ -3073,10 +2904,8 @@ 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)) {
-	arg = rb_assoc_new(memo->prev_value, memo->prev_elts);
-	rb_funcallv(memo->yielder, id_lshift, 1, &arg);
-    }
+    if (!NIL_P(memo->prev_elts))
+	rb_funcall(memo->yielder, id_lshift, 1, rb_assoc_new(memo->prev_value, memo->prev_elts));
     return Qnil;
 }
 
@@ -3166,14 +2995,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;
 
-    RETURN_SIZED_ENUMERATOR(enumerable, 0, 0, enum_size);
+    if (!rb_block_given_p())
+	rb_raise(rb_eArgError, "no block given");
 
     enumerator = rb_obj_alloc(rb_cEnumerator);
     rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
@@ -3199,12 +3028,12 @@ slicebefore_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
     ENUM_WANT_SVALUE();
 
     if (!NIL_P(argp->sep_pat))
-        header_p = rb_funcallv(argp->sep_pat, id_eqq, 1, &i);
+        header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
     else
-        header_p = rb_funcallv(argp->sep_pred, id_call, 1, &i);
+        header_p = rb_funcall(argp->sep_pred, id_call, 1, i);
     if (RTEST(header_p)) {
         if (!NIL_P(argp->prev_elts))
-            rb_funcallv(argp->yielder, id_lshift, 1, &argp->prev_elts);
+            rb_funcall(argp->yielder, id_lshift, 1, argp->prev_elts);
         argp->prev_elts = rb_ary_new3(1, i);
     }
     else {
@@ -3233,7 +3062,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_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
     return Qnil;
 }
 
@@ -3259,7 +3088,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 +to_a+, +map+, etc., are also usable.
+ *  such as map, etc., are also usable.
  *
  *  For example, iteration over ChangeLog entries can be implemented as
  *  follows:
@@ -3290,7 +3119,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 (see +chunk_while+ for a better way):
+ *  as follows:
  *
  *    a = [0, 2, 3, 4, 6, 7, 9]
  *    prev = a[0]
@@ -3369,10 +3198,9 @@ 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|
- *      emp = true
- *      f.slice_before { |line|
- *        prevemp = emp
- *        emp = line == "\n"
+ *      f.slice_before(emp: true) { |line, h|
+ *        prevemp = h[:emp]
+ *        h[:emp] = line == "\n"
  *        prevemp && line.start_with?("From ")
  *      }.each { |mail|
  *        mail.pop if mail.last == "\n"
@@ -3429,16 +3257,16 @@ sliceafter_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     }
 
     if (NIL_P(memo->pred)) {
-        split_p = RTEST(rb_funcallv(memo->pat, id_eqq, 1, &i));
+        split_p = RTEST(rb_funcall(memo->pat, id_eqq, 1, i));
         UPDATE_MEMO;
     }
     else {
-        split_p = RTEST(rb_funcallv(memo->pred, id_call, 1, &i));
+        split_p = RTEST(rb_funcall(memo->pred, id_call, 1, i));
         UPDATE_MEMO;
     }
 
     if (split_p) {
-        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
         UPDATE_MEMO;
         memo->prev_elts = Qnil;
     }
@@ -3463,7 +3291,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_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
     return Qnil;
 }
 
@@ -3551,17 +3379,14 @@ slicewhen_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
         memo->prev_elts = rb_ary_new3(1, i);
     }
     else {
-	VALUE args[2];
-	args[0] = memo->prev_elt;
-	args[1] = i;
-        split_p = RTEST(rb_funcallv(memo->pred, id_call, 2, args));
+        split_p = RTEST(rb_funcall(memo->pred, id_call, 2, memo->prev_elt, i));
         UPDATE_MEMO;
 
         if (memo->inverted)
             split_p = !split_p;
 
         if (split_p) {
-            rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+            rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
             UPDATE_MEMO;
             memo->prev_elts = rb_ary_new3(1, i);
         }
@@ -3594,7 +3419,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_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
     return Qnil;
 }
 
@@ -3609,7 +3434,7 @@ slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  _elt_before_ and _elt_after_,
  *  in the receiver enumerator.
  *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns <code>true</code>.
+ *  the block returns true.
  *
  *  The block is called the length of the receiver enumerator minus one.
  *
@@ -3657,8 +3482,6 @@ 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)
@@ -3688,7 +3511,7 @@ enum_slice_when(VALUE enumerable)
  *  _elt_before_ and _elt_after_,
  *  in the receiver enumerator.
  *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns <code>false</code>.
+ *  the block returns false.
  *
  *  The block is called the length of the receiver enumerator minus one.
  *
@@ -3723,8 +3546,6 @@ 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)
@@ -3790,7 +3611,7 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
                 n = 0;
             }
             if (r != Qundef) {
-                /* r can be an Integer when mathn is loaded */
+                /* 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))
@@ -3810,11 +3631,8 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
         }
     }
     else if (RB_FLOAT_TYPE_P(v)) {
-        /*
-         * Kahan-Babuska balancing compensated summation algorithm
-         * See http://link.springer.com/article/10.1007/s00607-005-0139-x
-         */
-        double x, t;
+        /* Kahan's compensated summation algorithm */
+        double x, y, t;
 
       float_value:
         if (RB_FLOAT_TYPE_P(i))
@@ -3831,35 +3649,14 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
             goto some_value;
         }
 
-        if (isnan(f)) return;
-        if (isnan(x)) {
-            memo->v = i;
-            memo->f = x;
-            return;
-        }
-        if (isinf(x)) {
-            if (isinf(f) && signbit(x) != signbit(f)) {
-                memo->f = NAN;
-                memo->v = DBL2NUM(f);
-            }
-            else {
-                memo->f = x;
-                memo->v = i;
-            }
-            return;
-        }
-        if (isinf(f)) return;
-
-        t = f + x;
-        if (fabs(f) >= fabs(x))
-            c += ((f - t) + x);
-        else
-            c += ((x - t) + f);
+        y = x - c;
+        t = f + y;
+        c = (t - f) - y;
         f = t;
     }
     else {
       some_value:
-        v = rb_funcallv(v, idPLUS, 1, &i);
+        v = rb_funcall(v, idPLUS, 1, i);
     }
 
     memo->v = v;
@@ -3950,8 +3747,11 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
     VALUE beg, end;
     int excl;
 
-    memo.v = (rb_check_arity(argc, 0, 1) == 0) ? LONG2FIX(0) : argv[0];
+    if (rb_scan_args(argc, argv, "01", &memo.v) == 0)
+        memo.v = LONG2FIX(0);
+
     memo.block_given = rb_block_given_p();
+
     memo.n = 0;
     memo.r = Qundef;
 
@@ -3975,13 +3775,13 @@ 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 + memo.c);
+        return DBL2NUM(memo.f);
     }
     else {
         if (memo.n != 0)
             memo.v = rb_fix_plus(LONG2FIX(memo.n), memo.v);
         if (memo.r != Qundef) {
-            /* r can be an Integer when mathn is loaded */
+            /* 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))
@@ -3996,7 +3796,6 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
 static VALUE
 uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
-    ENUM_WANT_SVALUE();
     rb_hash_add_new_element(hash, i, i);
     return Qnil;
 }
@@ -4004,7 +3803,6 @@ uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 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;
 }
@@ -4066,7 +3864,6 @@ 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, "reject", enum_reject, 0);
     rb_define_method(rb_mEnumerable, "collect", enum_collect, 0);
     rb_define_method(rb_mEnumerable, "map", enum_collect, 0);
@@ -4077,10 +3874,10 @@ Init_Enumerable(void)
     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, "first", enum_first, -1);
-    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, "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, "min", enum_min, -1);
     rb_define_method(rb_mEnumerable, "max", enum_max, -1);
     rb_define_method(rb_mEnumerable, "minmax", enum_minmax, 0);
@@ -4110,5 +3907,7 @@ Init_Enumerable(void)
     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");
 }
diff --git a/enumerator.c b/enumerator.c
index 6db3bbe50d..7b83af4ade 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -12,13 +12,7 @@
 
 ************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
-#include "id.h"
-
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
 
 /*
  * Document-class: Enumerator
@@ -107,18 +101,11 @@
  *
  */
 VALUE rb_cEnumerator;
-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;
+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;
 
-#define id_call idCall
-#define id_each idEach
-#define id_eqq idEqq
-#define id_initialize idInitialize
-#define id_size idSize
-
 VALUE rb_eStopIteration;
 
 struct enumerator {
@@ -131,7 +118,6 @@ struct enumerator {
     VALUE feedvalue;
     VALUE stop_exc;
     VALUE size;
-    VALUE procs;
     rb_enumerator_size_func *size_fn;
 };
 
@@ -139,38 +125,15 @@ static VALUE rb_cGenerator, rb_cYielder;
 
 struct generator {
     VALUE proc;
-    VALUE obj;
 };
 
 struct yielder {
     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
  */
@@ -186,7 +149,6 @@ enumerator_mark(void *p)
     rb_gc_mark(ptr->feedvalue);
     rb_gc_mark(ptr->stop_exc);
     rb_gc_mark(ptr->size);
-    rb_gc_mark(ptr->procs);
 }
 
 #define enumerator_free RUBY_TYPED_DEFAULT_FREE
@@ -219,41 +181,6 @@ enumerator_ptr(VALUE obj)
     return ptr;
 }
 
-static void
-proc_entry_mark(void *p)
-{
-    struct proc_entry *ptr = p;
-    rb_gc_mark(ptr->proc);
-    rb_gc_mark(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,
-    },
-};
-
-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
@@ -412,7 +339,7 @@ enumerator_initialize(int argc, VALUE *argv, VALUE obj)
 	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]) == HUGE_VAL)) {
+                (RB_TYPE_P(argv[0], T_FLOAT) && RFLOAT_VALUE(argv[0]) == INFINITY)) {
                 size = argv[0];
             }
             else {
@@ -558,8 +485,6 @@ 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);
@@ -604,9 +529,12 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo;
 
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", &memo);
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_enum_size);
-    memo = (!argc || NIL_P(memo = argv[0])) ? INT2FIX(0) : rb_to_int(memo);
+    if (NIL_P(memo))
+	memo = INT2FIX(0);
+    else
+	memo = rb_to_int(memo);
     return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)MEMO_NEW(memo, 0, 0));
 }
 
@@ -1002,7 +930,6 @@ 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
@@ -1025,25 +952,6 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 	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;
-    }
-
     eobj = rb_attr_get(obj, id_receiver);
     if (NIL_P(eobj)) {
 	eobj = e->obj;
@@ -1058,22 +966,6 @@ 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)
 {
@@ -1101,28 +993,15 @@ 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, ", ");
+		rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
 		OBJ_INFECT(str, arg);
 	    }
-	    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, ")");
 	}
     }
 
@@ -1161,23 +1040,6 @@ 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);
     }
@@ -1279,12 +1141,9 @@ yielder_yield(VALUE obj, VALUE args)
 
 /* :nodoc: */
 static VALUE
-yielder_yield_push(VALUE obj, VALUE arg)
+yielder_yield_push(VALUE obj, VALUE args)
 {
-    struct yielder *ptr = yielder_ptr(obj);
-
-    rb_proc_call_with_block(ptr->proc, 1, &arg, Qnil);
-
+    yielder_yield(obj, args);
     return obj;
 }
 
@@ -1308,7 +1167,6 @@ generator_mark(void *p)
 {
     struct generator *ptr = p;
     rb_gc_mark(ptr->proc);
-    rb_gc_mark(ptr->obj);
 }
 
 #define generator_free RUBY_TYPED_DEFAULT_FREE
@@ -1493,86 +1351,6 @@ 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_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_init_yielder(VALUE val, VALUE m, int argc, VALUE *argv)
-{
-    VALUE yielder = RARRAY_AREF(m, 0);
-    VALUE procs_array = RARRAY_AREF(m, 1);
-    VALUE memos = rb_attr_get(yielder, id_memo);
-    long i = 0;
-    struct MEMO *result;
-    int cont = 1;
-
-    result = MEMO_NEW(Qnil, rb_enum_values_pack(argc, argv),
-		      argc > 1 ? LAZY_MEMO_PACKED : 0);
-
-    for (i = 0; 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(VALUE val, VALUE m, int argc, VALUE *argv)
-{
-    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;
-}
-
 /*
  * call-seq:
  *   Lazy.new(obj, size=nil) { |yielder, *values| ... }
@@ -1623,24 +1401,11 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#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)
+static VALUE
+lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
 {
     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 */
@@ -1649,57 +1414,10 @@ lazy_set_args(VALUE lazy, VALUE args)
     else {
 	rb_ivar_set(lazy, id_arguments, args);
     }
-}
-
-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;
 }
 
-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
@@ -1787,45 +1505,14 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-lazyenum_yield(VALUE proc_entry, struct MEMO *result)
+lazy_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    return rb_proc_call_with_block(entry->proc, 1, &result->memo_value, Qnil);
-}
-
-static VALUE
-lazyenum_yield_values(VALUE proc_entry, struct MEMO *result)
-{
-    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;
-}
+    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
 
-static VALUE
-lazy_map_size(VALUE entry, VALUE receiver)
-{
-    return receiver;
+    rb_funcall(argv[0], id_yield, 1, result);
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_map_funcs = {
-    lazy_map_proc, lazy_map_size,
-};
-
 static VALUE
 lazy_map(VALUE obj)
 {
@@ -1833,15 +1520,15 @@ lazy_map(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy map without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_map_func, 0),
+			   Qnil, lazy_receiver_size);
 }
 
 static VALUE
 lazy_flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, yielder))
 {
-    VALUE arg = rb_enum_values_pack(argc, argv);
-
-    return rb_funcallv(yielder, idLTLT, 1, &arg);
+    return rb_funcallv(yielder, id_yield, argc, argv);
 }
 
 static VALUE
@@ -1856,25 +1543,25 @@ lazy_flat_map_to_ary(VALUE obj, VALUE yielder)
 {
     VALUE ary = rb_check_array_type(obj);
     if (NIL_P(ary)) {
-	rb_funcall(yielder, idLTLT, 1, obj);
+	rb_funcall(yielder, id_yield, 1, obj);
     }
     else {
 	long i;
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_funcall(yielder, idLTLT, 1, RARRAY_AREF(ary, i));
+	    rb_funcall(yielder, id_yield, 1, RARRAY_AREF(ary, i));
 	}
     }
     return Qnil;
 }
 
 static VALUE
-lazy_flat_map_proc(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_flat_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
     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], idLTLT, 1, RARRAY_AREF(result, i));
+	    rb_funcall(argv[0], id_yield, 1, RARRAY_AREF(result, i));
 	}
     }
     else {
@@ -1919,21 +1606,20 @@ lazy_flat_map(VALUE obj)
     }
 
     return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_flat_map_proc, 0),
+					 lazy_flat_map_func, 0),
 			   Qnil, 0);
 }
 
-static struct MEMO *
-lazy_select_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_select_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE chain = lazyenum_yield(proc_entry, result);
-    if (!RTEST(chain)) return 0;
-    return result;
-}
+    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
 
-static const lazyenum_funcs lazy_select_funcs = {
-    lazy_select_proc, 0,
-};
+    if (RTEST(rb_yield(element))) {
+	return rb_funcall(argv[0], id_yield, 1, element);
+    }
+    return Qnil;
+}
 
 static VALUE
 lazy_select(VALUE obj)
@@ -1942,20 +1628,21 @@ lazy_select(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy select without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_select_func, 0),
+			   Qnil, 0);
 }
 
-static struct MEMO *
-lazy_reject_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_reject_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE chain = lazyenum_yield(proc_entry, result);
-    if (RTEST(chain)) return 0;
-    return result;
-}
+    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
 
-static const lazyenum_funcs lazy_reject_funcs = {
-    lazy_reject_proc, 0,
-};
+    if (!RTEST(rb_yield(element))) {
+	return rb_funcall(argv[0], id_yield, 1, element);
+    }
+    return Qnil;
+}
 
 static VALUE
 lazy_reject(VALUE obj)
@@ -1964,85 +1651,77 @@ lazy_reject(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy reject without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_reject_func, 0),
+			   Qnil, 0);
 }
 
-static struct MEMO *
-lazy_grep_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_grep_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    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;
+    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;
 }
 
-static struct MEMO *
-lazy_grep_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_grep_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
+    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
+    VALUE result = rb_funcall(m, id_eqq, 1, i);
 
-    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;
+    if (RTEST(result)) {
+	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
+    }
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_grep_iter_funcs = {
-    lazy_grep_iter_proc, 0,
-};
-
-static const lazyenum_funcs lazy_grep_funcs = {
-    lazy_grep_proc, 0,
-};
-
 static VALUE
 lazy_grep(VALUE obj, VALUE pattern)
 {
-    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);
+    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);
 }
 
-static struct MEMO *
-lazy_grep_v_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_grep_v_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    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;
+    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;
 }
 
-static struct MEMO *
-lazy_grep_v_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_grep_v_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
+    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
+    VALUE result = rb_funcall(m, id_eqq, 1, i);
 
-    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;
+    if (!RTEST(result)) {
+	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
+    }
+    return Qnil;
 }
 
-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,
-};
-
 static VALUE
 lazy_grep_v(VALUE obj, VALUE pattern)
 {
-    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);
+    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);
 }
 
 static VALUE
@@ -2072,7 +1751,7 @@ lazy_zip_arrays_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, arrays))
     for (i = 0; i < RARRAY_LEN(arrays); i++) {
 	rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count));
     }
-    rb_funcall(yielder, idLTLT, 1, ary);
+    rb_funcall(yielder, id_yield, 1, ary);
     rb_ivar_set(yielder, id_memo, LONG2NUM(++count));
     return Qnil;
 }
@@ -2105,7 +1784,7 @@ lazy_zip_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, zip_args))
 		       rb_eStopIteration, (VALUE)0);
 	rb_ary_push(ary, v);
     }
-    rb_funcall(yielder, idLTLT, 1, ary);
+    rb_funcall(yielder, id_yield, 1, ary);
     return Qnil;
 }
 
@@ -2142,90 +1821,80 @@ lazy_zip(int argc, VALUE *argv, VALUE obj)
 			   ary, lazy_receiver_size);
 }
 
-static struct MEMO *
-lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_take_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
     long remain;
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
+    VALUE memo = rb_attr_get(argv[0], id_memo);
     if (NIL_P(memo)) {
-	memo = entry->memo;
+	memo = args;
     }
 
-    remain = NUM2LONG(memo);
-    if (remain == 0) {
-	LAZY_MEMO_SET_BREAK(result);
+    rb_funcallv(argv[0], id_yield, argc - 1, argv + 1);
+    if ((remain = NUM2LONG(memo)-1) == 0) {
+	return Qundef;
     }
     else {
-	if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
-	rb_ary_store(memos, memo_index, LONG2NUM(remain));
+	rb_ivar_set(argv[0], id_memo, LONG2NUM(remain));
+	return Qnil;
     }
-    return result;
 }
 
 static VALUE
-lazy_take_size(VALUE entry, VALUE receiver)
+lazy_take_size(VALUE generator, VALUE args, VALUE lazy)
 {
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(entry, id_arguments), 0));
+    VALUE receiver = lazy_size(lazy);
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, 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,
-};
-
 static VALUE
 lazy_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
-    int argc = 0;
-    VALUE argv[2];
+    VALUE lazy;
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
-
     if (len == 0) {
-       argv[0] = sym_cycle;
-       argv[1] = INT2NUM(0);
-       argc = 2;
+	VALUE len = INT2FIX(0);
+	lazy = lazy_to_enum_i(obj, sym_cycle, 1, &len, 0);
     }
-
-    return lazy_add_method(obj, argc, argv, n, rb_ary_new3(1, n), &lazy_take_funcs);
+    else {
+	lazy = rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_take_func, n);
+    }
+    return lazy_set_method(lazy, rb_ary_new3(1, n), lazy_take_size);
 }
 
-static struct MEMO *
-lazy_take_while_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_take_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
-    VALUE take = lazyenum_yield_values(proc_entry, result);
-    if (!RTEST(take)) {
-	LAZY_MEMO_SET_BREAK(result);
-	return 0;
-    }
-    return result;
+    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
+    if (!RTEST(result)) return Qundef;
+    rb_funcallv(argv[0], id_yield, argc - 1, argv + 1);
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_take_while_funcs = {
-    lazy_take_while_proc, 0,
-};
-
 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_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_take_while_func, 0),
+			   Qnil, 0);
 }
 
 static VALUE
-lazy_drop_size(VALUE proc_entry, VALUE receiver)
+lazy_drop_size(VALUE generator, VALUE args, VALUE lazy)
 {
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(proc_entry, id_arguments), 0));
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, id_arguments), 0));
+    VALUE receiver = lazy_size(lazy);
     if (NIL_P(receiver))
 	return receiver;
     if (FIXNUM_P(receiver)) {
@@ -2235,120 +1904,93 @@ lazy_drop_size(VALUE proc_entry, VALUE receiver)
     return rb_funcall(receiver, '-', 1, LONG2NUM(len));
 }
 
-static struct MEMO *
-lazy_drop_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_drop_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
     long remain;
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
+    VALUE memo = rb_attr_get(argv[0], id_memo);
     if (NIL_P(memo)) {
-	memo = entry->memo;
+	memo = args;
     }
-    remain = NUM2LONG(memo);
-    if (remain > 0) {
-	--remain;
-	rb_ary_store(memos, memo_index, LONG2NUM(remain));
-	return 0;
+    if ((remain = NUM2LONG(memo)) == 0) {
+	rb_funcallv(argv[0], id_yield, argc - 1, argv + 1);
     }
-
-    return result;
+    else {
+	rb_ivar_set(argv[0], id_memo, LONG2NUM(--remain));
+    }
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_drop_funcs = {
-    lazy_drop_proc, lazy_drop_size,
-};
-
 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_add_method(obj, 2, argv, n, rb_ary_new3(1, n), &lazy_drop_funcs);
+    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);
 }
 
-static struct MEMO *
-lazy_drop_while_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
+static VALUE
+lazy_drop_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
-    if (NIL_P(memo)) {
-	memo = entry->memo;
+    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);
     }
-
-    if (!RTEST(memo)) {
-	VALUE drop = lazyenum_yield_values(proc_entry, result);
-	if (RTEST(drop)) return 0;
-	rb_ary_store(memos, memo_index, Qtrue);
+    if (memo == Qtrue) {
+	rb_funcallv(argv[0], id_yield, argc - 1, argv + 1);
     }
-    return result;
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_drop_while_funcs = {
-    lazy_drop_while_proc, 0,
-};
-
 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_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_drop_while_func, 0),
+			   Qnil, 0);
 }
 
-static int
-lazy_uniq_check(VALUE chain, VALUE memos, long memo_index)
+static VALUE
+lazy_uniq_i(VALUE i, VALUE hash, int argc, const VALUE *argv, VALUE yielder)
 {
-    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);
+    if (rb_hash_add_new_element(hash, i, Qfalse))
+	return Qnil;
+    return rb_funcallv(yielder, id_yield, argc, argv);
 }
 
-static struct MEMO *
-lazy_uniq_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
-    if (lazy_uniq_check(result->memo_value, memos, memo_index)) return 0;
-    return result;
+    VALUE yielder = (--argc, *argv++);
+    i = rb_enum_values_pack(argc, argv);
+    return lazy_uniq_i(i, hash, argc, argv, yielder);
 }
 
-static struct MEMO *
-lazy_uniq_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
-    VALUE chain = lazyenum_yield(proc_entry, result);
-
-    if (lazy_uniq_check(chain, memos, memo_index)) return 0;
-    return result;
+    VALUE yielder = (--argc, *argv++);
+    i = rb_yield_values2(argc, argv);
+    return lazy_uniq_i(i, hash, argc, argv, yielder);
 }
 
-static const lazyenum_funcs lazy_uniq_iter_funcs = {
-    lazy_uniq_iter_proc, 0,
-};
-
-static const lazyenum_funcs lazy_uniq_funcs = {
-    lazy_uniq_proc, 0,
-};
-
 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);
+    rb_block_call_func *const func =
+	rb_block_given_p() ? lazy_uniq_iter : lazy_uniq_func;
+    VALUE hash = rb_obj_hide(rb_hash_new());
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 func, hash),
+			   0, 0);
 }
 
 static VALUE
@@ -2416,891 +2058,6 @@ stop_result(VALUE self)
     return rb_attr_get(self, id_result);
 }
 
-/*
- * 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(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,
-    },
-    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_yield_block(VALUE arg, VALUE block, int argc, VALUE *argv)
-{
-    return rb_funcallv(block, id_call, argc, argv);
-}
-
-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_block_call(RARRAY_AREF(enums, i), id_each, argc, argv, enum_chain_yield_block, 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.
- */
-
-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_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
- *
- * 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_obj_is_kind_of(obj, rb_cRange)) {
-        component->begin = RANGE_BEG(obj);
-        component->end   = RANGE_END(obj);
-        component->step  = INT2FIX(1);
-        component->exclude_end = RTEST(RANGE_EXCL(obj));
-        return 1;
-    }
-
-    return 0;
-}
-
-/*
- * 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(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);
-}
-
-/*
- * 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 = rb_int_idiv(rb_int_minus(e, b), s);
-    if (rb_num_negative_int_p(len_1)) {
-        if (argc == 0) {
-            return Qnil;
-        }
-        return rb_ary_new_capa(0);
-    }
-
-    last = rb_int_plus(b, rb_int_mul(s, len_1));
-    if ((last_is_adjusted = arith_seq_exclude_end_p(self) && rb_equal(last, e))) {
-        last = rb_int_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, ", ");
-                OBJ_INFECT(str, arg);
-            }
-            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 = rb_int_idiv(rb_int_minus(e, c), s);
-    last = rb_int_plus(c, rb_int_mul(s, len_1));
-    if (x && rb_equal(last, e)) {
-        last = rb_int_minus(last, s);
-    }
-
-    if (rb_num_negative_int_p(s)) {
-        while (NUM_GE(c, last)) {
-            rb_yield(c);
-            c = rb_int_plus(c, s);
-        }
-    }
-    else {
-        while (NUM_GE(last, c)) {
-            rb_yield(c);
-            c = rb_int_plus(c, s);
-        }
-    }
-
-    return self;
-}
-
-static double
-arith_seq_float_step_size(double beg, double end, double step, int excl)
-{
-    double const epsilon = DBL_EPSILON;
-    double n, err;
-
-    if (step == 0) {
-        return HUGE_VAL;
-    }
-    n = (end - beg) / step;
-    err = (fabs(beg) + fabs(end) + fabs(end - beg)) / fabs(step) * epsilon;
-    if (isinf(step)) {
-        return step > 0 ? beg <= end : beg >= end;
-    }
-    if (err > 0.5) err = 0.5;
-    if (excl) {
-        if (n <= 0) return 0;
-        if (n < 1)
-            n = 0;
-        else
-            n = floor(n - err);
-    }
-    else {
-        if (n < 0) return 0;
-        n = floor(n + err);
-    }
-    return n + 1;
-}
-
-/*
- * 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 = arith_seq_float_step_size(NUM2DBL(b), ee, NUM2DBL(s), x);
-        if (isinf(n)) return DBL2NUM(n);
-        if (POSFIXABLE(n)) return LONG2FIX(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;
-}
-
 void
 InitVM_Enumerator(void)
 {
@@ -3326,8 +2083,6 @@ 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);
@@ -3341,7 +2096,6 @@ InitVM_Enumerator(void)
     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, "reject", lazy_reject, 0);
     rb_define_method(rb_cLazy, "grep", lazy_grep, 1);
     rb_define_method(rb_cLazy, "grep_v", lazy_grep_v, 1);
@@ -3355,12 +2109,8 @@ 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);
 
-#if 0 /* for RDoc */
-    rb_define_method(rb_cLazy, "to_a", lazy_to_a, 0);
-#endif
     rb_define_alias(rb_cLazy, "force", "to_a");
 
     rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
@@ -3379,35 +2129,7 @@ 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, 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_define_method(rb_cYielder, "<<", yielder_yield_push, -2);
 
     rb_provide("enumerator.so");	/* for backward compatibility */
 }
@@ -3417,19 +2139,22 @@ 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_begin = rb_intern("begin");
-    id_end = rb_intern("end");
-    id_step = rb_intern("step");
-    id_exclude_end = rb_intern("exclude_end");
     sym_each = ID2SYM(id_each);
     sym_cycle = ID2SYM(rb_intern("cycle"));
 
diff --git a/error.c b/error.c
index a085afd800..4224c5f771 100644
--- a/error.c
+++ b/error.c
@@ -9,9 +9,8 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
-#include "ruby/st.h"
 #include "internal.h"
+#include "ruby/st.h"
 #include "ruby_assert.h"
 #include "vm_core.h"
 
@@ -25,15 +24,6 @@
 #include <unistd.h>
 #endif
 
-#if defined __APPLE__
-# include <AvailabilityMacros.h>
-#endif
-
-/*!
- * \defgroup exception Exception handlings
- * \{
- */
-
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
 #endif
@@ -48,15 +38,10 @@
 
 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_eEAGAIN;
 VALUE rb_eEWOULDBLOCK;
 VALUE rb_eEINPROGRESS;
-static VALUE rb_mWarning;
-static VALUE rb_cWarningBuffer;
-
-static ID id_warn;
 
 extern const char ruby_description[];
 
@@ -66,7 +51,7 @@ static const char REPORTBUG_MSG[] =
 	" or extension libraries.\n" \
 	"Bug reports are welcome.\n" \
 	""
-	"For details: https://www.ruby-lang.org/bugreport.html\n\n" \
+	"For details: http://www.ruby-lang.org/bugreport.html\n\n" \
     ;
 
 static const char *
@@ -137,54 +122,28 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
 }
 
 void
-ruby_deprecated_internal_feature(const char *func)
+rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
 {
-    rb_print_backtrace();
-    rb_fatal("%s is only for internal use and deprecated; do not use", func);
+    ONLY_FOR_INTERNAL_USE("rb_compile_error_with_enc()");
 }
 
-/*
- * call-seq:
- *    warn(msg)  -> nil
- *
- * Writes warning message +msg+ to $stderr. This method is called by
- * Ruby for all emitted warnings.
- */
-
-static VALUE
-rb_warning_s_warn(VALUE mod, VALUE str)
+void
+rb_compile_error(const char *file, int line, const char *fmt, ...)
 {
-    Check_Type(str, T_STRING);
-    rb_must_asciicompat(str);
-    rb_write_error_str(str);
-    return Qnil;
+    ONLY_FOR_INTERNAL_USE("rb_compile_error()");
 }
 
-/*
- *  Document-module: Warning
- *
- *  The Warning module contains a single method named #warn, and the
- *  module extends itself, making <code>Warning.warn</code> available.
- *  Warning.warn is called for all warnings issued by Ruby.
- *  By default, warnings are printed to $stderr.
- *
- *  By overriding Warning.warn, you can change how warnings are
- *  handled by Ruby, either filtering some warnings, and/or outputting
- *  warnings somewhere other than $stderr.  When Warning.warn is
- *  overridden, super can be called to get the default behavior of
- *  printing the warning to $stderr.
- */
-
-VALUE
-rb_warning_warn(VALUE mod, VALUE str)
+void
+rb_compile_error_append(const char *fmt, ...)
 {
-    return rb_funcallv(mod, id_warn, 1, &str);
+    ONLY_FOR_INTERNAL_USE("rb_compile_error_append()");
 }
 
-static void
-rb_write_warning_str(VALUE str)
+void
+ruby_only_for_internal_use(const char *func)
 {
-    rb_warning_warn(rb_mWarning, str);
+    rb_print_backtrace();
+    rb_fatal("%s is only for internal use and deprecated; do not use", func);
 }
 
 static VALUE
@@ -207,7 +166,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_warning_str(str);
+    rb_write_error_str(str);
 }
 
 /* rb_compile_warning() reports only in verbose mode */
@@ -222,100 +181,86 @@ 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_warning_str(str);
+    rb_write_error_str(str);
 }
 
 static VALUE
 warning_string(rb_encoding *enc, const char *fmt, va_list args)
 {
     int line;
-    const char *file = rb_source_location_cstr(&line);
-    return warn_vsprintf(enc, file, line, fmt, args);
-}
+    VALUE file = rb_source_location(&line);
 
-#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);
+    return warn_vsprintf(enc,
+			 NIL_P(file) ? NULL : RSTRING_PTR(file), line,
+			 fmt, args);
+}
 
 void
 rb_warn(const char *fmt, ...)
 {
-    if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    rb_write_warning_str(mesg);
-	}
-    }
+    VALUE mesg;
+    va_list args;
+
+    if (NIL_P(ruby_verbose)) return;
+
+    va_start(args, fmt);
+    mesg = warning_string(0, fmt, args);
+    va_end(args);
+    rb_write_error_str(mesg);
 }
 
 void
 rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
 {
-    if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    rb_write_warning_str(mesg);
-	}
-    }
+    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);
 }
 
 /* rb_warning() reports only in verbose mode */
 void
 rb_warning(const char *fmt, ...)
 {
-    if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    rb_write_warning_str(mesg);
-	}
-    }
-}
+    VALUE mesg;
+    va_list args;
 
-VALUE
-rb_warning_string(const char *fmt, ...)
-{
-    with_warning_string(mesg, 0, fmt) {
-    }
-    return mesg;
+    if (!RTEST(ruby_verbose)) return;
+
+    va_start(args, fmt);
+    mesg = warning_string(0, fmt, args);
+    va_end(args);
+    rb_write_error_str(mesg);
 }
 
 #if 0
 void
 rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
 {
-    if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    rb_write_warning_str(mesg);
-	}
-    }
-}
-#endif
+    VALUE mesg;
+    va_list args;
 
-static inline int
-end_with_asciichar(VALUE str, int c)
-{
-    return RB_TYPE_P(str, T_STRING) &&
-	rb_str_end_with_asciichar(str, c);
-}
+    if (!RTEST(ruby_verbose)) return;
 
-/* :nodoc: */
-static VALUE
-warning_write(int argc, VALUE *argv, VALUE buf)
-{
-    while (argc-- > 0) {
-	rb_str_append(buf, *argv++);
-    }
-    return buf;
+    va_start(args, fmt);
+    mesg = warning_string(enc, fmt, args);
+    va_end(args);
+    rb_write_error_str(mesg);
 }
+#endif
 
 /*
  * call-seq:
  *    warn(msg, ...)   -> nil
  *
- * If warnings have been disabled (for example with the
- * <code>-W0</code> flag), does nothing.  Otherwise,
- * converts each of the messages to strings, appends a newline
- * character to the string if the string does not end in a newline,
- * and calls <code>Warning.warn</code> with the string.
+ * 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")
  *
@@ -323,83 +268,13 @@ warning_write(int argc, VALUE *argv, VALUE buf)
  *
  *    warning 1
  *    warning 2
- *
- * If the <code>uplevel</code> keyword argument is given, the string will
- * be prepended with information for the given caller frame in
- * the same format used by the <code>rb_warn</code> C function.
- *
- *    # In baz.rb
- *    def foo
- *      warn("invalid call to foo", uplevel: 1)
- *    end
- *
- *    def bar
- *      foo
- *    end
- *
- *    bar
- *
- *  <em>produces:</em>
- *
- *    baz.rb:6: warning: invalid call to foo
  */
 
 static VALUE
 rb_warn_m(int argc, VALUE *argv, VALUE exc)
 {
-    VALUE opts, location = Qnil;
-
-    if (!NIL_P(ruby_verbose) && argc > 0 &&
-	    (argc = rb_scan_args(argc, argv, "*:", NULL, &opts)) > 0) {
-	VALUE str = argv[0], uplevel = Qnil;
-	if (!NIL_P(opts)) {
-	    static ID kwds[1];
-	    if (!kwds[0]) {
-		CONST_ID(kwds[0], "uplevel");
-	    }
-	    rb_get_kwargs(opts, kwds, 0, 1, &uplevel);
-	    if (uplevel == Qundef) {
-		uplevel = Qnil;
-	    }
-	    else if (!NIL_P(uplevel)) {
-		VALUE args[2];
-		long lev = NUM2LONG(uplevel);
-		if (lev < 0) {
-		    rb_raise(rb_eArgError, "negative level (%ld)", lev);
-		}
-		args[0] = LONG2NUM(lev + 1);
-		args[1] = INT2FIX(1);
-		location = rb_vm_thread_backtrace_locations(2, args, GET_THREAD()->self);
-		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_write_warning_str(str);
-	}
+    if (!NIL_P(ruby_verbose) && argc > 0) {
+	rb_io_puts(argc, argv, rb_stderr);
     }
     return Qnil;
 }
@@ -443,80 +318,6 @@ bug_report_file(const char *file, int line)
     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)
 {
@@ -527,7 +328,6 @@ 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 { \
@@ -548,8 +348,7 @@ bug_report_end(FILE *out)
 	    (*reporter->func)(out, reporter->data);
 	}
     }
-    fputs(REPORTBUG_MSG, out);
-    postscript_dump(out);
+    fprintf(out, REPORTBUG_MSG);
 }
 
 #define report_bug(file, line, fmt, ctx) do { \
@@ -587,8 +386,8 @@ rb_bug(const char *fmt, ...)
     const char *file = NULL;
     int line = 0;
 
-    if (GET_EC()) {
-	file = rb_source_location_cstr(&line);
+    if (GET_THREAD()) {
+	file = rb_source_loc(&line);
     }
 
     report_bug(file, line, fmt, NULL);
@@ -602,8 +401,8 @@ rb_bug_context(const void *ctx, const char *fmt, ...)
     const char *file = NULL;
     int line = 0;
 
-    if (GET_EC()) {
-	file = rb_source_location_cstr(&line);
+    if (GET_THREAD()) {
+	file = rb_source_loc(&line);
     }
 
     report_bug(file, line, fmt, ctx);
@@ -663,14 +462,13 @@ rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args)
     report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args);
 }
 
-MJIT_FUNC_EXPORTED void
+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();
@@ -829,13 +627,6 @@ 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)
 {
@@ -869,7 +660,6 @@ VALUE rb_eSignal;
 VALUE rb_eFatal;
 VALUE rb_eStandardError;
 VALUE rb_eRuntimeError;
-VALUE rb_eFrozenError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
 VALUE rb_eIndexError;
@@ -892,23 +682,22 @@ VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
 static VALUE rb_eNOERROR;
 
-ID ruby_static_id_cause;
-#define id_cause ruby_static_id_cause
-static ID id_message, id_backtrace;
-static ID id_name, 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;
+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;
 #define id_bt idBt
 #define id_bt_locations idBt_locations
 #define id_mesg idMesg
+#define id_status ruby_static_id_status
 
 #undef rb_exc_new_cstr
 
 VALUE
 rb_exc_new(VALUE etype, const char *ptr, long len)
 {
-    VALUE mesg = rb_str_new(ptr, len);
-    return rb_class_new_instance(1, &mesg, etype);
+    return rb_funcall(etype, id_new, 1, rb_str_new(ptr, len));
 }
 
 VALUE
@@ -921,16 +710,7 @@ VALUE
 rb_exc_new_str(VALUE etype, VALUE str)
 {
     StringValue(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;
+    return rb_funcall(etype, id_new, 1, str);
 }
 
 /*
@@ -946,8 +726,11 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE arg;
 
-    arg = (!rb_check_arity(argc, 0, 1) ? Qnil : argv[0]);
-    return exc_init(exc, arg);
+    rb_scan_args(argc, argv, "01", &arg);
+    rb_ivar_set(exc, id_mesg, arg);
+    rb_ivar_set(exc, id_bt, Qnil);
+
+    return exc;
 }
 
 /*
@@ -993,99 +776,14 @@ 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.
+ * Normally this returns the exception's message or name. By
+ * supplying a to_str method, exceptions are agreeing to
+ * be used where Strings are expected.
  */
 
 static VALUE
@@ -1098,7 +796,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
@@ -1166,27 +864,6 @@ exc_backtrace(VALUE exc)
     return obj;
 }
 
-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
@@ -1247,7 +924,7 @@ exc_set_backtrace(VALUE exc, VALUE bt)
     return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
 }
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_exc_set_backtrace(VALUE exc, VALUE bt)
 {
     return exc_set_backtrace(exc, bt);
@@ -1291,10 +968,10 @@ exc_equal(VALUE exc, VALUE obj)
     if (exc == obj) return Qtrue;
 
     if (rb_obj_class(exc) != rb_obj_class(obj)) {
-	int state;
+	int status = 0;
 
-	obj = rb_protect(try_convert_to_exception, obj, &state);
-	if (state || obj == Qundef) {
+	obj = rb_protect(try_convert_to_exception, obj, &status);
+	if (status || obj == Qundef) {
 	    rb_set_errinfo(Qnil);
 	    return Qfalse;
 	}
@@ -1437,57 +1114,34 @@ 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);
-    if (recv != Qundef) rb_ivar_set(exc, id_recv, 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 [, name], receiver:)  -> name_error
+ *   NameError.new([msg, *, name])  -> name_error
  *
  * Construct a new NameError exception. If given the <i>name</i>
- * parameter may subsequently be examined using the <code>NameError#name</code>
+ * parameter may subsequently be examined using the <code>NameError.name</code>
  * method.
  */
 
 static VALUE
 name_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    ID keywords[1];
-    VALUE values[numberof(keywords)], name, options;
+    VALUE name;
+    VALUE iseqw = Qnil;
 
-    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);
-    name_err_init_attr(self, values[0], name);
+    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);
     return self;
 }
 
-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
@@ -1525,17 +1179,9 @@ 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 [, priv]]])  -> no_method_error
+ *   NoMethodError.new([msg, *, name [, args]])  -> no_method_error
  *
  * Construct a NoMethodError exception for a method of the given name
  * called with the given arguments. The name may be accessed using
@@ -1546,22 +1192,12 @@ nometh_err_init_attr(VALUE exc, VALUE args, int priv)
 static VALUE
 nometh_err_initialize(int argc, VALUE *argv, VALUE 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(argc, argv);
-    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);
+    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;
 }
 
 /* :nodoc: */
@@ -1611,6 +1247,17 @@ rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method)
     return result;
 }
 
+VALUE
+rb_name_err_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;
+}
+
 /* :nodoc: */
 static VALUE
 name_err_mesg_equal(VALUE obj1, VALUE obj2)
@@ -1711,7 +1358,7 @@ name_err_receiver(VALUE self)
 {
     VALUE *ptr, recv, mesg;
 
-    recv = rb_ivar_lookup(self, id_recv, Qundef);
+    recv = rb_ivar_lookup(self, id_receiver, Qundef);
     if (recv != Qundef) return recv;
 
     mesg = rb_attr_get(self, id_mesg);
@@ -1736,13 +1383,6 @@ 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)
 {
@@ -1759,83 +1399,6 @@ 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.
@@ -1846,7 +1409,7 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE mesg;
     if (argc == 0) {
-	mesg = rb_fstring_lit("compile error");
+	mesg = rb_fstring_cstr("compile error");
 	argc = 1;
 	argv = &mesg;
     }
@@ -2082,8 +1645,8 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: Interrupt
  *
- *  Raised when the interrupt signal is received, typically because the
- *  user has pressed Control-C (on most posix platforms). As such, it is a
+ *  Raised with the interrupt signal is received, typically because the
+ *  user pressed on Control-C (on most posix platforms). As such, it is a
  *  subclass of +SignalException+.
  *
  *     begin
@@ -2235,7 +1798,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  Since constant names must start with a capital:
  *
- *     Integer.const_set :answer, 42
+ *     Fixnum.const_set :answer, 42
  *
  *  <em>raises the exception:</em>
  *
@@ -2256,22 +1819,17 @@ syserr_eqq(VALUE self, VALUE exc)
  */
 
 /*
- *  Document-class: FrozenError
+ *  Document-class: RuntimeError
  *
- *  Raised when there is an attempt to modify a frozen object.
+ *  A generic error class raised when an invalid operation is attempted.
  *
  *     [1, 2, 3].freeze << 4
  *
  *  <em>raises the exception:</em>
  *
- *     FrozenError: can't modify frozen Array
- */
-
-/*
- *  Document-class: RuntimeError
+ *     RuntimeError: can't modify frozen Array
  *
- *  A generic error class raised when an invalid operation is attempted.
- *  Kernel#raise will raise a RuntimeError if no Exception class is
+ *  Kernel.raise will raise a RuntimeError if no Exception class is
  *  specified.
  *
  *     raise "ouch"
@@ -2337,7 +1895,7 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  * Document-class: fatal
  *
- * fatal is an Exception that is raised when Ruby has encountered a 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.
  */
 
@@ -2413,7 +1971,6 @@ syserr_eqq(VALUE self, VALUE exc)
  *      * FloatDomainError
  *    * RegexpError
  *    * RuntimeError -- default for +raise+
- *      * FrozenError
  *    * SystemCallError
  *      * Errno::*
  *    * ThreadError
@@ -2429,13 +1986,11 @@ Init_Exception(void)
 {
     rb_eException   = rb_define_class("Exception", rb_cObject);
     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);
@@ -2456,9 +2011,6 @@ 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);
@@ -2487,7 +2039,6 @@ 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_eSecurityError = rb_define_class("SecurityError", rb_eException);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
     rb_eEncodingError = rb_define_class("EncodingError", rb_eStandardError);
@@ -2501,21 +2052,13 @@ Init_Exception(void)
 
     rb_mErrno = rb_define_module("Errno");
 
-    rb_mWarning = rb_define_module("Warning");
-    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);
-
     rb_define_global_function("warn", rb_warn_m, -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?");
@@ -2523,11 +2066,7 @@ 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_top = rb_intern_const("top");
-    id_bottom = rb_intern_const("bottom");
     id_iseq = rb_make_internal_id();
-    id_recv = rb_make_internal_id();
 }
 
 void
@@ -2734,104 +2273,44 @@ 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_warn(const char *fmt, ...)
+rb_sys_warning(const char *fmt, ...)
 {
-    if (!NIL_P(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
-    }
-}
+    VALUE mesg;
+    va_list args;
+    int errno_save;
 
-void
-rb_syserr_warn(int err, const char *fmt, ...)
-{
-    if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, err);
-	}
-    }
-}
+    errno_save = errno;
 
-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;
-    }
-}
+    if (!RTEST(ruby_verbose)) return;
 
-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);
-	}
-    }
+    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;
 }
-#endif
 
 void
-rb_sys_warning(const char *fmt, ...)
+rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
 {
-    if (RTEST(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
-    }
-}
+    VALUE mesg;
+    va_list args;
+    int errno_save;
 
-#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
+    errno_save = errno;
 
-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;
-    }
-}
+    if (!RTEST(ruby_verbose)) return;
 
-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);
-	}
-    }
+    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
@@ -2846,7 +2325,7 @@ rb_load_fail(VALUE path, const char *err)
 void
 rb_error_frozen(const char *what)
 {
-    rb_raise(rb_eFrozenError, "can't modify frozen %s", what);
+    rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
 }
 
 void
@@ -2859,11 +2338,11 @@ rb_error_frozen_object(VALUE frozen_obj)
 	VALUE path = rb_ary_entry(debug_info, 0);
 	VALUE line = rb_ary_entry(debug_info, 1);
 
-	rb_raise(rb_eFrozenError, "can't modify frozen %"PRIsVALUE", created at %"PRIsVALUE":%"PRIsVALUE,
+	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE", created at %"PRIsVALUE":%"PRIsVALUE,
 		 CLASS_OF(frozen_obj), path, line);
     }
     else {
-	rb_raise(rb_eFrozenError, "can't modify frozen %"PRIsVALUE,
+	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE,
 		 CLASS_OF(frozen_obj));
     }
 }
@@ -2910,7 +2389,3 @@ Init_syserr(void)
 #undef defined_error
 #undef undefined_error
 }
-
-/*!
- * \}
- */
diff --git a/eval.c b/eval.c
index 1eeaec56cb..1baf914a3a 100644
--- a/eval.c
+++ b/eval.c
@@ -17,12 +17,7 @@
 #include "gc.h"
 #include "ruby/vm.h"
 #include "vm_core.h"
-#include "mjit.h"
-#include "probes.h"
 #include "probes_helper.h"
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
 
 NORETURN(void rb_raise_jump(VALUE, VALUE));
 
@@ -30,8 +25,9 @@ VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
 ID ruby_static_id_signo, ruby_static_id_status;
-extern ID ruby_static_id_cause;
-#define id_cause ruby_static_id_cause
+static ID id_cause;
+#define id_signo ruby_static_id_signo
+#define id_status ruby_static_id_status
 
 #define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
 
@@ -42,46 +38,35 @@ extern ID ruby_static_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 Ruby VM and builtin libraries.
  * @retval 0 if succeeded.
  * @retval non-zero an error occurred.
  */
 int
 ruby_setup(void)
 {
-    enum ruby_tag_type state;
+    int 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();
 
-    EC_PUSH_TAG(GET_EC());
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
 	rb_call_inits();
 	ruby_prog_init();
 	GET_VM()->running = 1;
     }
-    EC_POP_TAG();
+    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.
  */
@@ -91,7 +76,7 @@ ruby_init(void)
     int state = ruby_setup();
     if (state) {
         if (RTEST(ruby_debug))
-            error_print(GET_EC());
+            error_print(GET_THREAD());
 	exit(EXIT_FAILURE);
     }
 }
@@ -109,12 +94,12 @@ ruby_init(void)
 void *
 ruby_options(int argc, char **argv)
 {
-    enum ruby_tag_type state;
+    int state;
     void *volatile iseq = 0;
 
     ruby_init_stack((void *)&iseq);
-    EC_PUSH_TAG(GET_EC());
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
     }
     else {
@@ -122,18 +107,18 @@ ruby_options(int argc, char **argv)
 	state = error_handle(state);
 	iseq = (void *)INT2FIX(state);
     }
-    EC_POP_TAG();
+    POP_TAG();
     return iseq;
 }
 
 static void
 ruby_finalize_0(void)
 {
-    EC_PUSH_TAG(GET_EC());
-    if (EC_EXEC_TAG() == TAG_NONE) {
+    PUSH_TAG();
+    if (EXEC_TAG() == 0) {
 	rb_trap_exit();
     }
-    EC_POP_TAG();
+    POP_TAG();
     rb_exec_end_proc();
     rb_clear_trace_func();
 }
@@ -142,7 +127,7 @@ static void
 ruby_finalize_1(void)
 {
     ruby_sig_finalize();
-    GET_EC()->errinfo = Qnil;
+    GET_THREAD()->errinfo = Qnil;
     rb_gc_call_finalizer_at_exit();
 }
 
@@ -182,14 +167,13 @@ ruby_cleanup(volatile int ex)
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
-    EC_PUSH_TAG(th->ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(th->ec); });
+    TH_PUSH_TAG(th);
+    if ((state = EXEC_TAG()) == 0) {
+	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(th); });
 
       step_0: step++;
-	errs[1] = th->ec->errinfo;
-        if (THROW_DATA_P(th->ec->errinfo)) th->ec->errinfo = Qnil;
-	rb_set_safe_level_force(0);
+	errs[1] = th->errinfo;
+	th->safe_level = 0;
 	ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
 
 	SAVE_ROOT_JMPBUF(th, ruby_finalize_0());
@@ -198,7 +182,7 @@ ruby_cleanup(volatile int ex)
 	/* protect from Thread#raise */
 	th->status = THREAD_KILLED;
 
-	errs[0] = th->ec->errinfo;
+	errs[0] = th->errinfo;
 	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
     }
     else {
@@ -208,7 +192,7 @@ ruby_cleanup(volatile int ex)
 	}
 	if (ex == 0) ex = state;
     }
-    th->ec->errinfo = errs[1];
+    th->errinfo = errs[1];
     sysex = error_handle(ex);
 
     state = 0;
@@ -217,7 +201,7 @@ ruby_cleanup(volatile int ex)
 
 	if (!RTEST(err)) continue;
 
-	/* th->ec->errinfo contains a NODE while break'ing */
+	/* th->errinfo contains a NODE while break'ing */
 	if (THROW_DATA_P(err)) continue;
 
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
@@ -234,13 +218,11 @@ ruby_cleanup(volatile int ex)
 	}
     }
 
-    mjit_finish(TRUE); /* We still need ISeqs here. */
-
     ruby_finalize_1();
 
     /* unlock again if finalizer took mutexes. */
     rb_threadptr_unlock_all_locking_mutexes(GET_THREAD());
-    EC_POP_TAG();
+    TH_POP_TAG();
     rb_thread_stop_timer_thread();
     ruby_vm_destruct(GET_VM());
     if (state) ruby_default_signal(state);
@@ -253,17 +235,17 @@ ruby_exec_internal(void *n)
 {
     volatile int state;
     rb_iseq_t *iseq = (rb_iseq_t *)n;
-    rb_thread_t * volatile th = GET_THREAD();
+    rb_thread_t *th = GET_THREAD();
 
     if (!n) return 0;
 
-    EC_PUSH_TAG(th->ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    TH_PUSH_TAG(th);
+    if ((state = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(th, {
 	    rb_iseq_eval_main(iseq);
 	});
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
     return state;
 }
 
@@ -410,14 +392,8 @@ 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_class_modify_check(VALUE klass)
+rb_frozen_class_p(VALUE klass)
 {
     if (SPECIAL_CONST_P(klass)) {
       noclass:
@@ -458,9 +434,9 @@ rb_class_modify_check(VALUE klass)
     }
 }
 
-NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE));
+NORETURN(static void rb_longjmp(int, volatile VALUE, VALUE));
 static VALUE get_errinfo(void);
-static VALUE get_ec_errinfo(const rb_execution_context_t *ec);
+static VALUE get_thread_errinfo(rb_thread_t *th);
 
 static VALUE
 exc_setup_cause(VALUE exc, VALUE cause)
@@ -481,103 +457,80 @@ 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 VALUE
-exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
+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)
+{
+    VALUE e;
+    const char *file = 0;
+    int line;
     int nocause = 0;
-    int nocircular = 0;
 
     if (NIL_P(mesg)) {
-	mesg = ec->errinfo;
-	if (INTERNAL_EXCEPTION_P(mesg)) EC_JUMP_TAG(ec, TAG_FATAL);
+	mesg = th->errinfo;
+	if (INTERNAL_EXCEPTION_P(mesg)) TH_JUMP_TAG(th, TAG_FATAL);
 	nocause = 1;
     }
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
 	nocause = 0;
-        nocircular = 1;
     }
-    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;
-        }
+    if (cause != Qundef) {
+	exc_setup_cause(mesg, cause);
     }
-    else if (!NIL_P(*cause) && !rb_obj_is_kind_of(*cause, rb_eException)) {
-        rb_raise(rb_eTypeError, "exception object expected");
+    else if (nocause) {
+	exc_setup_cause(mesg, Qnil);
     }
-
-    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");
-            }
-        }
+    else if (!rb_ivar_defined(mesg, id_cause)) {
+	exc_setup_cause(mesg, get_thread_errinfo(th));
     }
-    return mesg;
-}
-
-static void
-setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
-{
-    VALUE e;
-    const char *file = 0;
-    int line;
 
-    file = rb_source_location_cstr(&line);
-    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);
+    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();
 		}
-	    }
-            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, at);
 		rb_ivar_set(mesg, idBt_locations, at);
-		set_backtrace(mesg, at);
 	    }
-	    rb_ec_reset_raised(ec);
 	}
-	EC_POP_TAG();
-	if (state) goto fatal;
+	else if (NIL_P(get_backtrace(mesg))) {
+	    at = rb_vm_backtrace_object();
+	    if (OBJ_FROZEN(mesg)) {
+		mesg = rb_obj_dup(mesg);
+	    }
+	    rb_ivar_set(mesg, idBt_locations, at);
+	    set_backtrace(mesg, at);
+	}
     }
 
     if (!NIL_P(mesg)) {
-	ec->errinfo = mesg;
+	th->errinfo = mesg;
     }
 
-    if (RTEST(ruby_debug) && !NIL_P(e = ec->errinfo) &&
+    if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
 	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
-	enum ruby_tag_type state;
+	int status;
 
 	mesg = e;
-	EC_PUSH_TAG(ec);
-	if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	    ec->errinfo = Qnil;
+	TH_PUSH_TAG(th);
+	if ((status = EXEC_TAG()) == 0) {
+	    th->errinfo = Qnil;
 	    e = rb_obj_as_string(mesg);
-	    ec->errinfo = mesg;
+	    th->errinfo = mesg;
 	    if (file && line) {
 		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
 			       rb_obj_class(mesg), file, line, e);
@@ -592,35 +545,33 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
 	    }
 	    warn_print_str(e);
 	}
-	EC_POP_TAG();
-	if (state == TAG_FATAL && ec->errinfo == exception_error) {
-	    ec->errinfo = mesg;
+	TH_POP_TAG();
+	if (status == TAG_FATAL && th->errinfo == exception_error) {
+	    th->errinfo = mesg;
 	}
-	else if (state) {
-	    rb_ec_reset_raised(ec);
-	    EC_JUMP_TAG(ec, state);
+	else if (status) {
+	    rb_threadptr_reset_raised(th);
+	    TH_JUMP_TAG(th, status);
 	}
     }
 
-    if (rb_ec_set_raised(ec)) {
-      fatal:
-	ec->errinfo = exception_error;
-	rb_ec_reset_raised(ec);
-	EC_JUMP_TAG(ec, TAG_FATAL);
+    if (rb_threadptr_set_raised(th)) {
+	th->errinfo = exception_error;
+	rb_threadptr_reset_raised(th);
+	TH_JUMP_TAG(th, TAG_FATAL);
     }
 
     if (tag != TAG_FATAL) {
-	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(ec->errinfo));
-	EXEC_EVENT_HOOK(ec, RUBY_EVENT_RAISE, ec->cfp->self, 0, 0, 0, mesg);
+	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(th->errinfo));
+	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0, mesg);
     }
 }
 
-/*! \private */
 void
-rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
+rb_threadptr_setup_exception(rb_thread_t *th, VALUE mesg, VALUE cause)
 {
     if (cause == Qundef) {
-	cause = get_ec_errinfo(ec);
+	cause = get_thread_errinfo(th);
     }
     if (cause != mesg) {
 	rb_ivar_set(mesg, id_cause, cause);
@@ -628,59 +579,41 @@ rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
 }
 
 static void
-rb_longjmp(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
+rb_longjmp(int tag, volatile VALUE mesg, VALUE cause)
 {
-    mesg = exc_setup_message(ec, mesg, &cause);
-    setup_exception(ec, tag, mesg, cause);
-    rb_ec_raised_clear(ec);
-    EC_JUMP_TAG(ec, tag);
+    rb_thread_t *th = GET_THREAD();
+    setup_exception(th, tag, mesg, cause);
+    rb_thread_raised_clear(th);
+    TH_JUMP_TAG(th, 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(GET_EC(), TAG_RAISE, mesg, Qundef);
+    rb_longjmp(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(GET_EC(), TAG_FATAL, mesg, Qnil);
+    rb_longjmp(TAG_FATAL, mesg, Qnil);
 }
 
-/*!
- * Raises an \c Interrupt exception.
- * \ingroup exception
- */
 void
 rb_interrupt(void)
 {
-    rb_exc_raise(rb_exc_new(rb_eInterrupt, 0, 0));
+    rb_raise(rb_eInterrupt, "%s", "");
 }
 
-enum {raise_opt_cause, raise_max_opt}; /*< \private */
+enum {raise_opt_cause, raise_max_opt};
 
 static int
 extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
@@ -707,11 +640,11 @@ extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
 /*
  *  call-seq:
  *     raise
- *     raise(string, cause: $!)
- *     raise(exception [, string [, array]], cause: $!)
+ *     raise(string)
+ *     raise(exception [, string [, array]])
  *     fail
- *     fail(string, cause: $!)
- *     fail(exception [, string [, array]], cause: $!)
+ *     fail(string)
+ *     fail(exception [, string [, array]])
  *
  *  With no arguments, raises the exception in <code>$!</code> or raises
  *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
@@ -726,11 +659,6 @@ extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
  *
  *     raise "Failed to create socket"
  *     raise ArgumentError, "No parameters", caller
- *
- *  The +cause+ of the generated exception 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.
  */
 
 static VALUE
@@ -752,7 +680,7 @@ rb_f_raise(int argc, VALUE *argv)
     }
     rb_raise_jump(rb_make_exception(argc, argv), *cause);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 static VALUE
@@ -784,6 +712,7 @@ make_exception(int argc, const VALUE *argv, int isstr)
 	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");
@@ -803,77 +732,45 @@ make_exception(int argc, const VALUE *argv, int isstr)
     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_execution_context_t *ec = GET_EC();
-    const rb_control_frame_t *cfp = ec->cfp;
+    rb_thread_t *th = GET_THREAD();
+    const rb_control_frame_t *cfp = th->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;
 
-    rb_vm_pop_frame(ec);
-    EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, self, me->def->original_id, mid, klass, Qnil);
+    rb_vm_pop_frame(th);
+    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil);
 
-    rb_longjmp(ec, TAG_RAISE, mesg, cause);
+    setup_exception(th, TAG_RAISE, mesg, cause);
+
+    rb_thread_raised_clear(th);
+    TH_JUMP_TAG(th, TAG_RAISE);
 }
 
-/*!
- * 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);
     }
-    EC_JUMP_TAG(GET_EC(), tag);
+    JUMP_TAG(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)
 {
-    if (rb_vm_frame_block_handler(GET_EC()->cfp) == VM_BLOCK_HANDLER_NONE) {
+    rb_thread_t *th = GET_THREAD();
+    if (rb_vm_frame_block_handler(th->cfp) == VM_BLOCK_HANDLER_NONE) {
 	return FALSE;
     }
     else {
@@ -881,13 +778,14 @@ rb_block_given_p(void)
     }
 }
 
+int
+rb_iterator_p(void)
+{
+    return rb_block_given_p();
+}
+
 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)
 {
@@ -896,41 +794,19 @@ 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, ...)
 {
-    enum ruby_tag_type state;
-    rb_execution_context_t * volatile ec = GET_EC();
-    rb_control_frame_t *volatile cfp = ec->cfp;
+    int state;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     volatile VALUE result = Qfalse;
-    volatile VALUE e_info = ec->errinfo;
+    volatile VALUE e_info = th->errinfo;
     va_list args;
 
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    TH_PUSH_TAG(th);
+    if ((state = TH_EXEC_TAG()) == 0) {
       retry_entry:
 	result = (*b_proc) (data1);
     }
@@ -938,13 +814,13 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
 	/* escape from r_proc */
 	if (state == TAG_RETRY) {
 	    state = 0;
-	    ec->errinfo = Qnil;
+	    th->errinfo = Qnil;
 	    result = Qfalse;
 	    goto retry_entry;
 	}
     }
     else {
-	rb_vm_rewind_cfp(ec, cfp);
+	rb_vm_rewind_cfp(th, cfp);
 
 	if (state == TAG_RAISE) {
 	    int handle = FALSE;
@@ -952,7 +828,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
 
 	    va_init_list(args, data2);
 	    while ((eclass = va_arg(args, VALUE)) != 0) {
-		if (rb_obj_is_kind_of(ec->errinfo, eclass)) {
+		if (rb_obj_is_kind_of(th->errinfo, eclass)) {
 		    handle = TRUE;
 		    break;
 		}
@@ -963,33 +839,19 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
 		result = Qnil;
 		state = 0;
 		if (r_proc) {
-		    result = (*r_proc) (data2, ec->errinfo);
+		    result = (*r_proc) (data2, th->errinfo);
 		}
-		ec->errinfo = e_info;
+		th->errinfo = e_info;
 	    }
 	}
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
     if (state)
-	EC_JUMP_TAG(ec, state);
+	TH_JUMP_TAG(th, 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)
@@ -998,98 +860,67 @@ rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
 		      (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 *pstate)
+rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
 {
     volatile VALUE result = Qnil;
-    volatile enum ruby_tag_type state;
-    rb_execution_context_t * volatile ec = GET_EC();
-    rb_control_frame_t *volatile cfp = ec->cfp;
+    volatile int status;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     struct rb_vm_protect_tag protect_tag;
     rb_jmpbuf_t org_jmpbuf;
 
-    protect_tag.prev = ec->protect_tag;
+    protect_tag.prev = th->protect_tag;
 
-    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));
+    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));
     }
     else {
-	rb_vm_rewind_cfp(ec, cfp);
+	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;
     }
-    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)
 {
     int state;
     volatile VALUE result = Qnil;
-    VALUE errinfo;
-    rb_execution_context_t * volatile ec = GET_EC();
+    volatile VALUE errinfo;
+    rb_thread_t *const th = GET_THREAD();
     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 = ec->ensure_list;
-    ec->ensure_list = &ensure_list;
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    ensure_list.next = th->ensure_list;
+    th->ensure_list = &ensure_list;
+    TH_PUSH_TAG(th);
+    if ((state = EXEC_TAG()) == 0) {
 	result = (*b_proc) (data1);
     }
-    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;
+    TH_POP_TAG();
+    errinfo = th->errinfo;
+    th->ensure_list=ensure_list.next;
     (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
-    ec->errinfo = errinfo;
+    th->errinfo = errinfo;
     if (state)
-	EC_JUMP_TAG(ec, state);
+	TH_JUMP_TAG(th, state);
     return result;
 }
 
 static ID
-frame_func_id(const rb_control_frame_t *cfp)
+frame_func_id(rb_control_frame_t *cfp)
 {
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
 
@@ -1114,47 +945,24 @@ 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_EC()->cfp);
+    return frame_func_id(GET_THREAD()->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_EC()->cfp);
+    return frame_called_id(GET_THREAD()->cfp);
 }
 
 static rb_control_frame_t *
-previous_frame(const rb_execution_context_t *ec)
+previous_frame(rb_thread_t *th)
 {
-    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
+    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
     /* check if prev_cfp can be accessible */
-    if ((void *)(ec->vm_stack + ec->vm_stack_size) == (void *)(prev_cfp)) {
+    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
         return 0;
     }
     return prev_cfp;
@@ -1163,7 +971,7 @@ previous_frame(const rb_execution_context_t *ec)
 static ID
 prev_frame_callee(void)
 {
-    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
     if (!prev_cfp) return 0;
     return frame_called_id(prev_cfp);
 }
@@ -1171,27 +979,21 @@ prev_frame_callee(void)
 static ID
 prev_frame_func(void)
 {
-    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
     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)
 {
-    const rb_execution_context_t *ec = GET_EC();
-    const rb_control_frame_t *cfp = ec->cfp;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     ID mid;
 
     while (!(mid = frame_func_id(cfp)) &&
 	   (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
-	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, cfp)));
+	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)));
     return mid;
 }
 
@@ -1234,7 +1036,6 @@ 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--) {
@@ -1282,8 +1083,6 @@ 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--) {
@@ -1293,16 +1092,6 @@ 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)
 {
@@ -1312,28 +1101,12 @@ 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(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;
 
-    ensure_class_or_module(klass);
+    Check_Type(klass, T_CLASS);
     Check_Type(module, T_MODULE);
     if (NIL_P(CREF_REFINEMENTS(cref))) {
 	CREF_REFINEMENTS_SET(cref, hidden_identity_hash_new());
@@ -1355,7 +1128,6 @@ 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;
 
@@ -1411,10 +1183,6 @@ 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)
 {
@@ -1423,7 +1191,6 @@ rb_using_module(const rb_cref_t *cref, VALUE module)
     rb_clear_method_cache_by_class(rb_cObject);
 }
 
-/*! \private */
 VALUE
 rb_refinement_module_get_refined_class(VALUE module)
 {
@@ -1450,7 +1217,6 @@ 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;
     refinement = RCLASS_SUPER(refinement);
@@ -1465,11 +1231,11 @@ add_activated_refinement(VALUE activated_refinements,
 
 /*
  *  call-seq:
- *     refine(mod) { block }   -> module
+ *     refine(klass) { block }   -> module
  *
- *  Refine <i>mod</i> in the receiver.
+ *  Refine <i>klass</i> in the receiver.
  *
- *  Returns a module, where refined methods are defined.
+ *  Returns an overlaid module.
  */
 
 static VALUE
@@ -1480,7 +1246,7 @@ rb_mod_refine(VALUE module, VALUE klass)
        id_refined_class, id_defined_at;
     VALUE refinements, activated_refinements;
     rb_thread_t *th = GET_THREAD();
-    VALUE block_handler = rb_vm_frame_block_handler(th->ec->cfp);
+    VALUE block_handler = rb_vm_frame_block_handler(th->cfp);
 
     if (block_handler == VM_BLOCK_HANDLER_NONE) {
 	rb_raise(rb_eArgError, "no block given");
@@ -1489,7 +1255,7 @@ rb_mod_refine(VALUE module, VALUE klass)
 	rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
     }
 
-    ensure_class_or_module(klass);
+    Check_Type(klass, T_CLASS);
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
     if (NIL_P(refinements)) {
@@ -1505,9 +1271,8 @@ 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, superclass);
+	RCLASS_SET_SUPER(refinement, klass);
 	FL_SET(refinement, RMODULE_IS_REFINEMENT);
 	CONST_ID(id_refined_class, "__refined_class__");
 	rb_ivar_set(refinement, id_refined_class, klass);
@@ -1524,7 +1289,6 @@ 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";
     }
@@ -1542,7 +1306,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_EC());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
 
     if (prev_frame_func()) {
 	rb_raise(rb_eRuntimeError,
@@ -1611,16 +1375,6 @@ rb_mod_s_used_modules(void)
     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)
 {
@@ -1628,12 +1382,6 @@ rb_obj_call_init(VALUE obj, int argc, const VALUE *argv)
     rb_funcallv(obj, idInitialize, argc, argv);
 }
 
-/*!
- * Extend the object with the module.
- *
- * Same as \c Module\#extend_object.
- * \ingroup class
- */
 void
 rb_extend_object(VALUE obj, VALUE module)
 {
@@ -1751,7 +1499,7 @@ 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_EC());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
 
     if (CREF_NEXT(cref) || (prev_cfp && rb_vm_frame_method_entry(prev_cfp))) {
 	rb_raise(rb_eRuntimeError, "main.using is permitted only at toplevel");
@@ -1764,10 +1512,10 @@ top_using(VALUE self, VALUE module)
 }
 
 static const VALUE *
-errinfo_place(const rb_execution_context_t *ec)
+errinfo_place(rb_thread_t *th)
 {
-    const rb_control_frame_t *cfp = ec->cfp;
-    const rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
+    rb_control_frame_t *cfp = th->cfp;
+    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
 
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
 	if (VM_FRAME_RUBYFRAME_P(cfp)) {
@@ -1786,21 +1534,21 @@ errinfo_place(const rb_execution_context_t *ec)
 }
 
 static VALUE
-get_ec_errinfo(const rb_execution_context_t *ec)
+get_thread_errinfo(rb_thread_t *th)
 {
-    const VALUE *ptr = errinfo_place(ec);
+    const VALUE *ptr = errinfo_place(th);
     if (ptr) {
 	return *ptr;
     }
     else {
-	return ec->errinfo;
+	return th->errinfo;
     }
 }
 
 static VALUE
 get_errinfo(void)
 {
-    return get_ec_errinfo(GET_EC());
+    return get_thread_errinfo(GET_THREAD());
 }
 
 static VALUE
@@ -1809,33 +1557,45 @@ errinfo_getter(ID id)
     return get_errinfo();
 }
 
-/*! The current exception in the current thread.
- *
- * Same as \c $! in Ruby.
- * \return the current exception or \c Qnil
- * \ingroup exception
- */
+#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 {
+	const VALUE *ptr = errinfo_place(GET_THREAD());
+	if (ptr) {
+	    *ptr = val;
+	}
+	else {
+	    rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
+	}
+    }
+}
+#endif
+
 VALUE
 rb_errinfo(void)
 {
-    return GET_EC()->errinfo;
+    rb_thread_t *th = GET_THREAD();
+    return th->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_EC()->errinfo = err;
+    GET_THREAD()->errinfo = err;
+}
+
+VALUE
+rb_rubylevel_errinfo(void)
+{
+    return get_errinfo();
 }
 
 static VALUE
@@ -1843,7 +1603,7 @@ errat_getter(ID id)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-	return rb_get_backtrace(err);
+	return get_backtrace(err);
     }
     else {
 	return Qnil;
@@ -1972,8 +1732,8 @@ Init_eval(void)
     rb_define_global_function("untrace_var", rb_f_untrace_var, -1);	/* in variable.c */
 
     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 8ea58a4742..cfb82d3a24 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -3,10 +3,6 @@
  * 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)) ? 		\
@@ -16,20 +12,17 @@
 #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(const VALUE str)
+error_pos(void)
 {
-    VALUE pos = error_pos_str();
-    if (!NIL_P(pos)) {
-	write_warn_str(str, pos);
+    VALUE str = error_pos_str();
+    if (!NIL_P(str)) {
+	warn_print_str(str);
     }
 }
 
@@ -39,7 +32,7 @@ error_pos_str(void)
     int sourceline;
     VALUE sourcefile = rb_source_location(&sourceline);
 
-    if (!NIL_P(sourcefile)) {
+    if (sourcefile) {
 	ID caller_name;
 	if (sourceline == 0) {
 	    return rb_sprintf("%"PRIsVALUE": ", sourcefile);
@@ -56,6 +49,23 @@ 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)
 {
@@ -70,266 +80,131 @@ set_backtrace(VALUE info, VALUE bt)
 	    bt = rb_backtrace_to_str_ary(bt);
 	}
     }
-    rb_check_funcall(info, set_backtrace, 1, &bt);
+    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
 }
 
 static void
-error_print(rb_execution_context_t *ec)
+error_print(rb_thread_t *th)
 {
-    rb_ec_error_print(ec, ec->errinfo);
+    rb_threadptr_error_print(th, th->errinfo);
 }
 
-#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)
+void
+rb_threadptr_error_print(rb_thread_t *th, VALUE errinfo)
 {
-    const char *einfo = "";
-    long elen = 0;
+    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 (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 (highlight) write_warn(str, bold);
+    if (NIL_P(errinfo))
+	return;
+    rb_thread_raised_clear(th);
 
-	if (!NIL_P(emesg)) {
-	    einfo = RSTRING_PTR(emesg);
-            elen = RSTRING_LEN(emesg);
-	}
+    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;
+    }
+    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(": ");
     }
 
+    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;
+    }
     if (eclass == rb_eRuntimeError && elen == 0) {
-	if (highlight) write_warn(str, underline);
-	write_warn(str, "unhandled exception");
-	if (highlight) write_warn(str, reset);
-	write_warn2(str, "\n", 1);
+	warn_print("unhandled exception\n");
     }
     else {
 	VALUE epath;
 
 	epath = rb_class_name(eclass);
 	if (elen == 0) {
-	    if (highlight) write_warn(str, underline);
-	    write_warn_str(str, epath);
-	    if (highlight) write_warn(str, reset);
-	    write_warn(str, "\n");
+	    warn_print_str(epath);
+	    warn_print("\n");
 	}
 	else {
 	    const char *tail = 0;
+	    long len = elen;
 
-	    if (emesg == Qundef && highlight) write_warn(str, bold);
 	    if (RSTRING_PTR(epath)[0] == '#')
 		epath = 0;
 	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
-		write_warn2(str, einfo, tail - einfo);
+		len = tail - einfo;
 		tail++;		/* skip newline */
 	    }
-	    else {
-		write_warn_str(str, emesg);
-	    }
+	    warn_print_str(tail ? rb_str_subseq(e, 0, len) : e);
 	    if (epath) {
-		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_warn2(str, 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_warn2(str, 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_warn2(str, einfo, tail-einfo);
-			elen -= tail - einfo;
-			einfo = tail;
-		    }
-		}
+		warn_print(" (");
+		warn_print_str(epath);
+		warn_print(")\n");
 	    }
-	    else if (!epath) {
-		write_warn2(str, "\n", 1);
+	    if (tail) {
+		warn_print_str(rb_str_subseq(e, tail - einfo, elen - len - 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);
 
 #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
 #define TRACE_HEAD 8
 #define TRACE_TAIL 5
 
 	for (i = 1; i < len; i++) {
-	    VALUE line = RARRAY_AREF(errat, reverse ? len - i : i);
+	    VALUE line = RARRAY_AREF(errat, 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));
+		warn_print_str(rb_sprintf("\tfrom %"PRIsVALUE"\n", line));
 	    }
 	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-		write_warn_str(str, rb_sprintf("\t ... %ld levels...\n",
+		warn_print_str(rb_sprintf("\t ... %ld levels...\n",
 					  len - TRACE_HEAD - TRACE_TAIL));
 		i = len - TRACE_TAIL;
 	    }
 	}
     }
-}
-
-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);
-        }
-    }
+  error:
+    TH_POP_TAG();
+    th->errinfo = errinfo;
+    rb_thread_raised_set(th, raised_flag);
 }
 
 void
-rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse)
+ruby_error_print(void)
 {
-    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) || NIL_P(highlight)) {
-	VALUE tty = (VALUE)rb_stderr_tty_p();
-	if (NIL_P(reverse)) reverse = tty;
-	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
-rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
-{
-    volatile uint8_t raised_flag = ec->raised_flag;
-    volatile VALUE errat = Qundef;
-    volatile VALUE emesg = Qundef;
-
-    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);
-    }
-
-    rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qnil);
-
-    EC_POP_TAG();
-    ec->errinfo = errinfo;
-    rb_ec_raised_set(ec, raised_flag);
+    error_print(GET_THREAD());
 }
 
-#define undef_mesg_for(v, k) rb_fstring_lit("undefined"v" method `%1$s' for "k" `%2$s'")
+#define undef_mesg_for(v, k) rb_fstring_cstr("undefined"v" method `%1$s' for "k" `%2$s'")
 #define undef_mesg(v) ( \
 	is_mod ? \
 	undef_mesg_for(v, "module") : \
@@ -357,7 +232,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_lit("method `%1$s' for "k" `%2$s' is "v)
+#define inaccessible_mesg_for(v, k) rb_fstring_cstr("method `%1$s' for "k" `%2$s' is "v)
 #define inaccessible_mesg(v) ( \
 	is_mod ? \
 	inaccessible_mesg_for(v, "module") : \
@@ -392,9 +267,9 @@ static int
 error_handle(int ex)
 {
     int status = EXIT_FAILURE;
-    rb_execution_context_t *ec = GET_EC();
+    rb_thread_t *th = GET_THREAD();
 
-    if (rb_ec_set_raised(ec))
+    if (rb_threadptr_set_raised(th))
 	return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       case 0:
@@ -402,32 +277,32 @@ error_handle(int ex)
 	break;
 
       case TAG_RETURN:
-	error_pos(Qnil);
+	error_pos();
 	warn_print("unexpected return\n");
 	break;
       case TAG_NEXT:
-	error_pos(Qnil);
+	error_pos();
 	warn_print("unexpected next\n");
 	break;
       case TAG_BREAK:
-	error_pos(Qnil);
+	error_pos();
 	warn_print("unexpected break\n");
 	break;
       case TAG_REDO:
-	error_pos(Qnil);
+	error_pos();
 	warn_print("unexpected redo\n");
 	break;
       case TAG_RETRY:
-	error_pos(Qnil);
+	error_pos();
 	warn_print("retry outside of rescue clause\n");
 	break;
       case TAG_THROW:
 	/* TODO: fix me */
-	error_pos(Qnil);
+	error_pos();
 	warn_print("unexpected throw\n");
 	break;
       case TAG_RAISE: {
-	VALUE errinfo = ec->errinfo;
+	VALUE errinfo = th->errinfo;
 	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
 	    status = sysexit_status(errinfo);
 	}
@@ -436,17 +311,17 @@ error_handle(int ex)
 	    /* no message when exiting by signal */
 	}
 	else {
-	    rb_ec_error_print(ec, errinfo);
+	    error_print(th);
 	}
 	break;
       }
       case TAG_FATAL:
-	error_print(ec);
+	error_print(th);
 	break;
       default:
 	unknown_longjmp_status(ex);
 	break;
     }
-    rb_ec_reset_raised(ec);
+    rb_threadptr_reset_raised(th);
     return status;
 }
diff --git a/eval_intern.h b/eval_intern.h
index f4a48d8171..9db0fd1bdb 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -5,22 +5,23 @@
 #include "vm_core.h"
 
 static inline void
-vm_passed_block_handler_set(rb_execution_context_t *ec, VALUE block_handler)
+vm_passed_block_handler_set(rb_thread_t *th, VALUE block_handler)
 {
-    vm_block_handler_verify(block_handler);
-    ec->passed_block_handler = block_handler;
+    VM_ASSERT(vm_block_handler_verify(block_handler));
+    th->passed_block_handler = block_handler;
 }
 
 static inline void
-pass_passed_block_handler(rb_execution_context_t *ec)
+pass_passed_block_handler(rb_thread_t *th)
 {
-    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);
+    VALUE block_handler = rb_vm_frame_block_handler(th->cfp);
+    VM_ASSERT(vm_block_handler_verify(block_handler));
+    vm_passed_block_handler_set(th, block_handler);
+    VM_ENV_FLAGS_SET(th->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())
+#define PASS_PASSED_BLOCK_HANDLER_TH(th) pass_passed_block_handler(th)
+#define PASS_PASSED_BLOCK_HANDLER() pass_passed_block_handler(GET_THREAD())
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -97,7 +98,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_ec_raised_set(GET_EC(), RAISED_STACKOVERFLOW), \
+	      (rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW), \
 	       raise(SIGSEGV), \
 	       EXCEPTION_EXECUTE_HANDLER) : \
 	      EXCEPTION_CONTINUE_SEARCH) { \
@@ -127,27 +128,25 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
       rb_fiber_start(); \
   } while (0)
 
-#define EC_PUSH_TAG(ec) do { \
-  rb_execution_context_t * const _ec = (ec); \
+#define TH_PUSH_TAG(th) do { \
+  rb_thread_t * const _th = (th); \
   struct rb_vm_tag _tag; \
-  _tag.state = TAG_NONE; \
-  _tag.tag = Qundef; \
-  _tag.prev = _ec->tag;
+  _tag.tag = 0; \
+  _tag.prev = _th->tag;
 
-#define EC_POP_TAG() \
-  _ec->tag = _tag.prev; \
+#define TH_POP_TAG() \
+  _th->tag = _tag.prev; \
 } while (0)
 
-#define EC_TMPPOP_TAG() \
-  _ec->tag = _tag.prev
+#define TH_TMPPOP_TAG() \
+  _th->tag = _tag.prev
 
-#define EC_REPUSH_TAG() (void)(_ec->tag = &_tag)
+#define TH_REPUSH_TAG() (void)(_th->tag = &_tag)
 
-#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 PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
+#define POP_TAG()      TH_POP_TAG()
+
+#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8)
 # 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
@@ -157,48 +156,36 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 # define VAR_NOCLOBBERED(var) var
 #endif
 
-#if defined(USE_UNALIGNED_MEMBER_ACCESS) && USE_UNALIGNED_MEMBER_ACCESS && \
-    defined(__clang__)
-# 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; \
-})
-#else
-# define UNALIGNED_MEMBER_ACCESS(expr) expr
-#endif
-#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem)
-
-#undef RB_OBJ_WRITE
-#define RB_OBJ_WRITE(a, slot, b) UNALIGNED_MEMBER_ACCESS(rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__))
-
-/* clear ec->tag->state, and return the value */
+/* clear th->state, and return the value */
 static inline int
-rb_ec_tag_state(const rb_execution_context_t *ec)
+rb_threadptr_tag_state(rb_thread_t *th)
 {
-    enum ruby_tag_type state = ec->tag->state;
-    ec->tag->state = TAG_NONE;
+    int state = th->state;
+    th->state = 0;
     return state;
 }
 
-NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st));
+NORETURN(static inline void rb_threadptr_tag_jump(rb_thread_t *, int));
 static inline void
-rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
+rb_threadptr_tag_jump(rb_thread_t *th, int st)
 {
-    ec->tag->state = st;
-    ruby_longjmp(ec->tag->buf, 1);
+    th->state = st;
+    ruby_longjmp(th->tag->buf, 1);
 }
 
 /*
   setjmp() in assignment expression rhs is undefined behavior
   [ISO/IEC 9899:1999] 7.13.1.1
 */
-#define EC_EXEC_TAG() \
-    (ruby_setjmp(_tag.buf) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
+#define TH_EXEC_TAG() \
+    (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(VAR_FROM_MEMORY(_th)) : (TH_REPUSH_TAG(), 0))
 
-#define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st)
+#define EXEC_TAG() \
+  TH_EXEC_TAG()
+
+#define TH_JUMP_TAG(th, st) rb_threadptr_tag_jump(th, st)
+
+#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), (st))
 
 #define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc)
 
@@ -275,13 +262,12 @@ enum {
     RAISED_STACKOVERFLOW = 2,
     RAISED_NOMEMORY = 4
 };
-#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);
+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)
 
 VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self);
 VALUE rb_make_exception(int argc, const VALUE *argv);
@@ -294,9 +280,9 @@ NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
 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));
-#if 0
 NORETURN(void rb_vm_jump_tag_but_local_jump(int));
-#endif
+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);
@@ -306,10 +292,6 @@ 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);
-
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 # ifdef HAVE_MBLEN
 #  define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE))
diff --git a/eval_jump.c b/eval_jump.c
index a74aed959e..59dae109ce 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -50,6 +50,7 @@ rb_f_at_exit(void)
 struct end_proc_data {
     void (*func) ();
     VALUE data;
+    int safe;
     struct end_proc_data *next;
 };
 
@@ -71,6 +72,7 @@ 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;
 }
 
@@ -102,6 +104,7 @@ 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;
     }
@@ -110,26 +113,29 @@ exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
 void
 rb_exec_end_proc(void)
 {
-    enum ruby_tag_type state;
-    rb_execution_context_t * volatile ec = GET_EC();
-    volatile VALUE errinfo = ec->errinfo;
+    int status;
+    volatile int safe = rb_safe_level();
+    rb_thread_t *th = GET_THREAD();
+    volatile VALUE errinfo = th->errinfo;
 
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    TH_PUSH_TAG(th);
+    if ((status = EXEC_TAG()) == 0) {
       again:
-	exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
-	exec_end_procs_chain(&end_procs, &ec->errinfo);
+	exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo);
+	exec_end_procs_chain(&end_procs, &th->errinfo);
     }
     else {
-	EC_TMPPOP_TAG();
-	error_handle(state);
-	if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
-	EC_REPUSH_TAG();
+	VAR_INITIALIZED(th);
+	TH_TMPPOP_TAG();
+	error_handle(status);
+	if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
+	TH_REPUSH_TAG();
 	goto again;
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
 
-    ec->errinfo = errinfo;
+    rb_set_safe_level_force(safe);
+    th->errinfo = errinfo;
 }
 
 void
diff --git a/ext/-test-/arith_seq/extract/extconf.rb b/ext/-test-/arith_seq/extract/extconf.rb
deleted file mode 100644
index 9c368bf50e..0000000000
--- a/ext/-test-/arith_seq/extract/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 93b89c239a..0000000000
--- a/ext/-test-/arith_seq/extract/extract.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#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-/bignum/depend b/ext/-test-/bignum/depend
index 60e711489c..5310a3a4be 100644
--- a/ext/-test-/bignum/depend
+++ b/ext/-test-/bignum/depend
@@ -13,7 +13,6 @@ 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/onigmo.h
 big2str.o: $(hdrdir)/ruby/oniguruma.h
 big2str.o: $(hdrdir)/ruby/ruby.h
 big2str.o: $(hdrdir)/ruby/st.h
@@ -29,7 +28,6 @@ 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/onigmo.h
 bigzero.o: $(hdrdir)/ruby/oniguruma.h
 bigzero.o: $(hdrdir)/ruby/ruby.h
 bigzero.o: $(hdrdir)/ruby/st.h
@@ -45,7 +43,6 @@ 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/onigmo.h
 div.o: $(hdrdir)/ruby/oniguruma.h
 div.o: $(hdrdir)/ruby/ruby.h
 div.o: $(hdrdir)/ruby/st.h
@@ -72,7 +69,6 @@ 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/onigmo.h
 intpack.o: $(hdrdir)/ruby/oniguruma.h
 intpack.o: $(hdrdir)/ruby/ruby.h
 intpack.o: $(hdrdir)/ruby/st.h
@@ -88,7 +84,6 @@ 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/onigmo.h
 mul.o: $(hdrdir)/ruby/oniguruma.h
 mul.o: $(hdrdir)/ruby/ruby.h
 mul.o: $(hdrdir)/ruby/st.h
@@ -104,7 +99,6 @@ 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/onigmo.h
 str2big.o: $(hdrdir)/ruby/oniguruma.h
 str2big.o: $(hdrdir)/ruby/ruby.h
 str2big.o: $(hdrdir)/ruby/st.h
diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c
deleted file mode 100644
index 0d4103b5d4..0000000000
--- a/ext/-test-/bug-14834/bug-14384.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/debug.h>
-
-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
deleted file mode 100644
index e25ed1aa1a..0000000000
--- a/ext/-test-/bug-14834/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-bug-14384.o: $(RUBY_EXTCONF_H)
-bug-14384.o: $(arch_hdrdir)/ruby/config.h
-bug-14384.o: $(hdrdir)/ruby/backward.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
deleted file mode 100644
index e8f3f1f437..0000000000
--- a/ext/-test-/bug-14834/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: true
-create_makefile("-test-/bug_14834")
diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend
index 9e5ccff274..6d3f6e75f3 100644
--- a/ext/-test-/exception/depend
+++ b/ext/-test-/exception/depend
@@ -16,7 +16,6 @@ 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
diff --git a/ext/-test-/exception/enc_raise.c b/ext/-test-/exception/enc_raise.c
index 68d7b4ebc1..dc8a42cf3f 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_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 void
diff --git a/ext/-test-/exception/ensured.c b/ext/-test-/exception/ensured.c
index 7dcc9b78ef..365e1f4f79 100644
--- a/ext/-test-/exception/ensured.c
+++ b/ext/-test-/exception/ensured.c
@@ -18,22 +18,8 @@ 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-/file/depend b/ext/-test-/file/depend
index 0eea6063dd..fb22843b72 100644
--- a/ext/-test-/file/depend
+++ b/ext/-test-/file/depend
@@ -7,7 +7,6 @@ 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
@@ -32,7 +31,6 @@ 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 9027ed1c3e..321c173f4c 100644
--- a/ext/-test-/file/extconf.rb
+++ b/ext/-test-/file/extconf.rb
@@ -5,7 +5,6 @@ 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 63d2356d76..d3fa5350e5 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -36,12 +36,6 @@ 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
@@ -78,34 +72,9 @@ 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-/funcall/funcall.c b/ext/-test-/funcall/funcall.c
deleted file mode 100644
index 4e13c952e5..0000000000
--- a/ext/-test-/funcall/funcall.c
+++ /dev/null
@@ -1,44 +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_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
-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",
-			       with_funcall_passing_block,
-			       -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
new file mode 100644
index 0000000000..70cb210831
--- /dev/null
+++ b/ext/-test-/funcall/passing_block.c
@@ -0,0 +1,30 @@
+#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_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);
+}
+
+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-/integer/core_ext.c b/ext/-test-/integer/core_ext.c
index 510ba4a1e6..6d64cdb0c2 100644
--- a/ext/-test-/integer/core_ext.c
+++ b/ext/-test-/integer/core_ext.c
@@ -20,17 +20,10 @@ 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
index 48f04d9ca0..8ca1fe33c5 100644
--- a/ext/-test-/integer/depend
+++ b/ext/-test-/integer/depend
@@ -7,7 +7,6 @@ core_ext.o: $(hdrdir)/ruby/encoding.h
 core_ext.o: $(hdrdir)/ruby/intern.h
 core_ext.o: $(hdrdir)/ruby/io.h
 core_ext.o: $(hdrdir)/ruby/missing.h
-core_ext.o: $(hdrdir)/ruby/onigmo.h
 core_ext.o: $(hdrdir)/ruby/oniguruma.h
 core_ext.o: $(hdrdir)/ruby/ruby.h
 core_ext.o: $(hdrdir)/ruby/st.h
diff --git a/ext/-test-/iter/break.c b/ext/-test-/iter/break.c
index 4d43c5d0cf..66ed26a9b8 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_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 static VALUE
@@ -13,7 +13,7 @@ iter_break_value(VALUE self, VALUE val)
 {
     rb_iter_break_value(val);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 void
diff --git a/ext/-test-/load/protect/extconf.rb b/ext/-test-/load/protect/extconf.rb
deleted file mode 100644
index 83c080de9c..0000000000
--- a/ext/-test-/load/protect/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile('-test-/load/protect')
diff --git a/ext/-test-/load/protect/protect.c b/ext/-test-/load/protect/protect.c
deleted file mode 100644
index ccfbbb9ea0..0000000000
--- a/ext/-test-/load/protect/protect.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#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-/memory_status/extconf.rb b/ext/-test-/memory_status/extconf.rb
deleted file mode 100644
index 1c1096d8f4..0000000000
--- a/ext/-test-/memory_status/extconf.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 5775fa56f3..0000000000
--- a/ext/-test-/memory_status/memory_status.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#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-/notimplement/bug.c b/ext/-test-/notimplement/bug.c
index 82e243a81d..8e9cae707a 100644
--- a/ext/-test-/notimplement/bug.c
+++ b/ext/-test-/notimplement/bug.c
@@ -11,8 +11,6 @@ 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-/printf/printf.c b/ext/-test-/printf/printf.c
index e793bb7a48..666f5592e5 100644
--- a/ext/-test-/printf/printf.c
+++ b/ext/-test-/printf/printf.c
@@ -90,13 +90,6 @@ 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)
 {
@@ -105,5 +98,4 @@ 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-/rational/depend b/ext/-test-/rational/depend
index 4f7c4e4900..a0ee797b31 100644
--- a/ext/-test-/rational/depend
+++ b/ext/-test-/rational/depend
@@ -11,7 +11,6 @@ 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/onigmo.h
 rat.o: $(hdrdir)/ruby/oniguruma.h
 rat.o: $(hdrdir)/ruby/ruby.h
 rat.o: $(hdrdir)/ruby/st.h
diff --git a/ext/-test-/regexp/extconf.rb b/ext/-test-/regexp/extconf.rb
deleted file mode 100644
index ca51178a18..0000000000
--- a/ext/-test-/regexp/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 906abe940f..0000000000
--- a/ext/-test-/regexp/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#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
deleted file mode 100644
index 8e08a5c789..0000000000
--- a/ext/-test-/regexp/parse_depth_limit.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#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/extconf.rb b/ext/-test-/scan_args/extconf.rb
deleted file mode 100755
index 6cae9c2779..0000000000
--- a/ext/-test-/scan_args/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/scan_args")
diff --git a/ext/-test-/scan_args/scan_args.c b/ext/-test-/scan_args/scan_args.c
deleted file mode 100644
index dca353f643..0000000000
--- a/ext/-test-/scan_args/scan_args.c
+++ /dev/null
@@ -1,286 +0,0 @@
-#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);
-}
-
-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);
-}
-
diff --git a/ext/-test-/st/foreach/foreach.c b/ext/-test-/st/foreach/foreach.c
index 209b535503..1e0fd515c9 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->bins != NULL) rb_bug("should be packed\n");
+	if (!c->tbl->entries_packed) 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->bins == NULL) rb_bug("should be unpacked\n");
+	if (c->tbl->entries_packed) 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->bins != NULL) rb_bug("should still be packed\n");
+    if (!tbl->entries_packed) 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->bins == NULL) rb_bug("should be unpacked\n");
+    if (tbl->entries_packed) rb_bug("should be unpacked\n");
 
     st_free_table(tbl);
 
@@ -145,7 +145,7 @@ unp_fe(VALUE self, VALUE test)
 
     st_add_direct(tbl, 0, 0);
 
-    if (tbl->bins != NULL) rb_bug("should still be packed\n");
+    if (!tbl->entries_packed) 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->bins == NULL) rb_bug("should be unpacked\n");
+    if (tbl->entries_packed) rb_bug("should be unpacked\n");
 
     st_free_table(tbl);
 
diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c
index f5277bf4e6..ba7fb85e9e 100644
--- a/ext/-test-/string/capacity.c
+++ b/ext/-test-/string/capacity.c
@@ -11,7 +11,7 @@ bug_str_capacity(VALUE klass, VALUE str)
 }
 
 void
-Init_string_capacity(VALUE klass)
+Init_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 1342ce20da..b93172d72d 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_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 /* return coderange without scan */
@@ -36,7 +36,7 @@ str_coderange_scan(VALUE str)
 }
 
 void
-Init_string_coderange(VALUE klass)
+Init_coderange(VALUE klass)
 {
     sym_7bit = ID2SYM(rb_intern("7bit"));
     sym_valid = ID2SYM(rb_intern("valid"));
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index 71eafdb703..fc47d5206f 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -1,4 +1,3 @@
-#include "ruby/encoding.h"
 #include "internal.h"
 
 static VALUE
@@ -132,7 +131,7 @@ bug_str_s_rb_str_new_frozen(VALUE self, VALUE str)
 }
 
 void
-Init_string_cstr(VALUE klass)
+Init_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 71e995a523..e3ce4b6e9c 100644
--- a/ext/-test-/string/depend
+++ b/ext/-test-/string/depend
@@ -7,7 +7,6 @@ capacity.o: $(hdrdir)/ruby/encoding.h
 capacity.o: $(hdrdir)/ruby/intern.h
 capacity.o: $(hdrdir)/ruby/io.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
@@ -22,7 +21,6 @@ coderange.o: $(hdrdir)/ruby/defines.h
 coderange.o: $(hdrdir)/ruby/encoding.h
 coderange.o: $(hdrdir)/ruby/intern.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
@@ -36,7 +34,6 @@ cstr.o: $(hdrdir)/ruby/encoding.h
 cstr.o: $(hdrdir)/ruby/intern.h
 cstr.o: $(hdrdir)/ruby/io.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
@@ -62,7 +59,6 @@ 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/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
@@ -76,7 +72,6 @@ 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/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
@@ -115,22 +110,6 @@ 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/backward.h
-new.o: $(hdrdir)/ruby/defines.h
-new.o: $(hdrdir)/ruby/encoding.h
-new.o: $(hdrdir)/ruby/intern.h
-new.o: $(hdrdir)/ruby/io.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: $(top_srcdir)/include/ruby.h
-new.o: $(top_srcdir)/internal.h
-new.o: new.c
 nofree.o: $(RUBY_EXTCONF_H)
 nofree.o: $(arch_hdrdir)/ruby/config.h
 nofree.o: $(hdrdir)/ruby/backward.h
@@ -150,7 +129,6 @@ normalize.o: $(hdrdir)/ruby/encoding.h
 normalize.o: $(hdrdir)/ruby/intern.h
 normalize.o: $(hdrdir)/ruby/io.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
@@ -165,7 +143,6 @@ qsort.o: $(hdrdir)/ruby/defines.h
 qsort.o: $(hdrdir)/ruby/encoding.h
 qsort.o: $(hdrdir)/ruby/intern.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
@@ -173,17 +150,6 @@ qsort.o: $(hdrdir)/ruby/subst.h
 qsort.o: $(hdrdir)/ruby/util.h
 qsort.o: $(top_srcdir)/include/ruby.h
 qsort.o: qsort.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/backward.h
-rb_str_dup.o: $(hdrdir)/ruby/defines.h
-rb_str_dup.o: $(hdrdir)/ruby/intern.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/backward.h
diff --git a/ext/-test-/string/ellipsize.c b/ext/-test-/string/ellipsize.c
index 6034408724..0451519492 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_string_ellipsize(VALUE klass)
+Init_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 594d8a43a4..53811620a0 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_string_enc_associate(VALUE klass)
+Init_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 9ac4a298be..5d583c65dc 100644
--- a/ext/-test-/string/enc_str_buf_cat.c
+++ b/ext/-test-/string/enc_str_buf_cat.c
@@ -8,7 +8,7 @@ enc_str_buf_cat(VALUE str, VALUE str2)
 }
 
 void
-Init_string_enc_str_buf_cat(VALUE klass)
+Init_enc_str_buf_cat(VALUE klass)
 {
     rb_define_method(klass, "enc_str_buf_cat", enc_str_buf_cat, 1);
 }
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
index 30120b42f6..b65c98ce6d 100644
--- a/ext/-test-/string/fstring.c
+++ b/ext/-test-/string/fstring.c
@@ -9,7 +9,7 @@ bug_s_fstring(VALUE self, VALUE str)
 }
 
 void
-Init_string_fstring(VALUE klass)
+Init_fstring(VALUE klass)
 {
     rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
 }
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
index a74245c8d7..0b3e4a6ff2 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_string_##n(VALUE klass); Init_string_##n(klass);}
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
 
 void
 Init_string(void)
diff --git a/ext/-test-/string/modify.c b/ext/-test-/string/modify.c
index 945febc7e3..ddd2efd8f0 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_string_modify(VALUE klass)
+Init_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
deleted file mode 100644
index 60625b8300..0000000000
--- a/ext/-test-/string/new.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#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 fdf810c741..d3d8071ff9 100644
--- a/ext/-test-/string/nofree.c
+++ b/ext/-test-/string/nofree.c
@@ -7,7 +7,7 @@ bug_str_nofree(VALUE self)
 }
 
 void
-Init_string_nofree(VALUE klass)
+Init_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 0ba1797631..2e16a4616f 100644
--- a/ext/-test-/string/normalize.c
+++ b/ext/-test-/string/normalize.c
@@ -11,7 +11,7 @@ normalize_ospath(VALUE str)
 #endif
 
 void
-Init_string_normalize(VALUE klass)
+Init_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 fb7ea3d8cb..0b34936d38 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_string_qsort(VALUE klass)
+Init_qsort(VALUE klass)
 {
     rb_define_method(klass, "qsort!", bug_str_qsort_bang, -1);
 }
diff --git a/ext/-test-/string/rb_str_dup.c b/ext/-test-/string/rb_str_dup.c
deleted file mode 100644
index a0bd65820f..0000000000
--- a/ext/-test-/string/rb_str_dup.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#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 219cea404c..3c7d19d778 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_string_set_len(VALUE klass)
+Init_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
deleted file mode 100644
index 58ededbff9..0000000000
--- a/ext/-test-/struct/depend
+++ /dev/null
@@ -1,46 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-duplicate.o: $(RUBY_EXTCONF_H)
-duplicate.o: $(arch_hdrdir)/ruby/config.h
-duplicate.o: $(hdrdir)/ruby/backward.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: $(top_srcdir)/include/ruby.h
-duplicate.o: duplicate.c
-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
-len.o: $(RUBY_EXTCONF_H)
-len.o: $(arch_hdrdir)/ruby/config.h
-len.o: $(hdrdir)/ruby/backward.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: $(top_srcdir)/include/ruby.h
-len.o: len.c
-member.o: $(RUBY_EXTCONF_H)
-member.o: $(arch_hdrdir)/ruby/config.h
-member.o: $(hdrdir)/ruby/backward.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: $(top_srcdir)/include/ruby.h
-member.o: member.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/struct/len.c b/ext/-test-/struct/len.c
deleted file mode 100644
index 6153c720b2..0000000000
--- a/ext/-test-/struct/len.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#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/init.c b/ext/-test-/symbol/init.c
index 20cf2fa079..9e42e1a38b 100644
--- a/ext/-test-/symbol/init.c
+++ b/ext/-test-/symbol/init.c
@@ -11,13 +11,7 @@ sym_find(VALUE dummy, VALUE sym)
 static VALUE
 sym_pinneddown_p(VALUE dummy, VALUE sym)
 {
-    ID id = rb_check_id(&sym);
-    if (!id) return Qnil;
-#ifdef ULL2NUM
-    return ULL2NUM(id);
-#else
-    return ULONG2NUM(id);
-#endif
+    return rb_check_id(&sym) ? Qtrue : Qfalse;
 }
 
 void
diff --git a/ext/-test-/thread_fd_close/depend b/ext/-test-/thread_fd_close/depend
deleted file mode 100644
index 7bc04c3db3..0000000000
--- a/ext/-test-/thread_fd_close/depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/backward.h
-thread_fd_close.o: $(hdrdir)/ruby/defines.h
-thread_fd_close.o: $(hdrdir)/ruby/encoding.h
-thread_fd_close.o: $(hdrdir)/ruby/intern.h
-thread_fd_close.o: $(hdrdir)/ruby/io.h
-thread_fd_close.o: $(hdrdir)/ruby/missing.h
-thread_fd_close.o: $(hdrdir)/ruby/onigmo.h
-thread_fd_close.o: $(hdrdir)/ruby/oniguruma.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
deleted file mode 100644
index 0d9694539c..0000000000
--- a/ext/-test-/thread_fd_close/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 4fd967c5b3..0000000000
--- a/ext/-test-/thread_fd_close/thread_fd_close.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#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
deleted file mode 100644
index a9a770ba1e..0000000000
--- a/ext/-test-/time/depend
+++ /dev/null
@@ -1,35 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-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
-leap_second.o: $(RUBY_EXTCONF_H)
-leap_second.o: $(arch_hdrdir)/ruby/config.h
-leap_second.o: $(hdrdir)/ruby/backward.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)/include/ruby.h
-leap_second.o: leap_second.c
-new.o: $(RUBY_EXTCONF_H)
-new.o: $(arch_hdrdir)/ruby/config.h
-new.o: $(hdrdir)/ruby/backward.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: $(top_srcdir)/include/ruby.h
-new.o: new.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/time/init.c b/ext/-test-/time/init.c
index 91f8bf825b..01a20b8b3d 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_time_##n(VALUE klass); Init_time_##n(klass);}
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
 
 void
 Init_time(void)
diff --git a/ext/-test-/time/leap_second.c b/ext/-test-/time/leap_second.c
deleted file mode 100644
index 7eed421b73..0000000000
--- a/ext/-test-/time/leap_second.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "ruby.h"
-
-void ruby_reset_leap_second_info(void);
-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 6f894417b6..0f71a5542b 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_time_new(VALUE klass)
+Init_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-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c
index ae060960cd..1c5d677713 100644
--- a/ext/-test-/typeddata/typeddata.c
+++ b/ext/-test-/typeddata/typeddata.c
@@ -2,43 +2,19 @@
 
 static const rb_data_type_t test_data = {
     "typed_data",
-    {NULL, ruby_xfree, NULL},
-    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);
-    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-/wait_for_single_fd/depend b/ext/-test-/wait_for_single_fd/depend
index edd2f88dcf..949c427685 100644
--- a/ext/-test-/wait_for_single_fd/depend
+++ b/ext/-test-/wait_for_single_fd/depend
@@ -7,7 +7,6 @@ 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 2a976c8f4b..931662c040 100644
--- a/ext/-test-/wait_for_single_fd/extconf.rb
+++ b/ext/-test-/wait_for_single_fd/extconf.rb
@@ -1,4 +1,2 @@
 # frozen_string_literal: false
-headers = %w(sys/types.h sys/time.h sys/event.h).select { |h| have_header(h) }
-have_func('kqueue', headers)
 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 b8a33979bc..d406724a3f 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,67 +19,6 @@ 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)
 {
@@ -88,7 +27,4 @@ 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 a5f80fcaff..6d706fbfe7 100644
--- a/ext/-test-/win32/console/attribute.c
+++ b/ext/-test-/win32/console/attribute.c
@@ -61,9 +61,4 @@ 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 c3f14db4f7..712fefa29a 100644
--- a/ext/-test-/win32/dln/depend
+++ b/ext/-test-/win32/dln/depend
@@ -1,8 +1,8 @@
 $(TARGET_SO): $(DLNTESTLIB)
 
-$(DLNTESTLIB): dlntest.dll
+$(DLNTESTLIB): $(topdir)/dlntest.dll
 
-dlntest.dll: libdlntest.o libdlntest.def
+$(topdir)/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 d72b6a868c..55c2d16d1e 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 = "dlntest.dll"
+  testdll = "$(topdir)/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 << "dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
-      m << "dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
+      m << "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
+      m << "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
     end
     m
   end
diff --git a/ext/.document b/ext/.document
index 6a491576a1..2e6fc78879 100644
--- a/ext/.document
+++ b/ext/.document
@@ -13,6 +13,12 @@ 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
 etc/etc.c
 fcntl/fcntl.c
 fiber/fiber.c
@@ -23,13 +29,17 @@ fiddle/function.c
 fiddle/pointer.c
 fiddle/handle.c
 fiddle/lib
+fiddle/win32/lib
 gdbm/gdbm.c
 io/console/console.c
 io/nonblock/nonblock.c
+io/wait/lib
 io/wait/wait.c
-json/generator/generator.c
+json/ext/generator/generator.c
+json/ext/parser/parser.c
 json/lib
-json/parser/parser.c
+mathn/complex/complex.c
+mathn/rational/rational.c
 nkf/lib
 nkf/nkf.c
 objspace/objspace.c
@@ -45,10 +55,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
@@ -69,23 +79,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/psych_emitter.c
-psych/psych_parser.c
-psych/psych_to_ruby.c
-psych/psych_yaml_tree.c
+psych/to_ruby.c
+psych/yaml_tree.c
 pty/lib
 pty/pty.c
 racc/cparse/cparse.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
 win32ole/lib
 win32ole/*.c
 zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index ac79c86f84..0929d647ae 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -23,6 +23,8 @@
 #json
 #json/generator
 #json/parser
+#mathn/complex
+#mathn/rational
 #nkf
 #objspace
 #openssl
diff --git a/ext/Setup.nacl b/ext/Setup.nacl
new file mode 100644
index 0000000000..eb8a1a70cd
--- /dev/null
+++ b/ext/Setup.nacl
@@ -0,0 +1,44 @@
+# #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
+# #zlib
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index da1b24a631..b1c887c756 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -62,7 +62,6 @@ 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
@@ -110,7 +109,7 @@ rb_rational_num(VALUE rat)
 #ifdef HAVE_TYPE_STRUCT_RRATIONAL
     return RRATIONAL(rat)->num;
 #else
-    return rb_funcall(rat, rb_intern("numerator"), 0);
+    return rb_funcall(rat, rb_intern("numerator"));
 #endif
 }
 #endif
@@ -122,20 +121,31 @@ rb_rational_den(VALUE rat)
 #ifdef HAVE_TYPE_STRUCT_RRATIONAL
     return RRATIONAL(rat)->den;
 #else
-    return rb_funcall(rat, rb_intern("denominator"), 0);
+    return rb_funcall(rat, rb_intern("denominator"));
 #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);
@@ -217,7 +227,6 @@ 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];
@@ -231,8 +240,9 @@ again:
 	if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
 	d = RFLOAT_VALUE(v);
 	if (!isfinite(d)) {
-	    pv = VpCreateRbObject(1, NULL);
-	    VpDtoV(pv, d);
+	    pv = VpCreateRbObject(prec, NULL);
+	    pv->sign = isnan(d) ? VP_SIGN_NaN :
+		d > 0 ? VP_SIGN_POSITIVE_INFINITE : VP_SIGN_NEGATIVE_FINITE;
 	    return pv;
 	}
 	if (d != 0.0) {
@@ -275,15 +285,13 @@ again:
 
 #ifdef ENABLE_NUMERIC_STRING
       case T_STRING:
-	StringValueCStr(v);
-	rb_check_safe_obj(v);
-	return VpCreateRbObject(RSTRING_LEN(v) + VpBaseFig() + 1,
+	SafeStringValue(v);
+	return VpCreateRbObject(strlen(RSTRING_PTR(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:
@@ -324,18 +332,15 @@ BigDecimal_double_fig(VALUE self)
     return INT2FIX(VpDblFig());
 }
 
-/*  call-seq:
- *     big_decimal.precs  ->  array
- *
- *  Returns an Array of two Integer values.
+/* call-seq:
+ * precs
  *
- *  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.
+ * Returns an Array of two Integer values.
  *
- *     BigDecimal('5').precs #=> [9, 18]
+ * The first value is the current number of significant digits in the
+ * BigDecimal. The second value is the maximum number of significant digits
+ * for the BigDecimal.
  */
-
 static VALUE
 BigDecimal_prec(VALUE self)
 {
@@ -371,7 +376,7 @@ BigDecimal_hash(VALUE self)
 	hash ^= rb_memhash(p->frac, sizeof(BDIGIT)*p->Prec);
 	hash += p->exponent;
     }
-    return ST2FIX(hash);
+    return INT2FIX(hash);
 }
 
 /*
@@ -379,10 +384,10 @@ BigDecimal_hash(VALUE self)
  *
  * Method used to provide marshalling support.
  *
- *      inf = BigDecimal('Infinity')
- *        #=> Infinity
+ *      inf = BigDecimal.new('Infinity')
+ *        #=> #<BigDecimal:1e16fa8,'Infinity',9(9)>
  *      BigDecimal._load(inf._dump)
- *        #=> Infinity
+ *        #=> #<BigDecimal:1df8dc8,'Infinity',9(9)>
  *
  * See the Marshal module.
  */
@@ -417,8 +422,8 @@ BigDecimal_load(VALUE self, VALUE str)
     unsigned char ch;
     unsigned long m=0;
 
-    pch = (unsigned char *)StringValueCStr(str);
-    rb_check_safe_obj(str);
+    SafeStringValue(str);
+    pch = (unsigned char *)RSTRING_PTR(str);
     /* First get max prec */
     while((*pch) != (unsigned char)'\0' && (ch = *pch++) != (unsigned char)':') {
         if(!ISDIGIT(ch)) {
@@ -436,55 +441,6 @@ 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;
@@ -606,7 +562,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;
 }
 
@@ -632,12 +588,12 @@ GetAddSubPrec(Real *a, Real *b)
 }
 
 static SIGNED_VALUE
-GetPrecisionInt(VALUE v)
+GetPositiveInt(VALUE v)
 {
     SIGNED_VALUE n;
     n = NUM2INT(v);
     if (n < 0) {
-	rb_raise(rb_eArgError, "negative precision");
+	rb_raise(rb_eArgError, "argument must be positive");
     }
     return n;
 }
@@ -646,10 +602,9 @@ 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, 1, 1);
+    Real *pv = VpAlloc(mx,str);
     RTYPEDDATA_DATA(obj) = pv;
     pv->obj = obj;
-    RB_OBJ_FREEZE(obj);
     return pv;
 }
 
@@ -725,9 +680,9 @@ BigDecimal_check_num(Real *p)
 
 static VALUE BigDecimal_split(VALUE self);
 
-/* Returns the value as an Integer.
+/* Returns the value as an integer (Fixnum or Bignum).
  *
- * If the BigDecimal is infinity or NaN, raises FloatDomainError.
+ * If the BigNumber is infinity or NaN, raises FloatDomainError.
  */
 static VALUE
 BigDecimal_to_i(VALUE self)
@@ -752,7 +707,7 @@ BigDecimal_to_i(VALUE self)
 	VALUE ret;
 	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
 
-	if (BIGDECIMAL_NEGATIVE_P(p)) {
+	if (VpGetSign(p) < 0) {
 	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
 	}
 	if (dpower < 0) {
@@ -807,17 +762,17 @@ BigDecimal_to_f(VALUE self)
 
 overflow:
     VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(VpGetDoubleNegInf());
-    else
+    if (p->sign >= 0)
 	return rb_float_new(VpGetDoublePosInf());
+    else
+	return rb_float_new(VpGetDoubleNegInf());
 
 underflow:
     VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(-0.0);
-    else
+    if (p->sign >= 0)
 	return rb_float_new(0.0);
+    else
+	return rb_float_new(-0.0);
 }
 
 
@@ -863,7 +818,7 @@ BigDecimal_to_r(VALUE self)
  * be coerced into a BigDecimal value.
  *
  * e.g.
- *   a = BigDecimal("1.0")
+ *   a = BigDecimal.new("1.0")
  *   b = a / 2.0 #=> 0.5
  *
  * Note that coercing a String to a BigDecimal is not supported by default;
@@ -895,14 +850,13 @@ BigDecimal_coerce(VALUE self, VALUE other)
 }
 
 /*
- * call-seq:
- *    +big_decimal  ->  big_decimal
+ * call-seq: +@
  *
  * Return self.
  *
- *     +BigDecimal('5')  #=> 0.5e1
+ * e.g.
+ *   b = +a  # b == a
  */
-
 static VALUE
 BigDecimal_uplus(VALUE self)
 {
@@ -1152,7 +1106,7 @@ BigDecimal_comp(VALUE self, VALUE r)
  *
  * Values may be coerced to perform the comparison:
  *
- *   BigDecimal('1.0') == 1.0  #=> true
+ *   BigDecimal.new('1.0') == 1.0  #=> true
  */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
@@ -1213,14 +1167,14 @@ BigDecimal_ge(VALUE self, VALUE r)
 }
 
 /*
- *  call-seq:
- *     -big_decimal  ->  big_decimal
+ * call-seq: -@
  *
- *  Return the negation of self.
+ * Return the negation of self.
  *
- *    -BigDecimal('5')  #=> -0.5e1
+ * e.g.
+ *   b = -a
+ *   b == a * -1
  */
-
 static VALUE
 BigDecimal_neg(VALUE self)
 {
@@ -1308,14 +1262,25 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
     return Qnil;
 }
 
-/* call-seq:
- *   a / b       -> bigdecimal
- *   quo(value)  -> bigdecimal
- *
- * Divide by the specified value.
- *
- * See BigDecimal#div.
- */
+ /* 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.
+  */
 static VALUE
 BigDecimal_div(VALUE self, VALUE r)
 /* For c = self/r: with round operation */
@@ -1514,8 +1479,8 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
  *
  *   require 'bigdecimal'
  *
- *   a = BigDecimal("42")
- *   b = BigDecimal("9")
+ *   a = BigDecimal.new("42")
+ *   b = BigDecimal.new("9")
  *
  *   q, m = a.divmod(b)
  *
@@ -1558,7 +1523,7 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
     }
 
     /* div in BigDecimal sense */
-    ix = GetPrecisionInt(n);
+    ix = GetPositiveInt(n);
     if (ix == 0) {
         return BigDecimal_div(self, b);
     }
@@ -1568,7 +1533,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 + VpBaseFig(), "0"));
+        GUARD_OBJ(cv, VpCreateRbObject(mx, "0"));
         GUARD_OBJ(av, GetVpValue(self, 1));
         GUARD_OBJ(bv, GetVpValue(b, 1));
         mx = av->Prec + bv->Prec + 2;
@@ -1581,37 +1546,6 @@ 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)
 {
@@ -1627,7 +1561,7 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPrecisionInt(n);
+    SIGNED_VALUE mx = GetPositiveInt(n);
     if (mx == 0) return BigDecimal_add(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1657,7 +1591,7 @@ BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPrecisionInt(n);
+    SIGNED_VALUE mx = GetPositiveInt(n);
     if (mx == 0) return BigDecimal_sub(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1675,7 +1609,7 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPrecisionInt(n);
+    SIGNED_VALUE mx = GetPositiveInt(n);
     if (mx == 0) return BigDecimal_mult(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1687,16 +1621,11 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/*
- *  call-seq:
- *     big_decimal.abs  ->  big_decimal
- *
- *  Returns the absolute value, as a BigDecimal.
+/* Returns the absolute value, as a BigDecimal.
  *
- *     BigDecimal('5').abs  #=> 0.5e1
- *     BigDecimal('-3').abs #=> 0.3e1
+ *   BigDecimal('5').abs #=> 5
+ *   BigDecimal('-3').abs #=> 3
  */
-
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1729,7 +1658,7 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     GUARD_OBJ(a, GetVpValue(self, 1));
     mx = a->Prec * (VpBaseFig() + 1);
 
-    n = GetPrecisionInt(nFig) + VpDblFig() + BASE_FIG;
+    n = GetPositiveInt(nFig) + VpDblFig() + BASE_FIG;
     if (mx <= n) mx = n;
     GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSqrt(c, a);
@@ -1791,21 +1720,11 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
 	iLoc = 0;
 	break;
       case 1:
-        if (RB_TYPE_P(vLoc, T_HASH)) {
-	    sw = check_rounding_mode_option(vLoc);
-	}
-	else {
-	    iLoc = NUM2INT(vLoc);
-	}
+	iLoc = NUM2INT(vLoc);
 	break;
       case 2:
 	iLoc = NUM2INT(vLoc);
-	if (RB_TYPE_P(vRound, T_HASH)) {
-	    sw = check_rounding_mode_option(vRound);
-	}
-	else {
-	    sw = check_rounding_mode(vRound);
-	}
+	sw = check_rounding_mode(vRound);
 	break;
       default:
 	break;
@@ -1999,35 +1918,34 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * Examples:
  *
- *   BigDecimal('-123.45678901234567890').to_s('5F')
+ *   BigDecimal.new('-123.45678901234567890').to_s('5F')
  *     #=> '-123.45678 90123 45678 9'
  *
- *   BigDecimal('123.45678901234567890').to_s('+8F')
+ *   BigDecimal.new('123.45678901234567890').to_s('+8F')
  *     #=> '+123.45678901 23456789'
  *
- *   BigDecimal('123.45678901234567890').to_s(' F')
+ *   BigDecimal.new('123.45678901234567890').to_s(' F')
  *     #=> ' 123.4567890123456789'
  */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 {
     ENTER(5);
-    int   fmt = 0;   /* 0: E format, 1: F format */
-    int   fPlus = 0; /* 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
+    int   fmt = 0;   /* 0:E format */
+    int   fPlus = 0; /* =0:default,=1: set ' ' before digits ,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)) {
-	    psz = StringValueCStr(f);
-	    rb_check_safe_obj(f);
+	    SafeStringValue(f);
+	    psz = RSTRING_PTR(f);
 	    if (*psz == ' ') {
 		fPlus = 1;
 		psz++;
@@ -2050,11 +1968,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 	    }
 	}
 	else {
-	    m = NUM2INT(f);
-	    if (m <= 0) {
-		rb_raise(rb_eArgError, "argument must be positive");
-	    }
-	    mc = (size_t)m;
+	    mc = (size_t)GetPositiveInt(f);
 	}
     }
     if (fmt) {
@@ -2148,26 +2062,38 @@ BigDecimal_exponent(VALUE self)
     return INT2NUM(e);
 }
 
-/* Returns a string representation of self.
+/* Returns debugging information about the value as a string of comma-separated
+ * values in angle brackets with a leading #:
  *
- *   BigDecimal("1234.5678").inspect
- *     #=> "0.12345678e4"
+ *   BigDecimal.new("1234.5678").inspect
+ *     #=> "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
+ *
+ * The first part is the address, the second is the value as a string, and
+ * the final part ss(mm) is the current number of significant digits and the
+ * maximum number of significant digits, respectively.
  */
 static VALUE
 BigDecimal_inspect(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    volatile VALUE str;
+    volatile VALUE obj;
     size_t nc;
+    char *psz, *tmp;
 
     GUARD_OBJ(vp, GetVpValue(self, 1));
     nc = VpNumOfChars(vp, "E");
-
-    str = rb_str_new(0, nc);
-    VpToString(vp, RSTRING_PTR(str), 0, 0);
-    rb_str_resize(str, strlen(RSTRING_PTR(str)));
-    return str;
+    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;
 }
 
 static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
@@ -2313,7 +2239,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);
@@ -2377,7 +2303,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	if (is_negative(vexp)) {
 	    y = VpCreateRbObject(n, "#0");
 	    RB_GC_GUARD(y->obj);
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-0) ** (-even_integer)  -> Infinity */
@@ -2416,7 +2342,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 
     if (VpIsInf(x)) {
 	if (is_negative(vexp)) {
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-Infinity) ** (-even_integer) -> +0 */
@@ -2437,8 +2363,8 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	    }
 	}
 	else {
-	    y = VpCreateRbObject(n, "0");
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    y = VpCreateRbObject(n, "0#");
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			VpSetPosInf(y);
@@ -2470,7 +2396,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));
 		}
@@ -2479,7 +2405,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
+	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2488,7 +2414,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));
 		}
@@ -2497,7 +2423,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
+	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2538,82 +2464,93 @@ BigDecimal_power_op(VALUE self, VALUE exp)
     return BigDecimal_power(1, &exp, self);
 }
 
-/* :nodoc:
+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.
  *
- * private method for dup and clone the provided BigDecimal +other+
+ * 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.
+ *
+ * ArgumentError:: If the +initial+ is a Float or Rational, and the +digits+
+ *                 value is omitted, this exception is raised.
  */
 static VALUE
-BigDecimal_initialize_copy(VALUE self, VALUE other)
+BigDecimal_initialize(int argc, VALUE *argv, VALUE self)
 {
+    ENTER(1);
     Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
-    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
+    Real *x;
 
-    if (self != other) {
-	DATA_PTR(self) = VpCopy(pv, x);
+    GUARD_OBJ(x, BigDecimal_new(argc, argv));
+    if (ToValue(x)) {
+	pv = VpCopy(pv, x);
+    }
+    else {
+	VpFree(pv);
+	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_clone(VALUE self)
+BigDecimal_initialize_copy(VALUE self, VALUE other)
 {
-  return self;
-}
+    Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
+    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
 
-static int
-opts_exception_p(VALUE opts)
-{
-    static ID kwds[1];
-    VALUE exception;
-    if (!kwds[0]) {
-        kwds[0] = rb_intern_const("exception");
+    if (self != other) {
+	DATA_PTR(self) = VpCopy(pv, x);
     }
-    rb_get_kwargs(opts, kwds, 0, 1, &exception);
-    return exception != Qfalse;
+    return self;
 }
 
 static Real *
 BigDecimal_new(int argc, VALUE *argv)
 {
     size_t mf;
-    VALUE  opts = Qnil;
     VALUE  nFig;
     VALUE  iniValue;
-    double d;
-    int    exc;
 
-    argc = rb_scan_args(argc, argv, "11:", &iniValue, &nFig, &opts);
-    exc = opts_exception_p(opts);
-
-    if (argc == 1) {
+    if (rb_scan_args(argc, argv, "11", &iniValue, &nFig) == 1) {
         mf = 0;
     }
     else {
-        /* 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;
-        }
+        mf = GetPositiveInt(nFig);
     }
 
     switch (TYPE(iniValue)) {
@@ -2629,24 +2566,12 @@ BigDecimal_new(int argc, VALUE *argv)
 	return GetVpValue(iniValue, 1);
 
       case T_FLOAT:
-        d = RFLOAT_VALUE(iniValue);
-        if (!isfinite(d)) {
-            Real *pv = VpCreateRbObject(1, NULL);
-            VpDtoV(pv, d);
-            return pv;
-        }
 	if (mf > DBL_DIG+1) {
-            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));
@@ -2658,65 +2583,22 @@ BigDecimal_new(int argc, VALUE *argv)
       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), 1, exc);
+    return VpAlloc(mf, RSTRING_PTR(iniValue));
 }
 
-/* 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.
- */
+/* See also BigDecimal.new */
 static VALUE
-f_BigDecimal(int argc, VALUE *argv, VALUE self)
+BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
 {
     ENTER(1);
     Real *pv;
     VALUE obj;
 
     obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
-    pv = BigDecimal_new(argc, argv);
-    if (pv == NULL) return Qnil;
-    SAVE(pv);
+    GUARD_OBJ(pv, BigDecimal_new(argc, argv));
     if (ToValue(pv)) pv = VpCopy(NULL, pv);
     RTYPEDDATA_DATA(obj) = pv;
-    RB_OBJ_FREEZE(obj);
     return pv->obj = obj;
 }
 
@@ -2782,9 +2664,9 @@ BigDecimal_sign(VALUE self)
  *       BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
  *       BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
  *
- *       BigDecimal(BigDecimal('Infinity'))
- *       BigDecimal(BigDecimal('-Infinity'))
- *       BigDecimal(BigDecimal('NaN'))
+ *       BigDecimal.new(BigDecimal('Infinity'))
+ *       BigDecimal.new(BigDecimal('-Infinity'))
+ *       BigDecimal(BigDecimal.new('NaN'))
  *     end
  *
  * For use with the BigDecimal::EXCEPTION_*
@@ -2878,13 +2760,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 almost same as one in the
+    /* TODO: the following switch statement is almostly the 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 = BIGDECIMAL_NEGATIVE_P(vx);
+	negative = VpGetSign(vx) < 0;
 	infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	nan = VpIsNaN(vx);
 	break;
@@ -2937,7 +2819,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     x = vx->obj;
 
     n = prec + rmpd_double_figures();
-    negative = BIGDECIMAL_NEGATIVE_P(vx);
+    negative = VpGetSign(vx) < 0;
     if (negative) {
 	VpSetSign(vx, 1);
     }
@@ -3016,14 +2898,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 almost same as one in the
+    /* TODO: the following switch statement is almostly the 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 = BIGDECIMAL_NEGATIVE_P(vx);
+	  negative = VpGetSign(vx) < 0;
 	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	  nan = VpIsNaN(vx);
 	  break;
@@ -3140,20 +3022,6 @@ get_vp_value:
     return y;
 }
 
-VALUE
-rmpd_util_str_to_d(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(rb_cBigDecimal, &BigDecimal_data_type, pv);
-  RB_OBJ_FREEZE(pv->obj);
-  return pv->obj;
-}
-
 /* Document-class: BigDecimal
  * BigDecimal provides arbitrary-precision floating point decimal arithmetic.
  *
@@ -3185,15 +3053,15 @@ rmpd_util_str_to_d(VALUE str)
  *
  *   require 'bigdecimal'
  *
- *   sum = BigDecimal("0")
+ *   sum = BigDecimal.new("0")
  *   10_000.times do
- *     sum = sum + BigDecimal("0.0001")
+ *     sum = sum + BigDecimal.new("0.0001")
  *   end
  *   print sum #=> 0.1E1
  *
  * Similarly:
  *
- *	(BigDecimal("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
+ *	(BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
  *
  *	(1.2 - 1.0) == 0.2 #=> false
  *
@@ -3207,8 +3075,8 @@ rmpd_util_str_to_d(VALUE str)
  * BigDecimal sometimes needs to return infinity, for example if you divide
  * a value by zero.
  *
- *	BigDecimal("1.0") / BigDecimal("0.0")  #=> Infinity
- *	BigDecimal("-1.0") / BigDecimal("0.0")  #=> -Infinity
+ *	BigDecimal.new("1.0") / BigDecimal.new("0.0")  #=> Infinity
+ *	BigDecimal.new("-1.0") / BigDecimal.new("0.0")  #=> -Infinity
  *
  * You can represent infinite numbers to BigDecimal using the strings
  * <code>'Infinity'</code>, <code>'+Infinity'</code> and
@@ -3221,13 +3089,13 @@ rmpd_util_str_to_d(VALUE str)
  *
  * Example:
  *
- *	BigDecimal("0.0") / BigDecimal("0.0") #=> NaN
+ *	BigDecimal.new("0.0") / BigDecimal.new("0.0") #=> NaN
  *
  * You can also create undefined values.
  *
  * NaN is never considered to be the same as any other value, even NaN itself:
  *
- *	n = BigDecimal('NaN')
+ *	n = BigDecimal.new('NaN')
  *	n == 0.0 #=> false
  *	n == n #=> false
  *
@@ -3240,11 +3108,11 @@ rmpd_util_str_to_d(VALUE str)
  * If the value which is too small to be represented is negative, a BigDecimal
  * value of negative zero is returned.
  *
- *	BigDecimal("1.0") / BigDecimal("-Infinity") #=> -0.0
+ *	BigDecimal.new("1.0") / BigDecimal.new("-Infinity") #=> -0.0
  *
  * If the value is positive, a value of positive zero is returned.
  *
- *	BigDecimal("1.0") / BigDecimal("Infinity") #=> 0.0
+ *	BigDecimal.new("1.0") / BigDecimal.new("Infinity") #=> 0.0
  *
  * (See BigDecimal.mode for how to specify limits of precision.)
  *
@@ -3254,25 +3122,13 @@ rmpd_util_str_to_d(VALUE str)
  * 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>.
  *
- * BigDecimal is released under the Ruby and 2-clause BSD licenses.
- * See LICENSE.txt for details.
+ * 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.
  *
  * Maintained by mrkn <mrkn@mrkn.jp> and ruby-core members.
  *
@@ -3293,17 +3149,17 @@ 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", f_BigDecimal, -1);
+    rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
 
     /* Class methods */
-    rb_undef_method(CLASS_OF(rb_cBigDecimal), "allocate");
-    rb_undef_method(CLASS_OF(rb_cBigDecimal), "new");
     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);
@@ -3311,14 +3167,6 @@ 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.
@@ -3361,7 +3209,7 @@ Init_bigdecimal(void)
     rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW", INT2FIX(VP_EXCEPTION_OVERFLOW));
 
     /*
-     * 0x10: Determines what happens when a division by zero is performed.
+     * 0x01: Determines what happens when a division by zero is performed.
      * See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE", INT2FIX(VP_EXCEPTION_ZERODIVIDE));
@@ -3423,13 +3271,14 @@ Init_bigdecimal(void)
 
     arg = rb_str_new2("+Infinity");
     /* Positive infinity value. */
-    rb_define_const(rb_cBigDecimal, "INFINITY", f_BigDecimal(1, &arg, rb_cBigDecimal));
+    rb_define_const(rb_cBigDecimal, "INFINITY", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
     arg = rb_str_new2("NaN");
     /* 'Not a Number' value. */
-    rb_define_const(rb_cBigDecimal, "NAN", f_BigDecimal(1, &arg, rb_cBigDecimal));
+    rb_define_const(rb_cBigDecimal, "NAN", BigDecimal_global_new(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);
 
@@ -3454,8 +3303,7 @@ 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, "clone", BigDecimal_clone, 0);
-    rb_define_method(rb_cBigDecimal, "dup", BigDecimal_clone, 0);
+    /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
     rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
     rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
     rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
@@ -3503,7 +3351,6 @@ 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");
 }
 
 /*
@@ -3531,14 +3378,7 @@ static Real *VpPt5;        /* constant 0.5 */
 #define MemCmp(x,y,z) memcmp(x,y,z)
 #define StrCmp(x,y)   strcmp(x,y)
 
-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 VpIsDefOP(Real *c,Real *a,Real *b,int 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);
@@ -3565,7 +3405,7 @@ VpMemAlloc(size_t mb)
     return p;
 }
 
-VP_EXPORT void *
+    VP_EXPORT void *
 VpMemRealloc(void *ptr, size_t mb)
 {
     void *p = xrealloc(ptr, mb);
@@ -3583,12 +3423,12 @@ VpFree(Real *pv)
 #ifdef BIGDECIMAL_DEBUG
 	gnAlloc--; /* Decrement allocation count */
 	if (gnAlloc == 0) {
-	    printf(" *************** All memories allocated freed ****************\n");
-	    /*getchar();*/
+	    printf(" *************** All memories allocated freed ****************");
+	    getchar();
 	}
 	if (gnAlloc <  0) {
 	    printf(" ??????????? Too many memory free calls(%d) ?????????????\n", gnAlloc);
-	    /*getchar();*/
+	    getchar();
 	}
 #endif /* BIGDECIMAL_DEBUG */
     }
@@ -3728,7 +3568,13 @@ 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)
@@ -3753,19 +3599,25 @@ One(void)
 VP_EXPORT double
 VpGetDoubleNaN(void) /* Returns the value of NaN */
 {
-    return nan("");
+    static double fNaN = 0.0;
+    if (fNaN == 0.0) fNaN = Zero()/Zero();
+    return fNaN;
 }
 
 VP_EXPORT double
 VpGetDoublePosInf(void) /* Returns the value of +Infinity */
 {
-    return HUGE_VAL;
+    static double fInf = 0.0;
+    if (fInf == 0.0) fInf = One()/Zero();
+    return fInf;
 }
 
 VP_EXPORT double
 VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
 {
-    return -HUGE_VAL;
+    static double fInf = 0.0;
+    if (fInf == 0.0) fInf = -(One()/Zero());
+    return fInf;
 }
 
 VP_EXPORT double
@@ -3813,7 +3665,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, enum op_sw sw)
+VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 {
     if (VpIsNaN(a) || VpIsNaN(b)) {
 	/* at least a or b is NaN */
@@ -3824,7 +3676,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
     if (VpIsInf(a)) {
 	if (VpIsInf(b)) {
 	    switch(sw) {
-	      case OP_SW_ADD: /* + */
+	      case 1: /* + */
 		if (VpGetSign(a) == VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3833,7 +3685,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-	      case OP_SW_SUB: /* - */
+	      case 2: /* - */
 		if (VpGetSign(a) != VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3842,10 +3694,12 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-	      case OP_SW_MULT: /* * */
+		break;
+	      case 3: /* * */
 		VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 		goto Inf;
-	      case OP_SW_DIV: /* / */
+		break;
+	      case 4: /* / */
 		VpSetNaN(c);
 		goto NaN;
 	    }
@@ -3854,18 +3708,18 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 	}
 	/* Inf op Finite */
 	switch(sw) {
-	  case OP_SW_ADD: /* + */
-	  case OP_SW_SUB: /* - */
+	  case 1: /* + */
+	  case 2: /* - */
 	    VpSetInf(c, VpGetSign(a));
 	    break;
-	  case OP_SW_MULT: /* * */
+	  case 3: /* * */
 	    if (VpIsZero(b)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case OP_SW_DIV: /* / */
+	  case 4: /* / */
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3873,20 +3727,20 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 
     if (VpIsInf(b)) {
 	switch(sw) {
-	  case OP_SW_ADD: /* + */
+	  case 1: /* + */
 	    VpSetInf(c, VpGetSign(b));
 	    break;
-	  case OP_SW_SUB: /* - */
+	  case 2: /* - */
 	    VpSetInf(c, -VpGetSign(b));
 	    break;
-	  case OP_SW_MULT: /* * */
+	  case 3: /* * */
 	    if (VpIsZero(a)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case OP_SW_DIV: /* / */
+	  case 4: /* / */
 	    VpSetZero(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3894,13 +3748,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
     return 1; /* Results OK */
 
 Inf:
-    if (VpIsPosInf(c)) {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
-    }
-    else {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
-    }
-
+    return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
 NaN:
     return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
 }
@@ -3960,11 +3808,14 @@ VP_EXPORT size_t
 VpInit(BDIGIT BaseVal)
 {
     /* Setup +/- Inf  NaN -0 */
+    VpGetDoubleNaN();
+    VpGetDoublePosInf();
+    VpGetDoubleNegInf();
     VpGetDoubleNegZero();
 
     /* Allocates Vp constants. */
-    VpConstOne = VpAlloc(1UL, "1", 1, 1);
-    VpPt5 = VpAlloc(1UL, ".5", 1, 1);
+    VpConstOne = VpAlloc(1UL, "1");
+    VpPt5 = VpAlloc(1UL, ".5");
 
 #ifdef BIGDECIMAL_DEBUG
     gnAlloc = 0;
@@ -3973,11 +3824,11 @@ VpInit(BDIGIT BaseVal)
 #ifdef BIGDECIMAL_DEBUG
     if (gfDebug) {
 	printf("VpInit: BaseVal   = %"PRIuBDIGIT"\n", BaseVal);
-	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);
+	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);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -4028,52 +3879,6 @@ 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]
@@ -4088,10 +3893,9 @@ rmpd_parse_special_string(const char *str)
  *   NULL be returned if memory allocation is failed,or any error.
  */
 VP_EXPORT Real *
-VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
+VpAlloc(size_t mx, const char *szVal)
 {
-    const char *orig_szVal = szVal;
-    size_t i, j, ni, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
+    size_t i, ni, ipn, ipf, nf, ipe, ne, nalloc;
     char v, *psz;
     int  sign=1;
     Real *vp = NULL;
@@ -4102,198 +3906,123 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
     if (mx == 0) ++mx;
 
     if (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;
-        }
+	while (ISSPACE(*szVal)) szVal++;
+	if (*szVal != '#') {
+	    if (mf) {
+		mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
+		if (mx > mf) {
+		    mx = mf;
+		}
+	    }
+	}
+	else {
+	    ++szVal;
+	}
     }
     else {
-      return_zero:
-        /* 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;
-    }
-
-    /* Check on Inf & NaN */
-    if ((vp = rmpd_parse_special_string(szVal)) != NULL) {
-        return vp;
-    }
-
-    /* Scanning digits */
-
-    /* A buffer for keeping scanned digits */
+	/* 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;
     buf = rb_str_tmp_new(strlen(szVal) + 1);
     psz = RSTRING_PTR(buf);
-
-    /* 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;
+    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;
     }
-
-    /* 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;
-            }
-        }
+    /* Skip trailing spaces */
+    while (--i > 0) {
+	if (ISSPACE(psz[i])) psz[i] = 0;
+	else break;
     }
+    szVal = psz;
 
-    psz[i] = '\0';
+    /* 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 */
 
-    if (((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);
+	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;
+	}
     }
-
     nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
     /* units for szVal[]  */
     if (mx == 0) mx = 1;
@@ -4303,7 +4032,7 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
     /* xmalloc() alway returns(or throw interruption) */
     vp->MaxPrec = mx;        /* set max precision */
     VpSetZero(vp, sign);
-    VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne);
+    VpCtoV(vp, &szVal[ipn], ni, &szVal[ipf], nf, &szVal[ipe], ne);
     rb_str_resize(buf, 0);
     return vp;
 }
@@ -4361,7 +4090,7 @@ VpAsgn(Real *c, Real *a, int isw)
 
 /*
  *   c = a + b  when operation =  1 or 2
- *   c = a - b  when operation = -1 or -2.
+ *  = a - b  when operation = -1 or -2.
  *   Returns number of significant digits of c
  */
 VP_EXPORT size_t
@@ -4380,7 +4109,7 @@ VpAddSub(Real *c, Real *a, Real *b, int operation)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, (operation > 0) ? OP_SW_ADD : OP_SW_SUB)) return 0; /* No significant digits */
+    if (!VpIsDefOP(c, a, b, (operation > 0) ? 1 : 2)) return 0; /* No significant digits */
 
     /* check if a or b is zero  */
     if (VpIsZero(a)) {
@@ -4494,7 +4223,7 @@ end_if:
 }
 
 /*
- * Addition of two values with variable precision
+ * Addition of two variable precisional variables
  * a and b assuming abs(a)>abs(b).
  *   c = abs(a) + abs(b) ; where |a|>=|b|
  */
@@ -4836,7 +4565,7 @@ VpMult(Real *c, Real *a, Real *b)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, OP_SW_MULT)) return 0; /* No significant digit */
+    if (!VpIsDefOP(c, a, b, 3)) return 0; /* No significant digit */
 
     if (VpIsZero(a) || VpIsZero(b)) {
 	/* at least a or b is zero */
@@ -4866,7 +4595,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", 1, 1);
+	c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0");
 	MxIndC = MxIndAB;
     }
 
@@ -4948,7 +4677,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;
@@ -4966,14 +4695,14 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
 #endif /*BIGDECIMAL_DEBUG */
 
     VpSetNaN(r);
-    if (!VpIsDefOP(c, a, b, OP_SW_DIV)) goto Exit;
+    if (!VpIsDefOP(c, a, b, 4)) goto Exit;
     if (VpIsZero(a) && VpIsZero(b)) {
 	VpSetNaN(c);
-	return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
+	return VpException(VP_EXCEPTION_NaN, "(VpDivd) 0/0 not defined(NaN)", 0);
     }
     if (VpIsZero(b)) {
 	VpSetInf(c, VpGetSign(a) * VpGetSign(b));
-	return VpException(VP_EXCEPTION_ZERODIVIDE, "Divide by zero", 0);
+	return VpException(VP_EXCEPTION_ZERODIVIDE, "(VpDivd) Divide by zero", 0);
     }
     if (VpIsZero(a)) {
 	/* numerator a is zero  */
@@ -5253,7 +4982,7 @@ VpComp(Real *a, Real *b)
 	goto Exit;
     }
 
-    /* a and b have same exponent, then compare their significand. */
+    /* a and b have same exponent, then compare significand. */
     mx = (a->Prec < b->Prec) ? a->Prec : b->Prec;
     ind = 0;
     while (ind < mx) {
@@ -5294,7 +5023,7 @@ Exit:
  *      %  ... VP variable. To print '%', use '%%'.
  *      \n ... new line
  *      \b ... backspace
- *      \t ... tab
+ *           ... tab
  *     Note: % must not appear more than once
  *    a  ... VP variable to be printed
  */
@@ -5305,6 +5034,24 @@ 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). */
@@ -5313,20 +5060,8 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
     while (*(cntl_chr + j)) {
 	if (*(cntl_chr + j) == '%' && *(cntl_chr + j + 1) != '%') {
 	    nc = 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)) {
+	    if (!VpIsZero(a)) {
+		if (VpGetSign(a) < 0) {
 		    fprintf(fp, "-");
 		    ++nc;
 		}
@@ -5415,7 +5150,7 @@ VpFormatSt(char *psz, size_t fFmt)
 	if (!ch) break;
 	if (ISSPACE(ch) || ch=='-' || ch=='+') continue;
 	if (ch == '.') { nf = 0; continue; }
-	if (ch == 'E' || ch == 'e') break;
+	if (ch == 'E') break;
 
 	if (++nf > fFmt) {
 	    memmove(psz + i + 1, psz + i, ie - i + 1);
@@ -5464,7 +5199,7 @@ VpSzMantissa(Real *a,char *psz)
 
     ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
     if (!VpIsZero(a)) {
-	if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+	if (VpGetSign(a) < 0) *psz++ = '-';
 	n = a->Prec;
 	for (i = 0; i < n; ++i) {
 	    m = BASE1;
@@ -5492,7 +5227,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);
@@ -5527,7 +5262,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;
@@ -5538,7 +5273,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
 
-    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+    if (VpGetSign(a) < 0) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -5569,13 +5304,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, 2: set '+' before digits. */
+/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
 {
     size_t i, n;
     BDIGIT m, e, nn;
@@ -5584,7 +5319,7 @@ VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     if (VpToSpecialString(a, psz, fPlus)) return;
 
-    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+    if (VpGetSign(a) < 0) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -6006,22 +5741,21 @@ VpSqrt(Real *y, Real *x)
     ssize_t nr;
     double val;
 
-    /* Zero or +Infinity ? */
-    if (VpIsZero(x) || VpIsPosInf(x)) {
-	VpAsgn(y,x,1);
+    /* Zero, NaN or Infinity ? */
+    if (!VpHasVal(x)) {
+	if (VpIsZero(x) || VpGetSign(x) > 0) {
+	    VpAsgn(y,x,1);
+	    goto Exit;
+	}
+	VpSetNaN(y);
+	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(NaN or negative value)", 0);
 	goto Exit;
     }
 
     /* Negative ? */
-    if (BIGDECIMAL_NEGATIVE_P(x)) {
-	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of negative value", 0);
-    }
-
-    /* NaN ? */
-    if (VpIsNaN(x)) {
+    if (VpGetSign(x) < 0) {
 	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of 'NaN'(Not a Number)", 0);
+	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(negative value)", 0);
     }
 
     /* One ? */
@@ -6034,8 +5768,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", 1, 1);
-    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1", 1, 1);
+    f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1");
+    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1");
 
     nr = 0;
     y_prec = y->MaxPrec;
@@ -6100,12 +5834,17 @@ 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? */
@@ -6207,10 +5946,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 && BIGDECIMAL_POSITIVE_P(y)) ++div;
+	if (fracf && (VpGetSign(y) > 0)) ++div;
 	break;
       case VP_ROUND_FLOOR:
-	if (fracf && BIGDECIMAL_NEGATIVE_P(y)) ++div;
+	if (fracf && (VpGetSign(y) < 0)) ++div;
 	break;
       case VP_ROUND_HALF_EVEN: /* Banker's rounding */
 	if (v > 5) ++div;
@@ -6329,10 +6068,10 @@ VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
 	if (v >= 6) f = 1;
 	break;
       case VP_ROUND_CEIL:
-	if (v && BIGDECIMAL_POSITIVE_P(c)) f = 1;
+	if (v && (VpGetSign(c) > 0)) f = 1;
 	break;
       case VP_ROUND_FLOOR:
-	if (v && BIGDECIMAL_NEGATIVE_P(c)) f = 1;
+	if (v && (VpGetSign(c) < 0)) 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,
@@ -6469,7 +6208,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 (BIGDECIMAL_POSITIVE_P(x)) goto Exit;
+	if (VpGetSign(x) > 0) goto Exit;
 	if ((n % 2) == 0) goto Exit;
 	VpSetSign(y, -1);
 	goto Exit;
@@ -6487,8 +6226,8 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
 
     /* Allocate working variables  */
 
-    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0", 1, 1);
-    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0", 1, 1);
+    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
+    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
     /* calculation start */
 
     VpAsgn(y, x, 1);
diff --git a/ext/bigdecimal/bigdecimal.def b/ext/bigdecimal/bigdecimal.def
deleted file mode 100644
index 615bf72e20..0000000000
--- a/ext/bigdecimal/bigdecimal.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS
-rmpd_util_str_to_d
-Init_bigdecimal
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index 68d8f3c00f..1666325d45 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -1,30 +1,23 @@
-# coding: utf-8
-
-bigdecimal_version = '1.4.1'
+# -*- ruby -*-
+_VERSION = "1.2.8"
+date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
-  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 ext/bigdecimal/util/extconf.rb]
-  s.files         = %w[
+  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[
     bigdecimal.gemspec
-    ext/bigdecimal/bigdecimal.c
-    ext/bigdecimal/bigdecimal.def
-    ext/bigdecimal/bigdecimal.h
-    ext/bigdecimal/depend
-    ext/bigdecimal/extconf.rb
-    ext/bigdecimal/util/extconf.rb
-    ext/bigdecimal/util/util.c
-    lib/bigdecimal.rb
+    bigdecimal.c
+    bigdecimal.h
+    depend extconf.rb
     lib/bigdecimal/jacobian.rb
     lib/bigdecimal/ludcmp.rb
     lib/bigdecimal/math.rb
@@ -34,12 +27,5 @@ Gem::Specification.new do |s|
     sample/nlsolve.rb
     sample/pi.rb
   ]
-
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
-
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "rake-compiler", ">= 0.9"
-  s.add_development_dependency "rake-compiler-dock", ">= 0.6.1"
-  s.add_development_dependency "minitest", "< 5.0.0"
-  s.add_development_dependency "pry"
+  s.extensions = %w[extconf.rb]
 end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index e3eae06e67..f85c3e55ad 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -9,8 +9,6 @@
 #ifndef  RUBY_BIG_DECIMAL_H
 #define  RUBY_BIG_DECIMAL_H 1
 
-#define RUBY_NO_OLD_COMPATIBILITY
-
 #include "ruby/ruby.h"
 #include <float.h>
 
@@ -92,62 +90,6 @@ 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
@@ -227,9 +169,7 @@ extern VALUE rb_cBigDecimal;
 #define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
 #define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
 
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#define	FLEXIBLE_ARRAY_SIZE /* */
-#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
 #define	FLEXIBLE_ARRAY_SIZE 0
 #else
 #define	FLEXIBLE_ARRAY_SIZE 1
@@ -242,11 +182,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 frac[]        */
+                    /* This is the actual size of pfrac[]       */
                     /*(frac[0] to frac[MaxPrec] are available). */
     size_t Prec;    /* Current precision size.                  */
-                    /* This indicates how much the              */
-                    /* array frac[] is actually used.           */
+                    /* This indicates how much the.             */
+                    /* the array frac[] is actually used.       */
     SIGNED_VALUE exponent; /* Exponent part.                    */
     short  sign;    /* Attributes of the value.                 */
                     /*
@@ -308,7 +248,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, int strict_p, int exc);
+VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal);
 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 943bd6c38c..3ab229f2b6 100644
--- a/ext/bigdecimal/depend
+++ b/ext/bigdecimal/depend
@@ -1,9 +1,7 @@
-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/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 a6a36304cc..3799e685bc 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,40 +1,11 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-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
-
-bigdecimal_version =
-  IO.readlines(gemspec_path)
-    .grep(/\Abigdecimal_version\s+=\s+/)[0][/\'([\d\.]+)\'/, 1]
-
-$defs << %Q[-DRUBY_BIGDECIMAL_VERSION=\\"#{bigdecimal_version}\\"]
-
 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_func("rb_array_const_ptr", "ruby.h")
-have_func("rb_sym2str", "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') {|mf|
-  mf << "GEMSPEC = #{gemspec_name}\n"
-  mf << "BIGDECIMAL_RB = #{bigdecimal_rb}\n"
-}
+create_makefile('bigdecimal')
diff --git a/ext/bigdecimal/lib/bigdecimal.rb b/ext/bigdecimal/lib/bigdecimal.rb
deleted file mode 100644
index 96995a32b3..0000000000
--- a/ext/bigdecimal/lib/bigdecimal.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'bigdecimal.so'
-
-def BigDecimal.new(*args, **kwargs)
-  warn "BigDecimal.new is deprecated; use BigDecimal() method instead.", uplevel: 1
-  BigDecimal(*args, **kwargs)
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 84c50248b7..9cad06c09b 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -21,9 +21,6 @@
 #
 # fx is f.values(x).
 #
-
-require 'bigdecimal'
-
 module Jacobian
   module_function
 
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 0b9d0648bb..3ddde6a9a0 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.99999999999999999999......e0
+#   puts sin(a,100) # => 0.10000000000000000000......E1
 #
 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('2'), 16).to_s
-  #   #=> "0.1414213562373095048801688724e1"
+  #   BigMath.sqrt(BigDecimal.new('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('-1'), 16).to_s
-  #   #=> "-0.785398163397448309615660845819878471907514682065e0"
+  #   BigMath.atan(BigDecimal.new('-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 88f490cb45..0c4e486c00 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,74 +1,72 @@
 # frozen_string_literal: false
+# BigDecimal extends the native Integer class to provide the #to_d method.
 #
-#--
-# bigdecimal/util extends various native classes to provide the #to_d method,
-# and provides BigDecimal#to_d and BigDecimal#to_digits.
-#++
-
-require 'bigdecimal'
-require 'bigdecimal/util.so'
-
+# When you require the BigDecimal library in your application, this methodwill
+# be available on Integer objects.
 class Integer < Numeric
   # call-seq:
   #     int.to_d  -> bigdecimal
   #
-  # Returns the value of +int+ as a BigDecimal.
+  # Convert +int+ to a BigDecimal and return it.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     42.to_d   # => 0.42e2
-  #
-  # See also BigDecimal::new.
+  #     42.to_d
+  #     # => #<BigDecimal:1008ef070,'0.42E2',9(36)>
   #
   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:
-  #     float.to_d             -> bigdecimal
-  #     float.to_d(precision)  -> bigdecimal
+  #     flt.to_d  -> bigdecimal
   #
-  # 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).
+  # Convert +flt+ to a BigDecimal and return it.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     0.5.to_d         # => 0.5e0
-  #     1.234.to_d(2)    # => 0.12e1
+  #     0.5.to_d
+  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
   #
-  # See also BigDecimal::new.
-  #
-  def to_d(precision=Float::DIG)
-    BigDecimal(self, precision)
+  def to_d(precision=nil)
+    BigDecimal(self, precision || Float::DIG)
   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:
-  #     str.to_d  -> bigdecimal
+  #     string.to_d  -> bigdecimal
   #
-  # Returns the result of interpreting leading characters in +str+
-  # as a BigDecimal.
+  # Convert +string+ to a BigDecimal and return it.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     "0.5".to_d             # => 0.5e0
-  #     "123.45e1".to_d        # => 0.12345e4
-  #     "45.67 degrees".to_d   # => 0.4567e2
-  #
-  # See also BigDecimal::new.
+  #     "0.5".to_d
+  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
   #
+  def to_d
+    BigDecimal(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
@@ -76,11 +74,12 @@ 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("3.14")
-  #     d.to_digits                  # => "3.14"
-  #
+  #     d = BigDecimal.new("3.14")
+  #     d.to_digits
+  #     # => "3.14"
   def to_digits
     if self.nan? || self.infinite? || self.zero?
       self.to_s
@@ -95,52 +94,35 @@ 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:
-  #     rat.to_d(precision)  -> bigdecimal
-  #
-  # Returns the value as a BigDecimal.
-  #
-  # The required +precision+ parameter is used to determine the number of
-  # significant digits for the result.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
+  #   r.to_d(precision)   -> bigdecimal
   #
-  #     Rational(22, 7).to_d(3)   # => 0.314e1
+  # Converts a Rational to a BigDecimal.
   #
-  # See also BigDecimal::new.
+  # 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.
   #
+  #   r = (22/7.0).to_r
+  #   # => (7077085128725065/2251799813685248)
+  #   r.to_d(3)
+  #   # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
   def to_d(precision)
-    BigDecimal(self, precision)
-  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)
+    if precision <= 0
+      raise ArgumentError, "negative precision"
+    end
+    num = self.numerator
+    BigDecimal(num).div(self.denominator, precision)
   end
 end
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 516c2473be..3b23269f8a 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("0.0")
-one  = BigDecimal("1.0")
+zero = BigDecimal.new("0.0")
+one  = BigDecimal.new("1.0")
 
 while (n=rd_order(na))>0
   a = []
@@ -37,28 +37,27 @@ 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(s)
-         as << BigDecimal(s)
+         a  << BigDecimal.new(s);
+         as << BigDecimal.new(s);
        end
-       printf("Contatant vector element b[%d] ? ",i)
-       b << BigDecimal(ARGF.gets)
+       printf("Contatant vector element b[%d] ? ",i); b << BigDecimal.new(ARGF.gets);
      end
   else
      # Read data from specified file.
-     printf("Coefficient matrix and constant vector.\n")
+     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(s[j])
-         as << BigDecimal(s[j])
+         a  << BigDecimal.new(s[j]);
+         as << BigDecimal.new(s[j]);
        end
-       b << BigDecimal(s[n])
+       b << BigDecimal.new(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 c2227dac73..b1dd08e0a3 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("0.0")
-    @one  = BigDecimal("1.0")
-    @two  = BigDecimal("2.0")
-    @ten  = BigDecimal("10.0")
-    @eps  = BigDecimal("1.0e-16")
+    @zero = BigDecimal.new("0.0")
+    @one  = BigDecimal.new("1.0")
+    @two  = BigDecimal.new("2.0")
+    @ten  = BigDecimal.new("10.0")
+    @eps  = BigDecimal.new("1.0e-16")
   end
   def zero;@zero;end
   def one ;@one ;end
diff --git a/ext/bigdecimal/util/extconf.rb b/ext/bigdecimal/util/extconf.rb
deleted file mode 100644
index 8750db1c52..0000000000
--- a/ext/bigdecimal/util/extconf.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-require 'mkmf'
-
-checking_for(checking_message("Windows")) do
-  case RUBY_PLATFORM
-  when /cygwin|mingw/
-    if defined?($extlist)
-      build_dir = "$(TARGET_SO_DIR)../"
-    else
-      base_dir = File.expand_path('../../../..', __FILE__)
-      build_dir = File.join(base_dir, "tmp", RUBY_PLATFORM, "bigdecimal", RUBY_VERSION, "")
-    end
-    $libs << " #{build_dir}bigdecimal.so"
-    true
-  when /mswin/
-    $DLDFLAGS << " -libpath:.."
-    $libs << " bigdecimal-$(arch).lib"
-    true
-  else
-    false
-  end
-end
-
-create_makefile('bigdecimal/util')
diff --git a/ext/bigdecimal/util/util.c b/ext/bigdecimal/util/util.c
deleted file mode 100644
index 8d38d87852..0000000000
--- a/ext/bigdecimal/util/util.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "ruby.h"
-
-RUBY_EXTERN VALUE rmpd_util_str_to_d(VALUE str);
-
-void
-Init_util(void)
-{
-  rb_define_method(rb_cString, "to_d", rmpd_util_str_to_d, 0);
-}
diff --git a/ext/cgi/escape/depend b/ext/cgi/escape/depend
index 099bb3f14b..c93a487a56 100644
--- a/ext/cgi/escape/depend
+++ b/ext/cgi/escape/depend
@@ -6,7 +6,6 @@ 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
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
index ced1b182eb..7289f43b8d 100644
--- a/ext/cgi/escape/escape.c
+++ b/ext/cgi/escape/escape.c
@@ -196,7 +196,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;
@@ -252,8 +252,7 @@ optimized_unescape(VALUE str, VALUE encoding)
     long i, len, beg = 0;
     VALUE dest = 0;
     const char *cstr;
-    rb_encoding *enc = rb_to_encoding(encoding);
-    int cr, origenc, encidx = rb_enc_to_index(enc);
+    int cr, origenc, encidx = rb_to_encoding_index(encoding);
 
     len  = RSTRING_LEN(str);
     cstr = RSTRING_PTR(str);
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index c7f5a5e34b..9a9011a7da 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -10,10 +10,6 @@
 
 #include "ruby.h"
 #include "vm_core.h"
-#include "gc.h"
-
-static int current_mode;
-static VALUE me2counter = Qnil;
 
 /*
  * call-seq:
@@ -22,184 +18,25 @@ static VALUE me2counter = Qnil;
  * Enables coverage measurement.
  */
 static VALUE
-rb_coverage_start(int argc, VALUE *argv, VALUE klass)
+rb_coverage_start(VALUE klass)
 {
-    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_hash_new_compare_by_id();
-    }
-    else {
-	me2counter = Qnil;
-    }
-
-    coverages = rb_get_coverages();
+    VALUE coverages = rb_get_coverages();
     if (!RTEST(coverages)) {
 	coverages = rb_hash_new();
 	rb_obj_hide(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");
+	rb_set_coverages(coverages);
     }
     return Qnil;
 }
 
-static VALUE
-branch_coverage(VALUE branches)
-{
-    VALUE ret = rb_hash_new();
-    VALUE structure = rb_ary_dup(RARRAY_AREF(branches, 0));
-    VALUE counters = rb_ary_dup(RARRAY_AREF(branches, 1));
-    int i, j;
-    long id = 0;
-
-    for (i = 0; i < RARRAY_LEN(structure); i++) {
-	VALUE branches = RARRAY_AREF(structure, i);
-	VALUE base_type = RARRAY_AREF(branches, 0);
-	VALUE base_first_lineno = RARRAY_AREF(branches, 1);
-	VALUE base_first_column = RARRAY_AREF(branches, 2);
-	VALUE base_last_lineno = RARRAY_AREF(branches, 3);
-	VALUE base_last_column = RARRAY_AREF(branches, 4);
-	VALUE children = rb_hash_new();
-	rb_hash_aset(ret, rb_ary_new_from_args(6, base_type, LONG2FIX(id++), base_first_lineno, base_first_column, base_last_lineno, base_last_column), children);
-	for (j = 5; j < RARRAY_LEN(branches); j += 6) {
-	    VALUE target_label = RARRAY_AREF(branches, j);
-	    VALUE target_first_lineno = RARRAY_AREF(branches, j + 1);
-	    VALUE target_first_column = RARRAY_AREF(branches, j + 2);
-	    VALUE target_last_lineno = RARRAY_AREF(branches, j + 3);
-	    VALUE target_last_column = RARRAY_AREF(branches, j + 4);
-	    int idx = FIX2INT(RARRAY_AREF(branches, j + 5));
-	    rb_hash_aset(children, rb_ary_new_from_args(6, target_label, LONG2FIX(id++), target_first_lineno, target_first_column, target_last_lineno, target_last_column), RARRAY_AREF(counters, idx));
-	}
-    }
-
-    return ret;
-}
-
-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) {
-	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);
-	    }
-	}
-    }
-    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;
-    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;
-    }
-
+    coverage = rb_ary_dup(coverage);
+    rb_ary_freeze(coverage);
     rb_hash_aset(coverages, path, coverage);
     return ST_CONTINUE;
 }
@@ -209,12 +46,6 @@ 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)
@@ -225,77 +56,25 @@ rb_coverage_peek_result(VALUE klass)
 	rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
     }
     st_foreach(RHASH_TBL(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(stop: true, clear: true)  => hash
+ *     Coverage.result  => hash
  *
- * 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.
+ * Returns a hash that contains filename as key and coverage array as value
+ * and disables coverage measurement.
  */
 static VALUE
-rb_coverage_result(int argc, VALUE *argv, VALUE klass)
+rb_coverage_result(VALUE klass)
 {
-    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;
-    }
+    VALUE ncoverages = rb_coverage_peek_result(klass);
+    rb_reset_coverages();
     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.
  *
@@ -333,9 +112,7 @@ void
 Init_coverage(void)
 {
     VALUE rb_mCoverage = rb_define_module("Coverage");
-    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, "start", rb_coverage_start, 0);
+    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
     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 146f694cd5..860893b06f 100644
--- a/ext/coverage/depend
+++ b/ext/coverage/depend
@@ -19,7 +19,6 @@ coverage.o: $(hdrdir)/ruby/encoding.h
 coverage.o: $(hdrdir)/ruby/intern.h
 coverage.o: $(hdrdir)/ruby/io.h
 coverage.o: $(hdrdir)/ruby/missing.h
-coverage.o: $(hdrdir)/ruby/onigmo.h
 coverage.o: $(hdrdir)/ruby/oniguruma.h
 coverage.o: $(hdrdir)/ruby/ruby.h
 coverage.o: $(hdrdir)/ruby/st.h
@@ -29,7 +28,6 @@ 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)/gc.h
 coverage.o: $(top_srcdir)/include/ruby.h
 coverage.o: $(top_srcdir)/internal.h
 coverage.o: $(top_srcdir)/method.h
diff --git a/ext/coverage/lib/coverage.rb b/ext/coverage/lib/coverage.rb
deleted file mode 100644
index f1923ef366..0000000000
--- a/ext/coverage/lib/coverage.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index ddb9608f4e..0000000000
--- a/ext/date/date.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-Gem::Specification.new do |s|
-  s.name = "date"
-  s.version = '2.0.0'
-  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.license = "BSD-2-Clause"
-
-  s.add_development_dependency "rake-compiler"
-end
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 67ed6171a7..12240d7457 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -51,21 +51,18 @@ 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)
 
-static VALUE date_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE datetime_initialize(int argc, VALUE *argv, VALUE self);
-
-inline static int
+inline static VALUE
 f_cmp(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
 	long c = FIX2LONG(x) - FIX2LONG(y);
 	if (c > 0)
-	    return 1;
+	    c = 1;
 	else if (c < 0)
-	    return -1;
-	return 0;
+	    c = -1;
+	return INT2FIX(c);
     }
-    return rb_cmpint(rb_funcallv(x, id_cmp, 1, &y), x, y);
+    return rb_funcall(x, id_cmp, 1, y);
 }
 
 inline static VALUE
@@ -97,7 +94,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, id_ge_p, 1, y);
+    return rb_funcall(x, rb_intern(">="), 1, y);
 }
 
 inline static VALUE
@@ -105,7 +102,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, id_eqeq_p, 1, y);
+    return rb_funcall(x, rb_intern("=="), 1, y);
 }
 
 inline static VALUE
@@ -239,8 +236,11 @@ f_negative_p(VALUE x)
 struct SimpleDateData
 {
     unsigned flags;
-    int jd;	/* as utc */
     VALUE nth;	/* not always canonicalized */
+    int jd;	/* as utc */
+    /* df is zero */
+    /* sf is zero */
+    /* of is zero */
     date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as utc=local */
     int year;	/* truncated */
@@ -259,8 +259,11 @@ struct SimpleDateData
 struct ComplexDateData
 {
     unsigned flags;
-    int jd; 	/* as utc */
     VALUE nth;	/* not always canonicalized */
+    int jd; 	/* as utc */
+    int df;	/* as utc, in secs */
+    VALUE sf;	/* in nano secs */
+    int of;	/* in secs */
     date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as local */
     int year;	/* truncated */
@@ -274,9 +277,6 @@ 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 +315,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) & ~COMPLEX_DAT;\
-} while (0)
+    (x)->flags = _flags;\
+}
 #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) & ~COMPLEX_DAT;\
-} while (0)
+    (x)->flags = _flags;\
+}
 #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 +352,12 @@ do {\
     (x)->hour = _hour;\
     (x)->min = _min;\
     (x)->sec = _sec;\
-    (x)->flags = (_flags) | COMPLEX_DAT;\
-} while (0)
+    (x)->flags = _flags;\
+}
 #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 +366,13 @@ do {\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->pc = PACK5(_mon, _mday, _hour, _min, _sec);\
-    (x)->flags = (_flags) | COMPLEX_DAT;\
-} while (0)
+    (x)->flags = _flags;\
+}
 #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 +386,10 @@ do {\
     (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 +399,12 @@ do {\
     (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 +412,17 @@ do {\
     (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 +1109,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 +1118,7 @@ do {\
 	_nth = f_add(_nth, INT2FIX(1));\
 	_jd -= CM_PERIOD;\
     }\
-} while (0)
+}
 
 inline static void
 canonicalize_s_jd(VALUE obj, union DateData *x)
@@ -1928,13 +1928,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,9 +2333,6 @@ 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:
 	{
@@ -2362,11 +2359,10 @@ offset_to_sec(VALUE vof, int *rof)
       default:
 	expect_numeric(vof);
 	vof = f_to_r(vof);
-	if (!k_rational_p(vof)) {
-	    if (!try_rational) Check_Type(vof, T_RATIONAL);
-	    try_rational = 0;
-	    goto again;
-	}
+#ifdef CANONICALIZATION_FOR_MATHN
+	if (!k_rational_p(vof))
+	    return offset_to_sec(vof, rof);
+#endif
 	/* fall through */
       case T_RATIONAL:
 	{
@@ -2375,10 +2371,17 @@ offset_to_sec(VALUE vof, int *rof)
 
 	    vs = day_to_sec(vof);
 
+#ifdef CANONICALIZATION_FOR_MATHN
 	    if (!k_rational_p(vs)) {
-		vn = vs;
-		goto rounded;
+		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;
 	    }
+#endif
 	    vn = rb_rational_num(vs);
 	    vd = rb_rational_den(vs);
 
@@ -2388,7 +2391,6 @@ 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);
@@ -2418,12 +2420,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)
@@ -2460,7 +2462,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)
@@ -2549,7 +2551,7 @@ date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass)
  *    Date.valid_date?(2001,2,3)	#=> true
  *    Date.valid_date?(2001,2,29)	#=> false
  *
- * See also ::jd and ::civil.
+ * See also jd and civil.
  */
 static VALUE
 date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
@@ -2630,7 +2632,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)
@@ -2712,7 +2714,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)
@@ -2966,7 +2968,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);
+    set_to_simple(obj, dat, nth, jd, sg, y, m, d, flags & ~COMPLEX_DAT);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
 
@@ -2988,7 +2990,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);
+		   y, m, d, h, min, s, flags | COMPLEX_DAT);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
     assert(have_df_p(dat) || have_time_p(dat));
@@ -3205,47 +3207,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");\
 	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");\
 	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);
 
@@ -3260,7 +3262,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)
@@ -3310,7 +3312,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)
@@ -3378,25 +3380,14 @@ 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);
 
@@ -3426,7 +3417,11 @@ date_initialize(int argc, VALUE *argv, VALUE self)
 			       &rm, &rd))
 	    rb_raise(rb_eArgError, "invalid date");
 
-	set_to_simple(self, dat, nth, 0, sg, ry, rm, rd, HAVE_CIVIL);
+	ret = d_simple_new_internal(klass,
+				    nth, 0,
+				    sg,
+				    ry, rm, rd,
+				    HAVE_CIVIL);
     }
     else {
 	VALUE nth;
@@ -3438,9 +3433,12 @@ date_initialize(int argc, VALUE *argv, VALUE self)
 			   &ns))
 	    rb_raise(rb_eArgError, "invalid date");
 
-	set_to_simple(self, dat, nth, rjd, sg, ry, rm, rd, HAVE_JD | HAVE_CIVIL);
+	ret = d_simple_new_internal(klass,
+				    nth, rjd,
+				    sg,
+				    ry, rm, rd,
+				    HAVE_JD | HAVE_CIVIL);
     }
-    ret = self;
     add_frac();
     return ret;
 }
@@ -3459,7 +3457,7 @@ date_initialize(int argc, VALUE *argv, VALUE self)
  *    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)
@@ -3633,9 +3631,9 @@ static void set_sg(union DateData *, double);
  * call-seq:
  *    Date.today([start=Date::ITALY])  ->  date
  *
- * Creates a date object denoting the present day.
+ *    Date.today		#=> #<Date: 2011-06-11 ..>
  *
- *    Date.today   #=> #<Date: 2011-06-11 ...>
+ * Creates a date object denoting the present day.
  */
 static VALUE
 date_s_today(int argc, VALUE *argv, VALUE klass)
@@ -3681,18 +3679,16 @@ 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 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))
+#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)))
 
 static VALUE
 rt_rewrite_frags(VALUE hash)
 {
     VALUE seconds;
 
-    seconds = del_hash("seconds");
+    seconds = ref_hash("seconds");
     if (!NIL_P(seconds)) {
 	VALUE offset, d, h, min, s, fr;
 
@@ -3717,10 +3713,13 @@ 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);
@@ -4237,7 +4236,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)
@@ -4247,7 +4246,7 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=Date::ITALY]]])  ->  date
+ *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=ITALY]]])  ->  date
  *
  * Parses the given representation of date and time with the given
  * template, and creates a date object.  strptime does not support
@@ -4261,7 +4260,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)
@@ -4306,6 +4305,16 @@ 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;
 }
 
@@ -4331,7 +4340,7 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.parse(string='-4712-01-01'[, comp=true[, start=Date::ITALY]])  ->  date
+ *    Date.parse(string='-4712-01-01'[, comp=true[, start=ITALY]])  ->  date
  *
  * Parses the given representation of date and time, and creates a
  * date object.  This method does not function as a validator.
@@ -4391,7 +4400,7 @@ date_s__iso8601(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.iso8601(string='-4712-01-01'[, start=Date::ITALY])  ->  date
+ *    Date.iso8601(string='-4712-01-01'[, start=ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical ISO 8601 formats.
@@ -4434,7 +4443,7 @@ date_s__rfc3339(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  date
+ *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 3339 formats.
@@ -4475,7 +4484,7 @@ date_s__xmlschema(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.xmlschema(string='-4712-01-01'[, start=Date::ITALY])  ->  date
+ *    Date.xmlschema(string='-4712-01-01'[, start=ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical XML Schema formats.
@@ -4517,8 +4526,8 @@ date_s__rfc2822(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  date
- *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  date
+ *    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
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 2822 formats.
@@ -4560,7 +4569,7 @@ date_s__httpdate(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  date
+ *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some RFC 2616 format.
@@ -4602,16 +4611,12 @@ date_s__jisx0301(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.jisx0301(string='-4712-01-01'[, start=Date::ITALY])  ->  date
+ *    Date.jisx0301(string='-4712-01-01'[, start=ITALY])  ->  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 ...>
  */
 static VALUE
 date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
@@ -4686,14 +4691,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)
+}
 
-#if 0
+#ifndef NDEBUG
 static VALUE
 d_lite_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -4746,7 +4751,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);
+			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF | COMPLEX_DAT);
 	}
     }
     return self;
@@ -4765,28 +4770,8 @@ d_lite_initialize_copy(VALUE copy, VALUE date)
     {
 	get_d2(copy, date);
 	if (simple_dat_p(bdat)) {
-	    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
-	    }
+	    adat->s = bdat->s;
+	    adat->s.flags &= ~COMPLEX_DAT;
 	}
 	else {
 	    if (!complex_dat_p(adat))
@@ -4794,6 +4779,7 @@ d_lite_initialize_copy(VALUE copy, VALUE date)
 			 "cannot load complex into simple");
 
 	    adat->c = bdat->c;
+	    adat->c.flags |= COMPLEX_DAT;
 	}
     }
     return copy;
@@ -5394,7 +5380,7 @@ dup_obj_with_new_start(VALUE obj, double sg)
  * call-seq:
  *    d.new_start([start=Date::ITALY])  ->  date
  *
- * Duplicates self and resets its day of calendar reform.
+ * Duplicates self and resets its the day of calendar reform.
  *
  *    d = Date.new(1582,10,15)
  *    d.new_start(Date::JULIAN)		#=> #<Date: 1582-10-05 ...>
@@ -5512,9 +5498,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 a fractional number,
- * 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 flonum, 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)
@@ -5527,10 +5513,8 @@ 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:
 	{
@@ -5740,21 +5724,18 @@ d_lite_plus(VALUE self, VALUE other)
       default:
 	expect_numeric(other);
 	other = f_to_r(other);
-	if (!k_rational_p(other)) {
-	    if (!try_rational) Check_Type(other, T_RATIONAL);
-	    try_rational = 0;
-	    goto again;
-	}
+#ifdef CANONICALIZATION_FOR_MATHN
+	if (!k_rational_p(other))
+	    return d_lite_plus(self, other);
+#endif
 	/* fall through */
       case T_RATIONAL:
 	{
 	    VALUE nth, sf, t;
 	    int jd, df, s;
 
-	    if (wholenum_p(other)) {
-		other = rb_rational_num(other);
-		goto again;
-	    }
+	    if (wholenum_p(other))
+		return d_lite_plus(self, rb_rational_num(other));
 
 	    if (f_positive_p(other))
 		s = +1;
@@ -5902,8 +5883,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 a fractional number,
- * assumes its precision is at most nanosecond.
+ * pointing other days before self.  If the other is flonum, 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)
@@ -5984,24 +5965,12 @@ d_lite_next(VALUE self)
  * call-seq:
  *    d >> n  ->  date
  *
- * 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:
+ * Returns a date object pointing n months after self.  The n should
+ * be a numeric value.
  *
- *    Date.new(2001,1,28) >> 1   #=> #<Date: 2001-02-28 ...>
- *    Date.new(2001,1,31) >> 1   #=> #<Date: 2001-02-28 ...>
- *
- * 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 ...>
+ *    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 ...>
  */
 static VALUE
 d_lite_rshift(VALUE self, VALUE other)
@@ -6046,24 +6015,12 @@ d_lite_rshift(VALUE self, VALUE other)
  * call-seq:
  *    d << n  ->  date
  *
- * 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 ...>
- *
- * When the same day does not exist for the corresponding month,
- * the last day of the month is used instead:
+ * Returns a date object pointing n months before self.  The n should
+ * be a numeric value.
  *
- *    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 ...>
+ *    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 ...>
  */
 static VALUE
 d_lite_lshift(VALUE self, VALUE other)
@@ -6076,9 +6033,7 @@ d_lite_lshift(VALUE self, VALUE other)
  * call-seq:
  *    d.next_month([n=1])  ->  date
  *
- * This method is equivalent to d >> n.
- *
- * See Date#>> for examples.
+ * This method is equivalent to d >> n
  */
 static VALUE
 d_lite_next_month(int argc, VALUE *argv, VALUE self)
@@ -6095,9 +6050,7 @@ 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.
- *
- * See Date#<< for examples.
+ * This method is equivalent to d << n
  */
 static VALUE
 d_lite_prev_month(int argc, VALUE *argv, VALUE self)
@@ -6114,13 +6067,7 @@ 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).
- *
- *    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#>>.
+ * This method is equivalent to d >> (n * 12)
  */
 static VALUE
 d_lite_next_year(int argc, VALUE *argv, VALUE self)
@@ -6137,13 +6084,7 @@ 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).
- *
- *    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#<<.
+ * This method is equivalent to d << (n * 12)
  */
 static VALUE
 d_lite_prev_year(int argc, VALUE *argv, VALUE self)
@@ -6173,7 +6114,6 @@ 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);
 
@@ -6188,22 +6128,25 @@ d_lite_step(int argc, VALUE *argv, VALUE self)
     RETURN_ENUMERATOR(self, argc, argv);
 
     date = self;
-    c = f_cmp(step, INT2FIX(0));
-    if (c < 0) {
+    switch (FIX2INT(f_cmp(step, INT2FIX(0)))) {
+      case -1:
 	while (FIX2INT(d_lite_cmp(date, limit)) >= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
-    }
-    else if (c == 0) {
+	break;
+      case 0:
 	while (1)
 	    rb_yield(date);
-    }
-    else /* if (c > 0) */ {
+	break;
+      case 1:
 	while (FIX2INT(d_lite_cmp(date, limit)) <= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
+	break;
+      default:
+	abort();
     }
     return self;
 }
@@ -6258,10 +6201,10 @@ cmp_gen(VALUE self, VALUE other)
     get_d1(self);
 
     if (k_numeric_p(other))
-	return INT2FIX(f_cmp(m_ajd(dat), other));
+	return f_cmp(m_ajd(dat), other);
     else if (k_date_p(other))
-	return INT2FIX(f_cmp(m_ajd(dat), f_ajd(other)));
-    return rb_num_coerce_cmp(self, other, id_cmp);
+	return f_cmp(m_ajd(dat), f_ajd(other));
+    return rb_num_coerce_cmp(self, other, rb_intern("<=>"));
 }
 
 static VALUE
@@ -6329,11 +6272,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.
  */
@@ -6390,7 +6333,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, id_eqeq_p);
+    return rb_num_coerce_cmp(self, other, rb_intern("=="));
 }
 
 /*
@@ -6461,7 +6404,7 @@ d_lite_hash(VALUE self)
     h[2] = m_df(dat);
     h[3] = m_sf(dat);
     v = rb_memhash(h, sizeof(h));
-    return ST2FIX(v);
+    return LONG2FIX(v);
 }
 
 #include "date_tmx.h"
@@ -6473,8 +6416,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"
  */
@@ -6488,7 +6431,7 @@ d_lite_to_s(VALUE self)
 static VALUE
 mk_inspect_raw(union DateData *x, VALUE klass)
 {
-    char flags[6];
+    char flags[5];
 
     flags[0] = (x->flags & COMPLEX_DAT) ? 'C' : 'S';
     flags[1] = (x->flags & HAVE_JD)     ? 'j' : '-';
@@ -6654,9 +6597,7 @@ tmx_m_of(union DateData *x)
 static char *
 tmx_m_zone(union DateData *x)
 {
-    VALUE zone = m_zone(x);
-    /* TODO: fix potential dangling pointer */
-    return RSTRING_PTR(zone);
+    return RSTRING_PTR(m_zone(x));
 }
 
 static const struct tmx_funcs tmx_funcs = {
@@ -6750,13 +6691,13 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  * Formats date according to the directives in the given format
  * string.
- * The directives begin with a percent (%) character.
+ * The directives begins with a percent (%) character.
  * Any text not listed as a directive will be passed through to the
  * output string.
  *
- * A directive consists of a percent (%) character,
- * zero or more flags, an optional minimum field width,
- * an optional modifier, and a conversion specifier
+ * The directive consists of a percent (%) character,
+ * zero or more flags, optional minimum field width,
+ * optional modifier and a conversion specifier
  * as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -6806,7 +6747,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..60)
+ *      %S - Second of the minute (00..59)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
@@ -6821,7 +6762,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 - Equivalent to %:z (e.g. +09:00)
+ *      %Z - Time zone abbreviation name or something similar information.
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -6866,12 +6807,11 @@ 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 the strftime() function defined in ISO C
- * and POSIX.
+ * This method is similar to 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 the same format string is used in other
+ * However this method is locale independent.
+ * So, the result may differ even if a 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.
@@ -6919,7 +6859,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)
@@ -7039,14 +6979,10 @@ jisx0301_date_format(char *fmt, size_t size, VALUE jd, VALUE y)
 	    c = 'S';
 	    s = 1925;
 	}
-	else if (d < 2458605) {
+	else {
 	    c = 'H';
 	    s = 1988;
 	}
-	else {
-	    c = 'R';
-	    s = 2018;
-	}
 	snprintf(fmt, size, "%c%02ld" ".%%m.%%d", c, FIX2INT(y) - s);
 	return fmt;
     }
@@ -7124,10 +7060,6 @@ 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);
@@ -7140,33 +7072,63 @@ d_lite_marshal_load(VALUE self, VALUE a)
       case 2: /* 1.6.x */
       case 3: /* 1.8.x, 1.9.2 */
 	{
-	    VALUE ajd, vof, vsg;
+	    VALUE ajd, of, sg, nth, sf;
+	    int jd, df, rof;
+	    double rsg;
+
 
 	    if  (RARRAY_LEN(a) == 2) {
 		ajd = f_sub(RARRAY_AREF(a, 0), half_days_in_day);
-		vof = INT2FIX(0);
-		vsg = RARRAY_AREF(a, 1);
-		if (!k_numeric_p(vsg))
-		    vsg = DBL2NUM(RTEST(vsg) ? GREGORIAN : JULIAN);
+		of = INT2FIX(0);
+		sg = RARRAY_AREF(a, 1);
+		if (!k_numeric_p(sg))
+		    sg = DBL2NUM(RTEST(sg) ? GREGORIAN : JULIAN);
 	    }
 	    else {
 		ajd = RARRAY_AREF(a, 0);
-		vof = RARRAY_AREF(a, 1);
-		vsg = RARRAY_AREF(a, 2);
+		of = RARRAY_AREF(a, 1);
+		sg = RARRAY_AREF(a, 2);
 	    }
 
-	    old_to_new(ajd, vof, vsg,
-		       &nth, &jd, &df, &sf, &of, &sg);
+	    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);
+	    }
 	}
 	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:
@@ -7174,18 +7136,6 @@ d_lite_marshal_load(VALUE self, VALUE a)
 	break;
     }
 
-    if (simple_dat_p(dat)) {
-	if (df || !f_zero_p(sf) || of) {
-	    rb_raise(rb_eArgError,
-		     "cannot load complex into simple");
-	}
-	set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
-    } else {
-	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);
@@ -7211,7 +7161,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 ...>
@@ -7279,7 +7229,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 DateTime object denoting the given ordinal date.
+ * Creates a date-time 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')
@@ -7355,7 +7305,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 DateTime object denoting the given calendar date.
+ * Creates a date-time 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')
@@ -7366,20 +7316,9 @@ 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);
 
@@ -7423,13 +7362,13 @@ datetime_initialize(int argc, VALUE *argv, VALUE self)
 	    rb_raise(rb_eArgError, "invalid date");
 	canon24oc();
 
-	set_to_complex(self, dat,
-		       nth, 0,
-		       0, INT2FIX(0),
-		       rof, sg,
-		       ry, rm, rd,
-		       rh, rmin, rs,
-		       HAVE_CIVIL | HAVE_TIME);
+	ret = d_complex_new_internal(klass,
+				     nth, 0,
+				     0, INT2FIX(0),
+				     rof, sg,
+				     ry, rm, rd,
+				     rh, rmin, rs,
+				     HAVE_CIVIL | HAVE_TIME);
     }
     else {
 	VALUE nth;
@@ -7448,15 +7387,14 @@ datetime_initialize(int argc, VALUE *argv, VALUE self)
 			       time_to_df(rh, rmin, rs),
 			       rof);
 
-	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 = d_complex_new_internal(klass,
+				     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;
 }
@@ -7465,7 +7403,7 @@ datetime_initialize(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    DateTime.commercial([cwyear=-4712[, cweek=1[, cwday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])  ->  datetime
  *
- * Creates a DateTime object denoting the given week date.
+ * Creates a date-time 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 ...>
@@ -7682,7 +7620,7 @@ datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.now([start=Date::ITALY])  ->  datetime
  *
- * Creates a DateTime object denoting the present time.
+ * Creates a date-time object denoting the present time.
  *
  *    DateTime.now		#=> #<DateTime: 2011-06-11T21:20:44+09:00 ...>
  */
@@ -7731,8 +7669,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_TIMEZONE)
-#ifdef HAVE_ALTZONE
+#elif defined(HAVE_VAR_TIMEZONE)
+#ifdef HAVE_VAR_ALTZONE
     of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
 #else
     of = (long)-timezone;
@@ -7885,7 +7823,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)
@@ -7895,10 +7833,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=Date::ITALY]]])  ->  datetime
+ *    DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=ITALY]]])  ->  datetime
  *
  * Parses the given representation of date and time with the given
- * template, and creates a DateTime object.  strptime does not support
+ * template, and creates a date 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')
@@ -7918,7 +7856,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)
@@ -7948,10 +7886,10 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=Date::ITALY]])  ->  datetime
+ *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=ITALY]])  ->  datetime
  *
  * Parses the given representation of date and time, and creates a
- * DateTime object.  This method does not function as a validator.
+ * date object.  This method does not function as a validator.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", makes it full.
@@ -7991,9 +7929,9 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date object by parsing from a string according to
  * some typical ISO 8601 formats.
  *
  *    DateTime.iso8601('2001-02-03T04:05:06+07:00')
@@ -8025,9 +7963,9 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
  *    DateTime.rfc3339('2001-02-03T04:05:06+07:00')
@@ -8055,9 +7993,9 @@ datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date object by parsing from a string according to
  * some typical XML Schema formats.
  *
  *    DateTime.xmlschema('2001-02-03T04:05:06+07:00')
@@ -8085,10 +8023,10 @@ datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  datetime
- *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  datetime
+ *    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
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
  *     DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700')
@@ -8116,9 +8054,9 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  datetime
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date object by parsing from a string according to
  * some RFC 2616 format.
  *
  *    DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT')
@@ -8146,18 +8084,13 @@ datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
  *
- * Creates a new DateTime object by parsing from a string according to
+ * Creates a new Date 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 ...>
  */
 static VALUE
 datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
@@ -8183,8 +8116,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"
@@ -8201,13 +8134,13 @@ dt_lite_to_s(VALUE self)
  *
  * Formats date according to the directives in the given format
  * string.
- * The directives begin with a percent (%) character.
+ * The directives begins with a percent (%) character.
  * Any text not listed as a directive will be passed through to the
  * output string.
  *
- * A directive consists of a percent (%) character,
- * zero or more flags, an optional minimum field width,
- * an optional modifier, and a conversion specifier
+ * The directive consists of a percent (%) character,
+ * zero or more flags, optional minimum field width,
+ * optional modifier and a conversion specifier
  * as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -8222,7 +8155,7 @@ dt_lite_to_s(VALUE self)
  *
  * The minimum field width specifies the minimum width.
  *
- * The modifiers are "E" and "O".
+ * The modifier is "E" and "O".
  * They are ignored.
  *
  * Format directives:
@@ -8258,7 +8191,7 @@ dt_lite_to_s(VALUE self)
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..60)
+ *      %S - Second of the minute (00..59)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
@@ -8273,7 +8206,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 - Equivalent to %:z (e.g. +09:00)
+ *      %Z - Time zone abbreviation name or something similar information.
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -8318,12 +8251,11 @@ 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 the strftime() function defined in ISO C
- * and POSIX.
+ * This method is similar to 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 the same format string is used in other
+ * However this method is locale independent.
+ * So, the result may differ even if a 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.
@@ -8371,7 +8303,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)
@@ -8401,8 +8333,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%:z').
- * The optional argument +n+ is the number of digits for fractional seconds.
+ * This method is equivalent to strftime('%FT%T').  The optional
+ * argument n is length of fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').iso8601(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8424,8 +8356,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%:z').
- * The optional argument +n+ is the number of digits for fractional seconds.
+ * This method is equivalent to strftime('%FT%T').  The optional
+ * argument n is length of fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').rfc3339(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8440,8 +8372,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 the number of digits for fractional seconds.
+ * Returns a string in a JIS X 0301 format.  The optional argument n
+ * is length of fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').jisx0301(9)
  *				#=> "H13.02.03T04:05:06.123456789+07:00"
@@ -8671,7 +8603,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;
@@ -9036,18 +8968,14 @@ 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(">=");
@@ -9075,13 +9003,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
@@ -9089,14 +9017,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.
      *
@@ -9106,15 +9034,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 is so-called "commercial".
+     * In those classes, this 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 the same as
-     * the original Julian day number. And the chronological Julian day
+     * In this document, the astronomical Julian day number is 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.
      *
@@ -9124,14 +9052,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
-     * the same as the original modified Julian day number. And 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.
@@ -9140,16 +9068,16 @@ Init_date_core(void)
      * appears, it just refers to "chronological modified Julian day
      * number", not the original.
      *
-     * In those classes, those are so-called "amjd" and "mjd".
+     * In those classes, this is so-called "mjd".
      *
      * == Date
      *
-     * A subclass of Object that includes the Comparable module and
-     * easily handles date.
+     * A subclass of Object that includes Comparable module and easily handles
+     * date.
      *
-     * A Date object is created with Date::new, Date::jd, Date::ordinal,
+     * Date object is created with Date::new, Date::jd, Date::ordinal,
      * Date::commercial, Date::parse, Date::strptime, Date::today,
-     * Time#to_date, etc.
+     * Time#to_date or etc.
      *
      *     require 'date'
      *
@@ -9170,7 +9098,7 @@ Init_date_core(void)
      *
      * All date objects are immutable; hence cannot modify themselves.
      *
-     * The concept of a date object can be represented as a tuple
+     * The concept of this 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
@@ -9185,11 +9113,10 @@ Init_date_core(void)
      * The offset in this class is usually zero, and cannot be
      * specified directly.
      *
-     * 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.
+     * 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.
      *
      *     $ ruby sample/cal.rb -c it 10 1582
      *         October 1582
@@ -9206,7 +9133,7 @@ Init_date_core(void)
      *     17 18 19 20 21 22 23
      *     24 25 26 27 28 29 30
      *
-     * A Date object has various methods. See each reference.
+     * Date object has various methods. See each reference.
      *
      *     d = Date.parse('3rd Feb 2001')
      *					#=> #<Date: 2001-02-03 ...>
@@ -9254,31 +9181,32 @@ 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_simple);
+    rb_define_alloc_func(cDate, d_lite_s_alloc);
 
 #ifndef NDEBUG
-    rb_define_private_method(CLASS_OF(cDate), "_valid_jd?",
+#define de_define_private_method rb_define_private_method
+    de_define_private_method(CLASS_OF(cDate), "_valid_jd?",
 			     date_s__valid_jd_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
 			     date_s__valid_ordinal_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_civil?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_civil?",
 			     date_s__valid_civil_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_date?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_date?",
 			     date_s__valid_civil_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
 			     date_s__valid_commercial_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
 			     date_s__valid_weeknum_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
+    de_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
 			     date_s__valid_nth_kday_p, -1);
 #endif
 
@@ -9291,11 +9219,11 @@ Init_date_core(void)
 			       date_s_valid_commercial_p, -1);
 
 #ifndef NDEBUG
-    rb_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
+    de_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
 			     date_s_valid_weeknum_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
+    de_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
 			     date_s_valid_nth_kday_p, -1);
-    rb_define_private_method(CLASS_OF(cDate), "zone_to_diff",
+    de_define_private_method(CLASS_OF(cDate), "zone_to_diff",
 			     date_s_zone_to_diff, 1);
 #endif
 
@@ -9306,18 +9234,21 @@ Init_date_core(void)
 			       date_s_gregorian_leap_p, 1);
 
 #ifndef NDEBUG
-    rb_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
-    rb_define_alias(rb_singleton_class(cDate), "new_l!", "new");
+#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");
 #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
-    rb_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
-    rb_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
+    de_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
+    de_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
 #endif
 
     rb_define_singleton_method(cDate, "today", date_s_today, -1);
@@ -9340,11 +9271,14 @@ Init_date_core(void)
     rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, 1);
     rb_define_singleton_method(cDate, "jisx0301", date_s_jisx0301, -1);
 
-    rb_define_method(cDate, "initialize", date_initialize, -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_copy", d_lite_initialize_copy, 1);
 
 #ifndef NDEBUG
-    rb_define_method(cDate, "fill", d_lite_fill, 0);
+    de_define_method(cDate, "fill", d_lite_fill, 0);
 #endif
 
     rb_define_method(cDate, "ajd", d_lite_ajd, 0);
@@ -9366,8 +9300,8 @@ Init_date_core(void)
     rb_define_method(cDate, "cwday", d_lite_cwday, 0);
 
 #ifndef NDEBUG
-    rb_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
-    rb_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
+    de_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
+    de_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
 #endif
 
     rb_define_method(cDate, "wday", d_lite_wday, 0);
@@ -9381,14 +9315,18 @@ Init_date_core(void)
     rb_define_method(cDate, "saturday?", d_lite_saturday_p, 0);
 
 #ifndef NDEBUG
-    rb_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
+    de_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
 #endif
 
-    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_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_method(cDate, "julian?", d_lite_julian_p, 0);
     rb_define_method(cDate, "gregorian?", d_lite_gregorian_p, 0);
@@ -9401,6 +9339,8 @@ 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);
 
@@ -9428,7 +9368,7 @@ Init_date_core(void)
 
     rb_define_method(cDate, "to_s", d_lite_to_s, 0);
 #ifndef NDEBUG
-    rb_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
+    de_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
 #endif
     rb_define_method(cDate, "inspect", d_lite_inspect, 0);
 
@@ -9445,7 +9385,7 @@ Init_date_core(void)
     rb_define_method(cDate, "jisx0301", d_lite_jisx0301, 0);
 
 #ifndef NDEBUG
-    rb_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
+    de_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);
@@ -9454,49 +9394,48 @@ 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 does not consider any leap seconds, does not track
      * any summer time rules.
      *
-     * A DateTime object is created with DateTime::new, DateTime::jd,
+     * DateTime object is created with DateTime::new, DateTime::jd,
      * DateTime::ordinal, DateTime::commercial, DateTime::parse,
-     * DateTime::strptime, DateTime::now, Time#to_datetime, etc.
+     * DateTime::strptime, DateTime::now, Time#to_datetime or 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 a
+     * The last element of day, hour, minute or second can be
      * 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 ...>
      *
-     * The offset also accepts string form:
+     * 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
-     * negative/positive infinity.
-     * The default value is +Date::ITALY+ (2299161=1582-10-15).
+     * -/+oo.  The default value is +Date::ITALY+ (2299161=1582-10-15).
      *
-     * A DateTime object has various methods. See each reference.
+     * 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 ...>
@@ -9523,22 +9462,22 @@ Init_date_core(void)
      * 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 the
+     * 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])
      * 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 there's no way
-     * to express this with Time objects. This is where DateTime steps in:
+     * and has no concept of calendar reform then there's no way
+     * to express this. 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 is weird - the days of the week
-     * are different. Taking this further:
+     * Already you can see something's weird - the days of the week
+     * are different, taking this further:
      *
      *     cervantes == shakespeare
      *      #=> false
@@ -9592,7 +9531,6 @@ Init_date_core(void)
      */
 
     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);
@@ -9602,9 +9540,9 @@ Init_date_core(void)
 			       datetime_s_commercial, -1);
 
 #ifndef NDEBUG
-    rb_define_singleton_method(cDateTime, "weeknum",
+    de_define_singleton_method(cDateTime, "weeknum",
 			       datetime_s_weeknum, -1);
-    rb_define_singleton_method(cDateTime, "nth_kday",
+    de_define_singleton_method(cDateTime, "nth_kday",
 			       datetime_s_nth_kday, -1);
 #endif
 
@@ -9632,16 +9570,19 @@ Init_date_core(void)
     rb_define_singleton_method(cDateTime, "jisx0301",
 			       datetime_s_jisx0301, -1);
 
-    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);
+#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, "to_s", dt_lite_to_s, 0);
 
@@ -9669,15 +9610,15 @@ Init_date_core(void)
 #ifndef NDEBUG
     /* tests */
 
-    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",
+    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",
 			       date_s_test_commercial, 0);
-    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",
+    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",
 			       date_s_test_unit_conv, 0);
-    rb_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
+    de_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 e0634c39f1..efb414e2ee 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -7,9 +7,6 @@
 #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])
@@ -40,9 +37,9 @@ RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int bas
 #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)
@@ -66,13 +63,7 @@ static const char abbr_months[][4] = {
 #define asubt_string() rb_str_new("\024", 1)
 #endif
 
-static size_t
-digit_span(const char *s, const char *e)
-{
-    size_t i = 0;
-    while (s + i < e && isdigit(s[i])) i++;
-    return i;
-}
+#define DECDIGIT "0123456789"
 
 static void
 s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
@@ -98,7 +89,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    y = d;
 	    d = Qnil;
 	}
-	if (!NIL_P(d) && RSTRING_LEN(d) > 0 && *RSTRING_PTR(d) == '\'') {
+	if (!NIL_P(d) && *RSTRING_PTR(d) == '\'') {
 	    y = d;
 	    d = Qnil;
 	}
@@ -109,20 +100,17 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	size_t l;
 
 	s = RSTRING_PTR(y);
-	ep = RSTRING_END(y);
-	while (s < ep && !issign(*s) && !isdigit(*s))
+	while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
 	    s++;
-	if (s >= ep) goto no_date;
 	bp = s;
 	if (issign((unsigned char)*s))
 	    s++;
-	l = digit_span(s, ep);
+	l = strspn(s, DECDIGIT);
 	ep = s + l;
 	if (*ep) {
 	    y = d;
 	    d = rb_str_new(bp, ep - bp);
 	}
-      no_date:;
     }
 
     if (!NIL_P(m)) {
@@ -161,10 +149,8 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE iy;
 
 	s = RSTRING_PTR(y);
-	ep = RSTRING_END(y);
-	while (s < ep && !issign(*s) && !isdigit(*s))
+	while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
 	    s++;
-	if (s >= ep) goto no_year;
 	bp = s;
 	if (issign(*s)) {
 	    s++;
@@ -172,7 +158,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	}
 	if (sign)
 	    c = Qfalse;
-	l = digit_span(s, ep);
+	l = strspn(s, DECDIGIT);
 	ep = s + l;
 	if (l > 2)
 	    c = Qfalse;
@@ -186,7 +172,6 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("year", iy);
-      no_year:;
     }
 
     if (bc)
@@ -198,12 +183,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE im;
 
 	s = RSTRING_PTR(m);
-	ep = RSTRING_END(m);
-	while (s < ep && !isdigit(*s))
+	while (!isdigit((unsigned char)*s))
 	    s++;
-	if (s >= ep) goto no_month;
 	bp = s;
-	l = digit_span(s, ep);
+	l = strspn(s, DECDIGIT);
 	ep = s + l;
 	{
 	    char *buf;
@@ -215,7 +198,6 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("mon", im);
-      no_month:;
     }
 
     if (!NIL_P(d)) {
@@ -224,12 +206,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE id;
 
 	s = RSTRING_PTR(d);
-	ep = RSTRING_END(d);
-	while (s < ep && !isdigit(*s))
+	while (!isdigit((unsigned char)*s))
 	    s++;
-	if (s >= ep) goto no_mday;
 	bp = s;
-	l = digit_span(s, ep);
+	l = strspn(s, DECDIGIT);
 	ep = s + l;
 	{
 	    char *buf;
@@ -241,7 +221,6 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("mday", id);
-      no_mday:;
     }
 
     if (!NIL_P(c))
@@ -281,18 +260,18 @@ regcomp(const char *source, long len, int opt)
 }
 
 #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))
@@ -332,41 +311,34 @@ 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"
 
-static int
-str_end_with(const char *s, long l, const char *w)
-{
-    int n = (int)strlen(w);
-    return (l >= n && strncmp(s - n, w, n) == 0);
-}
-
 VALUE
 date_zone_to_diff(VALUE str)
 {
@@ -401,27 +373,44 @@ date_zone_to_diff(VALUE str)
 	    --d;
 	*d = '\0';
     }
-    l = d - dest;
-    s = dest;
+    str = rb_str_new2(dest);
     {
-	static const char STD[] = " standard time";
-	static const char DST1[] = " daylight time";
-	static const char DST2[] = " dst";
+#define STD " standard time"
+#define DST " daylight time"
+	char *ss, *ds;
+	long sl, dl;
 	int dst = 0;
 
-	if (str_end_with(d, l, STD)) {
-	    l -= sizeof(STD) - 1;
+	sl = RSTRING_LEN(str) - (sizeof STD - 1);
+	ss = RSTRING_PTR(str) + sl;
+	dl = RSTRING_LEN(str) - (sizeof DST - 1);
+	ds = RSTRING_PTR(str) + dl;
+
+	if (sl >= 0 && strcmp(ss, STD) == 0) {
+	    str = rb_str_new(RSTRING_PTR(str), sl);
 	}
-	else if (str_end_with(d, l, DST1)) {
-	    l -= sizeof(DST1) - 1;
+	else if (dl >= 0 && strcmp(ds, DST) == 0) {
+	    str = rb_str_new(RSTRING_PTR(str), dl);
 	    dst = 1;
 	}
-	else if (str_end_with(d, l, DST2)) {
-	    l -= sizeof(DST2) - 1;
-	    dst = 1;
+#undef STD
+#undef DST
+	else {
+#define DST " dst"
+	    char *ds;
+	    long dl;
+
+	    dl = RSTRING_LEN(str) - (sizeof DST - 1);
+	    ds = RSTRING_PTR(str) + dl;
+
+	    if (dl >= 0 && strcmp(ds, DST) == 0) {
+		str = rb_str_new(RSTRING_PTR(str), dl);
+		dst = 1;
+	    }
+#undef DST
 	}
 	{
-	    const struct zone *z = zonetab(s, (unsigned int)l);
+	    const struct zone *z = zonetab(RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str));
 	    if (z) {
 		int d = z->offset;
 		if (dst)
@@ -431,60 +420,100 @@ date_zone_to_diff(VALUE str)
 	    }
 	}
 	{
-	    char *p;
-	    int sign = 0;
-	    long hour = 0, min = 0, sec = 0;
+	    char *s, *p;
+	    VALUE sign;
+	    VALUE hour = Qnil, min = Qnil, sec = Qnil;
+	    VALUE str_orig;
+
+	    s = RSTRING_PTR(str);
+	    str_orig = str;
 
-	    if (l > 3 &&
-		(strncmp(s, "gmt", 3) == 0 ||
-		 strncmp(s, "utc", 3) == 0)) {
+	    if (strncmp(s, "gmt", 3) == 0 ||
+		strncmp(s, "utc", 3) == 0)
 		s += 3;
-		l -= 3;
-	    }
 	    if (issign(*s)) {
-		sign = *s == '-';
+		sign = rb_str_new(s, 1);
 		s++;
-		l--;
 
-		hour = STRTOUL(s, &p, 10);
-		if (*p == ':') {
+		str = rb_str_new2(s);
+
+		if ((p = strchr(s, ':')) != NULL) {
+		    hour = rb_str_new(s, p - s);
 		    s = ++p;
-		    min = STRTOUL(s, &p, 10);
-		    if (*p == ':') {
+		    if ((p = strchr(s, ':')) != NULL) {
+			min = rb_str_new(s, p - s);
 			s = ++p;
-			sec = STRTOUL(s, &p, 10);
+			if ((p = strchr(s, ':')) != NULL) {
+			    sec = rb_str_new(s, p - s);
+			}
+			else
+			    sec = rb_str_new2(s);
 		    }
+		    else
+			min = rb_str_new2(s);
+		    RB_GC_GUARD(str_orig);
 		    goto num;
 		}
-		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;
+		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;
 		}
-		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);
+		{
+		    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);
+		    }
 		    goto num;
 		}
 	      num:
-		sec += min * 60 + hour * 3600;
-		if (sign) sec = -sec;
-		offset = INT2FIX(sec);
+		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);
 	    }
 	}
     }
@@ -724,14 +753,16 @@ parse_era(VALUE str, VALUE hash)
 static int
 check_year_width(VALUE y)
 {
-    const char *s;
-    long l;
+    char *s;
+    size_t l;
 
-    l = RSTRING_LEN(y);
-    if (l < 2) return 0;
     s = RSTRING_PTR(y);
-    if (!isdigit(s[1])) return 0;
-    return (l == 2 || !isdigit(s[2]));
+    l = strcspn(s, DECDIGIT);
+    s += l;
+    l = strspn(s, DECDIGIT);
+    if (l != 2)
+	return 0;
+    return 1;
 }
 
 static int
@@ -1212,9 +1243,6 @@ parse_iso2(VALUE str, VALUE hash)
     return 1;
 }
 
-#define JISX0301_ERA_INITIALS "mtshr"
-#define JISX0301_DEFAULT_ERA 'H' /* obsolete */
-
 static int
 gengo(int c)
 {
@@ -1225,7 +1253,6 @@ 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;
@@ -1256,11 +1283,11 @@ parse_jis(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
 #ifndef TIGHT_PARSER
-        "\\b([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
+	"\\b([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
 #else
 	BOS
 	FPW_COM FPT_COM
-        "([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
+	"([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
 	TEE_FPT COM_FPW
 	EOS
 #endif
@@ -1863,26 +1890,30 @@ parse_ddd_cb(VALUE m, VALUE hash)
 	set_hash("zone", s5);
 
 	if (*cs5 == '[') {
-            const char *s1, *s2;
+	    VALUE vbuf = 0;
+	    char *buf = ALLOCV_N(char, vbuf, l5 + 1);
+	    char *s1, *s2, *s3;
 	    VALUE zone;
 
-            l5 -= 2;
-            s1 = cs5 + 1;
-            s2 = memchr(s1, ':', l5);
+	    memcpy(buf, cs5, l5);
+	    buf[l5 - 1] = '\0';
+
+	    s1 = buf + 1;
+	    s2 = strchr(buf, ':');
 	    if (s2) {
+		*s2 = '\0';
 		s2++;
-                zone = rb_str_subseq(s5, s2 - cs5, l5 - (s2 - s1));
-                s5 = rb_str_subseq(s5, 1, s2 - s1);
 	    }
-            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;
-            }
+	    if (s2)
+		s3 = s2;
+	    else
+		s3 = s1;
+	    zone = rb_str_new2(s3);
 	    set_hash("zone", zone);
-            set_hash("offset", date_zone_to_diff(s5));
+	    if (isdigit((unsigned char)*s1))
+		*--s1 = '+';
+	    set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
+	    ALLOCV_END(vbuf);
 	}
 	RB_GC_GUARD(s5);
     }
@@ -2175,7 +2206,7 @@ date__parse(VALUE str, VALUE comp)
 #endif
 
     {
-        if (RTEST(del_hash("_bc"))) {
+	if (RTEST(ref_hash("_bc"))) {
 	    VALUE y;
 
 	    y = ref_hash("cwyear");
@@ -2190,7 +2221,7 @@ date__parse(VALUE str, VALUE comp)
 	    }
 	}
 
-        if (RTEST(del_hash("_comp"))) {
+	if (RTEST(ref_hash("_comp"))) {
 	    VALUE y;
 
 	    y = ref_hash("cwyear");
@@ -2213,6 +2244,9 @@ 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")))
@@ -2951,7 +2985,7 @@ jisx0301_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    ep = gengo(NIL_P(s[1]) ? JISX0301_DEFAULT_ERA : *RSTRING_PTR(s[1]));
+    ep = gengo(NIL_P(s[1]) ? 'h' : *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]));
@@ -2976,7 +3010,7 @@ static int
 jisx0301(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-        "\\A\\s*([" JISX0301_ERA_INITIALS "])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
+	"\\A\\s*([mtsh])?(\\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 26d9fd11bf..4f93219317 100644
--- a/ext/date/date_strptime.c
+++ b/ext/date/date_strptime.c
@@ -79,17 +79,14 @@ read_digits(const char *s, VALUE *n, size_t width)
 {
     size_t l;
 
-    if (!width)
-        return 0;
-
-    l = 0;
-    while (ISDIGIT(s[l])) {
-        if (++l == width) break;
-    }
+    l = strspn(s, "0123456789");
 
     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;
@@ -116,26 +113,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)
 
@@ -150,14 +147,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);
 
@@ -240,9 +237,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;
 		}
@@ -281,9 +278,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;
 		}
@@ -361,9 +358,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",
@@ -429,7 +426,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("seconds",
-			     rb_rational_new2(n, INT2FIX(1000)));
+			     rb_rational_new2(n,
+					      f_expt(INT2FIX(10),
+						     INT2FIX(3))));
 		    goto matched;
 		}
 
@@ -530,24 +529,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':
 		{
@@ -669,7 +668,7 @@ date__strptime(const char *str, size_t slen,
     if (fail_p())
 	return Qnil;
 
-    cent = del_hash("_cent");
+    cent = ref_hash("_cent");
     if (!NIL_P(cent)) {
 	VALUE year;
 
@@ -679,9 +678,10 @@ 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 = del_hash("_merid");
+    merid = ref_hash("_merid");
     if (!NIL_P(merid)) {
 	VALUE hour;
 
@@ -690,6 +690,7 @@ 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 864fcc5302..2c24e91432 100644
--- a/ext/date/depend
+++ b/ext/date/depend
@@ -6,7 +6,6 @@ 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
@@ -22,7 +21,6 @@ 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
@@ -51,7 +49,6 @@ 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
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
index 8938df13b3..e8596952de 100644
--- a/ext/date/extconf.rb
+++ b/ext/date/extconf.rb
@@ -1,9 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 9170a99ae9..48ce6316bd 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # date.rb: Written by Tadayoshi Funaba 1998-2011
 
 require 'date_core'
@@ -15,17 +15,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 c0c55d2c27..e9ee35adc6 100644
--- a/ext/date/prereq.mk
+++ b/ext/date/prereq.mk
@@ -1,8 +1,8 @@
 .SUFFIXES: .list
 
 .list.h:
-	gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
-	| sed -f $(top_srcdir)/tool/gperf.sed \
+	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' \
 	> $(@F)
 
 zonetab.h: zonetab.list
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index 2dfa9b988a..1497eb5f65 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -1,5 +1,5 @@
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
+/* 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,$' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -26,10 +26,9 @@
       && ('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>."
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "zonetab.list"
 
 struct zone {
@@ -41,15 +40,15 @@ static const struct zone *zonetab();
 struct zone;
 /* maximum key range = 434, duplicates = 0 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
 inline
-#endif
+#elif defined(__GNUC__)
+__inline
 #endif
 static unsigned int
-hash (register const char *str, register size_t len)
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const unsigned short asso_values[] =
     {
@@ -80,7 +79,7 @@ hash (register const char *str, register size_t len)
       439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
       439, 439, 439, 439, 439, 439, 439
     };
-  register unsigned int hval = (unsigned int)len;
+  register int hval = len;
 
   switch (hval)
     {
@@ -97,7 +96,7 @@ hash (register const char *str, register size_t len)
         hval += asso_values[(unsigned char)str[0]+1];
         break;
     }
-  return (unsigned int)hval + asso_values[(unsigned char)str[len - 1]];
+  return hval + asso_values[(unsigned char)str[len - 1]];
 }
 
 struct stringpool_t
@@ -447,8 +446,16 @@ static const struct stringpool_t stringpool_contents =
     "fiji"
   };
 #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 (register const char *str, register size_t len)
+zonetab (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   enum
     {
@@ -463,398 +470,398 @@ zonetab (register const char *str, register size_t len)
     {
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 37 "zonetab.list"
-      {gperf_offsetof(stringpool, 5),   -5*3600},
+      {offsetof(struct stringpool_t, stringpool_str5),   -5*3600},
 #line 38 "zonetab.list"
-      {gperf_offsetof(stringpool, 6),   -6*3600},
+      {offsetof(struct stringpool_t, stringpool_str6),   -6*3600},
 #line 24 "zonetab.list"
-      {gperf_offsetof(stringpool, 7),    4*3600},
+      {offsetof(struct stringpool_t, stringpool_str7),    4*3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 15 "zonetab.list"
-      {gperf_offsetof(stringpool, 14), -6*3600},
+      {offsetof(struct stringpool_t, stringpool_str14), -6*3600},
 #line 16 "zonetab.list"
-      {gperf_offsetof(stringpool, 15), -5*3600},
+      {offsetof(struct stringpool_t, stringpool_str15), -5*3600},
 #line 85 "zonetab.list"
-      {gperf_offsetof(stringpool, 16),  2*3600},
+      {offsetof(struct stringpool_t, stringpool_str16),  2*3600},
 #line 71 "zonetab.list"
-      {gperf_offsetof(stringpool, 17),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str17),  1*3600},
 #line 90 "zonetab.list"
-      {gperf_offsetof(stringpool, 18),  4*3600},
+      {offsetof(struct stringpool_t, stringpool_str18),  4*3600},
 #line 79 "zonetab.list"
-      {gperf_offsetof(stringpool, 19), 2*3600},
+      {offsetof(struct stringpool_t, stringpool_str19), 2*3600},
 #line 65 "zonetab.list"
-      {gperf_offsetof(stringpool, 20),-10*3600},
+      {offsetof(struct stringpool_t, stringpool_str20),-10*3600},
       {-1},
 #line 17 "zonetab.list"
-      {gperf_offsetof(stringpool, 22), -7*3600},
+      {offsetof(struct stringpool_t, stringpool_str22), -7*3600},
 #line 18 "zonetab.list"
-      {gperf_offsetof(stringpool, 23), -6*3600},
+      {offsetof(struct stringpool_t, stringpool_str23), -6*3600},
 #line 84 "zonetab.list"
-      {gperf_offsetof(stringpool, 24), 2*3600},
+      {offsetof(struct stringpool_t, stringpool_str24), 2*3600},
 #line 73 "zonetab.list"
-      {gperf_offsetof(stringpool, 25),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str25),  1*3600},
       {-1},
 #line 82 "zonetab.list"
-      {gperf_offsetof(stringpool, 27), 2*3600},
+      {offsetof(struct stringpool_t, stringpool_str27), 2*3600},
       {-1}, {-1},
 #line 47 "zonetab.list"
-      {gperf_offsetof(stringpool, 30),  0*3600},
+      {offsetof(struct stringpool_t, stringpool_str30),  0*3600},
 #line 128 "zonetab.list"
-      {gperf_offsetof(stringpool, 31),               -43200},
+      {offsetof(struct stringpool_t, stringpool_str31),               -43200},
 #line 78 "zonetab.list"
-      {gperf_offsetof(stringpool, 32), 1*3600},
+      {offsetof(struct stringpool_t, stringpool_str32), 1*3600},
 #line 77 "zonetab.list"
-      {gperf_offsetof(stringpool, 33),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str33),  1*3600},
       {-1},
 #line 95 "zonetab.list"
-      {gperf_offsetof(stringpool, 35), 7*3600},
+      {offsetof(struct stringpool_t, stringpool_str35), 7*3600},
 #line 98 "zonetab.list"
-      {gperf_offsetof(stringpool, 36), 8*3600},
+      {offsetof(struct stringpool_t, stringpool_str36), 8*3600},
 #line 25 "zonetab.list"
-      {gperf_offsetof(stringpool, 37),    5*3600},
+      {offsetof(struct stringpool_t, stringpool_str37),    5*3600},
 #line 123 "zonetab.list"
-      {gperf_offsetof(stringpool, 38),           3600},
+      {offsetof(struct stringpool_t, stringpool_str38),           3600},
 #line 122 "zonetab.list"
-      {gperf_offsetof(stringpool, 39),            21600},
+      {offsetof(struct stringpool_t, stringpool_str39),            21600},
 #line 178 "zonetab.list"
-      {gperf_offsetof(stringpool, 40),               18000},
+      {offsetof(struct stringpool_t, stringpool_str40),               18000},
 #line 120 "zonetab.list"
-      {gperf_offsetof(stringpool, 41),          34200},
+      {offsetof(struct stringpool_t, stringpool_str41),          34200},
 #line 121 "zonetab.list"
-      {gperf_offsetof(stringpool, 42),        -21600},
+      {offsetof(struct stringpool_t, stringpool_str42),        -21600},
       {-1},
 #line 13 "zonetab.list"
-      {gperf_offsetof(stringpool, 44), -5*3600},
+      {offsetof(struct stringpool_t, stringpool_str44), -5*3600},
 #line 14 "zonetab.list"
-      {gperf_offsetof(stringpool, 45), -4*3600},
+      {offsetof(struct stringpool_t, stringpool_str45), -4*3600},
 #line 124 "zonetab.list"
-      {gperf_offsetof(stringpool, 46),         3600},
+      {offsetof(struct stringpool_t, stringpool_str46),         3600},
 #line 80 "zonetab.list"
-      {gperf_offsetof(stringpool, 47),  2*3600},
+      {offsetof(struct stringpool_t, stringpool_str47),  2*3600},
 #line 164 "zonetab.list"
-      {gperf_offsetof(stringpool, 48),                 25200},
+      {offsetof(struct stringpool_t, stringpool_str48),                 25200},
 #line 88 "zonetab.list"
-      {gperf_offsetof(stringpool, 49), 3*3600},
+      {offsetof(struct stringpool_t, stringpool_str49), 3*3600},
 #line 87 "zonetab.list"
-      {gperf_offsetof(stringpool, 50),  3*3600},
+      {offsetof(struct stringpool_t, stringpool_str50),  3*3600},
 #line 45 "zonetab.list"
-      {gperf_offsetof(stringpool, 51),    0*3600},
+      {offsetof(struct stringpool_t, stringpool_str51),    0*3600},
 #line 101 "zonetab.list"
-      {gperf_offsetof(stringpool, 52),10*3600},
+      {offsetof(struct stringpool_t, stringpool_str52),10*3600},
 #line 103 "zonetab.list"
-      {gperf_offsetof(stringpool, 53),11*3600},
+      {offsetof(struct stringpool_t, stringpool_str53),11*3600},
 #line 160 "zonetab.list"
-      {gperf_offsetof(stringpool, 54),             -10800},
+      {offsetof(struct stringpool_t, stringpool_str54),             -10800},
 #line 177 "zonetab.list"
-      {gperf_offsetof(stringpool, 55),                3600},
+      {offsetof(struct stringpool_t, stringpool_str55),                3600},
 #line 23 "zonetab.list"
-      {gperf_offsetof(stringpool, 56),    3*3600},
+      {offsetof(struct stringpool_t, stringpool_str56),    3*3600},
 #line 63 "zonetab.list"
-      {gperf_offsetof(stringpool, 57), -9*3600},
+      {offsetof(struct stringpool_t, stringpool_str57), -9*3600},
 #line 59 "zonetab.list"
-      {gperf_offsetof(stringpool, 58), -8*3600},
+      {offsetof(struct stringpool_t, stringpool_str58), -8*3600},
 #line 100 "zonetab.list"
-      {gperf_offsetof(stringpool, 59),  9*3600},
+      {offsetof(struct stringpool_t, stringpool_str59),  9*3600},
 #line 57 "zonetab.list"
-      {gperf_offsetof(stringpool, 60), -4*3600},
+      {offsetof(struct stringpool_t, stringpool_str60), -4*3600},
 #line 133 "zonetab.list"
-      {gperf_offsetof(stringpool, 61),                -18000},
+      {offsetof(struct stringpool_t, stringpool_str61),                -18000},
 #line 54 "zonetab.list"
-      {gperf_offsetof(stringpool, 62),-3*3600},
+      {offsetof(struct stringpool_t, stringpool_str62),-3*3600},
 #line 86 "zonetab.list"
-      {gperf_offsetof(stringpool, 63),   3*3600},
+      {offsetof(struct stringpool_t, stringpool_str63),   3*3600},
 #line 175 "zonetab.list"
-      {gperf_offsetof(stringpool, 64),            28800},
+      {offsetof(struct stringpool_t, stringpool_str64),            28800},
 #line 70 "zonetab.list"
-      {gperf_offsetof(stringpool, 65),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str65),  1*3600},
 #line 96 "zonetab.list"
-      {gperf_offsetof(stringpool, 66),  8*3600},
+      {offsetof(struct stringpool_t, stringpool_str66),  8*3600},
 #line 53 "zonetab.list"
-      {gperf_offsetof(stringpool, 67), -3*3600},
+      {offsetof(struct stringpool_t, stringpool_str67), -3*3600},
       {-1},
 #line 49 "zonetab.list"
-      {gperf_offsetof(stringpool, 69),-2*3600},
+      {offsetof(struct stringpool_t, stringpool_str69),-2*3600},
       {-1},
 #line 21 "zonetab.list"
-      {gperf_offsetof(stringpool, 71),    1*3600},
+      {offsetof(struct stringpool_t, stringpool_str71),    1*3600},
 #line 131 "zonetab.list"
-      {gperf_offsetof(stringpool, 72),                7200},
+      {offsetof(struct stringpool_t, stringpool_str72),                7200},
 #line 48 "zonetab.list"
-      {gperf_offsetof(stringpool, 73),  -2*3600},
+      {offsetof(struct stringpool_t, stringpool_str73),  -2*3600},
 #line 126 "zonetab.list"
-      {gperf_offsetof(stringpool, 74),                -21600},
+      {offsetof(struct stringpool_t, stringpool_str74),                -21600},
 #line 56 "zonetab.list"
-      {gperf_offsetof(stringpool, 75), -4*3600},
+      {offsetof(struct stringpool_t, stringpool_str75), -4*3600},
 #line 52 "zonetab.list"
-      {gperf_offsetof(stringpool, 76), -3*3600},
+      {offsetof(struct stringpool_t, stringpool_str76), -3*3600},
 #line 51 "zonetab.list"
-      {gperf_offsetof(stringpool, 77), -3*3600},
+      {offsetof(struct stringpool_t, stringpool_str77), -3*3600},
 #line 129 "zonetab.list"
-      {gperf_offsetof(stringpool, 78),               10800},
+      {offsetof(struct stringpool_t, stringpool_str78),               10800},
 #line 132 "zonetab.list"
-      {gperf_offsetof(stringpool, 79),       -10800},
+      {offsetof(struct stringpool_t, stringpool_str79),       -10800},
 #line 99 "zonetab.list"
-      {gperf_offsetof(stringpool, 80),  9*3600},
+      {offsetof(struct stringpool_t, stringpool_str80),  9*3600},
 #line 130 "zonetab.list"
-      {gperf_offsetof(stringpool, 81),            36000},
+      {offsetof(struct stringpool_t, stringpool_str81),            36000},
 #line 39 "zonetab.list"
-      {gperf_offsetof(stringpool, 82),   -7*3600},
+      {offsetof(struct stringpool_t, stringpool_str82),   -7*3600},
 #line 68 "zonetab.list"
-      {gperf_offsetof(stringpool, 83),  -11*3600},
+      {offsetof(struct stringpool_t, stringpool_str83),  -11*3600},
 #line 33 "zonetab.list"
-      {gperf_offsetof(stringpool, 84),   -1*3600},
+      {offsetof(struct stringpool_t, stringpool_str84),   -1*3600},
 #line 55 "zonetab.list"
-      {gperf_offsetof(stringpool, 85), -(3*3600+1800)},
+      {offsetof(struct stringpool_t, stringpool_str85), -(3*3600+1800)},
 #line 50 "zonetab.list"
-      {gperf_offsetof(stringpool, 86), -(2*3600+1800)},
+      {offsetof(struct stringpool_t, stringpool_str86), -(2*3600+1800)},
 #line 117 "zonetab.list"
-      {gperf_offsetof(stringpool, 87),         -21600},
+      {offsetof(struct stringpool_t, stringpool_str87),         -21600},
 #line 125 "zonetab.list"
-      {gperf_offsetof(stringpool, 88),         39600},
+      {offsetof(struct stringpool_t, stringpool_str88),         39600},
 #line 179 "zonetab.list"
-      {gperf_offsetof(stringpool, 89),            36000},
+      {offsetof(struct stringpool_t, stringpool_str89),            36000},
 #line 67 "zonetab.list"
-      {gperf_offsetof(stringpool, 90),-10*3600},
+      {offsetof(struct stringpool_t, stringpool_str90),-10*3600},
 #line 62 "zonetab.list"
-      {gperf_offsetof(stringpool, 91), -9*3600},
+      {offsetof(struct stringpool_t, stringpool_str91), -9*3600},
       {-1},
 #line 165 "zonetab.list"
-      {gperf_offsetof(stringpool, 93),         28800},
+      {offsetof(struct stringpool_t, stringpool_str93),         28800},
       {-1},
 #line 94 "zonetab.list"
-      {gperf_offsetof(stringpool, 95),  6*3600},
+      {offsetof(struct stringpool_t, stringpool_str95),  6*3600},
       {-1},
 #line 159 "zonetab.list"
-      {gperf_offsetof(stringpool, 97),                 10800},
+      {offsetof(struct stringpool_t, stringpool_str97),                 10800},
 #line 66 "zonetab.list"
-      {gperf_offsetof(stringpool, 98),-10*3600},
+      {offsetof(struct stringpool_t, stringpool_str98),-10*3600},
 #line 61 "zonetab.list"
-      {gperf_offsetof(stringpool, 99),-9*3600},
+      {offsetof(struct stringpool_t, stringpool_str99),-9*3600},
 #line 102 "zonetab.list"
-      {gperf_offsetof(stringpool, 100), 10*3600},
+      {offsetof(struct stringpool_t, stringpool_str100), 10*3600},
 #line 92 "zonetab.list"
-      {gperf_offsetof(stringpool, 101),  5*3600},
+      {offsetof(struct stringpool_t, stringpool_str101),  5*3600},
 #line 93 "zonetab.list"
-      {gperf_offsetof(stringpool, 102),  (5*3600+1800)},
+      {offsetof(struct stringpool_t, stringpool_str102),  (5*3600+1800)},
 #line 76 "zonetab.list"
-      {gperf_offsetof(stringpool, 103),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str103),  1*3600},
 #line 42 "zonetab.list"
-      {gperf_offsetof(stringpool, 104),  -10*3600},
+      {offsetof(struct stringpool_t, stringpool_str104),  -10*3600},
 #line 91 "zonetab.list"
-      {gperf_offsetof(stringpool, 105),  4*3600},
+      {offsetof(struct stringpool_t, stringpool_str105),  4*3600},
       {-1},
 #line 75 "zonetab.list"
-      {gperf_offsetof(stringpool, 107),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str107),  1*3600},
 #line 118 "zonetab.list"
-      {gperf_offsetof(stringpool, 108),              -3600},
+      {offsetof(struct stringpool_t, stringpool_str108),              -3600},
 #line 83 "zonetab.list"
-      {gperf_offsetof(stringpool, 109), 2*3600},
+      {offsetof(struct stringpool_t, stringpool_str109), 2*3600},
 #line 138 "zonetab.list"
-      {gperf_offsetof(stringpool, 110),              -10800},
+      {offsetof(struct stringpool_t, stringpool_str110),              -10800},
       {-1},
 #line 43 "zonetab.list"
-      {gperf_offsetof(stringpool, 112),  -11*3600},
+      {offsetof(struct stringpool_t, stringpool_str112),  -11*3600},
       {-1},
 #line 74 "zonetab.list"
-      {gperf_offsetof(stringpool, 114), 1*3600},
+      {offsetof(struct stringpool_t, stringpool_str114), 1*3600},
 #line 176 "zonetab.list"
-      {gperf_offsetof(stringpool, 115),        3600},
+      {offsetof(struct stringpool_t, stringpool_str115),        3600},
 #line 30 "zonetab.list"
-      {gperf_offsetof(stringpool, 116),   10*3600},
+      {offsetof(struct stringpool_t, stringpool_str116),   10*3600},
 #line 22 "zonetab.list"
-      {gperf_offsetof(stringpool, 117),    2*3600},
+      {offsetof(struct stringpool_t, stringpool_str117),    2*3600},
       {-1},
 #line 32 "zonetab.list"
-      {gperf_offsetof(stringpool, 119),   12*3600},
+      {offsetof(struct stringpool_t, stringpool_str119),   12*3600},
 #line 167 "zonetab.list"
-      {gperf_offsetof(stringpool, 120),               21600},
+      {offsetof(struct stringpool_t, stringpool_str120),               21600},
       {-1},
 #line 81 "zonetab.list"
-      {gperf_offsetof(stringpool, 122),  2*3600},
+      {offsetof(struct stringpool_t, stringpool_str122),  2*3600},
       {-1},
 #line 143 "zonetab.list"
-      {gperf_offsetof(stringpool, 124),                    12600},
+      {offsetof(struct stringpool_t, stringpool_str124),                    12600},
 #line 97 "zonetab.list"
-      {gperf_offsetof(stringpool, 125),  8*3600},
+      {offsetof(struct stringpool_t, stringpool_str125),  8*3600},
 #line 11 "zonetab.list"
-      {gperf_offsetof(stringpool, 126),   0*3600},
+      {offsetof(struct stringpool_t, stringpool_str126),   0*3600},
       {-1},
 #line 36 "zonetab.list"
-      {gperf_offsetof(stringpool, 128),   -4*3600},
+      {offsetof(struct stringpool_t, stringpool_str128),   -4*3600},
 #line 106 "zonetab.list"
-      {gperf_offsetof(stringpool, 129), 12*3600},
+      {offsetof(struct stringpool_t, stringpool_str129), 12*3600},
       {-1},
 #line 105 "zonetab.list"
-      {gperf_offsetof(stringpool, 131),12*3600},
+      {offsetof(struct stringpool_t, stringpool_str131),12*3600},
 #line 107 "zonetab.list"
-      {gperf_offsetof(stringpool, 132),13*3600},
+      {offsetof(struct stringpool_t, stringpool_str132),13*3600},
 #line 149 "zonetab.list"
-      {gperf_offsetof(stringpool, 133),                 23400},
+      {offsetof(struct stringpool_t, stringpool_str133),                 23400},
       {-1},
 #line 109 "zonetab.list"
-      {gperf_offsetof(stringpool, 135),                -32400},
+      {offsetof(struct stringpool_t, stringpool_str135),                -32400},
 #line 19 "zonetab.list"
-      {gperf_offsetof(stringpool, 136), -8*3600},
+      {offsetof(struct stringpool_t, stringpool_str136), -8*3600},
 #line 20 "zonetab.list"
-      {gperf_offsetof(stringpool, 137), -7*3600},
+      {offsetof(struct stringpool_t, stringpool_str137), -7*3600},
 #line 162 "zonetab.list"
-      {gperf_offsetof(stringpool, 138),             -14400},
+      {offsetof(struct stringpool_t, stringpool_str138),             -14400},
 #line 145 "zonetab.list"
-      {gperf_offsetof(stringpool, 139),                   32400},
+      {offsetof(struct stringpool_t, stringpool_str139),                   32400},
       {-1}, {-1},
 #line 44 "zonetab.list"
-      {gperf_offsetof(stringpool, 142),  -12*3600},
+      {offsetof(struct stringpool_t, stringpool_str142),  -12*3600},
 #line 26 "zonetab.list"
-      {gperf_offsetof(stringpool, 143),    6*3600},
+      {offsetof(struct stringpool_t, stringpool_str143),    6*3600},
 #line 60 "zonetab.list"
-      {gperf_offsetof(stringpool, 144),-9*3600},
+      {offsetof(struct stringpool_t, stringpool_str144),-9*3600},
 #line 58 "zonetab.list"
-      {gperf_offsetof(stringpool, 145),-8*3600},
+      {offsetof(struct stringpool_t, stringpool_str145),-8*3600},
       {-1}, {-1},
 #line 119 "zonetab.list"
-      {gperf_offsetof(stringpool, 148),                14400},
+      {offsetof(struct stringpool_t, stringpool_str148),                14400},
       {-1},
 #line 89 "zonetab.list"
-      {gperf_offsetof(stringpool, 150),  3*3600},
+      {offsetof(struct stringpool_t, stringpool_str150),  3*3600},
 #line 104 "zonetab.list"
-      {gperf_offsetof(stringpool, 151),12*3600},
+      {offsetof(struct stringpool_t, stringpool_str151),12*3600},
       {-1},
 #line 111 "zonetab.list"
-      {gperf_offsetof(stringpool, 153),                 14400},
+      {offsetof(struct stringpool_t, stringpool_str153),                 14400},
       {-1},
 #line 34 "zonetab.list"
-      {gperf_offsetof(stringpool, 155),   -2*3600},
+      {offsetof(struct stringpool_t, stringpool_str155),   -2*3600},
 #line 31 "zonetab.list"
-      {gperf_offsetof(stringpool, 156),   11*3600},
+      {offsetof(struct stringpool_t, stringpool_str156),   11*3600},
 #line 147 "zonetab.list"
-      {gperf_offsetof(stringpool, 157),            -7200},
+      {offsetof(struct stringpool_t, stringpool_str157),            -7200},
       {-1}, {-1},
 #line 172 "zonetab.list"
-      {gperf_offsetof(stringpool, 160),             -18000},
+      {offsetof(struct stringpool_t, stringpool_str160),             -18000},
       {-1}, {-1}, {-1},
 #line 64 "zonetab.list"
-      {gperf_offsetof(stringpool, 164),-10*3600},
+      {offsetof(struct stringpool_t, stringpool_str164),-10*3600},
       {-1}, {-1},
 #line 28 "zonetab.list"
-      {gperf_offsetof(stringpool, 167),    8*3600},
+      {offsetof(struct stringpool_t, stringpool_str167),    8*3600},
 #line 137 "zonetab.list"
-      {gperf_offsetof(stringpool, 168),                      7200},
+      {offsetof(struct stringpool_t, stringpool_str168),                      7200},
 #line 29 "zonetab.list"
-      {gperf_offsetof(stringpool, 169),    9*3600},
+      {offsetof(struct stringpool_t, stringpool_str169),    9*3600},
 #line 155 "zonetab.list"
-      {gperf_offsetof(stringpool, 170),              25200},
+      {offsetof(struct stringpool_t, stringpool_str170),              25200},
 #line 150 "zonetab.list"
-      {gperf_offsetof(stringpool, 171),         21600},
+      {offsetof(struct stringpool_t, stringpool_str171),         21600},
 #line 154 "zonetab.list"
-      {gperf_offsetof(stringpool, 172),         28800},
+      {offsetof(struct stringpool_t, stringpool_str172),         28800},
       {-1},
 #line 161 "zonetab.list"
-      {gperf_offsetof(stringpool, 174),             -18000},
+      {offsetof(struct stringpool_t, stringpool_str174),             -18000},
       {-1}, {-1},
 #line 166 "zonetab.list"
-      {gperf_offsetof(stringpool, 177),             7200},
+      {offsetof(struct stringpool_t, stringpool_str177),             7200},
       {-1}, {-1}, {-1},
 #line 115 "zonetab.list"
-      {gperf_offsetof(stringpool, 181),             36000},
+      {offsetof(struct stringpool_t, stringpool_str181),             36000},
 #line 113 "zonetab.list"
-      {gperf_offsetof(stringpool, 182),               -14400},
+      {offsetof(struct stringpool_t, stringpool_str182),               -14400},
       {-1}, {-1}, {-1},
 #line 146 "zonetab.list"
-      {gperf_offsetof(stringpool, 186),                 -21600},
+      {offsetof(struct stringpool_t, stringpool_str186),                 -21600},
       {-1},
 #line 148 "zonetab.list"
-      {gperf_offsetof(stringpool, 188),               -25200},
+      {offsetof(struct stringpool_t, stringpool_str188),               -25200},
       {-1},
 #line 127 "zonetab.list"
-      {gperf_offsetof(stringpool, 190),                   28800},
+      {offsetof(struct stringpool_t, stringpool_str190),                   28800},
 #line 116 "zonetab.list"
-      {gperf_offsetof(stringpool, 191),                  -3600},
+      {offsetof(struct stringpool_t, stringpool_str191),                  -3600},
 #line 142 "zonetab.list"
-      {gperf_offsetof(stringpool, 192),                   19800},
+      {offsetof(struct stringpool_t, stringpool_str192),                   19800},
       {-1},
 #line 40 "zonetab.list"
-      {gperf_offsetof(stringpool, 194),   -8*3600},
+      {offsetof(struct stringpool_t, stringpool_str194),   -8*3600},
 #line 112 "zonetab.list"
-      {gperf_offsetof(stringpool, 195),                  10800},
+      {offsetof(struct stringpool_t, stringpool_str195),                  10800},
 #line 139 "zonetab.list"
-      {gperf_offsetof(stringpool, 196),                   0},
+      {offsetof(struct stringpool_t, stringpool_str196),                   0},
 #line 152 "zonetab.list"
-      {gperf_offsetof(stringpool, 197),             43200},
+      {offsetof(struct stringpool_t, stringpool_str197),             43200},
 #line 141 "zonetab.list"
-      {gperf_offsetof(stringpool, 198),               -36000},
+      {offsetof(struct stringpool_t, stringpool_str198),               -36000},
 #line 27 "zonetab.list"
-      {gperf_offsetof(stringpool, 199),    7*3600},
+      {offsetof(struct stringpool_t, stringpool_str199),    7*3600},
 #line 158 "zonetab.list"
-      {gperf_offsetof(stringpool, 200),                  3600},
+      {offsetof(struct stringpool_t, stringpool_str200),                  3600},
       {-1}, {-1},
 #line 110 "zonetab.list"
-      {gperf_offsetof(stringpool, 203),                    10800},
+      {offsetof(struct stringpool_t, stringpool_str203),                    10800},
 #line 163 "zonetab.list"
-      {gperf_offsetof(stringpool, 204),                  -39600},
+      {offsetof(struct stringpool_t, stringpool_str204),                  -39600},
 #line 41 "zonetab.list"
-      {gperf_offsetof(stringpool, 205),   -9*3600},
+      {offsetof(struct stringpool_t, stringpool_str205),   -9*3600},
 #line 35 "zonetab.list"
-      {gperf_offsetof(stringpool, 206),   -3*3600},
+      {offsetof(struct stringpool_t, stringpool_str206),   -3*3600},
 #line 12 "zonetab.list"
-      {gperf_offsetof(stringpool, 207),  0*3600},
+      {offsetof(struct stringpool_t, stringpool_str207),  0*3600},
 #line 169 "zonetab.list"
-      {gperf_offsetof(stringpool, 208),                36000},
+      {offsetof(struct stringpool_t, stringpool_str208),                36000},
 #line 72 "zonetab.list"
-      {gperf_offsetof(stringpool, 209),  1*3600},
+      {offsetof(struct stringpool_t, stringpool_str209),  1*3600},
       {-1},
 #line 153 "zonetab.list"
-      {gperf_offsetof(stringpool, 211),           -12600},
+      {offsetof(struct stringpool_t, stringpool_str211),           -12600},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 151 "zonetab.list"
-      {gperf_offsetof(stringpool, 217),                   20700},
+      {offsetof(struct stringpool_t, stringpool_str217),                   20700},
 #line 114 "zonetab.list"
-      {gperf_offsetof(stringpool, 218),             34200},
+      {offsetof(struct stringpool_t, stringpool_str218),             34200},
       {-1}, {-1},
 #line 140 "zonetab.list"
-      {gperf_offsetof(stringpool, 221),                      7200},
+      {offsetof(struct stringpool_t, stringpool_str221),                      7200},
       {-1},
 #line 174 "zonetab.list"
-      {gperf_offsetof(stringpool, 223),             36000},
+      {offsetof(struct stringpool_t, stringpool_str223),             36000},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 46 "zonetab.list"
-      {gperf_offsetof(stringpool, 229),  0*3600},
+      {offsetof(struct stringpool_t, stringpool_str229),  0*3600},
       {-1}, {-1}, {-1},
 #line 135 "zonetab.list"
-      {gperf_offsetof(stringpool, 233),            18000},
+      {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"
-      {gperf_offsetof(stringpool, 265),            -25200},
+      {offsetof(struct stringpool_t, stringpool_str265),            -25200},
       {-1}, {-1}, {-1},
 #line 144 "zonetab.list"
-      {gperf_offsetof(stringpool, 269),                7200},
+      {offsetof(struct stringpool_t, stringpool_str269),                7200},
       {-1}, {-1},
 #line 180 "zonetab.list"
-      {gperf_offsetof(stringpool, 272),                 32400},
+      {offsetof(struct stringpool_t, stringpool_str272),                 32400},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 156 "zonetab.list"
-      {gperf_offsetof(stringpool, 279),             -14400},
+      {offsetof(struct stringpool_t, stringpool_str279),             -14400},
       {-1}, {-1},
 #line 171 "zonetab.list"
-      {gperf_offsetof(stringpool, 282),                   46800},
+      {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"
-      {gperf_offsetof(stringpool, 314),             16200},
+      {offsetof(struct stringpool_t, stringpool_str314),             16200},
       {-1}, {-1}, {-1}, {-1},
 #line 69 "zonetab.list"
-      {gperf_offsetof(stringpool, 319),-12*3600},
+      {offsetof(struct stringpool_t, stringpool_str319),-12*3600},
       {-1}, {-1},
 #line 157 "zonetab.list"
-      {gperf_offsetof(stringpool, 322),                -28800},
+      {offsetof(struct stringpool_t, stringpool_str322),                -28800},
       {-1}, {-1}, {-1}, {-1},
 #line 168 "zonetab.list"
-      {gperf_offsetof(stringpool, 327),                  28800},
+      {offsetof(struct stringpool_t, stringpool_str327),                  28800},
 #line 134 "zonetab.list"
-      {gperf_offsetof(stringpool, 328),                    7200},
+      {offsetof(struct stringpool_t, stringpool_str328),                    7200},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -863,28 +870,28 @@ zonetab (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 170 "zonetab.list"
-      {gperf_offsetof(stringpool, 392),                   32400},
+      {offsetof(struct stringpool_t, stringpool_str392),                   32400},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-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"
-      {gperf_offsetof(stringpool, 438),                    43200}
+      {offsetof(struct stringpool_t, stringpool_str438),                    43200}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register unsigned int key = hash (str, len);
+      register int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
             {
               register const char *s = o + stringpool;
 
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+              if (*str == *s && !strcmp (str + 1, s + 1))
                 return &wordlist[key];
             }
         }
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index df69b9fb50..07044d6f9f 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) ((void)(n),0)
+# define TOO_LONG(n) 0
 #else
 # define RSTRING_DSIZE(s) RSTRING_LENINT(s)
 # define TOO_LONG(n) ((long)(+(DSIZE_TYPE)(n)) != (n))
@@ -39,8 +39,6 @@ struct dbmdata {
     DBM *di_dbm;
 };
 
-NORETURN(static void closed_dbm(void));
-
 static void
 closed_dbm(void)
 {
@@ -49,6 +47,7 @@ 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)
 
@@ -61,18 +60,21 @@ static void
 free_dbm(void *ptr)
 {
     struct dbmdata *dbmp = ptr;
-    if (dbmp->di_dbm)
-	dbm_close(dbmp->di_dbm);
-    xfree(dbmp);
+    if (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;
-    size_t size = sizeof(*dbmp);
-    if (dbmp->di_dbm)
-	size += DBM_SIZEOF_DBM;
+    if (dbmp) {
+	size += sizeof(*dbmp);
+	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
+    }
     return size;
 }
 
@@ -113,6 +115,8 @@ 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;
 
@@ -122,9 +126,7 @@ fdbm_closed(VALUE obj)
 static VALUE
 fdbm_alloc(VALUE klass)
 {
-    struct dbmdata *dbmp;
-
-    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
+    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
 }
 
 /*
@@ -148,7 +150,6 @@ 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 */
     }
@@ -190,24 +191,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
@@ -216,8 +217,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
     }
@@ -227,8 +228,8 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 	rb_sys_fail_str(file);
     }
 
-    if (dbmp->di_dbm)
-	dbm_close(dbmp->di_dbm);
+    dbmp = ALLOC(struct dbmdata);
+    DATA_PTR(obj) = dbmp;
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -338,6 +339,8 @@ 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)) {
@@ -994,7 +997,7 @@ fdbm_reject(VALUE obj)
  *   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 6, also known as BDB and Sleepycat DB, now owned by Oracle
+ *   1 thru 5, 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
deleted file mode 100644
index 9ab444b9c7..0000000000
--- a/ext/dbm/dbm.gemspec
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-Gem::Specification.new do |s|
-  s.name = "dbm"
-  s.version = '1.0.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.license = "BSD-2-Clause"
-
-  s.add_development_dependency "rake-compiler"
-  s.add_development_dependency "test-unit"
-end
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index c9a5518bf6..04f751d776 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # configure option:
 #   --with-dbm-type=COMMA-SEPARATED-NDBM-TYPES
 #
@@ -7,7 +7,6 @@
 #   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)
@@ -24,7 +23,7 @@ dir_config("dbm")
 if dblib = with_config("dbm-type", nil)
   dblib = dblib.split(/[ ,]+/)
 else
-  dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm)
+  dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
 end
 
 headers = {
@@ -35,7 +34,6 @@ 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"],
@@ -133,7 +131,7 @@ def headers.db_check2(db, hdr)
   hsearch = nil
 
   case db
-  when /^db[2-6]?$/
+  when /^db[2-5]?$/
     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 6557e43c9d..8f436908d3 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -124,7 +124,6 @@ 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/digest.c b/ext/digest/digest.c
index 7d285cfe74..012c0cc89d 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:
  *
- * MD5::
- *  See RFC 1321 The MD5 Message-Digest Algorithm
+ * HMAC::
+ *   See FIPS PUB 198 The Keyed-Hash Message Authentication Code (HMAC).
  * RIPEMD-160::
  *   As Digest::RMD160.
  *   See http://homes.esat.kuleuven.be/~bosselae/ripemd160.html.
@@ -501,40 +501,6 @@ 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 *
@@ -630,11 +596,7 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
     return copy;
 }
 
-/*
- * call-seq: digest_base.reset -> digest_base
- *
- * Reset the digest to its initial state and return +self+.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_reset(VALUE self)
 {
@@ -650,13 +612,7 @@ rb_digest_base_reset(VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *   digest_base.update(string) -> digest_base
- *   digest_base << string -> digest_base
- *
- * Update the digest using given _string_ and return +self+.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_update(VALUE self, VALUE str)
 {
@@ -695,11 +651,7 @@ rb_digest_base_finish(VALUE self)
     return str;
 }
 
-/*
- * call-seq: digest_base.digest_length -> Integer
- *
- * Return the length of the hash value in bytes.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_digest_length(VALUE self)
 {
@@ -710,11 +662,7 @@ rb_digest_base_digest_length(VALUE self)
     return INT2NUM(algo->digest_len);
 }
 
-/*
- * call-seq: digest_base.block_length -> Integer
- *
- * Return the block length of the digest in bytes.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_block_length(VALUE self)
 {
@@ -728,7 +676,6 @@ rb_digest_base_block_length(VALUE self)
 void
 Init_digest(void)
 {
-#undef rb_intern
     id_reset           = rb_intern("reset");
     id_update          = rb_intern("update");
     id_finish          = rb_intern("finish");
diff --git a/ext/digest/digest_conf.rb b/ext/digest/digest_conf.rb
index 915b61877f..8e36ce5d41 100644
--- a/ext/digest/digest_conf.rb
+++ b/ext/digest/digest_conf.rb
@@ -1,56 +1,4 @@
 # frozen_string_literal: false
-
-# Copy from ext/openssl/extconf.rb
-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
-
 def digest_conf(name, hdr = name, funcs = nil, types = nil)
   unless with_config("bundled-#{name}")
     cc = with_config("common-digest")
@@ -66,7 +14,7 @@ def digest_conf(name, hdr = name, funcs = nil, types = nil)
     dir_config("openssl")
     pkg_config("openssl")
     require File.expand_path('../../openssl/deprecation', __FILE__)
-    if find_openssl_library
+    if have_library("crypto")
       funcs ||= name.upcase
       funcs = Array(funcs)
       types ||= funcs
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index fdd8b36c5d..a6afedef69 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -22,29 +22,9 @@ 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)
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 10d9370163..c1e753cc11 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -20,29 +20,9 @@ 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)
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index e12d297699..1f8b89e276 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -22,31 +22,9 @@ 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)
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 61a0734850..58ff9f5cf0 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -17,45 +17,11 @@ 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
     #
-    # Create a new SHA2 hash object with a given bit length.
+    # Creates a new SHA2 hash object with a given bit length.
     #
     # Valid bit lengths are 256, 384 and 512.
     def initialize(bitlen = 256)
@@ -75,7 +41,7 @@ module Digest
     # call-seq:
     #   digest_obj.reset -> digest_obj
     #
-    # Reset the digest to the initial state and return self.
+    # Resets the digest to the initial state and returns self.
     def reset
       @sha2.reset
       self
@@ -85,7 +51,7 @@ module Digest
     #   digest_obj.update(string) -> digest_obj
     #   digest_obj << string -> digest_obj
     #
-    # Update the digest using a given _string_ and return self.
+    # Updates the digest using a given _string_ and returns self.
     def update(str)
       @sha2.update(str)
       self
@@ -101,7 +67,7 @@ module Digest
     # call-seq:
     #   digest_obj.block_length -> Integer
     #
-    # Return the block length of the digest in bytes.
+    # Returns the block length of the digest in bytes.
     #
     #   Digest::SHA256.new.block_length * 8
     #   # => 512
@@ -116,7 +82,7 @@ module Digest
     # call-seq:
     #   digest_obj.digest_length -> Integer
     #
-    # Return the length of the hash value (the digest) in bytes.
+    # Returns the length of the hash value of the digest in bytes.
     #
     #   Digest::SHA256.new.digest_length * 8
     #   # => 256
diff --git a/ext/etc/depend b/ext/etc/depend
index 2d986c5913..137ec83849 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -11,7 +11,6 @@ etc.o: $(hdrdir)/ruby/encoding.h
 etc.o: $(hdrdir)/ruby/intern.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
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 2dd4ed673e..0d2d9af7cb 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -215,10 +215,9 @@ etc_getpwnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
-    const char *p = StringValueCStr(nam);
 
-    rb_check_safe_obj(nam);
-    pwd = getpwnam(p);
+    SafeStringValue(nam);
+    pwd = getpwnam(RSTRING_PTR(nam));
     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
     return setup_passwd(pwd);
 #else
@@ -459,10 +458,9 @@ etc_getgrnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
-    const char *p = StringValueCStr(nam);
 
-    rb_check_safe_obj(nam);
-    grp = getgrnam(p);
+    SafeStringValue(nam);
+    grp = getgrnam(RSTRING_PTR(nam));
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam);
     return setup_group(grp);
 #else
@@ -627,9 +625,8 @@ 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" on other platforms than Windows.
- * On Windows, this always returns the directory provided by the system.
+ * compiled. For example, if Ruby is built and installed in /usr/local, returns
+ * "/usr/local/etc".
  */
 static VALUE
 etc_sysconfdir(VALUE obj)
@@ -1015,7 +1012,7 @@ etc_nprocessors(VALUE obj)
 
     ncpus = etc_nprocessors_affin();
     if (ncpus != -1) {
-	return INT2NUM(ncpus);
+       return INT2NUM(ncpus);
     }
     /* fallback to _SC_NPROCESSORS_ONLN */
 #endif
diff --git a/ext/etc/etc.gemspec b/ext/etc/etc.gemspec
deleted file mode 100644
index 322fd41e8b..0000000000
--- a/ext/etc/etc.gemspec
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "etc"
-  spec.version       = "1.0.1"
-  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   = %q{Provides access to information typically stored in UNIX /etc directory.}
-  spec.homepage      = "https://github.com/ruby/etc"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = %w[
-    .gitignore
-    .travis.yml
-    Gemfile
-    LICENSE.txt
-    README.md
-    Rakefile
-    bin/console
-    bin/setup
-    etc.gemspec
-    ext/etc/etc.c
-    ext/etc/extconf.rb
-    ext/etc/mkconstants.rb
-    test/etc/test_etc.rb
-  ]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  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 435fbe7f3d..11bc9458c0 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 
 headers = []
@@ -12,10 +12,8 @@ have_func("uname((struct utsname *)NULL)", headers)
 have_func("getlogin")
 have_func("getpwent")
 have_func("getgrent")
-if (sysconfdir = RbConfig::CONFIG["sysconfdir"] and
-    !RbConfig.expand(sysconfdir.dup, "prefix"=>"", "DESTDIR"=>"").empty?)
-  $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
-end
+sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"")
+$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
 
 have_func("sysconf")
 have_func("confstr")
@@ -41,12 +39,6 @@ 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
-
 $distcleanfiles << "constdefs.h"
 
 create_makefile("etc")
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb
index a752d64519..0c4d17e6f9 100644
--- a/ext/etc/mkconstants.rb
+++ b/ext/etc/mkconstants.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'optparse'
 require 'erb'
 
@@ -66,15 +66,7 @@ def each_name(pat)
   }
 end
 
-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")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % each_const {|name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -88,7 +80,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % each_const {|name, default_value|
 #if defined(<%=name%>)
 %   if comment = COMMENTS[name]
@@ -99,13 +91,13 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % }
 EOS
 
-header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
+header_result = ERB.new(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= gen_const_decls %>
 EOS
 
-result = erb_new.call(<<'EOS', nil, '%').result(binding)
+result = ERB.new(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 #ifdef HAVE_LONG_LONG
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 1389dc4117..b73b8b6907 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -6,22 +6,27 @@
 $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
-$subconfigure = false
+$configure_only = false
 
 $progname = $0
 alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
+$compiled = {}
 
 DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
 
@@ -76,7 +81,6 @@ 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
@@ -102,7 +106,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 - srcs).empty? or return false
+    old_srcs.split.sort == srcs or return false
   end
   $target = target
   $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
@@ -127,7 +131,12 @@ def extract_makefile(makefile, keep = true)
   true
 end
 
-def extmake(target, basedir = 'ext', maybestatic = true)
+def extmake(target, basedir = (maybestatic = 'ext'))
+  unless $configure_only || verbose?
+    print "#{$message} #{target}\n"
+    $stdout.flush
+  end
+
   FileUtils.mkpath target unless File.directory?(target)
   begin
     # don't build if parent library isn't build
@@ -156,12 +165,12 @@ def extmake(target, basedir = 'ext', maybestatic = true)
     $preload = nil
     $objs = []
     $srcs = []
-    $extso = []
+    $compiled[target] = false
     makefile = "./Makefile"
     static = $static
     $static = nil if noinstall = File.fnmatch?("-*", target)
     ok = parent && File.exist?(makefile)
-    if parent
+    if parent && !$ignore
       rbconfig0 = RbConfig::CONFIG
       mkconfig0 = CONFIG
       rbconfig = {
@@ -197,12 +206,14 @@ def extmake(target, basedir = 'ext', maybestatic = true)
 	    [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
         then
 	  ok = false
-          if verbose?
-            print "#{conf}\n" if conf
-          else
-            print "#{$message} #{target}\n"
+          if $configure_only
+            if verbose?
+              print "#{conf}\n" if conf
+            else
+              print "#{$message} #{target}\n"
+            end
+            $stdout.flush
           end
-          $stdout.flush
           init_mkmf
 	  Logging::logfile 'mkmf.log'
 	  rm_f makefile
@@ -222,6 +233,7 @@ def extmake(target, basedir = 'ext', maybestatic = true)
       rescue SystemExit
 	# ignore
       rescue => error
+        lineno = error.backtrace_locations[0].lineno
         ok = false
       ensure
 	rm_f "conftest*"
@@ -237,27 +249,39 @@ def extmake(target, basedir = 'ext', maybestatic = true)
 
       return true if !error and target.start_with?("-")
 
-      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
+      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)
+      end
+      message = error.message if error
 
-      return [parent, message]
+      return parent ? [conf, lineno||0, message] : true
     end
     args = $mflags
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
       args += ["DESTDIR=" + relative_from($destdir, "../"+prefix)]
     end
     if $static and ok and !$objs.empty? and !noinstall
-      args += ["static"]
+      args += ["static"] unless $clean
       $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 ||= []
@@ -299,6 +323,10 @@ def extmake(target, basedir = 'ext', maybestatic = true)
   true
 end
 
+def compiled?(target)
+  $compiled[target]
+end
+
 def parse_args()
   $mflags = []
   $makeflags = [] # for make command to build ruby, so quoted
@@ -353,7 +381,6 @@ def parse_args()
     $optparser.warn(e)
     abort $optparser.to_s
   end
-  $command_output or abort "--command-output option is mandatory"
 
   $destdir ||= ''
 
@@ -389,10 +416,18 @@ parse_args()
 if target = ARGV.shift and /^[a-z-]+$/ =~ target
   $mflags.push(target)
   case target
-  when /^(dist|real)?(clean)$/, /^install\b/
-    abort "#{target} is obsolete"
+  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 /configure/
-    $subconfigure = !ARGV.empty?
+    $configure_only = true
   end
 end
 unless $message
@@ -411,15 +446,12 @@ elsif sep = config_string('BUILD_FILE_SEPARATOR')
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby = [$ruby]
-$ruby << "-I'$(topdir)'"
+$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"
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
@@ -459,13 +491,7 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
   end
 end unless $extstatic
 
-@gemname = nil
-if ARGV[0]
-  ext_prefix, exts = ARGV.shift.split('/', 2)
-  $extension = [exts] if exts
-  @gemname = exts if ext_prefix == 'gems'
-end
-ext_prefix = "#{$top_srcdir}/#{ext_prefix || 'ext'}"
+ext_prefix = "#{$top_srcdir}/ext"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
 default_exclude_exts =
   case
@@ -476,7 +502,6 @@ 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}
@@ -484,49 +509,78 @@ 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!
+    w.collect! {|o| o == '+' ? d : o}.flatten! if d
     proc {|c1| w.any?(&c1)}
   end
 }
 cond = proc {|ext, *|
-  withes.call(proc {|n|
-                !n or (mandatory_exts[ext] = true if File.fnmatch(n, ext))
-              }) and
-    !withouts.call(proc {|n| File.fnmatch(n, ext)})
+  cond1 = proc {|n| File.fnmatch(n, ext)}
+  withes.call(cond1) and !withouts.call(cond1)
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')
-  incl, excl = Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
+  exts |= Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
     d = File.dirname(d)
     d.slice!(0, ext_prefix.length + 1)
     d
-  }.partition {|ext|
+  }.find_all {|ext|
     with_config(ext, &cond)
-  }
-  incl.sort!
-  excl.sort!.collect! {|d| d+"/"}
-  nil while incl.reject! {|d| excl << d+"/" if excl.any? {|x| d.start_with?(x)}}
-  exts |= incl
+  }.sort
   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}/gems")
+  end
+end
+
+FileUtils.makedirs('gems')
+ext_prefix = "#$top_srcdir/gems"
+gems = Dir.glob(File.join(ext_prefix, ($extension || ''), '**/extconf.rb')).collect {|d|
+  d = File.dirname(d)
+  d.slice!(0, ext_prefix.length + 1)
+  d
+}.find_all {|ext|
+  with_config(ext, &cond)
+}.sort
 
 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
+}
+
+dir = Dir.pwd
+FileUtils::makedirs('ext')
+Dir::chdir('ext')
+
+hdrdir = $hdrdir
+$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
+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
+  end
+end
 
-  def configuration(srcdir)
-    super << "EXTSO #{['=', $extso].join(' ')}\n"
+Dir.chdir('..')
+FileUtils::makedirs('gems')
+Dir.chdir('gems')
+extout = $extout
+unless gems.empty?
+  def self.timestamp_file(name, target_prefix = nil)
+    name = "$(arch)/gems/#{@gemname}#{target_prefix}" if name == '$(TARGET_SO_DIR)'
+    super
   end
 
-  def create_makefile(*args, &block)
-    return super unless @gemname
+  def self.create_makefile(*args, &block)
     super(*args) do |conf|
       conf.find do |s|
         s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) {
@@ -545,31 +599,18 @@ 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_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 !$nodynamic or $static
-    result = extmake(d, ext_prefix, !@gemname) or abort
-    extso |= $extso
-    fails << [d, result] unless result == true
-  end
 end
+gems.each do |d|
+  $extout = extout.dup
+  @gemname = d[%r{\A[^/]+}]
+  extmake(d, 'gems')
+end
+$extout = extout
+Dir.chdir('../ext')
 
 $top_srcdir = srcdir
 $topdir = "."
@@ -580,13 +621,32 @@ 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
@@ -600,11 +660,27 @@ unless $extlist.empty?
       next
     end
     base = File.basename(feature)
-    extinits << feature
+    $extinit << "    init(Init_#{base}, \"#{feature}.so\");\n"
     $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 = [
@@ -614,7 +690,7 @@ unless $extlist.empty?
   ].map {|n, v|
     "#{n}=#{v}" if v &&= v[/\S(?:.*\S)?/]
   }.compact
-  puts(*conf) unless $subconfigure
+  puts(*conf)
   $stdout.flush
   $mflags.concat(conf)
   $makeflags.concat(conf)
@@ -638,9 +714,9 @@ $makeflags.uniq!
 
 $mflags.unshift("topdir=#$topdir")
 ENV.delete("RUBYOPT")
-exts.map! {|d| "#{ext_prefix}/#{d}/."}
-FileUtils.makedirs(File.dirname($command_output))
-begin
+if $configure_only and $command_output
+  exts.map! {|d| "ext/#{d}/."}
+  gems.map! {|d| "gems/#{d}/."}
   atomic_write_open($command_output) do |mf|
     mf.puts "V = 0"
     mf.puts "Q1 = $(V:1=)"
@@ -665,14 +741,11 @@ begin
       puts
     end
 
-    mf.macro "ruby", topruby
-    mf.macro "RUBY", ["$(ruby)"]
     mf.macro "extensions", exts
+    mf.macro "gems", gems
     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)"'
@@ -684,23 +757,21 @@ begin
       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/colorize.rb skip]
-    mf.macro "NOTE_NAME", %w[$(RUBY) $(top_srcdir)/tool/colorize.rb fail]
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
     targets.each do |tgt|
       mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
+      mf.puts "#{tgt}: $(gems:/.=/#{tgt})" unless tgt == 'static'
       mf.puts "#{tgt}: note" unless /clean\z/ =~ tgt
     end
     mf.puts
     mf.puts "clean:\n\t-$(Q)$(RM) ext/extinit.#{$OBJEXT}"
     mf.puts "distclean:\n\t-$(Q)$(RM) ext/extinit.c"
     mf.puts
-    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})"
+    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'}) $(gems:/.=/all)"
     submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)"
     mf.puts "all static: #{rubies.join(' ')}\n"
     $extobjs.each do |tgt|
@@ -711,7 +782,7 @@ begin
       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) EXTINITS=\"$(EXTINITS)\" $@" if $static
+    mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" if $static
     mf.puts
     if $gnumake == "yes"
       submake = "$(MAKE) -C $(@D)"
@@ -720,51 +791,51 @@ begin
       config_string("exec") {|str| submake << str << " "}
       submake << "$(MAKE)"
     end
+    gems = exts + gems
     targets.each do |tgt|
-      exts.each do |d|
-        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)"
+      (tgt == 'static' ? exts : gems).each do |d|
+        mf.puts "#{d[0..-2]}#{tgt}:\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?
-      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.">
+      mf.puts %Q<\t@echo "*** Following extensions failed to configure:">
+      fails.each do |d, n, err|
+        d = "#{d}:#{n}:"
+        if err
+          d << " " << err
         end
+        mf.puts %Q<\t@echo "#{d}">
       end
-      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"
+      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"
       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, *$mflags) or exit($?.exitstatus)
 end
 # :startdoc:
 
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
index 6998f77483..35371ebe18 100644
--- a/ext/fcntl/extconf.rb
+++ b/ext/fcntl/extconf.rb
@@ -1,3 +1,3 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index c93694c431..62780b78c0 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 minimum unused file descriptor
+     * Duplicate a file descriptor to the mimimum unused file descriptor
      * greater than or equal to the argument.
      *
      * The close-on-exec flag of the duplicated file descriptor is set.
diff --git a/ext/fcntl/fcntl.gemspec b/ext/fcntl/fcntl.gemspec
deleted file mode 100644
index 0e3194fbdc..0000000000
--- a/ext/fcntl/fcntl.gemspec
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "fcntl"
-  spec.version       = "1.0.0"
-  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.license       = "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"
-
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12"
-  spec.add_development_dependency "rake-compiler"
-end
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index 1a80b2b02a..f19091b29b 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -1,7 +1,6 @@
 #include <fiddle.h>
 #include <ruby/thread.h>
-
-int ruby_thread_has_gvl_p(void); /* from internal.h */
+#include "internal.h" /* rb_thread_has_gvl_p */
 
 VALUE cFiddleClosure;
 
diff --git a/ext/fiddle/depend b/ext/fiddle/depend
index 7209469260..470e15efef 100644
--- a/ext/fiddle/depend
+++ b/ext/fiddle/depend
@@ -25,20 +25,18 @@ $(LIBFFI_DIR)/Makefile:
 	$(Q) $(MAKEDIRS) $(LIBFFI_DIR)
 	$(Q) $(CONFIGURE_LIBFFI)
 
+build-libffi: $(LIBFFI_A)
 build-libffi $(LIBFFI_A):
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG)
+	$(Q) $(SUBMAKE_LIBFFI)
 
-clean-none:
 clean-libffi:
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) clean
+	$(Q) $(SUBMAKE_LIBFFI) clean
 
-distclean-none:
 distclean-libffi:
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) distclean
+	$(Q) $(SUBMAKE_LIBFFI) 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)
 
@@ -60,7 +58,6 @@ closure.o: $(hdrdir)/ruby/encoding.h
 closure.o: $(hdrdir)/ruby/intern.h
 closure.o: $(hdrdir)/ruby/io.h
 closure.o: $(hdrdir)/ruby/missing.h
-closure.o: $(hdrdir)/ruby/onigmo.h
 closure.o: $(hdrdir)/ruby/oniguruma.h
 closure.o: $(hdrdir)/ruby/ruby.h
 closure.o: $(hdrdir)/ruby/st.h
@@ -142,7 +139,6 @@ pointer.o: $(hdrdir)/ruby/encoding.h
 pointer.o: $(hdrdir)/ruby/intern.h
 pointer.o: $(hdrdir)/ruby/io.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
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index fce0cb4079..0359355193 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 
 # :stopdoc:
@@ -18,16 +18,6 @@ if ! bundle
   end and (have_library('ffi') || have_library('libffi'))
 end or
 begin
-  # for https://github.com/ruby/fiddle
-  if bundle && File.exist?("../../bin/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
   ver = bundle != false &&
         Dir.glob("#{$srcdir}/libffi-*/")
         .map {|n| File.basename(n)}
@@ -51,12 +41,12 @@ begin
   libffi.lib = "#{libffi.builddir}/.libs"
   libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
   nowarn = CONFIG.merge("warnflags"=>"")
-  libffi.cflags = RbConfig.expand("$(CFLAGS)".dup, nowarn)
+  libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
   ver = ver[/libffi-(.*)/, 1]
 
   FileUtils.mkdir_p(libffi.dir)
   libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1]
-  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}".dup)
+  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}")
   libffi.arch = RbConfig::CONFIG['host']
   if $mswin
     unless find_executable(as = /x64/ =~ libffi.arch ? "ml64" : "ml")
@@ -87,7 +77,7 @@ begin
   args << libffi.opt if libffi.opt
   args.concat %W[
       CC=#{cc} CFLAGS=#{libffi.cflags}
-      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)".dup, nowarn)}
+      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)", nowarn)}
       LD=#{ld} LDFLAGS=#{libffi.ldflags}
   ]
 
@@ -159,9 +149,9 @@ create_makefile 'fiddle' do |conf|
   if !libffi
     next conf << "LIBFFI_CLEAN = none\n"
   elsif $gnumake && !$nmake
-    submake_arg = "-C $(LIBFFI_DIR)\n"
+    submake = "$(MAKE) -C $(LIBFFI_DIR)\n"
   else
-    submake_pre = "cd $(LIBFFI_DIR) && #{config_string("exec")}".strip
+    submake = "cd $(LIBFFI_DIR) && \\\n\t\t" << "#{config_string("exec")} $(MAKE)".strip
   end
   if $nmake
     cmd = "$(RUBY) -C $(LIBFFI_DIR) #{libffi_config} --srcdir=$(LIBFFI_SRCDIR)"
@@ -180,8 +170,7 @@ create_makefile 'fiddle' do |conf|
    LIBFFI_CFLAGS = #{libffi.cflags}
    LIBFFI_LDFLAGS = #{libffi.ldflags}
    FFI_H = $(LIBFFI_DIR)/include/ffi.h
-   SUBMAKE_PRE = #{submake_pre}
-   SUBMAKE_ARG = #{submake_arg}
+   SUBMAKE_LIBFFI = #{submake}
    LIBFFI_CLEAN = libffi
   MK
 end
diff --git a/ext/fiddle/extlibs b/ext/fiddle/extlibs
index 1f0c9348e6..7d5fda5247 100644
--- a/ext/fiddle/extlibs
+++ b/ext/fiddle/extlibs
@@ -1,5 +1,2 @@
-https://ftp.osuosl.org/pub/blfs/conglomeration/libffi/libffi-3.2.1.tar.gz \
-  md5:83b89587607e3eb65c70d361f13bab43 \
-  sha512:980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 \
-  #
+ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz md5:83b89587607e3eb65c70d361f13bab43
 	win32/libffi-3.2.1-mswin.patch -p0
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
deleted file mode 100644
index b29f4ec788..0000000000
--- a/ext/fiddle/fiddle.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-Gem::Specification.new do |spec|
-  spec.name          = "fiddle"
-  spec.version       = '1.0.0'
-  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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/fiddle/closure.c", "ext/fiddle/closure.h", "ext/fiddle/conversions.c", "ext/fiddle/conversions.h", "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/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"]
-  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"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-end
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index bbd73e0f0a..8e280567db 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -113,7 +113,7 @@ initialize(int argc, VALUE argv[], VALUE self)
     Check_Max_Args("args", len);
     ary = rb_ary_subseq(args, 0, len);
     for (i = 0; i < RARRAY_LEN(args); i++) {
-        VALUE a = RARRAY_AREF(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));
@@ -214,7 +214,7 @@ function_call(int argc, VALUE argv[], VALUE self)
 	args.values[i] = (void *)&generic_args[i];
     }
     args.values[argc] = NULL;
-    args.fn = (void(*)(void))NUM2PTR(cfunc);
+    args.fn = NUM2PTR(cfunc);
 
     (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
 
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index e9aa7e50ae..5208eb9328 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fiddle.so'
 require 'fiddle/function'
 require 'fiddle/closure'
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
index c865a63c20..0b9adbb60a 100644
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Fiddle
   class Closure
 
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
index cd0a64fef5..6b9da9fa7c 100644
--- a/ext/fiddle/lib/fiddle/cparser.rb
+++ b/ext/fiddle/lib/fiddle/cparser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Fiddle
   # A mixin that provides methods for parsing C struct and prototype signatures.
   #
@@ -21,7 +21,6 @@ module Fiddle
     # Parses a C struct's members
     #
     # Example:
-    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
@@ -67,7 +66,6 @@ module Fiddle
     # be looked up.
     #
     # Example:
-    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
@@ -104,7 +102,6 @@ module Fiddle
     # value will be the C type to be looked up.
     #
     # Example:
-    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
index dd5e04e417..fcd90dfd26 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Fiddle
   class Function
     # The ABI of the Function.
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index 178ebb8c76..09429f6631 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fiddle'
 require 'fiddle/struct'
 require 'fiddle/cparser'
@@ -115,6 +115,8 @@ 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
@@ -122,12 +124,7 @@ module Fiddle
         when TYPE_VOIDP
           return SIZEOF_VOIDP
         else
-          if defined?(TYPE_LONG_LONG) and
-            ty == TYPE_LONG_LONG
-            return SIZEOF_LONG_LONG
-          else
-            raise(DLError, "unknown type: #{ty}")
-          end
+          raise(DLError, "unknown type: #{ty}")
         end
       when Class
         if( ty.instance_methods().include?(:to_ptr) )
@@ -157,8 +154,7 @@ module Fiddle
     # :stopdoc:
     CALL_TYPE_TO_ABI = Hash.new { |h, k|
       raise RuntimeError, "unsupported call type: #{k}"
-    }.merge({ :stdcall => Function.const_defined?(:STDCALL) ? Function::STDCALL :
-                          Function::DEFAULT,
+    }.merge({ :stdcall => (Function::STDCALL rescue 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 22eccedb76..6301068450 100644
--- a/ext/fiddle/lib/fiddle/pack.rb
+++ b/ext/fiddle/lib/fiddle/pack.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fiddle'
 
 module Fiddle
@@ -18,7 +18,7 @@ module Fiddle
     }
 
     PACK_MAP = {
-      TYPE_VOIDP => "l!",
+      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
       TYPE_CHAR  => "c",
       TYPE_SHORT => "s!",
       TYPE_INT   => "i!",
@@ -48,7 +48,6 @@ 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)
@@ -81,13 +80,10 @@ module Fiddle
       case SIZEOF_VOIDP
       when SIZEOF_LONG
         ary.pack(@template)
+      when SIZEOF_LONG_LONG
+        ary.pack(@template)
       else
-        if defined?(TYPE_LONG_LONG) and
-          SIZEOF_VOIDP == SIZEOF_LONG_LONG
-          ary.pack(@template)
-        else
-          raise(RuntimeError, "sizeof(void*)?")
-        end
+        raise(RuntimeError, "sizeof(void*)?")
       end
     end
 
@@ -95,20 +91,17 @@ module Fiddle
       case SIZEOF_VOIDP
       when SIZEOF_LONG
         ary.join().unpack(@template)
+      when SIZEOF_LONG_LONG
+        ary.join().unpack(@template)
       else
-        if defined?(TYPE_LONG_LONG) and
-          SIZEOF_VOIDP == SIZEOF_LONG_LONG
-          ary.join().unpack(@template)
-        else
-          raise(RuntimeError, "sizeof(void*)?")
-        end
+        raise(RuntimeError, "sizeof(void*)?")
       end
     end
 
     private
 
     def parse_types(types)
-      @template = "".dup
+      @template = ""
       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 7c0dedb39f..233a987269 100644
--- a/ext/fiddle/lib/fiddle/struct.rb
+++ b/ext/fiddle/lib/fiddle/struct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fiddle'
 require 'fiddle/value'
 require 'fiddle/pack'
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
index 8dc811d3e4..8a72635a69 100644
--- a/ext/fiddle/lib/fiddle/types.rb
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Fiddle
   # Adds Windows type aliases to the including class for use with
   # Fiddle::Importer.
diff --git a/ext/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
index 01fec1c206..ac318cf2c4 100644
--- a/ext/fiddle/lib/fiddle/value.rb
+++ b/ext/fiddle/lib/fiddle/value.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fiddle'
 
 module Fiddle
@@ -13,13 +13,10 @@ 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
-        if defined?(TYPE_LONG_LONG) and
-          ty.abs == TYPE_LONG_LONG
-          [val].pack("q").unpack("Q")[0]
-        else
-          val
-        end
+        val
       end
     end
 
@@ -33,13 +30,10 @@ 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
-        if defined?(TYPE_LONG_LONG) and
-          ty.abs == TYPE_LONG_LONG
-          [val].pack("Q").unpack("q")[0]
-        else
-          val
-        end
+        val
       end
     end
 
@@ -81,13 +75,10 @@ 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
-            if defined?(SIZEOF_LONG_LONG) and
-              SIZEOF_VOIDP == SIZEOF_LONG_LONG
-              return [arg].pack("p").unpack("q")[0]
-            else
-              raise(RuntimeError, "sizeof(void*)?")
-            end
+            raise(RuntimeError, "sizeof(void*)?")
           end
         end
       when Float, Integer
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index 2fb21f832e..932bc576c5 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -440,7 +440,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), (void *)data, data->ptr, data->size, (void *)data->free);
+		      RB_OBJ_CLASSNAME(self), data, data->ptr, data->size, data->free);
 }
 
 /*
@@ -677,7 +677,6 @@ 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
diff --git a/ext/fiddle/win32/libffi-config.rb b/ext/fiddle/win32/libffi-config.rb
index 6abc9b2c02..7a32a91517 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: true
+# frozen_string_literal: false
 require 'fileutils'
 
 basedir = File.dirname(__FILE__)
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 05eb450381..709f466cd8 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -83,10 +83,6 @@ 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)
 {
@@ -106,6 +102,7 @@ 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)
 
@@ -118,18 +115,21 @@ static void
 free_dbm(void *ptr)
 {
     struct dbmdata *dbmp = ptr;
-    if (dbmp->di_dbm)
-	gdbm_close(dbmp->di_dbm);
-    xfree(dbmp);
+    if (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;
-    size_t size = sizeof(*dbmp);
-    if (dbmp->di_dbm)
-	size += DBM_SIZEOF_DBM;
+    if (dbmp) {
+	size += sizeof(*dbmp);
+	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
+    }
     return size;
 }
 
@@ -170,6 +170,8 @@ 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;
 
@@ -179,9 +181,7 @@ fgdbm_closed(VALUE obj)
 static VALUE
 fgdbm_s_alloc(VALUE klass)
 {
-    struct dbmdata *dbmp;
-
-    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
+    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
 }
 
 /*
@@ -215,7 +215,6 @@ 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 */
     }
@@ -229,7 +228,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
     if (!NIL_P(vflags))
         flags = NUM2INT(vflags);
 
-    FilePathValue(file);
+    SafeStringValue(file);
 
 #ifdef GDBM_CLOEXEC
     /* GDBM_CLOEXEC is available since gdbm 1.10. */
@@ -269,8 +268,9 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
             rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
 
-    if (dbmp->di_dbm)
-	gdbm_close(dbmp->di_dbm);
+    dbmp = ALLOC(struct dbmdata);
+    free_dbm(DATA_PTR(obj));
+    DATA_PTR(obj) = dbmp;
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -334,7 +334,7 @@ rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
     datum key;
     long len;
 
-    ExportStringValue(keystr);
+    StringValue(keystr);
     len = RSTRING_LEN(keystr);
     if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
@@ -450,7 +450,7 @@ fgdbm_key(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    ExportStringValue(valstr);
+    StringValue(valstr);
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -538,7 +538,7 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
     long len;
 
     rb_gdbm_modify(obj);
-    ExportStringValue(keystr);
+    StringValue(keystr);
     len = RSTRING_LEN(keystr);
     if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
@@ -725,8 +725,8 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    ExportStringValue(keystr);
-    ExportStringValue(valstr);
+    StringValue(keystr);
+    StringValue(valstr);
 
     key.dptr = RSTRING_PTR(keystr);
     key.dsize = RSTRING_LENINT(keystr);
@@ -991,7 +991,7 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
     GDBM_FILE dbm;
     long len;
 
-    ExportStringValue(keystr);
+    StringValue(keystr);
     len = RSTRING_LENINT(keystr);
     if (TOO_LONG(len)) return Qfalse;
     key.dptr = RSTRING_PTR(keystr);
@@ -1018,7 +1018,7 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    ExportStringValue(valstr);
+    StringValue(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
deleted file mode 100644
index 849e289f9d..0000000000
--- a/ext/gdbm/gdbm.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "gdbm"
-  spec.version       = "2.0.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.license       = "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"
-
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "test-unit"
-end
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 54ff34492e..dbbfbb7463 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -14,6 +14,12 @@
 #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>
@@ -97,6 +103,10 @@ 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;
@@ -297,14 +307,6 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void
  *
  * 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)
- *
- * Refer to the manual page of termios for further details.
- *
  * You must require 'io/console' to use this method.
  */
 static VALUE
@@ -322,8 +324,6 @@ console_raw(int argc, VALUE *argv, VALUE io)
  *
  * 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.
  */
 static VALUE
@@ -397,8 +397,6 @@ getc_call(VALUE io)
  *
  * 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
@@ -533,23 +531,16 @@ 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);
-    if ((sizelen = RARRAY_LEN(size)) != 2 && sizelen != 4) {
-	rb_raise(rb_eArgError,
-		 "wrong number of arguments (given %ld, expected 2 or 4)",
-		 sizelen);
-    }
+    rb_check_arity(RARRAY_LENINT(size), 2, 4);
     sz = RARRAY_CONST_PTR(size);
-    row = sz[0], col = sz[1], xpixel = ypixel = Qnil;
-    if (sizelen == 4) xpixel = sz[2], ypixel = sz[3];
+    row = sz[0], col = sz[1], 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;
@@ -571,21 +562,17 @@ console_set_winsize(VALUE io, VALUE size)
     if (!GetConsoleScreenBufferInfo(wh, &ws)) {
 	rb_syserr_fail(LAST_ERROR, "GetConsoleScreenBufferInfo");
     }
-    ws.dwSize.X = newcol;
-    ret = SetConsoleScreenBufferSize(wh, ws.dwSize);
+    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.srWindow.Left = 0;
     ws.srWindow.Top = 0;
-    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)) {
+    ws.srWindow.Right = newcol;
+    ws.srWindow.Bottom = newrow;
+    if (!SetConsoleWindowInfo(wh, FALSE, &ws.srWindow)) {
 	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
     }
 #endif
diff --git a/ext/io/console/depend b/ext/io/console/depend
index 821b28d3fc..400ae81a96 100644
--- a/ext/io/console/depend
+++ b/ext/io/console/depend
@@ -7,7 +7,6 @@ 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
@@ -26,7 +25,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 -f $(top_srcdir)/tool/gperf.sed \
+	| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
 	) > $(@F)
 
 .SUFFIXES: .chksum .list .inc
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
index a6049da667..be536dff9f 100644
--- a/ext/io/console/extconf.rb
+++ b/ext/io/console/extconf.rb
@@ -17,12 +17,11 @@ else
 end
 if ok
   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
   $defs << "-D""ENABLE_IO_GETPASS=1"
   create_makefile("io/console") {|conf|
     conf << "\n""VK_HEADER = #{vk_header}\n"
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index ea50214712..d7414bb706 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -1,5 +1,5 @@
 # -*- ruby -*-
-_VERSION = "0.4.7"
+_VERSION = "0.4.6"
 date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
@@ -9,16 +9,13 @@ Gem::Specification.new do |s|
   s.summary = "Console interface"
   s.email = "nobu@ruby-lang.org"
   s.description = "add console capabilities to IO instances."
-  s.required_ruby_version = ">= 2.2.0"
-  s.homepage = "https://github.com/ruby/io-console"
+  s.required_ruby_version = ">= 2.0.0"
+  s.homepage = "http://www.ruby-lang.org"
   s.authors = ["Nobu Nakada"]
   s.require_path = %[lib]
-  s.files = %w[ext/io/console/console.c ext/io/console/extconf.rb lib/console/size.rb ext/io/console/win32_vk.inc]
-  s.extensions = %w[ext/io/console/extconf.rb]
+  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.add_development_dependency 'rake-compiler'
-  s.add_development_dependency 'rake-compiler-dock', ">= 0.6.1"
 end
diff --git a/ext/io/console/lib/console/size.rb b/ext/io/console/lib/console/size.rb
index 14b9a74b22..f17206dfcf 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 cbec7bef15..a098158e27 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
-/* ANSI-C code produced by gperf version 3.1 */
+/* C code produced by gperf version 3.0.4 */
 /* 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,14 +506,13 @@
       && ('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>."
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-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 */
@@ -546,7 +545,9 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_STRCMP
 #define GPERF_CASE_STRCMP 1
 static int
-gperf_case_strcmp (register const char *s1, register const char *s2)
+gperf_case_strcmp (s1, s2)
+     register const char *s1;
+     register const char *s2;
 {
   for (;;)
     {
@@ -559,15 +560,15 @@ gperf_case_strcmp (register const char *s1, register const char *s2)
 }
 #endif
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
 inline
-#endif
+#elif defined(__GNUC__)
+__inline
 #endif
 static unsigned int
-hash (register const char *str, register size_t len)
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const unsigned short asso_values[] =
     {
@@ -598,7 +599,7 @@ hash (register const char *str, register size_t len)
       257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
       257, 257, 257, 257, 257, 257, 257, 257
     };
-  register unsigned int hval = (unsigned int)len;
+  register int hval = len;
 
   switch (hval)
     {
@@ -660,7 +661,7 @@ hash (register const char *str, register size_t len)
         hval += asso_values[(unsigned char)str[0]];
         break;
     }
-  return (unsigned int)hval;
+  return hval;
 }
 
 struct stringpool_t
@@ -990,8 +991,16 @@ 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 (register const char *str, register size_t len)
+console_win32_vk (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   enum
     {
@@ -1007,375 +1016,375 @@ console_win32_vk (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
 #line 40 "win32_vk.list"
-      {gperf_offsetof(stringpool, 12), VK_UP},
+      {offsetof(struct stringpool_t, stringpool_str12), VK_UP},
 #line 52 "win32_vk.list"
-      {gperf_offsetof(stringpool, 13), VK_APPS},
+      {offsetof(struct stringpool_t, stringpool_str13), VK_APPS},
 #line 159 "win32_vk.list"
-      {gperf_offsetof(stringpool, 14), VK_CRSEL},
+      {offsetof(struct stringpool_t, stringpool_str14), VK_CRSEL},
 #line 34 "win32_vk.list"
-      {gperf_offsetof(stringpool, 15), VK_SPACE},
+      {offsetof(struct stringpool_t, stringpool_str15), VK_SPACE},
 #line 95 "win32_vk.list"
-      {gperf_offsetof(stringpool, 16), VK_SCROLL},
+      {offsetof(struct stringpool_t, stringpool_str16), VK_SCROLL},
 #line 29 "win32_vk.list"
-      {gperf_offsetof(stringpool, 17), VK_ESCAPE},
+      {offsetof(struct stringpool_t, stringpool_str17), VK_ESCAPE},
 #line 9 "win32_vk.list"
-      {gperf_offsetof(stringpool, 18), VK_CANCEL},
+      {offsetof(struct stringpool_t, stringpool_str18), VK_CANCEL},
 #line 32 "win32_vk.list"
-      {gperf_offsetof(stringpool, 19), VK_ACCEPT},
+      {offsetof(struct stringpool_t, stringpool_str19), VK_ACCEPT},
 #line 66 "win32_vk.list"
-      {gperf_offsetof(stringpool, 20), VK_SEPARATOR},
+      {offsetof(struct stringpool_t, stringpool_str20), VK_SEPARATOR},
 #line 43 "win32_vk.list"
-      {gperf_offsetof(stringpool, 21), VK_SELECT},
+      {offsetof(struct stringpool_t, stringpool_str21), VK_SELECT},
 #line 18 "win32_vk.list"
-      {gperf_offsetof(stringpool, 22), VK_CONTROL},
+      {offsetof(struct stringpool_t, stringpool_str22), VK_CONTROL},
 #line 166 "win32_vk.list"
-      {gperf_offsetof(stringpool, 23), VK_OEM_CLEAR},
+      {offsetof(struct stringpool_t, stringpool_str23), VK_OEM_CLEAR},
 #line 145 "win32_vk.list"
-      {gperf_offsetof(stringpool, 24), VK_OEM_RESET},
+      {offsetof(struct stringpool_t, stringpool_str24), VK_OEM_RESET},
 #line 155 "win32_vk.list"
-      {gperf_offsetof(stringpool, 25), VK_OEM_AUTO},
+      {offsetof(struct stringpool_t, stringpool_str25), VK_OEM_AUTO},
 #line 151 "win32_vk.list"
-      {gperf_offsetof(stringpool, 26), VK_OEM_CUSEL},
+      {offsetof(struct stringpool_t, stringpool_str26), VK_OEM_CUSEL},
       {-1},
 #line 22 "win32_vk.list"
-      {gperf_offsetof(stringpool, 28), VK_KANA},
+      {offsetof(struct stringpool_t, stringpool_str28), VK_KANA},
 #line 127 "win32_vk.list"
-      {gperf_offsetof(stringpool, 29), VK_OEM_PLUS},
+      {offsetof(struct stringpool_t, stringpool_str29), VK_OEM_PLUS},
 #line 35 "win32_vk.list"
-      {gperf_offsetof(stringpool, 30), VK_PRIOR},
+      {offsetof(struct stringpool_t, stringpool_str30), VK_PRIOR},
 #line 152 "win32_vk.list"
-      {gperf_offsetof(stringpool, 31), VK_OEM_ATTN},
+      {offsetof(struct stringpool_t, stringpool_str31), VK_OEM_ATTN},
 #line 20 "win32_vk.list"
-      {gperf_offsetof(stringpool, 32), VK_PAUSE},
+      {offsetof(struct stringpool_t, stringpool_str32), VK_PAUSE},
 #line 13 "win32_vk.list"
-      {gperf_offsetof(stringpool, 33), VK_BACK},
+      {offsetof(struct stringpool_t, stringpool_str33), VK_BACK},
 #line 144 "win32_vk.list"
-      {gperf_offsetof(stringpool, 34), VK_PACKET},
+      {offsetof(struct stringpool_t, stringpool_str34), VK_PACKET},
 #line 105 "win32_vk.list"
-      {gperf_offsetof(stringpool, 35), VK_RCONTROL},
+      {offsetof(struct stringpool_t, stringpool_str35), VK_RCONTROL},
 #line 104 "win32_vk.list"
-      {gperf_offsetof(stringpool, 36), VK_LCONTROL},
+      {offsetof(struct stringpool_t, stringpool_str36), VK_LCONTROL},
 #line 37 "win32_vk.list"
-      {gperf_offsetof(stringpool, 37), VK_END},
+      {offsetof(struct stringpool_t, stringpool_str37), VK_END},
 #line 38 "win32_vk.list"
-      {gperf_offsetof(stringpool, 38), VK_HOME},
+      {offsetof(struct stringpool_t, stringpool_str38), VK_HOME},
 #line 44 "win32_vk.list"
-      {gperf_offsetof(stringpool, 39), VK_PRINT},
+      {offsetof(struct stringpool_t, stringpool_str39), VK_PRINT},
 #line 94 "win32_vk.list"
-      {gperf_offsetof(stringpool, 40), VK_NUMLOCK},
+      {offsetof(struct stringpool_t, stringpool_str40), VK_NUMLOCK},
 #line 39 "win32_vk.list"
-      {gperf_offsetof(stringpool, 41), VK_LEFT},
+      {offsetof(struct stringpool_t, stringpool_str41), VK_LEFT},
 #line 25 "win32_vk.list"
-      {gperf_offsetof(stringpool, 42), VK_JUNJA},
+      {offsetof(struct stringpool_t, stringpool_str42), VK_JUNJA},
 #line 19 "win32_vk.list"
-      {gperf_offsetof(stringpool, 43), VK_MENU},
+      {offsetof(struct stringpool_t, stringpool_str43), VK_MENU},
 #line 150 "win32_vk.list"
-      {gperf_offsetof(stringpool, 44), VK_OEM_WSCTRL},
+      {offsetof(struct stringpool_t, stringpool_str44), VK_OEM_WSCTRL},
 #line 156 "win32_vk.list"
-      {gperf_offsetof(stringpool, 45), VK_OEM_ENLW},
+      {offsetof(struct stringpool_t, stringpool_str45), VK_OEM_ENLW},
 #line 36 "win32_vk.list"
-      {gperf_offsetof(stringpool, 46), VK_NEXT},
+      {offsetof(struct stringpool_t, stringpool_str46), VK_NEXT},
 #line 51 "win32_vk.list"
-      {gperf_offsetof(stringpool, 47), VK_RWIN},
+      {offsetof(struct stringpool_t, stringpool_str47), VK_RWIN},
 #line 50 "win32_vk.list"
-      {gperf_offsetof(stringpool, 48), VK_LWIN},
+      {offsetof(struct stringpool_t, stringpool_str48), VK_LWIN},
 #line 21 "win32_vk.list"
-      {gperf_offsetof(stringpool, 49), VK_CAPITAL},
+      {offsetof(struct stringpool_t, stringpool_str49), VK_CAPITAL},
 #line 49 "win32_vk.list"
-      {gperf_offsetof(stringpool, 50), VK_HELP},
+      {offsetof(struct stringpool_t, stringpool_str50), VK_HELP},
 #line 164 "win32_vk.list"
-      {gperf_offsetof(stringpool, 51), VK_NONAME},
+      {offsetof(struct stringpool_t, stringpool_str51), VK_NONAME},
 #line 8 "win32_vk.list"
-      {gperf_offsetof(stringpool, 52), VK_RBUTTON},
+      {offsetof(struct stringpool_t, stringpool_str52), VK_RBUTTON},
 #line 7 "win32_vk.list"
-      {gperf_offsetof(stringpool, 53), VK_LBUTTON},
+      {offsetof(struct stringpool_t, stringpool_str53), VK_LBUTTON},
 #line 96 "win32_vk.list"
-      {gperf_offsetof(stringpool, 54), VK_OEM_NEC_EQUAL},
+      {offsetof(struct stringpool_t, stringpool_str54), VK_OEM_NEC_EQUAL},
       {-1},
 #line 47 "win32_vk.list"
-      {gperf_offsetof(stringpool, 56), VK_INSERT},
+      {offsetof(struct stringpool_t, stringpool_str56), VK_INSERT},
 #line 27 "win32_vk.list"
-      {gperf_offsetof(stringpool, 57), VK_HANJA},
+      {offsetof(struct stringpool_t, stringpool_str57), VK_HANJA},
       {-1}, {-1},
 #line 46 "win32_vk.list"
-      {gperf_offsetof(stringpool, 60), VK_SNAPSHOT},
+      {offsetof(struct stringpool_t, stringpool_str60), VK_SNAPSHOT},
 #line 158 "win32_vk.list"
-      {gperf_offsetof(stringpool, 61), VK_ATTN},
+      {offsetof(struct stringpool_t, stringpool_str61), VK_ATTN},
 #line 14 "win32_vk.list"
-      {gperf_offsetof(stringpool, 62), VK_TAB},
+      {offsetof(struct stringpool_t, stringpool_str62), VK_TAB},
 #line 157 "win32_vk.list"
-      {gperf_offsetof(stringpool, 63), VK_OEM_BACKTAB},
+      {offsetof(struct stringpool_t, stringpool_str63), VK_OEM_BACKTAB},
 #line 143 "win32_vk.list"
-      {gperf_offsetof(stringpool, 64), VK_ICO_CLEAR},
+      {offsetof(struct stringpool_t, stringpool_str64), VK_ICO_CLEAR},
 #line 30 "win32_vk.list"
-      {gperf_offsetof(stringpool, 65), VK_CONVERT},
+      {offsetof(struct stringpool_t, stringpool_str65), VK_CONVERT},
 #line 16 "win32_vk.list"
-      {gperf_offsetof(stringpool, 66), VK_RETURN},
+      {offsetof(struct stringpool_t, stringpool_str66), VK_RETURN},
 #line 146 "win32_vk.list"
-      {gperf_offsetof(stringpool, 67), VK_OEM_JUMP},
+      {offsetof(struct stringpool_t, stringpool_str67), VK_OEM_JUMP},
       {-1}, {-1}, {-1},
 #line 111 "win32_vk.list"
-      {gperf_offsetof(stringpool, 71), VK_BROWSER_STOP},
+      {offsetof(struct stringpool_t, stringpool_str71), VK_BROWSER_STOP},
 #line 26 "win32_vk.list"
-      {gperf_offsetof(stringpool, 72), VK_FINAL},
+      {offsetof(struct stringpool_t, stringpool_str72), VK_FINAL},
 #line 163 "win32_vk.list"
-      {gperf_offsetof(stringpool, 73), VK_ZOOM},
+      {offsetof(struct stringpool_t, stringpool_str73), VK_ZOOM},
 #line 28 "win32_vk.list"
-      {gperf_offsetof(stringpool, 74), VK_KANJI},
+      {offsetof(struct stringpool_t, stringpool_str74), VK_KANJI},
 #line 48 "win32_vk.list"
-      {gperf_offsetof(stringpool, 75), VK_DELETE},
+      {offsetof(struct stringpool_t, stringpool_str75), VK_DELETE},
 #line 128 "win32_vk.list"
-      {gperf_offsetof(stringpool, 76), VK_OEM_COMMA},
+      {offsetof(struct stringpool_t, stringpool_str76), VK_OEM_COMMA},
 #line 67 "win32_vk.list"
-      {gperf_offsetof(stringpool, 77), VK_SUBTRACT},
+      {offsetof(struct stringpool_t, stringpool_str77), VK_SUBTRACT},
       {-1},
 #line 10 "win32_vk.list"
-      {gperf_offsetof(stringpool, 79), VK_MBUTTON},
+      {offsetof(struct stringpool_t, stringpool_str79), VK_MBUTTON},
 #line 78 "win32_vk.list"
-      {gperf_offsetof(stringpool, 80), VK_F9},
+      {offsetof(struct stringpool_t, stringpool_str80), VK_F9},
 #line 17 "win32_vk.list"
-      {gperf_offsetof(stringpool, 81), VK_SHIFT},
+      {offsetof(struct stringpool_t, stringpool_str81), VK_SHIFT},
 #line 103 "win32_vk.list"
-      {gperf_offsetof(stringpool, 82), VK_RSHIFT},
+      {offsetof(struct stringpool_t, stringpool_str82), VK_RSHIFT},
 #line 102 "win32_vk.list"
-      {gperf_offsetof(stringpool, 83), VK_LSHIFT},
+      {offsetof(struct stringpool_t, stringpool_str83), VK_LSHIFT},
 #line 65 "win32_vk.list"
-      {gperf_offsetof(stringpool, 84), VK_ADD},
+      {offsetof(struct stringpool_t, stringpool_str84), VK_ADD},
 #line 31 "win32_vk.list"
-      {gperf_offsetof(stringpool, 85), VK_NONCONVERT},
+      {offsetof(struct stringpool_t, stringpool_str85), VK_NONCONVERT},
 #line 160 "win32_vk.list"
-      {gperf_offsetof(stringpool, 86), VK_EXSEL},
+      {offsetof(struct stringpool_t, stringpool_str86), VK_EXSEL},
 #line 126 "win32_vk.list"
-      {gperf_offsetof(stringpool, 87), VK_OEM_1},
+      {offsetof(struct stringpool_t, stringpool_str87), VK_OEM_1},
 #line 138 "win32_vk.list"
-      {gperf_offsetof(stringpool, 88), VK_OEM_AX},
+      {offsetof(struct stringpool_t, stringpool_str88), VK_OEM_AX},
 #line 108 "win32_vk.list"
-      {gperf_offsetof(stringpool, 89), VK_BROWSER_BACK},
+      {offsetof(struct stringpool_t, stringpool_str89), VK_BROWSER_BACK},
 #line 137 "win32_vk.list"
-      {gperf_offsetof(stringpool, 90), VK_OEM_8},
+      {offsetof(struct stringpool_t, stringpool_str90), VK_OEM_8},
 #line 129 "win32_vk.list"
-      {gperf_offsetof(stringpool, 91), VK_OEM_MINUS},
+      {offsetof(struct stringpool_t, stringpool_str91), VK_OEM_MINUS},
 #line 162 "win32_vk.list"
-      {gperf_offsetof(stringpool, 92), VK_PLAY},
+      {offsetof(struct stringpool_t, stringpool_str92), VK_PLAY},
 #line 131 "win32_vk.list"
-      {gperf_offsetof(stringpool, 93), VK_OEM_2},
+      {offsetof(struct stringpool_t, stringpool_str93), VK_OEM_2},
 #line 15 "win32_vk.list"
-      {gperf_offsetof(stringpool, 94), VK_CLEAR},
+      {offsetof(struct stringpool_t, stringpool_str94), VK_CLEAR},
 #line 99 "win32_vk.list"
-      {gperf_offsetof(stringpool, 95), VK_OEM_FJ_TOUROKU},
+      {offsetof(struct stringpool_t, stringpool_str95), VK_OEM_FJ_TOUROKU},
 #line 147 "win32_vk.list"
-      {gperf_offsetof(stringpool, 96), VK_OEM_PA1},
+      {offsetof(struct stringpool_t, stringpool_str96), VK_OEM_PA1},
 #line 140 "win32_vk.list"
-      {gperf_offsetof(stringpool, 97), VK_ICO_HELP},
+      {offsetof(struct stringpool_t, stringpool_str97), VK_ICO_HELP},
 #line 112 "win32_vk.list"
-      {gperf_offsetof(stringpool, 98), VK_BROWSER_SEARCH},
+      {offsetof(struct stringpool_t, stringpool_str98), VK_BROWSER_SEARCH},
 #line 53 "win32_vk.list"
-      {gperf_offsetof(stringpool, 99), VK_SLEEP},
+      {offsetof(struct stringpool_t, stringpool_str99), VK_SLEEP},
       {-1},
 #line 70 "win32_vk.list"
-      {gperf_offsetof(stringpool, 101), VK_F1},
+      {offsetof(struct stringpool_t, stringpool_str101), VK_F1},
 #line 148 "win32_vk.list"
-      {gperf_offsetof(stringpool, 102), VK_OEM_PA2},
+      {offsetof(struct stringpool_t, stringpool_str102), VK_OEM_PA2},
 #line 154 "win32_vk.list"
-      {gperf_offsetof(stringpool, 103), VK_OEM_COPY},
+      {offsetof(struct stringpool_t, stringpool_str103), VK_OEM_COPY},
 #line 77 "win32_vk.list"
-      {gperf_offsetof(stringpool, 104), VK_F8},
+      {offsetof(struct stringpool_t, stringpool_str104), VK_F8},
 #line 88 "win32_vk.list"
-      {gperf_offsetof(stringpool, 105), VK_F19},
+      {offsetof(struct stringpool_t, stringpool_str105), VK_F19},
 #line 41 "win32_vk.list"
-      {gperf_offsetof(stringpool, 106), VK_RIGHT},
+      {offsetof(struct stringpool_t, stringpool_str106), VK_RIGHT},
 #line 71 "win32_vk.list"
-      {gperf_offsetof(stringpool, 107), VK_F2},
+      {offsetof(struct stringpool_t, stringpool_str107), VK_F2},
 #line 135 "win32_vk.list"
-      {gperf_offsetof(stringpool, 108), VK_OEM_6},
+      {offsetof(struct stringpool_t, stringpool_str108), VK_OEM_6},
 #line 87 "win32_vk.list"
-      {gperf_offsetof(stringpool, 109), VK_F18},
+      {offsetof(struct stringpool_t, stringpool_str109), VK_F18},
       {-1},
 #line 117 "win32_vk.list"
-      {gperf_offsetof(stringpool, 111), VK_VOLUME_UP},
+      {offsetof(struct stringpool_t, stringpool_str111), VK_VOLUME_UP},
       {-1}, {-1},
 #line 120 "win32_vk.list"
-      {gperf_offsetof(stringpool, 114), VK_MEDIA_STOP},
+      {offsetof(struct stringpool_t, stringpool_str114), VK_MEDIA_STOP},
 #line 130 "win32_vk.list"
-      {gperf_offsetof(stringpool, 115), VK_OEM_PERIOD},
+      {offsetof(struct stringpool_t, stringpool_str115), VK_OEM_PERIOD},
       {-1},
 #line 161 "win32_vk.list"
-      {gperf_offsetof(stringpool, 117), VK_EREOF},
+      {offsetof(struct stringpool_t, stringpool_str117), VK_EREOF},
       {-1}, {-1}, {-1},
 #line 114 "win32_vk.list"
-      {gperf_offsetof(stringpool, 121), VK_BROWSER_HOME},
+      {offsetof(struct stringpool_t, stringpool_str121), VK_BROWSER_HOME},
 #line 75 "win32_vk.list"
-      {gperf_offsetof(stringpool, 122), VK_F6},
+      {offsetof(struct stringpool_t, stringpool_str122), VK_F6},
       {-1},
 #line 110 "win32_vk.list"
-      {gperf_offsetof(stringpool, 124), VK_BROWSER_REFRESH},
+      {offsetof(struct stringpool_t, stringpool_str124), VK_BROWSER_REFRESH},
       {-1},
 #line 165 "win32_vk.list"
-      {gperf_offsetof(stringpool, 126), VK_PA1},
+      {offsetof(struct stringpool_t, stringpool_str126), VK_PA1},
 #line 142 "win32_vk.list"
-      {gperf_offsetof(stringpool, 127), VK_PROCESSKEY},
+      {offsetof(struct stringpool_t, stringpool_str127), VK_PROCESSKEY},
 #line 68 "win32_vk.list"
-      {gperf_offsetof(stringpool, 128), VK_DECIMAL},
+      {offsetof(struct stringpool_t, stringpool_str128), VK_DECIMAL},
 #line 132 "win32_vk.list"
-      {gperf_offsetof(stringpool, 129), VK_OEM_3},
+      {offsetof(struct stringpool_t, stringpool_str129), VK_OEM_3},
 #line 107 "win32_vk.list"
-      {gperf_offsetof(stringpool, 130), VK_RMENU},
+      {offsetof(struct stringpool_t, stringpool_str130), VK_RMENU},
 #line 106 "win32_vk.list"
-      {gperf_offsetof(stringpool, 131), VK_LMENU},
+      {offsetof(struct stringpool_t, stringpool_str131), VK_LMENU},
 #line 98 "win32_vk.list"
-      {gperf_offsetof(stringpool, 132), VK_OEM_FJ_MASSHOU},
+      {offsetof(struct stringpool_t, stringpool_str132), VK_OEM_FJ_MASSHOU},
 #line 54 "win32_vk.list"
-      {gperf_offsetof(stringpool, 133), VK_NUMPAD0},
+      {offsetof(struct stringpool_t, stringpool_str133), VK_NUMPAD0},
 #line 24 "win32_vk.list"
-      {gperf_offsetof(stringpool, 134), VK_HANGUL},
+      {offsetof(struct stringpool_t, stringpool_str134), VK_HANGUL},
 #line 63 "win32_vk.list"
-      {gperf_offsetof(stringpool, 135), VK_NUMPAD9},
+      {offsetof(struct stringpool_t, stringpool_str135), VK_NUMPAD9},
 #line 23 "win32_vk.list"
-      {gperf_offsetof(stringpool, 136), VK_HANGEUL},
+      {offsetof(struct stringpool_t, stringpool_str136), VK_HANGEUL},
 #line 134 "win32_vk.list"
-      {gperf_offsetof(stringpool, 137), VK_OEM_5},
+      {offsetof(struct stringpool_t, stringpool_str137), VK_OEM_5},
 #line 149 "win32_vk.list"
-      {gperf_offsetof(stringpool, 138), VK_OEM_PA3},
+      {offsetof(struct stringpool_t, stringpool_str138), VK_OEM_PA3},
 #line 115 "win32_vk.list"
-      {gperf_offsetof(stringpool, 139), VK_VOLUME_MUTE},
+      {offsetof(struct stringpool_t, stringpool_str139), VK_VOLUME_MUTE},
 #line 133 "win32_vk.list"
-      {gperf_offsetof(stringpool, 140), VK_OEM_4},
+      {offsetof(struct stringpool_t, stringpool_str140), VK_OEM_4},
 #line 122 "win32_vk.list"
-      {gperf_offsetof(stringpool, 141), VK_LAUNCH_MAIL},
+      {offsetof(struct stringpool_t, stringpool_str141), VK_LAUNCH_MAIL},
 #line 97 "win32_vk.list"
-      {gperf_offsetof(stringpool, 142), VK_OEM_FJ_JISHO},
+      {offsetof(struct stringpool_t, stringpool_str142), VK_OEM_FJ_JISHO},
 #line 72 "win32_vk.list"
-      {gperf_offsetof(stringpool, 143), VK_F3},
+      {offsetof(struct stringpool_t, stringpool_str143), VK_F3},
 #line 101 "win32_vk.list"
-      {gperf_offsetof(stringpool, 144), VK_OEM_FJ_ROYA},
+      {offsetof(struct stringpool_t, stringpool_str144), VK_OEM_FJ_ROYA},
 #line 100 "win32_vk.list"
-      {gperf_offsetof(stringpool, 145), VK_OEM_FJ_LOYA},
+      {offsetof(struct stringpool_t, stringpool_str145), VK_OEM_FJ_LOYA},
       {-1},
 #line 42 "win32_vk.list"
-      {gperf_offsetof(stringpool, 147), VK_DOWN},
+      {offsetof(struct stringpool_t, stringpool_str147), VK_DOWN},
       {-1},
 #line 153 "win32_vk.list"
-      {gperf_offsetof(stringpool, 149), VK_OEM_FINISH},
+      {offsetof(struct stringpool_t, stringpool_str149), VK_OEM_FINISH},
       {-1},
 #line 74 "win32_vk.list"
-      {gperf_offsetof(stringpool, 151), VK_F5},
+      {offsetof(struct stringpool_t, stringpool_str151), VK_F5},
       {-1},
 #line 136 "win32_vk.list"
-      {gperf_offsetof(stringpool, 153), VK_OEM_7},
+      {offsetof(struct stringpool_t, stringpool_str153), VK_OEM_7},
 #line 73 "win32_vk.list"
-      {gperf_offsetof(stringpool, 154), VK_F4},
+      {offsetof(struct stringpool_t, stringpool_str154), VK_F4},
 #line 86 "win32_vk.list"
-      {gperf_offsetof(stringpool, 155), VK_F17},
+      {offsetof(struct stringpool_t, stringpool_str155), VK_F17},
 #line 55 "win32_vk.list"
-      {gperf_offsetof(stringpool, 156), VK_NUMPAD1},
+      {offsetof(struct stringpool_t, stringpool_str156), VK_NUMPAD1},
 #line 141 "win32_vk.list"
-      {gperf_offsetof(stringpool, 157), VK_ICO_00},
+      {offsetof(struct stringpool_t, stringpool_str157), VK_ICO_00},
       {-1},
 #line 62 "win32_vk.list"
-      {gperf_offsetof(stringpool, 159), VK_NUMPAD8},
+      {offsetof(struct stringpool_t, stringpool_str159), VK_NUMPAD8},
       {-1}, {-1},
 #line 56 "win32_vk.list"
-      {gperf_offsetof(stringpool, 162), VK_NUMPAD2},
+      {offsetof(struct stringpool_t, stringpool_str162), VK_NUMPAD2},
       {-1},
 #line 124 "win32_vk.list"
-      {gperf_offsetof(stringpool, 164), VK_LAUNCH_APP1},
+      {offsetof(struct stringpool_t, stringpool_str164), VK_LAUNCH_APP1},
 #line 109 "win32_vk.list"
-      {gperf_offsetof(stringpool, 165), VK_BROWSER_FORWARD},
+      {offsetof(struct stringpool_t, stringpool_str165), VK_BROWSER_FORWARD},
       {-1},
 #line 76 "win32_vk.list"
-      {gperf_offsetof(stringpool, 167), VK_F7},
+      {offsetof(struct stringpool_t, stringpool_str167), VK_F7},
       {-1}, {-1},
 #line 125 "win32_vk.list"
-      {gperf_offsetof(stringpool, 170), VK_LAUNCH_APP2},
+      {offsetof(struct stringpool_t, stringpool_str170), VK_LAUNCH_APP2},
 #line 64 "win32_vk.list"
-      {gperf_offsetof(stringpool, 171), VK_MULTIPLY},
+      {offsetof(struct stringpool_t, stringpool_str171), VK_MULTIPLY},
       {-1}, {-1},
 #line 45 "win32_vk.list"
-      {gperf_offsetof(stringpool, 174), VK_EXECUTE},
+      {offsetof(struct stringpool_t, stringpool_str174), VK_EXECUTE},
       {-1},
 #line 113 "win32_vk.list"
-      {gperf_offsetof(stringpool, 176), VK_BROWSER_FAVORITES},
+      {offsetof(struct stringpool_t, stringpool_str176), VK_BROWSER_FAVORITES},
 #line 60 "win32_vk.list"
-      {gperf_offsetof(stringpool, 177), VK_NUMPAD6},
+      {offsetof(struct stringpool_t, stringpool_str177), VK_NUMPAD6},
       {-1},
 #line 85 "win32_vk.list"
-      {gperf_offsetof(stringpool, 179), VK_F16},
+      {offsetof(struct stringpool_t, stringpool_str179), VK_F16},
       {-1}, {-1},
 #line 79 "win32_vk.list"
-      {gperf_offsetof(stringpool, 182), VK_F10},
+      {offsetof(struct stringpool_t, stringpool_str182), VK_F10},
       {-1}, {-1},
 #line 116 "win32_vk.list"
-      {gperf_offsetof(stringpool, 185), VK_VOLUME_DOWN},
+      {offsetof(struct stringpool_t, stringpool_str185), VK_VOLUME_DOWN},
       {-1}, {-1},
 #line 89 "win32_vk.list"
-      {gperf_offsetof(stringpool, 188), VK_F20},
+      {offsetof(struct stringpool_t, stringpool_str188), VK_F20},
 #line 119 "win32_vk.list"
-      {gperf_offsetof(stringpool, 189), VK_MEDIA_PREV_TRACK},
+      {offsetof(struct stringpool_t, stringpool_str189), VK_MEDIA_PREV_TRACK},
       {-1},
 #line 33 "win32_vk.list"
-      {gperf_offsetof(stringpool, 191), VK_MODECHANGE},
+      {offsetof(struct stringpool_t, stringpool_str191), VK_MODECHANGE},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 83 "win32_vk.list"
-      {gperf_offsetof(stringpool, 197), VK_F14},
+      {offsetof(struct stringpool_t, stringpool_str197), VK_F14},
 #line 57 "win32_vk.list"
-      {gperf_offsetof(stringpool, 198), VK_NUMPAD3},
+      {offsetof(struct stringpool_t, stringpool_str198), VK_NUMPAD3},
 #line 11 "win32_vk.list"
-      {gperf_offsetof(stringpool, 199), VK_XBUTTON1},
+      {offsetof(struct stringpool_t, stringpool_str199), VK_XBUTTON1},
       {-1}, {-1}, {-1},
 #line 93 "win32_vk.list"
-      {gperf_offsetof(stringpool, 203), VK_F24},
+      {offsetof(struct stringpool_t, stringpool_str203), VK_F24},
       {-1},
 #line 12 "win32_vk.list"
-      {gperf_offsetof(stringpool, 205), VK_XBUTTON2},
+      {offsetof(struct stringpool_t, stringpool_str205), VK_XBUTTON2},
 #line 59 "win32_vk.list"
-      {gperf_offsetof(stringpool, 206), VK_NUMPAD5},
+      {offsetof(struct stringpool_t, stringpool_str206), VK_NUMPAD5},
       {-1}, {-1},
 #line 58 "win32_vk.list"
-      {gperf_offsetof(stringpool, 209), VK_NUMPAD4},
+      {offsetof(struct stringpool_t, stringpool_str209), VK_NUMPAD4},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 121 "win32_vk.list"
-      {gperf_offsetof(stringpool, 215), VK_MEDIA_PLAY_PAUSE},
+      {offsetof(struct stringpool_t, stringpool_str215), VK_MEDIA_PLAY_PAUSE},
       {-1},
 #line 123 "win32_vk.list"
-      {gperf_offsetof(stringpool, 217), VK_LAUNCH_MEDIA_SELECT},
+      {offsetof(struct stringpool_t, stringpool_str217), VK_LAUNCH_MEDIA_SELECT},
 #line 80 "win32_vk.list"
-      {gperf_offsetof(stringpool, 218), VK_F11},
+      {offsetof(struct stringpool_t, stringpool_str218), VK_F11},
       {-1},
 #line 139 "win32_vk.list"
-      {gperf_offsetof(stringpool, 220), VK_OEM_102},
+      {offsetof(struct stringpool_t, stringpool_str220), VK_OEM_102},
 #line 118 "win32_vk.list"
-      {gperf_offsetof(stringpool, 221), VK_MEDIA_NEXT_TRACK},
+      {offsetof(struct stringpool_t, stringpool_str221), VK_MEDIA_NEXT_TRACK},
 #line 61 "win32_vk.list"
-      {gperf_offsetof(stringpool, 222), VK_NUMPAD7},
+      {offsetof(struct stringpool_t, stringpool_str222), VK_NUMPAD7},
       {-1},
 #line 90 "win32_vk.list"
-      {gperf_offsetof(stringpool, 224), VK_F21},
+      {offsetof(struct stringpool_t, stringpool_str224), VK_F21},
       {-1},
 #line 82 "win32_vk.list"
-      {gperf_offsetof(stringpool, 226), VK_F13},
+      {offsetof(struct stringpool_t, stringpool_str226), VK_F13},
       {-1}, {-1},
 #line 81 "win32_vk.list"
-      {gperf_offsetof(stringpool, 229), VK_F12},
+      {offsetof(struct stringpool_t, stringpool_str229), VK_F12},
       {-1}, {-1},
 #line 92 "win32_vk.list"
-      {gperf_offsetof(stringpool, 232), VK_F23},
+      {offsetof(struct stringpool_t, stringpool_str232), VK_F23},
       {-1}, {-1},
 #line 91 "win32_vk.list"
-      {gperf_offsetof(stringpool, 235), VK_F22},
+      {offsetof(struct stringpool_t, stringpool_str235), VK_F22},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 84 "win32_vk.list"
-      {gperf_offsetof(stringpool, 242), VK_F15},
+      {offsetof(struct stringpool_t, stringpool_str242), VK_F15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
 #line 69 "win32_vk.list"
-      {gperf_offsetof(stringpool, 256), VK_DIVIDE}
+      {offsetof(struct stringpool_t, stringpool_str256), VK_DIVIDE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register unsigned int key = hash (str, len);
+      register int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           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 7909a4d1f0..28bc9545ec 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(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct vktable *console_win32_vk(const char *, unsigned int);
 %}
 struct vktable
 %%
diff --git a/ext/io/nonblock/depend b/ext/io/nonblock/depend
index 4402898de6..13f445abf5 100644
--- a/ext/io/nonblock/depend
+++ b/ext/io/nonblock/depend
@@ -7,7 +7,6 @@ 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
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 1c0bdc68e7..2509329f6c 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  io/nonblock.c -
+  io/wait.c -
 
   $Author$
   created at: Tue Jul 14 21:53:18 2009
diff --git a/ext/io/wait/depend b/ext/io/wait/depend
index f509dcd8a4..8440965df0 100644
--- a/ext/io/wait/depend
+++ b/ext/io/wait/depend
@@ -7,7 +7,6 @@ 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
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index dc8f406b5b..5a0a27cda5 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -12,6 +12,9 @@
 #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 54e8ae3eb4..556259c1c8 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -9,7 +9,6 @@ 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
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index f061267f0d..ef85bb7337 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -308,7 +308,7 @@ static char *fstrndup(const char *ptr, unsigned long len) {
   char *result;
   if (len <= 0) return NULL;
   result = ALLOC_N(char, len);
-  memcpy(result, ptr, len);
+  memccpy(result, ptr, 0, len);
   return result;
 }
 
@@ -1062,7 +1062,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
         }
     } else {
         if (state->indent) ruby_xfree(state->indent);
-        state->indent = fstrndup(RSTRING_PTR(indent), len);
+        state->indent = strdup(RSTRING_PTR(indent));
         state->indent_len = len;
     }
     return Qnil;
@@ -1100,7 +1100,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
         }
     } else {
         if (state->space) ruby_xfree(state->space);
-        state->space = fstrndup(RSTRING_PTR(space), len);
+        state->space = strdup(RSTRING_PTR(space));
         state->space_len = len;
     }
     return Qnil;
@@ -1136,7 +1136,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 = fstrndup(RSTRING_PTR(space_before), len);
+        state->space_before = strdup(RSTRING_PTR(space_before));
         state->space_before_len = len;
     }
     return Qnil;
@@ -1173,7 +1173,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 = fstrndup(RSTRING_PTR(object_nl), len);
+        state->object_nl = strdup(RSTRING_PTR(object_nl));
         state->object_nl_len = len;
     }
     return Qnil;
@@ -1208,7 +1208,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 = fstrndup(RSTRING_PTR(array_nl), len);
+        state->array_nl = strdup(RSTRING_PTR(array_nl));
         state->array_nl_len = len;
     }
     return Qnil;
@@ -1335,7 +1335,6 @@ static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_l
  */
 void Init_generator(void)
 {
-#undef rb_intern
     rb_require("json/common");
 
     mJSON = rb_define_module("JSON");
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index c367a6209a..900b4d58f3 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -1,6 +1,7 @@
 #ifndef _GENERATOR_H_
 #define _GENERATOR_H_
 
+#include <string.h>
 #include <math.h>
 #include <ctype.h>
 
diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 1c18efbedc..2c304ef918 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index b65ed87f98..8997def28b 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         = '2.1.0'
+  VERSION         = '2.0.2'
   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 2ffd904475..927cd892bf 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -9,7 +9,6 @@ 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
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 027fbcc26f..0dae674c88 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -91,20 +91,18 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
 
 static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 static VALUE CNaN, CInfinity, CMinusInfinity;
-static VALUE cBigDecimal = Qundef;
 
 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_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_BigDecimal;
+          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
+          i_match_string, i_aset, i_aref, i_leftshift;
 
 
-#line 125 "parser.rl"
+#line 124 "parser.rl"
 
 
 
-#line 107 "parser.c"
+#line 106 "parser.c"
 enum {JSON_object_start = 1};
 enum {JSON_object_first_final = 27};
 enum {JSON_object_error = 0};
@@ -112,7 +110,7 @@ enum {JSON_object_error = 0};
 enum {JSON_object_en_main = 1};
 
 
-#line 166 "parser.rl"
+#line 165 "parser.rl"
 
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -128,14 +126,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
 
-#line 131 "parser.c"
+#line 130 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 181 "parser.rl"
+#line 180 "parser.rl"
 
-#line 138 "parser.c"
+#line 137 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -163,7 +161,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 148 "parser.rl"
+#line 147 "parser.rl"
 	{
         char *np;
         json->parsing_name = 1;
@@ -176,7 +174,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 179 "parser.c"
+#line 178 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -243,7 +241,7 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 133 "parser.rl"
+#line 132 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
@@ -263,7 +261,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 266 "parser.c"
+#line 265 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -352,14 +350,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 156 "parser.rl"
+#line 155 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 362 "parser.c"
+#line 361 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -457,7 +455,7 @@ case 26:
 	_out: {}
 	}
 
-#line 182 "parser.rl"
+#line 181 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
@@ -482,7 +480,7 @@ case 26:
 
 
 
-#line 485 "parser.c"
+#line 484 "parser.c"
 enum {JSON_value_start = 1};
 enum {JSON_value_first_final = 29};
 enum {JSON_value_error = 0};
@@ -490,7 +488,7 @@ enum {JSON_value_error = 0};
 enum {JSON_value_en_main = 1};
 
 
-#line 282 "parser.rl"
+#line 281 "parser.rl"
 
 
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -498,14 +496,14 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 501 "parser.c"
+#line 500 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 289 "parser.rl"
+#line 288 "parser.rl"
 
-#line 508 "parser.c"
+#line 507 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -539,14 +537,14 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 234 "parser.rl"
+#line 233 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
 	goto st29;
 tr3:
-#line 239 "parser.rl"
+#line 238 "parser.rl"
 	{
         char *np;
         if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
@@ -566,7 +564,7 @@ tr3:
     }
 	goto st29;
 tr7:
-#line 257 "parser.rl"
+#line 256 "parser.rl"
 	{
         char *np;
         np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
@@ -574,7 +572,7 @@ tr7:
     }
 	goto st29;
 tr11:
-#line 263 "parser.rl"
+#line 262 "parser.rl"
 	{
         char *np;
         np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
@@ -582,7 +580,7 @@ tr11:
     }
 	goto st29;
 tr25:
-#line 227 "parser.rl"
+#line 226 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
@@ -592,7 +590,7 @@ tr25:
     }
 	goto st29;
 tr27:
-#line 220 "parser.rl"
+#line 219 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
@@ -602,19 +600,19 @@ tr27:
     }
 	goto st29;
 tr31:
-#line 214 "parser.rl"
+#line 213 "parser.rl"
 	{
         *result = Qfalse;
     }
 	goto st29;
 tr34:
-#line 211 "parser.rl"
+#line 210 "parser.rl"
 	{
         *result = Qnil;
     }
 	goto st29;
 tr37:
-#line 217 "parser.rl"
+#line 216 "parser.rl"
 	{
         *result = Qtrue;
     }
@@ -623,9 +621,9 @@ st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 269 "parser.rl"
+#line 268 "parser.rl"
 	{ p--; {p++; cs = 29; goto _out;} }
-#line 628 "parser.c"
+#line 627 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st29;
 		case 32: goto st29;
@@ -866,7 +864,7 @@ case 28:
 	_out: {}
 	}
 
-#line 290 "parser.rl"
+#line 289 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -876,7 +874,7 @@ case 28:
 }
 
 
-#line 879 "parser.c"
+#line 878 "parser.c"
 enum {JSON_integer_start = 1};
 enum {JSON_integer_first_final = 3};
 enum {JSON_integer_error = 0};
@@ -884,7 +882,7 @@ enum {JSON_integer_error = 0};
 enum {JSON_integer_en_main = 1};
 
 
-#line 306 "parser.rl"
+#line 305 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -892,15 +890,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
 
-#line 895 "parser.c"
+#line 894 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 313 "parser.rl"
+#line 312 "parser.rl"
     json->memo = p;
 
-#line 903 "parser.c"
+#line 902 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -934,14 +932,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 303 "parser.rl"
+#line 302 "parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 944 "parser.c"
+#line 943 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -960,7 +958,7 @@ case 5:
 	_out: {}
 	}
 
-#line 315 "parser.rl"
+#line 314 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -975,7 +973,7 @@ case 5:
 }
 
 
-#line 978 "parser.c"
+#line 977 "parser.c"
 enum {JSON_float_start = 1};
 enum {JSON_float_first_final = 8};
 enum {JSON_float_error = 0};
@@ -983,36 +981,23 @@ enum {JSON_float_error = 0};
 enum {JSON_float_en_main = 1};
 
 
-#line 340 "parser.rl"
+#line 339 "parser.rl"
 
 
-static int is_bigdecimal_class(VALUE obj)
-{
-  if (cBigDecimal == Qundef) {
-    if (rb_const_defined(rb_cObject, i_BigDecimal)) {
-      cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
-    }
-    else {
-      return 0;
-    }
-  }
-  return obj == cBigDecimal;
-}
-
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 994 "parser.c"
+#line 993 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 347 "parser.rl"
+#line 346 "parser.rl"
     json->memo = p;
 
-#line 1002 "parser.c"
+#line 1001 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1070,14 +1055,14 @@ case 8:
 		goto st0;
 	goto tr9;
 tr9:
-#line 334 "parser.rl"
+#line 333 "parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 1067 "parser.c"
+#line 1066 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -1138,24 +1123,14 @@ case 7:
 	_out: {}
 	}
 
-#line 349 "parser.rl"
+#line 348 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
         fbuffer_clear(json->fbuffer);
         fbuffer_append(json->fbuffer, json->memo, len);
         fbuffer_append_char(json->fbuffer, '\0');
-        if (NIL_P(json->decimal_class)) {
-          *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
-        } else {
-          VALUE text;
-          text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
-          if (is_bigdecimal_class(json->decimal_class)) {
-            *result = rb_funcall(Qnil, i_BigDecimal, 1, text);
-          } else {
-            *result = rb_funcall(json->decimal_class, i_new, 1, text);
-          }
-        }
+        *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
         return p + 1;
     } else {
         return NULL;
@@ -1164,7 +1139,7 @@ case 7:
 
 
 
-#line 1150 "parser.c"
+#line 1143 "parser.c"
 enum {JSON_array_start = 1};
 enum {JSON_array_first_final = 17};
 enum {JSON_array_error = 0};
@@ -1172,7 +1147,7 @@ enum {JSON_array_error = 0};
 enum {JSON_array_en_main = 1};
 
 
-#line 398 "parser.rl"
+#line 391 "parser.rl"
 
 
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -1186,14 +1161,14 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
 
-#line 1172 "parser.c"
+#line 1165 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 411 "parser.rl"
+#line 404 "parser.rl"
 
-#line 1179 "parser.c"
+#line 1172 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1232,7 +1207,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 375 "parser.rl"
+#line 368 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
@@ -1252,7 +1227,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1238 "parser.c"
+#line 1231 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1352,14 +1327,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 390 "parser.rl"
+#line 383 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1345 "parser.c"
+#line 1338 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1415,7 +1390,7 @@ case 16:
 	_out: {}
 	}
 
-#line 412 "parser.rl"
+#line 405 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
@@ -1460,21 +1435,13 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                      rb_enc_raise(
-                        EXC_ENCODING eParserError,
-                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
-                      );
+                        return Qnil;
                     } else {
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) {
-                              rb_enc_raise(
-                                EXC_ENCODING eParserError,
-                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
-                                );
-                            }
+                            if (pe > stringEnd - 6) return Qnil;
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -1504,7 +1471,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 }
 
 
-#line 1490 "parser.c"
+#line 1475 "parser.c"
 enum {JSON_string_start = 1};
 enum {JSON_string_first_final = 8};
 enum {JSON_string_error = 0};
@@ -1512,7 +1479,7 @@ enum {JSON_string_error = 0};
 enum {JSON_string_en_main = 1};
 
 
-#line 519 "parser.rl"
+#line 504 "parser.rl"
 
 
 static int
@@ -1534,15 +1501,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_buf_new(0);
 
-#line 1520 "parser.c"
+#line 1505 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 540 "parser.rl"
+#line 525 "parser.rl"
     json->memo = p;
 
-#line 1528 "parser.c"
+#line 1513 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1567,7 +1534,7 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 505 "parser.rl"
+#line 490 "parser.rl"
 	{
         *result = json_string_unescape(*result, json->memo + 1, p);
         if (NIL_P(*result)) {
@@ -1578,14 +1545,14 @@ tr2:
             {p = (( p + 1))-1;}
         }
     }
-#line 516 "parser.rl"
+#line 501 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1571 "parser.c"
+#line 1556 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1661,7 +1628,7 @@ case 7:
 	_out: {}
 	}
 
-#line 542 "parser.rl"
+#line 527 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -1677,9 +1644,7 @@ case 7:
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
     } else {
-          if (RB_TYPE_P(*result, T_STRING)) {
-              rb_str_resize(*result, RSTRING_LEN(*result));
-          }
+      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -1710,7 +1675,7 @@ static VALUE convert_encoding(VALUE source)
     }
     FORCE_UTF8(source);
   } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
   }
 #endif
     return source;
@@ -1816,12 +1781,6 @@ 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);
@@ -1835,11 +1794,10 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 0;
+        json->create_additions = 1;
         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);
@@ -1850,7 +1808,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1836 "parser.c"
+#line 1812 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1858,7 +1816,7 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 744 "parser.rl"
+#line 720 "parser.rl"
 
 
 /*
@@ -1875,16 +1833,16 @@ static VALUE cParser_parse(VALUE self)
   GET_PARSER;
 
 
-#line 1861 "parser.c"
+#line 1837 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 760 "parser.rl"
+#line 736 "parser.rl"
   p = json->source;
   pe = p + json->len;
 
-#line 1870 "parser.c"
+#line 1846 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1918,7 +1876,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 736 "parser.rl"
+#line 712 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1928,7 +1886,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1914 "parser.c"
+#line 1890 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2017,7 +1975,7 @@ case 9:
 	_out: {}
 	}
 
-#line 763 "parser.rl"
+#line 739 "parser.rl"
 
   if (cs >= JSON_first_final && p == pe) {
     return result;
@@ -2034,7 +1992,6 @@ 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);
 }
 
@@ -2084,7 +2041,6 @@ static VALUE cParser_source(VALUE self)
 
 void Init_parser(void)
 {
-#undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
@@ -2110,7 +2066,6 @@ void Init_parser(void)
     i_symbolize_names = rb_intern("symbolize_names");
     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?");
@@ -2118,8 +2073,6 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
-    i_new = rb_intern("new");
-    i_BigDecimal = rb_intern("BigDecimal");
 }
 
 /*
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index e6cf779024..1d46831965 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -39,7 +39,6 @@ typedef struct JSON_ParserStruct {
     int symbolize_names;
     VALUE object_class;
     VALUE array_class;
-    VALUE decimal_class;
     int create_additions;
     VALUE match_string;
     FBuffer *fbuffer;
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index fb0bb515de..dd24cf94cc 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -89,13 +89,11 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
 
 static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 static VALUE CNaN, CInfinity, CMinusInfinity;
-static VALUE cBigDecimal = Qundef;
 
 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_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_BigDecimal;
+          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
+          i_match_string, i_aset, i_aref, i_leftshift;
 
 %%{
     machine JSON_common;
@@ -340,19 +338,6 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
              )  (^[0-9Ee.\-]? @exit );
 }%%
 
-static int is_bigdecimal_class(VALUE obj)
-{
-  if (cBigDecimal == Qundef) {
-    if (rb_const_defined(rb_cObject, i_BigDecimal)) {
-      cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
-    }
-    else {
-      return 0;
-    }
-  }
-  return obj == cBigDecimal;
-}
-
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
@@ -366,17 +351,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
         fbuffer_clear(json->fbuffer);
         fbuffer_append(json->fbuffer, json->memo, len);
         fbuffer_append_char(json->fbuffer, '\0');
-        if (NIL_P(json->decimal_class)) {
-          *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
-        } else {
-          VALUE text;
-          text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
-          if (is_bigdecimal_class(json->decimal_class)) {
-            *result = rb_funcall(Qnil, i_BigDecimal, 1, text);
-          } else {
-            *result = rb_funcall(json->decimal_class, i_new, 1, text);
-          }
-        }
+        *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
         return p + 1;
     } else {
         return NULL;
@@ -471,21 +446,13 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                      rb_enc_raise(
-                        EXC_ENCODING eParserError,
-                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
-                      );
+                        return Qnil;
                     } else {
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) {
-                              rb_enc_raise(
-                                EXC_ENCODING eParserError,
-                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
-                                );
-                            }
+                            if (pe > stringEnd - 6) return Qnil;
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -572,9 +539,7 @@ 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)) {
-              rb_str_resize(*result, RSTRING_LEN(*result));
-          }
+      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -605,7 +570,7 @@ static VALUE convert_encoding(VALUE source)
     }
     FORCE_UTF8(source);
   } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
   }
 #endif
     return source;
@@ -711,12 +676,6 @@ 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);
@@ -730,11 +689,10 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 0;
+        json->create_additions = 1;
         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);
@@ -794,7 +752,6 @@ 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);
 }
 
@@ -844,7 +801,6 @@ static VALUE cParser_source(VALUE self)
 
 void Init_parser(void)
 {
-#undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
@@ -870,7 +826,6 @@ void Init_parser(void)
     i_symbolize_names = rb_intern("symbolize_names");
     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?");
@@ -878,8 +833,6 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
-    i_new = rb_intern("new");
-    i_BigDecimal = rb_intern("BigDecimal");
 }
 
 /*
diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c
new file mode 100644
index 0000000000..dce494959f
--- /dev/null
+++ b/ext/mathn/complex/complex.c
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..a3f45ac4fc
--- /dev/null
+++ b/ext/mathn/complex/extconf.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+require "mkmf"
+
+create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
new file mode 100644
index 0000000000..4e4cc5f621
--- /dev/null
+++ b/ext/mathn/rational/extconf.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+require "mkmf"
+
+create_makefile "mathn/rational"
diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c
new file mode 100644
index 0000000000..2ac5999946
--- /dev/null
+++ b/ext/mathn/rational/rational.c
@@ -0,0 +1,7 @@
+extern void nurat_canonicalization(int);
+
+void
+Init_rational(void)
+{
+    nurat_canonicalization(1);
+}
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 4ea8544a95..dfda9c0597 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -10,7 +10,6 @@ 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 cc438a50d6..b58c437d3c 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-2018, The nkf Project.
+ * Copyright (c) 1996-2013, 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.5"
-#define NKF_RELEASE_DATE "2018-12-15"
+#define NKF_VERSION "2.1.4"
+#define NKF_RELEASE_DATE "2015-12-12"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2018, The nkf Project."
+    "Copyright (C) 1996-2015, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -1111,26 +1111,18 @@ encode_fallback_java(nkf_char c)
     (*oconv)(0, '\\');
     c &= VALUE_MASK;
     if(!nkf_char_unicode_bmp_p(c)){
-        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    ));
+	(*oconv)(0, 'U');
+	(*oconv)(0, '0');
+	(*oconv)(0, '0');
+	(*oconv)(0, bin2hex(c>>20));
+	(*oconv)(0, bin2hex(c>>16));
     }else{
 	(*oconv)(0, 'u');
-	(*oconv)(0, bin2hex(c>>12));
-	(*oconv)(0, bin2hex(c>> 8));
-	(*oconv)(0, bin2hex(c>> 4));
-	(*oconv)(0, bin2hex(c    ));
     }
+    (*oconv)(0, bin2hex(c>>12));
+    (*oconv)(0, bin2hex(c>> 8));
+    (*oconv)(0, bin2hex(c>> 4));
+    (*oconv)(0, bin2hex(c    ));
     return;
 }
 
@@ -1955,17 +1947,12 @@ 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&& 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;
-	    }
+    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;
 	}
     }
 #endif
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index a31e4e7805..3821c59468 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,      0, 0x2E29, 0xB050, 0x2E2A,
+      0,      0,      0, 0x4724, 0xF42F, 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,      0, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143,      0,
+ 0x3F2D, 0xB063, 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,      0, 0x5059, 0xA154,
+ 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D, 0xB13E, 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,      0,
+ 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
 };
 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,
-      0, 0xA17B, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
+ 0xB23B, 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,      0, 0x512C, 0xB246,      0,
+      0, 0xB245, 0x2E46, 0xA176, 0xF430, 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,      0, 0x467E, 0xB26E,      0,
+ 0xA326,      0, 0x513E,      0, 0xB26D, 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,      0, 0xB27D,
+ 0xB279,      0, 0xB27A,      0, 0xA330, 0x5158, 0xB27C, 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,      0, 0x515F, 0x2E59,      0,
+      0, 0x515E, 0x4664,      0, 0xF431, 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,      0,      0,      0, 0x3879,
+ 0xA340,      0, 0xB357, 0x4E4F, 0xB358,      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[] = {
-      0, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
+ 0xB365, 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,      0, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
+ 0x3075, 0x346D, 0xB440, 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,      0, 0xB45F, 0x5257,
+      0, 0x3D76, 0xA360, 0x4840,      0, 0xB45E, 0xB45F, 0x5257,
  0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
  0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
  0x4266, 0x3C38, 0x3B4B, 0x3126, 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,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x5433, 0xB741,      0, 0x3A25,      0, 0x4333, 0xB743,
+      0, 0xF436,      0,      0,      0,      0,      0,      0,
+      0, 0x5433, 0xB741,      0, 0x3A25, 0xB742, 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,      0, 0x4A2F,      0,      0,      0,      0,
+      0, 0xA531, 0xB84E, 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,      0, 0x4B5B, 0x5475,      0, 0x4565,
+ 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
  0x5479, 0xB876, 0x5478, 0xA545,      0, 0x2F69, 0xB879, 0xA546,
- 0x547B, 0xB87B, 0x547A,      0,      0, 0x317C,      0, 0x547C,
+ 0x547B, 0xB87B, 0x547A, 0xB87C,      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,      0, 0x3A4A, 0xA54D,      0, 0x3E2A,      0,
+      0, 0x4B65, 0xB937, 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,      0, 0x4567,      0,
+ 0x4A76, 0xBB3F, 0xBB40,      0, 0x4F6D, 0xF43B, 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,
-      0, 0xA868, 0x565D, 0x565C,      0,      0, 0x565E, 0xA869,
+ 0xBB79, 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,      0, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
+      0, 0xBC64, 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,      0,      0, 0x576F,
+      0, 0x5779, 0x576B,      0,      0, 0xBD67,      0, 0x576F,
  0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
  0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
  0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
@@ -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,      0, 0xBD6E,      0,
+      0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 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,      0, 0x3054,
+ 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456, 0xBE30, 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,      0, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
+ 0xAC5A, 0xBE3D, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
       0, 0xAC5D, 0x3672, 0x3026, 0x7458,      0, 0xAC5E, 0x3436,
-      0, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
+ 0xF440, 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,      0, 0x587D, 0xAC73, 0x303F,      0,
+ 0x402E, 0x3266, 0x327C, 0xBF28, 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,      0, 0x4952,
+ 0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 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,      0, 0x4027,
+ 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
  0x7534, 0x7535,      0, 0x7536, 0x5A65, 0x5A63, 0x5A64, 0xC230,
-      0, 0xC22F, 0x7530,      0, 0x436B,      0,      0, 0x5B26,
+      0, 0xC22F, 0x7530, 0xF442, 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,      0, 0x5B2C,
+ 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 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,      0,      0, 0x7638,      0,      0, 0x7639,
+      0,      0, 0xF44A,      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,      0,
+ 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xEE38,      0, 0xC663,
  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,      0,
+      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962, 0xC743,
  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,      0, 0xC74C,
+      0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38, 0xC74B, 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,      0, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
-      0, 0x5E3B, 0x5E49, 0x453A, 0x7676,      0,      0,      0,
+ 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
+ 0xF44B, 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,      0, 0x5E5D, 0xC76F, 0xEE73,      0, 0x5E55,      0,
+ 0x5E62, 0xC76E, 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,      0, 0x6050,      0, 0x776D,
+      0,      0, 0xCB2D,      0, 0xCB2E, 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,      0,      0, 0xF065,
+      0, 0xF063,      0, 0x6060, 0xF064, 0xCB66,      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,      0, 0xCB6F,      0,      0, 0x777B,      0,
+      0,      0, 0xCB6E, 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,      0,      0, 0xCB7A,
+      0, 0x607E,      0,      0, 0xCB78, 0xCB79,      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,      0, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
+ 0x7827, 0xCC2D, 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,      0, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
+ 0x6225, 0x7860, 0xF451, 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,      0,      0, 0x626F,      0, 0xCF6E,      0,
+      0,      0, 0xCF6D,      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,      0, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
+      0, 0xD52E, 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,      0, 0x6848,
+ 0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 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,      0,      0, 0x692B,      0, 0xF66C,
+ 0x4F4F, 0x4622, 0x4973, 0xD951,      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,      0,
+      0, 0xF77A,      0, 0xF77B,      0, 0x6A24, 0x7B63, 0xF464,
       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,      0, 0x7C32,      0, 0x6B7B,      0,
+      0, 0xF86C, 0xDE4A, 0xDE4B, 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,      0, 0x352F,
+ 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 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,      0,
+ 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
       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,      0,
+ 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161, 0xE162,
  0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
  0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
  0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
@@ -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,      0, 0x6E5C,
+ 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 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,      0, 0x7D24,
+ 0xE338, 0xFA53,      0,      0, 0xE33A, 0xE33B, 0xE33C, 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,      0,
+ 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
  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,      0,      0, 0xFA79,
+ 0xFA78,      0, 0x4B2F, 0x7D32,      0, 0xE440,      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,      0,      0, 0xE534, 0x333B,
+      0, 0xFB35,      0, 0x7D41, 0xE533,      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,
-      0, 0xE54E, 0xE551, 0xFB49,      0, 0x7D47,      0,      0,
+ 0xE550, 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,      0, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42,      0,
+      0, 0xE562, 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,
-      0,      0, 0x7D49,      0, 0xE56D,      0,      0,      0,
+ 0xE56B,      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,      0, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
+      0, 0x3457, 0xF471, 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,      0, 0x704B,      0, 0x704C, 0xFB7B,
+      0, 0xFB7A, 0x704E, 0xE72E, 0x704B,      0, 0x704C, 0xFB7B,
  0x704D, 0x704F, 0xE72F,      0,      0, 0x7D68, 0x7D69, 0x7D6A,
-      0,      0, 0x4044,      0,      0, 0xFB7C, 0x4C77, 0xFB7D,
+      0, 0xF476, 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,      0,
+ 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C, 0xE85D,
  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,      0,      0, 0xE96C, 0xFD32,      0, 0x7174, 0x7175,
+ 0x3962, 0xF47B,      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,      0, 0xEA6B,      0, 0xFD4F, 0xEA6D,
+ 0xFD4E, 0x7243,      0, 0xEA6A, 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,      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,
+      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,
  0x2E38, 0x2E49, 0x2E50, 0x2E63, 0x2E68, 0x2E6E, 0x2F2C, 0x2F2F,
  0x2F36, 0x2F5A, 0x2F5E, 0x4F61, 0x4F62, 0x7450, 0x745C, 0x745E,
 };
@@ -11957,16 +11957,6 @@ 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,
@@ -12415,7 +12405,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_x0213,
+ utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
 };
 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 c958c91753..9613a925ce 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -137,7 +137,8 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
 {
     VALUE tmp;
     reinit();
-    nkf_split_options(StringValueCStr(opt));
+    StringValue(opt);
+    nkf_split_options(RSTRING_PTR(opt));
     if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
 
     switch (nkf_enc_to_index(output_encoding)) {
@@ -152,7 +153,8 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     incsize = INCSIZE;
 
     input_ctr = 0;
-    input = (unsigned char *)StringValuePtr(src);
+    StringValue(src);
+    input = (unsigned char *)RSTRING_PTR(src);
     i_len = RSTRING_LENINT(src);
     tmp = rb_str_new(0, i_len*3 + 10);
 
@@ -193,7 +195,8 @@ rb_nkf_guess(VALUE obj, VALUE src)
     reinit();
 
     input_ctr = 0;
-    input = (unsigned char *)StringValuePtr(src);
+    StringValue(src);
+    input = (unsigned char *)RSTRING_PTR(src);
     i_len = RSTRING_LENINT(src);
 
     guess_f = TRUE;
diff --git a/ext/objspace/depend b/ext/objspace/depend
index 642265618c..dc3009fc50 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -8,7 +8,6 @@ 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/missing.h
-object_tracing.o: $(hdrdir)/ruby/onigmo.h
 object_tracing.o: $(hdrdir)/ruby/oniguruma.h
 object_tracing.o: $(hdrdir)/ruby/ruby.h
 object_tracing.o: $(hdrdir)/ruby/st.h
@@ -25,7 +24,6 @@ objspace.o: $(hdrdir)/ruby/encoding.h
 objspace.o: $(hdrdir)/ruby/intern.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
@@ -48,7 +46,6 @@ objspace_dump.o: $(hdrdir)/ruby/encoding.h
 objspace_dump.o: $(hdrdir)/ruby/intern.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
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
index d0c2dbd02b..adb8ef9169 100644
--- a/ext/objspace/extconf.rb
+++ b/ext/objspace/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 $VPATH << '$(topdir)' << '$(top_srcdir)' # for id.h.
 create_makefile('objspace')
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index 7c354498ab..3a7f54427d 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -39,8 +39,7 @@ 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, &n);
-	    result = (char *)n;
+	    st_get_key(tbl, (st_data_t)str, (st_data_t *)&result);
 	}
 	else {
 	    result = (char *)ruby_xmalloc(len+1);
@@ -60,9 +59,8 @@ delete_unique_str(st_table *tbl, const char *str)
 
 	st_lookup(tbl, (st_data_t)str, &n);
 	if (n == 1) {
-	    n = (st_data_t)str;
-	    st_delete(tbl, &n, 0);
-	    ruby_xfree((char *)n);
+	    st_delete(tbl, (st_data_t *)&str, 0);
+	    ruby_xfree((char *)str);
 	}
 	else {
 	    st_insert(tbl, (st_data_t)str, n-1);
@@ -84,10 +82,8 @@ 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, &v)) {
-	info = (struct allocation_info *)v;
+    if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
 	if (arg->keep_remains) {
 	    if (info->living) {
 		/* do nothing. there is possibility to keep living if FREEOBJ events while suppressing tracing */
@@ -117,19 +113,15 @@ freeobj_i(VALUE tpval, void *data)
 {
     struct traceobj_arg *arg = (struct traceobj_arg *)data;
     rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
-    st_data_t obj = (st_data_t)rb_tracearg_object(tparg);
-    st_data_t v;
+    VALUE obj = rb_tracearg_object(tparg);
     struct allocation_info *info;
 
-    if (arg->keep_remains) {
-	if (st_lookup(arg->object_table, obj, &v)) {
-	    info = (struct allocation_info *)v;
+    if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
+	if (arg->keep_remains) {
 	    info->living = 0;
 	}
-    }
-    else {
-	if (st_delete(arg->object_table, &obj, &v)) {
-	    info = (struct allocation_info *)v;
+	else {
+	    st_delete(arg->object_table, (st_data_t *)&obj, (st_data_t *)&info);
 	    delete_unique_str(arg->str_table, info->path);
 	    delete_unique_str(arg->str_table, info->class_path);
 	    ruby_xfree(info);
@@ -186,9 +178,7 @@ trace_object_allocations_start(VALUE self)
     else {
 	if (arg->newobj_trace == 0) {
 	    arg->newobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, newobj_i, arg);
-	    rb_gc_register_mark_object(arg->newobj_trace);
 	    arg->freeobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREEOBJ, freeobj_i, arg);
-	    rb_gc_register_mark_object(arg->freeobj_trace);
 	}
 	rb_tracepoint_enable(arg->newobj_trace);
 	rb_tracepoint_enable(arg->freeobj_trace);
@@ -218,6 +208,8 @@ 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;
     }
 
     return Qnil;
@@ -329,9 +321,9 @@ static struct allocation_info *
 lookup_allocation_info(VALUE obj)
 {
     if (tmp_trace_arg) {
-	st_data_t info;
-	if (st_lookup(tmp_trace_arg->object_table, obj, &info)) {
-	    return (struct allocation_info *)info;
+ 	struct allocation_info *info;
+	if (st_lookup(tmp_trace_arg->object_table, obj, (st_data_t *)&info)) {
+	    return info;
 	}
     }
     return NULL;
@@ -364,7 +356,7 @@ allocation_sourcefile(VALUE self, VALUE obj)
 }
 
 /*
- * call-seq: allocation_sourceline(object) -> integer
+ * call-seq: allocation_sourceline(object) -> string
  *
  * Returns the original line from source for from the given +object+.
  *
@@ -447,7 +439,7 @@ allocation_method_id(VALUE self, VALUE obj)
 }
 
 /*
- * call-seq: allocation_generation(object) -> integer or nil
+ * call-seq: allocation_generation(object) -> Fixnum
  *
  * Returns garbage collector generation for the given +object+.
  *
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 1ac69af844..eff9d0c7f8 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -12,9 +12,9 @@
 
 **********************************************************************/
 
-#include <ruby/io.h>
 #include "internal.h"
 #include <ruby/st.h>
+#include <ruby/io.h>
 #include <ruby/re.h>
 #include "node.h"
 #include "gc.h"
@@ -33,7 +33,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
@@ -203,7 +203,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 be wrong.
+ *  T_DATA may not right size.
  *
  *  It returns a hash as:
  *    {:TOTAL=>1461154, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249, ...}
@@ -232,6 +232,13 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
 
     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);
+    }
+
     for (i = 0; i <= T_MASK; i++) {
 	if (counts[i]) {
 	    VALUE type = type2sym(i);
@@ -306,6 +313,13 @@ count_symbols(int argc, VALUE *argv, VALUE os)
     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);
+    }
+
     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));
     rb_hash_aset(hash, ID2SYM(rb_intern("immortal_static_symbol")),  SIZET2NUM(immortal_symbols - dynamic_counts.immortal));
@@ -357,7 +371,7 @@ static VALUE
 count_nodes(int argc, VALUE *argv, VALUE os)
 {
     size_t nodes[NODE_LAST+1];
-    enum node_type i;
+    size_t i;
     VALUE hash = setup_hash(argc, argv);
 
     for (i = 0; i <= NODE_LAST; i++) {
@@ -366,23 +380,28 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 
     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);
+    }
+
     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)); goto set
+#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); break;
 		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_WHEN);
+		COUNT_NODE(NODE_OPT_N);
 		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);
@@ -399,18 +418,18 @@ 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);
@@ -437,7 +456,7 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_DXSTR);
 		COUNT_NODE(NODE_EVSTR);
 		COUNT_NODE(NODE_DREGX);
-		COUNT_NODE(NODE_ONCE);
+		COUNT_NODE(NODE_DREGX_ONCE);
 		COUNT_NODE(NODE_ARGS);
 		COUNT_NODE(NODE_ARGS_AUX);
 		COUNT_NODE(NODE_OPT_ARG);
@@ -446,6 +465,8 @@ 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);
@@ -468,14 +489,15 @@ 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);
 #undef COUNT_NODE
-	      case NODE_LAST: break;
+	      default: node = INT2FIX(i);
 	    }
-	    UNREACHABLE;
-	  set:
 	    rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
 	}
     }
@@ -554,7 +576,7 @@ count_tdata_objects(int argc, VALUE *argv, VALUE self)
     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)
@@ -625,8 +647,6 @@ 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_parser_strterm");
     }
 
     rb_objspace_each_objects(count_imemo_objects_i, (void *)hash);
@@ -824,7 +844,7 @@ static int
 collect_values_of_values(VALUE category, VALUE category_objects, VALUE categories)
 {
     VALUE ary = rb_ary_new();
-    rb_hash_foreach(category_objects, collect_values, ary);
+    st_foreach(rb_hash_tbl(category_objects), collect_values, ary);
     rb_hash_aset(categories, category, ary);
     return ST_CONTINUE;
 }
@@ -902,7 +922,7 @@ objspace_internal_super_of(VALUE self, VALUE obj)
 	obj = (VALUE)DATA_PTR(obj);
     }
 
-    switch (OBJ_BUILTIN_TYPE(obj)) {
+    switch (TYPE(obj)) {
       case T_MODULE:
       case T_CLASS:
       case T_ICLASS:
@@ -936,7 +956,6 @@ 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 */
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 602cbadef5..47aaaf2e3a 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -12,16 +12,15 @@
 
 **********************************************************************/
 
-#include "ruby/io.h"
 #include "internal.h"
 #include "ruby/debug.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;
-static VALUE sym_full;
 
 struct dump_config {
     VALUE type;
@@ -32,7 +31,6 @@ struct dump_config {
     VALUE cur_obj;
     VALUE cur_obj_klass;
     size_t cur_obj_references;
-    int full_heap;
 };
 
 PRINTF_ARGS(static void dump_append(struct dump_config *, const char *, ...), 2, 3);
@@ -105,7 +103,7 @@ static inline const char *
 obj_type(VALUE obj)
 {
     switch (BUILTIN_TYPE(obj)) {
-#define CASE_TYPE(type) case T_##type: return #type
+#define CASE_TYPE(type) case T_##type: return #type; break
 	CASE_TYPE(NONE);
 	CASE_TYPE(NIL);
 	CASE_TYPE(OBJECT);
@@ -172,9 +170,9 @@ reachable_object_i(VALUE ref, void *data)
 	return;
 
     if (dc->cur_obj_references == 0)
-        dump_append(dc, ", \"references\":[\"%#"PRIxVALUE"\"", ref);
+	dump_append(dc, ", \"references\":[\"%p\"", (void *)ref);
     else
-        dump_append(dc, ", \"%#"PRIxVALUE"\"", ref);
+	dump_append(dc, ", \"%p\"", (void *)ref);
 
     dc->cur_obj_references++;
 }
@@ -184,7 +182,7 @@ 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\":%"PRIuSIZE, rb_str_capacity(obj));
+	dump_append(dc, ", \"capacity\":%"PRIdSIZE, rb_str_capacity(obj));
 
     if (is_ascii_string(obj)) {
 	dump_append(dc, ", \"value\":");
@@ -192,30 +190,8 @@ dump_append_string_content(struct dump_config *dc, VALUE obj)
     }
 }
 
-static const char *
-imemo_name(int imemo)
-{
-    switch(imemo) {
-#define TYPE_STR(t) case(imemo_##t): return #t
-	TYPE_STR(env);
-	TYPE_STR(cref);
-	TYPE_STR(svar);
-	TYPE_STR(throw_data);
-	TYPE_STR(ifunc);
-	TYPE_STR(memo);
-	TYPE_STR(ment);
-	TYPE_STR(iseq);
-	TYPE_STR(tmpbuf);
-	TYPE_STR(ast);
-	TYPE_STR(parser_strterm);
-      default:
-	return "unknown";
-#undef TYPE_STR
-    }
-}
-
 static void
-dump_object(VALUE obj, struct dump_config *dc)
+dump_object(VALUE obj, struct dump_config *dc, int part)
 {
     size_t memsize;
     struct allocation_info *ainfo;
@@ -235,20 +211,20 @@ dump_object(VALUE obj, struct dump_config *dc)
     if (dc->cur_obj == dc->string)
 	return;
 
-    dump_append(dc, "{\"address\":\"%#"PRIxVALUE"\", \"type\":\"%s\"", obj, obj_type(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));
 
     if (dc->cur_obj_klass)
-        dump_append(dc, ", \"class\":\"%#"PRIxVALUE"\"", dc->cur_obj_klass);
+	dump_append(dc, ", \"class\":\"%p\"", (void *)dc->cur_obj_klass);
     if (rb_obj_frozen_p(obj))
 	dump_append(dc, ", \"frozen\":true");
 
     switch (BUILTIN_TYPE(obj)) {
-      case T_NONE:
-	dump_append(dc, "}\n");
-	return;
-
-      case T_IMEMO:
-	dump_append(dc, ", \"imemo_type\":\"%s\"", imemo_name(imemo_type(obj)));
+      case T_NODE:
+	dump_append(dc, ", \"node_type\":\"%s\"", ruby_node_name(nd_type(obj)));
 	break;
 
       case T_SYMBOL:
@@ -272,9 +248,9 @@ dump_object(VALUE obj, struct dump_config *dc)
 	break;
 
       case T_HASH:
-	dump_append(dc, ", \"size\":%"PRIuSIZE, (size_t)RHASH_SIZE(obj));
+	dump_append(dc, ", \"size\":%"PRIdSIZE, (size_t)RHASH_SIZE(obj));
 	if (FL_TEST(obj, HASH_PROC_DEFAULT))
-            dump_append(dc, ", \"default\":\"%#"PRIxVALUE"\"", RHASH_IFNONE(obj));
+	    dump_append(dc, ", \"default\":\"%p\"", (void *)RHASH_IFNONE(obj));
 	break;
 
       case T_ARRAY:
@@ -311,7 +287,8 @@ dump_object(VALUE obj, struct dump_config *dc)
 	break;
 
       case T_ZOMBIE:
-	dump_append(dc, "}\n");
+	dump_append(dc, "}");
+	dc->roots++;
 	return;
     }
 
@@ -340,7 +317,8 @@ dump_object(VALUE obj, struct dump_config *dc)
 	dump_append(dc, "}");
     }
 
-    dump_append(dc, "}\n");
+    dump_append(dc, "}");
+    dc->roots++;
 }
 
 static int
@@ -349,8 +327,10 @@ 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 (dc->full_heap || RBASIC(v)->flags)
-	    dump_object(v, dc);
+	if (RBASIC(v)->flags && v != dc->string) {
+	    if (dc->roots++) dump_append(dc, ",\n");
+	    dump_object(v, dc, 1);
+	}
     }
     return 0;
 }
@@ -361,11 +341,13 @@ 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");
-    if (dc->root_category == NULL || category != dc->root_category)
-        dump_append(dc, "{\"type\":\"ROOT\", \"root\":\"%s\", \"references\":[\"%#"PRIxVALUE"\"", category, obj);
+	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);
+    }
     else
-        dump_append(dc, ", \"%#"PRIxVALUE"\"", obj);
+	dump_append(dc, ", \"%p\"", (void *)obj);
 
     dc->root_category = category;
     dc->roots++;
@@ -376,15 +358,9 @@ dump_output(struct dump_config *dc, VALUE opts, VALUE output, const char *filena
 {
     VALUE tmp;
 
-    dc->full_heap = 0;
-
-    if (RTEST(opts)) {
+    if (RTEST(opts))
 	output = rb_hash_aref(opts, sym_output);
 
-	if (Qtrue == rb_hash_lookup2(opts, sym_full, Qfalse))
-	    dc->full_heap = 1;
-    }
-
     if (output == sym_stdout) {
 	dc->stream = stdout;
 	dc->string = Qnil;
@@ -453,7 +429,8 @@ objspace_dump(int argc, VALUE *argv, VALUE os)
 
     output = dump_output(&dc, opts, sym_string, filename);
 
-    dump_object(obj, &dc);
+    dump_object(obj, &dc, 0);
+    if (dc.roots) dump_append(&dc, "\n");
 
     return dump_result(&dc, output);
 }
@@ -485,12 +462,14 @@ objspace_dump_all(int argc, VALUE *argv, VALUE os)
 
     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, "]}\n");
+    if (dc.roots) dump_append(&dc, "]}");
 
     /* dump all objects */
     rb_objspace_each_objects(heap_i, &dc);
+    dump_append(&dc, "\n}");
 
     return dump_result(&dc, output);
 }
@@ -498,7 +477,6 @@ objspace_dump_all(int argc, VALUE *argv, VALUE os)
 void
 Init_objspace_dump(VALUE rb_mObjSpace)
 {
-#undef rb_intern
 #if 0
     rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
 #endif
@@ -510,7 +488,6 @@ Init_objspace_dump(VALUE rb_mObjSpace)
     sym_stdout = ID2SYM(rb_intern("stdout"));
     sym_string = ID2SYM(rb_intern("string"));
     sym_file   = ID2SYM(rb_intern("file"));
-    sym_full   = ID2SYM(rb_intern("full"));
 
     /* force create static IDs */
     rb_obj_gc_flags(rb_mObjSpace, 0, 0);
diff --git a/ext/openssl/History.md b/ext/openssl/History.md
deleted file mode 100644
index db5050014e..0000000000
--- a/ext/openssl/History.md
+++ /dev/null
@@ -1,339 +0,0 @@
-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 021c6d99a8..8426765281 100644
--- a/ext/openssl/depend
+++ b/ext/openssl/depend
@@ -11,7 +11,6 @@ ossl.o: $(hdrdir)/ruby/encoding.h
 ossl.o: $(hdrdir)/ruby/intern.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
@@ -30,10 +29,10 @@ 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
@@ -49,7 +48,6 @@ ossl_asn1.o: $(hdrdir)/ruby/encoding.h
 ossl_asn1.o: $(hdrdir)/ruby/intern.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
@@ -67,10 +65,10 @@ 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
@@ -86,7 +84,6 @@ ossl_bio.o: $(hdrdir)/ruby/encoding.h
 ossl_bio.o: $(hdrdir)/ruby/intern.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
@@ -104,10 +101,10 @@ 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
@@ -123,7 +120,6 @@ ossl_bn.o: $(hdrdir)/ruby/encoding.h
 ossl_bn.o: $(hdrdir)/ruby/intern.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/ruby.h
 ossl_bn.o: $(hdrdir)/ruby/st.h
@@ -141,10 +137,10 @@ 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
@@ -160,7 +156,6 @@ ossl_cipher.o: $(hdrdir)/ruby/encoding.h
 ossl_cipher.o: $(hdrdir)/ruby/intern.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
@@ -178,10 +173,10 @@ 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
@@ -197,7 +192,6 @@ ossl_config.o: $(hdrdir)/ruby/encoding.h
 ossl_config.o: $(hdrdir)/ruby/intern.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
@@ -215,10 +209,10 @@ 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
@@ -234,7 +228,6 @@ ossl_digest.o: $(hdrdir)/ruby/encoding.h
 ossl_digest.o: $(hdrdir)/ruby/intern.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
@@ -252,10 +245,10 @@ 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
@@ -271,7 +264,6 @@ ossl_engine.o: $(hdrdir)/ruby/encoding.h
 ossl_engine.o: $(hdrdir)/ruby/intern.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
@@ -289,10 +281,10 @@ 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
@@ -308,7 +300,6 @@ ossl_hmac.o: $(hdrdir)/ruby/encoding.h
 ossl_hmac.o: $(hdrdir)/ruby/intern.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
@@ -326,10 +317,10 @@ 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
@@ -337,43 +328,6 @@ ossl_hmac.o: ossl_ssl.h
 ossl_hmac.o: ossl_version.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/backward.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/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: $(top_srcdir)/include/ruby.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_version.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/backward.h
@@ -382,7 +336,6 @@ ossl_ns_spki.o: $(hdrdir)/ruby/encoding.h
 ossl_ns_spki.o: $(hdrdir)/ruby/intern.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
@@ -399,11 +352,11 @@ 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
@@ -419,7 +372,6 @@ ossl_ocsp.o: $(hdrdir)/ruby/encoding.h
 ossl_ocsp.o: $(hdrdir)/ruby/intern.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
@@ -436,11 +388,11 @@ 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
@@ -456,7 +408,6 @@ ossl_pkcs12.o: $(hdrdir)/ruby/encoding.h
 ossl_pkcs12.o: $(hdrdir)/ruby/intern.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
@@ -473,11 +424,11 @@ 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
@@ -485,6 +436,42 @@ ossl_pkcs12.o: ossl_ssl.h
 ossl_pkcs12.o: ossl_version.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/backward.h
@@ -493,7 +480,6 @@ ossl_pkcs7.o: $(hdrdir)/ruby/encoding.h
 ossl_pkcs7.o: $(hdrdir)/ruby/intern.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
@@ -510,10 +496,10 @@ 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
@@ -530,7 +516,6 @@ ossl_pkey.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey.o: $(hdrdir)/ruby/intern.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
@@ -547,10 +532,10 @@ 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
@@ -567,7 +552,6 @@ ossl_pkey_dh.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/intern.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
@@ -584,10 +568,10 @@ 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
@@ -604,7 +588,6 @@ ossl_pkey_dsa.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/intern.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
@@ -621,10 +604,10 @@ 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
@@ -641,7 +624,6 @@ ossl_pkey_ec.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/intern.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
@@ -658,10 +640,10 @@ 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
@@ -678,7 +660,6 @@ ossl_pkey_rsa.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/intern.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
@@ -695,10 +676,10 @@ 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
@@ -715,7 +696,6 @@ ossl_rand.o: $(hdrdir)/ruby/encoding.h
 ossl_rand.o: $(hdrdir)/ruby/intern.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
@@ -732,10 +712,10 @@ 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
@@ -752,7 +732,6 @@ ossl_ssl.o: $(hdrdir)/ruby/encoding.h
 ossl_ssl.o: $(hdrdir)/ruby/intern.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
@@ -769,10 +748,10 @@ 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
@@ -789,7 +768,6 @@ ossl_ssl_session.o: $(hdrdir)/ruby/encoding.h
 ossl_ssl_session.o: $(hdrdir)/ruby/intern.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
@@ -806,10 +784,10 @@ 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
@@ -826,7 +804,6 @@ ossl_x509.o: $(hdrdir)/ruby/encoding.h
 ossl_x509.o: $(hdrdir)/ruby/intern.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
@@ -843,10 +820,10 @@ 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
@@ -863,7 +840,6 @@ ossl_x509attr.o: $(hdrdir)/ruby/encoding.h
 ossl_x509attr.o: $(hdrdir)/ruby/intern.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
@@ -880,10 +856,10 @@ 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
@@ -900,7 +876,6 @@ ossl_x509cert.o: $(hdrdir)/ruby/encoding.h
 ossl_x509cert.o: $(hdrdir)/ruby/intern.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
@@ -917,10 +892,10 @@ 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
@@ -937,7 +912,6 @@ ossl_x509crl.o: $(hdrdir)/ruby/encoding.h
 ossl_x509crl.o: $(hdrdir)/ruby/intern.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
@@ -954,10 +928,10 @@ 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
@@ -974,7 +948,6 @@ ossl_x509ext.o: $(hdrdir)/ruby/encoding.h
 ossl_x509ext.o: $(hdrdir)/ruby/intern.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
@@ -991,10 +964,10 @@ 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
@@ -1011,7 +984,6 @@ ossl_x509name.o: $(hdrdir)/ruby/encoding.h
 ossl_x509name.o: $(hdrdir)/ruby/intern.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
@@ -1028,10 +1000,10 @@ 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
@@ -1048,7 +1020,6 @@ ossl_x509req.o: $(hdrdir)/ruby/encoding.h
 ossl_x509req.o: $(hdrdir)/ruby/intern.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
@@ -1065,10 +1036,10 @@ 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
@@ -1085,7 +1056,6 @@ ossl_x509revoked.o: $(hdrdir)/ruby/encoding.h
 ossl_x509revoked.o: $(hdrdir)/ruby/intern.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
@@ -1102,10 +1072,10 @@ 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
@@ -1122,7 +1092,6 @@ ossl_x509store.o: $(hdrdir)/ruby/encoding.h
 ossl_x509store.o: $(hdrdir)/ruby/intern.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
@@ -1139,10 +1108,10 @@ 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
diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
index 1d51d065a9..7dfc87c1c6 100644
--- a/ext/openssl/deprecation.rb
+++ b/ext/openssl/deprecation.rb
@@ -3,6 +3,9 @@ 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 = ""
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 4f218562b1..20c67c6b50 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -33,80 +33,50 @@ end
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
-if $mswin || $mingw
-  have_library("ws2_32")
-end
+have_header("assert.h")
 
 Logging::message "=== Checking for required stuff... ===\n"
-result = pkg_config("openssl") && have_header("openssl/ssl.h")
-
-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
+if $mingw
+  have_library("wsock32")
+  have_library("gdi32")
 end
 
+result = pkg_config("openssl") && have_header("openssl/ssl.h")
 unless result
-  unless find_openssl_library
+  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"
-    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."
+    exit 1
   end
 end
 
-unless checking_for("OpenSSL version is 1.0.1 or later") {
-    try_static_assert("OPENSSL_VERSION_NUMBER >= 0x10001000L", "openssl/opensslv.h") }
-  raise "OpenSSL >= 1.0.1 or LibreSSL is required"
+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."
+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')"
 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}
@@ -114,9 +84,27 @@ engines.each { |name|
   OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h")
 }
 
-if ($mswin || $mingw) && have_macro("LIBRESSL_VERSION_NUMBER", "openssl/opensslv.h")
-  $defs.push("-DNOCRYPT")
-end
+# 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")
@@ -129,11 +117,8 @@ OpenSSL.check_func_or_macro("SSL_get_server_tmp_key", "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")
@@ -163,8 +148,6 @@ OpenSSL.check_func_or_macro("SSL_CTX_set_tmp_ecdh_callback", "openssl/ssl.h") #
 OpenSSL.check_func_or_macro("SSL_CTX_set_min_proto_version", "openssl/ssl.h")
 have_func("SSL_CTX_get_security_level")
 have_func("X509_get0_notBefore")
-have_func("SSL_SESSION_get_protocol_version")
-have_func("EVP_PBE_scrypt")
 
 Logging::message "=== Checking done. ===\n"
 
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 0914282920..26d167a9b4 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -19,4 +19,3 @@ require 'openssl/config'
 require 'openssl/digest'
 require 'openssl/x509'
 require 'openssl/ssl'
-require 'openssl/pkcs5'
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 8d1ebefb6e..6d6c96e42d 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -27,9 +27,8 @@ 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 5d1586e594..61e1f43e00 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -63,7 +63,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 +79,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 +106,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 +136,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,11 +163,6 @@ 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
@@ -190,11 +185,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 +$_+.
   #
@@ -220,7 +215,7 @@ module OpenSSL::Buffering
 
   ##
   # Executes the block for every line in the stream where lines are separated
-  # by _eol_.
+  # by +eol+.
   #
   # See also #gets
 
@@ -232,7 +227,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
 
@@ -245,7 +240,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.
 
@@ -281,7 +276,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.
@@ -308,7 +303,7 @@ 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)
@@ -316,33 +311,36 @@ module OpenSSL::Buffering
     @wbuffer << s
     @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE
-      until @wbuffer.empty?
+    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
+      remain = idx ? idx + $/.size : @wbuffer.length
+      nwritten = 0
+      while remain > 0
+        str = @wbuffer[nwritten,remain]
         begin
-          nwrote = syswrite(@wbuffer)
+          nwrote = syswrite(str)
         rescue Errno::EAGAIN
           retry
         end
-        @wbuffer[0, nwrote] = ""
+        remain -= nwrote
+        nwritten += 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 +.to_s+ method.  Returns the number of bytes written.
+  # 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.
 
-  def write(*s)
-    s.inject(0) do |written, str|
-      do_write(str)
-      written + str.bytesize
-    end
+  def write(s)
+    do_write(s)
+    s.bytesize
   end
 
   ##
-  # Writes _s_ in the non-blocking manner.
+  # Writes +str+ in the non-blocking manner.
   #
   # If there is buffered data, it is flushed first.  This may block.
   #
@@ -373,10 +371,6 @@ 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
@@ -384,16 +378,16 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Writes _s_ to the stream.  _s_ will be converted to a String using
-  # +.to_s+ method.
+  # Writes +s+ to the stream.  +s+ will be converted to a String using
+  # String#to_s.
 
-  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.
 
@@ -404,14 +398,16 @@ module OpenSSL::Buffering
     end
     args.each{|arg|
       s << arg.to_s
-      s.sub!(/(?<!\n)\z/, "\n")
+      if $/ && /\n\z/ !~ s
+        s << "\n"
+      end
     }
     do_write(s)
     nil
   end
 
   ##
-  # Writes _args_ to the stream.
+  # Writes +args+ to the stream.
   #
   # See IO#print for full details.
 
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 48d8be0069..8822545192 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -30,8 +30,7 @@ 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)
@@ -47,7 +46,7 @@ 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)
@@ -237,7 +236,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
@@ -256,7 +255,7 @@ module OpenSSL
     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:
     #
@@ -266,8 +265,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"
@@ -298,7 +297,7 @@ module OpenSSL
     end
 
     ##
-    # Set the target _key_ with a given _value_ under a specific _section_.
+    # Set the target +key+ with a given +value+ under a specific +section+.
     #
     # Given the following configurating file being loaded:
     #
@@ -308,7 +307,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')
@@ -323,7 +322,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:
     #
@@ -352,7 +351,7 @@ module OpenSSL
     end
 
     ##
-    # Sets a specific _section_ name with a Hash _pairs_.
+    # Sets a specific +section+ name with a Hash +pairs+
     #
     # Given the following configuration being created:
     #
@@ -366,7 +365,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"}
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index b6744de6bd..97ccbc9569 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -15,12 +15,15 @@
 module OpenSSL
   class Digest
 
-    alg = %w(MD2 MD4 MD5 MDC2 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512)
+    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 hash value computed with _name_ Digest. _name_ is either the
+    # Return the +data+ hash computed with +name+ Digest. +name+ is either the
     # long name or short name of a supported digest algorithm.
     #
     # === Examples
@@ -56,7 +59,7 @@ module OpenSSL
 
   end # Digest
 
-  # Returns a Digest subclass by _name_
+  # Returns a Digest subclass by +name+.
   #
   #   require 'openssl'
   #
diff --git a/ext/openssl/lib/openssl/pkcs5.rb b/ext/openssl/lib/openssl/pkcs5.rb
deleted file mode 100644
index 959447df5e..0000000000
--- a/ext/openssl/lib/openssl/pkcs5.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: false
-#--
-# 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 8a547c340d..9af5f781f9 100644
--- a/ext/openssl/lib/openssl/pkey.rb
+++ b/ext/openssl/lib/openssl/pkey.rb
@@ -1,25 +1,44 @@
 # frozen_string_literal: false
-#--
-# Ruby/OpenSSL Project
-# Copyright (C) 2017 Ruby/OpenSSL Project Authors
-#++
+module OpenSSL
+  module PKey
+    if defined?(OpenSSL::PKey::DH)
 
-module OpenSSL::PKey
-  if defined?(EC)
-  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)
+    class DH
+      # :nodoc:
+      DEFAULT_1024 = new <<-_end_of_pem_
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
+AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
+T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
+-----END DH PARAMETERS-----
+      _end_of_pem_
+
+      # :nodoc:
+      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
+
+    # :nodoc:
+    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
+    }
+
+    else
+      DEFAULT_TMP_DH_CALLBACK = nil
     end
-  end
   end
 end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 355eb2ebbb..190f504276 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -12,42 +12,24 @@
 
 require "openssl/buffering"
 require "io/nonblock"
-require "ipaddr"
 
 module OpenSSL
   module SSL
     class SSLContext
-      DEFAULT_PARAMS = { # :nodoc:
-        :min_version => OpenSSL::SSL::TLS1_VERSION,
+      # :nodoc:
+      DEFAULT_PARAMS = {
+        :ssl_version => "SSLv23",
         :verify_mode => OpenSSL::SSL::VERIFY_PEER,
         :verify_hostname => true,
         :options => -> {
           opts = OpenSSL::SSL::OP_ALL
           opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
-          opts |= OpenSSL::SSL::OP_NO_COMPRESSION
+          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
         }.call
       }
 
-      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!(
@@ -86,7 +68,8 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
         )
       end
 
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new # :nodoc:
+      # :nodoc:
+      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
       DEFAULT_CERT_STORE.set_default_paths
       DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
 
@@ -101,23 +84,21 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
 
       attr_accessor :tmp_dh_callback
 
-      # 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
+      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
 
       # call-seq:
-      #    SSLContext.new           -> ctx
-      #    SSLContext.new(:TLSv1)   -> ctx
-      #    SSLContext.new("SSLv23") -> ctx
-      #
-      # Creates a new SSL context.
+      #    SSLContext.new => ctx
+      #    SSLContext.new(:TLSv1) => ctx
+      #    SSLContext.new("SSLv23_client") => ctx
       #
-      # 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.
+      # You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
       def initialize(version = nil)
         self.options |= OpenSSL::SSL::OP_ALL
         self.ssl_version = version if version
@@ -129,15 +110,14 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
       #
       # 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 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
@@ -146,88 +126,6 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
         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
@@ -273,11 +171,11 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
             return true if verify_hostname(hostname, san.value)
           when 7 # iPAddress in GeneralName (RFC5280)
             should_verify_common_name = false
-            if san.value.size == 4 || san.value.size == 16
-              begin
-                return true if san.value == IPAddr.new(hostname).hton
-              rescue IPAddr::InvalidAddressError
-              end
+            # 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
             end
           end
         }
@@ -348,7 +246,9 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
       include Buffering
       include SocketForwarder
 
-      attr_reader :hostname
+      if ExtConfig::HAVE_TLSEXT_HOST_NAME
+        attr_reader :hostname
+      end
 
       # The underlying IO object.
       attr_reader :io
@@ -421,7 +321,7 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
       end
 
       def tmp_dh_callback
-        @context.tmp_dh_callback || OpenSSL::SSL::SSLContext::DEFAULT_TMP_DH_CALLBACK
+        @context.tmp_dh_callback || OpenSSL::PKey::DEFAULT_TMP_DH_CALLBACK
       end
 
       def tmp_ecdh_callback
@@ -445,8 +345,8 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
       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
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index 98358f90da..aef3456e0f 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -41,11 +41,6 @@ module OpenSSL
     end
 
     class Extension
-      def ==(other)
-        return false unless Extension === other
-        to_der == other.to_der
-      end
-
       def to_s # "oid = critical, value"
         str = self.oid
         str << " = "
@@ -144,13 +139,7 @@ module OpenSSL
         end
 
         def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
-          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
+          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
           self.new(ary, template)
         end
 
@@ -165,13 +154,6 @@ module OpenSSL
       end
     end
 
-    class Attribute
-      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
@@ -190,26 +172,5 @@ module OpenSSL
         }
       end
     end
-
-    class CRL
-      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
-      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
index e29cfcd709..48191fa0e9 100644
--- a/ext/openssl/openssl.gemspec
+++ b/ext/openssl/openssl.gemspec
@@ -1,49 +1,45 @@
 # -*- encoding: utf-8 -*-
-# stub: openssl 2.1.2 ruby lib
+# stub: openssl 2.0.0.beta.2 ruby lib
 # stub: ext/openssl/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "openssl".freeze
-  s.version = "2.1.2"
+  s.version = "2.0.0.beta.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "msys2_mingw_dependencies" => "openssl" } if s.respond_to? :metadata=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Martin Bosslet".freeze, "SHIBATA Hiroshi".freeze, "Zachary Scott".freeze, "Kazuki Yamaguchi".freeze]
-  s.date = "2018-10-17"
+  s.date = "2016-09-08"
   s.description = "It wraps the OpenSSL library.".freeze
   s.email = ["ruby-core@ruby-lang.org".freeze]
   s.extensions = ["ext/openssl/extconf.rb".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "CONTRIBUTING.md".freeze, "History.md".freeze]
-  s.files = ["BSDL".freeze, "CONTRIBUTING.md".freeze, "History.md".freeze, "LICENSE.txt".freeze, "README.md".freeze, "ext/openssl/deprecation.rb".freeze, "ext/openssl/extconf.rb".freeze, "ext/openssl/openssl_missing.c".freeze, "ext/openssl/openssl_missing.h".freeze, "ext/openssl/ossl.c".freeze, "ext/openssl/ossl.h".freeze, "ext/openssl/ossl_asn1.c".freeze, "ext/openssl/ossl_asn1.h".freeze, "ext/openssl/ossl_bio.c".freeze, "ext/openssl/ossl_bio.h".freeze, "ext/openssl/ossl_bn.c".freeze, "ext/openssl/ossl_bn.h".freeze, "ext/openssl/ossl_cipher.c".freeze, "ext/openssl/ossl_cipher.h".freeze, "ext/openssl/ossl_config.c".freeze, "ext/openssl/ossl_config.h".freeze, "ext/openssl/ossl_digest.c".freeze, "ext/openssl/ossl_digest.h".freeze, "ext/openssl/ossl_engine.c".freeze, "ext/openssl/ossl_engine.h".freeze, "ext/openssl/ossl_hmac.c".freeze, "ext/openssl/ossl_hmac.h".freeze, "ext/openssl/ossl_kdf.c".freeze, "ext/openssl/ossl_kdf.h".freeze, "ext/openssl/ossl_ns_spki.c".freeze, "ext/openssl/ossl_ns_spki.h".freeze, "ext/openssl/ossl_ocsp.c".freeze, "ext/openssl/ossl_ocsp.h".freeze, "ext/openssl/ossl_pkcs12.c".freeze, "ext/openssl/ossl_pkcs12.h".freeze, "ext/openssl/ossl_pkcs7.c".freeze, "ext/openssl/ossl_pkcs7.h".freeze, "ext/openssl/ossl_pkey.c".freeze, "ext/openssl/ossl_pkey.h".freeze, "ext/openssl/ossl_pkey_dh.c".freeze, "ext/openssl/ossl_pkey_dsa.c".freeze, "ext/openssl/ossl_pkey_ec.c".freeze, "ext/openssl/ossl_pkey_rsa.c".freeze, "ext/openssl/ossl_rand.c".freeze, "ext/openssl/ossl_rand.h".freeze, "ext/openssl/ossl_ssl.c".freeze, "ext/openssl/ossl_ssl.h".freeze, "ext/openssl/ossl_ssl_session.c".freeze, "ext/openssl/ossl_version.h".freeze, "ext/openssl/ossl_x509.c".freeze, "ext/openssl/ossl_x509.h".freeze, "ext/openssl/ossl_x509attr.c".freeze, "ext/openssl/ossl_x509cert.c".freeze, "ext/openssl/ossl_x509crl.c".freeze, "ext/openssl/ossl_x509ext.c".freeze, "ext/openssl/ossl_x509name.c".freeze, "ext/openssl/ossl_x509req.c".freeze, "ext/openssl/ossl_x509revoked.c".freeze, "ext/openssl/ossl_x509store.c".freeze, "ext/openssl/ruby_missing.h".freeze, "lib/openssl.rb".freeze, "lib/openssl/bn.rb".freeze, "lib/openssl/buffering.rb".freeze, "lib/openssl/cipher.rb".freeze, "lib/openssl/config.rb".freeze, "lib/openssl/digest.rb".freeze, "lib/openssl/pkcs5.rb".freeze, "lib/openssl/pkey.rb".freeze, "lib/openssl/ssl.rb".freeze, "lib/openssl/x509.rb".freeze]
-  s.homepage = "https://github.com/ruby/openssl".freeze
+  s.extra_rdoc_files = ["CONTRIBUTING.md".freeze, "README.md".freeze, "History.md".freeze]
+  s.files = ["BSDL".freeze, "CONTRIBUTING.md".freeze, "History.md".freeze, "LICENSE.txt".freeze, "README.md".freeze, "ext/openssl/deprecation.rb".freeze, "ext/openssl/extconf.rb".freeze, "ext/openssl/openssl_missing.c".freeze, "ext/openssl/openssl_missing.h".freeze, "ext/openssl/ossl.c".freeze, "ext/openssl/ossl.h".freeze, "ext/openssl/ossl_asn1.c".freeze, "ext/openssl/ossl_asn1.h".freeze, "ext/openssl/ossl_bio.c".freeze, "ext/openssl/ossl_bio.h".freeze, "ext/openssl/ossl_bn.c".freeze, "ext/openssl/ossl_bn.h".freeze, "ext/openssl/ossl_cipher.c".freeze, "ext/openssl/ossl_cipher.h".freeze, "ext/openssl/ossl_config.c".freeze, "ext/openssl/ossl_config.h".freeze, "ext/openssl/ossl_digest.c".freeze, "ext/openssl/ossl_digest.h".freeze, "ext/openssl/ossl_engine.c".freeze, "ext/openssl/ossl_engine.h".freeze, "ext/openssl/ossl_hmac.c".freeze, "ext/openssl/ossl_hmac.h".freeze, "ext/openssl/ossl_ns_spki.c".freeze, "ext/openssl/ossl_ns_spki.h".freeze, "ext/openssl/ossl_ocsp.c".freeze, "ext/openssl/ossl_ocsp.h".freeze, "ext/openssl/ossl_pkcs12.c".freeze, "ext/openssl/ossl_pkcs12.h".freeze, "ext/openssl/ossl_pkcs5.c".freeze, "ext/openssl/ossl_pkcs5.h".freeze, "ext/openssl/ossl_pkcs7.c".freeze, "ext/openssl/ossl_pkcs7.h".freeze, "ext/openssl/ossl_pkey.c".freeze, "ext/openssl/ossl_pkey.h".freeze, "ext/openssl/ossl_pkey_dh.c".freeze, "ext/openssl/ossl_pkey_dsa.c".freeze, "ext/openssl/ossl_pkey_ec.c".freeze, "ext/openssl/ossl_pkey_rsa.c".freeze, "ext/openssl/ossl_rand.c".freeze, "ext/openssl/ossl_rand.h".freeze, "ext/openssl/ossl_ssl.c".freeze, "ext/openssl/ossl_ssl.h".freeze, "ext/openssl/ossl_ssl_session.c".freeze, "ext/openssl/ossl_version.h".freeze, "ext/openssl/ossl_x509.c".freeze, "ext/openssl/ossl_x509.h".freeze, "ext/openssl/ossl_x509attr.c".freeze, "ext/openssl/ossl_x509cert.c".freeze, "ext/openssl/ossl_x509crl.c".freeze, "ext/openssl/ossl_x509ext.c".freeze, "ext/openssl/ossl_x509name.c".freeze, "ext/openssl/ossl_x509req.c".freeze, "ext/openssl/ossl_x509revoked.c".freeze, "ext/openssl/ossl_x509store.c".freeze, "ext/openssl/ruby_missing.h".freeze, "lib/openssl.rb".freeze, "lib/openssl/bn.rb".freeze, "lib/openssl/buffering.rb".freeze, "lib/openssl/cipher.rb".freeze, "lib/openssl/config.rb".freeze, "lib/openssl/digest.rb".freeze, "lib/openssl/pkey.rb".freeze, "lib/openssl/ssl.rb".freeze, "lib/openssl/x509.rb".freeze]
+  s.homepage = "https://www.ruby-lang.org/".freeze
   s.licenses = ["Ruby".freeze]
   s.rdoc_options = ["--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
-  s.rubygems_version = "3.0.0.beta1".freeze
+  s.rubygems_version = "2.6.6".freeze
   s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ipaddr>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake-compiler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 10.3"])
+      s.add_development_dependency(%q<rake-compiler>.freeze, ["~> 0.9"])
       s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.2"])
     else
-      s.add_dependency(%q<ipaddr>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rake-compiler>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, ["~> 10.3"])
+      s.add_dependency(%q<rake-compiler>.freeze, ["~> 0.9"])
       s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 4.2"])
     end
   else
-    s.add_dependency(%q<ipaddr>.freeze, [">= 0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<rake-compiler>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, ["~> 10.3"])
+    s.add_dependency(%q<rake-compiler>.freeze, ["~> 0.9"])
     s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 4.2"])
   end
 end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index b36ef0288e..cc13b7a3a5 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -20,6 +20,73 @@
 
 #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)
@@ -45,7 +112,7 @@ static struct {
 };
 
 int
-ossl_EC_curve_nist2nid(const char *name)
+EC_curve_nist2nid(const char *name)
 {
     size_t i;
     for (i = 0; i < (sizeof(nist_curves) / sizeof(nist_curves[0])); i++) {
@@ -60,7 +127,7 @@ ossl_EC_curve_nist2nid(const char *name)
 /*** added in 1.1.0 ***/
 #if !defined(HAVE_HMAC_CTX_NEW)
 HMAC_CTX *
-ossl_HMAC_CTX_new(void)
+HMAC_CTX_new(void)
 {
     HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX));
     if (!ctx)
@@ -72,7 +139,7 @@ ossl_HMAC_CTX_new(void)
 
 #if !defined(HAVE_HMAC_CTX_FREE)
 void
-ossl_HMAC_CTX_free(HMAC_CTX *ctx)
+HMAC_CTX_free(HMAC_CTX *ctx)
 {
     if (ctx) {
 	HMAC_CTX_cleanup(ctx);
@@ -83,8 +150,8 @@ ossl_HMAC_CTX_free(HMAC_CTX *ctx)
 
 #if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
 void
-ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
+X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
+			const X509_ALGOR **palg)
 {
     if (psig != NULL)
 	*psig = crl->signature;
@@ -95,8 +162,8 @@ ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
 
 #if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
 void
-ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
+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 09998214e1..897d6235b0 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -12,11 +12,45 @@
 
 #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 ossl_EC_curve_nist2nid(const char *);
-#  define EC_curve_nist2nid ossl_EC_curve_nist2nid
+int EC_curve_nist2nid(const char *);
 #endif
 #endif
 
@@ -55,13 +89,11 @@ int ossl_EC_curve_nist2nid(const char *);
 #endif
 
 #if !defined(HAVE_HMAC_CTX_NEW)
-HMAC_CTX *ossl_HMAC_CTX_new(void);
-#  define HMAC_CTX_new ossl_HMAC_CTX_new
+HMAC_CTX *HMAC_CTX_new(void);
 #endif
 
 #if !defined(HAVE_HMAC_CTX_FREE)
-void ossl_HMAC_CTX_free(HMAC_CTX *);
-#  define HMAC_CTX_free ossl_HMAC_CTX_free
+void HMAC_CTX_free(HMAC_CTX *ctx);
 #endif
 
 #if !defined(HAVE_X509_STORE_GET_EX_DATA)
@@ -78,13 +110,11 @@ void ossl_HMAC_CTX_free(HMAC_CTX *);
 #endif
 
 #if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-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
+void X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **);
 #endif
 
 #if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-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
+void X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **);
 #endif
 
 #if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
@@ -149,7 +179,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, co
 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(const _type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
+static inline void _type##_get0_##_group(_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) { \
@@ -158,7 +188,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(const _type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
+static inline void _type##_get0_##_group(_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; } \
@@ -185,7 +215,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
 
@@ -198,7 +228,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
 #undef IMPL_KEY_ACCESSOR3
 #endif /* HAVE_OPAQUE_OPENSSL */
 
-#if !defined(EVP_CTRL_AEAD_GET_TAG)
+#if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !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
@@ -209,14 +239,6 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
 #  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
 
 #endif /* _OSSL_OPENSSL_MISSING_H_ */
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 69758aed7a..a9000f25a3 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -92,40 +92,22 @@ OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
 OSSL_IMPL_SK2ARY(x509name, X509_NAME)
 
 static VALUE
-ossl_str_new_i(VALUE size)
+ossl_str_new(int 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;
+    return rb_str_new(0, size);
 }
 
 VALUE
 ossl_buf2str(char *buf, int len)
 {
     VALUE str;
-    int state;
+    int status = 0;
 
-    str = ossl_str_new(buf, len, &state);
+    str = rb_protect((VALUE (*)(VALUE))ossl_str_new, len, &status);
+    if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
     OPENSSL_free(buf);
-    if (state)
-	rb_jump_tag(state);
+    if(status) rb_jump_tag(status);
+
     return str;
 }
 
@@ -147,6 +129,13 @@ ossl_bin2hex(unsigned char *in, char *out, size_t inlen)
 /*
  * our default PEM callback
  */
+
+/*
+ * 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)
+ */
+#define OSSL_MIN_PWD_LEN 4
+
 VALUE
 ossl_pem_passwd_value(VALUE pass)
 {
@@ -155,10 +144,12 @@ 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 not be longer than %d bytes", PEM_BUFSIZE);
+	ossl_raise(eOSSLError, "password must be shorter than %d bytes", PEM_BUFSIZE);
 
     return pass;
 }
@@ -166,18 +157,18 @@ ossl_pem_passwd_value(VALUE pass)
 static VALUE
 ossl_pem_passwd_cb0(VALUE flag)
 {
-    VALUE pass = rb_yield(flag);
-    if (NIL_P(pass))
-	return Qnil;
-    StringValue(pass);
+    VALUE pass;
+
+    pass = rb_yield(flag);
+    SafeStringValue(pass);
+
     return pass;
 }
 
 int
 ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 {
-    long len;
-    int status;
+    int len, status;
     VALUE rflag, pass = (VALUE)pwd_;
 
     if (RTEST(pass)) {
@@ -185,10 +176,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_LEN(pass);
-	    if (len <= max_len) {
+	    len = RSTRING_LENINT(pass);
+	    if (len >= OSSL_MIN_PWD_LEN && len <= max_len) {
 		memcpy(buf, RSTRING_PTR(pass), len);
-		return (int)len;
+		return len;
 	    }
 	}
 	OSSL_Debug("passed data is not valid String???");
@@ -212,17 +203,78 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 	    rb_set_errinfo(Qnil);
 	    return -1;
 	}
-	if (NIL_P(pass))
-	    return -1;
-	len = RSTRING_LEN(pass);
+	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 (len > max_len) {
-	    rb_warning("password must not be longer than %d bytes", max_len);
+	    rb_warning("password must be shorter than %d bytes", max_len);
 	    continue;
 	}
 	memcpy(buf, RSTRING_PTR(pass), len);
 	break;
     }
-    return (int)len;
+    return len;
+}
+
+/*
+ * Verify callback
+ */
+int ossl_store_ctx_ex_verify_cb_idx;
+int ossl_store_ex_verify_cb_idx;
+
+struct ossl_verify_cb_args {
+    VALUE proc;
+    VALUE preverify_ok;
+    VALUE store_ctx;
+};
+
+static 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_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))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;
 }
 
 /*
@@ -238,7 +290,7 @@ VALUE eOSSLError;
 /*
  * Convert to DER string
  */
-static ID ossl_s_to_der;
+ID ossl_s_to_der;
 
 VALUE
 ossl_to_der(VALUE obj)
@@ -266,15 +318,18 @@ static VALUE
 ossl_make_error(VALUE exc, const char *fmt, va_list args)
 {
     VALUE str = Qnil;
-    unsigned long e;
+    const char *msg;
+    long e;
 
+    e = ERR_peek_last_error();
     if (fmt) {
 	str = rb_vsprintf(fmt, args);
     }
-    e = ERR_peek_last_error();
     if (e) {
-	const char *msg = ERR_reason_error_string(e);
-
+	if (dOSSL == Qtrue) /* FULL INFO */
+	    msg = ERR_error_string(e, NULL);
+	else
+	    msg = ERR_reason_error_string(e);
 	if (NIL_P(str)) {
 	    if (msg) str = rb_str_new_cstr(msg);
 	}
@@ -282,8 +337,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);
@@ -300,32 +355,27 @@ 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) {
-	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);
-	    }
+	long e;
+	while ((e = ERR_get_error())) {
+	    rb_warn("error on stack: %s", ERR_error_string(e, NULL));
 	}
     }
-    else {
-	ERR_clear_error();
-    }
+    ERR_clear_error();
 }
 
 /*
@@ -334,8 +384,7 @@ 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)
@@ -399,23 +448,6 @@ ossl_debug_set(VALUE self, VALUE 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
@@ -447,123 +479,44 @@ 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
-
-    BN_CTX_free(ossl_bn_ctx);
-    ossl_bn_ctx = NULL;
-
-#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
  */
-struct CRYPTO_dynlock_value {
-    rb_nativethread_lock_t lock;
-    rb_nativethread_id_t owner;
-    size_t count;
-};
+static rb_nativethread_lock_t *ossl_locks;
 
 static void
-ossl_lock_init(struct CRYPTO_dynlock_value *l)
+ossl_lock_unlock(int mode, rb_nativethread_lock_t *lock)
 {
-    rb_nativethread_lock_initialize(&l->lock);
-    l->count = 0;
+    if (mode & CRYPTO_LOCK) {
+	rb_nativethread_lock_lock(lock);
+    } else {
+	rb_nativethread_lock_unlock(lock);
+    }
 }
 
 static void
-ossl_lock_unlock(int mode, struct CRYPTO_dynlock_value *l)
+ossl_lock_callback(int mode, int type, const char *file, int line)
 {
-    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);
-    }
+    ossl_lock_unlock(mode, &ossl_locks[type]);
 }
 
+struct CRYPTO_dynlock_value {
+    rb_nativethread_lock_t lock;
+};
+
 static struct CRYPTO_dynlock_value *
 ossl_dyn_create_callback(const char *file, int line)
 {
-    /* 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);
+    struct CRYPTO_dynlock_value *dynlock = (struct CRYPTO_dynlock_value *)OPENSSL_malloc((int)sizeof(struct CRYPTO_dynlock_value));
+    rb_nativethread_lock_initialize(&dynlock->lock);
     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);
+    ossl_lock_unlock(mode, &l->lock);
 }
 
 static void
@@ -573,30 +526,41 @@ 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());
 }
-
-static struct CRYPTO_dynlock_value *ossl_locks;
-
-static void
-ossl_lock_callback(int mode, int type, const char *file, int line)
+#else
+static unsigned long ossl_thread_id(void)
 {
-    ossl_lock_unlock(mode, &ossl_locks[type]);
+    /* before OpenSSL 1.0, this is 'unsigned long' */
+    return (unsigned long)rb_nativethread_self();
 }
+#endif
 
 static void Init_ossl_locks(void)
 {
     int i;
     int num_locks = CRYPTO_num_locks();
 
-    ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
-    for (i = 0; i < num_locks; i++)
-	ossl_lock_init(&ossl_locks[i]);
+    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]);
+    }
 
+#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);
@@ -606,7 +570,7 @@ static void Init_ossl_locks(void)
 
 /*
  * OpenSSL provides SSL, TLS and general purpose cryptography.  It wraps the
- * OpenSSL[https://www.openssl.org/] library.
+ * OpenSSL[http://www.openssl.org/] library.
  *
  * = Examples
  *
@@ -1099,7 +1063,6 @@ static void Init_ossl_locks(void)
 void
 Init_openssl(void)
 {
-#undef rb_intern
     /*
      * Init timezone info
      */
@@ -1110,14 +1073,25 @@ Init_openssl(void)
     /*
      * Init all digests, ciphers
      */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
-    if (!OPENSSL_init_ssl(0, NULL))
-        rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
-#else
+    /* CRYPTO_malloc_init(); */
+    /* ENGINE_load_builtin_engines(); */
     OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
+
+    /*
+     * FIXME:
+     * On unload do:
+     */
+#if 0
+    CONF_modules_unload(1);
+    destroy_ui_method();
+    EVP_cleanup();
+    ENGINE_cleanup();
+    CRYPTO_cleanup_all_ex_data();
+    ERR_remove_state(0);
+    ERR_free_strings();
 #endif
 
     /*
@@ -1139,11 +1113,7 @@ 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
@@ -1152,7 +1122,7 @@ Init_openssl(void)
     rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
 
     /*
-     * Boolean indicating whether OpenSSL is FIPS-capable or not
+     * Boolean indicating whether OpenSSL is FIPS-enabled or not
      */
     rb_define_const(mOSSL, "OPENSSL_FIPS",
 #ifdef OPENSSL_FIPS
@@ -1162,7 +1132,6 @@ Init_openssl(void)
 #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);
 
     /*
@@ -1183,6 +1152,14 @@ 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");
@@ -1202,6 +1179,7 @@ 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();
@@ -1209,41 +1187,15 @@ Init_openssl(void)
     Init_ossl_ocsp();
     Init_ossl_engine();
     Init_ossl_asn1();
-    Init_ossl_kdf();
+}
 
 #if defined(OSSL_DEBUG)
-    /*
-     * 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
+/*
+ * Check if all symbols are OK with 'make LDSHARED=gcc all'
+ */
+int
+main(int argc, char *argv[])
+{
+    return 0;
 }
+#endif /* OSSL_DEBUG */
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 39699bd5e6..864d068342 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -12,12 +12,37 @@
 
 #include RUBY_EXTCONF_H
 
-#include <assert.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 <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>
@@ -28,18 +53,15 @@
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
-#include <openssl/crypto.h>
+#if !defined(_WIN32)
+#  include <openssl/crypto.h>
+#endif
 #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
@@ -61,29 +83,29 @@ extern VALUE eOSSLError;
   }\
 } while (0)
 
-/*
- * Type conversions
- */
-#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
+#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)
 
 /*
  * 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(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);\
@@ -120,13 +142,24 @@ 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;
+
+int ossl_verify_cb_call(VALUE, 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);
 
@@ -144,9 +177,20 @@ 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
 
 /*
@@ -165,13 +209,13 @@ 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"
 #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 0085d4beab..85b1f02e62 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -9,9 +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
@@ -23,6 +34,7 @@ asn1time_to_time(const ASN1_TIME *time)
     VALUE argv[6];
     int count;
 
+    if (!time || !time->data) return Qnil;
     memset(&tm, 0, sizeof(struct tm));
 
     switch (time->type) {
@@ -44,15 +56,9 @@ asn1time_to_time(const ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	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);
+	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" );
 	}
 	break;
     default:
@@ -69,6 +75,7 @@ asn1time_to_time(const 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)
 {
@@ -84,6 +91,13 @@ 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
@@ -96,11 +110,16 @@ asn1str_to_str(const ASN1_STRING *str)
 
 /*
  * 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(const ASN1_INTEGER *ai)
 {
     BIGNUM *bn;
+#if DO_IT_VIA_RUBY
+    char *txt;
+#endif
     VALUE num;
 
     if (!ai) {
@@ -114,12 +133,43 @@ asn1integer_to_num(const ASN1_INTEGER *ai)
 
     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)
 {
@@ -135,6 +185,7 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 
     return ai;
 }
+#endif
 
 /********/
 /*
@@ -144,13 +195,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_indefinite_length(o) rb_attr_get((o),sivINDEFINITE_LENGTH)
+#define ossl_asn1_get_infinite_length(o) rb_attr_get((o),sivINFINITE_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_indefinite_length(o,v) rb_ivar_set((o),sivINDEFINITE_LENGTH,(v))
+#define ossl_asn1_set_infinite_length(o,v) rb_ivar_set((o),sivINFINITE_LENGTH,(v))
 
 VALUE mASN1;
 VALUE eASN1Error;
@@ -174,10 +225,9 @@ VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
 VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
 VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
-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;
+static ID sIMPLICIT, sEXPLICIT;
+static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
+static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNUSED_BITS;
 
 /*
  * Ruby to ASN1 converters
@@ -202,15 +252,13 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
 {
     ASN1_BIT_STRING *bstr;
 
-    if (unused_bits < 0 || unused_bits > 7)
-	ossl_raise(eASN1Error, "unused_bits for a bitstring value must be in "\
-		   "the range 0 to 7");
+    if(unused_bits < 0) unused_bits = 0;
     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;
+    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
 
     return bstr;
 }
@@ -260,10 +308,15 @@ 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;
@@ -275,10 +328,15 @@ 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;
@@ -306,12 +364,13 @@ decode_bool(unsigned char* der, long length)
 {
     const unsigned char *p = der;
 
-    if (length != 3)
-	ossl_raise(eASN1Error, "invalid length for BOOLEAN");
-    if (p[0] != 1 || p[1] != 1)
-	ossl_raise(eASN1Error, "invalid BOOLEAN");
+    assert(length == 3);
+    if (*p++ != 1)
+	ossl_raise(eASN1Error, "not a boolean");
+    if (*p++ != 1)
+	ossl_raise(eASN1Error, "length is not 1");
 
-    return p[2] ? Qtrue : Qfalse;
+    return *p ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -498,7 +557,7 @@ ossl_asn1_get_asn1type(VALUE obj)
     VALUE value, rflag;
     void *ptr;
     void (*free_func)();
-    int tag;
+    int tag, flag;
 
     tag = ossl_asn1_default_tag(obj);
     value = ossl_asn1_get_value(obj);
@@ -514,7 +573,8 @@ ossl_asn1_get_asn1type(VALUE obj)
 	break;
     case V_ASN1_BIT_STRING:
         rflag = rb_attr_get(obj, sivUNUSED_BITS);
-	ptr = obj_to_asn1bstr(value, NUM2INT(rflag));
+        flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
+	ptr = obj_to_asn1bstr(value, flag);
 	free_func = ASN1_BIT_STRING_free;
 	break;
     case V_ASN1_NULL:
@@ -572,14 +632,17 @@ ossl_asn1_default_tag(VALUE obj)
     VALUE tmp_class, tag;
 
     tmp_class = CLASS_OF(obj);
-    while (!NIL_P(tmp_class)) {
+    while (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;
+    return -1; /* dummy */
 }
 
 static int
@@ -595,46 +658,74 @@ 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) || 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
+    if(NIL_P(s)) ret = V_ASN1_UNIVERSAL;
+    else if(SYMBOL_P(s)){
+	if (SYM2ID(s) == sUNIVERSAL)
+	    ret = V_ASN1_UNIVERSAL;
+	else if (SYM2ID(s) == sAPPLICATION)
+	    ret = V_ASN1_APPLICATION;
+	else if (SYM2ID(s) == sCONTEXT_SPECIFIC)
+	    ret = V_ASN1_CONTEXT_SPECIFIC;
+	else if (SYM2ID(s) == sPRIVATE)
+	    ret = V_ASN1_PRIVATE;
+    }
+    if(ret < 0){
 	ossl_raise(eASN1Error, "invalid tag class");
+    }
+
+    return ret;
 }
 
 static VALUE
 ossl_asn1_class2sym(int tc)
 {
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	return sym_PRIVATE;
+	return ID2SYM(sPRIVATE);
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	return sym_CONTEXT_SPECIFIC;
+	return ID2SYM(sCONTEXT_SPECIFIC);
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	return sym_APPLICATION;
+	return ID2SYM(sAPPLICATION);
     else
-	return sym_UNIVERSAL;
+	return ID2SYM(sUNIVERSAL);
 }
 
 /*
  * 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_: An Integer indicating the tag number.
+ * +tag+: A +Number+ 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
@@ -646,85 +737,73 @@ 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_indefinite_length(self, Qfalse);
+    ossl_asn1_set_infinite_length(self, Qfalse);
 
     return self;
 }
 
 static VALUE
-to_der_internal(VALUE self, int constructed, int indef_len, VALUE body)
+join_der_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, str))
 {
-    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;
+    i = ossl_to_der_if_possible(i);
+    StringValue(i);
+    rb_str_append(str, i);
+    return Qnil;
+}
 
-    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);
+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);
     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 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.
+ * 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.
  */
 static VALUE
 ossl_asn1data_to_der(VALUE self)
 {
-    VALUE value = ossl_asn1_get_value(self);
+    VALUE value, der, inf_length;
+    int tag, tag_class, is_cons = 0;
+    long length;
+    unsigned char *p;
 
-    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);
+    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((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
@@ -737,7 +816,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
 
     p = *pp;
 
-    if(tc == sym_UNIVERSAL && tag < ossl_asn1_info_size) {
+    if(tc == sUNIVERSAL && tag < ossl_asn1_info_size) {
 	switch(tag){
 	case V_ASN1_EOC:
 	    value = decode_eoc(p, hlen+length);
@@ -779,14 +858,13 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     *pp += hlen + length;
     *num_read = hlen + length;
 
-    if (tc == sym_UNIVERSAL &&
-	tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
+    if (tc == sUNIVERSAL && 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] = tc;
+	args[3] = ID2SYM(tc);
 	asn1data = rb_obj_alloc(klass);
 	ossl_asn1_initialize(4, args, asn1data);
 	if(tag == V_ASN1_BIT_STRING){
@@ -795,7 +873,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), tc);
+	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), ID2SYM(tc));
     }
 
     return asn1data;
@@ -807,48 +885,62 @@ 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 indefinite;
-    long available_len, off = *offset;
+    int infinite;
+    long off = *offset;
 
-    indefinite = (j == 0x21);
+    infinite = (j == 0x21);
     ary = rb_ary_new();
 
-    available_len = indefinite ? max_len : length;
-    while (available_len > 0) {
+    while (length > 0 || infinite) {
 	long inner_read = 0;
-	value = ossl_asn1_decode0(pp, available_len, &off, depth + 1, yield, &inner_read);
+	value = ossl_asn1_decode0(pp, max_len, &off, depth + 1, yield, &inner_read);
 	*num_read += inner_read;
-	available_len -= inner_read;
+	max_len -= inner_read;
+	rb_ary_push(ary, value);
+	if (length > 0)
+	    length -= inner_read;
 
-	if (indefinite &&
-	    ossl_asn1_tag(value) == V_ASN1_EOC &&
-	    ossl_asn1_get_tag_class(value) == sym_UNIVERSAL) {
+	if (infinite &&
+	    NUM2INT(ossl_asn1_get_tag(value)) == V_ASN1_EOC &&
+	    SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {
 	    break;
 	}
-	rb_ary_push(ary, value);
     }
 
-    if (tc == sym_UNIVERSAL) {
+    if (tc == sUNIVERSAL) {
 	VALUE args[4];
-	if (tag == V_ASN1_SEQUENCE || tag == V_ASN1_SET)
-	    asn1data = rb_obj_alloc(*ossl_asn1_info[tag].klass);
-	else
-	    asn1data = rb_obj_alloc(cASN1Constructive);
+	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);
+	}
 	args[0] = ary;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = tc;
+	args[3] = ID2SYM(tc);
 	ossl_asn1_initialize(4, args, asn1data);
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), tc);
+	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
     }
 
-    if (indefinite)
-	ossl_asn1_set_indefinite_length(asn1data, Qtrue);
+    if (infinite)
+	ossl_asn1_set_infinite_length(asn1data, Qtrue);
     else
-	ossl_asn1_set_indefinite_length(asn1data, Qfalse);
+	ossl_asn1_set_infinite_length(asn1data, Qfalse);
 
     *offset = off;
     return asn1data;
@@ -872,13 +964,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 = sym_PRIVATE;
+	tag_class = sPRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	tag_class = sym_CONTEXT_SPECIFIC;
+	tag_class = sCONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	tag_class = sym_APPLICATION;
+	tag_class = sAPPLICATION;
     else
-	tag_class = sym_UNIVERSAL;
+	tag_class = sUNIVERSAL;
 
     hlen = p - start;
 
@@ -897,12 +989,11 @@ 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 - hlen, len, &off, depth, yield, j, tag, tag_class, &inner_read);
+	asn1data = int_ossl_asn1_decode0_cons(pp, length, len, &off, depth, yield, j, tag, tag_class, &inner_read);
 	inner_read += hlen;
     }
     else {
-	if ((j & 0x01) && (len == 0))
-	    ossl_raise(eASN1Error, "indefinite length for primitive value");
+    	if ((j & 0x01) && (len == 0)) ossl_raise(eASN1Error, "Infinite length for primitive value");
 	asn1data = int_ossl_asn1_decode0_prim(pp, len, hlen, tag, tag_class, &inner_read);
 	off += hlen + len;
     }
@@ -934,13 +1025,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 (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)
+ * * 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)
  * * constructed: Whether this value is constructed or not (Boolean)
  * * tag_class: Current tag class (Symbol)
- * * tag: The current tag number (Integer)
+ * * tag: The current tag (Number)
  *
  * == Example
  *   der = File.binread('asn1data.der')
@@ -970,9 +1061,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')
@@ -1000,9 +1091,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
@@ -1037,19 +1128,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.
  *
@@ -1062,37 +1153,34 @@ 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);
-    default_tag = ossl_asn1_default_tag(self);
-
-    if (default_tag == -1 || argc > 1) {
+    if(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 = sym_UNIVERSAL;
+		tag_class = ID2SYM(sUNIVERSAL);
 	    else
-		tag_class = sym_CONTEXT_SPECIFIC;
+		tag_class = ID2SYM(sCONTEXT_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(default_tag);
+	tag = INT2NUM(ossl_asn1_default_tag(self));
 	tagging = Qnil;
-	tag_class = sym_UNIVERSAL;
+	tag_class = ID2SYM(sUNIVERSAL);
     }
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tagging(self, tagging);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_indefinite_length(self, Qfalse);
-    if (default_tag == V_ASN1_BIT_STRING)
-	rb_ivar_set(self, sivUNUSED_BITS, INT2FIX(0));
+    ossl_asn1_set_infinite_length(self, Qfalse);
 
     return self;
 }
@@ -1100,66 +1188,59 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_asn1eoc_initialize(VALUE self) {
     VALUE tag, tagging, tag_class, value;
-    tag = INT2FIX(0);
+    tag = INT2NUM(ossl_asn1_default_tag(self));
     tagging = Qnil;
-    tag_class = sym_UNIVERSAL;
+    tag_class = ID2SYM(sUNIVERSAL);
     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_indefinite_length(self, Qfalse);
+    ossl_asn1_set_infinite_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;
-    long alllen, bodylen;
-    unsigned char *p0, *p1;
-    int j, tag, tc, state;
+    int tn, tc, explicit;
+    long len, reallen;
+    unsigned char *buf, *p;
     VALUE str;
 
-    if (ossl_asn1_default_tag(self) == -1) {
-	str = ossl_asn1_get_value(self);
-	return to_der_internal(self, 0, 0, StringValue(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);
-    alllen = i2d_ASN1_TYPE(asn1, NULL);
-    if (alllen < 0) {
+
+    len = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn);
+    if(!(buf = OPENSSL_malloc(len))){
 	ASN1_TYPE_free(asn1);
-	ossl_raise(eASN1Error, "i2d_ASN1_TYPE");
+	ossl_raise(eASN1Error, "cannot alloc buffer");
     }
-    str = ossl_str_new(NULL, alllen, &state);
-    if (state) {
-	ASN1_TYPE_free(asn1);
-	rb_jump_tag(state);
+    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);
     }
-    p0 = p1 = (unsigned char *)RSTRING_PTR(str);
-    i2d_ASN1_TYPE(asn1, &p0);
     ASN1_TYPE_free(asn1);
-    assert(p0 - p1 == alllen);
+    reallen = p - buf;
+    assert(reallen <= len);
+    str = ossl_buf2str((char *)buf, rb_long2int(reallen)); /* buf will be free in ossl_buf2str */
 
-    /* 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));
+    return str;
 }
 
 /*
@@ -1171,41 +1252,92 @@ ossl_asn1prim_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_to_der(VALUE self)
 {
-    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;
+    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);
 	}
+    }
+    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
+    p += RSTRING_LEN(value);
 
-	item = ossl_to_der_if_possible(item);
-	StringValue(item);
-	rb_str_append(str, item);
+    /* 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);
     }
+    ossl_str_adjust(str, p);
 
-    return to_der_internal(self, 1, indef_len, str);
+    return str;
 }
 
 /*
  * call-seq:
  *    asn1_ary.each { |asn1| block } => asn1_ary
  *
- * 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
+ * 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
  * instead.
  *
  * == Example
@@ -1216,8 +1348,7 @@ ossl_asn1cons_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_each(VALUE self)
 {
-    rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);
-
+    rb_ary_each(ossl_asn1_get_value(self));
     return self;
 }
 
@@ -1225,8 +1356,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.
@@ -1245,13 +1376,14 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *    oid.sn -> string
- *    oid.short_name -> string
+/* Document-method: OpenSSL::ASN1::ObjectId#sn
  *
  * 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)
 {
@@ -1265,13 +1397,14 @@ ossl_asn1obj_get_sn(VALUE self)
     return ret;
 }
 
-/*
- * call-seq:
- *    oid.ln -> string
- *    oid.long_name -> string
+/* Document-method: OpenSSL::ASN1::ObjectId#ln
  *
  * 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)
 {
@@ -1285,48 +1418,23 @@ ossl_asn1obj_get_ln(VALUE self)
     return ret;
 }
 
-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
+/* Document-method: OpenSSL::ASN1::ObjectId#oid
  *
- * Returns a String representing the Object Identifier in the dot notation,
- * e.g. "1.2.3.4.5"
+ * The object identifier as a +String+, e.g. "1.2.3.4.5"
  */
 static VALUE
 ossl_asn1obj_get_oid(VALUE self)
 {
-    VALUE str;
+    VALUE val;
     ASN1_OBJECT *a1obj;
-    int state;
+    char buf[128];
 
-    a1obj = obj_to_asn1obj(ossl_asn1_get_value(self));
-    str = rb_protect(asn1obj_get_oid_i, (VALUE)a1obj, &state);
+    val = ossl_asn1_get_value(self);
+    a1obj = obj_to_asn1obj(val);
+    OBJ_obj2txt(buf, sizeof(buf), a1obj, 1);
     ASN1_OBJECT_free(a1obj);
-    if (state)
-	rb_jump_tag(state);
-    return str;
+
+    return rb_str_new2(buf);
 }
 
 #define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
@@ -1360,7 +1468,6 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 void
 Init_ossl_asn1(void)
 {
-#undef rb_intern
     VALUE ary;
     int i;
 
@@ -1369,18 +1476,18 @@ Init_ossl_asn1(void)
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
-    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"));
+    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");
 
     sivVALUE = rb_intern("@value");
     sivTAG = rb_intern("@tag");
     sivTAGGING = rb_intern("@tagging");
     sivTAG_CLASS = rb_intern("@tag_class");
-    sivINDEFINITE_LENGTH = rb_intern("@indefinite_length");
+    sivINFINITE_LENGTH = rb_intern("@infinite_length");
     sivUNUSED_BITS = rb_intern("@unused_bits");
 
     /*
@@ -1406,21 +1513,24 @@ 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. The value of
-     * an Constructive is always an Array.
+     * 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.
      *
      * ==== ASN1::Set and ASN1::Sequence
      *
@@ -1437,18 +1547,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)
@@ -1550,9 +1660,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.
@@ -1561,9 +1671,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
@@ -1574,13 +1684,13 @@ Init_ossl_asn1(void)
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @indefinite_length=false,
+     *   #              @infinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @indefinite_length=false,
+     *   #                   @infinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value="\x01">]>
@@ -1597,18 +1707,18 @@ Init_ossl_asn1(void)
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @indefinite_length=false,
+     *   #              @infinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @indefinite_length=false,
+     *   #                   @infinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value=
      *   #                     [#<OpenSSL::ASN1::Integer:0x85bf308
-     *   #                        @indefinite_length=false,
+     *   #                        @infinite_length=false,
      *   #                        @tag=2,
      *   #                        @tag_class=:UNIVERSAL
      *   #                        @tagging=nil,
@@ -1624,75 +1734,73 @@ Init_ossl_asn1(void)
      */
     rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
     /*
-     * An Integer representing the tag number of this ASN1Data. Never +nil+.
+     * A +Number+ 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 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.
+     * 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.
      * 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. Indefinite length encodings are always constructed.
+     * sent in chunks. Infinite 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 indefinite length
+     * (End of Content) tag. SETs and SEQUENCEs may use an infinite 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("indefinite_length"), 1, 1, 0);
-    rb_define_alias(cASN1Data, "infinite_length", "indefinite_length");
-    rb_define_alias(cASN1Data, "infinite_length=", "indefinite_length=");
+    rb_attr(cASN1Data, rb_intern("infinite_length"), 1, 1, 0);
     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 encoded with indefinite length form, thus
-     * it is not possible to set the _indefinite_length_ attribute for Primitive
-     * and its sub-classes.
+     * 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.
      *
      * == Primitive sub-classes and their mapping to Ruby classes
-     * * 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::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::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
      *
@@ -1701,15 +1809,15 @@ Init_ossl_asn1(void)
      * 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
@@ -1723,20 +1831,19 @@ 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
      *
@@ -1758,13 +1865,48 @@ 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);
@@ -1821,10 +1963,8 @@ do{\
     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));
@@ -1848,6 +1988,5 @@ 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));
-
-    id_each = rb_intern_const("each");
+    rb_global_variable(&class_tag_map);
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index 939a96ce74..d6a170c86c 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -14,11 +14,15 @@
  * ASN1_DATE conversions
  */
 VALUE asn1time_to_time(const ASN1_TIME *);
+#if defined(HAVE_ASN1_TIME_ADJ)
 /* 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
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index 42833d901a..feaf229604 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -8,35 +8,80 @@
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 BIO *
-ossl_obj2bio(volatile VALUE *pobj)
+ossl_obj2bio(VALUE obj)
 {
-    VALUE obj = *pobj;
     BIO *bio;
 
-    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;
+    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);
+    }
+
     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_membio2str(BIO *bio)
+ossl_membio2str0(BIO *bio)
 {
     VALUE ret;
-    int state;
     BUF_MEM *buf;
 
     BIO_get_mem_ptr(bio, &buf);
-    ret = ossl_str_new(buf->data, buf->length, &state);
+    ret = rb_str_new(buf->data, buf->length);
+
+    return ret;
+}
+
+VALUE
+ossl_protect_membio2str(BIO *bio, int *status)
+{
+    return rb_protect((VALUE (*)(VALUE))ossl_membio2str0, (VALUE)bio, status);
+}
+
+VALUE
+ossl_membio2str(BIO *bio)
+{
+    VALUE ret;
+    int status = 0;
+
+    ret = ossl_protect_membio2str(bio, &status);
     BIO_free(bio);
-    if (state)
-	rb_jump_tag(state);
+    if(status) rb_jump_tag(status);
 
     return ret;
 }
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
index da68c5e5a2..1705d0ac89 100644
--- a/ext/openssl/ossl_bio.h
+++ b/ext/openssl/ossl_bio.h
@@ -10,7 +10,10 @@
 #if !defined(_OSSL_BIO_H_)
 #define _OSSL_BIO_H_
 
-BIO *ossl_obj2bio(volatile VALUE *);
+BIO *ossl_obj2bio(VALUE);
+BIO *ossl_protect_obj2bio(VALUE,int*);
+VALUE ossl_membio2str0(BIO*);
 VALUE ossl_membio2str(BIO*);
+VALUE ossl_protect_membio2str(BIO*,int*);
 
 #endif
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 6f0064e966..19a868c334 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -26,6 +26,11 @@
   } \
 } while (0)
 
+#define SafeGetBN(obj, bn) do { \
+  OSSL_Check_Kind((obj), cBN); \
+  GetBN((obj), (bn)); \
+} while (0)
+
 static void
 ossl_bn_free(void *ptr)
 {
@@ -115,34 +120,30 @@ integer_to_bnptr(VALUE obj, BIGNUM *orig)
     return bn;
 }
 
-static VALUE
-try_convert_to_bn(VALUE obj)
+static BIGNUM *
+try_convert_to_bnptr(VALUE obj)
 {
-    BIGNUM *bn;
-    VALUE newobj = Qnil;
+    BIGNUM *bn = NULL;
+    VALUE newobj;
 
-    if (rb_obj_is_kind_of(obj, cBN))
-	return obj;
-    if (RB_INTEGER_TYPE_P(obj)) {
-	newobj = NewBN(cBN); /* Handle potential mem leaks */
+    if (rb_obj_is_kind_of(obj, cBN)) {
+	GetBN(obj, bn);
+    }
+    else if (RB_INTEGER_TYPE_P(obj)) {
+	newobj = NewBN(cBN); /* Handle potencial mem leaks */
 	bn = integer_to_bnptr(obj, NULL);
 	SetBN(newobj, bn);
     }
 
-    return newobj;
+    return bn;
 }
 
 BIGNUM *
-ossl_bn_value_ptr(volatile VALUE *ptr)
+GetBNPtr(VALUE obj)
 {
-    VALUE tmp;
-    BIGNUM *bn;
-
-    tmp = try_convert_to_bn(*ptr);
-    if (NIL_P(tmp))
+    BIGNUM *bn = try_convert_to_bnptr(obj);
+    if (!bn)
 	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
-    GetBN(tmp, bn);
-    *ptr = tmp;
 
     return bn;
 }
@@ -171,7 +172,8 @@ ossl_bn_alloc(VALUE klass)
     return obj;
 }
 
-/*
+/* Document-method: OpenSSL::BN.new
+ *
  * call-seq:
  *    OpenSSL::BN.new => aBN
  *    OpenSSL::BN.new(bn) => aBN
@@ -179,7 +181,7 @@ ossl_bn_alloc(VALUE klass)
  *    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)
@@ -187,7 +189,6 @@ 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);
@@ -214,14 +215,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     GetBN(self, bn);
     switch (base) {
     case 0:
-        ptr = StringValuePtr(str);
-        if (!BN_mpi2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
+	if (!BN_mpi2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-        ptr = StringValuePtr(str);
-        if (!BN_bin2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
+	if (!BN_bin2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -247,7 +246,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
  *    bn.to_s(base) => string
  *
  * === Parameters
- * * _base_ - Integer
+ * * +base+ - integer
  *   Valid values:
  *   * 0 - MPI
  *   * 2 - binary
@@ -374,21 +373,6 @@ BIGNUM_BOOL1(is_one)
  */
 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)				\
@@ -396,7 +380,7 @@ ossl_bn_is_negative(VALUE self)
 	BIGNUM *bn, *result;				\
 	VALUE obj;					\
 	GetBN(self, bn);				\
-	obj = NewBN(rb_obj_class(self));		\
+	obj = NewBN(CLASS_OF(self));			\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -422,7 +406,7 @@ BIGNUM_1c(sqr)
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;	\
 	VALUE obj;					\
 	GetBN(self, bn1);				\
-	obj = NewBN(rb_obj_class(self));		\
+	obj = NewBN(CLASS_OF(self));			\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -455,7 +439,7 @@ BIGNUM_2(sub)
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(rb_obj_class(self));			\
+	obj = NewBN(CLASS_OF(self));				\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -510,6 +494,7 @@ BIGNUM_2c(mod_sqr)
 BIGNUM_2c(mod_inverse)
 
 /*
+ * Document-method: OpenSSL::BN#/
  * call-seq:
  *    bn1 / bn2 => [result, remainder]
  *
@@ -519,13 +504,12 @@ static VALUE
 ossl_bn_div(VALUE self, VALUE other)
 {
     BIGNUM *bn1, *bn2 = GetBNPtr(other), *r1, *r2;
-    VALUE klass, obj1, obj2;
+    VALUE obj1, obj2;
 
     GetBN(self, bn1);
 
-    klass = rb_obj_class(self);
-    obj1 = NewBN(klass);
-    obj2 = NewBN(klass);
+    obj1 = NewBN(CLASS_OF(self));
+    obj2 = NewBN(CLASS_OF(self));
     if (!(r1 = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
@@ -552,7 +536,7 @@ ossl_bn_div(VALUE self, VALUE other)
 	BIGNUM *bn3 = GetBNPtr(other2), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(rb_obj_class(self));			\
+	obj = NewBN(CLASS_OF(self));				\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -625,11 +609,12 @@ BIGNUM_BIT(clear_bit)
  */
 BIGNUM_BIT(mask_bits)
 
-/*
+/* Document-method: OpenSSL::BN#bit_set?
  * call-seq:
  *   bn.bit_set?(bit) => true | false
  *
- * Tests bit _bit_ in _bn_ and returns +true+ if set, +false+ if not set.
+ * Returns boolean of whether +bit+ is set.
+ * Bitwise operations for openssl BIGNUMs.
  */
 static VALUE
 ossl_bn_is_bit_set(VALUE self, VALUE bit)
@@ -654,7 +639,7 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 	VALUE obj;					\
 	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
-	obj = NewBN(rb_obj_class(self));		\
+	obj = NewBN(CLASS_OF(self));			\
 	if (!(result = BN_new())) {			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
@@ -784,15 +769,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 set to
- * +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 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)
@@ -866,37 +851,6 @@ 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)		\
@@ -929,7 +883,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
@@ -938,12 +892,10 @@ ossl_bn_eq(VALUE self, VALUE other)
     BIGNUM *bn1, *bn2;
 
     GetBN(self, bn1);
-    other = try_convert_to_bn(other);
-    if (NIL_P(other))
-	return Qfalse;
-    GetBN(other, bn2);
+    /* BNPtr may raise, so we can't use here */
+    bn2 = try_convert_to_bnptr(other);
 
-    if (!BN_cmp(bn1, bn2)) {
+    if (bn2 && !BN_cmp(bn1, bn2)) {
 	return Qtrue;
     }
     return Qfalse;
@@ -954,7 +906,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>bn</i>. Contrast this
+ *  <code>OpenSSL::BN</code> with the same value as <i>big</i>. Contrast this
  *  with OpenSSL::BN#==, which performs type conversions.
  */
 static VALUE
@@ -982,20 +934,20 @@ static VALUE
 ossl_bn_hash(VALUE self)
 {
     BIGNUM *bn;
-    VALUE tmp, hash;
+    VALUE hash;
     unsigned char *buf;
     int len;
 
     GetBN(self, bn);
     len = BN_num_bytes(bn);
-    buf = ALLOCV(tmp, len);
+    buf = xmalloc(len);
     if (BN_bn2bin(bn, buf) != len) {
-	ALLOCV_END(tmp);
-	ossl_raise(eBNError, "BN_bn2bin");
+	xfree(buf);
+	ossl_raise(eBNError, NULL);
     }
 
-    hash = ST2FIX(rb_memhash(buf, len));
-    ALLOCV_END(tmp);
+    hash = INT2FIX(rb_memhash(buf, len));
+    xfree(buf);
 
     return hash;
 }
@@ -1005,12 +957,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 _checks_ is not specified, a number of iterations is used
+ * 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.
  *
  * === Parameters
- * * _checks_ - integer
+ * * +checks+ - integer
  */
 static VALUE
 ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
@@ -1045,8 +997,8 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
  * 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)
@@ -1100,7 +1052,7 @@ Init_ossl_bn(void)
     rb_define_alloc_func(cBN, ossl_bn_alloc);
     rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
 
-    rb_define_method(cBN, "initialize_copy", ossl_bn_copy, 1);
+    rb_define_copy_func(cBN, ossl_bn_copy);
     rb_define_method(cBN, "copy", ossl_bn_copy, 1);
 
     /* swap (=coerce?) */
@@ -1109,9 +1061,6 @@ 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);
@@ -1145,7 +1094,6 @@ 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 a19ba19487..4cd9d0600a 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -15,10 +15,8 @@ extern VALUE eBNError;
 
 extern BN_CTX *ossl_bn_ctx;
 
-#define GetBNPtr(obj) ossl_bn_value_ptr(&(obj))
-
 VALUE ossl_bn_new(const BIGNUM *);
-BIGNUM *ossl_bn_value_ptr(volatile VALUE *);
+BIGNUM *GetBNPtr(VALUE);
 void Init_ossl_bn(void);
 
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 0840c84a71..f1f3459ef2 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -23,16 +23,20 @@
 #define GetCipher(obj, ctx) do { \
     GetCipherInit((obj), (ctx)); \
     if (!(ctx)) { \
-	ossl_raise(rb_eRuntimeError, "Cipher not initialized!"); \
+	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
     } \
 } while (0)
+#define SafeGetCipher(obj, ctx) do { \
+    OSSL_Check_Kind((obj), cCipher); \
+    GetCipher((obj), (ctx)); \
+} while (0)
 
 /*
  * Classes
  */
 VALUE cCipher;
 VALUE eCipherError;
-static ID id_auth_tag_len, id_key_set;
+static ID id_auth_tag_len;
 
 static VALUE ossl_cipher_alloc(VALUE klass);
 static void ossl_cipher_free(void *ptr);
@@ -49,7 +53,7 @@ static const rb_data_type_t ossl_cipher_type = {
  * PUBLIC
  */
 const EVP_CIPHER *
-ossl_evp_get_cipherbyname(VALUE obj)
+GetCipherPtr(VALUE obj)
 {
     if (rb_obj_is_kind_of(obj, cCipher)) {
 	EVP_CIPHER_CTX *ctx;
@@ -104,7 +108,7 @@ ossl_cipher_alloc(VALUE klass)
  *  call-seq:
  *     Cipher.new(string) -> cipher
  *
- *  The string must be a valid cipher name like "AES-128-CBC" or "3DES".
+ *  The string must contain a valid cipher name like "AES-128-CBC" or "3DES".
  *
  *  A list of cipher names is available by calling OpenSSL::Cipher.ciphers.
  */
@@ -114,17 +118,27 @@ 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 initialized!");
+	ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
     }
     AllocCipher(self, ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
 	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%"PRIsVALUE")", str);
     }
-    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
+    /*
+     * 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)
 	ossl_raise(eCipherError, NULL);
 
     return self;
@@ -142,7 +156,7 @@ ossl_cipher_copy(VALUE self, VALUE other)
     if (!ctx1) {
 	AllocCipher(self, ctx1);
     }
-    GetCipher(other, ctx2);
+    SafeGetCipher(other, ctx2);
     if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
 	ossl_raise(eCipherError, NULL);
 
@@ -237,9 +251,6 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	ossl_raise(eCipherError, NULL);
     }
 
-    if (p_key)
-	rb_ivar_set(self, id_key_set, Qtrue);
-
     return self;
 }
 
@@ -292,9 +303,9 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
  *  OpenSSL::PKCS5 instead.
  *
  *  === Parameters
- *  * _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'
+ *  * +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'
  *
  *  A minimum of 1000 iterations is recommended.
  *
@@ -317,9 +328,7 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 	salt = (unsigned char *)RSTRING_PTR(vsalt);
     }
     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-    if (iter <= 0)
-	rb_raise(rb_eArgError, "iterations must be a positive integer");
-    digest = NIL_P(vdigest) ? EVP_md5() : ossl_evp_get_digestbyname(vdigest);
+    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
     GetCipher(self, ctx);
     EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
 		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LENINT(vpass), iter, key, iv);
@@ -328,8 +337,6 @@ 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;
 }
 
@@ -363,12 +370,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.
  *
- *  If _buffer_ is given, the encryption/decryption result will be written to
- *  it. _buffer_ will be resized automatically.
+ *  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)
@@ -380,9 +387,6 @@ 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)
@@ -416,7 +420,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
- *  having fed the entire plaintext or ciphertext to the Cipher instance.
+ *  after 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
@@ -484,8 +488,6 @@ 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;
 }
 
@@ -500,6 +502,9 @@ 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)
@@ -510,8 +515,10 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     StringValue(iv);
     GetCipher(self, ctx);
 
-    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
+    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
 	iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+#endif
     if (!iv_len)
 	iv_len = EVP_CIPHER_CTX_iv_length(ctx);
     if (RSTRING_LEN(iv) != iv_len)
@@ -523,23 +530,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     return iv;
 }
 
-/*
- *  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;
-}
-
+#ifdef HAVE_AUTHENTICATED_ENCRYPTION
 /*
  *  call-seq:
  *     cipher.auth_data = string -> string
@@ -571,8 +562,6 @@ 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");
@@ -587,8 +576,8 @@ 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
+ *  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.
@@ -610,7 +599,7 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
 
     GetCipher(self, ctx);
 
-    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
 
     ret = rb_str_new(NULL, tag_len);
@@ -624,11 +613,13 @@ 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 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.
+ *  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.
  *
  *  For OCB mode, the tag length must be supplied with #auth_tag_len=
  *  beforehand.
@@ -645,7 +636,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
     tag_len = RSTRING_LENINT(vtag);
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_CTX_flags(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))
@@ -672,7 +663,7 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
     EVP_CIPHER_CTX *ctx;
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_CTX_flags(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))
@@ -685,6 +676,23 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
 }
 
 /*
+ *  call-seq:
+ *     cipher.authenticated? -> boolean
+ *
+ *  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_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
+}
+
+/*
  * call-seq:
  *   cipher.iv_len = integer -> integer
  *
@@ -699,7 +707,7 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
     EVP_CIPHER_CTX *ctx;
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_CTX_flags(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))
@@ -713,6 +721,14 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
 
     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_set_auth_tag_len rb_f_notimplement
+#define ossl_cipher_is_authenticated rb_f_notimplement
+#define ossl_cipher_set_iv_length rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
@@ -790,8 +806,10 @@ ossl_cipher_iv_length(VALUE self)
     int len = 0;
 
     GetCipher(self, ctx);
-    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
+    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
 	len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+#endif
     if (!len)
 	len = EVP_CIPHER_CTX_iv_length(ctx);
 
@@ -921,10 +939,12 @@ 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. 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. 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
      *
      * <b>Always create a secure random IV for every encryption of your
      * Cipher</b>
@@ -1002,10 +1022,10 @@ Init_ossl_cipher(void)
      * 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). 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.
+     * 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 gurantees of GCM mode.
      *
      *   cipher = OpenSSL::Cipher::AES.new(128, :GCM).encrypt
      *   cipher.key = key
@@ -1015,8 +1035,8 @@ Init_ossl_cipher(void)
      *   encrypted = cipher.update(data) + cipher.final
      *   tag = cipher.auth_tag # produces 16 bytes tag by default
      *
-     * Now you are the receiver. You know the _key_ and have received _nonce_,
-     * _auth_data_, _encrypted_ and _tag_ through an untrusted network. Note
+     * 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
@@ -1037,7 +1057,7 @@ Init_ossl_cipher(void)
     eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
 
     rb_define_alloc_func(cCipher, ossl_cipher_alloc);
-    rb_define_method(cCipher, "initialize_copy", ossl_cipher_copy, 1);
+    rb_define_copy_func(cCipher, ossl_cipher_copy);
     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);
@@ -1062,5 +1082,4 @@ Init_ossl_cipher(void)
     rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 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 2392d41c6a..c444089fc2 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 *ossl_evp_get_cipherbyname(VALUE);
+const EVP_CIPHER *GetCipherPtr(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 28392e208c..ebf6ae2a3d 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -41,7 +41,7 @@ DupConfigPtr(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);
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index 112ce33647..44d961833d 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -15,6 +15,10 @@
 	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
@@ -42,7 +46,7 @@ static const rb_data_type_t ossl_digest_type = {
  * Public
  */
 const EVP_MD *
-ossl_evp_get_digestbyname(VALUE obj)
+GetDigestPtr(VALUE obj)
 {
     const EVP_MD *md;
     ASN1_OBJECT *oid = NULL;
@@ -61,7 +65,7 @@ ossl_evp_get_digestbyname(VALUE obj)
     } else {
         EVP_MD_CTX *ctx;
 
-        GetDigest(obj, ctx);
+        SafeGetDigest(obj, ctx);
 
         md = EVP_MD_CTX_md(ctx);
     }
@@ -76,13 +80,10 @@ ossl_digest_new(const EVP_MD *md)
     EVP_MD_CTX *ctx;
 
     ret = ossl_digest_alloc(cDigest);
-    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");
+    GetDigest(ret, ctx);
+    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
+	ossl_raise(eDigestError, "Digest initialization failed.");
+    }
 
     return ret;
 }
@@ -93,7 +94,13 @@ ossl_digest_new(const EVP_MD *md)
 static VALUE
 ossl_digest_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
+    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;
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
@@ -102,15 +109,15 @@ 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 equivalent to
+ * is equal to
  *
  *   digest = OpenSSL::Digest.new('sha256')
  *   digest.update('digestdata')
@@ -123,19 +130,14 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     VALUE type, data;
 
     rb_scan_args(argc, argv, "11", &type, &data);
-    md = ossl_evp_get_digestbyname(type);
+    md = GetDigestPtr(type);
     if (!NIL_P(data)) StringValue(data);
 
-    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");
+    GetDigest(self, ctx);
+    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
+	ossl_raise(eDigestError, "Digest initialization failed.");
     }
 
-    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;
 }
@@ -148,13 +150,8 @@ ossl_digest_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
 
-    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);
+    GetDigest(self, ctx1);
+    SafeGetDigest(other, ctx2);
 
     if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
 	ossl_raise(eDigestError, NULL);
@@ -444,7 +441,7 @@ Init_ossl_digest(void)
     rb_define_alloc_func(cDigest, ossl_digest_alloc);
 
     rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
-    rb_define_method(cDigest, "initialize_copy", ossl_digest_copy, 1);
+    rb_define_copy_func(cDigest, ossl_digest_copy);
     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 50bf5666a3..512f7d3a39 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 *ossl_evp_get_digestbyname(VALUE);
+const EVP_MD *GetDigestPtr(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 5ca0d4ca3f..f4863b36a4 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -25,6 +25,10 @@
         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
@@ -46,25 +50,13 @@ VALUE eEngineError;
 /*
  * Private
  */
-#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)  \
+#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
 do{\
-  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
-    ENGINE_load_##engine_name();\
+  if(!strcmp(#x, RSTRING_PTR(name))){\
+    ENGINE_load_##x();\
     return Qtrue;\
   }\
 }while(0)
-#endif
 
 static void
 ossl_engine_free(void *engine)
@@ -80,13 +72,14 @@ static const rb_data_type_t ossl_engine_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-/*
+/* Document-method: OpenSSL::Engine.load
+ *
  * call-seq:
- *    OpenSSL::Engine.load(name = nil)
+ *   load(enginename = 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.
  *
  */
@@ -106,63 +99,63 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     StringValueCStr(name);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_DYNAMIC
-    OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
+    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
 #endif
 #if HAVE_ENGINE_LOAD_4758CCA
-    OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
+    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
 #endif
 #if HAVE_ENGINE_LOAD_AEP
-    OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
+    OSSL_ENGINE_LOAD_IF_MATCH(aep);
 #endif
 #if HAVE_ENGINE_LOAD_ATALLA
-    OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
+    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
 #endif
 #if HAVE_ENGINE_LOAD_CHIL
-    OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
+    OSSL_ENGINE_LOAD_IF_MATCH(chil);
 #endif
 #if HAVE_ENGINE_LOAD_CSWIFT
-    OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
+    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
 #endif
 #if HAVE_ENGINE_LOAD_NURON
-    OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
+    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
 #endif
 #if HAVE_ENGINE_LOAD_SUREWARE
-    OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
+    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
 #endif
 #if HAVE_ENGINE_LOAD_UBSEC
-    OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
+    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
 #endif
 #if HAVE_ENGINE_LOAD_PADLOCK
-    OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
+    OSSL_ENGINE_LOAD_IF_MATCH(padlock);
 #endif
 #if HAVE_ENGINE_LOAD_CAPI
-    OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
+    OSSL_ENGINE_LOAD_IF_MATCH(capi);
 #endif
 #if HAVE_ENGINE_LOAD_GMP
-    OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
+    OSSL_ENGINE_LOAD_IF_MATCH(gmp);
 #endif
 #if HAVE_ENGINE_LOAD_GOST
-    OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
+    OSSL_ENGINE_LOAD_IF_MATCH(gost);
 #endif
 #if HAVE_ENGINE_LOAD_CRYPTODEV
-    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
+    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev);
 #endif
 #if HAVE_ENGINE_LOAD_AESNI
-    OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI);
+    OSSL_ENGINE_LOAD_IF_MATCH(aesni);
 #endif
 #endif
 #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
-    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO);
+    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 #endif
-    OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
+    OSSL_ENGINE_LOAD_IF_MATCH(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.
@@ -172,15 +165,11 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
     ENGINE_cleanup();
-#endif
     return Qnil;
 }
 
-/*
- * call-seq:
- *    OpenSSL::Engine.engines -> [engine, ...]
+/* Document-method: OpenSSL::Engine.engines
  *
  * Returns an array of currently loaded engines.
  */
@@ -204,16 +193,17 @@ ossl_engine_s_engines(VALUE klass)
     return ary;
 }
 
-/*
+/* Document-method: OpenSSL::Engine.by_id
+ *
  * call-seq:
- *    OpenSSL::Engine.by_id(name) -> engine
+ *   by_id(name) -> engine
  *
- * Fetches the engine as specified by the _id_ String.
+ * Fetch 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)
@@ -237,11 +227,24 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
     return obj;
 }
 
-/*
- * call-seq:
- *    engine.id -> string
+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
  *
- * Gets the id for this engine.
+ * Get the id for this engine
  *
  *    OpenSSL::Engine.load
  *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
@@ -256,11 +259,9 @@ ossl_engine_get_id(VALUE self)
     return rb_str_new2(ENGINE_get_id(e));
 }
 
-/*
- * call-seq:
- *    engine.name -> string
+/* Document-method: OpenSSL::Engine#name
  *
- * Get the descriptive name for this engine.
+ * Get the descriptive name for this engine
  *
  *    OpenSSL::Engine.load
  *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
@@ -276,9 +277,7 @@ ossl_engine_get_name(VALUE self)
     return rb_str_new2(ENGINE_get_name(e));
 }
 
-/*
- * call-seq:
- *    engine.finish -> nil
+/* Document-method: OpenSSL::Engine#finish
  *
  * Releases all internal structural references for this engine.
  *
@@ -295,14 +294,15 @@ ossl_engine_finish(VALUE self)
     return Qnil;
 }
 
-/*
+/* Document-method: OpenSSL::Engine#cipher
+ *
  * call-seq:
  *   engine.cipher(name) -> OpenSSL::Cipher
  *
- * Returns a new instance of OpenSSL::Cipher by _name_, if it is available in
- * this engine.
+ * This returns an OpenSSL::Cipher by +name+, if it is available in this
+ * engine.
  *
- * An EngineError will be raised if the cipher is unavailable.
+ * A EngineError will be raised if the cipher is unavailable.
  *
  *    e = OpenSSL::Engine.by_id("openssl")
  *     => #<OpenSSL::Engine id="openssl" name="Software engine support">
@@ -327,11 +327,12 @@ 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
  *
- * Returns a new instance of OpenSSL::Digest by _name_.
+ * This returns an OpenSSL::Digest by +name+.
  *
  * Will raise an EngineError if the digest is unavailable.
  *
@@ -359,11 +360,12 @@ 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 identified by _id_ and _data_.
+ * Loads the given private key by +id+ and +data+.
  *
  * An EngineError is raised of the OpenSSL::PKey is unavailable.
  *
@@ -388,11 +390,12 @@ 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 public key identified by _id_ and _data_.
+ * Loads the given private key by +id+ and +data+.
  *
  * An EngineError is raised of the OpenSSL::PKey is unavailable.
  *
@@ -415,15 +418,16 @@ 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
@@ -443,13 +447,14 @@ 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
  *
- * Sends the given _command_ to this engine.
+ * Send 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)
@@ -479,9 +484,7 @@ ossl_engine_cmd_flag_to_name(int flag)
     }
 }
 
-/*
- * call-seq:
- *    engine.cmds -> [["name", "description", "flags"], ...]
+/* Document-method: OpenSSL::Engine#cmds
  *
  * Returns an array of command definitions for the current engine
  */
@@ -507,11 +510,9 @@ ossl_engine_get_cmds(VALUE self)
     return ary;
 }
 
-/*
- * call-seq:
- *    engine.inspect -> string
+/* Document-method: OpenSSL::Engine#inspect
  *
- * Pretty prints this engine.
+ * Pretty print this engine
  */
 static VALUE
 ossl_engine_inspect(VALUE self)
@@ -536,11 +537,13 @@ Init_ossl_engine(void)
     cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
     eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
 
-    rb_undef_alloc_func(cEngine);
+    rb_define_alloc_func(cEngine, ossl_engine_s_alloc);
     rb_define_singleton_method(cEngine, "load", ossl_engine_s_load, -1);
     rb_define_singleton_method(cEngine, "cleanup", ossl_engine_s_cleanup, 0);
     rb_define_singleton_method(cEngine, "engines", ossl_engine_s_engines, 0);
     rb_define_singleton_method(cEngine, "by_id", ossl_engine_s_by_id, 1);
+    rb_undef_method(CLASS_OF(cEngine), "new");
+    rb_undef_method(cEngine, "initialize_copy");
 
     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 564dcab522..270979ed92 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -19,6 +19,10 @@
 	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
@@ -106,7 +110,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),
-		 ossl_evp_get_digestbyname(digest), NULL);
+		 GetDigestPtr(digest), NULL);
 
     return self;
 }
@@ -120,7 +124,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetHMAC(self, ctx1);
-    GetHMAC(other, ctx2);
+    SafeGetHMAC(other, ctx2);
 
     if (!HMAC_CTX_copy(ctx1, ctx2))
 	ossl_raise(eHMACError, "HMAC_CTX_copy");
@@ -131,7 +135,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
  *  call-seq:
  *     hmac.update(string) -> self
  *
- * Returns _hmac_ updated with the message to be authenticated.
+ * Returns +self+ updated with the message to be authenticated.
  * Can be called repeatedly with chunks of the message.
  *
  * === Example
@@ -230,7 +234,7 @@ ossl_hmac_hexdigest(VALUE self)
  *  call-seq:
  *     hmac.reset -> self
  *
- * Returns _hmac_ as it was when it was first initialized, with all processed
+ * Returns +self+ as it was when it was first initialized, with all processed
  * data cleared from it.
  *
  * === Example
@@ -260,16 +264,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
- * specifies the digest algorithm to use. This may be a String representing
- * the algorithm name or an instance of OpenSSL::Digest.
+ * Returns the authentication code as a binary string. The +digest+ parameter
+ * must be 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('sha1', key, data)
+ * 	hmac = OpenSSL::HMAC.digest(digest, key, data)
  * 	#=> "\xDE|\x9B\x85\xB8\xB7\x8A\xA6\xBC\x8Az6\xF7\n\x90p\x1C\x9D\xB4\xD9"
  *
  */
@@ -281,9 +285,8 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 
     StringValue(key);
     StringValue(data);
-    buf = HMAC(ossl_evp_get_digestbyname(digest), RSTRING_PTR(key),
-	       RSTRING_LENINT(key), (unsigned char *)RSTRING_PTR(data),
-	       RSTRING_LEN(data), NULL, &buf_len);
+    buf = HMAC(GetDigestPtr(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);
 }
@@ -292,16 +295,16 @@ 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 specifies the digest algorithm to use. This may be a String
- * representing the algorithm name or an instance of OpenSSL::Digest.
+ * Returns the authentication code as a hex-encoded string. The +digest+
+ * parameter must be 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('sha1', key, data)
+ * 	hmac = OpenSSL::HMAC.hexdigest(digest, key, data)
  * 	#=> "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9"
  *
  */
@@ -315,9 +318,9 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
     StringValue(key);
     StringValue(data);
 
-    if (!HMAC(ossl_evp_get_digestbyname(digest), RSTRING_PTR(key),
-	      RSTRING_LENINT(key), (unsigned char *)RSTRING_PTR(data),
-	      RSTRING_LEN(data), buf, &buf_len))
+    if (!HMAC(GetDigestPtr(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);
@@ -374,7 +377,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_method(cHMAC, "initialize_copy", ossl_hmac_copy, 1);
+    rb_define_copy_func(cHMAC, ossl_hmac_copy);
 
     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
deleted file mode 100644
index ee124718b5..0000000000
--- a/ext/openssl/ossl_kdf.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * 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::SHA256.new
-     *   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 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
-     *     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 PBKDF2, the
-     * length of the values to be compared is of fixed size.
-     */
-    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
deleted file mode 100644
index b6503f8d9d..0000000000
--- a/ext/openssl/ossl_kdf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#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 6f61e61bf5..2f7845b685 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,6 +159,8 @@ 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()))) {
@@ -168,8 +170,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 /*
@@ -198,7 +203,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
@@ -208,13 +213,12 @@ static VALUE
 ossl_spki_set_public_key(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
-    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
-    if (!NETSCAPE_SPKI_set_pubkey(spki, pkey))
-	ossl_raise(eSPKIError, "NETSCAPE_SPKI_set_pubkey");
+    if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
+	ossl_raise(eSPKIError, NULL);
+    }
+
     return key;
 }
 
@@ -244,7 +248,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.
@@ -269,8 +273,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
@@ -285,7 +289,7 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     GetSPKI(self, spki);
     if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
 	ossl_raise(eSPKIError, NULL);
@@ -299,7 +303,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.
@@ -308,25 +312,22 @@ static VALUE
 ossl_spki_verify(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
-    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
-    switch (NETSCAPE_SPKI_verify(spki, pkey)) {
-      case 0:
-	ossl_clear_error();
+    switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
+    case 0:
 	return Qfalse;
-      case 1:
+    case 1:
 	return Qtrue;
-      default:
-	ossl_raise(eSPKIError, "NETSCAPE_SPKI_verify");
+    default:
+	ossl_raise(eSPKIError, NULL);
     }
+    return Qnil; /* dummy */
 }
 
 /* Document-class: OpenSSL::Netscape::SPKI
  *
- * A Simple Public Key Infrastructure implementation (pronounced "spooky").
+ * A Simple Public Key Infrastructure implementation (pronounced "spookey").
  * The structure is defined as
  *   PublicKeyAndChallenge ::= SEQUENCE {
  *     spki SubjectPublicKeyInfo,
@@ -352,7 +353,7 @@ ossl_spki_verify(VALUE self, VALUE key)
  *   spki.public_key = key.public_key
  *   spki.sign(key, OpenSSL::Digest::SHA256.new)
  *   #send a request containing this to a server generating a certificate
- * === Verifying an SPKI request
+ * === Verifiying an SPKI request
  *   request = #...
  *   spki = OpenSSL::Netscape::SPKI.new request
  *   unless spki.verify(spki.public_key)
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index c0237791da..a8b3503d2a 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -22,6 +22,10 @@
     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)
@@ -33,6 +37,10 @@
     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)
@@ -44,6 +52,10 @@
     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)
@@ -55,6 +67,10 @@
     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)
@@ -66,6 +82,10 @@
     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;
@@ -180,7 +200,7 @@ ossl_ocspreq_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPReq(self, req_old);
-    GetOCSPReq(other, req);
+    SafeGetOCSPReq(other, req);
 
     req_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_REQUEST), req);
     if (!req_new)
@@ -198,7 +218,7 @@ 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
@@ -228,7 +248,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
@@ -261,7 +281,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:
  *
@@ -271,7 +291,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.
  */
@@ -284,7 +304,7 @@ ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
     int res;
 
     GetOCSPReq(self, req);
-    GetOCSPBasicRes(basic_resp, bs);
+    SafeGetOCSPBasicRes(basic_resp, bs);
     res = OCSP_check_nonce(req, bs);
 
     return INT2NUM(res);
@@ -294,7 +314,7 @@ 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
@@ -351,17 +371,17 @@ 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
+ * 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
+ * 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_ is a bitwise OR of the following constants:
+ * +flags+ can be a bitwise OR of the following constants:
  *
  * OpenSSL::OCSP::NOCERTS::
- *   Don't include any certificates in the request. _certs_ will be ignored.
+ *   Don't include any certificates in the request. +certs+ will be ignored.
  */
 static VALUE
 ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
@@ -384,7 +404,7 @@ ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
     if (NIL_P(digest))
 	md = EVP_sha1();
     else
-	md = ossl_evp_get_digestbyname(digest);
+	md = GetDigestPtr(digest);
     if (NIL_P(certs))
 	flg |= OCSP_NOCERTS;
     else
@@ -401,12 +421,9 @@ 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
@@ -456,29 +473,13 @@ 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
@@ -520,7 +521,7 @@ ossl_ocspres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPRes(self, res_old);
-    GetOCSPRes(other, res);
+    SafeGetOCSPRes(other, res);
 
     res_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_RESPONSE), res);
     if (!res_new)
@@ -538,7 +539,7 @@ 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
@@ -676,7 +677,7 @@ ossl_ocspbres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPBasicRes(self, bs_old);
-    GetOCSPBasicRes(other, bs);
+    SafeGetOCSPBasicRes(other, bs);
 
     bs_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs);
     if (!bs_new)
@@ -692,7 +693,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.
  */
 
@@ -723,7 +724,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.
  */
 
@@ -735,7 +736,7 @@ ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
     int ret;
 
     GetOCSPBasicRes(self, bs);
-    GetOCSPReq(request, req);
+    SafeGetOCSPReq(request, req);
     ret = OCSP_copy_nonce(bs, req);
 
     return INT2NUM(ret);
@@ -745,7 +746,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.
  */
 
@@ -791,26 +792,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.
  */
@@ -828,7 +829,7 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     VALUE tmp;
 
     GetOCSPBasicRes(self, bs);
-    GetOCSPCertId(cid, id);
+    SafeGetOCSPCertId(cid, id);
     st = NUM2INT(status);
     if (!NIL_P(ext)) { /* All ext's members must be X509::Extension */
 	ext = rb_check_array_type(ext);
@@ -887,7 +888,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::Extension.
+ * for the next update and a list of OpenSSL::X509::Extensions.
  *
  * This should be superseded by BasicResponse#responses and #find_response that
  * return SingleResponse.
@@ -976,7 +977,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
@@ -987,7 +988,7 @@ ossl_ocspbres_find_response(VALUE self, VALUE target)
     OCSP_CERTID *id;
     int n;
 
-    GetOCSPCertId(target, id);
+    SafeGetOCSPCertId(target, id);
     GetOCSPBasicRes(self, bs);
 
     if ((n = OCSP_resp_find(bs, id, -1)) == -1)
@@ -1005,10 +1006,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
@@ -1035,7 +1036,7 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
     if (NIL_P(digest))
 	md = EVP_sha1();
     else
-	md = ossl_evp_get_digestbyname(digest);
+	md = GetDigestPtr(digest);
     if (NIL_P(certs))
 	flg |= OCSP_NOCERTS;
     else
@@ -1052,8 +1053,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)
@@ -1183,7 +1184,7 @@ 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)
@@ -1212,7 +1213,7 @@ ossl_ocspsres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPSingleRes(self, sres_old);
-    GetOCSPSingleRes(other, sres);
+    SafeGetOCSPSingleRes(other, sres);
 
     sres_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_SINGLERESP), sres);
     if (!sres_new)
@@ -1234,10 +1235,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_ seconds of the current time.
+ * to be within +nsec+ 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
@@ -1328,10 +1329,8 @@ 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);
+    return asn1time_to_time(time); /* will handle NULL */
 }
 
 /*
@@ -1349,8 +1348,6 @@ 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);
 }
@@ -1372,8 +1369,6 @@ 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);
 }
@@ -1473,7 +1468,7 @@ ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPCertId(self, cid_old);
-    GetOCSPCertId(other, cid);
+    SafeGetOCSPCertId(other, cid);
 
     cid_new = OCSP_CERTID_dup(cid);
     if (!cid_new)
@@ -1490,13 +1485,14 @@ ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
  *   OpenSSL::OCSP::CertificateId.new(subject, issuer, digest = nil) -> certificate_id
  *   OpenSSL::OCSP::CertificateId.new(der_string)                    -> certificate_id
  *
- * 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.
+ * 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.
  *
  * If only one argument is given, decodes it as DER representation of a
  * certificate ID.
  */
+
 static VALUE
 ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -1521,7 +1517,7 @@ ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 
 	x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
 	x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
-	md = !NIL_P(digest) ? ossl_evp_get_digestbyname(digest) : NULL;
+	md = !NIL_P(digest) ? GetDigestPtr(digest) : NULL;
 
 	newid = OCSP_cert_to_id(md, x509s, x509i);
 	if (!newid)
@@ -1538,7 +1534,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
@@ -1548,7 +1544,7 @@ ossl_ocspcid_cmp(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    GetOCSPCertId(other, id2);
+    SafeGetOCSPCertId(other, id2);
     result = OCSP_id_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
@@ -1558,7 +1554,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.
  */
 
@@ -1569,7 +1565,7 @@ ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    GetOCSPCertId(other, id2);
+    SafeGetOCSPCertId(other, id2);
     result = OCSP_id_issuer_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
@@ -1828,13 +1824,12 @@ Init_ossl_ocsp(void)
 
     cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
     rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
-    rb_define_method(cOCSPReq, "initialize_copy", ossl_ocspreq_initialize_copy, 1);
+    rb_define_copy_func(cOCSPReq, ossl_ocspreq_initialize_copy);
     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);
@@ -1847,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_method(cOCSPRes, "initialize_copy", ossl_ocspres_initialize_copy, 1);
+    rb_define_copy_func(cOCSPRes, ossl_ocspres_initialize_copy);
     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);
@@ -1862,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_method(cOCSPBasicRes, "initialize_copy", ossl_ocspbres_initialize_copy, 1);
+    rb_define_copy_func(cOCSPBasicRes, ossl_ocspbres_initialize_copy);
     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);
@@ -1881,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_method(cOCSPSingleRes, "initialize_copy", ossl_ocspsres_initialize_copy, 1);
+    rb_define_copy_func(cOCSPSingleRes, ossl_ocspsres_initialize_copy);
     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);
@@ -1900,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_method(cOCSPCertId, "initialize_copy", ossl_ocspcid_initialize_copy, 1);
+    rb_define_copy_func(cOCSPCertId, ossl_ocspcid_initialize_copy);
     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_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 4566334481..0b9c7816b5 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -17,6 +17,11 @@
     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))
@@ -67,7 +72,7 @@ ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetPKCS12(self, p12_old);
-    GetPKCS12(other, p12);
+    SafeGetPKCS12(other, p12);
 
     p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12, (char *)p12);
     if (!p12_new)
@@ -84,20 +89,20 @@ ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
  *    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.
+ * * +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.
+ * * +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().
  */
@@ -156,8 +161,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)
@@ -173,7 +178,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);
@@ -232,7 +237,6 @@ 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);
@@ -248,7 +252,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_define_copy_func(cPKCS12, ossl_pkcs12_initialize_copy);
     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
new file mode 100644
index 0000000000..47c5bfa3b8
--- /dev/null
+++ b/ext/openssl/ossl_pkcs5.c
@@ -0,0 +1,180 @@
+/*
+ * 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 >= 1.0.0.
+ *
+ * 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 RFC 2898.
+ */
+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)
+{
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#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 (>= 1.0.0).
+     *
+     * === 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
new file mode 100644
index 0000000000..a3b132bc50
--- /dev/null
+++ b/ext/openssl/ossl_pkcs5.h
@@ -0,0 +1,6 @@
+#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 28010c81fb..fd58b48be8 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -23,6 +23,10 @@
 	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)
@@ -38,6 +42,10 @@
 	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)
@@ -53,6 +61,10 @@
 	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]))
 
@@ -150,7 +162,7 @@ DupPKCS7SignerPtr(VALUE obj)
 {
     PKCS7_SIGNER_INFO *p7si, *pkcs7;
 
-    GetPKCS7si(obj, p7si);
+    SafeGetPKCS7si(obj, p7si);
     if (!(pkcs7 = ossl_PKCS7_SIGNER_INFO_dup(p7si))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
@@ -177,7 +189,7 @@ DupPKCS7RecipientPtr(VALUE obj)
 {
     PKCS7_RECIP_INFO *p7ri, *pkcs7;
 
-    GetPKCS7ri(obj, p7ri);
+    SafeGetPKCS7ri(obj, p7ri);
     if (!(pkcs7 = ossl_PKCS7_RECIP_INFO_dup(p7ri))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
@@ -197,7 +209,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);
@@ -226,10 +238,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);
-    GetPKCS7(pkcs7, p7);
+    SafeGetPKCS7(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);
@@ -266,7 +278,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);
@@ -319,10 +331,10 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 #endif
 
     }
-    else ciph = ossl_evp_get_cipherbyname(cipher);
+    else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
     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);
@@ -373,7 +385,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);
@@ -402,7 +414,7 @@ ossl_pkcs7_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetPKCS7(self, a);
-    GetPKCS7(other, b);
+    SafeGetPKCS7(other, b);
 
     pkcs7 = PKCS7_dup(b);
     if (!pkcs7) {
@@ -525,7 +537,7 @@ ossl_pkcs7_set_cipher(VALUE self, VALUE cipher)
     PKCS7 *pkcs7;
 
     GetPKCS7(self, pkcs7);
-    if (!PKCS7_set_cipher(pkcs7, ossl_evp_get_cipherbyname(cipher))) {
+    if (!PKCS7_set_cipher(pkcs7, GetCipherPtr(cipher))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -765,7 +777,7 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     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);
@@ -783,7 +795,7 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     BIO_free(in);
     sk_X509_pop_free(x509s, X509_free);
     if (ok < 0) ossl_raise(ePKCS7Error, "PKCS7_verify");
-    msg = ERR_reason_error_string(ERR_peek_error());
+    msg = ERR_reason_error_string(ERR_get_error());
     ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
     ossl_clear_error();
     data = ossl_membio2str(out);
@@ -803,9 +815,9 @@ ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
     BIO *out;
     VALUE str;
 
-    rb_scan_args(argc, argv, "12", &pkey, &cert, &flags);
+    rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
     key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
-    x509 = NIL_P(cert) ? NULL : GetX509CertPtr(cert); /* NO NEED TO DUP */
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     GetPKCS7(self, p7);
     if(!(out = BIO_new(BIO_s_mem())))
@@ -832,7 +844,7 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
 	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
 	    ossl_raise(ePKCS7Error, NULL);
     }
-    in = ossl_obj2bio(&data);
+    in = ossl_obj2bio(data);
     if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
     for(;;){
 	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
@@ -921,7 +933,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 = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     GetPKCS7si(self, p7si);
     if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -1042,7 +1054,6 @@ 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);
@@ -1057,7 +1068,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_method(cPKCS7, "initialize_copy", ossl_pkcs7_copy, 1);
+    rb_define_copy_func(cPKCS7, ossl_pkcs7_copy);
     rb_define_method(cPKCS7, "initialize", ossl_pkcs7_initialize, -1);
     rb_define_method(cPKCS7, "type=", ossl_pkcs7_set_type, 1);
     rb_define_method(cPKCS7, "type", ossl_pkcs7_get_type, 0);
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index e1fffb2446..3c7c5e1781 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -20,21 +20,6 @@ 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)
 {
@@ -53,18 +38,11 @@ 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;
 }
 
@@ -72,7 +50,7 @@ void
 ossl_generate_cb_stop(void *ptr)
 {
     struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
-    arg->interrupted = 1;
+    arg->stop = 1;
 }
 
 static void
@@ -92,16 +70,13 @@ const rb_data_type_t ossl_evp_pkey_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-static VALUE
-pkey_new0(EVP_PKEY *pkey)
+VALUE
+ossl_pkey_new(EVP_PKEY *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 (!pkey) {
+	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
+    }
+    switch (EVP_PKEY_base_id(pkey)) {
 #if !defined(OPENSSL_NO_RSA)
     case EVP_PKEY_RSA:
 	return ossl_rsa_new(pkey);
@@ -114,30 +89,36 @@ pkey_new0(EVP_PKEY *pkey)
     case EVP_PKEY_DH:
 	return ossl_dh_new(pkey);
 #endif
-#if !defined(OPENSSL_NO_EC)
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
     case EVP_PKEY_EC:
 	return ossl_ec_new(pkey);
 #endif
     default:
-	obj = NewPKey(cPKey);
-	SetPKey(obj, pkey);
-	return obj;
+	ossl_raise(ePKeyError, "unsupported key type");
     }
+
+    UNREACHABLE;
 }
 
 VALUE
-ossl_pkey_new(EVP_PKEY *pkey)
+ossl_pkey_new_from_file(VALUE filename)
 {
-    VALUE obj;
-    int status;
+    FILE *fp;
+    EVP_PKEY *pkey;
 
-    obj = rb_protect((VALUE (*)(VALUE))pkey_new0, (VALUE)pkey, &status);
-    if (status) {
-	EVP_PKEY_free(pkey);
-	rb_jump_tag(status);
+    rb_check_safe_obj(filename);
+    if (!(fp = fopen(StringValueCStr(filename), "r"))) {
+	ossl_raise(ePKeyError, "%s", strerror(errno));
     }
+    rb_fd_fix_cloexec(fileno(fp));
 
-    return obj;
+    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
+    fclose(fp);
+    if (!pkey) {
+	ossl_raise(ePKeyError, NULL);
+    }
+
+    return ossl_pkey_new(pkey);
 }
 
 /*
@@ -145,15 +126,15 @@ ossl_pkey_new(EVP_PKEY *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
+ * 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
+ * * +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
+ * * +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
+ * * +pwd+ is an optional password in case +string+ or +file+ is an encrypted
  *   PEM resource.
  */
 static VALUE
@@ -166,7 +147,7 @@ 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);
+    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))) {
@@ -185,52 +166,12 @@ ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
     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;
 
-    GetPKey(obj, pkey);
+    SafeGetPKey(obj, pkey);
 
     return pkey;
 }
@@ -243,7 +184,7 @@ GetPrivPKeyPtr(VALUE obj)
     if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
-    GetPKey(obj, pkey);
+    SafeGetPKey(obj, pkey);
 
     return pkey;
 }
@@ -253,7 +194,7 @@ DupPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    GetPKey(obj, pkey);
+    SafeGetPKey(obj, pkey);
     EVP_PKEY_up_ref(pkey);
 
     return pkey;
@@ -282,13 +223,13 @@ 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_eTypeError, "OpenSSL::PKey::PKey can't be instantiated directly");
+	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
     }
     return self;
 }
@@ -297,10 +238,10 @@ ossl_pkey_initialize(VALUE self)
  *  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.
  *
@@ -321,25 +262,20 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
     int result;
 
     pkey = GetPrivPKeyPtr(self);
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     StringValue(data);
-    str = rb_str_new(0, EVP_PKEY_size(pkey));
+    str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
 
     ctx = EVP_MD_CTX_new();
     if (!ctx)
 	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    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");
-    }
+    EVP_SignInit(ctx, md);
+    EVP_SignUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
     result = EVP_SignFinal(ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey);
     EVP_MD_CTX_free(ctx);
     if (!result)
-	ossl_raise(ePKeyError, "EVP_SignFinal");
+	ossl_raise(ePKeyError, NULL);
+    assert((long)buf_len <= RSTRING_LEN(str));
     rb_str_set_len(str, buf_len);
 
     return str;
@@ -349,12 +285,12 @@ 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.
  *
@@ -372,27 +308,19 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     EVP_PKEY *pkey;
     const EVP_MD *md;
     EVP_MD_CTX *ctx;
-    int siglen, result;
+    int result;
 
     GetPKey(self, pkey);
-    ossl_pkey_check_public_key(pkey);
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     StringValue(sig);
-    siglen = RSTRING_LENINT(sig);
     StringValue(data);
 
     ctx = EVP_MD_CTX_new();
     if (!ctx)
 	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    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_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);
     EVP_MD_CTX_free(ctx);
     switch (result) {
     case 0:
@@ -401,8 +329,9 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     case 1:
 	return Qtrue;
     default:
-	ossl_raise(ePKeyError, "EVP_VerifyFinal");
+	ossl_raise(ePKeyError, NULL);
     }
+    return Qnil; /* dummy */
 }
 
 /*
@@ -411,7 +340,6 @@ 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");
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 0db59305f7..218f2ebbae 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -34,17 +34,21 @@ 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 interrupted;
+    int stop;
     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 *);
-void ossl_pkey_check_public_key(const EVP_PKEY *);
+VALUE ossl_pkey_new_from_file(VALUE);
 EVP_PKEY *GetPKeyPtr(VALUE);
 EVP_PKEY *DupPKeyPtr(VALUE);
 EVP_PKEY *GetPrivPKeyPtr(VALUE);
@@ -133,9 +137,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);					\
@@ -163,8 +167,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 bf4e3f9322..938efe1abc 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
@@ -181,15 +181,15 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
  *   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
@@ -222,7 +222,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     }
     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);
@@ -262,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");
@@ -436,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
@@ -460,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(rb_obj_class(self), dh);
+    obj = dh_instance(CLASS_OF(self), dh);
     if (obj == Qfalse) {
 	DH_free(dh);
 	ossl_raise(eDHError, NULL);
@@ -526,7 +526,7 @@ 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
+ * * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
  *   DH#public_key as that contains the DH parameters only.
  */
 static VALUE
@@ -557,7 +557,7 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
  * call-seq:
  *   dh.set_pqg(p, q, g) -> self
  *
- * Sets _p_, _q_, _g_ to the DH instance.
+ * Sets +p+, +q+, +g+ for the DH instance.
  */
 OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
 /*
@@ -565,7 +565,7 @@ OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
  * 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+.
+ * 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)
 
@@ -618,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_method(cDH, "initialize_copy", ossl_dh_initialize_copy, 1);
+    rb_define_copy_func(cDH, ossl_dh_initialize_copy);
     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 56cc9dd4f1..3821cd813c 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -172,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
@@ -195,12 +195,12 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
  *    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
@@ -229,7 +229,7 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     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);
@@ -329,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
@@ -348,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 = ossl_evp_get_cipherbyname(cipher);
+	ciph = GetCipherPtr(cipher);
 	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -491,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(rb_obj_class(self), dsa);
+    obj = dsa_instance(CLASS_OF(self), dsa);
     if (obj == Qfalse) {
 	DSA_free(dsa);
 	ossl_raise(eDSAError, NULL);
@@ -499,16 +499,18 @@ 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)
@@ -533,7 +535,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, DSA_size(dsa));
+    str = rb_str_new(0, ossl_dsa_buf_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) */
@@ -549,11 +551,11 @@ 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)
@@ -590,7 +592,7 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
  * call-seq:
  *   dsa.set_pqg(p, q, g) -> self
  *
- * Sets _p_, _q_, _g_ to the DSA instance.
+ * Sets +p+, +q+, +g+ for the DSA instance.
  */
 OSSL_PKEY_BN_DEF3(dsa, DSA, pqg, p, q, g)
 /*
@@ -598,7 +600,7 @@ OSSL_PKEY_BN_DEF3(dsa, DSA, pqg, p, q, g)
  * 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+.
+ * 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)
 
@@ -627,12 +629,18 @@ 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_method(cDSA, "initialize_copy", ossl_dsa_initialize_copy, 1);
+    rb_define_copy_func(cDSA, ossl_dsa_initialize_copy);
 
     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 8bb611248b..f0a31231b4 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -4,7 +4,7 @@
 
 #include "ossl.h"
 
-#if !defined(OPENSSL_NO_EC)
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
 
 #define EXPORT_PEM 0
 #define EXPORT_DER 1
@@ -23,21 +23,33 @@ static const rb_data_type_t ossl_ec_point_type;
     GetPKeyEC(obj, _pkey); \
     (key) = EVP_PKEY_get0_EC_KEY(_pkey); \
 } while (0)
+#define SafeGetEC(obj, key) do { \
+    OSSL_Check_Kind(obj, cEC); \
+    GetEC(obj, key); \
+} while (0)
 
 #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 SafeGetECGroup(obj, group) do { \
+    OSSL_Check_Kind((obj), cEC_GROUP); \
+    GetECGroup(obj, group); \
+} 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 SafeGetECPoint(obj, point) do { \
+    OSSL_Check_Kind((obj), cEC_POINT); \
+    GetECPoint(obj, point); \
+} while(0)
 #define GetECPointGroup(obj, group) do { \
     VALUE _group = rb_attr_get(obj, id_i_group); \
-    GetECGroup(_group, group); \
+    SafeGetECGroup(_group, group); \
 } while (0)
 
 VALUE cEC;
@@ -116,7 +128,7 @@ ec_key_new_from_group(VALUE arg)
     if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
 	EC_GROUP *group;
 
-	GetECGroup(arg, group);
+	SafeGetECGroup(arg, group);
 	if (!(ec = EC_KEY_new()))
 	    ossl_raise(eECError, NULL);
 
@@ -196,7 +208,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;
 
-	GetEC(arg, other_ec);
+	SafeGetEC(arg, other_ec);
 	if (!(ec = EC_KEY_dup(other_ec)))
 	    ossl_raise(eECError, NULL);
     } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
@@ -205,7 +217,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) {
@@ -245,7 +257,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");
-    GetEC(other, ec);
+    SafeGetEC(other, ec);
 
     ec_new = EC_KEY_dup(ec);
     if (!ec_new)
@@ -263,7 +275,7 @@ ossl_ec_key_initialize_copy(VALUE self, VALUE other)
  *   key.group   => group
  *
  * Returns the EC::Group that the key is associated with. Modifying the returned
- * group does not affect _key_.
+ * group does not affect +key+.
  */
 static VALUE
 ossl_ec_key_get_group(VALUE self)
@@ -284,7 +296,7 @@ ossl_ec_key_get_group(VALUE self)
  *   key.group = group
  *
  * 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.
+ * modifition 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)
@@ -293,7 +305,7 @@ ossl_ec_key_set_group(VALUE self, VALUE group_v)
     EC_GROUP *group;
 
     GetEC(self, ec);
-    GetECGroup(group_v, group);
+    SafeGetECGroup(group_v, group);
 
     if (EC_KEY_set_group(ec, group) != 1)
         ossl_raise(eECError, "EC_KEY_set_group");
@@ -378,7 +390,7 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
 
     GetEC(self, ec);
     if (!NIL_P(public_key))
-        GetECPoint(public_key, point);
+        SafeGetECPoint(public_key, point);
 
     switch (EC_KEY_set_public_key(ec, point)) {
     case 1:
@@ -446,7 +458,7 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
         private = 1;
 
     if (!NIL_P(ciph)) {
-	cipher = ossl_evp_get_cipherbyname(ciph);
+	cipher = GetCipherPtr(ciph);
 	pass = ossl_pem_passwd_value(pass);
     }
 
@@ -490,8 +502,8 @@ 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
+ * 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.
  */
@@ -596,7 +608,7 @@ static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
     VALUE str;
 
     GetEC(self, ec);
-    GetECPoint(pubkey, point);
+    SafeGetECPoint(pubkey, point);
 
 /* BUG: need a way to figure out the maximum string size */
     buf_len = 1024;
@@ -631,10 +643,11 @@ static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
     if (EC_KEY_get0_private_key(ec) == NULL)
 	ossl_raise(eECError, "Private EC key needed!");
 
-    str = rb_str_new(0, ECDSA_size(ec));
+    str = rb_str_new(0, ECDSA_size(ec) + 16);
     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_set_len(str, buf_len);
+         ossl_raise(eECError, "ECDSA_sign");
+
+    rb_str_resize(str, buf_len);
 
     return str;
 }
@@ -712,7 +725,7 @@ ec_group_new(const EC_GROUP *group)
  *
  * Creates a new EC::Group object.
  *
- * _ec_method_ is a symbol that represents an EC_METHOD. Currently the following
+ * +ec_method+ is a symbol that represents an EC_METHOD. Currently the following
  * are supported:
  *
  * * :GFp_simple
@@ -759,11 +772,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;
 
-            GetECGroup(arg1, arg1_group);
+            SafeGetECGroup(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) {
@@ -835,7 +848,7 @@ ossl_ec_group_initialize_copy(VALUE self, VALUE other)
     TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group_new);
     if (group_new)
 	ossl_raise(eEC_GROUP, "EC::Group already initialized");
-    GetECGroup(other, group);
+    SafeGetECGroup(other, group);
 
     group_new = EC_GROUP_dup(group);
     if (!group_new)
@@ -850,15 +863,15 @@ ossl_ec_group_initialize_copy(VALUE self, VALUE other)
  *   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.
+ * 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;
 
     GetECGroup(a, group1);
-    GetECGroup(b, group2);
+    SafeGetECGroup(b, group2);
 
     if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
        return Qfalse;
@@ -891,8 +904,8 @@ static VALUE ossl_ec_group_get_generator(VALUE self)
  * call-seq:
  *   group.set_generator(generator, order, cofactor)   => self
  *
- * Sets the curve parameters. _generator_ must be an instance of EC::Point that
- * is on the curve. _order_ and _cofactor_ are integers.
+ * 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()
  */
@@ -903,7 +916,7 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     const BIGNUM *o, *co;
 
     GetECGroup(self, group);
-    GetECPoint(generator, point);
+    SafeGetECPoint(generator, point);
     o = GetBNPtr(order);
     co = GetBNPtr(cofactor);
 
@@ -1093,49 +1106,42 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
    return ID2SYM(ret);
 }
 
-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.
  *
- * _format_ can be one of these:
+ * +format+ can be one of these:
  *
- * +:compressed+::
+ * :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+::
+ * :uncompressed::
  *   Encoded as z||x||y, where z is an octet 0x04.
- * +:hybrid+::
+ * :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;
+    EC_GROUP *group = NULL;
     point_conversion_form_t form;
+    ID form_id = SYM2ID(form_v);
 
     GetECGroup(self, group);
-    form = parse_point_conversion_form_symbol(form_v);
+
+    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");
+    }
 
     EC_GROUP_set_point_conversion_form(group, form);
 
@@ -1185,7 +1191,7 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
 
 /*
  * call-seq:
- *   group.degree   => integer
+ *   group.degree   => Fixnum
  *
  * See the OpenSSL documentation for EC_GROUP_get_degree()
  */
@@ -1319,62 +1325,77 @@ ec_point_new(const EC_POINT *point, const EC_GROUP *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 [, 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_.
+ *   OpenSSL::PKey::EC::Point.new(group)
+ *   OpenSSL::PKey::EC::Point.new(group, bn)
  *
- * _encoded_point_ is the octet string representation of the point. This
- * must be either a String or an OpenSSL::BN.
+ * See the OpenSSL documentation for EC_POINT_*
  */
 static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v, arg2;
-    const EC_GROUP *group;
+    VALUE arg1, arg2;
+    VALUE group_v = Qnil;
+    const EC_GROUP *group = NULL;
 
     TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point);
     if (point)
-	rb_raise(eEC_POINT, "EC_POINT already initialized");
+        ossl_raise(eEC_POINT, "EC_POINT already initialized");
 
-    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);
-    }
+    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;
 
-    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");
-	    }
-	}
+	    group_v = rb_attr_get(arg1, id_i_group);
+	    SafeGetECGroup(group_v, group);
+	    SafeGetECPoint(arg1, arg_point);
+
+            point = EC_POINT_dup(arg_point, group);
+        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
+            group_v = arg1;
+            SafeGetECGroup(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;
+        SafeGetECGroup(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 */
+
+            BIO_free(in);
+
+            if (point == NULL) {
+                ossl_raise(eEC_POINT, "unknown type for 2nd arg");
+            }
+        }
+        break;
+    default:
+        ossl_raise(rb_eArgError, "wrong number of arguments");
     }
 
+    if (point == NULL)
+        ossl_raise(eEC_POINT, NULL);
+
+    if (NIL_P(group_v))
+        ossl_raise(rb_eRuntimeError, "missing group (internal error)");
+
     RTYPEDDATA_DATA(self) = point;
     rb_ivar_set(self, id_i_group, group_v);
 
@@ -1391,10 +1412,10 @@ ossl_ec_point_initialize_copy(VALUE self, VALUE other)
     TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point_new);
     if (point_new)
 	ossl_raise(eEC_POINT, "EC::Point already initialized");
-    GetECPoint(other, point);
+    SafeGetECPoint(other, point);
 
     group_v = rb_obj_dup(rb_attr_get(other, id_i_group));
-    GetECGroup(group_v, group);
+    SafeGetECGroup(group_v, group);
 
     point_new = EC_POINT_dup(point, group);
     if (!point_new)
@@ -1421,8 +1442,8 @@ static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
         return Qfalse;
 
     GetECPoint(a, point1);
-    GetECPoint(b, point2);
-    GetECGroup(group_v1, group);
+    SafeGetECPoint(b, point2);
+    SafeGetECGroup(group_v1, group);
 
     if (EC_POINT_cmp(group, point1, point2, ossl_bn_ctx) == 1)
         return Qfalse;
@@ -1528,38 +1549,30 @@ static VALUE ossl_ec_point_set_to_infinity(VALUE self)
 
 /*
  * call-seq:
- *    point.to_octet_string(conversion_form) -> String
- *
- * Returns the octet string representation of the elliptic curve point.
+ *   point.to_bn   => OpenSSL::BN
  *
- * _conversion_form_ specifies how the point is converted. Possible values are:
- *
- * - +:compressed+
- * - +:uncompressed+
- * - +:hybrid+
+ *  See the OpenSSL documentation for EC_POINT_point2bn()
  */
-static VALUE
-ossl_ec_point_to_octet_string(VALUE self, VALUE conversion_form)
+static VALUE ossl_ec_point_to_bn(VALUE self)
 {
     EC_POINT *point;
+    VALUE bn_obj;
     const EC_GROUP *group;
     point_conversion_form_t form;
-    VALUE str;
-    size_t len;
+    BIGNUM *bn;
 
     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;
+
+    form = EC_GROUP_get_point_conversion_form(group);
+
+    bn_obj = rb_obj_alloc(cBN);
+    bn = GetBNPtr(bn_obj);
+
+    if (EC_POINT_point2bn(group, point, form, bn, ossl_bn_ctx) == NULL)
+        ossl_raise(eEC_POINT, "EC_POINT_point2bn");
+
+    return bn_obj;
 }
 
 /*
@@ -1570,12 +1583,12 @@ ossl_ec_point_to_octet_string(VALUE self, VALUE conversion_form)
  * 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 omitted, and in that case,
+ * generator of the group of +point+. +bn2+ may be ommitted, 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 omitted. _bns_ must be
- * an array of OpenSSL::BN. _points_ must be an array of
+ * + 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
  * OpenSSL::PKey::EC::Point. Please note that <tt>points[0]</tt> is not
  * multiplied by <tt>bns[0]</tt>, but <tt>bns[1]</tt>.
  */
@@ -1588,7 +1601,7 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
     const BIGNUM *bn_g = NULL;
 
     GetECPoint(self, point_self);
-    GetECGroup(group_v, group);
+    SafeGetECGroup(group_v, group);
 
     result = rb_obj_alloc(cEC_POINT);
     ossl_ec_point_initialize(1, &group_v, result);
@@ -1608,7 +1621,7 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 	 * points  | self    | arg2[0] | arg2[1] | ...
 	 */
 	long i, num;
-	VALUE bns_tmp, tmp_p, tmp_b;
+	VALUE tmp_p, tmp_b;
 	const EC_POINT **points;
 	const BIGNUM **bignums;
 
@@ -1618,18 +1631,14 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 	    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++) {
-	    VALUE item = RARRAY_AREF(arg1, i);
-	    bignums[i] = GetBNPtr(item);
-	    rb_ary_push(bns_tmp, item);
-	}
+	for (i = 0; i < num; i++)
+	    bignums[i] = GetBNPtr(RARRAY_AREF(arg1, i));
 
 	points = ALLOCV_N(const EC_POINT *, tmp_p, num);
 	points[0] = point_self; /* self */
 	for (i = 0; i < num - 1; i++)
-	    GetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
+	    SafeGetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
 
 	if (!NIL_P(arg3))
 	    bn_g = GetBNPtr(arg3);
@@ -1649,7 +1658,6 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 
 void Init_ossl_ec(void)
 {
-#undef rb_intern
 #if 0
     mPKey = rb_define_module_under(mOSSL, "PKey");
     cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
@@ -1700,7 +1708,7 @@ void Init_ossl_ec(void)
 
     rb_define_singleton_method(cEC, "generate", ossl_ec_key_s_generate, 1);
     rb_define_method(cEC, "initialize", ossl_ec_key_initialize, -1);
-    rb_define_method(cEC, "initialize_copy", ossl_ec_key_initialize_copy, 1);
+    rb_define_copy_func(cEC, ossl_ec_key_initialize_copy);
 /* copy/dup/cmp */
 
     rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
@@ -1737,7 +1745,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_method(cEC_GROUP, "initialize_copy", ossl_ec_group_initialize_copy, 1);
+    rb_define_copy_func(cEC_GROUP, ossl_ec_group_initialize_copy);
     rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
     rb_define_alias(cEC_GROUP, "==", "eql?");
 /* copy/dup/cmp */
@@ -1773,7 +1781,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_method(cEC_POINT, "initialize_copy", ossl_ec_point_initialize_copy, 1);
+    rb_define_copy_func(cEC_POINT, ossl_ec_point_initialize_copy);
     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?");
@@ -1785,7 +1793,7 @@ 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_octet_string", ossl_ec_point_to_octet_string, 1);
+    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
     rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1);
 
     id_i_group = rb_intern("@group");
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 4800fb2710..17a7494992 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -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
@@ -236,7 +236,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     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,8 +333,8 @@ 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
+ * 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
@@ -350,7 +350,7 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "02", &cipher, &pass);
 
     if (!NIL_P(cipher)) {
-	ciph = ossl_evp_get_cipherbyname(cipher);
+	ciph = GetCipherPtr(cipher);
 	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -404,12 +404,14 @@ ossl_rsa_to_der(VALUE self)
     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
@@ -427,7 +429,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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_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);
@@ -441,8 +443,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)
@@ -459,7 +461,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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_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);
@@ -473,7 +475,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
@@ -493,7 +495,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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_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);
@@ -507,8 +509,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)
@@ -527,7 +529,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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_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);
@@ -538,196 +540,6 @@ 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!!!
@@ -808,7 +620,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(rb_obj_class(self), rsa);
+    obj = rsa_instance(CLASS_OF(self), rsa);
     if (obj == Qfalse) {
 	RSA_free(rsa);
 	ossl_raise(eRSAError, NULL);
@@ -849,7 +661,7 @@ ossl_rsa_blinding_off(VALUE self)
  * call-seq:
  *   rsa.set_key(n, e, d) -> self
  *
- * Sets _n_, _e_, _d_ for the RSA instance.
+ * Sets +n+, +e+, +d+ for the RSA instance.
  */
 OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d)
 /*
@@ -857,7 +669,7 @@ OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d)
  * call-seq:
  *   rsa.set_factors(p, q) -> self
  *
- * Sets _p_, _q_ for the RSA instance.
+ * Sets +p+, +q+ for the RSA instance.
  */
 OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q)
 /*
@@ -865,7 +677,7 @@ OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q)
  * call-seq:
  *   rsa.set_crt_params(dmp1, dmq1, iqmp) -> self
  *
- * Sets _dmp1_, _dmq1_, _iqmp_ for the RSA instance. They are calculated by
+ * 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.
  */
@@ -896,7 +708,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 infrastructures (PKI)
+     * RFC 3447. It is in widespread use in public key infrastuctures (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.
@@ -907,7 +719,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_method(cRSA, "initialize_copy", ossl_rsa_initialize_copy, 1);
+    rb_define_copy_func(cRSA, ossl_rsa_initialize_copy);
 
     rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
     rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
@@ -921,8 +733,6 @@ 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 c95857060a..688c525afa 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,15 +31,15 @@ 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
  *
@@ -62,7 +62,7 @@ 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)
@@ -79,7 +79,7 @@ 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.
  */
@@ -98,7 +98,7 @@ ossl_rand_write_file(VALUE self, VALUE filename)
  *  call-seq:
  *	random_bytes(length) -> string
  *
- * Generates a String with _length_ number of cryptographically strong
+ * Generates +string+ with +length+ number of cryptographically strong
  * pseudo-random bytes.
  *
  * === Example
@@ -129,7 +129,7 @@ ossl_rand_bytes(VALUE self, VALUE len)
  *  call-seq:
  *	pseudo_bytes(length) -> string
  *
- * Generates a String with _length_ number of pseudo-random bytes.
+ * 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.
@@ -176,9 +176,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
@@ -199,7 +199,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)
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 7996f227b6..053613adae 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -11,6 +11,10 @@
  */
 #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]))
 
 #ifdef _WIN32
@@ -32,8 +36,7 @@ VALUE cSSLSocket;
 static VALUE eSSLErrorWaitReadable;
 static VALUE eSSLErrorWaitWritable;
 
-static ID id_call, ID_callback_state, id_tmp_dh_callback, id_tmp_ecdh_callback,
-	  id_npn_protocols_encoded;
+static ID ID_callback_state;
 static VALUE sym_exception, sym_wait_readable, sym_wait_writable;
 
 static ID id_i_cert_store, id_i_ca_file, id_i_ca_path, id_i_verify_mode,
@@ -46,19 +49,52 @@ static ID id_i_cert_store, id_i_ca_file, id_i_ca_path, id_i_verify_mode,
 	  id_i_verify_hostname;
 static ID id_i_io, id_i_context, id_i_hostname;
 
+/*
+ * 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 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_free(void *ptr)
 {
     SSL_CTX *ctx = ptr;
 #if !defined(HAVE_X509_STORE_UP_REF)
-    if (ctx && SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_store_p))
+    if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
 	ctx->cert_store = NULL;
 #endif
     SSL_CTX_free(ctx);
@@ -76,24 +112,22 @@ static VALUE
 ossl_sslctx_s_alloc(VALUE klass)
 {
     SSL_CTX *ctx;
-    long mode = 0 |
-	SSL_MODE_ENABLE_PARTIAL_WRITE |
-	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
-	SSL_MODE_RELEASE_BUFFERS;
+    long mode = SSL_MODE_ENABLE_PARTIAL_WRITE |
+	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
     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_sslctx_ex_ptr_idx, (void *)obj);
+    SSL_CTX_set_ex_data(ctx, ossl_ssl_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
@@ -110,91 +144,49 @@ 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.set_minmax_proto_version(min, max) -> nil
+ *    ctx.ssl_version = :TLSv1
+ *    ctx.ssl_version = "SSLv23_client"
  *
- * Sets the minimum and maximum supported protocol versions. See #min_version=
- * and #max_version=.
+ * Sets the SSL/TLS protocol version for the context. This forces connections to
+ * use only the specified protocol version.
+ *
+ * You can get a list of valid versions with OpenSSL::SSL::SSLContext::METHODS
  */
 static VALUE
-ossl_sslctx_set_minmax_proto_version(VALUE self, VALUE min_v, VALUE max_v)
+ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
 {
     SSL_CTX *ctx;
-    int min, max;
+    const char *s;
+    VALUE m = ssl_method;
+    int i;
 
     GetSSLCTX(self, ctx);
-    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 (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();
 
-	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);
-    }
+	    if (SSL_CTX_set_ssl_version(ctx, method) != 1)
+		ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
+
+#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;
+        }
+    }
 
-    return Qnil;
+    ossl_raise(rb_eArgError, "unknown SSL method `%"PRIsVALUE"'.", m);
 }
 
 static VALUE
@@ -207,7 +199,7 @@ ossl_call_client_cert_cb(VALUE obj)
     if (NIL_P(cb))
 	return Qnil;
 
-    ary = rb_funcallv(cb, id_call, 1, &obj);
+    ary = rb_funcall(cb, rb_intern("call"), 1, obj);
     Check_Type(ary, T_ARRAY);
     GetX509CertPtr(cert = rb_ary_entry(ary, 0));
     GetPrivPKeyPtr(key = rb_ary_entry(ary, 1));
@@ -231,90 +223,69 @@ ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
     return 1;
 }
 
-#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)
+#if !defined(OPENSSL_NO_DH)
+static VALUE
+ossl_call_tmp_dh_callback(VALUE args)
 {
     VALUE cb, dh;
     EVP_PKEY *pkey;
 
-    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));
+    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);
     pkey = GetPKeyPtr(dh);
-    if (EVP_PKEY_base_id(pkey) != args->type)
-	return NULL;
+    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) return Qfalse;
 
-    return pkey;
+    return dh;
 }
-#endif
 
-#if !defined(OPENSSL_NO_DH)
-static DH *
+static DH*
 ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
-    VALUE rb_ssl;
-    EVP_PKEY *pkey;
-    struct tmp_dh_callback_args args;
-    int state;
+    VALUE args, dh, rb_ssl;
 
     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;
 
-    return EVP_PKEY_get0_DH(pkey);
+    args = rb_ary_new_from_args(3, rb_ssl, INT2NUM(is_export), INT2NUM(keylength));
+
+    dh = rb_protect(ossl_call_tmp_dh_callback, args, NULL);
+    if (!RTEST(dh)) return NULL;
+
+    return EVP_PKEY_get0_DH(GetPKeyPtr(dh));
 }
 #endif /* OPENSSL_NO_DH */
 
 #if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
-static EC_KEY *
-ossl_tmp_ecdh_callback(SSL *ssl, int is_export, int keylength)
+static VALUE
+ossl_call_tmp_ecdh_callback(VALUE args)
 {
-    VALUE rb_ssl;
+    VALUE cb, ecdh;
     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;
+
+    return ecdh;
+}
+
+static EC_KEY*
+ossl_tmp_ecdh_callback(SSL *ssl, int is_export, int keylength)
+{
+    VALUE args, ecdh, rb_ssl;
 
     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 EVP_PKEY_get0_EC_KEY(pkey);
+    args = rb_ary_new_from_args(3, rb_ssl, INT2NUM(is_export), INT2NUM(keylength));
+
+    ecdh = rb_protect(ossl_call_tmp_ecdh_callback, args, NULL);
+    if (!RTEST(ecdh)) return NULL;
+
+    return EVP_PKEY_get0_EC_KEY(GetPKeyPtr(ecdh));
 }
 #endif
 
@@ -376,11 +347,12 @@ 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_funcallv(cb, id_call, 1, &ary);
+    return rb_funcall(cb, rb_intern("call"), 1, ary);
 }
 
+/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
 static SSL_SESSION *
-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
 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)
@@ -388,10 +360,13 @@ 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");
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return NULL;
+    ssl_obj = (VALUE)ptr;
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new((const char *)buf, len));
@@ -404,7 +379,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;
 
-    GetSSLSession(ret_obj, sess);
+    SafeGetSSLSession(ret_obj, sess);
     *copy = 1;
 
     return sess;
@@ -421,7 +396,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_funcallv(cb, id_call, 1, &ary);
+    return rb_funcall(cb, rb_intern("call"), 1, ary);
 }
 
 /* return 1 normal.  return 0 removes the session */
@@ -429,11 +404,14 @@ 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");
 
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return 1;
+    ssl_obj = (VALUE)ptr;
     sess_obj = rb_obj_alloc(cSSLSession);
     SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
@@ -468,25 +446,21 @@ ossl_call_session_remove_cb(VALUE ary)
     cb = rb_attr_get(sslctx_obj, id_i_session_remove_cb);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcallv(cb, id_call, 1, &ary);
+    return rb_funcall(cb, rb_intern("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");
 
-    sslctx_obj = (VALUE)SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_ptr_idx);
+    if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return;
+    sslctx_obj = (VALUE)ptr;
     sess_obj = rb_obj_alloc(cSSLSession);
     SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
@@ -522,6 +496,7 @@ 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)
 {
@@ -534,7 +509,7 @@ ossl_call_servername_cb(VALUE ary)
     cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
     if (NIL_P(cb)) return Qnil;
 
-    ret_obj = rb_funcallv(cb, id_call, 1, &ary);
+    ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
     if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
         SSL *ssl;
         SSL_CTX *ctx2;
@@ -556,13 +531,16 @@ 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;
 
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
+    	return SSL_TLSEXT_ERR_ALERT_FATAL;
+    ssl_obj = (VALUE)ptr;
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new2(servername));
@@ -575,21 +553,26 @@ 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;
 
-    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;
 
-    rb_funcallv(cb, id_call, 1, &ssl_obj);
+    (void) rb_funcall(cb, rb_intern("call"), 1, ssl_obj);
 }
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG) || \
+#if defined(HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB) || \
     defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
 static VALUE
 ssl_npn_encode_protocol_i(VALUE cur, VALUE encoded)
@@ -636,7 +619,7 @@ npn_select_cb_common_i(VALUE tmp)
 	in += l;
     }
 
-    selected = rb_funcallv(args->cb, id_call, 1, &protocols);
+    selected = rb_funcall(args->cb, rb_intern("call"), 1, protocols);
     StringValue(selected);
     len = RSTRING_LEN(selected);
     if (len < 1 || len >= 256) {
@@ -653,11 +636,7 @@ ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out,
 {
     VALUE selected;
     int status;
-    struct npn_select_cb_common_args args;
-
-    args.cb = cb;
-    args.in = in;
-    args.inlen = inlen;
+    struct npn_select_cb_common_args args = { cb, in, inlen };
 
     selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status);
     if (status) {
@@ -674,7 +653,7 @@ ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out,
 }
 #endif
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
+#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
 static int
 ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
 		     void *arg)
@@ -734,11 +713,7 @@ ossl_sslctx_get_options(VALUE self)
 {
     SSL_CTX *ctx;
     GetSSLCTX(self, 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));
+    return LONG2NUM(SSL_CTX_get_options(ctx));
 }
 
 /*
@@ -757,7 +732,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, NUM2ULONG(options));
+	SSL_CTX_set_options(ctx, NUM2LONG(options));
     }
 
     return self;
@@ -821,7 +796,7 @@ 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_sslctx_ex_store_p, ctx);
+        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void *)1);
 #else /* Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2) */
 	X509_STORE_up_ref(store);
 #endif
@@ -892,11 +867,10 @@ ossl_sslctx_setup(VALUE self)
     val = rb_attr_get(self, id_i_verify_depth);
     if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2INT(val));
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
+#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
     val = rb_attr_get(self, id_i_npn_protocols);
     if (!NIL_P(val)) {
 	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 *)encoded);
 	OSSL_Debug("SSL NPN advertise callback added");
     }
@@ -947,11 +921,13 @@ ossl_sslctx_setup(VALUE self)
 	OSSL_Debug("SSL SESSION remove callback added");
     }
 
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
     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;
 }
@@ -988,7 +964,12 @@ 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();
 
@@ -1036,6 +1017,10 @@ 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");
     }
@@ -1190,139 +1175,11 @@ 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)
@@ -1331,7 +1188,7 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
     SSL_SESSION *sess;
 
     GetSSLCTX(self, ctx);
-    GetSSLSession(arg, sess);
+    SafeGetSSLSession(arg, sess);
 
     return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -1340,7 +1197,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)
@@ -1349,7 +1206,7 @@ ossl_sslctx_session_remove(VALUE self, VALUE arg)
     SSL_SESSION *sess;
 
     GetSSLCTX(self, ctx);
-    GetSSLSession(arg, sess);
+    SafeGetSSLSession(arg, sess);
 
     return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -1476,9 +1333,9 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
 
 /*
  *  call-seq:
- *     ctx.flush_sessions(time) -> self
+ *     ctx.flush_sessions(time | nil) -> 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)
@@ -1516,6 +1373,24 @@ ssl_started(SSL *ssl)
 }
 
 static void
+ossl_ssl_shutdown(SSL *ssl)
+{
+    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();
+}
+
+static void
 ossl_ssl_free(void *ssl)
 {
     SSL_free(ssl);
@@ -1540,10 +1415,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 IO 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.
@@ -1603,8 +1478,7 @@ ossl_ssl_setup(VALUE self)
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     rb_io_check_writable(fptr);
-    if (!SSL_set_fd(ssl, TO_SOCKET(fptr->fd)))
-	ossl_raise(eSSLError, "SSL_set_fd");
+    SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
 
     return Qtrue;
 }
@@ -1618,15 +1492,19 @@ ossl_ssl_setup(VALUE self)
 static void
 write_would_block(int nonblock)
 {
-    if (nonblock)
-	ossl_raise(eSSLErrorWaitWritable, "write would block");
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLErrorWaitWritable, "write would block");
+        rb_exc_raise(exc);
+    }
 }
 
 static void
 read_would_block(int nonblock)
 {
-    if (nonblock)
-	ossl_raise(eSSLErrorWaitReadable, "read would block");
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLErrorWaitReadable, "read would block");
+        rb_exc_raise(exc);
+    }
 }
 
 static int
@@ -1646,9 +1524,6 @@ 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);
 
@@ -1672,33 +1547,16 @@ 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->fd);
+            rb_io_wait_writable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_WANT_READ:
             if (no_exception_p(opts)) { return sym_wait_readable; }
             read_would_block(nonblock);
-            rb_io_wait_readable(fptr->fd);
+            rb_io_wait_readable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_SYSCALL:
 	    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));
 	}
@@ -1739,10 +1597,10 @@ ossl_ssl_connect(VALUE self)
  *     retry
  *   end
  *
- * By specifying a keyword argument _exception_ to +false+, you can indicate
+ * By specifying `exception: false`, the options hash allows you to 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)
@@ -1787,10 +1645,10 @@ ossl_ssl_accept(VALUE self)
  *     retry
  *   end
  *
- * By specifying a keyword argument _exception_ to +false+, you can indicate
+ * By specifying `exception: false`, the options hash allows you to 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)
@@ -1819,26 +1677,22 @@ 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);
-	if (RSTRING_LEN(str) >= ilen)
-	    rb_str_modify(str);
-	else
-	    rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
+    if(NIL_P(str)) str = rb_str_new(0, ilen);
+    else{
+        StringValue(str);
+        rb_str_modify(str);
+        rb_str_resize(str, ilen);
     }
-    OBJ_TAINT(str);
-    rb_str_set_len(str, 0);
-    if (ilen == 0)
-	return str;
+    if(ilen == 0) return str;
 
     GetSSL(self, ssl);
     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), ilen);
+	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
 	    switch(ssl_get_error(ssl, nread)){
 	    case SSL_ERROR_NONE:
 		goto end;
@@ -1848,29 +1702,19 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 	    case SSL_ERROR_WANT_WRITE:
 		if (no_exception_p(opts)) { return sym_wait_writable; }
                 write_would_block(nonblock);
-                rb_io_wait_writable(fptr->fd);
+                rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
 		if (no_exception_p(opts)) { return sym_wait_readable; }
                 read_would_block(nonblock);
-                rb_io_wait_readable(fptr->fd);
+                rb_io_wait_readable(FPTR_TO_FD(fptr));
 		continue;
 	    case SSL_ERROR_SYSCALL:
-		if (!ERR_peek_error()) {
-		    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();
-		    }
+		if(ERR_peek_error() == 0 && nread == 0) {
+		    if (no_exception_p(opts)) { return Qnil; }
+		    rb_eof_error();
 		}
+		rb_sys_fail(0);
 	    default:
 		ossl_raise(eSSLError, "SSL_read");
 	    }
@@ -1888,6 +1732,8 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 
   end:
     rb_str_set_len(str, nread);
+    OBJ_TAINT(str);
+
     return str;
 }
 
@@ -1896,7 +1742,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
@@ -1915,7 +1761,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
@@ -1952,12 +1798,12 @@ ossl_ssl_write_internal(VALUE self, VALUE str, 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->fd);
+                rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
 		if (no_exception_p(opts)) { return sym_wait_readable; }
                 read_would_block(nonblock);
-                rb_io_wait_readable(fptr->fd);
+                rb_io_wait_readable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_SYSCALL:
 		if (errno) rb_sys_fail(0);
@@ -1985,7 +1831,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)
@@ -1997,7 +1843,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
@@ -2021,24 +1867,11 @@ 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;
 
-    /*
-     * 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();
+    ossl_ssl_shutdown(ssl);
+
     return Qnil;
 }
 
@@ -2141,21 +1974,22 @@ ossl_ssl_get_version(VALUE self)
 }
 
 /*
- * 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.
- */
+* call-seq:
+*    ssl.cipher => [name, version, bits, alg_bits]
+*
+* The cipher being used for the current connection
+*/
 static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
     SSL *ssl;
-    const SSL_CIPHER *cipher;
+    SSL_CIPHER *cipher;
 
     GetSSL(self, ssl);
-    cipher = SSL_get_current_cipher(ssl);
-    return cipher ? ossl_ssl_cipher_to_ary(cipher) : Qnil;
+
+    cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
+
+    return ossl_ssl_cipher_to_ary(cipher);
 }
 
 /*
@@ -2201,7 +2035,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)
@@ -2226,7 +2060,7 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     SSL_SESSION *sess;
 
     GetSSL(self, ssl);
-    GetSSLSession(arg1, sess);
+    SafeGetSSLSession(arg1, sess);
 
     if (SSL_set_session(ssl, sess) != 1)
         ossl_raise(eSSLError, "SSL_set_session");
@@ -2234,6 +2068,7 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     return arg1;
 }
 
+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
 /*
  * call-seq:
  *    ssl.hostname = hostname -> hostname
@@ -2260,6 +2095,7 @@ ossl_ssl_set_hostname(VALUE self, VALUE arg)
 
     return arg;
 }
+#endif
 
 /*
  * call-seq:
@@ -2303,7 +2139,7 @@ ossl_ssl_get_client_ca_list(VALUE self)
     return ossl_x509name_sk2ary(ca);
 }
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
+# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
 /*
  * call-seq:
  *    ssl.npn_protocol => String | nil
@@ -2379,6 +2215,9 @@ ossl_ssl_tmp_key(VALUE self)
 void
 Init_ossl_ssl(void)
 {
+    int i;
+    VALUE ary;
+
 #if 0
     mOSSL = rb_define_module("OpenSSL");
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
@@ -2386,23 +2225,11 @@ Init_ossl_ssl(void)
     rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
 #endif
 
-    id_call = rb_intern("call");
     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);
-    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
+    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);
 
     /* Document-module: OpenSSL::SSL
      *
@@ -2418,7 +2245,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");
@@ -2450,17 +2277,11 @@ Init_ossl_ssl(void)
 
     /*
      * 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);
 
     /*
      * 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);
 
@@ -2508,12 +2329,12 @@ Init_ossl_ssl(void)
      * 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+, the chain verification is immediately
+     * If the callback returns false, the chain verification is immediately
      * stopped and a bad_certificate alert is then sent.
      */
     rb_attr(cSSLContext, rb_intern("verify_callback"), 1, 1, Qfalse);
@@ -2534,9 +2355,6 @@ Init_ossl_ssl(void)
     /*
      * 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);
 
@@ -2583,7 +2401,7 @@ Init_ossl_ssl(void)
     /*
      * 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);
@@ -2592,14 +2410,20 @@ Init_ossl_ssl(void)
      * 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);
 
+#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
@@ -2623,7 +2447,7 @@ Init_ossl_ssl(void)
      *   end
      */
     rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
-#ifndef OPENSSL_NO_NEXTPROTONEG
+#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
     /*
      * An Enumerable of Strings. Each String represents a protocol to be
      * advertised as the list of supported protocols for Next Protocol
@@ -2689,20 +2513,14 @@ Init_ossl_ssl(void)
 
     rb_define_alias(cSSLContext, "ssl_timeout", "timeout");
     rb_define_alias(cSSLContext, "ssl_timeout=", "timeout=");
-    rb_define_private_method(cSSLContext, "set_minmax_proto_version",
-			     ossl_sslctx_set_minmax_proto_version, 2);
+    rb_define_method(cSSLContext, "ssl_version=", ossl_sslctx_set_ssl_version, 1);
     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
@@ -2762,6 +2580,14 @@ 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
      */
@@ -2795,129 +2621,72 @@ 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
 # 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
-# ifndef OPENSSL_NO_NEXTPROTONEG
+# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
     rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
 # endif
 #endif
 
-    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));
+#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, LONG2NUM(SSL_##x))
 
-    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
-    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
-    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));
+    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);
 #endif
-    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));
+#if defined(SSL_OP_NO_TLSv1_2)
+    ossl_ssl_def_const(OP_NO_TLSv1_2);
 #endif
-
-    /* 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));
+#if defined(SSL_OP_NO_TICKET)
+    ossl_ssl_def_const(OP_NO_TICKET);
 #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));
+#if defined(SSL_OP_NO_COMPRESSION)
+    ossl_ssl_def_const(OP_NO_COMPRESSION);
 #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);
 
     sym_exception = ID2SYM(rb_intern("exception"));
     sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
     sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
 
-    id_tmp_dh_callback = rb_intern("tmp_dh_callback");
-    id_tmp_ecdh_callback = rb_intern("tmp_ecdh_callback");
-    id_npn_protocols_encoded = rb_intern("npn_protocols_encoded");
-
 #define DefIVarID(name) do \
     id_i_##name = rb_intern("@"#name); while (0)
 
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index 535c56097c..c1a3cd6c1d 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -24,6 +24,11 @@
 	} \
 } 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 5514087387..fb7c0fb611 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -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);
 
@@ -80,7 +80,7 @@ ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     sess = RTYPEDDATA_DATA(self); /* XXX */
-    GetSSLSession(other, sess_other);
+    SafeGetSSLSession(other, sess_other);
 
     sess_new = ASN1_dup((i2d_of_void *)i2d_SSL_SESSION, (d2i_of_void *)d2i_SSL_SESSION,
 			(char *)sess_other);
@@ -93,36 +93,43 @@ ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
     return self;
 }
 
-static int
-ossl_SSL_SESSION_cmp(const SSL_SESSION *a, const SSL_SESSION *b)
+#if HAVE_SSL_SESSION_CMP == 0
+int 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 (SSL_SESSION_get_protocol_version(a) != SSL_SESSION_get_protocol_version(b))
+#if !defined(HAVE_OPAQUE_OPENSSL) /* missing SSL_SESSION_get_ssl_version() ? */
+    if (a->ssl_version != b->ssl_version)
 	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
  *
- * Returns +true+ if the two Session is the same, +false+ if not.
+ * 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);
-	GetSSLSession(val2, ctx2);
+	SafeGetSSLSession(val2, ctx2);
 
-	switch (ossl_SSL_SESSION_cmp(ctx1, ctx2)) {
+	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
 	case 0:		return Qtrue;
 	default:	return Qfalse;
 	}
@@ -134,18 +141,19 @@ static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
  *
  * Returns the time at which the session was established.
  */
-static VALUE
-ossl_ssl_session_get_time(VALUE self)
+static VALUE ossl_ssl_session_get_time(VALUE self)
 {
-    SSL_SESSION *ctx;
-    long t;
+	SSL_SESSION *ctx;
+	time_t t;
 
-    GetSSLSession(self, ctx);
-    t = SSL_SESSION_get_time(ctx);
-    if (t == 0)
-	return Qnil;
+	GetSSLSession(self, ctx);
+
+	t = SSL_SESSION_get_time(ctx);
 
-    return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
+	if (t == 0)
+		return Qnil;
+
+	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
 }
 
 /*
@@ -156,16 +164,16 @@ ossl_ssl_session_get_time(VALUE self)
  * established time.
  *
  */
-static VALUE
-ossl_ssl_session_get_timeout(VALUE self)
+static VALUE ossl_ssl_session_get_timeout(VALUE self)
 {
-    SSL_SESSION *ctx;
-    long t;
+	SSL_SESSION *ctx;
+	time_t t;
+
+	GetSSLSession(self, ctx);
 
-    GetSSLSession(self, ctx);
-    t = SSL_SESSION_get_timeout(ctx);
+	t = SSL_SESSION_get_timeout(ctx);
 
-    return LONG2NUM(t);
+	return TIMET2NUM(t);
 }
 
 /*
@@ -262,6 +270,9 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
 {
 	SSL_SESSION *ctx;
 	BIO *out;
+	BUF_MEM *buf;
+	VALUE str;
+	int i;
 
 	GetSSLSession(self, ctx);
 
@@ -269,13 +280,16 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
 		ossl_raise(eSSLSession, "BIO_s_mem()");
 	}
 
-	if (!PEM_write_bio_SSL_SESSION(out, ctx)) {
+	if (!(i=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 ossl_membio2str(out);
+	return str;
 }
 
 
@@ -289,6 +303,8 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
 {
 	SSL_SESSION *ctx;
 	BIO *out;
+	BUF_MEM *buf;
+	VALUE str;
 
 	GetSSLSession(self, ctx);
 
@@ -301,7 +317,11 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	return ossl_membio2str(out);
+	BIO_get_mem_ptr(out, &buf);
+	str = rb_str_new(buf->data, buf->length);
+	BIO_free(out);
+
+	return str;
 }
 
 
@@ -317,7 +337,7 @@ void Init_ossl_ssl_session(void)
 
 	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_copy_func(cSSLSession, ossl_ssl_session_initialize_copy);
 
 	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
 
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index c162f8c2a8..1744c1cac4 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -10,6 +10,6 @@
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "2.1.2"
+#define OSSL_VERSION "2.0.0"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
index 8a061b0687..19ec274ae1 100644
--- a/ext/openssl/ossl_x509.c
+++ b/ext/openssl/ossl_x509.c
@@ -20,10 +20,15 @@ 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
@@ -107,15 +112,21 @@ Init_ossl_x509(void)
     DefX509Const(V_FLAG_INHIBIT_MAP);
     /* Set by Store#flags= and StoreContext#flags=. */
     DefX509Const(V_FLAG_NOTIFY_POLICY);
+#if defined(X509_V_FLAG_EXTENDED_CRL_SUPPORT)
     /* Set by Store#flags= and StoreContext#flags=. Enables some additional
      * features including support for indirect signed CRLs. */
     DefX509Const(V_FLAG_EXTENDED_CRL_SUPPORT);
+#endif
+#if defined(X509_V_FLAG_USE_DELTAS)
     /* Set by Store#flags= and StoreContext#flags=. Uses delta CRLs. If not
      * specified, deltas are ignored. */
     DefX509Const(V_FLAG_USE_DELTAS);
+#endif
+#if defined(X509_V_FLAG_CHECK_SS_SIGNATURE)
     /* Set by Store#flags= and StoreContext#flags=. Enables checking of the
      * signature of the root self-signed CA. */
     DefX509Const(V_FLAG_CHECK_SS_SIGNATURE);
+#endif
 #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.
@@ -150,8 +161,10 @@ Init_ossl_x509(void)
     DefX509Const(PURPOSE_ANY);
     /* Set by Store#purpose=. OCSP helper. */
     DefX509Const(PURPOSE_OCSP_HELPER);
+#if defined(X509_PURPOSE_TIMESTAMP_SIGN)
     /* Set by Store#purpose=. Time stamps signer. */
     DefX509Const(PURPOSE_TIMESTAMP_SIGN);
+#endif
 
     DefX509Const(TRUST_COMPAT);
     DefX509Const(TRUST_SSL_CLIENT);
@@ -160,7 +173,9 @@ Init_ossl_x509(void)
     DefX509Const(TRUST_OBJECT_SIGN);
     DefX509Const(TRUST_OCSP_SIGN);
     DefX509Const(TRUST_OCSP_REQUEST);
+#if defined(X509_TRUST_TSA)
     DefX509Const(TRUST_TSA);
+#endif
 
     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 4fadfa6b82..c26da73897 100644
--- a/ext/openssl/ossl_x509.h
+++ b/ext/openssl/ossl_x509.h
@@ -41,6 +41,7 @@ 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);
@@ -53,6 +54,7 @@ extern VALUE eX509CRLError;
 
 VALUE ossl_x509crl_new(X509_CRL *);
 X509_CRL *GetX509CRLPtr(VALUE);
+X509_CRL *DupX509CRLPtr(VALUE);
 void Init_ossl_x509crl(void);
 
 /*
@@ -82,7 +84,9 @@ 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);
 
 /*
@@ -102,14 +106,14 @@ extern VALUE cX509Store;
 extern VALUE cX509StoreContext;
 extern VALUE eX509StoreError;
 
+VALUE ossl_x509store_new(X509_STORE *);
 X509_STORE *GetX509StorePtr(VALUE);
+X509_STORE *DupX509StorePtr(VALUE);
 
-void Init_ossl_x509store(void);
+VALUE ossl_x509stctx_new(X509_STORE_CTX *);
+VALUE ossl_x509stctx_clear_ptr(VALUE);
+X509_STORE_CTX *GetX509StCtxtPtr(VALUE);
 
-/*
- * 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 *);
+void Init_ossl_x509store(void);
 
 #endif /* _OSSL_X509_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 60846cfe9d..ae0b347b5f 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -23,6 +23,10 @@
 	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,7 +76,7 @@ GetX509AttrPtr(VALUE obj)
 {
     X509_ATTRIBUTE *attr;
 
-    GetX509Attr(obj, attr);
+    SafeGetX509Attr(obj, attr);
 
     return attr;
 }
@@ -130,7 +134,7 @@ ossl_x509attr_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetX509Attr(self, attr);
-    GetX509Attr(other, attr_other);
+    SafeGetX509Attr(other, attr_other);
 
     attr_new = X509_ATTRIBUTE_dup(attr_other);
     if (!attr_new)
@@ -315,7 +319,7 @@ Init_ossl_x509attr(void)
     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_copy_func(cX509Attr, ossl_x509attr_initialize_copy);
     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 40542c4a78..ad1126d465 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -23,6 +23,10 @@
 	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
@@ -67,12 +71,46 @@ 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;
 
-    GetX509(obj, x509);
+    SafeGetX509(obj, x509);
 
     return x509;
 }
@@ -82,7 +120,7 @@ DupX509CertPtr(VALUE obj)
 {
     X509 *x509;
 
-    GetX509(obj, x509);
+    SafeGetX509(obj, x509);
 
     X509_up_ref(x509);
 
@@ -123,7 +161,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) {
@@ -146,7 +184,7 @@ ossl_x509_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetX509(self, a);
-    GetX509(other, b);
+    SafeGetX509(other, b);
 
     x509 = X509_dup(b);
     if (!x509) ossl_raise(eX509CertError, NULL);
@@ -440,7 +478,7 @@ ossl_x509_set_not_before(VALUE self, VALUE time)
 
     GetX509(self, x509);
     asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_set1_notBefore(x509, asn1time)) {
+    if (!X509_set_notBefore(x509, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CertError, "X509_set_notBefore");
     }
@@ -479,7 +517,7 @@ ossl_x509_set_not_after(VALUE self, VALUE time)
 
     GetX509(self, x509);
     asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_set1_notAfter(x509, asn1time)) {
+    if (!X509_set_notAfter(x509, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CertError, "X509_set_notAfter");
     }
@@ -508,19 +546,18 @@ ossl_x509_get_public_key(VALUE self)
 
 /*
  * call-seq:
- *    cert.public_key = key
+ *    cert.public_key = key => key
  */
 static VALUE
 ossl_x509_set_public_key(VALUE self, VALUE key)
 {
     X509 *x509;
-    EVP_PKEY *pkey;
 
     GetX509(self, x509);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
-    if (!X509_set_pubkey(x509, pkey))
-	ossl_raise(eX509CertError, "X509_set_pubkey");
+    if (!X509_set_pubkey(x509, GetPKeyPtr(key))) { /* DUPs pkey */
+	ossl_raise(eX509CertError, NULL);
+    }
+
     return key;
 }
 
@@ -536,7 +573,7 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     GetX509(self, x509);
     if (!X509_sign(x509, pkey, md)) {
 	ossl_raise(eX509CertError, NULL);
@@ -549,8 +586,7 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
  * call-seq:
  *    cert.verify(key) => true | false
  *
- * Verifies the signature of the certificate, with the public key _key_. _key_
- * must be an instance of OpenSSL::PKey.
+ * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
  */
 static VALUE
 ossl_x509_verify(VALUE self, VALUE key)
@@ -558,9 +594,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;
@@ -574,10 +610,9 @@ ossl_x509_verify(VALUE self, VALUE key)
 
 /*
  * call-seq:
- *    cert.check_private_key(key) -> true | false
+ *    cert.check_private_key(key)
  *
- * Returns +true+ if _key_ is the corresponding private key to the Subject
- * Public Key Information, +false+ otherwise.
+ * Checks if 'key' is PRIV key for this cert
  */
 static VALUE
 ossl_x509_check_private_key(VALUE self, VALUE key)
@@ -589,7 +624,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_clear_error();
+	OSSL_Warning("Check private key:%s", OSSL_ErrMsg());
 	return Qfalse;
     }
 
@@ -685,26 +720,6 @@ 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
@@ -814,7 +829,7 @@ Init_ossl_x509cert(void)
 
     rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
     rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
-    rb_define_method(cX509Cert, "initialize_copy", ossl_x509_copy, 1);
+    rb_define_copy_func(cX509Cert, ossl_x509_copy);
 
     rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
     rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
@@ -842,5 +857,4 @@ 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 b0badf45c4..0ff5d2f8ea 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -23,6 +23,10 @@
 	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
@@ -52,7 +56,18 @@ GetX509CRLPtr(VALUE obj)
 {
     X509_CRL *crl;
 
-    GetX509CRL(obj, crl);
+    SafeGetX509CRL(obj, crl);
+
+    return crl;
+}
+
+X509_CRL *
+DupX509CRLPtr(VALUE obj)
+{
+    X509_CRL *crl;
+
+    SafeGetX509CRL(obj, crl);
+    X509_CRL_up_ref(crl);
 
     return crl;
 }
@@ -100,7 +115,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) {
@@ -122,7 +137,7 @@ ossl_x509crl_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509CRL(self, a);
-    GetX509CRL(other, b);
+    SafeGetX509CRL(other, b);
     if (!(crl = X509_CRL_dup(b))) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -167,6 +182,8 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
     X509_CRL *crl;
     const X509_ALGOR *alg;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -177,8 +194,10 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-
-    return ossl_membio2str(out);
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
 }
 
 static VALUE
@@ -208,14 +227,10 @@ 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(time);
+    return asn1time_to_time(X509_CRL_get0_lastUpdate(crl));
 }
 
 static VALUE
@@ -226,7 +241,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time)
 
     GetX509CRL(self, crl);
     asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_CRL_set1_lastUpdate(crl, asn1time)) {
+    if (!X509_CRL_set_lastUpdate(crl, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
     }
@@ -239,14 +254,10 @@ 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(time);
+    return asn1time_to_time(X509_CRL_get0_nextUpdate(crl));
 }
 
 static VALUE
@@ -257,7 +268,7 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time)
 
     GetX509CRL(self, crl);
     asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_CRL_set1_nextUpdate(crl, asn1time)) {
+    if (!X509_CRL_set_nextUpdate(crl, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
     }
@@ -347,7 +358,7 @@ ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509CRL(self, crl);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     if (!X509_CRL_sign(crl, pkey, md)) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -359,12 +370,9 @@ static VALUE
 ossl_x509crl_verify(VALUE self, VALUE key)
 {
     X509_CRL *crl;
-    EVP_PKEY *pkey;
 
     GetX509CRL(self, crl);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
-    switch (X509_CRL_verify(crl, pkey)) {
+    switch (X509_CRL_verify(crl, GetPKeyPtr(key))) {
       case 1:
 	return Qtrue;
       case 0:
@@ -380,6 +388,8 @@ 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()))) {
@@ -389,8 +399,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -398,6 +411,8 @@ 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()))) {
@@ -407,8 +422,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -416,6 +434,8 @@ 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()))) {
@@ -425,8 +445,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 /*
@@ -516,7 +539,7 @@ Init_ossl_x509crl(void)
 
     rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
     rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
-    rb_define_method(cX509CRL, "initialize_copy", ossl_x509crl_copy, 1);
+    rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
 
     rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
     rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index 30ec09d7a3..b92b0786b2 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -23,6 +23,10 @@
 	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)))) \
@@ -86,7 +90,7 @@ GetX509ExtPtr(VALUE obj)
 {
     X509_EXTENSION *ext;
 
-    GetX509Ext(obj, ext);
+    SafeGetX509Ext(obj, ext);
 
     return ext;
 }
@@ -259,15 +263,15 @@ ossl_x509ext_alloc(VALUE klass)
 
 /*
  * call-seq:
- *    OpenSSL::X509::Extension.new(der)
- *    OpenSSL::X509::Extension.new(oid, value)
- *    OpenSSL::X509::Extension.new(oid, value, critical)
+ *    OpenSSL::X509::Extension.new asn1
+ *    OpenSSL::X509::Extension.new name, value
+ *    OpenSSL::X509::Extension.new name, value, critical
  *
  * Creates an X509 extension.
  *
- * 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.
+ * 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.
  */
 static VALUE
 ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
@@ -301,7 +305,7 @@ ossl_x509ext_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetX509Ext(self, ext);
-    GetX509Ext(other, ext_other);
+    SafeGetX509Ext(other, ext_other);
 
     ext_new = X509_EXTENSION_dup(ext_other);
     if (!ext_new)
@@ -437,7 +441,6 @@ 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);
@@ -466,7 +469,7 @@ Init_ossl_x509ext(void)
     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_copy_func(cX509Ext, ossl_x509ext_initialize_copy);
     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);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 1ea8400dbb..abbdc3b11e 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -23,6 +23,10 @@
 	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"))
@@ -77,7 +81,7 @@ GetX509NamePtr(VALUE obj)
 {
     X509_NAME *name;
 
-    GetX509Name(obj, name);
+    SafeGetX509Name(obj, name);
 
     return name;
 }
@@ -131,15 +135,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
@@ -184,7 +188,7 @@ ossl_x509name_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetX509Name(self, name);
-    GetX509Name(other, name_other);
+    SafeGetX509Name(other, name_other);
 
     name_new = X509_NAME_dup(name_other);
     if (!name_new)
@@ -198,9 +202,9 @@ ossl_x509name_initialize_copy(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    name.add_entry(oid, value [, type], loc: -1, set: 0) => self
+ *    name.add_entry(oid, value [, type]) => 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
@@ -209,39 +213,24 @@ ossl_x509name_initialize_copy(VALUE self, VALUE other)
  * 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, opts, kwargs[2];
-    static ID kwargs_ids[2];
+    VALUE oid, value, type;
     const char *oid_name;
-    int loc = -1, set = 0;
 
-    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);
+    rb_scan_args(argc, argv, "21", &oid, &value, &type);
     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),
-				    (unsigned char *)RSTRING_PTR(value),
-				    RSTRING_LENINT(value), loc, set))
-	ossl_raise(eX509NameError, "X509_NAME_add_entry_by_txt");
+		(const unsigned char *)RSTRING_PTR(value), RSTRING_LENINT(value), -1, 0)) {
+	ossl_raise(eX509NameError, NULL);
+    }
+
     return self;
 }
 
@@ -250,83 +239,52 @@ ossl_x509name_to_s_old(VALUE self)
 {
     X509_NAME *name;
     char *buf;
+    VALUE str;
 
     GetX509Name(self, name);
     buf = X509_NAME_oneline(name, NULL, 0);
-    if (!buf)
-	ossl_raise(eX509NameError, "X509_NAME_oneline");
-    return ossl_buf2str(buf, rb_long2int(strlen(buf)));
-}
-
-static VALUE
-x509name_print(VALUE self, unsigned long iflag)
-{
-    X509_NAME *name;
-    BIO *out;
-    int ret;
+    str = rb_str_new2(buf);
+    OPENSSL_free(buf);
 
-    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);
+    return str;
 }
 
 /*
  * call-seq:
- *    name.to_s         -> string
- *    name.to_s(format) -> string
+ *    name.to_s => string
+ *    name.to_s(flags) => string
  *
- * Returns a String representation of the Distinguished Name. _format_ is
- * one of:
+ * Returns this name as a Distinguished Name string.  +flags+ may be 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)
 {
-    rb_check_arity(argc, 0, 1);
-    /* name.to_s(nil) was allowed */
-    if (!argc || NIL_P(argv[0]))
+    X509_NAME *name;
+    VALUE flag, str;
+    BIO *out;
+    unsigned long iflag;
+
+    rb_scan_args(argc, argv, "01", &flag);
+    if (NIL_P(flag))
 	return ossl_x509name_to_s_old(self);
-    else
-	return x509name_print(self, NUM2ULONG(argv[0]));
-}
+    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);
 
-/*
- * 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], ...]
@@ -380,18 +338,18 @@ ossl_x509name_cmp0(VALUE self, VALUE other)
     X509_NAME *name1, *name2;
 
     GetX509Name(self, name1);
-    GetX509Name(other, name2);
+    SafeGetX509Name(other, name2);
 
     return X509_NAME_cmp(name1, name2);
 }
 
 /*
  * call-seq:
- *    name.cmp(other) -> -1 | 0 | 1
- *    name <=> other  -> -1 | 0 | 1
+ *    name.cmp other => integer
+ *    name.<=> other => integer
  *
- * 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.
  */
 static VALUE
 ossl_x509name_cmp(VALUE self, VALUE other)
@@ -400,24 +358,26 @@ ossl_x509name_cmp(VALUE self, VALUE other)
 
     result = ossl_x509name_cmp0(self, other);
     if (result < 0) return INT2FIX(-1);
-    if (result > 0) return INT2FIX(1);
+    if (result > 1) return INT2FIX(1);
 
     return INT2FIX(0);
 }
 
 /*
  * call-seq:
- *   name.eql?(other) -> true | false
+ *   name.eql? other => boolean
  *
- * 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)
 {
-    if (!rb_obj_is_kind_of(other, cX509Name))
-	return Qfalse;
+    int result;
+
+    if(CLASS_OF(other) != cX509Name) return Qfalse;
+    result = ossl_x509name_cmp0(self, other);
 
-    return ossl_x509name_cmp0(self, other) == 0 ? Qtrue : Qfalse;
+    return (result == 0) ? Qtrue : Qfalse;
 }
 
 /*
@@ -440,6 +400,7 @@ ossl_x509name_hash(VALUE self)
     return ULONG2NUM(hash);
 }
 
+#ifdef HAVE_X509_NAME_HASH_OLD
 /*
  * call-seq:
  *    name.hash_old => integer
@@ -458,6 +419,7 @@ ossl_x509name_hash_old(VALUE self)
 
     return ULONG2NUM(hash);
 }
+#endif
 
 /*
  * call-seq:
@@ -502,7 +464,6 @@ ossl_x509name_to_der(VALUE self)
 void
 Init_ossl_x509name(void)
 {
-#undef rb_intern
     VALUE utf8str, ptrstr, ia5str, hash;
 
 #if 0
@@ -519,17 +480,17 @@ 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_copy_func(cX509Name, ossl_x509name_initialize_copy);
     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);
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 2c20042a92..d2619971d1 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -23,6 +23,10 @@
 	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
@@ -47,16 +51,49 @@ 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;
 
-    GetX509Req(obj, req);
+    SafeGetX509Req(obj, req);
 
     return req;
 }
 
+X509_REQ *
+DupX509ReqPtr(VALUE obj)
+{
+    X509_REQ *req, *new;
+
+    SafeGetX509Req(obj, req);
+    if (!(new = X509_REQ_dup(req))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return new;
+}
+
 /*
  * Private functions
  */
@@ -86,7 +123,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) {
@@ -108,7 +145,7 @@ ossl_x509req_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509Req(self, a);
-    GetX509Req(other, b);
+    SafeGetX509Req(other, b);
     if (!(req = X509_REQ_dup(b))) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -123,6 +160,8 @@ 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()))) {
@@ -132,8 +171,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -161,6 +203,8 @@ 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()))) {
@@ -170,8 +214,11 @@ 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 ossl_membio2str(out);
+    return str;
 }
 
 #if 0
@@ -257,6 +304,8 @@ ossl_x509req_get_signature_algorithm(VALUE self)
     X509_REQ *req;
     const X509_ALGOR *alg;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509Req(self, req);
 
@@ -268,8 +317,10 @@ ossl_x509req_get_signature_algorithm(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
-
-    return ossl_membio2str(out);
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
 }
 
 static VALUE
@@ -293,10 +344,11 @@ ossl_x509req_set_public_key(VALUE self, VALUE key)
     EVP_PKEY *pkey;
 
     GetX509Req(self, req);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
-    if (!X509_REQ_set_pubkey(req, pkey))
-	ossl_raise(eX509ReqError, "X509_REQ_set_pubkey");
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
+    if (!X509_REQ_set_pubkey(req, pkey)) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
     return key;
 }
 
@@ -309,7 +361,7 @@ ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509Req(self, req);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    md = GetDigestPtr(digest);
     if (!X509_REQ_sign(req, pkey, md)) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -327,8 +379,7 @@ ossl_x509req_verify(VALUE self, VALUE key)
     EVP_PKEY *pkey;
 
     GetX509Req(self, req);
-    pkey = GetPKeyPtr(key);
-    ossl_pkey_check_public_key(pkey);
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     switch (X509_REQ_verify(req, pkey)) {
       case 1:
 	return Qtrue;
@@ -420,7 +471,7 @@ Init_ossl_x509req(void)
 
     rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
     rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
-    rb_define_method(cX509Req, "initialize_copy", ossl_x509req_copy, 1);
+    rb_define_copy_func(cX509Req, ossl_x509req_copy);
 
     rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
     rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 5fe6853430..7960ea349e 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -23,6 +23,10 @@
 	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
@@ -72,7 +76,7 @@ DupX509RevokedPtr(VALUE obj)
 {
     X509_REVOKED *rev, *new;
 
-    GetX509Rev(obj, rev);
+    SafeGetX509Rev(obj, rev);
     if (!(new = X509_REVOKED_dup(rev))) {
 	ossl_raise(eX509RevError, NULL);
     }
@@ -112,7 +116,7 @@ ossl_x509revoked_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetX509Rev(self, rev);
-    GetX509Rev(other, rev_other);
+    SafeGetX509Rev(other, rev_other);
 
     rev_new = X509_REVOKED_dup(rev_other);
     if (!rev_new)
@@ -155,14 +159,10 @@ 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(time);
+    return asn1time_to_time(X509_REVOKED_get0_revocationDate(rev));
 }
 
 static VALUE
@@ -249,26 +249,6 @@ ossl_x509revoked_add_extension(VALUE self, VALUE ext)
     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
  */
@@ -287,7 +267,7 @@ Init_ossl_x509revoked(void)
 
     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_copy_func(cX509Rev, ossl_x509revoked_initialize_copy);
 
     rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
     rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
@@ -296,5 +276,4 @@ 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 2909eeda17..75f8238b01 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -23,6 +23,10 @@
 	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)
@@ -38,65 +42,10 @@
 	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
     } \
 } 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;
-}
+#define SafeGetX509StCtx(obj, storep) do { \
+    OSSL_Check_Kind((obj), cX509StoreContext); \
+    GetX509Store((obj), (ctx)); \
+} while (0)
 
 /*
  * Classes
@@ -122,12 +71,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;
 
-    GetX509Store(obj, store);
+    SafeGetX509Store(obj, store);
+
+    return store;
+}
+
+X509_STORE *
+DupX509StorePtr(VALUE obj)
+{
+    X509_STORE *store;
+
+    SafeGetX509Store(obj, store);
+    X509_STORE_up_ref(store);
 
     return store;
 }
@@ -140,10 +111,9 @@ x509store_verify_cb(int ok, X509_STORE_CTX *ctx)
 {
     VALUE proc;
 
-    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, stctx_ex_verify_cb_idx);
+    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),
-					     store_ex_verify_cb_idx);
+	proc = (VALUE)X509_STORE_get_ex_data(X509_STORE_CTX_get0_store(ctx), ossl_store_ex_verify_cb_idx);
     if (!proc)
 	return ok;
 
@@ -174,7 +144,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     X509_STORE *store;
 
     GetX509Store(self, store);
-    X509_STORE_set_ex_data(store, store_ex_verify_cb_idx, (void *)cb);
+    X509_STORE_set_ex_data(store, ossl_store_ex_verify_cb_idx, (void *)cb);
     rb_iv_set(self, "@verify_callback", cb);
 
     return cb;
@@ -212,9 +182,9 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   store.flags = flags
+ *   store.flags = flag
  *
- * Sets _flags_ to the Store. _flags_ consists of zero or more of the constants
+ * Sets +flag+ to the Store. +flag+ consists of zero or more of the constants
  * defined in with name V_FLAG_* or'ed together.
  */
 static VALUE
@@ -233,7 +203,7 @@ ossl_x509store_set_flags(VALUE self, VALUE flags)
  * call-seq:
  *   store.purpose = purpose
  *
- * Sets the store's purpose to _purpose_. If specified, the verifications on
+ * 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:
  *
@@ -292,9 +262,8 @@ ossl_x509store_set_time(VALUE self, VALUE time)
  * call-seq:
  *   store.add_file(file) -> self
  *
- * 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.
+ * Adds the certificates in +file+ to the certificate store.  The +file+ can
+ * contain multiple PEM-encoded certificates.
  */
 static VALUE
 ossl_x509store_add_file(VALUE self, VALUE file)
@@ -313,15 +282,6 @@ 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;
 }
@@ -330,7 +290,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
  * call-seq:
  *   store.add_path(path) -> self
  *
- * Adds _path_ as the hash dir to be looked up by the store.
+ * Adds +path+ as the hash dir to be looked up by the store.
  */
 static VALUE
 ossl_x509store_add_path(VALUE self, VALUE dir)
@@ -357,7 +317,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
  * call-seq:
  *   store.set_default_paths
  *
- * Configures _store_ to look up CA certificates from the system default
+ * 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:
  *
@@ -381,7 +341,7 @@ 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)
@@ -402,7 +362,7 @@ ossl_x509store_add_cert(VALUE self, VALUE arg)
  * call-seq:
  *   store.add_crl(crl) -> self
  *
- * Adds the OpenSSL::X509::CRL _crl_ to the store.
+ * Adds the OpenSSL::X509::CRL +crl+ to the store.
  */
 static VALUE
 ossl_x509store_add_crl(VALUE self, VALUE arg)
@@ -427,15 +387,15 @@ 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_.
+ * Performs a certificate verification on the OpenSSL::X509::Certificate +cert+.
  *
- * _chain_ can be an array of OpenSSL::X509::Certificate that is used to
+ * +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
+ * #error, #error_string, and the resuting complete certificate chain can be
  * retrieved by #chain.
  */
 static VALUE
@@ -472,6 +432,27 @@ static const rb_data_type_t ossl_x509stctx_type = {
     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)
+{
+    OSSL_Check_Kind(obj, cX509StoreContext);
+    RDATA(obj)->data = NULL;
+
+    return obj;
+}
+
 /*
  * Private functions
  */
@@ -501,17 +482,6 @@ 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);
@@ -532,7 +502,7 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "12", &store, &cert, &chain);
     GetX509StCtx(self, ctx);
-    GetX509Store(store, x509st);
+    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){
@@ -557,7 +527,7 @@ ossl_x509stctx_verify(VALUE self)
     X509_STORE_CTX *ctx;
 
     GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_ex_data(ctx, stctx_ex_verify_cb_idx,
+    X509_STORE_CTX_set_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx,
 			       (void *)rb_iv_get(self, "@verify_callback"));
 
     switch (X509_verify_cert(ctx)) {
@@ -771,21 +741,12 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
 void
 Init_ossl_x509store(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
 
-    /* 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
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 069acc8b14..f076b1757d 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -10,15 +10,23 @@
 #if !defined(_OSSL_RUBY_MISSING_H_)
 #define _OSSL_RUBY_MISSING_H_
 
-/* Ruby 2.4 */
-#ifndef RB_INTEGER_TYPE_P
-# define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
+#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
 
-/* Ruby 2.5 */
-#ifndef ST2FIX
-# define RB_ST2FIX(h) LONG2FIX((long)(h))
-# define ST2FIX(h) RB_ST2FIX(h)
+#ifndef HAVE_RB_IO_T
+#define rb_io_t OpenFile
+#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))
 #endif
 
 #endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pathname/depend b/ext/pathname/depend
index 42abd32130..5b6ea7484d 100644
--- a/ext/pathname/depend
+++ b/ext/pathname/depend
@@ -6,7 +6,6 @@ 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
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 2fd0642e14..a6621565d0 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -14,8 +14,6 @@ require 'pathname.so'
 
 class Pathname
 
-  # :stopdoc:
-
   # to_path is implemented so Pathname objects are usable with File.open, etc.
   TO_PATH = :to_path
 
@@ -40,7 +38,7 @@ class Pathname
   # chop_basename(path) -> [pre-basename, basename] or nil
   def chop_basename(path) # :nodoc:
     base = File.basename(path)
-    if /\A#{SEPARATOR_PAT}?\z/o.match?(base)
+    if /\A#{SEPARATOR_PAT}?\z/o =~ base
       return nil
     else
       return path[0, path.rindex(base)], base
@@ -62,7 +60,7 @@ class Pathname
   def prepend_prefix(prefix, relpath) # :nodoc:
     if relpath.empty?
       File.dirname(prefix)
-    elsif /#{SEPARATOR_PAT}/o.match?(prefix)
+    elsif /#{SEPARATOR_PAT}/o =~ prefix
       prefix = File.dirname(prefix)
       prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
       prefix + relpath
@@ -113,7 +111,7 @@ class Pathname
       end
     end
     pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
+    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
       names.shift while names[0] == '..'
     end
     self.class.new(prepend_prefix(pre, File.join(*names)))
@@ -162,7 +160,7 @@ class Pathname
       names.unshift base if base != '.'
     end
     pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
+    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
       names.shift while names[0] == '..'
     end
     if names.empty?
@@ -193,7 +191,8 @@ class Pathname
     begin
       stat1 = self.lstat
       stat2 = self.parent.lstat
-      stat1.dev != stat2.dev || stat1.ino == stat2.ino
+      stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
+        stat1.dev != stat2.dev
     rescue Errno::ENOENT
       false
     end
@@ -207,7 +206,7 @@ class Pathname
   # pathnames which points to roots such as <tt>/usr/..</tt>.
   #
   def root?
-    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o.match?(@path))
+    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
   end
 
   # Predicate method for testing whether a path is absolute.
@@ -379,7 +378,7 @@ class Pathname
       basename_list2.shift
     end
     r1 = chop_basename(prefix1)
-    if !r1 && (r1 = /#{SEPARATOR_PAT}/o.match?(File.basename(prefix1)))
+    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
       while !basename_list2.empty? && basename_list2.first == '..'
         index_list2.shift
         basename_list2.shift
@@ -503,7 +502,6 @@ class Pathname
   # ArgumentError is raised when it cannot find a relative path.
   #
   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 d5e58c52d8..4fe8859353 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -2,75 +2,7 @@
 #include "ruby/encoding.h"
 
 static VALUE rb_cPathname;
-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 ID id_at_path, id_to_path;
 
 static VALUE
 get_strpath(VALUE obj)
@@ -223,15 +155,11 @@ 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 ST2FIX(rb_str_hash(get_strpath(self)));
+    return INT2FIX(rb_str_hash(get_strpath(self)));
 }
 
 /*
@@ -271,10 +199,10 @@ path_sub(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
 
     if (rb_block_given_p()) {
-        str = rb_block_call(str, id_sub, argc, argv, 0, 0);
+        str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0);
     }
     else {
-        str = rb_funcallv(str, id_sub, argc, argv);
+        str = rb_funcallv(str, rb_intern("sub"), argc, argv);
     }
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
@@ -329,7 +257,7 @@ path_realpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, id_realpath, 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, rb_intern("realpath"), 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -345,7 +273,7 @@ path_realdirpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, id_realdirpath, 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, rb_intern("realdirpath"), 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -368,10 +296,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_cFile, id_foreach, 1+n, args, 0, 0);
+        return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
     }
     else {
-        return rb_funcallv(rb_cFile, id_foreach, 1+n, args);
+        return rb_funcallv(rb_cIO, rb_intern("foreach"), 1+n, args);
     }
 }
 
@@ -382,7 +310,7 @@ path_each_line(int argc, VALUE *argv, VALUE self)
  *
  * Returns all data from the file, or the first +N+ bytes if specified.
  *
- * See File.read.
+ * See IO.read.
  *
  */
 static VALUE
@@ -393,7 +321,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_funcallv(rb_cFile, id_read, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("read"), 1+n, args);
 }
 
 /*
@@ -402,7 +330,7 @@ path_read(int argc, VALUE *argv, VALUE self)
  *
  * Returns all the bytes from the file, or the first +N+ if specified.
  *
- * See File.binread.
+ * See IO.binread.
  *
  */
 static VALUE
@@ -413,7 +341,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_funcallv(rb_cFile, id_binread, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("binread"), 1+n, args);
 }
 
 /*
@@ -423,7 +351,7 @@ path_binread(int argc, VALUE *argv, VALUE self)
  *
  * Writes +contents+ to the file.
  *
- * See File.write.
+ * See IO.write.
  *
  */
 static VALUE
@@ -434,7 +362,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_funcallv(rb_cFile, id_write, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("write"), 1+n, args);
 }
 
 /*
@@ -444,7 +372,7 @@ path_write(int argc, VALUE *argv, VALUE self)
  *
  * Writes +contents+ to the file, opening it in binary mode.
  *
- * See File.binwrite.
+ * See IO.binwrite.
  *
  */
 static VALUE
@@ -455,7 +383,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_funcallv(rb_cFile, id_binwrite, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("binwrite"), 1+n, args);
 }
 
 /*
@@ -466,7 +394,7 @@ path_binwrite(int argc, VALUE *argv, VALUE self)
  *
  * Returns all the lines from the file.
  *
- * See File.readlines.
+ * See IO.readlines.
  *
  */
 static VALUE
@@ -477,7 +405,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_funcallv(rb_cFile, id_readlines, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("readlines"), 1+n, args);
 }
 
 /*
@@ -495,7 +423,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_funcallv(rb_cIO, id_sysopen, 1+n, args);
+    return rb_funcallv(rb_cIO, rb_intern("sysopen"), 1+n, args);
 }
 
 /*
@@ -509,7 +437,7 @@ path_sysopen(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_atime(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_atime, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("atime"), 1, get_strpath(self));
 }
 
 #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) || defined(_WIN32)
@@ -525,7 +453,7 @@ path_atime(VALUE self)
 static VALUE
 path_birthtime(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_birthtime, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("birthtime"), 1, get_strpath(self));
 }
 #else
 # define path_birthtime rb_f_notimplement
@@ -542,7 +470,7 @@ path_birthtime(VALUE self)
 static VALUE
 path_ctime(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_ctime, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("ctime"), 1, get_strpath(self));
 }
 
 /*
@@ -556,7 +484,7 @@ path_ctime(VALUE self)
 static VALUE
 path_mtime(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_mtime, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("mtime"), 1, get_strpath(self));
 }
 
 /*
@@ -570,7 +498,7 @@ path_mtime(VALUE self)
 static VALUE
 path_chmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, id_chmod, 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("chmod"), 2, mode, get_strpath(self));
 }
 
 /*
@@ -584,7 +512,7 @@ path_chmod(VALUE self, VALUE mode)
 static VALUE
 path_lchmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, id_lchmod, 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("lchmod"), 2, mode, get_strpath(self));
 }
 
 /*
@@ -598,7 +526,7 @@ path_lchmod(VALUE self, VALUE mode)
 static VALUE
 path_chown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, id_chown, 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("chown"), 3, owner, group, get_strpath(self));
 }
 
 /*
@@ -612,7 +540,7 @@ path_chown(VALUE self, VALUE owner, VALUE group)
 static VALUE
 path_lchown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, id_lchown, 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("lchown"), 3, owner, group, get_strpath(self));
 }
 
 /*
@@ -630,9 +558,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, id_fnmatch, 2, pattern, str);
+        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 2, pattern, str);
     else
-        return rb_funcall(rb_cFile, id_fnmatch, 3, pattern, str, flags);
+        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 3, pattern, str, flags);
 }
 
 /*
@@ -646,7 +574,7 @@ path_fnmatch(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_ftype(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_ftype, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("ftype"), 1, get_strpath(self));
 }
 
 /*
@@ -660,7 +588,7 @@ path_ftype(VALUE self)
 static VALUE
 path_make_link(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, id_link, 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("link"), 2, old, get_strpath(self));
 }
 
 /*
@@ -677,10 +605,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, id_open, 1+n, args, 0, 0);
+        return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
     }
     else {
-        return rb_funcallv(rb_cFile, id_open, 1+n, args);
+        return rb_funcallv(rb_cFile, rb_intern("open"), 1+n, args);
     }
 }
 
@@ -693,7 +621,7 @@ static VALUE
 path_readlink(VALUE self)
 {
     VALUE str;
-    str = rb_funcall(rb_cFile, id_readlink, 1, get_strpath(self));
+    str = rb_funcall(rb_cFile, rb_intern("readlink"), 1, get_strpath(self));
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -705,7 +633,7 @@ path_readlink(VALUE self)
 static VALUE
 path_rename(VALUE self, VALUE to)
 {
-    return rb_funcall(rb_cFile, id_rename, 2, get_strpath(self), to);
+    return rb_funcall(rb_cFile, rb_intern("rename"), 2, get_strpath(self), to);
 }
 
 /*
@@ -716,7 +644,7 @@ path_rename(VALUE self, VALUE to)
 static VALUE
 path_stat(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_stat, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("stat"), 1, get_strpath(self));
 }
 
 /*
@@ -725,7 +653,7 @@ path_stat(VALUE self)
 static VALUE
 path_lstat(VALUE self)
 {
-    return rb_funcall(rb_cFile, id_lstat, 1, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("lstat"), 1, get_strpath(self));
 }
 
 /*
@@ -739,7 +667,7 @@ path_lstat(VALUE self)
 static VALUE
 path_make_symlink(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, id_symlink, 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("symlink"), 2, old, get_strpath(self));
 }
 
 /*
@@ -750,7 +678,7 @@ path_make_symlink(VALUE self, VALUE old)
 static VALUE
 path_truncate(VALUE self, VALUE length)
 {
-    return rb_funcall(rb_cFile, id_truncate, 2, get_strpath(self), length);
+    return rb_funcall(rb_cFile, rb_intern("truncate"), 2, get_strpath(self), length);
 }
 
 /*
@@ -761,7 +689,7 @@ path_truncate(VALUE self, VALUE length)
 static VALUE
 path_utime(VALUE self, VALUE atime, VALUE mtime)
 {
-    return rb_funcall(rb_cFile, id_utime, 3, atime, mtime, get_strpath(self));
+    return rb_funcall(rb_cFile, rb_intern("utime"), 3, atime, mtime, get_strpath(self));
 }
 
 /*
@@ -775,9 +703,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, id_basename, 1, str);
+        str = rb_funcall(rb_cFile, rb_intern("basename"), 1, str);
     else
-        str = rb_funcall(rb_cFile, id_basename, 2, str, fext);
+        str = rb_funcall(rb_cFile, rb_intern("basename"), 2, str, fext);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -790,7 +718,7 @@ static VALUE
 path_dirname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    str = rb_funcall(rb_cFile, id_dirname, 1, str);
+    str = rb_funcall(rb_cFile, rb_intern("dirname"), 1, str);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -803,7 +731,7 @@ static VALUE
 path_extname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    return rb_funcall(rb_cFile, id_extname, 1, str);
+    return rb_funcall(rb_cFile, rb_intern("extname"), 1, str);
 }
 
 /*
@@ -817,9 +745,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, id_expand_path, 1, str);
+        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str);
     else
-        str = rb_funcall(rb_cFile, id_expand_path, 2, str, dname);
+        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -833,7 +761,7 @@ path_split(VALUE self)
 {
     VALUE str = get_strpath(self);
     VALUE ary, dirname, basename;
-    ary = rb_funcall(rb_cFile, id_split, 1, str);
+    ary = rb_funcall(rb_cFile, rb_intern("split"), 1, str);
     ary = rb_check_array_type(ary);
     dirname = rb_ary_entry(ary, 0);
     basename = rb_ary_entry(ary, 1);
@@ -848,7 +776,7 @@ path_split(VALUE self)
 static VALUE
 path_blockdev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_blockdev_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("blockdev?"), 1, get_strpath(self));
 }
 
 /*
@@ -857,7 +785,7 @@ path_blockdev_p(VALUE self)
 static VALUE
 path_chardev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_chardev_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("chardev?"), 1, get_strpath(self));
 }
 
 /*
@@ -866,7 +794,7 @@ path_chardev_p(VALUE self)
 static VALUE
 path_executable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_executable_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("executable?"), 1, get_strpath(self));
 }
 
 /*
@@ -875,7 +803,7 @@ path_executable_p(VALUE self)
 static VALUE
 path_executable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_executable_real_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("executable_real?"), 1, get_strpath(self));
 }
 
 /*
@@ -884,7 +812,7 @@ path_executable_real_p(VALUE self)
 static VALUE
 path_exist_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_exist_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("exist?"), 1, get_strpath(self));
 }
 
 /*
@@ -893,7 +821,7 @@ path_exist_p(VALUE self)
 static VALUE
 path_grpowned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_grpowned_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("grpowned?"), 1, get_strpath(self));
 }
 
 /*
@@ -902,7 +830,7 @@ path_grpowned_p(VALUE self)
 static VALUE
 path_directory_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_directory_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, get_strpath(self));
 }
 
 /*
@@ -911,7 +839,7 @@ path_directory_p(VALUE self)
 static VALUE
 path_file_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_file_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("file?"), 1, get_strpath(self));
 }
 
 /*
@@ -920,7 +848,7 @@ path_file_p(VALUE self)
 static VALUE
 path_pipe_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_pipe_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("pipe?"), 1, get_strpath(self));
 }
 
 /*
@@ -929,7 +857,7 @@ path_pipe_p(VALUE self)
 static VALUE
 path_socket_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_socket_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("socket?"), 1, get_strpath(self));
 }
 
 /*
@@ -938,7 +866,7 @@ path_socket_p(VALUE self)
 static VALUE
 path_owned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_owned_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("owned?"), 1, get_strpath(self));
 }
 
 /*
@@ -947,7 +875,7 @@ path_owned_p(VALUE self)
 static VALUE
 path_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_readable_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("readable?"), 1, get_strpath(self));
 }
 
 /*
@@ -956,7 +884,7 @@ path_readable_p(VALUE self)
 static VALUE
 path_world_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_world_readable_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("world_readable?"), 1, get_strpath(self));
 }
 
 /*
@@ -965,7 +893,7 @@ path_world_readable_p(VALUE self)
 static VALUE
 path_readable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_readable_real_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("readable_real?"), 1, get_strpath(self));
 }
 
 /*
@@ -974,7 +902,7 @@ path_readable_real_p(VALUE self)
 static VALUE
 path_setuid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_setuid_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("setuid?"), 1, get_strpath(self));
 }
 
 /*
@@ -983,7 +911,7 @@ path_setuid_p(VALUE self)
 static VALUE
 path_setgid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_setgid_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("setgid?"), 1, get_strpath(self));
 }
 
 /*
@@ -992,7 +920,7 @@ path_setgid_p(VALUE self)
 static VALUE
 path_size(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_size, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("size"), 1, get_strpath(self));
 }
 
 /*
@@ -1001,7 +929,7 @@ path_size(VALUE self)
 static VALUE
 path_size_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_size_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("size?"), 1, get_strpath(self));
 }
 
 /*
@@ -1010,7 +938,7 @@ path_size_p(VALUE self)
 static VALUE
 path_sticky_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_sticky_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("sticky?"), 1, get_strpath(self));
 }
 
 /*
@@ -1019,7 +947,7 @@ path_sticky_p(VALUE self)
 static VALUE
 path_symlink_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_symlink_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("symlink?"), 1, get_strpath(self));
 }
 
 /*
@@ -1028,7 +956,7 @@ path_symlink_p(VALUE self)
 static VALUE
 path_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_writable_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("writable?"), 1, get_strpath(self));
 }
 
 /*
@@ -1037,7 +965,7 @@ path_writable_p(VALUE self)
 static VALUE
 path_world_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_world_writable_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("world_writable?"), 1, get_strpath(self));
 }
 
 /*
@@ -1046,7 +974,7 @@ path_world_writable_p(VALUE self)
 static VALUE
 path_writable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_writable_real_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("writable_real?"), 1, get_strpath(self));
 }
 
 /*
@@ -1055,27 +983,11 @@ path_writable_real_p(VALUE self)
 static VALUE
 path_zero_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, id_zero_p, 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self));
 }
 
-/*
- * Tests the file is empty.
- *
- * See Dir#empty? and FileTest.empty?.
- */
 static VALUE
-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))
+glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 {
     return rb_yield(rb_class_new_instance(1, &elt, klass));
 }
@@ -1083,8 +995,8 @@ s_glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 /*
  * Returns or yields Pathname objects.
  *
- *  Pathname.glob("lib/i*.rb")
- *	#=> [#<Pathname:lib/ipaddr.rb>, #<Pathname:lib/irb.rb>]
+ *  Pathname.glob("config/" "*.rb")
+ *	#=> [#<Pathname:config/environment.rb>, #<Pathname:config/routes.rb>, ..]
  *
  * See Dir.glob.
  */
@@ -1096,12 +1008,12 @@ path_s_glob(int argc, VALUE *argv, VALUE klass)
 
     n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cDir, id_glob, n, args, s_glob_i, klass);
+        return rb_block_call(rb_cDir, rb_intern("glob"), n, args, glob_i, klass);
     }
     else {
         VALUE ary;
         long i;
-        ary = rb_funcallv(rb_cDir, id_glob, n, args);
+        ary = rb_funcallv(rb_cDir, rb_intern("glob"), n, args);
         ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
         for (i = 0; i < RARRAY_LEN(ary); i++) {
             VALUE elt = RARRAY_AREF(ary, i);
@@ -1112,54 +1024,6 @@ 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(rb_cDir, id_glob, n, args, glob_i, self);
-    }
-    else {
-        VALUE ary;
-        long i;
-        ary = rb_funcallv(rb_cDir, id_glob, n, args);
-        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.
  *
@@ -1172,7 +1036,7 @@ static VALUE
 path_s_getwd(VALUE klass)
 {
     VALUE str;
-    str = rb_funcall(rb_cDir, id_getwd, 0);
+    str = rb_funcall(rb_cDir, rb_intern("getwd"), 0);
     return rb_class_new_instance(1, &str, klass);
 }
 
@@ -1209,7 +1073,7 @@ path_entries(VALUE self)
     long i;
     klass = rb_obj_class(self);
     str = get_strpath(self);
-    ary = rb_funcall(rb_cDir, id_entries, 1, str);
+    ary = rb_funcall(rb_cDir, rb_intern("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);
@@ -1230,9 +1094,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, id_mkdir, 1, str);
+        return rb_funcall(rb_cDir, rb_intern("mkdir"), 1, str);
     else
-        return rb_funcall(rb_cDir, id_mkdir, 2, str, vmode);
+        return rb_funcall(rb_cDir, rb_intern("mkdir"), 2, str, vmode);
 }
 
 /*
@@ -1243,7 +1107,7 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_rmdir(VALUE self)
 {
-    return rb_funcall(rb_cDir, id_rmdir, 1, get_strpath(self));
+    return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
 }
 
 /*
@@ -1257,7 +1121,7 @@ path_opendir(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, id_open, 1, args, 0, 0);
+    return rb_block_call(rb_cDir, rb_intern("open"), 1, args, 0, 0);
 }
 
 static VALUE
@@ -1276,19 +1140,19 @@ path_each_entry(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, id_foreach, 1, args, each_entry_i, rb_obj_class(self));
+    return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
 }
 
 static VALUE
 unlink_body(VALUE str)
 {
-    return rb_funcall(rb_cDir, id_unlink, 1, str);
+    return rb_funcall(rb_cDir, rb_intern("unlink"), 1, str);
 }
 
 static VALUE
 unlink_rescue(VALUE str, VALUE errinfo)
 {
-    return rb_funcall(rb_cFile, id_unlink, 1, str);
+    return rb_funcall(rb_cFile, rb_intern("unlink"), 1, str);
 }
 
 /*
@@ -1298,7 +1162,7 @@ unlink_rescue(VALUE str, VALUE errinfo)
 static VALUE
 path_unlink(VALUE self)
 {
-    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, id_ENOTDIR);
+    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, rb_intern("ENOTDIR"));
     VALUE str = get_strpath(self);
     return rb_rescue2(unlink_body, str, unlink_rescue, str, eENOTDIR, (VALUE)0);
 }
@@ -1508,7 +1372,8 @@ path_f_pathname(VALUE self, VALUE str)
 void
 Init_pathname(void)
 {
-    InitVM(pathname);
+    id_at_path = rb_intern("@path");
+    id_to_path = rb_intern("to_path");
 
     rb_cPathname = rb_define_class("Pathname", rb_cObject);
     rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
@@ -1583,11 +1448,9 @@ 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);
@@ -1598,78 +1461,3 @@ 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/psych/.gitignore b/ext/psych/.gitignore
new file mode 100644
index 0000000000..836058c169
--- /dev/null
+++ b/ext/psych/.gitignore
@@ -0,0 +1,11 @@
+/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 c5ca1f6b13..7505e950bc 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -6,7 +6,6 @@ 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
@@ -25,7 +24,6 @@ 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
@@ -44,7 +42,6 @@ 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
@@ -63,7 +60,6 @@ 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
@@ -82,7 +78,6 @@ 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
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 6d8390ebe5..be33d35a5e 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 require 'fileutils'
 
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index 2a2ec2af43..ecef46c024 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,20 +1,10 @@
-# frozen_string_literal: true
-require 'psych/versions'
+# frozen_string_literal: false
 case RUBY_ENGINE
 when 'jruby'
   require 'psych_jars'
-  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
+  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
 else
-  begin
-    require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
-  rescue LoadError
-    require 'psych.so'
-  end
+  require 'psych.so'
 end
 require 'psych/nodes'
 require 'psych/streaming'
@@ -26,6 +16,7 @@ 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'
@@ -36,7 +27,7 @@ require 'psych/class_loader'
 # = Overview
 #
 # Psych is a YAML parser and emitter.
-# Psych leverages libyaml [Home page: https://pyyaml.org/wiki/LibYAML]
+# Psych leverages libyaml [Home page: http://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
@@ -203,13 +194,12 @@ require 'psych/class_loader'
 #
 # ==== Receiving an events stream
 #
-#   recorder = Psych::Handlers::Recorder.new
-#   parser = Psych::Parser.new(recorder)
+#   parser = Psych::Parser.new(Psych::Handlers::Recorder.new)
 #
 #   parser.parse("---\n - a\n - b")
-#   recorder.events # => [list of [event, args] lists]
-#                   # event is one of: Psych::Handler::EVENTS
-#                   # args are the arguments passed to the event
+#   parser.events # => [list of [event, args] lists]
+#                 # event is one of: Psych::Handler::EVENTS
+#                 # args are the arguments passed to the event
 #
 # === Emitting
 #
@@ -233,18 +223,19 @@ require 'psych/class_loader'
 #   # => "a"
 
 module Psych
+  # The version is Psych you're using
+  VERSION         = '2.1.1'
+
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
-  # Deprecation guard
-  NOT_GIVEN = Object.new
-  private_constant :NOT_GIVEN
+
+  FALLBACK        = Struct.new :to_ruby # :nodoc:
 
   ###
   # 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.  If +yaml+ is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
+  # +filename+ will be used in the exception message if any exception is raised
+  # while parsing.
   #
   # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
@@ -254,31 +245,14 @@ module Psych
   #   Psych.load("---\n - a\n - b")   # => ['a', 'b']
   #
   #   begin
-  #     Psych.load("--- `", filename: "file.txt")
+  #     Psych.load("--- `", "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  #
-  # 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
-  #
-  def self.load yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: false, symbolize_names: 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 = result.to_ruby if result
-    symbolize_names!(result) if symbolize_names
-    result
+  def self.load yaml, filename = nil, fallback = false
+    result = parse(yaml, filename, fallback)
+    result ? result.to_ruby : result
   end
 
   ###
@@ -294,72 +268,40 @@ module Psych
   # * Hash
   #
   # Recursive data structures are not allowed by default.  Arbitrary classes
-  # can be allowed by adding those classes to the +permitted_classes+ keyword argument.  They are
+  # can be allowed by adding those classes to the +whitelist+.  They are
   # additive.  For example, to allow Date deserialization:
   #
-  #   Psych.safe_load(yaml, permitted_classes: [Date])
+  #   Psych.safe_load(yaml, [Date])
   #
   # Now the Date class can be loaded in addition to the classes listed above.
   #
-  # Aliases can be explicitly allowed by changing the +aliases+ keyword argument.
+  # Aliases can be explicitly allowed by changing the +aliases+ parameter.
   # For example:
   #
   #   x = []
   #   x << x
   #   yaml = Psych.dump x
   #   Psych.safe_load yaml               # => raises an exception
-  #   Psych.safe_load yaml, aliases: true # => loads the aliases
+  #   Psych.safe_load yaml, [], [], true # => loads the aliases
   #
   # A Psych::DisallowedClass exception will be raised if the yaml contains a
-  # class that isn't in the +permitted_classes+ list.
+  # class that isn't in the whitelist.
   #
   # A Psych::BadAlias exception will be raised if the yaml contains aliases
-  # 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
-    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
-
-    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
+  # 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
 
-    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
-
-    result = parse(yaml, filename: filename)
-    return fallback unless result
-
-    class_loader = ClassLoader::Restricted.new(permitted_classes.map(&:to_s),
-                                               permitted_symbols.map(&:to_s))
+    class_loader = ClassLoader::Restricted.new(whitelist_classes.map(&:to_s),
+                                               whitelist_symbols.map(&:to_s))
     scanner      = ScalarScanner.new class_loader
-    visitor = if aliases
-                Visitors::ToRuby.new scanner, class_loader
-              else
-                Visitors::NoAliasRuby.new scanner, class_loader
-              end
-    result = visitor.accept result
-    symbolize_names!(result) if symbolize_names
-    result
+    if aliases
+      visitor = Visitors::ToRuby.new scanner, class_loader
+    else
+      visitor = Visitors::NoAliasRuby.new scanner, class_loader
+    end
+    visitor.accept result
   end
 
   ###
@@ -374,40 +316,28 @@ module Psych
   #   Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Document:0x00>
   #
   #   begin
-  #     Psych.parse("--- `", filename: "file.txt")
+  #     Psych.parse("--- `", "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, 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|
+  def self.parse yaml, filename = nil, fallback = false
+    parse_stream(yaml, filename) do |node|
       return node
     end
-
-    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
+    fallback
   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, fallback: false
-    result = File.open filename, 'r:bom|utf-8' do |f|
-      parse f, filename: filename
+  def self.parse_file filename
+    File.open filename, 'r:bom|utf-8' do |f|
+      parse f, filename
     end
-    result || fallback
   end
 
   ###
@@ -436,21 +366,14 @@ module Psych
   #   end
   #
   #   begin
-  #     Psych.parse_stream("--- `", filename: "file.txt")
+  #     Psych.parse_stream("--- `", "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, 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
-
+  def self.parse_stream yaml, filename = nil, &block
     if block_given?
       parser = Psych::Parser.new(Handlers::DocumentStream.new(&block))
       parser.parse yaml, filename
@@ -472,24 +395,6 @@ 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
@@ -499,10 +404,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
@@ -551,31 +456,23 @@ module Psych
   #   end
   #   list # => ['foo', 'bar']
   #
-  def self.load_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: []
-    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
+  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 }
     end
-
-    result = if block_given?
-               parse_stream(yaml, filename: filename) do |node|
-                 yield node.to_ruby
-               end
-             else
-               parse_stream(yaml, filename: filename).children.map(&:to_ruby)
-             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, or if the file is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
-  def self.load_file filename, fallback: false
+  # the specified default return value, which defaults to an empty Hash
+  def self.load_file filename, fallback = false
     File.open(filename, 'r:bom|utf-8') { |f|
-      self.load f, filename: filename, fallback: fallback
+      self.load f, filename, FALLBACK.new(fallback)
     }
   end
 
@@ -604,34 +501,6 @@ module Psych
     @dump_tags[klass] = tag
   end
 
-  def self.symbolize_names!(result)
-    case result
-    when Hash
-      result.keys.each do |key|
-        result[key.to_sym] = symbolize_names!(result.delete(key))
-      end
-    when Array
-      result.map! { |r| symbolize_names!(r) }
-    end
-    result
-  end
-  private_class_method :symbolize_names!
-
-  # 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
diff --git a/ext/psych/lib/psych/class_loader.rb b/ext/psych/lib/psych/class_loader.rb
index cfca86845a..ba756f7ea7 100644
--- a/ext/psych/lib/psych/class_loader.rb
+++ b/ext/psych/lib/psych/class_loader.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'psych/omap'
 require 'psych/set'
 
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
index 96a9c3fbad..26005f57b4 100644
--- a/ext/psych/lib/psych/coder.rb
+++ b/ext/psych/lib/psych/coder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 81055cc501..1a98279afd 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -1,17 +1,34 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 to_yaml options = {}
+  def psych_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
new file mode 100644
index 0000000000..165d2102b4
--- /dev/null
+++ b/ext/psych/lib/psych/deprecated.rb
@@ -0,0 +1,86 @@
+# 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 fac0c42b9f..83c3d7fa82 100644
--- a/ext/psych/lib/psych/exception.rb
+++ b/ext/psych/lib/psych/exception.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   class Exception < RuntimeError
   end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
index 8f23e366fa..1ab5f73e95 100644
--- a/ext/psych/lib/psych/handler.rb
+++ b/ext/psych/lib/psych/handler.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 anchor, *ponies is the alias.  In this case, alias is
+    # &ponies is the achor, *ponies is the alias.  In this case, alias is
     # called with "ponies".
     def alias anchor
     end
@@ -242,11 +242,6 @@ 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 67da794093..c43b39ebc5 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: true
+# frozen_string_literal: false
 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 a8fc7b1144..341b81dec4 100644
--- a/ext/psych/lib/psych/handlers/recorder.rb
+++ b/ext/psych/lib/psych/handlers/recorder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 17b7ddc386..478eb667c7 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: true
+# frozen_string_literal: false
 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 2ebd3d7a66..83b7e13655 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 5c2ee8ca25..2f94b8c252 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: true
+# frozen_string_literal: false
 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 eb973f5361..07f64737c5 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: true
+# frozen_string_literal: false
 module Psych
   module JSON
     module YAMLEvents # :nodoc:
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
index 5842c2e3e5..01573b509b 100644
--- a/ext/psych/lib/psych/nodes.rb
+++ b/ext/psych/lib/psych/nodes.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 6da655f0fd..716a00d62f 100644
--- a/ext/psych/lib/psych/nodes/alias.rb
+++ b/ext/psych/lib/psych/nodes/alias.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -14,8 +14,6 @@ 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 f57410d636..7234fef1d8 100644
--- a/ext/psych/lib/psych/nodes/document.rb
+++ b/ext/psych/lib/psych/nodes/document.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -56,8 +56,6 @@ 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 d49678cb0e..4c11df8cd6 100644
--- a/ext/psych/lib/psych/nodes/mapping.rb
+++ b/ext/psych/lib/psych/nodes/mapping.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -52,8 +52,6 @@ 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 f59fb8916b..e3621dc451 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'stringio'
 require 'psych/class_loader'
 require 'psych/scalar_scanner'
@@ -17,18 +17,6 @@ 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 = []
@@ -63,13 +51,6 @@ 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 e2616b6a84..ee5570518e 100644
--- a/ext/psych/lib/psych/nodes/scalar.rb
+++ b/ext/psych/lib/psych/nodes/scalar.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -63,8 +63,6 @@ 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 740f1938a4..1096469567 100644
--- a/ext/psych/lib/psych/nodes/sequence.rb
+++ b/ext/psych/lib/psych/nodes/sequence.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -77,8 +77,6 @@ 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 b525217821..559b0846e7 100644
--- a/ext/psych/lib/psych/nodes/stream.rb
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###
@@ -33,8 +33,6 @@ 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 29cde0be50..233b945c4a 100644
--- a/ext/psych/lib/psych/omap.rb
+++ b/ext/psych/lib/psych/omap.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   class Omap < ::Hash
   end
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
index 39bc8289be..242512f89f 100644
--- a/ext/psych/lib/psych/parser.rb
+++ b/ext/psych/lib/psych/parser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 29c156c212..a849359d18 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'strscan'
 
 module Psych
@@ -10,6 +10,7 @@ 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
 
@@ -82,13 +83,13 @@ module Psych
         else
           @symbol_cache[string] = class_loader.symbolize(string.sub(/^:/, ''))
         end
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}$/
+      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+$/
         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]){1,2}\.[0-9_]*$/
+      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*$/
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_f * 60 ** (e - 2).abs)
@@ -143,7 +144,7 @@ module Psych
         offset += ((tz[1] || 0) * 60)
       end
 
-      klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset)
+      klass.at((time - offset).to_i, us)
     end
   end
 end
diff --git a/ext/psych/lib/psych/set.rb b/ext/psych/lib/psych/set.rb
index 760d217098..f35be15e6f 100644
--- a/ext/psych/lib/psych/set.rb
+++ b/ext/psych/lib/psych/set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   class Set < ::Hash
   end
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
index 24e45afc3b..2f63d7d552 100644
--- a/ext/psych/lib/psych/stream.rb
+++ b/ext/psych/lib/psych/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 eb19792ad0..260f8a8008 100644
--- a/ext/psych/lib/psych/streaming.rb
+++ b/ext/psych/lib/psych/streaming.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 1598e6ff36..db293b9fb2 100644
--- a/ext/psych/lib/psych/syntax_error.rb
+++ b/ext/psych/lib/psych/syntax_error.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'psych/exception'
 
 module Psych
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
index 47a1695643..d359c933af 100644
--- a/ext/psych/lib/psych/tree_builder.rb
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych
@@ -23,18 +23,6 @@ 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{
@@ -44,15 +32,12 @@ 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}
-          n = pop
-          set_end_location(n)
-          n
+          pop
         end
       }
     end
@@ -64,7 +49,6 @@ 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
@@ -76,35 +60,26 @@ module Psych
     # See Psych::Handler#start_document
     def end_document implicit_end = !streaming?
       @last.implicit_end = implicit_end
-      n = pop
-      set_end_location(n)
-      n
+      pop
     end
 
     def start_stream encoding
       @root = Nodes::Stream.new(encoding)
-      set_start_location(@root)
       push @root
     end
 
     def end_stream
-      n = pop
-      set_end_location(n)
-      n
+      pop
     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
-      a = Nodes::Alias.new(anchor)
-      set_location(a)
-      @last.children << a
-      a
+      @last.children << Nodes::Alias.new(anchor)
     end
 
     private
@@ -118,20 +93,5 @@ 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 731ba9545e..5f7652b097 100644
--- a/ext/psych/lib/psych/versions.rb
+++ b/ext/psych/lib/psych/versions.rb
@@ -1,10 +1,4 @@
-
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
-  # The version of Psych you are using
-  VERSION = '3.1.0' unless defined?(::Psych::VERSION)
-
-  if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze
-  end
+  DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze
 end
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
index e2b084daee..5dee4ebd7a 100644
--- a/ext/psych/lib/psych/visitors.rb
+++ b/ext/psych/lib/psych/visitors.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 b4ff9e40e7..2d74a212d6 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: true
+# frozen_string_literal: false
 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 e3b92b7d03..f2ff9fdb28 100644
--- a/ext/psych/lib/psych/visitors/emitter.rb
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 9912cb1362..f2f0215cd2 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: true
+# frozen_string_literal: false
 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 74a52df866..fd1c8e6caf 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: true
+# frozen_string_literal: false
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
 require 'psych/exception'
@@ -380,6 +380,11 @@ 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 3f4ba64e57..d97bf550f6 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Psych
   module Visitors
     class Visitor
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index cfed8f1814..11214ecbf4 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: true
+# frozen_string_literal: false
 require 'psych/tree_builder'
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
@@ -53,6 +53,15 @@ 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
@@ -130,6 +139,24 @@ 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
@@ -164,8 +191,6 @@ module Psych
         @emitter.end_mapping
       end
 
-      alias :visit_Delegator :visit_Object
-
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
@@ -311,7 +336,7 @@ module Psych
         end
 
         is_primitive = o.class == ::String
-        ivars = is_primitive ? [] : o.instance_variables
+        ivars = find_ivars o, is_primitive
 
         if ivars.empty?
           unless is_primitive
@@ -321,7 +346,7 @@ module Psych
           end
           @emitter.scalar o, nil, tag, plain, quote, style
         else
-          maptag = '!ruby/string'.dup
+          maptag = '!ruby/string'
           maptag << ":#{o.class}" unless o.class == ::String
 
           register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
@@ -378,18 +403,14 @@ module Psych
 
       def visit_Array o
         if o.class == ::Array
-          visit_Enumerator o
+          register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+          o.each { |c| accept c }
+          @emitter.end_sequence
         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
@@ -415,9 +436,15 @@ 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.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) ||
+          string.index(NULL) ||
+          string.count(BINARY_RANGE, WS_RANGE).fdiv(string.length) > 0.3
       end
 
       def visit_array_subclass o
@@ -500,6 +527,24 @@ 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
@@ -541,7 +586,9 @@ module Psych
       end
 
       def dump_ivars target
-        target.instance_variables.each do |iv|
+        ivars = find_ivars target
+
+        ivars.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 e857953c04..82e05a783c 100644
--- a/ext/psych/lib/psych/y.rb
+++ b/ext/psych/lib/psych/y.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Kernel
   ###
   # An alias for Psych.dump_stream meant to be used with IRB.
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 44491c801e..4c0cb65214 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -1,75 +1,41 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-
-begin
-  require_relative 'lib/psych/versions'
-rescue LoadError
-  # for Ruby core repository
-  require_relative 'versions'
-end
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = Psych::VERSION
-  s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
-  s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
+  s.version = "2.1.1"
+  s.authors = ["Aaron Patterson", "SHIBATA Hiroshi"]
+  s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
+  s.date = "2016-09-07"
   s.summary = "Psych is a YAML parser and emitter"
   s.description = <<-DESCRIPTION
-Psych is a YAML parser and emitter. Psych leverages libyaml[https://pyyaml.org/wiki/LibYAML]
+Psych is a YAML parser and emitter. Psych leverages libyaml[http://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.homepage = "http://github.com/tenderlove/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", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "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.files = [".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.rdoc", "Rakefile", "bin/console", "bin/setup", "ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "ext/psych/.gitignore", "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", "psych.gemspec"]
 
-  s.rdoc_options = ["--main", "README.md"]
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md"]
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "CHANGELOG.rdoc", "README.rdoc"]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.rubygems_version = "2.5.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
-  s.add_development_dependency 'rake-compiler', ">= 0.4.1"
-  s.add_development_dependency 'minitest', "~> 5.0"
+  s.add_development_dependency(%q<rake-compiler>, [">= 0.4.1"])
+  s.add_development_dependency(%q<minitest>, ["~> 5.0"])
 
-  if RUBY_ENGINE == 'jruby'
+  if RUBY_PLATFORM =~ /java/
+    require 'psych/versions'
     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, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else
     s.extensions = ["ext/psych/extconf.rb"]
-    s.add_development_dependency 'rake-compiler-dock', ">= 0.6.3"
   end
 end
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
index 6b3d63f246..1830ca4b19 100644
--- a/ext/psych/psych.h
+++ b/ext/psych/psych.h
@@ -2,7 +2,10 @@
 #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 022ffa0946..371c285183 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -8,7 +8,6 @@
 #endif
 
 VALUE cPsychEmitter;
-static ID id_io;
 static ID id_write;
 static ID id_line_width;
 static ID id_indentation;
@@ -22,8 +21,12 @@ static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
 {
-    VALUE self = (VALUE)ctx, io = rb_attr_get(self, id_io);
+    VALUE io = (VALUE)ctx;
+#ifdef HAVE_RUBY_ENCODING_H
     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);
 }
@@ -91,8 +94,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
-    rb_ivar_set(self, id_io, io);
-    yaml_emitter_set_output(emitter, writer, (void *)self);
+    yaml_emitter_set_output(emitter, writer, (void *)io);
 
     return self;
 }
@@ -166,7 +168,9 @@ 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);
 
@@ -189,11 +193,13 @@ 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 *)StringValueCStr(name);
-	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
+	    tail->handle = (yaml_char_t *)RSTRING_PTR(name);
+	    tail->prefix = (yaml_char_t *)RSTRING_PTR(value);
 
 	    tail++;
 	}
@@ -251,11 +257,14 @@ 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);
@@ -269,11 +278,12 @@ 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 : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
 	    (yaml_char_t*)StringValuePtr(value),
 	    (int)RSTRING_LEN(value),
 	    plain ? 1 : 0,
@@ -303,6 +313,7 @@ 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)) {
@@ -314,13 +325,14 @@ 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 : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
 	    implicit ? 1 : 0,
 	    (yaml_sequence_style_t)NUM2INT(style)
 	    );
@@ -365,10 +377,12 @@ 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)) {
@@ -380,11 +394,12 @@ 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 : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
 	    implicit ? 1 : 0,
 	    (yaml_mapping_style_t)NUM2INT(style)
 	    );
@@ -425,14 +440,16 @@ 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 : StringValueCStr(anchor))
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
 	    );
 
     emit(emitter, &event);
@@ -521,7 +538,6 @@ 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);
@@ -546,7 +562,6 @@ 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 8eb2205848..2caa8a09c3 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -16,7 +16,6 @@ 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 { \
@@ -94,6 +93,7 @@ static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 	    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,6 +171,8 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
     return src;
 }
 
+#endif
+
 static VALUE protected_start_stream(VALUE pointer)
 {
     VALUE *args = (VALUE *)pointer;
@@ -233,12 +235,6 @@ 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)
@@ -257,8 +253,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     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) {
@@ -276,14 +274,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     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),
@@ -292,9 +294,6 @@ 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;
 
@@ -305,18 +304,6 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    rb_exc_raise(exception);
 	}
 
-	start_line = INT2NUM((long)event.start_mark.line);
-	start_column = INT2NUM((long)event.start_mark.column);
-	end_line = INT2NUM((long)event.end_mark.line);
-	end_column = INT2NUM((long)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:
 	      {
@@ -351,13 +338,17 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 			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));
@@ -386,7 +377,9 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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;
@@ -406,18 +399,24 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		    );
 		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 =
@@ -447,14 +446,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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 =
@@ -483,13 +486,17 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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 =
@@ -548,7 +555,6 @@ static VALUE mark(VALUE self)
 
 void Init_psych_parser(void)
 {
-#undef rb_intern
 #if 0
     mPsych = rb_define_module("Psych");
 #endif
@@ -574,19 +580,18 @@ void Init_psych_parser(void)
     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_event_location  = rb_intern("event_location");
+    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");
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/psych_to_ruby.c
index b388ff7754..3cc87a965e 100644
--- a/ext/psych/psych_to_ruby.c
+++ b/ext/psych/psych_to_ruby.c
@@ -21,7 +21,11 @@ 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 7aca9114c9..bcf24d2070 100644
--- a/ext/psych/psych_yaml_tree.c
+++ b/ext/psych/psych_yaml_tree.c
@@ -9,7 +9,7 @@ VALUE cPsychVisitorsYamlTree;
  */
 static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
 {
-    return rb_attr_get(target, rb_intern(StringValueCStr(prop)));
+    return rb_attr_get(target, rb_intern(StringValuePtr(prop)));
 }
 
 void Init_psych_yaml_tree(void)
diff --git a/ext/psych/yaml/LICENSE b/ext/psych/yaml/LICENSE
new file mode 100644
index 0000000000..050ced23f6
--- /dev/null
+++ b/ext/psych/yaml/LICENSE
@@ -0,0 +1,19 @@
+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 ee170d87de..e0b9d979cc 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_char_t *)yaml_realloc((void*)*start, (*end - *start)*2);
+    yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
 
     if (!new_start) return 0;
 
@@ -94,9 +94,8 @@ 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, SHIM(yaml_char_t **b_end))
+        yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end)
 {
-    UNUSED_PARAM(b_end)
     if (*b_start == *b_pointer)
         return 1;
 
@@ -178,17 +177,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, yaml_token_t*))
+    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE))
         goto error;
-    if (!STACK_INIT(parser, parser->indents, int*))
+    if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_SIZE))
         goto error;
-    if (!STACK_INIT(parser, parser->simple_keys, yaml_simple_key_t*))
+    if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_SIZE))
         goto error;
-    if (!STACK_INIT(parser, parser->states, yaml_parser_state_t*))
+    if (!STACK_INIT(parser, parser->states, INITIAL_STACK_SIZE))
         goto error;
-    if (!STACK_INIT(parser, parser->marks, yaml_mark_t*))
+    if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_SIZE))
         goto error;
-    if (!STACK_INIT(parser, parser->tag_directives, yaml_tag_directive_t*))
+    if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_SIZE))
         goto error;
 
     return 1;
@@ -244,7 +243,7 @@ static int
 yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
         size_t *size_read)
 {
-    yaml_parser_t *parser = (yaml_parser_t *)data;
+    yaml_parser_t *parser = data;
 
     if (parser->input.string.current == parser->input.string.end) {
         *size_read = 0;
@@ -270,7 +269,7 @@ static int
 yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
         size_t *size_read)
 {
-    yaml_parser_t *parser = (yaml_parser_t *)data;
+    yaml_parser_t *parser = data;
 
     *size_read = fread(buffer, 1, size, parser->input.file);
     return !ferror(parser->input.file);
@@ -356,13 +355,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, yaml_emitter_state_t*))
+    if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_SIZE))
         goto error;
-    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE, yaml_event_t*))
+    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE))
         goto error;
-    if (!STACK_INIT(emitter, emitter->indents, int*))
+    if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_SIZE))
         goto error;
-    if (!STACK_INIT(emitter, emitter->tag_directives, yaml_tag_directive_t*))
+    if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_SIZE))
         goto error;
 
     return 1;
@@ -396,7 +395,7 @@ yaml_emitter_delete(yaml_emitter_t *emitter)
     }
     QUEUE_DEL(emitter, emitter->events);
     STACK_DEL(emitter, emitter->indents);
-    while (!STACK_EMPTY(empty, emitter->tag_directives)) {
+    while (!STACK_EMPTY(emitter, emitter->tag_directives)) {
         yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives);
         yaml_free(tag_directive.handle);
         yaml_free(tag_directive.prefix);
@@ -414,9 +413,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 = (yaml_emitter_t *)data;
+    yaml_emitter_t *emitter = 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,
@@ -440,7 +439,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 = (yaml_emitter_t *)data;
+    yaml_emitter_t *emitter = data;
 
     return (fwrite(buffer, 1, size, emitter->output.file) == size);
 }
@@ -718,7 +717,7 @@ yaml_document_start_event_initialize(yaml_event_t *event,
                             /* Valid tag directives are expected. */
 
     if (version_directive) {
-        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
+        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
         if (!version_directive_copy) goto error;
         version_directive_copy->major = version_directive->major;
         version_directive_copy->minor = version_directive->minor;
@@ -726,7 +725,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, yaml_tag_directive_t*))
+        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
             goto error;
         for (tag_directive = tag_directives_start;
                 tag_directive != tag_directives_end; tag_directive ++) {
@@ -823,6 +822,7 @@ 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,16 +840,19 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     }
 
     if (length < 0) {
-        length = strlen((char *)value);
+        value_length = strlen((char *)value);
+    }
+    else {
+        value_length = (size_t)length;
     }
 
-    if (!yaml_check_utf8(value, length)) goto error;
-    value_copy = YAML_MALLOC(length+1);
+    if (!yaml_check_utf8(value, value_length)) goto error;
+    value_copy = yaml_malloc(value_length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, length);
-    value_copy[length] = '\0';
+    memcpy(value_copy, value, value_length);
+    value_copy[value_length] = '\0';
 
-    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, length,
+    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, value_length,
             plain_implicit, quoted_implicit, style, mark, mark);
 
     return 1;
@@ -1056,10 +1059,10 @@ yaml_document_initialize(yaml_document_t *document,
             (tag_directives_start == tag_directives_end));
                             /* Valid tag directives are expected. */
 
-    if (!STACK_INIT(&context, nodes, yaml_node_t*)) goto error;
+    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error;
 
     if (version_directive) {
-        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
+        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
         if (!version_directive_copy) goto error;
         version_directive_copy->major = version_directive->major;
         version_directive_copy->minor = version_directive->minor;
@@ -1067,7 +1070,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, yaml_tag_directive_t*))
+        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
             goto error;
         for (tag_directive = tag_directives_start;
                 tag_directive != tag_directives_end; tag_directive ++) {
@@ -1203,6 +1206,8 @@ 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. */
@@ -1216,19 +1221,26 @@ yaml_document_add_scalar(yaml_document_t *document,
     if (!tag_copy) goto error;
 
     if (length < 0) {
-        length = strlen((char *)value);
+        value_length = strlen((char *)value);
+    }
+    else {
+        value_length = (size_t)length;
     }
 
-    if (!yaml_check_utf8(value, length)) goto error;
-    value_copy = YAML_MALLOC(length+1);
+    if (!yaml_check_utf8(value, value_length)) goto error;
+    value_copy = yaml_malloc(value_length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, length);
-    value_copy[length] = '\0';
+    memcpy(value_copy, value, value_length);
+    value_copy[value_length] = '\0';
 
-    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark);
+    SCALAR_NODE_INIT(node, tag_copy, value_copy, value_length, style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     yaml_free(tag_copy);
@@ -1256,6 +1268,7 @@ 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. */
 
@@ -1267,13 +1280,17 @@ yaml_document_add_sequence(yaml_document_t *document,
     tag_copy = yaml_strdup(tag);
     if (!tag_copy) goto error;
 
-    if (!STACK_INIT(&context, items, yaml_node_item_t*)) goto error;
+    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error;
 
     SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     STACK_DEL(&context, items);
@@ -1301,6 +1318,7 @@ 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. */
 
@@ -1312,13 +1330,17 @@ yaml_document_add_mapping(yaml_document_t *document,
     tag_copy = yaml_strdup(tag);
     if (!tag_copy) goto error;
 
-    if (!STACK_INIT(&context, pairs, yaml_node_pair_t*)) goto error;
+    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error;
 
     MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     STACK_DEL(&context, pairs);
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h
index da905133ff..f54c27d339 100644
--- a/ext/psych/yaml/config.h
+++ b/ext/psych/yaml/config.h
@@ -1,10 +1,10 @@
 #define PACKAGE_NAME "yaml"
 #define PACKAGE_TARNAME "yaml"
-#define PACKAGE_VERSION "0.2.1"
-#define PACKAGE_STRING "yaml 0.2.1"
-#define PACKAGE_BUGREPORT "https://github.com/yaml/libyaml/issues"
-#define PACKAGE_URL "https://github.com/yaml/libyaml"
+#define PACKAGE_VERSION "0.1.6"
+#define PACKAGE_STRING "yaml 0.1.6"
+#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml"
+#define PACKAGE_URL ""
 #define YAML_VERSION_MAJOR 0
-#define YAML_VERSION_MINOR 2
-#define YAML_VERSION_PATCH 1
-#define YAML_VERSION_STRING "0.2.1"
+#define YAML_VERSION_MINOR 1
+#define YAML_VERSION_PATCH 6
+#define YAML_VERSION_STRING "0.1.6"
diff --git a/ext/psych/yaml/dumper.c b/ext/psych/yaml/dumper.c
index 29fb9c0784..203c6a709c 100644
--- a/ext/psych/yaml/dumper.c
+++ b/ext/psych/yaml/dumper.c
@@ -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(SHIM(yaml_emitter_t *emitter), int anchor_id)
+yaml_emitter_generate_anchor(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 92e21cdb73..bf84fafc51 100644
--- a/ext/psych/yaml/emitter.c
+++ b/ext/psych/yaml/emitter.c
@@ -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) : 0)
+         1))
 
 /*
  * Copy a character from a string into buffer.
@@ -53,7 +53,7 @@
 #define WRITE_BREAK(emitter,string)                                             \
     (FLUSH(emitter)                                                             \
      && (CHECK(string,'\n') ?                                                   \
-         (PUT_BREAK(emitter),                                                   \
+         ((void)PUT_BREAK(emitter),                                             \
           string.pointer ++,                                                    \
           1) :                                                                  \
          (COPY(emitter->buffer,string),                                         \
@@ -1002,7 +1002,7 @@ yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
  */
 
 static int
-yaml_emitter_emit_alias(yaml_emitter_t *emitter, SHIM(yaml_event_t *event))
+yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event)
 {
     if (!yaml_emitter_process_anchor(emitter))
         return 0;
@@ -1087,7 +1087,7 @@ yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event)
  */
 
 static int
-yaml_emitter_check_empty_document(SHIM(yaml_emitter_t *emitter))
+yaml_emitter_check_empty_document(yaml_emitter_t *emitter)
 {
     return 0;
 }
@@ -1234,7 +1234,7 @@ yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
 }
 
 /*
- * Write an anchor.
+ * Write an achor.
  */
 
 static int
@@ -1493,7 +1493,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
     int break_space = 0;
     int space_break = 0;
 
-    int preceded_by_whitespace = 0;
+    int preceeded_by_whitespace = 0;
     int followed_by_whitespace = 0;
     int previous_space = 0;
     int previous_break = 0;
@@ -1524,7 +1524,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
         flow_indicators = 1;
     }
 
-    preceded_by_whitespace = 1;
+    preceeded_by_whitespace = 1;
     followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
 
     while (string.pointer != string.end)
@@ -1570,7 +1570,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
                 }
             }
 
-            if (CHECK(string, '#') && preceded_by_whitespace) {
+            if (CHECK(string, '#') && preceeded_by_whitespace) {
                 flow_indicators = 1;
                 block_indicators = 1;
             }
@@ -1619,7 +1619,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
             previous_break = 0;
         }
 
-        preceded_by_whitespace = IS_BLANKZ(string);
+        preceeded_by_whitespace = IS_BLANKZ(string);
         MOVE(string);
         if (string.pointer != string.end) {
             followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
@@ -1946,6 +1946,10 @@ 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;
 }
@@ -2322,3 +2326,4 @@ 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 db8501ac74..def67933e7 100644
--- a/ext/psych/yaml/loader.c
+++ b/ext/psych/yaml/loader.c
@@ -72,7 +72,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, yaml_node_t*))
+    if (!STACK_INIT(parser, document->nodes, INITIAL_STACK_SIZE))
         goto error;
 
     if (!parser->stream_start_produced) {
@@ -90,7 +90,7 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
         return 1;
     }
 
-    if (!STACK_INIT(parser, parser->aliases, yaml_alias_data_t*))
+    if (!STACK_INIT(parser, parser->aliases, INITIAL_STACK_SIZE))
         goto error;
 
     parser->document = document;
@@ -283,6 +283,7 @@ static int
 yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
 {
     yaml_node_t node;
+    ptrdiff_t node_index;
     int index;
     yaml_char_t *tag = first_event->data.scalar.tag;
 
@@ -300,7 +301,11 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    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;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.scalar.anchor)) return 0;
@@ -329,6 +334,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
         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;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
@@ -339,7 +345,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    if (!STACK_INIT(parser, items, yaml_node_item_t*)) goto error;
+    if (!STACK_INIT(parser, items, INITIAL_STACK_SIZE)) goto error;
 
     SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
             first_event->data.sequence_start.style,
@@ -347,7 +353,11 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    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;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.sequence_start.anchor)) return 0;
@@ -391,6 +401,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;
 
@@ -402,7 +413,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    if (!STACK_INIT(parser, pairs, yaml_node_pair_t*)) goto error;
+    if (!STACK_INIT(parser, pairs, INITIAL_STACK_SIZE)) goto error;
 
     MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
             first_event->data.mapping_start.style,
@@ -410,7 +421,11 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    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;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.mapping_start.anchor)) return 0;
diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c
index 621f676bf2..32671b252c 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, yaml_tag_directive_t*))
+    if (!STACK_INIT(parser, tag_directives, INITIAL_STACK_SIZE))
         goto error;
 
     token = PEEK_TOKEN(parser);
@@ -1266,7 +1266,7 @@ yaml_parser_process_directives(yaml_parser_t *parser,
                         "found incompatible YAML document", token->start_mark);
                 goto error;
             }
-            version_directive = YAML_MALLOC_STATIC(yaml_version_directive_t);
+            version_directive = yaml_malloc(sizeof(yaml_version_directive_t));
             if (!version_directive) {
                 parser->error = YAML_MEMORY_ERROR;
                 goto error;
diff --git a/ext/psych/yaml/reader.c b/ext/psych/yaml/reader.c
index f3ac54c251..f1a06deb9d 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 >= MAX_FILE_SIZE) {
+    if (parser->offset >= PTRDIFF_MAX)
         return yaml_parser_set_reader_error(parser, "input is too long",
-            parser->offset, -1);
-    }
+                PTRDIFF_MAX, -1);
 
     return 1;
 }
+
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
index 359f1072f1..5e4875d7f9 100644
--- a/ext/psych/yaml/scanner.c
+++ b/ext/psych/yaml/scanner.c
@@ -1222,12 +1222,14 @@ 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 = column;
+        parser->indent = (int)column;
 
         /* Create a token and insert it into the queue. */
 
@@ -1636,7 +1638,7 @@ yaml_parser_fetch_key(yaml_parser_t *parser)
 
     if (!parser->flow_level)
     {
-        /* Check if we are allowed to start a new key (not necessary simple). */
+        /* Check if we are allowed to start a new key (not nessesary simple). */
 
         if (!parser->simple_key_allowed) {
             return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
@@ -2399,7 +2401,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';
 
@@ -2451,7 +2453,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
             /* Set the handle to '!'. */
 
             yaml_free(handle);
-            handle = YAML_MALLOC(2);
+            handle = yaml_malloc(2);
             if (!handle) goto error;
             handle[0] = '!';
             handle[1] = '\0';
@@ -3160,8 +3162,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 '\\':
@@ -3278,11 +3280,6 @@ 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 unitialized 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;
 
@@ -3507,7 +3504,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab characters that abuse indentation. */
+                /* Check for tab character that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
@@ -3576,3 +3573,4 @@ error:
 
     return 0;
 }
+
diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h
index f4f244cbc8..944499c94e 100644
--- a/ext/psych/yaml/yaml_private.h
+++ b/ext/psych/yaml/yaml_private.h
@@ -12,6 +12,16 @@
 #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.
  */
@@ -71,17 +81,6 @@ 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.
  */
 
@@ -94,7 +93,7 @@ yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
  */
 
 #define BUFFER_INIT(context,buffer,size)                                        \
-  (((buffer).start = (yaml_char_t *)yaml_malloc(size)) ?                        \
+    (((buffer).start = yaml_malloc(size)) ?                                     \
         ((buffer).last = (buffer).pointer = (buffer).start,                     \
          (buffer).end = (buffer).start+(size),                                  \
          1) :                                                                   \
@@ -134,7 +133,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)),                                     \
@@ -424,10 +423,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,type)                                     \
-  (((stack).start = (type)yaml_malloc(INITIAL_STACK_SIZE*sizeof(*(stack).start))) ? \
+#define STACK_INIT(context,stack,size)                                          \
+    (((stack).start = yaml_malloc((size)*sizeof(*(stack).start))) ?             \
         ((stack).top = (stack).start,                                           \
-         (stack).end = (stack).start+INITIAL_STACK_SIZE,                        \
+         (stack).end = (stack).start+(size),                                    \
          1) :                                                                   \
         ((context)->error = YAML_MEMORY_ERROR,                                  \
          0))
@@ -437,7 +436,8 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
      (stack).start = (stack).top = (stack).end = 0)
 
 #define STACK_EMPTY(context,stack)                                              \
-    ((stack).start == (stack).top)
+    ((void)(context),                                                           \
+     ((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,type)                                     \
-  (((queue).start = (type)yaml_malloc((size)*sizeof(*(queue).start))) ?         \
+#define QUEUE_INIT(context,queue,size)                                          \
+    (((queue).start = yaml_malloc((size)*sizeof(*(queue).start))) ?             \
         ((queue).head = (queue).tail = (queue).start,                           \
          (queue).end = (queue).start+(size),                                    \
          1) :                                                                   \
@@ -662,27 +662,3 @@ 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 4f0595c99d..432ad0647c 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -7,7 +7,6 @@ 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
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 7721a744c8..844902b1f7 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,9 +1,9 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 
-if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
+if /mswin|mingw|bccwin|nacl/ !~ RUBY_PLATFORM
   have_header("sys/stropts.h")
   have_func("setresuid")
   have_header("libutil.h")
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index 5dbfa09ae9..122562127d 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 $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 = ''.dup
+    buf = ''
     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)
+        c = @unusedBuf.slice!(0).chr
       elsif !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
         @unusedBuf = buf
         break
       else
-        c = getc
+        c = getc.chr
       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.captures]
+        result = [buf,*mat.to_a[1..-1]]
         break
       end
     end
@@ -69,3 +69,4 @@ class IO
     nil
   end
 end
+
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 7b9df4b5b9..2ac412cfbc 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -35,8 +35,8 @@
 #endif
 #include <ctype.h>
 
-#include "ruby/io.h"
 #include "internal.h"
+#include "ruby/io.h"
 #include "ruby/util.h"
 
 #include <signal.h>
@@ -143,7 +143,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     dup2(slave,0);
     dup2(slave,1);
     dup2(slave,2);
-    if (slave < 0 || slave > 2) (void)!close(slave);
+    close(slave);
 #if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
     if (seteuid(getuid())) ERROR_EXIT("seteuid()");
 #endif
@@ -182,7 +182,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 	argv = &v;
     }
 
-    carg.execarg_obj = rb_execarg_new(argc, argv, 1, 0);
+    carg.execarg_obj = rb_execarg_new(argc, argv, 1);
     carg.eargp = rb_execarg_get(carg.execarg_obj);
     rb_execarg_parent_start(carg.execarg_obj);
 
@@ -224,21 +224,6 @@ 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)
 {
@@ -246,13 +231,19 @@ 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(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
+#if defined(__sun) || (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 (rb_grantpt(masterfd) == -1) goto error;
+    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
+    if (grantpt(masterfd) == -1) goto grantpt_error;
     rb_fd_fix_cloexec(masterfd);
 #else
     {
@@ -266,8 +257,10 @@ 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 (rb_grantpt(masterfd) == -1) goto error;
+    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
+    if (grantpt(masterfd) == -1) goto grantpt_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;
@@ -275,9 +268,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_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;
+    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;
 #endif
 
     *master = masterfd;
@@ -285,6 +278,8 @@ 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);
@@ -336,26 +331,30 @@ 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;
-    if(rb_grantpt(masterfd) == -1) goto error;
+    s = signal(SIGCHLD, SIG_DFL);
+    if(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);
-    if(rb_grantpt(masterfd) == -1) goto error;
+    s = signal(SIGCHLD, SIG_DFL);
+    if(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_I_PUSH(slavefd, "ptem") == -1) goto error;
-    if(ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error;
-    ioctl_I_PUSH(slavefd, "ttcompat");
+    if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
+    if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
+    ioctl(slavefd, I_PUSH, "ttcompat");
 #endif
     *master = masterfd;
     *slave = slavefd;
@@ -373,34 +372,62 @@ 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] = {
-	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
-	HEX1("t"), HEX1("u"), HEX1("v"), HEX1("w"),
+    "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",
     };
 #elif defined(_IBMESA)  /* AIX/ESA */
     static const char MasterDevice[] = "/dev/ptyp%s";
     static const char SlaveDevice[] = "/dev/ttyp%s";
     static const char deviceNo[][3] = {
-	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"),
+    "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",
     };
 #else /* 4.2BSD */
     static const char MasterDevice[] = "/dev/pty%s";
     static const char SlaveDevice[] = "/dev/tty%s";
     static const char deviceNo[][3] = {
-	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
+    "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",
     };
 #endif
-#undef HEX1
     for (i = 0; i < numberof(deviceNo); i++) {
 	const char *const devno = deviceNo[i];
 	snprintf(MasterName, sizeof MasterName, MasterDevice, devno);
@@ -665,7 +692,7 @@ pty_check(int argc, VALUE *argv, VALUE self)
     if (!RTEST(exc)) return rb_last_status_get();
     raise_from_check(cpid, status);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 static VALUE cPTY;
@@ -680,7 +707,7 @@ static VALUE cPTY;
 /*
  * Document-class: PTY
  *
- * Creates and manages pseudo terminals (PTYs).  See also
+ * Creates and managed pseudo terminals (PTYs).  See also
  * http://en.wikipedia.org/wiki/Pseudo_terminal
  *
  * PTY allows you to allocate new terminals using ::open or ::spawn a new
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 143cbb0ee5..589837bee7 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,29 +1,13 @@
-# 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.ac \
+		   $(top_srcdir)/configure.in \
 		   $(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.ac \
-		$(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+                $(top_srcdir)/configure.in \
+                $(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/backward.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/backward.h
diff --git a/ext/rbconfig/sizeof/extconf.rb b/ext/rbconfig/sizeof/extconf.rb
index f7cd58f2d9..8cb16ca866 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 limits.c]
+$srcs = %w[sizes.c]
 $distcleanfiles.concat($srcs)
 
 have_type('int_least8_t')
diff --git a/ext/readline/.gitignore b/ext/readline/.gitignore
deleted file mode 100644
index 3d372989ae..0000000000
--- a/ext/readline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/readline-[1-9]*.*
diff --git a/ext/readline/depend b/ext/readline/depend
index eb7a047473..eb05e65727 100644
--- a/ext/readline/depend
+++ b/ext/readline/depend
@@ -7,12 +7,12 @@ readline.o: $(hdrdir)/ruby/encoding.h
 readline.o: $(hdrdir)/ruby/intern.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/extconf.rb b/ext/readline/extconf.rb
index fcc62921ae..776ab19ba8 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 "Neither readline nor libedit was found"
+    raise "readline nor libedit not found"
   end
 end
 
@@ -71,7 +71,6 @@ 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")
@@ -82,11 +81,10 @@ 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/ !~ 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")
+/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")
 readline.have_var("rl_pre_input_hook")
 readline.have_var("rl_special_prefixes")
 readline.have_func("rl_cleanup_after_signal")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 3380720f47..c3b98a8dc9 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -33,6 +33,7 @@
 #include <editline/readline.h>
 #endif
 
+#include "internal.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
 
@@ -57,11 +58,7 @@ static VALUE mReadline;
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "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
+static ID completion_proc, completion_case_fold;
 #if USE_INSERT_IGNORE_ESCAPE
 static ID id_orig_prompt, id_last_prompt;
 #endif
@@ -77,8 +74,6 @@ static ID id_special_prefixes;
 #endif
 #ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION
 # define rl_username_completion_function username_completion_function
-#else
-char *rl_username_completion_function(const char *, int);
 #endif
 #ifndef HAVE_RL_COMPLETION_MATCHES
 # define rl_completion_matches completion_matches
@@ -94,8 +89,7 @@ static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
 
 #define OutputStringValue(str) do {\
-    StringValueCStr(str);\
-    rb_check_safe_obj(str);\
+    SafeStringValue(str);\
     (str) = rb_str_conv_enc((str), rb_enc_get(str), rb_locale_encoding());\
 } while (0)\
 
@@ -138,13 +132,6 @@ 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
@@ -167,25 +154,24 @@ getc_body(struct getc_struct *p)
 #if defined(_WIN32)
     {
         INPUT_RECORD ir;
-        DWORD n;
+        int n;
         static int prior_key = '0';
         for (;;) {
-            HANDLE h;
             if (prior_key > 0xff) {
                 prior_key = rl_getc(p->input);
                 return prior_key;
             }
-            h = (HANDLE)_get_osfhandle(p->fd);
-            if (PeekConsoleInput(h, &ir, 1, &n)) {
+            if (PeekConsoleInput((HANDLE)_get_osfhandle(p->fd), &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(h, &ir, 1, &n);
+                        ReadConsoleInput((HANDLE)_get_osfhandle(p->fd), &ir, 1, &n);
                     }
                 } else {
-                    rb_w32_wait_events_blocking(&h, 1, INFINITE);
+                    HANDLE h = (HANDLE)_get_osfhandle(p->fd);
+                    rb_w32_wait_events(&h, 1, INFINITE);
                 }
             } else {
                 break;
@@ -632,7 +618,8 @@ readline_s_set_output(VALUE self, VALUE output)
 static VALUE
 readline_s_set_pre_input_hook(VALUE self, VALUE proc)
 {
-    mustbe_callable(proc);
+    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
+        rb_raise(rb_eArgError, "argument must respond to `call'");
     return rb_ivar_set(mReadline, id_pre_input_hook, proc);
 }
 
@@ -659,7 +646,7 @@ readline_pre_input_hook(void)
 
     proc = rb_attr_get(mReadline, id_pre_input_hook);
     if (!NIL_P(proc))
-        rb_funcall(proc, id_call, 0);
+        rb_funcall(proc, rb_intern("call"), 0);
     return 0;
 }
 #else
@@ -690,17 +677,6 @@ readline_s_insert_text(VALUE self, VALUE str)
 #endif
 
 #if defined(HAVE_RL_DELETE_TEXT)
-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
@@ -718,20 +694,21 @@ readline_s_delete_text(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 0, 2);
     if (rl_line_buffer) {
-        const char *p, *ptr = rl_line_buffer;
-        long beg = 0, len = strlen(ptr);
-        const char *end = ptr + len;
-        rb_encoding *enc = rb_locale_encoding();
+        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);
         if (argc == 2) {
             beg = NUM2LONG(argv[0]);
             len = NUM2LONG(argv[1]);
           num_pos:
-            p = str_subpos(ptr, end, beg, &len, enc);
+            p = rb_str_subpos(str, beg, &len);
             if (!p) rb_raise(rb_eArgError, "invalid index");
             beg = p - ptr;
         }
         else if (argc == 1) {
-            len = rb_enc_strlen(ptr, ptr + len, enc);
+            len = rb_str_strlen(str);
             if (!rb_range_beg_len(argv[0], &beg, &len, len, 1)) {
                 beg = NUM2LONG(argv[0]);
                 goto num_pos;
@@ -823,7 +800,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[https://svn.ruby-lang.org/repos/ruby/trunk/lib/irb/completion.rb]
+ * completion.rb[http://svn.ruby-lang.org/repos/ruby/trunk/lib/irb/completion.rb]
  * file for irb.
  *
  * The common strategy is to take a list of possible completions and filter it
@@ -838,7 +815,8 @@ readline_s_redisplay(VALUE self)
 static VALUE
 readline_s_set_completion_proc(VALUE self, VALUE proc)
 {
-    mustbe_callable(proc);
+    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
+        rb_raise(rb_eArgError, "argument must respond to `call'");
     return rb_ivar_set(mReadline, completion_proc, proc);
 }
 
@@ -854,51 +832,6 @@ 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
@@ -1020,7 +953,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, id_call, 1, rb_locale_str_new_cstr(text));
+    ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
     if (!RB_TYPE_P(ary, T_ARRAY))
         ary = rb_Array(ary);
     matches = RARRAY_LEN(ary);
@@ -1074,32 +1007,6 @@ 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:
@@ -1149,7 +1056,6 @@ readline_s_get_screen_size(VALUE self)
 #endif
 
 #ifdef HAVE_RL_VI_EDITING_MODE
-int rl_vi_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.vi_editing_mode -> nil
@@ -1188,7 +1094,6 @@ readline_s_vi_editing_mode_p(VALUE self)
 #endif
 
 #ifdef HAVE_RL_EMACS_EDITING_MODE
-int rl_emacs_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.emacs_editing_mode -> nil
@@ -1308,35 +1213,6 @@ 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:
@@ -1673,7 +1549,6 @@ readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 #endif
 
 #ifdef HAVE_RL_REFRESH_LINE
-int rl_refresh_line(int, int);
 /*
  * call-seq:
  *   Readline.refresh_line -> nil
@@ -1791,7 +1666,7 @@ rb_remove_history(int index)
 #else
     rb_notimplement();
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 #endif
 }
 
@@ -1919,11 +1794,6 @@ username_completion_proc_call(VALUE self, VALUE str)
     return result;
 }
 
-#ifdef HAVE_RL_CLEAR_SIGNALS
-int rl_clear_signals(void);
-#endif
-
-#undef rb_intern
 void
 Init_readline(void)
 {
@@ -1943,7 +1813,6 @@ 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)
@@ -1952,9 +1821,6 @@ 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",
@@ -1967,10 +1833,6 @@ 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",
@@ -1997,8 +1859,6 @@ 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",
@@ -2037,8 +1897,8 @@ Init_readline(void)
                                readline_s_get_special_prefixes, 0);
 
 #if USE_INSERT_IGNORE_ESCAPE
-    id_orig_prompt = rb_intern("orig_prompt");
-    id_last_prompt = rb_intern("last_prompt");
+    CONST_ID(id_orig_prompt, "orig_prompt");
+    CONST_ID(id_last_prompt, "last_prompt");
 #endif
 
     history = rb_obj_alloc(rb_cObject);
@@ -2121,9 +1981,6 @@ 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
@@ -2134,9 +1991,3 @@ 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 ed07a32e99..7ea823c427 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -12,16 +12,15 @@ ripper.o: ripper.c
 .y.c:
 	$(ECHO) compiling compiler $<
 	$(Q) $(BISON) -t -v -oy.tab.c $<
-	$(Q) sed -e "/^#/s!y\.tab\.c!$@!" -f $(top_srcdir)/tool/ytab.sed y.tab.c > $@
+	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
 	@$(RM) y.tab.c
 
 all: check
 static: check
 
-ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse.y {$(VPATH)}id.h
+ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
 	$(ECHO) extracting $@ from $(top_srcdir)/parse.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/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(top_srcdir)/parse.y > ripper.tmp.y
 	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
 	$(Q) $(RM) ripper.tmp.y
 
@@ -32,11 +31,11 @@ check: .eventids2-check
 	$(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
 	@exit > $@
 
-eventids1.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC1)
+eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
 	$(ECHO) generating $@ from $(SRC1)
 	$(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
 
-eventids2table.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC2)
+eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
 	$(ECHO) generating $@ from $(SRC2)
 	$(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
 
@@ -56,7 +55,6 @@ ripper.o: $(hdrdir)/ruby/encoding.h
 ripper.o: $(hdrdir)/ruby/intern.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/regex.h
 ripper.o: $(hdrdir)/ruby/ruby.h
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index e876e95ab3..04a40e0da7 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -1,13 +1,12 @@
-enum {
-    tIGNORED_NL  = tLAST_TOKEN + 1,
-    tCOMMENT,
-    tEMBDOC_BEG,
-    tEMBDOC,
-    tEMBDOC_END,
-    tHEREDOC_BEG,
-    tHEREDOC_END,
-    k__END__
-};
+#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)
 
 typedef struct {
     ID ripper_id_backref;
@@ -303,5 +302,5 @@ ripper_token2eventid(int tok)
     }
     rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
 
-    UNREACHABLE_RETURN(0);
+    UNREACHABLE;
 }
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index 89b46abcfd..91d4b320e4 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -1,5 +1,5 @@
 #!ruby -s
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 require 'mkmf'
 require 'rbconfig'
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index e937d65217..c5c3a8091e 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 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 cdbaf7dd34..53ed14d5e1 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # $Id$
 #
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
index 9955d30550..a50a2c6c4e 100644
--- a/ext/ripper/lib/ripper/filter.rb
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # $Id$
 #
@@ -25,7 +25,6 @@ class Ripper
       @__lexer = Lexer.new(src, filename, lineno)
       @__line = nil
       @__col = nil
-      @__state = nil
     end
 
     # The file name of the input.
@@ -47,20 +46,13 @@ 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, state|
+      @__lexer.lex.each do |pos, event, tok|
         @__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 95e1ebcdfe..69526340a7 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # $Id$
 #
@@ -23,47 +23,29 @@ class Ripper
   end
 
   # Tokenizes the Ruby program and returns an array of an array,
-  # which is formatted like
-  # <code>[[lineno, column], type, token, state]</code>.
+  # which is formatted like <code>[[lineno, column], type, token]</code>.
   #
   #   require 'ripper'
   #   require 'pp'
   #
   #   pp Ripper.lex("def m(a) nil end")
-  #   #=> [[[1,  0], :on_kw,     "def", Ripper::EXPR_FNAME                   ],
-  #        [[1,  3], :on_sp,     " ",   Ripper::EXPR_FNAME                   ],
-  #        [[1,  4], :on_ident,  "m",   Ripper::EXPR_ENDFN                   ],
-  #        [[1,  5], :on_lparen, "(",   Ripper::EXPR_LABEL | Ripper::EXPR_BEG],
-  #        [[1,  6], :on_ident,  "a",   Ripper::EXPR_ARG                     ],
-  #        [[1,  7], :on_rparen, ")",   Ripper::EXPR_ENDFN                   ],
-  #        [[1,  8], :on_sp,     " ",   Ripper::EXPR_BEG                     ],
-  #        [[1,  9], :on_kw,     "nil", Ripper::EXPR_END                     ],
-  #        [[1, 12], :on_sp,     " ",   Ripper::EXPR_END                     ],
-  #        [[1, 13], :on_kw,     "end", Ripper::EXPR_END                     ]]
+  #     #=> [[[1,  0], :on_kw,     "def"],
+  #          [[1,  3], :on_sp,     " "  ],
+  #          [[1,  4], :on_ident,  "m"  ],
+  #          [[1,  5], :on_lparen, "("  ],
+  #          [[1,  6], :on_ident,  "a"  ],
+  #          [[1,  7], :on_rparen, ")"  ],
+  #          [[1,  8], :on_sp,     " "  ],
+  #          [[1,  9], :on_kw,     "nil"],
+  #          [[1, 12], :on_sp,     " "  ],
+  #          [[1, 13], :on_kw,     "end"]]
   #
   def Ripper.lex(src, filename = '-', lineno = 1)
     Lexer.new(src, filename, lineno).lex
   end
 
   class Lexer < ::Ripper   #:nodoc: internal use only
-    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
-      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) do
-      def initialize(pos, event, tok, state)
-        super(pos, event, tok, State.new(state))
-      end
-    end
+    Elem = Struct.new(:pos, :event, :tok)
 
     def tokenize
       parse().sort_by(&:pos).map(&:tok)
@@ -83,32 +65,14 @@ class Ripper
 
     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)
-      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
+      @buf.last.each do |e|
+        if e.event == :on_tstring_content
           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
 
@@ -117,16 +81,16 @@ class Ripper
       buf = []
       @buf << buf
       @buf = buf
-      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+      @buf.push Elem.new([lineno(), column()], __callee__, tok)
     end
 
     def on_heredoc_end(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+      @buf.push Elem.new([lineno(), column()], __callee__, tok)
       @buf = @stack.pop
     end
 
     def _push_token(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+      @buf.push Elem.new([lineno(), column()], __callee__, tok)
     end
 
     (SCANNER_EVENTS.map {|event|:"on_#{event}"} - private_instance_methods(false)).each do |event|
@@ -192,7 +156,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/
@@ -213,14 +177,14 @@ class Ripper
     end
 
     def map_tokens(tokens)
-      tokens.map {|pos,type,str| map_token(type.to_s.delete_prefix('on_')) }.join
+      tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
     end
 
     MAP = {}
     seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
     SCANNER_EVENT_TABLE.each do |ev, |
       raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty?
-      MAP[ev.to_s.delete_prefix('on_')] = seed.shift
+      MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift
     end
 
     def map_token(tok)
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
index b52dd30ddc..aa1f86e38c 100644
--- a/ext/ripper/lib/ripper/sexp.rb
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # $Id$
 #
@@ -134,18 +134,6 @@ 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
deleted file mode 100644
index aafaa6f407..0000000000
--- a/ext/ripper/tools/dsl.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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);
-
-class DSL
-  def initialize(code, options)
-    @events = {}
-    @error = options.include?("error")
-    @brace = options.include?("brace")
-    @final = options.include?("final")
-    @vars = 0
-
-    # create $1 == "$1", $2 == "$2", ...
-    re, s = "", ""
-    1.upto(9) do |n|
-      re << "(..)"
-      s << "$#{ n }"
-    end
-    /#{ re }/ =~ s
-
-    # struct parser_params *p
-    p = "p"
-
-    @code = ""
-    @last_value = eval(code)
-  end
-
-  attr_reader :events
-
-  undef lambda
-  undef hash
-  undef class
-
-  def generate
-    s = "$$"
-    s = "p->result" if @final
-    s = "#@code#{ s }=#@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 f0de55a5f2..c1f0c5bc31 100755
--- a/ext/ripper/tools/generate-param-macros.rb
+++ b/ext/ripper/tools/generate-param-macros.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 off = true
 ARGF.each do |line|
   case line
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index 883e6ef2df..cb02de9b4b 100755
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # $Id$
 
 require 'optparse'
@@ -68,7 +68,7 @@ def usage(msg)
 end
 
 def generate_eventids1(ids)
-  buf = "".dup
+  buf = ""
   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 = "".dup
+  buf = ""
   buf << %Q[static void\n]
   buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
   buf << %Q[{\n]
@@ -135,8 +135,6 @@ def check_arity(h)
   abort if invalid
 end
 
-require_relative "dsl"
-
 def read_ids1_with_locations(path)
   h = {}
   File.open(path) {|f|
@@ -146,13 +144,6 @@ 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 7639a901df..2377506cd5 100755
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # $Id$
 
 require 'optparse'
@@ -24,7 +24,7 @@ def main
   unless ARGV.size == 1
     abort "wrong number of arguments (#{ARGV.size} for 1)"
   end
-  out = "".dup
+  out = ""
   File.open(ARGV[0]) {|f|
     prelude f, out
     grammar f, out
@@ -40,10 +40,14 @@ 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 << '%%' << $/
       return
@@ -51,37 +55,21 @@ def prelude(f, out)
       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 << $/
     when %r</\*%%%\*/>
       out << '#if 0' << $/
+    when %r</\*%c%\*/>
+      out << '/*' << $/
+    when %r</\*%c>
+      out << '*/' << $/
     when %r</\*%>
       out << '#endif' << $/
     when %r<%\*/>
@@ -96,12 +84,9 @@ def grammar(f, out)
 end
 
 def usercode(f, out)
-  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)
+  while line = f.gets
+    out << line
+  end
 end
 
 main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
index 23102f797a..0e409eb63b 100755
--- a/ext/ripper/tools/strip.rb
+++ b/ext/ripper/tools/strip.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 last_is_void = false
 ARGF.each do |line|
   case line
diff --git a/ext/rubyvm/extconf.rb b/ext/rubyvm/extconf.rb
deleted file mode 100644
index 8c40f58e2b..0000000000
--- a/ext/rubyvm/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("rubyvm")
diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
deleted file mode 100644
index e9bde2f299..0000000000
--- a/ext/rubyvm/lib/forwardable/impl.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# :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
index 3a42b0e569..9ff0e7959a 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -176,24 +176,24 @@ sdbm_open(register char *file, register int flags, register int mode)
 static int
 fd_set_cloexec(int fd)
 {
-	/* MinGW don't have F_GETFD and FD_CLOEXEC.  [ruby-core:40281] */
+  /* 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;
-			}
-		}
-	}
+    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;
+    return 0;
 }
 
 DBM *
@@ -400,20 +400,20 @@ makroom(register DBM *db, long int hash, int need)
  */
 
 #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) {
+	/*
+	 * 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;
+			return 0;
 		}
+		oldtail += PBLKSIZ;
+	}
 #endif
 
 		if (hash & (db->hmask + 1)) {
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 42292b99cd..684f31b98f 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -71,8 +71,6 @@ struct dbmdata {
     DBM *di_dbm;
 };
 
-NORETURN(static void closed_sdbm(void));
-
 static void
 closed_sdbm(void)
 {
@@ -81,6 +79,7 @@ closed_sdbm(void)
 
 #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)
 
@@ -101,10 +100,12 @@ free_sdbm(void *ptr)
 static size_t
 memsize_dbm(const void *ptr)
 {
+    size_t size = 0;
     const struct dbmdata *dbmp = ptr;
-    size_t size = sizeof(*dbmp);
-    if (dbmp->di_dbm)
-	size += sizeof(DBM);
+    if (dbmp) {
+	size += sizeof(*dbmp);
+	if (dbmp->di_dbm) size += sizeof(DBM);
+    }
     return size;
 }
 
@@ -147,6 +148,8 @@ 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;
 
@@ -156,9 +159,7 @@ fsdbm_closed(VALUE obj)
 static VALUE
 fsdbm_alloc(VALUE klass)
 {
-    struct dbmdata *dbmp;
-
-    return TypedData_Make_Struct(klass, struct dbmdata, &sdbm_type, dbmp);
+    return TypedData_Wrap_Struct(klass, &sdbm_type, 0);
 }
 /*
  * call-seq:
@@ -183,7 +184,6 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
     struct dbmdata *dbmp;
     int mode;
 
-    TypedData_Get_Struct(obj, struct dbmdata, &sdbm_type, dbmp);
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
     }
@@ -208,8 +208,8 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 	rb_sys_fail_str(file);
     }
 
-    if (dbmp->di_dbm)
-	sdbm_close(dbmp->di_dbm);
+    dbmp = ALLOC(struct dbmdata);
+    DATA_PTR(obj) = dbmp;
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
diff --git a/ext/sdbm/sdbm.gemspec b/ext/sdbm/sdbm.gemspec
deleted file mode 100644
index 6cf000b453..0000000000
--- a/ext/sdbm/sdbm.gemspec
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |s|
-  s.name = "sdbm"
-  s.version = '1.0.0'
-  s.summary = "Provides a simple file-based key-value store with String keys and values."
-  s.description = "Provides a simple file-based key-value store with String keys and values."
-
-  s.require_path = %w{lib}
-  s.files = %w{ext/sdbm/_sdbm.c ext/sdbm/extconf.rb ext/sdbm/init.c ext/sdbm/sdbm.h}
-  s.extensions = ["ext/sdbm/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/sdbm"
-  s.license = "BSD-2-Clause"
-
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "rake-compiler"
-end
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index f5451c9569..02766ba5d2 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -360,8 +360,6 @@ 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>
  */
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 1371672850..2d2b22e1a9 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:
- *   - Integer: value is assigned to an int, and a pointer to the int is
+ *   - Fixnum: value is assigned to an int, and a pointer to the int is
  *     passed, with length of sizeof(int).
  *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
- *     int is passed as for an Integer. Note that +false+ must be passed,
+ *     int is passed as for a Fixnum. Note that +false+ must be passed,
  *     not +nil+.
  *   - String: the string's data and length is passed to the socket.
  * * +socketoption+ is an instance of Socket::Option
@@ -314,18 +314,6 @@ 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);
@@ -542,9 +530,8 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
     struct rsock_send_arg arg;
     VALUE flags, to;
     rb_io_t *fptr;
-    ssize_t n;
+    int n;
     rb_blocking_function_t *func;
-    const char *funcname;
 
     rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
 
@@ -555,23 +542,21 @@ 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 = (ssize_t)BLOCKING_REGION_FD(func, &arg)) < 0) {
+	   (n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
 	if (rb_io_wait_writable(arg.fd)) {
 	    continue;
 	}
-	rb_sys_fail(funcname);
+	rb_sys_fail("send(2)");
     }
-    return SSIZET2NUM(n);
+    return INT2FIX(n);
 }
 
 /*
@@ -580,8 +565,6 @@ 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
@@ -737,13 +720,6 @@ 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/depend b/ext/socket/depend
index 41b00406a4..4b93dbeb1f 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -3,12 +3,10 @@ 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: $(srcdir)/mkconstants.rb
+constdefs.h constdefs.c : $(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
@@ -18,7 +16,6 @@ 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
@@ -39,7 +36,6 @@ 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
@@ -60,7 +56,6 @@ 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
@@ -82,7 +77,6 @@ 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
@@ -103,7 +97,6 @@ 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
@@ -124,7 +117,6 @@ 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
@@ -145,7 +137,6 @@ 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
@@ -166,7 +157,6 @@ 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
@@ -187,7 +177,6 @@ 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
@@ -208,7 +197,6 @@ 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
@@ -229,7 +217,6 @@ 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
@@ -250,7 +237,6 @@ 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
@@ -271,7 +257,6 @@ 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
@@ -292,7 +277,6 @@ 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
@@ -313,7 +297,6 @@ 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
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 0cc8a88d5c..fd70be45da 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -433,7 +433,6 @@ 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)"
@@ -477,7 +476,6 @@ 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)
 
@@ -568,7 +566,6 @@ 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)
          }
@@ -656,7 +653,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.h ..."; $stdout.flush
+    print "fixing apple's netinet6/in6.rb ..."; $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 ce6dc40478..b01f1cb82e 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -149,7 +149,6 @@ 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 */
@@ -167,7 +166,6 @@ 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/ifaddr.c b/ext/socket/ifaddr.c
index 26aa0c8082..a954163369 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -24,6 +24,7 @@ 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 {
@@ -54,12 +55,11 @@ 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;
-    if (ifaddr->ord == 0) size = sizeof(rb_ifaddr_root_t);
-    size += sizeof(struct ifaddrs);
-    return size;
+    root = get_root(ifaddr);
+    return sizeof(rb_ifaddr_root_t) + (root->numifaddrs - 1) * sizeof(rb_ifaddr_t);
 }
 
 static const rb_data_type_t ifaddr_type = {
@@ -84,12 +84,6 @@ get_ifaddr(VALUE self)
     return rifaddr;
 }
 
-static struct ifaddrs *
-get_ifaddrs(VALUE self)
-{
-    return get_ifaddr(self)->ifaddr;
-}
-
 static VALUE
 rsock_getifaddrs(void)
 {
@@ -112,7 +106,7 @@ rsock_getifaddrs(void)
         numifaddrs++;
 
     addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, 0);
-    root = xmalloc(offsetof(rb_ifaddr_root_t, ary) + numifaddrs * sizeof(rb_ifaddr_t));
+    root = xmalloc(sizeof(rb_ifaddr_root_t) + (numifaddrs-1) * sizeof(rb_ifaddr_t));
     root->refcount = 0;
     root->numifaddrs = numifaddrs;
 
@@ -120,6 +114,7 @@ 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];
@@ -146,7 +141,8 @@ rsock_getifaddrs(void)
 static VALUE
 ifaddr_name(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     return rb_str_new_cstr(ifa->ifa_name);
 }
 
@@ -161,7 +157,8 @@ ifaddr_name(VALUE self)
 static VALUE
 ifaddr_ifindex(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     unsigned int ifindex = if_nametoindex(ifa->ifa_name);
     if (ifindex == 0) {
         rb_raise(rb_eArgError, "invalid interface name: %s", ifa->ifa_name);
@@ -182,7 +179,8 @@ ifaddr_ifindex(VALUE self)
 static VALUE
 ifaddr_flags(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     return IFAFLAGS2NUM(ifa->ifa_flags);
 }
 
@@ -197,7 +195,8 @@ ifaddr_flags(VALUE self)
 static VALUE
 ifaddr_addr(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     if (ifa->ifa_addr)
         return rsock_sockaddr_obj(ifa->ifa_addr, rsock_sockaddr_len(ifa->ifa_addr));
     return Qnil;
@@ -214,7 +213,8 @@ ifaddr_addr(VALUE self)
 static VALUE
 ifaddr_netmask(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     if (ifa->ifa_netmask)
         return rsock_sockaddr_obj(ifa->ifa_netmask, rsock_sockaddr_len(ifa->ifa_netmask));
     return Qnil;
@@ -231,7 +231,8 @@ ifaddr_netmask(VALUE self)
 static VALUE
 ifaddr_broadaddr(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     if ((ifa->ifa_flags & IFF_BROADCAST) && ifa->ifa_broadaddr)
         return rsock_sockaddr_obj(ifa->ifa_broadaddr, rsock_sockaddr_len(ifa->ifa_broadaddr));
     return Qnil;
@@ -248,32 +249,13 @@ ifaddr_broadaddr(VALUE self)
 static VALUE
 ifaddr_dstaddr(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa = rifaddr->ifaddr;
     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)
 {
@@ -356,9 +338,12 @@ ifaddr_inspect_flags(ifa_flags_t flags, VALUE result)
 static VALUE
 ifaddr_inspect(VALUE self)
 {
-    struct ifaddrs *ifa = get_ifaddrs(self);
+    rb_ifaddr_t *rifaddr = get_ifaddr(self);
+    struct ifaddrs *ifa;
     VALUE result;
 
+    ifa = rifaddr->ifaddr;
+
     result = rb_str_new_cstr("#<");
 
     rb_str_append(result, rb_class_name(CLASS_OF(self)));
@@ -468,9 +453,6 @@ 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 259d3b5996..1ecd4fe352 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -10,10 +10,6 @@
 
 #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;
@@ -43,15 +39,7 @@ 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
@@ -68,12 +56,6 @@ 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)
 {
@@ -101,10 +83,8 @@ rsock_sendto_blocking(void *data)
 {
     struct rsock_send_arg *arg = data;
     VALUE mesg = arg->mesg;
-    ssize_t ret;
-    do_write_retry(sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-			  arg->flags, arg->to, arg->tolen));
-    return (VALUE)ret;
+    return (VALUE)sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+                         arg->flags, arg->to, arg->tolen);
 }
 
 VALUE
@@ -112,16 +92,13 @@ rsock_send_blocking(void *data)
 {
     struct rsock_send_arg *arg = data;
     VALUE mesg = arg->mesg;
-    ssize_t ret;
-    do_write_retry(send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-			arg->flags));
-    return (VALUE)ret;
+    return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+                       arg->flags);
 }
 
 struct recvfrom_arg {
     int fd, flags;
     VALUE str;
-    size_t length;
     socklen_t alen;
     union_sockaddr buf;
 };
@@ -132,11 +109,10 @@ 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), arg->length,
+    ret = recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
                    arg->flags, &arg->buf.addr, &arg->alen);
     if (ret != -1 && len0 < arg->alen)
         arg->alen = len0;
-
     return (VALUE)ret;
 }
 
@@ -154,6 +130,7 @@ rsock_strbuf(VALUE str, long buflen)
     } else {
 	rb_str_modify_expand(str, buflen - len);
     }
+    rb_str_set_len(str, buflen);
     return str;
 }
 
@@ -189,7 +166,6 @@ 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),
@@ -200,8 +176,9 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
         }
     }
 
-    /* Resize the string to the amount of data received */
-    rb_str_set_len(str, slen);
+    if (slen != RSTRING_LEN(str)) {
+	rb_str_set_len(str, slen);
+    }
     rb_obj_taint(str);
     switch (from) {
       case RECV_RECV:
@@ -303,114 +280,6 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
     return rb_assoc_new(str, addr);
 }
 
-#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)
-{
-    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;
-
-    OBJ_TAINT(str);
-    GetOpenFile(sock, fptr);
-
-    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;
-}
-
-/* :nodoc: */
-VALUE
-rsock_write_nonblock(VALUE sock, VALUE str, VALUE ex)
-{
-    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);
-    }
-
-#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);
-    }
-
-    return LONG2FIX(n);
-}
-#endif /* MSG_DONTWAIT_RELIABLE */
-
 /* returns true if SOCK_CLOEXEC is supported */
 int rsock_detect_cloexec(int fd)
 {
@@ -434,7 +303,7 @@ rsock_socket0(int domain, int type, int proto)
     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|RSOCK_NONBLOCK_DEFAULT, proto);
+        ret = socket(domain, type|SOCK_CLOEXEC, proto);
         if (ret >= 0) {
             if (ret <= 2)
                 goto fix_cloexec;
@@ -442,7 +311,7 @@ rsock_socket0(int domain, int type, int proto)
         }
     }
     else if (cloexec_state < 0) { /* usually runs once only for detection */
-        ret = socket(domain, type|SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT, proto);
+        ret = socket(domain, type|SOCK_CLOEXEC, proto);
         if (ret >= 0) {
             cloexec_state = rsock_detect_cloexec(ret);
             if (cloexec_state == 0 || ret <= 2)
@@ -465,9 +334,6 @@ rsock_socket0(int domain, int type, int proto)
         return -1;
 fix_cloexec:
     rb_maygvl_fd_fix_cloexec(ret);
-    if (RSOCK_NONBLOCK_DEFAULT) {
-        rsock_make_fd_nonblock(ret);
-    }
 update_max_fd:
     rb_update_max_fd(ret);
 
@@ -482,9 +348,6 @@ rsock_socket0(int domain, int type, int proto)
     if (ret == -1)
         return -1;
     rb_fd_fix_cloexec(ret);
-    if (RSOCK_NONBLOCK_DEFAULT) {
-        rsock_make_fd_nonblock(ret);
-    }
 
     return ret;
 }
@@ -513,30 +376,11 @@ wait_connectable(int fd)
     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.
@@ -637,8 +481,8 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
     return status;
 }
 
-void
-rsock_make_fd_nonblock(int fd)
+static void
+make_fd_nonblock(int fd)
 {
     int flags;
 #ifdef F_GETFL
@@ -664,9 +508,6 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
 #ifdef HAVE_ACCEPT4
     static int try_accept4 = 1;
 #endif
-    if (RSOCK_NONBLOCK_DEFAULT) {
-        nonblock = 1;
-    }
     if (address_len) len0 = *address_len;
 #ifdef HAVE_ACCEPT4
     if (try_accept4) {
@@ -686,7 +527,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
                 rb_maygvl_fd_fix_cloexec(ret);
 #ifndef SOCK_NONBLOCK
             if (nonblock) {
-                rsock_make_fd_nonblock(ret);
+                make_fd_nonblock(ret);
             }
 #endif
             if (address_len && len0 < *address_len) *address_len = len0;
@@ -703,7 +544,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
     if (address_len && len0 < *address_len) *address_len = len0;
     rb_maygvl_fd_fix_cloexec(ret);
     if (nonblock) {
-        rsock_make_fd_nonblock(ret);
+        make_fd_nonblock(ret);
     }
     return ret;
 }
@@ -839,8 +680,4 @@ 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 dadf10f6a5..9981fd43ad 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -191,43 +191,6 @@ 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
@@ -340,8 +303,6 @@ 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"
  *
@@ -369,7 +330,6 @@ 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 4ed2df23e6..5c3ed400f4 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
+        sock.close if !sock.closed?
       end
     else
       sock
     end
   end
-  protected :connect_internal
+  private :connect_internal
 
   # :call-seq:
   #   addrinfo.connect_from([local_addr_args], [opts]) {|socket| ... }
@@ -110,8 +110,10 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_from(*args, timeout: nil, &block)
-    connect_internal(family_addrinfo(*args), timeout, &block)
+  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)
   end
 
   # :call-seq:
@@ -133,8 +135,8 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect(timeout: nil, &block)
-    connect_internal(nil, timeout, &block)
+  def connect(opts={}, &block)
+    connect_internal(nil, opts[:timeout], &block)
   end
 
   # :call-seq:
@@ -156,9 +158,11 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_to(*args, timeout: nil, &block)
-    remote_addrinfo = family_addrinfo(*args)
-    remote_addrinfo.connect_internal(self, timeout, &block)
+  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)
   end
 
   # creates a socket bound to self.
@@ -185,7 +189,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -208,7 +212,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -313,9 +317,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 a keyword argument _exception_ to +false+, you can indicate
+  # By specifying `exception: false`, the _opts_ hash allows you to 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)
@@ -336,7 +340,6 @@ 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
@@ -362,9 +365,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 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.
+  # 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.
   #
   # === See
   # * Socket#recvfrom
@@ -436,26 +439,13 @@ class BasicSocket < IO
   # but non-blocking flag is set before the system call
   # and it doesn't retry the system call.
   #
-  # 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.
+  # 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.
   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
@@ -526,9 +516,9 @@ class Socket < BasicSocket
   # So IO::WaitReadable can be used to rescue the exceptions for retrying
   # recvfrom_nonblock.
   #
-  # 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.
+  # 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.
   #
   # === See
   # * Socket#recvfrom
@@ -583,9 +573,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 a keyword argument _exception_ to +false+, you can indicate
+  # 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.
+  # return the symbol :wait_readable instead.
   #
   # === See
   # * Socket#accept
@@ -619,10 +609,15 @@ class Socket < BasicSocket
   #     puts sock.read
   #   }
   #
-  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil) # :yield: socket
+  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
     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)
@@ -631,14 +626,14 @@ class Socket < BasicSocket
     Addrinfo.foreach(host, port, nil, :STREAM) {|ai|
       if local_addr_list
         local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
-        next unless local_addr
+        next if !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
@@ -646,7 +641,7 @@ class Socket < BasicSocket
       ret = sock
       break
     }
-    unless ret
+    if !ret
       if last_error
         raise last_error
       else
@@ -657,7 +652,7 @@ class Socket < BasicSocket
       begin
         yield ret
       ensure
-        ret.close
+        ret.close if !ret.closed?
       end
     else
       ret
@@ -681,7 +676,7 @@ class Socket < BasicSocket
         if reuseaddr
           s.setsockopt(:SOCKET, :REUSEADDR, 1)
         end
-        unless port
+        if !port
           s.bind(ai)
           port = s.local_address.ip_port
         else
@@ -689,10 +684,10 @@ class Socket < BasicSocket
         end
       }
     rescue Errno::EADDRINUSE
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       retry
     rescue Exception
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       raise
     end
     sockets
@@ -709,7 +704,7 @@ class Socket < BasicSocket
         s.listen(Socket::SOMAXCONN)
       }
     rescue Exception
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       raise
     end
     sockets
@@ -772,7 +767,7 @@ class Socket < BasicSocket
           raise last_error
         end
       rescue Exception
-        sockets.each(&:close)
+        sockets.each {|s| s.close }
         raise
       end
     end
@@ -780,7 +775,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each(&:close)
+        sockets.each {|s| s.close if !s.closed? }
       end
     else
       sockets
@@ -899,19 +894,18 @@ 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 unless a.ipv4?
+          next if !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 unless a.ipv6?
+          next if !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)
@@ -942,7 +936,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each(&:close) if sockets
+        sockets.each {|s| s.close if !s.closed? } if sockets
       end
     else
       sockets
@@ -1079,7 +1073,7 @@ class Socket < BasicSocket
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -1103,7 +1097,7 @@ class Socket < BasicSocket
   #   }
   #
   def self.unix_server_socket(path)
-    unless unix_socket_abstract_name?(path)
+    if !unix_socket_abstract_name?(path)
       begin
         st = File.lstat(path)
       rescue Errno::ENOENT
@@ -1117,8 +1111,8 @@ class Socket < BasicSocket
       begin
         yield s
       ensure
-        s.close
-        unless unix_socket_abstract_name?(path)
+        s.close if !s.closed?
+        if !unix_socket_abstract_name?(path)
           File.unlink path
         end
       end
@@ -1203,9 +1197,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 a keyword argument _exception_ to +false+, you can indicate
+  # By specifying `exception: false`, the options hash allows you to 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
@@ -1221,6 +1215,7 @@ 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.
@@ -1261,9 +1256,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 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.
+  # 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.
   #
   # === See
   # * Socket#recvfrom
@@ -1302,9 +1297,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 a keyword argument _exception_ to +false+, you can indicate
+  # 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.
+  # return the symbol :wait_readable instead.
   #
   # === See
   # * TCPServer#accept
@@ -1343,9 +1338,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 a keyword argument _exception_ to +false+, you can indicate
+  # 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.
+  # return the symbol :wait_readable instead.
   #
   # === See
   # * UNIXServer#accept
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 81b8224077..0ebf628b46 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -73,15 +73,7 @@ def each_name(pat)
   }
 end
 
-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")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % each_const {|guard, name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -95,7 +87,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
+ERB.new(<<'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%>));
@@ -104,7 +96,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name
 #endif
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % each_const {|guard, name, default_value|
 %   if guard
 #if <%=guard%>
@@ -154,7 +146,7 @@ def each_names_with_len(pat, prefix_optional=nil)
   }
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
+ERB.new(<<'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);
@@ -164,7 +156,7 @@ int <%=funcname%>(const char *str, long len, int *valp);
 %end
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
+ERB.new(<<'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)
 {
@@ -185,7 +177,7 @@ int
 }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
+ERB.new(<<'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)%>
@@ -214,7 +206,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
   end
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
+ERB.new(<<'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%>
@@ -223,7 +215,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_va
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
 ID
 <%=func_name%>(int val)
 {
@@ -234,7 +226,7 @@ ID
 }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
 ID <%=func_name%>(int val);
 EOS
 
@@ -283,7 +275,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.call(<<'EOS', nil, '%').result(binding)
+result = ERB.new(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
@@ -326,7 +318,7 @@ init_constants(void)
 
 EOS
 
-header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
+header_result = ERB.new(<<'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 5ad44cdcd8..a823ec7757 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -272,8 +272,6 @@ 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>
  *
@@ -406,7 +404,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 an integer.
+ * Returns the ipv4_multicast_loop data in _sockopt_ as a integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_loop(10)
  *   p sockopt.ipv4_multicast_loop => 10
@@ -424,7 +422,7 @@ sockopt_ipv4_multicast_loop(VALUE self)
     }
 #endif
     rb_raise(rb_eTypeError, "ipv4_multicast_loop socket option expected");
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 #define inspect_ipv4_multicast_loop(a,b,c,d) \
@@ -457,7 +455,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 an integer.
+ * Returns the ipv4_multicast_ttl data in _sockopt_ as a integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_ttl(10)
  *   p sockopt.ipv4_multicast_ttl => 10
@@ -475,7 +473,7 @@ sockopt_ipv4_multicast_ttl(VALUE self)
     }
 #endif
     rb_raise(rb_eTypeError, "ipv4_multicast_ttl socket option expected");
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 #define inspect_ipv4_multicast_ttl(a,b,c,d) \
@@ -1475,3 +1473,4 @@ 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 4c6a9b511c..11f5d1f5a6 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -145,6 +145,15 @@ 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)
@@ -173,15 +182,6 @@ 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)
 {
@@ -462,7 +462,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 (%"PRIuSIZE")",
+            rb_raise(rb_eArgError, "hostname too long (%"PRIdSIZE")",
                      len);
         }
         else {
@@ -493,7 +493,7 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
         SafeStringValueCStr(port);
         RSTRING_GETMEM(port, serv, len);
         if (len >= pbuflen) {
-            rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
+            rb_raise(rb_eArgError, "service name too long (%"PRIdSIZE")",
                      len);
         }
         memcpy(pbuf, serv, len);
@@ -726,8 +726,10 @@ static void
 addrinfo_mark(void *ptr)
 {
     rb_addrinfo_t *rai = ptr;
-    rb_gc_mark(rai->inspectname);
-    rb_gc_mark(rai->canonname);
+    if (rai) {
+        rb_gc_mark(rai->inspectname);
+        rb_gc_mark(rai->canonname);
+    }
 }
 
 #define addrinfo_free RUBY_TYPED_DEFAULT_FREE
@@ -2550,7 +2552,7 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
         rb_raise(rb_eTypeError, "neither IO nor file descriptor");
     }
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 /*
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 0ce77a5f6e..352da8c56e 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -26,13 +26,7 @@
 #  if defined(_MSC_VER)
 #    undef HAVE_TYPE_STRUCT_SOCKADDR_DL
 #  endif
-/*
- * FIXME: failures if we make nonblocking the default
- * [ruby-core:89973] [ruby-core:89976] [ruby-core:89977] [Bug #14968]
- */
-#  define RSOCK_NONBLOCK_DEFAULT (0)
 #else
-#  define RSOCK_NONBLOCK_DEFAULT (0)
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  ifdef HAVE_NETINET_IN_SYSTM_H
@@ -414,7 +408,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 safe list
+ * This is likely safe on all other *nix-like systems, so this whitelist
  * can be expanded by interested parties.
  */
 #if defined(__linux__)
@@ -436,11 +430,6 @@ 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__
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 0059595e1b..542cd02ed6 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -175,17 +175,16 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])
 {
     int ret;
     static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
-    static const int default_flags = SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT;
 
     if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
-        ret = socketpair(domain, type|default_flags, protocol, sv);
+        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|default_flags, protocol, sv);
+        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))
@@ -214,10 +213,6 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])
 fix_cloexec:
     rb_maygvl_fd_fix_cloexec(sv[0]);
     rb_maygvl_fd_fix_cloexec(sv[1]);
-    if (RSOCK_NONBLOCK_DEFAULT) {
-        rsock_make_fd_nonblock(sv[0]);
-        rsock_make_fd_nonblock(sv[1]);
-    }
 
 update_max_fd:
     rb_update_max_fd(sv[0]);
@@ -236,10 +231,6 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])
 
     rb_fd_fix_cloexec(sv[0]);
     rb_fd_fix_cloexec(sv[1]);
-    if (RSOCK_NONBLOCK_DEFAULT) {
-        rsock_make_fd_nonblock(sv[0]);
-        rsock_make_fd_nonblock(sv[1]);
-    }
     return ret;
 }
 #endif /* !SOCK_CLOEXEC */
@@ -992,18 +983,7 @@ sock_sockaddr(struct sockaddr *addr, socklen_t len)
  * call-seq:
  *   Socket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * 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_.
+ * Obtains the host information for _hostname_.
  *
  *   p Socket.gethostbyname("hal") #=> ["localhost", ["hal"], 2, "\x7F\x00\x00\x01"]
  *
@@ -1020,26 +1000,10 @@ sock_s_gethostbyname(VALUE obj, VALUE host)
  * call-seq:
  *   Socket.gethostbyaddr(address_string [, address_family]) => hostent
  *
- * 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_.
+ * 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)
@@ -1173,9 +1137,6 @@ 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.
@@ -1326,7 +1287,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    hptr = NULL;
 	}
 	else {
-	    strncpy(hbuf, StringValueCStr(host), sizeof(hbuf));
+	    strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
 	    hbuf[sizeof(hbuf) - 1] = '\0';
 	    hptr = hbuf;
 	}
@@ -1340,7 +1301,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    pptr = pbuf;
 	}
 	else {
-	    strncpy(pbuf, StringValueCStr(port), sizeof(pbuf));
+	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
 	    pbuf[sizeof(pbuf) - 1] = '\0';
 	    pptr = pbuf;
 	}
@@ -1390,7 +1351,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
     errno = saved_errno;
     rsock_raise_socket_error("getnameinfo", error);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 /*
@@ -1994,8 +1955,6 @@ 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/tcpsocket.c b/ext/socket/tcpsocket.c
index 29a3eda45f..a7a82fd880 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -41,16 +41,7 @@ tcp_sockaddr(struct sockaddr *addr, socklen_t len)
  * call-seq:
  *   TCPSocket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * 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_.
+ * Lookups host information by _hostname_.
  *
  *   TCPSocket.gethostbyname("localhost")
  *   #=> ["localhost", ["hal"], 2, "127.0.0.1"]
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index c2e273c2a3..7b7b34f04d 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -19,8 +19,6 @@
  * _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>
  *
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
index b1f2a38547..799dcffb00 100644
--- a/ext/socket/unixserver.c
+++ b/ext/socket/unixserver.c
@@ -17,8 +17,6 @@
  *
  * 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 8bdfc84575..d1cf1e2b2a 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -25,28 +25,6 @@ unixsock_connect_internal(VALUE a)
 			        arg->sockaddrlen, 0);
 }
 
-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') {
-            rb_check_safe_obj(name);
-            return name;             /* ignore encoding */
-        }
-    }
-#endif
-    return rb_get_path(path);
-}
-
 VALUE
 rsock_init_unixsock(VALUE sock, VALUE path, int server)
 {
@@ -55,7 +33,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
     int fd, status;
     rb_io_t *fptr;
 
-    path = unixsock_path_value(path);
+    SafeStringValue(path);
 
     INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
     if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {
@@ -115,8 +93,6 @@ 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
  *
@@ -339,12 +315,6 @@ 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
@@ -360,7 +330,6 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
     if (argc <= 1)
 	mode = Qnil;
 
-retry:
     GetOpenFile(sock, fptr);
 
     arg.msg.msg_name = NULL;
@@ -388,31 +357,12 @@ retry:
 
     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_syserr_fail_path(e, "recvmsg(2)", fptr->pathv);
+	    rsock_sys_fail_path("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));
diff --git a/ext/stringio/depend b/ext/stringio/depend
index 852146f503..cbd17f5df2 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -7,7 +7,6 @@ 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
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 47c2c50b95..a5a2327366 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -20,10 +20,6 @@
 #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
-
 struct StringIO {
     VALUE string;
     rb_encoding *enc;
@@ -35,7 +31,6 @@ 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))
@@ -57,8 +52,9 @@ static void
 strio_mark(void *p)
 {
     struct StringIO *ptr = p;
-
-    rb_gc_mark(ptr->string);
+    if (ptr) {
+	rb_gc_mark(ptr->string);
+    }
 }
 
 static void
@@ -108,14 +104,15 @@ enc_subseq(VALUE str, long pos, long len, rb_encoding *enc)
 }
 
 static VALUE
-strio_substr(struct StringIO *ptr, long pos, long len, rb_encoding *enc)
+strio_substr(struct StringIO *ptr, long pos, long len)
 {
     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_enc_str_new(0, 0, enc);
+    if (len == 0) return rb_str_new(0,0);
     return enc_subseq(str, pos, len, enc);
 }
 
@@ -613,30 +610,29 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
-    long amount, offset;
+    long offset;
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
-    amount = NUM2LONG(argv[0]);
+    offset = 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 (amount > LONG_MAX - offset || amount + offset < 0) {
+    if (offset < 0) {
 	error_inval(0);
     }
-    ptr->pos = amount + offset;
+    ptr->pos = offset;
     return INT2FIX(0);
 }
 
@@ -738,9 +734,6 @@ 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) {
@@ -770,15 +763,13 @@ strio_ungetc(VALUE self, VALUE c)
 
     check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
-    if (RB_INTEGER_TYPE_P(c)) {
-	int len, cc = NUM2INT(c);
+    if (FIXNUM_P(c)) {
+	int cc = FIX2INT(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, len);
+	return strio_unget_bytes(ptr, buf, rb_enc_codelen(cc, enc));
     }
     else {
 	SafeStringValue(c);
@@ -803,28 +794,24 @@ static VALUE
 strio_ungetbyte(VALUE self, VALUE c)
 {
     struct StringIO *ptr = readable(self);
+    char buf[1], *cp = buf;
+    long cl = 1;
 
     check_modifiable(ptr);
-    switch (TYPE(c)) {
-      case T_NIL:
-        return Qnil;
-      case T_FIXNUM:
-      case T_BIGNUM: ;
-        /* rb_int_modulo() not visible from exts */
-        VALUE v = rb_funcall(c, rb_intern("modulo"), 1, INT2FIX(256));
-        unsigned char cc = NUM2INT(v) & 0xFF;
-        c = rb_str_new((const char *)&cc, 1);
-        break;
-      default:
-        SafeStringValue(c);
+    if (NIL_P(c)) return Qnil;
+    if (FIXNUM_P(c)) {
+	buf[0] = (char)FIX2INT(c);
+	return strio_unget_bytes(ptr, buf, 1);
+    }
+    else {
+	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;
     }
-
-    const char *cp = RSTRING_PTR(c);
-    long cl = RSTRING_LEN(c);
-    if (cl == 0) return Qnil;
-    strio_unget_bytes(ptr, cp, cl);
-    RB_GC_GUARD(c);
-    return Qnil;
 }
 
 static VALUE
@@ -998,16 +985,15 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
 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)
 {
-    VALUE str, lim, opts;
+    VALUE str, lim;
     long limit = -1;
 
-    argc = rb_scan_args(argc, argv, "02:", &str, &lim, &opts);
+    rb_scan_args(argc, argv, "02", &str, &lim);
     switch (argc) {
       case 0:
 	str = rb_rs;
@@ -1033,37 +1019,15 @@ prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
     }
     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;
@@ -1075,15 +1039,11 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 	e = rb_enc_right_char_head(s, s + limit, e, get_enc(ptr));
     }
     if (NIL_P(str)) {
-	if (arg->chomp) {
-	    w = chomp_newline_width(s, e);
-	}
-	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     else if ((n = RSTRING_LEN(str)) == 0) {
 	p = s;
-	while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
-	    p += *p == '\r';
+	while (*p == '\n') {
 	    if (++p == e) {
 		return Qnil;
 	    }
@@ -1092,33 +1052,23 @@ strio_getline(struct getline_arg *arg, 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;
 	    }
 	}
-	if (!w && arg->chomp) {
-	    w = chomp_newline_width(s, e);
-	}
-	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s - w, enc);
+	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
     }
     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 - w, enc);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     else {
 	if (n < e - s) {
 	    if (e - s < 1024) {
 		for (p = s; p + n <= e; ++p) {
 		    if (MEMCMP(p, RSTRING_PTR(str), char, n) == 0) {
-			e = p + (arg->chomp ? 0 : n);
+			e = p + n;
 			break;
 		    }
 		}
@@ -1128,11 +1078,11 @@ strio_getline(struct getline_arg *arg, 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 + (arg->chomp ? 0 : n);
+		    e = s + pos + n;
 		}
 	    }
 	}
-	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     ptr->pos = e - RSTRING_PTR(ptr->string);
     ptr->lineno++;
@@ -1154,8 +1104,7 @@ strio_gets(int argc, VALUE *argv, VALUE self)
     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));
+	return rb_str_new(0, 0);
     }
 
     str = strio_getline(&arg, readable(self));
@@ -1252,8 +1201,8 @@ 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*.
  * The stream must be opened for writing.  If the argument is not a
@@ -1261,17 +1210,6 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
  * 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);
@@ -1287,7 +1225,7 @@ strio_write(VALUE self, VALUE str)
 	str = rb_str_conv_enc(str, enc2, enc);
     }
     len = RSTRING_LEN(str);
-    if (len == 0) return 0;
+    if (len == 0) return INT2FIX(0);
     check_modifiable(ptr);
     olen = RSTRING_LEN(ptr->string);
     if (ptr->flags & FMODE_APPEND) {
@@ -1310,7 +1248,7 @@ strio_write(VALUE self, VALUE str)
     OBJ_INFECT(ptr->string, self);
     RB_GC_GUARD(str);
     ptr->pos += len;
-    return len;
+    return LONG2NUM(len);
 }
 
 /*
@@ -1392,7 +1330,6 @@ 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]);
@@ -1410,14 +1347,12 @@ strio_read(int argc, VALUE *argv, VALUE self)
       case 0:
 	len = RSTRING_LEN(ptr->string);
 	if (len <= ptr->pos) {
-	    rb_encoding *enc = binary ? rb_ascii8bit_encoding() : 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 {
@@ -1426,8 +1361,8 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	break;
     }
     if (NIL_P(str)) {
-	rb_encoding *enc = binary ? rb_ascii8bit_encoding() : get_enc(ptr);
-	str = strio_substr(ptr, ptr->pos, len, enc);
+	str = strio_substr(ptr, ptr->pos, len);
+	if (binary) rb_enc_associate(str, rb_ascii8bit_encoding());
     }
     else {
 	long rest = RSTRING_LEN(ptr->string) - ptr->pos;
@@ -1574,7 +1509,7 @@ strio_external_encoding(VALUE self)
 static VALUE
 strio_internal_encoding(VALUE self)
 {
-    return Qnil;
+     return Qnil;
 }
 
 /*
@@ -1626,7 +1561,6 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
 void
 Init_stringio(void)
 {
-#undef rb_intern
     VALUE StringIO = rb_define_class("StringIO", rb_cData);
 
     rb_include_module(StringIO, rb_mEnumerable);
@@ -1685,7 +1619,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_m, -1);
+    rb_define_method(StringIO, "write", strio_write, 1);
     rb_define_method(StringIO, "putc", strio_putc, 1);
 
     /*
diff --git a/ext/stringio/stringio.gemspec b/ext/stringio/stringio.gemspec
deleted file mode 100644
index df1d468f93..0000000000
--- a/ext/stringio/stringio.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-# stub: stringio 0.0.0 ruby lib
-# stub: extconf.rb
-
-Gem::Specification.new do |s|
-  s.name = "stringio".freeze
-  s.version = "0.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 2.6".freeze)
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Nobu Nakada".freeze]
-  s.description = "Pseudo `IO` class from/to `String`.".freeze
-  s.email = "nobu@ruby-lang.org".freeze
-  s.extensions = ["ext/stringio/extconf.rb".freeze]
-  s.files = ["README.md".freeze, "ext/stringio/extconf.rb".freeze, "ext/stringio/stringio.c".freeze]
-  s.homepage = "https://github.com/ruby/stringio".freeze
-  s.licenses = ["BSD-2-Clause".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.2".freeze)
-  s.rubygems_version = "2.6.11".freeze
-  s.summary = "Pseudo IO on String".freeze
-
-  # s.cert_chain  = %w[certs/nobu.pem]
-  # s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
-
-  s.add_development_dependency 'rake-compiler'
-end
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 1c396b00cf..318da4f7e7 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -6,7 +6,6 @@ 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
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index 714fa99fae..c968f81c95 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'mkmf'
 $INCFLAGS << " -I$(top_srcdir)"
 create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 77a36fe323..e75bf6639c 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -64,7 +64,6 @@ struct strscanner
                             Function Prototypes
    ======================================================================= */
 
-static inline long minl _((const long n, const long x));
 static VALUE infect _((VALUE str, struct strscanner *p));
 static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i));
 static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len));
@@ -141,17 +140,12 @@ 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;
-    end_i = minl(end_i, S_LEN(p));
+    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);
 }
 
@@ -159,7 +153,8 @@ static VALUE
 extract_beg_len(struct strscanner *p, long beg_i, long len)
 {
     if (beg_i > S_LEN(p)) return Qnil;
-    len = minl(len, S_LEN(p) - beg_i);
+    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);
 }
 
@@ -733,7 +728,9 @@ strscan_getch(VALUE self)
         return Qnil;
 
     len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
-    len = minl(len, S_RESTLEN(p));
+    if (p->curr + len > S_LEN(p)) {
+        len = S_LEN(p) - p->curr;
+    }
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
@@ -810,7 +807,8 @@ strscan_peek(VALUE self, VALUE vlen)
     if (EOS_P(p))
         return infect(str_new(p, "", 0), p);
 
-    len = minl(len, S_RESTLEN(p));
+    if (p->curr + len > S_LEN(p))
+        len = S_LEN(p) - p->curr;
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -996,7 +994,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
 /*
  * call-seq: [](n)
  *
- * Returns the n-th subgroup in the most recent match.
+ * Return the n-th subgroup in the most recent match.
  *
  *   s = StringScanner.new("Fri Dec 12 1975 14:39")
  *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
@@ -1034,7 +1032,6 @@ strscan_aref(VALUE self, VALUE idx)
             idx = rb_sym2str(idx);
             /* fall through */
         case T_STRING:
-            if (!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;
@@ -1053,93 +1050,7 @@ strscan_aref(VALUE self, VALUE idx)
 }
 
 /*
- * 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, p->prev + p->regs.beg[i],
-                                     p->prev + p->regs.end[i]);
-        rb_ary_push(new_ary, str);
-    }
-
-    return new_ary;
-}
-
-/*
- *  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.
+ * Return the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -1158,7 +1069,7 @@ strscan_pre_match(VALUE self)
 }
 
 /*
- * Returns the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
+ * Return the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -1205,7 +1116,7 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
-    i = S_RESTLEN(p);
+    i = S_LEN(p) - p->curr;
     return INT2FIX(i);
 }
 
@@ -1291,7 +1202,7 @@ inspect2(struct strscanner *p)
     long len;
 
     if (EOS_P(p)) return rb_str_new2("");
-    len = S_RESTLEN(p);
+    len = S_LEN(p) - p->curr;
     if (len > INSPECT_LENGTH) {
 	str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
 	rb_str_cat2(str, "...");
@@ -1412,7 +1323,6 @@ inspect2(struct strscanner *p)
 void
 Init_strscan(void)
 {
-#undef rb_intern
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
 
@@ -1479,9 +1389,6 @@ 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);
diff --git a/ext/strscan/strscan.gemspec b/ext/strscan/strscan.gemspec
deleted file mode 100644
index eefe8fbf2c..0000000000
--- a/ext/strscan/strscan.gemspec
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-Gem::Specification.new do |s|
-  s.name = "strscan"
-  s.version = '1.0.0'
-  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 ext/strscan/regenc.h ext/strscan/regint.h}
-  s.extensions = %w{ext/strscan/extconf.rb}
-  s.required_ruby_version = ">= 2.4.0"
-
-  s.authors = ["Minero Aoki"]
-  s.email = [nil]
-  s.homepage = "https://github.com/ruby/strscan"
-  s.license = "BSD-2-Clause"
-
-  s.add_development_dependency "rake-compiler"
-end
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 754efd0317..9c41795f5b 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -150,7 +150,6 @@ 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");
@@ -161,9 +160,8 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
     if (NIL_P(ident)) {
         ident = rb_gv_get("$0");
     }
-    ident_ptr = StringValueCStr(ident);
-    rb_check_safe_obj(ident);
-    syslog_ident = strdup(ident_ptr);
+    SafeStringValue(ident);
+    syslog_ident = strdup(RSTRING_PTR(ident));
 
     if (NIL_P(opt)) {
 	syslog_options = LOG_PID | LOG_CONS;
@@ -420,7 +418,6 @@ 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");
@@ -507,7 +504,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/win32/extconf.rb b/ext/win32/extconf.rb
index ceab4ef4f4..9952274e29 100644
--- a/ext/win32/extconf.rb
+++ b/ext/win32/extconf.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: false
-if $mswin||$mingw||$cygwin
+if compiled?('fiddle') and $mswin||$mingw||$cygwin
   create_makefile('win32')
 end
diff --git a/ext/win32/lib/Win32API.rb b/ext/win32/lib/Win32API.rb
index 97b29fbf74..d03ecc1c46 100644
--- a/ext/win32/lib/Win32API.rb
+++ b/ext/win32/lib/Win32API.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 # for backward compatibility
-warn "Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead", uplevel: 2
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead" if $VERBOSE
 
 require 'fiddle/import'
 
diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb
index ea04bb34bf..f3655b78d3 100644
--- a/ext/win32/lib/win32/registry.rb
+++ b/ext/win32/lib/win32/registry.rb
@@ -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_NONE
+    # :REG_BINARY
     #    String (contains binary data)
     #
     # When rtype is specified, the value type must be included by
@@ -643,16 +643,14 @@ 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.map{|t|Registry.type2name(t)}.join(', ')}] but #{
-          Registry.type2name(type)} present)"
+        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{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, REG_NONE
+      when REG_BINARY
         [ type, data ]
       when REG_DWORD
         [ type, API.unpackdw(data) ]
@@ -661,7 +659,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 #{Registry.type2name(type)} is not supported."
+        raise TypeError, "Type #{type} is not supported."
       end
     end
 
@@ -684,7 +682,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 #{Registry.type2name(type)} is not supported."
+        raise TypeError, "Type #{type} is not supported."
       end
     end
 
@@ -748,7 +746,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, REG_NONE
+      when REG_BINARY
         data = data.to_s
       when REG_DWORD
         data = API.packdw(data.to_i)
@@ -757,7 +755,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 #{Registry.type2name(type)}"
+        raise TypeError, "Unsupported type #{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 1eb70d5dc6..647f1446fc 100644
--- a/ext/win32/lib/win32/resolv.rb
+++ b/ext/win32/lib/win32/resolv.rb
@@ -42,39 +42,24 @@ begin
 rescue LoadError
 end
 
-if [nil].pack("p").size <= 4 # 32bit env
-  begin
-    f = Fiddle
-    osid = f::Handle.new["rb_w32_osid"]
-  rescue f::DLError # not ix86, cannot be Windows 9x
-  else
-    if f::Function.new(osid, [], f::TYPE_INT).call < 2  # VER_PLATFORM_WIN32_NT
-      require_relative 'resolv9x'
-      return
-    end
-  end
+nt = Module.new do
+  break true if [nil].pack("p").size > 4
+  extend Importer
+  dlload "kernel32.dll"
+  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
 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
@@ -146,3 +131,4 @@ module Win32
     end
   end
 end
+end
diff --git a/ext/win32/lib/win32/resolv9x.rb b/ext/win32/lib/win32/resolv9x.rb
index a409d59c0c..1045bb2e09 100644
--- a/ext/win32/lib/win32/resolv9x.rb
+++ b/ext/win32/lib/win32/resolv9x.rb
@@ -141,7 +141,7 @@ module Win32
         extend Importer
         dlload "wsock32.dll"
       end
-      WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *)", :stdcall
+      WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *", :stdcall
       WSAGetLastError = WSock32.extern "int WSAGetLastError(void)", :stdcall
 
       MAX_TDI_ENTITIES = 512
diff --git a/ext/win32/lib/win32/sspi.rb b/ext/win32/lib/win32/sspi.rb
index 8103893d7f..20441b389c 100644
--- a/ext/win32/lib/win32/sspi.rb
+++ b/ext/win32/lib/win32/sspi.rb
@@ -73,7 +73,7 @@ module Win32
 			end
 		end
 
-		# Creates binary representations of a SecBufferDesc structure,
+		# Creates binary representaiton of a SecBufferDesc structure,
 		# including the SecBuffer contained inside.
 		class SecurityBuffer
 
diff --git a/ext/win32ole/lib/win32ole.rb b/ext/win32ole/lib/win32ole.rb
deleted file mode 100644
index d7034f7845..0000000000
--- a/ext/win32ole/lib/win32ole.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-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/win32ole.c b/ext/win32ole/win32ole.c
index c46d3937c3..f5246b0274 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -1,7 +1,6 @@
 /*
  *  (c) 1995 Microsoft Corporation. All rights reserved.
- *  Developed by ActiveWare Internet Corp., now known as
- *  ActiveState Tool Corp., http://www.ActiveState.com
+ *  Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
  *
  *  Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
  *  <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
@@ -27,7 +26,7 @@
 const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
 #endif
 
-#define WIN32OLE_VERSION "1.8.8"
+#define WIN32OLE_VERSION "1.8.5"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -37,13 +36,13 @@ typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
 typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
 VALUE cWIN32OLE;
 
-#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__))
+#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__) || defined(__MINGW32__))
 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 (TlsGetValue(g_ole_initialized_key)!=0)
+# define g_ole_initialized (BOOL)TlsGetValue(g_ole_initialized_key)
 # define g_ole_initialized_init() (g_ole_initialized_key = TlsAlloc())
 # define g_ole_initialized_set(val) TlsSetValue(g_ole_initialized_key, (void*)(val))
 #endif
@@ -51,7 +50,6 @@ 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;
@@ -171,7 +169,6 @@ 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",
@@ -424,12 +421,12 @@ rbtime2vtdate(VALUE tmobj)
     double t;
     double nsec;
 
-    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.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.wMilliseconds = 0;
     SystemTimeToVariantTime(&st, &t);
 
@@ -438,7 +435,7 @@ rbtime2vtdate(VALUE tmobj)
      * wMilliseconds of SYSTEMTIME struct.
      * So, we need to calculate milliseconds by ourselves.
      */
-    nsec =  RB_FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
+    nsec =  FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
     nsec /= 1000000.0;
     nsec /= (24.0 * 3600.0);
     nsec /= 1000;
@@ -454,18 +451,18 @@ vtdate2rbtime(double date)
     double sec;
     VariantTimeToSystemTime(date, &st);
     v = rb_funcall(rb_cTime, rb_intern("new"), 6,
-		      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));
+		      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));
     st.wMilliseconds = 0;
     SystemTimeToVariantTime(&st, &sec);
     /*
@@ -820,22 +817,16 @@ ole_initialize(void)
     }
 
     if(g_ole_initialized == FALSE) {
-        if(g_running_nano) {
-            hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-        } else {
-            hr = OleInitialize(NULL);
-        }
+        hr = OleInitialize(NULL);
         if(FAILED(hr)) {
             ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
         }
         g_ole_initialized_set(TRUE);
 
-        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");
-            }
+        hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
+        if(FAILED(hr)) {
+            previous_filter = NULL;
+            ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
         }
     }
 }
@@ -880,7 +871,7 @@ ole_vstr2wc(VALUE vstr)
     enc = rb_enc_get(vstr);
 
     if (st_lookup(tbl, (VALUE)enc | FIXNUM_FLAG, &data)) {
-        cp = RB_FIX2INT((VALUE)data);
+        cp = FIX2INT((VALUE)data);
     } else {
         cp = ole_encoding2cp(enc);
         if (code_page_installed(cp) ||
@@ -892,7 +883,7 @@ ole_vstr2wc(VALUE vstr)
             cp == CP_UTF7 ||
             cp == CP_UTF8 ||
             cp == 51932) {
-            st_insert(tbl, (VALUE)enc | FIXNUM_FLAG, RB_INT2FIX(cp));
+            st_insert(tbl, (VALUE)enc | FIXNUM_FLAG, INT2FIX(cp));
         } else {
             rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
         }
@@ -1280,7 +1271,7 @@ ole_val2variant(VALUE val, VARIANT *var)
     case T_FIXNUM:
         V_VT(var) = VT_I4;
         {
-            long v = RB_NUM2LONG(val);
+            long v = NUM2LONG(val);
             V_I4(var) = (LONG)v;
 #if SIZEOF_LONG > 4
             if (V_I4(var) != v) {
@@ -1495,58 +1486,58 @@ ole_variant2val(VARIANT *pvar)
         break;
     case VT_I1:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I1REF(pvar));
+            obj = INT2NUM((long)*V_I1REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_I1(pvar));
+            obj = INT2NUM((long)V_I1(pvar));
         break;
 
     case VT_UI1:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI1REF(pvar));
+            obj = INT2NUM((long)*V_UI1REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_UI1(pvar));
+            obj = INT2NUM((long)V_UI1(pvar));
         break;
 
     case VT_I2:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I2REF(pvar));
+            obj = INT2NUM((long)*V_I2REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_I2(pvar));
+            obj = INT2NUM((long)V_I2(pvar));
         break;
 
     case VT_UI2:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI2REF(pvar));
+            obj = INT2NUM((long)*V_UI2REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_UI2(pvar));
+            obj = INT2NUM((long)V_UI2(pvar));
         break;
 
     case VT_I4:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I4REF(pvar));
+            obj = INT2NUM((long)*V_I4REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_I4(pvar));
+            obj = INT2NUM((long)V_I4(pvar));
         break;
 
     case VT_UI4:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI4REF(pvar));
+            obj = INT2NUM((long)*V_UI4REF(pvar));
         else
-            obj = RB_INT2NUM((long)V_UI4(pvar));
+            obj = INT2NUM((long)V_UI4(pvar));
         break;
 
     case VT_INT:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_INTREF(pvar));
+            obj = INT2NUM((long)*V_INTREF(pvar));
         else
-            obj = RB_INT2NUM((long)V_INT(pvar));
+            obj = INT2NUM((long)V_INT(pvar));
         break;
 
     case VT_UINT:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UINTREF(pvar));
+            obj = INT2NUM((long)*V_UINTREF(pvar));
         else
-            obj = RB_INT2NUM((long)V_UINT(pvar));
+            obj = INT2NUM((long)V_UINT(pvar));
         break;
 
 #if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
@@ -1605,9 +1596,9 @@ ole_variant2val(VARIANT *pvar)
 
     case VT_ERROR:
         if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM(*V_ERRORREF(pvar));
+            obj = INT2NUM(*V_ERRORREF(pvar));
         else
-            obj = RB_INT2NUM(V_ERROR(pvar));
+            obj = INT2NUM(V_ERROR(pvar));
         break;
 
     case VT_BOOL:
@@ -1810,9 +1801,7 @@ ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
                 *pName = toupper((int)*pName);
                 id = rb_intern(pName);
                 if (rb_is_const_id(id)) {
-                    if(!rb_const_defined_at(klass, id)) {
-                        rb_define_const(klass, pName, val);
-                    }
+                    rb_define_const(klass, pName, val);
                 }
                 else {
                     rb_hash_aset(constant, rb_str_new2(pName), val);
@@ -2074,12 +2063,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
+            ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
         }
         hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
         if(FAILED(hr)) {
             OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
+            ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
         }
         OLE_RELEASE(pTypeInfo);
         if(!RB_TYPE_P(klass, T_NIL)) {
@@ -2138,7 +2127,7 @@ fole_s_reference_count(VALUE self, VALUE obj)
 {
     struct oledata * pole = NULL;
     pole = oledata_get_struct(obj);
-    return RB_INT2NUM(reference_count(pole));
+    return INT2NUM(reference_count(pole));
 }
 
 /*
@@ -2161,7 +2150,7 @@ fole_s_free(VALUE self, VALUE obj)
             n = OLE_RELEASE(pole->pDispatch);
         }
     }
-    return RB_INT2NUM(n);
+    return INT2NUM(n);
 }
 
 static HWND
@@ -2178,10 +2167,10 @@ ole_show_help(VALUE helpfile, VALUE helpcontext)
     if (!pfnHtmlHelp)
         return hwnd;
     hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                    0x0f, RB_NUM2INT(helpcontext));
+                    0x0f, NUM2INT(helpcontext));
     if (hwnd == 0)
         hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                 0,  RB_NUM2INT(helpcontext));
+                 0,  NUM2INT(helpcontext));
     return hwnd;
 }
 
@@ -2238,7 +2227,7 @@ fole_s_show_help(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_s_get_code_page(VALUE self)
 {
-    return RB_INT2FIX(cWIN32OLE_cp);
+    return INT2FIX(cWIN32OLE_cp);
 }
 
 static BOOL CALLBACK
@@ -2275,7 +2264,7 @@ code_page_installed(UINT cp)
 static VALUE
 fole_s_set_code_page(VALUE self, VALUE vcp)
 {
-    UINT cp = RB_FIX2INT(vcp);
+    UINT cp = FIX2INT(vcp);
     set_ole_codepage(cp);
     /*
      * Should this method return old codepage?
@@ -2295,7 +2284,7 @@ fole_s_set_code_page(VALUE self, VALUE vcp)
 static VALUE
 fole_s_get_locale(VALUE self)
 {
-    return RB_INT2FIX(cWIN32OLE_lcid);
+    return INT2FIX(cWIN32OLE_lcid);
 }
 
 static BOOL
@@ -2330,7 +2319,7 @@ lcid_installed(LCID lcid)
 static VALUE
 fole_s_set_locale(VALUE self, VALUE vlcid)
 {
-    LCID lcid = RB_FIX2INT(vlcid);
+    LCID lcid = FIX2INT(vlcid);
     if (lcid_installed(lcid)) {
         cWIN32OLE_lcid = lcid;
     } else {
@@ -2443,16 +2432,12 @@ 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.
@@ -2463,19 +2448,13 @@ 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, &opts);
+    rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
 
     StringValue(svr_name);
     if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
@@ -2504,35 +2483,9 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
                   StringValuePtr(svr_name));
     }
 
-    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);
-        }
-    }
+    /* get IDispatch interface */
+    hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
+                          &IID_IDispatch, &p);
     pDispatch = p;
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLERuntimeError,
@@ -2649,7 +2602,9 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
                 &wcmdname, 1, lcid, &DispID);
         SysFreeString(wcmdname);
         if(FAILED(hr)) {
-            return rb_eNoMethodError;
+            ole_raise(hr, rb_eNoMethodError,
+                    "unknown property or method: `%s'",
+                    StringValuePtr(cmd));
         }
     }
 
@@ -2851,11 +2806,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
 static VALUE
 fole_invoke(int argc, VALUE *argv, VALUE self)
 {
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
+    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
 }
 
 static VALUE
@@ -2868,7 +2819,8 @@ 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;
@@ -2889,7 +2841,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)RB_FIX2INT(tp);
+        vt = (VARTYPE)FIX2INT(tp);
         V_VT(&dispParams.rgvarg[i]) = vt;
         param = rb_ary_entry(args, j);
         if (param == Qnil)
@@ -3024,7 +2976,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, RB_NUM2INT(dispid),
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
                                          &IID_NULL, cWIN32OLE_lcid,
                                          dispkind,
                                          &dispParams, &result,
@@ -3033,7 +2985,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",
-                  RB_NUM2INT(dispid),
+                  NUM2INT(dispid),
                   StringValuePtr(v));
     }
 
@@ -3122,11 +3074,7 @@ fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
 static VALUE
 fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 {
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
 }
 
 /*
@@ -3145,11 +3093,7 @@ fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_setproperty(int argc, VALUE *argv, VALUE self)
 {
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
 }
 
 /*
@@ -3171,11 +3115,7 @@ fole_setproperty(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 {
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
 }
 
 static VALUE
@@ -3325,7 +3265,7 @@ fole_each(VALUE self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
     }
 
     if (V_VT(&result) == VT_UNKNOWN) {
@@ -3341,7 +3281,7 @@ fole_each(VALUE self)
     }
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
+        ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
     }
 
     VariantClear(&result);
@@ -3358,11 +3298,11 @@ fole_each(VALUE self)
 static VALUE
 fole_missing(int argc, VALUE *argv, VALUE self)
 {
-    VALUE mid, org_mid, sym, v;
+    VALUE mid, sym;
     const char* mname;
     long n;
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-    mid = org_mid = argv[0];
+    mid = argv[0];
     sym = rb_check_symbol(&mid);
     if (!NIL_P(sym)) mid = rb_sym2str(sym);
     mname = StringValueCStr(mid);
@@ -3378,12 +3318,7 @@ fole_missing(int argc, VALUE *argv, VALUE self)
     }
     else {
         argv[0] = rb_enc_associate(rb_str_dup(mid), cWIN32OLE_enc);
-        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;
+        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
     }
 }
 
@@ -3400,7 +3335,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
                                              -1,
@@ -3410,7 +3345,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, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
     }
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count; i++) {
@@ -3535,7 +3470,7 @@ fole_type(VALUE self)
 
     hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     type = ole_type_from_itypeinfo(pTypeInfo);
     OLE_RELEASE(pTypeInfo);
@@ -3569,7 +3504,7 @@ fole_typelib(VALUE self)
     hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                               0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
     OLE_RELEASE(pTypeInfo);
@@ -3616,7 +3551,7 @@ fole_query_interface(VALUE self, VALUE str_iid)
     hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
                                                  &p);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError,
+        ole_raise(hr, eWIN32OLERuntimeError,
                   "failed to get interface `%s'",
                   StringValuePtr(str_iid));
     }
@@ -3826,7 +3761,7 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
         break;
     default:
         typestr = rb_str_new2("Unknown Type ");
-        rb_str_concat(typestr, rb_fix2str(RB_INT2FIX(pTypeDesc->vt), 10));
+        rb_str_concat(typestr, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
         break;
     }
     if (typedetails != Qnil)
@@ -3857,7 +3792,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, eWIN32OLEQueryInterfaceError, "failed to get ITypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
 
     obj = create_win32ole_method(pTypeInfo, cmdname);
 
@@ -3956,31 +3891,11 @@ 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);
-    }
-}
-
-
 void
 Init_win32ole(void)
 {
     cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
     g_ole_initialized_init();
-    check_nano_server();
 
     com_vtbl.QueryInterface = QueryInterface;
     com_vtbl.AddRef = AddRef;
@@ -3997,11 +3912,11 @@ Init_win32ole(void)
     message_filter.RetryRejectedCall = mf_RetryRejectedCall;
     message_filter.MessagePending = mf_MessagePending;
 
-    enc2cp_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
+    enc2cp_hash = TypedData_Wrap_Struct(rb_cData, &win32ole_hash_datatype, 0);
     RTYPEDDATA_DATA(enc2cp_hash) = st_init_numtable();
     rb_gc_register_mark_object(enc2cp_hash);
 
-    com_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
+    com_hash = TypedData_Wrap_Struct(rb_cData, &win32ole_hash_datatype, 0);
     RTYPEDDATA_DATA(com_hash) = st_init_numtable();
     rb_gc_register_mark_object(com_hash);
 
@@ -4092,50 +4007,50 @@ Init_win32ole(void)
     /*
      * 0: ANSI code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_ACP", RB_INT2FIX(CP_ACP));
+    rb_define_const(cWIN32OLE, "CP_ACP", INT2FIX(CP_ACP));
 
     /*
      * 1: OEM code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_OEMCP", RB_INT2FIX(CP_OEMCP));
+    rb_define_const(cWIN32OLE, "CP_OEMCP", INT2FIX(CP_OEMCP));
 
     /*
      * 2
      */
-    rb_define_const(cWIN32OLE, "CP_MACCP", RB_INT2FIX(CP_MACCP));
+    rb_define_const(cWIN32OLE, "CP_MACCP", INT2FIX(CP_MACCP));
 
     /*
      * 3: current thread ANSI code page. See WIN32OLE.codepage and
      * WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", RB_INT2FIX(CP_THREAD_ACP));
+    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", INT2FIX(CP_THREAD_ACP));
 
     /*
      * 42: symbol code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_SYMBOL", RB_INT2FIX(CP_SYMBOL));
+    rb_define_const(cWIN32OLE, "CP_SYMBOL", INT2FIX(CP_SYMBOL));
 
     /*
      * 65000: UTF-7 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_UTF7", RB_INT2FIX(CP_UTF7));
+    rb_define_const(cWIN32OLE, "CP_UTF7", INT2FIX(CP_UTF7));
 
     /*
      * 65001: UTF-8 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_UTF8", RB_INT2FIX(CP_UTF8));
+    rb_define_const(cWIN32OLE, "CP_UTF8", INT2FIX(CP_UTF8));
 
     /*
      * 0x0800: default locale for the operating system. See WIN32OLE.locale
      * and WIN32OLE.locale=.
      */
-    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", RB_INT2FIX(LOCALE_SYSTEM_DEFAULT));
+    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", 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", RB_INT2FIX(LOCALE_USER_DEFAULT));
+    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", INT2FIX(LOCALE_USER_DEFAULT));
 
     Init_win32ole_variant_m();
     Init_win32ole_typelib();
diff --git a/ext/win32ole/win32ole.h b/ext/win32ole/win32ole.h
index c019930397..d61f5e23b4 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  RB_NUM2LL
-#define NUM2UI8 RB_NUM2ULL
+#define NUM2I8  NUM2LL
+#define NUM2UI8 NUM2ULL
 #else
-#define I8_2_NUM RB_INT2NUM
-#define UI8_2_NUM RB_UINT2NUM
-#define NUM2I8  RB_NUM2INT
-#define NUM2UI8 RB_NUM2UINT
+#define I8_2_NUM INT2NUM
+#define UI8_2_NUM UINT2NUM
+#define NUM2I8  NUM2INT
+#define NUM2UI8 NUM2UINT
 #endif
 
 #define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
diff --git a/ext/win32ole/win32ole_error.c b/ext/win32ole/win32ole_error.c
index 022527617e..62e69b186c 100644
--- a/ext/win32ole/win32ole_error.c
+++ b/ext/win32ole/win32ole_error.c
@@ -80,5 +80,4 @@ 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 296eb101ad..e0eee0ecf9 100644
--- a/ext/win32ole/win32ole_error.h
+++ b/ext/win32ole/win32ole_error.h
@@ -2,7 +2,6 @@
 #define WIN32OLE_ERROR_H 1
 
 VALUE eWIN32OLERuntimeError;
-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 ddb5200b9a..577333bfbb 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) = RB_NUM2CHR(val);
+            *V_UI1REF(var) = NUM2CHR(val);
             break;
         case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)RB_NUM2INT(val);
+            *V_I2REF(var) = (short)NUM2INT(val);
             break;
         case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = RB_NUM2INT(val);
+            *V_I4REF(var) = NUM2INT(val);
             break;
         case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)RB_NUM2INT(val);
+            *V_R4REF(var) = (float)NUM2INT(val);
             break;
         case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = RB_NUM2INT(val);
+            *V_R8REF(var) = 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)RB_NUM2INT(val);
+            *V_I2REF(var) = (short)NUM2INT(val);
             break;
         case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = RB_NUM2INT(val);
+            *V_I4REF(var) = 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, RB_UINT2NUM(i));
+        val = rb_hash_aref(hash, INT2FIX(i));
 	if (val == Qnil)
 	    val = rb_hash_aref(hash, key);
 	if (val == Qnil)
@@ -942,7 +942,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
                                            &p);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError,
+        ole_raise(hr, rb_eRuntimeError,
                   "failed to query IConnectionPointContainer");
     }
     pContainer = p;
@@ -953,7 +953,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     OLE_RELEASE(pContainer);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to query IConnectionPoint");
+        ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
     }
     pIEV = EVENTSINK_Constructor();
     pIEV->m_iid = iid;
@@ -961,7 +961,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
                                           (IUnknown*)pIEV,
                                           &dwCookie);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "Advise Error");
+        ole_raise(hr, rb_eRuntimeError, "Advise Error");
     }
 
     TypedData_Get_Struct(self, struct oleeventdata, &oleevent_datatype, poleev);
@@ -1264,7 +1264,6 @@ 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 ffa9324657..ba8cf78015 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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLERuntimeError, "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, eWIN32OLEQueryInterfaceError, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLERuntimeError, "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 = RB_INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+    vvt = 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 = RB_INT2FIX(pFuncDesc->invkind);
+    invkind = 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((RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
-       (RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
+    if((FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
+       (FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
         type = rb_str_new2("PROPERTY");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) {
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYGET) {
         type =  rb_str_new2("PROPERTYGET");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
         type = rb_str_new2("PROPERTYPUT");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
         type = rb_str_new2("PROPERTYPUTREF");
-    } else if(RB_FIX2INT(invkind) & INVOKE_FUNC) {
+    } else if(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 RB_INT2FIX(helpcontext);
+    return 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 = RB_INT2NUM(pFuncDesc->memid);
+    dispid = 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 = RB_INT2FIX(pFuncDesc->oVft);
+    offset_vtbl = 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 = RB_INT2FIX(pFuncDesc->cParams);
+    size_params = 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 = RB_INT2FIX(pFuncDesc->cParamsOpt);
+    size_opt_params = INT2FIX(pFuncDesc->cParamsOpt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return size_opt_params;
 }
diff --git a/ext/win32ole/win32ole_param.c b/ext/win32ole/win32ole_param.c
index 52905b3e8e..31cf853b04 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 = RB_FIX2INT(n);
+    idx = FIX2INT(n);
     return oleparam_ole_param(self, olemethod, idx);
 }
 
diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c
index e6ac402ecf..efcac883df 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 = RB_INT2FIX(pTypeAttr->wMajorVerNum);
+    ver = 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 = RB_INT2FIX(pTypeAttr->wMinorVerNum);
+    ver = 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 = RB_INT2FIX(pTypeAttr->typekind);
+    typekind = 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 RB_INT2FIX(helpcontext);
+    return INT2FIX(helpcontext);
 }
 
 /*
diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c
index 35376c644b..4f2c42fb76 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 =  RB_INT2NUM(pTLibAttr->wMajorVerNum);
+    major =  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 =  RB_INT2NUM(pTLibAttr->wMinorVerNum);
+    minor =  INT2NUM(pTLibAttr->wMinorVerNum);
     pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
     return minor;
 }
diff --git a/ext/win32ole/win32ole_variable.c b/ext/win32ole/win32ole_variable.c
index 3dc9972ee7..dd583828f2 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 = RB_INT2FIX(pVarDesc->varkind);
+    kind = INT2FIX(pVarDesc->varkind);
     return kind;
 }
 
diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c
index 3ff8f4ffbf..f1fdeca038 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 (!(FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM) || v == Qnil)) {
+    if (TYPE(v) != T_FIXNUM && TYPE(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) = RB_NUM2LONG(val);
+        V_ERROR(var) = NUM2LONG(val);
     } else {
         V_ERROR(var) = 0;
     }
@@ -294,7 +294,7 @@ folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
 
     ole_initialize();
 
-    vt = RB_NUM2UINT(vvt);
+    vt = 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 = RB_FIX2INT(rb_ary_entry(elems, i));
+        psab[i].cElements = 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 = RB_NUM2INT(vvt);
+        vt = 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] = RB_NUM2INT(ary[i]);
+        pid[i] = 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 Integer object, but String object "1")
+ *     obj.value # => "1" (not Fixnum 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 RB_INT2FIX(V_VT(&pvar->var));
+    return 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.
- *  This method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
+ *  Thie method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
  *  If the vartype is VT_UI1|VT_ARRAY, the val should be String object.
  *
  *     obj = WIN32OLE_VARIANT.new(1) # obj.vartype is WIN32OLE::VARIANT::VT_I4
@@ -692,7 +692,6 @@ ole_variant2variant(VALUE val, VARIANT *var)
 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);
@@ -707,19 +706,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, RB_INT2FIX(VT_EMPTY)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_EMPTY)));
 
     /*
      * represents VT_NULL OLE object.
      */
     rb_define_const(cWIN32OLE_VARIANT, "Null",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_NULL)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, 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, RB_INT2FIX(VT_DISPATCH)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_DISPATCH)));
 
     /*
      * represents VT_ERROR variant with DISP_E_PARAMNOTFOUND.
@@ -729,5 +728,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), RB_INT2FIX(VT_ERROR)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, INT2NUM(DISP_E_PARAMNOTFOUND), INT2FIX(VT_ERROR)));
 }
diff --git a/ext/win32ole/win32ole_variant_m.c b/ext/win32ole/win32ole_variant_m.c
index 4d76fdc790..eb3b0b11bb 100644
--- a/ext/win32ole/win32ole_variant_m.c
+++ b/ext/win32ole/win32ole_variant_m.c
@@ -17,133 +17,133 @@ void Init_win32ole_variant_m(void)
     /*
      * represents VT_EMPTY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", RB_INT2FIX(VT_EMPTY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY));
 
     /*
      * represents VT_NULL type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", RB_INT2FIX(VT_NULL));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL));
 
     /*
      * represents VT_I2 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", RB_INT2FIX(VT_I2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
 
     /*
      * represents VT_I4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", RB_INT2FIX(VT_I4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
 
     /*
      * represents VT_R4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", RB_INT2FIX(VT_R4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
 
     /*
      * represents VT_R8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", RB_INT2FIX(VT_R8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", INT2FIX(VT_R8));
 
     /*
      * represents VT_CY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", RB_INT2FIX(VT_CY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", INT2FIX(VT_CY));
 
     /*
      * represents VT_DATE type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", RB_INT2FIX(VT_DATE));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", INT2FIX(VT_DATE));
 
     /*
      * represents VT_BSTR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", RB_INT2FIX(VT_BSTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", INT2FIX(VT_BSTR));
 
     /*
      * represents VT_USERDEFINED type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", RB_INT2FIX(VT_USERDEFINED));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", INT2FIX(VT_USERDEFINED));
 
     /*
      * represents VT_PTR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", RB_INT2FIX(VT_PTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", INT2FIX(VT_PTR));
 
     /*
      * represents VT_DISPATCH type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", RB_INT2FIX(VT_DISPATCH));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", INT2FIX(VT_DISPATCH));
 
     /*
      * represents VT_ERROR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", RB_INT2FIX(VT_ERROR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", INT2FIX(VT_ERROR));
 
     /*
      * represents VT_BOOL type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", RB_INT2FIX(VT_BOOL));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", INT2FIX(VT_BOOL));
 
     /*
      * represents VT_VARIANT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", RB_INT2FIX(VT_VARIANT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", INT2FIX(VT_VARIANT));
 
     /*
      * represents VT_UNKNOWN type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", RB_INT2FIX(VT_UNKNOWN));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", INT2FIX(VT_UNKNOWN));
 
     /*
      * represents VT_I1 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", RB_INT2FIX(VT_I1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", INT2FIX(VT_I1));
 
     /*
      * represents VT_UI1 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", RB_INT2FIX(VT_UI1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
 
     /*
      * represents VT_UI2 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", RB_INT2FIX(VT_UI2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
 
     /*
      * represents VT_UI4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", RB_INT2FIX(VT_UI4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
 
 #if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
     /*
      * represents VT_I8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", RB_INT2FIX(VT_I8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", INT2FIX(VT_I8));
 
     /*
      * represents VT_UI8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", RB_INT2FIX(VT_UI8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", INT2FIX(VT_UI8));
 #endif
 
     /*
      * represents VT_INT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", RB_INT2FIX(VT_INT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
 
     /*
      * represents VT_UINT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", RB_INT2FIX(VT_UINT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
 
     /*
      * represents VT_ARRAY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", RB_INT2FIX(VT_ARRAY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
 
     /*
      * represents VT_BYREF type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", RB_INT2FIX(VT_BYREF));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
 
 }
diff --git a/ext/zlib/.gitignore b/ext/zlib/.gitignore
deleted file mode 100644
index 069491b4b4..0000000000
--- a/ext/zlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/zlib-[1-9]*.*.*
diff --git a/ext/zlib/depend b/ext/zlib/depend
index bfba309dae..f094d343dc 100644
--- a/ext/zlib/depend
+++ b/ext/zlib/depend
@@ -7,7 +7,6 @@ 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
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index fd2f168522..8bbede63b2 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # extconf.rb
 #
@@ -13,66 +13,7 @@ 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)"
-      if $nmake
-        zmkfile = "$(ZSRC)/win32/Makefile.msc"
-        m = "#{zsrc}/win32/Makefile.msc"
-      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",
-        "$(TARGET_SO): $(ZIMPLIB)\n",
-        "$(ZIMPLIB):\n",
-        "#{zmk} $@\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... '
@@ -112,21 +53,10 @@ if have_zlib
 
   $defs.concat(defines.collect{|d|' -D'+d})
 
-  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
+  have_func('crc32_combine', 'zlib.h')
+  have_func('adler32_combine', 'zlib.h')
+  have_type('z_crc_t', 'zlib.h')
 
-  create_makefile('zlib') {|conf|
-    if zsrc
-      conf.concat addconf if addconf
-    end
-    conf
-  }
+  create_makefile('zlib')
 
 end
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 1b48bb2677..4dfa2a5f34 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -25,7 +25,7 @@
 # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
 #endif
 
-#define RUBY_ZLIB_VERSION "1.0.0"
+#define RUBY_ZLIB_VERSION  "0.6.0"
 
 #ifndef GZIP_SUPPORT
 #define GZIP_SUPPORT  1
@@ -72,7 +72,6 @@ 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);
@@ -141,18 +140,18 @@ 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*, VALUE outbuf);
-static int gzfile_read_raw_ensure(struct gzfile*, long, VALUE outbuf);
+static VALUE gzfile_read_raw(struct gzfile*);
+static int gzfile_read_raw_ensure(struct gzfile*, long);
 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*, VALUE outbuf);
-static void gzfile_check_footer(struct gzfile*, VALUE outbuf);
+static void gzfile_read_header(struct gzfile*);
+static void gzfile_check_footer(struct gzfile*);
 static void gzfile_write(struct gzfile*, Bytef*, long);
-static long gzfile_read_more(struct gzfile*, VALUE outbuf);
+static long gzfile_read_more(struct gzfile*);
 static void gzfile_calc_crc(struct gzfile*, VALUE);
 static VALUE gzfile_read(struct gzfile*, long);
 static VALUE gzfile_read_all(struct gzfile*);
@@ -197,7 +196,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(int, VALUE*, VALUE);
+static VALUE rb_gzwriter_write(VALUE, VALUE);
 static VALUE rb_gzwriter_putc(VALUE, VALUE);
 
 static VALUE rb_gzreader_s_allocate(VALUE);
@@ -451,7 +450,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
@@ -489,7 +488,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
@@ -528,6 +527,7 @@ rb_zlib_crc_table(VALUE obj)
 struct zstream {
     unsigned long flags;
     VALUE buf;
+    long buf_filled;
     VALUE input;
     z_stream stream;
     const struct zstream_funcs {
@@ -550,7 +550,6 @@ struct zstream {
 #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_EXPAND_BUFFER_OK          0
 
@@ -600,6 +599,7 @@ zstream_init(struct zstream *z, const struct zstream_funcs *func)
 {
     z->flags = 0;
     z->buf = Qnil;
+    z->buf_filled = 0;
     z->input = Qnil;
     z->stream.zalloc = zlib_mem_alloc;
     z->stream.zfree = zlib_mem_free;
@@ -624,11 +624,11 @@ zstream_expand_buffer(struct zstream *z)
     }
 
     if (!ZSTREAM_IS_GZFILE(z) && rb_block_given_p()) {
-	long buf_filled = ZSTREAM_BUF_FILLED(z);
-	if (buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+	if (z->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);
 
@@ -644,11 +644,23 @@ zstream_expand_buffer(struct zstream *z)
 	}
 	else {
 	    zstream_expand_buffer_into(z,
-				       ZSTREAM_AVAIL_OUT_STEP_MAX - buf_filled);
+		    ZSTREAM_AVAIL_OUT_STEP_MAX - z->buf_filled);
 	}
     }
     else {
-	zstream_expand_buffer_non_stream(z);
+	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;
     }
 }
 
@@ -658,14 +670,15 @@ 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_buf_new(size);
+	z->buf = rb_str_new(0, size);
+	z->buf_filled = 0;
 	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_modify_expand(z->buf, size);
-	z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
+	rb_str_resize(z->buf, z->buf_filled + size);
+	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
 	z->stream.avail_out = MAX_UINT(size);
     }
 }
@@ -682,24 +695,34 @@ zstream_expand_buffer_protect(void *ptr)
 }
 
 static int
-zstream_expand_buffer_non_stream(struct zstream *z)
+zstream_expand_buffer_without_gvl(struct zstream *z)
 {
-    long inc, len = ZSTREAM_BUF_FILLED(z);
+    char * new_str;
+    long inc, len;
 
-    if (rb_str_capacity(z->buf) - len >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+    if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
     else {
-	inc = len / 2;
+	inc = z->buf_filled / 2;
 	if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
 	    inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
 	}
 
-	rb_str_modify_expand(z->buf, inc);
+	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;
+
 	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
 	    (int)inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
-    z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
+    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
 
     return ZSTREAM_EXPAND_BUFFER_OK;
 }
@@ -710,14 +733,15 @@ 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 ((long)rb_str_capacity(z->buf) < ZSTREAM_BUF_FILLED(z) + len) {
-	rb_str_modify_expand(z->buf, len);
+    if (RSTRING_LEN(z->buf) < z->buf_filled + len) {
+	rb_str_resize(z->buf, z->buf_filled + len);
 	z->stream.avail_out = 0;
     }
     else {
@@ -728,8 +752,9 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
 	    z->stream.avail_out = 0;
 	}
     }
-    rb_str_cat(z->buf, (const char *)src, len);
-    z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
+    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;
 }
 
 #define zstream_append_buffer2(z,v) \
@@ -752,12 +777,14 @@ zstream_detach_buffer(struct zstream *z)
     }
     else {
 	dst = z->buf;
+	rb_str_resize(dst, z->buf_filled);
 	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;
 
@@ -773,20 +800,18 @@ static VALUE
 zstream_shift_buffer(struct zstream *z, long len)
 {
     VALUE dst;
-    char *bufptr;
-    long buflen = ZSTREAM_BUF_FILLED(z);
+    long buflen;
 
-    if (buflen <= len) {
+    if (z->buf_filled <= len) {
 	return zstream_detach_buffer(z);
     }
 
-    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);
+    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;
     if (buflen > ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	buflen = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -798,17 +823,13 @@ zstream_shift_buffer(struct zstream *z, long len)
 static void
 zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
 {
-    char *bufptr;
-    long filled;
-
-    if (NIL_P(z->buf) || (long)rb_str_capacity(z->buf) <= ZSTREAM_BUF_FILLED(z)) {
+    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
 	zstream_expand_buffer_into(z, len);
     }
 
-    RSTRING_GETMEM(z->buf, bufptr, filled);
-    memmove(bufptr + len, bufptr, filled);
-    memmove(bufptr, b, len);
-    rb_str_set_len(z->buf, filled + 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;
     if (z->stream.avail_out > 0) {
 	if (len > z->stream.avail_out) len = z->stream.avail_out;
 	z->stream.next_out+=len;
@@ -819,8 +840,17 @@ zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
 static void
 zstream_buffer_ungetbyte(struct zstream *z, int c)
 {
-    Bytef cc = (Bytef)c;
-    zstream_buffer_ungets(z, &cc, 1);
+    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--;
+    }
 }
 
 static void
@@ -845,50 +875,20 @@ 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)) {
-    }
-    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);
-	}
+    if (NIL_P(z->input) || RSTRING_LEN(z->input) <= len) {
+	z->input = Qnil;
     }
-    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);
-	}
+    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);
     }
 }
 
 static void
 zstream_reset_input(struct zstream *z)
 {
-    if (!NIL_P(z->input) && RBASIC_CLASS(z->input) == 0) {
-	rb_str_resize(z->input, 0);
-    }
-    else {
-	z->input = Qnil;
-    }
+    z->input = Qnil;
 }
 
 static void
@@ -913,6 +913,7 @@ zstream_detach_input(struct zstream *z)
 	rb_obj_reveal(dst, rb_cString);
     }
     z->input = Qnil;
+    rb_obj_reveal(dst, rb_cString);
     return dst;
 }
 
@@ -927,6 +928,7 @@ 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);
@@ -967,7 +969,7 @@ zstream_run_func(void *ptr)
     while (!args->interrupt) {
 	n = z->stream.avail_out;
 	err = z->func->run(&z->stream, flush);
-	rb_str_set_len(z->buf, ZSTREAM_BUF_FILLED(z) + (n - z->stream.avail_out));
+	z->buf_filled += n - z->stream.avail_out;
 
 	if (err == Z_STREAM_END) {
 	    z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
@@ -996,7 +998,7 @@ zstream_run_func(void *ptr)
 							(void *)z);
 	}
 	else {
-	    state = zstream_expand_buffer_non_stream(z);
+	    state = zstream_expand_buffer_without_gvl(z);
 	}
 
 	if (state) {
@@ -1025,7 +1027,7 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
 {
     struct zstream_run_args args;
     int err;
-    VALUE old_input = Qnil;
+    VALUE guard = Qnil;
 
     args.z = z;
     args.flush = flush;
@@ -1039,13 +1041,12 @@ 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. */
-	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));
+	guard = z->input;
     }
 
     if (z->stream.avail_out == 0) {
@@ -1083,10 +1084,7 @@ loop:
 
     if (z->stream.avail_in > 0) {
 	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
-    }
-    if (!NIL_P(old_input)) {
-	rb_str_resize(old_input, 0);
-	rb_gc_force_recycle(old_input);
+	RB_GC_GUARD(guard); /* prevent tail call to make guard effective */
     }
 
     if (args.jump_state)
@@ -1415,7 +1413,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);
 }
 
 /*
@@ -1580,6 +1578,7 @@ 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;
@@ -1763,26 +1762,23 @@ 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);
-    filled = n - z->stream.avail_out;
+    z->buf_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);
-	filled = n - z->stream.avail_out;
+	z->buf_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;
 }
@@ -2225,6 +2221,7 @@ struct gzfile {
     rb_encoding *enc2;
     rb_econv_t *ec;
     VALUE ecopts;
+    char *cbuf;
     VALUE path;
 };
 #define GZFILE_CBUF_CAPA 10
@@ -2234,20 +2231,10 @@ struct gzfile {
 #define GZFILE_FLAG_FOOTER_FINISHED  (ZSTREAM_FLAG_UNUSED << 2)
 
 #define GZFILE_IS_FINISHED(gz) \
-    (ZSTREAM_IS_FINISHED(&(gz)->z) && ZSTREAM_BUF_FILLED(&(gz)->z) == 0)
+    (ZSTREAM_IS_FINISHED(&(gz)->z) && (gz)->z.buf_filled == 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)
@@ -2274,13 +2261,22 @@ gzfile_free(void *p)
 	}
 	zstream_finalize(z);
     }
+    if (gz->cbuf) {
+	xfree(gz->cbuf);
+    }
     xfree(gz);
 }
 
 static size_t
 gzfile_memsize(const void *p)
 {
-    return sizeof(struct gzfile);
+    const struct gzfile *gz = p;
+    size_t size = sizeof(struct gzfile);
+
+    if (gz->cbuf)
+	size += GZFILE_CBUF_CAPA;
+
+    return size;
 }
 
 static const rb_data_type_t gzfile_data_type = {
@@ -2289,9 +2285,16 @@ static const rb_data_type_t gzfile_data_type = {
      0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static void
-gzfile_init(struct gzfile *gz, const struct zstream_funcs *funcs, void (*endfunc)(struct gzfile *))
+static VALUE
+gzfile_new(klass, funcs, endfunc)
+    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);
     zstream_init(&gz->z, funcs);
     gz->z.flags |= ZSTREAM_FLAG_GZFILE;
     gz->io = Qnil;
@@ -2309,17 +2312,9 @@ gzfile_init(struct gzfile *gz, const struct zstream_funcs *funcs, void (*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;
 }
 
@@ -2360,7 +2355,7 @@ gzfile_write_raw(struct gzfile *gz)
 {
     VALUE str;
 
-    if (ZSTREAM_BUF_FILLED(&gz->z) > 0) {
+    if (gz->z.buf_filled > 0) {
 	str = zstream_detach_buffer(&gz->z);
 	OBJ_TAINT(str);  /* for safe */
 	rb_funcall(gz->io, id_write, 1, str);
@@ -2373,11 +2368,10 @@ gzfile_write_raw(struct gzfile *gz)
 static VALUE
 gzfile_read_raw_partial(VALUE arg)
 {
-    struct read_raw_arg *ra = (struct read_raw_arg *)arg;
+    struct gzfile *gz = (struct gzfile*)arg;
     VALUE str;
-    int argc = NIL_P(ra->as.argv[1]) ? 1 : 2;
 
-    str = rb_funcallv(ra->io, id_readpartial, argc, ra->as.argv);
+    str = rb_funcall(gz->io, id_readpartial, 1, INT2FIX(GZFILE_READ_SIZE));
     Check_Type(str, T_STRING);
     return str;
 }
@@ -2385,11 +2379,10 @@ gzfile_read_raw_partial(VALUE arg)
 static VALUE
 gzfile_read_raw_rescue(VALUE arg)
 {
-    struct read_raw_arg *ra = (struct read_raw_arg *)arg;
+    struct gzfile *gz = (struct gzfile*)arg;
     VALUE str = Qnil;
     if (rb_obj_is_kind_of(rb_errinfo(), rb_eNoMethodError)) {
-	int argc = NIL_P(ra->as.argv[1]) ? 1 : 2;
-	str = rb_funcallv(ra->io, id_read, argc, ra->as.argv);
+        str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
         if (!NIL_P(str)) {
             Check_Type(str, T_STRING);
         }
@@ -2398,30 +2391,20 @@ gzfile_read_raw_rescue(VALUE arg)
 }
 
 static VALUE
-gzfile_read_raw(struct gzfile *gz, VALUE outbuf)
+gzfile_read_raw(struct gzfile *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,
+    return rb_rescue2(gzfile_read_raw_partial, (VALUE)gz,
+                      gzfile_read_raw_rescue, (VALUE)gz,
                       rb_eEOFError, rb_eNoMethodError, (VALUE)0);
 }
 
 static int
-gzfile_read_raw_ensure(struct gzfile *gz, long size, VALUE outbuf)
+gzfile_read_raw_ensure(struct gzfile *gz, long size)
 {
     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, outbuf);
+	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) return 0;
 	zstream_append_input2(&gz->z, str);
     }
@@ -2438,7 +2421,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, Qnil);
+	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
@@ -2563,14 +2546,13 @@ gzfile_make_footer(struct gzfile *gz)
 }
 
 static void
-gzfile_read_header(struct gzfile *gz, VALUE outbuf)
+gzfile_read_header(struct gzfile *gz)
 {
     const unsigned char *head;
     long len;
     char flags, *p;
 
-    /* 10 is the size of gzip header */
-    if (!gzfile_read_raw_ensure(gz, 10, outbuf)) {
+    if (!gzfile_read_raw_ensure(gz, 10)) {  /* 10 is the size of gzip header */
 	gzfile_raise(gz, cGzError, "not in gzip format");
     }
 
@@ -2609,17 +2591,17 @@ gzfile_read_header(struct gzfile *gz, VALUE outbuf)
     zstream_discard_input(&gz->z, 10);
 
     if (flags & GZ_FLAG_EXTRA) {
-	if (!gzfile_read_raw_ensure(gz, 2, outbuf)) {
+	if (!gzfile_read_raw_ensure(gz, 2)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	len = gzfile_get16((Bytef*)RSTRING_PTR(gz->z.input));
-	if (!gzfile_read_raw_ensure(gz, 2 + len, outbuf)) {
+	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	zstream_discard_input(&gz->z, 2 + len);
     }
     if (flags & GZ_FLAG_ORIG_NAME) {
-	if (!gzfile_read_raw_ensure(gz, 1, outbuf)) {
+	if (!gzfile_read_raw_ensure(gz, 1)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	p = gzfile_read_raw_until_zero(gz, 0);
@@ -2629,7 +2611,7 @@ gzfile_read_header(struct gzfile *gz, VALUE outbuf)
 	zstream_discard_input(&gz->z, len + 1);
     }
     if (flags & GZ_FLAG_COMMENT) {
-	if (!gzfile_read_raw_ensure(gz, 1, outbuf)) {
+	if (!gzfile_read_raw_ensure(gz, 1)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	p = gzfile_read_raw_until_zero(gz, 0);
@@ -2645,14 +2627,13 @@ gzfile_read_header(struct gzfile *gz, VALUE outbuf)
 }
 
 static void
-gzfile_check_footer(struct gzfile *gz, VALUE outbuf)
+gzfile_check_footer(struct gzfile *gz)
 {
     unsigned long crc, length;
 
     gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
 
-    /* 8 is the size of gzip footer */
-    if (!gzfile_read_raw_ensure(gz, 8, outbuf)) {
+    if (!gzfile_read_raw_ensure(gz, 8)) { /* 8 is the size of gzip footer */
 	gzfile_raise(gz, cNoFooter, "footer is not found");
     }
 
@@ -2686,12 +2667,12 @@ gzfile_write(struct gzfile *gz, Bytef *str, long len)
 }
 
 static long
-gzfile_read_more(struct gzfile *gz, VALUE outbuf)
+gzfile_read_more(struct gzfile *gz)
 {
     VALUE str;
 
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	str = gzfile_read_raw(gz, outbuf);
+	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) {
 	    if (!ZSTREAM_IS_FINISHED(&gz->z)) {
 		rb_raise(cGzError, "unexpected end of file");
@@ -2703,9 +2684,9 @@ gzfile_read_more(struct gzfile *gz, VALUE outbuf)
 			Z_SYNC_FLUSH);
 	    RB_GC_GUARD(str);
 	}
-	if (ZSTREAM_BUF_FILLED(&gz->z) > 0) break;
+	if (gz->z.buf_filled > 0) break;
     }
-    return ZSTREAM_BUF_FILLED(&gz->z);
+    return gz->z.buf_filled;
 }
 
 static void
@@ -2716,7 +2697,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;
     }
 }
@@ -2746,16 +2727,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) && ZSTREAM_BUF_FILLED(&gz->z) < len) {
-	gzfile_read_more(gz, Qnil);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
+	gzfile_read_more(gz);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, Qnil);
+	    gzfile_check_footer(gz);
 	}
 	return -1;
     }
-    return len < ZSTREAM_BUF_FILLED(&gz->z) ? len : ZSTREAM_BUF_FILLED(&gz->z);
+    return len < gz->z.buf_filled ? len : gz->z.buf_filled;
 }
 
 static VALUE
@@ -2790,12 +2771,12 @@ gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
             return outbuf;
         }
     }
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) == 0) {
-	gzfile_read_more(gz, outbuf);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled == 0) {
+	gzfile_read_more(gz);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, outbuf);
+	    gzfile_check_footer(gz);
 	}
         if (!NIL_P(outbuf))
             rb_str_resize(outbuf, 0);
@@ -2808,8 +2789,7 @@ 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_str_resize(dst, 0);
-	rb_gc_force_recycle(dst);
+	RB_GC_GUARD(dst);
 	dst = outbuf;
     }
     OBJ_TAINT(dst);  /* for safe */
@@ -2822,11 +2802,11 @@ gzfile_read_all(struct gzfile *gz)
     VALUE dst;
 
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	gzfile_read_more(gz, Qnil);
+	gzfile_read_more(gz);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, Qnil);
+	    gzfile_check_footer(gz);
 	}
 	return rb_str_new(0, 0);
     }
@@ -2845,12 +2825,12 @@ gzfile_getc(struct gzfile *gz)
     int len;
 
     len = rb_enc_mbmaxlen(gz->enc);
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) < len) {
-	gzfile_read_more(gz, Qnil);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
+	gzfile_read_more(gz);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, Qnil);
+	    gzfile_check_footer(gz);
 	}
 	return Qnil;
     }
@@ -2858,19 +2838,22 @@ 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 + ZSTREAM_BUF_FILLED(&gz->z);
-        ds = dp = (unsigned char *)RSTRING_PTR(cbuf);
+        se = sp + gz->z.buf_filled;
+        ds = dp = (unsigned char *)gz->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);
-	rb_str_resize(cbuf, dp - ds);
-	OBJ_TAINT(cbuf);
-	return cbuf;
+	dst = rb_str_new(gz->cbuf, dp - ds);
+	rb_enc_associate(dst, gz->enc);
+	OBJ_TAINT(dst);
+	return dst;
     }
     else {
 	buf = gz->z.buf;
@@ -2927,7 +2910,7 @@ gzfile_reader_end_run(VALUE arg)
 
     if (GZFILE_IS_FINISHED(gz)
 	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz, Qnil);
+	gzfile_check_footer(gz);
     }
 
     return Qnil;
@@ -2964,7 +2947,7 @@ 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, Qnil);
+	gzfile_check_footer(gz);
     }
     if (NIL_P(gz->z.input)) return Qnil;
 
@@ -3235,7 +3218,7 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
  * Document-method: Zlib::GzipWriter#mtime=
  *
  * Specify the modification time (+mtime+) in the gzip header.
- * Using an Integer.
+ * Using a Fixnum or Integer.
  *
  * Setting the mtime in the gzip header does not effect the
  * mtime of the file generated. Different utilities that
@@ -3434,14 +3417,7 @@ static VALUE
 rb_gzfile_total_out(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
-    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));
-    }
+    return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
 }
 
 /*
@@ -3607,23 +3583,18 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_write(int argc, VALUE *argv, VALUE obj)
+rb_gzwriter_write(VALUE obj, VALUE str)
 {
     struct gzfile *gz = get_gzfile(obj);
-    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);
+
+    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);
     }
-    return SIZET2NUM(total);
+    gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
+    return INT2FIX(RSTRING_LEN(str));
 }
 
 /*
@@ -3772,7 +3743,7 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
     }
     gz->io = io;
     ZSTREAM_READY(&gz->z);
-    gzfile_read_header(gz, Qnil);
+    gzfile_read_header(gz);
     rb_gzfile_ecopts(gz, opt);
 
     if (rb_respond_to(io, id_path)) {
@@ -4020,20 +3991,20 @@ gzreader_skip_linebreaks(struct gzfile *gz)
     char *p;
     int n;
 
-    while (ZSTREAM_BUF_FILLED(&gz->z) == 0) {
+    while (gz->z.buf_filled == 0) {
 	if (GZFILE_IS_FINISHED(gz)) return;
-	gzfile_read_more(gz, Qnil);
+	gzfile_read_more(gz);
     }
     n = 0;
     p = RSTRING_PTR(gz->z.buf);
 
     while (n++, *(p++) == '\n') {
-	if (n >= ZSTREAM_BUF_FILLED(&gz->z)) {
+	if (n >= gz->z.buf_filled) {
 	    str = zstream_detach_buffer(&gz->z);
 	    gzfile_calc_crc(gz, str);
-	    while (ZSTREAM_BUF_FILLED(&gz->z) == 0) {
+	    while (gz->z.buf_filled == 0) {
 		if (GZFILE_IS_FINISHED(gz)) return;
-		gzfile_read_more(gz, Qnil);
+		gzfile_read_more(gz);
 	    }
 	    n = 0;
 	    p = RSTRING_PTR(gz->z.buf);
@@ -4055,7 +4026,7 @@ static long
 gzreader_charboundary(struct gzfile *gz, long n)
 {
     char *s = RSTRING_PTR(gz->z.buf);
-    char *e = s + ZSTREAM_BUF_FILLED(&gz->z);
+    char *e = s + gz->z.buf_filled;
     char *p = rb_enc_left_char_head(s, s + n, e, gz->enc);
     long l = p - s;
     if (l < n) {
@@ -4150,25 +4121,25 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	gzreader_skip_linebreaks(gz);
     }
 
-    while (ZSTREAM_BUF_FILLED(&gz->z) < rslen) {
+    while (gz->z.buf_filled < rslen) {
 	if (ZSTREAM_IS_FINISHED(&gz->z)) {
-	    if (ZSTREAM_BUF_FILLED(&gz->z) > 0) gz->lineno++;
+	    if (gz->z.buf_filled > 0) gz->lineno++;
 	    return gzfile_read(gz, rslen);
 	}
-	gzfile_read_more(gz, Qnil);
+	gzfile_read_more(gz);
     }
 
     p = RSTRING_PTR(gz->z.buf);
     n = rslen;
     for (;;) {
 	long filled;
-	if (n > ZSTREAM_BUF_FILLED(&gz->z)) {
+	if (n > gz->z.buf_filled) {
 	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
-	    gzfile_read_more(gz, Qnil);
+	    gzfile_read_more(gz);
 	    p = RSTRING_PTR(gz->z.buf) + n - rslen;
 	}
 	if (!rspara) rscheck(rsptr, rslen, rs);
-	filled = ZSTREAM_BUF_FILLED(&gz->z);
+	filled = gz->z.buf_filled;
 	if (limit > 0 && filled >= limit) {
 	    filled = limit;
 	}
@@ -4185,7 +4156,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	    p++, n++;
 	}
     }
-    if (maxlen > 1 && n == limit && (ZSTREAM_BUF_FILLED(&gz->z) > n || !ZSTREAM_IS_FINISHED(&gz->z))) {
+    if (maxlen > 1 && n == limit && (gz->z.buf_filled > n || !ZSTREAM_IS_FINISHED(&gz->z))) {
 	n = gzreader_charboundary(gz, n);
     }
 
@@ -4291,178 +4262,11 @@ rb_gzreader_external_encoding(VALUE self)
     return rb_enc_from_encoding(get_gzfile(self)->enc);
 }
 
-static VALUE
-zlib_gzip_ensure(VALUE arg)
-{
-    struct gzfile *gz = (struct gzfile *)arg;
-    rb_rescue((VALUE(*)())gz->end, arg, NULL, Qnil);
-    return 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);
-}
-
-#define OPTHASH_GIVEN_P(opts) \
-    (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
-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)
 {
-#undef rb_intern
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT
     VALUE cGzipFile, cGzipWriter, cGzipReader;
@@ -4697,7 +4501,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);
@@ -4728,9 +4532,6 @@ Init_zlib(void)
     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 */
@@ -4764,8 +4565,6 @@ 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");
 #endif /* GZIP_SUPPORT */
 }
 
diff --git a/ext/zlib/zlib.gemspec b/ext/zlib/zlib.gemspec
deleted file mode 100644
index f5b6443258..0000000000
--- a/ext/zlib/zlib.gemspec
+++ /dev/null
@@ -1,28 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-source_version = File.open(File.join(__dir__, "zlib.c")) {|f|
-  f.gets("\n#define RUBY_ZLIB_VERSION ")
-  f.gets[/\s*(".+")/, 1].undump
-}
-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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "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 6721d9b406..76162b0856 100644
--- a/file.c
+++ b/file.c
@@ -23,12 +23,9 @@
 #include <CoreFoundation/CFString.h>
 #endif
 
-#include "id.h"
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/io.h"
 #include "ruby/util.h"
-#include "ruby/thread.h"
-#include "internal.h"
 #include "dln.h"
 #include "encindex.h"
 
@@ -66,13 +63,19 @@ int flock(int, int);
 #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>
 #endif
@@ -92,9 +95,9 @@ int flock(int, int);
 /* define system APIs */
 #ifdef _WIN32
 #include "win32/file.h"
-#define STAT(p, s)	rb_w32_ustati128((p), (s))
+#define STAT(p, s)	rb_w32_ustati64((p), (s))
 #undef lstat
-#define lstat(p, s)	rb_w32_ulstati128((p), (s))
+#define lstat(p, s)	rb_w32_ulstati64((p), (s))
 #undef access
 #define access(p, m)	rb_w32_uaccess((p), (m))
 #undef truncate
@@ -105,8 +108,8 @@ int flock(int, int);
 #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 utime
+#define utime(p, t)	rb_w32_uutime((p), (t))
 #undef link
 #define link(f, t)	rb_w32_ulink((f), (t))
 #undef unlink
@@ -119,19 +122,6 @@ int flock(int, int);
 #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
-
 VALUE rb_cFile;
 VALUE rb_mFileTest;
 VALUE rb_cStat;
@@ -184,7 +174,10 @@ rb_get_path_check_to_string(VALUE obj, int level)
 	return obj;
     }
     CONST_ID(to_path, "to_path");
-    tmp = rb_check_funcall_default(obj, to_path, 0, 0, obj);
+    tmp = rb_check_funcall(obj, to_path, 0, 0);
+    if (tmp == Qundef) {
+	tmp = obj;
+    }
     StringValue(tmp);
     return tmp;
 }
@@ -198,14 +191,12 @@ rb_get_path_check_convert(VALUE obj, VALUE tmp, int level)
     }
 
     check_path_encoding(tmp);
-    if (!rb_str_to_cstr(tmp)) {
-	rb_raise(rb_eArgError, "path name contains null byte");
-    }
+    StringValueCStr(tmp);
 
     return rb_str_new4(tmp);
 }
 
-VALUE
+static VALUE
 rb_get_path_check(VALUE obj, int level)
 {
     VALUE tmp = rb_get_path_check_to_string(obj, level);
@@ -227,7 +218,7 @@ rb_get_path(VALUE obj)
 VALUE
 rb_str_encode_ospath(VALUE path)
 {
-#if USE_OSPATH
+#if defined _WIN32 || defined __APPLE__
     int encidx = ENCODING_GET(path);
 #ifdef _WIN32
     if (encidx == ENCINDEX_ASCII) {
@@ -350,72 +341,20 @@ 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(int (*func)(const char *, void *), int argc, VALUE *argv, void *arg)
+apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, void *arg)
 {
-    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]);
+    long i;
+    volatile VALUE path;
 
+    for (i=0; i<argc; i++) {
+	const char *s;
+	path = rb_get_path(argv[i]);
 	path = rb_str_encode_ospath(path);
-	aa->fn[aa->i].ptr = RSTRING_PTR(path);
-	aa->fn[aa->i].path = path;
+	s = RSTRING_PTR(path);
+	(*func)(s, path, arg);
     }
 
-    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);
 }
 
@@ -427,13 +366,6 @@ apply2files(int (*func)(const char *, void *), int argc, VALUE *argv, void *arg)
  *  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 <code>IOError</code> for a <i>file</i> created using
- *  <code>File::Constants::TMPFILE</code> because they don't have a pathname.
- *
  *     File.new("testfile").path               #=> "testfile"
  *     File.new("/tmp/../tmp/xxx", "w").path   #=> "/tmp/../tmp/xxx"
  *
@@ -446,11 +378,7 @@ rb_file_path(VALUE obj)
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
     rb_io_check_initialized(fptr);
-
-    if (NIL_P(fptr->pathv)) {
-        rb_raise(rb_eIOError, "File is unnamed (TMPFILE?)");
-    }
-
+    if (NIL_P(fptr->pathv)) return Qnil;
     return rb_obj_taint(rb_str_dup(fptr->pathv));
 }
 
@@ -572,7 +500,7 @@ static VALUE
 rb_stat_dev_major(VALUE self)
 {
 #if defined(major)
-    return UINT2NUM(major(get_stat(self)->st_dev));
+    return INT2NUM(major(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
@@ -593,7 +521,7 @@ static VALUE
 rb_stat_dev_minor(VALUE self)
 {
 #if defined(minor)
-    return UINT2NUM(minor(get_stat(self)->st_dev));
+    return INT2NUM(minor(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
@@ -612,12 +540,17 @@ rb_stat_dev_minor(VALUE self)
 static VALUE
 rb_stat_ino(VALUE self)
 {
-#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);
+#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);
 #elif SIZEOF_STRUCT_STAT_ST_INO > SIZEOF_LONG
     return ULL2NUM(get_stat(self)->st_ino);
 #else
@@ -731,7 +664,7 @@ static VALUE
 rb_stat_rdev_major(VALUE self)
 {
 #if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(major)
-    return UINT2NUM(major(get_stat(self)->st_rdev));
+    return DEVT2NUM(major(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
@@ -752,7 +685,7 @@ static VALUE
 rb_stat_rdev_minor(VALUE self)
 {
 #if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(minor)
-    return UINT2NUM(minor(get_stat(self)->st_rdev));
+    return DEVT2NUM(minor(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
@@ -1067,73 +1000,83 @@ rb_stat_inspect(VALUE 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
-fstat_without_gvl(int fd, struct stat *st)
-{
-    no_gvl_stat_data data;
-
-    data.file.fd = fd;
-    data.st = st;
-
-    return (int)(VALUE)rb_thread_io_blocking_region(no_gvl_fstat, &data, fd);
-}
-
-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)
+rb_stat(VALUE file, struct stat *st)
 {
-    no_gvl_stat_data data;
+    VALUE tmp;
 
-    data.file.path = path;
-    data.st = st;
+    tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
+    if (!NIL_P(tmp)) {
+	rb_io_t *fptr;
 
-    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_stat, &data,
-						  RUBY_UBF_IO, NULL);
+	GetOpenFile(tmp, fptr);
+	return fstat(fptr->fd, st);
+    }
+    FilePathValue(file);
+    file = rb_str_encode_ospath(file);
+    return STAT(StringValueCStr(file), st);
 }
 
-static int
-rb_stat(VALUE file, struct stat *st)
+#ifdef _WIN32
+static HANDLE
+w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
 {
     VALUE tmp;
-    int result;
+    HANDLE f, ret = 0;
 
-    tmp = rb_check_convert_type_with_id(file, T_FILE, "IO", idTo_io);
+    tmp = rb_check_convert_type(*file, T_FILE, "IO", "to_io");
     if (!NIL_P(tmp)) {
 	rb_io_t *fptr;
 
 	GetOpenFile(tmp, fptr);
-	result = fstat_without_gvl(fptr->fd, st);
-	file = tmp;
+	f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
+	if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
     }
     else {
-	FilePathValue(file);
-	file = rb_str_encode_ospath(file);
-	result = stat_without_gvl(RSTRING_PTR(file), st);
+	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;
     }
-    RB_GC_GUARD(file);
-    return result;
+    if (GetFileType(f) == FILE_TYPE_DISK) {
+	ZeroMemory(st, sizeof(*st));
+	if (GetFileInformationByHandle(f, st)) return ret;
+    }
+    if (ret) CloseHandle(ret);
+    return INVALID_HANDLE_VALUE;
+}
+
+static VALUE
+close_handle(VALUE h)
+{
+    CloseHandle((HANDLE)h);
+    return Qfalse;
+}
+
+struct w32_io_info_args {
+    VALUE *fname;
+    BY_HANDLE_FILE_INFORMATION *st;
+};
+
+static VALUE
+call_w32_io_info(VALUE arg)
+{
+    struct w32_io_info_args *p = (void *)arg;
+    return (VALUE)w32_io_info(p->fname, p->st);
 }
+#endif
 
 /*
  *  call-seq:
@@ -1152,8 +1095,7 @@ rb_file_s_stat(VALUE klass, VALUE fname)
     struct stat st;
 
     FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (stat_without_gvl(RSTRING_PTR(fname), &st) < 0) {
+    if (rb_stat(fname, &st) < 0) {
 	rb_sys_fail_path(fname);
     }
     return rb_stat_new(&st);
@@ -1187,27 +1129,6 @@ 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
@@ -1230,7 +1151,7 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat_without_gvl(StringValueCStr(fname), &st) == -1) {
+    if (lstat(StringValueCStr(fname), &st) == -1) {
 	rb_sys_fail_path(fname);
     }
     return rb_stat_new(&st);
@@ -1264,7 +1185,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_without_gvl(RSTRING_PTR(path), &st) == -1) {
+    if (lstat(RSTRING_PTR(path), &st) == -1) {
 	rb_sys_fail_path(fptr->pathv);
     }
     return rb_stat_new(&st);
@@ -1328,6 +1249,15 @@ 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)
@@ -1372,54 +1302,6 @@ 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
@@ -1515,7 +1397,7 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat_without_gvl(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (S_ISLNK(st.st_mode)) return Qtrue;
 #endif
 
@@ -1664,7 +1546,9 @@ rb_file_exists_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_readable_p(VALUE obj, VALUE fname)
 {
-    if (rb_eaccess(fname, R_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1679,7 +1563,9 @@ rb_file_readable_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_readable_real_p(VALUE obj, VALUE fname)
 {
-    if (rb_access(fname, R_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1732,7 +1618,9 @@ rb_file_world_readable_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_writable_p(VALUE obj, VALUE fname)
 {
-    if (rb_eaccess(fname, W_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1747,7 +1635,9 @@ rb_file_writable_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_writable_real_p(VALUE obj, VALUE fname)
 {
-    if (rb_access(fname, W_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1792,7 +1682,9 @@ rb_file_world_writable_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_executable_p(VALUE obj, VALUE fname)
 {
-    if (rb_eaccess(fname, X_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1807,7 +1699,9 @@ rb_file_executable_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_executable_real_p(VALUE obj, VALUE fname)
 {
-    if (rb_access(fname, X_OK) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1937,7 +1831,9 @@ check3rdbyte(VALUE fname, int mode)
 {
     struct stat st;
 
-    if (rb_stat(fname, &st) < 0) return Qfalse;
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    if (STAT(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (st.st_mode & mode) return Qtrue;
     return Qfalse;
 }
@@ -1948,8 +1844,6 @@ 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
@@ -1967,8 +1861,6 @@ 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
@@ -1986,8 +1878,6 @@ 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
@@ -2031,8 +1921,28 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
     if (st1.st_ino != st2.st_ino) return Qfalse;
     return Qtrue;
 #else
-    extern VALUE rb_w32_file_identical_p(VALUE, VALUE);
-    return rb_w32_file_identical_p(fname1, fname2);
+    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;
 #endif
 }
 
@@ -2121,7 +2031,7 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat_without_gvl(StringValueCStr(fname), &st) == -1) {
+    if (lstat(StringValueCStr(fname), &st) == -1) {
 	rb_sys_fail_path(fname);
     }
 
@@ -2132,7 +2042,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.
  *
@@ -2158,7 +2068,7 @@ rb_file_s_atime(VALUE klass, VALUE fname)
  *     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.
+ *   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
  *
@@ -2366,10 +2276,11 @@ rb_file_size(VALUE obj)
     return OFFT2NUM(st.st_size);
 }
 
-static int
-chmod_internal(const char *path, void *mode)
+static void
+chmod_internal(const char *path, VALUE pathv, void *mode)
 {
-    return chmod(path, *(mode_t *)mode);
+    if (chmod(path, *(int *)mode) < 0)
+	rb_sys_fail_path(pathv);
 }
 
 /*
@@ -2388,10 +2299,10 @@ chmod_internal(const char *path, void *mode)
 static VALUE
 rb_file_s_chmod(int argc, VALUE *argv)
 {
-    mode_t mode;
+    int mode;
 
     apply2args(1);
-    mode = NUM2MODET(*argv++);
+    mode = NUM2INT(*argv++);
 
     return apply2files(chmod_internal, argc, argv, &mode);
 }
@@ -2413,12 +2324,12 @@ static VALUE
 rb_file_chmod(VALUE obj, VALUE vmode)
 {
     rb_io_t *fptr;
-    mode_t mode;
+    int mode;
 #if !defined HAVE_FCHMOD || !HAVE_FCHMOD
     VALUE path;
 #endif
 
-    mode = NUM2MODET(vmode);
+    mode = NUM2INT(vmode);
 
     GetOpenFile(obj, fptr);
 #ifdef HAVE_FCHMOD
@@ -2441,10 +2352,11 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 }
 
 #if defined(HAVE_LCHMOD)
-static int
-lchmod_internal(const char *path, void *mode)
+static void
+lchmod_internal(const char *path, VALUE pathv, void *mode)
 {
-    return lchmod(path, *(mode_t *)mode);
+    if (lchmod(path, (int)(VALUE)mode) < 0)
+	rb_sys_fail_path(pathv);
 }
 
 /*
@@ -2460,12 +2372,12 @@ lchmod_internal(const char *path, void *mode)
 static VALUE
 rb_file_s_lchmod(int argc, VALUE *argv)
 {
-    mode_t mode;
+    long mode;
 
     apply2args(1);
-    mode = NUM2MODET(*argv++);
+    mode = NUM2INT(*argv++);
 
-    return apply2files(lchmod_internal, argc, argv, &mode);
+    return apply2files(lchmod_internal, argc, argv, (void *)(long)mode);
 }
 #else
 #define rb_file_s_lchmod rb_f_notimplement
@@ -2494,16 +2406,17 @@ struct chown_args {
     rb_gid_t group;
 };
 
-static int
-chown_internal(const char *path, void *arg)
+static void
+chown_internal(const char *path, VALUE pathv, void *arg)
 {
     struct chown_args *args = arg;
-    return chown(path, args->owner, args->group);
+    if (chown(path, args->owner, args->group) < 0)
+	rb_sys_fail_path(pathv);
 }
 
 /*
  *  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
@@ -2570,11 +2483,12 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
 }
 
 #if defined(HAVE_LCHOWN)
-static int
-lchown_internal(const char *path, void *arg)
+static void
+lchown_internal(const char *path, VALUE pathv, void *arg)
 {
     struct chown_args *args = arg;
-    return lchown(path, args->owner, args->group);
+    if (lchown(path, args->owner, args->group) < 0)
+	rb_sys_fail_path(pathv);
 }
 
 /*
@@ -2606,25 +2520,18 @@ 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) */
 };
 
-#ifdef UTIME_EINVAL
-NORETURN(static void utime_failed(struct apply_arg *));
+#if defined DOSISH || defined __CYGWIN__
+NORETURN(static void utime_failed(VALUE, const struct timespec *, VALUE, VALUE));
 
 static void
-utime_failed(struct apply_arg *aa)
+utime_failed(VALUE path, const struct timespec *tsp, VALUE atime, VALUE mtime)
 {
-    int e = aa->errnum;
-    VALUE path = aa->fn[aa->i].path;
-    struct utime_args *ua = aa->arg;
-
-    if (ua->tsp && e == EINVAL) {
+    int e = errno;
+    if (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);
 	}
@@ -2649,12 +2556,14 @@ utime_failed(struct apply_arg *aa)
     }
     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 int
-utime_internal(const char *path, void *arg)
+static void
+utime_internal(const char *path, VALUE pathv, void *arg)
 {
     struct utime_args *v = arg;
     const struct timespec *tsp = v->tsp;
@@ -2662,32 +2571,16 @@ utime_internal(const char *path, 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 (utimensat(AT_FDCWD, path, tsp, flags) < 0) {
+    if (try_utimensat) {
+        if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
             if (errno == ENOSYS) {
-# ifdef AT_SYMLINK_NOFOLLOW
-		try_utimensat_follow = 0;
-# endif
-		if (!v->follow)
-		    try_utimensat = 0;
+                try_utimensat = 0;
                 goto no_utimensat;
             }
-            return -1; /* calls utime_failed */
+            utime_failed(pathv, tsp, v->atime, v->mtime);
         }
-        return 0;
+        return;
     }
 no_utimensat:
 #endif
@@ -2699,10 +2592,8 @@ no_utimensat:
         tvbuf[1].tv_usec = (int)(tsp[1].tv_nsec / 1000);
         tvp = tvbuf;
     }
-#ifdef HAVE_LUTIMES
-    if (v->follow) return lutimes(path, tvp);
-#endif
-    return utimes(path, tvp);
+    if (utimes(path, tvp) < 0)
+	utime_failed(pathv, tsp, v->atime, v->mtime);
 }
 
 #else
@@ -2714,8 +2605,8 @@ struct utimbuf {
 };
 #endif
 
-static int
-utime_internal(const char *path, void *arg)
+static void
+utime_internal(const char *path, VALUE pathv, void *arg)
 {
     struct utime_args *v = arg;
     const struct timespec *tsp = v->tsp;
@@ -2725,13 +2616,23 @@ utime_internal(const char *path, void *arg)
         utbuf.modtime = tsp[1].tv_sec;
         utp = &utbuf;
     }
-    return utime(path, utp);
+    if (utime(path, utp) < 0)
+	utime_failed(pathv, tsp, v->atime, v->mtime);
 }
 
 #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
-utime_internal_i(int argc, VALUE *argv, int follow)
+rb_file_s_utime(int argc, VALUE *argv)
 {
     struct utime_args args;
     struct timespec tss[2], *tsp = NULL;
@@ -2740,8 +2641,6 @@ utime_internal_i(int argc, VALUE *argv, int follow)
     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);
@@ -2755,45 +2654,6 @@ utime_internal_i(int argc, VALUE *argv, int follow)
     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)
-{
-    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)
-{
-    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
@@ -2905,33 +2765,6 @@ 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)
 {
@@ -2942,7 +2775,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_without_gvl(path, v, size)) == size
+    while ((rv = readlink(RSTRING_PTR(path), RSTRING_PTR(v), size)) == size
 #ifdef _AIX
 	    || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
 #endif
@@ -2965,10 +2798,11 @@ rb_readlink(VALUE path, rb_encoding *enc)
 #define rb_file_s_readlink rb_f_notimplement
 #endif
 
-static int
-unlink_internal(const char *path, void *arg)
+static void
+unlink_internal(const char *path, VALUE pathv, void *arg)
 {
-    return unlink(path);
+    if (unlink(path) < 0)
+	rb_sys_fail_path(pathv);
 }
 
 /*
@@ -2978,12 +2812,6 @@ unlink_internal(const char *path, void *arg)
  *
  *  Deletes the named files, returning the number of names
  *  passed as arguments. Raises an exception on any error.
- *  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. <code>Errno::ENOENT</code>.
- *
  *  See also <code>Dir::rmdir</code>.
  */
 
@@ -2993,19 +2821,6 @@ 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
@@ -3019,27 +2834,26 @@ no_gvl_rename(void *ptr)
 static VALUE
 rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
 {
-    struct rename_args ra;
+    const char *src, *dst;
     VALUE f, t;
 
     FilePathValue(from);
     FilePathValue(to);
     f = rb_str_encode_ospath(from);
     t = rb_str_encode_ospath(to);
-    ra.src = StringValueCStr(f);
-    ra.dst = StringValueCStr(t);
+    src = StringValueCStr(f);
+    dst = StringValueCStr(t);
 #if defined __CYGWIN__
     errno = 0;
 #endif
-    if ((int)(VALUE)rb_thread_call_without_gvl(no_gvl_rename, &ra,
-					 RUBY_UBF_IO, 0) < 0) {
+    if (rename(src, dst) < 0) {
 	int e = errno;
 #if defined DOSISH
 	switch (e) {
 	  case EEXIST:
-	    if (chmod(ra.dst, 0666) == 0 &&
-		unlink(ra.dst) == 0 &&
-		rename(ra.src, ra.dst) == 0)
+	    if (chmod(dst, 0666) == 0 &&
+		unlink(dst) == 0 &&
+		rename(src, dst) == 0)
 		return INT2FIX(0);
 	}
 #endif
@@ -3067,19 +2881,19 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
 static VALUE
 rb_file_s_umask(int argc, VALUE *argv)
 {
-    mode_t omask = 0;
+    int omask = 0;
 
     if (argc == 0) {
 	omask = umask(0);
 	umask(omask);
     }
     else if (argc == 1) {
-	omask = umask(NUM2MODET(argv[0]));
+	omask = umask(NUM2INT(argv[0]));
     }
     else {
 	rb_check_arity(argc, 0, 1);
     }
-    return MODET2NUM(omask);
+    return INT2FIX(omask);
 }
 
 #ifdef __CYGWIN__
@@ -3092,38 +2906,24 @@ 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
+#if defined _WIN32 || defined __CYGWIN__
 #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)))
@@ -3161,9 +2961,9 @@ getcwdofdrv(int drv)
        of a particular drive is to change chdir() to that drive,
        so save the old cwd before chdir()
     */
-    oldcwd = ruby_getcwd();
+    oldcwd = my_getcwd();
     if (chdir(drive) == 0) {
-	drvcwd = ruby_getcwd();
+	drvcwd = my_getcwd();
 	chdir(oldcwd);
 	xfree(oldcwd);
     }
@@ -3294,17 +3094,17 @@ static char *
 ntfs_tail(const char *path, const char *end, rb_encoding *enc)
 {
     while (path < end && *path == '.') path++;
-    while (path < end && !isADS(*path)) {
+    while (path < end && *path != ':') {
 	if (istrailinggarbage(*path)) {
 	    const char *last = path++;
 	    while (path < end && istrailinggarbage(*path)) path++;
-	    if (path >= end || isADS(*path)) return (char *)last;
+	    if (path >= end || *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 (isADS(*path)) path++;
+	    if (*path == ':') path++;
 	}
 	else {
 	    Inc(path, end, enc);
@@ -3381,27 +3181,13 @@ 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;
+    struct passwd *pwPtr = getpwnam(username);
 #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
@@ -3417,37 +3203,17 @@ 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) {
-	const char *login = getlogin();
-	if (login) {
-	    struct passwd *pw = getpwnam(login);
-	    if (pw) {
-		copy_home_path(result, pw->pw_dir);
-		endpwent();
-		return result;
-	    }
-	    endpwent();
-	    rb_raise(rb_eArgError, "couldn't find HOME for login `%s' -- expanding `~'",
-		     login);
-	}
-	else {
-	    rb_raise(rb_eArgError, "couldn't find login name -- expanding `~'");
-	}
-    }
-#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)
 {
@@ -3584,7 +3350,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, ruby_getcwd(), &enc, fsenc);
+	    char *e = append_fspath(result, fname, my_getcwd(), &enc, fsenc);
 	    tainted = 1;
 	    BUFINIT();
 	    p = e;
@@ -3668,7 +3434,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 >= fend) {
+		if (!*s) {
 		    s = e;
 		    goto endpath;
 		}
@@ -3707,23 +3473,19 @@ 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 (isADS(*(s - (prime_len+1)))) {
+	    if (*(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);
@@ -3752,7 +3514,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_without_gvl(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
+	if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
 	    is_symlink = 1;
 	    if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
 		lnk_added = 1;
@@ -3941,16 +3703,8 @@ rb_file_s_absolute_path(int argc, const VALUE *argv)
     return rb_file_absolute_path(argv[0], argc > 1 ? argv[1] : Qnil);
 }
 
-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)
+static void
+realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE loopcheck, int strict, int last)
 {
     const char *pend = unresolved + strlen(unresolved);
     rb_encoding *enc = rb_enc_get(*resolvedp);
@@ -3991,10 +3745,6 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE f
             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 {
@@ -4004,18 +3754,16 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE f
             else {
                 struct stat sbuf;
                 int ret;
-                ret = lstat_without_gvl(RSTRING_PTR(testpath), &sbuf);
+                VALUE testpath2 = rb_str_encode_ospath(testpath);
+#ifdef __native_client__
+                ret = stat(RSTRING_PTR(testpath2), &sbuf);
+#else
+                ret = lstat(RSTRING_PTR(testpath2), &sbuf);
+#endif
                 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 (mode == RB_REALPATH_STRICT || !last || *unresolved_firstsep)
+                        if (strict || !last || *unresolved_firstsep)
 			    rb_syserr_fail_path(e, testpath);
                         *resolvedp = testpath;
                         break;
@@ -4027,7 +3775,7 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE f
 #ifdef HAVE_READLINK
                 if (S_ISLNK(sbuf.st_mode)) {
 		    VALUE link;
-		    VALUE link_orig = Qnil;
+		    volatile VALUE link_orig = Qnil;
 		    const char *link_prefix, *link_names;
                     long link_prefixlen;
                     rb_hash_aset(loopcheck, testpath, ID2SYM(resolving));
@@ -4036,17 +3784,15 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE f
 		    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 *tmpenc, *linkenc = rb_enc_get(link);
+			rb_encoding *enc, *linkenc = rb_enc_get(link);
 			link_orig = link;
 			link = rb_str_subseq(link, 0, link_prefixlen);
-			tmpenc = rb_enc_check(*resolvedp, link);
-			if (tmpenc != linkenc) link = rb_str_conv_enc(link, linkenc, tmpenc);
+			enc = rb_enc_check(*resolvedp, link);
+			if (enc != linkenc) link = rb_str_conv_enc(link, linkenc, enc);
 			*resolvedp = link;
 			*prefixlenp = link_prefixlen;
 		    }
-		    if (realpath_rec(prefixlenp, resolvedp, link_names, testpath,
-				     loopcheck, mode, !*unresolved_firstsep))
-			return -1;
+		    realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
 		    RB_GC_GUARD(link_orig);
 		    rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp));
                 }
@@ -4060,17 +3806,23 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE f
             }
         }
     }
-    return 0;
 }
 
-static VALUE
-rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode)
+#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)
 {
     long prefixlen;
     VALUE resolved;
-    VALUE unresolved_path;
+    volatile VALUE unresolved_path;
     VALUE loopcheck;
-    VALUE curdir = Qnil;
+    volatile VALUE curdir = Qnil;
 
     rb_encoding *enc, *origenc;
     char *path_names = NULL, *basedir_names = NULL, *curdir_names = NULL;
@@ -4081,12 +3833,9 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode
 
     if (!NIL_P(basedir)) {
         FilePathValue(basedir);
-        basedir = TO_OSPATH(rb_str_dup_frozen(basedir));
+        basedir = rb_str_dup_frozen(basedir);
     }
 
-    enc = rb_enc_get(unresolved_path);
-    origenc = enc;
-    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) {
@@ -4103,7 +3852,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode
         }
     }
 
-    curdir = rb_dir_getwd_ospath();
+    curdir = rb_dir_getwd();
     RSTRING_GETMEM(curdir, ptr, len);
     curdir_names = skipprefixroot(ptr, ptr + len, rb_enc_get(curdir));
     resolved = rb_str_subseq(curdir, 0, curdir_names - ptr);
@@ -4111,6 +3860,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode
   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;
@@ -4125,6 +3875,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode
     }
 #endif
 
+    origenc = enc;
     switch (rb_enc_to_index(enc)) {
       case ENCINDEX_ASCII:
       case ENCINDEX_US_ASCII:
@@ -4132,45 +3883,19 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode
     }
 
     loopcheck = rb_hash_new();
-    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 (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 (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);
-	}
-    }
+    if (origenc != enc && rb_enc_str_asciionly_p(resolved))
+	rb_enc_associate(resolved, origenc);
 
-    rb_obj_taint(resolved);
-    RB_GC_GUARD(unresolved_path);
-    RB_GC_GUARD(curdir);
+    OBJ_TAINT(resolved);
     return resolved;
 }
-
-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, mode);
-}
-
-VALUE
-rb_check_realpath(VALUE basedir, VALUE path)
-{
-    return rb_check_realpath_internal(basedir, path, RB_REALPATH_CHECK);
-}
+#endif
 
 /*
  * call-seq:
@@ -4318,8 +4043,7 @@ 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> (after first stripping trailing separators),
+ *  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
@@ -4382,10 +4106,9 @@ 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 (after first stripping trailing separators).
- *  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. 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>.
  *
  *     File.dirname("/home/gumby/work/ruby.rb")   #=> "/home/gumby/work"
  */
@@ -4472,7 +4195,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
 		if (*p == '.') dot = p;
 		p++;
 	    }
-	    if (!*p || isADS(*p)) {
+	    if (!*p || *p == ':') {
 		p = last;
 		break;
 	    }
@@ -4483,7 +4206,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
 #endif
 	}
 #if USE_NTFS
-	else if (isADS(*p)) {
+	else if (*p == ':') {
 	    break;
 	}
 #endif
@@ -4580,17 +4303,20 @@ rb_file_s_split(VALUE klass, VALUE path)
     return rb_assoc_new(rb_file_dirname(path), rb_file_s_basename(1,&path));
 }
 
-static VALUE rb_file_join(VALUE ary);
+static VALUE separator;
+
+static VALUE rb_file_join(VALUE ary, VALUE sep);
 
 static VALUE
-file_inspect_join(VALUE ary, VALUE arg, int recur)
+file_inspect_join(VALUE ary, VALUE argp, int recur)
 {
-    if (recur || ary == arg) rb_raise(rb_eArgError, "recursive array");
-    return rb_file_join(arg);
+    VALUE *arg = (VALUE *)argp;
+    if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array");
+    return rb_file_join(arg[0], arg[1]);
 }
 
 static VALUE
-rb_file_join(VALUE ary)
+rb_file_join(VALUE ary, VALUE sep)
 {
     long len, i;
     VALUE result, tmp;
@@ -4611,13 +4337,16 @@ rb_file_join(VALUE ary)
 	    len += 10;
 	}
     }
-    len += RARRAY_LEN(ary) - 1;
+    if (!NIL_P(sep)) {
+	StringValue(sep);
+	len += RSTRING_LEN(sep) * (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 (OBJ_BUILTIN_TYPE(tmp)) {
+	switch (TYPE(tmp)) {
 	  case T_STRING:
 	    if (!checked) check_path_encoding(tmp);
 	    StringValueCStr(tmp);
@@ -4627,7 +4356,11 @@ rb_file_join(VALUE ary)
 		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
-		tmp = rb_exec_recursive(file_inspect_join, ary, tmp);
+		VALUE args[2];
+
+		args[0] = tmp;
+		args[1] = sep;
+		tmp = rb_exec_recursive(file_inspect_join, ary, (VALUE)args);
 	    }
 	    break;
 	  default:
@@ -4638,13 +4371,15 @@ rb_file_join(VALUE ary)
 	if (i == 0) {
 	    rb_enc_copy(result, tmp);
 	}
-	else {
+	else if (!NIL_P(sep)) {
 	    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) {
-		rb_str_cat(result, "/", 1);
+		enc = rb_enc_check(result, sep);
+		rb_str_buf_append(result, sep);
+		rb_enc_associate(result, enc);
 	    }
 	}
 	enc = rb_enc_check(result, tmp);
@@ -4661,7 +4396,7 @@ rb_file_join(VALUE ary)
  *     File.join(string, ...)  ->  string
  *
  *  Returns a new string formed by joining the strings using
- *  <code>"/"</code>.
+ *  <code>File::SEPARATOR</code>.
  *
  *     File.join("usr", "mail", "gumby")   #=> "usr/mail/gumby"
  *
@@ -4670,46 +4405,10 @@ rb_file_join(VALUE ary)
 static VALUE
 rb_file_s_join(VALUE klass, VALUE args)
 {
-    return rb_file_join(args);
+    return rb_file_join(args, separator);
 }
 
 #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
@@ -4728,18 +4427,36 @@ nogvl_truncate(void *ptr)
 static VALUE
 rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
 {
-    struct truncate_arg ta;
-    int r;
+#ifdef HAVE_TRUNCATE
+#define NUM2POS(n) NUM2OFFT(n)
+    off_t pos;
+#else
+#define NUM2POS(n) NUM2LONG(n)
+    long pos;
+#endif
 
-    ta.pos = NUM2POS(len);
+    pos = NUM2POS(len);
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
-    ta.path = StringValueCStr(path);
-
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_truncate, &ta,
-						RUBY_UBF_IO, NULL);
-    if (r < 0)
+#ifdef HAVE_TRUNCATE
+    if (truncate(StringValueCStr(path), pos) < 0)
 	rb_sys_fail_path(path);
+#else /* defined(HAVE_CHSIZE) */
+    {
+	int tmpfd;
+
+	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
     return INT2FIX(0);
 #undef NUM2POS
 }
@@ -4748,29 +4465,6 @@ 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
@@ -4789,18 +4483,27 @@ static VALUE
 rb_file_truncate(VALUE obj, VALUE len)
 {
     rb_io_t *fptr;
-    struct ftruncate_arg fa;
+#if defined(HAVE_FTRUNCATE)
+#define NUM2POS(n) NUM2OFFT(n)
+    off_t pos;
+#else
+#define NUM2POS(n) NUM2LONG(n)
+    long pos;
+#endif
 
-    fa.pos = NUM2POS(len);
+    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);
-    fa.fd = fptr->fd;
-    if ((int)rb_thread_io_blocking_region(nogvl_ftruncate, &fa, fa.fd) < 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)
+	rb_sys_fail_path(fptr->pathv);
+#endif
     return INT2FIX(0);
 #undef NUM2POS
 }
@@ -5789,20 +5492,6 @@ 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
@@ -5813,22 +5502,21 @@ nogvl_mkfifo(void *ptr)
  *  (mode & ~umask).
  */
 
+#ifdef HAVE_MKFIFO
 static VALUE
 rb_file_s_mkfifo(int argc, VALUE *argv)
 {
     VALUE path;
-    struct mkfifo_arg ma;
+    int mode = 0666;
 
-    ma.mode = 0666;
     rb_check_arity(argc, 1, 2);
     if (argc > 1) {
-	ma.mode = NUM2MODET(argv[1]);
+	mode = NUM2INT(argv[1]);
     }
     path = argv[0];
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
-    ma.path = RSTRING_PTR(path);
-    if (rb_thread_call_without_gvl(nogvl_mkfifo, &ma, RUBY_UBF_IO, 0)) {
+    if (mkfifo(RSTRING_PTR(path), mode)) {
 	rb_sys_fail_path(path);
     }
     return INT2FIX(0);
@@ -5837,7 +5525,7 @@ rb_file_s_mkfifo(int argc, VALUE *argv)
 #define rb_file_s_mkfifo rb_f_notimplement
 #endif
 
-static VALUE rb_mFConst;
+VALUE rb_mFConst;
 
 void
 rb_file_const(const char *name, VALUE value)
@@ -5879,7 +5567,7 @@ path_check_0(VALUE path, int execpath)
     char *p = 0, *s;
 
     if (!rb_is_absolute_path(p0)) {
-	char *buf = ruby_getcwd();
+	char *buf = my_getcwd();
 	VALUE newpath;
 
 	newpath = rb_str_new2(buf);
@@ -5901,9 +5589,9 @@ path_check_0(VALUE path, int execpath)
 	    && !(p && execpath && (st.st_mode & S_ISVTX))
 #endif
 	    && !access(p0, W_OK)) {
-	    rb_enc_warn(enc, "Insecure world writable dir %s in %sPATH, mode 0%"
-			PRI_MODET_PREFIX"o",
-			p0, (execpath ? "" : "LOAD_"), st.st_mode);
+	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%"
+		    PRI_MODET_PREFIX"o",
+		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
 	    if (p) *p = '/';
 	    RB_GC_GUARD(path);
 	    return 0;
@@ -5965,7 +5653,7 @@ ruby_is_fd_loadable(int fd)
     if (S_ISREG(st.st_mode))
 	return 1;
 
-    if (S_ISFIFO(st.st_mode) || S_ISCHR(st.st_mode))
+    if (S_ISFIFO(st.st_mode))
 	return -1;
 
     if (S_ISDIR(st.st_mode))
@@ -6107,7 +5795,7 @@ rb_find_file_safe(VALUE path, int safe_level)
     if (f[0] == '~') {
 	tmp = file_expand_path_1(path);
 	if (safe_level >= 1 && OBJ_TAINTED(tmp)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %"PRIsVALUE, tmp);
+	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
 	}
 	path = copy_path_class(tmp, path);
 	f = RSTRING_PTR(path);
@@ -6116,7 +5804,7 @@ rb_find_file_safe(VALUE path, int safe_level)
 
     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 %"PRIsVALUE, path);
+	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
 	}
 	if (!rb_file_load_ok(f)) return 0;
 	if (!expanded)
@@ -6148,7 +5836,7 @@ 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 %"PRIsVALUE, tmp);
+	rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
     }
 
     return copy_path_class(tmp, path);
@@ -6161,7 +5849,7 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
     rb_define_singleton_method(rb_cFile, name, func, argc);
 }
 
-const char ruby_null_device[] =
+static const char null_device[] =
 #if defined DOSISH
     "NUL"
 #elif defined AMIGA || defined __amigaos__
@@ -6210,8 +5898,6 @@ const char ruby_null_device[] =
 void
 Init_File(void)
 {
-    VALUE separator;
-
     rb_mFileTest = rb_define_module("FileTest");
     rb_cFile = rb_define_class("File", rb_cIO);
 
@@ -6261,7 +5947,6 @@ 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);
@@ -6282,10 +5967,9 @@ 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_fstring_lit("/");
+    separator = rb_obj_freeze(rb_usascii_str_new2("/"));
     /* 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);
@@ -6297,7 +5981,7 @@ Init_File(void)
     rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
 #endif
     /* path list separator */
-    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_fstring_cstr(PATH_SEP));
+    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_obj_freeze(rb_str_new2(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);
@@ -6404,7 +6088,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_fstring_cstr(ruby_null_device));
+    rb_define_const(rb_mFConst, "NULL", rb_obj_freeze(rb_usascii_str_new2(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 0df7189191..18414ed98a 100644
--- a/gc.c
+++ b/gc.c
@@ -14,14 +14,13 @@
 #define rb_data_object_alloc rb_data_object_alloc
 #define rb_data_typed_object_alloc rb_data_typed_object_alloc
 
-#include "ruby/encoding.h"
-#include "ruby/io.h"
+#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 "internal.h"
 #include "eval_intern.h"
 #include "vm_core.h"
 #include "gc.h"
@@ -34,9 +33,6 @@
 #include <setjmp.h>
 #include <sys/types.h>
 #include "ruby_assert.h"
-#include "debug_counter.h"
-#include "transient_heap.h"
-#include "mjit.h"
 
 #undef rb_data_object_wrap
 
@@ -50,9 +46,7 @@
 # endif
 #endif
 #ifdef HAVE_MALLOC_USABLE_SIZE
-# ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
-#  include RUBY_ALTERNATIVE_MALLOC_HEADER
-# elif HAVE_MALLOC_H
+# ifdef HAVE_MALLOC_H
 #  include <malloc.h>
 # elif defined(HAVE_MALLOC_NP_H)
 #  include <malloc_np.h>
@@ -61,6 +55,16 @@
 # 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>
 #endif
@@ -68,6 +72,12 @@
 #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
+
+#endif
 
 #if defined _WIN32 || defined __CYGWIN__
 #include <windows.h>
@@ -210,18 +220,8 @@ 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) ((RGENGC_DEBUG) >= (level))
-#endif
-int ruby_rgengc_debug;
 
 /* RGENGC_CHECK_MODE
  * 0: disable all assertions
@@ -235,12 +235,6 @@ int ruby_rgengc_debug;
 #define RGENGC_CHECK_MODE  0
 #endif
 
-#if RGENGC_CHECK_MODE > 0
-#define GC_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(RGENGC_CHECK_MODE > 0, expr, #expr)
-#else
-#define GC_ASSERT(expr) ((void)0)
-#endif
-
 /* RGENGC_OLD_NEWOBJ_CHECK
  * 0:  disable all assertions
  * >0: make a OLD object when new object creation.
@@ -306,7 +300,7 @@ int ruby_rgengc_debug;
 #define GC_ENABLE_LAZY_SWEEP   1
 #endif
 #ifndef CALC_EXACT_MALLOC_SIZE
-#define CALC_EXACT_MALLOC_SIZE USE_GC_MALLOC_OBJ_INFO_DETAILS
+#define CALC_EXACT_MALLOC_SIZE 0
 #endif
 #if defined(HAVE_MALLOC_USABLE_SIZE) || CALC_EXACT_MALLOC_SIZE > 0
 #ifndef MALLOC_ALLOCATED_SIZE
@@ -348,9 +342,7 @@ typedef enum {
 
     /* others */
     GPR_FLAG_IMMEDIATE_SWEEP   = 0x2000,
-    GPR_FLAG_HAVE_FINALIZE     = 0x4000,
-    GPR_FLAG_IMMEDIATE_MARK    = 0x8000,
-    GPR_FLAG_FULL_MARK        = 0x10000
+    GPR_FLAG_HAVE_FINALIZE     = 0x4000
 } gc_profile_record_flag;
 
 typedef struct gc_profile_record {
@@ -417,6 +409,7 @@ typedef struct RVALUE {
 	struct RStruct rstruct;
 	struct RBignum bignum;
 	struct RFile   file;
+	struct RNode   node;
 	struct RMatch  match;
 	struct RRational rational;
 	struct RComplex complex;
@@ -429,8 +422,6 @@ typedef struct RVALUE {
 	    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;
@@ -491,8 +482,8 @@ typedef struct rb_heap_struct {
 
     struct heap_page *free_pages;
     struct heap_page *using_page;
-    struct list_head pages;
-    struct heap_page *sweeping_page; /* iterator for .pages */
+    struct heap_page *pages;
+    struct heap_page *sweep_pages;
 #if GC_ENABLE_INCREMENTAL_MARK
     struct heap_page *pooled_pages;
 #endif
@@ -649,8 +640,10 @@ 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),
@@ -664,6 +657,7 @@ enum {
 };
 
 struct heap_page {
+    struct heap_page *prev;
     short total_slots;
     short free_slots;
     short final_slots;
@@ -677,7 +671,7 @@ struct heap_page {
     struct heap_page *free_next;
     RVALUE *start;
     RVALUE *freelist;
-    struct list_node page_node;
+    struct heap_page *next;
 
 #if USE_RGENGC
     bits_t wb_unprotected_bits[HEAP_PAGE_BITMAP_LIMIT];
@@ -712,10 +706,6 @@ struct heap_page {
 #define GET_HEAP_MARKING_BITS(x)        (&GET_HEAP_PAGE(x)->marking_bits[0])
 #endif
 
-#ifndef ENABLE_VM_OBJSPACE
-# define ENABLE_VM_OBJSPACE 1
-#endif
-
 /* Aliases */
 #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 #define rb_objspace (*rb_objspace_of(GET_VM()))
@@ -792,7 +782,7 @@ gc_mode_verify(enum gc_mode mode)
 #else
 #define will_be_incremental_marking(objspace) FALSE
 #endif
-#define has_sweeping_pages(heap)         ((heap)->sweeping_page != 0)
+#define has_sweeping_pages(heap)         ((heap)->sweep_pages != 0)
 #define is_lazy_sweeping(heap)           (GC_ENABLE_LAZY_SWEEP && has_sweeping_pages(heap))
 
 #if SIZEOF_LONG == SIZEOF_VOIDP
@@ -819,9 +809,7 @@ 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;
 
@@ -834,14 +822,16 @@ 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 *);
 
 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 reason);
+static int garbage_collect(rb_objspace_t *, int full_mark, int immediate_mark, int immediate_sweep, int reason);
 
-static int  gc_start(rb_objspace_t *objspace, 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 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);
@@ -850,19 +840,23 @@ 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_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 inline void gc_mark(rb_objspace_t *objspace, VALUE ptr);
 static void gc_mark_ptr(rb_objspace_t *objspace, VALUE ptr);
-NO_SANITIZE("memory", static void gc_mark_maybe(rb_objspace_t *objspace, VALUE ptr));
+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);
@@ -870,7 +864,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);
-NO_SANITIZE("memory", static inline int is_pointer_to_heap(rb_objspace_t *objspace, void *ptr));
+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 *);
@@ -899,10 +893,10 @@ static inline void gc_prof_set_heap_info(rb_objspace_t *);
 #define gc_prof_enabled(objspace) ((objspace)->profile.run && (objspace)->profile.current_record)
 
 #ifdef HAVE_VA_ARGS_MACRO
-# define gc_report(level, objspace, ...) \
-    if (!RGENGC_DEBUG_ENABLED(level)) {} else gc_report_body(level, objspace, __VA_ARGS__)
+# define gc_report(level, objspace, fmt, ...) \
+    if ((level) > RGENGC_DEBUG) {} else gc_report_body(level, objspace, fmt, ##__VA_ARGS__)
 #else
-# define gc_report if (!RGENGC_DEBUG_ENABLED(0)) {} else gc_report_body
+# define gc_report if (!(RGENGC_DEBUG)) {} 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);
@@ -1012,12 +1006,9 @@ tick(void)
 #define MEASURE_LINE(expr) expr
 #endif /* USE_TICK_T */
 
-#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 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)
 
 #define RVALUE_MARK_BITMAP(obj)           MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), (obj))
 #define RVALUE_PAGE_MARKED(page, obj)     MARKED_IN_BITMAP((page)->mark_bits, (obj))
@@ -1094,7 +1085,7 @@ check_rvalue_consistency(const VALUE obj)
 		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 remembered, but not old (age: %d).", obj_info(obj), age);
+		rb_bug("check_rvalue_consistency: %s is rememberd, but not old (age: %d).", obj_info(obj), age);
 	    }
 	}
 
@@ -1177,7 +1168,6 @@ 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++;
@@ -1188,7 +1178,6 @@ 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);
 }
 
@@ -1225,7 +1214,7 @@ static inline void
 RVALUE_AGE_SET_OLD(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    GC_ASSERT(!RVALUE_OLD_P(obj));
+    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
 
     RBASIC(obj)->flags = RVALUE_FLAGS_AGE_SET(RBASIC(obj)->flags, RVALUE_OLD_AGE);
     RVALUE_OLD_UNCOLLECTIBLE_SET(objspace, obj);
@@ -1238,7 +1227,7 @@ static inline void
 RVALUE_AGE_SET_CANDIDATE(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    GC_ASSERT(!RVALUE_OLD_P(obj));
+    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
 
     RBASIC(obj)->flags = RVALUE_FLAGS_AGE_SET(RBASIC(obj)->flags, RVALUE_OLD_AGE - 1);
 
@@ -1256,7 +1245,7 @@ static inline void
 RVALUE_DEMOTE(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    GC_ASSERT(RVALUE_OLD_P(obj));
+    if (RGENGC_CHECK_MODE) assert(RVALUE_OLD_P(obj));
 
     if (!is_incremental_marking(objspace) && RVALUE_REMEMBERED(obj)) {
 	CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
@@ -1281,8 +1270,7 @@ static inline void
 RVALUE_AGE_RESET(VALUE obj)
 {
     check_rvalue_consistency(obj);
-    GC_ASSERT(!RVALUE_OLD_P(obj));
-
+    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
     RVALUE_AGE_RESET_RAW(obj);
     check_rvalue_consistency(obj);
 }
@@ -1322,8 +1310,6 @@ rb_objspace_alloc(void)
     rb_objspace_t *objspace = &rb_objspace;
 #endif
     malloc_limit = gc_params.malloc_limit_min;
-    list_head_init(&objspace->eden_heap.pages);
-    list_head_init(&objspace->tomb_heap.pages);
 
     return objspace;
 }
@@ -1362,6 +1348,7 @@ rb_objspace_free(rb_objspace_t *objspace)
 
 	objspace->eden_heap.total_pages = 0;
 	objspace->eden_heap.total_slots = 0;
+	objspace->eden_heap.pages = NULL;
     }
     free_stack_chunks(&objspace->mark_stack);
 #if !(defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE)
@@ -1371,55 +1358,33 @@ rb_objspace_free(rb_objspace_t *objspace)
 }
 
 static void
-heap_pages_expand_sorted_to(rb_objspace_t *objspace, size_t next_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);
-    }
-
-    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) {
-	heap_pages_expand_sorted_to(objspace, next_length);
-    }
+	struct heap_page **sorted;
+	size_t size = next_length * sizeof(struct heap_page *);
 
-    GC_ASSERT(heap_allocatable_pages + heap_eden->total_pages <= heap_pages_sorted_length);
-    GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
-}
+	gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %d, size: %d\n", (int)next_length, (int)size);
 
-static void
-heap_allocatable_pages_set(rb_objspace_t *objspace, size_t s)
-{
-    heap_allocatable_pages = s;
-    heap_pages_expand_sorted(objspace);
-}
+	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 inline void
 heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
@@ -1430,9 +1395,8 @@ heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj
     page->freelist = p;
 
     if (RGENGC_CHECK_MODE && !is_pointer_to_heap(objspace, p)) {
-	rb_bug("heap_page_add_freeobj: %p is not rvalue.", (void *)p);
+	rb_bug("heap_page_add_freeobj: %p is not rvalue.", p);
     }
-    poison_object(obj);
 
     gc_report(3, objspace, "heap_page_add_freeobj: add %p to freelist\n", (void *)obj);
 }
@@ -1465,7 +1429,11 @@ heap_add_poolpage(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *pa
 static void
 heap_unlink_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
 {
-    list_del(&page->page_node);
+    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;
     heap->total_pages--;
     heap->total_slots -= page->total_slots;
 }
@@ -1475,7 +1443,7 @@ heap_page_free(rb_objspace_t *objspace, struct heap_page *page)
 {
     heap_allocated_pages--;
     objspace->profile.total_freed_pages++;
-    rb_aligned_free(GET_PAGE_BODY(page->start));
+    aligned_free(GET_PAGE_BODY(page->start));
     free(page);
 }
 
@@ -1484,7 +1452,7 @@ heap_pages_free_unused_pages(rb_objspace_t *objspace)
 {
     size_t i, j;
 
-    if (!list_empty(&heap_tomb->pages)) {
+    if (heap_tomb->pages) {
 	for (i = j = 1; j < heap_allocated_pages; i++) {
 	    struct heap_page *page = heap_pages_sorted[i];
 
@@ -1499,7 +1467,7 @@ heap_pages_free_unused_pages(rb_objspace_t *objspace)
 		j++;
 	    }
 	}
-	GC_ASSERT(j == heap_allocated_pages);
+	if (RGENGC_CHECK_MODE) assert(j == heap_allocated_pages);
     }
 }
 
@@ -1513,7 +1481,7 @@ 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 *)rb_aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
+    page_body = (struct heap_page_body *)aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
     if (page_body == 0) {
 	rb_memerror();
     }
@@ -1521,7 +1489,7 @@ heap_page_allocate(rb_objspace_t *objspace)
     /* assign heap_page entry */
     page = (struct heap_page *)calloc(1, sizeof(struct heap_page));
     if (page == 0) {
-        rb_aligned_free(page_body);
+	aligned_free(page_body);
 	rb_memerror();
     }
 
@@ -1552,7 +1520,6 @@ 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);
     }
@@ -1560,17 +1527,9 @@ 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 (heap_allocated_pages > heap_pages_sorted_length) {
-	rb_bug("heap_page_allocate: allocated(%"PRIdSIZE") > sorted(%"PRIdSIZE")",
-	       heap_allocated_pages, heap_pages_sorted_length);
-    }
+    if (RGENGC_CHECK_MODE) assert(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;
@@ -1580,7 +1539,7 @@ 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", (void *)p);
+	gc_report(3, objspace, "assign_heap_page: %p is added to freelist\n", p);
 	heap_page_add_freeobj(objspace, page, (VALUE)p);
     }
     page->free_slots = limit;
@@ -1591,34 +1550,26 @@ heap_page_allocate(rb_objspace_t *objspace)
 static struct heap_page *
 heap_page_resurrect(rb_objspace_t *objspace)
 {
-    struct heap_page *page = 0, *next;
+    struct heap_page *page;
 
-    list_for_each_safe(&heap_tomb->pages, page, next, page_node) {
-	if (page->freelist != NULL) {
-	    heap_unlink_page(objspace, heap_tomb, page);
-	    return page;
-	}
+    if ((page = heap_tomb->pages) != NULL) {
+	heap_unlink_page(objspace, heap_tomb, page);
+	return page;
     }
-
     return NULL;
 }
 
 static struct heap_page *
 heap_page_create(rb_objspace_t *objspace)
 {
-    struct heap_page *page;
+    struct heap_page *page = heap_page_resurrect(objspace);
     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, (void *)page, (int)heap_pages_sorted_length, (int)heap_allocated_pages, (int)heap_tomb->total_pages);
+		   method, page, (int)heap_pages_sorted_length, (int)heap_allocated_pages, (int)heap_tomb->total_pages);
     return page;
 }
 
@@ -1626,7 +1577,9 @@ static void
 heap_add_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
 {
     page->flags.in_tomb = (heap == heap_tomb);
-    list_add(&heap->pages, &page->page_node);
+    page->next = heap->pages;
+    if (heap->pages) heap->pages->prev = page;
+    heap->pages = page;
     heap->total_pages++;
     heap->total_slots += page->total_slots;
 }
@@ -1644,13 +1597,12 @@ heap_add_pages(rb_objspace_t *objspace, rb_heap_t *heap, size_t add)
 {
     size_t i;
 
-    heap_allocatable_pages_set(objspace, add);
-
+    heap_allocatable_pages = add;
+    heap_pages_expand_sorted(objspace);
     for (i = 0; i < add; i++) {
 	heap_assign_page(objspace, heap);
     }
-
-    GC_ASSERT(heap_allocatable_pages == 0);
+    heap_allocatable_pages = 0;
 }
 
 static size_t
@@ -1676,9 +1628,9 @@ heap_extend_pages(rb_objspace_t *objspace, size_t free_slots, size_t total_slots
 
 	if (0) {
 	    fprintf(stderr,
-		    "free_slots(%8"PRIuSIZE")/total_slots(%8"PRIuSIZE")=%1.2f,"
+		    "free_slots(%8"PRIdSIZE")/total_slots(%8"PRIdSIZE")=%1.2f,"
 		    " G(%1.2f), f(%1.2f),"
-		    " used(%8"PRIuSIZE") => next_used(%8"PRIuSIZE")\n",
+		    " used(%8"PRIdSIZE") => next_used(%8"PRIdSIZE")\n",
 		    free_slots, total_slots, free_slots/(double)total_slots,
 		    goal_ratio, f, used, next_used);
 	}
@@ -1700,7 +1652,8 @@ heap_set_increment(rb_objspace_t *objspace, size_t additional_pages)
 
     if (next_used_limit == heap_allocated_pages) next_used_limit++;
 
-    heap_allocatable_pages_set(objspace, next_used_limit - used);
+    heap_allocatable_pages = next_used_limit - used;
+    heap_pages_expand_sorted(objspace);
 
     gc_report(1, objspace, "heap_set_increment: heap_allocatable_pages is %d\n", (int)heap_allocatable_pages);
 }
@@ -1711,10 +1664,7 @@ 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);
-
-	GC_ASSERT(heap_allocatable_pages + heap_eden->total_pages <= heap_pages_sorted_length);
-	GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
-
+	heap_allocatable_pages--;
 	heap_assign_page(objspace, heap);
 	return TRUE;
     }
@@ -1724,18 +1674,22 @@ heap_increment(rb_objspace_t *objspace, rb_heap_t *heap)
 static void
 heap_prepare(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    GC_ASSERT(heap->free_pages == NULL);
+    if (RGENGC_CHECK_MODE) 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, GPR_FLAG_NEWOBJ) == FALSE) {
+	gc_start(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ) == FALSE) {
 	rb_memerror();
     }
 }
@@ -1753,11 +1707,10 @@ heap_get_freeobj_from_next_freepage(rb_objspace_t *objspace, rb_heap_t *heap)
     heap->free_pages = page->free_next;
     heap->using_page = page;
 
-    GC_ASSERT(page->free_slots != 0);
+    if (RGENGC_CHECK_MODE) assert(page->free_slots != 0);
     p = page->freelist;
     page->freelist = NULL;
     page->free_slots = 0;
-    unpoison_object((VALUE)p, true);
     return p;
 }
 
@@ -1768,7 +1721,6 @@ heap_get_freeobj_head(rb_objspace_t *objspace, rb_heap_t *heap)
     if (LIKELY(p != NULL)) {
 	heap->freelist = p->as.free.next;
     }
-    unpoison_object((VALUE)p, true);
     return (VALUE)p;
 }
 
@@ -1779,7 +1731,6 @@ heap_get_freeobj(rb_objspace_t *objspace, rb_heap_t *heap)
 
     while (1) {
 	if (LIKELY(p != NULL)) {
-            unpoison_object((VALUE)p, true);
 	    heap->freelist = p->as.free.next;
 	    return (VALUE)p;
 	}
@@ -1798,15 +1749,9 @@ rb_objspace_set_event_hook(const rb_event_flag_t event)
 }
 
 static void
-gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE data)
+gc_event_hook_body(rb_thread_t *th, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE 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;
+    EXEC_EVENT_HOOK(th, event, th->cfp->self, 0, 0, data);
 }
 
 #define gc_event_hook_available_p(objspace) ((objspace)->flags.has_hook)
@@ -1814,15 +1759,17 @@ gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb
 
 #define gc_event_hook(objspace, event, data) do { \
     if (UNLIKELY(gc_event_hook_needed_p(objspace, event))) { \
-	gc_event_hook_body(GET_EC(), (objspace), (event), (data)); \
+	gc_event_hook_body(GET_THREAD(), (objspace), (event), (data)); \
     } \
 } while (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)
 {
-    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    if (RGENGC_CHECK_MODE > 0) {
+	assert(BUILTIN_TYPE(obj) == T_NONE);
+	assert((flags & FL_WB_PROTECTED) == 0);
+    }
 
     /* OBJSETUP */
     RBASIC(obj)->flags = flags;
@@ -1832,10 +1779,10 @@ newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_prote
     RANY(obj)->as.values.v3 = v3;
 
 #if RGENGC_CHECK_MODE
-    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);
+    assert(RVALUE_MARKED(obj) == FALSE);
+    assert(RVALUE_MARKING(obj) == FALSE);
+    assert(RVALUE_OLD_P(obj) == FALSE);
+    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));
@@ -1868,8 +1815,8 @@ newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_prote
 #endif
 
 #if GC_DEBUG
-    RANY(obj)->file = rb_source_location_cstr(&RANY(obj)->line);
-    GC_ASSERT(!SPECIAL_CONST_P(obj)); /* check alignment */
+    RANY(obj)->file = rb_source_loc(&RANY(obj)->line);
+    assert(!SPECIAL_CONST_P(obj)); /* check alignment */
 #endif
 
     objspace->total_allocated_objects++;
@@ -1911,7 +1858,7 @@ newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objsp
 	}
 
 	if (ruby_gc_stressful) {
-	    if (!garbage_collect(objspace, GPR_FLAG_NEWOBJ)) {
+	    if (!garbage_collect(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ)) {
 		rb_memerror();
 	    }
 	}
@@ -1944,15 +1891,13 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protect
     rb_objspace_t *objspace = &rb_objspace;
     VALUE obj;
 
-    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);
-        for (i = 0; i < cnt; ++i) {
-            if (klass == RARRAY_AREF(stress_to_class, i)) rb_memerror();
-        }
+	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();
+	}
     }
 #endif
     if (!(during_gc ||
@@ -1962,8 +1907,6 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protect
 	return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
     }
     else {
-        RB_DEBUG_COUNTER_INC(obj_newobj_slowpath);
-
 	return wb_protected ?
 	  newobj_slowpath_wb_protected(klass, flags, v1, v2, v3, objspace) :
 	  newobj_slowpath_wb_unprotected(klass, flags, v1, v2, v3, objspace);
@@ -1973,14 +1916,14 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protect
 VALUE
 rb_wb_unprotected_newobj_of(VALUE klass, VALUE flags)
 {
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    if (RGENGC_CHECK_MODE > 0) 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)
 {
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    if (RGENGC_CHECK_MODE > 0) assert((flags & FL_WB_PROTECTED) == 0);
     return newobj_of(klass, flags, 0, 0, 0, TRUE);
 }
 
@@ -1998,9 +1941,13 @@ rb_newobj_of(VALUE klass, VALUE flags)
     return newobj_of(klass, flags & ~FL_WB_PROTECTED, 0, 0, 0, flags & FL_WB_PROTECTED);
 }
 
-#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)
+NODE*
+rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+{
+    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;
+}
 
 #undef rb_imemo_new
 
@@ -2011,37 +1958,12 @@ 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);
-}
-
-VALUE
-rb_imemo_tmpbuf_auto_free_pointer(void *buf)
-{
-    return rb_imemo_new(imemo_tmpbuf, (VALUE)buf, 0, 0, 0);
-}
-
-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);
-}
-
 #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", (void *)memo, imemo_type(memo), file, line);
+    fprintf(stderr, "memo %p (type: %d) @ %s:%d\n", memo, imemo_type(memo), file, line);
     return memo;
 }
 #endif
@@ -2177,8 +2099,6 @@ make_io_zombie(rb_objspace_t *objspace, VALUE obj)
 static int
 obj_free(rb_objspace_t *objspace, VALUE obj)
 {
-    RB_DEBUG_COUNTER_INC(obj_free);
-
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_FREEOBJ, obj);
 
     switch (BUILTIN_TYPE(obj)) {
@@ -2210,21 +2130,13 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-        if ((RANY(obj)->as.basic.flags & ROBJECT_EMBED) ||
-            RANY(obj)->as.object.as.heap.ivptr == NULL) {
-            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;
+	if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
+            RANY(obj)->as.object.as.heap.ivptr) {
+	    xfree(RANY(obj)->as.object.as.heap.ivptr);
+	}
+	break;
       case T_MODULE:
       case T_CLASS:
-        mjit_remove_class_serial(RCLASS_SERIAL(obj));
 	rb_id_table_free(RCLASS_M_TBL(obj));
 	if (RCLASS_IV_TBL(obj)) {
 	    st_free_table(RCLASS_IV_TBL(obj));
@@ -2249,59 +2161,21 @@ 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 USE_DEBUG_COUNTER
-        if (RHASH_SIZE(obj) >= 8) {
-            RB_DEBUG_COUNTER_INC(obj_hash_ge8);
-        }
-        else if (RHASH_SIZE(obj) >= 4) {
-            RB_DEBUG_COUNTER_INC(obj_hash_ge4);
-        }
-        else if (RHASH_SIZE(obj) >= 1) {
-            RB_DEBUG_COUNTER_INC(obj_hash_under4);
-        }
-        else {
-            RB_DEBUG_COUNTER_INC(obj_hash_empty);
-        }
-
-        if (RHASH_AR_TABLE_P(obj)) {
-            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)) {
-            ar_table *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);
-        }
+	if (RANY(obj)->as.hash.ntbl) {
+	    st_free_table(RANY(obj)->as.hash.ntbl);
+	}
 	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:
@@ -2325,21 +2199,15 @@ 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:
@@ -2349,14 +2217,11 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
             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;
@@ -2379,8 +2244,6 @@ obj_free(rb_objspace_t *objspace, VALUE 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:
@@ -2389,32 +2252,23 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
       case T_BIGNUM:
 	if (!(RBASIC(obj)->flags & BIGNUM_EMBED_FLAG) && BIGNUM_DIGITS(obj)) {
 	    xfree(BIGNUM_DIGITS(obj));
-            RB_DEBUG_COUNTER_INC(obj_bignum_ptr);
 	}
 	break;
 
       case T_NODE:
-	UNEXPECTED_NODE(obj_free);
-	break;
+	rb_gc_free_node(obj);
+	break;			/* no need to free iv_tbl */
 
       case T_STRUCT:
-        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);
+	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);
 	}
 	break;
 
       case T_SYMBOL:
 	{
             rb_gc_free_dsymbol(obj);
-            RB_DEBUG_COUNTER_INC(obj_symbol);
 	}
 	break;
 
@@ -2422,45 +2276,15 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	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));
+	    VM_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;
 	  default:
-            /* unreachable */
 	    break;
 	}
 	return 0;
@@ -2493,6 +2317,16 @@ 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();
 }
@@ -2617,18 +2451,13 @@ static int
 internal_object_p(VALUE obj)
 {
     RVALUE *p = (RVALUE *)obj;
-    void *ptr = __asan_region_is_poisoned(p, SIZEOF_VALUE);
-    bool used_p = p->as.basic.flags;
-    unpoison_object(obj, false);
 
-    if (used_p) {
+    if (p->as.basic.flags) {
 	switch (BUILTIN_TYPE(p)) {
-	  case T_NODE:
-	    UNEXPECTED_NODE(internal_object_p);
-	    break;
 	  case T_NONE:
 	  case T_IMEMO:
 	  case T_ICLASS:
+	  case T_NODE:
 	  case T_ZOMBIE:
 	    break;
 	  case T_CLASS:
@@ -2642,9 +2471,6 @@ internal_object_p(VALUE obj)
 	    return 0;
 	}
     }
-    if (ptr || ! used_p) {
-        poison_object(obj);
-    }
     return 1;
 }
 
@@ -2725,7 +2551,12 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
 {
     VALUE of;
 
-    of = (!rb_check_arity(argc, 0, 1) ? 0 : argv[0]);
+    if (argc == 0) {
+	of = 0;
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &of);
+    }
     RETURN_ENUMERATOR(os, 1, &of);
     return os_obj_of(of);
 }
@@ -2758,7 +2589,7 @@ rb_undefine_finalizer(VALUE obj)
 static void
 should_be_callable(VALUE block)
 {
-    if (!rb_obj_respond_to(block, idCall, TRUE)) {
+    if (!rb_obj_respond_to(block, rb_intern("call"), TRUE)) {
 	rb_raise(rb_eArgError, "wrong type argument %"PRIsVALUE" (should be callable)",
 		 rb_obj_class(block));
     }
@@ -2818,13 +2649,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++) {
-                VALUE recv = RARRAY_AREF(table, i);
-                if (rb_funcall(recv, idEq, 1, block)) {
-                    return recv;
+	    for (i = 0; i < len; i++, ptr++) {
+		if (rb_funcall(*ptr, idEq, 1, block)) {
+		    return *ptr;
 		}
 	    }
 	}
@@ -2877,29 +2708,26 @@ static void
 run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
 {
     long i;
-    enum ruby_tag_type state;
+    int status;
     volatile struct {
 	VALUE errinfo;
 	VALUE objid;
-	rb_control_frame_t *cfp;
 	long finished;
 	int safe;
     } saved;
-    rb_execution_context_t * volatile ec = GET_EC();
+    rb_thread_t *const th = GET_THREAD();
 #define RESTORE_FINALIZER() (\
-	ec->cfp = saved.cfp, \
 	rb_set_safe_level_force(saved.safe), \
 	rb_set_errinfo(saved.errinfo))
 
     saved.safe = rb_safe_level();
     saved.errinfo = rb_errinfo();
     saved.objid = nonspecial_obj_id(obj);
-    saved.cfp = ec->cfp;
     saved.finished = 0;
 
-    EC_PUSH_TAG(ec);
-    state = EC_EXEC_TAG();
-    if (state != TAG_NONE) {
+    TH_PUSH_TAG(th);
+    status = TH_EXEC_TAG();
+    if (status) {
 	++saved.finished;	/* skip failed finalizer */
     }
     for (i = saved.finished;
@@ -2907,7 +2735,7 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
 	 saved.finished = ++i) {
 	run_single_final(RARRAY_AREF(table, i), saved.objid);
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
 #undef RESTORE_FINALIZER
 }
 
@@ -2930,16 +2758,13 @@ static void
 finalize_list(rb_objspace_t *objspace, VALUE zombie)
 {
     while (zombie) {
-        VALUE next_zombie;
-        struct heap_page *page;
-        unpoison_object(zombie, false);
-        next_zombie = RZOMBIE(zombie)->next;
-        page = GET_HEAP_PAGE(zombie);
+	VALUE next_zombie = RZOMBIE(zombie)->next;
+	struct heap_page *page = GET_HEAP_PAGE(zombie);
 
 	run_final(objspace, zombie);
 
 	RZOMBIE(zombie)->basic.flags = 0;
-        if (LIKELY(heap_pages_final_slots)) heap_pages_final_slots--;
+	heap_pages_final_slots--;
 	page->final_slots--;
 	page->free_slots++;
 	heap_page_add_freeobj(objspace, GET_HEAP_PAGE(zombie), zombie);
@@ -3023,7 +2848,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
 
     /* run finalizers */
     finalize_deferred(objspace);
-    GC_ASSERT(heap_pages_deferred_final == 0);
+    assert(heap_pages_deferred_final == 0);
 
     gc_rest(objspace);
     /* prohibit incremental GC */
@@ -3053,7 +2878,6 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
     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) {
-            unpoison_object((VALUE)p, false);
 	    switch (BUILTIN_TYPE(p)) {
 	      case T_DATA:
 		if (!DATA_PTR(p) || !RANY(p)->as.data.dfree) break;
@@ -3064,7 +2888,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
 		if (RTYPEDDATA_P(p)) {
 		    RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree;
 		}
-		if (RANY(p)->as.data.dfree == RUBY_DEFAULT_FREE) {
+		if (RANY(p)->as.data.dfree == (RUBY_DATA_FUNC)-1) {
 		    xfree(DATA_PTR(p));
 		}
 		else if (RANY(p)->as.data.dfree) {
@@ -3077,7 +2901,6 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
 		}
 		break;
 	    }
-            poison_object((VALUE)p);
 	    p++;
 	}
     }
@@ -3358,13 +3181,9 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	size += rb_ary_memsize(obj);
 	break;
       case T_HASH:
-        if (RHASH_AR_TABLE_P(obj)) {
-            size += sizeof(ar_table);
+	if (RHASH(obj)->ntbl) {
+	    size += st_memsize(RHASH(obj)->ntbl);
 	}
-        else {
-            VM_ASSERT(RHASH_ST_TABLE(obj) != NULL);
-            size += st_memsize(RHASH_ST_TABLE(obj));
-        }
 	break;
       case T_REGEXP:
 	if (RREGEXP_PTR(obj)) {
@@ -3390,9 +3209,6 @@ obj_memsize_of(VALUE obj, int use_all_types)
       case T_RATIONAL:
       case T_COMPLEX:
       case T_IMEMO:
-	if (imemo_type_p(obj, imemo_tmpbuf)) {
-	    size += RANY(obj)->as.imemo.alloc.cnt * sizeof(VALUE);
-	}
 	break;
 
       case T_FLOAT:
@@ -3406,7 +3222,7 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	break;
 
       case T_NODE:
-	UNEXPECTED_NODE(obj_memsize_of);
+	if (use_all_types) size += rb_node_memsize(obj);
 	break;
 
       case T_STRUCT:
@@ -3485,10 +3301,9 @@ count_objects(int argc, VALUE *argv, VALUE os)
     size_t freed = 0;
     size_t total = 0;
     size_t i;
-    VALUE hash = Qnil;
+    VALUE hash;
 
-    if (rb_check_arity(argc, 0, 1) == 1) {
-        hash = argv[0];
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
         if (!RB_TYPE_P(hash, T_HASH))
             rb_raise(rb_eTypeError, "non-hash given");
     }
@@ -3517,7 +3332,7 @@ count_objects(int argc, VALUE *argv, VALUE os)
         hash = rb_hash_new();
     }
     else if (!RHASH_EMPTY_P(hash)) {
-        rb_hash_stlike_foreach(hash, set_zero, hash);
+        st_foreach(RHASH_TBL_RAW(hash), set_zero, hash);
     }
     rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
     rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
@@ -3549,6 +3364,7 @@ count_objects(int argc, VALUE *argv, VALUE os)
 	    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
@@ -3622,15 +3438,14 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 	if (bitset) {
 	    p = offset  + i * BITS_BITLENGTH;
 	    do {
-                unpoison_object((VALUE)p, false);
 		if (bitset & 1) {
 		    switch (BUILTIN_TYPE(p)) {
 		      default: { /* majority case */
-			  gc_report(2, objspace, "page_sweep: free %p\n", (void *)p);
+			  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: %p - old while minor GC.", (void *)p);
-			      if (rgengc_remembered(objspace, (VALUE)p)) rb_bug("page_sweep: %p - remembered.", (void *)p);
+			      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)) {
@@ -3641,7 +3456,6 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 			      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++;
-                              poison_object((VALUE)p);
 			  }
 			  break;
 		      }
@@ -3722,9 +3536,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:     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;
+      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;
     }
 #endif
     if (0) fprintf(stderr, "gc_mode_transition: %s->%s\n", gc_mode_name(gc_mode(objspace)), gc_mode_name(mode));
@@ -3734,7 +3548,7 @@ 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->sweeping_page = list_top(&heap->pages, struct heap_page, page_node);
+    heap->sweep_pages = heap->pages;
     heap->free_pages = NULL;
 #if GC_ENABLE_INCREMENTAL_MARK
     heap->pooled_pages = NULL;
@@ -3764,14 +3578,14 @@ gc_sweep_start(rb_objspace_t *objspace)
 static void
 gc_sweep_finish(rb_objspace_t *objspace)
 {
-    gc_report(1, objspace, "gc_sweep_finish\n");
+    gc_report(1, objspace, "gc_sweep_finish");
 
     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_set(objspace, heap_tomb->total_pages);
+	heap_allocatable_pages = heap_tomb->total_pages;
     }
 
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_SWEEP, 0);
@@ -3785,7 +3599,7 @@ gc_sweep_finish(rb_objspace_t *objspace)
 static int
 gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    struct heap_page *sweep_page = heap->sweeping_page;
+    struct heap_page *sweep_page = heap->sweep_pages;
     int unlink_limit = 3;
 #if GC_ENABLE_INCREMENTAL_MARK
     int need_pool = will_be_incremental_marking(objspace) ? TRUE : FALSE;
@@ -3801,9 +3615,9 @@ gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
     gc_prof_sweep_timer_start(objspace);
 #endif
 
-    do {
+    while (sweep_page) {
+	struct heap_page *next_sweep_page = heap->sweep_pages = sweep_page->next;
 	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 &&
@@ -3833,9 +3647,11 @@ gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
 	else {
 	    sweep_page->free_next = NULL;
 	}
-    } while ((sweep_page = heap->sweeping_page));
 
-    if (!heap->sweeping_page) {
+	sweep_page = next_sweep_page;
+    }
+
+    if (heap->sweep_pages == NULL) {
 	gc_sweep_finish(objspace);
     }
 
@@ -3856,11 +3672,11 @@ 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)
 {
-    GC_ASSERT(dont_gc == FALSE);
-    if (!GC_ENABLE_LAZY_SWEEP) return;
+    if (RGENGC_CHECK_MODE) assert(dont_gc == FALSE);
 
     gc_enter(objspace, "sweep_continue");
 #if USE_RGENGC
@@ -3871,6 +3687,7 @@ gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap)
     gc_sweep_step(objspace, heap);
     gc_exit(objspace, "sweep_continue");
 }
+#endif
 
 static void
 gc_sweep(rb_objspace_t *objspace)
@@ -3890,12 +3707,13 @@ gc_sweep(rb_objspace_t *objspace)
 #endif
     }
     else {
-	struct heap_page *page = NULL;
+	struct heap_page *page;
 	gc_sweep_start(objspace);
-
-        list_for_each(&heap_eden->pages, page, page_node) {
-            page->flags.before_sweep = TRUE;
-        }
+	page = heap_eden->sweep_pages;
+	while (page) {
+	    page->flags.before_sweep = TRUE;
+	    page = page->next;
+	}
 	gc_sweep_step(objspace, heap_eden);
     }
 
@@ -3962,7 +3780,7 @@ push_mark_stack_chunk(mark_stack_t *stack)
 {
     stack_chunk_t *next;
 
-    GC_ASSERT(stack->index == stack->limit);
+    if (RGENGC_CHECK_MODE) assert(stack->index == stack->limit);
 
     if (stack->cache_size > 0) {
         next = stack->cache;
@@ -3985,7 +3803,7 @@ pop_mark_stack_chunk(mark_stack_t *stack)
     stack_chunk_t *prev;
 
     prev = stack->chunk->next;
-    GC_ASSERT(stack->index == 0);
+    if (RGENGC_CHECK_MODE) assert(stack->index == 0);
     add_stack_chunk_cache(stack, stack->chunk);
     stack->chunk = prev;
     stack->index = stack->limit;
@@ -4076,19 +3894,14 @@ init_mark_stack(mark_stack_t *stack)
 /* Marking */
 
 #ifdef __ia64
-#define SET_STACK_END (SET_MACHINE_STACK_END(&ec->machine.stack_end), ec->machine.register_stack_end = rb_ia64_bsp())
+#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(&ec->machine.stack_end)
+#define SET_STACK_END SET_MACHINE_STACK_END(&th->machine.stack_end)
 #endif
 
-#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
+#define STACK_START (th->machine.stack_start)
+#define STACK_END (th->machine.stack_end)
+#define STACK_LEVEL_MAX (th->machine.stack_maxsize/sizeof(VALUE))
 
 #if STACK_GROW_DIRECTION < 0
 # define STACK_LENGTH  (size_t)(STACK_START - STACK_END)
@@ -4114,54 +3927,43 @@ ruby_get_stack_grow_direction(volatile VALUE *addr)
 size_t
 ruby_stack_length(VALUE **p)
 {
-    rb_execution_context_t *ec = GET_EC();
+    rb_thread_t *th = GET_THREAD();
     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(rb_execution_context_t *ec, int water_mark)
+stack_check(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() - ec->machine.register_stack_start >
-	    ec->machine.register_stack_maxsize/sizeof(VALUE) - water_mark;
+        ret = (VALUE*)rb_ia64_bsp() - th->machine.register_stack_start >
+              th->machine.register_stack_maxsize/sizeof(VALUE) - water_mark;
     }
 #endif
     return ret;
 }
-#else
-#define stack_check(ec, water_mark) FALSE
 #endif
 
-#define STACKFRAME_FOR_CALL_CFUNC 838
-
-MJIT_FUNC_EXPORTED int
-rb_ec_stack_check(rb_execution_context_t *ec)
-{
-    return stack_check(ec, STACKFRAME_FOR_CALL_CFUNC);
-}
+#define STACKFRAME_FOR_CALL_CFUNC 512
 
 int
 ruby_stack_check(void)
 {
-    return stack_check(GET_EC(), STACKFRAME_FOR_CALL_CFUNC);
+#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
+    return 0;
+#else
+    return stack_check(STACKFRAME_FOR_CALL_CFUNC);
+#endif
 }
 
-ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void mark_locations_array(rb_objspace_t *objspace, register const VALUE *x, register long n));
+ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
 static void
 mark_locations_array(rb_objspace_t *objspace, register const VALUE *x, register long n)
 {
@@ -4253,23 +4055,7 @@ mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
 }
 
 static void
-mark_hash(rb_objspace_t *objspace, VALUE hash)
-{
-    rb_hash_stlike_foreach(hash, mark_keyvalue, (st_data_t)objspace);
-
-    if (RHASH_AR_TABLE_P(hash)) {
-        if (objspace->mark_func_data == NULL && 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_st(rb_objspace_t *objspace, st_table *tbl)
+mark_hash(rb_objspace_t *objspace, st_table *tbl)
 {
     if (!tbl) return;
     st_foreach(tbl, mark_keyvalue, (st_data_t)objspace);
@@ -4278,7 +4064,7 @@ mark_st(rb_objspace_t *objspace, st_table *tbl)
 void
 rb_mark_hash(st_table *tbl)
 {
-    mark_st(&rb_objspace, tbl);
+    mark_hash(&rb_objspace, tbl);
 }
 
 static void
@@ -4300,8 +4086,7 @@ 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.bmethod.proc);
-            if (def->body.bmethod.hooks) rb_hook_list_mark(def->body.bmethod.hooks);
+	    gc_mark(objspace, def->body.proc);
 	    break;
 	  case VM_METHOD_TYPE_ALIAS:
 	    gc_mark(objspace, (VALUE)def->body.alias.original_me);
@@ -4366,11 +4151,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, const rb_execution_context_t *ec,
+static void mark_stack_locations(rb_objspace_t *objspace, rb_thread_t *th,
 				 const VALUE *stack_start, const VALUE *stack_end);
 
 static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
+mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
 {
     union {
 	rb_jmp_buf j;
@@ -4390,29 +4175,29 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec
 
     mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
 
-    mark_stack_locations(objspace, ec, stack_start, stack_end);
+    mark_stack_locations(objspace, th, stack_start, stack_end);
 }
 
 void
-rb_gc_mark_machine_stack(const rb_execution_context_t *ec)
+rb_gc_mark_machine_stack(rb_thread_t *th)
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    rb_objspace_t *objspace = rb_objspace_of(th->vm);
     VALUE *stack_start, *stack_end;
 
     GET_STACK_BOUNDS(stack_start, stack_end, 0);
-    mark_stack_locations(objspace, ec, stack_start, stack_end);
+    mark_stack_locations(objspace, th, stack_start, stack_end);
 }
 
 static void
-mark_stack_locations(rb_objspace_t *objspace, const rb_execution_context_t *ec,
+mark_stack_locations(rb_objspace_t *objspace, rb_thread_t *th,
 		     const VALUE *stack_start, const VALUE *stack_end)
 {
 
     gc_mark_locations(objspace, stack_start, stack_end);
 #ifdef __ia64
     gc_mark_locations(objspace,
-		      ec->machine.register_stack_start,
-		      ec->machine.register_stack_end);
+		      th->machine.register_stack_start,
+		      th->machine.register_stack_end);
 #endif
 #if defined(__mc68000__)
     gc_mark_locations(objspace,
@@ -4432,17 +4217,10 @@ 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;
-        void *ptr = __asan_region_is_poisoned((void *)obj, SIZEOF_VALUE);
-
-        unpoison_object(obj, false);
-        type = BUILTIN_TYPE(obj);
+	int type = BUILTIN_TYPE(obj);
 	if (type != T_ZOMBIE && type != T_NONE) {
 	    gc_mark_ptr(objspace, obj);
 	}
-        if (ptr) {
-            poison_object(obj);
-        }
     }
 }
 
@@ -4521,7 +4299,7 @@ rgengc_check_relation(rb_objspace_t *objspace, VALUE obj)
 	}
     }
 
-    GC_ASSERT(old_parent == objspace->rgengc.parent_object);
+    if (RGENGC_CHECK_MODE) assert(old_parent == objspace->rgengc.parent_object);
 #endif
 }
 
@@ -4548,7 +4326,10 @@ gc_aging(rb_objspace_t *objspace, VALUE obj)
 #if USE_RGENGC
     struct heap_page *page = GET_HEAP_PAGE(obj);
 
-    GC_ASSERT(RVALUE_MARKING(obj) == FALSE);
+#if RGENGC_CHECK_MODE
+    assert(RVALUE_MARKING(obj) == FALSE);
+#endif
+
     check_rvalue_consistency(obj);
 
     if (!RVALUE_PAGE_WB_UNPROTECTED(page, obj)) {
@@ -4557,7 +4338,7 @@ gc_aging(rb_objspace_t *objspace, VALUE obj)
 	    RVALUE_AGE_INC(objspace, obj);
 	}
 	else if (is_full_marking(objspace)) {
-	    GC_ASSERT(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
+	    if (RGENGC_CHECK_MODE) assert(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
 	    RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, page, obj);
 	}
     }
@@ -4575,7 +4356,6 @@ gc_mark_ptr(rb_objspace_t *objspace, VALUE obj)
     if (LIKELY(objspace->mark_func_data == NULL)) {
 	rgengc_check_relation(objspace, obj);
 	if (!gc_mark_set(objspace, obj)) return; /* already marked */
-        if (RB_TYPE_P(obj, T_NONE)) rb_bug("try to mark T_NONE object"); /* check here will help debugging */
 	gc_aging(objspace, obj);
 	gc_grey(objspace, obj);
     }
@@ -4627,7 +4407,7 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
       case imemo_env:
 	{
 	    const rb_env_t *env = (const rb_env_t *)obj;
-	    GC_ASSERT(VM_ENV_ESCAPED_P(env->ep));
+	    VM_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));
@@ -4662,20 +4442,6 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
       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;
 #if VM_CHECK_MODE > 0
       default:
 	VM_UNREACHABLE(gc_mark_imemo);
@@ -4700,8 +4466,9 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 	break;
 
       case T_NODE:
-	UNEXPECTED_NODE(rb_gc_mark);
-	break;
+	obj = rb_gc_mark_node(&any->as.node);
+	if (obj) gc_mark(objspace, obj);
+	return;			/* no need to mark class. */
 
       case T_IMEMO:
 	gc_mark_imemo(objspace, obj);
@@ -4730,28 +4497,21 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 	break;
 
       case T_ARRAY:
-        if (FL_TEST(obj, ELTS_SHARED)) {
-            VALUE root = any->as.array.as.heap.aux.shared;
-            gc_mark(objspace, root);
+	if (FL_TEST(obj, ELTS_SHARED)) {
+	    gc_mark(objspace, any->as.array.as.heap.aux.shared);
 	}
 	else {
 	    long i, len = RARRAY_LEN(obj);
-            const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(obj);
+	    const VALUE *ptr = RARRAY_CONST_PTR(obj);
 	    for (i=0; i < len; i++) {
-                gc_mark(objspace, ptr[i]);
+		gc_mark(objspace, *ptr++);
 	    }
-
-            if (objspace->mark_func_data == NULL) {
-                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, obj);
+	mark_hash(objspace, any->as.hash.ntbl);
+	gc_mark(objspace, any->as.hash.ifnone);
 	break;
 
       case T_STRING:
@@ -4774,18 +4534,10 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 
       case T_OBJECT:
         {
-            const VALUE * const ptr = ROBJECT_IVPTR(obj);
-
-            if (ptr) {
-                uint32_t i, len = ROBJECT_NUMIV(obj);
-                for (i  = 0; i < len; i++) {
-                    gc_mark(objspace, ptr[i]);
-                }
-
-                if (objspace->mark_func_data == NULL &&
-                    ROBJ_TRANSIENT_P(obj)) {
-                    rb_transient_heap_mark(obj, ptr);
-                }
+            uint32_t i, len = ROBJECT_NUMIV(obj);
+	    VALUE *ptr = ROBJECT_IVPTR(obj);
+            for (i  = 0; i < len; i++) {
+		gc_mark(objspace, *ptr++);
             }
         }
 	break;
@@ -4829,18 +4581,12 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 
       case T_STRUCT:
 	{
-            long i;
-            const long len = RSTRUCT_LEN(obj);
-            const VALUE * const ptr = RSTRUCT_CONST_PTR(obj);
+	    long len = RSTRUCT_LEN(obj);
+	    const VALUE *ptr = RSTRUCT_CONST_PTR(obj);
 
-            for (i=0; i<len; i++) {
-                gc_mark(objspace, ptr[i]);
-            }
-
-            if (objspace->mark_func_data == NULL &&
-                RSTRUCT_TRANSIENT_P(obj)) {
-                rb_transient_heap_mark(obj, ptr);
-            }
+	    while (len--) {
+		gc_mark(objspace, *ptr++);
+	    }
 	}
 	break;
 
@@ -4851,7 +4597,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE 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), (void *)any,
+	       BUILTIN_TYPE(obj), any,
 	       is_pointer_to_heap(objspace, any) ? "corrupted object" : "non object");
     }
 }
@@ -4946,8 +4692,7 @@ static void
 gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
 {
     struct gc_list *list;
-    rb_execution_context_t *ec = GET_EC();
-    rb_vm_t *vm = rb_ec_vm_ptr(ec);
+    rb_thread_t *th = GET_THREAD();
 
 #if PRINT_ROOT_TICKS
     tick_t start_tick = tick();
@@ -4987,14 +4732,17 @@ gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
 
     MARK_CHECKPOINT("vm");
     SET_STACK_END;
-    rb_vm_mark(vm);
-    if (vm->self) gc_mark(objspace, vm->self);
+    rb_vm_mark(th->vm);
+    if (th->vm->self) gc_mark(objspace, th->vm->self);
 
     MARK_CHECKPOINT("finalizers");
     mark_tbl(objspace, finalizer_table);
 
     MARK_CHECKPOINT("machine_context");
-    mark_current_machine_context(objspace, ec);
+    mark_current_machine_context(objspace, th);
+
+    MARK_CHECKPOINT("encodings");
+    rb_gc_mark_encodings();
 
     /* mark protected global variables */
     MARK_CHECKPOINT("global_list");
@@ -5072,7 +4820,7 @@ reflist_dump(struct reflist *refs)
 }
 
 static int
-reflist_referred_from_machine_context(struct reflist *refs)
+reflist_refered_from_machine_context(struct reflist *refs)
 {
     int i;
     for (i=0; i<refs->pos; i++) {
@@ -5215,7 +4963,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_referred_from_machine_context(refs)) {
+	if (reflist_refered_from_machine_context(refs)) {
 	    fprintf(stderr, " (marked from machine stack).\n");
 	    /* marked from machine context can be false positive */
 	}
@@ -5280,7 +5028,7 @@ 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) GC_ASSERT(RVALUE_OLD_P(parent));
+    if (RGENGC_CHECK_MODE) assert(RVALUE_OLD_P(parent));
 
     if (!RVALUE_OLD_P(child)) {
 	if (!RVALUE_REMEMBERED(parent) &&
@@ -5350,7 +5098,7 @@ verify_internal_consistency_i(void *page_start, void *page_end, size_t stride, v
 	}
 	else {
 	    if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
-		GC_ASSERT(RBASIC(obj)->flags == T_ZOMBIE);
+		if (RGENGC_CHECK_MODE) assert(RBASIC(obj)->flags == T_ZOMBIE);
 		data->zombie_object_count++;
 	    }
 	}
@@ -5366,20 +5114,18 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
     int i;
     unsigned int has_remembered_shady = FALSE;
     unsigned int has_remembered_old = FALSE;
-    int remembered_old_objects = 0;
+    int rememberd_old_objects = 0;
     int free_objects = 0;
     int zombie_objects = 0;
 
     for (i=0; i<page->total_slots; i++) {
-	VALUE val = (VALUE)&page->start[i];
-	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)) {
+	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)) {
 	    has_remembered_old = TRUE;
-	    remembered_old_objects++;
+	    rememberd_old_objects++;
 	}
     }
 
@@ -5387,58 +5133,58 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
 	page->flags.has_remembered_objects == FALSE && has_remembered_old == TRUE) {
 
 	for (i=0; i<page->total_slots; i++) {
-	    VALUE val = (VALUE)&page->start[i];
-	    if (RVALUE_PAGE_MARKING(page, val)) {
-		fprintf(stderr, "marking -> %s\n", obj_info(val));
+	    VALUE obj = (VALUE)&page->start[i];
+	    if (RVALUE_PAGE_MARKING(page, obj)) {
+		fprintf(stderr, "marking -> %s\n", obj_info(obj));
 	    }
 	}
 	rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s",
-	       (void *)page, remembered_old_objects, obj ? obj_info(obj) : "");
+	       page, rememberd_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",
-	       (void *)page, obj ? obj_info(obj) : "");
+	       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", (void *)page, (int)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);
 	}
     }
     if (page->final_slots != zombie_objects) {
-	rb_bug("page %p's final_slots should be %d, but %d\n", (void *)page, (int)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);
     }
 
-    return remembered_old_objects;
+    return rememberd_old_objects;
 #else
     return 0;
 #endif
 }
 
 static int
-gc_verify_heap_pages_(rb_objspace_t *objspace, struct list_head *head)
+gc_verify_heap_pages_(rb_objspace_t *objspace, struct heap_page *page)
 {
-    int remembered_old_objects = 0;
-    struct heap_page *page = 0;
+    int rememberd_old_objects = 0;
 
-    list_for_each(head, page, page_node) {
+    while (page) {
 	if (page->flags.has_remembered_objects == FALSE) {
-	    remembered_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
+	    rememberd_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
 	}
+	page = page->next;
     }
 
-    return remembered_old_objects;
+    return rememberd_old_objects;
 }
 
 static int
 gc_verify_heap_pages(rb_objspace_t *objspace)
 {
-    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;
+    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;
 }
 
 /*
@@ -5485,17 +5231,17 @@ gc_verify_internal_consistency(VALUE dummy)
 	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 number: expect %"PRIuSIZE", but %"PRIuSIZE".", objspace_live_slots(objspace), data.live_object_count);
+	    rb_bug("inconsistent live slot nubmer: 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 number: expect %"PRIuSIZE", but %"PRIuSIZE".", 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);
 	}
 	if (objspace->rgengc.uncollectible_wb_unprotected_objects != data.remembered_shady_count) {
-	    rb_bug("inconsistent old slot number: expect %"PRIuSIZE", but %"PRIuSIZE".", 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);
 	}
     }
 #endif
@@ -5535,13 +5281,6 @@ rb_gc_verify_internal_consistency(void)
     gc_verify_internal_consistency(Qnil);
 }
 
-static VALUE
-gc_verify_transient_heap_internal_consistency(VALUE dmy)
-{
-    rb_transient_heap_verify();
-    return Qnil;
-}
-
 /* marks */
 
 static void
@@ -5585,9 +5324,9 @@ gc_marks_start(rb_objspace_t *objspace, int full_mark)
 static void
 gc_marks_wb_unprotected_objects(rb_objspace_t *objspace)
 {
-    struct heap_page *page = 0;
+    struct heap_page *page = heap_eden->pages;
 
-    list_for_each(&heap_eden->pages, page, page_node) {
+    while (page) {
 	bits_t *mark_bits = page->mark_bits;
 	bits_t *wbun_bits = page->wb_unprotected_bits;
 	RVALUE *p = page->start;
@@ -5603,8 +5342,10 @@ 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));
-			GC_ASSERT(RVALUE_WB_UNPROTECTED((VALUE)p));
-			GC_ASSERT(RVALUE_MARKED((VALUE)p));
+			if (RGENGC_CHECK_MODE > 0) {
+			    assert(RVALUE_WB_UNPROTECTED((VALUE)p));
+			    assert(RVALUE_MARKED((VALUE)p));
+			}
 			gc_mark_children(objspace, (VALUE)p);
 		    }
 		    p++;
@@ -5612,6 +5353,8 @@ gc_marks_wb_unprotected_objects(rb_objspace_t *objspace)
 		} while (bits);
 	    }
 	}
+
+	page = page->next;
     }
 
     gc_mark_stacked_objects_all(objspace);
@@ -5693,7 +5436,9 @@ gc_marks_finish(rb_objspace_t *objspace)
 	size_t min_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_min_ratio);
 	int full_marking = is_full_marking(objspace);
 
-	GC_ASSERT(heap->total_slots >= objspace->marked_slots);
+#if RGENGC_CHECK_MODE
+	assert(heap->total_slots >= objspace->marked_slots);
+#endif
 
 	/* setup free-able page counts */
 	if (max_free_slots < gc_params.heap_init_slots) max_free_slots = gc_params.heap_init_slots;
@@ -5758,18 +5503,16 @@ gc_marks_finish(rb_objspace_t *objspace)
 #endif
     }
 
-    rb_transient_heap_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)
 {
-#if GC_ENABLE_INCREMENTAL_MARK
-    GC_ASSERT(is_marking(objspace));
+    if (RGENGC_CHECK_MODE) assert(is_marking(objspace));
 
     if (gc_mark_stacked_objects_incremental(objspace, slots)) {
 	if (gc_marks_finish(objspace)) {
@@ -5778,8 +5521,8 @@ gc_marks_step(rb_objspace_t *objspace, int slots)
 	}
     }
     if (0) fprintf(stderr, "objspace->marked_slots: %d\n", (int)objspace->marked_slots);
-#endif
 }
+#endif
 
 static void
 gc_marks_rest(rb_objspace_t *objspace)
@@ -5804,19 +5547,19 @@ 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)
 {
-    GC_ASSERT(dont_gc == FALSE);
-#if GC_ENABLE_INCREMENTAL_MARK
+    int slots = 0;
+    const char *from;
+
+    if (RGENGC_CHECK_MODE) assert(dont_gc == FALSE);
 
     gc_enter(objspace, "marks_continue");
 
     PUSH_MARK_FUNC_DATA(NULL);
     {
-        int slots = 0;
-        const char *from;
-
 	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);
@@ -5841,8 +5584,8 @@ gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap)
     POP_MARK_FUNC_DATA();
 
     gc_exit(objspace, "marks_continue");
-#endif
 }
+#endif
 
 static void
 gc_marks(rb_objspace_t *objspace, int full_mark)
@@ -5925,7 +5668,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];
 
-    GC_ASSERT(!is_incremental_marking(objspace));
+    if (RGENGC_CHECK_MODE) assert(!is_incremental_marking(objspace));
 
     if (MARKED_IN_BITMAP(bits, obj)) {
 	return FALSE;
@@ -5983,13 +5726,13 @@ static void
 rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 {
     size_t j;
-    struct heap_page *page = 0;
+    struct heap_page *page = heap->pages;
 #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");
 
-    list_for_each(&heap->pages, page, page_node) {
+    while (page) {
 	if (page->flags.has_remembered_objects | page->flags.has_uncollectible_shady_objects) {
 	    RVALUE *p = page->start;
 	    RVALUE *offset = p - NUM_IN_PAGE(p);
@@ -6018,8 +5761,11 @@ 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));
-			    GC_ASSERT(RVALUE_UNCOLLECTIBLE(obj));
-			    GC_ASSERT(RVALUE_OLD_P(obj) || RVALUE_WB_UNPROTECTED(obj));
+
+			    if (RGENGC_CHECK_MODE) {
+				assert(RVALUE_UNCOLLECTIBLE(obj));
+				assert(RVALUE_OLD_P(obj) || RVALUE_WB_UNPROTECTED(obj));
+			    }
 
 			    gc_mark_children(objspace, obj);
 			}
@@ -6034,6 +5780,8 @@ rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 	    skip++;
 	}
 #endif
+
+	page = page->next;
     }
 
 #if PROFILE_REMEMBERSET_MARK
@@ -6045,14 +5793,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 = 0;
+    struct heap_page *page = heap->pages;
 
-    list_for_each(&heap->pages, page, page_node) {
+    while (page) {
 	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);
 	page->flags.has_uncollectible_shady_objects = FALSE;
 	page->flags.has_remembered_objects = FALSE;
+	page = page->next;
     }
 }
 
@@ -6109,18 +5858,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] %p -> %s\n", (void *)a, obj_info(b));
+    gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %s -> %s\n", obj_info(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] %p -> %s\n", (void *)a, obj_info(b));
+		gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %s -> %s\n", obj_info(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] %p -> %s\n", (void *)a, obj_info(b));
+		gc_report(1, objspace, "gc_writebarrier_incremental: [GN] %s -> %s\n", obj_info(a), obj_info(b));
 		RVALUE_AGE_SET_OLD(objspace, b);
 
 		if (RVALUE_BLACK_P(b)) {
@@ -6128,7 +5877,7 @@ gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace)
 		}
 	    }
 	    else {
-		gc_report(1, objspace, "gc_writebarrier_incremental: [LL] %p -> %s\n", (void *)a, obj_info(b));
+		gc_report(1, objspace, "gc_writebarrier_incremental: [LL] %s -> %s\n", obj_info(a), obj_info(b));
 		gc_remember_unprotected(objspace, b);
 	    }
 	}
@@ -6188,7 +5937,6 @@ 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);
     }
 }
@@ -6196,7 +5944,7 @@ rb_gc_writebarrier_unprotect(VALUE obj)
 /*
  * remember `obj' if needed.
  */
-MJIT_FUNC_EXPORTED void
+void
 rb_gc_writebarrier_remember(VALUE obj)
 {
     rb_objspace_t *objspace = &rb_objspace;
@@ -6251,8 +5999,9 @@ rb_gc_unprotect_logging(void *objptr, const char *filename, int line)
 	    cnt++;
 	}
 	else {
-	    ptr = (strdup)(buff);
+	    ptr = (char *)malloc(strlen(buff) + 1);
 	    if (!ptr) rb_memerror();
+	    strcpy(ptr, buff);
 	}
 	st_insert(rgengc_unprotect_logging_table, (st_data_t)ptr, cnt);
     }
@@ -6385,7 +6134,7 @@ rb_gc_force_recycle(VALUE obj)
 void
 rb_gc_register_mark_object(VALUE obj)
 {
-    VALUE ary_ary = GET_VM()->mark_object_ary;
+    VALUE ary_ary = GET_THREAD()->vm->mark_object_ary;
     VALUE ary = rb_ary_last(0, 0, ary_ary);
 
     if (ary == Qnil || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) {
@@ -6482,7 +6231,8 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 
 	if (inc > malloc_limit) {
 	    malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor);
-	    if (malloc_limit > gc_params.malloc_limit_max) {
+	    if (gc_params.malloc_limit_max > 0 && /* ignore max-check if 0 */
+		malloc_limit > gc_params.malloc_limit_max) {
 		malloc_limit = gc_params.malloc_limit_max;
 	    }
 	}
@@ -6541,7 +6291,7 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 }
 
 static int
-garbage_collect(rb_objspace_t *objspace, int reason)
+garbage_collect(rb_objspace_t *objspace, int full_mark, int immediate_mark, int immediate_sweep, int reason)
 {
 #if GC_PROFILE_MORE_DETAIL
     objspace->profile.prepare_time = getrusage_time();
@@ -6553,27 +6303,26 @@ garbage_collect(rb_objspace_t *objspace, int reason)
     objspace->profile.prepare_time = getrusage_time() - objspace->profile.prepare_time;
 #endif
 
-    return gc_start(objspace, reason);
+    return gc_start(objspace, full_mark, immediate_mark, immediate_sweep, reason);
 }
 
 static int
-gc_start(rb_objspace_t *objspace, int reason)
+gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, const unsigned int immediate_sweep, int reason)
 {
-    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);
+    int do_full_mark = full_mark;
+    objspace->flags.immediate_sweep = immediate_sweep;
 
     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));
+    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(Qnil);
 #endif
+    }
 
     gc_enter(objspace, "gc_start");
 
@@ -6620,41 +6369,19 @@ gc_start(rb_objspace_t *objspace, int reason)
 
     if (objspace->flags.immediate_sweep) reason |= GPR_FLAG_IMMEDIATE_SWEEP;
 
-    gc_report(1, objspace, "gc_start(reason: %d) => %u, %d, %d\n",
-	      reason,
+    gc_report(1, objspace, "gc_start(%d, %d, %d, reason: %d) => %d, %d, %d\n",
+	      full_mark, immediate_mark, immediate_sweep, 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? */);
-    GC_ASSERT(during_gc);
+    if (RGENGC_CHECK_MODE) assert(during_gc);
 
     gc_prof_timer_start(objspace);
     {
@@ -6692,6 +6419,9 @@ gc_rest(rb_objspace_t *objspace)
 struct objspace_and_reason {
     rb_objspace_t *objspace;
     int reason;
+    int full_mark;
+    int immediate_mark;
+    int immediate_sweep;
 };
 
 static void
@@ -6775,13 +6505,11 @@ gc_record(rb_objspace_t *objspace, int direction, const char *event)
 static inline void
 gc_enter(rb_objspace_t *objspace, const char *event)
 {
-    GC_ASSERT(during_gc == 0);
+    if (RGENGC_CHECK_MODE) assert(during_gc == 0);
     if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(Qnil);
 
-    mjit_gc_start_hook();
-
     during_gc = TRUE;
-    gc_report(1, objspace, "gc_enter: %s [%s]\n", event, gc_current_status(objspace));
+    gc_report(1, objspace, "gc_entr: %s [%s]\n", event, gc_current_status(objspace));
     gc_record(objspace, 0, event);
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_ENTER, 0); /* TODO: which parameter should be passed? */
 }
@@ -6789,35 +6517,36 @@ gc_enter(rb_objspace_t *objspace, const char *event)
 static inline void
 gc_exit(rb_objspace_t *objspace, const char *event)
 {
-    GC_ASSERT(during_gc != 0);
+    if (RGENGC_CHECK_MODE) 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));
     during_gc = FALSE;
-
-    mjit_gc_finish_hook();
 }
 
 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->reason);
+    return (void *)(VALUE)garbage_collect(oar->objspace, oar->full_mark, oar->immediate_mark, oar->immediate_sweep, oar->reason);
 }
 
 static int
-garbage_collect_with_gvl(rb_objspace_t *objspace, int reason)
+garbage_collect_with_gvl(rb_objspace_t *objspace, int full_mark, int immediate_mark, int immediate_sweep, int reason)
 {
     if (dont_gc) return TRUE;
     if (ruby_thread_has_gvl_p()) {
-	return garbage_collect(objspace, reason);
+	return garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, 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 {
@@ -6828,6 +6557,12 @@ garbage_collect_with_gvl(rb_objspace_t *objspace, int reason)
     }
 }
 
+int
+rb_garbage_collect(void)
+{
+    return garbage_collect(&rb_objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
+}
+
 #undef Init_stack
 
 void
@@ -6839,11 +6574,9 @@ Init_stack(volatile VALUE *addr)
 /*
  *  call-seq:
  *     GC.start                     -> nil
- *     ObjectSpace.garbage_collect  -> nil
- *     include GC; garbage_collect  -> nil
+ *     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
+ *     GC.garbage_collect(full_mark: true, immediate_sweep: true) -> nil
  *
  *  Initiates garbage collection, unless manually disabled.
  *
@@ -6863,8 +6596,7 @@ static VALUE
 gc_start_internal(int argc, VALUE *argv, VALUE self)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    int reason = GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
-                GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_METHOD;
+    int full_mark = TRUE, immediate_mark = TRUE, immediate_sweep = TRUE;
     VALUE opt = Qnil;
     static ID keyword_ids[3];
 
@@ -6881,18 +6613,12 @@ gc_start_internal(int argc, VALUE *argv, VALUE self)
 
 	rb_get_kwargs(opt, keyword_ids, 0, 3, kwvals);
 
-	if (kwvals[0] != Qundef && !RTEST(kwvals[0])) {
-            reason &= ~GPR_FLAG_FULL_MARK;
-        }
-	if (kwvals[1] != Qundef && !RTEST(kwvals[1])) {
-            reason &= ~GPR_FLAG_IMMEDIATE_MARK;
-        }
-	if (kwvals[2] != Qundef && !RTEST(kwvals[2])) {
-            reason &= ~GPR_FLAG_IMMEDIATE_SWEEP;
-        }
+	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]);
     }
 
-    garbage_collect(objspace, reason);
+    garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, GPR_FLAG_METHOD);
     gc_finalize_deferred(objspace);
 
     return Qnil;
@@ -6909,9 +6635,7 @@ void
 rb_gc(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    int reason = GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
-                GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI;
-    garbage_collect(objspace, reason);
+    garbage_collect(objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
     gc_finalize_deferred(objspace);
 }
 
@@ -6929,7 +6653,7 @@ 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_with_size(T_MASK);
+    VALUE result = rb_hash_new();
     int i;
     for (i=0; i<T_MASK; i++) {
 	const char *type = type_name(i, 0);
@@ -7076,13 +6800,13 @@ gc_latest_gc_info(int argc, VALUE *argv, VALUE self)
     rb_objspace_t *objspace = &rb_objspace;
     VALUE arg = Qnil;
 
-    if (rb_check_arity(argc, 0, 1) == 1) {
-        arg = argv[0];
+    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");
 	}
     }
-    else {
+
+    if (arg == Qnil) {
 	arg = rb_hash_new();
     }
 
@@ -7451,8 +7175,7 @@ gc_stat(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg = Qnil;
 
-    if (rb_check_arity(argc, 0, 1) == 1) {
-        arg = argv[0];
+    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
 	if (SYMBOL_P(arg)) {
 	    size_t value = gc_stat_internal(arg);
 	    return SIZET2NUM(value);
@@ -7461,7 +7184,8 @@ gc_stat(int argc, VALUE *argv, VALUE self)
 	    rb_raise(rb_eTypeError, "non-hash or symbol given");
 	}
     }
-    else {
+
+    if (arg == Qnil) {
         arg = rb_hash_new();
     }
     gc_stat_internal(arg);
@@ -7513,7 +7237,7 @@ gc_stress_set(rb_objspace_t *objspace, VALUE flag)
  *
  *  Enabling stress mode will degrade performance, it is only for debugging.
  *
- *  flag can be true, false, or an integer bit-ORed following flags.
+ *  flag can be true, false, or a integer bit-ORed following flags.
  *    0x01:: no major GC
  *    0x02:: no immediate sweep
  *    0x04:: full mark after malloc/calloc/realloc
@@ -7616,14 +7340,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: %"PRIuSIZE")\n", name, val, *default_value);
+		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE")\n", name, val, *default_value);
 	    }
 	    *default_value = (size_t)val;
 	    return 1;
 	}
 	else {
 	    if (RTEST(ruby_verbose)) {
-		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE") is ignored because it must be greater than %"PRIuSIZE".\n",
+		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE") is ignored because it must be greater than %"PRIdSIZE".\n",
 			name, val, *default_value, lower_bound);
 	    }
 	    return 0;
@@ -7760,9 +7484,6 @@ 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
@@ -7879,31 +7600,27 @@ ruby_memerror(void)
 void
 rb_memerror(void)
 {
-    rb_execution_context_t *ec = GET_EC();
-    rb_objspace_t *objspace = rb_objspace_of(rb_ec_vm_ptr(ec));
-    VALUE exc;
+    rb_thread_t *th = GET_THREAD();
+    rb_objspace_t *objspace = rb_objspace_of(th->vm);
 
     if (during_gc) gc_exit(objspace, "rb_memerror");
 
-    exc = nomem_error;
-    if (!exc ||
-	rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
+    if (!nomem_error ||
+	rb_thread_raised_p(th, RAISED_NOMEMORY)) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
 	exit(EXIT_FAILURE);
     }
-    if (rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
-	rb_ec_raised_clear(ec);
-    }
-    else {
-	rb_ec_raised_set(ec, RAISED_NOMEMORY);
-	exc = ruby_vm_special_exception_copy(exc);
+    if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
+	rb_thread_raised_clear(th);
+	GET_THREAD()->errinfo = nomem_error;
+	TH_JUMP_TAG(th, TAG_RAISE);
     }
-    ec->errinfo = exc;
-    EC_JUMP_TAG(ec, TAG_RAISE);
+    rb_thread_raised_set(th, RAISED_NOMEMORY);
+    rb_exc_raise(nomem_error);
 }
 
-void *
-rb_aligned_malloc(size_t alignment, size_t size)
+static void *
+aligned_malloc(size_t alignment, size_t size)
 {
     void *res;
 
@@ -7930,14 +7647,16 @@ rb_aligned_malloc(size_t alignment, size_t size)
     res = (void*)aligned;
 #endif
 
+#if defined(_DEBUG) || GC_DEBUG
     /* alignment must be a power of 2 */
-    GC_ASSERT(((alignment - 1) & alignment) == 0);
-    GC_ASSERT(alignment % sizeof(void*) == 0);
+    assert(((alignment - 1) & alignment) == 0);
+    assert(alignment % sizeof(void*) == 0);
+#endif
     return res;
 }
 
-void
-rb_aligned_free(void *ptr)
+static void
+aligned_free(void *ptr)
 {
 #if defined __MINGW32__
     __mingw_aligned_free(ptr);
@@ -7961,9 +7680,9 @@ objspace_malloc_size(rb_objspace_t *objspace, void *ptr, size_t hint)
 }
 
 enum memop_type {
-    MEMOP_TYPE_MALLOC  = 0,
-    MEMOP_TYPE_FREE,
-    MEMOP_TYPE_REALLOC
+    MEMOP_TYPE_MALLOC  = 1,
+    MEMOP_TYPE_FREE    = 2,
+    MEMOP_TYPE_REALLOC = 3
 };
 
 static inline void
@@ -7982,13 +7701,7 @@ static void
 objspace_malloc_gc_stress(rb_objspace_t *objspace)
 {
     if (ruby_gc_stressful && ruby_native_thread_p()) {
-        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);
+	garbage_collect_with_gvl(objspace, gc_stress_full_mark_after_malloc_p(), TRUE, TRUE, GPR_FLAG_STRESS | GPR_FLAG_MALLOC);
     }
 }
 
@@ -8015,7 +7728,7 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 		gc_rest(objspace); /* gc_rest can reduce malloc_increase */
 		goto retry;
 	    }
-	    garbage_collect_with_gvl(objspace, GPR_FLAG_MALLOC);
+	    garbage_collect_with_gvl(objspace, FALSE, FALSE, FALSE, GPR_FLAG_MALLOC);
 	}
     }
 
@@ -8054,7 +7767,7 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 	    }
 #if MALLOC_ALLOCATED_SIZE_CHECK
 	    else {
-		GC_ASSERT(objspace->malloc_params.allocations > 0);
+		if (RGENGC_CHECK_MODE) assert(objspace->malloc_params.allocations > 0);
 	    }
 #endif
 	}
@@ -8064,27 +7777,13 @@ 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(struct malloc_obj_info);
+    size += sizeof(size_t);
 #endif
 
     return size;
@@ -8093,22 +7792,9 @@ 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
-    {
-        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;
-#else
-        info->file = NULL;
-#endif
-        mem = info + 1;
-    }
+    ((size_t *)mem)[0] = size;
+    mem = (size_t *)mem + 1;
 #endif
 
     return mem;
@@ -8117,16 +7803,14 @@ objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
 #define TRY_WITH_GC(alloc) do { \
         objspace_malloc_gc_stress(objspace); \
 	if (!(alloc) && \
-            (!garbage_collect_with_gvl(objspace, GPR_FLAG_FULL_MARK | \
-                GPR_FLAG_IMMEDIATE_MARK | GPR_FLAG_IMMEDIATE_SWEEP | \
-                GPR_FLAG_MALLOC) || \
+	    (!garbage_collect_with_gvl(objspace, TRUE, TRUE, TRUE, GPR_FLAG_MALLOC) || /* full/immediate mark && immediate sweep */ \
 	     !(alloc))) { \
 	    ruby_memerror(); \
 	} \
     } while (0)
 
-/* these shouldn't be called directly.
- * objspace_* functinos do not check allocation size.
+/* this shouldn't be called directly.
+ * objspace_xmalloc and objspace_xmalloc2 checks allocation size.
  */
 static void *
 objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
@@ -8135,10 +7819,20 @@ objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
 
     size = objspace_malloc_prepare(objspace, size);
     TRY_WITH_GC(mem = malloc(size));
-    RB_DEBUG_COUNTER_INC(heap_xmalloc);
+    size = objspace_malloc_size(objspace, mem, size);
+    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC);
     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)
 {
@@ -8150,11 +7844,17 @@ xmalloc2_size(const size_t count, const size_t elsize)
 }
 
 static void *
+objspace_xmalloc2(rb_objspace_t *objspace, size_t n, size_t size)
+{
+    return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
+}
+
+static void *
 objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size)
 {
     void *mem;
 
-    if (!ptr) return objspace_xmalloc0(objspace, new_size);
+    if (!ptr) return objspace_xmalloc(objspace, new_size);
 
     /*
      * The behavior of realloc(ptr, 0) is implementation defined.
@@ -8167,12 +7867,9 @@ objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t ol
     }
 
 #if CALC_EXACT_MALLOC_SIZE
-    {
-        struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
-        new_size += sizeof(struct malloc_obj_info);
-        ptr = info;
-        old_size = info->size;
-    }
+    new_size += sizeof(size_t);
+    ptr = (size_t *)ptr - 1;
+    old_size = ((size_t *)ptr)[0];
 #endif
 
     old_size = objspace_malloc_size(objspace, ptr, old_size);
@@ -8180,137 +7877,25 @@ objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t ol
     new_size = objspace_malloc_size(objspace, mem, new_size);
 
 #if CALC_EXACT_MALLOC_SIZE
-    {
-        struct malloc_obj_info *info = mem;
-        info->size = new_size;
-        mem = info + 1;
-    }
+    ((size_t *)mem)[0] = new_size;
+    mem = (size_t *)mem + 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%d\t%d\n", file, (int)data[0], (int)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%d\t%d\n", (int)malloc_info_gen_cnt[i], (int)malloc_info_gen_size[i]);
-        }
-        else {
-            fprintf(stderr, "%d\t%d\t%d\n", i, (int)malloc_info_gen_cnt[i], (int)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%d\n", (int)s, (int)malloc_info_size[i]);
-    }
-    fprintf(stderr, "more\t%d\n", (int)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 CALC_EXACT_MALLOC_SIZE
-    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;
-            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, (st_data_t *)&data)) {
-                /* hit */
-            }
-            else {
-                data = malloc(sizeof(size_t) * 2);
-                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 /* verbose output */
-        if (gen >= 2) {
-            if (info->file) {
-                fprintf(stderr, "free - size:%d, gen:%d, pos: %s:%d\n", (int)info->size, gen, info->file, (int)info->line);
-            }
-            else {
-                fprintf(stderr, "free - size:%d, gen:%d\n", (int)info->size, gen);
-            }
-        }
-#endif
-    }
-#endif
+    ptr = ((size_t *)ptr) - 1;
+    old_size = ((size_t*)ptr)[0];
 #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);
 }
@@ -8322,42 +7907,44 @@ ruby_xmalloc0(size_t size)
 }
 
 void *
-ruby_xmalloc_body(size_t size)
+ruby_xmalloc(size_t size)
 {
-    if ((ssize_t)size < 0) {
-	negative_size_allocation_error("too large allocation size");
-    }
-    return ruby_xmalloc0(size);
+    return objspace_xmalloc(&rb_objspace, size);
 }
 
 void
 ruby_malloc_size_overflow(size_t count, size_t elsize)
 {
     rb_raise(rb_eArgError,
-	     "malloc: possible integer overflow (%"PRIuSIZE"*%"PRIuSIZE")",
+	     "malloc: possible integer overflow (%"PRIdSIZE"*%"PRIdSIZE")",
 	     count, elsize);
 }
 
 void *
-ruby_xmalloc2_body(size_t n, size_t size)
+ruby_xmalloc2(size_t n, size_t size)
 {
-    return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
+    return objspace_xmalloc2(&rb_objspace, n, size);
 }
 
 static void *
-objspace_xcalloc(rb_objspace_t *objspace, size_t size)
+objspace_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize)
 {
     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);
     return objspace_malloc_fixup(objspace, mem, size);
 }
 
 void *
-ruby_xcalloc_body(size_t n, size_t size)
+ruby_xcalloc(size_t n, size_t size)
 {
-    return objspace_xcalloc(&rb_objspace, xmalloc2_size(n, size));
+    return objspace_xcalloc(&rb_objspace, n, size);
 }
 
 #ifdef ruby_sized_xrealloc
@@ -8366,15 +7953,11 @@ ruby_xcalloc_body(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_body(void *ptr, size_t new_size)
+ruby_xrealloc(void *ptr, size_t new_size)
 {
     return ruby_sized_xrealloc(ptr, new_size, 0);
 }
@@ -8393,7 +7976,7 @@ ruby_sized_xrealloc2(void *ptr, size_t n, size_t size, size_t old_n)
 }
 
 void *
-ruby_xrealloc2_body(void *ptr, size_t n, size_t size)
+ruby_xrealloc2(void *ptr, size_t n, size_t size)
 {
     return ruby_sized_xrealloc2(ptr, n, size, 0);
 }
@@ -8423,23 +8006,13 @@ ruby_mimmalloc(size_t size)
 {
     void *mem;
 #if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(struct malloc_obj_info);
+    size += sizeof(size_t);
 #endif
     mem = malloc(size);
 #if CALC_EXACT_MALLOC_SIZE
     /* set 0 for consistency of allocated_size/allocations */
-    {
-        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;
-#else
-        info->file = NULL;
-#endif
-        mem = info + 1;
-    }
+    ((size_t *)mem)[0] = 0;
+    mem = (size_t *)mem + 1;
 #endif
     return mem;
 }
@@ -8447,28 +8020,24 @@ ruby_mimmalloc(size_t size)
 void
 ruby_mimfree(void *ptr)
 {
+    size_t *mem = (size_t *)ptr;
 #if CALC_EXACT_MALLOC_SIZE
-    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
-    ptr = info;
+    mem = mem - 1;
 #endif
-    free(ptr);
+    free(mem);
 }
 
 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;
 
-    /* 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;
+    s = rb_node_newnode(NODE_ALLOCA, 0, 0, 0);
     ptr = ruby_xmalloc0(size);
-    tmpbuf = (rb_imemo_tmpbuf_t *)imemo;
-    tmpbuf->ptr = ptr;
-    tmpbuf->cnt = cnt;
+    s->u1.value = (VALUE)ptr;
+    s->u3.cnt = cnt;
+    *store = (VALUE)s;
     return ptr;
 }
 
@@ -8487,10 +8056,10 @@ rb_alloc_tmp_buffer(volatile VALUE *store, long len)
 void
 rb_free_tmp_buffer(volatile VALUE *store)
 {
-    rb_imemo_tmpbuf_t *s = (rb_imemo_tmpbuf_t*)ATOMIC_VALUE_EXCHANGE(*store, 0);
+    VALUE s = ATOMIC_VALUE_EXCHANGE(*store, 0);
     if (s) {
-	void *ptr = ATOMIC_PTR_EXCHANGE(s->ptr, 0);
-	s->cnt = 0;
+	void *ptr = ATOMIC_PTR_EXCHANGE(RNODE(s)->u1.node, 0);
+	RNODE(s)->u3.cnt = 0;
 	ruby_xfree(ptr);
     }
 }
@@ -8527,18 +8096,6 @@ 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 ------------------------------
 */
@@ -8653,7 +8210,6 @@ wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
     return ST_CONTINUE;
 }
 
-/* :nodoc: */
 static VALUE
 wmap_finalize(VALUE self, VALUE objid)
 {
@@ -8866,7 +8422,7 @@ wmap_aset_update(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
     else {
 	optr = 0;
 	size = 1;
-	ptr = ruby_xmalloc0(2 * sizeof(VALUE));
+	ptr = ruby_xmalloc2(2, sizeof(VALUE));
     }
     ptr[0] = size;
     ptr[size] = (VALUE)arg;
@@ -8915,7 +8471,6 @@ wmap_has_key(VALUE self, VALUE key)
     return NIL_P(wmap_aref(self, key)) ? Qfalse : Qtrue;
 }
 
-/* Returns the number of referenced objects */
 static VALUE
 wmap_size(VALUE self)
 {
@@ -9024,7 +8579,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_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY
+#if GC_PROFILE_DETAIL_MEMORY
 #ifdef RUSAGE_SELF
 	{
 	    struct rusage usage;
@@ -9317,6 +8872,8 @@ 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
@@ -9344,7 +8901,7 @@ 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"PRIuSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
+	    append(out, rb_sprintf("%5"PRIdSIZE" %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));
 	}
@@ -9368,7 +8925,7 @@ 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"PRIuSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
+	    append(out, rb_sprintf("%5"PRIdSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
 #if CALC_EXACT_MALLOC_SIZE
 				   " %15"PRIuSIZE
 #endif
@@ -9435,9 +8992,9 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
 static VALUE
 gc_profile_result(void)
 {
-    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;
 }
 
 /*
@@ -9454,7 +9011,12 @@ gc_profile_report(int argc, VALUE *argv, VALUE self)
 {
     VALUE out;
 
-    out = (!rb_check_arity(argc, 0, 1) ? rb_stdout : argv[0]);
+    if (argc == 0) {
+	out = rb_stdout;
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &out);
+    }
     gc_profile_dump_on(out, rb_io_write);
 
     return Qnil;
@@ -9564,6 +9126,7 @@ 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_ZOMBIE);
       case T_DATA:
@@ -9604,22 +9167,20 @@ method_type_name(rb_method_type_t type)
 
 /* from array.c */
 # define ARY_SHARED_P(ary) \
-    (GC_ASSERT(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
      FL_TEST((ary),ELTS_SHARED)!=0)
 # define ARY_EMBED_P(ary) \
-    (GC_ASSERT(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+    (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 (iseq->body && iseq->body->location.label) {
-	VALUE path = rb_iseq_path(iseq);
-	VALUE n = iseq->body->location.first_lineno;
+    if (iseq->body->location.label) {
 	snprintf(buff, buff_size, "%s %s@%s:%d", buff,
 		 RSTRING_PTR(iseq->body->location.label),
-		 RSTRING_PTR(path),
-		 n ? FIX2INT(n) : 0 );
+		 RSTRING_PTR(iseq->body->location.path),
+		 FIX2INT(iseq->body->location.first_lineno));
     }
 }
 
@@ -9628,13 +9189,6 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 {
     if (SPECIAL_CONST_P(obj)) {
 	snprintf(buff, buff_size, "%s", obj_type_name(obj));
-
-        if (FIXNUM_P(obj)) {
-            snprintf(buff, buff_size, "%s %ld", buff, FIX2LONG(obj));
-        }
-        else if (SYMBOL_P(obj)) {
-            snprintf(buff, buff_size, "%s %s", buff, rb_id2name(SYM2ID(obj)));
-        }
     }
     else {
 #define TF(c) ((c) != 0 ? "true" : "false")
@@ -9643,21 +9197,13 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 #if USE_RGENGC
 	const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
 
-        if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
-            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 {
-            /* fake */
-            snprintf(buff, buff_size, "%p [%dXXXX] %s",
-                     (void *)obj, age,
-                     obj_type_name(obj));
-        }
+	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,
@@ -9684,131 +9230,74 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 
 	switch (type) {
 	  case T_NODE:
-	    UNEXPECTED_NODE(rb_raw_obj_info);
+	    snprintf(buff, buff_size, "%s (%s)", buff,
+		     ruby_node_name(nd_type(obj)));
 	    break;
 	  case T_ARRAY:
-            if (FL_TEST(obj, ELTS_SHARED)) {
-                snprintf(buff, buff_size, "%s shared -> %s", buff,
-                         rb_obj_info(RARRAY(obj)->as.heap.aux.shared));
-            }
-            else if (FL_TEST(obj, RARRAY_EMBED_FLAG)) {
-                snprintf(buff, buff_size, "%s [%s%s] len: %d (embed)", buff,
-                         C(ARY_EMBED_P(obj),  "E"),
-                         C(ARY_SHARED_P(obj), "S"),
-                         (int)RARRAY_LEN(obj));
-            }
-            else {
-                snprintf(buff, buff_size, "%s [%s%s%s] len: %d, capa:%d ptr:%p", buff,
-                         C(ARY_EMBED_P(obj),  "E"),
-                         C(ARY_SHARED_P(obj), "S"),
-                         C(RARRAY_TRANSIENT_P(obj), "T"),
-                         (int)RARRAY_LEN(obj),
-                         ARY_EMBED_P(obj) ? -1 : (int)RARRAY(obj)->as.heap.aux.capa,
-                         (void *)RARRAY_CONST_PTR_TRANSIENT(obj));
-            }
+	    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));
 	    break;
 	  case T_STRING: {
-	    snprintf(buff, buff_size, "%s %s", buff, RSTRING_PTR(obj));
-	    break;
+	      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;
 	  }
-          case T_HASH: {
-              snprintf(buff, buff_size, "%s [%c%c] %d", buff,
-                       RHASH_AR_TABLE_P(obj) ? 'A' : 'S',
-                       RHASH_TRANSIENT_P(obj) ? 'T' : ' ',
-                       (int)RHASH_SIZE(obj));
-              break;
-          }
-          case T_CLASS:
-          case T_MODULE:
-            {
-                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;
-            }
-          case T_ICLASS:
-            {
-                VALUE class_path = rb_class_path_cached(RBASIC_CLASS(obj));
-                if (!NIL_P(class_path)) {
-                    snprintf(buff, buff_size, "%s src:%s", buff, RSTRING_PTR(class_path));
-                }
-                break;
-            }
-          case T_OBJECT:
-            {
-                uint32_t len = ROBJECT_NUMIV(obj);
-
-                if (RANY(obj)->as.basic.flags & ROBJECT_EMBED) {
-                    snprintf(buff, buff_size, "%s (embed) len:%d", buff, len);
-                }
-                else {
-                    VALUE *ptr = ROBJECT_IVPTR(obj);
-                    snprintf(buff, buff_size, "%s len:%d ptr:%p", buff, len, (void *)ptr);
-                }
-            }
-            break;
 	  case T_DATA: {
-	    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, buff_size, iseq);
-	    }
-	    else {
-		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 rb_iseq_t *iseq;
+	      if (rb_obj_is_proc(obj) && (iseq = vm_proc_iseq(obj)) != NULL) {
+		  rb_raw_iseq_info(buff, buff_size, iseq);
+	      }
+	      else {
+		  const char * const type_name = rb_objspace_data_type_name(obj);
+		  if (type_name) {
+		      snprintf(buff, buff_size, "%s %s", buff, type_name);
+		  }
+	      }
+	      break;
 	  }
 	  case T_IMEMO: {
-	    const char *imemo_name = "\0";
-	    switch (imemo_type(obj)) {
+	      const char *imemo_name;
+	      switch (imemo_type(obj)) {
 #define IMEMO_NAME(x) case imemo_##x: imemo_name = #x; break;
-		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(env);
+		  IMEMO_NAME(cref);
+		  IMEMO_NAME(svar);
+		  IMEMO_NAME(throw_data);
+		  IMEMO_NAME(ifunc);
+		  IMEMO_NAME(memo);
+		  IMEMO_NAME(ment);
+		  IMEMO_NAME(iseq);
 #undef IMEMO_NAME
-	      default: UNREACHABLE;
-	    }
-	    snprintf(buff, buff_size, "%s %s", buff, imemo_name);
+	      }
+	      snprintf(buff, buff_size, "%s %s", buff, imemo_name);
 
-	    switch (imemo_type(obj)) {
-	      case imemo_ment: {
-		const rb_method_entry_t *me = &RANY(obj)->as.imemo.ment;
-		if (me->def) {
+	      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,
 			     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;
 		}
-		else {
-		    snprintf(buff, buff_size, "%s", rb_id2name(me->called_id));
+		case imemo_iseq: {
+		    const rb_iseq_t *iseq = (const rb_iseq_t *)obj;
+		    rb_raw_iseq_info(buff, buff_size, iseq);
+		    break;
 		}
-		break;
-	      }
-	      case imemo_iseq: {
-		const rb_iseq_t *iseq = (const rb_iseq_t *)obj;
-		rb_raw_iseq_info(buff, buff_size, iseq);
-		break;
+		default:
+		  break;
 	      }
-	      default:
-		break;
-	    }
 	  }
 	  default:
 	    break;
@@ -9845,7 +9334,7 @@ obj_info(VALUE obj)
 }
 #endif
 
-MJIT_FUNC_EXPORTED const char *
+const char *
 rb_obj_info(VALUE obj)
 {
     if (!rb_special_const_p(obj)) {
@@ -9913,13 +9402,6 @@ 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)
 {
@@ -9932,14 +9414,6 @@ 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)
 {
@@ -10047,7 +9521,6 @@ Init_GC(void)
     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));
     OBJ_FREEZE(gc_constants);
-    /* internal constants */
     rb_define_const(rb_mGC, "INTERNAL_CONSTANTS", gc_constants);
 
     rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
@@ -10099,7 +9572,6 @@ Init_GC(void)
 
     /* internal methods */
     rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency, 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);
@@ -10110,9 +9582,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);
@@ -10131,69 +9603,3 @@ 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 2c91e06620..c723106137 100644
--- a/gc.h
+++ b/gc.h
@@ -2,9 +2,9 @@
 #ifndef RUBY_GC_H
 #define RUBY_GC_H 1
 
-#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__)
+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
-#elif defined(__i386) && defined(__GNUC__)
+#elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
 #else
 NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
@@ -90,8 +90,6 @@ 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);
 
-struct rb_thread_struct;
-
 RUBY_SYMBOL_EXPORT_BEGIN
 
 /* exports for objspace module */
diff --git a/gems/bundled_gems b/gems/bundled_gems
index 7c896b73ce..69917d3f88 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -1,7 +1,7 @@
-did_you_mean 1.3.0 https://github.com/yuki24/did_you_mean
-minitest 5.11.3 https://github.com/seattlerb/minitest
-net-telnet 0.2.0 https://github.com/ruby/net-telnet
-power_assert 1.1.3 https://github.com/k-tsj/power_assert
-rake 12.3.3 https://github.com/ruby/rake
-test-unit 3.2.9 https://github.com/test-unit/test-unit
-xmlrpc 0.3.0 https://github.com/ruby/xmlrpc
+did_you_mean 1.0.2
+minitest 5.9.0
+net-telnet 0.1.1
+power_assert 0.3.1
+rake 11.2.2
+test-unit 3.2.1
+xmlrpc 0.1.1
diff --git a/golf_prelude.rb b/golf_prelude.rb
index 204f659b0e..8034601287 100644
--- a/golf_prelude.rb
+++ b/golf_prelude.rb
@@ -50,11 +50,6 @@ 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
@@ -90,7 +85,7 @@ class String
     split('')
   end
 
-  (Array.instance_methods - instance_methods - %i[to_ary transpose flatten flatten! compact compact! assoc rassoc]).each{|meth|
+  (Array.instance_methods - instance_methods - [: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 ddb62562d4..5ac4c96d12 100644
--- a/goruby.c
+++ b/goruby.c
@@ -35,11 +35,7 @@ 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) {
-	    close(rw[0]);
-	    close(rw[1]);
-	    goto no_irb;
-	}
+	if (infd < 0) return NULL;
 	dup2(rw[0], 0);
 	close(rw[0]);
 	n = write(rw[1], cmd, sizeof(cmd) - 1);
@@ -50,7 +46,6 @@ goruby_options(int argc, char **argv)
 	return ret;
     }
     else {
-      no_irb:
 	return ruby_options(argc, argv);
     }
 }
diff --git a/hash.c b/hash.c
index e8be71bec3..8ff6d1b94b 100644
--- a/hash.c
+++ b/hash.c
@@ -11,18 +11,14 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
-#include "internal.h"
 #include <errno.h>
 #include "probes.h"
 #include "id.h"
 #include "symbol.h"
-#include "gc.h"
-#include "debug_counter.h"
-#include "transient_heap.h"
-#include "ruby_assert.h"
+
 #ifdef __APPLE__
 # ifdef HAVE_CRT_EXTERNS_H
 #  include <crt_externs.h>
@@ -31,10 +27,6 @@
 # endif
 #endif
 
-#ifndef HASH_DEBUG
-#define HASH_DEBUG 0
-#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) || \
@@ -92,6 +84,12 @@ static VALUE envtbl;
 static ID id_hash, id_yield, id_default, id_flatten_bang;
 
 VALUE
+rb_hash_ifnone(VALUE h)
+{
+    return RHASH_IFNONE(h);
+}
+
+VALUE
 rb_hash_set_ifnone(VALUE hash, VALUE ifnone)
 {
     RB_OBJ_WRITE(hash, (&RHASH(hash)->ifnone), ifnone);
@@ -147,33 +145,16 @@ rb_hash(VALUE obj)
 
 long rb_objid_hash(st_index_t index);
 
-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
-    {
-	union {double d; uint64_t i;} u;
-
-	u.d = d;
-	return rb_objid_hash(rb_hash_start(u.i));
-    }
-#endif
-}
-
-static inline long
+static st_index_t
 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;
 	if (STATIC_SYM_P(a)) {
 	    hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
-	    hnum = rb_hash_start(hnum);
 	    goto out;
 	}
 	else if (FLONUM_P(a)) {
@@ -194,22 +175,15 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
     }
     else if (BUILTIN_TYPE(a) == T_FLOAT) {
       flt:
-	hnum = rb_dbl_long_hash(rb_float_value(a));
+	hval = rb_dbl_hash(rb_float_value(a));
+	hnum = FIX2LONG(hval);
     }
     else {
 	hnum = other_func(a);
     }
   out:
-#if SIZEOF_LONG < SIZEOF_ST_INDEX_T
-    if (hnum > 0)
-	hnum &= (unsigned long)-1 >> 2;
-    else
-	hnum |= ~((unsigned long)-1 >> 2);
-#else
     hnum <<= 1;
-    hnum = RSHIFT(hnum, 1);
-#endif
-    return (long)hnum;
+    return (st_index_t)RSHIFT(hnum, 1);
 }
 
 static st_index_t
@@ -225,42 +199,34 @@ rb_any_hash(VALUE a)
     return any_hash(a, obj_any_hash);
 }
 
-/* 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)
-{
-#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
-}
-
-static inline uint64_t
-key64_hash(uint64_t key, uint32_t seed)
+static st_index_t
+rb_num_hash_start(st_index_t n)
 {
-    return mult_and_mix(key + seed, prime1);
+    /*
+     * 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);
 }
 
 long
 rb_objid_hash(st_index_t index)
 {
-    return (long)key64_hash(rb_hash_start(index), prime2);
+    st_index_t hnum = rb_num_hash_start(index);
+
+    hnum = rb_hash_start(hnum);
+    hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
+    hnum = rb_hash_end(hnum);
+    return hnum;
 }
 
 static st_index_t
@@ -272,8 +238,14 @@ objid_hash(VALUE obj)
 VALUE
 rb_obj_hash(VALUE obj)
 {
-    long hnum = any_hash(obj, objid_hash);
-    return ST2FIX(hnum);
+    st_index_t hnum = any_hash(obj, objid_hash);
+    return LONG2FIX(hnum);
+}
+
+int
+rb_hash_iter_lev(VALUE h)
+{
+    return RHASH_ITER_LEV(h);
 }
 
 static const struct st_hash_type objhash = {
@@ -293,13 +265,11 @@ rb_ident_hash(st_data_t n)
      *   many integers get interpreted as 2.0 or -2.0 [Bug #10761]
      */
     if (FLONUM_P(n)) {
-        union { double d; st_data_t i; } u;
-        u.d = rb_float_value(n);
-        n ^= u.i;
+	n ^= (st_data_t)rb_float_value(n);
     }
 #endif
 
-    return (st_index_t)key64_hash(rb_hash_start((st_index_t)n), prime2);
+    return (st_index_t)rb_num_hash_start((st_index_t)n);
 }
 
 static const struct st_hash_type identhash = {
@@ -307,805 +277,6 @@ static const struct st_hash_type identhash = {
     rb_ident_hash,
 };
 
-#define EQUAL(x,y) ((x) == (y) || (*objhash.compare)((x),(y)) == 0)
-#define PTR_EQUAL(ptr, hash_val, key_) \
-    ((ptr)->hash == (hash_val) && EQUAL((key_), (ptr)->key))
-
-#define RESERVED_HASH_VAL (~(st_hash_t) 0)
-#define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0)
-
-#define SET_KEY(entry, _key) (entry)->key = (_key)
-#define SET_HASH(entry, _hash) (entry)->hash = (_hash)
-#define SET_RECORD(entry, _value) (entry)->record = (_value)
-
-typedef st_data_t st_hash_t;
-extern const st_hash_t st_reserved_hash_val;
-extern const st_hash_t st_reserved_hash_substitution_val;
-
-static inline st_hash_t
-do_hash(st_data_t key)
-{
-    st_hash_t hash = (st_hash_t)(*objhash.hash)(key);
-    return (RESERVED_HASH_VAL == hash) ? RESERVED_HASH_SUBSTITUTION_VAL : hash;
-}
-
-static inline void
-set_entry(ar_table_entry *entry, st_data_t key, st_data_t val, st_hash_t hash)
-{
-    SET_HASH(entry, hash);
-    SET_KEY(entry, key);
-    SET_RECORD(entry, val);
-}
-
-static inline void
-clear_entry(ar_table_entry* entry)
-{
-    SET_KEY(entry, Qundef);
-    SET_RECORD(entry, Qundef);
-    SET_HASH(entry, RESERVED_HASH_VAL);
-}
-
-static inline int
-empty_entry(ar_table_entry *entry)
-{
-    return entry->hash == RESERVED_HASH_VAL;
-}
-
-#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 RHASH_AR_TABLE_REF(hash, n) (&RHASH_AR_TABLE(hash)->entries[n])
-
-#if HASH_DEBUG
-#define hash_verify(hash) hash_verify_(hash, __FILE__, __LINE__)
-#define HASH_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(1, expr, #expr)
-
-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++) {
-            ar_table_entry *cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            st_data_t k, v;
-
-            if (!empty_entry(cur_entry)) {
-                char b1[0x100], b2[0x100];
-                /* h = cur_entry->hash; */
-                k = cur_entry->key;
-                v = cur_entry->record;
-                fprintf(stderr, "  %d key:%s val:%s\n", i,
-                        rb_raw_obj_info(b1, 0x100, k),
-                        rb_raw_obj_info(b2, 0x100, v));
-                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++) {
-            ar_table_entry *cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            st_data_t h, k, v;
-            if (!empty_entry(cur_entry)) {
-                h = cur_entry->hash;
-                k = cur_entry->key;
-                v = cur_entry->record;
-                HASH_ASSERT(h != RESERVED_HASH_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 (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)));
-    }
-    return hash;
-}
-
-#else
-#define hash_verify(h) ((void)0)
-#define HASH_ASSERT(e) ((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;
-}
-
-MJIT_FUNC_EXPORTED 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;
-}
-
-MJIT_FUNC_EXPORTED 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_AR_TABLE_SET(h, a) hash_ar_table_set(h, a)
-
-#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)
-
-#define RHASH_AR_TABLE_BOUND_SET(h, n) do { \
-    st_index_t tmp_n = (n);          \
-    HASH_ASSERT(RHASH_AR_TABLE_P(h)); \
-    HASH_ASSERT(tmp_n <= RHASH_AR_TABLE_MAX_BOUND); \
-    RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK; \
-    RBASIC(h)->flags |= (tmp_n) << RHASH_AR_TABLE_BOUND_SHIFT; \
-} while (0)
-
-#define RHASH_AR_TABLE_SIZE_SET(h, n) do { \
-    st_index_t tmp_n = n; \
-    HASH_ASSERT(RHASH_AR_TABLE_P(h)); \
-    RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK; \
-    RBASIC(h)->flags |= (tmp_n) << RHASH_AR_TABLE_SIZE_SHIFT; \
-} while (0)
-
-#define HASH_AR_TABLE_SIZE_ADD(h, n) do  { \
-    HASH_ASSERT(RHASH_AR_TABLE_P(h)); \
-    RHASH_AR_TABLE_SIZE_SET((h), RHASH_AR_TABLE_SIZE(h)+(n)); \
-    hash_verify(h); \
-} while (0)
-
-#define RHASH_AR_TABLE_SIZE_INC(h) HASH_AR_TABLE_SIZE_ADD(h, 1)
-#define RHASH_AR_TABLE_SIZE_DEC(h) do  { \
-    HASH_ASSERT(RHASH_AR_TABLE_P(h)); \
-    RHASH_AR_TABLE_SIZE_SET((h), RHASH_AR_TABLE_SIZE(h) - 1); \
-    hash_verify(h); \
-} while (0)
-
-#define RHASH_AR_TABLE_CLEAR(h) do { \
-    RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK; \
-    RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK; \
-    RHASH_AR_TABLE_SET(hash, NULL); \
-} while (0)
-
-
-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);
-    RHASH_AR_TABLE_SET(hash, tab);
-
-    return tab;
-}
-
-static unsigned
-find_entry(VALUE hash, st_hash_t hash_value, st_data_t key)
-{
-    unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
-
-    /* if table is NULL, then bound also should be 0 */
-
-    for (i = 0; i < bound; i++) {
-        if (PTR_EQUAL(RHASH_AR_TABLE_REF(hash, i), hash_value, key)) {
-            return i;
-        }
-    }
-    return RHASH_AR_TABLE_MAX_BOUND;
-}
-
-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);
-}
-
-void st_add_direct_with_hash(st_table *tab, st_data_t key, st_data_t value, st_hash_t hash); /* st.c */
-
-static void
-ar_try_convert_table(VALUE hash)
-{
-    st_table *new_tab;
-    ar_table_entry *entry;
-    unsigned size;
-    st_index_t i;
-
-    if (!RHASH_AR_TABLE_P(hash)) return;
-
-    size = RHASH_AR_TABLE_SIZE(hash);
-
-    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++) {
-        entry = RHASH_AR_TABLE_REF(hash, i);
-        HASH_ASSERT(entry->hash != RESERVED_HASH_VAL);
-
-        st_add_direct_with_hash(new_tab, entry->key, entry->record, entry->hash);
-    }
-    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)) {
-        ar_table_entry *entry;
-        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++) {
-            entry = RHASH_AR_TABLE_REF(hash, i);
-            if (empty_entry(entry)) continue;
-
-            st_add_direct_with_hash(new_tab, entry->key, entry->record, entry->hash);
-        }
-        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_entry *entries = RHASH_AR_TABLE_REF(hash, 0);
-
-        for (i=0; i<bound; i++) {
-            if (empty_entry(&entries[i])) {
-                if (j <= i) j = i+1;
-                for (; j<bound; j++) {
-                    if (!empty_entry(&entries[j])) {
-                        entries[i] = entries[j];
-                        clear_entry(&entries[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);
-    ar_table *tab = RHASH_AR_TABLE(hash);
-    ar_table_entry *entry;
-
-    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);
-
-        entry = &tab->entries[bin];
-        set_entry(entry, key, val, hash_value);
-        RHASH_AR_TABLE_BOUND_SET(hash, bin+1);
-        RHASH_AR_TABLE_SIZE_INC(hash);
-        return 0;
-    }
-}
-
-static int
-ar_foreach(VALUE hash, int (*func)(ANYARGS), 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++) {
-            enum st_retval retval;
-            ar_table_entry *cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            if (empty_entry(cur_entry)) continue;
-            retval = (*func)(cur_entry->key, cur_entry->record, arg, 0);
-            /* cur_entry is not valid after that */
-
-            switch (retval) {
-              case ST_CONTINUE:
-                break;
-              case ST_CHECK:
-              case ST_STOP:
-                return 0;
-              case ST_DELETE:
-                clear_entry(RHASH_AR_TABLE_REF(hash, i));
-                RHASH_AR_TABLE_SIZE_DEC(hash);
-                break;
-            }
-        }
-    }
-    return 0;
-}
-
-static int
-ar_foreach_check(VALUE hash, int (*func)(ANYARGS), 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;
-        ar_table_entry *cur_entry;
-        st_data_t key;
-        st_hash_t hash_value;
-
-        for (i = 0; i < bound; i++) {
-            cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            if (empty_entry(cur_entry))
-              continue;
-            key = cur_entry->key;
-            hash_value = cur_entry->hash;
-
-            retval = (*func)(key, cur_entry->record, arg, 0);
-            hash_verify(hash);
-
-            cur_entry = RHASH_AR_TABLE_REF(hash, i);
-
-            switch (retval) {
-              case ST_CHECK: {
-                  if (cur_entry->key == never && cur_entry->hash == RESERVED_HASH_VAL)
-                      break;
-                  ret = find_entry(hash, hash_value, key);
-                  if (ret == RHASH_AR_TABLE_MAX_BOUND) {
-                      retval = (*func)(0, 0, arg, 1);
-                      return 2;
-                  }
-              }
-              case ST_CONTINUE:
-                break;
-              case ST_STOP:
-                return 0;
-              case ST_DELETE: {
-                  if (!empty_entry(cur_entry)) {
-                      clear_entry(cur_entry);
-                      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 = 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 = 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_entry *entry = RHASH_AR_TABLE_REF(hash, bin);
-        key = entry->key;
-        value = entry->record;
-    }
-    old_key = key;
-    retval = (*func)(&key, &value, arg, existing);
-
-    switch (retval) {
-      case ST_CONTINUE:
-        if (!existing) {
-            if (ar_add_direct_with_hash(hash, key, value, hash_value)) {
-                return -1;
-            }
-        }
-        else {
-            ar_table_entry *entry = RHASH_AR_TABLE_REF(hash, bin);
-            if (old_key != key) {
-                entry->key = key;
-            }
-            entry->record = value;
-        }
-        break;
-      case ST_DELETE:
-        if (existing) {
-            clear_entry(RHASH_AR_TABLE_REF(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 = 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 = 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);
-
-        set_entry(RHASH_AR_TABLE_REF(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)->record = value;
-        return 1;
-    }
-}
-
-static int
-ar_lookup(VALUE hash, st_data_t key, st_data_t *value)
-{
-    st_hash_t hash_value = do_hash(key);
-    unsigned bin;
-    if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) {
-        /* `#hash` changes ar_table -> st_table */
-        return st_lookup(RHASH_ST_TABLE(hash), key, value);
-    }
-    bin = 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)->record;
-        }
-        return 1;
-    }
-}
-
-static int
-ar_delete(VALUE hash, st_data_t *key, st_data_t *value)
-{
-    unsigned bin;
-    st_hash_t hash_value = 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 = find_entry(hash, hash_value, *key);
-
-    if (bin == RHASH_AR_TABLE_MAX_BOUND) {
-        if (value != 0) *value = 0;
-        return 0;
-    }
-    else {
-        ar_table_entry *entry = RHASH_AR_TABLE_REF(hash, bin);
-        if (value != 0) *value = entry->record;
-        clear_entry(entry);
-        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);
-        ar_table_entry *entry, *entries = RHASH_AR_TABLE(hash)->entries;
-
-        for (i = 0; i < bound; i++) {
-            entry = &entries[i];
-            if (!empty_entry(entry)) {
-                if (value != 0) *value = entry->record;
-                *key = entry->key;
-                clear_entry(entry);
-                RHASH_AR_TABLE_SIZE_DEC(hash);
-                return 1;
-            }
-        }
-    }
-    if (value != 0) *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 {
-            ar_table_entry *cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            if (!empty_entry(cur_entry))
-              *keys++ = cur_entry->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 {
-            ar_table_entry *cur_entry = RHASH_AR_TABLE_REF(hash, i);
-            if (!empty_entry(cur_entry))
-              *values++ = cur_entry->record;
-        }
-    }
-
-    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_AR_TABLE_BOUND_SET(hash1, RHASH_AR_TABLE_BOUND(hash2));
-        RHASH_AR_TABLE_SIZE_SET(hash1, RHASH_AR_TABLE_SIZE(hash2));
-        RHASH_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));
-        }
-
-        RHASH_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) {
-          promote:
-            new_tab = ruby_xmalloc(sizeof(ar_table));
-            RHASH_UNSET_TRANSIENT_FLAG(hash);
-        }
-        else {
-            new_tab = rb_transient_heap_alloc(hash, sizeof(ar_table));
-            if (new_tab == NULL) goto promote;
-        }
-        *new_tab = *old_tab;
-        RHASH_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 {
@@ -1150,27 +321,6 @@ 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;
@@ -1178,13 +328,14 @@ 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_ST_TABLE(arg->hash);
+    tbl = RHASH(arg->hash)->ntbl;
     status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
-    if (RHASH_ST_TABLE(arg->hash) != tbl) {
-    	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
+    if (RHASH(arg->hash)->ntbl != 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;
@@ -1204,36 +355,21 @@ hash_foreach_ensure_rollback(VALUE hash)
 static VALUE
 hash_foreach_ensure(VALUE hash)
 {
-    RHASH_ITER_LEV(hash)--;
-    return 0;
-}
-
-int
-rb_hash_stlike_foreach(VALUE hash, int (*func)(ANYARGS), 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);
+    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);
+	}
     }
+    return 0;
 }
 
 static VALUE
 hash_foreach_call(VALUE arg)
 {
     VALUE hash = ((struct hash_foreach_arg *)arg)->hash;
-    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);
+    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");
     }
     return Qnil;
 }
@@ -1243,14 +379,13 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
 {
     struct hash_foreach_arg arg;
 
-    if (RHASH_TABLE_EMPTY_P(hash))
+    if (!RHASH(hash)->ntbl)
         return;
     RHASH_ITER_LEV(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
@@ -1284,41 +419,13 @@ rb_hash_new(void)
     return hash_alloc(rb_cHash);
 }
 
-VALUE
-rb_hash_new_compare_by_id(void)
-{
-    VALUE hash = rb_hash_new();
-    RHASH_ST_TABLE_SET(hash, rb_init_identtable());
-    return hash;
-}
-
-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)
 {
     VALUE ret = hash_alloc_flags(klass, flags,
 				 RHASH_IFNONE(hash));
-    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)));
-    }
+    if (!RHASH_EMPTY_P(hash))
+	RHASH(ret)->ntbl = st_copy(RHASH(hash)->ntbl);
     return ret;
 }
 
@@ -1333,43 +440,39 @@ rb_hash_dup(VALUE 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);
 }
 
-MJIT_FUNC_EXPORTED struct st_table *
-#if RHASH_CONVERT_TABLE_DEBUG
-rb_hash_tbl_raw(VALUE hash, const char *file, int line)
+static struct st_table *
+hash_tbl(VALUE hash)
 {
-    return ar_force_convert_table(hash, file, line);
+    if (!RHASH(hash)->ntbl) {
+        RHASH(hash)->ntbl = st_init_table(&objhash);
+    }
+    return RHASH(hash)->ntbl;
 }
-#else
-rb_hash_tbl_raw(VALUE hash)
+
+struct st_table *
+rb_hash_tbl(VALUE hash)
 {
-    return ar_force_convert_table(hash, NULL, 0);
+    OBJ_WB_UNPROTECT(hash);
+    return hash_tbl(hash);
 }
-#endif
 
 struct st_table *
-rb_hash_tbl(VALUE hash, const char *file, int line)
+rb_hash_tbl_raw(VALUE hash)
 {
-    OBJ_WB_UNPROTECT(hash);
-    return RHASH_TBL_RAW(hash);
+    return hash_tbl(hash);
 }
 
 static void
 rb_hash_modify(VALUE hash)
 {
     rb_hash_modify_check(hash);
+    hash_tbl(hash);
 }
 
 NORETURN(static void no_new_key(void));
@@ -1409,22 +512,6 @@ 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)
 {
@@ -1438,7 +525,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 = rb_hash_stlike_update(hash, key, func, (st_data_t)&arg);
+    result = st_update(RHASH(hash)->ntbl, (st_data_t)key, func, (st_data_t)&arg);
 
     /* write barrier */
     if (arg.new_key)   RB_OBJ_WRITTEN(hash, arg.old_key, arg.new_key);
@@ -1551,17 +638,15 @@ 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_AR_TABLE_P(tmp)) {
-                ar_copy(hash, tmp);
+	    if (RHASH(tmp)->ntbl) {
+		RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
 	    }
-            else {
-                RHASH_ST_TABLE_SET(hash, st_copy(RHASH_ST_TABLE(tmp)));
-            }
 	    return hash;
 	}
 
@@ -1607,22 +692,26 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
     }
 
     hash = hash_alloc(klass);
-    rb_hash_bulk_insert(argc, argv, hash);
-    hash_verify(hash);
+    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]);
+    }
+
     return hash;
 }
 
-VALUE
-rb_to_hash_type(VALUE hash)
+static VALUE
+to_hash(VALUE hash)
 {
-    return rb_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
+    return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
 }
-#define to_hash rb_to_hash_type
 
 VALUE
 rb_check_hash_type(VALUE hash)
 {
-    return rb_check_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
+    return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
 }
 
 /*
@@ -1650,12 +739,9 @@ struct rehash_arg {
 static int
 rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
 {
-    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);
-    }
+    st_table *tbl = (st_table *)arg;
+
+    st_insert(tbl, (st_data_t)key, (st_data_t)value);
     return ST_CONTINUE;
 }
 
@@ -1689,25 +775,17 @@ rb_hash_rehash(VALUE hash)
 	rb_raise(rb_eRuntimeError, "rehash during iteration");
     }
     rb_hash_modify_check(hash);
-    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);
+    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;
+
     return hash;
 }
 
@@ -1744,27 +822,10 @@ rb_hash_aref(VALUE hash, VALUE key)
 {
     st_data_t val;
 
-    if (RHASH_AR_TABLE_P(hash) && ar_lookup(hash, key, &val)) {
-        return (VALUE)val;
-    }
-    else if (RHASH_ST_TABLE_P(hash) && st_lookup(RHASH_ST_TABLE(hash), key, &val)) {
-        return (VALUE)val;
-    }
-    hash_verify(hash);
-    return rb_hash_default_value(hash, key);
-}
-
-MJIT_FUNC_EXPORTED int
-rb_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);
+    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+	return rb_hash_default_value(hash, key);
     }
+    return (VALUE)val;
 }
 
 VALUE
@@ -1772,12 +833,10 @@ rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
 {
     st_data_t val;
 
-    if (rb_hash_stlike_lookup(hash, key, &val)) {
-        return (VALUE)val;
-    }
-    else {
-        return def; /* without Hash#default */
+    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+	return def; /* without Hash#default */
     }
+    return (VALUE)val;
 }
 
 VALUE
@@ -1793,9 +852,9 @@ rb_hash_lookup(VALUE hash, VALUE key)
  *
  *  Returns a value from the hash for the given key. If the key can't be
  *  found, there are several options: With no other arguments, it will
- *  raise a <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.
+ *  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
@@ -1829,23 +888,19 @@ rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
     if (block_given && argc == 2) {
 	rb_warn("block supersedes default value argument");
     }
-    if (RHASH_AR_TABLE_P(hash) && ar_lookup(hash, key, &val)) {
-        return (VALUE)val;
-    }
-    else if (RHASH_ST_TABLE_P(hash) && st_lookup(RHASH_ST_TABLE(hash), key, &val)) {
-        return (VALUE)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);
+    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);
 	}
-        desc = rb_str_ellipsize(desc, 65);
-        rb_key_err_raise(rb_sprintf("key not found: %"PRIsVALUE, desc), hash, key);
+	return argv[1];
     }
-    hash_verify(hash);
-    return argv[1];
+    return (VALUE)val;
 }
 
 VALUE
@@ -1966,7 +1021,7 @@ rb_hash_set_default_proc(VALUE hash, VALUE proc)
 	SET_DEFAULT(hash, proc);
 	return proc;
     }
-    b = rb_check_convert_type_with_id(proc, T_DATA, "Proc", idTo_proc);
+    b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
     if (NIL_P(b) || !rb_obj_is_proc(b)) {
 	rb_raise(rb_eTypeError,
 		 "wrong default_proc type %s (expected Proc)",
@@ -2024,17 +1079,6 @@ rb_hash_index(VALUE hash, VALUE value)
     return rb_hash_key(hash, value);
 }
 
-int
-rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval)
-{
-    if (RHASH_AR_TABLE_P(hash)) {
-        return ar_delete(hash, pkey, pval);
-    }
-    else {
-        return st_delete(RHASH_ST_TABLE(hash), pkey, pval);
-    }
-}
-
 /*
  * delete a specified entry a given key.
  * if there is the corresponding entry, return a value of the entry.
@@ -2045,11 +1089,19 @@ rb_hash_delete_entry(VALUE hash, VALUE key)
 {
     st_data_t ktmp = (st_data_t)key, val;
 
-    if (rb_hash_stlike_delete(hash, &ktmp, &val)) {
-        return (VALUE)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;
     }
     else {
-        return Qundef;
+	return Qundef;
     }
 }
 
@@ -2144,29 +1196,14 @@ rb_hash_shift(VALUE hash)
     struct shift_var var;
 
     rb_hash_modify_check(hash);
-    if (RHASH_AR_TABLE_P(hash)) {
+    if (RHASH(hash)->ntbl) {
 	var.key = Qundef;
 	if (RHASH_ITER_LEV(hash) == 0) {
-            if (ar_shift(hash, &var.key, &var.val)) {
+	    if (st_shift(RHASH(hash)->ntbl, &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);
@@ -2212,9 +1249,8 @@ rb_hash_delete_if(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    if (!RHASH_TABLE_EMPTY_P(hash)) {
-        rb_hash_foreach(hash, delete_if_i, hash);
-    }
+    if (RHASH(hash)->ntbl)
+	rb_hash_foreach(hash, delete_if_i, hash);
     return hash;
 }
 
@@ -2237,7 +1273,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_SIZE(hash)) return Qnil;
+    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
     return hash;
 }
 
@@ -2284,38 +1320,6 @@ rb_hash_reject(VALUE hash)
 }
 
 /*
- *  call-seq:
- *     hsh.slice(*keys) -> a_hash
- *
- *  Returns a hash containing only the given keys and their values.
- *
- *     h = { a: 100, b: 200, c: 300 }
- *     h.slice(:a)           #=> {:a=>100}
- *     h.slice(:b, :c, :d)   #=> {:b=>200, :c=>300}
- */
-
-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.values_at(key, ...)   -> array
  *
@@ -2379,8 +1383,6 @@ select_i(VALUE key, VALUE value, VALUE result)
  *  call-seq:
  *     hsh.select {|key, value| block}   -> a_hash
  *     hsh.select                        -> an_enumerator
- *     hsh.filter {|key, value| block}   -> a_hash
- *     hsh.filter                        -> an_enumerator
  *
  *  Returns a new hash consisting of entries for which the block returns true.
  *
@@ -2389,8 +1391,6 @@ select_i(VALUE key, VALUE value, VALUE result)
  *     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}
- *
- *  Hash#filter is an alias for Hash#select.
  */
 
 VALUE
@@ -2419,13 +1419,9 @@ keep_if_i(VALUE key, VALUE value, VALUE hash)
  *  call-seq:
  *     hsh.select! {| key, value | block }  -> hsh or nil
  *     hsh.select!                          -> an_enumerator
- *     hsh.filter! {| key, value | block }  -> hsh or nil
- *     hsh.filter!                          -> an_enumerator
- *
- *  Equivalent to Hash#keep_if, but returns
- *  +nil+ if no changes were made.
  *
- *  Hash#filter! is an alias for Hash#select!.
+ *  Equivalent to <code>Hash#keep_if</code>, but returns
+ *  <code>nil</code> if no changes were made.
  */
 
 VALUE
@@ -2435,10 +1431,11 @@ rb_hash_select_bang(VALUE hash)
 
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    n = RHASH_SIZE(hash);
-    if (!n) return Qnil;
+    if (!RHASH(hash)->ntbl)
+        return Qnil;
+    n = RHASH(hash)->ntbl->num_entries;
     rb_hash_foreach(hash, keep_if_i, hash);
-    if (n == RHASH_SIZE(hash)) return Qnil;
+    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
     return hash;
 }
 
@@ -2448,11 +1445,10 @@ rb_hash_select_bang(VALUE hash)
  *     hsh.keep_if                          -> an_enumerator
  *
  *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
- *  evaluates to +false+.
+ *  evaluates to false.
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *  See also Hash#select!.
  */
 
 VALUE
@@ -2460,9 +1456,8 @@ rb_hash_keep_if(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    if (!RHASH_TABLE_EMPTY_P(hash)) {
-        rb_hash_foreach(hash, keep_if_i, hash);
-    }
+    if (RHASH(hash)->ntbl)
+	rb_hash_foreach(hash, keep_if_i, hash);
     return hash;
 }
 
@@ -2487,15 +1482,13 @@ VALUE
 rb_hash_clear(VALUE hash)
 {
     rb_hash_modify_check(hash);
-
-    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));
+    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);
     }
 
     return hash;
@@ -2516,22 +1509,11 @@ 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_TAINT|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 && !RB_OBJ_FROZEN(*key)) {
-	*key = rb_hash_key_str(*key);
+    if (!existing) {
+	*key = rb_str_new_frozen(*key);
     }
     return hash_aset(key, val, arg, existing);
 }
@@ -2570,15 +1552,14 @@ 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 (RHASH_TABLE_NULL_P(hash)) {
+    if (!tbl) {
 	if (iter_lev > 0) no_new_key();
-        ar_alloc_table(hash);
+	tbl = hash_tbl(hash);
     }
-
-    if (RHASH_TYPE(hash) == &identhash || rb_obj_class(key) != rb_cString) {
+    if (tbl->type == &identhash || rb_obj_class(key) != rb_cString) {
 	RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset, val);
     }
     else {
@@ -2599,6 +1580,8 @@ replace_i(VALUE key, VALUE val, VALUE hash)
 static VALUE
 rb_hash_initialize_copy(VALUE hash, VALUE hash2)
 {
+    st_table *ntbl;
+
     rb_hash_modify_check(hash);
     hash2 = to_hash(hash2);
 
@@ -2606,23 +1589,15 @@ rb_hash_initialize_copy(VALUE hash, VALUE hash2)
 
     if (hash == hash2) return hash;
 
-    if (RHASH_AR_TABLE_P(hash2)) {
-        if (RHASH_AR_TABLE_P(hash)) ar_free_and_clear_table(hash);
-        ar_copy(hash, hash2);
-        if (RHASH_AR_TABLE_SIZE(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 (RHASH_ST_TABLE_P(hash2)) {
-        if (RHASH_ST_TABLE_P(hash)) st_free_table(RHASH_ST_TABLE(hash));
-        RHASH_ST_TABLE_SET(hash, st_copy(RHASH_ST_TABLE(hash2)));
-        if (RHASH_ST_TABLE(hash)->num_entries)
-            rb_hash_rehash(hash);
-    }
-    else if (RHASH_AR_TABLE_P(hash)) {
-        ar_clear(hash);
-    }
-    else if (RHASH_ST_TABLE_P(hash)) {
-        st_clear(RHASH_ST_TABLE(hash));
+    else if (ntbl) {
+	st_clear(ntbl);
     }
 
     COPY_DEFAULT(hash, hash2);
@@ -2645,28 +1620,19 @@ rb_hash_initialize_copy(VALUE hash, VALUE hash2)
 static VALUE
 rb_hash_replace(VALUE hash, VALUE hash2)
 {
+    st_table *table2;
+
     rb_hash_modify_check(hash);
     if (hash == hash2) return hash;
     hash2 = to_hash(hash2);
 
     COPY_DEFAULT(hash, hash2);
 
-    rb_hash_clear(hash);
+    table2 = RHASH(hash2)->ntbl;
 
-    if (RHASH_AR_TABLE_P(hash)) {
-        if (RHASH_AR_TABLE_P(hash2)) {
-            ar_copy(hash, hash2);
-        }
-        else {
-            goto st_to_st;
-        }
-    }
-    else {
-        if (RHASH_AR_TABLE_P(hash2)) ar_force_convert_table(hash2, __FILE__, __LINE__);
-      st_to_st:
-        RHASH_TBL_RAW(hash)->type = RHASH_ST_TABLE(hash2)->type;
-        rb_hash_foreach(hash2, replace_i, hash);
-    }
+    rb_hash_clear(hash);
+    if (table2) hash_tbl(hash)->type = table2->type;
+    rb_hash_foreach(hash2, replace_i, hash);
 
     return hash;
 }
@@ -2679,12 +1645,9 @@ rb_hash_replace(VALUE hash, VALUE hash2)
  *  Returns the number of key-value pairs in the hash.
  *
  *     h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
- *     h.size          #=> 4
+ *     h.length        #=> 4
  *     h.delete("a")   #=> 200
- *     h.size          #=> 3
  *     h.length        #=> 3
- *
- *  Hash#length is an alias for Hash#size.
  */
 
 VALUE
@@ -2693,11 +1656,6 @@ 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:
@@ -2792,10 +1750,7 @@ each_pair_i(VALUE key, VALUE value)
 static int
 each_pair_i_fast(VALUE key, VALUE value)
 {
-    VALUE argv[2];
-    argv[0] = key;
-    argv[1] = value;
-    rb_yield_values2(2, argv);
+    rb_yield_values(2, key, value);
     return ST_CONTINUE;
 }
 
@@ -2833,82 +1788,6 @@ rb_hash_each_pair(VALUE hash)
 }
 
 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:
- *     hsh.transform_keys {|key| block } -> new_hash
- *     hsh.transform_keys                -> an_enumerator
- *
- *  Returns a new hash with the results of running the block once for
- *  every key.
- *  This method does not change the values.
- *
- *     h = { a: 1, b: 2, c: 3 }
- *     h.transform_keys {|k| k.to_s }  #=> { "a" => 1, "b" => 2, "c" => 3 }
- *     h.transform_keys(&:to_s)        #=> { "a" => 1, "b" => 2, "c" => 3 }
- *     h.transform_keys.with_index {|k, i| "#{k}.#{i}" }
- *                                     #=> { "a.0" => 1, "b.1" => 2, "c.2" => 3 }
- *
- *  If no block is given, an enumerator is returned instead.
- */
-static VALUE
-rb_hash_transform_keys(VALUE hash)
-{
-    VALUE result;
-
-    RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
-    result = rb_hash_new();
-    if (!RHASH_EMPTY_P(hash)) {
-        rb_hash_foreach(hash, transform_keys_i, result);
-    }
-
-    return result;
-}
-
-static VALUE rb_hash_flatten(int argc, VALUE *argv, VALUE hash);
-
-/*
- *  call-seq:
- *     hsh.transform_keys! {|key| block } -> hsh
- *     hsh.transform_keys!                -> an_enumerator
- *
- *  Invokes the given block once for each key in <i>hsh</i>, replacing it
- *  with the new key returned by the block, and then returns <i>hsh</i>.
- *  This method does not change the values.
- *
- *     h = { a: 1, b: 2, c: 3 }
- *     h.transform_keys! {|k| k.to_s }  #=> { "a" => 1, "b" => 2, "c" => 3 }
- *     h.transform_keys!(&:to_sym)      #=> { a: 1, b: 2, c: 3 }
- *     h.transform_keys!.with_index {|k, i| "#{k}.#{i}" }
- *                                      #=> { "a.0" => 1, "b.1" => 2, "c.2" => 3 }
- *
- *  If no block is given, an enumerator is returned instead.
- */
-static VALUE
-rb_hash_transform_keys_bang(VALUE hash)
-{
-    RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
-    rb_hash_modify_check(hash);
-    if (!RHASH_TABLE_EMPTY_P(hash)) {
-        long i;
-        VALUE pairs = rb_hash_flatten(0, NULL, hash);
-        rb_hash_clear(hash);
-        for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
-            VALUE key = RARRAY_AREF(pairs, i), new_key = rb_yield(key),
-                  val = RARRAY_AREF(pairs, i+1);
-            rb_hash_aset(hash, new_key, val);
-        }
-    }
-    return hash;
-}
-
-static int
 transform_values_i(VALUE key, VALUE value, VALUE result)
 {
     VALUE new_value = rb_yield(value);
@@ -2918,11 +1797,10 @@ transform_values_i(VALUE key, VALUE value, VALUE result)
 
 /*
  *  call-seq:
- *     hsh.transform_values {|value| block } -> new_hash
+ *     hsh.transform_values {|value| block } -> hsh
  *     hsh.transform_values                  -> an_enumerator
  *
- *  Returns a new hash with the results of running the block once for
- *  every value.
+ *  Return a new with the results of running block once for every value.
  *  This method does not change the keys.
  *
  *     h = { a: 1, b: 2, c: 3 }
@@ -2939,7 +1817,7 @@ rb_hash_transform_values(VALUE hash)
     VALUE result;
 
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
-    result = rb_hash_new_with_size(RHASH_SIZE(hash));
+    result = rb_hash_new();
     if (!RHASH_EMPTY_P(hash)) {
         rb_hash_foreach(hash, transform_values_i, result);
     }
@@ -2952,15 +1830,14 @@ rb_hash_transform_values(VALUE hash)
  *     hsh.transform_values! {|value| block } -> hsh
  *     hsh.transform_values!                  -> an_enumerator
  *
- *  Invokes the given block once for each value in <i>hsh</i>, replacing it
- *  with the new value returned by the block, and then returns <i>hsh</i>.
+ *  Return a new with the results of running block once for every value.
  *  This method does not change the keys.
  *
  *     h = { a: 1, b: 2, c: 3 }
  *     h.transform_values! {|v| v * v + 1 }  #=> { a: 2, b: 5, c: 10 }
- *     h.transform_values!(&:to_s)           #=> { a: "2", b: "5", c: "10" }
+ *     h.transform_values!(&:to_s)           #=> { a: "1", b: "2", c: "3" }
  *     h.transform_values!.with_index {|v, i| "#{v}.#{i}" }
- *                                           #=> { a: "2.0", b: "5.1", c: "10.2" }
+ *                                           #=> { a: "1.0", b: "2.1", c: "3.2" }
  *
  *  If no block is given, an enumerator is returned instead.
  */
@@ -2969,7 +1846,7 @@ 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))
+    if (RHASH(hash)->ntbl)
         rb_hash_foreach(hash, transform_values_i, hash);
     return hash;
 }
@@ -3072,58 +1949,17 @@ 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);
-    OBJ_INFECT(h, hash);
-    return h;
-}
-
 /*
  *  call-seq:
- *     hsh.to_h                         -> hsh or new_hash
- *     hsh.to_h {|key, value| block }   -> new_hash
+ *     hsh.to_h     -> hsh or new_hash
  *
  *  Returns +self+. If called on a subclass of Hash, converts
  *  the receiver to a Hash object.
- *
- *  If a block is given, the results of the block on each pair of
- *  the receiver will be used as pairs.
  */
 
 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);
@@ -3150,25 +1986,22 @@ keys_i(VALUE key, VALUE value, VALUE ary)
  *
  */
 
-MJIT_FUNC_EXPORTED VALUE
+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)) {
-        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);
+	st_table *table = RHASH(hash)->ntbl;
+
+	rb_gc_writebarrier_remember(keys);
+	RARRAY_PTR_USE(keys, ptr, {
+	    size = st_keys_check(table, ptr, size, Qundef);
+	});
 	rb_ary_set_len(keys, size);
     }
     else {
@@ -3207,19 +2040,12 @@ rb_hash_values(VALUE hash)
     if (size == 0) return values;
 
     if (ST_DATA_COMPATIBLE_P(VALUE)) {
-        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);
-            });
-        }
+	st_table *table = RHASH(hash)->ntbl;
+
+	rb_gc_writebarrier_remember(values);
+	RARRAY_PTR_USE(values, ptr, {
+	    size = st_values_check(table, ptr, size, Qundef);
+	});
 	rb_ary_set_len(values, size);
     }
     else {
@@ -3248,13 +2074,12 @@ rb_hash_values(VALUE hash)
  *  See also Enumerable#include?
  */
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_hash_has_key(VALUE hash, VALUE key)
 {
-    if (RHASH_AR_TABLE_P(hash) && ar_lookup(hash, key, 0)) {
-        return Qtrue;
-    }
-    else if (RHASH_ST_TABLE_P(hash) && st_lookup(RHASH_ST_TABLE(hash), key, 0)) {
+    if (!RHASH(hash)->ntbl)
+        return Qfalse;
+    if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
 	return Qtrue;
     }
     return Qfalse;
@@ -3281,8 +2106,8 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
  *  in <i>hsh</i>.
  *
  *     h = { "a" => 100, "b" => 200 }
- *     h.value?(100)   #=> true
- *     h.value?(999)   #=> false
+ *     h.has_value?(100)   #=> true
+ *     h.has_value?(999)   #=> false
  */
 
 static VALUE
@@ -3298,7 +2123,7 @@ rb_hash_has_value(VALUE hash, VALUE val)
 
 struct equal_data {
     VALUE result;
-    VALUE hash;
+    st_table *tbl;
     int eql;
 };
 
@@ -3308,15 +2133,10 @@ eql_i(VALUE key, VALUE val1, VALUE arg)
     struct equal_data *data = (struct equal_data *)arg;
     st_data_t val2;
 
-    if (RHASH_AR_TABLE_P(data->hash) && !ar_lookup(data->hash, key, &val2)) {
+    if (!st_lookup(data->tbl, key, &val2)) {
 	data->result = Qfalse;
 	return ST_STOP;
     }
-    else if (RHASH_ST_TABLE_P(data->hash) && !st_lookup(RHASH_ST_TABLE(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;
@@ -3361,23 +2181,19 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
     }
     if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
 	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 (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
+        return Qtrue;
+    if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
+	return Qfalse;
 #if 0
     if (!(rb_equal(RHASH_IFNONE(hash1), RHASH_IFNONE(hash2)) &&
 	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
 	return Qfalse;
 #endif
-    return Qtrue;
+
+    data.tbl = RHASH(hash2)->ntbl;
+    data.eql = eql;
+    return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
 }
 
 /*
@@ -3458,7 +2274,7 @@ rb_hash_hash(VALUE hash)
 	rb_hash_foreach(hash, hash_i, (VALUE)&hval);
     }
     hval = rb_hash_end(hval);
-    return ST2FIX(hval);
+    return INT2FIX(hval);
 }
 
 static int
@@ -3501,7 +2317,7 @@ rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
 static VALUE
 rb_hash_invert(VALUE hash)
 {
-    VALUE h = rb_hash_new_with_size(RHASH_SIZE(hash));
+    VALUE h = rb_hash_new();
 
     rb_hash_foreach(hash, rb_hash_invert_i, h);
     return h;
@@ -3559,64 +2375,39 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.merge!(other_hash1, other_hash2, ...)              -> hsh
- *     hsh.update(other_hash1, other_hash2, ...)              -> hsh
- *     hsh.merge!(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
- *                                                            -> hsh
- *     hsh.update(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
- *                                                            -> hsh
- *
- *  Adds the contents of the given hashes to the receiver.
+ *     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
  *
- *  If no block is given, entries with duplicate keys are overwritten
- *  with the values from each +other_hash+ successively,
- *  otherwise the value for each duplicate key is determined by
- *  calling the block with the key, its value in the receiver and
- *  its value in each +other_hash+.
+ *  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 }
- *     h1.merge!          #=> {"a"=>100, "b"=>200}
- *     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" => 246, "c" => 300 }
- *     h1.merge!(h2)      #=> {"a"=>100, "b"=>246, "c"=>300}
- *     h1                 #=> {"a"=>100, "b"=>246, "c"=>300}
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 246, "c" => 300 }
- *     h3 = { "b" => 357, "d" => 400 }
- *     h1.merge!(h2, h3)
- *                        #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
- *     h1                 #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 246, "c" => 300 }
- *     h3 = { "b" => 357, "d" => 400 }
- *     h1.merge!(h2, h3) {|key, v1, v2| v1 }
- *                        #=> {"a"=>100, "b"=>200, "c"=>300, "d"=>400}
- *     h1                 #=> {"a"=>100, "b"=>200, "c"=>300, "d"=>400}
- *
- *  Hash#update is an alias for Hash#merge!.
+ *     h2 = { "b" => 254, "c" => 300 }
+ *     h1.merge!(h2) { |key, v1, v2| v1 }
+ *                     #=> {"a"=>100, "b"=>200, "c"=>300}
  */
 
 static VALUE
-rb_hash_update(int argc, VALUE *argv, VALUE self)
+rb_hash_update(VALUE hash1, VALUE hash2)
 {
-    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);
-       }
+    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);
     }
-    return self;
+    return hash1;
 }
 
 struct update_func_arg {
@@ -3675,39 +2466,28 @@ rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func)
 
 /*
  *  call-seq:
- *     hsh.merge(other_hash1, other_hash2, ...)           -> new_hash
- *     hsh.merge(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
- *                                                        -> new_hash
- *
- *  Returns a new hash that combines the contents of the receiver and
- *  the contents of the given hashes.
+ *     hsh.merge(other_hash)                              -> new_hash
+ *     hsh.merge(other_hash){|key, oldval, newval| block} -> new_hash
  *
- *  If no block is given, entries with duplicate keys are overwritten
- *  with the values from each +other_hash+ successively,
- *  otherwise the value for each duplicate key is determined by
- *  calling the block with the key, its value in the receiver and
- *  its value in each +other_hash+.
- *
- *  When called without any argument, returns a copy of the receiver.
+ *  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" => 246, "c" => 300 }
- *     h3 = { "b" => 357, "d" => 400 }
- *     h1.merge          #=> {"a"=>100, "b"=>200}
- *     h1.merge(h2)      #=> {"a"=>100, "b"=>246, "c"=>300}
- *     h1.merge(h2, h3)  #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
- *     h1.merge(h2) {|key, oldval, newval| newval - oldval}
- *                       #=> {"a"=>100, "b"=>46,  "c"=>300}
- *     h1.merge(h2, h3) {|key, oldval, newval| newval - oldval}
- *                       #=> {"a"=>100, "b"=>311, "c"=>300, "d"=>400}
- *     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}
  *
  */
 
 static VALUE
-rb_hash_merge(int argc, VALUE *argv, VALUE self)
+rb_hash_merge(VALUE hash1, VALUE hash2)
 {
-    return rb_hash_update(argc, argv, rb_hash_dup(self));
+    return rb_hash_update(rb_obj_dup(hash1), hash2);
 }
 
 static int
@@ -3732,8 +2512,7 @@ static VALUE
 reset_hash_type(VALUE arg)
 {
     struct reset_hash_type_arg *p = (struct reset_hash_type_arg *)arg;
-    HASH_ASSERT(RHASH_ST_TABLE_P(p->hash));
-    RHASH_ST_TABLE(p->hash)->type = p->orighash;
+    RHASH(p->hash)->ntbl->type = p->orighash;
     return Qundef;
 }
 
@@ -3771,10 +2550,7 @@ rb_hash_assoc(VALUE hash, VALUE key)
     VALUE args[2];
 
     if (RHASH_EMPTY_P(hash)) return Qnil;
-
-    ar_force_convert_table(hash, __FILE__, __LINE__);
-    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
-    table = RHASH_ST_TABLE(hash);
+    table = RHASH(hash)->ntbl;
     orighash = table->type;
 
     if (orighash != &identhash) {
@@ -3784,7 +2560,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;
@@ -3868,23 +2644,17 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
 {
     VALUE ary;
 
-    rb_check_arity(argc, 0, 1);
-
     if (argc) {
-	int level = NUM2INT(argv[0]);
-
+	int level = NUM2INT(*argv);
 	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);
-	level--;
-
-	if (level > 0) {
-	    VALUE ary_flatten_level = INT2FIX(level);
-	    rb_funcallv(ary, id_flatten_bang, 1, &ary_flatten_level);
+	if (level - 1 > 0) {
+	    *argv = INT2FIX(level - 1);
+	    rb_funcallv(ary, id_flatten_bang, argc, argv);
 	}
 	else if (level < 0) {
-	    /* flatten recursively */
 	    rb_funcallv(ary, id_flatten_bang, 0, 0);
 	}
     }
@@ -3896,71 +2666,7 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
     return ary;
 }
 
-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.compact -> new_hash
- *
- *  Returns a new hash with the nil values/key pairs removed
- *
- *     h = { a: 1, b: false, c: nil }
- *     h.compact     #=> { a: 1, b: false }
- *     h             #=> { a: 1, b: false, c: nil }
- *
- */
-
-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:
- *     hsh.compact! -> hsh or nil
- *
- *  Removes all nil values from the hash.
- *  Returns nil if no changes were made, otherwise returns the hash.
- *
- *     h = { a: 1, b: false, c: nil }
- *     h.compact!     #=> { a: 1, b: false }
- *
- */
-
-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 VALUE rb_hash_compare_by_id_p(VALUE hash);
 
 /*
  *  call-seq:
@@ -3981,24 +2687,10 @@ rb_hash_compact_bang(VALUE hash)
 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_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);
-
+    rb_hash_modify(hash);
+    RHASH(hash)->ntbl->type = &identhash;
+    rb_hash_rehash(hash);
     return hash;
 }
 
@@ -4011,22 +2703,22 @@ rb_hash_compare_by_id(VALUE hash)
  *
  */
 
-MJIT_FUNC_EXPORTED VALUE
+static VALUE
 rb_hash_compare_by_id_p(VALUE hash)
 {
-    if (RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type == &identhash) {
-	return Qtrue;
-    }
-    else {
+    if (!RHASH(hash)->ntbl)
         return Qfalse;
+    if (RHASH(hash)->ntbl->type == &identhash) {
+	return Qtrue;
     }
+    return Qfalse;
 }
 
 VALUE
 rb_ident_hash_new(void)
 {
     VALUE hash = rb_hash_new();
-    RHASH_ST_TABLE_SET(hash, st_init_table(&identhash));
+    RHASH(hash)->ntbl = st_init_table(&identhash);
     return hash;
 }
 
@@ -4064,74 +2756,50 @@ 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
- *     hsh.any?(pattern)                     -> true or false
  *
  *  See also Enumerable#any?
  */
 
 static VALUE
-rb_hash_any_p(int argc, VALUE *argv, VALUE hash)
+rb_hash_any_p(VALUE hash)
 {
-    VALUE args[2];
-    args[0] = Qfalse;
+    VALUE ret = Qfalse;
 
-    rb_check_arity(argc, 0, 1);
     if (RHASH_EMPTY_P(hash)) return Qfalse;
-    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);
-    }
-    else {
-	if (!rb_block_given_p()) {
-	    /* yields pairs, never false */
-	    return Qtrue;
-	}
-	if (rb_block_arity() > 1)
-	    rb_hash_foreach(hash, any_p_i_fast, (VALUE)args);
-	else
-	    rb_hash_foreach(hash, any_p_i, (VALUE)args);
+    if (!rb_block_given_p()) {
+	/* yields pairs, never false */
+	return Qtrue;
     }
-    return args[0];
+    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;
 }
 
 /*
  * call-seq:
  *   hsh.dig(key, ...)                 -> object
  *
- * Extracts the nested value specified by the sequence of <i>key</i>
+ * 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
+ *   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: Integer does not have #dig method
- *   g.dig(:foo, :bar)           #=> TypeError: no implicit conversion of Symbol into Integer
+ *   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
  */
 
-static VALUE
+VALUE
 rb_hash_dig(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
@@ -4252,19 +2920,6 @@ hash_proc_call(VALUE key, VALUE hash, int argc, const VALUE *argv, VALUE passed_
     return rb_hash_aref(hash, *argv);
 }
 
-/*
- * call-seq:
- *   hash.to_proc -> proc
- *
- * Returns a Proc which maps keys to values.
- *
- *   h = {a:1, b:2}
- *   hp = h.to_proc
- *   hp.call(:a)          #=> 1
- *   hp.call(:b)          #=> 2
- *   hp.call(:c)          #=> nil
- *   [:a, :b, :c].map(&h) #=> [1, 2, nil]
- */
 static VALUE
 rb_hash_to_proc(VALUE hash)
 {
@@ -4288,70 +2943,11 @@ add_new_i(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
 int
 rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val)
 {
-    st_table *tbl;
-    int ret = 0;
+    st_table *tbl = rb_hash_tbl_raw(hash);
     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);
-    }
-}
-
-MJIT_FUNC_EXPORTED 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 int path_tainted = -1;
@@ -4398,17 +2994,20 @@ 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)
+{
+    return rb_str_conv_enc_opts(str, NULL, enc,
+				ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE, Qnil);
+}
+#endif
+
 static VALUE
 env_enc_str_new(const char *ptr, long len, rb_encoding *enc)
 {
 #ifdef _WIN32
-    rb_encoding *internal = rb_default_internal_encoding();
-    const int ecflags = ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE;
-    rb_encoding *utf8 = rb_utf8_encoding();
-    VALUE str = rb_enc_str_new(NULL, 0, (internal ? internal : enc));
-    if (NIL_P(rb_str_cat_conv_enc_opts(str, 0, ptr, len, utf8, ecflags, Qnil))) {
-        rb_str_initialize(str, ptr, len, NULL);
-    }
+    VALUE str = env_str_transcode(rb_utf8_str_new(ptr, len), enc);
 #else
     VALUE str = rb_external_str_new_with_enc(ptr, len, enc);
 #endif
@@ -4439,9 +3038,6 @@ env_str_new2(const char *ptr)
 
 static int env_path_tainted(const char *);
 
-static const char TZ_ENV[] = "TZ";
-extern bool ruby_tz_uptodate_p;
-
 static rb_encoding *
 env_encoding_for(const char *name, const char *ptr)
 {
@@ -4523,9 +3119,6 @@ env_delete(VALUE obj, VALUE name)
 	    RB_GC_GUARD(name);
 	    path_tainted = 0;
 	}
-	else if (ENVMATCH(nam, TZ_ENV)) {
-	    ruby_tz_uptodate_p = FALSE;
-	}
 	return value;
     }
     return Qnil;
@@ -4533,8 +3126,8 @@ env_delete(VALUE obj, VALUE name)
 
 /*
  * call-seq:
- *   ENV.delete(name)                  -> value
- *   ENV.delete(name) { |name| block } -> value
+ *   ENV.delete(name)            -> value
+ *   ENV.delete(name) { |name| } -> value
  *
  * 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
@@ -4573,14 +3166,14 @@ rb_f_getenv(VALUE obj, VALUE name)
 /*
  * :yield: missing_name
  * call-seq:
- *   ENV.fetch(name)                          -> value
- *   ENV.fetch(name, default)                 -> value
- *   ENV.fetch(name) { |missing_name| block } -> value
+ *   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 KeyError is raised.  If a block is given it is called with
+ * 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.
  */
@@ -4602,7 +3195,7 @@ env_fetch(int argc, VALUE *argv)
     if (!env) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_key_err_raise(rb_sprintf("key not found: \"%"PRIsVALUE"\"", key), envtbl, key);
+	    rb_raise(rb_eKeyError, "key not found: \"%"PRIsVALUE"\"", key);
 	}
 	return argv[1];
     }
@@ -4669,33 +3262,10 @@ 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
 
@@ -4735,11 +3305,16 @@ 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;
-	len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
-	if (check_envsize((size_t)len + len2)) { /* len and len2 include '\0' */
+	if (!p) goto fail; /* never happen */
+	n = lstrlen(name) + 2 + strlen(value) + getenvsize(p);
+	FreeEnvironmentStringsW(p);
+	if (n >= getenvblocksize()) {
 	    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);
@@ -4903,9 +3478,6 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
 	    path_tainted_p(value);
 	}
     }
-    else if (ENVMATCH(name, TZ_ENV)) {
-	ruby_tz_uptodate_p = FALSE;
-    }
     return val;
 }
 
@@ -4952,8 +3524,8 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
 
 /*
  * call-seq:
- *   ENV.each_key { |name| block } -> Hash
- *   ENV.each_key                  -> Enumerator
+ *   ENV.each_key { |name| } -> Hash
+ *   ENV.each_key            -> Enumerator
  *
  * Yields each environment variable name.
  *
@@ -5000,8 +3572,8 @@ env_values(void)
 
 /*
  * call-seq:
- *   ENV.each_value { |value| block } -> Hash
- *   ENV.each_value                   -> Enumerator
+ *   ENV.each_value { |value| } -> Hash
+ *   ENV.each_value             -> Enumerator
  *
  * Yields each environment variable +value+.
  *
@@ -5023,10 +3595,10 @@ env_each_value(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.each      { |name, value| block } -> Hash
- *   ENV.each                              -> Enumerator
- *   ENV.each_pair { |name, value| block } -> Hash
- *   ENV.each_pair                         -> Enumerator
+ *   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+.
  *
@@ -5068,10 +3640,10 @@ env_each_pair(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.reject! { |name, value| block } -> ENV or nil
- *   ENV.reject!                         -> Enumerator
+ *   ENV.reject! { |name, value| } -> ENV or nil
+ *   ENV.reject!                   -> Enumerator
  *
- * Equivalent to ENV.delete_if but returns +nil+ if no changes were made.
+ * Equivalent to ENV#delete_if but returns +nil+ if no changes were made.
  *
  * Returns an Enumerator if no block was given.
  */
@@ -5102,8 +3674,8 @@ env_reject_bang(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.delete_if { |name, value| block } -> Hash
- *   ENV.delete_if                         -> Enumerator
+ *   ENV.delete_if { |name, value| } -> Hash
+ *   ENV.delete_if                   -> Enumerator
  *
  * Deletes every environment variable for which the block evaluates to +true+.
  *
@@ -5139,16 +3711,12 @@ env_values_at(int argc, VALUE *argv)
 
 /*
  * call-seq:
- *   ENV.select { |name, value| block } -> Hash
- *   ENV.select                         -> Enumerator
- *   ENV.filter { |name, value| block } -> Hash
- *   ENV.filter                         -> Enumerator
+ *   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.filter is an alias for ENV.select.
  */
 static VALUE
 env_select(VALUE ehash)
@@ -5176,14 +3744,10 @@ env_select(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.select! { |name, value| block } -> ENV or nil
- *   ENV.select!                         -> Enumerator
- *   ENV.filter! { |name, value| block } -> ENV or nil
- *   ENV.filter!                         -> Enumerator
+ *   ENV.select! { |name, value| } -> ENV or nil
+ *   ENV.select!                   -> Enumerator
  *
- * Equivalent to ENV.keep_if but returns +nil+ if no changes were made.
- *
- * ENV.filter! is an alias for ENV.select!.
+ * Equivalent to ENV#keep_if but returns +nil+ if no changes were made.
  */
 static VALUE
 env_select_bang(VALUE ehash)
@@ -5212,8 +3776,8 @@ env_select_bang(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.keep_if { |name, value| block } -> Hash
- *   ENV.keep_if                         -> Enumerator
+ *   ENV.keep_if { |name, value| } -> Hash
+ *   ENV.keep_if                   -> Enumerator
  *
  * Deletes every environment variable where the block evaluates to +false+.
  *
@@ -5228,35 +3792,6 @@ env_keep_if(VALUE ehash)
 }
 
 /*
- *  call-seq:
- *     ENV.slice(*keys) -> a_hash
- *
- *  Returns a hash containing only the given keys from ENV and their values.
- *
- *     ENV.slice("TERM","HOME")  #=> {"TERM"=>"xterm-256color", "HOME"=>"/Users/rhc"}
- */
-static VALUE
-env_slice(int argc, VALUE *argv)
-{
-    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;
-}
-
-/*
  * call-seq:
  *   ENV.clear
  *
@@ -5556,6 +4091,7 @@ env_index(VALUE dmy, VALUE value)
 /*
  * call-seq:
  *   ENV.to_hash -> hash
+ *   ENV.to_h    -> hash
  *
  * Creates a hash with a copy of the environment variables.
  *
@@ -5582,28 +4118,10 @@ env_to_hash(void)
 
 /*
  * call-seq:
- *   ENV.to_h                        -> hash
- *   ENV.to_h {|name, value| block } -> hash
- *
- * Creates a hash with a copy of the environment variables.
+ *   ENV.reject { |name, value| } -> Hash
+ *   ENV.reject                   -> Enumerator
  *
- */
-static VALUE
-env_to_h(void)
-{
-    VALUE hash = env_to_hash();
-    if (rb_block_given_p()) {
-        hash = rb_hash_to_h_block(hash);
-    }
-    return hash;
-}
-
-/*
- * call-seq:
- *   ENV.reject { |name, value| block } -> Hash
- *   ENV.reject                         -> Enumerator
- *
- * Same as ENV.delete_if, but works on (and returns) a copy of the
+ * Same as ENV#delete_if, but works on (and returns) a copy of the
  * environment.
  */
 static VALUE
@@ -5699,8 +4217,8 @@ env_update_i(VALUE key, VALUE val)
 
 /*
  * call-seq:
- *   ENV.update(hash)                                        -> Hash
- *   ENV.update(hash) { |name, old_value, new_value| block } -> Hash
+ *   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
@@ -5767,7 +4285,7 @@ env_update(VALUE env, VALUE hash)
  *  Hashes are an easy way to represent data structures, such as
  *
  *    books         = {}
- *    books[:matz]  = "The Ruby Programming Language"
+ *    books[:matz]  = "The Ruby Language"
  *    books[:black] = "The Well-Grounded Rubyist"
  *
  *  Hashes are also commonly used as a way to have named parameters in
@@ -5835,9 +4353,6 @@ Init_Hash(void)
 #undef rb_intern
 #define rb_intern(str) rb_intern_const(str)
 
-    RUBY_ASSERT(RESERVED_HASH_VAL == st_reserved_hash_val);
-    RUBY_ASSERT(RESERVED_HASH_SUBSTITUTION_VAL == st_reserved_hash_substitution_val);
-
     id_hash = rb_intern("hash");
     id_yield = rb_intern("yield");
     id_default = rb_intern("default");
@@ -5850,83 +4365,76 @@ 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_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_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, "transform_keys", rb_hash_transform_keys, 0);
-    rb_define_method(rb_cHash, "transform_keys!", rb_hash_transform_keys_bang, 0);
+    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, "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, "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,"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, "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, -1);
+    rb_define_method(rb_cHash, "any?", rb_hash_any_p, 0);
     rb_define_method(rb_cHash, "dig", rb_hash_dig, -1);
 
     rb_define_method(rb_cHash, "<=", rb_hash_le, 1);
@@ -5947,51 +4455,48 @@ 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, "slice", env_slice, -1);
-    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, "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, "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_h, 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, 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);
 
     /*
      * ENV is a Hash-like accessor for environment variables.
diff --git a/hrtime.h b/hrtime.h
deleted file mode 100644
index f133bdb1ac..0000000000
--- a/hrtime.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#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
index 1087105585..1087105585 100644
--- a/ia64.S
+++ b/ia64.s
diff --git a/id_table.c b/id_table.c
index 74c9e756a0..f0f37cc913 100644
--- a/id_table.c
+++ b/id_table.c
@@ -11,8 +11,205 @@
 #endif
 #include "ruby_assert.h"
 
-typedef rb_id_serial_t id_key_t;
+/*
+ * 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)
 {
@@ -24,7 +221,932 @@ 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_ITERATOR_RESULT_END: \
+      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 */
@@ -37,7 +1159,7 @@ typedef struct rb_id_item {
     VALUE    val;
 } item_t;
 
-struct rb_id_table {
+struct hash_id_table {
     int capa;
     int num;
     int used;
@@ -50,7 +1172,7 @@ struct rb_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 rb_id_table *tbl, int i, id_key_t key)
+ITEM_SET_KEY(struct hash_id_table *tbl, int i, id_key_t key)
 {
     tbl->items[i].key = key;
 }
@@ -60,7 +1182,7 @@ ITEM_SET_KEY(struct rb_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 rb_id_table *tbl, int i, id_key_t key)
+ITEM_SET_KEY(struct hash_id_table *tbl, int i, id_key_t key)
 {
     tbl->items[i].key = (key << 1) | ITEM_COLLIDED(tbl, i);
 }
@@ -79,10 +1201,10 @@ round_capa(int capa)
     return (capa + 1) << 2;
 }
 
-static struct rb_id_table *
-rb_id_table_init(struct rb_id_table *tbl, int capa)
+static struct hash_id_table *
+hash_id_table_init(struct hash_id_table *tbl, int capa)
 {
-    MEMZERO(tbl, struct rb_id_table, 1);
+    MEMZERO(tbl, struct hash_id_table, 1);
     if (capa > 0) {
 	capa = round_capa(capa);
 	tbl->capa = (int)capa;
@@ -91,42 +1213,44 @@ rb_id_table_init(struct rb_id_table *tbl, int capa)
     return tbl;
 }
 
-struct rb_id_table *
-rb_id_table_create(size_t capa)
+#ifndef ID_TABLE_USE_MIX
+static struct hash_id_table *
+hash_id_table_create(size_t capa)
 {
-    struct rb_id_table *tbl = ALLOC(struct rb_id_table);
-    return rb_id_table_init(tbl, (int)capa);
+    struct hash_id_table *tbl = ALLOC(struct hash_id_table);
+    return hash_id_table_init(tbl, (int)capa);
 }
+#endif
 
-void
-rb_id_table_free(struct rb_id_table *tbl)
+static void
+hash_id_table_free(struct hash_id_table *tbl)
 {
     xfree(tbl->items);
     xfree(tbl);
 }
 
-void
-rb_id_table_clear(struct rb_id_table *tbl)
+static void
+hash_id_table_clear(struct hash_id_table *tbl)
 {
     tbl->num = 0;
     tbl->used = 0;
     MEMZERO(tbl->items, item_t, tbl->capa);
 }
 
-size_t
-rb_id_table_size(const struct rb_id_table *tbl)
+static size_t
+hash_id_table_size(const struct hash_id_table *tbl)
 {
     return (size_t)tbl->num;
 }
 
-size_t
-rb_id_table_memsize(const struct rb_id_table *tbl)
+static size_t
+hash_id_table_memsize(const struct hash_id_table *tbl)
 {
-    return sizeof(item_t) * tbl->capa + sizeof(struct rb_id_table);
+    return sizeof(item_t) * tbl->capa + sizeof(struct hash_id_table);
 }
 
 static int
-hash_table_index(struct rb_id_table* tbl, id_key_t key)
+hash_table_index(struct hash_id_table* tbl, id_key_t key)
 {
     if (tbl->capa > 0) {
 	int mask = tbl->capa - 1;
@@ -144,7 +1268,7 @@ hash_table_index(struct rb_id_table* tbl, id_key_t key)
 }
 
 static void
-hash_table_raw_insert(struct rb_id_table *tbl, id_key_t key, VALUE val)
+hash_table_raw_insert(struct hash_id_table *tbl, id_key_t key, VALUE val)
 {
     int mask = tbl->capa - 1;
     int ix = key & mask;
@@ -164,7 +1288,7 @@ hash_table_raw_insert(struct rb_id_table *tbl, id_key_t key, VALUE val)
 }
 
 static int
-hash_delete_index(struct rb_id_table *tbl, int ix)
+hash_delete_index(struct hash_id_table *tbl, int ix)
 {
     if (ix >= 0) {
 	if (!ITEM_COLLIDED(tbl, ix)) {
@@ -174,20 +1298,19 @@ hash_delete_index(struct rb_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 rb_id_table* tbl)
+hash_table_extend(struct hash_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 rb_id_table tmp_tbl = {0, 0, 0};
+	struct hash_id_table tmp_tbl = {0, 0, 0};
 	if (new_cap < tbl->capa) {
 	    new_cap = round_capa(tbl->used + (tbl->used >> 1));
 	}
@@ -207,7 +1330,7 @@ hash_table_extend(struct rb_id_table* tbl)
 
 #if ID_TABLE_DEBUG && 0
 static void
-hash_table_show(struct rb_id_table *tbl)
+hash_table_show(struct hash_id_table *tbl)
 {
     const id_key_t *keys = tbl->keys;
     const int capa = tbl->capa;
@@ -222,8 +1345,8 @@ hash_table_show(struct rb_id_table *tbl)
 }
 #endif
 
-int
-rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp)
+static int
+hash_id_table_lookup(struct hash_id_table *tbl, ID id, VALUE *valp)
 {
     id_key_t key = id2key(id);
     int index = hash_table_index(tbl, key);
@@ -238,7 +1361,7 @@ rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp)
 }
 
 static int
-rb_id_table_insert_key(struct rb_id_table *tbl, const id_key_t key, const VALUE val)
+hash_id_table_insert_key(struct hash_id_table *tbl, const id_key_t key, const VALUE val)
 {
     const int index = hash_table_index(tbl, key);
 
@@ -252,22 +1375,22 @@ rb_id_table_insert_key(struct rb_id_table *tbl, const id_key_t key, const VALUE
     return TRUE;
 }
 
-int
-rb_id_table_insert(struct rb_id_table *tbl, ID id, VALUE val)
+static int
+hash_id_table_insert(struct hash_id_table *tbl, ID id, VALUE val)
 {
-    return rb_id_table_insert_key(tbl, id2key(id), val);
+    return hash_id_table_insert_key(tbl, id2key(id), val);
 }
 
-int
-rb_id_table_delete(struct rb_id_table *tbl, ID id)
+static int
+hash_id_table_delete(struct hash_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);
 }
 
-void
-rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
+static void
+hash_id_table_foreach(struct hash_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
 {
     int i, capa = tbl->capa;
 
@@ -285,8 +1408,8 @@ rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, v
     }
 }
 
-void
-rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
+static void
+hash_id_table_foreach_values(struct hash_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
 {
     int i, capa = tbl->capa;
 
@@ -301,3 +1424,169 @@ rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_f
 	}
     }
 }
+#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/include/ruby/backward.h b/include/ruby/backward.h
index 262ed2cef1..4574cb98da 100644
--- a/include/ruby/backward.h
+++ b/include/ruby/backward.h
@@ -1,55 +1,6 @@
 #ifndef RUBY_RUBY_BACKWARD_H
 #define RUBY_RUBY_BACKWARD_H 1
 
-#define RClass RClassDeprecated
-#ifndef __cplusplus
-DEPRECATED_TYPE(("RClass is internal use only"),
-struct RClass {
-    struct RBasic basic;
-});
-#endif
-
-#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)));
-
-/* 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);
-
-/* struct.c */
-DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr);
-
-/* variable.c */
-DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table);
-NORETURN(ERRORFUNC(("internal function"), VALUE rb_mod_const_missing(VALUE, VALUE)));
-
-/* from version.c */
 #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
 # define RUBY_SHOW_COPYRIGHT_TO_DIE 1
 #endif
diff --git a/include/ruby/debug.h b/include/ruby/debug.h
index 8a831e61ab..9bfc9b9a83 100644
--- a/include/ruby/debug.h
+++ b/include/ruby/debug.h
@@ -75,7 +75,6 @@ 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);
@@ -83,11 +82,7 @@ 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
- * rb_postponed_job_register and rb_postponed_job_register_one are
- * async-signal-safe and used via SIGPROF by the "stackprof" RubyGem
- */
+/* Postponed Job API */
 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);
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index cbf5537790..89e549ec19 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -29,6 +29,10 @@ extern "C" {
 #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
@@ -58,26 +62,12 @@ extern "C" {
 #endif
 
 #ifndef GCC_VERSION_SINCE
-# if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
-#  define GCC_VERSION_SINCE(major, minor, patchlevel) \
-    ((__GNUC__ > (major)) ||  \
-     ((__GNUC__ == (major) && \
-       ((__GNUC_MINOR__ > (minor)) || \
-        (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))))
-# else
-#  define GCC_VERSION_SINCE(major, minor, patchlevel) 0
-# endif
-#endif
-#ifndef GCC_VERSION_BEFORE
-# if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
-#  define GCC_VERSION_BEFORE(major, minor, patchlevel) \
-    ((__GNUC__ < (major)) ||  \
-     ((__GNUC__ == (major) && \
-       ((__GNUC_MINOR__ < (minor)) || \
-        (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ <= (patchlevel))))))
-# else
-#  define GCC_VERSION_BEFORE(major, minor, patchlevel) 0
-# endif
+#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 */
@@ -89,24 +79,9 @@ extern "C" {
 #define RB_UNLIKELY(x) (x)
 #endif /* __GNUC__ >= 3 */
 
-/*
-  cold attribute for code layout improvements
-  RUBY_FUNC_ATTRIBUTE not used because MSVC does not like nested func macros
- */
-#if defined(__clang__) || GCC_VERSION_SINCE(4, 3, 0)
-#define COLDFUNC __attribute__((cold))
-#else
-#define COLDFUNC
-#endif
-
 #ifdef __GNUC__
-#if defined __MINGW_PRINTF_FORMAT
-#define PRINTF_ARGS(decl, string_index, first_to_check) \
-  decl __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, first_to_check)))
-#else
 #define PRINTF_ARGS(decl, string_index, first_to_check) \
   decl __attribute__((format(printf, string_index, first_to_check)))
-#endif
 #else
 #define PRINTF_ARGS(decl, string_index, first_to_check) decl
 #endif
@@ -150,9 +125,6 @@ extern "C" {
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STDALIGN_H
-# include <stdalign.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -218,89 +190,12 @@ RUBY_SYMBOL_EXPORT_BEGIN
 # define RUBY_ATTR_ALLOC_SIZE(params)
 #endif
 
-void *ruby_xmalloc(size_t) RUBY_ATTR_ALLOC_SIZE((1));
-void *ruby_xmalloc2(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *ruby_xcalloc(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *ruby_xrealloc(void*,size_t) RUBY_ATTR_ALLOC_SIZE((2));
-void *ruby_xrealloc2(void*,size_t,size_t) RUBY_ATTR_ALLOC_SIZE((2,3));
-void ruby_xfree(void*);
-
-#ifndef USE_GC_MALLOC_OBJ_INFO_DETAILS
-#define USE_GC_MALLOC_OBJ_INFO_DETAILS 0
-#endif
-
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-
-void *ruby_xmalloc_body(size_t) RUBY_ATTR_ALLOC_SIZE((1));
-void *ruby_xmalloc2_body(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *ruby_xcalloc_body(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *ruby_xrealloc_body(void*,size_t) RUBY_ATTR_ALLOC_SIZE((2));
-void *ruby_xrealloc2_body(void*,size_t,size_t) RUBY_ATTR_ALLOC_SIZE((2,3));
-
-#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__)
-
-extern const char *ruby_malloc_info_file;
-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
+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
@@ -365,32 +260,12 @@ ruby_xrealloc2_with_location(void *ptr, size_t s1, size_t s2, const char *file,
 #define RUBY_FUNC_EXPORTED
 #endif
 
-/* These macros are used for functions which are exported only for MJIT
-   and NOT ensured to be exported in future versions. */
-#define MJIT_FUNC_EXPORTED RUBY_FUNC_EXPORTED
-#define MJIT_SYMBOL_EXPORT_BEGIN RUBY_SYMBOL_EXPORT_BEGIN
-#define MJIT_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END
-
-#if defined(MJIT_HEADER) && defined(_MSC_VER)
-# undef MJIT_FUNC_EXPORTED
-# define MJIT_FUNC_EXPORTED static
-#endif
-
 #ifndef RUBY_EXTERN
 #define RUBY_EXTERN extern
 #endif
 
 #ifndef EXTERN
-# if defined __GNUC__
-#   define EXTERN _Pragma("message \"EXTERN is deprecated, use RUBY_EXTERN instead\""); \
-    RUBY_EXTERN
-# elif defined _MSC_VER
-#   define EXTERN __pragma(message(__FILE__"("STRINGIZE(__LINE__)"): warning: "\
-				   "EXTERN is deprecated, use RUBY_EXTERN instead")); \
-    RUBY_EXTERN
-# else
-#   define EXTERN <-<-"EXTERN is deprecated, use RUBY_EXTERN instead"->->
-# endif
+#define EXTERN RUBY_EXTERN	/* deprecated */
 #endif
 
 #ifndef RUBY_MBCHAR_MAXSIZE
@@ -478,31 +353,6 @@ void rb_ia64_flushrs(void);
 # endif
 #endif
 
-#ifndef RUBY_ALIGNAS
-#define RUBY_ALIGNAS(x) /* x */
-#endif
-
-#ifdef RUBY_ALIGNOF
-/* OK, take that definition */
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-#define RUBY_ALIGNOF alignof
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-#define RUBY_ALIGNOF _Alignof
-#else
-#define RUBY_ALIGNOF(type) ((size_t)offsetof(struct { char f1; type f2; }, f2))
-#endif
-
-#define NORETURN_STYLE_NEW 1
-#ifdef NORETURN
-/* OK, take that definition */
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-#define NORETURN(x) [[ noreturn ]] x
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-#define NORETURN(x) _Noreturn x
-#else
-#define NORETURN(x) x
-#endif
-
 RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 93939ee7db..5b3ef484f5 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -12,10 +12,6 @@
 #ifndef RUBY_ENCODING_H
 #define RUBY_ENCODING_H 1
 
-#ifdef RUBY_INTERNAL_H
-#error "Include this file before internal.h"
-#endif
-
 #if defined(__cplusplus)
 extern "C" {
 #if 0
@@ -24,7 +20,6 @@ extern "C" {
 #endif
 
 #include <stdarg.h>
-#include "ruby/ruby.h"
 #include "ruby/oniguruma.h"
 
 RUBY_SYMBOL_EXPORT_BEGIN
@@ -122,9 +117,7 @@ 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);
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 17aafd7f8e..48608f32c3 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -34,15 +34,6 @@ extern "C" {
 
 #include "ruby/st.h"
 
-/* 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
-
 RUBY_SYMBOL_EXPORT_BEGIN
 
 /*
@@ -188,27 +179,12 @@ VALUE rb_complex_raw(VALUE, VALUE);
 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_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);
@@ -229,6 +205,7 @@ 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);
@@ -261,13 +238,6 @@ VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, const VALUE *, rb_enumerator
 	    return SIZED_ENUMERATOR(obj, argc, argv, size_fn);		\
     } while (0)
 #define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
-typedef struct {
-    VALUE begin;
-    VALUE end;
-    VALUE step;
-    int exclude_end;
-} rb_arithmetic_sequence_components_t;
-int rb_arithmetic_sequence_extract(VALUE, rb_arithmetic_sequence_components_t *);
 /* error.c */
 VALUE rb_exc_new(VALUE, const char*, long);
 VALUE rb_exc_new_cstr(VALUE, const char*);
@@ -279,14 +249,17 @@ PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)),
 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));
-void rb_error_untrusted(VALUE);
+CONSTFUNC(void rb_error_untrusted(VALUE));
 void rb_check_frozen(VALUE);
-void rb_check_trusted(VALUE);
+CONSTFUNC(void rb_check_trusted(VALUE));
 #define rb_check_frozen_internal(obj) do { \
 	VALUE frozen_obj = (obj); \
-	if (RB_UNLIKELY(RB_OBJ_FROZEN(frozen_obj))) { \
+	if (OBJ_FROZEN(frozen_obj)) { \
 	    rb_error_frozen_object(frozen_obj); \
 	} \
     } while (0)
@@ -319,7 +292,7 @@ int rb_sourceline(void);
 const char *rb_sourcefile(void);
 VALUE rb_check_funcall(VALUE, ID, int, const VALUE*);
 
-NORETURN(MJIT_STATIC void rb_error_arity(int, int, int));
+NORETURN(void rb_error_arity(int, int, int));
 static inline int
 rb_check_arity(int argc, int min, int max)
 {
@@ -367,15 +340,7 @@ void rb_fd_set(int, rb_fdset_t *);
 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);
-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);
-}
+#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)
@@ -406,11 +371,24 @@ 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);
@@ -503,7 +481,7 @@ VALUE rb_file_directory_p(VALUE,VALUE);
 VALUE rb_str_encode_ospath(VALUE);
 int rb_is_absolute_path(const char *);
 /* gc.c */
-COLDFUNC NORETURN(void rb_memerror(void));
+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*);
@@ -524,7 +502,6 @@ 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);
 /* hash.c */
 void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
 VALUE rb_check_hash_type(VALUE);
@@ -544,12 +521,13 @@ 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, const char *file, int line);
+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);
-void rb_hash_free(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;
@@ -798,6 +776,8 @@ 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);
@@ -905,6 +885,7 @@ VALUE rb_struct_getmember(VALUE, ID);
 VALUE rb_struct_s_members(VALUE);
 VALUE rb_struct_members(VALUE);
 VALUE rb_struct_size(VALUE s);
+DEPRECATED(const VALUE *rb_struct_ptr(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, ...);
@@ -933,7 +914,6 @@ 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);
-VALUE rb_time_utc_offset(VALUE time);
 /* variable.c */
 VALUE rb_mod_name(VALUE);
 VALUE rb_class_path(VALUE);
@@ -944,12 +924,14 @@ 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);
@@ -973,9 +955,7 @@ 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 */
 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);
@@ -986,12 +966,16 @@ VALUE rb_mod_class_variables(int, const VALUE*, VALUE);
 VALUE rb_mod_remove_cvar(VALUE, VALUE);
 
 ID rb_frame_callee(void);
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
 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)
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 7caca17e3b..60d6f6d32e 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -12,10 +12,6 @@
 #ifndef RUBY_IO_H
 #define RUBY_IO_H 1
 
-#ifdef RUBY_INTERNAL_H
-#error "Include this file before internal.h"
-#endif
-
 #if defined(__cplusplus)
 extern "C" {
 #if 0
@@ -24,6 +20,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
+#include <errno.h>
 #include "ruby/encoding.h"
 
 #if defined(HAVE_STDIO_EXT_H)
@@ -31,7 +28,6 @@ extern "C" {
 #endif
 
 #include "ruby/config.h"
-#include <errno.h>
 #if defined(HAVE_POLL)
 #  ifdef _AIX
 #    define reqevents events
@@ -113,7 +109,6 @@ 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 */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 03657042ce..3474ca256f 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -136,7 +136,7 @@ RUBY_EXTERN double lgamma_r(double, int *);
 RUBY_EXTERN double cbrt(double);
 #endif
 
-#if !defined(INFINITY) || !defined(NAN)
+#if !defined(HAVE_INFINITY) || !defined(HAVE_NAN)
 union bytesequence4_or_float {
   unsigned char bytesequence[4];
   float float_value;
@@ -147,18 +147,12 @@ 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
@@ -168,8 +162,6 @@ RUBY_EXTERN const union bytesequence4_or_float rb_nan;
 #    include <ieeefp.h>
 #    endif
 #  define isinf(x) (!finite(x) && !isnan(x))
-#  elif defined(__cplusplus) && __cplusplus >= 201103L
-#    include <cmath> // it must include constexpr bool isinf(double);
 #  else
 RUBY_EXTERN int isinf(double);
 #  endif
@@ -178,11 +170,7 @@ RUBY_EXTERN int isinf(double);
 
 #ifndef isnan
 # ifndef HAVE_ISNAN
-#  if defined(__cplusplus) && __cplusplus >= 201103L
-#    include <cmath> // it must include constexpr bool isnan(double);
-#  else
 RUBY_EXTERN int isnan(double);
-#  endif
 # endif
 #endif
 
@@ -193,10 +181,6 @@ RUBY_EXTERN int isnan(double);
 # endif
 #endif
 
-#ifndef HAVE_NAN
-RUBY_EXTERN double nan(const char *);
-#endif
-
 #ifndef HAVE_NEXTAFTER
 RUBY_EXTERN double nextafter(double x, double y);
 #endif
@@ -230,6 +214,12 @@ 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
diff --git a/include/ruby/onigmo.h b/include/ruby/onigmo.h
deleted file mode 100644
index 385f2d6a8b..0000000000
--- a/include/ruby/onigmo.h
+++ /dev/null
@@ -1,935 +0,0 @@
-#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                          10
-#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])
-
-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)(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);
-ONIG_EXTERN
-OnigCaptureTreeNode* onig_get_capture_tree(OnigRegion* region);
-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 dc83754aca..1d8a0198d8 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -1,8 +1,880 @@
 #ifndef ONIGURUMA_H
 #define ONIGURUMA_H
-#include "onigmo.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
+
 #define ONIGURUMA
-#define ONIGURUMA_VERSION_MAJOR ONIGMO_VERSION_MAJOR
-#define ONIGURUMA_VERSION_MINOR ONIGMO_VERSION_MINOR
-#define ONIGURUMA_VERSION_TEENY ONIGMO_VERSION_TEENY
+#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;
+
+/* 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 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 */
+
+#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 ruby_encoding_index;
+  unsigned int  flags;
+  int    (*case_map)(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
+} OnigEncodingType;
+
+typedef const OnigEncodingType* OnigEncoding;
+
+ONIG_EXTERN const OnigEncodingType OnigEncodingASCII;
+
+#define ONIG_ENCODING_ASCII        (&OnigEncodingASCII)
+
+#define ONIG_ENCODING_UNDEF    ((OnigEncoding )0)
+
+/* 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));
+
+
+/* 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
+
 #endif /* ONIGURUMA_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index d983114e0a..634fe60c51 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -26,24 +26,15 @@ extern "C" {
 #include RUBY_EXTCONF_H
 #endif
 
-#include "defines.h"
-
-/* For MinGW, we need __declspec(dllimport) for RUBY_EXTERN on MJIT.
-   mswin's RUBY_EXTERN already has that. See also: win32/Makefile.sub */
-#if defined(MJIT_HEADER) && defined(_WIN32) && defined(__GNUC__)
-# undef RUBY_EXTERN
-# define RUBY_EXTERN extern __declspec(dllimport)
-#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
-#elif GCC_VERSION_BEFORE(4,8,6) /* Bug #14221 */
-# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
 #endif
 
+#include "defines.h"
+
 #ifndef ASSUME
 # ifdef UNREACHABLE
 #   define ASSUME(x) (RB_LIKELY(!!(x)) ? (void)0 : UNREACHABLE)
@@ -51,13 +42,6 @@ extern "C" {
 #   define ASSUME(x) ((void)(x))
 # endif
 #endif
-#ifndef UNREACHABLE_RETURN
-# ifdef UNREACHABLE
-#  define UNREACHABLE_RETURN(val) UNREACHABLE
-# else
-#  define UNREACHABLE_RETURN(val) return (val)
-# endif
-#endif
 #ifndef UNREACHABLE
 # define UNREACHABLE ((void)0)	/* unreachable */
 #endif
@@ -127,26 +111,12 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
 #ifndef PRI_LONG_PREFIX
 #define PRI_LONG_PREFIX "l"
 #endif
-#ifndef PRI_SHORT_PREFIX
-#define PRI_SHORT_PREFIX "h"
-#endif
 
-#ifndef PRI_64_PREFIX
 #if SIZEOF_LONG == 8
 #define PRI_64_PREFIX PRI_LONG_PREFIX
 #elif SIZEOF_LONG_LONG == 8
 #define PRI_64_PREFIX PRI_LL_PREFIX
 #endif
-#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
 
 #define RUBY_PRI_VALUE_MARK "\v"
 #if defined PRIdPTR && !defined PRI_VALUE_PREFIX
@@ -258,15 +228,13 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
 #define FIXNUM_MAX RUBY_FIXNUM_MAX
 #define FIXNUM_MIN RUBY_FIXNUM_MIN
 
-#define RB_INT2FIX(i) (((VALUE)(i))<<1 | RUBY_FIXNUM_FLAG)
-#define INT2FIX(i) RB_INT2FIX(i)
-#define RB_LONG2FIX(i) RB_INT2FIX(i)
-#define LONG2FIX(i) RB_INT2FIX(i)
-#define rb_fix_new(v) RB_INT2FIX(v)
-VALUE rb_int2inum(intptr_t);
+#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(uintptr_t);
+VALUE rb_uint2inum(VALUE);
 
 #define rb_uint_new(v) rb_uint2inum(v)
 
@@ -459,14 +427,10 @@ enum ruby_special_consts {
     RUBY_SPECIAL_SHIFT  = 8
 };
 
-#define RUBY_Qfalse ((VALUE)RUBY_Qfalse)
-#define RUBY_Qtrue  ((VALUE)RUBY_Qtrue)
-#define RUBY_Qnil   ((VALUE)RUBY_Qnil)
-#define RUBY_Qundef ((VALUE)RUBY_Qundef)	/* undefined value for placeholder */
-#define Qfalse RUBY_Qfalse
-#define Qtrue  RUBY_Qtrue
-#define Qnil   RUBY_Qnil
-#define Qundef RUBY_Qundef
+#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
@@ -475,10 +439,8 @@ enum ruby_special_consts {
 #endif
 #define SYMBOL_FLAG RUBY_SYMBOL_FLAG
 
-#define RB_TEST(v) !(((VALUE)(v) & (VALUE)~RUBY_Qnil) == 0)
-#define RB_NIL_P(v) !((VALUE)(v) != RUBY_Qnil)
-#define RTEST(v) RB_TEST(v)
-#define NIL_P(v) RB_NIL_P(v)
+#define RTEST(v) !(((VALUE)(v) & ~RUBY_Qnil) == 0)
+#define NIL_P(v) !((VALUE)(v) != RUBY_Qnil)
 
 #define CLASS_OF(v) rb_class_of((VALUE)(v))
 
@@ -508,7 +470,7 @@ enum ruby_value_type {
     RUBY_T_FIXNUM = 0x15,
     RUBY_T_UNDEF  = 0x16,
 
-    RUBY_T_IMEMO  = 0x1a, /*!< @see imemo_type */
+    RUBY_T_IMEMO  = 0x1a,
     RUBY_T_NODE   = 0x1b,
     RUBY_T_ICLASS = 0x1c,
     RUBY_T_ZOMBIE = 0x1d,
@@ -566,11 +528,7 @@ static inline int rb_type(VALUE obj);
 
 #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; \
-    }))
+    (*__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;}
@@ -658,7 +616,7 @@ int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 a
 # define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error))
 #endif
 void rb_set_safe_level_force(int);
-void rb_secure_update(VALUE);
+CONSTFUNC(void rb_secure_update(VALUE));
 NORETURN(void rb_insecure_operation(void));
 
 VALUE rb_errinfo(void);
@@ -772,8 +730,8 @@ rb_num2ll_inline(VALUE x)
 double rb_num2dbl(VALUE);
 #define NUM2DBL(x) rb_num2dbl((VALUE)(x))
 
-VALUE rb_uint2big(uintptr_t);
-VALUE rb_int2big(intptr_t);
+VALUE rb_uint2big(VALUE);
+VALUE rb_int2big(SIGNED_VALUE);
 
 VALUE rb_newobj(void);
 VALUE rb_newobj_of(VALUE, VALUE);
@@ -881,10 +839,14 @@ enum ruby_fl_type {
     RUBY_FL_SINGLETON = RUBY_FL_USER0
 };
 
-struct RUBY_ALIGNAS(SIZEOF_VALUE) RBasic {
+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 */
@@ -905,7 +867,7 @@ VALUE rb_obj_reveal(VALUE obj, VALUE klass); /* do not use this API to change kl
 
 #define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
 #define ROBJECT_EMBED ROBJECT_EMBED
-enum ruby_robject_flags {
+enum {
     ROBJECT_EMBED_LEN_MAX = 3,
     ROBJECT_EMBED = RUBY_FL_USER1,
 
@@ -936,6 +898,13 @@ struct RObject {
      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)
@@ -944,7 +913,7 @@ struct RObject {
 #define RMODULE_IS_OVERLAID RMODULE_IS_OVERLAID
 #define RMODULE_IS_REFINEMENT RMODULE_IS_REFINEMENT
 #define RMODULE_INCLUDED_INTO_REFINEMENT RMODULE_INCLUDED_INTO_REFINEMENT
-enum ruby_rmodule_flags {
+enum {
     RMODULE_IS_OVERLAID = RUBY_FL_USER2,
     RMODULE_IS_REFINEMENT = RUBY_FL_USER3,
     RMODULE_INCLUDED_INTO_REFINEMENT = RUBY_FL_USER4,
@@ -967,7 +936,7 @@ VALUE rb_float_new_in_heap(double);
 #define RSTRING_EMBED_LEN_SHIFT RSTRING_EMBED_LEN_SHIFT
 #define RSTRING_EMBED_LEN_MAX RSTRING_EMBED_LEN_MAX
 #define RSTRING_FSTR RSTRING_FSTR
-enum ruby_rstring_flags {
+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),
@@ -977,7 +946,6 @@ enum ruby_rstring_flags {
 
     RSTRING_ENUM_END
 };
-
 struct RString {
     struct RBasic basic;
     union {
@@ -1013,31 +981,19 @@ struct RString {
      ((ptrvar) = RSTRING(str)->as.ary, (lenvar) = RSTRING_EMBED_LEN(str)) : \
      ((ptrvar) = RSTRING(str)->as.heap.ptr, (lenvar) = RSTRING(str)->as.heap.len))
 
-#ifndef USE_TRANSIENT_HEAP
-#define USE_TRANSIENT_HEAP 1
-#endif
-
-enum ruby_rarray_flags {
+#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),
 
-#if USE_TRANSIENT_HEAP
-    RARRAY_TRANSIENT_FLAG = RUBY_FL_USER13,
-#define RARRAY_TRANSIENT_FLAG RARRAY_TRANSIENT_FLAG
-#else
-#define RARRAY_TRANSIENT_FLAG 0
-#endif
-
     RARRAY_ENUM_END
 };
-#define RARRAY_EMBED_FLAG (VALUE)RARRAY_EMBED_FLAG
-#define RARRAY_EMBED_LEN_MASK (VALUE)RARRAY_EMBED_LEN_MASK
-#define RARRAY_EMBED_LEN_MAX RARRAY_EMBED_LEN_MAX
-#define RARRAY_EMBED_LEN_SHIFT RARRAY_EMBED_LEN_SHIFT
-
 struct RArray {
     struct RBasic basic;
     union {
@@ -1058,26 +1014,9 @@ struct RArray {
 #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_CONST_PTR_TRANSIENT(a) rb_array_const_ptr_transient(a)
-
-#if USE_TRANSIENT_HEAP
-#define RARRAY_TRANSIENT_P(ary) FL_TEST_RAW((ary), RARRAY_TRANSIENT_FLAG)
-#else
-#define RARRAY_TRANSIENT_P(ary) 0
-#endif
 
-#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) do { \
-    const VALUE _ary = (ary); \
-    VALUE *ptr_name = (VALUE *)RARRAY_PTR_USE_START_TRANSIENT(_ary); \
-    expr; \
-    RARRAY_PTR_USE_END_TRANSIENT(_ary); \
-} 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_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); \
@@ -1086,13 +1025,12 @@ struct RArray {
     RARRAY_PTR_USE_END(_ary); \
 } while (0)
 
-#define RARRAY_AREF(a, i) (RARRAY_CONST_PTR_TRANSIENT(a)[i])
+#define RARRAY_AREF(a, i)    (RARRAY_CONST_PTR(a)[i])
 #define RARRAY_ASET(a, i, v) do { \
     const VALUE _ary = (a); \
-    const VALUE _v = (v); \
-    VALUE *ptr = (VALUE *)RARRAY_PTR_USE_START_TRANSIENT(_ary); \
-    RB_OBJ_WRITE(_ary, &ptr[i], _v); \
-    RARRAY_PTR_USE_END_TRANSIENT(_ary); \
+    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)))
@@ -1109,13 +1047,11 @@ struct RRegexp {
 #define RREGEXP_SRC_LEN(r) RSTRING_LEN(RREGEXP(r)->src)
 #define RREGEXP_SRC_END(r) RSTRING_END(RREGEXP(r)->src)
 
-/* RHash is defined at internal.h */
-size_t rb_hash_size_num(VALUE hash);
-
-#define RHASH_TBL(h) rb_hash_tbl(h, __FILE__, __LINE__)
+/* 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) rb_hash_size_num(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)
 
@@ -1124,6 +1060,9 @@ struct RFile {
     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*);
@@ -1205,10 +1144,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
     (void)((sval) = (type *)DATA_PTR(result));
 
 #ifdef __GNUC__
-#define Data_Make_Struct(klass,type,mark,free,sval) RB_GNUC_EXTENSION_BLOCK(\
+#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 \
-)
+    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)) \
@@ -1223,10 +1162,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
     (void)((sval) = (type *)DATA_PTR(result));
 
 #ifdef __GNUC__
-#define TypedData_Make_Struct(klass, type, data_type, sval) RB_GNUC_EXTENSION_BLOCK(\
+#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 \
-)
+    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)) \
@@ -1239,15 +1178,14 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
 #define TypedData_Get_Struct(obj,type,data_type,sval) \
     ((sval) = (type*)rb_check_typeddata((obj), (data_type)))
 
-#define RSTRUCT_LEN(st)         NUM2LONG(rb_struct_size(st))
-#define RSTRUCT_PTR(st)         rb_struct_ptr(st)
+#define RSTRUCT_LEN(st)         rb_struct_size(st)
+#define RSTRUCT_PTR(st)         rb_struct_const_ptr(st)
 #define RSTRUCT_SET(st, idx, v) rb_struct_aset(st, INT2NUM(idx), (v))
 #define RSTRUCT_GET(st, idx)    rb_struct_aref(st, INT2NUM(idx))
 
-int rb_big_sign(VALUE);
-#define RBIGNUM_SIGN(b) (rb_big_sign(b))
-#define RBIGNUM_POSITIVE_P(b) (RBIGNUM_SIGN(b)!=0)
-#define RBIGNUM_NEGATIVE_P(b) (RBIGNUM_SIGN(b)==0)
+#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))
@@ -1261,40 +1199,40 @@ int rb_big_sign(VALUE);
 #define RTYPEDDATA(obj)   (R_CAST(RTypedData)(obj))
 #define RFILE(obj)   (R_CAST(RFile)(obj))
 
-#define FL_SINGLETON    ((VALUE)RUBY_FL_SINGLETON)
-#define FL_WB_PROTECTED ((VALUE)RUBY_FL_WB_PROTECTED)
-#define FL_PROMOTED0    ((VALUE)RUBY_FL_PROMOTED0)
-#define FL_PROMOTED1    ((VALUE)RUBY_FL_PROMOTED1)
-#define FL_FINALIZE     ((VALUE)RUBY_FL_FINALIZE)
-#define FL_TAINT        ((VALUE)RUBY_FL_TAINT)
-#define FL_UNTRUSTED    ((VALUE)RUBY_FL_UNTRUSTED)
-#define FL_EXIVAR       ((VALUE)RUBY_FL_EXIVAR)
-#define FL_FREEZE       ((VALUE)RUBY_FL_FREEZE)
-
-#define FL_USHIFT       ((VALUE)RUBY_FL_USHIFT)
-
-#define FL_USER0  	((VALUE)RUBY_FL_USER0)
-#define FL_USER1  	((VALUE)RUBY_FL_USER1)
-#define FL_USER2  	((VALUE)RUBY_FL_USER2)
-#define FL_USER3  	((VALUE)RUBY_FL_USER3)
-#define FL_USER4  	((VALUE)RUBY_FL_USER4)
-#define FL_USER5  	((VALUE)RUBY_FL_USER5)
-#define FL_USER6  	((VALUE)RUBY_FL_USER6)
-#define FL_USER7  	((VALUE)RUBY_FL_USER7)
-#define FL_USER8  	((VALUE)RUBY_FL_USER8)
-#define FL_USER9  	((VALUE)RUBY_FL_USER9)
-#define FL_USER10 	((VALUE)RUBY_FL_USER10)
-#define FL_USER11 	((VALUE)RUBY_FL_USER11)
-#define FL_USER12 	((VALUE)RUBY_FL_USER12)
-#define FL_USER13 	((VALUE)RUBY_FL_USER13)
-#define FL_USER14 	((VALUE)RUBY_FL_USER14)
-#define FL_USER15 	((VALUE)RUBY_FL_USER15)
-#define FL_USER16 	((VALUE)RUBY_FL_USER16)
-#define FL_USER17 	((VALUE)RUBY_FL_USER17)
-#define FL_USER18 	((VALUE)RUBY_FL_USER18)
-#define FL_USER19 	((VALUE)RUBY_FL_USER19)
-
-#define RB_SPECIAL_CONST_P(x) (RB_IMMEDIATE_P(x) || !RB_TEST(x))
+#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)
@@ -1306,7 +1244,7 @@ int rb_big_sign(VALUE);
 #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 &= ~(VALUE)(f))
+#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)
@@ -1328,11 +1266,6 @@ int rb_big_sign(VALUE);
 #define RB_OBJ_FREEZE_RAW(x) (void)(RBASIC(x)->flags |= RUBY_FL_FREEZE)
 #define RB_OBJ_FREEZE(x) rb_obj_freeze_inline((VALUE)x)
 
-/*!
- * \defgroup deprecated_macros deprecated macro APIs
- * \{
- * \par These macros are deprecated. Prefer their `RB_`-prefixed versions.
- */
 #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)
@@ -1361,8 +1294,6 @@ int rb_big_sign(VALUE);
 #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
@@ -1540,24 +1471,13 @@ rb_obj_write(VALUE a, VALUE *slot, VALUE b, RB_UNUSED_VAR(const char *filename),
     *slot = b;
 
 #if USE_RGENGC
-    rb_obj_written(a, RUBY_Qundef /* ignore `oldv' now */, b, filename, line);
+    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)
-#if defined __GNUC__ && !GCC_VERSION_SINCE(4, 3, 0)
-/* clang 3.x (4.2 compatible) can't eliminate CSE of RB_BUILTIN_TYPE
- * in inline function and caller function */
-#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)); \
-    })
-#else
 static inline int
 rb_integer_type_p(VALUE obj)
 {
@@ -1565,17 +1485,16 @@ rb_integer_type_p(VALUE obj)
 	    (!RB_SPECIAL_CONST_P(obj) &&
 	     RB_BUILTIN_TYPE(obj) == RUBY_T_BIGNUM));
 }
-#endif
 
 #if SIZEOF_INT < SIZEOF_LONG
-# define RB_INT2NUM(v) RB_INT2FIX((int)(v))
-# define RB_UINT2NUM(v) RB_LONG2FIX((unsigned int)(v))
+# 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 RB_INT2FIX(v);
+	return INT2FIX(v);
     else
 	return rb_int2big(v);
 }
@@ -1585,7 +1504,7 @@ static inline VALUE
 rb_uint2num_inline(unsigned int v)
 {
     if (RB_POSFIXABLE(v))
-	return RB_LONG2FIX(v);
+	return LONG2FIX(v);
     else
 	return rb_uint2big(v);
 }
@@ -1598,7 +1517,7 @@ static inline VALUE
 rb_long2num_inline(long v)
 {
     if (RB_FIXABLE(v))
-	return RB_LONG2FIX(v);
+	return LONG2FIX(v);
     else
 	return rb_int2big(v);
 }
@@ -1608,7 +1527,7 @@ static inline VALUE
 rb_ulong2num_inline(unsigned long v)
 {
     if (RB_POSFIXABLE(v))
-	return RB_LONG2FIX(v);
+	return LONG2FIX(v);
     else
 	return rb_uint2big(v);
 }
@@ -1624,26 +1543,18 @@ rb_num2char_inline(VALUE x)
 }
 #define RB_NUM2CHR(x) rb_num2char_inline(x)
 
-#define RB_CHR2FIX(x) RB_INT2FIX((long)((x)&0xff))
+#define RB_CHR2FIX(x) INT2FIX((long)((x)&0xff))
 
 #define LONG2NUM(x) RB_LONG2NUM(x)
 #define ULONG2NUM(x) RB_ULONG2NUM(x)
-#define USHORT2NUM(x) RB_INT2FIX(x)
 #define NUM2CHR(x) RB_NUM2CHR(x)
 #define CHR2FIX(x) RB_CHR2FIX(x)
 
-#if SIZEOF_LONG < SIZEOF_VALUE
-#define RB_ST2FIX(h) RB_LONG2FIX((long)((h) > 0 ? (h) & (unsigned long)-1 >> 2 : (h) | ~((unsigned long)-1 >> 2)))
-#else
-#define RB_ST2FIX(h) RB_LONG2FIX((long)(h))
-#endif
-#define ST2FIX(h) RB_ST2FIX(h)
-
-#define RB_ALLOC_N(type,n) ((type*)ruby_xmalloc2((size_t)(n),sizeof(type)))
+#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((size_t)(n),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),(size_t)(n),sizeof(type)))
+#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)
@@ -1651,23 +1562,7 @@ rb_num2char_inline(VALUE x)
 #define ZALLOC(type) RB_ZALLOC(type)
 #define REALLOC_N(var,type,n) RB_REALLOC_N(var,type,n)
 
-#if GCC_VERSION_BEFORE(4,9,5)
-/* 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#Other-Builtins */
-# undef HAVE_BUILTIN___BUILTIN_ALLOCA_WITH_ALIGN
-#endif
-
-#if defined(HAVE_BUILTIN___BUILTIN_ALLOCA_WITH_ALIGN) && defined(RUBY_ALIGNOF)
-/* I don't know why but __builtin_alloca_with_align's second argument
-   takes bits rather than bytes. */
-#define ALLOCA_N(type, n) \
-    (type*)__builtin_alloca_with_align((sizeof(type)*(n)), \
-        RUBY_ALIGNOF(type) * CHAR_BIT)
-#else
 #define ALLOCA_N(type,n) ((type*)alloca(sizeof(type)*(n)))
-#endif
 
 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));
@@ -1698,14 +1593,14 @@ 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)) {
+    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(cnt, elsize, max, &size))) {
+	if (RB_UNLIKELY(rb_mul_size_overflow(count, elsize, max, &size))) {
 	    ruby_malloc_size_overflow(cnt, elsize);
 	}
 	cnt = (size + sizeof(VALUE) - 1) / sizeof(VALUE);
@@ -1717,16 +1612,16 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
 #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))
+     rb_alloc_tmp_buffer2(&(v), (n), sizeof(type))))
 #else
 # define RUBY_ALLOCV_LIMIT 1024
 # define RB_ALLOCV(v, n) ((n) < RUBY_ALLOCV_LIMIT ? \
-                       ((v) = 0, alloca(n)) : \
+		       (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)) ? \
-             ((v) = 0, alloca((size_t)(n) * sizeof(type))) : \
-	     rb_alloc_tmp_buffer2(&(v), (long)(n), 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))
 
@@ -1734,12 +1629,12 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
 #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)*(size_t)(n))
-#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(size_t)(n))
-#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(size_t)(n))
-#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(size_t)(n))
+#define MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
+#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
+#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
+#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
 
-void rb_obj_infect(VALUE victim, VALUE carrier);
+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);
@@ -1818,42 +1713,17 @@ VALUE rb_check_symbol(volatile VALUE *namep);
     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)
-#if defined(HAVE_BUILTIN___BUILTIN_CONSTANT_P) && defined(HAVE_STMT_AND_DECL_IN_EXPR)
+#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__ (RUBY_CONST_ID_CACHE((ID), (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))
-
-# 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)
-#   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 rb_varargs_argc_check(argc, vargc) \
-	rb_varargs_argc_check_runtime(argc, vargc)
-# endif
-
 #else
 #define rb_intern_const(str) rb_intern2((str), (long)strlen(str))
 #endif
@@ -1901,7 +1771,7 @@ enum rb_io_wait_readwrite {RB_IO_WAIT_READABLE, 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);
+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));
@@ -1925,7 +1795,7 @@ 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 */
-COLDFUNC PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
+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
@@ -1979,20 +1849,19 @@ RUBY_EXTERN VALUE rb_cBignum;
 RUBY_EXTERN VALUE rb_cBinding;
 RUBY_EXTERN VALUE rb_cClass;
 RUBY_EXTERN VALUE rb_cCont;
-RUBY_EXTERN VALUE rb_cData;
 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_cFalseClass;
 RUBY_EXTERN VALUE rb_cFile;
 #ifndef RUBY_INTEGER_UNIFICATION
 RUBY_EXTERN VALUE rb_cFixnum;
 #endif
-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_cIO;
 RUBY_EXTERN VALUE rb_cMatch;
 RUBY_EXTERN VALUE rb_cMethod;
 RUBY_EXTERN VALUE rb_cModule;
@@ -2003,6 +1872,7 @@ 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;
@@ -2027,7 +1897,6 @@ 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;
@@ -2061,7 +1930,7 @@ rb_class_of(VALUE obj)
 	if (obj == RUBY_Qtrue)  return rb_cTrueClass;
 	if (RB_STATIC_SYM_P(obj)) return rb_cSymbol;
     }
-    else if (!RB_TEST(obj)) {
+    else if (!RTEST(obj)) {
 	if (obj == RUBY_Qnil)   return rb_cNilClass;
 	if (obj == RUBY_Qfalse) return rb_cFalseClass;
     }
@@ -2078,7 +1947,7 @@ rb_type(VALUE obj)
 	if (RB_STATIC_SYM_P(obj)) return RUBY_T_SYMBOL;
 	if (obj == RUBY_Qundef) return RUBY_T_UNDEF;
     }
-    else if (!RB_TEST(obj)) {
+    else if (!RTEST(obj)) {
 	if (obj == RUBY_Qnil)   return RUBY_T_NIL;
 	if (obj == RUBY_Qfalse) return RUBY_T_FALSE;
     }
@@ -2113,8 +1982,7 @@ rb_special_const_p(VALUE obj)
 static inline void
 rb_clone_setup(VALUE clone, VALUE obj)
 {
-    rb_obj_setup(clone, rb_singleton_class_clone(obj),
-                 RBASIC(obj)->flags & ~(FL_PROMOTED0|FL_PROMOTED1|FL_FINALIZE));
+    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);
 }
@@ -2141,54 +2009,13 @@ rb_array_len(VALUE a)
 # define FIX_CONST_VALUE_PTR(x) (x)
 #endif
 
-/* internal function. do not use this function */
 static inline const VALUE *
-rb_array_const_ptr_transient(VALUE a)
+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);
 }
 
-/* internal function. do not use this function */
-static inline const VALUE *
-rb_array_const_ptr(VALUE a)
-{
-#if USE_TRANSIENT_HEAP
-    void rb_ary_detransient(VALUE a);
-
-    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, int allow_transient)
-{
-    VALUE *rb_ary_ptr_use_start(VALUE ary);
-
-#if USE_TRANSIENT_HEAP
-    if (!allow_transient) {
-        if (RARRAY_TRANSIENT_P(a)) {
-            void rb_ary_detransient(VALUE 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, int allow_transient)
-{
-    void rb_ary_ptr_use_end(VALUE a);
-    rb_ary_ptr_use_end(a);
-}
-
 #if defined(EXTLIB) && defined(USE_DLN_A_OUT)
 /* hook for external modules */
 static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
@@ -2216,11 +2043,11 @@ int ruby_native_thread_p(void);
 #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
+#define RUBY_EVENT_SPECIFIED_LINE         0x010000
+#define RUBY_EVENT_COVERAGE               0x020000
 
 /* internal events */
 #define RUBY_INTERNAL_EVENT_SWITCH          0x040000
@@ -2234,7 +2061,7 @@ int ruby_native_thread_p(void);
 #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
+#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);
@@ -2289,7 +2116,7 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base);
 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(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__)
+#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,\
@@ -2306,16 +2133,8 @@ ERRORFUNC(("variable argument length doesn't match"), int rb_scan_args_length_mi
 
 # define rb_scan_args_isdigit(c) ((unsigned char)((c)-'0')<10)
 
-#if !defined(__has_attribute)
-#define __has_attribute(x) 0
-#endif
-# if __has_attribute(diagnose_if)
-#  define rb_scan_args_count_end(fmt, ofs, varc, vari) \
-     (fmt[ofs] ? rb_scan_args_bad_format(fmt) : (vari))
-# else
-#  define rb_scan_args_count_end(fmt, ofs, varc, vari) \
-     ((vari)/(!fmt[ofs] || rb_scan_args_bad_format(fmt)))
-# endif
+# 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]!='&' ? \
@@ -2343,19 +2162,18 @@ ERRORFUNC(("variable argument length doesn't match"), int rb_scan_args_length_mi
      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_isdigit(fmt[0]) ? \
       rb_scan_args_count_var(fmt, 0, varc, 0) : \
-      rb_scan_args_count_opt(fmt, 1, varc, fmt[0]-'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) == (varc) || \
-     rb_scan_args_length_mismatch(fmt, varc)))
+    ((varc)/(rb_scan_args_count(fmt, varc)))
 
-# if defined(__has_attribute) && __has_attribute(diagnose_if)
-#  define rb_scan_args_verify(fmt, varc) (void)0
-# elif defined(__GNUC__)
+# ifdef __GNUC__
 # define rb_scan_args_verify(fmt, varc) \
-    (void)__extension__ ({ \
+    ({ \
 	int verify; \
 	_Pragma("GCC diagnostic push"); \
 	_Pragma("GCC diagnostic ignored \"-Warray-bounds\""); \
@@ -2365,7 +2183,7 @@ ERRORFUNC(("variable argument length doesn't match"), int rb_scan_args_length_mi
     })
 # else
 # define rb_scan_args_verify(fmt, varc) \
-    (void)rb_scan_args_verify_count(fmt, varc)
+    rb_scan_args_verify_count(fmt, varc)
 # endif
 
 ALWAYS_INLINE(static int rb_scan_args_lead_p(const char *fmt));
@@ -2414,16 +2232,29 @@ ALWAYS_INLINE(static int rb_scan_args_trail_idx(const char *fmt));
 static inline int
 rb_scan_args_trail_idx(const char *fmt)
 {
-    const int idx = rb_scan_args_var_idx(fmt);
-    return idx+(fmt[idx]=='*');
+    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)
 {
-    const int idx = rb_scan_args_trail_idx(fmt);
-    return (rb_scan_args_isdigit(fmt[idx]) ? fmt[idx]-'0' : 0);
+    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));
@@ -2466,8 +2297,6 @@ rb_scan_args_end_idx(const char *fmt)
 }
 # 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(argc, argv, \
 		     rb_scan_args_n_lead(fmt), \
@@ -2476,32 +2305,27 @@ rb_scan_args_end_idx(const char *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)
+		     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,
-		 VALUE *vars[], char *fmt, int varc));
-
+		 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,
-		 VALUE *vars[], RB_UNUSED_VAR(char *fmt), RB_UNUSED_VAR(int varc))
-# if defined(__has_attribute) && __has_attribute(diagnose_if)
-    __attribute__((diagnose_if(rb_scan_args_count(fmt,varc)==0,"bad scan arg format","error")))
-    __attribute__((diagnose_if(rb_scan_args_count(fmt,varc)!=varc,"variable argument length doesn't match","error")))
-# endif
+		 int varc, VALUE *vars[])
 {
-    int i, argi = 0, vari = 0, last_idx = -1;
-    VALUE *var, hash = Qnil, last_hash = 0;
+    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 (RB_NIL_P(last)) {
+	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 */
@@ -2510,10 +2334,9 @@ rb_scan_args_set(int argc, const VALUE *argv,
 	}
 	else {
 	    hash = rb_check_hash_type(last);
-	    if (!RB_NIL_P(hash)) {
+	    if (!NIL_P(hash)) {
 		VALUE opts = rb_extract_keywords(&hash);
-		if (!(last_hash = hash)) argc--;
-		else last_idx = argc - 1;
+		if (!hash) argc--;
 		hash = opts ? opts : Qnil;
 	    }
 	}
@@ -2524,14 +2347,14 @@ rb_scan_args_set(int argc, const VALUE *argv,
     /* capture leading mandatory arguments */
     for (i = n_lead; i-- > 0; ) {
 	var = vars[vari++];
-	if (var) *var = (argi == last_idx) ? last_hash : argv[argi];
+	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 = (argi == last_idx) ? last_hash : argv[argi];
+	    if (var) *var = argv[argi];
 	    argi++;
 	}
 	else {
@@ -2544,11 +2367,7 @@ rb_scan_args_set(int argc, const VALUE *argv,
 
 	var = vars[vari++];
 	if (0 < n_var) {
-	    if (var) {
-		int f_last = (last_idx + 1 == argc - n_trail);
-		*var = rb_ary_new4(n_var-f_last, &argv[argi]);
-		if (f_last) rb_ary_push(*var, last_hash);
-	    }
+	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
 	    argi += n_var;
 	}
 	else {
@@ -2558,7 +2377,7 @@ rb_scan_args_set(int argc, const VALUE *argv,
     /* capture trailing mandatory arguments */
     for (i = n_trail; i-- > 0; ) {
 	var = vars[vari++];
-	if (var) *var = (argi == last_idx) ? last_hash : argv[argi];
+	if (var) *var = argv[argi];
 	argi++;
     }
     /* capture an option hash - phase 2: assignment */
@@ -2581,30 +2400,6 @@ rb_scan_args_set(int argc, const VALUE *argv,
 }
 #endif
 
-#if 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); \
-    })
-
-# 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
diff --git a/include/ruby/st.h b/include/ruby/st.h
index 149e0ebaef..de5aaaebec 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -1,8 +1,6 @@
-/* This is a public domain general purpose hash table package
-   originally written by Peter Moore @ UCB.
+/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
 
-   The hash table data strutures were redesigned and the package was
-   rewritten by Vladimir Makarov <vmakarov@redhat.com>.  */
+/* @(#) st.h 5.1 89/12/14 */
 
 #ifndef RUBY_ST_H
 #define RUBY_ST_H 1
@@ -48,10 +46,6 @@ 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);
 
@@ -63,7 +57,7 @@ struct st_hash_type {
     st_index_t (*hash)(ANYARGS /*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) \
@@ -72,26 +66,33 @@ 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;
-    /* 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;
+    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;
 };
 
 #define st_is_member(table,key) st_lookup((table),(key),(st_data_t *)0)
@@ -120,6 +121,7 @@ typedef int st_update_callback_func(st_data_t *key, st_data_t *value, st_data_t
 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);
@@ -143,8 +145,6 @@ CONSTFUNC(st_index_t st_hash_end(st_index_t h));
 CONSTFUNC(st_index_t 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/util.h b/include/ruby/util.h
index 3fecba8ebc..3b78e467b4 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -70,6 +70,7 @@ char *ruby_strdup(const char *);
 #define strdup(s) ruby_strdup(s)
 
 char *ruby_getcwd(void);
+#define my_getcwd() ruby_getcwd()
 
 double ruby_strtod(const char *, char **);
 #undef strtod
diff --git a/include/ruby/version.h b/include/ruby/version.h
index a4d319f646..8b4801fcfd 100644
--- a/include/ruby/version.h
+++ b/include/ruby/version.h
@@ -31,7 +31,7 @@
 
 /* API version */
 #define RUBY_API_VERSION_MAJOR 2
-#define RUBY_API_VERSION_MINOR 6
+#define RUBY_API_VERSION_MINOR 4
 #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)
 
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
index 1bb170d2ce..73345264bd 100644
--- a/include/ruby/vm.h
+++ b/include/ruby/vm.h
@@ -25,7 +25,7 @@ RUBY_SYMBOL_EXPORT_BEGIN
  *
  * We will prepare VM creation/control APIs on 1.9.2 or later.
  * If you have an interest about it, please see mvm branch.
- * https://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
+ * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
  */
 
 /* VM type declaration */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index fe1978fdde..68b8db73e6 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -139,13 +139,6 @@ typedef int clockid_t;
 #undef fstat
 #ifdef RUBY_EXPORT
 #define utime(_p, _t)		rb_w32_utime(_p, _t)
-#undef HAVE_UTIMES
-#define HAVE_UTIMES 1
-#define utimes(_p, _t)		rb_w32_utimes(_p, _t)
-#undef HAVE_UTIMENSAT
-#define HAVE_UTIMENSAT 1
-#define AT_FDCWD		-100
-#define utimensat(_d, _p, _t, _f)	rb_w32_utimensat(_d, _p, _t, _f)
 #define lseek(_f, _o, _w)	_lseeki64(_f, _o, _w)
 
 #define pipe(p)			rb_w32_pipe(p)
@@ -158,6 +151,7 @@ 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)
@@ -172,43 +166,26 @@ typedef int clockid_t;
 #define unlink(p)		rb_w32_unlink(p)
 #endif /* RUBY_EXPORT */
 
-/* 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;
-};
-
 #if SIZEOF_OFF_T == 8
 #define off_t __int64
-#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_stati128(path,st)
+#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_lstati128(path,st)
+#define lstat(path,st)		rb_w32_lstati64(path,st)
 #define access(path,mode)	rb_w32_access(path,mode)
 
 #define strcasecmp		_stricmp
@@ -256,7 +233,6 @@ 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);
@@ -339,14 +315,14 @@ 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_stati128(const char *, struct stati128 *);
-extern int rb_w32_ustati128(const char *, struct stati128 *);
-extern int rb_w32_lstati128(const char *, struct stati128 *);
-extern int rb_w32_ulstati128(const char *, struct stati128 *);
+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_uaccess(const char *, int);
 extern char rb_w32_fd_is_text(int);
-extern int rb_w32_fstati128(int, struct stati128 *);
+extern int rb_w32_fstati64(int, struct stati64 *);
 extern int rb_w32_dup2(int, int);
 
 #include <float.h>
@@ -463,6 +439,8 @@ 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
@@ -753,10 +731,6 @@ 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 *);
 int  rb_w32_uutime(const char *, const struct utimbuf *);
-int  rb_w32_utimes(const char *, const struct timeval *);
-int  rb_w32_uutimes(const char *, const struct timeval *);
-int  rb_w32_utimensat(int /* must be AT_FDCWD */, const char *, const struct timespec *, int /* must be 0 */);
-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);
@@ -778,8 +752,7 @@ uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc
 
 RUBY_SYMBOL_EXPORT_END
 
-#if (defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)) && !defined(__cplusplus)
-#ifdef RUBY_MINGW64_BROKEN_FREXP_MODF
+#ifdef __MINGW_ATTRIB_PURE
 /* License: Ruby's */
 /* get rid of bugs in math.h of mingw */
 #define frexp(_X, _Y) __extension__ ({\
@@ -797,6 +770,13 @@ 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.
@@ -806,19 +786,13 @@ RUBY_SYMBOL_EXPORT_END
 static inline double
 rb_w32_pow(double x, double y)
 {
-    return (double)powl(x, y);
+    return 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 f730903b5e..5822f04cab 100644
--- a/inits.c
+++ b/inits.c
@@ -16,10 +16,6 @@
 void
 rb_call_inits(void)
 {
-#if USE_TRANSIENT_HEAP
-    CALL(TransientHeap);
-#endif
-    CALL(vm_postponed_job);
     CALL(Method);
     CALL(RandomSeedCore);
     CALL(sym);
@@ -65,7 +61,5 @@ rb_call_inits(void)
     CALL(Complex);
     CALL(version);
     CALL(vm_trace);
-    CALL(vm_stack_canary);
-    CALL(ast);
 }
 #undef CALL
diff --git a/insns.def b/insns.def
index 6c62f99770..ac53f967c1 100644
--- a/insns.def
+++ b/insns.def
@@ -1,62 +1,36 @@
-/* -*- mode:c; style:ruby; coding: utf-8 -*-
+/** ##skip -*- mode:c; style:ruby; coding: utf-8 -*-
   insns.def - YARV instruction definitions
 
   $Author: $
   created at: 04/01/01 01:17:55 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
-  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..
-     {
+*/
+
+/** ##skip
+  instruction comment
+  @c: category
+  @e: english description
+  @j: japanese description
+
+  instruction form:
+    DEFINE_INSN
+    instruction_name
+    (instruction_operands, ..)
+    (pop_values, ..)
+    (return value)
+    {
        .. // 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.
-
-   - 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.
+/**
+  @c nop
+  @e nop
+  @j nop
  */
-
-/* nop */
 DEFINE_INSN
 nop
 ()
@@ -70,8 +44,12 @@ nop
 /* deal with variables                                    */
 /**********************************************************/
 
-/* Get local variable (pointed by `idx' and `level').
+/**
+  @c variable
+  @e Get local variable (pointed by `idx' and `level').
      'level' indicates the nesting depth from the current block.
+  @j level, idx で指定されたローカル変数の値をスタックに置く。
+     level はブロックのネストレベルで、何段上かを示す。
  */
 DEFINE_INSN
 getlocal
@@ -79,13 +57,22 @@ getlocal
 ()
 (VALUE val)
 {
-    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);
+    int i, lev = (int)level;
+    const 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);
 }
 
-/* Set a local variable (pointed to by 'idx') as val.
+/**
+  @c variable
+  @e 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
@@ -93,128 +80,65 @@ setlocal
 (VALUE val)
 ()
 {
-    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);
-}
+    int i, lev = (int)level;
+    const VALUE *ep = GET_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);
+    /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
+    for (i = 0; i < lev; i++) {
+	ep = GET_PREV_EP(ep);
     }
-}
-
-/* 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`.
+/**
+  @c variable
+  @e Get value of special local variable ($~, $_, ..).
+  @j 特殊なローカル変数（$~, $_, ...）の値を得る。
  */
 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)
 {
-    val = vm_getspecial(ec, GET_LEP(), key, type);
+    val = vm_getspecial(th, GET_LEP(), key, type);
 }
 
-/* Set value of special local variable ($~, $_, ...) to obj. */
+/**
+  @c variable
+  @e Set value of special local variable ($~, $_, ...) to obj.
+  @j 特別なローカル変数（$~, $_, ...）の値を設定する。
+ */
 DEFINE_INSN
 setspecial
 (rb_num_t key)
 (VALUE obj)
 ()
 {
-    lep_svar_set(ec, GET_LEP(), key, obj);
+    lep_svar_set(th, GET_LEP(), key, obj);
 }
 
-/* Get value of instance variable id of self. */
+/**
+  @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 の値を得る。
+ */
 DEFINE_INSN
 getinstancevariable
 (ID id, IC ic)
 ()
 (VALUE val)
-/* "instance variable not initialized" warning can be hooked. */
-// attr bool leaf = false; /* has rb_warning() */
 {
     val = vm_getinstancevariable(GET_SELF(), id, ic);
 }
 
-/* Set value of instance variable id of self to val. */
+/**
+  @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 にする。
+ */
 DEFINE_INSN
 setinstancevariable
 (ID id, IC ic)
@@ -224,91 +148,118 @@ setinstancevariable
     vm_setinstancevariable(GET_SELF(), id, val, ic);
 }
 
-/* Get value of class variable id of klass as val. */
+/**
+  @c variable
+  @e Get value of class variable id of klass as val.
+  @j 現在のスコープのクラス変数 id の値を得る。
+ */
 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);
 }
 
-/* Set value of class variable id of klass as val. */
+/**
+  @c variable
+  @e Set value of class variable id of klass as val.
+  @j klass のクラス変数 id を val にする。
+ */
 DEFINE_INSN
 setclassvariable
 (ID id)
 (VALUE val)
 ()
-/* "class variable access from toplevel" warning can be hooked. */
-// attr bool leaf = false; /* has rb_warning() */
 {
     vm_ensure_not_refinement_module(GET_SELF());
     rb_cvar_set(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id, val);
 }
 
-/* Get constant variable id. If klass is Qnil, constants
-   are searched in the current scope. Otherwise, get constant under klass
+/**
+  @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
    class or module.
+  @j 定数 id の値を得る。
+   klass が Qnil なら、そのスコープで得られる定数の値を得る。
+   Qfalse なら、トップレベルスコープを得る。
+   それ以外なら、klass クラスの下の定数を得る。
  */
 DEFINE_INSN
 getconstant
 (ID id)
 (VALUE klass)
 (VALUE val)
-/* getconstant can kick autoload */
-// attr bool leaf = false; /* has rb_autoload_load() */
 {
-    val = vm_get_ev_const(ec, klass, id, 0);
+    val = vm_get_ev_const(th, klass, id, 0);
 }
 
-/* Set constant variable id under cbase class or module.
+/**
+  @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 クラスの下の定数を設定する。
  */
 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);
 }
 
-/* get global variable id. */
+/**
+  @c variable
+  @e get global variable id.
+  @j グローバル変数 id の値を得る。
+ */
 DEFINE_INSN
 getglobal
 (GENTRY entry)
 ()
 (VALUE val)
-// attr bool leaf = leafness_of_getglobal(entry);
 {
     val = GET_GLOBAL((VALUE)entry);
 }
 
-/* set global variable id as val. */
+/**
+  @c variable
+  @e set global variable id as val.
+  @j グローバル変数 id の値を設定する。
+ */
 DEFINE_INSN
 setglobal
 (GENTRY entry)
 (VALUE val)
 ()
-// attr bool leaf = leafness_of_setglobal(entry);
 {
     SET_GLOBAL((VALUE)entry, val);
 }
 
+
 /**********************************************************/
 /* deal with values                                       */
 /**********************************************************/
 
-/* put nil to stack. */
+/**
+  @c put
+  @e put nil to stack.
+  @j スタックに nil をプッシュする。
+ */
 DEFINE_INSN
 putnil
 ()
@@ -318,7 +269,11 @@ putnil
     val = Qnil;
 }
 
-/* put self. */
+/**
+  @c put
+  @e put self.
+  @j スタックに self をプッシュする。
+ */
 DEFINE_INSN
 putself
 ()
@@ -328,7 +283,11 @@ putself
     val = GET_SELF();
 }
 
-/* put some object.
+/**
+  @c put
+  @e put some object.
+     i.e. Fixnum, true, false, nil, and so on.
+  @j オブジェクト val をスタックにプッシュする。
      i.e. Fixnum, true, false, nil, and so on.
  */
 DEFINE_INSN
@@ -340,31 +299,54 @@ putobject
     /* */
 }
 
-/* put special object.  "value_type" is for expansion. */
+/**
+  @c put
+  @e put special object.  "value_type" is for expansion.
+  @j 特別なオブジェクト val をスタックにプッシュする。
+     オブジェクトの種類は value_type による．
+ */
 DEFINE_INSN
 putspecialobject
 (rb_num_t value_type)
 ()
 (VALUE val)
 {
-    enum vm_special_object_type type;
-
-    type = (enum vm_special_object_type)value_type;
-    val = vm_get_special_object(GET_EP(), type);
+    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");
+    }
 }
 
-/* put iseq value. */
+/**
+  @c put
+  @e put iseq value.
+  @j iseq をスタックにプッシュする。
+ */
 DEFINE_INSN
 putiseq
 (ISEQ iseq)
 ()
 (VALUE ret)
-// attr bool handles_sp = false; /* of course it doesn't */
 {
     ret = (VALUE)iseq;
 }
 
-/* put string val. string will be copied. */
+/**
+  @c put
+  @e put string val. string will be copied.
+  @j 文字列をコピーしてスタックにプッシュする。
+ */
 DEFINE_INSN
 putstring
 (VALUE str)
@@ -374,99 +356,108 @@ putstring
     val = rb_str_resurrect(str);
 }
 
-/* put concatenate strings */
+/**
+  @c put
+  @e put concatenate strings
+  @j スタックトップの文字列を n 個連結し，結果をスタックにプッシュする。
+ */
 DEFINE_INSN
 concatstrings
 (rb_num_t num)
 (...)
-(VALUE val)
-// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
+(VALUE val) // inc += 1 - num;
 {
-    val = rb_str_concat_literals(num, STACK_ADDR_FROM_TOP(num));
+    val = rb_str_concat_literals(num, &TOPN(num-1));
+    POPN(num);
 }
 
-/* push the result of to_s. */
+/**
+  @c put
+  @e push the result of to_str.
+  @j to_str の結果をスタックにプッシュする。
+ */
 DEFINE_INSN
 tostring
 ()
-(VALUE val, VALUE str)
+(VALUE val)
 (VALUE val)
 {
-    val = rb_obj_as_string_result(str, val);
+    val = rb_obj_as_string(val);
 }
 
-/* Freeze (dynamically) created strings. if debug_info is given, set it. */
+/**
+  @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)
 {
-    vm_freezestring(str, debug_info);
+    if (!NIL_P(debug_info)) {
+	rb_ivar_set(str, id_debug_created_info, debug_info);
+    }
+    rb_str_freeze(str);
 }
 
-/* compile str to Regexp and push it.
+/**
+  @c put
+  @e 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)
-/* This instruction has StringValue(), which is a method call.  But it
- * seems that path is never covered. */
-// attr bool leaf = true; /* yes it is */
-// attr rb_snum_t sp_inc = 1 - (rb_snum_t)cnt;
+(VALUE val) // inc += 1 - cnt;
 {
-    const VALUE ary = rb_ary_tmp_new_from_values(0, cnt, STACK_ADDR_FROM_TOP(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);
     val = rb_reg_new_ary(ary, (int)opt);
     rb_ary_clear(ary);
 }
 
-/* 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. */
+/**
+  @c put
+  @e put new array initialized with num values on the stack.
+  @j 新しい配列をスタック上の num 個の値で初期化して生成しプッシュする。
+ */
 DEFINE_INSN
 newarray
 (rb_num_t num)
 (...)
-(VALUE val)
-// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
+(VALUE val) // inc += 1 - num;
 {
-    val = rb_ary_new4(num, STACK_ADDR_FROM_TOP(num));
+    val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
+    POPN(num);
 }
 
-/* dup array */
+/**
+  @c put
+  @e dup array
+  @j 配列 ary を dup してスタックにプッシュする。
+ */
 DEFINE_INSN
 duparray
 (VALUE ary)
 ()
 (VALUE val)
 {
-    RUBY_DTRACE_CREATE_HOOK(ARRAY, RARRAY_LEN(ary));
     val = rb_ary_resurrect(ary);
 }
 
-/* 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.
+/**
+  @c put
+  @e 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.
@@ -474,66 +465,110 @@ duphash
      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)
-(...)
-// attr bool leaf = false; /* has rb_check_array_type() */
-// attr rb_snum_t sp_inc = (rb_snum_t)num - 1 + (flag & 1 ? 1 : 0);
+(...) // inc += num - 1 + (flag & 1 ? 1 : 0);
 {
-    vm_expandarray(GET_SP(), ary, num, (int)flag);
+    vm_expandarray(GET_CFP(), ary, num, (int)flag);
 }
 
-/* concat two arrays */
+/**
+  @c put
+  @e concat two arrays
+  @j 二つの配列 ary1, ary2 を連結しスタックへプッシュする。
+ */
 DEFINE_INSN
 concatarray
 ()
-(VALUE ary1, VALUE ary2)
+(VALUE ary1, VALUE ary2st)
 (VALUE ary)
-// attr bool leaf = false; /* has rb_check_array_type() */
 {
-    ary = vm_concat_array(ary1, ary2);
+    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);
 }
 
-/* call to_a on array ary to splat */
+/**
+  @c put
+  @e call to_a on array ary to splat
+  @j splat のために配列 ary に対して to_a を呼び出す。
+ */
 DEFINE_INSN
 splatarray
 (VALUE flag)
 (VALUE ary)
 (VALUE obj)
-// attr bool leaf = false; /* has rb_check_array_type() */
 {
-    obj = vm_splat_array(flag, ary);
+    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;
 }
 
-/* put new Hash from n elements. n must be an even number. */
+/**
+  @c put
+  @e put new Hash from n elements. n must be an even number.
+  @j 新しいハッシュをスタックトップの n 個を初期値として生成する。
+     n はキーと値のペアなので 2 の倍数でなければならない。
+ */
 DEFINE_INSN
 newhash
 (rb_num_t num)
 (...)
-(VALUE val)
-// attr bool leaf = false; /* has rb_hash_key_str() */
-// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
+(VALUE val) // inc += 1 - num;
 {
+    rb_num_t i;
+
     RUBY_DTRACE_CREATE_HOOK(HASH, num);
 
-    val = rb_hash_new_with_size(num / 2);
+    val = rb_hash_new();
 
-    if (num) {
-        rb_hash_bulk_insert(num, STACK_ADDR_FROM_TOP(num), val);
+    for (i = num; i > 0; i -= 2) {
+	const VALUE v = TOPN(i - 2);
+	const VALUE k = TOPN(i - 1);
+	rb_hash_aset(val, k, v);
     }
+    POPN(num);
 }
 
-/* put new Range object.(Range.new(low, high, flag)) */
+/**
+  @c put
+  @e put new Range object.(Range.new(low, high, flag))
+  @j 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);
 }
@@ -542,7 +577,11 @@ newrange
 /* deal with stack operation                              */
 /**********************************************************/
 
-/* pop from stack. */
+/**
+  @c stack
+  @e pop from stack.
+  @j スタックから一つポップする。
+ */
 DEFINE_INSN
 pop
 ()
@@ -553,7 +592,11 @@ pop
     /* none */
 }
 
-/* duplicate stack top. */
+/**
+  @c stack
+  @e duplicate stack top.
+  @j スタックトップをコピーしてスタックにプッシュする。
+ */
 DEFINE_INSN
 dup
 ()
@@ -563,21 +606,31 @@ dup
     val1 = val2 = val;
 }
 
-/* duplicate stack top n elements */
+/**
+  @c stack
+  @e duplicate stack top n elements
+  @j スタックトップの n 個をコピーしてスタックにプッシュする。
+ */
 DEFINE_INSN
 dupn
 (rb_num_t n)
 (...)
-(...)
-// attr rb_snum_t sp_inc = n;
+(...) // inc += n;
 {
-    void *dst = GET_SP();
-    void *src = STACK_ADDR_FROM_TOP(n);
-
-    MEMCPY(dst, src, VALUE, 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);
 }
 
-/* swap top 2 vals */
+
+/**
+  @c stack
+  @e swap top 2 vals
+  @j スタックトップの 2 つの値を交換する。
+ */
 DEFINE_INSN
 swap
 ()
@@ -587,13 +640,16 @@ swap
     /* none */
 }
 
-/* reverse stack top N order. */
+/**
+  @c stack
+  @e reverse stack top N order.
+  @j スタックトップの n 個の値を逆転する。
+ */
 DEFINE_INSN
 reverse
 (rb_num_t n)
 (...)
-(...)
-// attr rb_snum_t sp_inc = 0;
+(...) // inc += 0;
 {
     rb_num_t i;
     VALUE *sp = STACK_ADDR_FROM_TOP(n);
@@ -606,108 +662,191 @@ reverse
     }
 }
 
-/* for stack caching. */
+/**
+  @c stack
+  @e for stack caching.
+  @j スタックキャッシングの状態を調整するために必要な命令。
+ */
 DEFINE_INSN
 reput
 ()
 (..., VALUE val)
-(VALUE val)
-// attr rb_snum_t sp_inc = 0;
+(VALUE val) // inc += 0;
 {
     /* none */
 }
 
-/* get nth stack value from stack top */
+/**
+  @c stack
+  @e get nth stack value from stack top
+  @j スタックトップから n 個目をスタックにプッシュする。
+ */
 DEFINE_INSN
 topn
 (rb_num_t n)
 (...)
-(VALUE val)
-// attr rb_snum_t sp_inc = 1;
+(VALUE val) // inc += 1;
 {
     val = TOPN(n);
 }
 
-/* set Nth stack entry to stack top */
+/**
+  @c stack
+  @e set Nth stack entry to stack top
+  @j スタックトップの値を n 個目のスタックにコピー
+ */
 DEFINE_INSN
 setn
 (rb_num_t n)
 (..., VALUE val)
-(VALUE val)
-// attr rb_snum_t sp_inc = 0;
+(VALUE val) // inc += 0
 {
-    TOPN(n) = val;
+    TOPN(n-1) = val;
 }
 
-/* empty current stack */
+/**
+  @c stack
+  @e empty current stack
+  @j current stack を空にする。
+ */
 DEFINE_INSN
 adjuststack
 (rb_num_t n)
 (...)
-(...)
-// attr rb_snum_t sp_inc = -(rb_snum_t)n;
+(...) // inc -= n
 {
-    /* none */
+    DEC_SP(n);
 }
 
+
 /**********************************************************/
 /* deal with setting                                      */
 /**********************************************************/
 
-/* defined? */
+/**
+  @c setting
+  @e defined?
+  @j 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(ec, GET_CFP(), op_type, obj, needstr, v);
+    val = vm_defined(th, GET_CFP(), op_type, obj, needstr, v);
 }
 
-/* check `target' matches `pattern'.
+/**
+  @c setting
+  @e 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);
 {
-    result = vm_check_match(ec, target, pattern, 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;
+	}
+    }
 }
 
-/* check keywords are specified or not. */
+/**
+  @c setting
+  @e check keywords are specified or not.
+  @j キーワードが指定されているかどうかチェックする
+ */
 DEFINE_INSN
 checkkeyword
-(lindex_t kw_bits_index, lindex_t keyword_index)
+(lindex_t kw_bits_index, rb_num_t keyword_index)
 ()
 (VALUE ret)
 {
-    ret = vm_check_keyword(kw_bits_index, keyword_index, GET_EP());
+    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 {
+	VM_ASSERT(RB_TYPE_P(kw_bits, T_HASH));
+	ret = rb_hash_has_key(kw_bits, INT2FIX(keyword_index)) ? Qfalse : Qtrue;
+    }
 }
 
-/* check if val is type. */
+/**
+  @c setting
+  @e trace
+  @j trace 用の命令。
+ */
 DEFINE_INSN
-checktype
-(rb_num_t type)
-(VALUE val)
-(VALUE ret)
+trace
+(rb_num_t nf)
+()
+()
 {
-    ret = (TYPE(val) == (int)type) ? Qtrue : Qfalse;
+    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);
 }
 
 /**********************************************************/
 /* deal with control flow 1: class/module                 */
 /**********************************************************/
 
-/* enter class definition scope. if super is Qfalse, and class
+/**
+  @c class/module
+  @e
+   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
@@ -715,14 +854,89 @@ defineclass
 (VALUE cbase, VALUE super)
 (VALUE val)
 {
-    VALUE klass = vm_find_or_create_class_by_id(id, flags, cbase, super);
+    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);
+    }
 
     rb_iseq_check(class_iseq);
 
     /* enter scope */
-    vm_push_frame(ec, class_iseq, VM_FRAME_MAGIC_CLASS | VM_ENV_FLAG_LOCAL, klass,
+    vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS | VM_ENV_FLAG_LOCAL, klass,
 		  GET_BLOCK_HANDLER(),
-		  (VALUE)vm_cref_push(ec, klass, NULL, FALSE),
+		  (VALUE)vm_cref_push(th, klass, NULL, FALSE),
 		  class_iseq->body->iseq_encoded, GET_SP(),
 		  class_iseq->body->local_table_size,
 		  class_iseq->body->stack_max);
@@ -730,163 +944,195 @@ defineclass
     NEXT_INSN();
 }
 
+
 /**********************************************************/
 /* deal with control flow 2: method/iterator              */
 /**********************************************************/
 
-/* invoke method. */
+/**
+  @c method/iterator
+  @e invoke method.
+  @j メソッド呼び出しを行う。ci に必要な情報が格納されている。
+ */
 DEFINE_INSN
 send
 (CALL_INFO ci, CALL_CACHE cc, ISEQ blockiseq)
 (...)
-(VALUE val)
-// attr rb_snum_t sp_inc = - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
     struct rb_calling_info calling;
 
-    calling.block_handler = vm_caller_setup_arg_block(ec, reg_cfp, ci, blockiseq, FALSE);
-    calling.recv = TOPN(calling.argc = ci->orig_argc);
-    vm_search_method(ci, cc, calling.recv);
-    CALL_METHOD(&calling, ci, cc);
-}
-
-/* Invoke method without block */
-DEFINE_INSN
-opt_send_without_block
-(CALL_INFO ci, CALL_CACHE cc)
-(...)
-(VALUE val)
-// attr bool handles_sp = true;
-// attr rb_snum_t sp_inc = -ci->orig_argc;
-{
-    struct rb_calling_info calling;
-    calling.block_handler = VM_BLOCK_HANDLER_NONE;
+    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);
 }
 
 DEFINE_INSN
 opt_str_freeze
-(VALUE str, CALL_INFO ci, CALL_CACHE cc)
+(VALUE str)
 ()
 (VALUE val)
 {
-    val = vm_opt_str_freeze(str, BOP_FREEZE, idFreeze);
-
-    if (val == Qundef) {
-        PUSH(rb_str_resurrect(str));
-        CALL_SIMPLE_METHOD();
+    if (BASIC_OP_UNREDEFINED_P(BOP_FREEZE, STRING_REDEFINED_OP_FLAG)) {
+	val = str;
+    }
+    else {
+	val = rb_funcall(rb_str_resurrect(str), idFreeze, 0);
     }
 }
 
 DEFINE_INSN
-opt_str_uminus
-(VALUE str, CALL_INFO ci, CALL_CACHE cc)
-()
-(VALUE val)
+opt_newarray_max
+(rb_num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
 {
-    val = vm_opt_str_freeze(str, BOP_UMINUS, idUMinus);
-
-    if (val == Qundef) {
-        PUSH(rb_str_resurrect(str));
-        CALL_SIMPLE_METHOD();
+#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);
+    }
+    else {
+	VALUE ary = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
+	val = rb_funcall(ary, idMax, 0);
+	POPN(num);
     }
+#undef id_cmp
 }
 
 DEFINE_INSN
-opt_newarray_max
+opt_newarray_min
 (rb_num_t 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;
+(VALUE val) // inc += 1 - num;
 {
-    val = vm_opt_newarray_max(num, STACK_ADDR_FROM_TOP(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
 }
 
+/**
+  @c optimize
+  @e Invoke method without block
+  @j Invoke method without block
+ */
 DEFINE_INSN
-opt_newarray_min
-(rb_num_t num)
+opt_send_without_block
+(CALL_INFO ci, CALL_CACHE cc)
 (...)
-(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;
+(VALUE val) // inc += -ci->orig_argc;
 {
-    val = vm_opt_newarray_min(num, STACK_ADDR_FROM_TOP(num));
+    struct rb_calling_info calling;
+    calling.block_handler = VM_BLOCK_HANDLER_NONE;
+    vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
+    CALL_METHOD(&calling, ci, cc);
 }
 
-/* super(args) # args.size => num */
+/**
+  @c method/iterator
+  @e super(args) # args.size => num
+  @j super を実行する。ci に必要な情報が格納されている。
+ */
 DEFINE_INSN
 invokesuper
 (CALL_INFO ci, CALL_CACHE cc, ISEQ blockiseq)
 (...)
-(VALUE val)
-// attr rb_snum_t sp_inc = - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
     struct rb_calling_info calling;
+    calling.argc = ci->orig_argc;
 
-    calling.block_handler = vm_caller_setup_arg_block(ec, reg_cfp, ci, blockiseq, TRUE);
-    calling.recv = TOPN(calling.argc = ci->orig_argc);
-    vm_search_super_method(ec, GET_CFP(), &calling, ci, cc);
+    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);
 }
 
-/* yield(args) */
+/**
+  @c method/iterator
+  @e yield(args)
+  @j yield を実行する。
+ */
 DEFINE_INSN
 invokeblock
 (CALL_INFO ci)
 (...)
-(VALUE val)
-// attr bool handles_sp = true;
-// attr rb_snum_t sp_inc = 1 - ci->orig_argc;
+(VALUE val)  // inc += 1 - ci->orig_argc;
 {
     struct rb_calling_info calling;
-    VALUE block_handler;
-
     calling.argc = ci->orig_argc;
     calling.block_handler = VM_BLOCK_HANDLER_NONE;
-    calling.recv = Qundef; /* should not be used */
-
-    block_handler = VM_CF_BLOCK_HANDLER(GET_CFP());
-    if (block_handler == VM_BLOCK_HANDLER_NONE) {
-	rb_vm_localjump_error("no block given (yield)", Qnil, 0);
-    }
+    calling.recv = GET_SELF();
 
-    val = vm_invoke_block(ec, GET_CFP(), &calling, ci, block_handler);
+    val = vm_invoke_block(th, GET_CFP(), &calling, ci);
     if (val == Qundef) {
-        EXEC_EC_CFP(val);
+	RESTORE_REGS();
+	NEXT_INSN();
     }
 }
 
-/* return from this scope. */
+/**
+  @c method/iterator
+  @e return from this scope.
+  @j このスコープから抜ける。
+ */
 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) {
-	    vm_stack_consistency_error(ec, reg_cfp, bp);
+	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
+		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, bp));
 	}
     }
 
-    RUBY_VM_CHECK_INTS(ec);
+    RUBY_VM_CHECK_INTS(th);
 
-    if (vm_pop_frame(ec, GET_CFP(), GET_EP())) {
+    if (vm_pop_frame(th, GET_CFP(), GET_EP())) {
 #if OPT_CALL_THREADED_CODE
-	rb_ec_thread_ptr(ec)->retval = val;
+	th->retval = val;
 	return 0;
 #else
 	return val;
@@ -901,17 +1147,19 @@ leave
 /* deal with control flow 3: exception                    */
 /**********************************************************/
 
-/* longjump */
+/**
+  @c exception
+  @e longjump
+  @j 大域ジャンプを行う。
+ */
 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(ec);
-    val = vm_throw(ec, GET_CFP(), throw_state, throwobj);
+    RUBY_VM_CHECK_INTS(th);
+    val = vm_throw(th, GET_CFP(), throw_state, throwobj);
     THROW_EXCEPTION(val);
     /* unreachable */
 }
@@ -920,513 +1168,987 @@ throw
 /* deal with control flow 4: local jump                   */
 /**********************************************************/
 
-/* set PC to (PC + dst). */
+/**
+  @c jump
+  @e set PC to (PC + dst).
+  @j PC を (PC + dst) にする。
+ */
 DEFINE_INSN
 jump
 (OFFSET dst)
 ()
 ()
-/* Same discussion as leave. */
-// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
 {
-    RUBY_VM_CHECK_INTS(ec);
+    RUBY_VM_CHECK_INTS(th);
     JUMP(dst);
 }
 
-/* if val is not false or nil, set PC to (PC + dst). */
+/**
+  @c jump
+  @e if val is not false or nil, set PC to (PC + dst).
+  @j もし val が false か nil でなければ、PC を (PC + dst) にする。
+ */
 DEFINE_INSN
 branchif
 (OFFSET dst)
 (VALUE val)
 ()
-/* Same discussion as jump. */
-// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
 {
     if (RTEST(val)) {
-	RUBY_VM_CHECK_INTS(ec);
+	RUBY_VM_CHECK_INTS(th);
 	JUMP(dst);
     }
 }
 
-/* if val is false or nil, set PC to (PC + dst). */
+/**
+  @c jump
+  @e if val is false or nil, set PC to (PC + dst).
+  @j もし val が false か nil ならば、PC を (PC + dst) にする。
+ */
 DEFINE_INSN
 branchunless
 (OFFSET dst)
 (VALUE val)
 ()
-/* Same discussion as jump. */
-// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
 {
     if (!RTEST(val)) {
-	RUBY_VM_CHECK_INTS(ec);
+	RUBY_VM_CHECK_INTS(th);
 	JUMP(dst);
     }
 }
 
-/* if val is nil, set PC to (PC + dst). */
+/**
+  @c jump
+  @e if val is nil, set PC to (PC + dst).
+  @j もし val が nil ならば、PC を (PC + dst) にする。
+ */
 DEFINE_INSN
 branchnil
 (OFFSET dst)
 (VALUE val)
 ()
-/* Same discussion as jump. */
-// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
 {
     if (NIL_P(val)) {
-	RUBY_VM_CHECK_INTS(ec);
+	RUBY_VM_CHECK_INTS(th);
 	JUMP(dst);
     }
 }
 
+
 /**********************************************************/
 /* for optimize                                           */
 /**********************************************************/
 
-/* push inline-cached value and go to dst if it is valid */
+/**
+  @c optimize
+  @e push inline-cached value and go to dst if it is valid
+  @j インラインキャッシュが有効なら、値をスタックにプッシュして dst へジャンプする。
+ */
 DEFINE_INSN
-opt_getinlinecache
+getinlinecache
 (OFFSET dst, IC ic)
 ()
 (VALUE val)
 {
-    if (vm_ic_hit_p(ic, GET_EP())) {
+    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);
     }
     else {
+	/* none */
 	val = Qnil;
     }
 }
 
-/* set inline cache */
+/**
+  @c optimize
+  @e set inline cache
+  @j インラインキャッシュの値を設定する。
+ */
 DEFINE_INSN
-opt_setinlinecache
+setinlinecache
 (IC ic)
 (VALUE val)
 (VALUE val)
 {
-    vm_ic_update(ic, val, GET_EP());
+    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;
 }
 
-/* run iseq only once */
+/**
+  @c optimize
+  @e run iseq only once
+  @j once を実現する。
+ */
 DEFINE_INSN
 once
-(ISEQ iseq, ISE ise)
+(ISEQ iseq, IC ic)
 ()
 (VALUE val)
 {
-    val = vm_once_dispatch(ec, iseq, ise);
+    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;
+    }
 }
 
-/* case dispatcher, jump by table if possible */
+/**
+  @c optimize
+  @e case dispatcher, jump by table if possible
+  @j case 文で、可能なら表引きでジャンプする。
+ */
 DEFINE_INSN
 opt_case_dispatch
 (CDHASH hash, OFFSET else_offset)
 (..., VALUE key)
-()
-// attr rb_snum_t sp_inc = -1;
+() // inc += -1;
 {
-    OFFSET dst = vm_case_dispatch(hash, else_offset, key);
-
-    if (dst) {
-	JUMP(dst);
+    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;
     }
 }
 
 /** simple functions */
 
-/* optimized X+Y. */
+/**
+  @c optimize
+  @e optimized X+Y.
+  @j 最適化された X+Y。
+ */
 DEFINE_INSN
 opt_plus
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
-/* Array + anything can be handled inside of opt_plus, and that
- * anything is converted into array using #to_ary. */
-// attr bool leaf = false; /* has rb_to_array_type() */
 {
-    val = vm_opt_plus(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_PLUS,INTEGER_REDEFINED_OP_FLAG)) {
+	/* fixnum + fixnum */
+#ifndef LONG_LONG_VALUE
+	VALUE msb = (VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1);
+	val = recv - 1 + obj;
+	if ((~(recv ^ obj) & (recv ^ val)) & msb) {
+	    val = rb_int2big((SIGNED_VALUE)((val>>1) | (recv & msb)));
+	}
+#else
+	val = LONG2NUM(FIX2LONG(recv) + FIX2LONG(obj));
+#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);
     }
 }
 
-/* optimized X-Y. */
+/**
+  @c optimize
+  @e optimized X-Y.
+  @j 最適化された X-Y。
+ */
 DEFINE_INSN
 opt_minus
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_minus(recv, obj);
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_MINUS, INTEGER_REDEFINED_OP_FLAG)) {
+	long a, b, c;
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	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);
     }
 }
 
-/* optimized X*Y. */
+/**
+  @c optimize
+  @e optimized X*Y.
+  @j 最適化された X*Y。
+ */
 DEFINE_INSN
 opt_mult
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_mult(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized X/Y. */
+/**
+  @c optimize
+  @e optimized X/Y.
+  @j 最適化された X/Y。
+ */
 DEFINE_INSN
 opt_div
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_div(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized X%Y. */
+/**
+  @c optimize
+  @e optimized X%Y.
+  @j 最適化された X%Y。
+ */
 DEFINE_INSN
 opt_mod
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_mod(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized X==Y. */
+/**
+  @c optimize
+  @e optimized X==Y.
+  @j 最適化された X==Y。
+ */
 DEFINE_INSN
 opt_eq
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
-/* This instruction can compare a string with non-string.  This
- * (somewhat) coerces the non-string into a string, via a method
- * call. */
-// attr bool leaf = false; /* has rb_str_equal() */
 {
     val = opt_eq_func(recv, obj, ci, cc);
 
     if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	/* other */
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* optimized X!=Y. */
+/**
+  @c optimize
+  @e optimized X!=Y.
+  @j 最適化された X!=Y。
+ */
 DEFINE_INSN
 opt_neq
-(CALL_INFO ci_eq, CALL_CACHE cc_eq, CALL_INFO ci, CALL_CACHE cc)
+(CALL_INFO ci, CALL_CACHE cc, CALL_INFO ci_eq, CALL_CACHE cc_eq)
 (VALUE recv, VALUE obj)
 (VALUE val)
-/* Same discussion as opt_eq. */
-// attr bool leaf = false; /* has rb_str_equal() */
 {
-    val = vm_opt_neq(ci, cc, ci_eq, cc_eq, recv, obj);
+    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;
+	}
+    }
 
     if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	/* other */
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* optimized X<Y. */
+/**
+  @c optimize
+  @e optimized X<Y.
+  @j 最適化された X<Y。
+ */
 DEFINE_INSN
 opt_lt
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_lt(recv, obj);
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_LT, INTEGER_REDEFINED_OP_FLAG)) {
+	SIGNED_VALUE a = recv, b = obj;
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	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);
     }
 }
 
-/* optimized X<=Y. */
+/**
+  @c optimize
+  @e optimized X<=Y.
+  @j 最適化された X<=Y。
+ */
 DEFINE_INSN
 opt_le
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_le(recv, obj);
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_LE, INTEGER_REDEFINED_OP_FLAG)) {
+	SIGNED_VALUE a = recv, b = obj;
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	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);
     }
 }
 
-/* optimized X>Y. */
+/**
+  @c optimize
+  @e optimized X>Y.
+  @j 最適化された X>Y。
+ */
 DEFINE_INSN
 opt_gt
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_gt(recv, obj);
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_GT, INTEGER_REDEFINED_OP_FLAG)) {
+	SIGNED_VALUE a = recv, b = obj;
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	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);
     }
 }
 
-/* optimized X>=Y. */
+/**
+  @c optimize
+  @e optimized X>=Y.
+  @j 最適化された X>=Y。
+ */
 DEFINE_INSN
 opt_ge
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_ge(recv, obj);
+    if (FIXNUM_2_P(recv, obj) &&
+	BASIC_OP_UNREDEFINED_P(BOP_GE, INTEGER_REDEFINED_OP_FLAG)) {
+	SIGNED_VALUE a = recv, b = obj;
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+	if (a >= b) {
+	    val = Qtrue;
+	}
+	else {
+	    val = Qfalse;
+	}
     }
-}
-
-/* << */
-DEFINE_INSN
-opt_ltlt
-(CALL_INFO ci, CALL_CACHE cc)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    val = vm_opt_ltlt(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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;
     }
-}
-
-/* optimized X&Y. */
-DEFINE_INSN
-opt_and
-(CALL_INFO ci, CALL_CACHE cc)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    val = vm_opt_and(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    else {
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* optimized X|Y. */
+/**
+  @c optimize
+  @e <<
+  @j 最適化された X<<Y。
+ */
 DEFINE_INSN
-opt_or
+opt_ltlt
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = vm_opt_or(recv, obj);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* [] */
+/**
+  @c optimize
+  @e []
+  @j 最適化された recv[obj]。
+ */
 DEFINE_INSN
 opt_aref
 (CALL_INFO ci, CALL_CACHE cc)
 (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();
+    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);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	PUSH(obj);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* recv[obj] = set */
+/**
+  @c optimize
+  @e recv[obj] = set
+  @j 最適化された recv[obj] = set。
+ */
 DEFINE_INSN
 opt_aset
 (CALL_INFO ci, CALL_CACHE cc)
 (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 */
 {
-    val = vm_opt_aset(recv, obj, set);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* recv[str] = set */
+/**
+  @c optimize
+  @e recv[str] = set
+  @j 最適化された recv[str] = set。
+ */
 DEFINE_INSN
 opt_aset_with
-(VALUE key, CALL_INFO ci, CALL_CACHE cc)
+(CALL_INFO ci, CALL_CACHE cc, VALUE key)
 (VALUE recv, VALUE val)
 (VALUE val)
-/* Same discussion as opt_aset. */
-// attr bool leaf = false; /* has rb_funcall() */ /* calls #hash */
 {
-    VALUE tmp = vm_opt_aset_with(recv, key, val);
-
-    if (tmp != Qundef) {
-	val = tmp;
+    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);
     }
     else {
-#ifndef MJIT_HEADER
-	TOPN(0) = rb_str_resurrect(key);
+	PUSH(recv);
+	PUSH(rb_str_resurrect(key));
 	PUSH(val);
-#endif
-        CALL_SIMPLE_METHOD();
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* recv[str] */
+/**
+  @c optimize
+  @e recv[str]
+  @j 最適化された recv[str]。
+ */
 DEFINE_INSN
 opt_aref_with
-(VALUE key, CALL_INFO ci, CALL_CACHE cc)
+(CALL_INFO ci, CALL_CACHE cc, VALUE key)
 (VALUE recv)
 (VALUE val)
-/* Same discussion as opt_aref. */
-// attr bool leaf = false; /* has rb_funcall() */ /* calls #yield */
 {
-    val = vm_opt_aref_with(recv, key);
-
-    if (val == Qundef) {
-#ifndef MJIT_HEADER
+    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);
 	PUSH(rb_str_resurrect(key));
-#endif
-        CALL_SIMPLE_METHOD();
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* optimized length */
+/**
+  @c optimize
+  @e optimized length
+  @j 最適化された recv.length()。
+ */
 DEFINE_INSN
 opt_length
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv)
 (VALUE val)
 {
-    val = vm_opt_length(recv, BOP_LENGTH);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized size */
+/**
+  @c optimize
+  @e optimized size
+  @j 最適化された recv.size()。
+ */
 DEFINE_INSN
 opt_size
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv)
 (VALUE val)
 {
-    val = vm_opt_length(recv, BOP_SIZE);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized empty? */
+/**
+  @c optimize
+  @e optimized empty?
+  @j 最適化された recv.empty?()。
+ */
 DEFINE_INSN
 opt_empty_p
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv)
 (VALUE val)
 {
-    val = vm_opt_empty_p(recv);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* optimized succ */
+/**
+  @c optimize
+  @e optimized succ
+  @j 最適化された recv.succ()。
+ */
 DEFINE_INSN
 opt_succ
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv)
 (VALUE val)
 {
-    val = vm_opt_succ(recv);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    if (SPECIAL_CONST_P(recv)) {
+	if (FIXNUM_P(recv) &&
+	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, INTEGER_REDEFINED_OP_FLAG)) {
+	    /* fixnum + INT2FIX(1) */
+	    if (recv != LONG2FIX(FIXNUM_MAX)) {
+		val = recv - 1 + INT2FIX(1);
+	    }
+	    else {
+		val = LONG2NUM(FIXNUM_MAX + 1);
+	    }
+	}
+	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);
     }
 }
 
-/* optimized not */
+/**
+  @c optimize
+  @e optimized not
+  @j 最適化された recv.!()。
+ */
 DEFINE_INSN
 opt_not
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE recv)
 (VALUE val)
 {
-    val = vm_opt_not(ci, cc, recv);
+    vm_search_method(ci, cc, recv);
 
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    if (check_cfunc(cc->me, rb_obj_not)) {
+	val = RTEST(recv) ? Qfalse : Qtrue;
+    }
+    else {
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(recv);
     }
 }
 
-/* optimized regexp match */
+
+/**
+  @c optimize
+  @e optimized regexp match
+  @j 最適化された正規表現マッチ。
+ */
 DEFINE_INSN
 opt_regexpmatch1
-(VALUE recv)
+(VALUE r)
 (VALUE obj)
 (VALUE val)
-// attr bool leaf = BASIC_OP_UNREDEFINED_P(BOP_MATCH, REGEXP_REDEFINED_OP_FLAG);
 {
-    val = vm_opt_regexpmatch1(recv, obj);
+    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);
+    }
 }
 
-/* optimized regexp match 2 */
+/**
+  @c optimize
+  @e optimized regexp match 2
+  @j 最適化された正規表現マッチ 2
+ */
 DEFINE_INSN
 opt_regexpmatch2
 (CALL_INFO ci, CALL_CACHE cc)
 (VALUE obj2, VALUE obj1)
 (VALUE val)
 {
-    val = vm_opt_regexpmatch2(obj2, obj1);
-
-    if (val == Qundef) {
-        CALL_SIMPLE_METHOD();
+    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);
     }
 }
 
-/* call native compiled method */
+/**
+  @c optimize
+  @e call native compiled method
+  @j ネイティブコンパイルしたメソッドを起動。
+ */
 DEFINE_INSN
 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)(ec, reg_cfp);
+    reg_cfp = (funcptr)(th, reg_cfp);
 
     if (reg_cfp == 0) {
-	VALUE err = ec->errinfo;
-	ec->errinfo = Qnil;
+	VALUE err = th->errinfo;
+	th->errinfo = Qnil;
 	THROW_EXCEPTION(err);
     }
 
@@ -1434,7 +2156,11 @@ opt_call_c_function
     NEXT_INSN();
 }
 
-/* BLT */
+/**
+  @c joke
+  @e BLT
+  @j BLT
+ */
 DEFINE_INSN
 bitblt
 ()
@@ -1444,7 +2170,11 @@ bitblt
     ret = rb_str_new2("a bit of bacon, lettuce and tomato");
 }
 
-/* The Answer to Life, the Universe, and Everything */
+/**
+  @c joke
+  @e The Answer to Life, the Universe, and Everything
+  @j 人生、宇宙、すべての答え。
+ */
 DEFINE_INSN
 answer
 ()
@@ -1453,3 +2183,4 @@ answer
 {
     ret = INT2FIX(42);
 }
+
diff --git a/internal.h b/internal.h
index 9583e8388e..bf3880e695 100644
--- a/internal.h
+++ b/internal.h
@@ -13,6 +13,8 @@
 #define RUBY_INTERNAL_H 1
 
 #include "ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/io.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -21,65 +23,27 @@ extern "C" {
 #endif
 #endif
 
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#endif
-
-#ifndef __bool_true_false_are_defined
-# ifndef __cplusplus
-#  undef bool
-#  undef false
-#  undef true
-#  define bool signed char
-#  define false 0
-#  define true 1
-#  define __bool_true_false_are_defined 1
-# endif
-#endif
-
-/* 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 LIKELY(x) RB_LIKELY(x)
 #define UNLIKELY(x) RB_UNLIKELY(x)
 
-#ifndef MAYBE_UNUSED
-# define MAYBE_UNUSED(x) x
-#endif
-
-#ifndef WARN_UNUSED_RESULT
-# define WARN_UNUSED_RESULT(x) x
+#ifndef __has_attribute
+# define __has_attribute(x) 0
 #endif
 
-#if 0
-#elif defined(NO_SANITIZE)
-# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
-    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))
+#if __has_attribute(__unused__)
+#define UNINITIALIZED_VAR(x) x __attribute__((__unused__))
+#elif defined(__GNUC__) && __GNUC__ >= 3
+#define UNINITIALIZED_VAR(x) x = x
 #else
-# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) x
-#endif
-
-#if defined(NO_SANITIZE) && defined(__GNUC__) &&! defined(__clang__)
-/* GCC warns about unknown sanitizer, which is annoying. */
-#undef NO_SANITIZE
-#define NO_SANITIZE(x, y) \
-    COMPILER_WARNING_PUSH; \
-    COMPILER_WARNING_IGNORED(-Wattributes); \
-    __attribute__((__no_sanitize__(x))) y; \
-    COMPILER_WARNING_POP
+#define UNINITIALIZED_VAR(x) x
 #endif
 
-#ifndef NO_SANITIZE
-# define NO_SANITIZE(x, y) y
+#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
@@ -105,71 +69,8 @@ extern "C" {
 # define __has_extension __has_feature
 #endif
 
-#ifndef MJIT_HEADER
-
-#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H
-# include <sanitizer/asan_interface.h>
-#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
-
-#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H
-# include <sanitizer/msan_interface.h>
-#endif
-
-#if !__has_feature(memory_sanitizer)
-# define __msan_allocated_memory(x, y)
-# define __msan_poison(x, y)
-# define __msan_unpoison(x, y)
-# define __msan_unpoison_string(x)
-#endif
-
-static inline void
-poison_memory_region(const volatile void *ptr, size_t size)
-{
-    __msan_poison(ptr, size);
-    __asan_poison_memory_region(ptr, size);
-}
-
-static inline void
-poison_object(VALUE obj)
-{
-    struct RVALUE *ptr = (void *)obj;
-    poison_memory_region(ptr, SIZEOF_VALUE);
-}
-
-static inline void
-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);
-    }
-}
-
-static inline void
-unpoison_object(VALUE obj, bool newobj_p)
-{
-    struct RVALUE *ptr = (void *)obj;
-    unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p);
-}
-
-#endif
-
-/* Prevent compiler from reordering access */
-#define ACCESS_ONCE(type,x) (*((volatile type *)&(x)))
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
+#if GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert)
 # define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr)
-#elif GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert)
-# define STATIC_ASSERT(name, expr) RB_GNUC_EXTENSION _Static_assert(expr, #name ": " #expr)
 #else
 # define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)]
 #endif
@@ -191,41 +92,15 @@ unpoison_object(VALUE obj, bool newobj_p)
 #endif
 #define TIMET_MAX_PLUS_ONE (2*(double)(TIMET_MAX/2+1))
 
-#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P
-#define MUL_OVERFLOW_P(a, b) \
-    __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0)
-#elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW
-#define MUL_OVERFLOW_P(a, b) \
-    RB_GNUC_EXTENSION_BLOCK(__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)))
-
-#ifdef HAVE_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) RB_GNUC_EXTENSION_BLOCK( \
-    struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \
-    __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
+#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
@@ -270,20 +145,20 @@ unpoison_object(VALUE obj, bool newobj_p)
 # endif
 #endif
 
-static inline unsigned int
+static inline int
 nlz_int(unsigned int x)
 {
 #if defined(HAVE_BUILTIN___BUILTIN_CLZ)
     if (x == 0) return SIZEOF_INT * CHAR_BIT;
-    return (unsigned int)__builtin_clz(x);
+    return __builtin_clz(x);
 #else
     unsigned int y;
 # if 64 < SIZEOF_INT * CHAR_BIT
-    unsigned int n = 128;
+    int n = 128;
 # elif 32 < SIZEOF_INT * CHAR_BIT
-    unsigned int n = 64;
+    int n = 64;
 # else
-    unsigned int n = 32;
+    int n = 32;
 # endif
 # if 64 < SIZEOF_INT * CHAR_BIT
     y = x >> 64; if (y) {n -= 64; x = y;}
@@ -296,24 +171,24 @@ nlz_int(unsigned int x)
     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);
+    return (int)(n - x);
 #endif
 }
 
-static inline unsigned int
+static inline int
 nlz_long(unsigned long x)
 {
 #if defined(HAVE_BUILTIN___BUILTIN_CLZL)
     if (x == 0) return SIZEOF_LONG * CHAR_BIT;
-    return (unsigned int)__builtin_clzl(x);
+    return __builtin_clzl(x);
 #else
     unsigned long y;
 # if 64 < SIZEOF_LONG * CHAR_BIT
-    unsigned int n = 128;
+    int n = 128;
 # elif 32 < SIZEOF_LONG * CHAR_BIT
-    unsigned int n = 64;
+    int n = 64;
 # else
-    unsigned int n = 32;
+    int n = 32;
 # endif
 # if 64 < SIZEOF_LONG * CHAR_BIT
     y = x >> 64; if (y) {n -= 64; x = y;}
@@ -326,25 +201,25 @@ nlz_long(unsigned long x)
     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);
+    return (int)(n - x);
 #endif
 }
 
 #ifdef HAVE_LONG_LONG
-static inline unsigned int
+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 (unsigned int)__builtin_clzll(x);
+    return __builtin_clzll(x);
 #else
     unsigned LONG_LONG y;
 # if 64 < SIZEOF_LONG_LONG * CHAR_BIT
-    unsigned int n = 128;
+    int n = 128;
 # elif 32 < SIZEOF_LONG_LONG * CHAR_BIT
-    unsigned int n = 64;
+    int n = 64;
 # else
-    unsigned int n = 32;
+    int n = 32;
 # endif
 # if 64 < SIZEOF_LONG_LONG * CHAR_BIT
     y = x >> 64; if (y) {n -= 64; x = y;}
@@ -357,17 +232,17 @@ nlz_long_long(unsigned LONG_LONG x)
     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);
+    return (int)(n - x);
 #endif
 }
 #endif
 
 #ifdef HAVE_UINT128_T
-static inline unsigned int
+static inline int
 nlz_int128(uint128_t x)
 {
     uint128_t y;
-    unsigned int n = 128;
+    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;}
@@ -375,30 +250,23 @@ nlz_int128(uint128_t x)
     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);
+    return (int)(n - x);
 }
 #endif
 
-static inline unsigned int
-nlz_intptr(uintptr_t x)
-{
-#if SIZEOF_UINTPTR_T == SIZEOF_INT
-    return nlz_int(x);
-#elif SIZEOF_UINTPTR_T == SIZEOF_LONG
-    return nlz_long(x);
-#elif SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG
+static inline int
+nlz_intptr(uintptr_t x) {
+#if SIZEOF_VOIDP == 8
     return nlz_long_long(x);
-#else
-    #error no known integer type corresponds uintptr_t
-    return /* sane compiler */ ~0;
+#elif SIZEOF_VOIDP == 4
+    return nlz_int(x);
 #endif
 }
 
-static inline unsigned int
-rb_popcount32(uint32_t x)
-{
+static inline int
+rb_popcount32(uint32_t x) {
 #ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT
-    return (unsigned int)__builtin_popcount(x);
+    return __builtin_popcount(x);
 #else
     x = (x & 0x55555555) + (x >> 1 & 0x55555555);
     x = (x & 0x33333333) + (x >> 2 & 0x33333333);
@@ -409,8 +277,7 @@ rb_popcount32(uint32_t x)
 }
 
 static inline int
-rb_popcount64(uint64_t x)
-{
+rb_popcount64(uint64_t x) {
 #ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT
     return __builtin_popcountll(x);
 #else
@@ -424,8 +291,7 @@ rb_popcount64(uint64_t x)
 }
 
 static inline int
-rb_popcount_intptr(uintptr_t x)
-{
+rb_popcount_intptr(uintptr_t x) {
 #if SIZEOF_VOIDP == 8
     return rb_popcount64(x);
 #elif SIZEOF_VOIDP == 4
@@ -434,8 +300,7 @@ rb_popcount_intptr(uintptr_t x)
 }
 
 static inline int
-ntz_int32(uint32_t x)
-{
+ntz_int32(uint32_t x) {
 #ifdef HAVE_BUILTIN___BUILTIN_CTZ
     return __builtin_ctz(x);
 #else
@@ -444,8 +309,7 @@ ntz_int32(uint32_t x)
 }
 
 static inline int
-ntz_int64(uint64_t x)
-{
+ntz_int64(uint64_t x) {
 #ifdef HAVE_BUILTIN___BUILTIN_CTZLL
     return __builtin_ctzll(x);
 #else
@@ -454,8 +318,7 @@ ntz_int64(uint64_t x)
 }
 
 static inline int
-ntz_intptr(uintptr_t x)
-{
+ntz_intptr(uintptr_t x) {
 #if SIZEOF_VOIDP == 8
     return ntz_int64(x);
 #elif SIZEOF_VOIDP == 4
@@ -472,66 +335,6 @@ ntz_intptr(uintptr_t x)
 VALUE rb_int128t2big(int128_t n);
 #endif
 
-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)
-{
-#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW
-    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
-     *     * nevative: 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;
-    }
-#else
-    long lz = FIX2LONG(x) + FIX2LONG(y);
-    return LONG2NUM(lz);
-#endif
-}
-
-static inline VALUE
-rb_fix_minus_fix(VALUE x, VALUE y)
-{
-#ifdef HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW
-    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;
-    }
-#else
-    long lz = FIX2LONG(x) - FIX2LONG(y);
-    return LONG2NUM(lz);
-#endif
-}
-
 /* arguments must be Fixnum */
 static inline VALUE
 rb_fix_mul_fix(VALUE x, VALUE y)
@@ -601,28 +404,19 @@ rb_fix_mod_fix(VALUE x, VALUE y)
     return mod;
 }
 
-#if defined(HAVE_UINT128_T) && defined(HAVE_LONG_LONG)
+#if defined(HAVE_UINT128_T)
 #   define bit_length(x) \
-    (unsigned int) \
     (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_UINT128_T)
-#   define bit_length(x) \
-    (unsigned int) \
-    (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_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x)))
 #elif defined(HAVE_LONG_LONG)
 #   define bit_length(x) \
-    (unsigned int) \
     (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) \
-    (unsigned int) \
     (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \
      SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)))
 #endif
@@ -700,7 +494,7 @@ struct RBignum {
         BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
     } as;
 };
-#define BIGNUM_SIGN_BIT ((VALUE)FL_USER1)
+#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) \
@@ -710,15 +504,13 @@ struct RBignum {
 #define BIGNUM_NEGATIVE_P(b) (!BIGNUM_SIGN(b))
 #define BIGNUM_NEGATE(b) (RBASIC(b)->flags ^= BIGNUM_SIGN_BIT)
 
-#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2)
-#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 */
+#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) ? \
-     (size_t)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \
-	      (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \
+     (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) \
@@ -754,103 +546,30 @@ struct RComplex {
 
 #define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
 
-/* shortcut macro for internal only */
+#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))
-
-enum ruby_rhash_flags {
-    RHASH_ST_TABLE_FLAG = FL_USER3,
-    RHASH_AR_TABLE_MAX_SIZE = 8,
-    RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7),
-    RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4),
-    RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11),
-    RHASH_AR_TABLE_BOUND_SHIFT = (FL_USHIFT+8),
-
-    RHASH_ENUM_END
-};
-
-#define HASH_PROC_DEFAULT FL_USER2
-
-#define RHASH_AR_TABLE_SIZE_RAW(h) \
-  ((unsigned int)((RBASIC(h)->flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT))
-
-int rb_hash_ar_table_p(VALUE hash);
-struct ar_table_struct *rb_hash_ar_table(VALUE hash);
-st_table *rb_hash_st_table(VALUE hash);
-void rb_hash_st_table_set(VALUE hash, st_table *st);
-
-#if 0 /* for debug */
-#define RHASH_AR_TABLE_P(hash)       rb_hash_ar_table_p(hash)
-#define RHASH_AR_TABLE(h)            rb_hash_ar_table(h)
-#define RHASH_ST_TABLE(h)            rb_hash_st_table(h)
-#else
-#define RHASH_AR_TABLE_P(hash)       (!FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG))
-#define RHASH_AR_TABLE(hash)         (RHASH(hash)->as.ar)
-#define RHASH_ST_TABLE(hash)         (RHASH(hash)->as.st)
-#endif
-
-#define RHASH(obj)                   (R_CAST(RHash)(obj))
-#define RHASH_ST_SIZE(h)             (RHASH_ST_TABLE(h)->num_entries)
-#define RHASH_ST_TABLE_P(h)          (!RHASH_AR_TABLE_P(h))
-#define RHASH_ST_CLEAR(h)            (FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG), RHASH(h)->as.ar = NULL)
-
-#define RHASH_AR_TABLE_SIZE_MASK     (VALUE)RHASH_AR_TABLE_SIZE_MASK
-#define RHASH_AR_TABLE_SIZE_SHIFT    RHASH_AR_TABLE_SIZE_SHIFT
-#define RHASH_AR_TABLE_BOUND_MASK    (VALUE)RHASH_AR_TABLE_BOUND_MASK
-#define RHASH_AR_TABLE_BOUND_SHIFT   RHASH_AR_TABLE_BOUND_SHIFT
-
-#if USE_TRANSIENT_HEAP
-#define RHASH_TRANSIENT_FLAG      FL_USER14
-#define RHASH_TRANSIENT_P(hash)   FL_TEST_RAW((hash), RHASH_TRANSIENT_FLAG)
-#define RHASH_SET_TRANSIENT_FLAG(h)   FL_SET_RAW(h, RHASH_TRANSIENT_FLAG)
-#define RHASH_UNSET_TRANSIENT_FLAG(h) FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG)
-#else
-#define RHASH_TRANSIENT_P(hash)   0
-#define RHASH_SET_TRANSIENT_FLAG(h)   ((void)0)
-#define RHASH_UNSET_TRANSIENT_FLAG(h) ((void)0)
 #endif
 
-#define RHASH_AR_TABLE_MAX_SIZE      8
-#define RHASH_AR_TABLE_MAX_BOUND     RHASH_AR_TABLE_MAX_SIZE
-
-typedef struct ar_table_entry {
-    VALUE hash;
-    VALUE key;
-    VALUE record;
-} ar_table_entry;
-
-typedef struct ar_table_struct {
-    ar_table_entry entries[RHASH_AR_TABLE_MAX_SIZE];
-} ar_table;
-
-/*
- * 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.
- */
 struct RHash {
     struct RBasic basic;
-    union {
-        st_table *st;
-        ar_table *ar; /* possibly 0 */
-    } as;
+    struct st_table *ntbl;      /* possibly 0 */
     int iter_lev;
     const VALUE ifnone;
 };
 
-#ifdef RHASH_ITER_LEV
-#  undef RHASH_ITER_LEV
-#  undef RHASH_IFNONE
-#  undef RHASH_SIZE
+#define RHASH(obj)   (R_CAST(RHash)(obj))
 
-#  define RHASH_ITER_LEV(h)  (RHASH(h)->iter_lev)
-#  define RHASH_IFNONE(h)    (RHASH(h)->ifnone)
-#  define RHASH_SIZE(h)      (RHASH_AR_TABLE_P(h) ? RHASH_AR_TABLE_SIZE_RAW(h) : RHASH_ST_SIZE(h))
-#endif /* #ifdef RHASH_ITER_LEV */
+#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
@@ -860,26 +579,14 @@ extern void ruby_init_setproctitle(int argc, char *argv[]);
 #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_TRANSIENT_FLAG = FL_USER3,
 
     RSTRUCT_ENUM_END
 };
 
-#if USE_TRANSIENT_HEAP
-#define RSTRUCT_TRANSIENT_P(st) FL_TEST_RAW((obj), RSTRUCT_TRANSIENT_FLAG)
-#define RSTRUCT_TRANSIENT_SET(st) FL_SET_RAW((st), RSTRUCT_TRANSIENT_FLAG)
-#define RSTRUCT_TRANSIENT_UNSET(st) FL_UNSET_RAW((st), RSTRUCT_TRANSIENT_FLAG)
-#else
-#define RSTRUCT_TRANSIENT_P(st) 0
-#define RSTRUCT_TRANSIENT_SET(st) ((void)0)
-#define RSTRUCT_TRANSIENT_UNSET(st) ((void)0)
-#endif
-
 struct RStruct {
     struct RBasic basic;
     union {
@@ -920,13 +627,6 @@ rb_struct_const_ptr(VALUE st)
 	RSTRUCT(st)->as.ary : RSTRUCT(st)->as.heap.ptr);
 }
 
-static inline const VALUE *
-rb_struct_const_heap_ptr(VALUE st)
-{
-    /* TODO: check embed on debug mode */
-    return RSTRUCT(st)->as.heap.ptr;
-}
-
 /* class.c */
 
 struct rb_deprecated_classext_struct {
@@ -944,15 +644,12 @@ struct rb_subclass_entry {
 #if defined(HAVE_LONG_LONG)
 typedef unsigned LONG_LONG rb_serial_t;
 #define SERIALT2NUM ULL2NUM
-#define PRI_SERIALT_PREFIX PRI_LL_PREFIX
 #elif defined(HAVE_UINT64_T)
 typedef uint64_t rb_serial_t;
 #define SERIALT2NUM SIZET2NUM
-#define PRI_SERIALT_PREFIX PRI_64_PREFIX
 #else
 typedef unsigned long rb_serial_t;
 #define SERIALT2NUM ULONG2NUM
-#define PRI_SERIALT_PREFIX PRI_LONG_PREFIX
 #endif
 
 struct rb_classext_struct {
@@ -1039,64 +736,45 @@ struct RIMemo {
 };
 
 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_env        = 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
 };
-#define IMEMO_MASK   0x0f
 
 static inline enum imemo_type
 imemo_type(VALUE imemo)
 {
-    return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK;
+    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;
-    }
-}
+/* 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
 
-/* 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
+/* CREF in method.h */
 
-/* CREF (Class REFerence) is defined in method.h */
+/* SVAR */
 
-/*! SVAR (Special VARiable) */
 struct vm_svar {
     VALUE flags;
-    const VALUE cref_or_me; /*!< class reference or rb_method_entry_t */
+    const VALUE cref_or_me;
     const VALUE lastline;
     const VALUE backref;
     const VALUE others;
 };
 
+/* THROW_DATA */
 
-#define THROW_DATA_CONSUMED IMEMO_FL_USER0
-
-/*! THROW_DATA */
 struct vm_throw_data {
     VALUE flags;
     VALUE reserved;
@@ -1105,72 +783,22 @@ struct vm_throw_data {
     VALUE throw_state;
 };
 
-#define THROW_DATA_P(err) RB_TYPE_P((VALUE)(err), T_IMEMO)
+#define THROW_DATA_P(err) RB_TYPE_P((err), T_IMEMO)
 
-/* 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 */
 
-/*! IFUNC (Internal FUNCtion) */
 struct vm_ifunc {
     VALUE flags;
     VALUE reserved;
     VALUE (*func)(ANYARGS);
     const void *data;
-    struct vm_ifunc_argc argc;
+    ID id;
 };
 
 #define IFUNC_NEW(a, b, c) ((struct vm_ifunc *)rb_imemo_new(imemo_ifunc, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0))
-struct vm_ifunc *rb_vm_ifunc_new(VALUE (*func)(ANYARGS), const void *data, int min_argc, int max_argc);
-static inline struct vm_ifunc *
-rb_vm_ifunc_proc_new(VALUE (*func)(ANYARGS), const void *data)
-{
-    return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS);
-}
-
-typedef 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 */
-} rb_imemo_tmpbuf_t;
-
-VALUE rb_imemo_tmpbuf_auto_free_pointer(void *buf);
-VALUE rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(void *buf, size_t cnt);
-rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt);
 
-#define RB_IMEMO_TMPBUF_PTR(v) \
-    ((void *)(((const struct rb_imemo_tmpbuf_struct *)(v))->ptr))
+/* MEMO */
 
-static inline VALUE
-rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str)
-{
-    const void *src;
-    void *dst;
-    size_t len;
-
-    SafeStringValue(str);
-    len = RSTRING_LEN(str);
-    src = RSTRING_PTR(str);
-    dst = ruby_xmalloc(len);
-    memcpy(dst, src, len);
-    return rb_imemo_tmpbuf_auto_free_pointer(dst);
-}
-
-void rb_strterm_mark(VALUE obj);
-
-/*! MEMO
- *
- * @see imemo_type
- * */
 struct MEMO {
     VALUE flags;
     VALUE reserved;
@@ -1211,13 +839,12 @@ struct MEMO {
 enum {
     cmp_opt_Fixnum,
     cmp_opt_String,
-    cmp_opt_Float,
     cmp_optimizable_count
 };
 
 struct cmp_opt_data {
-    unsigned int opt_methods;
-    unsigned int opt_inited;
+    int opt_methods;
+    int opt_inited;
 };
 
 #define NEW_CMP_OPT_MEMO(type, value) \
@@ -1235,8 +862,6 @@ struct cmp_opt_data {
      (((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))
 
 /* ment is in method.h */
@@ -1253,50 +878,16 @@ 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 *);
 
-/* array.c */
-
-#ifndef ARRAY_DEBUG
-#define ARRAY_DEBUG 0
-#endif
-
-#ifdef ARRAY_DEBUG
-#define RARRAY_PTR_IN_USE_FLAG FL_USER14
-#define ARY_PTR_USING_P(ary) FL_TEST_RAW((ary), RARRAY_PTR_IN_USE_FLAG)
-#else
-
-/* disable debug function */
-#undef  RARRAY_PTR_USE_START_TRANSIENT
-#undef  RARRAY_PTR_USE_END_TRANSIENT
-#define RARRAY_PTR_USE_START_TRANSIENT(a) ((VALUE *)RARRAY_CONST_PTR_TRANSIENT(a))
-#define RARRAY_PTR_USE_END_TRANSIENT(a)
-#define ARY_PTR_USING_P(ary) 0
-
-#endif
-
-#if USE_TRANSIENT_HEAP
-#define RARY_TRANSIENT_SET(ary) FL_SET_RAW((ary), RARRAY_TRANSIENT_FLAG);
-#define RARY_TRANSIENT_UNSET(ary) FL_UNSET_RAW((ary), RARRAY_TRANSIENT_FLAG);
-#else
-#undef RARRAY_TRANSIENT_P
-#define RARRAY_TRANSIENT_P(a) 0
-#define RARY_TRANSIENT_SET(ary) ((void)0)
-#define RARY_TRANSIENT_UNSET(ary) ((void)0)
-#endif
-
+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);
-VALUE rb_ary_aref1(VALUE ary, VALUE i);
-VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
 size_t rb_ary_memsize(VALUE);
-VALUE rb_to_array_type(VALUE obj);
-VALUE rb_check_to_array(VALUE ary);
-VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *);
-VALUE rb_ary_behead(VALUE, long);
-#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO)
+#ifdef __GNUC__
 #define rb_ary_new_from_args(n, ...) \
     __extension__ ({ \
 	const VALUE args_to_new_ary[] = {__VA_ARGS__}; \
@@ -1307,25 +898,9 @@ VALUE rb_ary_behead(VALUE, long);
     })
 #endif
 
-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];
-}
-
 /* bignum.c */
 extern const char ruby_digitmap[];
-double rb_big_fdiv_double(VALUE x, VALUE y);
+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);
@@ -1334,7 +909,6 @@ 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_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);
@@ -1345,7 +919,6 @@ 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);
 
 /* class.c */
 VALUE rb_class_boot(VALUE);
@@ -1360,13 +933,13 @@ 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);
-void rb_undef_methods_from(VALUE klass, VALUE super);
 
 /* compar.c */
 VALUE rb_invcmp(VALUE, VALUE);
@@ -1375,37 +948,32 @@ VALUE rb_invcmp(VALUE, VALUE);
 struct rb_block;
 int rb_dvar_defined(ID, const struct rb_block *);
 int rb_local_defined(ID, const struct rb_block *);
-const char * rb_insns_name(int i);
+CONSTFUNC(const char * rb_insns_name(int i));
 VALUE rb_insns_name_array(void);
-int rb_vm_insn_addr2insn(const void *);
 
 /* complex.c */
-VALUE rb_dbl_complex_new_polar_pi(double abs, double ang);
+VALUE rb_complex_plus(VALUE, VALUE);
+VALUE rb_complex_mul(VALUE, VALUE);
+VALUE rb_complex_abs(VALUE x);
+VALUE rb_complex_sqrt(VALUE x);
 
-struct rb_thread_struct;
 /* cont.c */
-struct rb_fiber_struct;
 VALUE rb_obj_is_fiber(VALUE);
-void rb_fiber_reset_root_local_storage(struct rb_thread_struct *);
+void rb_fiber_reset_root_local_storage(VALUE);
 void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(ANYARGS), VALUE (*rollback_func)(ANYARGS));
-void rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber);
 
 /* debug.c */
 PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
 
-/* dir.c */
-VALUE rb_dir_getwd_ospath(void);
-
 /* dmyext.c */
 void Init_enc(void);
 void Init_ext(void);
 
 /* encoding.c */
 ID rb_id_encoding(void);
-#ifdef RUBY_ENCODING_H
+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);
-#endif
 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);
@@ -1416,7 +984,6 @@ void rb_encdb_set_unicode(int index);
 PUREFUNC(int rb_data_is_encoding(VALUE obj));
 
 /* 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);
 
@@ -1425,52 +992,28 @@ 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_sys_warn(const char *fmt, ...), 1, 2);
-PRINTF_ARGS(void rb_syserr_warn(int err, const char *fmt, ...), 2, 3);
-PRINTF_ARGS(void rb_sys_warning(const char *fmt, ...), 1, 2);
-PRINTF_ARGS(void rb_syserr_warning(int err, const char *fmt, ...), 2, 3);
-#ifdef RUBY_ENCODING_H
-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_warn(rb_encoding *enc, const char *fmt, ...), 2, 3);
-PRINTF_ARGS(void rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...), 3, 4);
 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);
-PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4);
-#endif
-
-#define rb_raise_cstr(etype, mesg) \
-    rb_exc_raise(rb_exc_new_str(etype, rb_str_new_cstr(mesg)))
-#define rb_raise_static(etype, mesg) \
-    rb_exc_raise(rb_exc_new_str(etype, rb_str_new_static(mesg, rb_strlen_lit(mesg))))
-
 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))
-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);
-#define rb_key_err_raise(mesg, recv, name) \
-    rb_exc_raise(rb_key_err_new(mesg, recv, name))
-NORETURN(void ruby_deprecated_internal_feature(const char *));
-#define DEPRECATED_INTERNAL_FEATURE(func) \
-    (ruby_deprecated_internal_feature(func), UNREACHABLE)
-VALUE rb_warning_warn(VALUE mod, VALUE str);
-PRINTF_ARGS(VALUE rb_warning_string(const char *fmt, ...), 1, 2);
+NORETURN(void ruby_only_for_internal_use(const char *));
+#define ONLY_FOR_INTERNAL_USE(func) ruby_only_for_internal_use(func)
 
 /* eval.c */
 VALUE rb_refinement_module_get_refined_class(VALUE module);
-extern ID ruby_static_id_signo, ruby_static_id_status;
-void rb_class_modify_check(VALUE);
-#define id_signo ruby_static_id_signo
-#define id_status ruby_static_id_status
 
 /* eval_error.c */
+void ruby_error_print(void);
 VALUE rb_get_backtrace(VALUE info);
 
 /* eval_jump.c */
@@ -1478,18 +1021,15 @@ void rb_call_end_proc(VALUE data);
 void rb_mark_end_proc(void);
 
 /* 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);
 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);
-VALUE rb_get_path_check(VALUE, int);
 void Init_File(void);
 int ruby_is_fd_loadable(int fd);
 
@@ -1530,14 +1070,14 @@ void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj);
 #define ruby_sized_xfree(ptr, size) ruby_xfree(ptr)
 #define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n)
 #else
-RUBY_SYMBOL_EXPORT_BEGIN
 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);
-RUBY_SYMBOL_EXPORT_END
 #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);
+
 /* optimized version of NEWOBJ() */
 #undef NEWOBJF_OF
 #undef RB_NEWOBJ_OF
@@ -1547,44 +1087,22 @@ RUBY_SYMBOL_EXPORT_END
 			rb_wb_unprotected_newobj_of(klass, flags))
 #define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags)
 
-void *rb_aligned_malloc(size_t, size_t);
-void rb_aligned_free(void *);
-
 /* hash.c */
-#if RHASH_CONVERT_TABLE_DEBUG
-struct 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__)
-#else
 struct st_table *rb_hash_tbl_raw(VALUE hash);
-#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
-#endif
-
-VALUE rb_hash_new_with_size(st_index_t size);
-RUBY_SYMBOL_EXPORT_BEGIN
-VALUE rb_hash_new_compare_by_id(void);
-RUBY_SYMBOL_EXPORT_END
 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);
-long rb_dbl_long_hash(double d);
 st_table *rb_init_identtable(void);
 st_table *rb_init_identtable_with_size(st_index_t size);
-VALUE rb_hash_compare_by_id_p(VALUE hash);
-VALUE rb_to_hash_type(VALUE obj);
-VALUE rb_hash_key_str(VALUE);
+
+#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);
-VALUE rb_hash_resurrect(VALUE hash);
 int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val);
-VALUE rb_hash_set_pair(VALUE hash, VALUE pair);
-void rb_hash_bulk_insert(long, const VALUE *, VALUE);
-
-int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval);
-int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval);
-int rb_hash_stlike_foreach(VALUE hash, int (*func)(ANYARGS), st_data_t arg);
-int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg);
+#define HASH_DELETED  FL_USER1
+#define HASH_PROC_DEFAULT FL_USER2
 
 /* inits.c */
 void rb_call_inits(void);
@@ -1595,12 +1113,7 @@ 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);
-#ifdef RUBY_IO_H
 size_t rb_io_memsize(const rb_io_t *);
-#endif
-int rb_stderr_tty_p(void);
-void rb_io_fptr_finalize_internal(void *ptr);
-#define rb_io_fptr_finalize rb_io_fptr_finalize_internal
 
 /* load.c */
 VALUE rb_get_load_path(void);
@@ -1626,139 +1139,28 @@ VALUE rb_math_sin(VALUE);
 VALUE rb_math_sinh(VALUE);
 VALUE rb_math_sqrt(VALUE);
 
-/* mjit.c */
-
-#if USE_MJIT
-extern int mjit_enabled;
-VALUE mjit_pause(int wait_p);
-VALUE mjit_resume(void);
-void mjit_finish(int close_handle_p);
-#else
-#define mjit_enabled 0
-static inline VALUE mjit_pause(int wait_p){ return Qnil; } /* unreachable */
-static inline VALUE mjit_resume(void){ return Qnil; } /* unreachable */
-static inline void mjit_finish(int close_handle_p){}
-#endif
-
 /* newline.c */
 void Init_newline(void);
 
 /* numeric.c */
-
-#define FIXNUM_POSITIVE_P(num) ((SIGNED_VALUE)(num) > (SIGNED_VALUE)INT2FIX(0))
-#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0)
-#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0))
-
-#define INT_NEGATIVE_P(x) (FIXNUM_P(x) ? FIXNUM_NEGATIVE_P(x) : BIGNUM_NEGATIVE_P(x))
-
-#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
-};
-#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)
-
 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 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_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_int_mul(VALUE x, VALUE y);
-VALUE rb_float_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, enum ruby_num_rounding_mode mode);
+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_gt(VALUE x, VALUE y);
-int rb_float_cmp(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);
-VALUE rb_int_abs(VALUE num);
-VALUE rb_int_odd_p(VALUE num);
-int rb_int_positive_p(VALUE num);
-int rb_int_negative_p(VALUE num);
-VALUE rb_num_pow(VALUE x, VALUE y);
-
-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));
-}
-
-
-VALUE rb_float_abs(VALUE flt);
-VALUE rb_float_equal(VALUE x, VALUE y);
-VALUE rb_float_eql(VALUE x, VALUE y);
-VALUE rb_flo_div_flo(VALUE x, VALUE y);
 
 #if USE_FLONUM
 #define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n)))
@@ -1779,7 +1181,7 @@ rb_float_flonum_value(VALUE v)
 	/* e: xx1... -> 011... */
 	/*    xx0... -> 100... */
 	/*      ^b63           */
-	t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~(VALUE)0x03), 3);
+	t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~0x03), 3);
 	return t.d;
     }
 #endif
@@ -1842,10 +1244,6 @@ 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_obj_not_equal(VALUE obj1, VALUE obj2);
-VALUE rb_convert_type_with_id(VALUE,int,const char*,ID);
-VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID);
 
 struct RBasicRaw {
     VALUE flags;
@@ -1865,9 +1263,7 @@ struct RBasicRaw {
 #endif
 VALUE rb_parser_get_yydebug(VALUE);
 VALUE rb_parser_set_yydebug(VALUE, VALUE);
-RUBY_SYMBOL_EXPORT_BEGIN
 VALUE rb_parser_set_context(VALUE, const struct rb_block *, int);
-RUBY_SYMBOL_EXPORT_END
 void *rb_parser_load_file(VALUE parser, VALUE name);
 int rb_is_const_name(VALUE name);
 int rb_is_class_name(VALUE name);
@@ -1893,15 +1289,12 @@ ID rb_id_attrget(ID id);
 VALUE rb_proc_location(VALUE self);
 st_index_t rb_hash_proc(st_index_t hash, VALUE proc);
 int rb_block_arity(void);
-int rb_block_min_max_arity(int *max);
 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_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info);
+VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val);
 
 /* process.c */
 #define RB_MAX_GROUPS (65536)
 
-struct waitpid_state;
 struct rb_execarg {
     union {
         struct {
@@ -1930,8 +1323,6 @@ struct rb_execarg {
     unsigned new_pgroup_flag : 1;
     unsigned uid_given : 1;
     unsigned gid_given : 1;
-    unsigned exception : 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;
@@ -1943,7 +1334,6 @@ struct rb_execarg {
     VALUE fd_open;
     VALUE fd_dup2_child;
     VALUE env_modification; /* Qfalse or [[k1,v1], ...] */
-    VALUE path_env;
     VALUE chdir_dir;
 };
 
@@ -1951,56 +1341,41 @@ struct rb_execarg {
  * 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 ARGVSTR2ARGV(argv_str) ((char **)RB_IMEMO_TMPBUF_PTR(argv_str) + 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;
-}
+#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);
 
-/* range.c */
-#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
-#define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
-#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
-
 /* 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_mul(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_abs(VALUE self);
-VALUE rb_rational_cmp(VALUE self, VALUE other);
-VALUE rb_rational_pow(VALUE self, VALUE other);
-VALUE rb_numeric_quo(VALUE x, VALUE y);
 
 /* 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);
-VALUE rb_reg_new_ary(VALUE ary, int options);
 
 /* 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))
@@ -2035,15 +1410,11 @@ VALUE rb_id_quote_unprintable(ID);
 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_tmp_frozen_acquire(VALUE str);
-void rb_str_tmp_frozen_release(VALUE str, VALUE tmp);
-VALUE rb_str_chomp_string(VALUE str, VALUE chomp);
 #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);
-VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc);
 #endif
 #define STR_NOEMBED      FL_USER1
 #define STR_SHARED       FL_USER2 /* = ELTS_SHARED */
@@ -2054,9 +1425,6 @@ VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc);
 size_t rb_str_memsize(VALUE);
 VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, VALUE passed_proc);
 VALUE rb_sym_to_proc(VALUE sym);
-char *rb_str_to_cstr(VALUE str);
-VALUE rb_str_eql(VALUE str1, VALUE str2);
-VALUE rb_obj_as_string_result(VALUE str, VALUE obj);
 
 /* symbol.c */
 #ifdef RUBY_ENCODING_H
@@ -2081,31 +1449,20 @@ VALUE rb_sym_intern_ascii_cstr(const char *ptr);
 	rb_sym_intern_ascii_cstr(ptr); \
 })
 #endif
-VALUE rb_to_symbol_type(VALUE obj);
 
 /* 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);
 
 /* time.c */
 struct timeval rb_time_timeval(VALUE);
 
 /* 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);
 void rb_clear_trace_func(void);
 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);
@@ -2114,38 +1471,27 @@ 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;
-#ifdef RUBY_ENCODING_H
 size_t rb_econv_memsize(rb_econv_t *);
-#endif
 
 /* us_ascii.c */
-#ifdef RUBY_ENCODING_H
 extern rb_encoding OnigEncodingUS_ASCII;
-#endif
 
 /* 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 */
-#ifdef RUBY_ENCODING_H
 extern rb_encoding OnigEncodingUTF_8;
-#endif
 
 /* variable.c */
-#if USE_TRANSIENT_HEAP
-#define ROBJECT_TRANSIENT_FLAG    FL_USER13
-#define ROBJ_TRANSIENT_P(obj)     FL_TEST_RAW((obj), ROBJECT_TRANSIENT_FLAG)
-#define ROBJ_TRANSIENT_SET(obj)   FL_SET_RAW((obj), ROBJECT_TRANSIENT_FLAG)
-#define ROBJ_TRANSIENT_UNSET(obj) FL_UNSET_RAW((obj), ROBJECT_TRANSIENT_FLAG)
-#else
-#define ROBJ_TRANSIENT_P(obj)     0
-#define ROBJ_TRANSIENT_SET(obj)   ((void)0)
-#define ROBJ_TRANSIENT_UNSET(obj) ((void)0)
-#endif
 void rb_gc_mark_global_tbl(void);
 size_t rb_generic_ivar_memsize(VALUE);
 VALUE rb_search_class_path(VALUE);
@@ -2153,10 +1499,9 @@ 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);
 void rb_deprecate_constant(VALUE mod, const char *name);
-NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE));
-rb_gvar_getter_t *rb_gvar_getter_function_of(const struct rb_global_entry *);
-rb_gvar_setter_t *rb_gvar_setter_function_of(const struct rb_global_entry *);
-bool rb_gvar_is_traced(const struct rb_global_entry *);
+
+/* version.c */
+extern const char ruby_engine[];
 
 /* vm_insnhelper.h */
 rb_serial_t rb_next_class_serial(void);
@@ -2168,17 +1513,18 @@ void Init_BareVM(void);
 void Init_vm_objects(void);
 PUREFUNC(VALUE rb_vm_top_self(void));
 void rb_thread_recycle_stack_release(VALUE *);
-VALUE *rb_thread_recycle_stack(size_t);
 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_location_cstr(int *pline);
-MJIT_STATIC void rb_vm_pop_cfunc_frame(void);
+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);
-MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE);
+VALUE ruby_vm_sysstack_error_copy(void);
 PUREFUNC(st_table *rb_vm_fstring_table(void));
 
 
@@ -2192,18 +1538,12 @@ VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, V
 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);
-const char *rb_type_str(enum ruby_value_type type);
 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);
-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);
 
 /* vm_insnhelper.c */
 VALUE rb_equal_opt(VALUE obj1, VALUE obj2);
-VALUE rb_eql_opt(VALUE obj1, VALUE obj2);
-void Init_vm_stack_canary(void);
 
 /* vm_method.c */
 void Init_eval_method(void);
@@ -2222,7 +1562,8 @@ 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);
+void rb_backtrace_print_to(VALUE output);
+VALUE rb_vm_backtrace_object(void);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 const char *rb_objspace_data_type_name(VALUE obj);
@@ -2230,11 +1571,6 @@ 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);
 
-/* 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);
-
 /* bignum.c (export) */
 VALUE rb_big_mul_normal(VALUE x, VALUE y);
 VALUE rb_big_mul_balance(VALUE x, VALUE y);
@@ -2253,19 +1589,6 @@ 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
-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
-};
-VALUE rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits, int base, int flags);
-
-/* 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);
 
 /* error.c (export) */
 int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
@@ -2276,15 +1599,8 @@ NORETURN(void rb_unexpected_type(VALUE,int));
      ((t) == RUBY_T_DATA && RTYPEDDATA_P(v)) ? \
      rb_unexpected_type((VALUE)(v), (t)) : (void)0)
 
-static inline int
-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);
-}
-#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline
-
 /* file.c (export) */
-#if defined HAVE_READLINK && defined RUBY_ENCODING_H
+#ifdef HAVE_READLINK
 VALUE rb_readlink(VALUE path, rb_encoding *enc);
 #endif
 #ifdef __APPLE__
@@ -2306,8 +1622,9 @@ 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, int allow_exc_opt);
+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);
@@ -2316,29 +1633,20 @@ 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(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
 
-/* signal.c (export) */
-int rb_grantpt(int fd);
-
 /* 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
-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);
 
 /* thread.c (export) */
 int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */
 
-/* time.c (export) */
-void ruby_reset_leap_second_info(void);
-
 /* util.c (export) */
 extern const signed char ruby_digit36_to_number_table[];
 extern const char ruby_hexdigits[];
@@ -2368,9 +1676,6 @@ VALUE rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VAL
 VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0);
 #endif
 
-/* random.c */
-int ruby_fill_random_bytes(void *, size_t, int);
-
 RUBY_SYMBOL_EXPORT_END
 
 #define RUBY_DTRACE_CREATE_HOOK(name, arg) \
@@ -2379,89 +1684,12 @@ RUBY_SYMBOL_EXPORT_END
 do { \
     if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
 	int dtrace_line; \
-	const char *dtrace_file = rb_source_location_cstr(&dtrace_line); \
+	const char *dtrace_file = rb_source_loc(&dtrace_line); \
 	if (!dtrace_file) dtrace_file = ""; \
 	RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \
     } \
 } while (0)
 
-#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 : \
-	RB_BUILTIN_TYPE(arg_obj); \
-    })
-#else
-static inline int
-rb_obj_builtin_type(VALUE obj)
-{
-    return RB_SPECIAL_CONST_P(obj) ? -1 :
-	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
-
-#if defined(_MSC_VER)
-# define COMPILER_WARNING_PUSH          __pragma(warning(push))
-# define COMPILER_WARNING_POP           __pragma(warning(pop))
-# define COMPILER_WARNING_ERROR(flag)   __pragma(warning(error: flag)))
-# define COMPILER_WARNING_IGNORED(flag) __pragma(warning(suppress: flag)))
-
-#elif defined(__clang__) /* clang 2.6 already had this feature */
-# define COMPILER_WARNING_PUSH          _Pragma("clang diagnostic push")
-# define COMPILER_WARNING_POP           _Pragma("clang diagnostic pop")
-# define COMPILER_WARNING_SPECIFIER(kind, msg) \
-    clang diagnostic kind # msg
-# define COMPILER_WARNING_ERROR(flag) \
-    COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag))
-# define COMPILER_WARNING_IGNORED(flag) \
-    COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag))
-
-#elif GCC_VERSION_SINCE(4, 2, 0)
-/* https://gcc.gnu.org/onlinedocs/gcc-4.2.0/gcc/Diagnostic-Pragmas.html */
-# define COMPILER_WARNING_PUSH          _Pragma("GCC diagnostic push")
-# define COMPILER_WARNING_POP           _Pragma("GCC diagnostic pop")
-# define COMPILER_WARNING_SPECIFIER(kind, msg) \
-    GCC diagnostic kind # msg
-# define COMPILER_WARNING_ERROR(flag) \
-    COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(error, flag))
-# define COMPILER_WARNING_IGNORED(flag) \
-    COMPILER_WARNING_PRAGMA(COMPILER_WARNING_SPECIFIER(ignored, flag))
-
-#else /* other compilers to follow? */
-# define COMPILER_WARNING_PUSH          /* nop */
-# define COMPILER_WARNING_POP           /* nop */
-# define COMPILER_WARNING_ERROR(flag)   /* nop */
-# define COMPILER_WARNING_IGNORED(flag) /* nop */
-#endif
-
-#define COMPILER_WARNING_PRAGMA(str) COMPILER_WARNING_PRAGMA_(str)
-#define COMPILER_WARNING_PRAGMA_(str) _Pragma(#str)
-
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */
diff --git a/io.c b/io.c
index 3f7dbde50d..980f8232bf 100644
--- a/io.c
+++ b/io.c
@@ -11,17 +11,15 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
-#include "internal.h"
 #include "dln.h"
 #include "encindex.h"
 #include "id.h"
 #include <ctype.h>
 #include <errno.h>
 #include "ruby_atomic.h"
-#include "ccan/list/list.h"
 
 #undef free
 #define free(x) xfree(x)
@@ -122,6 +120,13 @@
 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)
@@ -131,17 +136,6 @@ 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
-
-#if defined(_WIN32)
-#  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
-#elif defined(O_NONBLOCK)
-  /* disabled for [Bug #15356] (Rack::Deflater + rails) failure: */
-#  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
-#else /* any platforms where O_NONBLOCK does not exist? */
-#  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
 #endif
 
 VALUE rb_cIO;
@@ -185,7 +179,7 @@ struct argf {
     long last_lineno;		/* $. */
     long lineno;
     VALUE argv;
-    VALUE inplace;
+    char *inplace;
     struct rb_io_enc_t encs;
     int8_t init_p, next_p, binmode;
 };
@@ -194,22 +188,14 @@ 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)
         return;
 
-#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) {
+    if (fstat(fd, &buf) != 0 && errno == EBADF) {
         rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd);
     }
 
@@ -234,7 +220,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 != 0) {
+        if (ret == -1) {
             rb_bug("rb_maygvl_fd_fix_cloexec: fcntl(%d, F_SETFD, %d) failed: %s", fd, flags2, strerror(errno));
         }
     }
@@ -278,7 +264,7 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode)
     flags |= O_NOINHERIT;
 #endif
     ret = open(pathname, flags, mode);
-    if (ret < 0) return ret;
+    if (ret == -1) return -1;
     if (ret <= 2 || o_cloexec_state == 0) {
 	rb_maygvl_fd_fix_cloexec(ret);
     }
@@ -327,30 +313,12 @@ rb_cloexec_dup2(int oldfd, int newfd)
 #else
         ret = dup2(oldfd, newfd);
 #endif
-        if (ret < 0) return ret;
+        if (ret == -1) return -1;
     }
     rb_maygvl_fd_fix_cloexec(ret);
     return ret;
 }
 
-static int
-rb_fd_set_nonblock(int fd)
-{
-#ifdef _WIN32
-    return rb_w32_set_nonblock(fd);
-#elif defined(F_GETFL)
-    int oflags = fcntl(fd, F_GETFL);
-
-    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 fildes[2])
 {
@@ -359,7 +327,7 @@ rb_cloexec_pipe(int fildes[2])
 #if defined(HAVE_PIPE2)
     static int try_pipe2 = 1;
     if (try_pipe2) {
-        ret = pipe2(fildes, O_CLOEXEC | RUBY_PIPE_NONBLOCK_DEFAULT);
+        ret = pipe2(fildes, O_CLOEXEC);
         if (ret != -1)
             return ret;
         /* pipe2 is available since Linux 2.6.27, glibc 2.9. */
@@ -374,7 +342,7 @@ rb_cloexec_pipe(int fildes[2])
 #else
     ret = pipe(fildes);
 #endif
-    if (ret < 0) return ret;
+    if (ret == -1) return -1;
 #ifdef __CYGWIN__
     if (ret == 0 && fildes[1] == -1) {
 	close(fildes[0]);
@@ -385,10 +353,6 @@ rb_cloexec_pipe(int fildes[2])
 #endif
     rb_maygvl_fd_fix_cloexec(fildes[0]);
     rb_maygvl_fd_fix_cloexec(fildes[1]);
-    if (RUBY_PIPE_NONBLOCK_DEFAULT) {
-        rb_fd_set_nonblock(fildes[0]);
-        rb_fd_set_nonblock(fildes[1]);
-    }
     return ret;
 }
 
@@ -421,7 +385,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
     ret = fcntl(fd, F_DUPFD, minfd);
 #elif defined(HAVE_DUP)
     ret = dup(fd);
-    if (ret >= 0 && ret < minfd) {
+    if (ret != -1 && ret < minfd) {
         const int prev_fd = ret;
         ret = rb_cloexec_fcntl_dupfd(fd, minfd);
         close(prev_fd);
@@ -430,7 +394,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
 #else
 # error "dup() or fcntl(F_DUPFD) must be supported."
 #endif
-    if (ret < 0) return ret;
+    if (ret == -1) return -1;
     rb_maygvl_fd_fix_cloexec(ret);
     return ret;
 }
@@ -460,7 +424,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
@@ -650,15 +614,6 @@ 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)
 {
@@ -684,7 +639,9 @@ void
 rb_io_check_closed(rb_io_t *fptr)
 {
     rb_io_check_initialized(fptr);
-    io_fd_check_closed(fptr->fd);
+    if (fptr->fd < 0) {
+	rb_raise(rb_eIOError, closed_stream);
+    }
 }
 
 static rb_io_t *
@@ -698,13 +655,13 @@ rb_io_get_fptr(VALUE io)
 VALUE
 rb_io_get_io(VALUE io)
 {
-    return rb_convert_type_with_id(io, T_FILE, "IO", idTo_io);
+    return rb_convert_type(io, T_FILE, "IO", "to_io");
 }
 
 VALUE
 rb_io_check_io(VALUE io)
 {
-    return rb_check_convert_type_with_id(io, T_FILE, "IO", idTo_io);
+    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
 }
 
 VALUE
@@ -736,10 +693,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
@@ -932,12 +889,11 @@ ruby_dup(int orig)
 
     fd = rb_cloexec_dup(orig);
     if (fd < 0) {
-	int e = errno;
-	if (rb_gc_for_fd(e)) {
+	if (rb_gc_for_fd(errno)) {
 	    fd = rb_cloexec_dup(orig);
 	}
 	if (fd < 0) {
-	    rb_syserr_fail(e, 0);
+	    rb_sys_fail(0);
 	}
     }
     rb_update_max_fd(fd);
@@ -960,7 +916,6 @@ io_alloc(VALUE klass)
 
 struct io_internal_read_struct {
     int fd;
-    int nonblock;
     void *buf;
     size_t capa;
 };
@@ -979,44 +934,25 @@ struct io_internal_writev_struct {
 };
 #endif
 
-static int nogvl_wait_for_single_fd(int fd, short events);
 static VALUE
 internal_read_func(void *ptr)
 {
     struct io_internal_read_struct *iis = ptr;
-    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->fd, RB_WAITFD_IN) != -1) {
-                goto retry;
-            }
-            errno = e;
-        }
-    }
-    return r;
+    return read(iis->fd, iis->buf, iis->capa);
 }
 
-#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;
-    ssize_t ret;
-    do_write_retry(write(iis->fd, iis->buf, iis->capa));
-    return (VALUE)ret;
+    return write(iis->fd, iis->buf, iis->capa);
 }
 
 static void*
 internal_write_func2(void *ptr)
 {
-    return (void*)internal_write_func(ptr);
+    struct io_internal_write_struct *iis = ptr;
+    return (void*)(intptr_t)write(iis->fd, iis->buf, iis->capa);
 }
 
 #ifdef HAVE_WRITEV
@@ -1024,9 +960,7 @@ static VALUE
 internal_writev_func(void *ptr)
 {
     struct io_internal_writev_struct *iis = ptr;
-    ssize_t ret;
-    do_write_retry(writev(iis->fd, iis->iov, iis->iovcnt));
-    return (VALUE)ret;
+    return writev(iis->fd, iis->iov, iis->iovcnt);
 }
 #endif
 
@@ -1034,9 +968,7 @@ static ssize_t
 rb_read_internal(int fd, void *buf, size_t count)
 {
     struct io_internal_read_struct iis;
-
     iis.fd = fd;
-    iis.nonblock = 0;
     iis.buf = buf;
     iis.capa = count;
 
@@ -1158,6 +1090,7 @@ 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;
@@ -1169,7 +1102,9 @@ io_fflush(rb_io_t *fptr)
 int
 rb_io_wait_readable(int f)
 {
-    io_fd_check_closed(f);
+    if (f < 0) {
+	rb_raise(rb_eIOError, closed_stream);
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -1193,7 +1128,9 @@ rb_io_wait_readable(int f)
 int
 rb_io_wait_writable(int f)
 {
-    io_fd_check_closed(f);
+    if (f < 0) {
+	rb_raise(rb_eIOError, closed_stream);
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -1310,8 +1247,8 @@ io_binwrite_string(VALUE arg)
 
 	r = rb_writev_internal(fptr->fd, iov, 2);
 
-        if (r < 0)
-            return r;
+        if (r == -1)
+            return -1;
 
 	if (fptr->wbuf.len <= r) {
 	    r -= fptr->wbuf.len;
@@ -1424,11 +1361,6 @@ 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)
 {
@@ -1490,9 +1422,6 @@ 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);
@@ -1502,13 +1431,11 @@ 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);
 
-    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;
+    return io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str),
+		       fptr, nosync);
 }
 
 ssize_t
@@ -1542,210 +1469,21 @@ io_write(VALUE io, VALUE str, int nosync)
     rb_io_check_writable(fptr);
 
     n = io_fwrite(str, fptr, nosync);
-    if (n < 0L) rb_sys_fail_path(fptr->pathv);
+    if (n == -1L) rb_sys_fail_path(fptr->pathv);
 
     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, 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, 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_path(fptr->pathv);
-	total = rb_fix_plus(LONG2FIX(n), total);
-    }
-
-    return total;
-}
-
 /*
  *  call-seq:
- *     ios.write(string, ...)    -> integer
+ *     ios.write(string)    -> integer
  *
- *  Writes the given strings to <em>ios</em>. The stream must be opened
- *  for writing. Arguments that are not a string will be converted
+ *  Writes the given string to <em>ios</em>. The stream must be opened
+ *  for writing. If the argument is not a string, it will be converted
  *  to a string using <code>to_s</code>. Returns the number of bytes
- *  written in total.
+ *  written.
  *
- *     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>
@@ -1755,15 +1493,9 @@ io_writev(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-io_write_m(int argc, VALUE *argv, VALUE io)
+io_write_m(VALUE io, VALUE str)
 {
-    if (argc != 1) {
-	return io_writev(argc, argv, io);
-    }
-    else {
-	VALUE str = argv[0];
-	return io_write(io, str, 0);
-    }
+    return io_write(io, str, 0);
 }
 
 VALUE
@@ -1772,23 +1504,6 @@ rb_io_write(VALUE io, VALUE str)
     return rb_funcallv(io, id_write, 1, &str);
 }
 
-static VALUE
-rb_io_writev(VALUE io, int argc, VALUE *argv)
-{
-    if (argc > 1 && rb_obj_method_arity(io, id_write) == 1) {
-	if (io != rb_stderr && RTEST(ruby_verbose)) {
-	    VALUE klass = CLASS_OF(io);
-	    char sep = FL_TEST(klass, FL_SINGLETON) ? (klass = io, '.') : '#';
-	    rb_warning("%+"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
@@ -1933,7 +1648,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>:
@@ -2029,16 +1744,6 @@ 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;
@@ -2058,7 +1763,7 @@ io_fillbuf(rb_io_t *fptr)
 	    r = rb_read_internal(fptr->fd, fptr->rbuf.ptr, fptr->rbuf.capa);
 	}
         if (r < 0) {
-            if (fptr_wait_readable(fptr))
+            if (rb_io_wait_readable(fptr->fd))
                 goto retry;
 	    {
 		int e = errno;
@@ -2069,7 +1774,6 @@ 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)
@@ -2170,6 +1874,8 @@ rb_io_sync(VALUE io)
  *
  *     f = File.new("testfile")
  *     f.sync = true
+ *
+ *  <em>(produces no output)</em>
  */
 
 static VALUE
@@ -2366,7 +2072,7 @@ rb_io_inspect(VALUE obj)
 
 /*
  *  call-seq:
- *     ios.to_io  -> ios
+ *     ios.to_io  ->  ios
  *
  *  Returns <em>ios</em>.
  */
@@ -2405,7 +2111,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 (fptr_wait_readable(fptr))
+                if (rb_io_wait_readable(fptr->fd))
                     goto again;
 		return -1;
 	    }
@@ -2429,7 +2135,7 @@ io_bufread(char *ptr, long len, rb_io_t *fptr)
     return len - n;
 }
 
-static int io_setstrbuf(VALUE *str, long len);
+static void io_setstrbuf(VALUE *str, long len);
 
 struct bufread_arg {
     char *str_ptr;
@@ -2591,7 +2297,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) < 0) {
+                if (io_fillbuf(fptr) == -1) {
 		    if (!fptr->readconv) {
 			return MORE_CHAR_FINISHED;
 		    }
@@ -2648,45 +2354,33 @@ io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
     return str;
 }
 
-static int
+static void
 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, len);
-	return TRUE;
+	*str = rb_str_new(0, 0);
     }
     else {
 	VALUE s = StringValue(*str);
 	long clen = RSTRING_LEN(s);
 	if (clen >= len) {
 	    rb_str_modify(s);
-	    return FALSE;
+	    return;
 	}
 	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, int shrinkable)
+io_set_read_length(VALUE str, long n)
 {
     if (RSTRING_LEN(str) != n) {
 	rb_str_modify(str);
 	rb_str_set_len(str, n);
-	if (shrinkable) io_shrink_read_string(str, n);
     }
 }
 
@@ -2698,12 +2392,11 @@ 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);
-	shrinkable = io_setstrbuf(&str,0);
+	io_setstrbuf(&str,0);
         make_readconv(fptr, 0);
         while (1) {
             VALUE v;
@@ -2722,7 +2415,6 @@ 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);
             }
         }
@@ -2736,7 +2428,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
     cr = 0;
 
     if (siz == 0) siz = BUFSIZ;
-    shrinkable = io_setstrbuf(&str, siz);
+    io_setstrbuf(&str,siz);
     for (;;) {
 	READ_CHECK(fptr);
 	n = io_fread(str, bytes, siz - bytes, fptr);
@@ -2752,7 +2444,6 @@ 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;
@@ -2761,23 +2452,41 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
 void
 rb_io_set_nonblock(rb_io_t *fptr)
 {
-    if (rb_fd_set_nonblock(fptr->fd) != 0) {
+#ifdef _WIN32
+    if (rb_w32_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 io_internal_read_struct *iis = (struct io_internal_read_struct *)arg;
-
-    return rb_thread_io_blocking_region(internal_read_func, iis, iis->fd);
-}
-
-static long
-read_internal_locktmp(VALUE str, struct io_internal_read_struct *iis)
-{
-    return (long)rb_str_locktmp_ensure(str, read_internal_call, (VALUE)iis);
+    struct read_internal_arg *p = (struct read_internal_arg *)arg;
+    p->len = rb_read_internal(p->fd, p->str_ptr, p->len);
+    return Qundef;
 }
 
 static int
@@ -2796,8 +2505,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
     rb_io_t *fptr;
     VALUE length, str;
     long n, len;
-    struct io_internal_read_struct iis;
-    int shrinkable;
+    struct read_internal_arg arg;
 
     rb_scan_args(argc, argv, "11", &length, &str);
 
@@ -2805,7 +2513,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    shrinkable = io_setstrbuf(&str, len);
+    io_setstrbuf(&str,len);
     OBJ_TAINT(str);
 
     GetOpenFile(io, fptr);
@@ -2823,14 +2531,14 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
             rb_io_set_nonblock(fptr);
         }
 	io_setstrbuf(&str, len);
-        iis.fd = fptr->fd;
-        iis.nonblock = nonblock;
-        iis.buf = RSTRING_PTR(str);
-        iis.capa = len;
-        n = read_internal_locktmp(str, &iis);
+	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;
         if (n < 0) {
 	    int e = errno;
-            if (!nonblock && fptr_wait_readable(fptr))
+            if (!nonblock && rb_io_wait_readable(fptr->fd))
                 goto again;
 	    if (nonblock && (e == EWOULDBLOCK || e == EAGAIN)) {
                 if (no_exception_p(opts))
@@ -2842,7 +2550,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, shrinkable);
+    io_set_read_length(str, n);
 
     if (n == 0)
         return Qnil;
@@ -2858,12 +2566,10 @@ 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 _outbuf_ argument is present,
+ *  If the optional <i>outbuf</i> 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
+ *  The <i>outbuf</i> 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.
  *
  *  readpartial is designed for streams such as pipe, socket, tty, etc.
@@ -2937,14 +2643,13 @@ io_read_nonblock(VALUE io, VALUE length, VALUE str, VALUE ex)
 {
     rb_io_t *fptr;
     long n, len;
-    struct io_internal_read_struct iis;
-    int shrinkable;
+    struct read_internal_arg arg;
 
     if ((len = NUM2LONG(length)) < 0) {
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    shrinkable = io_setstrbuf(&str, len);
+    io_setstrbuf(&str,len);
     OBJ_TAINT(str);
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
@@ -2955,12 +2660,12 @@ io_read_nonblock(VALUE io, VALUE length, VALUE str, VALUE ex)
     n = read_buffered_data(RSTRING_PTR(str), len, fptr);
     if (n <= 0) {
 	rb_io_set_nonblock(fptr);
-	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);
+	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;
         if (n < 0) {
 	    int e = errno;
 	    if ((e == EWOULDBLOCK || e == EAGAIN)) {
@@ -2971,7 +2676,7 @@ io_read_nonblock(VALUE io, VALUE length, VALUE str, VALUE ex)
             rb_syserr_fail_path(e, fptr->pathv);
         }
     }
-    io_set_read_length(str, n, shrinkable);
+    io_set_read_length(str, n);
 
     if (n == 0) {
 	if (ex == Qfalse) return Qnil;
@@ -3000,9 +2705,8 @@ io_write_nonblock(VALUE io, VALUE str, VALUE ex)
 
     rb_io_set_nonblock(fptr);
     n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
-    RB_GC_GUARD(str);
 
-    if (n < 0) {
+    if (n == -1) {
 	int e = errno;
 	if (e == EWOULDBLOCK || e == EAGAIN) {
 	    if (ex == Qfalse) {
@@ -3022,67 +2726,66 @@ io_write_nonblock(VALUE io, VALUE str, VALUE ex)
  *  call-seq:
  *     ios.read([length [, outbuf]])    -> string, outbuf, or nil
  *
- *  Reads _length_ bytes from the I/O stream.
+ *  Reads <i>length</i> bytes from the I/O stream.
  *
- *  _length_ must be a non-negative integer or +nil+.
+ *  <i>length</i> must be a non-negative integer or <code>nil</code>.
  *
- *  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 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 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 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 zero, it returns an empty string (<code>""</code>).
+ *  If <i>length</i> is zero, it returns <code>""</code>.
  *
- *  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
+ *  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.
  *
- *  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+.
+ *  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>.
  *
  *     f = File.new("testfile")
  *     f.read(16)   #=> "This is line one"
  *
- *     # read whole file
- *     open("file") do |f|
- *       data = f.read   # This returns a string even if the file is empty.
- *       # ...
- *     end
+ *     # reads whole file
+ *     open("file") {|f|
+ *       data = f.read # This returns a string even if the file is empty.
+ *       ...
+ *     }
  *
- *     # iterate over fixed length records
- *     open("fixed-record-file") do |f|
+ *     # iterate over fixed length records.
+ *     open("fixed-record-file") {|f|
  *       while record = f.read(256)
- *         # ...
+ *         ...
  *       end
- *     end
+ *     }
  *
- *     # iterate over variable length records,
- *     # each record is prefixed by its 32-bit length
- *     open("variable-record-file") do |f|
+ *     # iterate over variable length records.
+ *     # record is prefixed by 32-bit length.
+ *     open("variable-record-file") {|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 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.
+ *  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.
  *  (This method is non-blocking flag insensitive as other methods.)
- *  If you need the behavior like a single read(2) system call,
- *  consider #readpartial, #read_nonblock, and #sysread.
+ *  If you need the behavior like single read(2) system call,
+ *  consider readpartial, read_nonblock and sysread.
  */
 
 static VALUE
@@ -3091,7 +2794,6 @@ 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
@@ -3108,12 +2810,12 @@ io_read(int argc, VALUE *argv, VALUE io)
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    shrinkable = io_setstrbuf(&str,len);
+    io_setstrbuf(&str,len);
 
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
     if (len == 0) {
-	io_set_read_length(str, 0, shrinkable);
+	io_set_read_length(str, 0);
 	return str;
     }
 
@@ -3122,7 +2824,7 @@ 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, shrinkable);
+    io_set_read_length(str, n);
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
     if (previous_mode == O_TEXT) {
 	setmode(fptr->fd, O_TEXT);
@@ -3274,7 +2976,7 @@ swallow(rb_io_t *fptr, int term)
 }
 
 static VALUE
-rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, int chomp)
+rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
 {
     VALUE str = Qnil;
     int len = 0;
@@ -3287,33 +2989,21 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, int chomp)
 	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 - chomplen);
+		str = rb_str_new(p, pending);
 		fptr->rbuf.off += pending;
 		fptr->rbuf.len -= pending;
 	    }
 	    else {
-		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;
-                    }
-                }
+		rb_str_resize(str, len + pending);
+		read_buffered_data(RSTRING_PTR(str)+len, pending, fptr);
 	    }
-	    len += pending - chomplen;
+	    len += pending;
 	    if (cr != ENC_CODERANGE_BROKEN)
 		pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr);
 	    if (e) break;
@@ -3333,30 +3023,14 @@ 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
-extract_getline_args(int argc, VALUE *argv, struct getline_arg *args)
+extract_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit)
 {
     VALUE rs = rb_rs, lim = Qnil;
 
+    rb_check_arity(argc, 0, 2);
     if (argc == 1) {
         VALUE tmp = Qnil;
 
@@ -3372,8 +3046,8 @@ extract_getline_args(int argc, VALUE *argv, struct getline_arg *args)
         if (!NIL_P(rs))
             StringValue(rs);
     }
-    args->rs = rs;
-    args->limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+    *rsp = rs;
+    *limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
 }
 
 static void
@@ -3406,17 +3080,14 @@ check_getline_args(VALUE *rsp, long *limit, VALUE io)
 }
 
 static void
-prepare_getline_args(int argc, VALUE *argv, struct getline_arg *args, VALUE io)
+prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, 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);
+    extract_getline_args(argc, argv, rsp, limit);
+    check_getline_args(rsp, limit, io);
 }
 
 static VALUE
-rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
+rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
 {
     VALUE str = Qnil;
     int nolimit = 0;
@@ -3426,7 +3097,6 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, 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));
@@ -3434,7 +3104,7 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, 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, chomp);
+	return rb_io_getline_fast(fptr, enc);
     }
     else {
 	int c, newline = -1;
@@ -3442,7 +3112,6 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, 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);
@@ -3467,7 +3136,6 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
 		rsptr = RSTRING_PTR(rs);
 	    }
 	    newline = (unsigned char)rsptr[rslen - 1];
-	    chomp_cr = chomp && rslen == 1 && newline == '\n';
 	}
 
 	/* MS - Optimization */
@@ -3482,13 +3150,7 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, 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) {
-		    if (chomp) {
-			if (chomp_cr && p > s && *(p-1) == '\r') --p;
-			rb_str_set_len(str, p - s);
-		    }
-		    break;
-		}
+		if (memcmp(p, rsptr, rslen) == 0) break;
 	    }
 	    if (limit == 0) {
 		s = RSTRING_PTR(str);
@@ -3522,7 +3184,7 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
 }
 
 static VALUE
-rb_io_getline_1(VALUE rs, long limit, int chomp, VALUE io)
+rb_io_getline_1(VALUE rs, long limit, VALUE io)
 {
     rb_io_t *fptr;
     int old_lineno, new_lineno;
@@ -3530,7 +3192,7 @@ rb_io_getline_1(VALUE rs, long limit, int chomp, VALUE io)
 
     GetOpenFile(io, fptr);
     old_lineno = fptr->lineno;
-    str = rb_io_getline_0(rs, limit, chomp, fptr);
+    str = rb_io_getline_0(rs, limit, fptr);
     if (!NIL_P(str) && (new_lineno = fptr->lineno) != old_lineno) {
 	if (io == ARGF.current_file) {
 	    ARGF.lineno += new_lineno - old_lineno;
@@ -3547,16 +3209,17 @@ rb_io_getline_1(VALUE rs, long limit, int chomp, VALUE io)
 static VALUE
 rb_io_getline(int argc, VALUE *argv, VALUE io)
 {
-    struct getline_arg args;
+    VALUE rs;
+    long limit;
 
-    prepare_getline_args(argc, argv, &args, io);
-    return rb_io_getline_1(args.rs, args.limit, args.chomp, io);
+    prepare_getline_args(argc, argv, &rs, &limit, io);
+    return rb_io_getline_1(rs, limit, io);
 }
 
 VALUE
 rb_io_gets(VALUE io)
 {
-    return rb_io_getline_1(rb_default_rs, -1, FALSE, io);
+    return rb_io_getline_1(rb_default_rs, -1, io);
 }
 
 VALUE
@@ -3564,22 +3227,22 @@ rb_io_gets_internal(VALUE io)
 {
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
-    return rb_io_getline_0(rb_default_rs, -1, FALSE, fptr);
+    return rb_io_getline_0(rb_default_rs, -1, fptr);
 }
 
 /*
  *  call-seq:
- *     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
+ *     ios.gets(sep=$/)     -> string or nil
+ *     ios.gets(limit)      -> string or nil
+ *     ios.gets(sep, limit) -> string or nil
  *
  *  Reads the next ``line'' from the I/O stream; lines are separated by
- *  <i>sep</i>. A separator of +nil+ reads the entire
+ *  <i>sep</i>. A separator of <code>nil</code> reads the entire
  *  contents, and a zero-length separator reads the input a paragraph at
  *  a time (two successive newlines in the input separate paragraphs).
  *  The stream must be opened for reading or an <code>IOError</code>
  *  will be raised. The line read in will be returned and also assigned
- *  to <code>$_</code>. Returns +nil+ if called at end of
+ *  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.
@@ -3673,9 +3336,9 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
 
 /*
  *  call-seq:
- *     ios.readline(sep=$/ [, getline_args])     -> string
- *     ios.readline(limit [, getline_args])      -> string
- *     ios.readline(sep, limit [, getline_args]) -> string
+ *     ios.readline(sep=$/)     -> string
+ *     ios.readline(limit)      -> string
+ *     ios.readline(sep, limit) -> string
  *
  *  Reads a line as with <code>IO#gets</code>, but raises an
  *  <code>EOFError</code> on end of file.
@@ -3692,50 +3355,45 @@ rb_io_readline(int argc, VALUE *argv, VALUE io)
     return line;
 }
 
-static VALUE io_readlines(const struct getline_arg *arg, VALUE io);
+static VALUE io_readlines(VALUE rs, long limit, VALUE io);
 
 /*
  *  call-seq:
- *     ios.readlines(sep=$/ [, getline_args])     -> array
- *     ios.readlines(limit [, getline_args])      -> array
- *     ios.readlines(sep, limit [, getline_args]) -> array
+ *     ios.readlines(sep=$/)     -> array
+ *     ios.readlines(limit)      -> array
+ *     ios.readlines(sep, limit) -> array
  *
  *  Reads all of the lines in <em>ios</em>, and returns them in
- *  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
+ *  <i>anArray</i>. Lines are separated by the optional <i>sep</i>. If
+ *  <i>sep</i> is <code>nil</code>, the rest of the stream is returned
+ *  as a single record.  If the first argument is an integer, or
  *  optional second argument is given, the returning string would not be
  *  longer than the given value in bytes. The stream must be opened for
  *  reading or an <code>IOError</code> will be raised.
  *
  *     f = File.new("testfile")
  *     f.readlines[0]   #=> "This is line one\n"
- *
- *     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)
 {
-    struct getline_arg args;
+    VALUE rs;
+    long limit;
 
-    prepare_getline_args(argc, argv, &args, io);
-    return io_readlines(&args, io);
+    prepare_getline_args(argc, argv, &rs, &limit, io);
+    return io_readlines(rs, limit, io);
 }
 
 static VALUE
-io_readlines(const struct getline_arg *arg, VALUE io)
+io_readlines(VALUE rs, long limit, VALUE io)
 {
     VALUE line, ary;
 
-    if (arg->limit == 0)
+    if (limit == 0)
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline_1(arg->rs, arg->limit, arg->chomp, io))) {
+    while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -3743,15 +3401,15 @@ io_readlines(const struct getline_arg *arg, VALUE io)
 
 /*
  *  call-seq:
- *     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(sep=$/) {|line| block }         -> ios
+ *     ios.each(limit) {|line| block }          -> ios
+ *     ios.each(sep,limit) {|line| block }      -> ios
+ *     ios.each(...)                            -> 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
+ *     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
  *
  *  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
@@ -3768,21 +3426,19 @@ io_readlines(const struct getline_arg *arg, 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;
-    struct getline_arg args;
+    VALUE str, rs;
+    long limit;
 
     RETURN_ENUMERATOR(io, argc, argv);
-    prepare_getline_args(argc, argv, &args, io);
-    if (args.limit == 0)
+    prepare_getline_args(argc, argv, &rs, &limit, io);
+    if (limit == 0)
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
-    while (!NIL_P(str = rb_io_getline_1(args.rs, args.limit, args.chomp, io))) {
+    while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
 	rb_yield(str);
     }
     return io;
@@ -3859,9 +3515,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);
 
@@ -4140,7 +3796,7 @@ rb_io_codepoints(VALUE io)
  *     ios.getc   -> string or nil
  *
  *  Reads a one-character string from <em>ios</em>. Returns
- *  +nil+ if called at end of file.
+ *  <code>nil</code> if called at end of file.
  *
  *     f = File.new("testfile")
  *     f.getc   #=> "h"
@@ -4189,7 +3845,7 @@ rb_io_readchar(VALUE io)
  *     ios.getbyte   -> integer or nil
  *
  *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
- *  +nil+ if called at end of file.
+ *  <code>nil</code> if called at end of file.
  *
  *     f = File.new("testfile")
  *     f.getbyte   #=> 84
@@ -4243,7 +3899,7 @@ 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
@@ -4261,22 +3917,16 @@ VALUE
 rb_io_ungetbyte(VALUE io, VALUE b)
 {
     rb_io_t *fptr;
-    VALUE v;
-    unsigned char c;
 
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
-    switch (TYPE(b)) {
-      case T_NIL:
-        return Qnil;
-      case T_FIXNUM:
-      case T_BIGNUM: ;
-        v = rb_int_modulo(b, INT2FIX(256));
-        c = NUM2INT(v) & 0xFF;
-        b = rb_str_new((const char *)&c, 1);
-        break;
-      default:
-        SafeStringValue(b);
+    if (NIL_P(b)) return Qnil;
+    if (FIXNUM_P(b)) {
+	char cc = FIX2INT(b);
+	b = rb_str_new(&cc, 1);
+    }
+    else {
+	SafeStringValue(b);
     }
     io_ungetbyte(b, fptr);
     return Qnil;
@@ -4445,7 +4095,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 != 0) rb_sys_fail_path(fptr->pathv);
+                if (ret == -1) rb_sys_fail_path(fptr->pathv);
             }
         }
 
@@ -4457,7 +4107,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 != 0) rb_sys_fail_path(fptr->pathv);
+            if (ret == -1) rb_sys_fail_path(fptr->pathv);
         }
     }
     return Qnil;
@@ -4587,8 +4237,7 @@ static void free_io_buffer(rb_io_buffer_t *buf);
 static void clear_codeconv(rb_io_t *fptr);
 
 static void
-fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
-                    struct list_head *busy)
+fptr_finalize(rb_io_t *fptr, int noraise)
 {
     VALUE err = Qnil;
     int fd = fptr->fd;
@@ -4608,7 +4257,8 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
     }
     if (fptr->wbuf.len) {
 	if (noraise) {
-	    io_flush_buffer_sync(fptr);
+	    if ((int)io_flush_buffer_sync(fptr) < 0 && NIL_P(err))
+		err = Qtrue;
 	}
 	else {
 	    if (io_fflush(fptr) < 0 && NIL_P(err))
@@ -4620,14 +4270,6 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
     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 */
     }
@@ -4635,7 +4277,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
 	/* stdio_file is deallocated anyway
          * even if fclose failed.  */
 	if ((maygvl_fclose(stdio_file, noraise) < 0) && NIL_P(err))
-	    if (!noraise) err = INT2NUM(errno);
+	    err = noraise ? Qtrue : INT2NUM(errno);
     }
     else if (0 <= fd) {
 	/* fptr->fd may be closed even if close fails.
@@ -4643,24 +4285,22 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
          * We assumes it is closed.  */
 
 	/**/
-	keepgvl |= !(mode & FMODE_WRITABLE);
+	int keepgvl = !(mode & FMODE_WRITABLE);
 	keepgvl |= noraise;
 	if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err))
-	    if (!noraise) err = INT2NUM(errno);
+	    err = noraise ? Qtrue : INT2NUM(errno);
     }
 
     if (!NIL_P(err) && !noraise) {
-	if (RB_INTEGER_TYPE_P(err))
+        switch (TYPE(err)) {
+          case T_FIXNUM:
+          case T_BIGNUM:
 	    rb_syserr_fail_path(NUM2INT(err), fptr->pathv);
-	else
-	    rb_exc_raise(err);
-    }
-}
 
-static void
-fptr_finalize(rb_io_t *fptr, int noraise)
-{
-    fptr_finalize_flush(fptr, noraise, FALSE, 0);
+          default:
+            rb_exc_raise(err);
+        }
+    }
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
@@ -4713,36 +4353,21 @@ clear_codeconv(rb_io_t *fptr)
     clear_writeconv(fptr);
 }
 
-void
-rb_io_fptr_finalize_internal(void *ptr)
+int
+rb_io_fptr_finalize(rb_io_t *fptr)
 {
-    rb_io_t *fptr = ptr;
-
-    if (!ptr) return;
+    if (!fptr) return 0;
     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)
 {
@@ -4755,23 +4380,14 @@ 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;
@@ -4784,10 +4400,8 @@ io_close_fptr(VALUE io)
     if (!fptr) return 0;
     if (fptr->fd < 0) return 0;
 
-    if (rb_notify_fd_close(fptr->fd, &busy)) {
-        /* calls close(fptr->fd): */
-        fptr_finalize_flush(fptr, FALSE, KEEPGVL, &busy);
-    }
+    fd = fptr->fd;
+    rb_thread_fd_close(fd);
     rb_io_fptr_cleanup(fptr, FALSE);
     return fptr;
 }
@@ -4849,7 +4463,7 @@ static VALUE
 ignore_closed_stream(VALUE io, VALUE exc)
 {
     enum {mesg_len = sizeof(closed_stream)-1};
-    VALUE mesg = rb_attr_get(exc, idMesg);
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
     if (!RB_TYPE_P(mesg, T_STRING) ||
 	RSTRING_LEN(mesg) != mesg_len ||
 	memcmp(RSTRING_PTR(mesg), closed_stream, mesg_len)) {
@@ -4922,8 +4536,6 @@ 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
@@ -4984,8 +4596,6 @@ 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
@@ -5056,7 +4666,7 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
     }
     errno = 0;
     pos = lseek(fptr->fd, pos, whence);
-    if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
+    if (pos == -1 && errno) rb_sys_fail_path(fptr->pathv);
 
     return OFFT2NUM(pos);
 }
@@ -5077,10 +4687,8 @@ 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, len;
-    const char *ptr;
+    long n;
 
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
@@ -5089,15 +4697,16 @@ 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");
     }
 
-    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);
+    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);
 
     return LONG2FIX(n);
 }
@@ -5109,12 +4718,10 @@ 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 _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
+ *  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.
- *
  *  Raises <code>SystemCallError</code> on error and
  *  <code>EOFError</code> at end of file.
  *
@@ -5128,13 +4735,12 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     VALUE len, str;
     rb_io_t *fptr;
     long n, ilen;
-    struct io_internal_read_struct iis;
-    int shrinkable;
+    struct read_internal_arg arg;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2LONG(len);
 
-    shrinkable = io_setstrbuf(&str, ilen);
+    io_setstrbuf(&str,ilen);
     if (ilen == 0) return str;
 
     GetOpenFile(io, fptr);
@@ -5156,171 +4762,24 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     rb_io_check_closed(fptr);
 
     io_setstrbuf(&str, ilen);
-    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 < 0) {
-	rb_sys_fail_path(fptr->pathv);
-    }
-    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 <code>SystemCallError</code> on error, <code>EOFError</code>
- *  at end of file and <code>NotImplementedError</code> 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);
+    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;
 
-    if (n < 0) {
+    if (n == -1) {
 	rb_sys_fail_path(fptr->pathv);
     }
-    io_set_read_length(str, n, shrinkable);
-    if (n == 0 && arg.count > 0) {
+    io_set_read_length(str, n);
+    if (n == 0 && ilen > 0) {
 	rb_eof_error();
     }
     OBJ_TAINT(str);
 
     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 <code>SystemCallError</code> on error and <code>NotImplementedError</code>
- *  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)
@@ -5389,6 +4848,7 @@ rb_io_ascii8bit_binmode(VALUE io)
  *  - newline conversion disabled
  *  - encoding conversion disabled
  *  - content is treated as ASCII-8BIT
+ *
  */
 
 static VALUE
@@ -5433,10 +4893,10 @@ rb_io_fmode_modestr(int fmode)
       case FMODE_READABLE:
 	return MODE_BTMODE("r", "rb", "rt");
       case FMODE_WRITABLE:
-	return MODE_BTXMODE("w", "wb", "wt", "wx", "wbx", "wtx");
+	return MODE_BTMODE("w", "wb", "wt");
       case FMODE_READWRITE:
 	if (fmode & FMODE_CREATE) {
-            return MODE_BTXMODE("w+", "wb+", "wt+", "w+x", "wb+x", "wt+x");
+	    return MODE_BTMODE("w+", "wb+", "wt+");
 	}
 	return MODE_BTMODE("r+", "rb+", "rt+");
     }
@@ -5485,11 +4945,6 @@ 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 ':':
@@ -5533,9 +4988,6 @@ 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;
@@ -5571,9 +5023,6 @@ 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;
@@ -5597,11 +5046,7 @@ rb_io_oflags_modestr(int oflags)
 #else
 # define MODE_BINARY(a,b) (a)
 #endif
-    int accmode;
-    if (oflags & O_EXCL) {
-        rb_raise(rb_eArgError, "exclusive access mode is not supported");
-    }
-    accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
+    int accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
     if (oflags & O_APPEND) {
 	if (accmode == O_WRONLY) {
 	    return MODE_BINARY("a", "ab");
@@ -5610,7 +5055,7 @@ rb_io_oflags_modestr(int oflags)
 	    return MODE_BINARY("a+", "ab+");
 	}
     }
-    switch (accmode) {
+    switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
       default:
 	rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
       case O_RDONLY:
@@ -5814,12 +5259,9 @@ 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 |= FMODE_TEXTMODE;
+	fmode |= DEFAULT_TEXTMODE;
 	*fmode_p = fmode;
     }
 #if !DEFAULT_TEXTMODE
@@ -6030,12 +5472,11 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
 
     fd = rb_sysopen_internal(&data);
     if (fd < 0) {
-	int e = errno;
-	if (rb_gc_for_fd(e)) {
+	if (rb_gc_for_fd(errno)) {
 	    fd = rb_sysopen_internal(&data);
 	}
 	if (fd < 0) {
-	    rb_syserr_fail_path(e, fname);
+	    rb_sys_fail_path(fname);
 	}
     }
     return fd;
@@ -6051,19 +5492,19 @@ rb_fdopen(int fd, const char *modestr)
 #endif
     file = fdopen(fd, modestr);
     if (!file) {
-	int e = errno;
 #if defined(__sun)
-	if (e == 0) {
+	if (errno == 0) {
 	    rb_gc();
 	    errno = 0;
 	    file = fdopen(fd, modestr);
 	}
 	else
 #endif
-	if (rb_gc_for_fd(e)) {
+	if (rb_gc_for_fd(errno)) {
 	    file = fdopen(fd, modestr);
 	}
 	if (!file) {
+	    int e = errno;
 #ifdef _WIN32
 	    if (e == 0) e = EINVAL;
 #elif defined(__sun)
@@ -6081,13 +5522,11 @@ rb_fdopen(int fd, const char *modestr)
     return file;
 }
 
-static int
+static void
 io_check_tty(rb_io_t *fptr)
 {
-    int t = isatty(fptr->fd);
-    if (t)
+    if (isatty(fptr->fd))
         fptr->mode |= FMODE_TTY|FMODE_DUPLEX;
-    return t;
 }
 
 static VALUE rb_io_internal_encoding(VALUE);
@@ -6097,10 +5536,7 @@ 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):
@@ -6131,9 +5567,12 @@ 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;
@@ -6176,7 +5615,6 @@ 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) {
@@ -6192,15 +5630,8 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode,
     MakeOpenFile(io, fptr);
     fptr->mode = fmode;
     fptr->encs = *convconfig;
-    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);
+    fptr->pathv = rb_str_new_frozen(filename);
+    fptr->fd = rb_sysopen(fptr->pathv, oflags, perm);
     io_check_tty(fptr);
     if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
 
@@ -6268,16 +5699,23 @@ pipe_add_fptr(rb_io_t *fptr)
 static void
 pipe_del_fptr(rb_io_t *fptr)
 {
-    struct pipe_list **prev = &pipe_list;
+    struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
 
-    while ((tmp = *prev) != 0) {
-	if (tmp->fptr == fptr) {
-	    *prev = tmp->next;
+    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;
 	    free(tmp);
 	    return;
 	}
-	prev = &tmp->next;
+	list = list->next;
     }
 }
 
@@ -6314,31 +5752,6 @@ 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)
 {
@@ -6357,7 +5770,7 @@ rb_pipe(int *pipes)
 {
     int ret;
     ret = rb_cloexec_pipe(pipes);
-    if (ret < 0) {
+    if (ret == -1) {
         if (rb_gc_for_fd(errno)) {
             ret = rb_cloexec_pipe(pipes);
         }
@@ -6434,9 +5847,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 < 0) return fd;
+    if (fd == -1) return -1;
     ss = read(fd, buf, sizeof(buf));
-    if (ss < 0) goto err;
+    if (ss == -1) goto err;
     p = buf;
     e = buf + ss;
     while ((int)sizeof("FDSize:\t0\n")-1 <= e-p &&
@@ -6455,7 +5868,7 @@ linux_get_maxfd(void)
 
   err:
     close(fd);
-    return (int)ss;
+    return -1;
 }
 #endif
 
@@ -6625,7 +6038,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)) < 0) {
+	while ((pid = DO_SPAWN(cmd, args, envp)) == -1) {
 	    /* exec failed */
 	    switch (e = errno) {
 	      case EAGAIN:
@@ -6658,7 +6071,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
     }
 
     /* parent */
-    if (pid < 0) {
+    if (pid == -1) {
 # if defined(HAVE_WORKING_FORK)
 	e = errno;
 # endif
@@ -6769,7 +6182,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, FALSE);
+	execarg_obj = rb_execarg_new(argc, argv, TRUE);
     return pipe_open(execarg_obj, modestr, fmode, convconfig);
 }
 
@@ -6808,7 +6221,7 @@ 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 contain a hash at first for environments and
+ *  The array can contains a hash at first for environments and
  *  a hash at last for options similar to <code>spawn</code>.
  *
  *  The default mode for the new file object is ``r'',
@@ -6845,7 +6258,7 @@ pipe_close(VALUE io)
  *  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 +nil+, and the child's standard in and
+ *  will be passed <code>nil</code>, and the child's standard in and
  *  standard out will be connected to the parent through the pipe. Not
  *  available on all platforms.
  *
@@ -6853,7 +6266,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|
@@ -6902,14 +6315,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, FALSE);
+	execarg_obj = rb_execarg_new((int)len, RARRAY_CONST_PTR(tmp), FALSE);
 	RB_GC_GUARD(tmp);
     }
     else {
 	SafeStringValue(pname);
 	execarg_obj = Qnil;
 	if (!is_popen_fork(pname))
-            execarg_obj = rb_execarg_new(1, &pname, TRUE, FALSE);
+	    execarg_obj = rb_execarg_new(1, &pname, TRUE);
     }
     if (!NIL_P(execarg_obj)) {
 	if (!NIL_P(opt))
@@ -7001,7 +6414,7 @@ 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
  *  the optional code block is given, it will be passed +io+ as an argument,
@@ -7028,7 +6441,7 @@ rb_io_s_open(int argc, VALUE *argv, VALUE klass)
  *     IO.sysopen(path, [mode, [perm]])  -> integer
  *
  *  Opens the given path, returning the underlying file descriptor as a
- *  <code>Integer</code>.
+ *  <code>Fixnum</code>.
  *
  *     IO.sysopen("testfile")   #=> 3
  */
@@ -7113,7 +6526,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.
  *
@@ -7146,7 +6559,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
@@ -7211,10 +6624,10 @@ rb_f_open(int argc, VALUE *argv)
     return rb_io_s_open(argc, argv, rb_cFile);
 }
 
-static VALUE rb_io_open_generic(VALUE, VALUE, int, int, const convconfig_t *, mode_t);
+static VALUE rb_io_open_generic(VALUE, int, int, const convconfig_t *, mode_t);
 
 static VALUE
-rb_io_open(VALUE io, VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
+rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
 {
     int oflags, fmode;
     convconfig_t convconfig;
@@ -7222,24 +6635,34 @@ rb_io_open(VALUE io, 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(io, filename, oflags, fmode, &convconfig, perm);
+    return rb_io_open_generic(filename, oflags, fmode, &convconfig, perm);
 }
 
 static VALUE
-rb_io_open_generic(VALUE klass, VALUE filename, int oflags, int fmode,
+rb_io_open_generic(VALUE filename, int oflags, int fmode,
 		   const convconfig_t *convconfig, mode_t perm)
 {
     VALUE cmd;
-    if (klass == rb_cIO && !NIL_P(cmd = check_pipe_command(filename))) {
+    if (!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(klass), filename,
+        return rb_file_open_generic(io_alloc(rb_cFile), 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;
@@ -7282,7 +6705,11 @@ 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_copy_finalizer(fptr, orig);
+    fptr->finalize = orig->finalize;
+#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
+    if (fptr->finalize == pipe_finalize)
+	pipe_add_fptr(fptr);
+#endif
 
     fd = fptr->fd;
     fd2 = orig->fd;
@@ -7337,13 +6764,12 @@ rb_freopen(VALUE fname, const char *mode, FILE *fp)
 
 /*
  *  call-seq:
- *     ios.reopen(other_IO)             -> ios
- *     ios.reopen(path, mode [, opt])   -> ios
+ *     ios.reopen(other_IO)         -> ios
+ *     ios.reopen(path, mode_str)   -> ios
  *
  *  Reassociates <em>ios</em> with the I/O stream given in
  *  <i>other_IO</i> or to a new stream opened on <i>path</i>. This may
  *  dynamically change the actual class of this stream.
- *  The +mode+ and +opt+ parameters accept the same values as IO.open.
  *
  *     f1 = File.new("testfile")
  *     f2 = File.new("testfile")
@@ -7462,7 +6888,11 @@ 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_copy_finalizer(fptr, orig);
+    fptr->finalize = orig->finalize;
+#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
+    if (fptr->finalize == pipe_finalize)
+	pipe_add_fptr(fptr);
+#endif
 
     fd = ruby_dup(orig->fd);
     fptr->fd = fd;
@@ -7531,20 +6961,18 @@ rb_f_printf(int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     ios.print               -> nil
+ *     ios.print()             -> nil
  *     ios.print(obj, ...)     -> nil
  *
- *  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.
+ *  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>.
  *
  *     $stdout.print("This is ", 100, " percent.\n")
  *
@@ -7613,10 +7041,10 @@ rb_f_print(int argc, const VALUE *argv)
  *     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>.
- *  If <i>obj</i> is <code>String</code>, write the first character
- *  of <i>obj</i> to <em>ios</em>.
- *  Otherwise, raise <code>TypeError</code>.
+ *  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.
  *
  *     $stdout.putc "A"
  *     $stdout.putc 65
@@ -7649,8 +7077,8 @@ 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
@@ -7663,8 +7091,8 @@ rb_f_putc(VALUE recv, VALUE ch)
 }
 
 
-int
-rb_str_end_with_asciichar(VALUE str, int c)
+static int
+str_end_with_asciichar(VALUE str, int c)
 {
     long len = RSTRING_LEN(str);
     const char *ptr = RSTRING_PTR(str);
@@ -7702,17 +7130,13 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
  *  call-seq:
  *     ios.puts(obj, ...)    -> nil
  *
- *  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.
+ *  Writes the given objects to <em>ios</em> as with
+ *  <code>IO#print</code>. Writes a record separator (typically a
+ *  newline) after any that do not already end with a newline sequence.
  *  If called with an array argument, writes each element on a new line.
- *  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.
+ *  If called without arguments, outputs a single record separator.
  *
- *     $stdout.puts("this", "is", ["a", "test"])
+ *     $stdout.puts("this", "is", "a", "test")
  *
  *  <em>produces:</em>
  *
@@ -7720,16 +7144,13 @@ 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, n;
-    VALUE line, args[2];
+    int i;
+    VALUE line;
 
     /* if no argument given, print newline. */
     if (argc == 0) {
@@ -7746,13 +7167,11 @@ rb_io_puts(int argc, const VALUE *argv, VALUE out)
 	}
 	line = rb_obj_as_string(argv[i]);
       string:
-	n = 0;
-	args[n++] = line;
+	rb_io_write(out, line);
 	if (RSTRING_LEN(line) == 0 ||
-            !rb_str_end_with_asciichar(line, '\n')) {
-	    args[n++] = rb_default_rs;
+            !str_end_with_asciichar(line, '\n')) {
+	    rb_io_write(out, rb_default_rs);
 	}
-	rb_io_writev(out, n, args);
     }
 
     return Qnil;
@@ -7779,15 +7198,15 @@ rb_f_puts(int argc, VALUE *argv, VALUE recv)
 void
 rb_p(VALUE obj) /* for debug print within C code */
 {
-    VALUE args[2];
-    args[0] = rb_obj_as_string(rb_inspect(obj));
-    args[1] = rb_default_rs;
+    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_writev(2, args, rb_stdout);
+        io_write(rb_stdout, str, 1);
+        io_write(rb_stdout, rb_default_rs, 0);
     }
     else {
-	rb_io_writev(rb_stdout, 2, args);
+        rb_io_write(rb_stdout, str);
+        rb_io_write(rb_stdout, rb_default_rs);
     }
 }
 
@@ -7857,7 +7276,6 @@ rb_f_p(int argc, VALUE *argv, VALUE self)
  *
  *     def display(port=$>)
  *       port.write self
- *       nil
  *     end
  *
  *  For example:
@@ -7877,27 +7295,21 @@ rb_obj_display(int argc, VALUE *argv, VALUE self)
 {
     VALUE out;
 
-    out = (!rb_check_arity(argc, 0, 1) ? rb_stdout : argv[0]);
+    if (argc == 0) {
+	out = rb_stdout;
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &out);
+    }
     rb_io_write(out, self);
 
     return Qnil;
 }
 
-static int
-rb_stderr_to_original_p(void)
-{
-    return (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0);
-}
-
 void
 rb_write_error2(const char *mesg, long len)
 {
-    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 (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
 	if (fwrite(mesg, sizeof(char), (size_t)len, stderr) < (size_t)len) {
 	    /* failed to write to stderr, what can we do? */
 	    return;
@@ -7918,7 +7330,7 @@ void
 rb_write_error_str(VALUE mesg)
 {
     /* a stopgap measure for the time being */
-    if (rb_stderr_to_original_p()) {
+    if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
 	size_t len = (size_t)RSTRING_LEN(mesg);
 #ifdef _WIN32
 	if (isatty(fileno(stderr))) {
@@ -7936,14 +7348,6 @@ rb_write_error_str(VALUE 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)
 {
@@ -7969,13 +7373,14 @@ prep_io(int fd, int fmode, VALUE klass, const char *path)
 
     MakeOpenFile(io, fp);
     fp->fd = fd;
-    fp->mode = fmode;
-    if (!io_check_tty(fp)) {
 #ifdef __CYGWIN__
-	fp->mode |= FMODE_BINMODE;
+    if (!isatty(fd)) {
+        fmode |= FMODE_BINMODE;
 	setmode(fd, O_BINARY);
-#endif
     }
+#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);
 
@@ -8088,8 +7493,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+, <code>File::WRONLY|File::CREAT</code>).
- *  See the open(2) man page for more information.
+ *  File::Constants (+File::RDONLY+, +File::WRONLY | File::CREAT+).  See the
+ *  open(2) man page for more information.
  *
  *  When +mode+ is a string it must be in one of the following forms:
  *
@@ -8132,10 +7537,6 @@ 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. <code>Errno::EEXIST</code> 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.
@@ -8154,7 +7555,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
@@ -8174,13 +7575,14 @@ 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.
+ *    External encoding for the IO.  "-" is a synonym for the default external
+ *    encoding.
  *
  *  :\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".
@@ -8253,7 +7655,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) < 0) rb_sys_fail(0);
+    if (fstat(fd, &st) == -1) rb_sys_fail(0);
 #endif
     rb_update_max_fd(fd);
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
@@ -8300,11 +7702,6 @@ 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 <code>IO#sync=</code>
- *  about sync mode.
- *
  *  === Examples
  *
  *    f = File.new("testfile", "r")
@@ -8413,21 +7810,29 @@ 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, RUBY_TYPED_DEFAULT_FREE, argf_memsize},
+    {argf_mark, argf_free, argf_memsize},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
@@ -8469,6 +7874,11 @@ 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;
 }
 
@@ -8500,7 +7910,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=+.
@@ -8543,7 +7953,7 @@ argf_close(VALUE argf)
     if (RB_TYPE_P(file, T_FILE)) {
 	rb_io_set_write_io(file, Qnil);
     }
-    io_close(file);
+    rb_funcall3(file, rb_intern("close"), 0, 0);
     ARGF.init_p = -1;
 }
 
@@ -8580,13 +7990,11 @@ 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);
-	    FilePathValue(filename);
-	    ARGF.filename = filename;
-	    filename = rb_str_encode_ospath(filename);
+	    StringValueCStr(filename);
+	    ARGF.filename = rb_str_encode_ospath(filename);
 	    fn = StringValueCStr(filename);
 	    if (RSTRING_LEN(filename) == 1 && fn[0] == '-') {
 		ARGF.current_file = rb_stdin;
@@ -8612,14 +8020,10 @@ argf_next_argv(VALUE argf)
 		    }
 		    fstat(fr, &st);
 		    str = filename;
-		    if (!NIL_P(ARGF.inplace)) {
-			VALUE suffix = ARGF.inplace;
+		    if (*ARGF.inplace) {
 			str = rb_str_dup(str);
-			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);
-			}
+			rb_str_cat2(str, ARGF.inplace);
+			/* TODO: encoding of ARGF.inplace */
 #ifdef NO_SAFE_RENAME
 			(void)close(fr);
 			(void)unlink(RSTRING_PTR(str));
@@ -8688,7 +8092,6 @@ 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);
@@ -8774,9 +8177,9 @@ static VALUE argf_gets(int, VALUE *, VALUE);
 
 /*
  *  call-seq:
- *     gets(sep=$/ [, getline_args])     -> string or nil
- *     gets(limit [, getline_args])      -> string or nil
- *     gets(sep, limit [, getline_args]) -> string or nil
+ *     gets(sep=$/)    -> string or nil
+ *     gets(limit)     -> string or nil
+ *     gets(sep,limit) -> 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
@@ -8788,8 +8191,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+, <code>gets(nil)</code> will read
- *  the contents one file at a time.
+ *  filenames are present in +ARGV+, +gets(nil)+ will read the contents
+ *  one file at a time.
  *
  *     ARGV << "testfile"
  *     print while gets
@@ -8816,21 +8219,18 @@ rb_f_gets(int argc, VALUE *argv, VALUE recv)
 
 /*
  *  call-seq:
- *     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
+ *     ARGF.gets(sep=$/)     -> string or nil
+ *     ARGF.gets(limit)      -> string or nil
+ *     ARGF.gets(sep, limit) -> string or nil
  *
  *  Returns the next line from the current file in +ARGF+.
  *
- *  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.
+ *  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.
  *
  *  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)
@@ -8899,11 +8299,10 @@ 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 <code>$/</code>;
- *  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 +$/+; 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.
@@ -8927,9 +8326,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.
@@ -9013,7 +8412,6 @@ 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 */
 
@@ -9350,13 +8748,13 @@ 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 +nil+
+ *  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.
  *
@@ -9407,7 +8805,7 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
  *  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 block.
+ *  <code>OpenSSL::SSL::SSLSocket#readpartial</code> will blocks.
  *
  *  Also, the remote side can request SSL renegotiation which forces
  *  the local SSL engine to write some data.
@@ -9430,7 +8828,7 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
  *  However it is not the best way to use <code>IO.select</code>.
  *
  *  The writability notified by select(2) doesn't show
- *  how many bytes are writable.
+ *  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.
@@ -9604,6 +9002,14 @@ 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)
 {
@@ -9859,17 +9265,11 @@ 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)
-	  case F_DUPFD:
-#endif
-#if defined(F_DUPFD_CLOEXEC)
-	  case F_DUPFD_CLOEXEC:
-#endif
-	    rb_update_max_fd(retval);
-	}
+    if (retval != -1 && cmd == F_DUPFD) {
+	rb_update_max_fd(retval);
     }
+#endif
 
     return retval;
 }
@@ -9948,14 +9348,13 @@ 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.
- *  The 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.
+ *   DL (Fiddle) library is preferred for safer and a bit more portable programming.
  */
 
 static VALUE
@@ -10224,7 +9623,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) < 0)
+    if (rb_pipe(pipes) == -1)
         rb_sys_fail(0);
 
     args[0] = klass;
@@ -10298,10 +9697,9 @@ struct foreach_arg {
 };
 
 static void
-open_key_args(VALUE klass, int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
+open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
 {
     VALUE path, v;
-    VALUE vmode = Qnil, vperm = Qnil;
 
     path = *argv++;
     argc--;
@@ -10310,18 +9708,29 @@ open_key_args(VALUE klass, int argc, VALUE *argv, VALUE opt, struct foreach_arg
     arg->argc = argc;
     arg->argv = argv;
     if (NIL_P(opt)) {
-	vmode = INT2NUM(O_RDONLY);
-	vperm = INT2FIX(0666);
+	arg->io = rb_io_open(path, INT2NUM(O_RDONLY), INT2FIX(0666), Qnil);
+	return;
     }
-    else if (!NIL_P(v = rb_hash_aref(opt, sym_open_args))) {
-	int n;
+    v = rb_hash_aref(opt, sym_open_args);
+    if (!NIL_P(v)) {
+	VALUE args;
+	long n;
 
-	v = rb_to_array_type(v);
-	n = RARRAY_LENINT(v);
-	rb_check_arity(n, 0, 3); /* rb_io_open */
-	rb_scan_args(n, RARRAY_CONST_PTR(v), "02:", &vmode, &vperm, &opt);
+	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;
     }
-    arg->io = rb_io_open(klass, path, vmode, vperm, opt);
+    arg->io = rb_io_open(path, Qnil, Qnil, opt);
 }
 
 static VALUE
@@ -10329,7 +9738,7 @@ io_s_foreach(struct getline_arg *arg)
 {
     VALUE str;
 
-    while (!NIL_P(str = rb_io_getline_1(arg->rs, arg->limit, arg->chomp, arg->io))) {
+    while (!NIL_P(str = rb_io_getline_1(arg->rs, arg->limit, arg->io))) {
 	rb_lastline_set(str);
 	rb_yield(str);
     }
@@ -10339,9 +9748,9 @@ io_s_foreach(struct getline_arg *arg)
 
 /*
  *  call-seq:
- *     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(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(...)                                            -> an_enumerator
  *
  *  Executes the block for every line in the named I/O port, where lines
@@ -10359,8 +9768,7 @@ io_s_foreach(struct getline_arg *arg)
  *     GOT And so on...
  *
  *  If the last argument is a hash, it's the keyword argument to open.
- *  See IO.readlines for details about getline_args.
- *  And see also IO.read for details about open_args.
+ *  See <code>IO.read</code> for detail.
  *
  */
 
@@ -10374,10 +9782,9 @@ rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
 
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
     RETURN_ENUMERATOR(self, orig_argc, argv);
-    extract_getline_args(argc-1, argv+1, &garg);
-    open_key_args(self, argc, argv, opt, &arg);
+    extract_getline_args(argc-1, argv+1, &garg.rs, &garg.limit);
+    open_key_args(argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
-    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);
 }
@@ -10385,14 +9792,14 @@ rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
 static VALUE
 io_s_readlines(struct getline_arg *arg)
 {
-    return io_readlines(arg, arg->io);
+    return io_readlines(arg->rs, arg->limit, arg->io);
 }
 
 /*
  *  call-seq:
- *     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
+ *     IO.readlines(name, sep=$/ [, open_args])     -> array
+ *     IO.readlines(name, limit [, open_args])      -> array
+ *     IO.readlines(name, sep, limit [, 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
@@ -10401,21 +9808,9 @@ io_s_readlines(struct getline_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
@@ -10426,10 +9821,9 @@ rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
     struct getline_arg garg;
 
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
-    extract_getline_args(argc-1, argv+1, &garg);
-    open_key_args(io, argc, argv, opt, &arg);
+    extract_getline_args(argc-1, argv+1, &garg.rs, &garg.limit);
+    open_key_args(argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
-    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);
 }
@@ -10469,24 +9863,24 @@ seek_before_access(VALUE argp)
  *
  *  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 or integer
+ *  mode::
+ *    string
  *
- *    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.
+ *    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.
  *
- *  :open_args::
- *    array
+ *  open_args::
+ *    array of strings
  *
  *    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:
  *
@@ -10503,7 +9897,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(io, argc, argv, opt, &arg);
+    open_key_args(argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
     if (!NIL_P(offset)) {
 	struct seek_arg sarg;
@@ -10552,7 +9946,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(io, argv[0], oflags, fmode, &convconfig, 0);
+    arg.io = rb_io_open_generic(argv[0], oflags, fmode, &convconfig, 0);
     if (NIL_P(arg.io)) return Qnil;
     arg.argv = argv+1;
     arg.argc = (argc > 1) ? 1 : 0;
@@ -10578,7 +9972,7 @@ io_s_write0(struct write_arg *arg)
 }
 
 static VALUE
-io_s_write(int argc, VALUE *argv, VALUE klass, int binary)
+io_s_write(int argc, VALUE *argv, int binary)
 {
     VALUE string, offset, opt;
     struct foreach_arg arg;
@@ -10598,7 +9992,7 @@ io_s_write(int argc, VALUE *argv, VALUE klass, int binary)
        if (NIL_P(offset)) mode |= O_TRUNC;
        rb_hash_aset(opt,sym_mode,INT2NUM(mode));
     }
-    open_key_args(klass, argc, argv, opt, &arg);
+    open_key_args(argc,argv,opt,&arg);
 
 #ifndef O_BINARY
     if (binary) rb_io_binmode_m(arg.io);
@@ -10627,67 +10021,63 @@ io_s_write(int argc, VALUE *argv, VALUE klass, int binary)
 
 /*
  *  call-seq:
- *     IO.write(name, string [, offset])           -> integer
- *     IO.write(name, string [, offset] [, opt])   -> integer
+ *     IO.write(name, string, [offset] )   => integer
+ *     IO.write(name, string, [offset], open_args )   => 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 in write mode, the file is truncated.
- *  Otherwise, it is not truncated.
+ *  If <i>offset</i> is not given, the file is truncated.  Otherwise,
+ *  it is not truncated.
  *
- *    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"
+ *  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.
  *
- *  If the last argument is a hash, it specifies options for the internal
- *  open().  It accepts the following keys:
+ *   encoding: string or encoding
  *
- *  :encoding::
- *    string or encoding
+ *    specifies encoding of the read string.  encoding will be ignored
+ *    if length is specified.
  *
- *    Specifies the encoding of the read string.
- *    See Encoding.aliases for possible encodings.
+ *   mode: string
  *
- *  :mode::
- *    string or integer
+ *    specifies mode argument for open().  it should start with "w" or "a" or "r+"
+ *    otherwise it would cause error.
  *
- *    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.
+ *   perm: integer
  *
- *  :perm::
- *    integer
+ *    specifies perm argument for open().
  *
- *    Specifies the <i>perm</i> argument for open().
+ *   open_args: array
  *
- *  :open_args::
- *    array
+ *    specifies arguments for open() as an array.
  *
- *    Specifies arguments for open() as an array.
- *    This key can not be used in combination with other keys.
+ *     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"
  */
 
 static VALUE
 rb_io_s_write(int argc, VALUE *argv, VALUE io)
 {
-    return io_s_write(argc, argv, io, 0);
+    return io_s_write(argc, argv, 0);
 }
 
 /*
  *  call-seq:
- *     IO.binwrite(name, string, [offset] )             -> integer
- *     IO.binwrite(name, string, [offset], open_args )  -> integer
+ *     IO.binwrite(name, string, [offset] )   => integer
+ *     IO.binwrite(name, string, [offset], open_args )   => integer
  *
  *  Same as <code>IO.write</code> except opening the file in binary mode
  *  and ASCII-8BIT encoding ("wb:ASCII-8BIT").
+ *
  */
 
 static VALUE
 rb_io_s_binwrite(int argc, VALUE *argv, VALUE io)
 {
-    return io_s_write(argc, argv, io, 1);
+    return io_s_write(argc, argv, 1);
 }
 
 struct copy_stream_struct {
@@ -10698,12 +10088,13 @@ struct copy_stream_struct {
 
     int src_fd;
     int dst_fd;
-    unsigned close_src : 1;
-    unsigned close_dst : 1;
-    int error_no;
+    int close_src;
+    int close_dst;
     off_t total;
     const char *syserr;
+    int error_no;
     const char *notimp;
+    rb_fdset_t fds;
     VALUE th;
 };
 
@@ -10740,23 +10131,15 @@ maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
 }
 
 /* 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
+#if defined(HAVE_POLL) && defined(__linux__)
+#  define USE_POLL 1
+#  define IOWAIT_SYSCALL "poll"
+#else
+#  define IOWAIT_SYSCALL "select"
 #  define USE_POLL 0
 #endif
 
 #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)
 {
@@ -10765,35 +10148,8 @@ nogvl_wait_for_single_fd(int fd, short events)
     fds.fd = fd;
     fds.events = events;
 
-    return poll(&fds, 1, -1);
+    return poll(&fds, 1, 0);
 }
-#else /* !USE_POLL */
-#  include "vm_core.h"
-#  define IOWAIT_SYSCALL "select"
-static int
-nogvl_wait_for_single_fd(int fd, short events)
-{
-    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)
@@ -10805,156 +10161,69 @@ 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, RB_WAITFD_IN);
+	    ret = nogvl_wait_for_single_fd(stp->src_fd, POLLIN);
 	}
-    } while (ret < 0 && maygvl_copy_stream_continue_p(has_gvl, stp));
+    } while (ret == -1 && maygvl_copy_stream_continue_p(has_gvl, stp));
 
-    if (ret < 0) {
-        stp->syserr = IOWAIT_SYSCALL;
+    if (ret == -1) {
+        stp->syserr = "poll";
         stp->error_no = errno;
-        return ret;
+        return -1;
     }
     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
-nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
+maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
 {
     int ret;
 
     do {
-	ret = nogvl_wait_for_single_fd(stp->dst_fd, RB_WAITFD_OUT);
-    } while (ret < 0 && maygvl_copy_stream_continue_p(0, stp));
+	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));
 
-    if (ret < 0) {
-        stp->syserr = IOWAIT_SYSCALL;
+    if (ret == -1) {
+        stp->syserr = "select";
         stp->error_no = errno;
-        return ret;
+        return -1;
     }
     return 0;
 }
-
-#if defined __linux__ && defined __NR_copy_file_range
-#  define USE_COPY_FILE_RANGE
-#endif
-
-#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)
-{
-    return syscall(__NR_copy_file_range, in_fd, in_offset, out_fd, out_offset, count, flags);
-}
+#endif /* !USE_POLL */
 
 static int
-nogvl_copy_file_range(struct copy_stream_struct *stp)
+nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
 {
-    struct stat sb;
-    ssize_t ss;
-    off_t src_size;
     int ret;
-    off_t copy_length, src_offset, *src_offset_ptr;
 
-    ret = fstat(stp->src_fd, &sb);
-    if (ret < 0) {
-        stp->syserr = "fstat";
-        stp->error_no = errno;
-        return ret;
-    }
-    if (!S_ISREG(sb.st_mode))
-        return 0;
-
-    src_size = sb.st_size;
-    ret = fstat(stp->dst_fd, &sb);
-    if (ret < 0) {
-        stp->syserr = "fstat";
-        stp->error_no = errno;
-        return ret;
-    }
-
-    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
-            return 0;
-	  case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	  case EWOULDBLOCK:
+    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);
 #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);
+    } while (ret == -1 && maygvl_copy_stream_continue_p(0, stp));
 
-		if (flags != -1 && flags & O_APPEND) {
-		    return 0;
-		}
-		errno = e;
-	    }
-        }
-        stp->syserr = "copy_file_range";
+    if (ret == -1) {
+        stp->syserr = IOWAIT_SYSCALL;
         stp->error_no = errno;
-        return (int)ss;
+        return -1;
     }
-    return 1;
+    return 0;
 }
-#endif
 
 #ifdef HAVE_SENDFILE
 
@@ -10989,7 +10258,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 r;
+    if (r != 0 && sbytes == 0) return -1;
     if (offset) {
 	*offset += sbytes;
     }
@@ -11007,52 +10276,51 @@ 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 sb;
+    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, &sb);
-    if (ret < 0) {
+    ret = fstat(stp->src_fd, &src_stat);
+    if (ret == -1) {
         stp->syserr = "fstat";
         stp->error_no = errno;
-        return ret;
+        return -1;
     }
-    if (!S_ISREG(sb.st_mode))
+    if (!S_ISREG(src_stat.st_mode))
         return 0;
 
-    src_size = sb.st_size;
-    ret = fstat(stp->dst_fd, &sb);
-    if (ret < 0) {
+    ret = fstat(stp->dst_fd, &dst_stat);
+    if (ret == -1) {
         stp->syserr = "fstat";
         stp->error_no = errno;
-        return ret;
+        return -1;
     }
 #ifndef __linux__
-    if ((sb.st_mode & S_IFMT) != S_IFSOCK)
+    if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
 	return 0;
 #endif
 
     src_offset = stp->src_offset;
-    use_pread = src_offset >= (off_t)0;
+    use_pread = src_offset != (off_t)-1;
 
     copy_length = stp->copy_length;
-    if (copy_length < (off_t)0) {
+    if (copy_length == (off_t)-1) {
         if (use_pread)
-            copy_length = src_size - src_offset;
+            copy_length = src_stat.st_size - src_offset;
         else {
             off_t cur;
             errno = 0;
             cur = lseek(stp->src_fd, 0, SEEK_CUR);
-            if (cur < (off_t)0 && errno) {
+            if (cur == (off_t)-1 && errno) {
                 stp->syserr = "lseek";
                 stp->error_no = errno;
-                return (int)cur;
+                return -1;
             }
-            copy_length = src_size - cur;
+            copy_length = src_stat.st_size - cur;
         }
     }
 
@@ -11076,7 +10344,7 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
             goto retry_sendfile;
         }
     }
-    if (ss < 0) {
+    if (ss == -1) {
 	if (maygvl_copy_stream_continue_p(0, stp))
 	    goto retry_sendfile;
         switch (errno) {
@@ -11089,27 +10357,24 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
 #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()...
-                */
-                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;
-            }
+           /*
+            * 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;
             goto retry_sendfile;
         }
         stp->syserr = "sendfile";
         stp->error_no = errno;
-        return (int)ss;
+        return -1;
     }
     return 1;
 }
@@ -11129,7 +10394,7 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
 {
     ssize_t ss;
   retry_read:
-    if (offset < (off_t)0) {
+    if (offset == (off_t)-1) {
         ss = maygvl_read(has_gvl, stp->src_fd, buf, len);
     }
     else {
@@ -11143,7 +10408,7 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
     if (ss == 0) {
         return 0;
     }
-    if (ss < 0) {
+    if (ss == -1) {
 	if (maygvl_copy_stream_continue_p(has_gvl, stp))
 	    goto retry_read;
         switch (errno) {
@@ -11151,19 +10416,18 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-            {
-                int ret = maygvl_copy_stream_wait_read(has_gvl, stp);
-                if (ret < 0) return ret;
-            }
+            if (maygvl_copy_stream_wait_read(has_gvl, stp) == -1)
+                return -1;
             goto retry_read;
 #ifdef ENOSYS
 	  case ENOSYS:
             stp->notimp = "pread";
-            return ss;
+            return -1;
 #endif
         }
-        stp->syserr = offset < (off_t)0 ?  "read" : "pread";
+        stp->syserr = offset == (off_t)-1 ?  "read" : "pread";
         stp->error_no = errno;
+        return -1;
     }
     return ss;
 }
@@ -11175,17 +10439,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 < 0) {
-            if (maygvl_copy_stream_continue_p(0, stp))
-                continue;
+        if (ss == -1) {
+	    if (maygvl_copy_stream_continue_p(0, stp))
+		continue;
             if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                int ret = nogvl_copy_stream_wait_write(stp);
-                if (ret < 0) return ret;
+                if (nogvl_copy_stream_wait_write(stp) == -1)
+                    return -1;
                 continue;
             }
             stp->syserr = "write";
             stp->error_no = errno;
-            return (int)ss;
+            return -1;
         }
         off += (int)ss;
         len -= (int)ss;
@@ -11207,15 +10471,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)0;
+    use_eof = copy_length == (off_t)-1;
     src_offset = stp->src_offset;
-    use_pread = src_offset >= (off_t)0;
+    use_pread = src_offset != (off_t)-1;
 
     if (use_pread && stp->close_src) {
         off_t r;
 	errno = 0;
         r = lseek(stp->src_fd, src_offset, SEEK_SET);
-        if (r < (off_t)0 && errno) {
+        if (r == (off_t)-1 && errno) {
             stp->syserr = "lseek";
             stp->error_no = errno;
             return;
@@ -11255,16 +10519,10 @@ static void *
 nogvl_copy_stream_func(void *arg)
 {
     struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE)
+#ifdef USE_SENDFILE
     int ret;
 #endif
 
-#ifdef USE_COPY_FILE_RANGE
-    ret = nogvl_copy_file_range(stp);
-    if (ret != 0)
-	goto finish; /* error or success */
-#endif
-
 #ifdef USE_SENDFILE
     ret = nogvl_copy_stream_sendfile(stp);
     if (ret != 0)
@@ -11273,7 +10531,7 @@ nogvl_copy_stream_func(void *arg)
 
     nogvl_copy_stream_read_write(stp);
 
-#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE)
+#ifdef USE_SENDFILE
   finish:
 #endif
     return 0;
@@ -11290,7 +10548,7 @@ copy_stream_fallback_body(VALUE arg)
     off_t off = stp->src_offset;
     ID read_method = id_readpartial;
 
-    if (stp->src_fd < 0) {
+    if (stp->src_fd == -1) {
 	if (!rb_respond_to(stp->src, read_method)) {
 	    read_method = id_read;
 	}
@@ -11299,17 +10557,15 @@ copy_stream_fallback_body(VALUE arg)
     while (1) {
         long numwrote;
         long l;
-        if (stp->copy_length < (off_t)0) {
+        if (stp->copy_length == (off_t)-1) {
             l = buflen;
         }
         else {
-	    if (rest == 0) {
-		rb_str_resize(buf, 0);
-		break;
-	    }
+            if (rest == 0)
+                break;
             l = buflen < rest ? buflen : (long)rest;
         }
-        if (stp->src_fd < 0) {
+        if (stp->src_fd == -1) {
             VALUE rc = rb_funcall(stp->src, read_method, 2, INT2FIX(l), buf);
 
             if (read_method == id_read && NIL_P(rc))
@@ -11320,11 +10576,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 < 0)
+            if (ss == -1)
                 return Qnil;
             if (ss == 0)
                 rb_eof_error();
-            if (off >= (off_t)0)
+            if (off != (off_t)-1)
                 off += ss;
         }
         n = rb_io_write(stp->dst, buf);
@@ -11342,7 +10598,7 @@ copy_stream_fallback_body(VALUE arg)
 static VALUE
 copy_stream_fallback(struct copy_stream_struct *stp)
 {
-    if (stp->src_fd < 0 && stp->src_offset >= (off_t)0) {
+    if (stp->src_fd == -1 && stp->src_offset != (off_t)-1) {
 	rb_raise(rb_eArgError, "cannot specify src_offset for non-IO");
     }
     rb_rescue2(copy_stream_fallback_body, (VALUE)stp,
@@ -11403,7 +10659,7 @@ copy_stream_body(VALUE arg)
     else {
 	VALUE tmp_io = rb_io_check_io(dst_io);
 	if (!NIL_P(tmp_io)) {
-	    dst_io = GetWriteIO(tmp_io);
+	    dst_io = tmp_io;
 	}
 	else if (!RB_TYPE_P(dst_io, T_FILE)) {
 	    VALUE args[3];
@@ -11432,10 +10688,10 @@ copy_stream_body(VALUE arg)
     if (dst_fptr)
 	io_ascii8bit_binmode(dst_fptr);
 
-    if (stp->src_offset < (off_t)0 && src_fptr && src_fptr->rbuf.len) {
+    if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf.len) {
         size_t len = src_fptr->rbuf.len;
         VALUE str;
-        if (stp->copy_length >= (off_t)0 && stp->copy_length < (off_t)len) {
+        if (stp->copy_length != (off_t)-1 && stp->copy_length < (off_t)len) {
             len = (size_t)stp->copy_length;
         }
         str = rb_str_buf_new(len);
@@ -11447,9 +10703,8 @@ copy_stream_body(VALUE arg)
         }
         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)0)
+        if (stp->copy_length != (off_t)-1)
             stp->copy_length -= len;
     }
 
@@ -11460,10 +10715,13 @@ copy_stream_body(VALUE arg)
     if (stp->copy_length == 0)
         return Qnil;
 
-    if (src_fd < 0 || dst_fd < 0) {
+    if (src_fd == -1 || dst_fd == -1) {
         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;
 }
@@ -11478,6 +10736,7 @@ copy_stream_finalize(VALUE arg)
     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);
     }
@@ -11494,12 +10753,7 @@ 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-like object.
- *  IO-like object for <i>src</i> should have <code>readpartial</code> or
- *  <code>read</code> method.
- *  IO-like object for <i>dst</i> should have <code>write</code> method.
- *  (Specialized mechanisms, such as sendfile system call, may be used
- *  on appropriate situation.)
+ *  <i>src</i> and <i>dst</i> is either a filename or an IO.
  *
  *  This method returns the number of bytes copied.
  *
@@ -11543,6 +10797,7 @@ 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);
@@ -11553,7 +10808,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 in write mode and no encoding is specified, returns +nil+.
+ *  If io is write mode and no encoding is specified, returns <code>nil</code>.
  */
 
 static VALUE
@@ -11578,7 +10833,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
@@ -11636,12 +10891,6 @@ 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
@@ -11653,7 +10902,7 @@ global_argf_p(VALUE arg)
  *
  *  To set the external encoding use +ARGF.set_encoding+.
  *
- *  For example:
+ * For example:
  *
  *     ARGF.external_encoding  #=>  #<Encoding:UTF-8>
  *
@@ -11678,7 +10927,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)
@@ -11711,7 +10960,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:
  *
@@ -11758,10 +11007,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)
@@ -11809,19 +11058,11 @@ 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);
-    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;
+    return rb_io_rewind(ARGF.current_file);
 }
 
 /*
@@ -11906,28 +11147,22 @@ 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+.
+ *  _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.
  *
- *  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 _outbuf_ 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 <i>outbuf</i> 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
@@ -11938,11 +11173,8 @@ argf_eof(VALUE argf)
  *     ARGF.read(2)   #=> "sm"
  *     ARGF.read(0)   #=> ""
  *
- *  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.
+ *  Note that this method behaves like fread() function in C.  If you need the
+ *  behavior like read(2) system call, consider +ARGF.readpartial+.
  */
 
 static VALUE
@@ -12017,7 +11249,7 @@ 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 _outbuf_ will contain only the received data after the method call
+ *  The <i>outbuf</i> 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.
@@ -12036,8 +11268,8 @@ argf_readpartial(int argc, VALUE *argv, VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.read_nonblock(maxlen[, options])              -> string
- *     ARGF.read_nonblock(maxlen, outbuf[, options])      -> outbuf
+ *     ARGF.read_nonblock(maxlen)              -> string
+ *     ARGF.read_nonblock(maxlen, outbuf)      -> outbuf
  *
  *  Reads at most _maxlen_ bytes from the ARGF stream in non-blocking mode.
  */
@@ -12146,7 +11378,7 @@ argf_getc(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.getbyte  -> Integer or nil
+ *     ARGF.getbyte  -> Fixnum or nil
  *
  *  Gets the next 8-bit byte (0..255) from +ARGF+. Returns +nil+ if called at
  *  the end of the stream.
@@ -12226,9 +11458,9 @@ argf_readchar(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.readbyte  -> Integer
+ *     ARGF.readbyte  -> Fixnum
  *
- *  Reads the next 8-bit byte from ARGF and returns it as an +Integer+. Raises
+ *  Reads the next 8-bit byte from ARGF and returns it as a +Fixnum+. Raises
  *  an +EOFError+ after the last byte of the last file has been read.
  *
  *  For example:
@@ -12275,58 +11507,34 @@ argf_block_call(ID mid, int argc, VALUE *argv, VALUE 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 = rb_block_call(ARGF.current_file, 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 an +Integer+ specifying the maximum
+ *  The optional _limit_ argument is a +Fixnum+ 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 of the current line and line number of
- *  the whole input, respectively.
+ *  be used to determine the filename and line number, respectively, of the
+ *  current line.
  *
  *  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
@@ -12336,7 +11544,7 @@ argf_each_line(int argc, VALUE *argv, VALUE argf)
 {
     RETURN_ENUMERATOR(argf, argc, argv);
     FOREACH_ARGF() {
-	argf_block_call_line(rb_intern("each_line"), argc, argv, argf);
+	argf_block_call(rb_intern("each_line"), argc, argv, argf);
     }
     return argf;
 }
@@ -12363,7 +11571,7 @@ argf_lines(int argc, VALUE *argv, VALUE argf)
  *     ARGF.each_byte                  -> an_enumerator
  *
  *  Iterates over each byte of each file in +ARGV+.
- *  A byte is returned as an +Integer+ in the range 0..255.
+ *  A byte is returned as a +Fixnum+ 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
@@ -12373,7 +11581,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]
  *
@@ -12403,8 +11611,8 @@ argf_bytes(VALUE 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+.
  *
@@ -12442,8 +11650,8 @@ argf_chars(VALUE 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+.
  *
@@ -12518,8 +11726,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.
- *  <code>$stdin</code> is returned when the current file is STDIN.
+ *  Returns the current file as an +IO+ or +File+ object. #<IO:<STDIN>> is
+ *  returned when the current file is STDIN.
  *
  *  For example:
  *
@@ -12564,10 +11772,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
@@ -12586,7 +11794,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"
@@ -12607,11 +11815,11 @@ argf_skip(VALUE argf)
  *  call-seq:
  *     ARGF.close  -> ARGF
  *
- *  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.
+ *  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.
  *
- *  For example:
+ * For example:
  *
  *     $ ruby argf.rb foo bar
  *
@@ -12619,6 +11827,7 @@ argf_skip(VALUE argf)
  *     ARGF.close
  *     ARGF.filename  #=> "bar"
  *     ARGF.close
+ *     ARGF.close     #=> closed stream (IOError)
  */
 static VALUE
 argf_close_m(VALUE argf)
@@ -12664,15 +11873,14 @@ argf_to_s(VALUE argf)
  *     ARGF.inplace_mode  -> String
  *
  *  Returns the file extension appended to the names of modified files under
- *  in-place edit mode. This value can be set using +ARGF.inplace_mode=+ or
+ *  inplace-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;
-    if (NIL_P(ARGF.inplace)) return rb_str_new(0, 0);
-    return rb_str_dup(ARGF.inplace);
+    return rb_str_new2(ARGF.inplace);
 }
 
 static VALUE
@@ -12685,7 +11893,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.
  *
@@ -12698,8 +11906,8 @@ 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)
@@ -12708,13 +11916,14 @@ argf_inplace_mode_set(VALUE argf, VALUE val)
 	rb_insecure_operation();
 
     if (!RTEST(val)) {
-	ARGF.inplace = Qfalse;
-    }
-    else if (StringValueCStr(val), !RSTRING_LEN(val)) {
-	ARGF.inplace = Qnil;
+	if (ARGF.inplace) free(ARGF.inplace);
+	ARGF.inplace = 0;
     }
     else {
-	ARGF.inplace = rb_str_new_frozen(val);
+	StringValue(val);
+	if (ARGF.inplace) free(ARGF.inplace);
+	ARGF.inplace = 0;
+	ARGF.inplace = strdup(RSTRING_PTR(val));
     }
     return argf;
 }
@@ -12728,13 +11937,15 @@ opt_i_set(VALUE val, ID id, VALUE *var)
 const char *
 ruby_get_inplace_mode(void)
 {
-    return RSTRING_PTR(ARGF.inplace);
+    return ARGF.inplace;
 }
 
 void
 ruby_set_inplace_mode(const char *suffix)
 {
-    ARGF.inplace = !suffix ? Qfalse : !*suffix ? Qnil : rb_fstring_cstr(suffix);
+    if (ARGF.inplace) free(ARGF.inplace);
+    ARGF.inplace = 0;
+    if (suffix) ARGF.inplace = strdup(suffix);
 }
 
 /*
@@ -12858,8 +12069,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 <code>SystemCallError</code>s
- * and these are not subclasses of IOError:
+ * Note that some IO failures raise +SystemCallError+s and these are not
+ * subclasses of IOError:
  *
  *    File.open("does/not/exist")
  *      #=> Errno::ENOENT: No such file or directory - does/not/exist
@@ -12872,7 +12083,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+.
+ * raises EOFError +EOFError+.
  *
  * +EOFError+ is a subclass of +IOError+.
  *
@@ -12960,13 +12171,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 <code>$<</code>) provides an
+ *  The global constant ARGF (also accessible as $<) 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
@@ -13053,14 +12264,10 @@ Init_IO(void)
     rb_cIO = rb_define_class("IO", rb_cObject);
     rb_include_module(rb_cIO, rb_mEnumerable);
 
-    /* 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
@@ -13071,17 +12278,13 @@ 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);
 
@@ -13112,10 +12315,10 @@ Init_IO(void)
     rb_output_fs = Qnil;
     rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
 
-    rb_default_rs = rb_fstring_lit("\n"); /* avoid modifying RS_default */
+    rb_rs = rb_default_rs = rb_usascii_str_new2("\n");
     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);
@@ -13143,9 +12346,6 @@ Init_IO(void)
     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);
@@ -13166,7 +12366,7 @@ Init_IO(void)
 
     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);
diff --git a/iseq.c b/iseq.c
index e327cd9976..b6b31c052f 100644
--- a/iseq.c
+++ b/iseq.c
@@ -17,7 +17,6 @@
 # include <dlfcn.h>
 #endif
 
-#define RUBY_VM_INSNS_INFO 1
 /* #define RUBY_MARK_FREE_DEBUG 1 */
 #include "gc.h"
 #include "vm_core.h"
@@ -26,18 +25,11 @@
 
 #include "insns.inc"
 #include "insns_info.inc"
-#include "mjit.h"
 
 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
@@ -51,9 +43,6 @@ obj_resurrect(VALUE obj)
 	  case T_ARRAY:
 	    obj = rb_ary_resurrect(obj);
 	    break;
-          case T_HASH:
-            obj = rb_hash_resurrect(obj);
-            break;
 	}
     }
     return obj;
@@ -82,198 +71,63 @@ rb_iseq_free(const rb_iseq_t *iseq)
 {
     RUBY_FREE_ENTER("iseq");
 
-    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
-	ruby_xfree((void *)body->local_table);
-	ruby_xfree((void *)body->is_entries);
-
-	if (body->ci_entries) {
-	    unsigned int i;
-	    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&body->ci_entries[body->ci_size];
-	    for (i=0; i<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);
+    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(body->ci_entries);
-	    ruby_xfree(body->cc_entries);
-	}
-	ruby_xfree((void *)body->catch_table);
-	ruby_xfree((void *)body->param.opt_table);
+	    ruby_xfree((void *)iseq->body->catch_table);
+	    ruby_xfree((void *)iseq->body->param.opt_table);
 
-	if (body->param.keyword != NULL) {
-	    ruby_xfree((void *)body->param.keyword->default_values);
-	    ruby_xfree((void *)body->param.keyword);
+	    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);
 	}
-	compile_data_free(ISEQ_COMPILE_DATA(iseq));
-	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 void iseq_value_itr_t(void *ctx, VALUE obj);
-typedef VALUE rb_vm_insns_translator_t(const void *addr);
-
-static int
-iseq_extract_values(const 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)) {
-			func(data, op);
-		    }
-		    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) {
-			func(data, is->once.value);
-		    }
-		    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;
-    const VALUE *code;
-    size_t n;
-    rb_vm_insns_translator_t * translator;
-    const struct rb_iseq_constant_body *const body = iseq->body;
-
-    size = body->iseq_size;
-    code = body->iseq_encoded;
-
-#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
-    if (FL_TEST(iseq, ISEQ_TRANSLATED)) {
-	translator = rb_vm_insn_addr2insn2;
-    } else {
-	translator = rb_vm_insn_null_translator;
-    }
-#else
-    translator = rb_vm_insn_null_translator;
-#endif
-
-    for (n = 0; n < size;) {
-	n += iseq_extract_values(code, n, func, data, translator);
-    }
-}
-
-static void
-each_insn_value(void *ctx, VALUE obj)
-{
-    rb_gc_mark(obj);
-}
-
 void
 rb_iseq_mark(const rb_iseq_t *iseq)
 {
     RUBY_MARK_ENTER("iseq");
 
-    RUBY_MARK_UNLESS_NULL(iseq->wrapper);
+    RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
 
     if (iseq->body) {
-	const struct rb_iseq_constant_body *const body = iseq->body;
-
-	if (FL_TEST(iseq, ISEQ_MARKABLE_ISEQ)) {
-	    rb_iseq_each_value(iseq, each_insn_value, NULL);
-	}
+	const struct rb_iseq_constant_body *body = iseq->body;
 
-	rb_gc_mark(body->variable.coverage);
-        rb_gc_mark(body->variable.pc2branchindex);
+	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.pathobj);
+	rb_gc_mark(body->location.path);
+	RUBY_MARK_UNLESS_NULL(body->location.absolute_path);
 	RUBY_MARK_UNLESS_NULL((VALUE)body->parent_iseq);
-
-	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(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 = &table->entries[i];
-		if (entry->iseq) {
-		    rb_gc_mark((VALUE)entry->iseq);
-		}
-	    }
-	}
     }
 
-    if (FL_TEST_RAW(iseq, ISEQ_NOT_LOADED_YET)) {
+    if (FL_TEST(iseq, ISEQ_NOT_LOADED_YET)) {
 	rb_gc_mark(iseq->aux.loader.obj);
     }
-    else if (FL_TEST_RAW(iseq, ISEQ_USE_COMPILE_DATA)) {
+    else if (ISEQ_COMPILE_DATA(iseq) != 0) {
 	const struct iseq_compile_data *const compile_data = ISEQ_COMPILE_DATA(iseq);
-        VM_ASSERT(compile_data != NULL);
-
-        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);
-    }
-    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_UNLESS_NULL(compile_data->mark_ary);
+	RUBY_MARK_UNLESS_NULL(compile_data->err_info);
+	RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
     }
 
     RUBY_MARK_LEAVE("iseq");
@@ -306,7 +160,7 @@ iseq_memsize(const rb_iseq_t *iseq)
 
 	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->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);
@@ -346,7 +200,7 @@ iseq_memsize(const rb_iseq_t *iseq)
 
 	cur = compile_data->storage_head;
 	while (cur) {
-	    size += cur->size + offsetof(struct iseq_compile_data_storage, buff);
+	    size += cur->size + SIZEOF_ISEQ_COMPILE_DATA_STORAGE;
 	    cur = cur->next;
 	}
     }
@@ -362,114 +216,83 @@ iseq_alloc(void)
     return iseq;
 }
 
-VALUE
-rb_iseq_pathobj_new(VALUE path, VALUE realpath)
+static rb_iseq_location_t *
+iseq_location_setup(rb_iseq_t *iseq, VALUE path, VALUE absolute_path, VALUE name, VALUE first_lineno)
 {
-    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);
+    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);
     }
     else {
-	if (!NIL_P(realpath)) realpath = rb_fstring(realpath);
-	pathobj = rb_ary_new_from_args(2, rb_fstring(path), realpath);
-	rb_obj_freeze(pathobj);
+	RB_OBJ_WRITE(iseq, &loc->absolute_path, absolute_path);
     }
-    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)
 {
-    struct rb_iseq_constant_body *const body = iseq->body;
-    const VALUE type = body->type;
+    const VALUE type = iseq->body->type;
 
     /* set class nest stack */
     if (type == ISEQ_TYPE_TOP) {
-	body->local_iseq = iseq;
+	iseq->body->local_iseq = iseq;
     }
     else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
-	body->local_iseq = iseq;
+	iseq->body->local_iseq = iseq;
     }
     else if (piseq) {
-	body->local_iseq = piseq->body->local_iseq;
+	iseq->body->local_iseq = piseq->body->local_iseq;
     }
 
     if (piseq) {
-	body->parent_iseq = piseq;
+	iseq->body->parent_iseq = piseq;
     }
 
     if (type == ISEQ_TYPE_MAIN) {
-	body->local_iseq = iseq;
+	iseq->body->local_iseq = iseq;
     }
 }
 
+void
+rb_iseq_add_mark_object(const rb_iseq_t *iseq, VALUE obj)
+{
+    /* TODO: check dedup */
+    rb_ary_push(ISEQ_MARK_ARY(iseq), obj);
+}
+
 static VALUE
 prepare_iseq_build(rb_iseq_t *iseq,
-                   VALUE name, VALUE path, VALUE realpath, VALUE first_lineno, const rb_code_location_t *code_location, const int node_id,
+		   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 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;
 
-    body->type = type;
+    iseq->body->type = type;
     set_relation(iseq, parent);
 
     name = rb_fstring(name);
-    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);
+    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);
     }
-    ISEQ_COVERAGE_SET(iseq, Qnil);
-    ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
-    body->variable.flip_count = 0;
+    RB_OBJ_WRITE(iseq, &iseq->body->mark_ary, iseq_mark_ary_create(0));
 
-    ISEQ_COMPILE_DATA_ALLOC(iseq);
-    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err_info);
+    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 +
-		offsetof(struct iseq_compile_data_storage, buff));
+		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;
@@ -477,92 +300,34 @@ prepare_iseq_build(rb_iseq_t *iseq,
     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_COMPILE_DATA(iseq)->ivar_cache_table = NULL;
 
     if (option->coverage_enabled) {
 	VALUE coverages = rb_get_coverages();
 	if (RTEST(coverages)) {
-	    coverage = rb_hash_lookup(coverages, rb_iseq_path(iseq));
+	    coverage = rb_hash_lookup(coverages, path);
 	    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
-    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
-finish_iseq_build(rb_iseq_t *iseq)
+cleanup_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_CLEAR(iseq);
+    ISEQ_COMPILE_DATA(iseq) = 0;
     compile_data_free(data);
 
-#if VM_INSN_INFO_TABLE_IMPL == 2 /* succinct bitvector */
-    /* create succ_index_table */
-    if (body->insns_info.succ_index_table == NULL) {
-	rb_iseq_insns_info_encode_positions(iseq);
-    }
-#endif
-
-#if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0
-    validate_get_insn_info(iseq);
-#endif
-
     if (RTEST(err)) {
-	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_funcallv(err, rb_intern("set_backtrace"), 1, &iseq->body->location.path);
 	rb_exc_raise(err);
     }
-
-    rb_iseq_init_trace(iseq);
     return Qtrue;
 }
 
@@ -574,6 +339,7 @@ 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 */
@@ -600,6 +366,7 @@ 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);
@@ -654,6 +421,7 @@ 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);
@@ -665,34 +433,25 @@ make_compile_option_value(rb_compile_option_t *option)
 }
 
 rb_iseq_t *
-rb_iseq_new(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
+rb_iseq_new(NODE *node, VALUE name, VALUE path, VALUE absolute_path,
 	    const rb_iseq_t *parent, enum iseq_type type)
 {
-    return rb_iseq_new_with_opt(ast, name, path, realpath, INT2FIX(0), parent, type,
+    return rb_iseq_new_with_opt(node, name, path, absolute_path, INT2FIX(0), parent, type,
 				&COMPILE_OPTION_DEFAULT);
 }
 
 rb_iseq_t *
-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, ISEQ_TYPE_TOP,
+rb_iseq_new_top(NODE *node, VALUE name, VALUE path, VALUE absolute_path, 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);
 }
 
 rb_iseq_t *
-rb_iseq_new_main(const rb_ast_body_t *ast, VALUE path, VALUE realpath, const rb_iseq_t *parent)
+rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path, const rb_iseq_t *parent)
 {
-    return rb_iseq_new_with_opt(ast, rb_fstring_lit("<main>"),
-				path, realpath, INT2FIX(0),
+    return rb_iseq_new_with_opt(node, rb_fstring_cstr("<main>"),
+				path, absolute_path, INT2FIX(0),
 				parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
 }
 
@@ -711,39 +470,18 @@ iseq_translate(rb_iseq_t *iseq)
 }
 
 rb_iseq_t *
-rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
+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)
 {
-    const NODE *node = ast ? ast->root : 0;
-    /* TODO: argument check */
-    rb_iseq_t *iseq = iseq_alloc();
-    rb_compile_option_t new_opt;
-
-    new_opt = option ? *option : 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, type, &new_opt);
-
-    rb_iseq_compile_node(iseq, node);
-    finish_iseq_build(iseq);
-
-    return iseq_translate(iseq);
-}
-
-rb_iseq_t *
-rb_iseq_new_ifunc(const struct vm_ifunc *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, type, option);
+    prepare_iseq_build(iseq, name, path, absolute_path, first_lineno, parent, type, option);
 
-    rb_iseq_compile_ifunc(iseq, ifunc);
-    finish_iseq_build(iseq);
+    rb_iseq_compile_node(iseq, node);
+    cleanup_iseq_build(iseq);
 
     return iseq_translate(iseq);
 }
@@ -760,10 +498,10 @@ rb_iseq_load_iseq(VALUE fname)
     return NULL;
 }
 
-#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)
+#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")
 static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;}
 
 static enum iseq_type
@@ -777,7 +515,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_plain = rb_intern("plain");
+    const ID id_defined_guard = rb_intern("defined_guard");
     /* ensure all symbols are static or pinned down before
      * conversion */
     const ID typeid = rb_check_id(&type);
@@ -789,7 +527,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_plain) return ISEQ_TYPE_PLAIN;
+    if (typeid == id_defined_guard) return ISEQ_TYPE_DEFINED_GUARD;
     return (enum iseq_type)-1;
 }
 
@@ -799,13 +537,12 @@ 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, realpath, first_lineno, code_location, node_id;
+    VALUE name, path, absolute_path, first_lineno;
     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,
@@ -823,8 +560,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++));
-    realpath    = rb_ary_entry(data, i++);
-    realpath    = NIL_P(realpath) ? Qnil : CHECK_STRING(realpath);
+    absolute_path = rb_ary_entry(data, i++);
+    absolute_path = NIL_P(absolute_path) ? Qnil : CHECK_STRING(absolute_path);
     first_lineno = CHECK_INTEGER(rb_ary_entry(data, i++));
 
     type        = CHECK_SYMBOL(rb_ary_entry(data, i++));
@@ -840,24 +577,14 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt)
 	rb_raise(rb_eTypeError, "unsupport 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, realpath, first_lineno, &tmp_loc, NUM2INT(node_id),
+    prepare_iseq_build(iseq, name, path, absolute_path, first_lineno,
 		       parent, (enum iseq_type)iseq_type, &option);
 
     rb_iseq_build_from_ary(iseq, misc, locals, params, exception, body);
 
-    finish_iseq_build(iseq);
+    cleanup_iseq_build(iseq);
 
     return iseqw_new(iseq);
 }
@@ -880,8 +607,9 @@ rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
 }
 
 rb_iseq_t *
-rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, const struct rb_block *base_block, VALUE opt)
+rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE absolute_path, VALUE line, const struct rb_block *base_block, VALUE opt)
 {
+    rb_thread_t *th = GET_THREAD();
     rb_iseq_t *iseq = NULL;
     const rb_iseq_t *const parent = base_block ? vm_block_iseq(base_block) : NULL;
     rb_compile_option_t option;
@@ -891,9 +619,9 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, c
 #else
 # define INITIALIZED /* volatile */
 #endif
-    rb_ast_t *(*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
+    NODE *(*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
     int ln;
-    rb_ast_t *INITIALIZED ast;
+    NODE *INITIALIZED node;
 
     /* safe results first */
     make_compile_option(&option, opt);
@@ -909,20 +637,18 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, c
     {
 	const VALUE parser = rb_parser_new();
 	rb_parser_set_context(parser, base_block, FALSE);
-	ast = (*parse)(parser, file, src, ln);
+	node = (*parse)(parser, file, src, ln);
     }
 
-    if (!ast->body.root) {
-	rb_ast_dispose(ast);
-	rb_exc_raise(GET_EC()->errinfo);
+    if (!node) {
+	rb_exc_raise(th->errinfo);
     }
     else {
 	INITIALIZED VALUE label = parent ?
 	    parent->body->location.label :
-	    rb_fstring_lit("<compiled>");
-	iseq = rb_iseq_new_with_opt(&ast->body, label, file, realpath, line,
+	    rb_fstring_cstr("<compiled>");
+	iseq = rb_iseq_new_with_opt(node, label, file, absolute_path, line,
 				    parent, type, &option);
-	rb_ast_dispose(ast);
     }
 
     return iseq;
@@ -943,19 +669,13 @@ rb_iseq_compile_on_base(VALUE src, VALUE file, VALUE line, const struct rb_block
 VALUE
 rb_iseq_path(const rb_iseq_t *iseq)
 {
-    return pathobj_path(iseq->body->location.pathobj);
-}
-
-VALUE
-rb_iseq_realpath(const rb_iseq_t *iseq)
-{
-    return pathobj_realpath(iseq->body->location.pathobj);
+    return iseq->body->location.path;
 }
 
 VALUE
 rb_iseq_absolute_path(const rb_iseq_t *iseq)
 {
-    return rb_iseq_realpath(iseq);
+    return iseq->body->location.absolute_path;
 }
 
 VALUE
@@ -979,51 +699,24 @@ rb_iseq_first_lineno(const rb_iseq_t *iseq)
 VALUE
 rb_iseq_method_name(const rb_iseq_t *iseq)
 {
-    struct rb_iseq_constant_body *const body = iseq->body->local_iseq->body;
+    const rb_iseq_t *local_iseq;
+
+    local_iseq = iseq->body->local_iseq;
 
-    if (body->type == ISEQ_TYPE_METHOD) {
-	return body->location.base_label;
+    if (local_iseq->body->type == ISEQ_TYPE_METHOD) {
+	return local_iseq->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) {
-	if (rb_obj_is_iseq(v)) {
-            rb_iseq_t *iseq = (rb_iseq_t *)v;
-            ISEQ_COVERAGE_SET(iseq, Qnil);
-	}
-    }
-    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
@@ -1047,22 +740,14 @@ static const rb_data_type_t iseqw_data_type = {
 static VALUE
 iseqw_new(const rb_iseq_t *iseq)
 {
-    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);
+    union { const rb_iseq_t *in; void *out; } deconst;
+    VALUE obj;
 
-        /* cache a wrapper object */
-        RB_OBJ_WRITE((VALUE)iseq, &iseq->wrapper, obj);
-        RB_OBJ_FREEZE((VALUE)iseq);
+    deconst.in = iseq;
+    obj = TypedData_Wrap_Struct(rb_cISeq, &iseqw_data_type, deconst.out);
+    RB_OBJ_WRITTEN(obj, Qundef, iseq);
 
-        return obj;
-    }
+    return obj;
 }
 
 VALUE
@@ -1096,26 +781,12 @@ static VALUE
 iseqw_s_compile(int argc, VALUE *argv, VALUE self)
 {
     VALUE src, file = Qnil, path = Qnil, line = INT2FIX(1), opt = Qnil;
-    int i;
-
     rb_secure(1);
 
-    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;
+    rb_scan_args(argc, argv, "14", &src, &file, &path, &line, &opt);
+    if (NIL_P(file)) file = rb_fstring_cstr("<compiled>");
     if (NIL_P(line)) line = INT2FIX(1);
 
-    Check_Type(path, T_STRING);
-    Check_Type(file, T_STRING);
-
     return iseqw_new(rb_iseq_compile_with_option(src, file, path, line, 0, opt));
 }
 
@@ -1143,41 +814,31 @@ static VALUE
 iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
 {
     VALUE file, line = INT2FIX(1), opt = Qnil;
-    VALUE parser, f, exc = Qnil, ret;
-    rb_ast_t *ast;
+    VALUE parser;
+    VALUE f;
+    NODE *node;
+    const char *fname;
     rb_compile_option_t option;
-    int i;
 
     rb_secure(1);
-    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];
-    }
+    rb_scan_args(argc, argv, "11", &file, &opt);
     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();
-    rb_parser_set_context(parser, NULL, FALSE);
-    ast = rb_parser_compile_file_path(parser, file, f, NUM2INT(line));
-    if (!ast->body.root) exc = GET_EC()->errinfo;
+    node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
 
     rb_io_close(f);
-    if (!ast->body.root) {
-	rb_ast_dispose(ast);
-	rb_exc_raise(exc);
-    }
 
     make_compile_option(&option, opt);
 
-    ret = iseqw_new(rb_iseq_new_with_opt(&ast->body, rb_fstring_lit("<main>"),
-					 file,
-					 rb_realpath_internal(Qnil, file, 1),
-					 line, NULL, ISEQ_TYPE_TOP, &option));
-    rb_ast_dispose(ast);
-    return ret;
+    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));
 }
 
 /*
@@ -1204,6 +865,7 @@ 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.
  *
@@ -1241,7 +903,7 @@ iseqw_check(VALUE iseqw)
     rb_iseq_t *iseq = DATA_PTR(iseqw);
 
     if (!iseq->body) {
-	rb_ibf_load_iseq_complete(iseq);
+	ibf_load_iseq_complete(iseq);
     }
 
     if (!iseq->body->location.label) {
@@ -1279,17 +941,14 @@ 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 (!body->location.label) {
-	return rb_sprintf("#<%"PRIsVALUE": uninitialized>", klass);
+    if (!iseq->body->location.label) {
+        return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
     }
     else {
-	return rb_sprintf("<%"PRIsVALUE":%"PRIsVALUE"@%"PRIsVALUE":%d>",
-			  klass,
-			  body->location.label, rb_iseq_path(iseq),
-			  FIX2INT(rb_iseq_first_lineno(iseq)));
+	return rb_sprintf("<%s:%s@%s>",
+			  rb_obj_classname(self),
+			  RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
     }
 }
 
@@ -1341,7 +1000,7 @@ iseqw_path(VALUE self)
 static VALUE
 iseqw_absolute_path(VALUE self)
 {
-    return rb_iseq_realpath(iseqw_check(self));
+    return rb_iseq_absolute_path(iseqw_check(self));
 }
 
 /*  Returns the label of this instruction sequence.
@@ -1476,7 +1135,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 +plain+.
+ *    +:ensure+, +:eval+, +:main+, and +:defined_guard+.
  *
  *  [locals]
  *    An array containing the names of all arguments and local variables as
@@ -1506,167 +1165,48 @@ iseqw_to_a(VALUE self)
     return iseq_data_to_ary(iseq);
 }
 
-#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;
+/* TODO: search algorithm is brute force.
+         this should be binary search or so. */
 
-    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);
-    }
-
-    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)
-{
-    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)
+static const struct iseq_line_info_entry *
+get_line_info(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;
+    size_t i = 0, size = iseq->body->line_info_size;
+    const struct iseq_line_info_entry *table = iseq->body->line_info_table;
     const int debug = 0;
 
     if (debug) {
-#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
+	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 (size == 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;
+	return 0;
     }
     else if (size == 1) {
-	return &insns_info[0];
+	return &table[0];
     }
     else {
 	for (i=1; i<size; i++) {
-	    if (debug) printf("insns_info[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
-			      i, positions[i], insns_info[i].line_no, pos);
+	    if (debug) printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
+			      i, table[i].position, table[i].line_no, pos);
 
-	    if (positions[i] == pos) {
-		return &insns_info[i];
+	    if (table[i].position == pos) {
+		return &table[i];
 	    }
-	    if (positions[i] > pos) {
-		return &insns_info[i-1];
+	    if (table[i].position > pos) {
+		return &table[i-1];
 	    }
 	}
     }
-    return &insns_info[i-1];
+    return &table[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)
+static unsigned int
+find_line_no(const rb_iseq_t *iseq, size_t pos)
 {
-    return get_insn_info_linear_search(iseq, pos);
-}
-#endif
-
-#if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0
-static void
-validate_get_insn_info(const rb_iseq_t *iseq)
-{
-    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);
+    const struct iseq_line_info_entry *entry = get_line_info(iseq, pos);
 
     if (entry) {
 	return entry->line_no;
@@ -1676,60 +1216,30 @@ 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)
+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->events;
+    if (pos == 0) {
+	return find_line_no(iseq, pos);
     }
     else {
-	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);
-        }
+	return find_line_no(iseq, pos - 1);
     }
 }
 
 static VALUE
-local_var_name(const rb_iseq_t *diseq, VALUE level, VALUE op)
+id_to_name(ID id, VALUE default_value)
 {
-    VALUE i;
-    VALUE name;
-    ID lid;
-    int idx;
-
-    for (i = 0; i < level; i++) {
-	diseq = diseq->body->parent_iseq;
-    }
-    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("?");
+    VALUE str = rb_id2str(id);
+    if (!str) {
+	str = default_value;
     }
-    else if (!rb_str_symname_p(name)) {
-	name = rb_str_inspect(name);
+    else if (!rb_str_symname_p(str)) {
+	str = rb_str_inspect(str);
     }
-    else {
-	name = rb_str_dup(name);
-    }
-    rb_str_catf(name, "@%d", idx);
-    return name;
+    return str;
 }
 
-int rb_insn_unified_local_var_level(VALUE);
-
 VALUE
 rb_insn_operand_intern(const rb_iseq_t *iseq,
 		       VALUE insn, int op_no, VALUE op,
@@ -1745,33 +1255,26 @@ 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;
-	    if (deftype == DEFINED_FUNC) {
-		ret = rb_fstring_lit("func"); break;
-	    }
-	    if (deftype == DEFINED_REF) {
-		ret = rb_fstring_lit("ref"); break;
-	    }
-	    ret = rb_iseq_defined_string(deftype);
-	    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:{
-	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);
+	if (insn == BIN(getlocal) || insn == BIN(setlocal)) {
+	    if (pnop) {
+		const rb_iseq_t *diseq = iseq;
+		VALUE level = *pnop, i;
+		ID lid;
+
+		for (i = 0; i < level; i++) {
+		    diseq = diseq->body->parent_iseq;
+		}
+		lid = diseq->body->local_table[diseq->body->local_table_size +
+					       VM_ENV_DATA_SIZE - 1 - op];
+		ret = id_to_name(lid, INT2FIX('*'));
+	    }
+	    else {
+		ret = rb_sprintf("%"PRIuVALUE, op);
+	    }
 	}
 	else {
 	    ret = rb_inspect(INT2FIX(op));
@@ -1779,24 +1282,10 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	break;
       }
       case TS_ID:		/* ID (symbol) */
-	ret = rb_inspect(ID2SYM(op));
-	break;
+	op = ID2SYM(op);
 
       case TS_VALUE:		/* VALUE */
 	op = obj_resurrect(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_inspect(op);
 	if (CLASS_OF(op) == rb_cISeq) {
 	    if (child) {
@@ -1827,7 +1316,6 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	break;
 
       case TS_IC:
-      case TS_ISE:
 	ret = rb_sprintf("<is:%"PRIdPTRDIFF">", (union iseq_inline_storage_entry *)op - iseq->body->is_entries);
 	break;
 
@@ -1850,19 +1338,15 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 
 	    if (ci->flag) {
 		VALUE flags = rb_ary_new();
-# define CALL_FLAG(n) if (ci->flag & 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(OPT_SEND); /* maybe not reachable */
+		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 */
 		rb_ary_push(ary, rb_ary_join(flags, rb_str_new2("|")));
 	    }
 	    ret = rb_sprintf("<callinfo!%"PRIsVALUE">", rb_ary_join(ary, rb_str_new2(", ")));
@@ -1891,20 +1375,11 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	break;
 
       default:
-	rb_bug("unknown operand type: %c", type);
+	rb_bug("insn_operand_intern: 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
@@ -1922,15 +1397,15 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
 
     insn_name_buff = insn_name(insn);
     if (1) {
-	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);
+	rb_str_catf(str, "%04"PRIdSIZE" %-16s ", pos, insn_name_buff);
     }
     else {
-	rb_str_catf(str, "%04"PRIuSIZE" %-28.*s ", pos,
+	rb_str_catf(str, "%04"PRIdSIZE" %-16.*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);
@@ -1942,8 +1417,8 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
     }
 
     {
-	unsigned int line_no = rb_iseq_line_no(iseq, pos);
-	unsigned int prev = pos == 0 ? 0 : rb_iseq_line_no(iseq, pos - 1);
+	unsigned int line_no = find_line_no(iseq, pos);
+	unsigned int prev = pos == 0 ? 0 : find_line_no(iseq, pos - 1);
 	if (line_no && line_no != prev) {
 	    long slen = RSTRING_LEN(str);
 	    slen = (slen > 70) ? 0 : (70 - slen);
@@ -1951,31 +1426,12 @@ 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", (int)RSTRING_LEN(str), RSTRING_PTR(str));
+	printf("%s\n", RSTRING_PTR(str));
     }
     return len;
 }
@@ -1997,7 +1453,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;
     }
 }
@@ -2005,163 +1461,127 @@ catch_type(int type)
 static VALUE
 iseq_inspect(const rb_iseq_t *iseq)
 {
-    const struct rb_iseq_constant_body *const body = iseq->body;
-    if (!body->location.label) {
+    if (!iseq->body->location.label) {
 	return rb_sprintf("#<ISeq: uninitialized>");
     }
     else {
-	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);
+	return rb_sprintf("#<ISeq:%s@%s>", RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
     }
 }
 
-static VALUE
-rb_iseq_disasm_recursive(const rb_iseq_t *iseq, VALUE indent)
+VALUE
+rb_iseq_disasm(const rb_iseq_t *iseq)
 {
-    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;
-    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_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_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_cat2(str, "\n");
 
     /* show catch table information */
-    if (body->catch_table) {
-	rb_str_cat(str, indent_str, indent_len);
+    if (iseq->body->catch_table) {
 	rb_str_cat2(str, "== catch table\n");
     }
-    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 = &body->catch_table->entries[i];
-	    rb_str_cat(str, indent_str, indent_len);
+    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];
 	    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 && !(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();
-		st_insert(done_iseq, (st_data_t)entry->iseq, (st_data_t)0);
-		indent_str = RSTRING_PTR(indent);
+	    if (entry->iseq) {
+		rb_str_concat(str, rb_iseq_disasm(rb_iseq_check(entry->iseq)));
 	    }
 	}
-	rb_str_resize(indent, indent_len);
-	indent_str = RSTRING_PTR(indent);
     }
-    if (body->catch_table) {
-	rb_str_cat(str, indent_str, indent_len);
+    if (iseq->body->catch_table) {
 	rb_str_cat2(str, "|-------------------------------------"
 		    "-----------------------------------\n");
     }
 
     /* show local table information */
-    if (body->local_table) {
-	const struct rb_iseq_param_keyword *const keyword = body->param.keyword;
-	rb_str_cat(str, indent_str, indent_len);
+    tbl = iseq->body->local_table;
+
+    if (tbl) {
 	rb_str_catf(str,
 		    "local table (size: %d, argc: %d "
 		    "[opts: %d, rest: %d, post: %d, block: %d, kw: %d@%d, kwrest: %d])\n",
-		    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;
+		    iseq->body->local_table_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;
 	    long width;
-	    VALUE name = local_var_name(iseq, 0, i);
+	    VALUE name = id_to_name(tbl[i], 0);
 	    char argi[0x100] = "";
 	    char opti[0x100] = "";
 
-	    if (body->param.flags.has_opt) {
-		int argc = body->param.lead_num;
-		int opts = body->param.opt_num;
+	    if (iseq->body->param.flags.has_opt) {
+		int argc = iseq->body->param.lead_num;
+		int opts = iseq->body->param.opt_num;
 		if (li >= argc && li < argc + opts) {
 		    snprintf(opti, sizeof(opti), "Opt=%"PRIdVALUE,
-			     body->param.opt_table[li - argc]);
+			     iseq->body->param.opt_table[li - argc]);
 		}
 	    }
 
-	    snprintf(argi, sizeof(argi), "%s%s%s%s%s%s",	/* arg, opts, rest, post, kwrest, block */
-		     body->param.lead_num > li ? "Arg" : "",
+	    snprintf(argi, sizeof(argi), "%s%s%s%s%s",	/* arg, opts, rest, post  block */
+		     iseq->body->param.lead_num > li ? "Arg" : "",
 		     opti,
-		     (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" : "");
+		     (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" : "");
 
-	    rb_str_cat(str, indent_str, indent_len);
-	    rb_str_catf(str, "[%2d] ", i + 1);
+	    rb_str_catf(str, "[%2d] ", iseq->body->local_table_size - i);
 	    width = RSTRING_LEN(str) + 11;
-	    rb_str_append(str, name);
+	    if (name)
+		rb_str_append(str, name);
+	    else
+		rb_str_cat2(str, "?");
 	    if (*argi) rb_str_catf(str, "<%s>", argi);
 	    if ((width -= RSTRING_LEN(str)) > 0) rb_str_catf(str, "%*s", (int)width, "");
 	}
-	rb_str_cat_cstr(right_strip(str), "\n");
+	rb_str_cat2(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);
-	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_str_concat(str, rb_iseq_disasm(rb_iseq_check((rb_iseq_t *)isv)));
     }
-    if (done_iseq) st_free_table(done_iseq);
 
     return str;
 }
 
-VALUE
-rb_iseq_disasm(const rb_iseq_t *iseq)
-{
-    return rb_iseq_disasm_recursive(iseq, rb_str_new(0, 0));
-}
-
 /*
  *  call-seq:
  *     iseq.disasm -> str
@@ -2186,115 +1606,6 @@ 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 = &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.
  *
@@ -2338,17 +1649,14 @@ iseqw_s_of(VALUE klass, VALUE body)
     rb_secure(1);
 
     if (rb_obj_is_proc(body)) {
-        iseq = vm_proc_iseq(body);
+	iseq = vm_proc_iseq(body);
 
-        if (!rb_obj_is_iseq((VALUE)iseq)) {
-            iseq = NULL;
-        }
-    }
-    else if (rb_obj_is_method(body)) {
-        iseq = rb_method_iseq(body);
+	if (!rb_obj_is_iseq((VALUE)iseq)) {
+	    iseq = NULL;
+	}
     }
-    else if (rb_typeddata_is_instance_of(body, &iseqw_data_type)) {
-        return body;
+    else {
+	iseq = rb_method_iseq(body);
     }
 
     return iseq ? iseqw_new(iseq) : Qnil;
@@ -2419,7 +1727,7 @@ 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;
     }
 }
@@ -2450,7 +1758,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("unknown exception type: %d", (int)type);
+	rb_bug("exception_type2symbol: unknown type %d", (int)type);
     }
     return ID2SYM(id);
 }
@@ -2468,10 +1776,9 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 {
     unsigned int i;
     long l;
-    const struct rb_iseq_constant_body *const iseq_body = iseq->body;
-    const struct iseq_insn_info_entry *prev_insn_info;
+    size_t ti;
     unsigned int pos;
-    int last_line = 0;
+    unsigned int line = 0;
     VALUE *seq, *iseq_original;
 
     VALUE val = rb_ary_new();
@@ -2483,7 +1790,7 @@ 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/2]; /* w/o-trace only */
+    static VALUE insn_syms[VM_INSTRUCTION_SIZE];
     struct st_table *labels_table = st_init_numtable();
 
     DECL_SYMBOL(top);
@@ -2494,11 +1801,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     DECL_SYMBOL(ensure);
     DECL_SYMBOL(eval);
     DECL_SYMBOL(main);
-    DECL_SYMBOL(plain);
+    DECL_SYMBOL(defined_guard);
 
     if (sym_top == 0) {
 	int i;
-	for (i=0; i<numberof(insn_syms); i++) {
+	for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
 	    insn_syms[i] = ID2SYM(rb_intern(insn_name(i)));
 	}
 	INIT_SYMBOL(top);
@@ -2509,11 +1816,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 	INIT_SYMBOL(ensure);
 	INIT_SYMBOL(eval);
 	INIT_SYMBOL(main);
-	INIT_SYMBOL(plain);
+	INIT_SYMBOL(defined_guard);
     }
 
     /* 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;
@@ -2522,19 +1829,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_PLAIN:  type = sym_plain;  break;
-      default: rb_bug("unsupported iseq type: %d", (int)iseq_body->type);
+      case ISEQ_TYPE_DEFINED_GUARD: type = sym_defined_guard; break;
+      default: rb_bug("unsupported iseq 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 {
@@ -2544,58 +1851,57 @@ 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<keyword->required_num; i++) {
-		rb_ary_push(keywords, ID2SYM(keyword->table[i]));
+	    for (i=0; i<iseq->body->param.keyword->required_num; i++) {
+		rb_ary_push(keywords, ID2SYM(iseq->body->param.keyword->table[i]));
 	    }
-	    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]);
+	    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]);
 		}
 		rb_ary_push(keywords, key);
 	    }
 
 	    rb_hash_aset(params, ID2SYM(rb_intern("kwbits")),
-	                 INT2FIX(keyword->bits_start));
+	                 INT2FIX(iseq->body->param.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(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(iseq->body->param.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%numberof(insn_syms)]);
+	rb_ary_push(ary, insn_syms[insn]);
 	for (j=0; j<len-1; j++, seq++) {
 	    switch (insn_op_type(insn, j)) {
 	      case TS_OFFSET: {
@@ -2629,10 +1935,9 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 		}
 		break;
 	      case TS_IC:
-	      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:
@@ -2705,9 +2010,9 @@ 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 = &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)));
@@ -2724,10 +2029,9 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 
     /* make body with labels and insert line number */
     body = rb_ary_new();
-    prev_insn_info = NULL;
+    ti = 0;
 
     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;
 
@@ -2735,26 +2039,10 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 	    rb_ary_push(body, (VALUE)label);
 	}
 
-	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;
+	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++;
 	}
 
 	rb_ary_push(body, ary);
@@ -2764,17 +2052,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 
     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_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)));
+    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));
 
+    /* TODO: compatibility issue */
     /*
      * [:magic, :major_version, :minor_version, :format_type, :misc,
      *  :name, :path, :absolute_path, :start_lineno, :type, :locals, :args,
@@ -2785,10 +2067,10 @@ 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, 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, 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, locals);
     rb_ary_push(val, params);
@@ -2801,12 +2083,10 @@ VALUE
 rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 {
     int i, r;
-    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);
+    VALUE a, args = rb_ary_new2(iseq->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) body->local_table[(i)]
+#define PARAM_ID(i) iseq->body->local_table[(i)]
 #define PARAM(i, type) (		      \
 	PARAM_TYPE(type),		      \
 	rb_id2str(PARAM_ID(i)) ?	      \
@@ -2816,18 +2096,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 < body->param.lead_num; i++) {
+	for (i = 0; i < iseq->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 < body->param.lead_num; i++) {
+	for (i = 0; i < iseq->body->param.lead_num; i++) {
 	    rb_ary_push(args, PARAM(i, req));
 	}
     }
-    r = body->param.lead_num + body->param.opt_num;
+    r = iseq->body->param.lead_num + iseq->body->param.opt_num;
     for (; i < r; i++) {
 	PARAM_TYPE(opt);
 	if (rb_id2str(PARAM_ID(i))) {
@@ -2835,52 +2115,52 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 	}
 	rb_ary_push(args, a);
     }
-    if (body->param.flags.has_rest) {
+    if (iseq->body->param.flags.has_rest) {
 	CONST_ID(rest, "rest");
-	rb_ary_push(args, PARAM(body->param.rest_start, rest));
+	rb_ary_push(args, PARAM(iseq->body->param.rest_start, rest));
     }
-    r = body->param.post_start + body->param.post_num;
+    r = iseq->body->param.post_start + iseq->body->param.post_num;
     if (is_proc) {
-	for (i = body->param.post_start; i < r; i++) {
+	for (i = iseq->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 = body->param.post_start; i < r; i++) {
+	for (i = iseq->body->param.post_start; i < r; i++) {
 	    rb_ary_push(args, PARAM(i, req));
 	}
     }
-    if (body->param.flags.has_kw) {
+    if (iseq->body->param.flags.has_kw) {
 	i = 0;
-	if (keyword->required_num > 0) {
+	if (iseq->body->param.keyword->required_num > 0) {
 	    ID keyreq;
 	    CONST_ID(keyreq, "keyreq");
-	    for (; i < keyword->required_num; i++) {
+	    for (; i < iseq->body->param.keyword->required_num; i++) {
 		PARAM_TYPE(keyreq);
-		if (rb_id2str(keyword->table[i])) {
-		    rb_ary_push(a, ID2SYM(keyword->table[i]));
+		if (rb_id2str(iseq->body->param.keyword->table[i])) {
+		    rb_ary_push(a, ID2SYM(iseq->body->param.keyword->table[i]));
 		}
 		rb_ary_push(args, a);
 	    }
 	}
 	CONST_ID(key, "key");
-	for (; i < keyword->num; i++) {
+	for (; i < iseq->body->param.keyword->num; i++) {
 	    PARAM_TYPE(key);
-	    if (rb_id2str(keyword->table[i])) {
-		rb_ary_push(a, ID2SYM(keyword->table[i]));
+	    if (rb_id2str(iseq->body->param.keyword->table[i])) {
+		rb_ary_push(a, ID2SYM(iseq->body->param.keyword->table[i]));
 	    }
 	    rb_ary_push(args, a);
 	}
     }
-    if (body->param.flags.has_kwrest) {
+    if (iseq->body->param.flags.has_kwrest) {
 	CONST_ID(keyrest, "keyrest");
-	rb_ary_push(args, PARAM(keyword->rest_start, keyrest));
+	rb_ary_push(args, PARAM(iseq->body->param.keyword->rest_start, keyrest));
     }
-    if (body->param.flags.has_block) {
+    if (iseq->body->param.flags.has_block) {
 	CONST_ID(block, "block");
-	rb_ary_push(args, PARAM(body->param.block_start, block));
+	rb_ary_push(args, PARAM(iseq->body->param.block_start, block));
     }
     return args;
 }
@@ -2925,255 +2205,131 @@ rb_iseq_defined_string(enum defined_type type)
     return str;
 }
 
-/* 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);
-        insn_data[insn].notrace_encoded_insn = (void *) key1;
-        insn_data[insn].trace_encoded_insn = (void *) key2;
-
-        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]);
-    }
-}
+/* Experimental tracing support: trace(line) -> trace(specified_line)
+ * MRI Specific.
+ */
 
 int
-rb_vm_insn_addr2insn(const void *addr)
+rb_iseqw_line_trace_each(VALUE iseqw, int (*func)(int line, rb_event_flag_t *events_ptr, void *d), void *data)
 {
-    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;
-    }
-
-    rb_bug("rb_vm_insn_addr2insn: invalid insn address: %p", addr);
-}
-
-static inline int
-encoded_iseq_trace_instrument(VALUE *iseq_encoded_insn, rb_event_flag_t turnon)
-{
-    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;
-        *iseq_encoded_insn = (VALUE) (turnon ? e->trace_encoded_insn : e->notrace_encoded_insn);
-        return e->insn_len;
+    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));
+		    }
+		}
+	    }
+	}
     }
-
-    rb_bug("trace_instrument: invalid insn address: %p", (void *)*iseq_encoded_insn);
-}
-
-void
-rb_iseq_trace_flag_cleared(const rb_iseq_t *iseq, size_t pos)
-{
-    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);
+    return trace_num;
 }
 
 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));
-    }
-
-    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)
+collect_trace(int line, rb_event_flag_t *events_ptr, void *ptr)
 {
-    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);
+    VALUE result = (VALUE)ptr;
+    rb_ary_push(result, INT2NUM(line));
+    return 1;
 }
 
-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
-iseq_remove_local_tracepoint(const rb_iseq_t *iseq, VALUE tpval)
+/*
+ * <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)
 {
-    int n = 0;
-
-    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));
-        }
-    }
-    return n;
+    VALUE result = rb_ary_new();
+    rb_iseqw_line_trace_each(iseqw, collect_trace, (void *)result);
+    return result;
 }
 
-struct trace_clear_local_events_struct {
-    VALUE tpval;
-    int n;
+struct set_specifc_data {
+    int pos;
+    int set;
+    int prev; /* 1: set, 2: unset, 0: not found */
 };
 
-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 trace_clear_local_events_struct data;
-    data.tpval = tpval;
-    data.n = 0;
-
-    iseq_remove_local_tracepoint_i(iseq, (void *)&data);
-    return data.n;
-}
-
-void
-rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events)
+static int
+line_trace_specify(int line, rb_event_flag_t *events_ptr, void *ptr)
 {
-    if (iseq->aux.exec.global_trace_events == turnon_events) {
-	return;
-    }
+    struct set_specifc_data *data = (struct set_specifc_data *)ptr;
 
-    if (!ISEQ_EXECUTABLE_P(iseq)) {
-	/* this is building ISeq */
-	return;
+    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 {
-        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);
-	}
+	data->pos--;
+	return 1;
     }
 }
 
-static int
-trace_set_i(void *vstart, void *vend, size_t stride, void *data)
+/*
+ * <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)
 {
-    rb_event_flag_t turnon_events = *(rb_event_flag_t *)data;
+    struct set_specifc_data data;
 
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-	if (rb_obj_is_iseq(v)) {
-	    rb_iseq_trace_set(rb_iseq_check((rb_iseq_t *)v), turnon_events);
-	}
+    data.prev = 0;
+    data.pos = NUM2INT(pos);
+    if (data.pos < 0) rb_raise(rb_eTypeError, "`pos' is negative");
+
+    switch (set) {
+      case Qtrue:  data.set = 1; break;
+      case Qfalse: data.set = 0; break;
+      default:
+	rb_raise(rb_eTypeError, "`set' should be true/false");
     }
-    return 0;
-}
 
-void
-rb_iseq_trace_set_all(rb_event_flag_t turnon_events)
-{
-    rb_objspace_each_objects(trace_set_i, &turnon_events);
-}
+    rb_iseqw_line_trace_each(iseqval, line_trace_specify, (void *)&data);
 
-/* This is exported since Ruby 2.5 but not internally used for now. If you're going to use this, please
-   update `ruby_vm_event_enabled_global_flags` and set `mjit_call_p = FALSE` as well to cancel MJIT code. */
-void
-rb_iseq_trace_on_all(void)
-{
-    rb_iseq_trace_set_all(RUBY_EVENT_TRACEPOINT_ALL);
+    if (data.prev == 0) {
+	rb_raise(rb_eTypeError, "`pos' is out of range.");
+    }
+    return data.prev == 1 ? Qtrue : Qfalse;
 }
 
 VALUE
@@ -3202,8 +2358,9 @@ rb_iseqw_local_variables(VALUE iseqval)
 static VALUE
 iseqw_to_binary(int argc, VALUE *argv, VALUE self)
 {
-    VALUE opt = !rb_check_arity(argc, 0, 1) ? Qnil : argv[0];
-    return rb_iseq_ibf_dump(iseqw_check(self), opt);
+    VALUE opt;
+    rb_scan_args(argc, argv, "01", &opt);
+    return iseq_ibf_dump(iseqw_check(self), opt);
 }
 
 /*
@@ -3222,7 +2379,7 @@ iseqw_to_binary(int argc, VALUE *argv, VALUE self)
 static VALUE
 iseqw_s_load_from_binary(VALUE self, VALUE str)
 {
-    return iseqw_new(rb_iseq_ibf_load(str));
+    return iseqw_new(iseq_ibf_load(str));
 }
 
 /*
@@ -3234,141 +2391,9 @@ iseqw_s_load_from_binary(VALUE self, VALUE str)
 static VALUE
 iseqw_s_load_from_binary_extra_data(VALUE self, VALUE str)
 {
-    return rb_iseq_ibf_load_extra_data(str);
+    return  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 implementatoin 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 = ruby_xcalloc(imm_size * sizeof(uint64_t) + succ_size * sizeof(struct succ_dict_block), 1); /* zero cleared */
-    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 = ruby_xmalloc(sizeof(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
  *
@@ -3412,8 +2437,16 @@ 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);
-    rb_define_method(rb_cISeq, "trace_points", iseqw_trace_points, 0);
-    rb_define_method(rb_cISeq, "each_child", iseqw_each_child, 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
 
 #if 0 /* TBD */
     rb_define_private_method(rb_cISeq, "marshal_dump", iseqw_marshal_dump, 0);
diff --git a/iseq.h b/iseq.h
index f3f269b572..6a5cb8bdad 100644
--- a/iseq.h
+++ b/iseq.h
@@ -12,9 +12,8 @@
 #ifndef RUBY_ISEQ_H
 #define RUBY_ISEQ_H 1
 
-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])
+#define ISEQ_MAJOR_VERSION 2
+#define ISEQ_MINOR_VERSION 3
 
 #ifndef rb_iseq_t
 typedef struct rb_iseq_struct rb_iseq_t;
@@ -27,117 +26,55 @@ rb_call_info_kw_arg_bytes(int keyword_len)
     return sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (keyword_len - 1);
 }
 
-#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)
+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;
+}
+
+#define ISEQ_MARK_ARY(iseq)           (iseq)->body->mark_ary
 
-#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_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_FLIP_CNT(iseq) (iseq)->body->variable.flip_count
+#define ISEQ_FLIP_CNT(iseq) FIX2INT(RARRAY_AREF(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_FLIP_CNT))
 
-static inline rb_snum_t
+static inline int
 ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq)
 {
-    rb_snum_t cnt = iseq->body->variable.flip_count;
-    iseq->body->variable.flip_count += 1;
+    int cnt = ISEQ_FLIP_CNT(iseq);
+    RARRAY_ASET(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_FLIP_CNT, INT2FIX(cnt+1));
     return cnt;
 }
 
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ(const rb_iseq_t *iseq)
 {
-    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);
-    }
+    VALUE str = RARRAY_AREF(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_ORIGINAL_ISEQ);
+    if (RTEST(str)) return (VALUE *)RSTRING_PTR(str);
+    return NULL;
 }
 
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size)
 {
-    return iseq->body->variable.original_iseq =
-        ruby_xmalloc2(size, sizeof(VALUE));
-}
-
-#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((iseq), ISEQ_NOT_LOADED_YET | ISEQ_USE_COMPILE_DATA) == 0)
-
-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;
-    struct iseq_compile_data_storage *storage_head;
-    struct iseq_compile_data_storage *storage_current;
-    int loopval_popped;	/* used by NODE_BREAK */
-    int last_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
-};
-
-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;
-    }
+    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);
 }
 
-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;
-}
+#define ISEQ_COMPILE_DATA(iseq)       (iseq)->aux.compile_data
 
 static inline rb_iseq_t *
 iseq_imemo_alloc(void)
@@ -145,24 +82,17 @@ iseq_imemo_alloc(void)
     return (rb_iseq_t *)rb_imemo_new(imemo_iseq, 0, 0, 0, 0);
 }
 
-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);
-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
+#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);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
 /* compile.c */
-VALUE rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node);
-VALUE rb_iseq_compile_ifunc(rb_iseq_t *iseq, const struct vm_ifunc *ifunc);
+VALUE rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node);
 int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
 VALUE *rb_iseq_original_iseq(const rb_iseq_t *iseq);
 void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc,
@@ -170,26 +100,24 @@ void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc,
 			    VALUE exception, VALUE body);
 
 /* 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_trace_on_all(void);
-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);
 VALUE rb_iseqw_new(const rb_iseq_t *iseq);
 const rb_iseq_t *rb_iseqw_to_iseq(VALUE iseqw);
 
-VALUE rb_iseq_absolute_path(const rb_iseq_t *iseq); /* obsolete */
+VALUE rb_iseq_path(const rb_iseq_t *iseq);
+VALUE rb_iseq_absolute_path(const rb_iseq_t *iseq);
 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);
@@ -203,15 +131,16 @@ 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_insn_info_entry {
-    int line_no;
-    rb_event_flag_t events;
+struct iseq_line_info_entry {
+    unsigned int position;
+    unsigned int line_no;
 };
 
 struct iseq_catch_table_entry {
@@ -223,21 +152,7 @@ struct iseq_catch_table_entry {
 	CATCH_TYPE_REDO   = INT2FIX(5),
 	CATCH_TYPE_NEXT   = INT2FIX(6)
     } type;
-
-    /*
-     * 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.
-     */
     const rb_iseq_t *iseq;
-
     unsigned int start;
     unsigned int end;
     unsigned int cont;
@@ -246,19 +161,18 @@ struct iseq_catch_table_entry {
 
 PACKED_STRUCT_UNALIGNED(struct iseq_catch_table {
     unsigned int size;
-    struct iseq_catch_table_entry entries[FLEX_ARY_LEN];
+    struct iseq_catch_table_entry entries[1]; /* flexible array */
 });
 
 static inline int
 iseq_catch_table_bytes(int n)
 {
     enum {
-	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
+	catch_table_entries_max = (INT_MAX - sizeof(struct iseq_catch_table)) / sizeof(struct iseq_catch_table_entry)
     };
     if (n > catch_table_entries_max) rb_fatal("too large iseq_catch_table - %d", n);
-    return (int)(offsetof(struct iseq_catch_table, entries) +
-		 n * catch_table_entry_size);
+    return (int)(sizeof(struct iseq_catch_table) +
+		 (n - 1) * sizeof(struct iseq_catch_table_entry));
 }
 
 #define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512)
@@ -267,13 +181,47 @@ struct iseq_compile_data_storage {
     struct iseq_compile_data_storage *next;
     unsigned int pos;
     unsigned int size;
-    char buff[FLEX_ARY_LEN];
+    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
 };
 
 /* defined? */
 
 enum defined_type {
-    DEFINED_NOT_DEFINED,
     DEFINED_NIL = 1,
     DEFINED_IVAR,
     DEFINED_LVAR,
diff --git a/lex.c.blt b/lex.c.blt
index 92a4793b00..7d8dd5b6e7 100644
--- a/lex.c.blt
+++ b/lex.c.blt
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.1 */
+/* C code produced by gperf version 3.0.4 */
 /* 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,16 +25,15 @@
       && ('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>."
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "defs/keywords"
 
-struct kwtable {short name, id[2], state;};
+struct kwtable {int 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;
@@ -46,15 +45,15 @@ struct kwtable;
 #define MAX_HASH_VALUE 50
 /* maximum key range = 43, duplicates = 0 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
 inline
-#endif
+#elif defined(__GNUC__)
+__inline
 #endif
 static unsigned int
-hash (register const char *str, register size_t len)
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const unsigned char asso_values[] =
     {
@@ -85,7 +84,7 @@ hash (register const char *str, register size_t len)
       51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
       51, 51, 51, 51, 51, 51
     };
-  register unsigned int hval = (unsigned int)len;
+  register int hval = len;
 
   switch (hval)
     {
@@ -97,7 +96,7 @@ hash (register const char *str, register size_t len)
         hval += asso_values[(unsigned char)str[0]];
         break;
     }
-  return (unsigned int)hval + asso_values[(unsigned char)str[len - 1]];
+  return hval + asso_values[(unsigned char)str[len - 1]];
 }
 
 struct stringpool_t
@@ -189,102 +188,110 @@ 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 (register const char *str, register size_t len)
+rb_reserved_word (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const struct kwtable wordlist[] =
     {
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 19 "defs/keywords"
-      {gperf_offsetof(stringpool, 8), {keyword_break, keyword_break}, EXPR_MID},
+      {(int)offsetof(struct stringpool_t, stringpool_str8), {keyword_break, keyword_break}, EXPR_MID},
 #line 25 "defs/keywords"
-      {gperf_offsetof(stringpool, 9), {keyword_else, keyword_else}, EXPR_BEG},
+      {(int)offsetof(struct stringpool_t, stringpool_str9), {keyword_else, keyword_else}, EXPR_BEG},
 #line 35 "defs/keywords"
-      {gperf_offsetof(stringpool, 10), {keyword_nil, keyword_nil}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str10), {keyword_nil, keyword_nil}, EXPR_END},
 #line 28 "defs/keywords"
-      {gperf_offsetof(stringpool, 11), {keyword_ensure, keyword_ensure}, EXPR_BEG},
+      {(int)offsetof(struct stringpool_t, stringpool_str11), {keyword_ensure, keyword_ensure}, EXPR_BEG},
 #line 27 "defs/keywords"
-      {gperf_offsetof(stringpool, 12), {keyword_end, keyword_end}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str12), {keyword_end, keyword_end}, EXPR_END},
 #line 44 "defs/keywords"
-      {gperf_offsetof(stringpool, 13), {keyword_then, keyword_then}, EXPR_BEG},
+      {(int)offsetof(struct stringpool_t, stringpool_str13), {keyword_then, keyword_then}, EXPR_BEG},
 #line 36 "defs/keywords"
-      {gperf_offsetof(stringpool, 14), {keyword_not, keyword_not}, EXPR_ARG},
+      {(int)offsetof(struct stringpool_t, stringpool_str14), {keyword_not, keyword_not}, EXPR_ARG},
 #line 29 "defs/keywords"
-      {gperf_offsetof(stringpool, 15), {keyword_false, keyword_false}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str15), {keyword_false, keyword_false}, EXPR_END},
 #line 42 "defs/keywords"
-      {gperf_offsetof(stringpool, 16), {keyword_self, keyword_self}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str16), {keyword_self, keyword_self}, EXPR_END},
 #line 26 "defs/keywords"
-      {gperf_offsetof(stringpool, 17), {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str17), {keyword_elsif, keyword_elsif}, EXPR_VALUE},
 #line 39 "defs/keywords"
-      {gperf_offsetof(stringpool, 18), {keyword_rescue, modifier_rescue}, EXPR_MID},
+      {(int)offsetof(struct stringpool_t, stringpool_str18), {keyword_rescue, modifier_rescue}, EXPR_MID},
 #line 45 "defs/keywords"
-      {gperf_offsetof(stringpool, 19), {keyword_true, keyword_true}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str19), {keyword_true, keyword_true}, EXPR_END},
 #line 48 "defs/keywords"
-      {gperf_offsetof(stringpool, 20), {keyword_until, modifier_until}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str20), {keyword_until, modifier_until}, EXPR_VALUE},
 #line 47 "defs/keywords"
-      {gperf_offsetof(stringpool, 21), {keyword_unless, modifier_unless}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str21), {keyword_unless, modifier_unless}, EXPR_VALUE},
 #line 41 "defs/keywords"
-      {gperf_offsetof(stringpool, 22), {keyword_return, keyword_return}, EXPR_MID},
+      {(int)offsetof(struct stringpool_t, stringpool_str22), {keyword_return, keyword_return}, EXPR_MID},
 #line 22 "defs/keywords"
-      {gperf_offsetof(stringpool, 23), {keyword_def, keyword_def}, EXPR_FNAME},
+      {(int)offsetof(struct stringpool_t, stringpool_str23), {keyword_def, keyword_def}, EXPR_FNAME},
 #line 17 "defs/keywords"
-      {gperf_offsetof(stringpool, 24), {keyword_and, keyword_and}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str24), {keyword_and, keyword_and}, EXPR_VALUE},
 #line 24 "defs/keywords"
-      {gperf_offsetof(stringpool, 25), {keyword_do, keyword_do}, EXPR_BEG},
+      {(int)offsetof(struct stringpool_t, stringpool_str25), {keyword_do, keyword_do}, EXPR_BEG},
 #line 51 "defs/keywords"
-      {gperf_offsetof(stringpool, 26), {keyword_yield, keyword_yield}, EXPR_ARG},
+      {(int)offsetof(struct stringpool_t, stringpool_str26), {keyword_yield, keyword_yield}, EXPR_ARG},
 #line 30 "defs/keywords"
-      {gperf_offsetof(stringpool, 27), {keyword_for, keyword_for}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str27), {keyword_for, keyword_for}, EXPR_VALUE},
 #line 46 "defs/keywords"
-      {gperf_offsetof(stringpool, 28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
+      {(int)offsetof(struct stringpool_t, stringpool_str28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
 #line 37 "defs/keywords"
-      {gperf_offsetof(stringpool, 29), {keyword_or, keyword_or}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str29), {keyword_or, keyword_or}, EXPR_VALUE},
 #line 32 "defs/keywords"
-      {gperf_offsetof(stringpool, 30), {keyword_in, keyword_in}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str30), {keyword_in, keyword_in}, EXPR_VALUE},
 #line 49 "defs/keywords"
-      {gperf_offsetof(stringpool, 31), {keyword_when, keyword_when}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str31), {keyword_when, keyword_when}, EXPR_VALUE},
 #line 40 "defs/keywords"
-      {gperf_offsetof(stringpool, 32), {keyword_retry, keyword_retry}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str32), {keyword_retry, keyword_retry}, EXPR_END},
 #line 31 "defs/keywords"
-      {gperf_offsetof(stringpool, 33), {keyword_if, modifier_if}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str33), {keyword_if, modifier_if}, EXPR_VALUE},
 #line 20 "defs/keywords"
-      {gperf_offsetof(stringpool, 34), {keyword_case, keyword_case}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str34), {keyword_case, keyword_case}, EXPR_VALUE},
 #line 38 "defs/keywords"
-      {gperf_offsetof(stringpool, 35), {keyword_redo, keyword_redo}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str35), {keyword_redo, keyword_redo}, EXPR_END},
 #line 34 "defs/keywords"
-      {gperf_offsetof(stringpool, 36), {keyword_next, keyword_next}, EXPR_MID},
+      {(int)offsetof(struct stringpool_t, stringpool_str36), {keyword_next, keyword_next}, EXPR_MID},
 #line 43 "defs/keywords"
-      {gperf_offsetof(stringpool, 37), {keyword_super, keyword_super}, EXPR_ARG},
+      {(int)offsetof(struct stringpool_t, stringpool_str37), {keyword_super, keyword_super}, EXPR_ARG},
 #line 33 "defs/keywords"
-      {gperf_offsetof(stringpool, 38), {keyword_module, keyword_module}, EXPR_VALUE},
+      {(int)offsetof(struct stringpool_t, stringpool_str38), {keyword_module, keyword_module}, EXPR_VALUE},
 #line 18 "defs/keywords"
-      {gperf_offsetof(stringpool, 39), {keyword_begin, keyword_begin}, EXPR_BEG},
+      {(int)offsetof(struct stringpool_t, stringpool_str39), {keyword_begin, keyword_begin}, EXPR_BEG},
 #line 12 "defs/keywords"
-      {gperf_offsetof(stringpool, 40), {keyword__LINE__, keyword__LINE__}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str40), {keyword__LINE__, keyword__LINE__}, EXPR_END},
 #line 13 "defs/keywords"
-      {gperf_offsetof(stringpool, 41), {keyword__FILE__, keyword__FILE__}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str41), {keyword__FILE__, keyword__FILE__}, EXPR_END},
 #line 11 "defs/keywords"
-      {gperf_offsetof(stringpool, 42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
 #line 15 "defs/keywords"
-      {gperf_offsetof(stringpool, 43), {keyword_END, keyword_END}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str43), {keyword_END, keyword_END}, EXPR_END},
 #line 16 "defs/keywords"
-      {gperf_offsetof(stringpool, 44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
+      {(int)offsetof(struct stringpool_t, stringpool_str44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
 #line 14 "defs/keywords"
-      {gperf_offsetof(stringpool, 45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+      {(int)offsetof(struct stringpool_t, stringpool_str45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
 #line 23 "defs/keywords"
-      {gperf_offsetof(stringpool, 46), {keyword_defined, keyword_defined}, EXPR_ARG},
+      {(int)offsetof(struct stringpool_t, stringpool_str46), {keyword_defined, keyword_defined}, EXPR_ARG},
 #line 21 "defs/keywords"
-      {gperf_offsetof(stringpool, 47), {keyword_class, keyword_class}, EXPR_CLASS},
+      {(int)offsetof(struct stringpool_t, stringpool_str47), {keyword_class, keyword_class}, EXPR_CLASS},
       {-1}, {-1},
 #line 50 "defs/keywords"
-      {gperf_offsetof(stringpool, 50), {keyword_while, modifier_while}, EXPR_VALUE}
+      {(int)offsetof(struct stringpool_t, stringpool_str50), {keyword_while, modifier_while}, EXPR_VALUE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register unsigned int key = hash (str, len);
+      register int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
diff --git a/lib/.document b/lib/.document
deleted file mode 100644
index 668152021d..0000000000
--- a/lib/.document
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add files to this as they become documented
-
-*.rb
-
-bundler
-cgi
-csv
-drb
-forwardable
-irb
-matrix
-net
-optparse
-racc
-rdoc
-rexml
-rinda
-rss
-rubygems
-scanf.rb
-shell
-unicode_normalize
-uri
-webrick
-yaml
diff --git a/lib/English.rb b/lib/English.rb
index a4f5bb6620..0c17229682 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #  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}.
@@ -153,7 +153,9 @@ alias $CHILD_STATUS            $?
 # scope.
 alias $LAST_MATCH_INFO         $~
 
-# This variable is no longer effective. Deprecated.
+# 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
 alias $IGNORECASE              $=
 
 # An array of strings containing the command-line
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
index 2af01d2eae..2eac293c30 100644
--- a/lib/abbrev.rb
+++ b/lib/abbrev.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #--
 # Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
 #
diff --git a/lib/base64.rb b/lib/base64.rb
index 24f0b02966..a08941af92 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # = 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.unpack1("m")
+    str.unpack("m").first
   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.unpack1("m0")
+    str.unpack("m0").first
   end
 
   # Returns the Base64-encoded version of +bin+.
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index 5ce9710586..ec1b658cde 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #--
 # benchmark.rb - a performance benchmarking library
 #
@@ -439,9 +439,6 @@ 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)
@@ -455,7 +452,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.
     #
@@ -463,20 +460,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
@@ -532,7 +529,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 (+x+).
+    # Tms object.
     #
     # +op+ can be a mathematical operation such as <tt>+</tt>, <tt>-</tt>,
     # <tt>*</tt>, <tt>/</tt>
diff --git a/lib/bundler.rb b/lib/bundler.rb
deleted file mode 100644
index 1cb3b4fb21..0000000000
--- a/lib/bundler.rb
+++ /dev/null
@@ -1,567 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/compatibility_guard"
-
-require "bundler/vendored_fileutils"
-require "pathname"
-require "rbconfig"
-require "thread"
-
-require "bundler/errors"
-require "bundler/environment_preserver"
-require "bundler/plugin"
-require "bundler/rubygems_ext"
-require "bundler/rubygems_integration"
-require "bundler/version"
-require "bundler/constants"
-require "bundler/current_ruby"
-require "bundler/build_metadata"
-
-module Bundler
-  environment_preserver = EnvironmentPreserver.new(ENV, EnvironmentPreserver::BUNDLER_KEYS)
-  ORIGINAL_ENV = environment_preserver.restore
-  ENV.replace(environment_preserver.backup)
-  SUDO_MUTEX = Mutex.new
-
-  autoload :Definition,             "bundler/definition"
-  autoload :Dependency,             "bundler/dependency"
-  autoload :DepProxy,               "bundler/dep_proxy"
-  autoload :Deprecate,              "bundler/deprecate"
-  autoload :Dsl,                    "bundler/dsl"
-  autoload :EndpointSpecification,  "bundler/endpoint_specification"
-  autoload :Env,                    "bundler/env"
-  autoload :Fetcher,                "bundler/fetcher"
-  autoload :FeatureFlag,            "bundler/feature_flag"
-  autoload :GemHelper,              "bundler/gem_helper"
-  autoload :GemHelpers,             "bundler/gem_helpers"
-  autoload :GemRemoteFetcher,       "bundler/gem_remote_fetcher"
-  autoload :GemVersionPromoter,     "bundler/gem_version_promoter"
-  autoload :Graph,                  "bundler/graph"
-  autoload :Index,                  "bundler/index"
-  autoload :Injector,               "bundler/injector"
-  autoload :Installer,              "bundler/installer"
-  autoload :LazySpecification,      "bundler/lazy_specification"
-  autoload :LockfileParser,         "bundler/lockfile_parser"
-  autoload :MatchPlatform,          "bundler/match_platform"
-  autoload :ProcessLock,            "bundler/process_lock"
-  autoload :RemoteSpecification,    "bundler/remote_specification"
-  autoload :Resolver,               "bundler/resolver"
-  autoload :Retry,                  "bundler/retry"
-  autoload :RubyDsl,                "bundler/ruby_dsl"
-  autoload :RubyGemsGemInstaller,   "bundler/rubygems_gem_installer"
-  autoload :RubyVersion,            "bundler/ruby_version"
-  autoload :Runtime,                "bundler/runtime"
-  autoload :Settings,               "bundler/settings"
-  autoload :SharedHelpers,          "bundler/shared_helpers"
-  autoload :Source,                 "bundler/source"
-  autoload :SourceList,             "bundler/source_list"
-  autoload :SpecSet,                "bundler/spec_set"
-  autoload :StubSpecification,      "bundler/stub_specification"
-  autoload :UI,                     "bundler/ui"
-  autoload :URICredentialsFilter,   "bundler/uri_credentials_filter"
-  autoload :VersionRanges,          "bundler/version_ranges"
-
-  class << self
-    def configure
-      @configured ||= configure_gem_home_and_path
-    end
-
-    def ui
-      (defined?(@ui) && @ui) || (self.ui = UI::Silent.new)
-    end
-
-    def ui=(ui)
-      Bundler.rubygems.ui = ui ? UI::RGProxy.new(ui) : nil
-      @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
-
-    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
-
-    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"
-      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] unless feature_flag.deployment_means_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 ruby_scope
-      "#{Bundler.rubygems.ruby_engine}/#{Bundler.rubygems.config_map[: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
-          Kernel.send(:require, "etc")
-          user_home = tmp_home_path(Etc.getlogin, warning)
-          Bundler.ui.warn "#{warning}\nBundler will use `#{user_home}' as your home directory temporarily.\n"
-          user_home
-        else
-          Pathname.new(home)
-        end
-      end
-    end
-
-    def tmp_home_path(login, warning)
-      login ||= "unknown"
-      Kernel.send(:require, "tmpdir")
-      path = Pathname.new(Dir.tmpdir).join("bundler", "home")
-      SharedHelpers.filesystem_access(path) do |tmp_home_path|
-        unless tmp_home_path.exist?
-          tmp_home_path.mkpath
-          tmp_home_path.chmod(0o777)
-        end
-        tmp_home_path.join(login).tap(&:mkpath)
-      end
-    rescue RuntimeError => e
-      raise e.exception("#{warning}\nBundler also failed to create a temporary home directory at `#{path}':\n#{e}")
-    end
-
-    def user_bundle_path(dir = "home")
-      env_var, fallback = case dir
-                          when "home"
-                            ["BUNDLE_USER_HOME", Pathname.new(user_home).join(".bundle")]
-                          when "cache"
-                            ["BUNDLE_USER_CACHE", user_bundle_path.join("cache")]
-                          when "config"
-                            ["BUNDLE_USER_CONFIG", user_bundle_path.join("config")]
-                          when "plugin"
-                            ["BUNDLE_USER_PLUGIN", 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"]
-        Pathname.new(app_config).expand_path(root)
-      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 http://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 `original_env` instead
-    # @return [Hash] Environment with all bundler-related variables removed
-    def clean_env
-      Bundler::SharedHelpers.major_deprecation(2, "`Bundler.clean_env` has weird edge cases, use `.original_env` instead")
-      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")
-        env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
-      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
-
-    def with_original_env
-      with_env(original_env) { yield }
-    end
-
-    def with_clean_env
-      with_env(clean_env) { yield }
-    end
-
-    def clean_system(*args)
-      with_clean_env { Kernel.system(*args) }
-    end
-
-    def clean_exec(*args)
-      with_clean_env { Kernel.exec(*args) }
-    end
-
-    def local_platform
-      return Gem::Platform::RUBY if settings[:force_ruby_platform]
-      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 bindir foo`.
-      Bundler.settings[:system_bindir] || Bundler.rubygems.gem_bindir
-    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 install --path vendor/bundle
-
-        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_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
-
-  private
-
-    def eval_yaml_gemspec(path, contents)
-      Kernel.send(:require, "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}"
-
-      if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
-        msg += "\nDoes it try to require a relative path? That's been removed in Ruby 1.9"
-      end
-
-      raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents)
-    end
-
-    def configure_gem_home_and_path
-      configure_gem_path
-      configure_gem_home
-      bundle_path
-    end
-
-    def configure_gem_path(env = ENV)
-      blank_home = env["GEM_HOME"].nil? || env["GEM_HOME"].empty?
-      if !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.
-        env["GEM_PATH"] = ""
-      elsif blank_home
-        possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
-        paths = possibles.flatten.compact.uniq.reject(&:empty?)
-        env["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
-      end
-    end
-
-    def configure_gem_home
-      Bundler::SharedHelpers.set_env "GEM_HOME", File.expand_path(bundle_path, root)
-      Bundler.rubygems.clear_paths
-    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
deleted file mode 100644
index 6146f16cb6..0000000000
--- a/lib/bundler/build_metadata.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  # Represents metadata from when the Bundler gem was built.
-  module BuildMetadata
-    # begin ivars
-    @built_at = "2018-12-19".freeze
-    @git_commit_sha = "3fc4de72b".freeze
-    @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 @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
-
-      # If Bundler is a submodule in RubyGems, get the submodule commit
-      git_sub_dir = File.join(File.expand_path("../../../..", __FILE__), ".git")
-      if File.directory?(git_sub_dir)
-        return @git_commit_sha = Dir.chdir(git_sub_dir) do
-          `git ls-tree --abbrev=8 HEAD bundler`.split(/\s/).fetch(2, "").strip.freeze
-        end
-      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
deleted file mode 100644
index b229ab224d..0000000000
--- a/lib/bundler/bundler.gemspec
+++ /dev/null
@@ -1,64 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-begin
-  require File.expand_path("../lib/bundler/version", __FILE__)
-rescue LoadError
-  # for Ruby core repository
-  require File.expand_path("../version", __FILE__)
-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    = "http://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" => "http://github.com/bundler/bundler/issues",
-      "changelog_uri" => "https://github.com/bundler/bundler/blob/master/CHANGELOG.md",
-      "homepage_uri" => "https://bundler.io/",
-      "source_code_uri" => "http://github.com/bundler/bundler/",
-    }
-  end
-
-  if s.version >= Gem::Version.new("2.a".dup)
-    s.required_ruby_version     = ">= 2.3.0"
-    s.required_rubygems_version = ">= 2.5.0"
-  else
-    s.required_ruby_version     = ">= 1.8.7"
-    s.required_rubygems_version = ">= 1.3.6"
-  end
-
-  s.add_development_dependency "automatiek", "~> 0.1.0"
-  s.add_development_dependency "mustache",   "0.99.6"
-  s.add_development_dependency "rake",       "~> 10.0"
-  s.add_development_dependency "rdiscount",  "~> 2.2"
-  s.add_development_dependency "ronn",       "~> 0.7.3"
-  s.add_development_dependency "rspec",      "~> 3.6"
-
-  # base_dir = File.dirname(__FILE__).gsub(%r{([^A-Za-z0-9_\-.,:\/@\n])}, "\\\\\\1")
-  # s.files = IO.popen("git -C #{base_dir} ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) }
-
-  # we don't check in man pages, but we need to ship them because
-  # we use them to generate the long-form help for each command.
-  # s.files += Dir.glob("man/**/*")
-  # Include the CHANGELOG.md, LICENSE.md, README.md manually
-  # s.files += %w[CHANGELOG.md LICENSE.md README.md]
-  # include the gemspec itself because warbler breaks w/o it
-  s.files += %w[bundler.gemspec]
-
-  s.bindir        = "exe"
-  s.executables   = %w[bundle bundler]
-  s.require_paths = ["lib"]
-end
diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb
deleted file mode 100644
index 1b7145b72b..0000000000
--- a/lib/bundler/capistrano.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/shared_helpers"
-Bundler::SharedHelpers.major_deprecation 2,
-  "The Bundler task for Capistrano. Please use http://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 "bundler/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 http://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
deleted file mode 100644
index e658ffce72..0000000000
--- a/lib/bundler/cli.rb
+++ /dev/null
@@ -1,790 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler"
-require "bundler/vendored_thor"
-
-module Bundler
-  class CLI < Thor
-    require "bundler/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
-
-    def self.start(*)
-      super
-    rescue Exception => e
-      Bundler.ui = UI::Shell.new
-      raise e
-    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 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_paths!
-      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) }
-
-      if ENV["RUBYGEMS_GEMDEPS"] && !ENV["RUBYGEMS_GEMDEPS"].empty?
-        Bundler.ui.warn(
-          "The RUBYGEMS_GEMDEPS environment variable is set. This enables RubyGems' " \
-          "experimental Gemfile mode, which may conflict with Bundler and cause unexpected errors. " \
-          "To remove this warning, unset RUBYGEMS_GEMDEPS.", :wrap => true
-        )
-      end
-    end
-
-    def self.deprecated_option(*args, &blk)
-      return if Bundler.feature_flag.forget_cli_options?
-      method_option(*args, &blk)
-    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",
-                          Bundler.feature_flag.cache_command_is_package? ? "cache" : "package",
-                          "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", __FILE__)
-      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)
-        if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
-          Kernel.exec "man #{man_pages[command]}"
-        else
-          puts File.read("#{man_path}/#{File.basename(man_pages[command])}.txt")
-        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
-    deprecated_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
-    def init
-      require "bundler/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?}"
-    map "c" => "check"
-    def check
-      require "bundler/cli/check"
-      Check.new(options).run
-    end
-
-    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)
-      require "bundler/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
-    deprecated_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
-      "Generate bin stubs for bundled gems to ./bin"
-    deprecated_option "clean", :type => :boolean, :banner =>
-      "Run bundle clean automatically after install"
-    deprecated_option "deployment", :type => :boolean, :banner =>
-      "Install using defaults tuned for deployment environments"
-    deprecated_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"
-    deprecated_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."
-    deprecated_option "no-prune", :type => :boolean, :banner =>
-      "Don't remove stale gems from the cache."
-    deprecated_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"
-    method_option "quiet", :type => :boolean, :banner =>
-      "Only output warnings and errors."
-    deprecated_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"
-    deprecated_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("|")
-    deprecated_option "without", :type => :array, :banner =>
-      "Exclude gems that are part of the specified named group."
-    deprecated_option "with", :type => :array, :banner =>
-      "Include gems that are part of the specified named group."
-    map "i" => "install"
-    def install
-      SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
-      require "bundler/cli/install"
-      Bundler.settings.temporary(:no_install => false) do
-        Install.new(options.dup).run
-      end
-    end
-
-    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 "bundler/cli/update"
-      Update.new(options, gems).run
-    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)
-      if ARGV[0] == "show"
-        rest = ARGV[1..-1]
-
-        new_command = rest.find {|arg| !arg.start_with?("--") } ? "info" : "list"
-
-        new_arguments = rest.map do |arg|
-          next arg if arg != "--paths"
-          next "--path" if new_command == "info"
-        end
-
-        old_argv = ARGV.join(" ")
-        new_argv = [new_command, *new_arguments.compact].join(" ")
-
-        Bundler::SharedHelpers.major_deprecation(2, "use `bundle #{new_argv}` instead of `bundle #{old_argv}`")
-      end
-      require "bundler/cli/show"
-      Show.new(options, gem_name).run
-    end
-    # TODO: 2.0 remove `bundle show`
-
-    if Bundler.feature_flag.list_command?
-      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 => :string, :banner => "print gems from a particular group"
-      method_option "without-group", :type => :string, :banner => "print all gems expect from a group"
-      method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
-      def list
-        require "bundler/cli/list"
-        List.new(options).run
-      end
-
-      map %w[ls] => "list"
-    else
-      map %w[list] => "show"
-    end
-
-    desc "info GEM [OPTIONS]", "Show information for the given gem"
-    method_option "path", :type => :boolean, :banner => "Print full path to gem"
-    def info(gem_name)
-      require "bundler/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"
-    def binstubs(*gems)
-      require "bundler/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 "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 "bundler/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"
-    method_option "strict", :type => :boolean, :banner =>
-      "Only list newer versions allowed by your Gemfile requirements"
-    method_option "update-strict", :type => :boolean, :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 "bundler/cli/outdated"
-      Outdated.new(options, gems).run
-    end
-
-    if Bundler.feature_flag.cache_command_is_package?
-      map %w[cache] => :package
-    else
-      desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
-      unless Bundler.feature_flag.cache_command_is_package?
-        method_option "all", :type => :boolean,
-                             :banner => "Include all sources (including path and git)."
-      end
-      method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
-      method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
-      def cache
-        require "bundler/cli/cache"
-        Cache.new(options).run
-      end
-    end
-
-    desc "#{Bundler.feature_flag.cache_command_is_package? ? :cache : :package} [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
-    unless Bundler.feature_flag.cache_command_is_package?
-      method_option "all",  :type => :boolean,
-                            :banner => "Include all sources (including path and git)."
-    end
-    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 the package."
-    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"
-    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 package operation's install"
-    long_desc <<-D
-      The package 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 package
-      require "bundler/cli/package"
-      Package.new(options).run
-    end
-    map %w[pack] => :package
-
-    desc "exec [OPTIONS]", "Run the command in context of the bundle"
-    method_option :keep_file_descriptors, :type => :boolean, :default => false
-    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
-    map "e" => "exec"
-    def exec(*args)
-      require "bundler/cli/exec"
-      Exec.new(options, args).run
-    end
-
-    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 superceded by local configuration, this command
-      will show the current value, as well as any superceded values and
-      where they were specified.
-    D
-    method_option "parseable", :type => :boolean, :banner => "Use minimal formatting for more parseable output"
-    def config(*args)
-      require "bundler/cli/config"
-      Config.new(options, args, self).run
-    end
-
-    desc "open GEM", "Opens the source directory of the given bundled gem"
-    def open(name)
-      require "bundler/cli/open"
-      Open.new(options, name).run
-    end
-
-    if Bundler.feature_flag.console_command?
-      desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
-      def console(group = nil)
-        require "bundler/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 %w[-v --version] => :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
-
-    if Bundler.feature_flag.viz_command?
-      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 moved to the `bundle-viz` gem, see https://github.com/bundler/bundler-viz"
-        require "bundler/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 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 :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
-    method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec",
-                         :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
-    def gem(name)
-    end
-
-    commands["gem"].tap do |gem_command|
-      def gem_command.run(instance, args = [])
-        arity = 1 # name
-
-        require "bundler/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 "bundler/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 "bundler/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 "bundler/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 "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 "bundler/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 "bundler/cli/doctor"
-      Doctor.new(options).run
-    end
-
-    desc "issue", "Learn how to report an issue in Bundler"
-    def issue
-      require "bundler/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 "bundler/cli/pristine"
-      Pristine.new(gems).run
-    end
-
-    if Bundler.feature_flag.plugins?
-      require "bundler/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 = all_commands.keys
-      help_flags = %w[--help -h]
-      exec_commands = %w[e ex exe 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 }
-      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 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(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
-  end
-end
diff --git a/lib/bundler/cli/add.rb b/lib/bundler/cli/add.rb
deleted file mode 100644
index 9709e71be0..0000000000
--- a/lib/bundler/cli/add.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Add
-    def initialize(options, gems)
-      @gems = gems
-      @options = options
-      @options[:group] = @options[:group].split(",").map(&:strip) if !@options[:group].nil? && !@options[:group].empty?
-    end
-
-    def run
-      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 = @options[:version].nil? ? nil : @options[:version].split(",").map(&:strip)
-
-      unless version.nil?
-        version.each do |v|
-          raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN =~ v.to_s
-        end
-      end
-
-      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])
-
-      Installer.install(Bundler.root, Bundler.definition) unless @options["skip-install"]
-    end
-  end
-end
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb
deleted file mode 100644
index 266396eedc..0000000000
--- a/lib/bundler/cli/binstubs.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 }
-
-      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)
-          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
deleted file mode 100644
index 9d2ba87d34..0000000000
--- a/lib/bundler/cli/cache.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Cache
-    attr_reader :options
-    def initialize(options)
-      @options = options
-    end
-
-    def run
-      Bundler.definition.validate_runtime!
-      Bundler.definition.resolve_with_cache!
-      setup_cache_all
-      Bundler.settings.set_command_option_if_given :cache_all_platforms, options["all-platforms"]
-      Bundler.load.cache
-      Bundler.settings.set_command_option_if_given :no_prune, options["no-prune"]
-      Bundler.load.lock
-    rescue GemNotFound => e
-      Bundler.ui.error(e.message)
-      Bundler.ui.warn "Run `bundle install` to install missing gems."
-      exit 1
-    end
-
-  private
-
-    def setup_cache_all
-      Bundler.settings.set_command_option_if_given :cache_all, options[:all]
-
-      if Bundler.definition.has_local_dependencies? && !Bundler.feature_flag.cache_all?
-        Bundler.ui.warn "Your Gemfile contains path and git dependencies. If you want "    \
-          "to package them as well, please pass the --all flag. This will be the default " \
-          "on Bundler 2.0."
-      end
-    end
-  end
-end
diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
deleted file mode 100644
index 19c0aaea06..0000000000
--- a/lib/bundler/cli/check.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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]
-
-      begin
-        definition = Bundler.definition
-        definition.validate_runtime!
-        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
deleted file mode 100644
index 4a407fbae7..0000000000
--- a/lib/bundler/cli/clean.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
deleted file mode 100644
index 9d40ee9dfd..0000000000
--- a/lib/bundler/cli/common.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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_without_groups_message
-      return if Bundler.settings[:without].empty?
-      Bundler.ui.confirm without_groups_message
-    end
-
-    def self.without_groups_message
-      groups = Bundler.settings[:without]
-      group_list = [groups[0...-1].join(", "), groups[-1..-1]].
-        reject {|s| s.to_s.empty? }.join(" and ")
-      group_str = (groups.size == 1) ? "group" : "groups"
-      "Gems in the #{group_str} #{group_list} were not installed."
-    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
-        raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
-      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)
-      if !$stdout.tty? && ENV["BUNDLE_SPEC_RUN"].nil?
-        raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
-      end
-
-      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 "bundler/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)
-      locked_names = locked_gems.specs.map(&:name)
-      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)
-      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"]
-      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
deleted file mode 100644
index 12f71ea8fe..0000000000
--- a/lib/bundler/cli/config.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Config
-    attr_reader :name, :options, :scope, :thor
-    attr_accessor :args
-
-    def initialize(options, args, thor)
-      @options = options
-      @args = args
-      @thor = thor
-      @name = peek = args.shift
-      @scope = "global"
-      return unless peek && peek.start_with?("--")
-      @name = args.shift
-      @scope = peek[2..-1]
-    end
-
-    def run
-      unless name
-        confirm_all
-        return
-      end
-
-      unless valid_scope?(scope)
-        Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
-        exit 1
-      end
-
-      if scope == "delete"
-        Bundler.settings.set_local(name, nil)
-        Bundler.settings.set_global(name, nil)
-        return
-      end
-
-      if args.empty?
-        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
-
-  private
-
-    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(args.join(" "))
-      if name.start_with?("local.") && pathname.directory?
-        pathname.expand_path.to_s
-      else
-        args.join(" ")
-      end
-    end
-
-    def message
-      locations = Bundler.settings.locations(name)
-      if @options[:parseable]
-        "#{name}=#{new_value}" if new_value
-      elsif scope == "global"
-        if locations[:local]
-          "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] && locations[:global] != args.join(" ")
-          "You are replacing the current global value of #{name}, which is currently " \
-            "#{locations[:global].inspect}"
-        end
-      elsif scope == "local" && locations[:local] != args.join(" ")
-        "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 valid_scope?(scope)
-      %w[delete local global].include?(scope)
-    end
-  end
-end
diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
deleted file mode 100644
index 853eca8358..0000000000
--- a/lib/bundler/cli/console.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
deleted file mode 100644
index 3e0898ff8a..0000000000
--- a/lib/bundler/cli/doctor.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-
-require "rbconfig"
-
-module Bundler
-  class CLI::Doctor
-    DARWIN_REGEX = /\s+(.+) \(compatibility /
-    LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/
-
-    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}"`.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}"`.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 "bundler/cli/check"
-      Bundler::CLI::Check.new({}).run
-    end
-
-    def run
-      Bundler.ui.level = "error" 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 = []
-      Find.find(Bundler.home.to_s).each do |f|
-        if !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 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
deleted file mode 100644
index c29d632307..0000000000
--- a/lib/bundler/cli/exec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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
-
-      if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby?
-        @args << { :close_others => !options.keep_file_descriptors? }
-      elsif options.keep_file_descriptors?
-        Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
-      end
-    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
-        # First, try to exec directly to something in PATH
-        if Bundler.current_ruby.jruby_18?
-          kernel_exec(bin_path, *args)
-        else
-          kernel_exec([bin_path, cmd], *args)
-        end
-      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)
-      ui = Bundler.ui
-      Bundler.ui = nil
-      Kernel.exec(*args)
-    rescue Errno::EACCES, Errno::ENOEXEC
-      Bundler.ui = ui
-      Bundler.ui.error "bundler: not executable: #{cmd}"
-      exit 126
-    rescue Errno::ENOENT
-      Bundler.ui = ui
-      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)
-      ui = Bundler.ui
-      Bundler.ui = nil
-      require "bundler/setup"
-      TRAPPED_SIGNALS.each {|s| trap(s, "DEFAULT") }
-      Kernel.load(file)
-    rescue SystemExit, SignalException
-      raise
-    rescue Exception => e # rubocop:disable Lint/RescueException
-      Bundler.ui = ui
-      Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})"
-      backtrace = e.backtrace ? e.backtrace.take_while {|bt| !bt.start_with?(__FILE__) } : []
-      abort "#{e.class}: #{e.message}\n  #{backtrace.join("\n  ")}"
-    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/gem.rb b/lib/bundler/cli/gem.rb
deleted file mode 100644
index 58e2f8a3fd..0000000000
--- a/lib/bundler/cli/gem.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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"
-    }.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("::")
-
-      git_installed = Bundler.git_present?
-
-      git_author_name = git_installed ? `git config user.name`.chomp : ""
-      github_username = git_installed ? `git config github.user`.chomp : ""
-      git_user_email = git_installed ? `git config user.email`.chomp : ""
-
-      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,
-        :github_username  => github_username.empty? ? "[USERNAME]" : github_username
-      }
-      ensure_safe_gem_name(name, constant_array)
-
-      templates = {
-        "Gemfile.tt" => "Gemfile",
-        "lib/newgem.rb.tt" => "lib/#{namespaced_path}.rb",
-        "lib/newgem/version.rb.tt" => "lib/#{namespaced_path}/version.rb",
-        "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 Bundler.git_present?
-
-      if test_framework = ask_and_set_test_framework
-        config[:test] = test_framework
-        config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
-
-        templates.merge!("travis.yml.tt" => ".travis.yml")
-
-        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"
-          )
-        when "minitest"
-          templates.merge!(
-            "test/test_helper.rb.tt" => "test/test_helper.rb",
-            "test/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
-          )
-        end
-      end
-
-      config[:test_task] = config[:test] == "minitest" ? "test" : "spec"
-
-      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
-
-      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
-
-      templates.each do |src, dst|
-        destination = target.join(dst)
-        SharedHelpers.filesystem_access(destination) do
-          thor.template("newgem/#{src}", destination, config)
-        end
-      end
-
-      executables.each do |file|
-        SharedHelpers.filesystem_access(target.join(file)) do |path|
-          executable = (path.stat.mode | 0o111)
-          path.chmod(executable)
-        end
-      end
-
-      if Bundler.git_present?
-        Bundler.ui.info "Initializing git repo in #{target}"
-        Dir.chdir(target) do
-          `git init`
-          `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"
-    rescue Errno::EEXIST => e
-      raise GenericSystemCallError.new(e, "There was a conflict while creating the new gem.")
-    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" \
-                       "http://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.nil?
-        Bundler.ui.confirm "Do you want to generate tests with your gem?"
-        result = Bundler.ui.ask "Type 'rspec' or 'minitest' to generate those test files now and " \
-          "in the future. rspec/minitest/(none):"
-        if result =~ /rspec|minitest/
-          test_framework = result
-        else
-          test_framework = false
-        end
-      end
-
-      if Bundler.settings["gem.test"].nil?
-        Bundler.settings.set_global("gem.test", test_framework)
-      end
-
-      test_framework
-    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
-  end
-end
diff --git a/lib/bundler/cli/info.rb b/lib/bundler/cli/info.rb
deleted file mode 100644
index 958b525067..0000000000
--- a/lib/bundler/cli/info.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-      spec = spec_for_gem(gem_name)
-
-      spec_not_found(gem_name) unless spec
-      return print_gem_path(spec) if @options[:path]
-      print_gem_info(spec)
-    end
-
-  private
-
-    def spec_for_gem(gem_name)
-      spec = Bundler.definition.specs.find {|s| s.name == gem_name }
-      spec || default_gem_spec(gem_name)
-    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_path(spec)
-      Bundler.ui.info spec.full_gem_path
-    end
-
-    def print_gem_info(spec)
-      gem_info = String.new
-      gem_info << "  * #{spec.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 << "\tPath: #{spec.full_gem_path}\n"
-      gem_info << "\tDefault Gem: yes" if spec.respond_to?(:default_gem?) && spec.default_gem?
-      Bundler.ui.info gem_info
-    end
-  end
-end
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
deleted file mode 100644
index 40df797269..0000000000
--- a/lib/bundler/cli/init.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile"
-    end
-  end
-end
diff --git a/lib/bundler/cli/inject.rb b/lib/bundler/cli/inject.rb
deleted file mode 100644
index b00675d348..0000000000
--- a/lib/bundler/cli/inject.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
deleted file mode 100644
index b40e5f0e9e..0000000000
--- a/lib/bundler/cli/install.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Install
-    attr_reader :options
-    def initialize(options)
-      @options = options
-    end
-
-    def run
-      Bundler.ui.level = "error" if options[:quiet]
-
-      warn_if_root
-
-      normalize_groups
-
-      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?
-
-        if Bundler.feature_flag.deployment_means_frozen?
-          Bundler.settings.set_command_option :deployment, true
-        else
-          Bundler.settings.set_command_option :frozen, true
-        end
-      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`"
-      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.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
-
-      Bundler.ui.confirm "Bundle complete! #{dependencies_count_for(definition)}, #{gems_installed_for(definition)}."
-      Bundler::CLI::Common.output_without_groups_message
-
-      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 "bundler/cli/clean"
-        Bundler::CLI::Clean.new(options).run
-      end
-    rescue GemNotFound, VersionConflict => e
-      if options[:local] && Bundler.app_cache.exist?
-        Bundler.ui.warn "Some gems seem to be missing from your #{Bundler.settings.app_cache_path} directory."
-      end
-
-      unless Bundler.definition.has_rubygems_remotes?
-        Bundler.ui.warn <<-WARN, :wrap => true
-          Your Gemfile has no gem server sources. If you need gems that are \
-          not already on your machine, add a line like this to your Gemfile:
-          source 'https://rubygems.org'
-        WARN
-      end
-      raise e
-    rescue Gem::InvalidSpecificationException => e
-      Bundler.ui.warn "You have one or more invalid gemspecs that need to be fixed."
-      raise e
-    end
-
-  private
-
-    def warn_if_root
-      return if Bundler.settings[:silence_root_warning] || Bundler::WINDOWS || !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
-    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 options[:deployment]
-      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"]
-
-      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
-
-      options[:force] = options[:redownload]
-    end
-
-    def warn_ambiguous_gems
-      Installer.ambiguous_gems.to_a.each do |name, installed_from_uri, *also_found_in_uris|
-        Bundler.ui.error "Warning: the gem '#{name}' was found in multiple sources."
-        Bundler.ui.error "Installed from: #{installed_from_uri}"
-        Bundler.ui.error "Also found in:"
-        also_found_in_uris.each {|uri| Bundler.ui.error "  * #{uri}" }
-        Bundler.ui.error "You should add a source requirement to restrict this gem to your preferred source."
-        Bundler.ui.error "For example:"
-        Bundler.ui.error "    gem '#{name}', :source => '#{installed_from_uri}'"
-        Bundler.ui.error "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
deleted file mode 100644
index 91f827ea99..0000000000
--- a/lib/bundler/cli/issue.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/bundler/bundler/blob/master/doc/TROUBLESHOOTING.md
-
-        2. Instructions for common Bundler uses can be found on the documentation
-        site: http://bundler.io/
-
-        3. Information about each Bundler command can be found in the Bundler
-        man pages: http://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. Please
-        view the Filing Issues guide for more information:
-        https://github.com/bundler/bundler/blob/master/doc/contributing/ISSUES.md
-
-      EOS
-
-      Bundler.ui.info Bundler::Env.report
-
-      Bundler.ui.info "\n## Bundle Doctor"
-      doctor
-    end
-
-    def doctor
-      require "bundler/cli/doctor"
-      Bundler::CLI::Doctor.new({}).run
-    end
-  end
-end
diff --git a/lib/bundler/cli/list.rb b/lib/bundler/cli/list.rb
deleted file mode 100644
index d1799196e7..0000000000
--- a/lib/bundler/cli/list.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::List
-    def initialize(options)
-      @options = options
-    end
-
-    def run
-      raise InvalidOption, "The `--only-group` and `--without-group` options cannot be used together" if @options["only-group"] && @options["without-group"]
-
-      raise InvalidOption, "The `--name-only` and `--paths` options cannot be used together" if @options["name-only"] && @options[:paths]
-
-      specs = if @options["only-group"] || @options["without-group"]
-        filtered_specs_by_groups
-      else
-        Bundler.load.specs
-      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)
-      raise InvalidOption, "`#{@options["without-group"]}` group could not be found." if @options["without-group"] && !groups.include?(@options["without-group"].to_sym)
-
-      raise InvalidOption, "`#{@options["only-group"]}` group could not be found." if @options["only-group"] && !groups.include?(@options["only-group"].to_sym)
-    end
-
-    def filtered_specs_by_groups
-      definition = Bundler.definition
-      groups = definition.groups
-
-      verify_group_exists(groups)
-
-      show_groups =
-        if @options["without-group"]
-          groups.reject {|g| g == @options["without-group"].to_sym }
-        elsif @options["only-group"]
-          groups.select {|g| g == @options["only-group"].to_sym }
-        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
deleted file mode 100644
index 7dd078b1ef..0000000000
--- a/lib/bundler/cli/lock.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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]
-      if update.is_a?(Array) # unlocking specific gems
-        Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
-        update = { :gems => update, :lock_shared_dependencies => options[: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
deleted file mode 100644
index 552fe6f128..0000000000
--- a/lib/bundler/cli/open.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "shellwords"
-
-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)
-      path = spec.full_gem_path
-      Dir.chdir(path) do
-        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
diff --git a/lib/bundler/cli/outdated.rb b/lib/bundler/cli/outdated.rb
deleted file mode 100644
index 2ca90293db..0000000000
--- a/lib/bundler/cli/outdated.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Outdated
-    attr_reader :options, :gems
-
-    def initialize(options, gems)
-      @options = options
-      @gems = gems
-    end
-
-    def run
-      check_for_deployment_mode
-
-      sources = Array(options[:source])
-
-      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.each do |dep|
-          current_dependencies[dep.name] = dep
-        end
-      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
-      )
-
-      # the patch level options imply strict is also true. It wouldn't make
-      # sense otherwise.
-      strict = options[:strict] ||
-        Bundler::CLI::Common.patch_level_options(options).any?
-
-      filter_options_patch = options.keys &
-        %w[filter-major filter-minor filter-patch]
-
-      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 ""
-      outdated_gems_by_groups = {}
-      outdated_gems_list = []
-
-      # 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).each do |current_spec|
-        next if !gems.empty? && !gems.include?(current_spec.name)
-
-        dependency = current_dependencies[current_spec.name]
-        active_spec = retrieve_active_spec(strict, definition, current_spec)
-
-        next if active_spec.nil?
-        if filter_options_patch.any?
-          update_present = update_present_via_semver_portions(current_spec, active_spec, options)
-          next unless update_present
-        end
-
-        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)
-        groups = nil
-        if dependency && !options[:parseable]
-          groups = dependency.groups.join(", ")
-        end
-
-        outdated_gems_list << { :active_spec => active_spec,
-                                :current_spec => current_spec,
-                                :dependency => dependency,
-                                :groups => groups }
-
-        outdated_gems_by_groups[groups] ||= []
-        outdated_gems_by_groups[groups] << { :active_spec => active_spec,
-                                             :current_spec => current_spec,
-                                             :dependency => dependency,
-                                             :groups => groups }
-      end
-
-      if outdated_gems_list.empty?
-        display_nothing_outdated_message(filter_options_patch)
-      else
-        unless options[:parseable]
-          if options[:pre]
-            Bundler.ui.info "Outdated gems included in the bundle (including " \
-              "pre-releases):"
-          else
-            Bundler.ui.info "Outdated gems included in the bundle:"
-          end
-        end
-
-        options_include_groups = [:group, :groups].select do |v|
-          options.keys.include?(v.to_s)
-        end
-
-        if options_include_groups.any?
-          ordered_groups = outdated_gems_by_groups.keys.compact.sort
-          [nil, ordered_groups].flatten.each do |groups|
-            gems = outdated_gems_by_groups[groups]
-            contains_group = if groups
-              groups.split(",").include?(options[:group])
-            else
-              options[:group] == "group"
-            end
-
-            next if (!options[:groups] && !contains_group) || gems.nil?
-
-            unless options[:parseable]
-              if groups
-                Bundler.ui.info "===== Group #{groups} ====="
-              else
-                Bundler.ui.info "===== Without group ====="
-              end
-            end
-
-            gems.each do |gem|
-              print_gem(
-                gem[:current_spec],
-                gem[:active_spec],
-                gem[:dependency],
-                groups,
-                options_include_groups.any?
-              )
-            end
-          end
-        else
-          outdated_gems_list.each do |gem|
-            print_gem(
-              gem[:current_spec],
-              gem[:active_spec],
-              gem[:dependency],
-              gem[:groups],
-              options_include_groups.any?
-            )
-          end
-        end
-
-        exit 1
-      end
-    end
-
-  private
-
-    def retrieve_active_spec(strict, definition, current_spec)
-      if strict
-        active_spec = definition.find_resolved_spec(current_spec)
-      else
-        active_specs = definition.find_indexed_specs(current_spec)
-        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_spec = active_specs.last
-      end
-
-      active_spec
-    end
-
-    def display_nothing_outdated_message(filter_options_patch)
-      unless options[:parseable]
-        if filter_options_patch.any?
-          display = filter_options_patch.map do |o|
-            o.sub("filter-", "")
-          end.join(" or ")
-
-          Bundler.ui.info "No #{display} updates to display.\n"
-        else
-          Bundler.ui.info "Bundle up to date!\n"
-        end
-      end
-    end
-
-    def print_gem(current_spec, active_spec, dependency, groups, options_include_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
-        "  * #{spec_outdated_info}"
-      else
-        "  * #{spec_outdated_info} in groups \"#{groups}\""
-      end
-
-      Bundler.ui.info output_message.rstrip
-    end
-
-    def check_for_deployment_mode
-      return unless Bundler.frozen_bundle?
-      suggested_command = if Bundler.settings.locations("frozen")[:global]
-        "bundle config --delete frozen"
-      elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any?
-        "bundle config --delete deployment"
-      else
-        "bundle install --no-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.nil? ? 0 : (version_section.first || 0)
-    end
-  end
-end
diff --git a/lib/bundler/cli/package.rb b/lib/bundler/cli/package.rb
deleted file mode 100644
index 2dcd0e1e29..0000000000
--- a/lib/bundler/cli/package.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CLI::Package
-    attr_reader :options
-
-    def initialize(options)
-      @options = options
-    end
-
-    def run
-      Bundler.ui.level = "error" if options[:quiet]
-      Bundler.settings.set_command_option_if_given :path, options[:path]
-      Bundler.settings.set_command_option_if_given :cache_all_platforms, options["all-platforms"]
-      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.load.cache(custom_path)
-    end
-
-  private
-
-    def install
-      require "bundler/cli/install"
-      options = self.options.dup
-      if Bundler.settings[:cache_all_platforms]
-        options["local"] = false
-        options["update"] = true
-      end
-      Bundler::CLI::Install.new(options).run
-    end
-
-    def setup_cache_all
-      all = options.fetch(:all, Bundler.feature_flag.cache_command_is_package? || nil)
-
-      Bundler.settings.set_command_option_if_given :cache_all, all
-
-      if Bundler.definition.has_local_dependencies? && !Bundler.feature_flag.cache_all?
-        Bundler.ui.warn "Your Gemfile contains path and git dependencies. If you want "    \
-          "to package them as well, please pass the --all flag. This will be the default " \
-          "on Bundler 2.0."
-      end
-    end
-  end
-end
diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb
deleted file mode 100644
index e97cad49a4..0000000000
--- a/lib/bundler/cli/platform.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 5488a9f28d..0000000000
--- a/lib/bundler/cli/plugin.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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 option). 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 "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
-  end
-end
diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb
deleted file mode 100644
index 4a411a83fc..0000000000
--- a/lib/bundler/cli/pristine.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-          source.remote!
-          if extension_cache_path = source.extension_cache_path(spec)
-            FileUtils.rm_rf extension_cache_path
-          end
-          FileUtils.rm_rf spec.extension_dir if spec.respond_to?(: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
deleted file mode 100644
index cd6a2cec28..0000000000
--- a/lib/bundler/cli/remove.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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) if @options["install"]
-    end
-  end
-end
diff --git a/lib/bundler/cli/show.rb b/lib/bundler/cli/show.rb
deleted file mode 100644
index 61756801b2..0000000000
--- a/lib/bundler/cli/show.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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)
-            Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
-          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
deleted file mode 100644
index b088853768..0000000000
--- a/lib/bundler/cli/update.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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 = "error" 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 2, "Pass --all to `bundle update` to update everything"
-      elsif !full_update && options[:all]
-        raise InvalidOption, "Cannot specify --all along with specific options."
-      end
-
-      if full_update
-        # We're doing a full update
-        Bundler.definition(true)
-      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],
-                           :lock_shared_dependencies => options[: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!
-      installer = Installer.install Bundler.root, Bundler.definition, opts
-      Bundler.load.cache if Bundler.app_cache.exist?
-
-      if CLI::Common.clean_after_install?
-        require "bundler/cli/clean"
-        Bundler::CLI::Clean.new(options).run
-      end
-
-      if locked_gems = Bundler.definition.locked_gems
-        gems.each do |name|
-          locked_version = locked_gems.specs.find {|s| s.name == name }
-          locked_version &&= locked_version.version
-          next unless locked_version
-          new_version = Bundler.definition.specs[name].first
-          new_version &&= new_version.version
-          if !new_version
-            Bundler.ui.warn "Bundler attempted to update #{name} but it was removed from the bundle"
-          elsif 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
-      Bundler::CLI::Common.output_post_install_messages installer.post_install_messages
-    end
-  end
-end
diff --git a/lib/bundler/cli/viz.rb b/lib/bundler/cli/viz.rb
deleted file mode 100644
index 644f9b25cf..0000000000
--- a/lib/bundler/cli/viz.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
deleted file mode 100644
index 6c241ca07a..0000000000
--- a/lib/bundler/compact_index_client.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "set"
-
-module Bundler
-  class CompactIndexClient
-    DEBUG_MUTEX = Mutex.new
-    def self.debug
-      return unless ENV["DEBUG_COMPACT_INDEX"]
-      DEBUG_MUTEX.synchronize { warn("[#{self}] #{yield}") }
-    end
-
-    class Error < StandardError; end
-
-    require "bundler/compact_index_client/cache"
-    require "bundler/compact_index_client/updater"
-
-    attr_reader :directory
-
-    # @return [Lambda] A lambda that takes an array of inputs and a block, and
-    #         maps the inputs with the block in parallel.
-    #
-    attr_accessor :in_parallel
-
-    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 = Mutex.new
-      @in_parallel = 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})" }
-      in_parallel.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
deleted file mode 100644
index f6105d3bb3..0000000000
--- a/lib/bundler/compact_index_client/cache.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-
-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(string)
-        version_and_platform, rest = string.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 {|r| parse_dependency(r) } : []
-        [version, platform, dependencies, requirements]
-      end
-
-      def parse_dependency(string)
-        dependency = string.split(":")
-        dependency[-1] = dependency[-1].split("&") if dependency.size > 1
-        dependency
-      end
-
-      def info_roots
-        [
-          directory.join("info"),
-          directory.join("info-special-characters"),
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/bundler/compact_index_client/updater.rb b/lib/bundler/compact_index_client/updater.rb
deleted file mode 100644
index 4d6eb80044..0000000000
--- a/lib/bundler/compact_index_client/updater.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_fileutils"
-require "stringio"
-require "zlib"
-
-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 "tmpdir"
-      end
-
-      def update(local_path, remote_path, retrying = nil)
-        headers = {}
-
-        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
-          else
-            # Fastly ignores Range when Accept-Encoding: gzip is set
-            headers["Accept-Encoding"] = "gzip"
-          end
-
-          response = @fetcher.call(remote_path, headers)
-          return nil if response.is_a?(Net::HTTPNotModified)
-
-          content = response.body
-          if response["Content-Encoding"] == "gzip"
-            content = Zlib::GzipReader.new(StringIO.new(content)).read
-          end
-
-          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) }
-            else
-              local_temp_path.open("w") {|f| f << content }
-            end
-          end
-
-          response_etag = (response["ETag"] || "").gsub(%r{\AW/}, "")
-          if etag_for(local_temp_path) == response_etag
-            SharedHelpers.filesystem_access(local_path) do
-              FileUtils.mv(local_temp_path, local_path)
-            end
-            return nil
-          end
-
-          if retrying
-            raise MisMatchedChecksumError.new(remote_path, response_etag, etag_for(local_temp_path))
-          end
-
-          update(local_path, remote_path, :retrying)
-        end
-      rescue Errno::EACCES
-        raise Bundler::PermissionError,
-          "Bundler does not have write access to create a temp directory " \
-          "within #{Dir.tmpdir}. Bundler must have write access to your " \
-          "systems temp directory to function properly. "
-      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)
-        if body.respond_to?(:byteslice)
-          body.byteslice(range)
-        else # pre-1.9.3
-          body.unpack("@#{range.first}a#{range.end + 1}").first
-        end
-      end
-
-      def checksum_for_file(path)
-        return nil unless path.file?
-        # This must use IO.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(IO.read(path))
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/compatibility_guard.rb b/lib/bundler/compatibility_guard.rb
deleted file mode 100644
index 750a1db04f..0000000000
--- a/lib/bundler/compatibility_guard.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-
-require "rubygems"
-require "bundler/version"
-
-if Bundler::VERSION.split(".").first.to_i >= 2
-  if Gem::Version.new(Object::RUBY_VERSION.dup) < Gem::Version.new("2.3")
-    abort "Bundler 2 requires Ruby 2.3 or later. Either install bundler 1 or update to a supported Ruby version."
-  end
-
-  if Gem::Version.new(Gem::VERSION.dup) < Gem::Version.new("2.5")
-    abort "Bundler 2 requires RubyGems 2.5 or later. Either install bundler 1 or update to a supported RubyGems version."
-  end
-end
diff --git a/lib/bundler/constants.rb b/lib/bundler/constants.rb
deleted file mode 100644
index 2e4ebb37ee..0000000000
--- a/lib/bundler/constants.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index d5efaad6c5..0000000000
--- a/lib/bundler/current_ruby.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-    ].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?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" ||
-          RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
-    end
-
-    def mri?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
-    end
-
-    def rbx?
-      ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-    end
-
-    def jruby?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-    end
-
-    def maglev?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
-    end
-
-    def truffleruby?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == "truffleruby"
-    end
-
-    def mswin?
-      Bundler::WINDOWS
-    end
-
-    def mswin64?
-      Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
-    end
-
-    def mingw?
-      Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
-    end
-
-    def x64_mingw?
-      Bundler::WINDOWS && 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
deleted file mode 100644
index 8e56d4a9bc..0000000000
--- a/lib/bundler/definition.rb
+++ /dev/null
@@ -1,993 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/lockfile_parser"
-require "set"
-
-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
-        unlock = unlock.dup
-        @unlocking_bundler = unlock.delete(:bundler)
-        unlock.delete_if {|_k, v| Array(v).empty? }
-        @unlocking = !unlock.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
-      @locked_specs_incomplete_for_platform = false
-
-      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
-
-      @unlock[:gems] ||= []
-      @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 Bundler.frozen_bundle?
-
-      converge_path_sources_to_gemspec_sources
-      @path_changes = converge_paths
-      @source_changes = converge_sources
-
-      unless @unlock[:lock_shared_dependencies]
-        eager_unlock = expand_dependencies(@unlock[:gems], true)
-        @unlock[:gems] = @locked_specs.for(eager_unlock, [], false, false, false).map(&:name)
-      end
-
-      @dependency_changes = converge_dependencies
-      @local_changes = converge_locals
-
-      @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_with_cache!
-      raise "Specs already loaded" if @specs
-      sources.cached!
-      specs
-    end
-
-    def resolve_remotely!
-      raise "Specs already loaded" if @specs
-      @remote = true
-      sources.remote!
-      specs
-    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 ||= begin
-        begin
-          specs = resolve.materialize(Bundler.settings[:cache_all_platforms] ? dependencies : requested_dependencies)
-        rescue GemNotFound => e # Handle yanked gem
-          gem_name, gem_version = extract_gem_info(e)
-          locked_gem = @locked_specs[gem_name].last
-          raise if locked_gem.nil? || locked_gem.version.to_s != gem_version || !@remote
-          raise GemNotFound, "Your bundle is locked to #{locked_gem}, but that version could not " \
-                             "be found in any of the sources listed in your Gemfile. If you haven't changed sources, " \
-                             "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
-        unless specs["bundler"].any?
-          bundler = sources.metadata_source.specs.search(Gem::Dependency.new("bundler", VERSION)).last
-          specs["bundler"] = bundler
-        end
-
-        specs
-      end
-    end
-
-    def new_specs
-      specs - @locked_specs
-    end
-
-    def removed_specs
-      @locked_specs - specs
-    end
-
-    def new_platform?
-      @new_platform
-    end
-
-    def missing_specs
-      missing = []
-      resolve.materialize(requested_dependencies, missing)
-      missing
-    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
-      @index = nil
-      @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
-      @requested_specs ||= begin
-        groups = requested_groups
-        groups.map!(&:to_sym)
-        specs_for(groups)
-      end
-    end
-
-    def current_dependencies
-      dependencies.select(&:should_include?)
-    end
-
-    def specs_for(groups)
-      deps = dependencies.select {|d| (d.groups & groups).any? }
-      deps.delete_if {|d| !d.should_include? }
-      specs.for(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
-        resolve =
-          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}")
-            last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms)
-          end
-
-        # filter out gems that _can_ be installed on multiple platforms, but don't need
-        # to be
-        resolve.for(expand_dependencies(dependencies, true), [], false, false, false)
-      end
-    end
-
-    def index
-      @index ||= Index.build do |idx|
-        dependency_names = @dependencies.map(&:name)
-
-        sources.all_sources.each do |source|
-          source.dependency_names = dependency_names - 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 = pinned_spec_names
-      loop do
-        idxcount = idx.size
-
-        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
-
-        break if idxcount == idx.size
-      end
-    end
-    private :double_check_for_index
-
-    def has_rubygems_remotes?
-      sources.rubygems_sources.any? {|s| s.remotes.any? }
-    end
-
-    def has_local_dependencies?
-      !sources.path_sources.empty? || !sources.git_sources.empty?
-    end
-
-    def spec_git_paths
-      sources.git_sources.map {|s| s.path.to_s }
-    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 "bundler/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")[:global]
-          "bundle config --delete frozen"
-        elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any?
-          "bundle config --delete deployment"
-        else
-          "bundle install --no-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}" }
-
-      gemfile_sources = sources.lock_sources
-
-      new_sources = gemfile_sources - @locked_sources
-      deleted_sources = @locked_sources - gemfile_sources
-
-      new_deps = @dependencies - @locked_deps.values
-      deleted_deps = @locked_deps.values - @dependencies
-
-      # Check if it is possible that the source is only changed thing
-      if (new_deps.empty? && deleted_deps.empty?) && (!new_sources.empty? && !deleted_sources.empty?)
-        new_sources.reject! {|source| (source.path? && source.path.exist?) || equivalent_rubygems_remotes?(source) }
-        deleted_sources.reject! {|source| (source.path? && source.path.exist?) || equivalent_rubygems_remotes?(source) }
-      end
-
-      if @locked_sources != gemfile_sources
-        if new_sources.any?
-          added.concat new_sources.map {|source| "* source: #{source}" }
-        end
-
-        if deleted_sources.any?
-          deleted.concat deleted_sources.map {|source| "* source: #{source}" }
-        end
-      end
-
-      added.concat new_deps.map {|d| "* #{pretty_dep(d)}" } if new_deps.any?
-      if deleted_deps.any?
-        deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" }
-      end
-
-      both_sources = Hash.new {|h, k| h[k] = [] }
-      @dependencies.each {|d| both_sources[d.name][0] = d }
-      @locked_deps.each  {|name, d| both_sources[name][1] = d.source }
-
-      both_sources.each do |name, (dep, lock_source)|
-        next unless (dep.nil? && !lock_source.nil?) || (!dep.nil? && !lock_source.nil? && !lock_source.can_lock?(dep))
-        gemfile_source_name = (dep && dep.source) || "no specified source"
-        lockfile_source_name = lock_source || "no specified source"
-        changed << "* #{name} from `#{gemfile_source_name}` to `#{lockfile_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 @platforms.any? do |bundle_platform|
-        Bundler.rubygems.platforms.any? do |local_platform|
-          MatchPlatform.platforms_match?(bundle_platform, local_platform)
-        end
-      end
-
-      raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \
-        "but your local platforms are #{Bundler.rubygems.platforms.map(&:to_s)}, and " \
-        "there's no compatible match between those two lists."
-    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 add_current_platform
-      current_platform = Bundler.local_platform
-      add_platform(current_platform) if Bundler.feature_flag.specific_platform?
-      add_platform(generic(current_platform))
-    end
-
-    def find_resolved_spec(current_spec)
-      specs.find_by_name_and_platform(current_spec.name, current_spec.platform)
-    end
-
-    def find_indexed_specs(current_spec)
-      index[current_spec.name].select {|spec| spec.match_platform(current_spec.platform) }.sort_by(&:version)
-    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 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_deps.values.select {|dep| dep.source == locked_source }
-
-      Set.new(deps_for_source) != Set.new(locked_deps_for_source)
-    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_rubygems_sources
-      return false if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-
-      changes = false
-
-      # Get the RubyGems sources from the Gemfile.lock
-      locked_gem_sources = @locked_sources.select {|s| s.is_a?(Source::Rubygems) }
-      # Get the RubyGems remotes from the Gemfile
-      actual_remotes = sources.rubygems_remotes
-
-      # If there is a RubyGems source in both
-      if !locked_gem_sources.empty? && !actual_remotes.empty?
-        locked_gem_sources.each do |locked_gem|
-          # Merge the remotes from the Gemfile into the Gemfile.lock
-          changes |= locked_gem.replace_remotes(actual_remotes, Bundler.settings[:allow_deployment_source_credential_changes])
-        end
-      end
-
-      changes
-    end
-
-    def converge_sources
-      changes = false
-
-      changes |= converge_rubygems_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
-      frozen = Bundler.frozen_bundle?
-      (@dependencies + @locked_deps.values).each do |dep|
-        locked_source = @locked_deps[dep.name]
-        # This is to make sure that if bundler is installing in deployment mode and
-        # after locked_source and sources don't match, we still use locked_source.
-        if frozen && !locked_source.nil? &&
-            locked_source.respond_to?(:source) && locked_source.source.instance_of?(Source::Path) && locked_source.source.path.exist?
-          dep.source = locked_source.source
-        elsif dep.source
-          dep.source = sources.get(dep.source)
-        end
-        if dep.source.is_a?(Source::Gemspec)
-          dep.platforms.concat(@platforms.map {|p| Dependency::REVERSE_PLATFORM_MAP[p] }.flatten(1)).uniq!
-        end
-      end
-
-      changes = false
-      # We want to know if all match, but don't want to check all entries
-      # This means we need to return false if any dependency doesn't match
-      # the lock or doesn't exist in the lock.
-      @dependencies.each do |dependency|
-        unless locked_dep = @locked_deps[dependency.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, dependency.type)
-
-        # We already know the name matches from the hash lookup
-        # so we only need to check the requirement now
-        changes ||= dependency.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
-      deps = []
-
-      # Build a list of dependencies that are the same in the Gemfile
-      # and Gemfile.lock. If the Gemfile modified a dependency, but
-      # the gem in the Gemfile.lock still satisfies it, this is fine
-      # too.
-      @dependencies.each do |dep|
-        locked_dep = @locked_deps[dep.name]
-
-        # If the locked_dep doesn't match the dependency we're looking for then we ignore the locked_dep
-        locked_dep = nil unless locked_dep == dep
-
-        if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
-          deps << dep
-        elsif dep.source.is_a?(Source::Path) && dep.current_platform? && (!locked_dep || dep.source != locked_dep.source)
-          @locked_specs.each do |s|
-            @unlock[:gems] << s.name if s.source == dep.source
-          end
-
-          dep.source.unlock! if dep.source.respond_to?(:unlock!)
-          dep.source.specs.each {|s| @unlock[:gems] << s.name }
-        end
-      end
-
-      unlock_source_unlocks_spec = Bundler.feature_flag.unlock_source_unlocks_spec?
-
-      converged = []
-      @locked_specs.each do |s|
-        # Replace the locked dependency's source with the equivalent source from the Gemfile
-        dep = @dependencies.find {|d| s.satisfies?(d) }
-        s.source = (dep && dep.source) || sources.get(s.source)
-
-        # Don't add a spec to the list if its source is expired. For example,
-        # if you change a Git gem to RubyGems.
-        next if s.source.nil?
-        next if @unlock[:sources].include?(s.source.name)
-
-        # XXX This is a backwards-compatibility fix to preserve the ability to
-        # unlock a single gem by passing its name via `--source`. See issue #3759
-        # TODO: delete in Bundler 2
-        next if unlock_source_unlocks_spec && @unlock[:sources].include?(s.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)
-          other_sources_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 @locked_specs.
-                    for(requested_dependencies, [], false, true, false).
-                    none? {|locked_spec| locked_spec.source == s.source }
-
-            raise
-          end
-
-          other = other_sources_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 other
-
-          deps2 = other.dependencies.select {|d| d.type != :development }
-          runtime_dependencies = s.dependencies.select {|d| d.type != :development }
-          # If the dependencies of the path source have changed, unlock it
-          next unless runtime_dependencies.sort == deps2.sort
-        end
-
-        converged << s
-      end
-
-      resolve = SpecSet.new(converged)
-      expanded_deps = expand_dependencies(deps, true)
-      @locked_specs_incomplete_for_platform = !resolve.for(expanded_deps, @unlock[:gems], true, true)
-      resolve = resolve.for(expanded_deps, @unlock[:gems], false, false, false)
-      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 in_locked_deps?(dep, locked_dep)
-      # Because the lockfile can't link a dep to a specific remote, we need to
-      # treat sources as equivalent anytime the locked dep has all the remotes
-      # that the Gemfile dep does.
-      locked_dep && locked_dep.source && dep.source && locked_dep.source.include?(dep.source)
-    end
-
-    def satisfies_locked_spec?(dep)
-      @locked_specs[dep].any? {|s| s.satisfies?(dep) && (!dep.source || s.source.include?(dep.source)) }
-    end
-
-    # This list of dependencies is only used in #resolve, so it's OK to add
-    # the metadata dependencies here
-    def expanded_dependencies
-      @expanded_dependencies ||= begin
-        expand_dependencies(dependencies + metadata_dependencies, @remote)
-      end
-    end
-
-    def metadata_dependencies
-      @metadata_dependencies ||= begin
-        ruby_versions = concat_ruby_version_requirements(@ruby_version)
-        if ruby_versions.empty? || !@ruby_version.exact?
-          concat_ruby_version_requirements(RubyVersion.system)
-          concat_ruby_version_requirements(locked_ruby_version_object) unless @unlock[:ruby]
-        end
-        [
-          Dependency.new("ruby\0", ruby_versions),
-          Dependency.new("rubygems\0", Gem::VERSION),
-        ]
-      end
-    end
-
-    def concat_ruby_version_requirements(ruby_version, ruby_versions = [])
-      return ruby_versions unless ruby_version
-      if ruby_version.patchlevel
-        ruby_versions << ruby_version.to_gem_version_with_patchlevel
-      else
-        ruby_versions.concat(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)
-      sorted_platforms = Resolver.sort_platforms(@platforms)
-      deps = []
-      dependencies.each do |dep|
-        dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
-        next if !remote && !dep.current_platform?
-        platforms = dep.gem_platforms(sorted_platforms)
-        if platforms.empty? && !Bundler.settings[:disable_platform_warnings]
-          mapped_platforms = dep.platforms.map {|p| Dependency::PLATFORM_MAP[p] }
-          Bundler.ui.warn \
-            "The dependency #{dep} will be unused by any of the platforms Bundler is installing for. " \
-            "Bundler is installing for #{@platforms.join ", "} but the dependency " \
-            "is only for #{mapped_platforms.join ", "}. " \
-            "To add those platforms to the bundle, " \
-            "run `bundle lock --add-platform #{mapped_platforms.join " "}`."
-        end
-        platforms.each do |p|
-          deps << DepProxy.new(dep, p) if remote || p == generic_local_platform
-        end
-      end
-      deps
-    end
-
-    def requested_dependencies
-      groups = requested_groups
-      groups.map!(&:to_sym)
-      dependencies.reject {|d| !d.should_include? || (d.groups & groups).empty? }
-    end
-
-    def source_requirements
-      # Load all specs from remote sources
-      index
-
-      # 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)
-      default = sources.default_source
-      source_requirements = { :default => default }
-      default = nil unless Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-      dependencies.each do |dep|
-        next unless source = dep.source || default
-        source_requirements[dep.name] = source
-      end
-      metadata_dependencies.each do |dep|
-        source_requirements[dep.name] = sources.metadata_source
-      end
-      source_requirements["bundler"] = sources.metadata_source # needs to come last to override
-      source_requirements
-    end
-
-    def pinned_spec_names(skip = nil)
-      pinned_names = []
-      default = Bundler.feature_flag.lockfile_uses_separate_rubygems_sources? && sources.default_source
-      @dependencies.each do |dep|
-        next unless dep_source = dep.source || default
-        next if dep_source == skip
-        pinned_names << dep.name
-      end
-      pinned_names
-    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 extract_gem_info(error)
-      # This method will extract the error message like "Could not find foo-1.2.3 in any of the sources"
-      # to an array. The first element will be the gem name (e.g. foo), the second will be the version number.
-      error.message.scan(/Could not find (\w+)-(\d+(?:\.\d+)+)/).flatten
-    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 && Bundler.feature_flag.only_update_to_newer_versions?
-      dependencies_by_name = dependencies.inject({}) {|memo, dep| memo.update(dep.name => dep) }
-      @locked_gems.specs.reduce({}) do |requirements, locked_spec|
-        name = locked_spec.name
-        next requirements if @locked_gems.dependencies[name] != dependencies_by_name[name]
-        dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
-        requirements[name] = DepProxy.new(dep, locked_spec.platform)
-        requirements
-      end.values
-    end
-
-    def equivalent_rubygems_remotes?(source)
-      return false unless source.is_a?(Source::Rubygems)
-
-      Bundler.settings[:allow_deployment_source_credential_changes] && source.equivalent_remotes?(sources.rubygems_remotes)
-    end
-  end
-end
diff --git a/lib/bundler/dep_proxy.rb b/lib/bundler/dep_proxy.rb
deleted file mode 100644
index 6c32179ac1..0000000000
--- a/lib/bundler/dep_proxy.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class DepProxy
-    attr_reader :__platform, :dep
-
-    def initialize(dep, platform)
-      @dep = dep
-      @__platform = platform
-    end
-
-    def hash
-      @hash ||= [dep, __platform].hash
-    end
-
-    def ==(other)
-      return false if other.class != self.class
-      dep == other.dep && __platform == other.__platform
-    end
-
-    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
-
-  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
deleted file mode 100644
index 8840ad6a9c..0000000000
--- a/lib/bundler/dependency.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/dependency"
-require "bundler/shared_helpers"
-require "bundler/rubygems_ext"
-
-module Bundler
-  class Dependency < Gem::Dependency
-    attr_reader :autorequire
-    attr_reader :groups, :platforms, :gemfile
-
-    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,
-      :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,
-      :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,
-      :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,
-      :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,
-      :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,
-    }.freeze
-
-    REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
-      PLATFORM_MAP.each do |key, value|
-        reverse_platform_map[value] ||= []
-        reverse_platform_map[value] << key
-      end
-
-      reverse_platform_map.each {|_, platforms| platforms.freeze }
-    end.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"]
-      @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?
-
-      @gem_platforms ||= @platforms.map {|pl| PLATFORM_MAP[pl] }.compact.uniq
-
-      valid_platforms & @gem_platforms
-    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
deleted file mode 100644
index 291e158ca0..0000000000
--- a/lib/bundler/deployment.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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
deleted file mode 100644
index f59533630e..0000000000
--- a/lib/bundler/deprecate.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/dsl.rb b/lib/bundler/dsl.rb
deleted file mode 100644
index 1a2114ed93..0000000000
--- a/lib/bundler/dsl.rb
+++ /dev/null
@@ -1,615 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/dependency"
-require "bundler/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
-
-    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.untaint, gemfile.to_s, 1)
-    rescue Exception => e
-      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 = Dir[File.join(expanded_path, "{,*}.gemspec")].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_platforms = Bundler::Dependency::REVERSE_PLATFORM_MAP[Bundler::GemHelpers.generic_local_platform]
-        gem spec.name, :name => spec.name, :path => path, :glob => glob, :platforms => gem_platforms
-
-        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
-
-        if current.requirement != dep.requirement
-          unless deleted_dep
-            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}"
-          end
-
-        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 (per group).\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
-          unless deleted_dep
-            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
-        check_primary_source_safety(@sources)
-        @sources.global_rubygems_source = 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)
-      unless block_given?
-        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"
-
-        raise DeprecatedError, msg if Bundler.feature_flag.disable_multisource?
-        SharedHelpers.major_deprecation(2, msg.strip)
-      end
-
-      source_options = normalize_hash(options).merge(
-        "path" => Pathname.new(path),
-        "root_path" => gemfile_root,
-        "gemspec" => gemspecs.find {|g| g.name == options["name"] }
-      )
-      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?
-      raise DeprecatedError, "The #github method has been removed" if Bundler.feature_flag.skip_default_git_sources?
-      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)
-      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
-
-  private
-
-    def add_git_sources
-      return if Bundler.feature_flag.skip_default_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
-        # It would be better to use https instead of the git protocol, but this
-        # can break deployment of existing locked bundles when switching between
-        # different versions of Bundler. The change will be made in 2.0, which
-        # does not guarantee compatibility with the 1.x series.
-        #
-        # See https://github.com/bundler/bundler/pull/2569 for discussion
-        #
-        # This can be overridden by adding this code to your Gemfiles:
-        #
-        #   git_source(:github) do |repo_name|
-        #     repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-        #     "https://github.com/#{repo_name}.git"
-        #   end
-        repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-        # TODO: 2.0 upgrade this setting to the default
-        if Bundler.feature_flag.github_https?
-          Bundler::SharedHelpers.major_deprecation 2, "The `github.https` setting will be removed"
-          "https://github.com/#{repo_name}.git"
-        else
-          "git://github.com/#{repo_name}.git"
-        end
-      end
-
-      # TODO: 2.0 remove this deprecated git source
-      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
-
-      # TODO: 2.0 remove this deprecated git source
-      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
-      if name.empty?
-        raise GemfileError, %(an empty gem name is not valid)
-      end
-
-      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]
-        opts["git"] = @git_sources[git_name].call(opts[git_name])
-      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_primary_source_safety(source_list)
-      return if source_list.rubygems_primary_remotes.empty? && source_list.global_rubygems_source.nil?
-
-      if Bundler.feature_flag.disable_multisource?
-        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"
-        unless Bundler.feature_flag.bundler_2_mode?
-          msg += ". To downgrade this error to a warning, run " \
-            "`bundle config --delete disable_multisource`"
-        end
-        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. " \
-          "To upgrade this warning to an error, run `bundle config " \
-          "disable_multisource true`."
-      end
-    end
-
-    def warn_deprecated_git_source(name, replacement, additional_message = nil)
-      # TODO: 2.0 remove deprecation
-      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 2, <<-EOS
-The :#{name} git source is deprecated, and will be removed in Bundler 2.0.#{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(/#{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
deleted file mode 100644
index 9a00b64e0e..0000000000
--- a/lib/bundler/endpoint_specification.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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
deleted file mode 100644
index 51738139fa..0000000000
--- a/lib/bundler/env.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/rubygems_integration"
-require "bundler/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}")
-      if RUBY_VERSION < "1.9"
-        str << " (#{RUBY_RELEASE_DATE}"
-        str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
-        str << ") [#{RUBY_PLATFORM}]"
-      else
-        str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
-        str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
-      end
-    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", ENV.fetch("GEM_HOME") { Gem.dir }]
-      out << ["  Gem Path", ENV.fetch("GEM_PATH") { Gem.path.join(File::PATH_SEPARATOR) }]
-      out << ["  User Path", Gem.user_dir]
-      out << ["  Bin Dir", Gem.bindir]
-      if defined?(OpenSSL)
-        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
deleted file mode 100644
index af7c1ef0a4..0000000000
--- a/lib/bundler/environment_preserver.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_ORIG_MANPATH
-      BUNDLER_VERSION
-      GEM_HOME
-      GEM_PATH
-      MANPATH
-      PATH
-      RB_USER_INSTALL
-      RUBYLIB
-      RUBYOPT
-    ].map(&:freeze).freeze
-    BUNDLER_PREFIX = "BUNDLER_ORIG_".freeze
-
-    # @param env [ENV]
-    # @param keys [Array<String>]
-    def initialize(env, keys)
-      @original = env.to_hash
-      @keys = keys
-      @prefix = BUNDLER_PREFIX
-    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
deleted file mode 100644
index e471bce0b6..0000000000
--- a/lib/bundler/errors.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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 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 message
-      "There was an error while trying to #{action} `#{@path}`. " \
-      "It is likely that you need to grant #{@permission_type} permissions " \
-      "for that path."
-    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
deleted file mode 100644
index 249170c4b2..0000000000
--- a/lib/bundler/feature_flag.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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? && !default.nil?
-        value
-      end
-    end
-    private_class_method :settings_method
-
-    (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
-
-    settings_flag(:allow_bundler_dependency_conflicts) { bundler_2_mode? }
-    settings_flag(:allow_offline_install) { bundler_2_mode? }
-    settings_flag(:auto_clean_without_path) { bundler_2_mode? }
-    settings_flag(:auto_config_jobs) { bundler_2_mode? }
-    settings_flag(:cache_all) { bundler_2_mode? }
-    settings_flag(:cache_command_is_package) { bundler_2_mode? }
-    settings_flag(:console_command) { !bundler_2_mode? }
-    settings_flag(:default_install_uses_path) { bundler_2_mode? }
-    settings_flag(:deployment_means_frozen) { bundler_2_mode? }
-    settings_flag(:disable_multisource) { bundler_2_mode? }
-    settings_flag(:error_on_stderr) { bundler_2_mode? }
-    settings_flag(:forget_cli_options) { bundler_2_mode? }
-    settings_flag(:global_path_appends_ruby_scope) { bundler_2_mode? }
-    settings_flag(:global_gem_cache) { bundler_2_mode? }
-    settings_flag(:init_gems_rb) { bundler_2_mode? }
-    settings_flag(:list_command) { bundler_2_mode? }
-    settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
-    settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
-    settings_flag(:path_relative_to_cwd) { bundler_2_mode? }
-    settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
-    settings_flag(:prefer_gems_rb) { bundler_2_mode? }
-    settings_flag(:print_only_version_number) { bundler_2_mode? }
-    settings_flag(:setup_makes_kernel_gem_public) { !bundler_2_mode? }
-    settings_flag(:skip_default_git_sources) { bundler_2_mode? }
-    settings_flag(:specific_platform) { bundler_2_mode? }
-    settings_flag(:suppress_install_using_messages) { bundler_2_mode? }
-    settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? }
-    settings_flag(:update_requires_all_flag) { bundler_2_mode? }
-    settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_2_mode? }
-    settings_flag(:viz_command) { !bundler_2_mode? }
-
-    settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
-
-    settings_method(:github_https?, "github.https") { bundler_2_mode? }
-
-    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
deleted file mode 100644
index 4dd42e42ff..0000000000
--- a/lib/bundler/fetcher.rb
+++ /dev/null
@@ -1,312 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_persistent"
-require "cgi"
-require "securerandom"
-require "zlib"
-
-module Bundler
-  # Handles all the fetching with the rubygems server
-  class Fetcher
-    autoload :CompactIndex, "bundler/fetcher/compact_index"
-    autoload :Downloader, "bundler/fetcher/downloader"
-    autoload :Dependency, "bundler/fetcher/dependency"
-    autoload :Index, "bundler/fetcher/index"
-
-    # This error is raised when it looks like the network is down
-    class NetworkDownError < 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" \
-          " http://bit.ly/ruby-ssl. 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 #{remote_uri} username:password"
-      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 = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
-      if uri.scheme == "file"
-        Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(uri.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|
-        next if name == "bundler"
-        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",
-        "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 "bundler", :ENV
-        if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
-          con.proxy = 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
-        certs = File.expand_path("../ssl_certs/*/*.pem", __FILE__)
-        Dir.glob(certs).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
deleted file mode 100644
index 27987f670a..0000000000
--- a/lib/bundler/fetcher/base.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index cfc74d642c..0000000000
--- a/lib/bundler/fetcher/compact_index.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/fetcher/base"
-require "bundler/worker"
-
-module Bundler
-  autoload :CompactIndexClient, "bundler/compact_index_client"
-
-  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 = compact_index_client.dependencies(remaining_gems)
-          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 ||= begin
-          SharedHelpers.filesystem_access(cache_path) do
-            CompactIndexClient.new(cache_path, client_fetcher)
-          end.tap do |client|
-            client.in_parallel = 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
-          end
-        end
-      end
-
-      def bundle_worker(func = nil)
-        @bundle_worker ||= begin
-          worker_name = "Compact Index (#{display_uri.host})"
-          Bundler::Worker.new(Bundler.current_ruby.rbx? ? 1 : 25, 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
deleted file mode 100644
index 1430d1ebeb..0000000000
--- a/lib/bundler/fetcher/dependency.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/fetcher/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
deleted file mode 100644
index e0e0cbf1c9..0000000000
--- a/lib/bundler/fetcher/downloader.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
-
-        response = request(uri, headers)
-        Bundler.ui.debug("HTTP #{response.code} #{response.message} #{uri}")
-
-        case response
-        when Net::HTTPSuccess, Net::HTTPNotModified
-          response
-        when Net::HTTPRedirection
-          new_uri = 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::HTTPUnauthorized
-          raise AuthenticationRequiredError, uri.host
-        when Net::HTTPNotFound
-          raise FallbackError, "Net::HTTPNotFound"
-        else
-          raise HTTPError, "#{response.class}#{": #{response.body}" unless response.body.empty?}"
-        end
-      end
-
-      def request(uri, headers)
-        validate_uri_scheme!(uri)
-
-        Bundler.ui.debug "HTTP GET #{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
-        case e.message
-        when /host down:/, /getaddrinfo: nodename nor servname provided/
-          raise NetworkDownError, "Could not reach host #{uri.host}. Check your network " \
-            "connection and try again."
-        else
-          raise HTTPError, "Network error while fetching #{URICredentialsFilter.credential_filtered_uri(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
deleted file mode 100644
index 1a8064624d..0000000000
--- a/lib/bundler/fetcher/index.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/fetcher/base"
-require "rubygems/remote_fetcher"
-
-module Bundler
-  class Fetcher
-    class Index < Base
-      def specs(_gem_names)
-        Bundler.rubygems.fetch_all_remote_specs(remote)
-      rescue Gem::RemoteFetcher::FetchError, OpenSSL::SSL::SSLError, Net::HTTPFatalError => e
-        case e.message
-        when /certificate verify failed/
-          raise CertificateFailureError.new(display_uri)
-        when /401/
-          raise AuthenticationRequiredError, remote_uri
-        when /403/
-          raise BadAuthenticationError, remote_uri if remote_uri.userinfo
-          raise AuthenticationRequiredError, remote_uri
-        else
-          Bundler.ui.trace e
-          raise HTTPError, "Could not fetch specs from #{display_uri}"
-        end
-      end
-
-      def fetch_spec(spec)
-        spec -= [nil, "ruby", ""]
-        spec_file_name = "#{spec.join "-"}.gemspec"
-
-        uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
-        if uri.scheme == "file"
-          Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(uri.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
deleted file mode 100644
index ae3299a7c8..0000000000
--- a/lib/bundler/friendly_errors.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require "cgi"
-require "bundler/vendored_thor"
-
-module Bundler
-  module FriendlyErrors
-  module_function
-
-    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, nil, true
-      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."
-        Bundler.ui.warn <<-WARN, :wrap => true
-          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 http://rvm.io/packages/openssl.
-        WARN
-        Bundler.ui.trace error
-      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
-    rescue
-      raise error
-    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.info <<-EOS.gsub(/^ {8}/, "")
-        --- ERROR REPORT TEMPLATE -------------------------------------------------------
-        # Error Report
-
-        ## Questions
-
-        Please fill out answers to these questions, it'll help us figure out
-        why things are going wrong.
-
-        - **What did you do?**
-
-          I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
-
-        - **What did you expect to happen?**
-
-          I expected Bundler to...
-
-        - **What happened instead?**
-
-          Instead, what happened was...
-
-        - **Have you tried any solutions posted on similar issues in our issue tracker, stack overflow, or google?**
-
-          I tried...
-
-        - **Have you read our issues document, https://github.com/bundler/bundler/blob/master/doc/contributing/ISSUES.md?**
-
-          ...
-
-        ## Backtrace
-
-        ```
-        #{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.warn <<-EOS.gsub(/^ {8}/, "")
-
-        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 create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
-        https://github.com/bundler/bundler/issues/new
-      EOS
-    end
-
-    def issues_url(exception)
-      message = exception.message.lines.first.tr(":", " ").chomp
-      message = message.split("-").first if exception.is_a?(Errno)
-      "https://github.com/bundler/bundler/search?q=" \
-        "#{CGI.escape(message)}&type=Issues"
-    end
-  end
-
-  def self.with_friendly_errors
-    yield
-  rescue SignalException
-    raise
-  rescue Exception => e
-    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
deleted file mode 100644
index e7673cba88..0000000000
--- a/lib/bundler/gem_helper.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_thor" unless defined?(Thor)
-require "bundler"
-
-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 gemspec(&block)
-        gemspec = instance.gemspec
-        block.call(gemspec) if block
-        gemspec
-      end
-    end
-
-    attr_reader :spec_path, :base, :gemspec
-
-    def initialize(base = nil, name = nil)
-      Bundler.ui = UI::Shell.new
-      @base = (base ||= SharedHelpers.pwd)
-      gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.gemspec")]
-      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)
-    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 "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" do
-        rubygem_push(built_gem_path) if gem_push?
-      end
-
-      GemHelper.instance = self
-    end
-
-    def build_gem
-      file_name = nil
-      sh("gem 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
-      out, _ = sh_with_code("gem install '#{built_gem_path}'#{" --local" if local}")
-      raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
-      Bundler.ui.confirm "#{name} (#{version}) installed."
-    end
-
-  protected
-
-    def rubygem_push(path)
-      gem_command = "gem push '#{path}'"
-      gem_command += " --key #{gem_key}" if gem_key
-      gem_command += " --host #{allowed_push_host}" if allowed_push_host
-      unless allowed_push_host || Bundler.user_home.join(".gem/credentials").file?
-        raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
-      end
-      sh(gem_command)
-      Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
-    end
-
-    def built_gem_path
-      Dir[File.join(base, "#{name}-*.gem")].sort_by {|f| File.mtime(f) }.last
-    end
-
-    def git_push(remote = "")
-      perform_git_push remote
-      perform_git_push "#{remote} --tags"
-      Bundler.ui.confirm "Pushed git commits and tags."
-    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 perform_git_push(options = "")
-      cmd = "git push #{options}"
-      out, code = sh_with_code(cmd)
-      raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0
-    end
-
-    def already_tagged?
-      return false unless sh("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_code("git diff --exit-code")[1] == 0
-    end
-
-    def committed?
-      sh_with_code("git diff-index --quiet --cached HEAD")[1] == 0
-    end
-
-    def tag_version
-      sh "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_code "git tag -d #{version_tag}"
-      raise
-    end
-
-    def version
-      gemspec.version
-    end
-
-    def version_tag
-      "v#{version}"
-    end
-
-    def name
-      gemspec.name
-    end
-
-    def sh(cmd, &block)
-      out, code = sh_with_code(cmd, &block)
-      unless code.zero?
-        raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
-      end
-      out
-    end
-
-    def sh_with_code(cmd, &block)
-      cmd += " 2>&1"
-      outbuf = String.new
-      Bundler.ui.debug(cmd)
-      SharedHelpers.chdir(base) do
-        outbuf = `#{cmd}`
-        status = $?.exitstatus
-        block.call(outbuf) if status.zero? && 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
-  end
-end
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb
deleted file mode 100644
index 019ae10c66..0000000000
--- a/lib/bundler/gem_helpers.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module GemHelpers
-    GENERIC_CACHE = {} # rubocop:disable 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)
-      return p if p == Gem::Platform::RUBY
-
-      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(Bundler.local_platform)
-    end
-    module_function :generic_local_platform
-
-    def platform_specificity_match(spec_platform, user_platform)
-      spec_platform = Gem::Platform.new(spec_platform)
-      return PlatformMatch::EXACT_MATCH if spec_platform == user_platform
-      return PlatformMatch::WORST_MATCH if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
-
-      PlatformMatch.new(
-        PlatformMatch.os_match(spec_platform, user_platform),
-        PlatformMatch.cpu_match(spec_platform, user_platform),
-        PlatformMatch.platform_version_match(spec_platform, user_platform)
-      )
-    end
-    module_function :platform_specificity_match
-
-    def select_best_platform_match(specs, platform)
-      specs.select {|spec| spec.match_platform(platform) }.
-        min_by {|spec| platform_specificity_match(spec.platform, platform) }
-    end
-    module_function :select_best_platform_match
-
-    PlatformMatch = Struct.new(:os_match, :cpu_match, :platform_version_match)
-    class PlatformMatch
-      def <=>(other)
-        return nil unless other.is_a?(PlatformMatch)
-
-        m = os_match <=> other.os_match
-        return m unless m.zero?
-
-        m = cpu_match <=> other.cpu_match
-        return m unless m.zero?
-
-        m = platform_version_match <=> other.platform_version_match
-        m
-      end
-
-      EXACT_MATCH = new(-1, -1, -1).freeze
-      WORST_MATCH = new(1_000_000, 1_000_000, 1_000_000).freeze
-
-      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
-  end
-end
diff --git a/lib/bundler/gem_remote_fetcher.rb b/lib/bundler/gem_remote_fetcher.rb
deleted file mode 100644
index 9577535d63..0000000000
--- a/lib/bundler/gem_remote_fetcher.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/remote_fetcher"
-
-module Bundler
-  # Adds support for setting custom HTTP headers when fetching gems from the
-  # server.
-  #
-  # TODO: Get rid of this when and if gemstash only supports RubyGems versions
-  # that contain https://github.com/rubygems/rubygems/commit/3db265cc20b2f813.
-  class GemRemoteFetcher < Gem::RemoteFetcher
-    attr_accessor :headers
-
-    # Extracted from RubyGems 2.4.
-    def fetch_http(uri, last_modified = nil, head = false, depth = 0)
-      fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
-      # beginning of change
-      response   = request uri, fetch_type, last_modified do |req|
-        headers.each {|k, v| req.add_field(k, v) } if headers
-      end
-      # end of change
-
-      case response
-      when Net::HTTPOK, Net::HTTPNotModified then
-        response.uri = uri if response.respond_to? :uri
-        head ? response : response.body
-      when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
-           Net::HTTPTemporaryRedirect then
-        raise FetchError.new("too many redirects", uri) if depth > 10
-
-        location = URI.parse response["Location"]
-
-        if https?(uri) && !https?(location)
-          raise FetchError.new("redirecting to non-https resource: #{location}", uri)
-        end
-
-        fetch_http(location, last_modified, head, depth + 1)
-      else
-        raise FetchError.new("bad response #{response.message} #{response.code}", uri)
-      end
-    end
-  end
-end
diff --git a/lib/bundler/gem_tasks.rb b/lib/bundler/gem_tasks.rb
deleted file mode 100644
index f736517bd7..0000000000
--- a/lib/bundler/gem_tasks.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/clean"
-CLOBBER.include "pkg"
-
-require "bundler/gem_helper"
-Bundler::GemHelper.install_tasks
diff --git a/lib/bundler/gem_version_promoter.rb b/lib/bundler/gem_version_promoter.rb
deleted file mode 100644
index adb951a7a0..0000000000
--- a/lib/bundler/gem_version_promoter.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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["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
-            STDERR.puts before_result
-            STDERR.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
deleted file mode 100644
index cd4b25d0e6..0000000000
--- a/lib/bundler/gemdeps.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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
deleted file mode 100644
index de6bba0214..0000000000
--- a/lib/bundler/graph.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-            $stderr.puts "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
deleted file mode 100644
index 9166a92738..0000000000
--- a/lib/bundler/index.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# frozen_string_literal: true
-
-require "set"
-
-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).to_set unless @sources.empty?
-
-      @sources.each do |source|
-        source.unsorted_search(query, base).each do |spec|
-          results << spec if seen.add?(spec.full_name)
-        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
-
-    # returns a list of the dependencies
-    def unmet_dependency_names
-      dependency_names.select do |name|
-        name != "bundler" && 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 }
-      Set.new(deps) == Set.new(other_deps)
-    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.platform)
-          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
deleted file mode 100644
index 1bb29f0b36..0000000000
--- a/lib/bundler/injector.rb
+++ /dev/null
@@ -1,253 +0,0 @@
-# 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?
-
-        %(gem #{name}#{requirement}#{group}#{source})
-      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
-
-    # evalutes a gemfile to remove the specified gem
-    # from it.
-    def remove_deps(gemfile_path)
-      initial_gemfile = IO.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 opertion if no gems were removed
-      # no need to operate on gemfile furthur
-      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] path of the Gemfile
-    # @return [Array]   removed_deps 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\)/
-
-      # remove lines which match the regex
-      new_gemfile = IO.readlines(gemfile_path).reject {|line| line.match(patterns) }
-
-      # remove lone \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 [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.include?(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)
-      # evalute 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
deleted file mode 100644
index 9d25f3261a..0000000000
--- a/lib/bundler/inline.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/compatibility_guard"
-
-# 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 "bundler"
-
-  opts = options.dup
-  ui = opts.delete(:ui) { Bundler::UI::Shell.new }
-  raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
-
-  old_root = Bundler.method(:root)
-  def Bundler.root
-    Bundler::SharedHelpers.pwd.expand_path
-  end
-  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)
-
-  definition = builder.to_definition(nil, true)
-  def definition.lock(*); end
-  definition.validate_runtime!
-
-  missing_specs = proc do
-    definition.missing_specs?
-  end
-
-  Bundler.ui = ui if install
-  if install || missing_specs.call
-    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
-ensure
-  bundler_module = class << Bundler; self; end
-  bundler_module.send(:define_method, :root, old_root) if old_root
-end
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
deleted file mode 100644
index b49cfb6703..0000000000
--- a/lib/bundler/installer.rb
+++ /dev/null
@@ -1,318 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-require "rubygems/dependency_installer"
-require "bundler/worker"
-require "bundler/installer/parallel_installer"
-require "bundler/installer/standalone"
-require "bundler/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!
-          warn_on_incompatible_bundler_deps
-          load_plugins
-          options.delete(:jobs)
-        else
-          options[:jobs] = 1 # to avoid the overhead of Bundler::Worker
-        end
-        install(options)
-
-        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
-
-        File.open(binstub_path, "w", 0o777 & ~File.umask) do |f|
-          if RUBY_VERSION >= "2.6"
-            f.puts ERB.new(template, :trim_mode => "-").result(binding)
-          else
-            f.puts ERB.new(template, nil, "-").result(binding)
-          end
-        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)
-      # 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
-        File.open "#{bin_path}/#{executable}", "w", 0o755 do |f|
-          if RUBY_VERSION >= "2.6"
-            f.puts ERB.new(template, :trim_mode => "-").result(binding)
-          else
-            f.puts ERB.new(template, nil, "-").result(binding)
-          end
-        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
-
-      return 1 unless can_install_in_parallel?
-
-      auto_config_jobs = Bundler.feature_flag.auto_config_jobs?
-      if jobs = Bundler.settings[:jobs]
-        if auto_config_jobs
-          jobs
-        else
-          [jobs.pred, 1].max
-        end
-      elsif auto_config_jobs
-        processor_count
-      else
-        1
-      end
-    end
-
-    def processor_count
-      require "etc"
-      Etc.nprocessors
-    rescue
-      1
-    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)
-    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 warn_on_incompatible_bundler_deps
-      bundler_version = Gem::Version.create(Bundler::VERSION)
-      @definition.specs.each do |spec|
-        spec.dependencies.each do |dep|
-          next if dep.type == :development
-          next unless dep.name == "bundler".freeze
-          next if dep.requirement.satisfied_by?(bundler_version)
-
-          Bundler.ui.warn "#{spec.name} (#{spec.version}) has dependency" \
-            " #{SharedHelpers.pretty_dependency(dep)}" \
-            ", which is unsatisfied by the current bundler version #{VERSION}" \
-            ", so the dependency is being ignored"
-        end
-      end
-    end
-
-    def can_install_in_parallel?
-      if Bundler.rubygems.provides?(">= 2.1.0")
-        true
-      else
-        Bundler.ui.warn "RubyGems #{Gem::VERSION} is not threadsafe, so your "\
-          "gems will be installed one at a time. Upgrade to RubyGems 2.1.0 " \
-          "or higher to enable parallel gem installation."
-        false
-      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
deleted file mode 100644
index e5e245f970..0000000000
--- a/lib/bundler/installer/gem_installer.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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, APIResponseMismatchError
-      raise
-    rescue Errno::ENOSPC
-      return false, out_of_space_message
-    rescue StandardError => 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" if Bundler.ui.debug?
-      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
-      return install_error_message if spec.source.options["git"]
-      "#{install_error_message}\n#{gem_install_message}"
-    end
-
-    def install_error_message
-      "An error occurred while installing #{spec.name} (#{spec.version}), and Bundler cannot continue."
-    end
-
-    def gem_install_message
-      source = spec.source
-      return unless source.respond_to?(:remotes)
-
-      if source.remotes.size == 1
-        "Make sure that `gem install #{spec.name} -v '#{spec.version}' --source '#{source.remotes.first}'` succeeds before bundling."
-      else
-        "Make sure that `gem install #{spec.name} -v '#{spec.version}'` succeeds before bundling."
-      end
-    end
-
-    def spec_settings
-      # Fetch the build settings, if there are any
-      Bundler.settings["build.#{spec.name}"]
-    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
deleted file mode 100644
index f8a849ccfc..0000000000
--- a/lib/bundler/installer/parallel_installer.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/worker"
-require "bundler/installer/gem_installer"
-
-module Bundler
-  class ParallelInstaller
-    class SpecInstallation
-      attr_accessor :spec, :name, :post_install_message, :state, :error
-      def initialize(spec)
-        @spec = spec
-        @name = spec.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 installation_attempted?
-        installed? || failed?
-      end
-
-      # Only true when spec in neither installed nor already enqueued
-      def ready_to_enqueue?
-        !enqueued? && !installation_attempted?
-      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 ||= begin
-          all_dependencies.reject {|dep| ignorable_dependency? dep }
-        end
-      end
-
-      def missing_lockfile_dependencies(all_spec_names)
-        deps = all_dependencies.reject {|dep| ignorable_dependency? dep }
-        deps.reject {|dep| all_spec_names.include? dep.name }
-      end
-
-      # Represents all dependencies
-      def all_dependencies
-        @spec.dependencies
-      end
-
-      def to_s
-        "#<#{self.class} #{@spec.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
-      # Since `autoload` has the potential for threading issues on 1.8.7
-      # TODO:  remove in bundler 2.0
-      require "bundler/gem_remote_fetcher" if RUBY_VERSION < "1.9"
-
-      check_for_corrupt_lockfile
-
-      if @size > 1
-        install_with_worker
-      else
-        install_serially
-      end
-
-      handle_error if @specs.any?(&:failed?)
-      @specs
-    ensure
-      worker_pool && worker_pool.stop
-    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 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 = begin
-        gem_installer.install_from_spec
-      rescue RuntimeError => e
-        raise e, "#{e}\n\n#{require_tree_for_spec(spec_install.spec)}"
-      end
-      if success
-        spec_install.state = :installed
-        spec_install.post_install_message = message unless message.nil?
-      else
-        spec_install.state = :failed
-        spec_install.error = "#{message}\n\n#{require_tree_for_spec(spec_install.spec)}"
-      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 = @specs.select(&:failed?).map(&:error)
-      if exception = errors.find {|e| e.is_a?(Bundler::BundlerError) }
-        raise exception
-      end
-      raise Bundler::InstallError, errors.map(&:to_s).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|
-        next if @rake && !@rake.installed? && spec.name != @rake.name
-
-        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
deleted file mode 100644
index ce0c9df1eb..0000000000
--- a/lib/bundler/installer/standalone.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Standalone
-    def initialize(groups, definition)
-      @specs = groups.empty? ? definition.requested_specs : definition.specs_for(groups.map(&:to_sym))
-    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 "# ruby 1.8.7 doesn't define RUBY_ENGINE"
-        file.puts "ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'"
-        file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]"
-        file.puts "path = File.expand_path('..', __FILE__)"
-        paths.each do |path|
-          file.puts %($:.unshift "\#{path}/#{path}")
-        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}/#{ruby_version}')
-          # This is a static string intentionally. It's interpolated at a later time.
-        end
-      end.flatten
-    end
-
-    def version_dir
-      "#{Bundler::RubyVersion.system.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)
-      Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path)).to_s
-    rescue TypeError
-      error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
-      raise Gem::InvalidSpecificationException.new(error_message)
-    end
-  end
-end
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
deleted file mode 100644
index d9cb01f810..0000000000
--- a/lib/bundler/lazy_specification.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-require "bundler/match_platform"
-
-module Bundler
-  class LazySpecification
-    Identifier = Struct.new(:name, :version, :source, :platform, :dependencies)
-    class Identifier
-      include Comparable
-      def <=>(other)
-        return unless other.is_a?(Identifier)
-        [name, version, platform_string] <=> [other.name, other.version, other.platform_string]
-      end
-
-    protected
-
-      def platform_string
-        platform_string = platform.to_s
-        platform_string == Index::RUBY ? Index::NULL : platform_string
-      end
-    end
-
-    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 satisfies?(dependency)
-      @name == dependency.name && dependency.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__
-      search_object = Bundler.feature_flag.specific_platform? || Bundler.settings[:force_ruby_platform] ? self : Dependency.new(name, version)
-      @specification = if source.is_a?(Source::Gemspec) && source.gemspec.name == name
-        source.gemspec.tap {|s| s.source = source }
-      else
-        search = source.specs.search(search_object).last
-        if search && Gem::Platform.new(search.platform) != Gem::Platform.new(platform) && !search.runtime_dependencies.-(dependencies.reject {|d| d.type == :development }).empty?
-          Bundler.ui.warn "Unable to use the platform-specific (#{search.platform}) version of #{name} (#{version}) " \
-            "because it has different dependencies from the #{platform} version. " \
-            "To use the platform-specific version of the gem, run `bundle config specific_platform true` and install again."
-          search = source.specs.search(self).last
-        end
-        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 ||= Identifier.new(name, version, source, platform, dependencies)
-    end
-
-    def git_version
-      return unless source.is_a?(Bundler::Source::Git)
-      " #{source.revision[0..6]}"
-    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
-  end
-end
diff --git a/lib/bundler/lockfile_generator.rb b/lib/bundler/lockfile_generator.rb
deleted file mode 100644
index 585077d18d..0000000000
--- a/lib/bundler/lockfile_generator.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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
deleted file mode 100644
index ff706fca1d..0000000000
--- a/lib/bundler/lockfile_parser.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-# frozen_string_literal: true
-
-# Some versions of the Bundler 1.1 RC series introduced corrupted
-# lockfiles. There were two major problems:
-#
-# * multiple copies of the same GIT section appeared in the lockfile
-# * when this happened, those sections got multiple copies of gems
-#   in those sections.
-#
-# As a result, Bundler 1.1 contains code that fixes the earlier
-# corruption. We will remove this fix-up code in Bundler 1.2.
-
-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
-    SOURCE       = [GIT, GEM, PATH, PLUGIN].freeze
-
-    SECTIONS_BY_VERSION_INTRODUCED = {
-      # The strings have to be dup'ed for old RG on Ruby 2.3+
-      # TODO: remove dup in Bundler 2.0
-      Gem::Version.create("1.0".dup) => [DEPENDENCIES, PLATFORMS, GIT, GEM, PATH].freeze,
-      Gem::Version.create("1.10".dup) => [BUNDLED].freeze,
-      Gem::Version.create("1.12".dup) => [RUBY].freeze,
-      Gem::Version.create("1.13".dup) => [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        = {}
-
-      @rubygems_aggregate = Source::Rubygems.new
-
-      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
-      @sources << @rubygems_aggregate unless Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-      @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
-      prerelease_text = bundler_version.prerelease? ? " --pre" : ""
-      current_version = Gem::Version.create(Bundler::VERSION)
-      case current_version.segments.first <=> bundler_version.segments.first
-      when -1
-        raise LockfileError, "You must use Bundler #{bundler_version.segments.first} or greater with this lockfile."
-      when 0
-        if 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 " \
-               "upgrade to the latest version of Bundler by running `gem " \
-               "install bundler#{prerelease_text}`.\n"
-        end
-      end
-    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)
-          # Strip out duplicate GIT sections
-          if @sources.include?(@current_source)
-            @current_source = @sources.find {|s| s == @current_source }
-          else
-            @sources << @current_source
-          end
-        when GEM
-          if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-            @opts["remotes"] = @opts.delete("remote")
-            @current_source = TYPES[@type].from_lock(@opts)
-            @sources << @current_source
-          else
-            Array(@opts["remote"]).each do |url|
-              @rubygems_aggregate.add_remote(url)
-            end
-            @current_source = @rubygems_aggregate
-          end
-        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
-
-    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
-
-        # Avoid introducing multiple copies of the same spec (caused by
-        # duplicate GIT sections)
-        @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/match_platform.rb b/lib/bundler/match_platform.rb
deleted file mode 100644
index 56cbbfb95d..0000000000
--- a/lib/bundler/match_platform.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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
deleted file mode 100644
index b15190e7e5..0000000000
--- a/lib/bundler/mirror.rb
+++ /dev/null
@@ -1,223 +0,0 @@
-# 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[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
-          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 = 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
deleted file mode 100644
index 53f9806b73..0000000000
--- a/lib/bundler/plugin.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/plugin/api"
-
-module Bundler
-  module Plugin
-    autoload :DSL,        "bundler/plugin/dsl"
-    autoload :Events,     "bundler/plugin/events"
-    autoload :Index,      "bundler/plugin/index"
-    autoload :Installer,  "bundler/plugin/installer"
-    autoload :SourceList, "bundler/plugin/source_list"
-
-    class MalformattedPlugin < PluginError; end
-    class UndefinedCommandError < PluginError; end
-    class UnknownSourceError < 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 => e
-      if specs
-        specs_to_delete = Hash[specs.select {|k, _v| names.include?(k) && !index.commands.values.include?(k) }]
-        specs_to_delete.values.each {|spec| Bundler.rm_rf(spec.full_gem_path) }
-      end
-
-      Bundler.ui.error "Failed to install plugin #{name}: #{e.message}\n  #{e.backtrace.join("\n ")}"
-    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)
-      builder = DSL.new
-      if block_given?
-        builder.instance_eval(&inline)
-      else
-        builder.eval_gemfile(gemfile)
-      end
-      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
-    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
-    # approriate 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 calss 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|
-        spec = specs[name]
-        validate_plugin! Pathname.new(spec.full_gem_path)
-        installed = register_plugin(name, spec, optional_plugins.include?(name))
-        Bundler.ui.info "Installed plugin #{name}" if installed
-      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
-
-    # 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
-      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)
-      # 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)
-
-      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
-
-    def add_to_load_path(load_paths)
-      if insert_index = Bundler.rubygems.load_path_insert_index
-        $LOAD_PATH.insert(insert_index, *load_paths)
-      else
-        $LOAD_PATH.unshift(*load_paths)
-      end
-    end
-
-    class << self
-      private :load_plugin, :register_plugin, :save_plugins, :validate_plugin!,
-        :add_to_load_path
-    end
-  end
-end
diff --git a/lib/bundler/plugin/api.rb b/lib/bundler/plugin/api.rb
deleted file mode 100644
index a2d5cbb4ac..0000000000
--- a/lib/bundler/plugin/api.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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, "bundler/plugin/api/source"
-
-      # 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
deleted file mode 100644
index 586477efb5..0000000000
--- a/lib/bundler/plugin/api/source.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-
-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 intenally. 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(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 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(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 attibutes
-        # 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
-
-        # 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 #{options[:type]} with uri #{uri}"
-        end
-
-        # 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
deleted file mode 100644
index 4bfc8437e0..0000000000
--- a/lib/bundler/plugin/dsl.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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, :path, :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
deleted file mode 100644
index bc037d1af5..0000000000
--- a/lib/bundler/plugin/events.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
deleted file mode 100644
index f09587dfda..0000000000
--- a/lib/bundler/plugin/index.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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 {|e| (@hooks[e] ||= []) << name }
-
-        @plugin_paths[name] = path
-        @load_paths[name] = load_paths
-        save_index
-      rescue StandardError
-        @commands = old_commands
-        raise
-      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 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 "bundler/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 "bundler/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
deleted file mode 100644
index 5379c38979..0000000000
--- a/lib/bundler/plugin/installer.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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, "bundler/plugin/installer/rubygems"
-      autoload :Git,      "bundler/plugin/installer/git"
-
-      def install(names, options)
-        version = options[:version] || [">= 0"]
-        Bundler.settings.temporary(:lockfile_uses_separate_rubygems_sources => false, :disable_multisource => false) do
-          if options[:git]
-            install_git(names, version, options)
-          else
-            sources = options[:source] || Bundler.rubygems.sources
-            install_rubygems(names, version, sources)
-          end
-        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 install_git(names, version, options)
-        uri = options.delete(:git)
-        options["uri"] = uri
-
-        source_list = SourceList.new
-        source_list.add_git_source(options)
-
-        # To support both sources
-        if options[:source]
-          source_list.add_rubygems_source("remotes" => options[:source])
-        end
-
-        deps = names.map {|name| Dependency.new name, version }
-
-        definition = Definition.new(nil, deps, source_list, true)
-        install_definition(definition)
-      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)
-        deps = names.map {|name| Dependency.new name, version }
-
-        source_list = SourceList.new
-        source_list.add_rubygems_source("remotes" => sources)
-
-        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
deleted file mode 100644
index fbb6c5e40e..0000000000
--- a/lib/bundler/plugin/installer/git.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
deleted file mode 100644
index 7ae74fa93b..0000000000
--- a/lib/bundler/plugin/installer/rubygems.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index f0e212205f..0000000000
--- a/lib/bundler/plugin/source_list.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-
-    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
deleted file mode 100644
index cba4fcdba5..0000000000
--- a/lib/bundler/process_lock.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
deleted file mode 100644
index e654416a5a..0000000000
--- a/lib/bundler/psyched_yaml.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-# Psych could be a gem, so try to ask for it
-begin
-  gem "psych"
-rescue LoadError
-end if defined?(gem)
-
-# 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
-
-require "bundler/deprecate"
-begin
-  Bundler::Deprecate.skip_during do
-    require "rubygems/safe_yaml"
-  end
-rescue LoadError
-  # it's OK if the file isn't there
-end
diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb
deleted file mode 100644
index 23e1234330..0000000000
--- a/lib/bundler/remote_specification.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-
-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)
-      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
-        # see https://github.com/bundler/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
deleted file mode 100644
index 545b4cc88a..0000000000
--- a/lib/bundler/resolver.rb
+++ /dev/null
@@ -1,373 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Resolver
-    require "bundler/vendored_molinillo"
-    require "bundler/resolver/spec_group"
-
-    # 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, index, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [], platforms = nil)
-      platforms = Set.new(platforms) if platforms
-      base = SpecSet.new(base) unless base.is_a?(SpecSet)
-      resolver = new(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
-      result = resolver.start(requirements)
-      SpecSet.new(result)
-    end
-
-    def initialize(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
-      @index = index
-      @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.new(dep, ls.platform), true)
-      end
-      additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
-      @platforms = platforms
-      @gem_version_promoter = gem_version_promoter
-      @allow_bundler_dependency_conflicts = Bundler.feature_flag.allow_bundler_dependency_conflicts?
-      @lockfile_uses_separate_rubygems_sources = Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-      @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)
-      STDERR.puts debug_info.split("\n").map {|s| "  " * depth + s }
-    end
-
-    def debug?
-      return @debug_mode if defined?(@debug_mode)
-      @debug_mode = 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)
-      platform = dependency.__platform
-      dependency = dependency.dep unless dependency.is_a? Gem::Dependency
-      search = @search_for[dependency] ||= begin
-        index = index_for(dependency)
-        results = index.search(dependency, @base[dependency.name])
-
-        if vertex = @base_dg.vertex_named(dependency.name)
-          locked_requirement = vertex.payload.requirement
-        end
-
-        if !@prerelease_specified[dependency.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)
-            spec_group = SpecGroup.new(specs)
-            spec_group.ignores_bundler_dependencies = @allow_bundler_dependency_conflicts
-            groups << spec_group
-          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
-      search.select {|sg| sg.for?(platform) }.each {|sg| sg.activate_platform!(platform) }
-    end
-
-    def index_for(dependency)
-      source = @source_requirements[dependency.name]
-      if source
-        source.specs
-      elsif @lockfile_uses_separate_rubygems_sources
-        Index.build do |idx|
-          if dependency.all_sources
-            dependency.all_sources.each {|s| idx.add_source(s.specs) if s }
-          else
-            idx.add_source @source_requirements[:default].specs
-          end
-        end
-      else
-        @index
-      end
-    end
-
-    def name_for(dependency)
-      dependency.name
-    end
-
-    def name_for_explicit_dependency_source
-      Bundler.default_gemfile.basename.to_s
-    rescue
-      "Gemfile"
-    end
-
-    def name_for_locking_dependency_source
-      Bundler.default_lockfile.basename.to_s
-    rescue
-      "Gemfile.lock"
-    end
-
-    def requirement_satisfied_by?(requirement, activated, spec)
-      return false unless requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
-      spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
-      true
-    end
-
-    def relevant_sources_for_vertex(vertex)
-      if vertex.root?
-        [@source_requirements[vertex.name]]
-      elsif @lockfile_uses_separate_rubygems_sources
-        vertex.recursive_predecessors.map do |v|
-          @source_requirements[v.name]
-        end << @source_requirements[:default]
-      end
-    end
-
-    def sort_dependencies(dependencies, activated, conflicts)
-      dependencies.sort_by do |dependency|
-        dependency.all_sources = relevant_sources_for_vertex(activated.vertex_named(dependency.name))
-        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
-
-    # Sort platforms from most general to most specific
-    def self.sort_platforms(platforms)
-      platforms.sort_by do |platform|
-        platform_sort_key(platform)
-      end
-    end
-
-    def self.platform_sort_key(platform)
-      return ["", "", ""] if Gem::Platform::RUBY == platform
-      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?
-
-        cache_message = begin
-                            " or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
-                          rescue GemfileNotFound
-                            nil
-                          end
-
-        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`"
-        elsif source = @source_requirements[name]
-          specs = source.specs[name]
-          versions_with_platforms = specs.map {|s| [s.version, s.platform] }
-          message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
-          message << if versions_with_platforms.any?
-                       "The source contains '#{name}' at: #{formatted_versions_with_platforms(versions_with_platforms)}"
-                     else
-                       "The source does not contain any versions of '#{name}'"
-                     end
-        else
-          message = "Could not find gem '#{requirement}' in any of the gem sources " \
-            "listed in your Gemfile#{cache_message}."
-        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)
-      e.message_with_trees(
-        :solver_name => "Bundler",
-        :possibility_type => "gem",
-        :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 = trees.sort_by {|t| t.flatten.map(&:to_s) }
-          trees.uniq! {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
-
-          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}))
-            other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION)
-          end
-
-          if name == "bundler" && other_bundler_required
-            o << "\n"
-            o << "This Gemfile requires a different version of Bundler.\n"
-            o << "Perhaps you need to update Bundler by running `gem install bundler`?\n"
-          end
-          if 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_sources = if conflict.requirement.source
-              [conflict.requirement.source]
-            elsif conflict.requirement.all_sources
-              conflict.requirement.all_sources
-            elsif @lockfile_uses_separate_rubygems_sources
-              # every conflict should have an explicit group of sources when we
-              # enforce strict pinning
-              raise "no source set for #{conflict}"
-            else
-              []
-            end.compact.map(&:to_s).uniq.sort
-
-            o << "Could not find gem '#{SharedHelpers.pretty_dependency(conflict.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 relevant_sources.empty?
-                   "in any of the sources.\n"
-                 else
-                   "in any of the relevant sources:\n  #{relevant_sources * "\n  "}\n"
-                 end
-          end
-        end,
-        :version_for_spec => lambda {|spec| spec.version }
-      )
-    end
-  end
-end
diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb
deleted file mode 100644
index 34d043aed7..0000000000
--- a/lib/bundler/resolver/spec_group.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Resolver
-    class SpecGroup
-      include GemHelpers
-
-      attr_accessor :name, :version, :source
-      attr_accessor :ignores_bundler_dependencies
-
-      def initialize(all_specs)
-        raise ArgumentError, "cannot initialize with an empty value" unless exemplary_spec = all_specs.first
-        @name = exemplary_spec.name
-        @version = exemplary_spec.version
-        @source = exemplary_spec.source
-
-        @activated_platforms = []
-        @dependencies = nil
-        @specs        = Hash.new do |specs, platform|
-          specs[platform] = select_best_platform_match(all_specs, platform)
-        end
-        @ignores_bundler_dependencies = true
-      end
-
-      def to_specs
-        @activated_platforms.map do |p|
-          next unless s = @specs[p]
-          lazy_spec = LazySpecification.new(name, version, s.platform, source)
-          lazy_spec.dependencies.replace s.dependencies
-          lazy_spec
-        end.compact
-      end
-
-      def activate_platform!(platform)
-        return unless for?(platform)
-        return if @activated_platforms.include?(platform)
-        @activated_platforms << platform
-      end
-
-      def for?(platform)
-        spec = @specs[platform]
-        !spec.nil?
-      end
-
-      def to_s
-        @to_s ||= "#{name} (#{version})"
-      end
-
-      def dependencies_for_activated_platforms
-        dependencies = @activated_platforms.map {|p| __dependencies[p] }
-        metadata_dependencies = @activated_platforms.map do |platform|
-          metadata_dependencies(@specs[platform], platform)
-        end
-        dependencies.concat(metadata_dependencies).flatten
-      end
-
-      def ==(other)
-        return unless other.is_a?(SpecGroup)
-        name == other.name &&
-          version == other.version &&
-          source == other.source
-      end
-
-      def eql?(other)
-        name.eql?(other.name) &&
-          version.eql?(other.version) &&
-          source.eql?(other.source)
-      end
-
-      def hash
-        to_s.hash ^ source.hash
-      end
-
-    private
-
-      def __dependencies
-        @dependencies = Hash.new do |dependencies, platform|
-          dependencies[platform] = []
-          if spec = @specs[platform]
-            spec.dependencies.each do |dep|
-              next if dep.type == :development
-              next if @ignores_bundler_dependencies && dep.name == "bundler".freeze
-              dependencies[platform] << DepProxy.new(dep, platform)
-            end
-          end
-          dependencies[platform]
-        end
-      end
-
-      def metadata_dependencies(spec, platform)
-        return [] unless spec
-        # Only allow endpoint specifications since they won't hit the network to
-        # fetch the full gemspec when calling required_ruby_version
-        return [] if !spec.is_a?(EndpointSpecification) && !spec.is_a?(Gem::Specification)
-        dependencies = []
-        if !spec.required_ruby_version.nil? && !spec.required_ruby_version.none?
-          dependencies << DepProxy.new(Gem::Dependency.new("ruby\0", spec.required_ruby_version), platform)
-        end
-        if !spec.required_rubygems_version.nil? && !spec.required_rubygems_version.none?
-          dependencies << DepProxy.new(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
deleted file mode 100644
index 244606dcc9..0000000000
--- a/lib/bundler/retry.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 => 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 incase 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
deleted file mode 100644
index f6ba220cd5..0000000000
--- a/lib/bundler/ruby_dsl.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
deleted file mode 100644
index e6c31a94c9..0000000000
--- a/lib/bundler/ruby_version.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-
-    # 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 = if defined?(RUBY_ENGINE) && !RUBY_ENGINE.nil?
-        RUBY_ENGINE.dup
-      else
-        # not defined in ruby 1.8.7
-        "ruby"
-      end
-      # :sob: mocking RUBY_VERSION breaks stuff on 1.8.7
-      ruby_version = ENV.fetch("BUNDLER_SPEC_RUBY_VERSION") { RUBY_VERSION }.dup
-      ruby_engine_version = case ruby_engine
-                            when "ruby"
-                              ruby_version
-                            when "rbx"
-                              Rubinius::VERSION.dup
-                            when "jruby"
-                              JRUBY_VERSION.dup
-                            else
-                              RUBY_ENGINE_VERSION.dup
-      end
-      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
deleted file mode 100644
index e9f0eac355..0000000000
--- a/lib/bundler/rubygems_ext.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-
-if defined?(Gem::QuickLoader)
-  # Gem Prelude makes me a sad panda :'(
-  Gem::QuickLoader.load_full_rubygems_library
-end
-
-require "rubygems"
-require "rubygems/specification"
-
-begin
-  # Possible use in Gem::Specification#source below and require
-  # shouldn't be deferred.
-  require "rubygems/source"
-rescue LoadError
-  # Not available before RubyGems 2.0.0, ignore
-  nil
-end
-
-require "bundler/match_platform"
-
-module Gem
-  @loaded_stacks = Hash.new {|h, k| h[k] = [] }
-
-  class Specification
-    attr_accessor :remote, :location, :relative_loaded_from
-
-    if instance_methods(false).map(&:to_sym).include?(:source)
-      remove_method :source
-      attr_writer :source
-      def source
-        (defined?(@source) && @source) || Gem::Source::Installed.new
-      end
-    else
-      attr_accessor :source
-    end
-
-    alias_method :rg_full_gem_path, :full_gem_path
-    alias_method :rg_loaded_from,   :loaded_from
-
-    attr_writer :full_gem_path unless instance_methods.include?(:full_gem_path=)
-
-    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.untaint
-      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
-      return full_require_paths if respond_to?(:full_require_paths)
-
-      require_paths.map do |require_path|
-        if require_path.include?(full_gem_path)
-          require_path
-        else
-          File.join(full_gem_path, require_path)
-        end
-      end
-    end
-
-    if method_defined?(:extension_dir)
-      alias_method :rg_extension_dir, :extension_dir
-      def extension_dir
-        @bundler_extension_dir ||= if source.respond_to?(:extension_dir_name)
-          File.expand_path(File.join(extensions_dir, source.extension_dir_name))
-        else
-          rg_extension_dir
-        end
-      end
-    end
-
-    # RubyGems 1.8+ used only.
-    methods = instance_methods(false)
-    gem_dir = methods.first.is_a?(String) ? "gem_dir" : :gem_dir
-    remove_method :gem_dir if methods.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
-
-  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, :all_sources
-
-    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", "@all_sources"].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
-
-    # Backport of performance enhancement added to RubyGems 1.4
-    def matches_spec?(spec)
-      # name can be a Regexp, so use ===
-      return false unless name === spec.name
-      return true  if requirement.none?
-
-      requirement.satisfied_by?(spec.version)
-    end unless allocate.respond_to?(:matches_spec?)
-  end
-
-  class Requirement
-    # Backport of performance enhancement added to RubyGems 1.4
-    def none?
-      # note that it might be tempting to replace with with RubyGems 2.0's
-      # improved implementation. Don't. It requires `DefaultRequirement` to be
-      # defined, and more importantantly, these overrides are not used when the
-      # running RubyGems defines these methods
-      to_s == ">= 0"
-    end unless allocate.respond_to?(:none?)
-
-    # Backport of performance enhancement added to RubyGems 2.2
-    def exact?
-      return false unless @requirements.size == 1
-      @requirements[0][0] == "="
-    end unless allocate.respond_to?(:exact?)
-  end
-
-  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)
-
-    undef_method :hash if method_defined? :hash
-    def hash
-      @cpu.hash ^ @os.hash ^ @version.hash
-    end
-
-    undef_method :eql? if method_defined? :eql?
-    alias_method :eql?, :==
-  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
deleted file mode 100644
index 2b7fa8e0f6..0000000000
--- a/lib/bundler/rubygems_gem_installer.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/installer"
-
-module Bundler
-  class RubyGemsGemInstaller < Gem::Installer
-    unless respond_to?(:at)
-      def self.at(*args)
-        new(*args)
-      end
-    end
-
-    def check_executable_overwrite(filename)
-      # Bundler needs to install gems regardless of binstub overwriting
-    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]
-      return super unless extension_cache_path && extension_dir = Bundler.rubygems.spec_extension_dir(spec)
-
-      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
-        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 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 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
deleted file mode 100644
index 783d106e7b..0000000000
--- a/lib/bundler/rubygems_integration.rb
+++ /dev/null
@@ -1,898 +0,0 @@
-# frozen_string_literal: true
-
-require "monitor"
-require "rubygems"
-require "rubygems/config_file"
-
-module Bundler
-  class RubygemsIntegration
-    if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
-      EXT_LOCK = Gem::Ext::Builder::CHDIR_MONITOR
-    else
-      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 = {}
-    end
-
-    def version
-      self.class.version
-    end
-
-    def provides?(req_str)
-      self.class.provides?(req_str)
-    end
-
-    def build_args
-      Gem::Command.build_args
-    end
-
-    def build_args=(args)
-      Gem::Command.build_args = args
-    end
-
-    def load_path_insert_index
-      Gem.load_path_insert_index
-    end
-
-    def loaded_specs(name)
-      Gem.loaded_specs[name]
-    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?(spec)
-      return false if spec.extensions.empty?
-
-      default
-    end
-
-    def spec_default_gem?(spec)
-      spec.respond_to?(:default_gem?) && spec.default_gem?
-    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 spec_extension_dir(spec)
-      return unless spec.respond_to?(:extension_dir)
-      spec.extension_dir
-    end
-
-    def stub_set_spec(stub, spec)
-      stub.instance_variable_set(:@spec, spec)
-    end
-
-    def path(obj)
-      obj.to_s
-    end
-
-    def platforms
-      return [Gem::Platform::RUBY] if Bundler.settings[:force_ruby_platform]
-      Gem.platforms
-    end
-
-    def configuration
-      require "bundler/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)
-      if defined?(Gem::Util)
-        Gem::Util.inflate(obj)
-      else
-        Gem.inflate(obj)
-      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 config_map
-      Gem::ConfigMap
-    end
-
-    def repository_subdirectories
-      %w[cache doc gems specifications]
-    end
-
-    def clear_paths
-      Gem.clear_paths
-    end
-
-    def bin_path(gem, bin, ver)
-      Gem.bin_path(gem, bin, ver)
-    end
-
-    def path_separator
-      File::PATH_SEPARATOR
-    end
-
-    def preserve_paths
-      # this is a no-op outside of RubyGems 1.8
-      yield
-    end
-
-    def loaded_gem_paths
-      # RubyGems 2.2+ can put binary extension into dedicated folders,
-      # therefore use RubyGems facilities to obtain their load paths.
-      if Gem::Specification.method_defined? :full_require_paths
-        loaded_gem_paths = Gem.loaded_specs.map {|_, s| s.full_require_paths }
-        loaded_gem_paths.flatten
-      else
-        $LOAD_PATH.select do |p|
-          Bundler.rubygems.gem_path.any? {|gp| p =~ /^#{Regexp.escape(gp)}/ }
-        end
-      end
-    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 ui=(obj)
-      Gem::DefaultUserInteraction.ui = obj
-    end
-
-    def ext_lock
-      EXT_LOCK
-    end
-
-    def fetch_specs(all, pre, &blk)
-      require "rubygems/spec_fetcher"
-      specs = Gem::SpecFetcher.new.list(all, pre)
-      specs.each { yield } if block_given?
-      specs
-    end
-
-    def fetch_prerelease_specs
-      fetch_specs(false, true)
-    rescue Gem::RemoteFetcher::FetchError
-      {} # if we can't download them, there aren't any
-    end
-
-    # TODO: This is for older versions of RubyGems... should we support the
-    # X-Gemfile-Source header on these old versions?
-    # Maybe the newer implementation will work on older RubyGems?
-    # It seems difficult to keep this implementation and still send the header.
-    def fetch_all_remote_specs(remote)
-      old_sources = Bundler.rubygems.sources
-      Bundler.rubygems.sources = [remote.uri.to_s]
-      # Fetch all specs, minus prerelease specs
-      spec_list = fetch_specs(true, false)
-      # Then fetch the prerelease specs
-      fetch_prerelease_specs.each {|k, v| spec_list[k].concat(v) }
-
-      spec_list.values.first
-    ensure
-      Bundler.rubygems.sources = old_sources
-    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 install_with_build_args(args)
-      with_build_args(args) { yield }
-    end
-
-    def gem_from_path(path, policy = nil)
-      require "rubygems/format"
-      Gem::Format.from_file_by_path(path, policy)
-    end
-
-    def spec_from_gem(path, policy = nil)
-      require "rubygems/security"
-      require "bundler/psyched_yaml"
-      gem_from_path(path, security_policies[policy]).spec
-    rescue Gem::Package::FormatError
-      raise GemspecError, "Could not read gem at #{path}. It may be corrupted."
-    rescue Exception, Gem::Exception, Gem::Security::Exception => e
-      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(spec, skip_validation = false)
-      require "rubygems/builder"
-      Gem::Builder.new(spec).build
-    end
-
-    def build_gem(gem_dir, spec)
-      build(spec)
-    end
-
-    def download_gem(spec, uri, path)
-      uri = Bundler.settings.mirror_for(uri)
-      fetcher = Gem::RemoteFetcher.new(configuration[:http_proxy])
-      Bundler::Retry.new("download gem from #{uri}").attempts do
-        fetcher.download(spec, uri, path)
-      end
-    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 binstubs_call_gem?
-      true
-    end
-
-    def stubs_provide_full_functionality?
-      false
-    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|
-          executables ||= specs.map(&:executables).flatten if ::Bundler.rubygems.binstubs_call_gem?
-          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?
-            "#{dep.name} is not part of the bundle." \
-            " Add it to your #{Bundler.default_gemfile.basename}."
-          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/bundler/bundler/issues/5102
-        kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
-      end
-    end
-
-    def stub_source_index(specs)
-      Gem::SourceIndex.send(:alias_method, :old_initialize, :initialize)
-      redefine_method(Gem::SourceIndex, :initialize) do |*args|
-        @gems = {}
-        # You're looking at this thinking: Oh! This is how I make those
-        # rubygems deprecations go away!
-        #
-        # You'd be correct BUT using of this method in production code
-        # must be approved by the rubygems team itself!
-        #
-        # This is your warning. If you use this and don't have approval
-        # we can't protect you.
-        #
-        Deprecate.skip_during do
-          self.spec_dirs = *args
-          add_specs(*specs)
-        end
-      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, 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
-
-        spec_with_name = specs_by_name[gem_name]
-        spec = if exec_name
-          if spec_with_name && spec_with_name.executables.include?(exec_name)
-            spec_with_name
-          else
-            specs.find {|s| s.executables.include?(exec_name) }
-          end
-        else
-          spec_with_name
-        end
-
-        unless spec
-          message = "can't find executable #{exec_name} for gem #{gem_name}"
-          if !exec_name || 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
-
-        raise Gem::Exception, "no default executable for #{spec.full_name}" unless exec_name ||= spec.default_executable
-
-        unless spec.name == gem_name
-          Bundler::SharedHelpers.major_deprecation 2,
-            "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
-        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
-
-    # Because Bundler has a static view of what specs are available,
-    # we don't #refresh, so stub it out.
-    def replace_refresh
-      gem_class = (class << Gem; self; end)
-      redefine_method(gem_class, :refresh) {}
-    end
-
-    # Replace or hook into RubyGems to provide a bundlerized view
-    # of the world.
-    def replace_entrypoints(specs)
-      specs_by_name = specs.reduce({}) do |h, s|
-        h[s.name] = s
-        h
-      end
-
-      replace_gem(specs, specs_by_name)
-      stub_rubygems(specs)
-      replace_bin_path(specs, specs_by_name)
-      replace_refresh
-
-      Gem.clear_paths
-    end
-
-    # This backports the correct segment generation code from RubyGems 1.4+
-    # by monkeypatching it into the method in RubyGems 1.3.6 and 1.3.7.
-    def backport_segment_generation
-      redefine_method(Gem::Version, :segments) do
-        @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-          /^\d+$/ =~ s ? s.to_i : s
-        end
-      end
-    end
-
-    # This backport fixes the marshaling of @segments.
-    def backport_yaml_initialize
-      redefine_method(Gem::Version, :yaml_initialize) do |_, map|
-        @version = map["version"]
-        @segments = nil
-        @hash = nil
-      end
-    end
-
-    # This backports base_dir which replaces installation path
-    # RubyGems 1.8+
-    def backport_base_dir
-      redefine_method(Gem::Specification, :base_dir) do
-        return Gem.dir unless loaded_from
-        File.dirname File.dirname loaded_from
-      end
-    end
-
-    def backport_cache_file
-      redefine_method(Gem::Specification, :cache_dir) do
-        @cache_dir ||= File.join base_dir, "cache"
-      end
-
-      redefine_method(Gem::Specification, :cache_file) do
-        @cache_file ||= File.join cache_dir, "#{full_name}.gem"
-      end
-    end
-
-    def backport_spec_file
-      redefine_method(Gem::Specification, :spec_dir) do
-        @spec_dir ||= File.join base_dir, "specifications"
-      end
-
-      redefine_method(Gem::Specification, :spec_file) do
-        @spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
-      end
-    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
-
-    # RubyGems 1.4 through 1.6
-    class Legacy < RubygemsIntegration
-      def initialize
-        super
-        backport_base_dir
-        backport_cache_file
-        backport_spec_file
-        backport_yaml_initialize
-      end
-
-      def stub_rubygems(specs)
-        # RubyGems versions lower than 1.7 use SourceIndex#from_gems_in
-        source_index_class = (class << Gem::SourceIndex; self; end)
-        redefine_method(source_index_class, :from_gems_in) do |*args|
-          Gem::SourceIndex.new.tap do |source_index|
-            source_index.spec_dirs = *args
-            source_index.add_specs(*specs)
-          end
-        end
-      end
-
-      def all_specs
-        Gem.source_index.gems.values
-      end
-
-      def find_name(name)
-        Gem.source_index.find_name(name)
-      end
-
-      def validate(spec)
-        # These versions of RubyGems always validate in "packaging" mode,
-        # which is too strict for the kinds of checks we care about. As a
-        # result, validation is disabled on versions of RubyGems below 1.7.
-      end
-
-      def post_reset_hooks
-        []
-      end
-
-      def reset
-      end
-    end
-
-    # RubyGems versions 1.3.6 and 1.3.7
-    class Ancient < Legacy
-      def initialize
-        super
-        backport_segment_generation
-      end
-    end
-
-    # RubyGems 1.7
-    class Transitional < Legacy
-      def stub_rubygems(specs)
-        stub_source_index(specs)
-      end
-
-      def validate(spec)
-        # Missing summary is downgraded to a warning in later versions,
-        # so we set it to an empty string to prevent an exception here.
-        spec.summary ||= ""
-        RubygemsIntegration.instance_method(:validate).bind(self).call(spec)
-      end
-    end
-
-    # RubyGems 1.8.5-1.8.19
-    class Modern < RubygemsIntegration
-      def stub_rubygems(specs)
-        Gem::Specification.all = specs
-
-        Gem.post_reset do
-          Gem::Specification.all = specs
-        end
-
-        stub_source_index(specs)
-      end
-
-      def all_specs
-        Gem::Specification.to_a
-      end
-
-      def find_name(name)
-        Gem::Specification.find_all_by_name name
-      end
-    end
-
-    # RubyGems 1.8.0 to 1.8.4
-    class AlmostModern < Modern
-      # RubyGems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever
-      # you call Gem::Installer#install with an :install_dir set. We have to
-      # change it back for our sudo mode to work.
-      def preserve_paths
-        old_dir = gem_dir
-        old_path = gem_path
-        yield
-        Gem.use_paths(old_dir, old_path)
-      end
-    end
-
-    # RubyGems 1.8.20+
-    class MoreModern < Modern
-      # RubyGems 1.8.20 and adds the skip_validation parameter, so that's
-      # when we start passing it through.
-      def build(spec, skip_validation = false)
-        require "rubygems/builder"
-        Gem::Builder.new(spec).build(skip_validation)
-      end
-    end
-
-    # RubyGems 2.0
-    class Future < RubygemsIntegration
-      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 all_specs
-        Gem::Specification.to_a
-      end
-
-      def find_name(name)
-        Gem::Specification.find_all_by_name name
-      end
-
-      def fetch_specs(source, remote, name)
-        path = source + "#{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 => e
-        # it's okay for prerelease to fail
-        raise e unless name == "prerelease_specs"
-      end
-
-      def fetch_all_remote_specs(remote)
-        source = remote.uri.is_a?(URI) ? remote.uri : URI.parse(source.to_s)
-
-        specs = fetch_specs(source, remote, "specs")
-        pres = fetch_specs(source, remote, "prerelease_specs") || []
-
-        specs.concat(pres)
-      end
-
-      def download_gem(spec, uri, path)
-        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
-          fetcher.download(spec, uri, path)
-        end
-      end
-
-      def gem_remote_fetcher
-        require "resolv"
-        proxy = configuration[:http_proxy]
-        dns = Resolv::DNS.new
-        Bundler::GemRemoteFetcher.new(proxy, dns)
-      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
-    end
-
-    # RubyGems 2.1.0
-    class MoreFuture < Future
-      def initialize
-        super
-        backport_ext_builder_monitor
-      end
-
-      def all_specs
-        require "bundler/remote_specification"
-        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 <<-RB, __FILE__, __LINE__ + 1
-          module Ext
-          end
-        RB
-
-        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
-
-      if Gem::Specification.respond_to?(:stubs_for)
-        def find_name(name)
-          Gem::Specification.stubs_for(name).map(&:to_spec)
-        end
-      else
-        def find_name(name)
-          Gem::Specification.stubs.find_all do |spec|
-            spec.name == name
-          end.map(&:to_spec)
-        end
-      end
-
-      def use_gemdeps(gemfile)
-        ENV["BUNDLE_GEMFILE"] ||= File.expand_path(gemfile)
-        require "bundler/gemdeps"
-        runtime = Bundler.setup
-        Bundler.ui = nil
-        activated_spec_names = runtime.requested_specs.map(&:to_spec).sort_by(&:name)
-        [Gemdeps.new(runtime), activated_spec_names]
-      end
-
-      if provides?(">= 2.5.2")
-        # RubyGems-generated binstubs call Kernel#gem
-        def binstubs_call_gem?
-          false
-        end
-
-        # only 2.5.2+ has all of the stub methods we want to use, and since this
-        # is a performance optimization _only_,
-        # we'll restrict ourselves to the most
-        # recent RG versions instead of all versions that have stubs
-        def stubs_provide_full_functionality?
-          true
-        end
-      end
-    end
-  end
-
-  def self.rubygems
-    @rubygems ||= if RubygemsIntegration.provides?(">= 2.1.0")
-      RubygemsIntegration::MoreFuture.new
-    elsif RubygemsIntegration.provides?(">= 1.99.99")
-      RubygemsIntegration::Future.new
-    elsif RubygemsIntegration.provides?(">= 1.8.20")
-      RubygemsIntegration::MoreModern.new
-    elsif RubygemsIntegration.provides?(">= 1.8.5")
-      RubygemsIntegration::Modern.new
-    elsif RubygemsIntegration.provides?(">= 1.8.0")
-      RubygemsIntegration::AlmostModern.new
-    elsif RubygemsIntegration.provides?(">= 1.7.0")
-      RubygemsIntegration::Transitional.new
-    elsif RubygemsIntegration.provides?(">= 1.4.0")
-      RubygemsIntegration::Legacy.new
-    else # RubyGems 1.3.6 and 1.3.7
-      RubygemsIntegration::Ancient.new
-    end
-  end
-end
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
deleted file mode 100644
index 762e7b3ec6..0000000000
--- a/lib/bundler/runtime.rb
+++ /dev/null
@@ -1,322 +0,0 @@
-# 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?
-
-      groups.map!(&:to_sym)
-
-      # Has to happen first
-      clean_load_path
-
-      specs = groups.any? ? @definition.specs_for(groups) : requested_specs
-
-      SharedHelpers.set_bundle_environment
-      Bundler.rubygems.replace_entrypoints(specs)
-
-      # Activate the specs
-      load_paths = specs.map do |spec|
-        unless spec.loaded_from
-          raise GemNotFound, "#{spec.full_name} is missing. Run `bundle install` to get it."
-        end
-
-        check_for_activated_spec!(spec)
-
-        Bundler.rubygems.mark_loaded(spec)
-        spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
-      end.reverse.flatten
-
-      # See Gem::Specification#add_self_to_load_path (since RubyGems 1.8)
-      if insert_index = Bundler.rubygems.load_path_insert_index
-        # Gem directories must come after -I and ENV['RUBYLIB']
-        $LOAD_PATH.insert(insert_index, *load_paths)
-      else
-        # We are probably testing in core, -I and RUBYLIB don't apply
-        $LOAD_PATH.unshift(*load_paths)
-      end
-
-      setup_manpath
-
-      lock(:preserve_unknown_sections => true)
-
-      self
-    end
-
-    REQUIRE_ERRORS = [
-      /^no such file to load -- (.+)$/i,
-      /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
-      /^Missing API definition file in (.+)$/i,
-      /^cannot load such file -- (.+)$/i,
-      /^dlopen\([^)]*\): Library not loaded: (.+)$/i,
-    ].freeze
-
-    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
-          REQUIRE_ERRORS.find {|r| r =~ e.message }
-          raise if dep.autorequire || $1 != required_file
-
-          if dep.autorequire.nil? && dep.name.include?("-")
-            begin
-              namespaced_file = dep.name.tr("-", "/")
-              Kernel.require namespaced_file
-            rescue LoadError => e
-              REQUIRE_ERRORS.find {|r| r =~ e.message }
-              raise if $1 != 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)
-      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 = Bundler.settings[:cache_all_platforms] ? @definition.resolve.materialized_for_all_platforms : specs
-      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/*/*/*"]
-      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 = []
-      specs.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"].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 Bundler.rubygems.spec_default_gem?(activated_spec)
-        "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
deleted file mode 100644
index fe68d510ff..0000000000
--- a/lib/bundler/settings.rb
+++ /dev/null
@@ -1,463 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-
-module Bundler
-  class Settings
-    autoload :Mirror,  "bundler/mirror"
-    autoload :Mirrors, "bundler/mirror"
-    autoload :Validator, "bundler/settings/validator"
-
-    BOOL_KEYS = %w[
-      allow_bundler_dependency_conflicts
-      allow_deployment_source_credential_changes
-      allow_offline_install
-      auto_clean_without_path
-      auto_install
-      auto_config_jobs
-      cache_all
-      cache_all_platforms
-      cache_command_is_package
-      console_command
-      default_install_uses_path
-      deployment
-      deployment_means_frozen
-      disable_checksum_validation
-      disable_exec_load
-      disable_local_branch_check
-      disable_multisource
-      disable_platform_warnings
-      disable_shared_gems
-      disable_version_check
-      error_on_stderr
-      force_ruby_platform
-      forget_cli_options
-      frozen
-      gem.coc
-      gem.mit
-      global_path_appends_ruby_scope
-      global_gem_cache
-      ignore_messages
-      init_gems_rb
-      list_command
-      lockfile_uses_separate_rubygems_sources
-      major_deprecations
-      no_install
-      no_prune
-      only_update_to_newer_versions
-      path_relative_to_cwd
-      path.system
-      plugins
-      prefer_gems_rb
-      print_only_version_number
-      setup_makes_kernel_gem_public
-      silence_root_warning
-      skip_default_git_sources
-      specific_platform
-      suppress_install_using_messages
-      unlock_source_unlocks_spec
-      update_requires_all_flag
-      use_gem_version_promoter_for_major_updates
-      viz_command
-    ].freeze
-
-    NUMBER_KEYS = %w[
-      jobs
-      redirect
-      retry
-      ssl_verify_mode
-      timeout
-    ].freeze
-
-    ARRAY_KEYS = %w[
-      with
-      without
-    ].freeze
-
-    DEFAULT_CONFIG = {
-      :disable_version_check => true,
-      :redirect => 5,
-      :retry => 3,
-      :timeout => 10,
-    }.freeze
-
-    def initialize(root = nil)
-      @root            = root
-      @local_config    = load_config(local_config_file)
-      @global_config   = load_config(global_config_file)
-      @temporary       = {}
-    end
-
-    def [](name)
-      key = key_for(name)
-      value = @temporary.fetch(key) do
-              @local_config.fetch(key) do
-              ENV.fetch(key) do
-              @global_config.fetch(key) do
-              DEFAULT_CONFIG.fetch(name) do
-                nil
-              end end end end end
-
-      converted_value(value, name)
-    end
-
-    def set_command_option(key, value)
-      if Bundler.feature_flag.forget_cli_options?
-        temporary(key => value)
-        value
-      else
-        command = if value.nil?
-          "bundle config --delete #{key}"
-        else
-          "bundle config #{key} #{Array(value).join(":")}"
-        end
-
-        Bundler::SharedHelpers.major_deprecation 2,\
-          "flags passed to commands " \
-          "will no longer be automatically remembered. Instead please set flags " \
-          "you want remembered between commands using `bundle config " \
-          "<setting name> <setting value>`, i.e. `#{command}`"
-
-        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
-      env_keys = ENV.keys.grep(/\ABUNDLE_.+/)
-
-      keys = @temporary.keys | @global_config.keys | @local_config.keys | env_keys
-
-      keys.map do |key|
-        key.sub(/^BUNDLE_/, "").gsub(/__/, ".").downcase
-      end
-    end
-
-    def local_overrides
-      repos = {}
-      all.each do |k|
-        repos[$'] = self[k] if k =~ /^local\./
-      end
-      repos
-    end
-
-    def mirror_for(uri)
-      uri = URI(uri.to_s) unless uri.is_a?(URI)
-      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)
-      locations = {}
-      locations[:temporary] = @temporary[key] if @temporary.key?(key)
-      locations[:local]  = @local_config[key] if @local_config.key?(key)
-      locations[:env]    = ENV[key] if ENV[key]
-      locations[:global] = @global_config[key] if @global_config.key?(key)
-      locations[:default] = DEFAULT_CONFIG[key] if DEFAULT_CONFIG.key?(key)
-      locations
-    end
-
-    def pretty_values_for(exposed_key)
-      key = key_for(exposed_key)
-
-      locations = []
-
-      if @temporary.key?(key)
-        locations << "Set for the current command: #{converted_value(@temporary[key], exposed_key).inspect}"
-      end
-
-      if @local_config.key?(key)
-        locations << "Set for your local app (#{local_config_file}): #{converted_value(@local_config[key], exposed_key).inspect}"
-      end
-
-      if value = ENV[key]
-        locations << "Set via #{key}: #{converted_value(value, exposed_key).inspect}"
-      end
-
-      if @global_config.key?(key)
-        locations << "Set for the current user (#{global_config_file}): #{converted_value(@global_config[key], exposed_key).inspect}"
-      end
-
-      return ["You have not configured a value for `#{exposed_key}`"] if locations.empty?
-      locations
-    end
-
-    # for legacy reasons, in Bundler 1, the ruby scope isnt appended when the setting comes from ENV or the global config,
-    # nor do we respect :disable_shared_gems
-    def path
-      key  = key_for(:path)
-      path = ENV[key] || @global_config[key]
-      if path && !@temporary.key?(key) && !@local_config.key?(key)
-        return Path.new(path, Bundler.feature_flag.global_path_appends_ruby_scope?, false, false)
-      end
-
-      system_path = self["path.system"] || (self[:disable_shared_gems] == false)
-      Path.new(self[:path], true, system_path, Bundler.feature_flag.default_install_uses_path?)
-    end
-
-    Path = Struct.new(:explicit_path, :append_ruby_scope, :system_path, :default_install_uses_path) do
-      def path
-        path = base_path
-        path = File.join(path, Bundler.ruby_scope) if append_ruby_scope && !use_system_gems?
-        path
-      end
-
-      def use_system_gems?
-        return true if system_path
-        return false if explicit_path
-        !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, @global_config].each do |settings|
-          value = converted_value(settings[key_for(raw_key)], raw_key)
-          Validator.validate!(raw_key, value, settings.to_hash.dup)
-        end
-      end
-    end
-
-    def key_for(key)
-      key = Settings.normalize_uri(key).to_s if key.is_a?(String) && /https?:/ =~ key
-      key = key.to_s.gsub(".", "__").upcase
-      "BUNDLE_#{key}"
-    end
-
-  private
-
-    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 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 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 "bundler/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 global_config_file
-      if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
-        Pathname.new(ENV["BUNDLE_CONFIG"])
-      else
-        begin
-          Bundler.user_bundle_path("config")
-        rescue PermissionError, GenericSystemCallError
-          nil
-        end
-      end
-    end
-
-    def local_config_file
-      Pathname.new(@root).join("config") if @root
-    end
-
-    CONFIG_REGEX = %r{ # rubocop:disable Style/RegexpLiteral
-      ^
-      (BUNDLE_.+):\s # the key
-      (?: !\s)? # optional exclamation mark found with ruby 1.9.3
-      (['"]?) # optional opening quote
-      (.* # contents of the value
-        (?: # optionally, up until the next key
-          (\n(?!BUNDLE).+)*
-        )
-      )
-      \2 # matching closing quote
-      $
-    }xo
-
-    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 "bundler/yaml_serializer"
-        YAMLSerializer.load file.read
-      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
-
-    # 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?("/")
-      uri = 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
deleted file mode 100644
index 0a57ea7f03..0000000000
--- a/lib/bundler/settings/validator.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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
deleted file mode 100644
index ac6a5bf861..0000000000
--- a/lib/bundler/setup.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/shared_helpers"
-
-if Bundler::SharedHelpers.in_bundle?
-  require "bundler"
-
-  if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
-    begin
-      Bundler.setup
-    rescue Bundler::BundlerError => e
-      puts "\e[31m#{e.message}\e[0m"
-      puts e.backtrace.join("\n") if ENV["DEBUG"]
-      if e.is_a?(Bundler::GemNotFound)
-        puts "\e[33mRun `bundle install` to install missing gems.\e[0m"
-      end
-      exit e.status_code
-    end
-  else
-    Bundler.setup
-  end
-
-  # Add bundler to the load path after disabling system gems
-  bundler_lib = File.expand_path("../..", __FILE__)
-  $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
-
-  Bundler.ui = nil
-end
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
deleted file mode 100644
index a4c09e36eb..0000000000
--- a/lib/bundler/shared_helpers.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/compatibility_guard"
-
-require "pathname"
-require "rubygems"
-
-require "bundler/version"
-require "bundler/constants"
-require "bundler/rubygems_integration"
-require "bundler/current_ruby"
-
-module Gem
-  class Dependency
-    # This is only needed for RubyGems < 1.4
-    unless method_defined? :requirement
-      def requirement
-        version_requirements
-      end
-    end
-  end
-end
-
-module Bundler
-  module SharedHelpers
-    def root
-      gemfile = find_gemfile
-      raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-      Pathname.new(gemfile).untaint.expand_path.parent
-    end
-
-    def default_gemfile
-      gemfile = find_gemfile(:order_matters)
-      raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-      Pathname.new(gemfile).untaint.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.untaint
-    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)
-      # Use block.call instead of yield because of a bug in Ruby 2.2.2
-      # See https://github.com/bundler/bundler/issues/5341 for details
-      block.call(path.dup.untaint)
-    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)
-      if Bundler.bundler_major_version >= major_version
-        require "bundler/errors"
-        raise DeprecatedError, "[REMOVED FROM #{major_version}.0] #{message}"
-      end
-
-      return unless prints_major_deprecations?
-      @major_deprecation_ui ||= Bundler::UI::Shell.new("no-color" => true)
-      ui = Bundler.ui.is_a?(@major_deprecation_ui.class) ? Bundler.ui : @major_deprecation_ui
-      ui.warn("[DEPRECATED FOR #{major_version}.0] #{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 false if gemfiles.size == 1
-      end
-      if multiple_gemfiles && Bundler.bundler_major_version == 1
-        Bundler::SharedHelpers.major_deprecation 2, \
-          "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
-      end
-
-      if RUBY_VERSION < "2"
-        major_deprecation(2, "Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}")
-      end
-      return if Bundler.rubygems.provides?(">= 2")
-      major_deprecation(2, "Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}")
-    end
-
-    def trap(signal, override = false, &block)
-      prior = Signal.trap(signal) do
-        block.call
-        prior.call unless override
-      end
-    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::MD5.digest("")
-        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(order_matters = false)
-      given = ENV["BUNDLE_GEMFILE"]
-      return given if given && !given.empty?
-      names = gemfile_names
-      names.reverse! if order_matters && Bundler.feature_flag.prefer_gems_rb?
-      find_file(*names)
-    end
-
-    def gemfile_names
-      ["Gemfile", "gems.rb"]
-    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).untaint
-
-      until !File.directory?(current) || current == previous
-        if ENV["BUNDLE_SPEC_RUN"]
-          # avoid stepping above the tmp directory when testing
-          gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
-            # for Ruby Core
-            "lib/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
-      begin
-        exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
-        unless File.exist?(exe_file)
-          exe_file = File.expand_path("../../../exe/bundle", __FILE__)
-        end
-        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
-      rescue Gem::GemNotFoundException
-        exe_file = File.expand_path("../../../exe/bundle", __FILE__)
-        # for Ruby core repository
-        exe_file = File.expand_path("../../../../bin/bundle", __FILE__) unless File.exist?(exe_file)
-        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
-      end
-
-      # Set BUNDLE_GEMFILE
-      Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile(:order_matters).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
-      return if !rubyopt.empty? && rubyopt.first =~ %r{-rbundler/setup}
-      rubyopt.unshift %(-rbundler/setup)
-      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
-      # handle 1.9 where system gems are always on the load path
-      return unless defined?(::Gem)
-
-      bundler_lib = bundler_ruby_lib
-
-      loaded_gem_paths = Bundler.rubygems.loaded_gem_paths
-
-      $LOAD_PATH.reject! do |p|
-        next if resolve_path(p).start_with?(bundler_lib)
-        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 "bundler"
-      deprecation_release = Bundler::VERSION.split(".").drop(1).include?("99")
-      return false if !deprecation_release && !Bundler.settings[:major_deprecations]
-      require "bundler/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
deleted file mode 100644
index b7f3ee7afa..0000000000
--- a/lib/bundler/similarity_detector.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-
-    # http://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
deleted file mode 100644
index 26a3625bb1..0000000000
--- a/lib/bundler/source.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Source
-    autoload :Gemspec,  "bundler/source/gemspec"
-    autoload :Git,      "bundler/source/git"
-    autoload :Metadata, "bundler/source/metadata"
-    autoload :Path,     "bundler/source/path"
-    autoload :Rubygems, "bundler/source/rubygems"
-
-    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
-
-    # 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 include?(other)
-      other == self
-    end
-
-    def inspect
-      "#<#{self.class}:0x#{object_id} #{self}>"
-    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
deleted file mode 100644
index 7e3447e776..0000000000
--- a/lib/bundler/source/gemspec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
deleted file mode 100644
index 0b00608bdd..0000000000
--- a/lib/bundler/source/git.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_fileutils"
-require "uri"
-
-module Bundler
-  class Source
-    class Git < Path
-      autoload :GitProxy, "bundler/source/git/git_proxy"
-
-      attr_reader :uri, :ref, :branch, :options, :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"] || "master"
-        @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 @glob == DEFAULT_GLOB
-        out << "  specs:\n"
-      end
-
-      def hash
-        [self.class, uri, ref, branch, name, version, 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 && submodules == other.submodules
-      end
-
-      alias_method :==, :eql?
-
-      def to_s
-        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
-        else
-          ref
-        end
-
-        rev = begin
-                "@#{shortref_for_display(revision)}"
-              rescue GitError
-                nil
-              end
-
-        "#{@safe_uri} (at #{at}#{rev})"
-      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?
-
-        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 use " \
-            "`bundle config --delete` to remove the local override"
-        end
-
-        unless path.exist?
-          raise GitError, "Cannot use local override for #{name} because #{path} " \
-            "does not exist. Check `bundle config --delete` 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 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
-
-    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 local?
-        @local
-      end
-
-      def requires_checkout?
-        allow_git_ops? && !local?
-      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 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 = 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
-        SharedHelpers.digest(:SHA1).hexdigest(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
-
-      if Bundler.rubygems.stubs_provide_full_functionality?
-        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.untaint
-          StubSpecification.from_stub(stub)
-        end
-      end
-
-      def git_scope
-        "#{base_name}-#{uri_hash}"
-      end
-
-      def extension_cache_slug(_)
-        extension_dir_name
-      end
-    end
-  end
-end
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
deleted file mode 100644
index cd964f7e56..0000000000
--- a/lib/bundler/source/git/git_proxy.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-# frozen_string_literal: true
-
-require "shellwords"
-require "tempfile"
-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 a `git #{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 http://github.com/bundler/bundler/issues "
-          msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
-          super msg
-        end
-      end
-
-      class GitCommandError < GitError
-        def initialize(command, path = nil, extra_info = nil)
-          msg = String.new
-          msg << "Git error: command `git #{command}` in directory #{SharedHelpers.pwd} has failed."
-          msg << "\n#{extra_info}" if extra_info
-          msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path && path.exist?
-          super msg
-        end
-      end
-
-      class MissingGitRevisionError < GitError
-        def initialize(ref, repo)
-          msg = "Revision #{ref} does not exist in the repository #{repo}. Maybe you misspelled it?"
-          super 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
-          raise GitNotInstalledError.new if allow? && !Bundler.git_present?
-        end
-
-        def revision
-          return @revision if @revision
-
-          begin
-            @revision ||= find_local_revision
-          rescue GitCommandError
-            raise MissingGitRevisionError.new(ref, URICredentialsFilter.credential_filtered_uri(uri))
-          end
-
-          @revision
-        end
-
-        def branch
-          @branch ||= allowed_in_path do
-            git("rev-parse --abbrev-ref HEAD").strip
-          end
-        end
-
-        def contains?(commit)
-          allowed_in_path do
-            result = git_null("branch --contains #{commit}")
-            $? == 0 && 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 = "#{Shellwords.shellescape(ref)}:#{Shellwords.shellescape(ref)}" if ref && ref.start_with?("refs/")
-
-          Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
-
-          unless path.exist?
-            SharedHelpers.filesystem_access(path.dirname) do |p|
-              FileUtils.mkdir_p(p)
-            end
-            git_retry %(clone #{uri_escaped_with_configured_credentials} "#{path}" --bare --no-hardlinks --quiet)
-            return unless extra_ref
-          end
-
-          in_path do
-            git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*" #{extra_ref})
-          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}" "#{destination}")
-              File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination)
-            rescue Errno::EEXIST => e
-              file_path = e.message[%r{.*?(/.*)}, 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
-          SharedHelpers.chdir(destination) do
-            git_retry %(fetch --force --quiet --tags "#{path}")
-
-            begin
-              git "reset --hard #{@revision}"
-            rescue GitCommandError
-              raise MissingGitRevisionError.new(@revision, URICredentialsFilter.credential_filtered_uri(uri))
-            end
-
-            if submodules
-              git_retry "submodule update --init --recursive"
-            elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
-              git_retry "submodule deinit --all --force"
-            end
-          end
-        end
-
-      private
-
-        # TODO: Do not rely on /dev/null.
-        # Given that open3 is not cross platform until Ruby 1.9.3,
-        # the best solution is to pipe to /dev/null if it exists.
-        # If it doesn't, everything will work fine, but the user
-        # will get the $stderr messages as well.
-        def git_null(command)
-          git("#{command} 2>#{Bundler::NULL}", false)
-        end
-
-        def git_retry(command)
-          Bundler::Retry.new("`git #{URICredentialsFilter.credential_filtered_string(command, uri)}`", GitNotAllowedError).attempts do
-            git(command)
-          end
-        end
-
-        def git(command, check_errors = true, error_msg = nil)
-          command_with_no_credentials = URICredentialsFilter.credential_filtered_string(command, uri)
-          raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
-
-          out = SharedHelpers.with_clean_git_env do
-            capture_and_filter_stderr(uri) { `git #{command}` }
-          end
-
-          stdout_with_no_credentials = URICredentialsFilter.credential_filtered_string(out, uri)
-          raise GitCommandError.new(command_with_no_credentials, path, error_msg) if check_errors && !$?.success?
-          stdout_with_no_credentials
-        end
-
-        def has_revision_cached?
-          return unless @revision
-          in_path { git("cat-file -e #{@revision}") }
-          true
-        rescue GitError
-          false
-        end
-
-        def remove_cache
-          FileUtils.rm_rf(path)
-        end
-
-        def find_local_revision
-          allowed_in_path do
-            git("rev-parse --verify #{Shellwords.shellescape(ref)}", true).strip
-          end
-        end
-
-        # Escape the URI for git commands
-        def uri_escaped_with_configured_credentials
-          remote = configured_uri_for(uri)
-          if Bundler::WINDOWS
-            # Windows quoting requires double quotes only, with double quotes
-            # inside the string escaped by being doubled.
-            '"' + remote.gsub('"') { '""' } + '"'
-          else
-            # Bash requires single quoted strings, with the single quotes escaped
-            # by ending the string, escaping the quote, and restarting the string.
-            "'" + remote.gsub("'") { "'\\''" } + "'"
-          end
-        end
-
-        # Adds credentials to the URI as Fetcher#configured_uri_for does
-        def configured_uri_for(uri)
-          if /https?:/ =~ uri
-            remote = 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?
-          @git ? @git.allow_git_ops? : true
-        end
-
-        def in_path(&blk)
-          checkout unless path.exist?
-          _ = URICredentialsFilter # load it before we chdir
-          SharedHelpers.chdir(path, &blk)
-        end
-
-        def allowed_in_path
-          return in_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
-
-        # TODO: Replace this with Open3 when upgrading to bundler 2
-        # Similar to #git_null, as Open3 is not cross-platform,
-        # a temporary way is to use Tempfile to capture the stderr.
-        # When replacing this using Open3, make sure git_null is
-        # also replaced by Open3, so stdout and stderr all got handled properly.
-        def capture_and_filter_stderr(uri)
-          return_value, captured_err = ""
-          backup_stderr = STDERR.dup
-          begin
-            Tempfile.open("captured_stderr") do |f|
-              STDERR.reopen(f)
-              return_value = yield
-              f.rewind
-              captured_err = f.read
-            end
-          ensure
-            STDERR.reopen backup_stderr
-          end
-          $stderr.puts URICredentialsFilter.credential_filtered_string(captured_err, uri) if uri && !captured_err.empty?
-          return_value
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/source/metadata.rb b/lib/bundler/source/metadata.rb
deleted file mode 100644
index 9c5657eef6..0000000000
--- a/lib/bundler/source/metadata.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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)
-
-          idx << Gem::Specification.new do |s|
-            s.name     = "bundler"
-            s.version  = VERSION
-            s.platform = Gem::Platform::RUBY
-            s.source   = self
-            s.authors  = ["bundler team"]
-            s.bindir   = "exe"
-            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 loaded_spec = Bundler.rubygems.loaded_specs("bundler")
-            idx << loaded_spec # this has to come after the fake gemspec, to override it
-          elsif 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 cached!; end
-
-      def remote!; 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
deleted file mode 100644
index ed734bf549..0000000000
--- a/lib/bundler/source/path.rb
+++ /dev/null
@@ -1,249 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Source
-    class Path < Source
-      autoload :Installer, "bundler/source/path/installer"
-
-      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"] || Bundler.root
-
-        if options["path"]
-          @path = Pathname.new(options["path"])
-          @path = expand(@path) unless @path.relative?
-        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 = {})
-        print_using_message "Using #{version_message(spec)} from #{self}"
-        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)
-        somepath.expand_path(root_path)
-      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(Bundler.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
-          Dir["#{expanded_path}/#{@glob}"].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
deleted file mode 100644
index a0357ffa39..0000000000
--- a/lib/bundler/source/path/installer.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-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
-          SharedHelpers.chdir(@gem_dir) do
-            run_hooks(:pre_install)
-
-            unless @disable_extensions
-              build_extensions
-              run_hooks(:post_build)
-            end
-
-            generate_bin unless spec.executables.nil? || spec.executables.empty?
-
-            run_hooks(:post_install)
-          end
-        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
deleted file mode 100644
index 485b388a32..0000000000
--- a/lib/bundler/source/rubygems.rb
+++ /dev/null
@@ -1,539 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-require "rubygems/user_interaction"
-
-module Bundler
-  class Source
-    class Rubygems < Source
-      autoload :Remote, "bundler/source/rubygems/remote"
-
-      # 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
-        @caches = [cache_path, *Bundler.rubygems.gem_cache]
-
-        Array(options["remotes"] || []).reverse_each {|r| add_remote(r) }
-      end
-
-      def remote!
-        @specs = nil
-        @allow_remote = true
-      end
-
-      def cached!
-        @specs = nil
-        @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 can_lock?(spec)
-        return super if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-        spec.source.is_a?(Rubygems)
-      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"
-        else
-          remote_names = remotes.map(&:to_s).join(", ")
-          "rubygems repository #{remote_names} or installed locally"
-        end
-      end
-      alias_method :name, :to_s
-
-      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)
-          idx
-        end
-      end
-
-      def install(spec, opts = {})
-        force = opts[:force]
-        ensure_builtin_gems_cached = opts[:ensure_builtin_gems_cached]
-
-        if ensure_builtin_gems_cached && builtin_gem?(spec)
-          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
-
-          s = Bundler.rubygems.spec_from_gem(fetch_gem(spec), Bundler.settings["trust-policy"])
-          spec.__swap__(s)
-        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)
-          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")
-
-          installed_spec = nil
-          Bundler.rubygems.preserve_paths do
-            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
-          end
-          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)
-        if builtin_gem?(spec)
-          cached_path = cached_built_in_gem(spec)
-        else
-          cached_path = cached_gem(spec)
-        end
-        raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." 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 equivalent_remotes?(other_remotes)
-        other_remotes.map(&method(:remove_auth)) == @remotes.map(&method(:remove_auth))
-      end
-
-      def replace_remotes(other_remotes, allow_equivalent = false)
-        return false if other_remotes == @remotes
-
-        equivalent = allow_equivalent && equivalent_remotes?(other_remotes)
-
-        @remotes = []
-        other_remotes.reverse_each do |r|
-          add_remote r.to_s
-        end
-
-        !equivalent
-      end
-
-      def unmet_deps
-        if @allow_remote && api_fetchers.any?
-          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 api_fetchers.any?
-
-        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)
-          when RemoteSpecification # from the full index
-            return nil
-          else
-            raise "unhandled spec type (#{spec.inspect})"
-          end
-        end
-        names.map!(&:name) if names
-        names
-      end
-
-    protected
-
-      def credless_remotes
-        remotes.map(&method(:suppress_configured_credentials))
-      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)
-        cached_gem = cached_path(spec)
-        unless cached_gem
-          raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation"
-        end
-        cached_gem
-      end
-
-      def cached_path(spec)
-        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{/$}
-        uri = URI(uri)
-        raise ArgumentError, "The source must be an absolute URI. For example:\n" \
-          "source 'https://rubygems.org'" if !uri.absolute? || (uri.is_a?(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|
-            next if spec.name == "bundler"
-            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 = installed_specs.dup
-
-          Dir["#{cache_path}/*.gem"].each do |gemfile|
-            next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
-            s ||= Bundler.rubygems.spec_from_gem(gemfile)
-            s.source = self
-            if Bundler.rubygems.spec_missing_extensions?(s, false)
-              Bundler.ui.debug "Source #{self} is ignoring #{s} because it is missing extensions"
-              next
-            end
-            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 #{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 #{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
-
-        download_path = requires_sudo? ? Bundler.tmp(spec.full_name) : rubygems_dir
-        gem_path = "#{rubygems_dir}/cache/#{spec.full_name}.gem"
-
-        SharedHelpers.filesystem_access("#{download_path}/cache") do |p|
-          FileUtils.mkdir_p(p)
-        end
-        download_gem(spec, download_path)
-
-        if requires_sudo?
-          SharedHelpers.filesystem_access("#{rubygems_dir}/cache") do |p|
-            Bundler.mkdir_p(p)
-          end
-          Bundler.sudo "mv #{download_path}/cache/#{spec.full_name}.gem #{gem_path}"
-        end
-
-        gem_path
-      ensure
-        Bundler.rm_rf(download_path) if requires_sudo?
-      end
-
-      def builtin_gem?(spec)
-        # Ruby 2.1, where all included gems have this summary
-        return true if spec.summary =~ /is bundled with Ruby/
-
-        # Ruby 2.0, where gemspecs are stored in specifications/default/
-        spec.loaded_from && spec.loaded_from.include?("specifications/default/")
-      end
-
-      def installed?(spec)
-        installed_specs[spec].any?
-      end
-
-      def requires_sudo?
-        Bundler.requires_sudo?
-      end
-
-      def rubygems_dir
-        Bundler.rubygems.gem_dir
-      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_path
-      #         the local directory the .gem will end up in.
-      #
-      def download_gem(spec, download_path)
-        local_path = File.join(download_path, "cache/#{spec.full_name}.gem")
-
-        if (cache_path = download_cache_path(spec)) && cache_path.file?
-          SharedHelpers.filesystem_access(local_path) do
-            FileUtils.cp(cache_path, local_path)
-          end
-        else
-          uri = spec.remote.uri
-          Bundler.ui.confirm("Fetching #{version_message(spec)}")
-          rubygems_local_path = Bundler.rubygems.download_gem(spec, uri, download_path)
-          if rubygems_local_path != local_path
-            FileUtils.mv(rubygems_local_path, local_path)
-          end
-          cache_globally(spec, local_path)
-        end
-      end
-
-      # Checks if the requested spec exists in the global cache. If it does
-      # not, we create the relevant global cache subdirectory if it does not
-      # exist and copy the spec from the local cache to the global cache.
-      #
-      # @param  [Specification] spec
-      #         the spec we want to copy to the global cache.
-      #
-      # @param  [String] local_cache_path
-      #         the local directory from which we want to copy the .gem.
-      #
-      def cache_globally(spec, local_cache_path)
-        return unless cache_path = download_cache_path(spec)
-        return if cache_path.exist?
-
-        SharedHelpers.filesystem_access(cache_path.dirname, &:mkpath)
-        SharedHelpers.filesystem_access(cache_path) do
-          FileUtils.cp(local_cache_path, cache_path)
-        end
-      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, spec.file_name)
-      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
deleted file mode 100644
index b45f33770a..0000000000
--- a/lib/bundler/source/rubygems/remote.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-
-            # URI::File of Ruby 2.6 returns empty string when given "file://".
-            host = defined?(URI::File) && cache_uri.is_a?(URI::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 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_list.rb b/lib/bundler/source_list.rb
deleted file mode 100644
index ac2adacb3d..0000000000
--- a/lib/bundler/source_list.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class SourceList
-    attr_reader :path_sources,
-      :git_sources,
-      :plugin_sources,
-      :global_rubygems_source,
-      :metadata_source
-
-    def initialize
-      @path_sources           = []
-      @git_sources            = []
-      @plugin_sources         = []
-      @global_rubygems_source = nil
-      @rubygems_aggregate     = rubygems_aggregate_class.new
-      @rubygems_sources       = []
-      @metadata_source        = Source::Metadata.new
-    end
-
-    def add_path_source(options = {})
-      if options["gemspec"]
-        add_source_to_list Source::Gemspec.new(options), path_sources
-      else
-        add_source_to_list Source::Path.new(options), path_sources
-      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 = {})
-      add_source_to_list Source::Rubygems.new(options), @rubygems_sources
-    end
-
-    def add_plugin_source(source, options = {})
-      add_source_to_list Plugin.source(source).new(options), @plugin_sources
-    end
-
-    def global_rubygems_source=(uri)
-      if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-        @global_rubygems_source ||= rubygems_aggregate_class.new("remotes" => uri)
-      end
-      add_rubygems_remote(uri)
-    end
-
-    def add_rubygems_remote(uri)
-      if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-        return if Bundler.feature_flag.disable_multisource?
-        raise InvalidOption, "`lockfile_uses_separate_rubygems_sources` cannot be set without `disable_multisource` being set"
-      end
-      @rubygems_aggregate.add_remote(uri)
-      @rubygems_aggregate
-    end
-
-    def default_source
-      global_rubygems_source || @rubygems_aggregate
-    end
-
-    def rubygems_sources
-      @rubygems_sources + [default_source]
-    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 get(source)
-      source_list_for(source).find {|s| equal_source?(source, s) || equivalent_source?(source, s) }
-    end
-
-    def lock_sources
-      if Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
-        [[default_source], @rubygems_sources, git_sources, path_sources, plugin_sources].map do |sources|
-          sources.sort_by(&:to_s)
-        end.flatten(1)
-      else
-        lock_sources = (path_sources + git_sources + plugin_sources).sort_by(&:to_s)
-        lock_sources << combine_rubygems_sources
-      end
-    end
-
-    # Returns true if there are changes
-    def replace_sources!(replacement_sources)
-      return true if replacement_sources.empty?
-
-      [path_sources, git_sources, plugin_sources].each do |source_list|
-        source_list.map! do |source|
-          replacement_sources.find {|s| s == source } || source
-        end
-      end
-
-      replacement_rubygems = !Bundler.feature_flag.lockfile_uses_separate_rubygems_sources? &&
-        replacement_sources.detect {|s| s.is_a?(Source::Rubygems) }
-      @rubygems_aggregate = replacement_rubygems if replacement_rubygems
-
-      return true if !equal_sources?(lock_sources, replacement_sources) && !equivalent_sources?(lock_sources, replacement_sources)
-      return true if replacement_rubygems && rubygems_remotes.to_set != replacement_rubygems.remotes.to_set
-
-      false
-    end
-
-    def cached!
-      all_sources.each(&:cached!)
-    end
-
-    def remote!
-      all_sources.each(&:remote!)
-    end
-
-    def rubygems_primary_remotes
-      @rubygems_aggregate.remotes
-    end
-
-  private
-
-    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 git.allow_insecure true`, or switch to the `https` " \
-          "protocol to keep your data secure."
-      end
-    end
-
-    def equal_sources?(lock_sources, replacement_sources)
-      lock_sources.to_set == replacement_sources.to_set
-    end
-
-    def equal_source?(source, other_source)
-      source == other_source
-    end
-
-    def equivalent_source?(source, other_source)
-      return false unless Bundler.settings[:allow_deployment_source_credential_changes] && source.is_a?(Source::Rubygems)
-
-      equivalent_rubygems_sources?([source], [other_source])
-    end
-
-    def equivalent_sources?(lock_sources, replacement_sources)
-      return false unless Bundler.settings[:allow_deployment_source_credential_changes]
-
-      lock_rubygems_sources, lock_other_sources = lock_sources.partition {|s| s.is_a?(Source::Rubygems) }
-      replacement_rubygems_sources, replacement_other_sources = replacement_sources.partition {|s| s.is_a?(Source::Rubygems) }
-
-      equivalent_rubygems_sources?(lock_rubygems_sources, replacement_rubygems_sources) && equal_sources?(lock_other_sources, replacement_other_sources)
-    end
-
-    def equivalent_rubygems_sources?(lock_sources, replacement_sources)
-      actual_remotes = replacement_sources.map(&:remotes).flatten.uniq
-      lock_sources.all? {|s| s.equivalent_remotes?(actual_remotes) }
-    end
-  end
-end
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
deleted file mode 100644
index 5003b2cbec..0000000000
--- a/lib/bundler/spec_set.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# frozen_string_literal: true
-
-require "tsort"
-require "forwardable"
-require "set"
-
-module Bundler
-  class SpecSet
-    extend Forwardable
-    include TSort, Enumerable
-
-    def_delegators :@specs, :<<, :length, :add, :remove, :size, :empty?
-    def_delegators :sorted, :each
-
-    def initialize(specs)
-      @specs = specs
-    end
-
-    def for(dependencies, skip = [], check = false, match_current_platform = false, raise_on_missing = true)
-      handled = Set.new
-      deps = dependencies.dup
-      specs = []
-      skip += ["bundler"]
-
-      loop do
-        break unless dep = deps.shift
-        next if !handled.add?(dep) || skip.include?(dep.name)
-
-        if spec = spec_for_dependency(dep, match_current_platform)
-          specs << spec
-
-          spec.dependencies.each do |d|
-            next if d.type == :development
-            d = DepProxy.new(d, dep.__platform) unless match_current_platform
-            deps << d
-          end
-        elsif check
-          return false
-        elsif raise_on_missing
-          others = lookup[dep.name] if match_current_platform
-          message = "Unable to find a spec satisfying #{dep} in the set. Perhaps the lockfile is corrupted?"
-          message += " Found #{others.join(", ")} that did not match the current platform." if others && !others.empty?
-          raise GemNotFound, message
-        end
-      end
-
-      if spec = lookup["bundler"].first
-        specs << spec
-      end
-
-      check ? true : SpecSet.new(specs)
-    end
-
-    def valid_for?(deps)
-      self.for(deps, [], true)
-    end
-
-    def [](key)
-      key = key.name if key.respond_to?(:name)
-      lookup[key].reverse
-    end
-
-    def []=(key, value)
-      @specs << value
-      @lookup = nil
-      @sorted = nil
-      value
-    end
-
-    def sort!
-      self
-    end
-
-    def to_a
-      sorted.dup
-    end
-
-    def to_hash
-      lookup.dup
-    end
-
-    def materialize(deps, missing_specs = nil)
-      materialized = self.for(deps, [], false, true, !missing_specs).to_a
-      deps = materialized.map(&:name).uniq
-      materialized.map! do |s|
-        next s unless s.is_a?(LazySpecification)
-        s.source.dependency_names = deps if s.source.respond_to?(:dependency_names=)
-        spec = s.__materialize__
-        unless spec
-          unless missing_specs
-            raise GemNotFound, "Could not find #{s.full_name} in any of the sources"
-          end
-          missing_specs << s
-        end
-        spec
-      end
-      SpecSet.new(missing_specs ? materialized.compact : 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
-      names = @specs.map(&:name).uniq
-      @specs.map do |s|
-        next s unless s.is_a?(LazySpecification)
-        s.source.dependency_names = names if s.source.respond_to?(:dependency_names=)
-        spec = s.__materialize__
-        raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec
-        spec
-      end
-    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
-
-  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)
-      if Bundler.current_ruby.mri? && Bundler.current_ruby.on_19?
-        error.message.scan(/(\w+) \([^)]/).flatten
-      else
-        error.message.scan(/@name="(.*?)"/).flatten
-      end
-    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
-        Bundler.rubygems.platforms.reverse_each do |pl|
-          match = GemHelpers.select_best_platform_match(specs_for_platforms, pl)
-          return match if match
-        end
-        nil
-      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/ssl_certs/.document b/lib/bundler/ssl_certs/.document
deleted file mode 100644
index fb66f13c33..0000000000
--- a/lib/bundler/ssl_certs/.document
+++ /dev/null
@@ -1 +0,0 @@
-# Ignore all files in this directory
diff --git a/lib/bundler/ssl_certs/certificate_manager.rb b/lib/bundler/ssl_certs/certificate_manager.rb
deleted file mode 100644
index 26fc38ec18..0000000000
--- a/lib/bundler/ssl_certs/certificate_manager.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_fileutils"
-require "net/https"
-require "openssl"
-
-module Bundler
-  module SSLCerts
-    class CertificateManager
-      attr_reader :bundler_cert_path, :bundler_certs, :rubygems_certs
-
-      def self.update_from!(rubygems_path)
-        new(rubygems_path).update!
-      end
-
-      def initialize(rubygems_path = nil)
-        if rubygems_path
-          rubygems_cert_path = File.join(rubygems_path, "lib/rubygems/ssl_certs")
-          @rubygems_certs = certificates_in(rubygems_cert_path)
-        end
-
-        @bundler_cert_path = File.expand_path("..", __FILE__)
-        @bundler_certs = certificates_in(bundler_cert_path)
-      end
-
-      def up_to_date?
-        rubygems_certs.all? do |rc|
-          bundler_certs.find do |bc|
-            File.basename(bc) == File.basename(rc) && FileUtils.compare_file(bc, rc)
-          end
-        end
-      end
-
-      def update!
-        return if up_to_date?
-
-        FileUtils.rm bundler_certs
-        FileUtils.cp rubygems_certs, bundler_cert_path
-      end
-
-      def connect_to(host)
-        http = Net::HTTP.new(host, 443)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.cert_store = store
-        http.head("/")
-      end
-
-    private
-
-      def certificates_in(path)
-        Dir[File.join(path, "**/*.pem")].sort
-      end
-
-      def store
-        @store ||= begin
-          store = OpenSSL::X509::Store.new
-          bundler_certs.each do |cert|
-            store.add_file cert
-          end
-          store
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem b/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
deleted file mode 100644
index f4ce4ca43d..0000000000
--- a/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
diff --git a/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem b/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
deleted file mode 100644
index 9e6810ab70..0000000000
--- a/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
diff --git a/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem b/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
deleted file mode 100644
index 20585f1c01..0000000000
--- a/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
diff --git a/lib/bundler/stub_specification.rb b/lib/bundler/stub_specification.rb
deleted file mode 100644
index 0dd024024a..0000000000
--- a/lib/bundler/stub_specification.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/remote_specification"
-
-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
-
-    # Pre 2.2.0 did not include extension_dir
-    # https://github.com/rubygems/rubygems/commit/9485ca2d101b82a946d6f327f4bdcdea6d4946ea
-    if Bundler.rubygems.provides?(">= 2.2.0")
-      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
-    end
-
-    def to_yaml
-      _remote_specification.to_yaml
-    end
-
-    # @!group Stub Delegates
-
-    if Bundler.rubygems.provides?(">= 2.3")
-      # This is defined directly to avoid having to load every installed spec
-      def missing_extensions?
-        stub.missing_extensions?
-      end
-    end
-
-    def activated
-      stub.activated
-    end
-
-    def activated=(activated)
-      stub.instance_variable_set(:@activated, activated)
-    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
-
-    if Bundler.rubygems.provides?(">= 2.2.0")
-      def full_require_paths
-        stub.full_require_paths
-      end
-
-      # This is what we do in bundler/rubygems_ext
-      # full_require_paths is always implemented in >= 2.2.0
-      def load_paths
-        full_require_paths
-      end
-    end
-
-    def loaded_from
-      stub.loaded_from
-    end
-
-    if Bundler.rubygems.stubs_provide_full_functionality?
-      def matches_for_glob(glob)
-        stub.matches_for_glob(glob)
-      end
-    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
deleted file mode 100644
index fb66f13c33..0000000000
--- a/lib/bundler/templates/.document
+++ /dev/null
@@ -1 +0,0 @@
-# Ignore all files in this directory
diff --git a/lib/bundler/templates/Executable b/lib/bundler/templates/Executable
deleted file mode 100644
index 3e8d5b317a..0000000000
--- a/lib/bundler/templates/Executable
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
deleted file mode 100644
index eeda90b584..0000000000
--- a/lib/bundler/templates/Executable.bundler
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/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 || ">= 0.a"
-      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_version
-    @bundler_version ||= begin
-      env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
-  end
-
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_version
-    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_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
-    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
deleted file mode 100644
index 4bf0753f44..0000000000
--- a/lib/bundler/templates/Executable.standalone
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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
deleted file mode 100644
index 1afd2cce67..0000000000
--- a/lib/bundler/templates/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 547cd6e8d9..0000000000
--- a/lib/bundler/templates/gems.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/CODE_OF_CONDUCT.md.tt b/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
deleted file mode 100644
index a3833d29d7..0000000000
--- a/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers 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, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at <%= config[:email] %>. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/lib/bundler/templates/newgem/Gemfile.tt b/lib/bundler/templates/newgem/Gemfile.tt
deleted file mode 100644
index c114bd6665..0000000000
--- a/lib/bundler/templates/newgem/Gemfile.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in <%= config[:name] %>.gemspec
-gemspec
diff --git a/lib/bundler/templates/newgem/LICENSE.txt.tt b/lib/bundler/templates/newgem/LICENSE.txt.tt
deleted file mode 100644
index 76ef4b0191..0000000000
--- a/lib/bundler/templates/newgem/LICENSE.txt.tt
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 868a0afe67..0000000000
--- a/lib/bundler/templates/newgem/README.md.tt
+++ /dev/null
@@ -1,47 +0,0 @@
-# <%= 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
-
-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 tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## 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 [Contributor Covenant](http://contributor-covenant.org) code of conduct.<% 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[: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/master/CODE_OF_CONDUCT.md).
-<% end -%>
diff --git a/lib/bundler/templates/newgem/Rakefile.tt b/lib/bundler/templates/newgem/Rakefile.tt
deleted file mode 100644
index 099da6f3ec..0000000000
--- a/lib/bundler/templates/newgem/Rakefile.tt
+++ /dev/null
@@ -1,29 +0,0 @@
-require "bundler/gem_tasks"
-<% if config[:test] == "minitest" -%>
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-<% elsif config[:test] == "rspec" -%>
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-<% end -%>
-<% if config[:ext] -%>
-require "rake/extensiontask"
-
-task :build => :compile
-
-Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
-  ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
-end
-
-task :default => [:clobber, :compile, :<%= config[:test_task] %>]
-<% else -%>
-task :default => :<%= config[:test_task] %>
-<% end -%>
diff --git a/lib/bundler/templates/newgem/bin/console.tt b/lib/bundler/templates/newgem/bin/console.tt
deleted file mode 100644
index a27f82430f..0000000000
--- a/lib/bundler/templates/newgem/bin/console.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-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
deleted file mode 100644
index dce67d860a..0000000000
--- a/lib/bundler/templates/newgem/bin/setup.tt
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/exe/newgem.tt b/lib/bundler/templates/newgem/exe/newgem.tt
deleted file mode 100644
index a8339bb79f..0000000000
--- a/lib/bundler/templates/newgem/exe/newgem.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
index 8cfc828f94..0000000000
--- a/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 8177c4d202..0000000000
--- a/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
+++ /dev/null
@@ -1,9 +0,0 @@
-#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
deleted file mode 100644
index c6e420b66e..0000000000
--- a/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-#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/gitignore.tt b/lib/bundler/templates/newgem/gitignore.tt
deleted file mode 100644
index b1c9f9986c..0000000000
--- a/lib/bundler/templates/newgem/gitignore.tt
+++ /dev/null
@@ -1,20 +0,0 @@
-/.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/lib/newgem.rb.tt b/lib/bundler/templates/newgem/lib/newgem.rb.tt
deleted file mode 100644
index fae6337c3e..0000000000
--- a/lib/bundler/templates/newgem/lib/newgem.rb.tt
+++ /dev/null
@@ -1,13 +0,0 @@
-require "<%= config[:namespaced_path] %>/version"
-<%- if config[:ext] -%>
-require "<%= 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
deleted file mode 100644
index 389daf5048..0000000000
--- a/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-<%- 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
deleted file mode 100644
index faf6f7bbc5..0000000000
--- a/lib/bundler/templates/newgem/newgem.gemspec.tt
+++ /dev/null
@@ -1,55 +0,0 @@
-<%- if RUBY_VERSION < "2.0.0" -%>
-# coding: utf-8
-<%- end -%>
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "<%= 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       = %q{TODO: Write a short summary, because RubyGems requires one.}
-  spec.description   = %q{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 -%>
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.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."
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  # 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"]
-<%- if config[:ext] -%>
-  spec.extensions    = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
-<%- end -%>
-
-  spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>"
-  spec.add_development_dependency "rake", "~> 10.0"
-<%- if config[:ext] -%>
-  spec.add_development_dependency "rake-compiler"
-<%- end -%>
-<%- if config[:test] -%>
-  spec.add_development_dependency "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
-<%- end -%>
-end
diff --git a/lib/bundler/templates/newgem/rspec.tt b/lib/bundler/templates/newgem/rspec.tt
deleted file mode 100644
index 34c5164d9b..0000000000
--- a/lib/bundler/templates/newgem/rspec.tt
+++ /dev/null
@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper
diff --git a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
deleted file mode 100644
index c63b487830..0000000000
--- a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 805cf57e01..0000000000
--- a/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-require "bundler/setup"
-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/test/newgem_test.rb.tt b/lib/bundler/templates/newgem/test/newgem_test.rb.tt
deleted file mode 100644
index f2af9f90e0..0000000000
--- a/lib/bundler/templates/newgem/test/newgem_test.rb.tt
+++ /dev/null
@@ -1,11 +0,0 @@
-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/test_helper.rb.tt b/lib/bundler/templates/newgem/test/test_helper.rb.tt
deleted file mode 100644
index 725e3e4647..0000000000
--- a/lib/bundler/templates/newgem/test/test_helper.rb.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require "<%= config[:namespaced_path] %>"
-
-require "minitest/autorun"
diff --git a/lib/bundler/templates/newgem/travis.yml.tt b/lib/bundler/templates/newgem/travis.yml.tt
deleted file mode 100644
index 7a3381a889..0000000000
--- a/lib/bundler/templates/newgem/travis.yml.tt
+++ /dev/null
@@ -1,7 +0,0 @@
----
-sudo: false
-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
deleted file mode 100644
index 8138b30d38..0000000000
--- a/lib/bundler/ui.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module UI
-    autoload :RGProxy, "bundler/ui/rg_proxy"
-    autoload :Shell,   "bundler/ui/shell"
-    autoload :Silent,  "bundler/ui/silent"
-  end
-end
diff --git a/lib/bundler/ui/rg_proxy.rb b/lib/bundler/ui/rg_proxy.rb
deleted file mode 100644
index e2f98481db..0000000000
--- a/lib/bundler/ui/rg_proxy.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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
deleted file mode 100644
index 16e3d15713..0000000000
--- a/lib/bundler/ui/shell.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_thor"
-
-module Bundler
-  module UI
-    class Shell
-      LEVELS = %w[silent error warn confirm info debug].freeze
-
-      attr_writer :shell
-
-      def initialize(options = {})
-        if options["no-color"] || !$stdout.tty?
-          Thor::Base.shell = Thor::Shell::Basic
-        end
-        @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)
-        return unless level("warn")
-        return if @warning_history.include? msg
-        @warning_history << msg
-
-        return tell_err(msg, :yellow, newline) if Bundler.feature_flag.error_on_stderr?
-        tell_me(msg, :yellow, newline)
-      end
-
-      def error(msg, newline = nil)
-        return unless level("error")
-        return tell_err(msg, :red, newline) if Bundler.feature_flag.error_on_stderr?
-        tell_me(msg, :red, 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
deleted file mode 100644
index dca1b2ac86..0000000000
--- a/lib/bundler/ui/silent.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
deleted file mode 100644
index ee3692268c..0000000000
--- a/lib/bundler/uri_credentials_filter.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-      uri = URI(uri.to_s) unless uri.is_a?(URI)
-      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 if uri_to_anonymize.is_a?(URI)
-      return uri.to_s if uri_to_anonymize.is_a?(String)
-    rescue 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/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
deleted file mode 100644
index cc69740845..0000000000
--- a/lib/bundler/vendor/fileutils/lib/fileutils.rb
+++ /dev/null
@@ -1,1638 +0,0 @@
-# frozen_string_literal: true
-#
-# = 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)
-#
-# 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 three are obvious.
-# Each method documents the options that it honours.
-#
-# All methods that have the concept of a "source" file or directory can take
-# either one file or a list of files in that argument.  See the method
-# documentation for examples.
-#
-# There are some `low level' methods, which do not accept any option:
-#
-#   Bundler::FileUtils.copy_entry(src, dest, preserve = false, dereference = 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
-
-  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 old
-  # working directory after the block execution finished.
-  #
-  #   Bundler::FileUtils.cd('/', :verbose => true)   # chdir and report it
-  #
-  #   Bundler::FileUtils.cd('/') do  # chdir
-  #     # ...               # 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)
-    fu_output_message 'cd -' if verbose and block
-  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 it does not exist.
-  #
-  # * /usr
-  # * /usr/local
-  # * /usr/local/lib
-  # * /usr/local/lib/ruby
-  #
-  # You can pass several directories at a time in a list.
-  #
-  def mkdir_p(list, 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|
-      begin
-        Dir.rmdir(dir = remove_trailing_slash(dir))
-        if parents
-          until (parent = File.dirname(dir)) == '.' or parent == dir
-            dir = parent
-            Dir.rmdir(dir)
-          end
-        end
-      rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
-      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
-
-  #
-  # :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 :force 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
-
-  #
-  # 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.
-  #
-  #   # Installing Ruby library "mylib" under the site_ruby
-  #   Bundler::FileUtils.rm_r site_ruby + '/mylib', :force
-  #   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)
-    Entry_.new(src, nil, dereference_root).wrap_traverse(proc do |ent|
-      destent = Entry_.new(dest, ent.rel, false)
-      File.unlink destent.path if remove_destination && File.file?(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
-          else
-            destent.remove_file if rename_cannot_overwrite_file?
-          end
-        end
-        begin
-          File.rename s, d
-        rescue Errno::EXDEV
-          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
-
-  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.
-  #
-  #   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 :secure=>false.
-  #
-  # 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:
-  #
-  # * 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
-  #
-  # 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
-    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
-    }
-    # ---- 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)
-    sa = String.new(capacity: bsize)
-    sb = String.new(capacity: bsize)
-    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
-
-  begin
-    require 'etc'
-  rescue LoadError # rescue LoadError for miniruby
-  end
-
-  def fu_get_uid(user)   #:nodoc:
-    return nil unless user
-    case user
-    when Integer
-      user
-    when /\A\d+\z/
-      user.to_i
-    else
-      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
-      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
-
-    def fu_windows?
-      /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
-    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?
-      Dir.entries(path(), opts)\
-          .reject {|n| n == '.' or n == '..' }\
-          .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
-    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 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?
-        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 socket?
-        raise "cannot handle socket" unless File.respond_to?(:mknod)
-        mknod dest, nil, lstat().mode, 0
-      when pipe?
-        raise "cannot handle FIFO" unless File.respond_to?(:mkfifo)
-        mkfifo dest, 0666
-      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
-    SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
-
-    def descendant_directory?(descendant, ascendant)
-      /\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant)
-    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?
-
-  @fileutils_output = $stderr
-  @fileutils_label  = ''
-
-  def fu_output_message(msg)   #:nodoc:
-    @fileutils_output ||= $stderr
-    @fileutils_label  ||= ''
-    @fileutils_output.puts @fileutils_label + 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
-  }
-
-  #
-  # Returns an Array of method names which have any options.
-  #
-  #   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 method 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
-
-  LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern)
-  module LowMethods
-    private
-    def _do_nothing(*)end
-    ::Bundler::FileUtils::LOW_METHODS.map {|name| alias_method name, :_do_nothing}
-  end
-
-  METHODS = singleton_methods() - [:private_module_function,
-      :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
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
-    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
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
-    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
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
-    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/lib/molinillo.rb b/lib/bundler/vendor/molinillo/lib/molinillo.rb
deleted file mode 100644
index 9e2867144f..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/compatibility'
-require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'
-require 'bundler/vendor/molinillo/lib/molinillo/errors'
-require 'bundler/vendor/molinillo/lib/molinillo/resolver'
-require 'bundler/vendor/molinillo/lib/molinillo/modules/ui'
-require 'bundler/vendor/molinillo/lib/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/compatibility.rb b/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
deleted file mode 100644
index 3eba8e4083..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler::Molinillo
-  # Hacks needed for old Ruby versions.
-  module Compatibility
-    module_function
-
-    if [].respond_to?(:flat_map)
-      # Flat map
-      # @param [Enumerable] enum an enumerable object
-      # @block the block to flat-map with
-      # @return The enum, flat-mapped
-      def flat_map(enum, &blk)
-        enum.flat_map(&blk)
-      end
-    else
-      # Flat map
-      # @param [Enumerable] enum an enumerable object
-      # @block the block to flat-map with
-      # @return The enum, flat-mapped
-      def flat_map(enum, &blk)
-        enum.map(&blk).flatten(1)
-      end
-    end
-  end
-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
deleted file mode 100644
index bcacf35243..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
index ec9c770a28..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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#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
deleted file mode 100644
index 677a8bd916..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
+++ /dev/null
@@ -1,223 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-require 'tsort'
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/log'
-require 'bundler/vendor/molinillo/lib/molinillo/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 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
-
-    # @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([origin, destination])
-      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
-  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
deleted file mode 100644
index c04c7eec9c..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
deleted file mode 100644
index 9849aea2fe..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 0a1e08255b..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 1d9f4b327d..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 385dcbdd06..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 8582dd19c1..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular'
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex'
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge'
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named'
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload'
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 37286d104a..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index d6ad16e07a..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph/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
deleted file mode 100644
index 7ecdc4b65a..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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 [Array<Vertex>] the vertices of {#graph} where `self` is a
-      #   {#descendent?}
-      def recursive_predecessors
-        vertices = predecessors
-        vertices += Compatibility.flat_map(vertices, &:recursive_predecessors)
-        vertices.uniq!
-        vertices
-      end
-
-      # @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 [Array<Vertex>] the vertices of {#graph} where `self` is an
-      #   {#ancestor?}
-      def recursive_successors
-        vertices = successors
-        vertices += Compatibility.flat_map(vertices, &:recursive_successors)
-        vertices.uniq!
-        vertices
-      end
-
-      # @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 true iff 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 = Set.new)
-        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 true iff there is a path following edges within this {#graph}
-      def ancestor?(other)
-        other.path_to?(self)
-      end
-
-      alias is_reachable_from? ancestor?
-    end
-  end
-end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb b/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
deleted file mode 100644
index ce0931f103..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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 iff 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 = []
-      Compatibility.flat_map(conflicts.values.flatten, &: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 'bundler/vendor/molinillo/lib/molinillo/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 << req.to_s
-            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
deleted file mode 100644
index 73f8fbf2ac..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler::Molinillo
-  # The version of Bundler::Molinillo.
-  VERSION = '0.6.6'.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
deleted file mode 100644
index fa094c1981..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler::Molinillo
-  # Provides information about specifcations 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
-
-    # 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
deleted file mode 100644
index a166bc6991..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
deleted file mode 100644
index 0eb665d17a..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
+++ /dev/null
@@ -1,837 +0,0 @@
-# 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
-
-        handle_missing_or_push_dependency_state(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 'bundler/vendor/molinillo/lib/molinillo/state'
-      require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'
-
-      require 'bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state'
-      require 'bundler/vendor/molinillo/lib/molinillo/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 the initial state for the resolution, based upon the
-      # {#requested} dependencies
-      # @return [DependencyState] the initial state for the resolution
-      def 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
-
-        requirements = sort_dependencies(original_requested, graph, {})
-        initial_requirement = requirements.shift
-        DependencyState.new(
-          initial_requirement && name_for(initial_requirement),
-          requirements,
-          graph,
-          initial_requirement,
-          possibilities_for_requirement(initial_requirement, graph),
-          0,
-          {},
-          []
-        )
-      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
-        relevant_unused_unwinds = unused_unwind_options.select do |alternative|
-          intersecting_requirements =
-            last_detail_for_current_unwind.all_requirements &
-            alternative.requirements_unwound_to_instead
-          next if intersecting_requirements.empty?
-          # 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 { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
-        unwind_details.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
-
-        current_detail
-      end
-
-      # @param [Array<Object>] 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] 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] 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] 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] 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 = Compatibility.flat_map(primary_unwinds) 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 = Compatibility.flat_map(parent_unwinds, &: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] array of requirements
-      # @param [Array] 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
-
-      # @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
-
-      # @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
-
-      # @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
-
-      # @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
-
-      # @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
-          # use reject!(!satisfied) for 1.8.7 compatibility
-          possibility.possibilities.reject! 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] 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] activated_possibility 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
-      # @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] the proposed requirement
-      # @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] the proposed requirement
-      # @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] an array of possibilities
-      # @return [Array] 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 && 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
deleted file mode 100644
index 7d36858778..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/vendor/molinillo/lib/molinillo/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 'bundler/vendor/molinillo/lib/molinillo/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
deleted file mode 100644
index 68fa1f54e3..0000000000
--- a/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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/lib/net/http/faster.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb
deleted file mode 100644
index e5e09080c2..0000000000
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'net/protocol'
-
-##
-# Aaron Patterson's monkeypatch (accepted into 1.9.1) to fix Net::HTTP's speed
-# problems.
-#
-# http://gist.github.com/251244
-
-class Net::BufferedIO #:nodoc:
-  alias :old_rbuf_fill :rbuf_fill
-
-  def rbuf_fill
-    if @io.respond_to? :read_nonblock then
-      begin
-        @rbuf << @io.read_nonblock(65536)
-      rescue Errno::EWOULDBLOCK, Errno::EAGAIN => e
-        retry if IO.select [@io], nil, nil, @read_timeout
-        raise Timeout::Error, e.message
-      end
-    else # SSL sockets do not have read_nonblock
-      timeout @read_timeout do
-        @rbuf << @io.sysread(65536)
-      end
-    end
-  end
-end if RUBY_VERSION < '1.9'
-
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
deleted file mode 100644
index 7cbca5bc06..0000000000
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
+++ /dev/null
@@ -1,1233 +0,0 @@
-require 'net/http'
-begin
-  require 'net/https'
-rescue LoadError
-  # net/https or openssl
-end if RUBY_VERSION < '1.9' # but only for 1.8
-require 'bundler/vendor/net-http-persistent/lib/net/http/faster'
-require 'uri'
-require 'cgi' # for escaping
-
-begin
-  require 'net/http/pipeline'
-rescue LoadError
-end
-
-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.
-#
-# Multiple Bundler::Persistent::Net::HTTP::Persistent objects will share the same set of
-# connections.
-#
-# For each thread you start a new connection will be created.  A
-# Bundler::Persistent::Net::HTTP::Persistent connection will not be shared across threads.
-#
-# You can shut down the HTTP connections when done by calling #shutdown.  You
-# should name your Bundler::Persistent::Net::HTTP::Persistent object if you intend to call this
-# method.
-#
-# Example:
-#
-#   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
-#
-#   uri = URI 'http://example.com/awesome/web/service'
-#
-#   http = Bundler::Persistent::Net::HTTP::Persistent.new 'my_app_name'
-#
-#   # 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 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 URI#request_uri not URI#path.  The request_uri contains the query
-# params which are sent in the body for other requests.
-#
-# == SSL
-#
-# SSL connections are automatically created depending upon the scheme of the
-# URI.  SSL 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 SSL settings, see the individual methods for documentation:
-#
-# #certificate        :: This client's certificate
-# #ca_file            :: The certificate-authority
-# #cert_store         :: An SSL certificate store
-# #private_key        :: The client's SSL private key
-# #reuse_ssl_sessions :: Reuse a previously opened SSL session for a new
-#                        connection
-# #ssl_version        :: Which specific SSL version to use
-# #verify_callback    :: For server 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 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
-#
-# By providing an application name to ::new you can separate your connections
-# from the connections of other applications.
-#
-# === 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.
-#
-# === Non-Idempotent Requests
-#
-# By default non-idempotent requests will not be retried per RFC 2616.  By
-# setting retry_change_requests to true requests will automatically be retried
-# once.
-#
-# Only do this when you know that retrying a POST or other non-idempotent
-# request is safe for your application and will not create duplicate
-# resources.
-#
-# The recommended way to handle non-idempotent requests is the following:
-#
-#   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
-#
-#   uri = URI 'http://example.com/awesome/web/service'
-#   post_uri = uri + 'create'
-#
-#   http = Bundler::Persistent::Net::HTTP::Persistent.new 'my_app_name'
-#
-#   post = Net::HTTP::Post.new post_uri.path
-#   # ... fill in POST request
-#
-#   begin
-#     response = http.request post_uri, post
-#   rescue Bundler::Persistent::Net::HTTP::Persistent::Error
-#
-#     # POST failed, make a new request to verify the server did not process
-#     # the request
-#     exists_uri = uri + '...'
-#     response = http.get exists_uri
-#
-#     # Retry if it failed
-#     retry if response.code == '404'
-#   end
-#
-# The method of determining if the resource was created or not is unique to
-# the particular service you are using.  Of course, you will want to add
-# protection from infinite looping.
-#
-# === 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 version of Bundler::Persistent::Net::HTTP::Persistent you are using
-
-  VERSION = '2.9.4'
-
-  ##
-  # Exceptions rescued for automatic retry on ruby 2.0.0.  This overlaps with
-  # the exception list for ruby 1.x.
-
-  RETRIED_EXCEPTIONS = [ # :nodoc:
-    (Net::ReadTimeout if Net.const_defined? :ReadTimeout),
-    IOError,
-    EOFError,
-    Errno::ECONNRESET,
-    Errno::ECONNABORTED,
-    Errno::EPIPE,
-    (OpenSSL::SSL::SSLError if HAVE_OPENSSL),
-    Timeout::Error,
-  ].compact
-
-  ##
-  # 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 = URI uri unless URI::Generic === uri
-    uri += '/'
-
-    req = Net::HTTP::Head.new uri.request_uri
-
-    http = new 'net-http-persistent detect_idle_timeout'
-
-    connection = http.connection_for uri
-
-    sleep_time = 0
-
-    loop do
-      response = connection.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
-  rescue
-    # ignore StandardErrors, we've probably found the idle timeout.
-  ensure
-    http.shutdown
-
-    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
-
-  ##
-  # An SSL certificate store.  Setting this will override the default
-  # certificate store.  See verify_mode for more information.
-
-  attr_reader :cert_store
-
-  ##
-  # 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:
-
-  ##
-  # Where this instance's connections live in the thread local variables
-
-  attr_reader :generation_key # :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
-
-  ##
-  # 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
-
-  ##
-  # A name for this connection.  Allows you to keep your connections apart
-  # from everybody else's.
-
-  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
-
-  ##
-  # Seconds to wait until reading one block.  See Net::HTTP#read_timeout
-
-  attr_accessor :read_timeout
-
-  ##
-  # Where this instance's request counts live in the thread local variables
-
-  attr_reader :request_key # :nodoc:
-
-  ##
-  # 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:
-
-  ##
-  # Where this instance's SSL connections live in the thread local variables
-
-  attr_reader :ssl_generation_key # :nodoc:
-
-  ##
-  # SSL version to use.
-  #
-  # By default, the version will be negotiated automatically between client
-  # and server.  Ruby 1.9 and newer only.
-
-  attr_reader :ssl_version if RUBY_VERSION > '1.9'
-
-  ##
-  # 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 is set.
-
-  attr_reader :verify_callback
-
-  ##
-  # HTTPS verify mode.  Defaults to OpenSSL::SSL::VERIFY_PEER which verifies
-  # the server certificate.
-  #
-  # If no ca_file 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
-
-  ##
-  # Enable retries of non-idempotent requests that change data (e.g. POST
-  # requests) when the server has disconnected.
-  #
-  # This will in the worst case lead to multiple requests with the same data,
-  # but it may be useful for some applications.  Take care when enabling
-  # this option to ensure it is safe to POST or perform other non-idempotent
-  # requests to the server.
-
-  attr_accessor :retry_change_requests
-
-  ##
-  # Creates a new Bundler::Persistent::Net::HTTP::Persistent.
-  #
-  # Set +name+ to keep your connections apart from everybody else's.  Not
-  # required currently, but highly recommended.  Your library name should be
-  # good enough.  This parameter will be required in a future version.
-  #
-  # +proxy+ may be set to a URI::HTTP or :ENV to pick up proxy options from
-  # the environment.  See proxy_from_env for details.
-  #
-  # In order to use a URI for the proxy you may need to do some extra work
-  # beyond URI parsing if the proxy requires a password:
-  #
-  #   proxy = URI 'http://proxy.example'
-  #   proxy.user     = 'AzureDiamond'
-  #   proxy.password = 'hunter2'
-
-  def initialize name = nil, proxy = nil
-    @name = name
-
-    @debug_output     = nil
-    @proxy_uri        = nil
-    @no_proxy         = []
-    @headers          = {}
-    @override_headers = {}
-    @http_versions    = {}
-    @keep_alive       = 30
-    @open_timeout     = nil
-    @read_timeout     = nil
-    @idle_timeout     = 5
-    @max_requests     = nil
-    @socket_options   = []
-
-    @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
-      Socket.const_defined? :TCP_NODELAY
-
-    key = ['net_http_persistent', name].compact
-    @generation_key     = [key, 'generations'    ].join('_').intern
-    @ssl_generation_key = [key, 'ssl_generations'].join('_').intern
-    @request_key        = [key, 'requests'       ].join('_').intern
-    @timeout_key        = [key, 'timeouts'       ].join('_').intern
-
-    @certificate        = nil
-    @ca_file            = nil
-    @private_key        = nil
-    @ssl_version        = nil
-    @verify_callback    = nil
-    @verify_mode        = nil
-    @cert_store         = nil
-
-    @generation         = 0 # incremented when proxy URI changes
-    @ssl_generation     = 0 # incremented when SSL session variables change
-
-    if HAVE_OPENSSL then
-      @verify_mode        = OpenSSL::SSL::VERIFY_PEER
-      @reuse_ssl_sessions = OpenSSL::SSL.const_defined? :Session
-    end
-
-    @retry_change_requests = false
-
-    @ruby_1 = RUBY_VERSION < '2'
-    @retried_on_ruby_2 = !@ruby_1
-
-    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
-
-  ##
-  # Overrides the default SSL certificate store used for verifying
-  # connections.
-
-  def cert_store= store
-    @cert_store = store
-
-    reconnect_ssl
-  end
-
-  ##
-  # Finishes all connections on the given +thread+ that were created before
-  # the given +generation+ in the threads +generation_key+ list.
-  #
-  # See #shutdown for a bunch of scary warning about misusing this method.
-
-  def cleanup(generation, thread = Thread.current,
-              generation_key = @generation_key) # :nodoc:
-    timeouts = thread[@timeout_key]
-
-    (0...generation).each do |old_generation|
-      next unless thread[generation_key]
-
-      conns = thread[generation_key].delete old_generation
-
-      conns.each_value do |conn|
-        finish conn, thread
-
-        timeouts.delete conn.object_id if timeouts
-      end if conns
-    end
-  end
-
-  ##
-  # Creates a new connection for +uri+
-
-  def connection_for uri
-    Thread.current[@generation_key]     ||= Hash.new { |h,k| h[k] = {} }
-    Thread.current[@ssl_generation_key] ||= Hash.new { |h,k| h[k] = {} }
-    Thread.current[@request_key]        ||= Hash.new 0
-    Thread.current[@timeout_key]        ||= Hash.new EPOCH
-
-    use_ssl = uri.scheme.downcase == 'https'
-
-    if use_ssl then
-      raise Bundler::Persistent::Net::HTTP::Persistent::Error, 'OpenSSL is not available' unless
-        HAVE_OPENSSL
-
-      ssl_generation = @ssl_generation
-
-      ssl_cleanup ssl_generation
-
-      connections = Thread.current[@ssl_generation_key][ssl_generation]
-    else
-      generation = @generation
-
-      cleanup generation
-
-      connections = Thread.current[@generation_key][generation]
-    end
-
-    net_http_args = [uri.host, uri.port]
-    connection_id = net_http_args.join ':'
-
-    if @proxy_uri and not proxy_bypass? uri.host, uri.port then
-      connection_id << @proxy_connection_id
-      net_http_args.concat @proxy_args
-    else
-      net_http_args.concat [nil, nil, nil, nil]
-    end
-
-    connection = connections[connection_id]
-
-    unless connection = connections[connection_id] then
-      connections[connection_id] = http_class.new(*net_http_args)
-      connection = connections[connection_id]
-      ssl connection if use_ssl
-    else
-      reset connection if expired? connection
-    end
-
-    start connection unless connection.started?
-
-    connection.read_timeout = @read_timeout if @read_timeout
-    connection.keep_alive_timeout = @idle_timeout if @idle_timeout && connection.respond_to?(:keep_alive_timeout=)
-
-    connection
-  rescue Errno::ECONNREFUSED
-    address = connection.proxy_address || connection.address
-    port    = connection.proxy_port    || connection.port
-
-    raise Error, "connection refused: #{address}:#{port}"
-  rescue Errno::EHOSTDOWN
-    address = connection.proxy_address || connection.address
-    port    = connection.proxy_port    || connection.port
-
-    raise Error, "host down: #{address}:#{port}"
-  end
-
-  ##
-  # Returns an error message containing the number of requests performed on
-  # this connection
-
-  def error_message connection
-    requests = Thread.current[@request_key][connection.object_id] - 1 # fixup
-    last_use = Thread.current[@timeout_key][connection.object_id]
-
-    age = Time.now - last_use
-
-    "after #{requests} requests on #{connection.object_id}, " \
-      "last used #{age} seconds ago"
-  end
-
-  ##
-  # URI::escape wrapper
-
-  def escape str
-    CGI.escape str if str
-  end
-
-  ##
-  # URI::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
-    requests = Thread.current[@request_key][connection.object_id]
-    return true  if     @max_requests && requests >= @max_requests
-    return false unless @idle_timeout
-    return true  if     @idle_timeout.zero?
-
-    last_used = Thread.current[@timeout_key][connection.object_id]
-
-    Time.now - last_used > @idle_timeout
-  end
-
-  ##
-  # Starts the Net::HTTP +connection+
-
-  def start connection
-    connection.set_debug_output @debug_output if @debug_output
-    connection.open_timeout = @open_timeout if @open_timeout
-
-    connection.start
-
-    socket = connection.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, thread = Thread.current
-    if requests = thread[@request_key] then
-      requests.delete connection.object_id
-    end
-
-    connection.finish
-  rescue IOError
-  end
-
-  def http_class # :nodoc:
-    if RUBY_VERSION > '2.0' then
-      Net::HTTP
-    elsif [:Artifice, :FakeWeb, :WebMock].any? { |klass|
-             Object.const_defined?(klass)
-          } or not @reuse_ssl_sessions then
-        Net::HTTP
-    else
-      Bundler::Persistent::Net::HTTP::Persistent::SSLReuse
-    end
-  end
-
-  ##
-  # Returns the HTTP protocol version for +uri+
-
-  def http_version uri
-    @http_versions["#{uri.host}:#{uri.port}"]
-  end
-
-  ##
-  # Is +req+ idempotent according to RFC 2616?
-
-  def idempotent? req
-    case req
-    when Net::HTTP::Delete, Net::HTTP::Get, Net::HTTP::Head,
-         Net::HTTP::Options, Net::HTTP::Put, Net::HTTP::Trace then
-      true
-    end
-  end
-
-  ##
-  # Is the request +req+ idempotent or is retry_change_requests allowed.
-  #
-  # If +retried_on_ruby_2+ is true, true will be returned if we are on ruby,
-  # retry_change_requests is allowed and the request is not idempotent.
-
-  def can_retry? req, retried_on_ruby_2 = false
-    return @retry_change_requests && !idempotent?(req) if retried_on_ruby_2
-
-    @retry_change_requests || idempotent?(req)
-  end
-
-  if RUBY_VERSION > '1.9' then
-    ##
-    # Workaround for missing Net::HTTPHeader#connection_close? on Ruby 1.8
-
-    def connection_close? header
-      header.connection_close?
-    end
-
-    ##
-    # Workaround for missing Net::HTTPHeader#connection_keep_alive? on Ruby 1.8
-
-    def connection_keep_alive? header
-      header.connection_keep_alive?
-    end
-  else
-    ##
-    # Workaround for missing Net::HTTPRequest#connection_close? on Ruby 1.8
-
-    def connection_close? header
-      header['connection'] =~ /close/ or header['proxy-connection'] =~ /close/
-    end
-
-    ##
-    # Workaround for missing Net::HTTPRequest#connection_keep_alive? on Ruby
-    # 1.8
-
-    def connection_keep_alive? header
-      header['connection'] =~ /keep-alive/ or
-        header['proxy-connection'] =~ /keep-alive/
-    end
-  end
-
-  ##
-  # Deprecated in favor of #expired?
-
-  def max_age # :nodoc:
-    return Time.now + 1 unless @idle_timeout
-
-    Time.now - @idle_timeout
-  end
-
-  ##
-  # Adds "http://" to the String +uri+ if it is missing.
-
-  def normalize_uri uri
-    (uri =~ /^https?:/) ? uri : "http://#{uri}"
-  end
-
-  ##
-  # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
-  # block is given.  Returns all responses received.
-  #
-  # See
-  # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]
-  # for further details.
-  #
-  # Only if <tt>net-http-pipeline</tt> was required before
-  # <tt>net-http-persistent</tt> #pipeline will be present.
-
-  def pipeline uri, requests, &block # :yields: responses
-    connection = connection_for uri
-
-    connection.pipeline requests, &block
-  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 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 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 URI::HTTP then proxy
-                 when nil       then # ignore
-                 else raise ArgumentError, 'proxy must be :ENV or a URI::HTTP'
-                 end
-
-    @no_proxy.clear
-
-    if @proxy_uri then
-      @proxy_args = [
-        @proxy_uri.host,
-        @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 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 URI is given the
-  # indicated user and password unless HTTP_PROXY contains either of these in
-  # the 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 = 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 HTTP connections.
-
-  def reconnect
-    @generation += 1
-  end
-
-  ##
-  # Forces reconnection of SSL connections.
-
-  def reconnect_ssl
-    @ssl_generation += 1
-  end
-
-  ##
-  # Finishes then restarts the Net::HTTP +connection+
-
-  def reset connection
-    Thread.current[@request_key].delete connection.object_id
-    Thread.current[@timeout_key].delete connection.object_id
-
-    finish connection
-
-    start connection
-  rescue Errno::ECONNREFUSED
-    e = Error.new "connection refused: #{connection.address}:#{connection.port}"
-    e.set_backtrace $@
-    raise e
-  rescue Errno::EHOSTDOWN
-    e = Error.new "host down: #{connection.address}:#{connection.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::HTTPRequest subclass (see Net::HTTP for a list).
-  #
-  # If there is an error and the request is idempotent according to RFC 2616
-  # it will be retried automatically.
-
-  def request uri, req = nil, &block
-    retried      = false
-    bad_response = false
-
-    req = request_setup req || uri
-
-    connection = connection_for uri
-    connection_id = connection.object_id
-
-    begin
-      Thread.current[@request_key][connection_id] += 1
-      response = connection.request req, &block
-
-      if connection_close?(req) or
-         (response.http_version <= '1.0' and
-          not connection_keep_alive?(response)) or
-         connection_close?(response) then
-        connection.finish
-      end
-    rescue Net::HTTPBadResponse => e
-      message = error_message connection
-
-      finish connection
-
-      raise Error, "too many bad responses #{message}" if
-        bad_response or not can_retry? req
-
-      bad_response = true
-      retry
-    rescue *RETRIED_EXCEPTIONS => e # retried on ruby 2
-      request_failed e, req, connection if
-        retried or not can_retry? req, @retried_on_ruby_2
-
-      reset connection
-
-      retried = true
-      retry
-    rescue Errno::EINVAL, Errno::ETIMEDOUT => e # not retried on ruby 2
-      request_failed e, req, connection if retried or not can_retry? req
-
-      reset connection
-
-      retried = true
-      retry
-    rescue Exception => e
-      finish connection
-
-      raise
-    ensure
-      Thread.current[@timeout_key][connection_id] = Time.now
-    end
-
-    @http_versions["#{uri.host}:#{uri.port}"] ||= response.http_version
-
-    response
-  end
-
-  ##
-  # Raises an Error for +exception+ which resulted from attempting the request
-  # +req+ on the +connection+.
-  #
-  # Finishes the +connection+.
-
-  def request_failed exception, req, connection # :nodoc:
-    due_to = "(due to #{exception.message} - #{exception.class})"
-    message = "too many connection resets #{due_to} #{error_message connection}"
-
-    finish connection
-
-
-    raise Error, message, exception.backtrace
-  end
-
-  ##
-  # Creates a GET request if +req_or_uri+ is a URI and adds headers to the
-  # request.
-  #
-  # Returns the request.
-
-  def request_setup req_or_uri # :nodoc:
-    req = if URI === req_or_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 for +thread+.
-  #
-  # Uses the current thread by default.
-  #
-  # If you've used Bundler::Persistent::Net::HTTP::Persistent across multiple threads you should
-  # call this in each thread when you're done making HTTP requests.
-  #
-  # *NOTE*: Calling shutdown for another thread can be dangerous!
-  #
-  # If the thread is still using the connection it may cause an error!  It is
-  # best to call #shutdown in the thread at the appropriate time instead!
-
-  def shutdown thread = Thread.current
-    generation = reconnect
-    cleanup generation, thread, @generation_key
-
-    ssl_generation = reconnect_ssl
-    cleanup ssl_generation, thread, @ssl_generation_key
-
-    thread[@request_key] = nil
-    thread[@timeout_key] = nil
-  end
-
-  ##
-  # Shuts down all connections in all threads
-  #
-  # *NOTE*: THIS METHOD IS VERY DANGEROUS!
-  #
-  # Do not call this method if other threads are still using their
-  # connections!  Call #shutdown at the appropriate time instead!
-  #
-  # Use this method only as a last resort!
-
-  def shutdown_in_all_threads
-    Thread.list.each do |thread|
-      shutdown thread
-    end
-
-    nil
-  end
-
-  ##
-  # Enables SSL on +connection+
-
-  def ssl connection
-    connection.use_ssl = true
-
-    connection.ssl_version = @ssl_version if @ssl_version
-
-    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
-
-    if @ca_file then
-      connection.ca_file = @ca_file
-      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
-
-  ##
-  # Finishes all connections that existed before the given SSL parameter
-  # +generation+.
-
-  def ssl_cleanup generation # :nodoc:
-    cleanup generation, Thread.current, @ssl_generation_key
-  end
-
-  ##
-  # SSL version to use
-
-  def ssl_version= ssl_version
-    @ssl_version = ssl_version
-
-    reconnect_ssl
-  end if RUBY_VERSION > '1.9'
-
-  ##
-  # 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 'bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse'
-
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb
deleted file mode 100644
index 1b6b789f6d..0000000000
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-##
-# This Net::HTTP subclass adds SSL session reuse and Server Name Indication
-# (SNI) RFC 3546.
-#
-# DO NOT DEPEND UPON THIS CLASS
-#
-# This class is an implementation detail and is subject to change or removal
-# at any time.
-
-class Bundler::Persistent::Net::HTTP::Persistent::SSLReuse < Net::HTTP
-
-  @is_proxy_class = false
-  @proxy_addr = nil
-  @proxy_port = nil
-  @proxy_user = nil
-  @proxy_pass = nil
-
-  def initialize address, port = nil # :nodoc:
-    super
-
-    @ssl_session = nil
-  end
-
-  ##
-  # From ruby trunk r33086 including http://redmine.ruby-lang.org/issues/5341
-
-  def connect # :nodoc:
-    D "opening connection to #{conn_address()}..."
-    s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
-    D "opened"
-    if use_ssl?
-      ssl_parameters = Hash.new
-      iv_list = instance_variables
-      SSL_ATTRIBUTES.each do |name|
-        ivname = "@#{name}".intern
-        if iv_list.include?(ivname) and
-           value = instance_variable_get(ivname)
-          ssl_parameters[name] = value
-        end
-      end
-      unless @ssl_context then
-        @ssl_context = OpenSSL::SSL::SSLContext.new
-        @ssl_context.set_params(ssl_parameters)
-      end
-      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.sync_close = true
-    end
-    @socket = Net::BufferedIO.new(s)
-    @socket.read_timeout = @read_timeout
-    @socket.continue_timeout = @continue_timeout if
-      @socket.respond_to? :continue_timeout
-    @socket.debug_output = @debug_output
-    if use_ssl?
-      begin
-        if proxy?
-          @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                    @address, @port, HTTPVersion)
-          @socket.writeline "Host: #{@address}:#{@port}"
-          if proxy_user
-            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-            credential.delete!("\r\n")
-            @socket.writeline "Proxy-Authorization: Basic #{credential}"
-          end
-          @socket.writeline ''
-          Net::HTTPResponse.read_new(@socket).value
-        end
-        s.session = @ssl_session if @ssl_session
-        # Server Name Indication (SNI) RFC 3546
-        s.hostname = @address if s.respond_to? :hostname=
-        timeout(@open_timeout) { s.connect }
-        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
-      end
-    end
-    on_connect
-  end if RUBY_VERSION > '1.9'
-
-  ##
-  # From ruby_1_8_7 branch r29865 including a modified
-  # http://redmine.ruby-lang.org/issues/5341
-
-  def connect # :nodoc:
-    D "opening connection to #{conn_address()}..."
-    s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
-    D "opened"
-    if use_ssl?
-      unless @ssl_context.verify_mode
-        warn "warning: peer certificate won't be verified in this SSL session"
-        @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.sync_close = true
-    end
-    @socket = Net::BufferedIO.new(s)
-    @socket.read_timeout = @read_timeout
-    @socket.debug_output = @debug_output
-    if use_ssl?
-      if proxy?
-        @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                  @address, @port, HTTPVersion)
-        @socket.writeline "Host: #{@address}:#{@port}"
-        if proxy_user
-          credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-          credential.delete!("\r\n")
-          @socket.writeline "Proxy-Authorization: Basic #{credential}"
-        end
-        @socket.writeline ''
-        Net::HTTPResponse.read_new(@socket).value
-      end
-      s.session = @ssl_session if @ssl_session
-      s.connect
-      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-        s.post_connection_check(@address)
-      end
-      @ssl_session = s.session
-    end
-    on_connect
-  end if RUBY_VERSION < '1.9'
-
-  private :connect
-
-end
-
diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb
deleted file mode 100644
index 999e8b7e61..0000000000
--- a/lib/bundler/vendor/thor/lib/thor.rb
+++ /dev/null
@@ -1,509 +0,0 @@
-require "set"
-require "bundler/vendor/thor/lib/thor/base"
-
-class Bundler::Thor
-  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)
-      @map ||= from_superclass(:map, {})
-
-      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)}"
-      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.merge(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.merge(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 ||= Set.new
-    end
-
-    # help command has the required check disabled by default.
-    def disable_required_check #:nodoc:
-      @disable_required_check ||= Set.new([: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)
-      "#{basename} #{command.formatted_usage(self, $thor_runner, subcommand)}"
-    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
deleted file mode 100644
index e6698572a9..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions.rb
+++ /dev/null
@@ -1,321 +0,0 @@
-require "uri"
-require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
-require "bundler/vendor/thor/lib/thor/actions/create_file"
-require "bundler/vendor/thor/lib/thor/actions/create_link"
-require "bundler/vendor/thor/lib/thor/actions/directory"
-require "bundler/vendor/thor/lib/thor/actions/empty_directory"
-require "bundler/vendor/thor/lib/thor/actions/file_manipulation"
-require "bundler/vendor/thor/lib/thor/actions/inject_into_file"
-
-class Bundler::Thor
-  module Actions
-    attr_accessor :behavior
-
-    def self.included(base) #:nodoc:
-      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)
-      path = path.dup
-      if path.gsub!(@destination_stack[0], ".")
-        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
-        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)
-
-      unless options[:pretend]
-        config[:capture] ? `#{command}` : system(command.to_s)
-      end
-    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
deleted file mode 100644
index 97d22d9bbd..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-require "bundler/vendor/thor/lib/thor/actions/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
deleted file mode 100644
index 3a664401b4..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require "bundler/vendor/thor/lib/thor/actions/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?
-        exists? && File.identical?(render, 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
deleted file mode 100644
index f555f7b7e0..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require "bundler/vendor/thor/lib/thor/actions/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(base.find_in_source_paths(source.to_s))
-        @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
-
-      if RUBY_VERSION < "2.0"
-        def file_level_lookup(previous_lookup)
-          File.join(previous_lookup, "{*,.[a-z]*}")
-        end
-
-        def files(lookup)
-          Dir[lookup]
-        end
-      else
-        def file_level_lookup(previous_lookup)
-          File.join(previous_lookup, "*")
-        end
-
-        def files(lookup)
-          Dir.glob(lookup, File::FNM_DOTMATCH)
-        end
-      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
deleted file mode 100644
index 284d92c19a..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-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
deleted file mode 100644
index 4c83bebc86..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
+++ /dev/null
@@ -1,364 +0,0 @@
-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))
-
-      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(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.
-    #
-    # ==== 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
-
-      if source =~ %r{^https?\://}
-        require "open-uri"
-      else
-        source = File.expand_path(find_in_source_paths(source.to_s))
-      end
-
-      render = open(source) { |input| input.binmode.read }
-
-      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
-        content = CapturableERB.new(::File.binread(source), nil, "-", "@output_buffer").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.
-    #
-    # ==== 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)
-      return unless behavior == :invoke
-      config = args.last.is_a?(Hash) ? args.pop : {}
-
-      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
deleted file mode 100644
index 349b26ff65..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require "bundler/vendor/thor/lib/thor/actions/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
-    #
-    def insert_into_file(destination, *args, &block)
-      data = block_given? ? block : args.shift
-      config = args.shift
-      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!
-        say_status :invoke
-
-        content = if @behavior == :after
-          '\0' + replacement
-        else
-          replacement + '\0'
-        end
-
-        if exists?
-          replace!(/#{flag}/, content, config[:force])
-        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)
-        status = if behavior == :invoke
-          if flag == /\A/
-            :prepend
-          elsif flag == /\z/
-            :append
-          else
-            :insert
-          end
-        else
-          :subtract
-        end
-
-        super(status, 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)
-          content.gsub!(regexp, string)
-          File.open(destination, "wb") { |file| file.write(content) }
-        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
deleted file mode 100644
index 9bd1077170..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/base.rb
+++ /dev/null
@@ -1,679 +0,0 @@
-require "bundler/vendor/thor/lib/thor/command"
-require "bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access"
-require "bundler/vendor/thor/lib/thor/core_ext/ordered_hash"
-require "bundler/vendor/thor/lib/thor/error"
-require "bundler/vendor/thor/lib/thor/invocation"
-require "bundler/vendor/thor/lib/thor/parser"
-require "bundler/vendor/thor/lib/thor/shell"
-require "bundler/vendor/thor/lib/thor/line_editor"
-require "bundler/vendor/thor/lib/thor/util"
-
-class Bundler::Thor
-  autoload :Actions,    "bundler/vendor/thor/lib/thor/actions"
-  autoload :RakeCompat, "bundler/vendor/thor/lib/thor/rake_compat"
-  autoload :Group,      "bundler/vendor/thor/lib/thor/group"
-
-  # 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"
-
-  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:
-        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 responsable 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 is disabled by default for compatibility.
-      def check_default_type!
-        @check_default_type = true
-      end
-
-      def check_default_type #:nodoc:
-        @check_default_type ||= from_superclass(:check_default_type, false)
-      end
-
-      def check_default_type? #:nodoc:
-        !!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
-      # OrderedHash:: An ordered hash with commands names as keys and Bundler::Thor::Command
-      #               objects as values.
-      #
-      def commands
-        @commands ||= Bundler::Thor::CoreExt::OrderedHash.new
-      end
-      alias_method :tasks, :commands
-
-      # Returns the commands for this Bundler::Thor class and all subclasses.
-      #
-      # ==== Returns
-      # OrderedHash:: An ordered hash with commands names as keys and Bundler::Thor::Command
-      #               objects as values.
-      #
-      def all_commands
-        @all_commands ||= from_superclass(:all_commands, Bundler::Thor::CoreExt::OrderedHash.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
-        @no_commands = true
-        yield
-      ensure
-        @no_commands = false
-      end
-      alias_method :no_tasks, :no_commands
-
-      # 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(1) 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(0)
-      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, "Could not find command #{command.inspect} in #{namespace.inspect} namespace." if has_namespace
-        raise UndefinedCommandError, "Could not find command #{command.inspect}."
-      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).inspect}"
-        raise InvocationError, msg
-      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, options.merge(:check_default_type => check_default_type?))
-      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)
-        Bundler::Thor::Base.register_klass_file(klass)
-        klass.instance_variable_set(:@no_commands, false)
-      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)
-        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)
-
-        @no_commands ||= false
-        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
-
-      # A flag that makes the process exit with status 1 if any error happens.
-      def exit_on_failure?
-        false
-      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
deleted file mode 100644
index c636948e5d..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/command.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-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
-
-      # Add usage with required arguments
-      formatted << 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
-
-      # Add required options
-      formatted << " #{required_options}"
-
-      # Strip and go!
-      formatted.strip
-    end
-
-  protected
-
-    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)
-        # Ruby 1.9 always include the called method in the backtrace
-        saned.empty? || (saned.size == 1 && RUBY_VERSION >= "1.9")
-      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
deleted file mode 100644
index c167aa33b8..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-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/core_ext/io_binary_read.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
deleted file mode 100644
index 0f6e2e0af2..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class IO #:nodoc:
-  class << self
-    unless method_defined? :binread
-      def binread(file, *args)
-        raise ArgumentError, "wrong number of arguments (#{1 + args.size} for 1..3)" unless args.size < 3
-        File.open(file, "rb") do |f|
-          f.read(*args)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb
deleted file mode 100644
index 76f1e43c65..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-class Bundler::Thor
-  module CoreExt
-    class OrderedHash < ::Hash
-      if RUBY_VERSION < "1.9"
-        def initialize(*args, &block)
-          super
-          @keys = []
-        end
-
-        def initialize_copy(other)
-          super
-          # make a deep copy of keys
-          @keys = other.keys
-        end
-
-        def []=(key, value)
-          @keys << key unless key?(key)
-          super
-        end
-
-        def delete(key)
-          if key? key
-            index = @keys.index(key)
-            @keys.delete_at index
-          end
-          super
-        end
-
-        def delete_if
-          super
-          sync_keys!
-          self
-        end
-
-        alias_method :reject!, :delete_if
-
-        def reject(&block)
-          dup.reject!(&block)
-        end
-
-        def keys
-          @keys.dup
-        end
-
-        def values
-          @keys.map { |key| self[key] }
-        end
-
-        def to_hash
-          self
-        end
-
-        def to_a
-          @keys.map { |key| [key, self[key]] }
-        end
-
-        def each_key
-          return to_enum(:each_key) unless block_given?
-          @keys.each { |key| yield(key) }
-          self
-        end
-
-        def each_value
-          return to_enum(:each_value) unless block_given?
-          @keys.each { |key| yield(self[key]) }
-          self
-        end
-
-        def each
-          return to_enum(:each) unless block_given?
-          @keys.each { |key| yield([key, self[key]]) }
-          self
-        end
-
-        def each_pair
-          return to_enum(:each_pair) unless block_given?
-          @keys.each { |key| yield(key, self[key]) }
-          self
-        end
-
-        alias_method :select, :find_all
-
-        def clear
-          super
-          @keys.clear
-          self
-        end
-
-        def shift
-          k = @keys.first
-          v = delete(k)
-          [k, v]
-        end
-
-        def merge!(other_hash)
-          if block_given?
-            other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
-          else
-            other_hash.each { |k, v| self[k] = v }
-          end
-          self
-        end
-
-        alias_method :update, :merge!
-
-        def merge(other_hash, &block)
-          dup.merge!(other_hash, &block)
-        end
-
-        # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
-        def replace(other)
-          super
-          @keys = other.keys
-          self
-        end
-
-        def inspect
-          "#<#{self.class} #{super}>"
-        end
-
-        private
-
-        def sync_keys!
-          @keys.delete_if { |k| !key?(k) }
-        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
deleted file mode 100644
index 2f816081f3..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/error.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-class Bundler::Thor
-  # 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
-  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
-  end
-
-  class RequiredArgumentMissingError < InvocationError
-  end
-
-  class MalformattedArgumentError < InvocationError
-  end
-end
diff --git a/lib/bundler/vendor/thor/lib/thor/group.rb b/lib/bundler/vendor/thor/lib/thor/group.rb
deleted file mode 100644
index 05ddc10cd3..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/group.rb
+++ /dev/null
@@ -1,281 +0,0 @@
-require "bundler/vendor/thor/lib/thor/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__
-          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__
-          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
deleted file mode 100644
index 866d2212a7..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/invocation.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-class Bundler::Thor
-  module Invocation
-    def self.included(base) #:nodoc:
-      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
deleted file mode 100644
index ce81a17484..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/line_editor.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "bundler/vendor/thor/lib/thor/line_editor/basic"
-require "bundler/vendor/thor/lib/thor/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
deleted file mode 100644
index 0adb2b3137..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-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" if RUBY_VERSION > "1.9.2"
-          $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
deleted file mode 100644
index dd39cff35d..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-begin
-  require "readline"
-rescue LoadError
-end
-
-class Bundler::Thor
-  module LineEditor
-    class Readline < Basic
-      def self.available?
-        Object.const_defined?(:Readline)
-      end
-
-      def readline
-        if echo?
-          ::Readline.completion_append_character = nil
-          # Ruby 1.8.7 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/parser.rb b/lib/bundler/vendor/thor/lib/thor/parser.rb
deleted file mode 100644
index 08f80e565d..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/parser.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "bundler/vendor/thor/lib/thor/parser/argument"
-require "bundler/vendor/thor/lib/thor/parser/arguments"
-require "bundler/vendor/thor/lib/thor/parser/option"
-require "bundler/vendor/thor/lib/thor/parser/options"
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/argument.rb b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
deleted file mode 100644
index dfe7398583..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index 1fd790f4b7..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-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 =~ /^-/
-        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?
-          @assigns[argument.human_name] = argument.default
-        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 !~ /^-/
-    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
deleted file mode 100644
index 85169b56c8..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/parser/option.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-class Bundler::Thor
-  class Option < Argument #:nodoc:
-    attr_reader :aliases, :group, :lazy_default, :hide
-
-    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)
-      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! if @check_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
-
-      raise ArgumentError, "Expected #{@type} default value for '#{switch_name}'; got #{@default.inspect} (#{default_type})" unless default_type == @type
-    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
deleted file mode 100644
index 70f6366842..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/parser/options.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-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 = []
-
-      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
-        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)
-            @assigns[option.human_name] = parse_peek(switch, option)
-          elsif @stop_on_unknown
-            @parsing_options = false
-            @extra << shifted
-            @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!
-      # an unknown option starts with - or -- and has no more --'s afterward.
-      unknown = @extra.select { |str| str =~ /^--?(?:(?!--).)*$/ }
-      raise UnknownArgumentError, "Unknown switches '#{unknown.join(', ')}'" unless unknown.empty?
-    end
-
-  protected
-
-    # 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))
-    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
-          !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
deleted file mode 100644
index 60282e2991..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/rake_compat.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-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)
-      # 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
deleted file mode 100644
index b110b8d478..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/runner.rb
+++ /dev/null
@@ -1,324 +0,0 @@
-require "bundler/vendor/thor/lib/thor"
-require "bundler/vendor/thor/lib/thor/group"
-require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
-
-require "yaml"
-require "digest"
-require "pathname"
-
-class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLength
-  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 Bundler::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 "bundler/vendor/thor/lib/thor/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 Bundler::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 Bundler::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 Bundler::Thorfiles are loaded first, so local
-  # Bundler::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 Bundler::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 Bundler::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 Bundler::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
deleted file mode 100644
index e945549324..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/shell.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-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, "bundler/vendor/thor/lib/thor/shell/basic"
-    autoload :Color, "bundler/vendor/thor/lib/thor/shell/color"
-    autoload :HTML,  "bundler/vendor/thor/lib/thor/shell/html"
-
-    # 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__
-        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
deleted file mode 100644
index 5162390efd..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
+++ /dev/null
@@ -1,437 +0,0 @@
-class Bundler::Thor
-  module Shell
-    class Basic
-      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 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 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/))
-        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|
-          unwrapped.strip.tr("\n", " ").squeeze(" ").gsub(/.{1,#{width}}(?:\s|\Z)/) { ($& + 5.chr).gsub(/\n\005/, "\n").gsub(/\005/, "\n") }
-        end
-
-        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
-      #
-      def file_collision(destination)
-        return true if @always_force
-        options = block_given? ? "[Ynaqdh]" : "[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..."
-          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 : 80
-        end
-        result < 10 ? 80 : result
-      rescue
-        80
-      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
-        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]
-        correct_answer = nil
-        until correct_answer
-          answers = answer_set.join(", ")
-          answer = ask_simply("#{statement} [#{answers}]", color, options)
-          correct_answer = answer_set.include?(answer) ? answer : nil
-          say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
-        end
-        correct_answer
-      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
deleted file mode 100644
index da289cb50c..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/shell/color.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require "bundler/vendor/thor/lib/thor/shell/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?
-        stdout.tty?
-      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
deleted file mode 100644
index 83d2054988..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/shell/html.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-require "bundler/vendor/thor/lib/thor/shell/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('; ')};\">#{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('; ')};\">#{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
deleted file mode 100644
index 5d03177a28..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/util.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-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 responsable 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}/Bundler::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
-    end
-  end
-end
diff --git a/lib/bundler/vendor/thor/lib/thor/version.rb b/lib/bundler/vendor/thor/lib/thor/version.rb
deleted file mode 100644
index df8f18821a..0000000000
--- a/lib/bundler/vendor/thor/lib/thor/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Bundler::Thor
-  VERSION = "0.20.0"
-end
diff --git a/lib/bundler/vendored_fileutils.rb b/lib/bundler/vendored_fileutils.rb
deleted file mode 100644
index d14e98baf7..0000000000
--- a/lib/bundler/vendored_fileutils.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler; end
-if RUBY_VERSION >= "2.4"
-  require "bundler/vendor/fileutils/lib/fileutils"
-else
-  # the version we vendor is 2.4+
-  require "fileutils"
-end
diff --git a/lib/bundler/vendored_molinillo.rb b/lib/bundler/vendored_molinillo.rb
deleted file mode 100644
index 061b634f72..0000000000
--- a/lib/bundler/vendored_molinillo.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler; end
-require "bundler/vendor/molinillo/lib/molinillo"
diff --git a/lib/bundler/vendored_persistent.rb b/lib/bundler/vendored_persistent.rb
deleted file mode 100644
index de9c42fcc1..0000000000
--- a/lib/bundler/vendored_persistent.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-# We forcibly require OpenSSL, because net/http/persistent will only autoload
-# it. On some Rubies, autoload fails but explicit require succeeds.
-begin
-  require "openssl"
-rescue LoadError
-  # some Ruby builds don't have OpenSSL
-end
-module Bundler
-  module Persistent
-    module Net
-      module HTTP
-      end
-    end
-  end
-end
-require "bundler/vendor/net-http-persistent/lib/net/http/persistent"
-
-module Bundler
-  class PersistentHTTP < Persistent::Net::HTTP::Persistent
-    def connection_for(uri)
-      connection = super
-      warn_old_tls_version_rubygems_connection(uri, connection)
-      connection
-    end
-
-    def warn_old_tls_version_rubygems_connection(uri, connection)
-      return unless connection.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
deleted file mode 100644
index 8cca090f55..0000000000
--- a/lib/bundler/vendored_thor.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  def self.require_thor_actions
-    Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")
-  end
-end
-require "bundler/vendor/thor/lib/thor"
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
deleted file mode 100644
index 01b28c08eb..0000000000
--- a/lib/bundler/version.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: false
-
-# Ruby 1.9.3 and old RubyGems don't play nice with frozen version strings
-# rubocop:disable MutableConstant
-
-module Bundler
-  # We're doing this because we might write tests that deal
-  # with other versions of bundler and we are unsure how to
-  # handle this better.
-  VERSION = "1.17.2" unless defined?(::Bundler::VERSION)
-
-  def self.overwrite_loaded_gem_version
-    begin
-      require "rubygems"
-    rescue LoadError
-      return
-    end
-    return unless bundler_spec = Gem.loaded_specs["bundler"]
-    return if bundler_spec.version == VERSION
-    bundler_spec.version = Bundler::VERSION
-  end
-  private_class_method :overwrite_loaded_gem_version
-  overwrite_loaded_gem_version
-
-  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
deleted file mode 100644
index ec25716cde..0000000000
--- a/lib/bundler/version_ranges.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module VersionRanges
-    NEq = Struct.new(:version)
-    ReqR = Struct.new(:left, :right)
-    class ReqR
-      Endpoint = Struct.new(:version, :inclusive)
-      def to_s
-        "#{left.inclusive ? "[" : "("}#{left.version}, #{right.version}#{right.inclusive ? "]" : ")"}"
-      end
-      INFINITY = Object.new.freeze
-      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
-
-      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_by {|range| [range.left.version, range.left.inclusive ? 0 : 1] }, 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
-        when 1 then next curr_range
-        when 0 then next(last_range.right.inclusive && curr_range.left.inclusive && !neqs.include?(curr_range.left.version) && curr_range)
-        when -1 then next false
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/vlad.rb b/lib/bundler/vlad.rb
deleted file mode 100644
index 68181e7db8..0000000000
--- a/lib/bundler/vlad.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/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 "bundler/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
deleted file mode 100644
index e91cfa7805..0000000000
--- a/lib/bundler/worker.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-require "thread"
-
-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 = Queue.new
-      @response_queue = Queue.new
-      @func = func
-      @size = size
-      @threads = nil
-      SharedHelpers.trap("INT") { abort_threads }
-    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
-      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)
-      @threads = nil
-    end
-
-    def abort_threads
-      return unless @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
-
-      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
-  end
-end
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb
deleted file mode 100644
index 0fd81c40ef..0000000000
--- a/lib/bundler/yaml_serializer.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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
-
-    HASH_REGEX = /
-      ^
-      ([ ]*) # indentations
-      (.+) # key
-      (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
-      [ ]?
-      (?: !\s)? # optional exclamation mark found with ruby 1.9.3
-      (['"]?) # optional opening quote
-      (.*) # value
-      \3 # matching closing quote
-      $
-    /xo
-
-    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 0f44a929e4..167b76cef7 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # cgi.rb - cgi support library
 #
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
index 9a0d41e2b8..ffd88b8edb 100644
--- a/lib/cgi/cookie.rb
+++ b/lib/cgi/cookie.rb
@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-require_relative 'util'
+# frozen_string_literal: false
+require 'cgi/util'
 class CGI
   # Class representing an HTTP cookie.
   #
@@ -143,7 +143,7 @@ class CGI
     # Convert the Cookie to its string representation.
     def to_s
       val = collect{|v| CGI.escape(v) }.join("&")
-      buf = "#{@name}=#{val}".dup
+      buf = "#{@name}=#{val}"
       buf << "; domain=#{@domain}" if @domain
       buf << "; path=#{@path}"     if @path
       buf << "; expires=#{CGI::rfc1123_date(@expires)}" if @expires
@@ -162,7 +162,7 @@ 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)
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index c45f9b3a9e..1a741dcd76 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -1,16 +1,9 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #--
 # 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
 
@@ -153,7 +146,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.
@@ -189,7 +182,7 @@ class CGI
   alias :header :http_header
 
   def _header_for_string(content_type) #:nodoc:
-    buf = ''.dup
+    buf = ''
     if nph?()
       buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
@@ -205,7 +198,7 @@ class CGI
   private :_header_for_string
 
   def _header_for_hash(options)  #:nodoc:
-    buf = ''.dup
+    buf = ''
     ## add charset to option['type']
     options['type'] ||= 'text/html'
     charset = options.delete('charset')
@@ -267,7 +260,7 @@ class CGI
   def _header_for_modruby(buf)  #:nodoc:
     request = Apache::request
     buf.scan(/([^:]+): (.+)#{EOL}/o) do |name, value|
-      $stderr.printf("name:%s value:%s\n", name, value) if $DEBUG
+      warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
       case name
       when 'Set-Cookie'
         request.headers_out.add(name, value)
@@ -421,7 +414,7 @@ class CGI
   module QueryExtension
 
     %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-      define_method(env.delete_prefix('HTTP_').downcase) do
+      define_method(env.sub(/^HTTP_/, '').downcase) do
         (val = env_table[env]) && Integer(val)
       end
     end
@@ -434,7 +427,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.delete_prefix('HTTP_').downcase) do
+      define_method(env.sub(/^HTTP_/, '').downcase) do
         env_table[env]
       end
     end
@@ -487,7 +480,7 @@ class CGI
       @files = {}
       boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
       boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
-      buf = ''.dup
+      buf = ''
       bufsize = 10 * 1024
       max_count = MAX_MULTIPART_COUNT
       n = 0
@@ -542,12 +535,12 @@ class CGI
         body.rewind
         ## original filename
         /Content-Disposition:.* filename=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
-        filename = $1 || $2 || ''.dup
+        filename = $1 || $2 || ''
         filename = CGI.unescape(filename) if unescape_filename?()
         body.instance_variable_set(:@original_filename, filename.taint)
         ## content type
         /Content-Type: (.*)/i.match(head)
-        (content_type = $1 || ''.dup).chomp!
+        (content_type = $1 || '').chomp!
         body.instance_variable_set(:@content_type, content_type.taint)
         ## query parameter name
         /Content-Disposition:.* name=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
@@ -596,7 +589,7 @@ class CGI
       else
         begin
           require 'stringio'
-          body = StringIO.new("".b)
+          body = StringIO.new("".force_encoding(Encoding::ASCII_8BIT))
         rescue LoadError
           require 'tempfile'
           body = Tempfile.new('CGI', encoding: Encoding::ASCII_8BIT)
@@ -707,7 +700,7 @@ class CGI
         if value
           return value
         elsif defined? StringIO
-          StringIO.new("".b)
+          StringIO.new("".force_encoding(Encoding::ASCII_8BIT))
         else
           Tempfile.new("CGI",encoding: Encoding::ASCII_8BIT)
         end
@@ -741,7 +734,7 @@ class CGI
   #
   #   CGI.accept_charset = "EUC-JP"
   #
-  @@accept_charset="UTF-8" if false # needed for rdoc?
+  @@accept_charset="UTF-8"
 
   # Return the accept character set for all new CGI instances.
   def self.accept_charset
@@ -862,24 +855,24 @@ class CGI
 
     case @options[:tag_maker]
     when "html3"
-      require_relative 'html'
+      require 'cgi/html'
       extend Html3
       extend HtmlExtension
     when "html4"
-      require_relative 'html'
+      require 'cgi/html'
       extend Html4
       extend HtmlExtension
     when "html4Tr"
-      require_relative 'html'
+      require 'cgi/html'
       extend Html4Tr
       extend HtmlExtension
     when "html4Fr"
-      require_relative 'html'
+      require 'cgi/html'
       extend Html4Tr
       extend Html4Fr
       extend HtmlExtension
     when "html5"
-      require_relative 'html'
+      require 'cgi/html'
       extend Html5
       extend HtmlExtension
     end
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
index 02d847ebd3..4b9e577b32 100644
--- a/lib/cgi/html.rb
+++ b/lib/cgi/html.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 class CGI
   # Base module for HTML-generation mixins.
   #
@@ -26,7 +26,7 @@ class CGI
     #   - O EMPTY
     def nOE_element(element, attributes = {})
       attributes={attributes=>nil} if attributes.kind_of?(String)
-      s = "<#{element.upcase}".dup
+      s = "<#{element.upcase}"
       attributes.each do|name, value|
         next unless value
         s << " "
@@ -408,7 +408,7 @@ class CGI
       end
       pretty = attributes.delete("PRETTY")
       pretty = "  " if true == pretty
-      buf = "".dup
+      buf = ""
 
       if attributes.has_key?("DOCTYPE")
         if attributes["DOCTYPE"]
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 5afc7e69aa..d44a5f84b0 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # cgi/session.rb - session support for cgi scripts
 #
@@ -406,8 +406,8 @@ class CGI
               @hash[CGI::unescape(k)] = Marshal.restore(CGI::unescape(v))
             end
           ensure
-            f&.close
-            lockf&.close
+            f.close unless f.nil?
+            lockf.close if lockf
           end
         end
         @hash
@@ -426,8 +426,8 @@ class CGI
           f.close
           File.rename @path+".new", @path
         ensure
-          f&.close
-          lockf&.close
+          f.close if f and !f.closed?
+          lockf.close if lockf
         end
       end
 
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index 5a6e25d137..2dfb72bdce 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # 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_relative '../session'
+require 'cgi/session'
 require 'pstore'
 
 class CGI
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index 464115262f..66fa54d8e9 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -1,9 +1,5 @@
-# frozen_string_literal: true
-class CGI
-  module Util; end
-  include Util
-  extend Util
-end
+# frozen_string_literal: false
+class CGI; module Util; end; extend Util; end
 module CGI::Util
   @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   # URL-encode a string.
@@ -11,7 +7,7 @@ module CGI::Util
   #      # => "%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
diff --git a/lib/cmath.gemspec b/lib/cmath.gemspec
deleted file mode 100644
index 953cfe04c4..0000000000
--- a/lib/cmath.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "cmath"
-  spec.version       = "1.0.0"
-  spec.authors       = ["Tadayoshi Funaba"]
-  spec.email         = [nil]
-
-  spec.summary       = "Provides Trigonometric and Transcendental functions for complex numbers"
-  spec.description   = "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."
-  spec.homepage      = "https://github.com/ruby/cmath"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = "lib/cmath.rb"
-  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"
-  spec.add_development_dependency "rake"
-end
diff --git a/lib/cmath.rb b/lib/cmath.rb
index 7dbd65e799..41ab06e77c 100644
--- a/lib/cmath.rb
+++ b/lib/cmath.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # = Trigonometric and transcendental functions for complex numbers.
 #
@@ -50,7 +50,7 @@ module CMath
     atanh
   ].each do |meth|
     define_method(meth + '!') do |*args, &block|
-      warn("CMath##{meth}! is deprecated; use CMath##{meth} or Math##{meth}", uplevel: 1) if $VERBOSE
+      warn("CMath##{meth}! is deprecated; use CMath##{meth} or Math##{meth}") if $VERBOSE
       RealMath.send(meth, *args, &block)
     end
   end
diff --git a/lib/csv.rb b/lib/csv.rb
index 1239554ad6..03b87983e6 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2,7 +2,9 @@
 # frozen_string_literal: true
 # = csv.rb -- CSV Reading and Writing
 #
-# Created by James Edward Gray II on 2005-10-31.
+#  Created by James Edward Gray II on 2005-10-31.
+#  Copyright 2005 James Edward Gray II. You can redistribute or modify this code
+#  under the terms of Ruby's license.
 #
 # See CSV for documentation.
 #
@@ -94,131 +96,73 @@ 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)
-
 #
 # 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.
 #
-# The most generic interface of the library is:
-#
-#    csv = CSV.new(string_or_io, **options)
+# == Reading
 #
-#    # Reading: IO object should be open for read
-#    csv.read # => array of rows
-#    # or
-#    csv.each do |row|
-#      # ...
-#    end
-#    # or
-#    row = csv.shift
+# === From a File
 #
-#    # Writing: IO object should be open for write
-#    csv << row
+# ==== A Line at a Time
 #
-# There are several specialized class methods for one-statement reading or writing,
-# described in the Specialized Methods section.
+#   CSV.foreach("path/to/file.csv") do |row|
+#     # use row here...
+#   end
 #
-# If a String is passed into ::new, it is internally wrapped into a StringIO object.
+# ==== All at Once
 #
-# +options+ can be used for specifying the particular CSV flavor (column
-# separators, row separators, value quoting and so on), and for data conversion,
-# see Data Conversion section for the description of the latter.
+#   arr_of_arrs = CSV.read("path/to/file.csv")
 #
-# == Specialized Methods
+# === From a String
 #
-# === Reading
+# ==== A Line at a Time
 #
-#   # From a file: all at once
-#   arr_of_rows = CSV.read("path/to/file.csv", **options)
-#   # iterator-style:
-#   CSV.foreach("path/to/file.csv", **options) do |row|
-#     # ...
+#   CSV.parse("CSV,data,String") do |row|
+#     # use row here...
 #   end
 #
-#   # From a string
-#   arr_of_rows = CSV.parse("CSV,data,String", **options)
-#   # or
-#   CSV.parse("CSV,data,String", **options) do |row|
-#     # ...
-#   end
+# ==== All at Once
+#
+#   arr_of_arrs = CSV.parse("CSV,data,String")
+#
+# == Writing
 #
-# === Writing
+# === To a File
 #
-#   # To a file
 #   CSV.open("path/to/file.csv", "wb") do |csv|
 #     csv << ["row", "of", "CSV", "data"]
 #     csv << ["another", "row"]
 #     # ...
 #   end
 #
-#   # To a String
+# === To a String
+#
 #   csv_string = CSV.generate do |csv|
 #     csv << ["row", "of", "CSV", "data"]
 #     csv << ["another", "row"]
 #     # ...
 #   end
 #
-# === Shortcuts
+# == Convert a Single Line
 #
-#   # Core extensions for converting one line
 #   csv_string = ["CSV", "data"].to_csv   # to CSV
 #   csv_array  = "CSV,String".parse_csv   # from CSV
 #
-#   # CSV() method
+# == Shortcut Interface
+#
 #   CSV             { |csv_out| csv_out << %w{my data here} }  # to $stdout
 #   CSV(csv = "")   { |csv_str| csv_str << %w{my data here} }  # to a String
 #   CSV($stderr)    { |csv_err| csv_err << %w{my data here} }  # to $stderr
 #   CSV($stdin)     { |csv_in|  csv_in.each { |row| p row } }  # from $stdin
 #
-# == Data Conversion
+# == Advanced Usage
 #
-# === CSV with headers
+# === Wrap an IO Object
 #
-# CSV allows to specify column names of CSV file, whether they are in data, or
-# provided separately. If headers 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,Engeneering,1000', headers: %i[name department salary])
-#   data.first      #=> #<CSV::Row name:"Bob" department:"Engineering" salary:"1000">
-#
-# === Typed data reading
-#
-# CSV allows to provide a set of data _converters_ e.g. transformations to try on input
-# data. Converter could be a symbol from CSV::Converters constant's keys, or lambda.
-#
-#   # Without any converters:
-#   CSV.parse('Bob,2018-03-01,100')
-#   #=> [["Bob", "2018-03-01", "100"]]
-#
-#   # With built-in converters:
-#   CSV.parse('Bob,2018-03-01,100', converters: %i[numeric date])
-#   #=> [["Bob", #<Date: 2018-03-01>, 100]]
-#
-#   # With custom converters:
-#   CSV.parse('Bob,2018-03-01,100', converters: [->(v) { Time.parse(v) rescue v }])
-#   #=> [["Bob", 2018-03-01 00:00:00 +0200, "100"]]
+#   csv = CSV.new(io, options)
+#   # ... read (with gets() or each()) from and write (with <<) to csv here ...
 #
 # == CSV and Character Encodings (M17n or Multilingualization)
 #
@@ -263,18 +207,716 @@ using CSV::MatchP if CSV.const_defined?(:MatchP)
 # find with it.
 #
 class CSV
+  # The version of the installed library.
+  VERSION = "2.4.8"
+
+  #
+  # A CSV::Row is part Array and part Hash.  It retains an order for the fields
+  # and allows duplicates just as an Array would, but also allows you to access
+  # fields by name just as you could if they were in a Hash.
+  #
+  # All rows returned by CSV will be constructed from this class, if header row
+  # processing is activated.
+  #
+  class Row
+    #
+    # Construct a new CSV::Row from +headers+ and +fields+, which are expected
+    # to be Arrays.  If one Array is shorter than the other, it will be padded
+    # with +nil+ objects.
+    #
+    # The optional +header_row+ parameter can be set to +true+ to indicate, via
+    # CSV::Row.header_row?() and CSV::Row.field_row?(), that this is a header
+    # row.  Otherwise, the row is assumes to be a field row.
+    #
+    # A CSV::Row object supports the following Array methods through delegation:
+    #
+    # * empty?()
+    # * length()
+    # * size()
+    #
+    def initialize(headers, fields, header_row = false)
+      @header_row = header_row
+      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
 
-  # 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}.")
+    # Internal data format used to compare equality.
+    attr_reader :row
+    protected   :row
+
+    ### Array Delegation ###
+
+    extend Forwardable
+    def_delegators :@row, :empty?, :length, :size
+
+    # Returns +true+ if this is a header row.
+    def header_row?
+      @header_row
+    end
+
+    # Returns +true+ if this is a field row.
+    def field_row?
+      not header_row?
+    end
+
+    # Returns the headers of this row.
+    def headers
+      @row.map { |pair| pair.first }
+    end
+
+    #
+    # :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
+      else
+        header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
+      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}"
+        else
+          varargs.first
+        end
+      end
+    end
+
+    # Returns +true+ if there is a field with the given +header+.
+    def has_key?(header)
+      !!@row.assoc(header)
+    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
+      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]
+      end
+
+      self  # for chaining
+    end
+
+    #
+    # A shortcut for appending multiple fields.  Equivalent to:
+    #
+    #   args.each { |arg| csv_row << arg }
+    #
+    # This method returns the row for chaining.
+    #
+    def push(*args)
+      args.each { |arg| self << arg }
+
+      self  # for chaining
+    end
+
+    #
+    # :call-seq:
+    #   delete( header )
+    #   delete( header, offset )
+    #   delete( index )
+    #
+    # Used to remove a pair from the row by +header+ or +index+.  The pair is
+    # located as described in CSV::Row.field().  The deleted pair is returned,
+    # or +nil+ if a pair could not be found.
+    #
+    def delete(header_or_index, minimum_index = 0)
+      if header_or_index.is_a? Integer                 # by index
+        @row.delete_at(header_or_index)
+      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.
+    #
+    # This method returns the row for chaining.
+    #
+    # If no block is given, an Enumerator is returned.
+    #
+    def delete_if(&block)
+      block or return enum_for(__method__) { size }
+
+      @row.delete_if(&block)
+
+      self  # for chaining
+    end
+
+    #
+    # This method accepts any number of arguments which can be headers, indices,
+    # Ranges of either, or two-element Arrays containing a header and offset.
+    # Each argument will be replaced with a field lookup as described in
+    # CSV::Row.field().
+    #
+    # If called with no arguments, all fields are returned.
+    #
+    def fields(*headers_and_or_indices)
+      if headers_and_or_indices.empty?  # return all fields--no arguments
+        @row.map { |pair| pair.last }
+      else                              # or work like values_at()
+        headers_and_or_indices.inject(Array.new) do |all, h_or_i|
+          all + if h_or_i.is_a? Range
+            index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
+                                                        index(h_or_i.begin)
+            index_end   = h_or_i.end.is_a?(Integer)   ? h_or_i.end :
+                                                        index(h_or_i.end)
+            new_range   = h_or_i.exclude_end? ? (index_begin...index_end) :
+                                                (index_begin..index_end)
+            fields.values_at(new_range)
+          else
+            [field(*Array(h_or_i))]
+          end
+        end
+      end
+    end
+    alias_method :values_at, :fields
+
+    #
+    # :call-seq:
+    #   index( header )
+    #   index( header, offset )
+    #
+    # This method will return the index of a field with the provided +header+.
+    # The +offset+ can be used to locate duplicate header names, as described in
+    # CSV::Row.field().
+    #
+    def index(header, minimum_index = 0)
+      # find the pair
+      index = headers[minimum_index..-1].index(header)
+      # return the index at the right offset, if we found one
+      index.nil? ? nil : index + minimum_index
+    end
+
+    # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
+    def header?(name)
+      headers.include? name
+    end
+    alias_method :include?, :header?
+
+    #
+    # Returns +true+ if +data+ matches a field in this row, and +false+
+    # otherwise.
+    #
+    def field?(data)
+      fields.include? data
+    end
+
+    include Enumerable
+
+    #
+    # Yields each pair of the row as header and field tuples (much like
+    # iterating over a Hash). This method returns the row for chaining.
+    #
+    # If no block is given, an Enumerator is returned.
+    #
+    # Support for Enumerable.
+    #
+    def each(&block)
+      block or return enum_for(__method__) { size }
+
+      @row.each(&block)
+
+      self  # for chaining
+    end
+
+    #
+    # Returns +true+ if this row contains the same headers and fields in the
+    # same order as +other+.
+    #
+    def ==(other)
+      return @row == other.row if other.is_a? CSV::Row
+      @row == other
+    end
+
+    #
+    # 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
+
+    #
+    # Returns the row as a CSV String.  Headers are not used.  Equivalent to:
+    #
+    #   csv_row.fields.to_csv( options )
+    #
+    def to_csv(options = Hash.new)
+      fields.to_csv(options)
+    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.
+    #
+    # A CSV::Table object supports the following Array methods through
+    # delegation:
+    #
+    # * empty?()
+    # * length()
+    # * size()
+    #
+    def initialize(array_of_rows)
+      @table = array_of_rows
+      @mode  = :col_or_row
+    end
+
+    # The current access mode for indexing and iteration.
+    attr_reader :mode
+
+    # Internal data format used to compare equality.
+    attr_reader :table
+    protected   :table
+
+    ### Array Delegation ###
+
+    extend Forwardable
+    def_delegators :@table, :empty?, :length, :size
+
+    #
+    # Returns a duplicate table object, in column mode.  This is handy for
+    # chaining in a single call without changing the table mode, but be aware
+    # that this method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_col
+      self.class.new(@table.dup).by_col!
+    end
+
+    #
+    # Switches the mode of this table to column mode.  All calls to indexing and
+    # iteration methods will work with columns until the mode is changed again.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_col!
+      @mode = :col
+
+      self
+    end
+
+    #
+    # Returns a duplicate table object, in mixed mode.  This is handy for
+    # chaining in a single call without changing the table mode, but be aware
+    # that this method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_col_or_row
+      self.class.new(@table.dup).by_col_or_row!
+    end
+
+    #
+    # Switches the mode of this table to mixed mode.  All calls to indexing and
+    # iteration methods will use the default intelligent indexing system until
+    # the mode is changed again.  In mixed mode an index is assumed to be a row
+    # reference while anything else is assumed to be column access by headers.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_col_or_row!
+      @mode = :col_or_row
+
+      self
+    end
+
+    #
+    # Returns a duplicate table object, in row mode.  This is handy for chaining
+    # in a single call without changing the table mode, but be aware that this
+    # method can consume a fair amount of memory for bigger data sets.
+    #
+    # This method returns the duplicate table for chaining.  Don't chain
+    # destructive methods (like []=()) this way though, since you are working
+    # with a duplicate.
+    #
+    def by_row
+      self.class.new(@table.dup).by_row!
+    end
+
+    #
+    # Switches the mode of this table to row mode.  All calls to indexing and
+    # iteration methods will work with rows until the mode is changed again.
+    #
+    # This method returns the table and is safe to chain.
+    #
+    def by_row!
+      @mode = :row
+
+      self
+    end
+
+    #
+    # Returns the headers for the first row of this table (assumed to match all
+    # other rows).  An empty Array is returned for empty tables.
+    #
+    def headers
+      if @table.empty?
+        Array.new
+      else
+        @table.first.headers
+      end
+    end
+
+    #
+    # In the default mixed mode, this method returns rows for index access and
+    # columns for header access.  You can force the index association by first
+    # calling by_col!() or by_row!().
+    #
+    # Columns are returned as an Array of values.  Altering that Array has no
+    # effect on the table.
+    #
+    def [](index_or_header)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and (index_or_header.is_a?(Integer) 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
+        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
+
+    #
+    # The mixed mode default is to treat a list of indices as row access,
+    # returning the rows indicated.  Anything else is considered columnar
+    # access.  For columnar access, the return set has an Array for each row
+    # with the values indicated by the headers in each Array.  You can force
+    # column or row mode using by_col!() or by_row!().
+    #
+    # You cannot mix column and row access.
+    #
+    def values_at(*indices_or_headers)
+      if @mode == :row or  # by indices
+         ( @mode == :col_or_row and indices_or_headers.all? do |index|
+                                      index.is_a?(Integer)         or
+                                      ( index.is_a?(Range)         and
+                                        index.first.is_a?(Integer) and
+                                        index.last.is_a?(Integer) )
+                                    end )
+        @table.values_at(*indices_or_headers)
+      else                 # by headers
+        @table.map { |row| row.values_at(*indices_or_headers) }
+      end
+    end
+
+    #
+    # Adds a new row to the bottom end of this table.  You can provide an Array,
+    # which will be converted to a CSV::Row (inheriting the table's headers()),
+    # or a CSV::Row.
+    #
+    # This method returns the table for chaining.
+    #
+    def <<(row_or_array)
+      if row_or_array.is_a? Array  # append Array
+        @table << Row.new(headers, row_or_array)
+      else                         # append Row
+        @table << row_or_array
+      end
+
+      self  # for chaining
+    end
+
+    #
+    # A shortcut for appending multiple rows.  Equivalent to:
+    #
+    #   rows.each { |row| self << row }
+    #
+    # This method returns the table for chaining.
+    #
+    def push(*rows)
+      rows.each { |row| self << row }
+
+      self  # for chaining
+    end
+
+    #
+    # Removes and returns the indicated column or row.  In the default mixed
+    # mode indices refer to rows and everything else is assumed to be a column
+    # header.  Use by_col!() or by_row!() to force the lookup.
+    #
+    def delete(index_or_header)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and index_or_header.is_a? Integer)
+        @table.delete_at(index_or_header)
+      else                 # by header
+        @table.map { |row| row.delete(index_or_header).last }
+      end
+    end
+
+    #
+    # Removes any column or row for which the block returns +true+.  In the
+    # default mixed mode or row mode, iteration is the standard row major
+    # walking of rows.  In column mode, 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.
+    #
+    # If no block is given, an Enumerator is returned.
+    #
+    def delete_if(&block)
+      block or return enum_for(__method__) { @mode == :row or @mode == :col_or_row ? size : headers.size }
+
+      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
+    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.
+    #
+    # If no block is given, an Enumerator is returned.
+    #
+    def each(&block)
+      block or return enum_for(__method__) { @mode == :col ? headers.size : size }
+
+      if @mode == :col
+        headers.each { |header| block[[header, self[header]]] }
+      else
+        @table.each(&block)
+      end
+
+      self  # for chaining
+    end
+
+    # Returns +true+ if all rows of this table ==() +other+'s rows.
+    def ==(other)
+      @table == other.table
+    end
+
+    #
+    # Returns the table as an Array of Arrays.  Headers will be the first row,
+    # then all of the field rows will follow.
+    #
+    def to_a
+      @table.inject([headers]) do |array, row|
+        if row.header_row?
+          array
+        else
+          array + [row.fields]
+        end
+      end
+    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(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
+
+    # 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
+
+  # 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
@@ -292,11 +934,7 @@ class CSV
   # 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
+            \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")
@@ -336,7 +974,7 @@ class CSV
     date:      lambda { |f|
       begin
         e = f.encode(ConverterEncoding)
-        e.match?(DateMatcher) ? Date.parse(e) : f
+        e =~ DateMatcher ? Date.parse(e) : f
       rescue  # encoding conversion or date parse errors
         f
       end
@@ -344,7 +982,7 @@ class CSV
     date_time: lambda { |f|
       begin
         e = f.encode(ConverterEncoding)
-        e.match?(DateTimeMatcher) ? DateTime.parse(e) : f
+        e =~ DateTimeMatcher ? DateTime.parse(e) : f
       rescue  # encoding conversion or date parse errors
         f
       end
@@ -376,8 +1014,8 @@ class CSV
   HeaderConverters = {
     downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
     symbol:   lambda { |h|
-      h.encode(ConverterEncoding).downcase.gsub(/[^\s\w]+/, "").strip.
-                                           gsub(/\s+/, "_").to_sym
+      h.encode(ConverterEncoding).downcase.strip.gsub(/\s+/, "_").
+                                                 gsub(/\W+/, "").to_sym
     }
   }
 
@@ -397,7 +1035,6 @@ class CSV
   # <b><tt>:force_quotes</tt></b>::       +false+
   # <b><tt>:skip_lines</tt></b>::         +nil+
   # <b><tt>:liberal_parsing</tt></b>::    +false+
-  # <b><tt>:quote_empty</tt></b>::        +true+
   #
   DEFAULT_OPTIONS = {
     col_sep:            ",",
@@ -413,7 +1050,6 @@ class CSV
     force_quotes:       false,
     skip_lines:         nil,
     liberal_parsing:    false,
-    quote_empty:        true,
   }.freeze
 
   #
@@ -425,14 +1061,14 @@ class CSV
   # 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)
+  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))
+    instance    =   (@@instances[sig] ||= new(data, options))
 
     if block_given?
       yield instance  # run block, if given, returning result
@@ -443,9 +1079,9 @@ class CSV
 
   #
   # :call-seq:
-  #   filter( **options ) { |row| ... }
-  #   filter( input, **options ) { |row| ... }
-  #   filter( input, output, **options ) { |row| ... }
+  #   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.
@@ -465,23 +1101,25 @@ class CSV
   # The <tt>:output_row_sep</tt> +option+ defaults to
   # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
   #
-  def self.filter(input=nil, output=nil, **options)
+  def self.filter(*args)
     # 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
-        in_options[key]  = value
-        out_options[key] = value
+    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(input  || ARGF,    in_options)
-    output = new(output || $stdout, out_options)
+    input  = new(args.shift || ARGF,    in_options)
+    output = new(args.shift || $stdout, out_options)
 
     # read, yield, write
     input.each do |row|
@@ -504,17 +1142,17 @@ class CSV
   # <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, mode="r", **options, &block)
-    return to_enum(__method__, path, mode, options) unless block_given?
-    open(path, mode, options) do |csv|
+  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
   end
 
   #
   # :call-seq:
-  #   generate( str, **options ) { |csv| ... }
-  #   generate( **options ) { |csv| ... }
+  #   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
@@ -529,17 +1167,19 @@ class CSV
   # 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(str=nil, **options)
+  def self.generate(*args)
     # add a default empty String, if none was given
-    if str
-      str = StringIO.new(str)
-      str.seek(0, IO::SEEK_END)
+    if args.first.is_a? String
+      io = StringIO.new(args.shift)
+      io.seek(0, IO::SEEK_END)
+      args.unshift(io)
     else
-      encoding = options[:encoding]
-      str = +""
+      encoding = args[-1][:encoding] if args.last.is_a?(Hash)
+      str      = String.new
       str.force_encoding(encoding) if encoding
+      args.unshift(str)
     end
-    csv = new(str, options) # wrap
+    csv = new(*args)  # wrap
     yield csv         # yield for appending
     csv.string        # return final String
   end
@@ -557,23 +1197,24 @@ class CSV
   # 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)
-    options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
-    str = +""
-    if options[:encoding]
-      str.force_encoding(options[:encoding])
-    elsif field = row.find {|f| f.is_a?(String)}
-      str.force_encoding(field.encoding)
+  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
   end
 
   #
   # :call-seq:
-  #   open( filename, mode = "rb", **options ) { |faster_csv| ... }
-  #   open( filename, **options ) { |faster_csv| ... }
-  #   open( filename, mode = "rb", **options )
-  #   open( filename, **options )
+  #   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.
@@ -631,16 +1272,17 @@ class CSV
   # * truncate()
   # * tty?()
   #
-  def self.open(filename, mode="r", **options)
+  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(filename, mode, file_opts)
+      f = File.open(*args, file_opts)
     rescue ArgumentError => e
-      raise unless /needs binmode/.match?(e.message) and mode == "r"
-      mode = "rb"
+      raise unless /needs binmode/ =~ e.message and args.size == 1
+      args << "rb"
       file_opts = {encoding: Encoding.default_external}.merge(file_opts)
       retry
     end
@@ -665,26 +1307,26 @@ class CSV
 
   #
   # :call-seq:
-  #   parse( str, **options ) { |row| ... }
-  #   parse( str, **options )
+  #   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+ containing
+  # You pass your +str+ to read from, and an optional +options+ Hash containing
   # anything CSV::new() understands.
   #
   def self.parse(*args, &block)
     csv = new(*args)
-
-    return csv.each(&block) if block_given?
-
-    # slurp contents, if no block is given
-    begin
-      csv.read
-    ensure
-      csv.close
+    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)
     end
   end
 
@@ -695,7 +1337,7 @@ class CSV
   #
   # The +options+ parameter can be anything CSV::new() understands.
   #
-  def self.parse_line(line, **options)
+  def self.parse_line(line, options = Hash.new)
     new(line, options).shift
   end
 
@@ -726,7 +1368,7 @@ class CSV
   #                     converters:        :numeric,
   #                     header_converters: :symbol }.merge(options) )
   #
-  def self.table(path, **options)
+  def self.table(path, options = Hash.new)
     read( path, { headers:           true,
                   converters:        :numeric,
                   header_converters: :symbol }.merge(options) )
@@ -878,133 +1520,79 @@ class CSV
   #                                       attempt to parse input not conformant
   #                                       with RFC 4180, such as double quotes
   #                                       in unquoted fields.
-  # <b><tt>:nil_value</tt></b>::          When set an object, any values of an
-  #                                       empty field are replaced by the set
-  #                                       object, not nil.
-  # <b><tt>:empty_value</tt></b>::        When set an object, any values of a
-  #                                       blank string field is replaced by
-  #                                       the set object.
-  # <b><tt>:quote_empty</tt></b>::        TODO
-  # <b><tt>:write_converters</tt></b>::   TODO
-  # <b><tt>:write_nil_value</tt></b>::    TODO
-  # <b><tt>:write_empty_value</tt></b>::  TODO
-  # <b><tt>:strip</tt></b>::              TODO
   #
   # 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,
-                 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?
+  def initialize(data, options = Hash.new)
+    if data.nil?
+      raise ArgumentError.new("Cannot parse nil as CSV")
+    end
 
-    # create the IO object we will read from
-    @io = data.is_a?(String) ? StringIO.new(data) : data
-    @encoding = determine_encoding(encoding, internal_encoding)
+    # build the options for this read/write
+    options = DEFAULT_OPTIONS.merge(options)
 
-    @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
-
-    @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,
-    }
+    # 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(', ')}."
+    end
 
-    @writer = nil
-    writer if @writer_options[:write_headers]
+    # 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.
   #
-  def col_sep
-    parser.column_separator
-  end
-
+  attr_reader :col_sep
   #
   # The encoded <tt>:row_sep</tt> used in parsing and writing.  See CSV::new
   # for details.
   #
-  def row_sep
-    parser.row_separator
-  end
-
+  attr_reader :row_sep
   #
   # The encoded <tt>:quote_char</tt> used in parsing and writing.  See CSV::new
   # for details.
   #
-  def quote_char
-    parser.quote_character
-  end
-
+  attr_reader :quote_char
   # The limit for field size, if any.  See CSV::new for details.
-  def field_size_limit
-    parser.field_size_limit
-  end
+  attr_reader :field_size_limit
 
   # The regex marking a line as a comment. See CSV::new for details
-  def skip_lines
-    parser.skip_lines
-  end
+  attr_reader :skip_lines
 
   #
   # Returns the current list of converters in effect.  See CSV::new for details.
@@ -1012,7 +1600,7 @@ class CSV
   # as is.
   #
   def converters
-    parser_fields_converter.map do |converter|
+    @converters.map do |converter|
       name = Converters.rassoc(converter)
       name ? name.first : converter
     end
@@ -1021,68 +1609,42 @@ class CSV
   # Returns +true+ if unconverted_fields() to parsed results.  See CSV::new
   # for details.
   #
-  def unconverted_fields?
-    parser.unconverted_fields?
-  end
-
+  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
-    if @writer
-      @writer.headers
-    else
-      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
+    @headers || true if @use_headers
   end
   #
   # Returns +true+ if headers will be returned as a row of results.
   # See CSV::new for details.
   #
-  def return_headers?
-    parser.return_headers?
-  end
-
+  def return_headers?()     @return_headers     end
   # Returns +true+ if headers are written in output. See CSV::new for details.
-  def write_headers?
-    @writer_options[:write_headers]
-  end
-
+  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_fields_converter.map do |converter|
+    @header_converters.map do |converter|
       name = HeaderConverters.rassoc(converter)
       name ? name.first : converter
     end
   end
-
   #
   # Returns +true+ blank lines are skipped by the parser. See CSV::new
   # for details.
   #
-  def skip_blanks?
-    parser.skip_blanks?
-  end
-
+  def skip_blanks?()        @skip_blanks        end
   # Returns +true+ if all output fields are quoted. See CSV::new for details.
-  def force_quotes?
-    @writer_options[:force_quotes]
-  end
-
+  def force_quotes?()       @force_quotes       end
   # Returns +true+ if illegal input is handled. See CSV::new for details.
-  def liberal_parsing?
-    parser.liberal_parsing?
-  end
+  def liberal_parsing?()    @liberal_parsing    end
 
   #
   # The Encoding CSV is parsing or writing in.  This will be the Encoding you
@@ -1091,85 +1653,26 @@ class CSV
   attr_reader :encoding
 
   #
-  # The line number of the last row read from this file. Fields with nested
+  # The line number of the last row read from this file.  Fields with nested
   # line-end characters will not affect this count.
   #
-  def lineno
-    if @writer
-      @writer.lineno
-    else
-      parser.lineno
-    end
-  end
-
-  #
-  # The last row read from this file.
-  #
-  def line
-    parser.line
-  end
+  attr_reader :lineno
 
   ### IO and StringIO Delegation ###
 
   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
-
-  def flock(*args)
-    raise NotImplementedError unless @io.respond_to?(:flock)
-    @io.flock(*args)
-  end
-
-  def ioctl(*args)
-    raise NotImplementedError unless @io.respond_to?(:ioctl)
-    @io.ioctl(*args)
-  end
-
-  def path
-    @io.path if @io.respond_to?(:path)
-  end
-
-  def stat(*args)
-    raise NotImplementedError unless @io.respond_to?(:stat)
-    @io.stat(*args)
-  end
-
-  def to_i
-    raise NotImplementedError unless @io.respond_to?(:to_i)
-    @io.to_i
-  end
-
-  def to_io
-    @io.respond_to?(:to_io) ? @io.to_io : @io
-  end
-
-  def eof?
-    begin
-      parser_enumerator.peek
-      false
-    rescue StopIteration
-      true
-    end
-  end
-  alias_method :eof, :eof?
+  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?
 
   # Rewinds the underlying IO object and resets CSV's lineno() counter.
   def rewind
-    @parser = nil
-    @parser_enumerator = nil
-    @writer.rewind if @writer
+    @headers = nil
+    @lineno  = 0
+
     @io.rewind
   end
 
@@ -1183,8 +1686,35 @@ class CSV
   # The data source must be open for writing.
   #
   def <<(row)
-    writer << row
-    self
+    # 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
   end
   alias_method :add_row, :<<
   alias_method :puts,    :<<
@@ -1205,7 +1735,7 @@ class CSV
   # converted field or the field itself.
   #
   def convert(name = nil, &converter)
-    parser_fields_converter.add_converter(name, &converter)
+    add_converter(:converters, self.class::Converters, name, &converter)
   end
 
   #
@@ -1220,7 +1750,10 @@ class CSV
   # effect.
   #
   def header_convert(name = nil, &converter)
-    header_fields_converter.add_converter(name, &converter)
+    add_converter( :header_converters,
+                   self.class::HeaderConverters,
+                   name,
+                   &converter )
   end
 
   include Enumerable
@@ -1232,8 +1765,14 @@ class CSV
   #
   # The data source must be open for reading.
   #
-  def each(&block)
-    parser_enumerator.each(&block)
+  def each
+    if block_given?
+      while row = shift
+        yield row
+      end
+    else
+      to_enum
+    end
   end
 
   #
@@ -1243,8 +1782,8 @@ class CSV
   #
   def read
     rows = to_a
-    if parser.use_headers?
-      Table.new(rows, headers: parser.headers)
+    if @use_headers
+      Table.new(rows)
     else
       rows
     end
@@ -1253,7 +1792,7 @@ class CSV
 
   # Returns +true+ if the next row read will be a header row.
   def header_row?
-    parser.header_row?
+    @use_headers and @headers.nil?
   end
 
   #
@@ -1264,10 +1803,153 @@ class CSV
   # The data source must be open for reading.
   #
   def shift
-    begin
-      parser_enumerator.next
-    rescue StopIteration
-      nil
+    #########################################################################
+    ### 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
+    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[-1] = csv[-1].push(part[0..-2]).join("")
+            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.push(part, @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], @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
     end
   end
   alias_method :gets,     :shift
@@ -1292,18 +1974,15 @@ class CSV
     # show encoding
     str << " encoding:" << @encoding.name
     # show other attributes
-    ["lineno", "col_sep", "row_sep", "quote_char"].each do |attr_name|
-      if a = __send__(attr_name)
+    %w[ lineno     col_sep     row_sep
+        quote_char skip_blanks liberal_parsing ].each do |attr_name|
+      if a = instance_variable_get("@#{attr_name}")
         str << " " << attr_name << ":" << a.inspect
       end
     end
-    ["skip_blanks", "liberal_parsing"].each do |attr_name|
-      if a = __send__("#{attr_name}?")
-        str << " " << attr_name << ":" << a.inspect
-      end
+    if @use_headers
+      str << " headers:" << headers.inspect
     end
-    _headers = headers
-    str << " headers:" << _headers.inspect if _headers
     str << ">"
     begin
       str.join('')
@@ -1317,32 +1996,221 @@ class CSV
 
   private
 
-  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
+  #
+  # 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)
 
-    return Encoding.find(internal_encoding) if internal_encoding
+    if @quote_char.length != 1
+      raise ArgumentError, ":quote_char has to be a single character String"
+    end
 
-    if encoding
-      encoding, = encoding.split(":", 2) if encoding.is_a?(String)
-      return Encoding.find(encoding)
+    #
+    # 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
+
+          # 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
+      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.
+  #
+  def init_converters(options, field_name = :converters)
+    if field_name == :converters
+      @unconverted_fields = options.delete(:unconverted_fields)
+    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
     end
 
-    Encoding.default_internal || Encoding.default_external
+    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)
   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]
+  # 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
+  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
   end
@@ -1355,88 +2223,120 @@ class CSV
   # shortcut.
   #
   def convert_fields(fields, headers = false)
-    if headers
-      header_fields_converter.convert(fields, nil, 0)
-    else
-      parser_fields_converter.convert(fields, @headers, lineno)
+    # 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
   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
+  # 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
-  end
-
-  def parser_fields_converter
-    @parser_fields_converter ||= build_parser_fields_converter
-  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
-
-  def header_fields_converter
-    @header_fields_converter ||= build_header_fields_converter
-  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
-
-  def writer_fields_converter
-    @writer_fields_converter ||= build_writer_fields_converter
-  end
-
-  def build_writer_fields_converter
-    build_fields_converter(@initial_write_converters,
-                           @write_fields_converter_options)
+    self.class::Row.new(@headers, convert_fields(row))  # field row
   end
 
-  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)
+  #
+  # 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
-    fields_converter
+    row.instance_eval { @unconverted_fields = fields }
+    row
   end
 
-  def parser
-    @parser ||= Parser.new(@io, parser_options)
+  #
+  # 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}
   end
 
-  def parser_options
-    @parser_options.merge(header_fields_converter: header_fields_converter,
-                          fields_converter: parser_fields_converter)
+  #
+  # 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))
   end
 
-  def parser_enumerator
-    @parser_enumerator ||= parser.parse
+  #
+  # 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('')
   end
 
-  def writer
-    @writer ||= Writer.new(@io, writer_options)
-  end
+  private
 
-  def writer_options
-    @writer_options.merge(header_fields_converter: header_fields_converter,
-                          fields_converter: writer_fields_converter)
+  #
+  # 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
   end
 end
 
@@ -1460,6 +2360,22 @@ def CSV(*args, &block)
   CSV.instance(*args, &block)
 end
 
-require_relative "csv/version"
-require_relative "csv/core_ext/array"
-require_relative "csv/core_ext/string"
+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
diff --git a/lib/csv/core_ext/array.rb b/lib/csv/core_ext/array.rb
deleted file mode 100644
index 94df7d5c35..0000000000
--- a/lib/csv/core_ext/array.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 8f2070f3bd..0000000000
--- a/lib/csv/core_ext/string.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 98110bc13c..0000000000
--- a/lib/csv/csv.gemspec
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.license       = "BSD-2-Clause"
-
-  spec.files         = [
-    "LICENSE.txt",
-    "NEWS.md",
-    "README.md",
-    "lib/csv.rb",
-    "lib/csv/core_ext/array.rb",
-    "lib/csv/core_ext/string.rb",
-    "lib/csv/delete_suffix.rb",
-    "lib/csv/fields_converter.rb",
-    "lib/csv/match_p.rb",
-    "lib/csv/parser.rb",
-    "lib/csv/row.rb",
-    "lib/csv/table.rb",
-    "lib/csv/version.rb",
-    "lib/csv/writer.rb",
-  ]
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.3.0"
-
-  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
deleted file mode 100644
index e0b40c7aab..0000000000
--- a/lib/csv/delete_suffix.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 + 1))]
-          else
-            self
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/csv/fields_converter.rb b/lib/csv/fields_converter.rb
deleted file mode 100644
index c2fa5798ff..0000000000
--- a/lib/csv/fields_converter.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-class CSV
-  class FieldsConverter
-    include Enumerable
-
-    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.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
deleted file mode 100644
index 775559a3eb..0000000000
--- a/lib/csv/match_p.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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
deleted file mode 100644
index 85252203e4..0000000000
--- a/lib/csv/parser.rb
+++ /dev/null
@@ -1,1092 +0,0 @@
-# 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
-  class Parser
-    class InvalidEncoding < StandardError
-    end
-
-    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[start, pos - start]
-      end
-
-      def keep_back
-        self.pos = @keeps.pop
-      end
-
-      def keep_drop
-        @keeps.pop
-      end
-    end
-
-    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[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.string
-          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
-    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
-      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))
-        end
-        @need_robust_parsing = true
-      elsif @strip
-        strip_values = " \t\r\n\f\v"
-        @escaped_strip = strip_values.encode(@encoding)
-        if @quote_character
-          @strip_value = Regexp.new("[#{strip_values}]+".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].to_s.encode(@encoding)
-      @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
-      if @escaped_strip
-        no_unquoted_values << @escaped_strip
-      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)
-          separator = detect_row_separator(@input.string, cr, lf)
-        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)
-        sample = @input.string
-      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)
-        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.string)
-        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.string
-        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
-
-      while true
-        @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)
-      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
-          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
-      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
deleted file mode 100644
index c79d75cd8a..0000000000
--- a/lib/csv/row.rb
+++ /dev/null
@@ -1,388 +0,0 @@
-# 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
-    #
-    # 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).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
-      @row = @row.dup
-    end
-
-    # Returns +true+ if this is a header row.
-    def header_row?
-      @header_row
-    end
-
-    # Returns +true+ if this is a field row.
-    def field_row?
-      not header_row?
-    end
-
-    # Returns the headers of this row.
-    def headers
-      @row.map(&:first)
-    end
-
-    #
-    # :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
-      else
-        header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
-      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}"
-        else
-          varargs.first
-        end
-      end
-    end
-
-    # Returns +true+ if there is a field with the given +header+.
-    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:
-    #   []=( 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
-      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]
-      end
-
-      self  # for chaining
-    end
-
-    #
-    # A shortcut for appending multiple fields.  Equivalent to:
-    #
-    #   args.each { |arg| csv_row << arg }
-    #
-    # This method returns the row for chaining.
-    #
-    def push(*args)
-      args.each { |arg| self << arg }
-
-      self  # for chaining
-    end
-
-    #
-    # :call-seq:
-    #   delete( header )
-    #   delete( header, offset )
-    #   delete( index )
-    #
-    # Used to remove a pair from the row by +header+ or +index+.  The pair is
-    # located as described in CSV::Row.field().  The deleted pair is returned,
-    # or +nil+ if a pair could not be found.
-    #
-    def delete(header_or_index, minimum_index = 0)
-      if header_or_index.is_a? Integer                 # by index
-        @row.delete_at(header_or_index)
-      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.
-    #
-    # This method returns the row for chaining.
-    #
-    # If no block is given, an Enumerator is returned.
-    #
-    def delete_if(&block)
-      return enum_for(__method__) { size } unless block_given?
-
-      @row.delete_if(&block)
-
-      self  # for chaining
-    end
-
-    #
-    # This method accepts any number of arguments which can be headers, indices,
-    # Ranges of either, or two-element Arrays containing a header and offset.
-    # Each argument will be replaced with a field lookup as described in
-    # CSV::Row.field().
-    #
-    # If called with no arguments, all fields are returned.
-    #
-    def fields(*headers_and_or_indices)
-      if headers_and_or_indices.empty?  # return all fields--no arguments
-        @row.map(&: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
-
-    #
-    # Collapses the row into a simple Hash.  Be warned that this discards field
-    # order and clobbers duplicate fields.
-    #
-    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
-
-    #
-    # Returns the row as a CSV String.  Headers are not used.  Equivalent to:
-    #
-    #   csv_row.fields.to_csv( options )
-    #
-    def to_csv(**options)
-      fields.to_csv(options)
-    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, *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
-
-    # 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
-end
diff --git a/lib/csv/table.rb b/lib/csv/table.rb
deleted file mode 100644
index 71eb885de5..0000000000
--- a/lib/csv/table.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-# 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
-    #
-    # 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.
-    #
-    # 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
-
-    #
-    # In the default mixed mode, this method returns rows for index access and
-    # columns for header access.  You can force the index association by first
-    # calling by_col!() or by_row!().
-    #
-    # Columns are returned as an Array of values.  Altering that Array has no
-    # effect on the table.
-    #
-    def [](index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and (index_or_header.is_a?(Integer) 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
-
-    #
-    # The mixed mode default is to treat a list of indices as row access,
-    # returning the rows indicated.  Anything else is considered columnar
-    # access.  For columnar access, the return set has an Array for each row
-    # with the values indicated by the headers in each Array.  You can force
-    # column or row mode using by_col!() or by_row!().
-    #
-    # You cannot mix column and row access.
-    #
-    def values_at(*indices_or_headers)
-      if @mode == :row or  # by indices
-         ( @mode == :col_or_row and indices_or_headers.all? do |index|
-                                      index.is_a?(Integer)         or
-                                      ( index.is_a?(Range)         and
-                                        index.first.is_a?(Integer) and
-                                        index.last.is_a?(Integer) )
-                                    end )
-        @table.values_at(*indices_or_headers)
-      else                 # by headers
-        @table.map { |row| row.values_at(*indices_or_headers) }
-      end
-    end
-
-    #
-    # Adds a new row to the bottom end of this table.  You can provide an Array,
-    # which will be converted to a CSV::Row (inheriting the table's headers()),
-    # or a CSV::Row.
-    #
-    # This method returns the table for chaining.
-    #
-    def <<(row_or_array)
-      if row_or_array.is_a? Array  # append Array
-        @table << Row.new(headers, row_or_array)
-      else                         # append Row
-        @table << row_or_array
-      end
-
-      self # for chaining
-    end
-
-    #
-    # A shortcut for appending multiple rows.  Equivalent to:
-    #
-    #   rows.each { |row| self << row }
-    #
-    # This method returns the table for chaining.
-    #
-    def push(*rows)
-      rows.each { |row| self << row }
-
-      self # for chaining
-    end
-
-    #
-    # Removes and returns the indicated columns or rows.  In the default mixed
-    # mode indices refer to rows and everything else is assumed to be a column
-    # headers.  Use by_col!() or by_row!() to force the lookup.
-    #
-    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 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.
-    #
-    # This method returns the table for chaining.
-    #
-    # If no block is given, an Enumerator is returned.
-    #
-    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
-
-    #
-    # 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.
-    #
-    # If no block is given, an Enumerator is returned.
-    #
-    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 rows of this table ==() +other+'s rows.
-    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
deleted file mode 100644
index b2b0ad743a..0000000000
--- a/lib/csv/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class CSV
-  # The version of the installed library.
-  VERSION = "3.0.9"
-end
diff --git a/lib/csv/writer.rb b/lib/csv/writer.rb
deleted file mode 100644
index 8e0aab32ff..0000000000
--- a/lib/csv/writer.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "match_p"
-require_relative "row"
-
-using CSV::MatchP if CSV.const_defined?(:MatchP)
-
-class CSV
-  class Writer
-    attr_reader :lineno
-    attr_reader :headers
-
-    def initialize(output, options)
-      @output = output
-      @options = options
-      @lineno = 0
-      prepare
-      if @options[:write_headers] and @headers
-        self << @headers
-      end
-      @fields_converter = @options[:fields_converter]
-    end
-
-    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
-
-      converted_row = row.collect do |field|
-        quote(field)
-      end
-      line = converted_row.join(@column_separator) + @row_separator
-      if @output_encoding
-        line = line.encode(@output_encoding)
-      end
-      @output << line
-
-      self
-    end
-
-    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_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]
-      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)
-      if @force_quotes
-        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 @quotable_pattern.match?(field)
-            quote_field(field)
-          else
-            field  # unquoted field
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/debug.rb b/lib/debug.rb
index 34d7d27406..394a53e172 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # 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>
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 37819a28f4..4ce3c53cc9 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # = delegate -- Support for the Delegation Pattern
 #
 # Documentation by James Edward Gray II and Gavin Sinclair
@@ -40,7 +40,7 @@ class Delegator < BasicObject
   kernel = ::Kernel.dup
   kernel.class_eval do
     alias __raise__ raise
-    [:to_s, :inspect, :=~, :!~, :===, :<=>, :hash].each do |m|
+    [:to_s,:inspect,:=~,:!~,:===,:<=>,:eql?,:hash].each do |m|
       undef_method m
     end
     private_instance_methods.each do |m|
@@ -97,7 +97,7 @@ class Delegator < BasicObject
     target = self.__getobj__ {r = false}
     r &&= target.respond_to?(m, include_private)
     if r && include_private && !target.respond_to?(m, false)
-      warn "delegator does not forward private method \##{m}", uplevel: 3
+      warn "#{caller(3)[0]}: delegator does not forward private method \##{m}"
       return false
     end
     r
@@ -146,14 +146,6 @@ 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 !
@@ -183,7 +175,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
@@ -194,7 +186,7 @@ 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)
@@ -242,7 +234,7 @@ class Delegator < BasicObject
   end
 
   @delegator_api = self.public_instance_methods
-  def self.public_api # :nodoc:
+  def self.public_api   # :nodoc:
     @delegator_api
   end
 end
@@ -313,7 +305,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)
@@ -387,9 +379,9 @@ def DelegateClass(superclass)
   klass = Class.new(Delegator)
   methods = superclass.instance_methods
   methods -= ::Delegator.public_api
-  methods -= [:to_s, :inspect, :=~, :!~, :===]
+  methods -= [:to_s,:inspect,:=~,:!~,:===]
   klass.module_eval do
-    def __getobj__ # :nodoc:
+    def __getobj__  # :nodoc:
       unless defined?(@delegate_dc_obj)
         return yield if block_given?
         __raise__ ::ArgumentError, "not delegated"
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index b004656f09..520b7df71d 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -49,9 +49,6 @@ 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'
@@ -61,10 +58,6 @@ 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
@@ -89,7 +82,8 @@ class ACL
     # Creates a Regexp to match an address.
 
     def dot_pat(str)
-      /\A#{dot_pat_str(str)}\z/
+      exp = "^" + dot_pat_str(str) + "$"
+      Regexp.new(exp)
     end
 
     public
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index de57362f24..38cb38563b 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -47,8 +47,9 @@
 #   Translation of presentation on Ruby by Masatoshi Seki.
 
 require 'socket'
+require 'thread'
 require 'io/wait'
-require_relative 'eq'
+require 'drb/eq'
 
 #
 # == Overview
@@ -360,7 +361,7 @@ module DRb
   # drb remains valid only while that object instance remains alive
   # within the server runtime.
   #
-  # For alternative mechanisms, see DRb::TimerIdConv in drb/timeridconv.rb
+  # For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
   # and DRbNameIdConv in sample/name.rb in the full drb distribution.
   class DRbIdConv
 
@@ -800,7 +801,7 @@ module DRb
     module_function :uri_option
 
     def auto_load(uri)  # :nodoc:
-      if /\Adrb([a-z0-9]+):/ =~ uri
+      if uri =~ /^drb([a-z0-9]+):/
         require("drb/#{$1}") rescue nil
       end
     end
@@ -816,13 +817,13 @@ module DRb
     # :stopdoc:
     private
     def self.parse_uri(uri)
-      if /\Adruby:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
+      if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
         host = $1
         port = $2.to_i
         option = $4
         [host, port, option]
       else
-        raise(DRbBadScheme, uri) unless uri.start_with?('druby:')
+        raise(DRbBadScheme, uri) unless uri =~ /^druby:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
@@ -847,11 +848,7 @@ module DRb
     def self.getservername
       host = Socket::gethostname
       begin
-        Socket::getaddrinfo(host, nil,
-                                  Socket::AF_UNSPEC,
-                                  Socket::SOCK_STREAM,
-                                  0,
-                                  Socket::AI_PASSIVE)[0][3]
+        Socket::gethostbyname(host)[0]
       rescue
         'localhost'
       end
@@ -953,7 +950,6 @@ 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
@@ -962,8 +958,14 @@ module DRb
     end
 
     def close_shutdown_pipe
-      @shutdown_pipe_w.close
-      @shutdown_pipe_r.close
+      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
     end
     private :close_shutdown_pipe
 
@@ -996,7 +998,7 @@ module DRb
 
     # Graceful shutdown
     def shutdown
-      @shutdown_pipe_w.close
+      @shutdown_pipe_w.close if @shutdown_pipe_w && !@shutdown_pipe_w.closed?
     end
 
     # Check to see if this connection is alive.
@@ -1171,7 +1173,7 @@ module DRb
       bt = []
       result.backtrace.each do |x|
         break if /`__send__'$/ =~ x
-        if /\A\(druby:\/\// =~ x
+        if /^\(druby:\/\// =~ x
           bt.push(x)
         else
           bt.push(prefix + x)
@@ -1465,7 +1467,12 @@ module DRb
       if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
         Thread.current['DRb']['stop_service'] = true
       else
-        shutdown
+        if @protocol.respond_to? :shutdown
+          @protocol.shutdown
+        else
+          [@thread, *@grp.list].each {|thread| thread.kill} # xxx: Thread#kill
+        end
+        @thread.join
       end
     end
 
@@ -1484,18 +1491,6 @@ 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.
 
@@ -1570,23 +1565,17 @@ module DRb
         if $SAFE < @safe_level
           info = Thread.current['DRb']
           if @block
-            @result = Thread.new do
+            @result = Thread.new {
               Thread.current['DRb'] = info
-              prev_safe_level = $SAFE
               $SAFE = @safe_level
               perform_with_block
-            ensure
-              $SAFE = prev_safe_level
-            end.value
+            }.value
           else
-            @result = Thread.new do
+            @result = Thread.new {
               Thread.current['DRb'] = info
-              prev_safe_level = $SAFE
               $SAFE = @safe_level
               perform_without_block
-            ensure
-              $SAFE = prev_safe_level
-            end.value
+            }.value
           end
         else
           if @block
@@ -1638,7 +1627,7 @@ module DRb
 
     end
 
-    require_relative 'invokemethod'
+    require 'drb/invokemethod'
     class InvokeMethod
       include InvokeMethod18Mixin
     end
@@ -1684,8 +1673,7 @@ module DRb
           ensure
             client.close unless succ
             if Thread.current['DRb']['stop_service']
-              shutdown
-              break
+              Thread.new { stop_service }
             end
             break unless succ
           end
@@ -1866,11 +1854,6 @@ 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 a93d5d1576..1cb1be4709 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -4,7 +4,7 @@
         Copyright (c) 2000,2002 Masatoshi SEKI
 =end
 
-require_relative 'drb'
+require 'drb/drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 040e4e3e08..7e70a3cd82 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -4,7 +4,8 @@
         Copyright (c) 2000 Masatoshi SEKI
 =end
 
-require_relative 'drb'
+require 'drb/drb'
+require 'thread'
 require 'monitor'
 
 module DRb
@@ -37,7 +38,7 @@ module DRb
       synchronize do
         while true
           server = @servers[name]
-          return server if server && server.alive? # server may be `false'
+          return server if server&.alive?
           invoke_service(name)
           @cond.wait
         end
@@ -61,7 +62,8 @@ module DRb
     private
     def invoke_thread
       Thread.new do
-        while name = @queue.pop
+        while true
+          name = @queue.pop
           invoke_service_command(name, @@command[name])
         end
       end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
index 65a525476e..d000507644 100644
--- a/lib/drb/gw.rb
+++ b/lib/drb/gw.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'drb'
+require 'drb/drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 48ba35ace7..8d2724e736 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'socket'
 require 'openssl'
-require_relative 'drb'
+require 'drb/drb'
 require 'singleton'
 
 module DRb
@@ -162,7 +162,7 @@ module DRb
           return
         end
 
-        rsa = OpenSSL::PKey::RSA.new(2048){|p, n|
+        rsa = OpenSSL::PKey::RSA.new(1024){|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::SHA256.new)
+        cert.sign(rsa, OpenSSL::Digest::SHA1.new)
 
         @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 /\Adrbssl:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
+      if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
         host = $1
         port = $2.to_i
         option = $4
         [host, port, option]
       else
-        raise(DRbBadScheme, uri) unless uri.start_with?('drbssl:')
+        raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
@@ -336,7 +336,7 @@ module DRb
       end
       self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError
-        warn("#{$!.message} (#{$!.class})", uplevel: 0) if @config[:verbose]
+        warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
         retry
       end
     end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index 3ead98a7f2..9ac7e1e69c 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'drb'
+require 'drb/drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 89957c9e7b..adacf6df5b 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'socket'
-require_relative 'drb'
+require 'drb/drb'
 require 'tmpdir'
 
 raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
@@ -15,12 +15,12 @@ module DRb
   class DRbUNIXSocket < DRbTCPSocket
     # :stopdoc:
     def self.parse_uri(uri)
-      if /\Adrbunix:(.*?)(\?(.*))?\z/ =~ uri
+      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
         filename = $1
         option = $3
         [filename, option]
       else
-        raise(DRbBadScheme, uri) unless uri.start_with?('drbunix:')
+        raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
@@ -95,7 +95,6 @@ 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/e2mmap.gemspec b/lib/e2mmap.gemspec
deleted file mode 100644
index b9808d89ff..0000000000
--- a/lib/e2mmap.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/e2mmap/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "e2mmap/version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "e2mmap"
-  spec.version       = Exception2MessageMapper::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Module for defining custom exceptions with specific messages.}
-  spec.description   = %q{Module for defining custom exceptions with specific messages.}
-  spec.homepage      = "https://github.com/ruby/e2mmap"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "e2mmap.gemspec", "lib/e2mmap.rb", "lib/e2mmap/version.rb"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index 1c1d7148ff..bbff4f8c2e 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 #--
 #   e2mmap.rb - for Ruby 1.1
@@ -62,20 +62,16 @@ module Exception2MessageMapper
   end
 
   def bind(cl)
-    self.module_eval "#{<<-"begin;"}\n#{<<-"end;"}", __FILE__, __LINE__+1
-    begin;
+    self.module_eval %[
       def Raise(err = nil, *rest)
         Exception2MessageMapper.Raise(self.class, err, *rest)
       end
       alias Fail Raise
 
-      class << self
-        undef included
-      end
       def self.included(mod)
         mod.extend Exception2MessageMapper
       end
-    end;
+    ]
   end
 
   # Fail(err, *rest)
@@ -134,7 +130,6 @@ module Exception2MessageMapper
   def E2MM.def_exception(k, n, m, s = StandardError)
     e = Class.new(s)
     E2MM.instance_eval{@MessageMap[[k, e]] = m}
-    k.module_eval {remove_const(n)} if k.const_defined?(n, false)
     k.const_set(n, e)
   end
 
diff --git a/lib/e2mmap/version.rb b/lib/e2mmap/version.rb
deleted file mode 100644
index c459aeace3..0000000000
--- a/lib/e2mmap/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Exception2MessageMapper
-  VERSION = "0.1.0"
-end
diff --git a/lib/erb.rb b/lib/erb.rb
index 5b725d7820..af5a4bac9c 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: true
+# frozen_string_literal: false
 # = ERB -- Ruby Templating
 #
 # Author:: Masatoshi SEKI
@@ -115,7 +115,7 @@ require "cgi/util"
 #     James Edward Gray II
 #   }.gsub(/^  /, '')
 #
-#   message = ERB.new(template, trim_mode: "%<>")
+#   message = ERB.new(template, 0, "%<>")
 #
 #   # Set up template data.
 #   to = "Community Spokesman <spokesman@ruby_community.org>"
@@ -263,7 +263,7 @@ class ERB
 
   # Returns revision information for the erb.rb module.
   def self.version
-    "erb.rb [2.2.0 #{ERB::Revision.split[1]}]"
+    "erb.rb [2.1.0 #{ERB::Revision.split[1]}]"
   end
 end
 
@@ -280,9 +280,9 @@ class ERB
   # ERB#src:
   #
   #   compiler = ERB::Compiler.new('<>')
-  #   compiler.pre_cmd    = ["_erbout=+''"]
-  #   compiler.put_cmd    = "_erbout.<<"
-  #   compiler.insert_cmd = "_erbout.<<"
+  #   compiler.pre_cmd    = ["_erbout=String.new"]
+  #   compiler.put_cmd    = "_erbout.concat"
+  #   compiler.insert_cmd = "_erbout.concat"
   #   compiler.post_cmd   = ["_erbout"]
   #
   #   code, enc = compiler.compile("Got <%= obj %>!\n")
@@ -291,7 +291,7 @@ class ERB
   # <i>Generates</i>:
   #
   #   #coding:UTF-8
-  #   _erbout=+''; _erbout.<< "Got ".freeze; _erbout.<<(( obj ).to_s); _erbout.<< "!\n".freeze; _erbout
+  #   _erbout=String.new; _erbout.concat "Got "; _erbout.concat(( obj ).to_s); _erbout.concat "!\n"; _erbout
   #
   # By default the output is sent to the print method.  For example:
   #
@@ -302,7 +302,7 @@ class ERB
   # <i>Generates</i>:
   #
   #   #coding:UTF-8
-  #   print "Got ".freeze; print(( obj ).to_s); print "!\n".freeze
+  #   print "Got "; print(( obj ).to_s); print "!\n"
   #
   # == Evaluation
   #
@@ -347,15 +347,16 @@ class ERB
       end
       attr_reader :value
       alias :to_s :value
+
+      def empty?
+        @value.empty?
+      end
     end
 
     class Scanner # :nodoc:
       @scanner_map = {}
-      class << self
-        def register_scanner(klass, trim_mode, percent)
-          @scanner_map[[trim_mode, percent]] = klass
-        end
-        alias :regist_scanner :register_scanner
+      def self.regist_scanner(klass, trim_mode, percent)
+        @scanner_map[[trim_mode, percent]] = klass
       end
 
       def self.default_scanner=(klass)
@@ -367,13 +368,11 @@ 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 = DEFAULT_STAGS
-        @etags = DEFAULT_ETAGS
+        @stags = %w(<%% <%= <%# <%).freeze
+        @etags = %w(%%> %>).freeze
       end
       attr_accessor :stag
       attr_reader :stags, :etags
@@ -387,19 +386,20 @@ class ERB
         @trim_mode = trim_mode
         @percent = percent
         if @trim_mode == '>'
-          @scan_reg  = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m
+          @scan_reg  = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m
           @scan_line = self.method(:trim_line1)
         elsif @trim_mode == '<>'
-          @scan_reg  = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m
+          @scan_reg  = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m
           @scan_line = self.method(:trim_line2)
         elsif @trim_mode == '-'
-          @scan_reg  = /(.*?)(^[ \t]*<%\-|<%\-|-%>\r?\n|-%>|#{(stags + etags).join('|')}|\z)/m
+          @scan_reg  = /(.*?)(^[ \t]*<%\-|<%\-|-%>\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 +439,7 @@ class ERB
         line.scan(@scan_reg) do |tokens|
           tokens.each do |token|
             next if token.empty?
-            if token == "%>\n" || token == "%>\r\n"
+            if token == "%>\n"
               yield('%>')
               yield(:cr)
             else
@@ -455,7 +455,7 @@ class ERB
           tokens.each do |token|
             next if token.empty?
             head = token unless head
-            if token == "%>\n" || token == "%>\r\n"
+            if token == "%>\n"
               yield('%>')
               if is_erb_stag?(head)
                 yield(:cr)
@@ -477,7 +477,7 @@ class ERB
             next if token.empty?
             if @stag.nil? && /[ \t]*<%-/ =~ token
               yield('<%')
-            elsif @stag && (token == "-%>\n" || token == "-%>\r\n")
+            elsif @stag && token == "-%>\n"
               yield('%>')
               yield(:cr)
             elsif @stag && token == '-%>'
@@ -497,14 +497,25 @@ 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'
-    rescue LoadError
-    else
-      class SimpleScanner < Scanner # :nodoc:
+      class SimpleScanner2 < Scanner # :nodoc:
         def scan
-          stag_reg = (stags == DEFAULT_STAGS) ? /(.*?)(<%[%=#]?|\z)/m : /(.*?)(#{stags.join('|')}|\z)/m
-          etag_reg = (etags == DEFAULT_ETAGS) ? /(.*?)(%%?>|\z)/m : /(.*?)(#{etags.join('|')}|\z)/m
+          stag_reg = /(.*?)(#{stags.join('|')}|\z)/m
+          etag_reg = /(.*?)(#{etags.join('|')}|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
             scanner.scan(@stag ? etag_reg : stag_reg)
@@ -513,7 +524,7 @@ class ERB
           end
         end
       end
-      Scanner.register_scanner(SimpleScanner, nil, false)
+      Scanner.regist_scanner(SimpleScanner2, nil, false)
 
       class ExplicitScanner < Scanner # :nodoc:
         def scan
@@ -529,21 +540,23 @@ class ERB
               yield('<%')
             elsif elem == '-%>'
               yield('%>')
-              yield(:cr) if scanner.scan(/(\r?\n|\z)/)
+              yield(:cr) if scanner.scan(/(\n|\z)/)
             else
               yield(elem)
             end
           end
         end
       end
-      Scanner.register_scanner(ExplicitScanner, '-', false)
+      Scanner.regist_scanner(ExplicitScanner, '-', false)
+
+    rescue LoadError
     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|
@@ -572,8 +585,17 @@ 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}.freeze#{"\n" * content.count("\n")}")
+      out.push("#{@put_cmd} #{content_dump(content)}")
     end
 
     def add_insert_cmd(out, content)
@@ -589,7 +611,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?
@@ -609,7 +631,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
@@ -617,11 +639,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
@@ -634,7 +656,7 @@ class ERB
       when '%>'
         compile_content(scanner.stag, out)
         scanner.stag = nil
-        self.content = +''
+        self.content = ''
       when '%%>'
         content << '%>'
       else
@@ -655,7 +677,7 @@ class ERB
       when '<%='
         add_insert_cmd(out, content)
       when '<%#'
-        # commented out
+        # out.push("# #{content_dump(content)}")
       end
     end
 
@@ -665,13 +687,9 @@ class ERB
         return [false, '>']
       when 2
         return [false, '<>']
-      when 0, nil
+      when 0
         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, '-']
@@ -683,7 +701,6 @@ class ERB
           [perc, nil]
         end
       else
-        warn_invalid_trim_mode(mode, uplevel: 5)
         return [false, nil]
       end
     end
@@ -735,10 +752,6 @@ 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
 
@@ -786,11 +799,11 @@ class ERB
   #    def build
   #      b = binding
   #      # create and run templates, filling member data variables
-  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@product").result b
+  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), 0, "", "@product").result b
   #        <%= PRODUCT[:name] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRODUCT
-  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@price").result b
+  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), 0, "", "@price").result b
   #        <%= PRODUCT[:name] %> -- <%= PRODUCT[:cost] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRICE
@@ -811,22 +824,7 @@ class ERB
   #  Chicken Fried Steak -- 9.95
   #  A well messages pattie, breaded and fried.
   #
-  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, which should be removed at Ruby 2.7.
-    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
-    else
-      safe_level = nil
-    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
-
+  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
     @safe_level = safe_level
     compiler = make_compiler(trim_mode)
     set_eoutvar(compiler, eoutvar)
@@ -834,8 +832,6 @@ class ERB
     @filename = nil
     @lineno = 0
   end
-  NOT_GIVEN = Object.new
-  private_constant :NOT_GIVEN
 
   ##
   # Creates a new compiler for ERB.  See ERB::Compiler.new for details
@@ -869,10 +865,10 @@ class ERB
   # requires the setup of an ERB _compiler_ object.
   #
   def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.<<"
-    compiler.insert_cmd = "#{eoutvar}.<<"
-    compiler.pre_cmd = ["#{eoutvar} = +''"]
-    compiler.post_cmd = [eoutvar]
+    compiler.put_cmd = "#{eoutvar}.concat"
+    compiler.insert_cmd = "#{eoutvar}.concat"
+    compiler.pre_cmd = ["#{eoutvar} = String.new"]
+    compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
   end
 
   # Generate results and print them. (see ERB#result)
@@ -890,41 +886,21 @@ class ERB
   #
   def result(b=new_toplevel)
     if @safe_level
-      proc do
-        prev_safe_level = $SAFE
+      proc {
         $SAFE = @safe_level
         eval(@src, b, (@filename || '(erb)'), @lineno)
-      ensure
-        $SAFE = prev_safe_level
-      end.call
+      }.call
     else
       eval(@src, b, (@filename || '(erb)'), @lineno)
     end
   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(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
+  def new_toplevel
+    TOPLEVEL_BINDING.dup
   end
   private :new_toplevel
 
@@ -1016,8 +992,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.unpack1("C"))
+      s.to_s.b.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
+        sprintf("%%%02X", m.unpack("C")[0])
       }
     end
     alias u url_encode
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 8981ef98e8..4317af5327 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1,13 +1,4 @@
-# frozen_string_literal: true
-
-begin
-  require 'rbconfig'
-rescue LoadError
-  # for make mjit-headers
-end
-
-require "fileutils/version"
-
+# frozen_string_literal: false
 #
 # = fileutils.rb
 #
@@ -25,7 +16,7 @@ require "fileutils/version"
 #   require 'fileutils'
 #
 #   FileUtils.cd(dir, options)
-#   FileUtils.cd(dir, options) {|dir| block }
+#   FileUtils.cd(dir, options) {|dir| .... }
 #   FileUtils.pwd()
 #   FileUtils.mkdir(dir, options)
 #   FileUtils.mkdir(list, options)
@@ -33,11 +24,11 @@ require "fileutils/version"
 #   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.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)
@@ -47,7 +38,7 @@ require "fileutils/version"
 #   FileUtils.rm(list, options)
 #   FileUtils.rm_r(list, options)
 #   FileUtils.rm_rf(list, options)
-#   FileUtils.install(src, dest, 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)
@@ -56,7 +47,7 @@ require "fileutils/version"
 #
 # 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 three are obvious.
+# <tt>:noop</tt> means that no changes are made.  The other two are obvious.
 # Each method documents the options that it honours.
 #
 # All methods that have the concept of a "source" file or directory can take
@@ -65,7 +56,7 @@ require "fileutils/version"
 #
 # There are some `low level' methods, which do not accept any option:
 #
-#   FileUtils.copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
+#   FileUtils.copy_entry(src, dest, preserve = false, dereference = false)
 #   FileUtils.copy_file(src, dest, preserve = false, dereference = true)
 #   FileUtils.copy_stream(srcstream, deststream)
 #   FileUtils.remove_entry(path, force = false)
@@ -93,6 +84,7 @@ require "fileutils/version"
 # files/directories.  This equates to passing the <tt>:noop</tt> and
 # <tt>:verbose</tt> flags to methods in FileUtils.
 #
+
 module FileUtils
 
   def self.private_module_function(name)   #:nodoc:
@@ -120,14 +112,13 @@ module FileUtils
   #   FileUtils.cd('/', :verbose => true)   # chdir and report it
   #
   #   FileUtils.cd('/') do  # chdir
-  #     # ...               # do something
+  #     [...]               # 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)
+    Dir.chdir(dir, &block)
     fu_output_message 'cd -' if verbose and block
-    result
   end
   module_function :cd
 
@@ -153,7 +144,7 @@ module FileUtils
   end
   module_function :uptodate?
 
-  def remove_trailing_slash(dir)   #:nodoc:
+  def remove_trailing_slash(dir)
     dir == '/' ? dir : dir.chomp(?/)
   end
   private_module_function :remove_trailing_slash
@@ -184,11 +175,10 @@ 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
+  #     * /usr
+  #     * /usr/local
+  #     * /usr/local/lib
+  #     * /usr/local/lib/ruby
   #
   # You can pass several directories at a time in a list.
   #
@@ -211,7 +201,6 @@ module FileUtils
         stack.push path
         path = File.dirname(path)
       end
-      stack.pop                 # root directory should exist
       stack.reverse_each do |dir|
         begin
           fu_mkdir dir, mode
@@ -254,39 +243,38 @@ module FileUtils
     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
+      begin
+        Dir.rmdir(dir = remove_trailing_slash(dir))
+        if parents
           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
 
   #
-  # :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)
+  # <b><tt>ln(old, new, **options)</tt></b>
   #
-  # 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+.
+  # 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+.
   #
-  #   FileUtils.ln 'gcc', 'cc', verbose: true
+  #   FileUtils.ln 'gcc', 'cc', :verbose => true
   #   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.
+  # <b><tt>ln(list, destdir, **options)</tt></b>
   #
-  #   FileUtils.cd '/sbin'
+  # Creates several hard links in a directory, with each one pointing to the
+  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  #
+  #   include FileUtils
+  #   cd '/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)
@@ -303,57 +291,24 @@ module FileUtils
   module_function :link
 
   #
-  # :call-seq:
-  #   FileUtils.cp_lr(src, dest, noop: nil, verbose: nil, dereference_root: true, remove_destination: false)
+  # <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+.
-  #
-  # +src+ can be a list of files.
-  #
-  #   # Installing the library "mylib" under the site_ruby directory.
-  #   FileUtils.rm_r site_ruby + '/mylib', :force => true
-  #   FileUtils.cp_lr 'lib/', site_ruby + '/mylib'
-  #
-  #   # 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 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.
-  #
-  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
-
+  # 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+.
   #
-  # :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)
+  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
+  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
   #
-  # In the first form, creates a symbolic link +link+ which points to +target+.
-  # If +link+ already exists, raises Errno::EEXIST.
-  # But if the :force option is set, overwrites +link+.
+  # <b><tt>ln_s(list, destdir, **options)</tt></b>
   #
-  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
-  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', force: true
+  # 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.
   #
-  # 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.
+  # If +destdir+ is not a directory, raises Errno::ENOTDIR.
   #
-  #   FileUtils.ln_s Dir.glob('/bin/*.rb'), '/home/foo/bin'
+  #   FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/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
@@ -369,12 +324,8 @@ module FileUtils
   module_function :symlink
 
   #
-  # :call-seq:
-  #   FileUtils.ln_sf(*args)
-  #
   # Same as
-  #
-  #   FileUtils.ln_s(*args, force: true)
+  #   #ln_s(src, dest, :force => true)
   #
   def ln_sf(src, dest, noop: nil, verbose: nil)
     ln_s src, dest, force: true, noop: noop, verbose: verbose
@@ -382,26 +333,6 @@ 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+.
   #
@@ -437,7 +368,7 @@ module FileUtils
   #
   #   # 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/foo/lib/ruby', :noop => true, :verbose => true
+  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/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,
@@ -474,7 +405,7 @@ module FileUtils
   def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
     Entry_.new(src, nil, dereference_root).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))
+      File.unlink destent.path if remove_destination && File.file?(destent.path)
       ent.copy destent.path
     end, proc do |ent|
       destent = Entry_.new(dest, ent.rel, false)
@@ -511,7 +442,7 @@ module FileUtils
   #   FileUtils.mv 'badname.rb', 'goodname.rb'
   #   FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', :force => true  # no error
   #
-  #   FileUtils.mv %w(junk.txt dust.txt), '/home/foo/.trash/'
+  #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
   #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
   #
   def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
@@ -523,6 +454,8 @@ module FileUtils
         if destent.exist?
           if destent.directory?
             raise Errno::EEXIST, d
+          else
+            destent.remove_file if rename_cannot_overwrite_file?
           end
         end
         begin
@@ -545,6 +478,11 @@ 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.
@@ -570,7 +508,7 @@ module FileUtils
   #
   # Equivalent to
   #
-  #   FileUtils.rm(list, :force => true)
+  #   #rm(list, :force => true)
   #
   def rm_f(list, noop: nil, verbose: nil)
     rm list, force: true, noop: noop, verbose: verbose
@@ -586,7 +524,7 @@ module FileUtils
   # StandardError when :force option is set.
   #
   #   FileUtils.rm_r Dir.glob('/tmp/*')
-  #   FileUtils.rm_r 'some_dir', :force => true
+  #   FileUtils.rm_r '/', :force => true          #  :-)
   #
   # WARNING: This method causes local vulnerability
   # if one of parent directories or removing directory tree are world
@@ -616,7 +554,7 @@ module FileUtils
   #
   # Equivalent to
   #
-  #   FileUtils.rm_r(list, :force => true)
+  #   #rm_r(list, :force => true)
   #
   # WARNING: This method causes local vulnerability.
   # Read the documentation of #rm_r first.
@@ -636,9 +574,9 @@ module FileUtils
   # (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
@@ -656,8 +594,8 @@ module FileUtils
   #
   # 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
+  #   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
   #
   # For fileutils.rb, this vulnerability is reported in [ruby-dev:26100].
   #
@@ -681,38 +619,22 @@ 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
-    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
-
+    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
+    }
     # ---- tree root is frozen ----
     root = Entry_.new(path)
     root.preorder_traverse do |ent|
@@ -788,10 +710,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('/dev/null', '/dev/urandom')  #=> false
+  #   FileUtils.compare_file('somefile', 'somefile')  #=> true
+  #   FileUtils.compare_file('/bin/cp', '/bin/mv')    #=> maybe false
   #
   def compare_file(a, b)
     return false unless File.size(a) == File.size(b)
@@ -813,15 +735,8 @@ module FileUtils
   #
   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
-
+    sa = ""
+    sb = ""
     begin
       a.read(bsize, sa)
       b.read(bsize, sb)
@@ -884,7 +799,7 @@ module FileUtils
   end
   private_module_function :user_mask
 
-  def apply_mask(mode, user_mask, op, mode_mask)   #:nodoc:
+  def apply_mask(mode, user_mask, op, mode_mask)
     case op
     when '='
       (mode & ~user_mask) | (user_mask & mode_mask)
@@ -1145,11 +1060,8 @@ module FileUtils
   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
+    def fu_windows?
+      /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
     end
 
     def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
@@ -1274,7 +1186,8 @@ module FileUtils
     def entries
       opts = {}
       opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
-      Dir.children(path, opts)\
+      Dir.entries(path(), opts)\
+          .reject {|n| n == '.' or n == '..' }\
           .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
     end
 
@@ -1330,24 +1243,7 @@ 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
@@ -1535,9 +1431,9 @@ module FileUtils
     end
 
     if File::ALT_SEPARATOR
-      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)"
+      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)".freeze
     else
-      DIRECTORY_TERM = "(?=/|\\z)"
+      DIRECTORY_TERM = "(?=/|\\z)".freeze
     end
     SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
 
diff --git a/lib/fileutils/fileutils.gemspec b/lib/fileutils/fileutils.gemspec
deleted file mode 100644
index 7212883d2b..0000000000
--- a/lib/fileutils/fileutils.gemspec
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require_relative "lib/fileutils/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |s|
-  s.name = "fileutils"
-  s.version = FileUtils::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 = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "fileutils.gemspec", "lib/fileutils.rb", "lib/fileutils/version.rb"]
-  s.required_ruby_version = ">= 2.3.0"
-
-  s.authors = ["Minero Aoki"]
-  s.email = [nil]
-  s.homepage = "https://github.com/ruby/fileutils"
-  s.license = "BSD-2-Clause"
-
-  if s.respond_to?(:metadata=)
-    s.metadata = {
-      "source_code_uri" => "https://github.com/ruby/fileutils"
-    }
-  end
-
-  s.add_development_dependency 'rake'
-end
diff --git a/lib/fileutils/version.rb b/lib/fileutils/version.rb
deleted file mode 100644
index e82734dfec..0000000000
--- a/lib/fileutils/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module FileUtils
-  VERSION = "1.1.0"
-end
diff --git a/lib/find.rb b/lib/find.rb
index f97cc1b836..093f8557c3 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # find.rb: the Find module for processing all files under a given directory.
 #
@@ -55,13 +55,14 @@ module Find
           end
           if s.directory? then
             begin
-              fs = Dir.children(file, encoding: enc)
+              fs = Dir.entries(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
             }
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index bcd462a97c..aa45d41a31 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -110,11 +110,8 @@
 # +delegate.rb+.
 #
 module Forwardable
-  require 'forwardable/impl'
-
   # Version of +forwardable.rb+
-  VERSION = "1.2.0"
-  FORWARDABLE_VERSION = VERSION
+  FORWARDABLE_VERSION = "1.1.0"
 
   @debug = nil
   class << self
@@ -131,13 +128,12 @@ module Forwardable
   #    delegate [method, method, ...] => accessor
   #
   def instance_delegate(hash)
-    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
+    hash.each{ |methods, accessor|
+      methods = [methods] unless methods.respond_to?(:each)
+      methods.each{ |method|
+        def_instance_delegator(accessor, method)
+      }
+    }
   end
 
   #
@@ -199,33 +195,34 @@ module Forwardable
       accessor = "#{accessor}()"
     end
 
-    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;
+    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)"
     end
 
-    _compile_method("#{<<-"begin;"}\n#{<<-"end;"}", __FILE__, __LINE__+1)
+    line_no = __LINE__+1; str = "#{<<-"begin;"}\n#{<<-"end;"}"
     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
 
@@ -263,13 +260,12 @@ module SingleForwardable
   #    delegate [method, method, ...] => accessor
   #
   def single_delegate(hash)
-    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
+    hash.each{ |methods, accessor|
+      methods = [methods] unless methods.respond_to?(:each)
+      methods.each{ |method|
+        def_single_delegator(accessor, method)
+      }
+    }
   end
 
   #
diff --git a/lib/forwardable/forwardable.gemspec b/lib/forwardable/forwardable.gemspec
deleted file mode 100644
index f90b82269d..0000000000
--- a/lib/forwardable/forwardable.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/forwardable"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "../forwardable"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "forwardable"
-  spec.version       = Forwardable::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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "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"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-end
diff --git a/lib/forwardable/impl.rb b/lib/forwardable/impl.rb
deleted file mode 100644
index 58a9dfb69c..0000000000
--- a/lib/forwardable/impl.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# :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 ff7674f1cb..c0ba5399b7 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # GetoptLong for Ruby
 #
@@ -310,7 +310,7 @@ class GetoptLong
         #
         next if i == argument_flag
         begin
-          if !i.is_a?(String) || i !~ /\A-([^-]|-.+)\z/
+          if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
             raise ArgumentError, "an invalid option `#{i}'"
           end
           if (@canonical_names.include?(i))
@@ -447,7 +447,7 @@ class GetoptLong
       terminate
       return nil
     elsif @ordering == PERMUTE
-      while 0 < ARGV.length && ARGV[0] !~ /\A-./
+      while 0 < ARGV.length && ARGV[0] !~ /^-./
         @non_option_arguments.push(ARGV.shift)
       end
       if ARGV.length == 0
@@ -456,7 +456,7 @@ class GetoptLong
       end
       argument = ARGV.shift
     elsif @ordering == REQUIRE_ORDER
-      if (ARGV[0] !~ /\A-./)
+      if (ARGV[0] !~ /^-./)
         terminate
         return nil
       end
@@ -477,7 +477,7 @@ class GetoptLong
     #
     # Check for long and short options.
     #
-    if argument =~ /\A(--[^=]+)/ && @rest_singles.length == 0
+    if argument =~ /^(--[^=]+)/ && @rest_singles.length == 0
       #
       # This is a long style option, which start with `--'.
       #
@@ -507,7 +507,7 @@ class GetoptLong
       # Check an argument to the option.
       #
       if @argument_flags[option_name] == REQUIRED_ARGUMENT
-        if argument =~ /=(.*)/m
+        if argument =~ /=(.*)$/
           option_argument = $1
         elsif 0 < ARGV.length
           option_argument = ARGV.shift
@@ -516,19 +516,19 @@ class GetoptLong
                     "option `#{argument}' requires an argument")
         end
       elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-        if argument =~ /=(.*)/m
+        if argument =~ /=(.*)$/
           option_argument = $1
-        elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
+        elsif 0 < ARGV.length && ARGV[0] !~ /^-./
           option_argument = ARGV.shift
         else
           option_argument = ''
         end
-      elsif argument =~ /=(.*)/m
+      elsif argument =~ /=(.*)$/
         set_error(NeedlessArgument,
                   "option `#{option_name}' doesn't allow an argument")
       end
 
-    elsif argument =~ /\A(-(.))(.*)/m
+    elsif argument =~ /^(-(.))(.*)/
       #
       # This is a short style option, which start with `-' (not `--').
       # Short options may be catenated (e.g. `-l -g' is equivalent to
@@ -555,7 +555,7 @@ class GetoptLong
           if 0 < @rest_singles.length
             option_argument = @rest_singles
             @rest_singles = ''
-          elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
+          elsif 0 < ARGV.length && ARGV[0] !~ /^-./
             option_argument = ARGV.shift
           else
             option_argument = ''
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
deleted file mode 100644
index 2de9ef4881..0000000000
--- a/lib/ipaddr.gemspec
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "ipaddr.gemspec", "lib/ipaddr.rb"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "test-unit"
-end
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 7fff54b9d0..458be58577 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # 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 self.new_ntoh(addr)
-    return new(ntop(addr))
+  def IPAddr::new_ntoh(addr)
+    return IPAddr.new(IPAddr::ntop(addr))
   end
 
   # Convert a network byte ordered string form of an IP address into
   # human readable form.
-  def self.ntop(addr)
+  def IPAddr::ntop(addr)
     case addr.size
     when 4
       s = addr.unpack('C4').join('.')
@@ -149,10 +149,7 @@ class IPAddr
   # Returns true if two ipaddrs are equal.
   def ==(other)
     other = coerce_other(other)
-  rescue
-    false
-  else
-    @family == other.family && @addr == other.to_i
+    return @family == other.family && @addr == other.to_i
   end
 
   # Returns a new ipaddr built by masking IP address with the given
@@ -259,50 +256,6 @@ 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
@@ -310,11 +263,6 @@ 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
@@ -322,8 +270,6 @@ 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
@@ -336,7 +282,6 @@ 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
@@ -347,7 +292,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)
@@ -390,10 +335,10 @@ class IPAddr
   # Compares the ipaddr with another.
   def <=>(other)
     other = coerce_other(other)
-  rescue
-    nil
-  else
-    @addr <=> other.to_i if other.family == @family
+
+    return nil if other.family != @family
+
+    return @addr <=> other.to_i
   end
   include Comparable
 
@@ -423,35 +368,6 @@ 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
@@ -494,8 +410,7 @@ class IPAddr
 
   # Set current netmask to given mask.
   def mask!(mask)
-    case mask
-    when String
+    if mask.kind_of?(String)
       if mask =~ /\A\d+\z/
         prefixlen = mask.to_i
       else
@@ -504,10 +419,6 @@ 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
@@ -594,8 +505,6 @@ 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 ee3e649e81..92b79b3301 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -19,8 +19,6 @@ require "irb/ruby-lex"
 require "irb/input-method"
 require "irb/locale"
 
-require "irb/version"
-
 # IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
 # expressions read from the standard input.
 #
@@ -50,6 +48,7 @@ require "irb/version"
 #
 #   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
@@ -91,6 +90,7 @@ require "irb/version"
 # 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
@@ -356,7 +356,9 @@ module IRB
   def IRB.version
     if v = @CONF[:VERSION] then return v end
 
-    @CONF[:VERSION] = format("irb %s (%s)", @RELEASE_VERSION, @LAST_UPDATE_DATE)
+    require "irb/version"
+    rv = @RELEASE_VERSION.sub(/\.0/, "")
+    @CONF[:VERSION] = format("irb %s(%s)", rv, @LAST_UPDATE_DATE)
   end
 
   # The current IRB::Context of the session, see IRB.conf
@@ -380,7 +382,21 @@ module IRB
     else
       irb = Irb.new
     end
-    irb.run(@CONF)
+
+    @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
   end
 
   # Calls each event hook of IRB.conf[:AT_EXIT] when the current session quits.
@@ -414,24 +430,6 @@ module 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
-
-      trap("SIGINT") do
-        signal_handle
-      end
-
-      begin
-        catch(:IRB_EXIT) do
-          eval_input
-        end
-      ensure
-        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
@@ -439,8 +437,6 @@ module IRB
 
     # Evaluates input for this session.
     def eval_input
-      exc = nil
-
       @scanner.set_prompt do
         |ltype, indent, continue, line_no|
         if ltype
@@ -490,74 +486,54 @@ module IRB
         signal_status(:IN_EVAL) do
           begin
             line.untaint
-            @context.evaluate(line, line_no, exception: exc)
+            @context.evaluate(line, line_no)
             output_value if @context.echo?
+            exc = nil
           rescue Interrupt => exc
           rescue SystemExit, SignalException
             raise
           rescue Exception => exc
-          else
-            exc = nil
-            next
           end
-          handle_exception(exc)
-        end
-      end
-    end
-
-    def handle_exception(exc)
-      if exc.backtrace && exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
-         !(SyntaxError === exc)
-        irb_bug = true
-      else
-        irb_bug = false
-      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
+            end
 
-      if STDOUT.tty?
-        attr = ATTR_TTY
-        print "#{attr[1]}Traceback#{attr[]} (most recent call last):\n"
-      else
-        attr = ATTR_PLAIN
-      end
-      messages = []
-      lasts = []
-      levels = 0
-      if exc.backtrace
-        count = 0
-        exc.backtrace.each do |m|
-          m = @context.workspace.filter_backtrace(m) or next unless irb_bug
-          count += 1
-          if attr == ATTR_TTY
-            m = sprintf("%9d: from %s", count, m)
-          else
-            m = "\tfrom #{m}"
+            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
+                  end
+                end
+              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
           end
-          if messages.size < @context.back_trace_limit
-            messages.push(m)
-          elsif lasts.size < @context.back_trace_limit
-            lasts.push(m).shift
-            levels += 1
+          if $SAFE > 2
+            abort "Error: irb does not work for $SAFE level higher than 2"
           end
         end
       end
-      if attr == ATTR_TTY
-        unless lasts.empty?
-          puts lasts.reverse
-          printf "... %d levels...\n", levels if levels > 0
-        end
-        puts messages.reverse
-      end
-      m = exc.to_s.split(/\n/)
-      print "#{attr[1]}#{exc.class} (#{attr[4]}#{m.shift}#{attr[0, 1]})#{attr[]}\n"
-      puts m.map {|s| "#{attr[1]}#{s}#{attr[]}\n"}
-      if attr == ATTR_PLAIN
-        puts messages
-        unless lasts.empty?
-          puts lasts
-          printf "... %d levels...\n", levels if levels > 0
-        end
-      end
-      print "Maybe IRB bug!\n" if irb_bug
     end
 
     # Evaluates the given block using the given +path+ as the Context#irb_path
@@ -701,11 +677,6 @@ module IRB
       end
       format("#<%s: %s>", self.class, ary.join(", "))
     end
-
-    ATTR_TTY = "\e[%sm"
-    def ATTR_TTY.[](*a) self % a.join(";"); end
-    ATTR_PLAIN = ""
-    def ATTR_PLAIN.[](*) self; end
   end
 
   def @CONF.inspect
@@ -730,69 +701,3 @@ 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 +ruby potato.rb+ 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(eval("__FILE__"), argv: [])
-    workspace = IRB::WorkSpace.new(self)
-    STDOUT.print(workspace.code_around_binding)
-    IRB::Irb.new(workspace).run(IRB.conf)
-  end
-end
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index e9f257791c..606e0c52a9 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -10,20 +10,20 @@
 #
 #
 
-require_relative "nop"
-require_relative "../ext/change-ws"
+require "irb/cmd/nop.rb"
+require "irb/ext/change-ws.rb"
 
 # :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 ae4d51b5d1..552c3962f6 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -14,7 +14,7 @@
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Fork < Nop
+    class Fork<Nop
       def execute
         pid = send ExtendCommand.irb_original_method_name("fork")
         unless pid
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index 71590ee844..7a09c396e1 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -11,12 +11,12 @@
 
 require 'rdoc/ri/driver'
 
-require_relative "nop"
+require "irb/cmd/nop.rb"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Help < Nop
+    class Help<Nop
       begin
         Ri = RDoc::RI::Driver.new
       rescue SystemExit
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index b6769a4124..e3b84dad79 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -10,13 +10,13 @@
 #
 #
 
-require_relative "nop"
-require_relative "../ext/loader"
+require "irb/cmd/nop.rb"
+require "irb/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/pushws.rb b/lib/irb/cmd/pushws.rb
index 187b276e48..aa14430ce4 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -10,26 +10,26 @@
 #
 #
 
-require_relative "nop"
-require_relative "../ext/workspaces"
+require "irb/cmd/nop.rb"
+require "irb/ext/workspaces.rb"
 
 # :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
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index 1e18607d1a..f29548b88f 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -9,31 +9,31 @@
 #
 #
 
-require_relative "nop"
-require_relative "../ext/multi-irb"
+require "irb/cmd/nop.rb"
+require "irb/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/completion.rb b/lib/irb/completion.rb
index 390e7254dd..e7499a8e2b 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 #
-#   irb/completion.rb -
+#   irb/completor.rb -
 #   	$Release Version: 0.9$
 #   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -169,9 +169,18 @@ module IRB
         else
           # func1.func2
           candidates = []
-          to_ignore = ignored_modules
           ObjectSpace.each_object(Module){|m|
-            next if (to_ignore.include?(m) rescue true)
+            begin
+              name = m.name
+            rescue Exception
+              name = ""
+            end
+            begin
+              next if name != "IRB::Context" and
+                /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
+            rescue Exception
+              next
+            end
             candidates.concat m.instance_methods(false).collect{|x| x.to_s}
           }
           candidates.sort!
@@ -209,31 +218,6 @@ module IRB
         end
       end
     end
-
-    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 SLex RubyLex RubyToken).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
 
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index e8e6a118e6..4cf6128930 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -9,10 +9,8 @@
 #
 #
 #
-require_relative "workspace"
-require_relative "inspector"
-require_relative "input-method"
-require_relative "output-method"
+require "irb/workspace"
+require "irb/inspector"
 
 module IRB
   # A class that wraps the current state of the irb session, including the
@@ -44,6 +42,7 @@ module IRB
       @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]
@@ -262,7 +261,7 @@ module IRB
     # to #last_value.
     def set_last_value(value)
       @last_value = value
-      @workspace.local_variable_set :_, value
+      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
     end
 
     # Sets the +mode+ of the prompt in this context.
@@ -376,12 +375,8 @@ module IRB
       @debug_level > 0
     end
 
-    def evaluate(line, line_no, exception: nil) # :nodoc:
+    def evaluate(line, line_no) # :nodoc:
       @line_no = line_no
-      if exception
-        line = "begin ::Kernel.raise _; rescue _.class; #{line}; end"
-        @workspace.local_variable_set(:_, exception)
-      end
       set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
     end
 
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
new file mode 100644
index 0000000000..e409dbdc6a
--- /dev/null
+++ b/lib/irb/ext/math-mode.rb
@@ -0,0 +1,48 @@
+# 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 28d6fba832..982a319611 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -10,6 +10,7 @@
 #
 #
 IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
+require "thread"
 
 module IRB
   class JobManager
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index cc71706671..571dd25d17 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -10,8 +10,8 @@
 #
 #
 
-require_relative "../cmd/load"
-require_relative "loader"
+require "irb/cmd/load"
+require "irb/ext/loader"
 
 class Object
   alias __original__load__IRB_use_loader__ load
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 064f21ba52..6f15e6403a 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -214,6 +214,7 @@ 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"],
     ]
@@ -222,6 +223,7 @@ 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
@@ -304,3 +306,4 @@ module IRB # :nodoc:
     end
   end
 end
+
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index 7868a70a6c..a4264ab4ab 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -10,7 +10,7 @@
 #
 #
 
-require_relative 'magic-file'
+require 'irb/magic-file'
 
 module IRB
   # Outputs the irb help message, see IRB@Command+line+options.
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 2066d8cb64..1184db15ea 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -13,10 +13,10 @@
 module IRB # :nodoc:
 
   # initialize config
-  def IRB.setup(ap_path, argv: ::ARGV)
+  def IRB.setup(ap_path)
     IRB.init_config(ap_path)
     IRB.init_error
-    IRB.parse_opts(argv: argv)
+    IRB.parse_opts
     IRB.run_config
     IRB.load_modules
 
@@ -43,6 +43,7 @@ module IRB # :nodoc:
     @CONF[:LOAD_MODULES] = []
     @CONF[:IRB_RC] = nil
 
+    @CONF[:MATH_MODE] = false
     @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
@@ -121,19 +122,21 @@ module IRB # :nodoc:
   end
 
   # option analyzing
-  def IRB.parse_opts(argv: ::ARGV)
+  def IRB.parse_opts
     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
       when /^-W(.+)?/
-        opt = $1 || argv.shift
+        opt = $1 || ARGV.shift
         case opt
         when "0"
           $VERBOSE = nil
@@ -143,19 +146,19 @@ module IRB # :nodoc:
           $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
@@ -174,7 +177,7 @@ module IRB # :nodoc:
       when "--noverbose"
         @CONF[:VERBOSE] = 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"
@@ -186,22 +189,22 @@ 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
+        @CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
       when "-v", "--version"
         print IRB.version, "\n"
         exit 0
       when "-h", "--help"
-        require_relative "help"
+        require "irb/help"
         IRB.print_usage
         exit 0
       when "--"
-        if opt = argv.shift
+        if opt = ARGV.shift
           @CONF[:SCRIPT] = opt
           $0 = opt
         end
@@ -277,7 +280,7 @@ module IRB # :nodoc:
       begin
         require m
       rescue LoadError => err
-        warn "#{err.class}: #{err}", uplevel: 0
+        warn err.backtrace[0] << ":#{err.class}: #{err}"
       end
     end
   end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index f491d5a760..f7b1aac3bf 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -9,8 +9,8 @@
 #
 #
 #
-require_relative 'src_encoding'
-require_relative 'magic-file'
+require 'irb/src_encoding'
+require 'irb/magic-file'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
diff --git a/lib/irb/irb.gemspec b/lib/irb/irb.gemspec
deleted file mode 100644
index 57a44fecb7..0000000000
--- a/lib/irb/irb.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "exe/irb", "irb.gemspec", "lib/irb.rb", "lib/irb/cmd/chws.rb", "lib/irb/cmd/fork.rb", "lib/irb/cmd/help.rb", "lib/irb/cmd/load.rb", "lib/irb/cmd/nop.rb", "lib/irb/cmd/pushws.rb", "lib/irb/cmd/subirb.rb", "lib/irb/completion.rb", "lib/irb/context.rb", "lib/irb/ext/change-ws.rb", "lib/irb/ext/history.rb", "lib/irb/ext/loader.rb", "lib/irb/ext/multi-irb.rb", "lib/irb/ext/save-history.rb", "lib/irb/ext/tracer.rb", "lib/irb/ext/use-loader.rb", "lib/irb/ext/workspaces.rb", "lib/irb/extend-command.rb", "lib/irb/frame.rb", "lib/irb/help.rb", "lib/irb/init.rb", "lib/irb/input-method.rb", "lib/irb/inspector.rb", "lib/irb/lc/.document", "lib/irb/lc/error.rb", "lib/irb/lc/help-message", "lib/irb/lc/ja/encoding_aliases.rb", "lib/irb/lc/ja/error.rb", "lib/irb/lc/ja/help-message", "lib/irb/locale.rb", "lib/irb/magic-file.rb", "lib/irb/notifier.rb", "lib/irb/output-method.rb", "lib/irb/ruby-lex.rb", "lib/irb/ruby-token.rb", "lib/irb/slex.rb", "lib/irb/src_encoding.rb", "lib/irb/version.rb", "lib/irb/workspace.rb", "lib/irb/ws-for-case-2.rb", "lib/irb/xmp.rb"]
-  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/irb/lc/help-message b/lib/irb/lc/help-message
index d43c6a1695..5853693eb0 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -11,6 +11,7 @@
 #
 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
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index 1b24d14d28..288eb5245c 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -10,6 +10,7 @@
 #
 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 を追加する.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index b713f50e76..df540c8cbb 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -31,7 +31,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}"]), uplevel: 1)
+            warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]
           end
           @encoding = Encoding.find(@encoding_name) rescue nil
         end
diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb
index 34e06d64b3..2dee684657 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 ||= IRB.default_src_encoding
+      encoding ||= default_src_encoding
       io.rewind
       io.set_encoding(encoding, internal_encoding)
 
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index 5a68b0e8c8..9d8de82e69 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -11,7 +11,7 @@
 #
 
 require "e2mmap"
-require_relative "output-method"
+require "irb/output-method"
 
 module IRB
   # An output formatter used internally by the lexer.
@@ -113,7 +113,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)
@@ -174,7 +174,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 +212,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 935a127d0a..7d64851698 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -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 555d1f024f..879c45c565 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -11,8 +11,8 @@
 #
 
 require "e2mmap"
-require_relative "slex"
-require_relative "ruby-token"
+require "irb/slex"
+require "irb/ruby-token"
 
 # :stopdoc:
 class RubyLex
@@ -262,18 +262,9 @@ class RubyLex
   end
 
   def lex
-    continue = @continue
-    while tk = token
-      case tk
-      when TkNL, TkEND_OF_SCRIPT
-        @continue = continue unless continue.nil?
-        break unless @continue
-      when TkSPACE, TkCOMMENT
-      when TkSEMICOLON, TkBEGIN, TkELSE
-        @continue = continue = false
-      else
-        continue = nil
-      end
+    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?
@@ -415,7 +406,7 @@ class RubyLex
       if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
           (@lex_state != EXPR_ARG || @space_seen)
         c = peek(0)
-        if /[-~"'`\w]/ =~ c
+        if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-" || c == "~")
           tk = identify_here_document
         end
       end
@@ -801,7 +792,7 @@ class RubyLex
           token_c = TkSymbol2Token[trans[1]]
           @lex_state = trans[0]
         else
-          if @lex_state != EXPR_FNAME and peek(0) != ':'
+          if @lex_state != EXPR_FNAME
             if ENINDENT_CLAUSE.include?(token)
               # check for ``class = val'' etc.
               valid = true
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index e584b312bd..68174771a7 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -11,7 +11,7 @@
 #
 
 require "e2mmap"
-require_relative "notifier"
+require "irb/notifier"
 
 # :stopdoc:
 module IRB
@@ -53,7 +53,7 @@ module IRB
       node.preproc=proc
     end
 
-    # need a check?
+    #$BMW%A%'%C%/(B?
     def postproc(token)
       node = search(token, proc)
       node.postproc=proc
diff --git a/lib/irb/src_encoding.rb b/lib/irb/src_encoding.rb
index 99aea2b43e..32f997fc7c 100644
--- a/lib/irb/src_encoding.rb
+++ b/lib/irb/src_encoding.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 # DO NOT WRITE ANY MAGIC COMMENT HERE.
-module IRB
-  def self.default_src_encoding
-    return __ENCODING__
-  end
+def default_src_encoding
+  return __ENCODING__
 end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index 41cfff404c..094cb33c05 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -11,7 +11,6 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.0.0"
-  @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2018-12-18"
+  @RELEASE_VERSION = "0.9.6"
+  @LAST_UPDATE_DATE = "09/06/30"
 end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 53914fb7c1..16f714d66e 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -39,6 +39,8 @@ EOF
 
         when 2	# binding in loaded file(thread use)
           unless defined? BINDING_QUEUE
+            require "thread"
+
             IRB.const_set(:BINDING_QUEUE, Thread::SizedQueue.new(1))
             Thread.abort_on_exception = true
             Thread.start do
@@ -71,7 +73,7 @@ EOF
           end
         end
       end
-      @binding.local_variable_set(:_, nil)
+      eval("_=nil", @binding)
     end
 
     # The Binding of this workspace
@@ -85,14 +87,6 @@ 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)
       case IRB.conf[:CONTEXT_MODE]
@@ -115,28 +109,6 @@ EOF
       bt
     end
 
-    def code_around_binding
-      file, pos = @binding.source_location
-
-      unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
-        begin
-          lines = File.readlines(file)
-        rescue SystemCallError
-          return
-        end
-      end
-      pos -= 1
-
-      start_pos = [pos - 5, 0].max
-      end_pos   = [pos + 5, lines.size - 1].min
-
-      fmt = " %2s %#{end_pos.to_s.length}d: %s"
-      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}\n"
-    end
-
     def IRB.delete_caller
     end
   end
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 60cf3b4e4d..3234cff7f3 100644
--- a/lib/irb/xmp.rb
+++ b/lib/irb/xmp.rb
@@ -11,7 +11,7 @@
 #
 
 require "irb"
-require_relative "frame"
+require "irb/frame"
 
 # An example printer for irb.
 #
diff --git a/lib/logger.gemspec b/lib/logger.gemspec
deleted file mode 100644
index 815ae5bc46..0000000000
--- a/lib/logger.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-begin
-  require_relative "lib/logger"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "logger"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "logger"
-  spec.version       = Logger::VERSION
-  spec.authors       = ["SHIBATA Hiroshi"]
-  spec.email         = ["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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/logger.rb", "logger.gemspec"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-end
diff --git a/lib/logger.rb b/lib/logger.rb
index 918caf0956..8551abc7ac 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -109,7 +109,7 @@ require 'monitor'
 # 3. Create a logger for the specified file.
 #
 #      file = File.open('foo.log', File::WRONLY | File::APPEND)
-#      # To create new logfile, add File::CREAT like:
+#      # To create new (and to remove old) logfile, add File::CREAT like:
 #      # file = File.open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
 #      logger = Logger.new(file)
 #
@@ -224,7 +224,7 @@ require 'monitor'
 #   })
 #
 class Logger
-  VERSION = "1.3.0"
+  VERSION = "1.2.7"
   _, name, rev = %w$Id$
   if name
     name = name.chomp(",v")
@@ -268,17 +268,17 @@ class Logger
       @level = severity
     else
       case severity.to_s.downcase
-      when 'debug'
+      when 'debug'.freeze
         @level = DEBUG
-      when 'info'
+      when 'info'.freeze
         @level = INFO
-      when 'warn'
+      when 'warn'.freeze
         @level = WARN
-      when 'error'
+      when 'error'.freeze
         @level = ERROR
-      when 'fatal'
+      when 'fatal'.freeze
         @level = FATAL
-      when 'unknown'
+      when 'unknown'.freeze
         @level = UNKNOWN
       else
         raise ArgumentError, "invalid log level: #{severity}"
@@ -340,7 +340,7 @@ class Logger
 
   #
   # :call-seq:
-  #   Logger.new(logdev, shift_age = 0, shift_size = 1048576)
+  #   Logger.new(logdev, shift_age = 7, shift_size = 1048576)
   #   Logger.new(logdev, shift_age = 'weekly')
   #   Logger.new(logdev, level: :info)
   #   Logger.new(logdev, progname: 'progname')
@@ -356,8 +356,8 @@ class Logger
   #   Number of old log files to keep, *or* frequency of rotation (+daily+,
   #   +weekly+ or +monthly+). Default value is 0.
   # +shift_size+::
-  #   Maximum logfile size in bytes (only applies when +shift_age+ is a number).
-  #   Defaults to +1048576+ (1MB).
+  #   Maximum logfile size (only applies when +shift_age+ is a number). Default
+  #   value is 1MiB.
   # +level+::
   #   Logging severity threshold. Default values is Logger::DEBUG.
   # +progname+::
@@ -457,9 +457,7 @@ class Logger
     if @logdev.nil? or severity < @level
       return true
     end
-    if progname.nil?
-      progname = @progname
-    end
+    progname ||= @progname
     if message.nil?
       if block_given?
         message = yield
@@ -479,7 +477,9 @@ class Logger
   # device exists, return +nil+.
   #
   def <<(msg)
-    @logdev&.write(msg)
+    unless @logdev.nil?
+      @logdev.write(msg)
+    end
   end
 
   #
@@ -566,7 +566,7 @@ class Logger
   # Close the logging device.
   #
   def close
-    @logdev&.close
+    @logdev.close if @logdev
   end
 
 private
@@ -629,8 +629,8 @@ private
       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)
+        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
@@ -673,11 +673,7 @@ private
         @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
+        @next_rotate_time = next_rotate_time(Time.now, @shift_age) unless @shift_age.is_a?(Integer)
       end
     end
 
@@ -741,7 +737,7 @@ private
 
     def open_logfile(filename)
       begin
-        File.open(filename, (File::WRONLY | File::APPEND))
+        open(filename, (File::WRONLY | File::APPEND))
       rescue Errno::ENOENT
         create_logfile(filename)
       end
@@ -749,7 +745,7 @@ private
 
     def create_logfile(filename)
       begin
-        logdev = File.open(filename, (File::WRONLY | File::APPEND | File::CREAT | File::EXCL))
+        logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT | File::EXCL))
         logdev.flock(File::LOCK_EX)
         logdev.sync = true
         add_log_header(logdev)
diff --git a/lib/mathn.rb b/lib/mathn.rb
new file mode 100644
index 0000000000..9cb9401e37
--- /dev/null
+++ b/lib/mathn.rb
@@ -0,0 +1,170 @@
+# 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)
+      sqrt!(a)
+    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 7f338bb07e..fe61b6d120 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -12,7 +12,7 @@
 # Original Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
 ##
 
-require "e2mmap"
+require "e2mmap.rb"
 
 module ExceptionForMatrix # :nodoc:
   extend Exception2MessageMapper
@@ -28,8 +28,110 @@ 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 such as trace, rank, inverse, determinant,
-# or eigensystem.
+# 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
 #
 class Matrix
   include Enumerable
@@ -145,8 +247,8 @@ class Matrix
     scalar(n, 1)
   end
   class << Matrix
-    alias_method :unit, :identity
-    alias_method :I, :identity
+    alias unit identity
+    alias I identity
   end
 
   #
@@ -212,10 +314,10 @@ class Matrix
   #   Matrix.vstack(x, y) # => Matrix[[1, 2], [3, 4], [5, 6], [7, 8]]
   #
   def Matrix.vstack(x, *matrices)
-    x = CoercionHelper.coerce_to_matrix(x)
+    raise TypeError, "Expected a Matrix, got a #{x.class}" unless x.is_a?(Matrix)
     result = x.send(:rows).map(&:dup)
     matrices.each do |m|
-      m = CoercionHelper.coerce_to_matrix(m)
+      raise TypeError, "Expected a Matrix, got a #{m.class}" unless m.is_a?(Matrix)
       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
@@ -233,11 +335,11 @@ class Matrix
   #   Matrix.hstack(x, y) # => Matrix[[1, 2, 5, 6], [3, 4, 7, 8]]
   #
   def Matrix.hstack(x, *matrices)
-    x = CoercionHelper.coerce_to_matrix(x)
+    raise TypeError, "Expected a Matrix, got a #{x.class}" unless x.is_a?(Matrix)
     result = x.send(:rows).map(&:dup)
     total_column_count = x.column_count
     matrices.each do |m|
-      m = CoercionHelper.coerce_to_matrix(m)
+      raise TypeError, "Expected a Matrix, got a #{m.class}" unless m.is_a?(Matrix)
       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
@@ -250,35 +352,6 @@ class Matrix
   end
 
   #
-  # 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|
-      Matrix.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
-
-  def combine(*matrices, &block)
-    Matrix.combine(self, *matrices, &block)
-  end
-
-  #
   # Matrix.new is private; use Matrix.rows, columns, [], etc... to create.
   #
   def initialize(rows, column_count = rows[0].size)
@@ -289,9 +362,10 @@ class Matrix
     @column_count = column_count
   end
 
-  private def new_matrix(rows, column_count = rows[0].size) # :nodoc:
+  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+.
@@ -302,107 +376,12 @@ 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)
-    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
+    @rows[i][j] = v
   end
   alias set_element []=
   alias 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)
-      Matrix.Raise ErrDimensionMismatch unless row_range.size == value.size
-      set_column_vector(row_range, col, value)
-    elsif value.is_a?(Matrix)
-      Matrix.Raise ErrDimensionMismatch unless value.column_count == 1
-      value = value.column(0)
-      Matrix.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)
-      Matrix.Raise ErrDimensionMismatch unless value.row_count == 1
-      value.row(0).to_a
-    else
-      Array.new(col_range.size, value)
-    end
-    Matrix.Raise ErrDimensionMismatch unless col_range.size == value.size
-    @rows[row][col_range] = value
-  end
+  private :[]=, :set_element, :set_component
 
   #
   # Returns the number of rows.
@@ -455,48 +434,16 @@ 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
   #
-  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.freeze
-    super
+  def collect(&block) # :yield: e
+    return to_enum(:collect) unless block_given?
+    rows = @rows.collect{|row| row.collect(&block)}
+    new_matrix rows, column_count
   end
+  alias map collect
 
   #
   # Yields all elements of the matrix, starting with those of the first row,
@@ -928,19 +875,6 @@ class Matrix
   end
 
   #
-  # Returns +true+ if this is an antisymmetric matrix.
-  # Raises an error if matrix is not square.
-  #
-  def antisymmetric?
-    Matrix.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.
   #
@@ -992,11 +926,12 @@ class Matrix
   end
 
   #
-  # Called for dup & clone.
+  # 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.
   #
-  private def initialize_copy(m)
-    super
-    @rows = @rows.map(&:dup) unless frozen?
+  def clone
+    new_matrix @rows.map(&:dup), column_count
   end
 
   #
@@ -1118,17 +1053,6 @@ 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
@@ -1138,9 +1062,9 @@ class Matrix
     Matrix.Raise ErrDimensionMismatch unless square?
     self.class.I(row_count).send(:inverse_from, self)
   end
-  alias_method :inv, :inverse
+  alias inv inverse
 
-  private def inverse_from(src) # :nodoc:
+  def inverse_from(src) # :nodoc:
     last = row_count - 1
     a = src.to_a
 
@@ -1183,6 +1107,7 @@ class Matrix
     end
     self
   end
+  private :inverse_from
 
   #
   # Matrix exponentiation.
@@ -1193,7 +1118,7 @@ class Matrix
   #     => 67 96
   #        48 99
   #
-  def **(other)
+  def ** (other)
     case other
     when Integer
       x = self
@@ -1289,7 +1214,7 @@ class Matrix
   # with smaller bignums (if any), while a matrix of Float will usually have
   # intermediate results with better precision.
   #
-  private def determinant_bareiss
+  def determinant_bareiss
     size = row_count
     last = size - 1
     a = to_a
@@ -1315,15 +1240,16 @@ class Matrix
     end
     sign * pivot
   end
+  private :determinant_bareiss
 
   #
   # deprecated; use Matrix#determinant
   #
   def determinant_e
-    warn "Matrix#determinant_e is deprecated; use #determinant", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Matrix#determinant_e is deprecated; use #determinant"
     determinant
   end
-  alias_method :det_e, :determinant_e
+  alias det_e determinant_e
 
   #
   # Returns a new matrix resulting by stacking horizontally
@@ -1378,7 +1304,7 @@ class Matrix
   # deprecated; use Matrix#rank
   #
   def rank_e
-    warn "Matrix#rank_e is deprecated; use #rank", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Matrix#rank_e is deprecated; use #rank"
     rank
   end
 
@@ -1400,7 +1326,7 @@ class Matrix
       tr + @rows[i][i]
     end
   end
-  alias_method :tr, :trace
+  alias tr trace
 
   #
   # Returns the transpose of the matrix.
@@ -1416,7 +1342,7 @@ class Matrix
     return self.class.empty(column_count, 0) if row_count.zero?
     new_matrix @rows.transpose, row_count
   end
-  alias_method :t, :transpose
+  alias t transpose
 
   #
   # Returns a new matrix resulting by stacking vertically
@@ -1445,7 +1371,7 @@ class Matrix
   def eigensystem
     EigenvalueDecomposition.new(self)
   end
-  alias_method :eigen, :eigensystem
+  alias eigen eigensystem
 
   #
   # Returns the LUP decomposition of the matrix; see +LUPDecomposition+.
@@ -1460,7 +1386,7 @@ class Matrix
   def lup
     LUPDecomposition.new(self)
   end
-  alias_method :lup_decomposition, :lup
+  alias lup_decomposition lup
 
   #--
   # COMPLEX ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -1478,7 +1404,7 @@ class Matrix
   def conjugate
     collect(&:conjugate)
   end
-  alias_method :conj, :conjugate
+  alias conj conjugate
 
   #
   # Returns the imaginary part of the matrix.
@@ -1492,7 +1418,7 @@ class Matrix
   def imaginary
     collect(&:imaginary)
   end
-  alias_method :imag, :imaginary
+  alias imag imaginary
 
   #
   # Returns the real part of the matrix.
@@ -1516,7 +1442,7 @@ class Matrix
   def rect
     [real, imag]
   end
-  alias_method :rectangular, :rect
+  alias rectangular rect
 
   #--
   # CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -1557,40 +1483,24 @@ 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 map(&:to_f)
   def elements_to_f
-    warn "Matrix#elements_to_f is deprecated, use map(&:to_f)", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_f is deprecated, use map(&:to_f)"
     map(&:to_f)
   end
 
-  # Deprecated.
-  #
-  # Use map(&:to_i)
   def elements_to_i
-    warn "Matrix#elements_to_i is deprecated, use map(&:to_i)", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_i is deprecated, use map(&:to_i)"
     map(&:to_i)
   end
 
-  # Deprecated.
-  #
-  # Use map(&:to_r)
   def elements_to_r
-    warn "Matrix#elements_to_r is deprecated, use map(&:to_r)", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Matrix#elements_to_r is deprecated, use map(&:to_r)"
     map(&:to_r)
   end
 
@@ -1629,7 +1539,7 @@ class Matrix
     # Converts the obj to an Array. If copy is set to true
     # a copy of obj will be made if necessary.
     #
-    private def convert_to_array(obj, copy = false) # :nodoc:
+    def convert_to_array(obj, copy = false) # :nodoc:
       case obj
       when Array
         copy ? obj.dup : obj
@@ -1645,6 +1555,7 @@ class Matrix
         converted
       end
     end
+    private :convert_to_array
   end
 
   extend ConversionHelper
@@ -1654,13 +1565,14 @@ class Matrix
     # Applies the operator +oper+ with argument +obj+
     # through coercion of +obj+
     #
-    private def apply_through_coercion(obj, oper)
+    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.
@@ -1670,7 +1582,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
@@ -1684,30 +1596,6 @@ 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
@@ -1756,7 +1644,7 @@ class Matrix
       end
     end
 
-    def /(other)
+    def / (other)
       case other
       when Numeric
         Scalar.new(@value / other)
@@ -1769,7 +1657,7 @@ class Matrix
       end
     end
 
-    def **(other)
+    def ** (other)
       case other
       when Numeric
         Scalar.new(@value ** other)
@@ -1797,14 +1685,10 @@ 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)
@@ -1813,7 +1697,6 @@ end
 # * #angle_with(v)
 # * Vector.independent?(*vs)
 # * #independent?(*vs)
-# * #zero?
 #
 # Vector arithmetic:
 # * #*(x) "is matrix or number"
@@ -1827,10 +1710,8 @@ end
 # * #inner_product(v), dot(v)
 # * #cross_product(v), cross(v)
 # * #collect
-# * #collect!
 # * #magnitude
 # * #map
-# * #map!
 # * #map2(v)
 # * #norm
 # * #normalize
@@ -1888,17 +1769,6 @@ 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)
@@ -1909,11 +1779,7 @@ class Vector
   # ACCESSING
 
   #
-  # :call-seq:
-  #   vector[range]
-  #   vector[integer]
-  #
-  # Returns element or elements of the vector.
+  # Returns element number +i+ (starting at zero) of the vector.
   #
   def [](i)
     @elements[i]
@@ -1921,44 +1787,12 @@ 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)
-    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
+    @elements[i]= v
   end
   alias set_element []=
   alias 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)
-      Matrix.Raise ErrDimensionMismatch unless value.row_count == 1
-      @elements[range] = value.row(0).elements
-    else
-      @elements[range] = Array.new(range.size, value)
-    end
-  end
+  private :[]=, :set_element, :set_component
 
   # Returns a vector with entries rounded to the given precision
   # (see Float#round)
@@ -2048,27 +1882,6 @@ class Vector
     self.class.independent?(self, *vs)
   end
 
-  #
-  # Returns +true+ iff all elements are zero.
-  #
-  def zero?
-    all?(&:zero?)
-  end
-
-  def freeze
-    @elements.freeze
-    super
-  end
-
-  #
-  # Called for dup & clone.
-  #
-  private def initialize_copy(v)
-    super
-    @elements = @elements.dup unless frozen?
-  end
-
-
   #--
   # COMPARING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
@@ -2087,6 +1900,13 @@ 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
@@ -2234,18 +2054,7 @@ class Vector
     els = @elements.collect(&block)
     self.class.elements(els, false)
   end
-  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!
+  alias map collect
 
   #
   # Returns the modulus (Pythagorean distance) of the vector.
@@ -2254,8 +2063,8 @@ class Vector
   def magnitude
     Math.sqrt(@elements.inject(0) {|v, e| v + e.abs2})
   end
-  alias_method :r, :magnitude
-  alias_method :norm, :magnitude
+  alias r magnitude
+  alias norm magnitude
 
   #
   # Like Vector#collect2, but returns a Vector instead of an Array.
@@ -2281,7 +2090,7 @@ 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
   #
@@ -2290,12 +2099,8 @@ class Vector
     Vector.Raise ErrDimensionMismatch if size != v.size
     prod = magnitude * v.magnitude
     raise ZeroVectorError, "Can't get angle of zero vector" if prod == 0
-    dot = inner_product(v)
-    if dot.abs >= prod
-      dot.positive? ? 0 : Math::PI
-    else
-      Math.acos(dot / prod)
-    end
+
+    Math.acos( inner_product(v) / prod )
   end
 
   #--
@@ -2316,25 +2121,18 @@ 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 "Vector#elements_to_f is deprecated", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_f is deprecated"
     map(&:to_f)
   end
 
   def elements_to_i
-    warn "Vector#elements_to_i is deprecated", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_i is deprecated"
     map(&:to_i)
   end
 
   def elements_to_r
-    warn "Vector#elements_to_r is deprecated", uplevel: 1
+    warn "#{caller(1)[0]}: warning: Vector#elements_to_r is deprecated"
     map(&:to_r)
   end
 
diff --git a/lib/matrix/eigenvalue_decomposition.rb b/lib/matrix/eigenvalue_decomposition.rb
index bf6637635a..919db9e83d 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_method :v, :eigenvector_matrix
+    alias 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_method :v_inv, :eigenvector_matrix_inv
+    alias 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_method :d, :eigenvalue_matrix
+    alias 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,10 +96,9 @@ class Matrix
         end
       end
     end
-
     # Complex scalar division.
 
-    private def cdiv(xr, xi, yr, yi)
+    def cdiv(xr, xi, yr, yi)
       if (yr.abs > yi.abs)
         r = yi/yr
         d = yr + r*yi
@@ -114,7 +113,7 @@ class Matrix
 
     # Symmetric Householder reduction to tridiagonal form.
 
-    private def tridiagonalize
+    def tridiagonalize
 
       #  This is derived from the Algol procedures tred2 by
       #  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
@@ -232,7 +231,7 @@ class Matrix
 
     # Symmetric tridiagonal QL algorithm.
 
-    private def diagonalize
+    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
@@ -351,7 +350,7 @@ class Matrix
 
     # Nonsymmetric reduction to Hessenberg form.
 
-    private def reduce_to_hessenberg
+    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
@@ -441,9 +440,11 @@ class Matrix
       end
     end
 
+
+
     # Nonsymmetric reduction from Hessenberg to real Schur form.
 
-    private def hessenberg_to_real_schur
+    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 c001770a12..9c1998fd36 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
diff --git a/lib/matrix/matrix.gemspec b/lib/matrix/matrix.gemspec
deleted file mode 100644
index 71f0371856..0000000000
--- a/lib/matrix/matrix.gemspec
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "matrix"
-  spec.version       = "0.1.0"
-  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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/matrix.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/mkmf.rb b/lib/mkmf.rb
index 0d9d3d9f38..53f9fd96fa 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -7,9 +7,8 @@ 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}"
@@ -32,20 +31,15 @@ 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
@@ -135,6 +129,7 @@ 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
@@ -181,7 +176,7 @@ module MakeMakefile
   ]
 
   def install_dirs(target_prefix = nil)
-    if $extout and $extmk
+    if $extout
       dirs = [
         ['BINDIR',        '$(extout)/bin'],
         ['RUBYCOMMONDIR', '$(extout)/common'],
@@ -247,12 +242,7 @@ module MakeMakefile
     $topdir ||= RbConfig::CONFIG["topdir"]
     $arch_hdrdir = "$(extout)/include/$(arch)"
   else
-    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
+    abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
   end
 
   CONFTEST = "conftest".freeze
@@ -474,6 +464,7 @@ MSG
       xsystem(command, *opts)
     ensure
       log_src(src)
+      MakeMakefile.rm_rf "#{CONFTEST}.dSYM"
     end
   end
 
@@ -536,7 +527,6 @@ MSG
   end
 
   def try_link0(src, opt="", *opts, &b) # :nodoc:
-    exe = CONFTEST+$EXEEXT
     cmd = link_command("", opt)
     if $universal
       require 'tmpdir'
@@ -550,10 +540,7 @@ MSG
       end
     else
       try_do(src, cmd, *opts, &b)
-    end and File.executable?(exe) or return nil
-    exe
-  ensure
-    MakeMakefile.rm_rf(*Dir["#{CONFTEST}*"]-[exe])
+    end and File.executable?(CONFTEST+$EXEEXT)
   end
 
   # Returns whether or not the +src+ can be compiled as a C source and linked
@@ -567,9 +554,9 @@ MSG
   # [+src+] a String which contains a C source
   # [+opt+] a String which contains linker options
   def try_link(src, opt="", *opts, &b)
-    exe = try_link0(src, opt, *opts, &b) or return false
-    MakeMakefile.rm_f exe
-    true
+    try_link0(src, opt, *opts, &b)
+  ensure
+    MakeMakefile.rm_f "#{CONFTEST}*", "c0x32*"
   end
 
   # Returns whether or not the +src+ can be compiled as a C source.  +opt+ is
@@ -668,8 +655,7 @@ MSG
   end
 
   def try_ldflags(flags, opts = {})
-    opts = {:werror => true}.update(opts) if $mswin
-    try_link(MAIN_DOES_NOTHING, flags, opts)
+    try_link(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
   end
 
   def append_ldflags(flags, *opts)
@@ -744,7 +730,7 @@ int main() {printf("%"PRI_CONFTEST_PREFIX"#{neg ? 'd' : 'u'}\\n", conftest_const
           end
         end
       ensure
-        MakeMakefile.rm_f "#{CONFTEST}#{$EXEEXT}"
+        MakeMakefile.rm_f "#{CONFTEST}*"
       end
     end
     nil
@@ -957,10 +943,10 @@ SRC
     a = r = nil
     Logging::postpone do
       r = yield
-      a = (fmt ? "#{fmt % r}" : r ? "yes" : "no")
-      "#{f}#{m}-------------------- #{a}\n\n"
+      a = (fmt ? "#{fmt % r}" : r ? "yes" : "no") << "\n"
+      "#{f}#{m}-------------------- #{a}\n"
     end
-    message "%s\n", a
+    message(a)
     Logging::message "--------------------\n\n"
     r
   end
@@ -1386,7 +1372,7 @@ SRC
   # _convertible_ means actually the same type, or typedef'd from the same
   # type.
   #
-  # If the +type+ is an integer type and the _convertible_ type is found,
+  # If the +type+ is a 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.
   #
@@ -1971,7 +1957,6 @@ 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']}
@@ -1989,7 +1974,6 @@ 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
@@ -2137,10 +2121,7 @@ RULES
     unless suffixes.empty?
       depout.unshift(".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n")
     end
-    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.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n") if $extconf_h
     depout.flatten!
     depout
   end
@@ -2264,7 +2245,7 @@ RULES
     origdef ||= ''
 
     if $extout and $INSTALLFILES
-      $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.delete_prefix('./'))})
+      $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))})
       $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir})
     end
 
@@ -2307,7 +2288,7 @@ DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
 #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
+TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
 " #"
     # TODO: fixme
     install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
@@ -2316,7 +2297,7 @@ TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
     conf << "\
 TARGET_SO_DIR =#{$extout ? " $(RUBYARCHDIR)/" : ''}
 TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = #{'$(TARGET_SO) ' if target}#{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
+CLEANLIBS     = $(TARGET_SO) #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
 CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
 " #"
 
@@ -2325,7 +2306,7 @@ CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$
     mfile.puts(conf)
     mfile.print "
 all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : ""}"}
+static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"}
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-static clean-rb
 " #"
@@ -2520,9 +2501,6 @@ 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
@@ -2601,8 +2579,7 @@ MESSAGE
       src = src.sub(/\{/) do
         $& +
           "\n  if (argc > 1000000) {\n" +
-          refs.map {|n|"    int (* volatile #{n}p)(void)=(int (*)(void))&#{n};\n"}.join("") +
-          refs.map {|n|"    printf(\"%d\", (*#{n}p)());\n"}.join("") +
+          refs.map {|n|"    printf(\"%p\", &#{n});\n"}.join("") +
           "  }\n"
       end
     end
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 64b1f85e7c..3ded0b3658 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -7,6 +7,8 @@
 # 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
@@ -87,9 +89,6 @@
 # MonitorMixin module.
 #
 module MonitorMixin
-  EXCEPTION_NEVER = {Exception => :never}.freeze
-  EXCEPTION_IMMEDIATE = {Exception => :immediate}.freeze
-
   #
   # FIXME: This isn't documented in Nutshell.
   #
@@ -106,17 +105,13 @@ module MonitorMixin
     # even if no other thread doesn't signal.
     #
     def wait(timeout = nil)
-      Thread.handle_interrupt(EXCEPTION_NEVER) do
-        @monitor.__send__(:mon_check_owner)
-        count = @monitor.__send__(:mon_exit_for_cond)
-        begin
-          Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do
-            @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-          end
-          return true
-        ensure
-          @monitor.__send__(:mon_enter_for_cond, count)
-        end
+      @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
 
@@ -209,32 +204,16 @@ module MonitorMixin
   end
 
   #
-  # Returns true if this monitor is locked by any thread
-  #
-  def mon_locked?
-    @mon_mutex.locked?
-  end
-
-  #
-  # Returns true if this monitor is locked by current thread.
-  #
-  def mon_owned?
-    @mon_mutex.locked? && @mon_owner == Thread.current
-  end
-
-  #
   # Enters exclusive section and executes the block.  Leaves the exclusive
   # section automatically when the block exits.  See example under
   # +MonitorMixin+.
   #
   def mon_synchronize
-    # Prevent interrupt on handling interrupts; for example timeout errors
-    # it may break locking state.
-    Thread.handle_interrupt(EXCEPTION_NEVER){ mon_enter }
+    mon_enter
     begin
       yield
     ensure
-      Thread.handle_interrupt(EXCEPTION_NEVER){ mon_exit }
+      mon_exit
     end
   end
   alias synchronize mon_synchronize
@@ -260,13 +239,9 @@ module MonitorMixin
   # 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_mutex) && @mon_mutex_owner_object_id == object_id
-      raise ThreadError, "already initialized"
-    end
-    @mon_mutex = Thread::Mutex.new
-    @mon_mutex_owner_object_id = object_id
     @mon_owner = nil
     @mon_count = 0
+    @mon_mutex = Thread::Mutex.new
   end
 
   def mon_check_owner
diff --git a/lib/mutex_m.gemspec b/lib/mutex_m.gemspec
deleted file mode 100644
index 409ed5b7b2..0000000000
--- a/lib/mutex_m.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-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.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "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 dd47934bea..a8472f1582 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -10,6 +10,9 @@
 #
 # --
 
+
+require 'thread'
+
 # = mutex_m.rb
 #
 # When 'mutex_m' is required, any object that extends or includes Mutex_m will
@@ -25,23 +28,16 @@
 #   obj.extend Mutex_m
 #
 # Or mixin Mutex_m into your module to your class inherit Mutex instance
-# methods --- remember to call super() in your class initialize method.
+# methods.
 #
 #   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.0"
-
   def Mutex_m.define_aliases(cl) # :nodoc:
     cl.module_eval %q{
       alias locked? mu_locked?
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index e68d825dcf..bd89956d36 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -17,12 +17,8 @@
 
 require "socket"
 require "monitor"
-require_relative "protocol"
+require "net/protocol"
 require "time"
-begin
-  require "openssl"
-rescue LoadError
-end
 
 module Net
 
@@ -77,12 +73,8 @@ module Net
   # - #rename
   # - #delete
   #
-  class FTP < Protocol
+  class FTP
     include MonitorMixin
-    if defined?(OpenSSL::SSL)
-      include OpenSSL
-      include SSL
-    end
 
     # :stopdoc:
     FTP_PORT = 21
@@ -111,13 +103,6 @@ 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,
@@ -158,117 +143,38 @@ 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, *args)
+    def FTP.open(host, user = nil, passwd = nil, acct = nil)
       if block_given?
-        ftp = new(host, *args)
+        ftp = new(host, user, passwd, acct)
         begin
           yield ftp
         ensure
           ftp.close
         end
       else
-        new(host, *args)
+        new(host, user, passwd, acct)
       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.
-    #
-    # +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+.
-    # 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)
+    # is made. Additionally, if the +user+ is given, the given user name,
+    # password, and (optionally) account are used to log in.  See #login.
+    #
+    def initialize(host = nil, user = nil, passwd = nil, acct = nil)
       super()
-      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
-      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
+      @passive = @@default_passive
+      @debug_mode = false
       @resume = false
-      @bare_sock = @sock = NullSocket.new
+      @sock = NullSocket.new
       @logged_in = false
-      @open_timeout = options[:open_timeout]
-      @ssl_handshake_timeout = options[:ssl_handshake_timeout]
-      @read_timeout = options[:read_timeout] || 60
+      @open_timeout = nil
+      @read_timeout = 60
       if host
-        connect(host, options[:port] || FTP_PORT)
-        if options[:username]
-          login(options[:username], options[:password], options[:account])
+        connect(host)
+        if user
+          login(user, passwd, acct)
         end
       end
     end
@@ -314,49 +220,35 @@ module Net
 
     # Obsolete
     def return_code # :nodoc:
-      warn("Net::FTP#return_code is obsolete and do nothing", uplevel: 1)
+      $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
       return "\n"
     end
 
     # Obsolete
     def return_code=(s) # :nodoc:
-      warn("Net::FTP#return_code= is obsolete and do nothing", uplevel: 1)
+      $stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing")
     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 Socket is
+    # SOCKS_SERVER, then a SOCKSSocket is returned, else a TCPSocket is
     # returned.
     def open_socket(host, port) # :nodoc:
-      return Timeout.timeout(@open_timeout, OpenTimeout) {
+      return Timeout.timeout(@open_timeout, Net::OpenTimeout) {
         if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
           @passive = true
-          SOCKSSocket.open(host, port)
+          sock = SOCKSSocket.open(host, port)
         else
-          Socket.tcp(host, port)
+          sock = TCPSocket.open(host, port)
         end
+        io = BufferedSocket.new(sock)
+        io.read_timeout = @read_timeout
+        io
       }
     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
@@ -368,24 +260,8 @@ module Net
         print "connect: ", host, ", ", port, "\n"
       end
       synchronize do
-        @host = host
-        @bare_sock = open_socket(host, port)
-        @sock = BufferedSocket.new(@bare_sock, read_timeout: @read_timeout)
+        @sock = open_socket(host, port)
         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
 
@@ -507,10 +383,10 @@ module Net
 
     # Constructs and send the appropriate PORT (or EPRT) command
     def sendport(host, port) # :nodoc:
-      remote_address = @bare_sock.remote_address
-      if remote_address.ipv4?
+      af = (@sock.peeraddr)[0]
+      if af == "AF_INET"
         cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
-      elsif remote_address.ipv6?
+      elsif af == "AF_INET6"
         cmd = sprintf("EPRT |2|%s|%d|", host, port)
       else
         raise FTPProtoError, host
@@ -521,13 +397,13 @@ module Net
 
     # Constructs a TCPServer socket
     def makeport # :nodoc:
-      Addrinfo.tcp(@bare_sock.local_address.ip_address, 0).listen
+      TCPServer.open(@sock.addr[3], 0)
     end
     private :makeport
 
     # sends the appropriate command to enable a passive connection
     def makepasv # :nodoc:
-      if @bare_sock.remote_address.ipv4?
+      if @sock.peeraddr[0] == "AF_INET"
         host, port = parse227(sendcmd("PASV"))
       else
         host, port = parse229(sendcmd("EPSV"))
@@ -557,8 +433,7 @@ module Net
       else
         sock = makeport
         begin
-          addr = sock.local_address
-          sendport(addr.ip_address, addr.ip_port)
+          sendport(sock.addr[3], sock.addr[1])
           if @resume and rest_offset
             resp = sendcmd("REST " + rest_offset.to_s)
             if !resp.start_with?("3")
@@ -571,19 +446,15 @@ module Net
           if !resp.start_with?("1")
             raise FTPReplyError, resp
           end
-          conn, = sock.accept
+          conn = BufferedSocket.new(sock.accept)
+          conn.read_timeout = @read_timeout
           sock.shutdown(Socket::SHUT_WR) rescue nil
           sock.read rescue nil
         ensure
           sock.close
         end
       end
-      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
+      return conn
     end
     private :transfercmd
 
@@ -751,10 +622,10 @@ module Net
       if localfile
         if @resume
           rest_offset = File.size?(localfile)
-          f = File.open(localfile, "a")
+          f = open(localfile, "a")
         else
           rest_offset = nil
-          f = File.open(localfile, "w")
+          f = open(localfile, "w")
         end
       elsif !block_given?
         result = String.new
@@ -784,7 +655,7 @@ module Net
       f = nil
       result = nil
       if localfile
-        f = File.open(localfile, "w")
+        f = open(localfile, "w")
       elsif !block_given?
         result = String.new
       end
@@ -830,7 +701,7 @@ module Net
       else
         rest_offset = nil
       end
-      f = File.open(localfile)
+      f = open(localfile)
       begin
         f.binmode
         if rest_offset
@@ -849,7 +720,7 @@ module Net
     # passing in the transmitted data one line at a time.
     #
     def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
-      f = File.open(localfile)
+      f = open(localfile)
       begin
         storlines("STOR #{remotefile}", f, &block)
       ensure
@@ -1236,16 +1107,11 @@ module Net
 
     #
     # Returns the status (STAT command).
-    # pathname - when stat is invoked with pathname as a parameter it acts like
-    #            list but alot 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)
+    def status
+      line = "STAT" + CRLF
+      print "put: STAT\n" if @debug_mode
+      @sock.send(line, Socket::MSG_OOB)
       return getresp
     end
 
@@ -1383,7 +1249,7 @@ module Net
         raise FTPReplyError, resp
       end
       if m = /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/.match(resp)
-        return @bare_sock.remote_address.ip_address, m["port"].to_i
+        return @sock.peeraddr[3], m["port"].to_i
       else
         raise FTPProtoError, resp
       end
@@ -1420,7 +1286,7 @@ module Net
     end
 
     class BufferedSocket < BufferedIO
-      [:local_address, :remote_address, :addr, :peeraddr, :send, :shutdown].each do |method|
+      [:addr, :peeraddr, :send, :shutdown].each do |method|
         define_method(method) { |*args|
           @io.__send__(method, *args)
         }
@@ -1431,7 +1297,7 @@ module Net
           s = super(len, String.new, true)
           return s.empty? ? nil : s
         else
-          result = String.new
+          result = ""
           while s = super(DEFAULT_BLOCKSIZE, String.new, true)
             break if s.empty?
             result << s
@@ -1453,37 +1319,6 @@ module Net
         return line
       end
     end
-
-    if defined?(OpenSSL::SSL::SSLSocket)
-      class BufferedSSLSocket <  BufferedSocket
-        def initialize(*args)
-          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 31cbb7a866..4738bc621a 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -20,11 +20,11 @@
 # See Net::HTTP for an overview and examples.
 #
 
-require_relative 'protocol'
+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 an HTTP user-agent
+  # The following example code can be used as the basis of a HTTP user-agent
   # which can perform a variety of request types using persistent
   # connections.
   #
@@ -104,13 +104,14 @@ 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.
@@ -169,7 +170,7 @@ module Net   #:nodoc:
   # === POST
   #
   # A POST can be made using the Net::HTTP::Post request class.  This example
-  # creates a URL encoded POST body:
+  # creates a urlencoded POST body:
   #
   #   uri = URI('http://www.example.com/todo.cgi')
   #   req = Net::HTTP::Post.new(uri)
@@ -186,10 +187,13 @@ module Net   #:nodoc:
   #     res.value
   #   end
   #
-  # To send multipart/form-data use Net::HTTPHeader#set_form:
+  # 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=:
   #
   #   req = Net::HTTP::Post.new(uri)
-  #   req.set_form([['upload', File.open('foo.bar')]], 'multipart/form-data')
+  #   req.body = multipart_data
+  #   req.content_type = '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).
@@ -218,7 +222,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')
   #
@@ -262,7 +266,7 @@ module Net   #:nodoc:
   #   end
   #
   # Or if you simply want to make a GET request, you may pass in an URI
-  # object that has an HTTPS URL. Net::HTTP automatically turns on TLS
+  # object that has a HTTPS URL. Net::HTTP automatically turn on TLS
   # verification if the URI object has a 'https' URI scheme.
   #
   #   uri = URI('https://example.com/')
@@ -485,24 +489,6 @@ module Net   #:nodoc:
       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:
@@ -556,7 +542,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=:ENV, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
+    #   HTTP.start(address, port=nil, p_addr=nil, 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.
@@ -572,7 +558,7 @@ module Net   #:nodoc:
     #
     # _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, write_timeout, ssl_timeout,
+    # close_on_empty_response, key, open_timeout, read_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.
@@ -587,7 +573,6 @@ 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)
 
@@ -623,13 +608,12 @@ 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+ 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.
+    # 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.
     #
-    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil)
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
       http = super address, port
 
       if proxy_class? then # from Net::HTTP::Proxy()
@@ -641,10 +625,6 @@ 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
@@ -670,9 +650,7 @@ 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
@@ -705,7 +683,7 @@ module Net   #:nodoc:
     #   http.start { .... }
     #
     def set_debug_output(output)
-      warn 'Net::HTTP#set_debug_output called after HTTP started', uplevel: 1 if started?
+      warn 'Net::HTTP#set_debug_output called after HTTP started' if started?
       @debug_output = output
     end
 
@@ -739,41 +717,12 @@ 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+.
@@ -826,8 +775,6 @@ module Net   #:nodoc:
       :@key,
       :@ssl_timeout,
       :@ssl_version,
-      :@min_version,
-      :@max_version,
       :@verify_callback,
       :@verify_depth,
       :@verify_mode,
@@ -841,8 +788,6 @@ module Net   #:nodoc:
       :key,
       :ssl_timeout,
       :ssl_version,
-      :min_version,
-      :max_version,
       :verify_callback,
       :verify_depth,
       :verify_mode,
@@ -877,12 +822,6 @@ 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
 
@@ -953,23 +892,6 @@ module Net   #:nodoc:
       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 #{@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|
@@ -980,36 +902,60 @@ module Net   #:nodoc:
         end
         @ssl_context = OpenSSL::SSL::SSLContext.new
         @ssl_context.set_params(ssl_parameters)
-        @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_address}:#{conn_port}..."
         s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
         s.sync_close = true
-        # 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
-          s.post_connection_check(@address)
+        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
         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
 
@@ -1026,7 +972,7 @@ module Net   #:nodoc:
 
     def do_finish
       @started = false
-      @socket.close if @socket
+      @socket.close if @socket and not @socket.closed?
       @socket = nil
     end
     private :do_finish
@@ -1128,29 +1074,14 @@ module Net   #:nodoc:
       end
     end
 
-    # [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.
+    # The proxy username, if one is configured
     def proxy_user
-      if ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE && @proxy_from_env
-        proxy_uri&.user
-      else
-        @proxy_user
-      end
+      @proxy_user
     end
 
-    # The password of the proxy server, if one is configured.
+    # The proxy password, if one is configured
     def proxy_pass
-      if ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE && @proxy_from_env
-        proxy_uri&.password
-      else
-        @proxy_pass
-      end
+      @proxy_pass
     end
 
     alias proxyaddr proxy_address   #:nodoc: obsolete
@@ -1508,7 +1439,7 @@ module Net   #:nodoc:
           begin
             res = HTTPResponse.read_new(@socket)
             res.decode_content = req.decode_content
-          end while res.kind_of?(HTTPInformation)
+          end while res.kind_of?(HTTPContinue)
 
           res.uri = req.uri
 
@@ -1524,14 +1455,14 @@ module Net   #:nodoc:
              # avoid a dependency on OpenSSL
              defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
              Timeout::Error => exception
-        if count < max_retries && IDEMPOTENT_METHODS_.include?(req.method)
+        if count == 0 && IDEMPOTENT_METHODS_.include?(req.method)
           count += 1
-          @socket.close if @socket
+          @socket.close if @socket and not @socket.closed?
           D "Conn close because of error #{exception}, and retry"
           retry
         end
         D "Conn close because of error #{exception}"
-        @socket.close if @socket
+        @socket.close if @socket and not @socket.closed?
         raise
       end
 
@@ -1539,7 +1470,7 @@ module Net   #:nodoc:
       res
     rescue => exception
       D "Conn close because of error #{exception}"
-      @socket.close if @socket
+      @socket.close if @socket and not @socket.closed?
       raise exception
     end
 
@@ -1627,10 +1558,11 @@ module Net   #:nodoc:
     private
 
     def addr_port
-      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}"
+      if use_ssl?
+        address() + (port == HTTP.https_default_port ? '' : ":#{port()}")
+      else
+        address() + (port == HTTP.http_default_port ? '' : ":#{port()}")
+      end
     end
 
     def D(msg)
@@ -1642,17 +1574,17 @@ module Net   #:nodoc:
 
 end
 
-require_relative 'http/exceptions'
+require 'net/http/exceptions'
 
-require_relative 'http/header'
+require 'net/http/header'
 
-require_relative 'http/generic_request'
-require_relative 'http/request'
-require_relative 'http/requests'
+require 'net/http/generic_request'
+require 'net/http/request'
+require 'net/http/requests'
 
-require_relative 'http/response'
-require_relative 'http/responses'
+require 'net/http/response'
+require 'net/http/responses'
 
-require_relative 'http/proxy_delta'
+require 'net/http/proxy_delta'
 
-require_relative 'http/backward'
+require 'net/http/backward'
diff --git a/lib/net/http/exceptions.rb b/lib/net/http/exceptions.rb
index da5f7a70fc..0d34526616 100644
--- a/lib/net/http/exceptions.rb
+++ b/lib/net/http/exceptions.rb
@@ -20,14 +20,7 @@ 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 3ff6d88f0c..6c5ceafe61 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -14,8 +14,6 @@ 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
@@ -84,7 +82,7 @@ class Net::HTTPGenericRequest
   end
 
   def body_exist?
-    warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?", uplevel: 1 if $VERBOSE
+    warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE
     response_body_permitted?
   end
 
@@ -170,8 +168,9 @@ class Net::HTTPGenericRequest
 
     def write(buf)
       # avoid memcpy() of buf, buf can huge and eat memory bandwidth
-      rv = buf.bytesize
-      @sock.write("#{rv.to_s(16)}\r\n", buf, "\r\n")
+      @sock.write("#{buf.bytesize.to_s(16)}\r\n")
+      rv = @sock.write(buf)
+      @sock.write("\r\n")
       rv
     end
 
@@ -300,7 +299,7 @@ class Net::HTTPGenericRequest
 
   def supply_default_content_type
     return if content_type()
-    warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE
+    warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
     set_content_type 'application/x-www-form-urlencoded'
   end
 
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index 7865814208..63a163afbd 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -14,15 +14,11 @@ module Net::HTTPHeader
     @header = {}
     return unless initheader
     initheader.each do |key, value|
-      warn "net/http: duplicated HTTP header: #{key}", uplevel: 1 if key?(key) and $VERBOSE
+      warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE
       if value.nil?
-        warn "net/http: nil HTTP header: #{key}", uplevel: 1 if $VERBOSE
+        warn "net/http: warning: nil HTTP header: #{key}" if $VERBOSE
       else
-        value = value.strip # raise error for invalid byte sequences
-        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]
+        @header[key.downcase] = [value.strip]
       end
     end
   end
@@ -36,17 +32,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.to_s] or return nil
+    a = @header[key.downcase] 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.to_s
+      @header.delete key.downcase
       return val
     end
-    set_field(key, val)
+    @header[key.downcase] = [val]
   end
 
   # [Ruby 1.8.3]
@@ -65,39 +61,10 @@ module Net::HTTPHeader
   #   p request.get_fields('X-My-Header')   #=> ["a", "b", "c"]
   #
   def add_field(key, 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
+    if @header.key?(key.downcase)
+      @header[key.downcase].push val
     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
-      val = val.to_s
-      if /[\r\n]/n.match?(val.b)
-        raise ArgumentError, 'header field value cannot include CR/LF'
-      end
-      ary.push val
+      @header[key.downcase] = [val]
     end
   end
 
@@ -113,9 +80,8 @@ 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)
-    stringified_downcased_key = key.downcase.to_s
-    return nil unless @header[stringified_downcased_key]
-    @header[stringified_downcased_key].dup
+    return nil unless @header[key.downcase]
+    @header[key.downcase].dup
   end
 
   # Returns the header field corresponding to the case-insensitive key.
@@ -123,7 +89,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.to_s, *args, &block)
+    a = @header.fetch(key.downcase, *args, &block)
     a.kind_of?(Array) ? a.join(', ') : a
   end
 
@@ -184,12 +150,12 @@ module Net::HTTPHeader
 
   # Removes a header field, specified by case-insensitive key.
   def delete(key)
-    @header.delete(key.downcase.to_s)
+    @header.delete(key.downcase)
   end
 
   # true if +key+ header exists.
   def key?(key)
-    @header.key?(key.downcase.to_s)
+    @header.key?(key.downcase)
   end
 
   # Returns a Hash consisting of header names and array of values.
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index 66132985d9..349812834f 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -117,9 +117,7 @@ class Net::HTTPResponse
   end
 
   def error!   #:nodoc:
-    message = @code
-    message += ' ' + @message.dump if @message
-    raise error_type().new(message, self)
+    raise error_type().new(@code + ' ' + @message.dump, self)
   end
 
   def error_type   #:nodoc:
@@ -140,17 +138,17 @@ class Net::HTTPResponse
   #
 
   def response   #:nodoc:
-    warn "Net::HTTPResponse#response is obsolete", uplevel: 1 if $VERBOSE
+    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#response is obsolete" if $VERBOSE
     self
   end
 
   def header   #:nodoc:
-    warn "Net::HTTPResponse#header is obsolete", uplevel: 1 if $VERBOSE
+    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#header is obsolete" if $VERBOSE
     self
   end
 
   def read_header   #:nodoc:
-    warn "Net::HTTPResponse#read_header is obsolete", uplevel: 1 if $VERBOSE
+    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#read_header is obsolete" if $VERBOSE
     self
   end
 
@@ -242,10 +240,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 not supported or zlib is missing, the plain socket is
+  # Content-Encoding is unsupported 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:
@@ -380,7 +378,6 @@ 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 50352032df..8e75f75d4f 100644
--- a/lib/net/http/responses.rb
+++ b/lib/net/http/responses.rb
@@ -1,6 +1,5 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # :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
@@ -19,7 +18,7 @@ class Net::HTTPRedirection < Net::HTTPResponse           # 3xx
 end
 class Net::HTTPClientError < Net::HTTPResponse           # 4xx
   HAS_BODY = true
-  EXCEPTION_TYPE = Net::HTTPClientException   # for backward compatibility
+  EXCEPTION_TYPE = Net::HTTPServerException   # for backward compatibility
 end
 class Net::HTTPServerError < Net::HTTPResponse           # 5xx
   HAS_BODY = true
@@ -32,12 +31,7 @@ end
 class Net::HTTPSwitchProtocol < Net::HTTPInformation     # 101
   HAS_BODY = false
 end
-class Net::HTTPProcessing < Net::HTTPInformation         # 102
-  HAS_BODY = false
-end
-class Net::HTTPEarlyHints < Net::HTTPInformation         # 103 - RFC 8297
-  HAS_BODY = false
-end
+# 102 - RFC 2518; removed in RFC 4918
 
 class Net::HTTPOK < Net::HTTPSuccess                            # 200
   HAS_BODY = true
@@ -63,9 +57,7 @@ end
 class Net::HTTPMultiStatus < Net::HTTPSuccess                   # 207 - RFC 4918
   HAS_BODY = true
 end
-class Net::HTTPAlreadyReported < Net::HTTPSuccess               # 208 - RFC 5842
-  HAS_BODY = true
-end
+# 208 Already Reported - RFC 5842; experimental
 class Net::HTTPIMUsed < Net::HTTPSuccess                        # 226 - RFC 3229
   HAS_BODY = true
 end
@@ -122,10 +114,9 @@ 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
@@ -138,30 +129,24 @@ end
 class Net::HTTPPreconditionFailed < Net::HTTPClientError            # 412
   HAS_BODY = true
 end
-class Net::HTTPPayloadTooLarge < Net::HTTPClientError               # 413
+class Net::HTTPRequestEntityTooLarge < Net::HTTPClientError         # 413
   HAS_BODY = true
 end
-Net::HTTPRequestEntityTooLarge = Net::HTTPPayloadTooLarge
-class Net::HTTPURITooLong < Net::HTTPClientError                    # 414
+class Net::HTTPRequestURITooLong < 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::HTTPRangeNotSatisfiable < Net::HTTPClientError           # 416
+class Net::HTTPRequestedRangeNotSatisfiable < 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
@@ -184,7 +169,7 @@ end
 class Net::HTTPRequestHeaderFieldsTooLarge < Net::HTTPClientError   # 431 - RFC 6585
   HAS_BODY = true
 end
-class Net::HTTPUnavailableForLegalReasons < Net::HTTPClientError    # 451 - RFC 7725
+class Net::HTTPUnavailableForLegalReasons < Net::HTTPClientError    # 451
   HAS_BODY = true
 end
 # 444 No Response - Nginx
@@ -204,26 +189,19 @@ 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
-class Net::HTTPVariantAlsoNegotiates < Net::HTTPServerError         # 506
-  HAS_BODY = true
-end
+# 506 Variant Also Negotiates - RFC 2295; experimental
 class Net::HTTPInsufficientStorage < Net::HTTPServerError           # 507 - RFC 4918
   HAS_BODY = true
 end
-class Net::HTTPLoopDetected < Net::HTTPServerError                  # 508 - RFC 5842
-  HAS_BODY = true
-end
+# 508 Loop Detected - RFC 5842; experimental
 # 509 Bandwidth Limit Exceeded - Apache bw/limited extension
-class Net::HTTPNotExtended < Net::HTTPServerError                   # 510 - RFC 2774
-  HAS_BODY = true
-end
+# 510 Not Extended - RFC 2774; experimental
 class Net::HTTPNetworkAuthenticationRequired < Net::HTTPServerError # 511 - RFC 6585
   HAS_BODY = true
 end
@@ -239,8 +217,6 @@ class Net::HTTPResponse
   CODE_TO_OBJ = {
     '100' => Net::HTTPContinue,
     '101' => Net::HTTPSwitchProtocol,
-    '102' => Net::HTTPProcessing,
-    '103' => Net::HTTPEarlyHints,
 
     '200' => Net::HTTPOK,
     '201' => Net::HTTPCreated,
@@ -250,7 +226,6 @@ class Net::HTTPResponse
     '205' => Net::HTTPResetContent,
     '206' => Net::HTTPPartialContent,
     '207' => Net::HTTPMultiStatus,
-    '208' => Net::HTTPAlreadyReported,
     '226' => Net::HTTPIMUsed,
 
     '300' => Net::HTTPMultipleChoices,
@@ -270,17 +245,16 @@ 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::HTTPPayloadTooLarge,
-    '414' => Net::HTTPURITooLong,
+    '413' => Net::HTTPRequestEntityTooLarge,
+    '414' => Net::HTTPRequestURITooLong,
     '415' => Net::HTTPUnsupportedMediaType,
-    '416' => Net::HTTPRangeNotSatisfiable,
+    '416' => Net::HTTPRequestedRangeNotSatisfiable,
     '417' => Net::HTTPExpectationFailed,
-    '421' => Net::HTTPMisdirectedRequest,
     '422' => Net::HTTPUnprocessableEntity,
     '423' => Net::HTTPLocked,
     '424' => Net::HTTPFailedDependency,
@@ -288,20 +262,17 @@ 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
deleted file mode 100644
index b3995f763f..0000000000
--- a/lib/net/http/status.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-# 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 d46721c82a..58cb6ddf19 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -19,5 +19,5 @@
 
 =end
 
-require_relative 'http'
+require 'net/http'
 require 'openssl'
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 1c7e89ba14..9895ed68ce 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -18,7 +18,6 @@ require "socket"
 require "monitor"
 require "digest/md5"
 require "strscan"
-require_relative 'protocol'
 begin
   require "openssl"
 rescue LoadError
@@ -200,7 +199,7 @@ module Net
   #    Goldsmith, D. and Davis, M., "UTF-7: A Mail-Safe Transformation Format of
   #    Unicode", RFC 2152, May 1997.
   #
-  class IMAP < Protocol
+  class IMAP
     include MonitorMixin
     if defined?(OpenSSL::SSL)
       include OpenSSL
@@ -222,11 +221,6 @@ 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
 
@@ -320,7 +314,6 @@ module Net
 
     # Disconnects from the server.
     def disconnect
-      return if disconnected?
       begin
         begin
           # try to call SSL::SSLSocket#io.
@@ -336,7 +329,9 @@ module Net
       end
       @receiver_thread.join
       synchronize do
-        @sock.close
+        unless @sock.closed?
+          @sock.close
+        end
       end
       raise e if e
     end
@@ -814,13 +809,13 @@ module Net
     #   #=> "12-Oct-2000 22:40:59 +0900"
     #   p data.attr["UID"]
     #   #=> 98
-    def fetch(set, attr, mod = nil)
-      return fetch_internal("FETCH", set, attr, mod)
+    def fetch(set, attr)
+      return fetch_internal("FETCH", set, attr)
     end
 
     # Similar to #fetch(), but +set+ contains unique identifiers.
-    def uid_fetch(set, attr, mod = nil)
-      return fetch_internal("UID FETCH", set, attr, mod)
+    def uid_fetch(set, attr)
+      return fetch_internal("UID FETCH", set, attr)
     end
 
     # Sends a STORE command to alter data associated with messages
@@ -964,7 +959,7 @@ module Net
           @idle_done_cond.wait(timeout)
           @idle_done_cond = nil
           if @receiver_thread_terminating
-            raise @exception || Net::IMAP::Error.new("connection closed")
+            raise Net::IMAP::Error, "connection closed"
           end
         ensure
           unless @receiver_thread_terminating
@@ -999,7 +994,7 @@ module Net
     def self.decode_utf7(s)
       return s.gsub(/&([^-]+)?-/n) {
         if $1
-          ($1.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
+          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
         else
           "&"
         end
@@ -1055,7 +1050,6 @@ 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:
     #
@@ -1084,9 +1078,8 @@ 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 = tcp_socket(@host, @port)
+      @sock = TCPSocket.open(@host, @port)
       begin
         if options[:ssl]
           start_tls_session(options[:ssl])
@@ -1098,9 +1091,7 @@ 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
@@ -1128,15 +1119,6 @@ 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
@@ -1164,13 +1146,8 @@ module Net
             when TaggedResponse
               @tagged_responses[resp.tag] = resp
               @tagged_response_arrival.broadcast
-              case resp.tag
-              when @logout_command_tag
+              if resp.tag == @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)
@@ -1260,7 +1237,7 @@ module Net
         put_string(tag + " " + cmd)
         args.each do |i|
           put_string(" ")
-          send_data(i, tag)
+          send_data(i)
         end
         put_string(CRLF)
         if cmd == "LOGOUT"
@@ -1306,12 +1283,8 @@ module Net
       when Integer
         NumValidator.ensure_number(data)
       when Array
-        if data[0] == 'CHANGEDSINCE'
-          NumValidator.ensure_mod_sequence_value(data[1])
-        else
-          data.each do |i|
-            validate_data(i)
-          end
+        data.each do |i|
+          validate_data(i)
         end
       when Time
       when Symbol
@@ -1320,32 +1293,32 @@ module Net
       end
     end
 
-    def send_data(data, tag = nil)
+    def send_data(data)
       case data
       when nil
         put_string("NIL")
       when String
-        send_string_data(data, tag)
+        send_string_data(data)
       when Integer
         send_number_data(data)
       when Array
-        send_list_data(data, tag)
+        send_list_data(data)
       when Time
         send_time_data(data)
       when Symbol
         send_symbol_data(data)
       else
-        data.send_data(self, tag)
+        data.send_data(self)
       end
     end
 
-    def send_string_data(str, tag = nil)
+    def send_string_data(str)
       case str
       when ""
         put_string('""')
       when /[\x80-\xff\r\n]/n
         # literal
-        send_literal(str, tag)
+        send_literal(str)
       when /[(){ \x00-\x1f\x7f%*"\\]/n
         # quoted string
         send_quoted_string(str)
@@ -1358,28 +1331,18 @@ module Net
       put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"')
     end
 
-    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
+    def send_literal(str)
+      put_string("{" + str.bytesize.to_s + "}" + CRLF)
+      @continuation_request_arrival.wait
+      raise @exception if @exception
+      put_string(str)
     end
 
     def send_number_data(num)
       put_string(num.to_s)
     end
 
-    def send_list_data(list, tag = nil)
+    def send_list_data(list)
       put_string("(")
       first = true
       list.each do |i|
@@ -1388,7 +1351,7 @@ module Net
         else
           put_string(" ")
         end
-        send_data(i, tag)
+        send_data(i)
       end
       put_string(")")
     end
@@ -1423,7 +1386,7 @@ module Net
       end
     end
 
-    def fetch_internal(cmd, set, attr, mod = nil)
+    def fetch_internal(cmd, set, attr)
       case attr
       when String then
         attr = RawData.new(attr)
@@ -1435,11 +1398,7 @@ module Net
 
       synchronize do
         @responses.delete("FETCH")
-        if mod
-          send_command(cmd, MessageSet.new(set), attr, mod)
-        else
-          send_command(cmd, MessageSet.new(set), attr)
-        end
+        send_command(cmd, MessageSet.new(set), attr)
         return @responses.delete("FETCH")
       end
     end
@@ -1530,15 +1489,14 @@ module Net
       end
       @sock = SSLSocket.new(@sock, context)
       @sock.sync_close = true
-      @sock.hostname = @host if @sock.respond_to? :hostname=
-      ssl_socket_connect(@sock, @open_timeout)
+      @sock.connect
       if context.verify_mode != VERIFY_NONE
         @sock.post_connection_check(@host)
       end
     end
 
     class RawData # :nodoc:
-      def send_data(imap, tag)
+      def send_data(imap)
         imap.send(:put_string, @data)
       end
 
@@ -1553,7 +1511,7 @@ module Net
     end
 
     class Atom # :nodoc:
-      def send_data(imap, tag)
+      def send_data(imap)
         imap.send(:put_string, @data)
       end
 
@@ -1568,7 +1526,7 @@ module Net
     end
 
     class QuotedString # :nodoc:
-      def send_data(imap, tag)
+      def send_data(imap)
         imap.send(:send_quoted_string, @data)
       end
 
@@ -1583,8 +1541,8 @@ module Net
     end
 
     class Literal # :nodoc:
-      def send_data(imap, tag)
-        imap.send(:send_literal, @data, tag)
+      def send_data(imap)
+        imap.send(:send_literal, @data)
       end
 
       def validate
@@ -1598,7 +1556,7 @@ module Net
     end
 
     class MessageSet # :nodoc:
-      def send_data(imap, tag)
+      def send_data(imap)
         imap.send(:put_string, format_internal(@data))
       end
 
@@ -1674,15 +1632,6 @@ 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)
@@ -1698,14 +1647,6 @@ 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
 
@@ -2035,7 +1976,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
         return subtype
       end
     end
@@ -2062,7 +2004,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
         return subtype
       end
     end
@@ -2091,7 +2034,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
         return subtype
       end
     end
@@ -2151,7 +2095,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
         return subtype
       end
     end
@@ -2256,10 +2201,6 @@ 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
@@ -2267,13 +2208,8 @@ module Net
 
       def continue_req
         match(T_PLUS)
-        token = lookahead
-        if token.symbol == T_SPACE
-          shift_token
-          return ContinuationRequest.new(resp_text, @str)
-        else
-          return ContinuationRequest.new(ResponseText.new(nil, ""), @str)
-        end
+        match(T_SPACE)
+        return ContinuationRequest.new(resp_text, @str)
       end
 
       def response_untagged
@@ -2372,8 +2308,6 @@ 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
@@ -2863,16 +2797,6 @@ 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
@@ -3716,10 +3640,6 @@ module Net
     class ByeResponseError < 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/pop.rb b/lib/net/pop.rb
index a6374cd78c..00209fec46 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # = net/pop.rb
 #
 # Copyright (c) 1999-2007 Yukihiro Matsumoto.
@@ -14,14 +14,14 @@
 # Ruby Distribute License.
 #
 # NOTE: You can find Japanese version of this document at:
-# http://docs.ruby-lang.org/ja/latest/library/net=2fpop.html
+# http://www.ruby-lang.org/ja/man/html/net_pop.html
 #
 #   $Id$
 #
 # See Net::POP3 for documentation.
 #
 
-require_relative 'protocol'
+require 'net/protocol'
 require 'digest/md5'
 require 'timeout'
 
@@ -168,8 +168,8 @@ module Net
   #     require 'net/pop'
   #
   #     # Use APOP authentication if $isapop == true
-  #     pop = Net::POP3.APOP($isapop).new('apop.example.com', 110)
-  #     pop.start('YourAccount', 'YourPassword') do |pop|
+  #     pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
+  #     pop.start(YourAccount', 'YourPassword') do |pop|
   #       # Rest of the code is the same.
   #     end
   #
@@ -467,7 +467,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.
@@ -550,15 +550,15 @@ module Net
         context.set_params(@ssl_params)
         s = OpenSSL::SSL::SSLSocket.new(s, context)
         s.sync_close = true
-        ssl_socket_connect(s, @open_timeout)
+        s.connect
         if context.verify_mode != OpenSSL::SSL::VERIFY_NONE
           s.post_connection_check(@address)
         end
       end
-      @socket = InternetMessageIO.new(s,
-                                      read_timeout: @read_timeout,
-                                      debug_output: @debug_output)
+      @socket = InternetMessageIO.new(s)
       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
+        s.close if s and not s.closed?
         @socket = nil
         @command = nil
       end
@@ -601,7 +601,7 @@ module Net
     ensure
       @started = false
       @command = nil
-      @socket.close if @socket
+      @socket.close if @socket and not @socket.closed?
       @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)
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 60e23f1aa5..b53370931a 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # = net/protocol.rb
 #
@@ -34,24 +34,6 @@ 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
 
 
@@ -75,54 +57,20 @@ 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
-    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 ReadTimeout            < Timeout::Error; end
 
 
   class BufferedIO   #:nodoc: internal use only
-    def initialize(io, read_timeout: 60, write_timeout: 60, continue_timeout: nil, debug_output: nil)
+    def initialize(io)
       @io = io
-      @read_timeout = read_timeout
-      @write_timeout = write_timeout
-      @continue_timeout = continue_timeout
-      @debug_output = debug_output
-      @rbuf = ''.b
+      @read_timeout = 60
+      @continue_timeout = nil
+      @debug_output = nil
+      @rbuf = ''
     end
 
     attr_reader :io
     attr_accessor :read_timeout
-    attr_accessor :write_timeout
     attr_accessor :continue_timeout
     attr_accessor :debug_output
 
@@ -148,19 +96,17 @@ module Net # :nodoc:
 
     public
 
-    def read(len, dest = ''.b, ignore_eof = false)
+    def read(len, dest = '', ignore_eof = false)
       LOG "reading #{len} bytes..."
       read_bytes = 0
       begin
         while read_bytes + @rbuf.size < len
-          s = rbuf_consume(@rbuf.size)
+          dest << (s = rbuf_consume(@rbuf.size))
           read_bytes += s.size
-          dest << s
           rbuf_fill
         end
-        s = rbuf_consume(len - read_bytes)
+        dest << (s = rbuf_consume(len - read_bytes))
         read_bytes += s.size
-        dest << s
       rescue EOFError
         raise unless ignore_eof
       end
@@ -168,14 +114,13 @@ module Net # :nodoc:
       dest
     end
 
-    def read_all(dest = ''.b)
+    def read_all(dest = '')
       LOG 'reading all...'
       read_bytes = 0
       begin
         while true
-          s = rbuf_consume(@rbuf.size)
+          dest << (s = rbuf_consume(@rbuf.size))
           read_bytes += s.size
-          dest << s
           rbuf_fill
         end
       rescue EOFError
@@ -206,33 +151,25 @@ module Net # :nodoc:
     BUFSIZE = 1024 * 16
 
     def rbuf_fill
-      tmp = @rbuf.empty? ? @rbuf : nil
-      case rv = @io.read_nonblock(BUFSIZE, tmp, exception: false)
+      case rv = @io.read_nonblock(BUFSIZE, exception: false)
       when String
-        return if rv.equal?(tmp)
-        @rbuf << rv
-        rv.clear
-        return
+        return @rbuf << rv
       when :wait_readable
-        (io = @io.to_io).wait_readable(@read_timeout) or raise Net::ReadTimeout.new(io)
+        @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout
         # continue looping
       when :wait_writable
         # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
         # http://www.openssl.org/support/faq.html#PROG10
-        (io = @io.to_io).wait_writable(@read_timeout) or raise Net::ReadTimeout.new(io)
+        @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout
         # continue looping
       when nil
-        raise EOFError, 'end of file reached'
+        # callers do not care about backtrace, so avoid allocating for it
+        raise EOFError, 'end of file reached', []
       end while true
     end
 
     def rbuf_consume(len)
-      if len == @rbuf.size
-        s = @rbuf
-        @rbuf = ''.b
-      else
-        s = @rbuf.slice!(0, len)
-      end
+      s = @rbuf.slice!(0, len)
       @debug_output << %Q[-> #{s.dump}\n] if @debug_output
       s
     end
@@ -243,9 +180,9 @@ module Net # :nodoc:
 
     public
 
-    def write(*strs)
+    def write(str)
       writing {
-        write0(*strs)
+        write0 str
       }
     end
 
@@ -269,34 +206,11 @@ module Net # :nodoc:
       bytes
     end
 
-    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
+    def write0(str)
+      @debug_output << str.dump if @debug_output
+      len = @io.write(str)
+      @written_bytes += len
+      len
     end
 
     #
@@ -322,7 +236,7 @@ module Net # :nodoc:
 
 
   class InternetMessageIO < BufferedIO   #:nodoc: internal use only
-    def initialize(*)
+    def initialize(io)
       super
       @wbuf = nil
     end
@@ -337,7 +251,7 @@ module Net # :nodoc:
       read_bytes = 0
       while (line = readuntil("\r\n")) != ".\r\n"
         read_bytes += line.size
-        yield line.delete_prefix('.')
+        yield line.sub(/\A\./, '')
       end
       LOG_on()
       LOG "read message (#{read_bytes} bytes)"
@@ -399,7 +313,7 @@ module Net # :nodoc:
     end
 
     def using_each_crlf_line
-      @wbuf = ''.b
+      @wbuf = ''
       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 86b55d278b..50cd742495 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # = net/smtp.rb
 #
 # Copyright (c) 1999-2007 Yukihiro Matsumoto.
@@ -17,7 +17,7 @@
 # See Net::SMTP for documentation.
 #
 
-require_relative 'protocol'
+require 'net/protocol'
 require 'digest/md5'
 require 'timeout'
 begin
@@ -167,7 +167,7 @@ module Net
   #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
   #                     'Your Account', 'Your Password', :cram_md5)
   #
-  class SMTP < Protocol
+  class SMTP
 
     Revision = %q$Revision$.split[1]
 
@@ -567,7 +567,7 @@ module Net
     ensure
       unless @started
         # authentication failed, cancel connection.
-        s.close if s
+        s.close if s and not s.closed?
         @socket = nil
       end
     end
@@ -581,7 +581,7 @@ module Net
       s = ssl_socket(s, @ssl_context)
       logging "TLS connection started"
       s.sync_close = true
-      ssl_socket_connect(s, @open_timeout)
+      s.connect
       if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
         s.post_connection_check(@address)
       end
@@ -592,8 +592,10 @@ module Net
     end
 
     def new_internet_message_io(s)
-      InternetMessageIO.new(s, read_timeout: @read_timeout,
-                            debug_output: @debug_output)
+      io = InternetMessageIO.new(s)
+      io.read_timeout = @read_timeout
+      io.debug_output = @debug_output
+      io
     end
 
     def do_helo(helo_domain)
@@ -613,7 +615,7 @@ module Net
     ensure
       @started = false
       @error_occurred = false
-      @socket.close if @socket
+      @socket.close if @socket and not @socket.closed?
       @socket = nil
     end
 
@@ -945,7 +947,7 @@ module Net
     end
 
     def recv_response
-      buf = ''.dup
+      buf = ''
       while true
         line = @socket.readline
         buf << line << "\n"
@@ -1035,9 +1037,9 @@ module Net
       end
 
       # Creates a CRAM-MD5 challenge. You can view more information on CRAM-MD5
-      # on Wikipedia: https://en.wikipedia.org/wiki/CRAM-MD5
+      # on Wikipedia: http://en.wikipedia.org/wiki/CRAM-MD5
       def cram_md5_challenge
-        @string.split(/ /)[1].unpack1('m')
+        @string.split(/ /)[1].unpack('m')[0]
       end
 
       # Returns a hash of the human readable reply text in the response if it
diff --git a/lib/observer.rb b/lib/observer.rb
index acfe654301..fa7446f384 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # Implementation of the _Observer_ object-oriented design pattern.  The
 # following documentation is copied, with modifications, from "Programming
@@ -114,7 +114,7 @@
 module Observable
 
   #
-  # 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.
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 38f074ef59..2414f5101c 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -40,13 +40,6 @@ module Kernel
   module_function :open
 end
 
-module URI #:nodoc:
-  # alias for Kernel.open defined in open-uri.
-  def self.open(name, *rest, &block)
-    Kernel.open(name, *rest, &block)
-  end
-end
-
 # OpenURI is an easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP.
 #
 # == Example
@@ -115,7 +108,6 @@ module OpenURI
     :ssl_verify_mode => nil,
     :ftp_active_mode => false,
     :redirect => true,
-    :encoding => nil,
   }
 
   def OpenURI.check_options(options) # :nodoc:
@@ -149,12 +141,6 @@ module OpenURI
       encoding, = $1,Encoding.find($1) if $1
       mode = nil
     end
-    if options.has_key? :encoding
-      if !encoding.nil?
-        raise ArgumentError, "encoding specified twice"
-      end
-      encoding = Encoding.find(options[:encoding])
-    end
 
     unless mode == nil ||
            mode == 'r' || mode == 'rb' ||
@@ -354,7 +340,6 @@ module OpenURI
           if options[:progress_proc] && Net::HTTPSuccess === resp
             options[:progress_proc].call(buf.size)
           end
-          str.clear
         }
       }
     }
@@ -653,8 +638,8 @@ module OpenURI
     #  is called before actual transfer is started.
     #  It takes one argument, which is expected content length in bytes.
     #
-    #  If two or more transfers are performed by HTTP redirection, the
-    #  procedure is called only once for the last transfer.
+    #  If two or more transfer is done by HTTP redirection, the procedure
+    #  is called only one for a last transfer.
     #
     #  When expected content length is unknown, the procedure is called with
     #  nil.  This happens when the HTTP response has no Content-Length header.
diff --git a/lib/open3.rb b/lib/open3.rb
index 5e725317a4..3c9d450737 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -81,13 +81,7 @@ module Open3
   # If merged stdout and stderr output is not a problem, you can use Open3.popen2e.
   # If you really need stdout and stderr output as separate strings, you can consider Open3.capture3.
   #
-  def popen3(*cmd, &block)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
+  def popen3(*cmd, **opts, &block)
     in_r, in_w = IO.pipe
     opts[:in] = in_r
     in_w.sync = true
@@ -142,13 +136,7 @@ module Open3
   #     p o.read #=> "*"
   #   }
   #
-  def popen2(*cmd, &block)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
+  def popen2(*cmd, **opts, &block)
     in_r, in_w = IO.pipe
     opts[:in] = in_r
     in_w.sync = true
@@ -191,13 +179,7 @@ module Open3
   #     }
   #   }
   #
-  def popen2e(*cmd, &block)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
+  def popen2e(*cmd, **opts, &block)
     in_r, in_w = IO.pipe
     opts[:in] = in_r
     in_w.sync = true
@@ -210,15 +192,19 @@ module Open3
   module_function :popen2e
 
   def popen_run(cmd, opts, child_io, parent_io) # :nodoc:
+    if last = Hash.try_convert(cmd.last)
+      opts = opts.merge(last)
+      cmd.pop
+    end
     pid = spawn(*cmd, opts)
     wait_thr = Process.detach(pid)
-    child_io.each(&:close)
+    child_io.each {|io| io.close }
     result = [*parent_io, wait_thr]
     if defined? yield
       begin
         return yield(*result)
       ensure
-        parent_io.each(&:close)
+        parent_io.each{|io| io.close unless io.closed?}
         wait_thr.join
       end
     end
@@ -268,16 +254,7 @@ module Open3
   #     STDOUT.binmode; print thumbnail
   #   end
   #
-  def capture3(*cmd)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
-    stdin_data = opts.delete(:stdin_data) || ''
-    binmode = opts.delete(:binmode)
-
+  def capture3(*cmd, stdin_data: '', binmode: false, **opts)
     popen3(*cmd, opts) {|i, o, e, t|
       if binmode
         i.binmode
@@ -287,11 +264,7 @@ module Open3
       out_reader = Thread.new { o.read }
       err_reader = Thread.new { e.read }
       begin
-        if stdin_data.respond_to? :readpartial
-          IO.copy_stream(stdin_data, i)
-        else
-          i.write stdin_data
-        end
+        i.write stdin_data
       rescue Errno::EPIPE
       end
       i.close
@@ -329,16 +302,7 @@ module Open3
   #   End
   #   image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true)
   #
-  def capture2(*cmd)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
-    stdin_data = opts.delete(:stdin_data)
-    binmode = opts.delete(:binmode)
-
+  def capture2(*cmd, stdin_data: nil, binmode: false, **opts)
     popen2(*cmd, opts) {|i, o, t|
       if binmode
         i.binmode
@@ -347,11 +311,7 @@ module Open3
       out_reader = Thread.new { o.read }
       if stdin_data
         begin
-          if stdin_data.respond_to? :readpartial
-            IO.copy_stream(stdin_data, i)
-          else
-            i.write stdin_data
-          end
+          i.write stdin_data
         rescue Errno::EPIPE
         end
       end
@@ -377,16 +337,7 @@ module Open3
   #   # capture make log
   #   make_log, s = Open3.capture2e("make")
   #
-  def capture2e(*cmd)
-    if Hash === cmd.last
-      opts = cmd.pop.dup
-    else
-      opts = {}
-    end
-
-    stdin_data = opts.delete(:stdin_data)
-    binmode = opts.delete(:binmode)
-
+  def capture2e(*cmd, stdin_data: nil, binmode: false, **opts)
     popen2e(*cmd, opts) {|i, oe, t|
       if binmode
         i.binmode
@@ -395,11 +346,7 @@ module Open3
       outerr_reader = Thread.new { oe.read }
       if stdin_data
         begin
-          if stdin_data.respond_to? :readpartial
-            IO.copy_stream(stdin_data, i)
-          else
-            i.write stdin_data
-          end
+          i.write stdin_data
         rescue Errno::EPIPE
         end
       end
@@ -451,13 +398,7 @@ module Open3
   #     stdin.close     # send EOF to sort.
   #     p stdout.read   #=> "     1\tbar\n     2\tbaz\n     3\tfoo\n"
   #   }
-  def pipeline_rw(*cmds, &block)
-    if Hash === cmds.last
-      opts = cmds.pop.dup
-    else
-      opts = {}
-    end
-
+  def pipeline_rw(*cmds, **opts, &block)
     in_r, in_w = IO.pipe
     opts[:in] = in_r
     in_w.sync = true
@@ -507,13 +448,7 @@ module Open3
   #     p ts[1].value #=> #<Process::Status: pid 24913 exit 0>
   #   }
   #
-  def pipeline_r(*cmds, &block)
-    if Hash === cmds.last
-      opts = cmds.pop.dup
-    else
-      opts = {}
-    end
-
+  def pipeline_r(*cmds, **opts, &block)
     out_r, out_w = IO.pipe
     opts[:out] = out_w
 
@@ -549,13 +484,7 @@ module Open3
   #     i.puts "hello"
   #   }
   #
-  def pipeline_w(*cmds, &block)
-    if Hash === cmds.last
-      opts = cmds.pop.dup
-    else
-      opts = {}
-    end
-
+  def pipeline_w(*cmds, **opts, &block)
     in_r, in_w = IO.pipe
     opts[:in] = in_r
     in_w.sync = true
@@ -608,13 +537,7 @@ module Open3
   #     p err_r.read # error messages of pdftops and lpr.
   #   }
   #
-  def pipeline_start(*cmds, &block)
-    if Hash === cmds.last
-      opts = cmds.pop.dup
-    else
-      opts = {}
-    end
-
+  def pipeline_start(*cmds, **opts, &block)
     if block
       pipeline_run(cmds, opts, [], [], &block)
     else
@@ -676,15 +599,9 @@ module Open3
   #   #   106
   #   #   202
   #
-  def pipeline(*cmds)
-    if Hash === cmds.last
-      opts = cmds.pop.dup
-    else
-      opts = {}
-    end
-
+  def pipeline(*cmds, **opts)
     pipeline_run(cmds, opts, [], []) {|ts|
-      ts.map(&:value)
+      ts.map {|t| t.value }
     }
   end
   module_function :pipeline
@@ -728,18 +645,18 @@ module Open3
       end
       pid = spawn(*cmd, cmd_opts)
       wait_thrs << Process.detach(pid)
-      r&.close
-      w2&.close
+      r.close if r
+      w2.close if w2
       r = r2
     }
     result = parent_io + [wait_thrs]
-    child_io.each(&:close)
+    child_io.each {|io| io.close }
     if defined? yield
       begin
         return yield(*result)
       ensure
-        parent_io.each(&:close)
-        wait_thrs.each(&:join)
+        parent_io.each{|io| io.close unless io.closed?}
+        wait_thrs.each {|t| t.join }
       end
     end
     result
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 5cdcabf4a7..7ff7b8e499 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # optparse.rb - command-line option analysis with the OptionParser class.
 #
@@ -125,7 +125,6 @@
 # For options that require an argument, option specification strings may include an
 # option name in all caps. If an option is used without the required argument,
 # an exception will be raised.
-#
 #   require 'optparse'
 #
 #   options = {}
@@ -138,9 +137,9 @@
 #
 # Used:
 #
-#   $ ruby optparse-test.rb -r
+#   bash-3.2$ ruby optparse-test.rb -r
 #   optparse-test.rb:9:in `<main>': missing argument: -r (OptionParser::MissingArgument)
-#   $ ruby optparse-test.rb -r my-library
+#   bash-3.2$ ruby optparse-test.rb -r my-library
 #   You required my-library!
 #
 # === Type Coercion
@@ -188,12 +187,13 @@
 #   end.parse!
 #
 # Used:
-#
-#   $ ruby optparse-test.rb  -t nonsense
+#   bash-3.2$ ruby optparse-test.rb  -t nonsense
 #   ... invalid argument: -t nonsense (OptionParser::InvalidArgument)
-#   $ ruby optparse-test.rb  -t 10-11-12
+#   from ... time.rb:5:in `block in <top (required)>'
+#   from optparse-test.rb:31:in `<main>'
+#   bash-3.2$ ruby optparse-test.rb  -t 10-11-12
 #   2010-11-12 00:00:00 -0500
-#   $ ruby optparse-test.rb  -t 9:30
+#   bash-3.2$ ruby optparse-test.rb  -t 9:30
 #   2014-08-13 09:30:00 -0400
 #
 # ==== Creating Custom Conversions
@@ -225,39 +225,13 @@
 #
 #   op.parse!
 #
-# Used:
-#
-#   $ ruby optparse-test.rb --user 1
+# output:
+#   bash-3.2$ ruby optparse-test.rb --user 1
 #   #<struct User id=1, name="Sam">
-#   $ ruby optparse-test.rb --user 2
+#   bash-3.2$ ruby optparse-test.rb --user 2
 #   #<struct User id=2, name="Gandalf">
-#   $ ruby optparse-test.rb --user 3
+#   bash-3.2$ ruby optparse-test.rb --user 3
 #   optparse-test.rb:15:in `block in find_user': No User Found for id 3 (RuntimeError)
-#
-# === Store options to a Hash
-#
-# The +into+ option of +order+, +parse+ and so on methods stores command line options into a Hash.
-#
-#   require 'optparse'
-#
-#   params = {}
-#   OptionParser.new do |opts|
-#     opts.on('-a')
-#     opts.on('-b NUM', Integer)
-#     opts.on('-v', '--verbose')
-#   end.parse!(into: params)
-#
-#   p params
-#
-# Used:
-#
-#   $ ruby optparse-test.rb -a
-#   {:a=>true}
-#   $ ruby optparse-test.rb -a -v
-#   {:a=>true, :verbose=>true}
-#   $ ruby optparse-test.rb -a -b 100
-#   {:a=>true, :b=>100}
-#
 # === Complete example
 #
 # The following example is a complete Ruby program.  You can run it and see the
@@ -439,7 +413,7 @@ class OptionParser
       candidates = []
       block.call do |k, *v|
         (if Regexp === k
-           kn = ""
+           kn = "".freeze
            k === key
          else
            kn = defined?(k.id2name) ? k.id2name : k
@@ -534,9 +508,8 @@ class OptionParser
 
     def initialize(pattern = nil, conv = nil,
                    short = nil, long = nil, arg = nil,
-                   desc = ([] if short or long), block = nil, &_block)
+                   desc = ([] if short or long), block = Proc.new)
       raise if Array === pattern
-      block ||= _block
       @pattern, @conv, @short, @long, @arg, @desc, @block =
         pattern, conv, short, long, arg, desc, block
     end
@@ -604,7 +577,7 @@ class OptionParser
       while s = lopts.shift
         l = left[-1].length + s.length
         l += arg.length if left.size == 1 && arg
-        l < max or sopts.empty? or left << +''
+        l < max or sopts.empty? or left << ''
         left[-1] << (left[-1].empty? ? ' ' * 4 : ', ') << s
       end
 
@@ -655,7 +628,7 @@ class OptionParser
       return if sopts.empty? and lopts.empty? # completely hidden
 
       (sopts+lopts).each do |opt|
-        # "(-x -c -r)-l[left justify]"
+        # "(-x -c -r)-l[left justify]" \
         if /^--\[no-\](.+)$/ =~ opt
           o = $1
           yield("--#{o}", desc.join(""))
@@ -1163,7 +1136,7 @@ XXX
   #
   def banner
     unless @banner
-      @banner = +"Usage: #{program_name} [options]"
+      @banner = "Usage: #{program_name} [options]"
       visit(:add_banner, @banner)
     end
     @banner
@@ -1192,14 +1165,14 @@ XXX
   # Version
   #
   def version
-    (defined?(@version) && @version) || (defined?(::Version) && ::Version)
+    @version || (defined?(::Version) && ::Version)
   end
 
   #
   # Release code
   #
   def release
-    (defined?(@release) && @release) || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
+    @release || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
   end
 
   #
@@ -1207,7 +1180,7 @@ XXX
   #
   def ver
     if v = version
-      str = +"#{program_name} #{[v].join('.')}"
+      str = "#{program_name} #{[v].join('.')}"
       str << " (#{v})" if v = release
       str
     end
@@ -1264,8 +1237,7 @@ XXX
   # +indent+:: Indentation, defaults to @summary_indent.
   #
   def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
-    nl = "\n"
-    blk ||= proc {|l| to << (l.index(nl, -1) ? l : l + nl)}
+    blk ||= proc {|l| to << (l.index($/, -1) ? l : l + $/)}
     visit(:summarize, {}, {}, width, max, indent, &blk)
     to
   end
@@ -1352,8 +1324,6 @@ XXX
   # [Description:]
   #   Description string for the option.
   #     "Run verbosely"
-  #   If you give multiple description strings, each string will be printed
-  #   line by line.
   #
   # [Handler:]
   #   Handler for the parsed argument value. Either give a block or pass a
@@ -1416,8 +1386,7 @@ XXX
         default_style = Switch::NoArgument
         default_pattern, conv = search(:atype, FalseClass) unless default_pattern
         ldesc << "--no-#{q}"
-        (q = q.downcase).tr!('_', '-')
-        long << "no-#{q}"
+        long << 'no-' + (q = q.downcase)
         nolong << q
       when /^--\[no-\]([^\[\]=\s]*)(.+)?/
         q, a = $1, $2
@@ -1427,11 +1396,10 @@ XXX
           default_pattern, conv = search(:atype, o) unless default_pattern
         end
         ldesc << "--[no-]#{q}"
-        (o = q.downcase).tr!('_', '-')
-        long << o
+        long << (o = q.downcase)
         not_pattern, not_conv = search(:atype, FalseClass) unless not_style
         not_style = Switch::NoArgument
-        nolong << "no-#{o}"
+        nolong << 'no-' + o
       when /^--([^\[\]=\s]*)(.+)?/
         q, a = $1, $2
         if a
@@ -1440,8 +1408,7 @@ XXX
           default_pattern, conv = search(:atype, o) unless default_pattern
         end
         ldesc << "--#{q}"
-        (o = q.downcase).tr!('_', '-')
-        long << o
+        long << (o = q.downcase)
       when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
         q, a = $1, $2
         o = notwice(Object, klass, 'type')
@@ -1571,7 +1538,6 @@ XXX
         # long option
         when /\A--([^=]*)(?:=(.*))?/m
           opt, rest = $1, $2
-          opt.tr!('_', '-')
           begin
             sw, = complete(:long, opt, true)
           rescue ParseError
@@ -1595,7 +1561,7 @@ XXX
               begin
                 sw, = complete(:short, opt)
                 # short option matched.
-                val = arg.delete_prefix('-')
+                val = arg.sub(/\A-/, '')
                 has_arg = true
               rescue InvalidOption
                 # if no short options match, try completion with long
@@ -1683,11 +1649,11 @@ XXX
   # Wrapper method for getopts.rb.
   #
   #   params = ARGV.getopts("ab:", "foo", "bar:", "zot:Z;zot option")
-  #   # params["a"] = true   # -a
-  #   # params["b"] = "1"    # -b1
-  #   # params["foo"] = "1"  # --foo
-  #   # params["bar"] = "x"  # --bar x
-  #   # params["zot"] = "z"  # --zot Z
+  #   # params[:a] = true   # -a
+  #   # params[:b] = "1"    # -b1
+  #   # params[:foo] = "1"  # --foo
+  #   # params[:bar] = "x"  # --bar x
+  #   # params[:zot] = "z"  # --zot Z
   #
   def getopts(*args)
     argv = Array === args.first ? args.shift : default_argv
@@ -1774,16 +1740,16 @@ XXX
   def candidate(word)
     list = []
     case word
-    when '-'
-      long = short = true
     when /\A--/
       word, arg = word.split(/=/, 2)
       argpat = Completion.regexp(arg, false) if arg and !arg.empty?
       long = true
-    when /\A-/
+    when /\A-(!-)/
       short = true
+    when /\A-/
+      long = short = true
     end
-    pat = Completion.regexp(word, long)
+    pat = Completion.regexp(word, true)
     visit(:each_option) do |opt|
       next unless Switch === opt
       opts = (long ? opt.long : []) + (short ? opt.short : [])
@@ -1872,7 +1838,7 @@ XXX
   #
   # Float number format, and converts to Float.
   #
-  float = "(?:#{decimal}(?=(.)?)(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
+  float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
   floatpat = %r"\A[-+]?#{float}\z"io
   accept(Float, floatpat) {|s,| s.to_f if s}
 
@@ -1881,13 +1847,11 @@ XXX
   # for float format, and Rational for rational format.
   #
   real = "[-+]?(?:#{octal}|#{float})"
-  accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, f, n,|
+  accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, n|
     if n
       Rational(d, n)
-    elsif f
-      Float(s)
-    else
-      Integer(s)
+    elsif s
+      eval(s)
     end
   }
 
@@ -1897,7 +1861,7 @@ XXX
   DecimalInteger = /\A[-+]?#{decimal}\z/io
   accept(DecimalInteger, DecimalInteger) {|s,|
     begin
-      Integer(s, 10)
+      Integer(s)
     rescue ArgumentError
       raise OptionParser::InvalidArgument, s
     end if s
@@ -1921,14 +1885,10 @@ XXX
   # integer format, Float for float format.
   #
   DecimalNumeric = floatpat     # decimal integer is allowed as float also.
-  accept(DecimalNumeric, floatpat) {|s, f|
+  accept(DecimalNumeric, floatpat) {|s,|
     begin
-      if f
-        Float(s)
-      else
-        Integer(s)
-      end
-    rescue ArgumentError
+      eval(s)
+    rescue SyntaxError
       raise OptionParser::InvalidArgument, s
     end if s
   }
@@ -1982,7 +1942,7 @@ XXX
   #
   class ParseError < RuntimeError
     # Reason which caused the error.
-    Reason = 'parse error'
+    Reason = 'parse error'.freeze
 
     def initialize(*args)
       @args = args
@@ -2045,42 +2005,42 @@ XXX
   # Raises when ambiguously completable string is encountered.
   #
   class AmbiguousOption < ParseError
-    const_set(:Reason, 'ambiguous option')
+    const_set(:Reason, 'ambiguous option'.freeze)
   end
 
   #
   # Raises when there is an argument for a switch which takes no argument.
   #
   class NeedlessArgument < ParseError
-    const_set(:Reason, 'needless argument')
+    const_set(:Reason, 'needless argument'.freeze)
   end
 
   #
   # Raises when a switch with mandatory argument has no argument.
   #
   class MissingArgument < ParseError
-    const_set(:Reason, 'missing argument')
+    const_set(:Reason, 'missing argument'.freeze)
   end
 
   #
   # Raises when switch is undefined.
   #
   class InvalidOption < ParseError
-    const_set(:Reason, 'invalid option')
+    const_set(:Reason, 'invalid option'.freeze)
   end
 
   #
   # Raises when the given argument does not match required format.
   #
   class InvalidArgument < ParseError
-    const_set(:Reason, 'invalid argument')
+    const_set(:Reason, 'invalid argument'.freeze)
   end
 
   #
   # Raises when the given argument word can't be completed uniquely.
   #
   class AmbiguousArgument < InvalidArgument
-    const_set(:Reason, 'ambiguous argument')
+    const_set(:Reason, 'ambiguous argument'.freeze)
   end
 
   #
@@ -2187,5 +2147,4 @@ end
 # ARGV is arguable by OptionParser
 ARGV.extend(OptionParser::Arguable)
 
-# An alias for OptionParser.
-OptParse = OptionParser  # :nodoc:
+OptParse = OptionParser
diff --git a/lib/optparse/kwargs.rb b/lib/optparse/kwargs.rb
deleted file mode 100644
index ed58cc142b..0000000000
--- a/lib/optparse/kwargs.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-require 'optparse'
-
-class OptionParser
-  def define_by_keywords(options, meth, **opts)
-    meth.parameters.each do |type, name|
-      case type
-      when :key, :keyreq
-        op, cl = *(type == :key ? %w"[ ]" : ["", ""])
-        define("--#{name}=#{op}#{name.upcase}#{cl}", *opts[name]) do |o|
-          options[name] = o
-        end
-      end
-    end
-    options
-  end
-end
diff --git a/lib/ostruct.gemspec b/lib/ostruct.gemspec
deleted file mode 100644
index 4faf5b84aa..0000000000
--- a/lib/ostruct.gemspec
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "ostruct"
-  spec.version       = "0.1.0"
-  spec.authors       = ["Marc-Andre Lafortune"]
-  spec.email         = ["ruby-core@marc-andre.ca"]
-
-  spec.summary       = %q{Class to build custom data structures, similar to a Hash.}
-  spec.description   = %q{Class to build custom data structures, similar to a Hash.}
-  spec.homepage      = "https://github.com/ruby/ostruct"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "ostruct.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/ostruct.rb b/lib/ostruct.rb
index a758a65979..bbf1743247 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # = ostruct.rb: OpenStruct implementation
 #
@@ -15,64 +15,65 @@
 # accomplished by using Ruby's metaprogramming to define methods on the class
 # itself.
 #
-# == Examples
+# == Examples:
 #
-#   require "ostruct"
+#   require 'ostruct'
 #
 #   person = OpenStruct.new
-#   person.name = "John Smith"
-#   person.age  = 70
+#   person.name    = "John Smith"
+#   person.age     = 70
+#   person.pension = 300
 #
-#   person.name      # => "John Smith"
-#   person.age       # => 70
-#   person.address   # => nil
+#   puts person.name     # -> "John Smith"
+#   puts person.age      # -> 70
+#   puts person.address  # -> nil
 #
-# An OpenStruct employs a Hash internally to store the attributes and values
-# and can even be initialized with one:
+# An OpenStruct employs a Hash internally to store the methods and values and
+# can even be initialized with one:
 #
-#   australia = OpenStruct.new(:country => "Australia", :capital => "Canberra")
-#     # => #<OpenStruct country="Australia", capital="Canberra">
+#   australia = OpenStruct.new(:country => "Australia", :population => 20_000_000)
+#   p australia   # -> <OpenStruct country="Australia" population=20000000>
 #
-# Hash keys with spaces or characters that could normally not be used for
-# method calls (e.g. <code>()[]*</code>) will not be immediately available
-# on the OpenStruct object as a method for retrieval or assignment, but can
-# still be reached through the Object#send method.
+# Hash keys with spaces or characters that would normally not be able to use for
+# method calls (e.g. ()[]*) will not be immediately available on the
+# OpenStruct object as a method for retrieval or assignment, but can be still be
+# reached through the Object#send method.
 #
 #   measurements = OpenStruct.new("length (in inches)" => 24)
-#   measurements.send("length (in inches)")   # => 24
+#   measurements.send("length (in inches)")  # -> 24
 #
-#   message = OpenStruct.new(:queued? => true)
-#   message.queued?                           # => true
-#   message.send("queued?=", false)
-#   message.queued?                           # => false
+#   data_point = OpenStruct.new(:queued? => true)
+#   data_point.queued?                       # -> true
+#   data_point.send("queued?=",false)
+#   data_point.queued?                       # -> false
 #
-# Removing the presence of an attribute requires the execution of the
-# delete_field method as setting the property value to +nil+ will not
-# remove the attribute.
-#
-#   first_pet  = OpenStruct.new(:name => "Rowdy", :owner => "John Smith")
-#   second_pet = OpenStruct.new(:name => "Rowdy")
+# Removing the presence of a method requires the execution the delete_field
+# method as setting the property value to +nil+ will not remove the method.
 #
+#   first_pet = OpenStruct.new(:name => 'Rowdy', :owner => 'John Smith')
 #   first_pet.owner = nil
-#   first_pet                 # => #<OpenStruct name="Rowdy", owner=nil>
-#   first_pet == second_pet   # => false
+#   second_pet = OpenStruct.new(:name => 'Rowdy')
+#
+#   first_pet == second_pet   # -> false
 #
 #   first_pet.delete_field(:owner)
-#   first_pet                 # => #<OpenStruct name="Rowdy">
-#   first_pet == second_pet   # => true
+#   first_pet == second_pet   # -> true
 #
 #
-# == Implementation
+# == Implementation:
 #
 # An OpenStruct utilizes Ruby's method lookup structure to find and define the
-# necessary methods for properties. This is accomplished through the methods
-# method_missing and define_singleton_method.
+# necessary methods for properties. This is accomplished through the method
+# method_missing and define_method.
 #
 # This should be a consideration if there is a concern about the performance of
 # the objects that are created, as there is much more overhead in the setting
 # of these properties compared to using a Hash or a Struct.
 #
 class OpenStruct
+  class << self # :nodoc:
+    alias allocate new
+  end
 
   #
   # Creates a new OpenStruct object.  By default, the resulting OpenStruct
@@ -82,11 +83,11 @@ class OpenStruct
   # (can be a Hash, an OpenStruct or a Struct).
   # For example:
   #
-  #   require "ostruct"
-  #   hash = { "country" => "Australia", :capital => "Canberra" }
+  #   require 'ostruct'
+  #   hash = { "country" => "Australia", :population => 20_000_000 }
   #   data = OpenStruct.new(hash)
   #
-  #   data   # => #<OpenStruct country="Australia", capital="Canberra">
+  #   p data        # -> <OpenStruct country="Australia" population=20000000>
   #
   def initialize(hash=nil)
     @table = {}
@@ -98,53 +99,37 @@ class OpenStruct
     end
   end
 
-  # Duplicates an OpenStruct object's Hash table.
-  def initialize_copy(orig) # :nodoc:
+  # Duplicate an OpenStruct object members.
+  def initialize_copy(orig)
     super
     @table = @table.dup
   end
 
   #
-  # call-seq:
-  #   ostruct.to_h                        -> hash
-  #   ostruct.to_h {|name, value| block } -> hash
-  #
   # Converts the OpenStruct to a hash with keys representing
-  # each attribute (as symbols) and their corresponding values.
+  # each attribute (as symbols) and their corresponding values
+  # Example:
   #
-  # If a block is given, the results of the block on each pair of
-  # the receiver will be used as pairs.
+  #   require 'ostruct'
+  #   data = OpenStruct.new("country" => "Australia", :population => 20_000_000)
+  #   data.to_h   # => {:country => "Australia", :population => 20000000 }
   #
-  #   require "ostruct"
-  #   data = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-  #   data.to_h   # => {:country => "Australia", :capital => "Canberra" }
-  #   data.to_h {|name, value| [name.to_s, value.upcase] }
-  #               # => {"country" => "AUSTRALIA", "capital" => "CANBERRA" }
-  #
-  def to_h(&block)
-    if block_given?
-      @table.to_h(&block)
-    else
-      @table.dup
-    end
+  def to_h
+    @table.dup
   end
 
   #
-  # :call-seq:
-  #   ostruct.each_pair {|name, value| block }  -> ostruct
-  #   ostruct.each_pair                         -> Enumerator
+  # Yields all attributes (as a symbol) along with the corresponding values
+  # or returns an enumerator if not block is given.
+  # Example:
   #
-  # Yields all attributes (as symbols) along with the corresponding values
-  # or returns an enumerator if no block is given.
-  #
-  #   require "ostruct"
-  #   data = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-  #   data.each_pair.to_a   # => [[:country, "Australia"], [:capital, "Canberra"]]
+  #   require 'ostruct'
+  #   data = OpenStruct.new("country" => "Australia", :population => 20_000_000)
+  #   data.each_pair.to_a  # => [[:country, "Australia"], [:population, 20000000]]
   #
   def each_pair
     return to_enum(__method__) { @table.size } unless block_given?
     @table.each_pair{|p| yield p}
-    self
   end
 
   #
@@ -169,14 +154,13 @@ class OpenStruct
     begin
       @modifiable = true
     rescue
-      exception_class = defined?(FrozenError) ? FrozenError : RuntimeError
-      raise exception_class, "can't modify frozen #{self.class}", caller(3)
+      raise RuntimeError, "can't modify frozen #{self.class}", caller(3)
     end
     @table
   end
   private :modifiable?
 
-  # ::Kernel.warn("do not use OpenStruct#modifiable", uplevel: 1)
+  # ::Kernel.warn("#{caller(1, 1)[0]}: do not use OpenStruct#modifiable")
   alias modifiable modifiable? # :nodoc:
   protected :modifiable
 
@@ -195,7 +179,7 @@ class OpenStruct
   end
   private :new_ostruct_member!
 
-  # ::Kernel.warn("do not use OpenStruct#new_ostruct_member", uplevel: 1)
+  # ::Kernel.warn("#{caller(1, 1)[0]}: do not use OpenStruct#new_ostruct_member")
   alias new_ostruct_member new_ostruct_member! # :nodoc:
   protected :new_ostruct_member
 
@@ -204,9 +188,9 @@ class OpenStruct
     super
   end
 
-  def respond_to_missing?(mid, include_private = false) # :nodoc:
+  def respond_to_missing?(mid, include_private = false)
     mname = mid.to_s.chomp("=").to_sym
-    @table&.key?(mname) || super
+    @table.key?(mname) || super
   end
 
   def method_missing(mid, *args) # :nodoc:
@@ -216,69 +200,46 @@ class OpenStruct
         raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
       end
       modifiable?[new_ostruct_member!(mname)] = args[0]
-    elsif len == 0 # and /\A[a-z_]\w*\z/ =~ mid #
+    elsif len == 0
       if @table.key?(mid)
         new_ostruct_member!(mid) unless frozen?
         @table[mid]
       end
     else
-      begin
-        super
-      rescue NoMethodError => err
-        err.backtrace.shift
-        raise
-      end
+      err = NoMethodError.new "undefined method `#{mid}' for #{self}", mid, args
+      err.set_backtrace caller(1)
+      raise err
     end
   end
 
+  # Returns the value of a member.
   #
-  # :call-seq:
-  #   ostruct[name]  -> object
-  #
-  # Returns the value of an attribute.
-  #
-  #   require "ostruct"
-  #   person = OpenStruct.new("name" => "John Smith", "age" => 70)
-  #   person[:age]   # => 70, same as person.age
+  #   person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
+  #   person[:age] # => 70, same as ostruct.age
   #
   def [](name)
     @table[name.to_sym]
   end
 
   #
-  # :call-seq:
-  #   ostruct[name] = obj  -> obj
-  #
-  # Sets the value of an attribute.
+  # Sets the value of a member.
   #
-  #   require "ostruct"
-  #   person = OpenStruct.new("name" => "John Smith", "age" => 70)
-  #   person[:age] = 42   # equivalent to person.age = 42
-  #   person.age          # => 42
+  #   person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
+  #   person[:age] = 42 # => equivalent to ostruct.age = 42
+  #   person.age # => 42
   #
   def []=(name, value)
     modifiable?[new_ostruct_member!(name)] = value
   end
 
   #
-  # :call-seq:
-  #   ostruct.dig(name, ...)  -> object
-  #
-  # Extracts the nested value specified by the sequence of +name+
-  # objects by calling +dig+ at each step, returning +nil+ if any
-  # intermediate step is +nil+.
+  # Retrieves the value object corresponding to the each +name+
+  # objects repeatedly.
   #
-  #   require "ostruct"
-  #   address = OpenStruct.new("city" => "Anytown NC", "zip" => 12345)
-  #   person  = OpenStruct.new("name" => "John Smith", "address" => address)
-  #
-  #   person.dig(:address, "zip")            # => 12345
-  #   person.dig(:business_address, "zip")   # => nil
-  #
-  #   data = OpenStruct.new(:array => [1, [2, 3]])
-  #
-  #   data.dig(:array, 1, 0)   # => 2
-  #   data.dig(:array, 0, 0)   # TypeError: Integer does not have #dig method
+  #   address = OpenStruct.new('city' => "Anytown NC", 'zip' => 12345)
+  #   person = OpenStruct.new('name' => 'John Smith', 'address' => address)
+  #   person.dig(:address, 'zip') # => 12345
+  #   person.dig(:business_address, 'zip') # => nil
   #
   def dig(name, *names)
     begin
@@ -290,25 +251,19 @@ class OpenStruct
   end
 
   #
-  # Removes the named field from the object. Returns the value that the field
+  # Remove the named field from the object. Returns the value that the field
   # contained if it was defined.
   #
-  #   require "ostruct"
-  #
-  #   person = OpenStruct.new(name: "John", age: 70, pension: 300)
+  #   require 'ostruct'
   #
-  #   person.delete_field("age")   # => 70
-  #   person                       # => #<OpenStruct name="John", pension=300>
+  #   person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
   #
-  # Setting the value to +nil+ will not remove the attribute:
-  #
-  #   person.pension = nil
-  #   person                 # => #<OpenStruct name="John", pension=nil>
+  #   person.delete_field('name')  # => 'John Smith'
   #
   def delete_field(name)
     sym = name.to_sym
     begin
-      singleton_class.remove_method(sym, "#{sym}=")
+      singleton_class.__send__(:remove_method, sym, "#{sym}=")
     rescue NameError
     end
     @table.delete(sym) do
@@ -322,20 +277,25 @@ class OpenStruct
   # Returns a string containing a detailed summary of the keys and values.
   #
   def inspect
+    str = "#<#{self.class}"
+
     ids = (Thread.current[InspectKey] ||= [])
     if ids.include?(object_id)
-      detail = ' ...'
-    else
-      ids << object_id
-      begin
-        detail = @table.map do |key, value|
-          " #{key}=#{value.inspect}"
-        end.join(',')
-      ensure
-        ids.pop
+      return str << ' ...>'
+    end
+
+    ids << object_id
+    begin
+      first = true
+      for k,v in @table
+        str << "," unless first
+        first = false
+        str << " #{k}=#{v.inspect}"
       end
+      return str << '>'
+    ensure
+      ids.pop
     end
-    ['#<', self.class, detail, '>'].join
   end
   alias :to_s :inspect
 
@@ -348,14 +308,6 @@ class OpenStruct
   # +other+ when +other+ is an OpenStruct and the two objects' Hash tables are
   # equal.
   #
-  #   require "ostruct"
-  #   first_pet  = OpenStruct.new("name" => "Rowdy")
-  #   second_pet = OpenStruct.new(:name  => "Rowdy")
-  #   third_pet  = OpenStruct.new("name" => "Rowdy", :age => nil)
-  #
-  #   first_pet == second_pet   # => true
-  #   first_pet == third_pet    # => false
-  #
   def ==(other)
     return false unless other.kind_of?(OpenStruct)
     @table == other.table!
@@ -371,11 +323,9 @@ class OpenStruct
     @table.eql?(other.table!)
   end
 
-  # Computes a hash code for this OpenStruct.
-  # Two OpenStruct objects with the same content will have the same hash code
-  # (and will compare using #eql?).
-  #
-  # See also Object#hash.
+  # Compute a hash-code for this OpenStruct.
+  # Two hashes with the same content will have the same hash code
+  # (and will be eql?).
   def hash
     @table.hash
   end
diff --git a/lib/pp.rb b/lib/pp.rb
index cbc49e72e9..9678774b8c 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -2,9 +2,37 @@
 
 require 'prettyprint'
 
+module Kernel
+  # Returns a pretty printed object as a string.
+  #
+  # In order to use this method you must first require the PP module:
+  #
+  #   require 'pp'
+  #
+  # See the PP module for more information.
+  def pretty_inspect
+    PP.pp(self, ''.dup)
+  end
+
+  private
+  # prints arguments in pretty form.
+  #
+  # pp returns argument(s).
+  def pp(*objs) # :nodoc:
+    objs.each {|obj|
+      PP.pp(obj)
+    }
+    objs.size <= 1 ? objs.first : objs
+  end
+  module_function :pp # :nodoc:
+end
+
 ##
 # A pretty-printer for Ruby objects.
 #
+# All examples assume you have loaded the PP class with:
+#   require 'pp'
+#
 ##
 # == What PP Does
 #
@@ -284,7 +312,7 @@ class PP < PrettyPrint
         inspect_method = method_method.call(:inspect)
       rescue NameError
       end
-      if inspect_method && inspect_method.owner != Kernel
+      if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect
         q.text self.inspect
       elsif !inspect_method && self.respond_to?(:inspect)
         q.text self.inspect
@@ -318,7 +346,7 @@ class PP < PrettyPrint
     # However, doing this requires that every class that #inspect is called on
     # implement #pretty_print, or a RuntimeError will be raised.
     def pretty_print_inspect
-      if Object.instance_method(:method).bind(self).call(:pretty_print).owner == PP::ObjectMixin
+      if /\(PP::ObjectMixin\)#/ =~ Object.instance_method(:method).bind(self).call(:pretty_print).inspect
         raise "pretty_print is not overridden for #{self.class}"
       end
       PP.singleline_pp(self, ''.dup)
@@ -386,22 +414,7 @@ class Range # :nodoc:
     q.breakable ''
     q.text(self.exclude_end? ? '...' : '..')
     q.breakable ''
-    q.pp self.end if self.end
-  end
-end
-
-class String # :nodoc:
-  def pretty_print(q) # :nodoc:
-    lines = self.lines
-    if lines.size > 1
-      q.group(0, '', '') do
-        q.seplist(lines, lambda { q.text ' +'; q.breakable }) do |v|
-          q.pp v
-        end
-      end
-    else
-      q.text inspect
-    end
+    q.pp self.end
   end
 end
 
@@ -514,36 +527,6 @@ class MatchData # :nodoc:
   end
 end
 
-class RubyVM::AbstractSyntaxTree::Node
-  def pretty_print_children(q, names = [])
-    children.zip(names) do |c, n|
-      if n
-        q.breakable
-        q.text "#{n}:"
-      end
-      q.group(2) do
-        q.breakable
-        q.pp c
-      end
-    end
-  end
-
-  def pretty_print(q)
-    q.group(1, "(#{type}@#{first_lineno}:#{first_column}-#{last_lineno}:#{last_column}", ")") {
-      case type
-      when :SCOPE
-        pretty_print_children(q, %w"tbl args body")
-      when :ARGS
-        pretty_print_children(q, %w[pre_num pre_init opt first_post post_num post_init rest kw kwrest block])
-      when :DEFN
-        pretty_print_children(q, %w[mid body])
-      else
-        pretty_print_children(q)
-      end
-    }
-  end
-end
-
 class Object < BasicObject # :nodoc:
   include PP::ObjectMixin
 end
@@ -563,27 +546,3 @@ end
     end
   }
 }
-
-module Kernel
-  # Returns a pretty printed object as a string.
-  #
-  # In order to use this method you must first require the PP module:
-  #
-  #   require 'pp'
-  #
-  # See the PP module for more information.
-  def pretty_inspect
-    PP.pp(self, ''.dup)
-  end
-
-  # prints arguments in pretty form.
-  #
-  # pp returns argument(s).
-  def pp(*objs)
-    objs.each {|obj|
-      PP.pp(obj)
-    }
-    objs.size <= 1 ? objs.first : objs
-  end
-  module_function :pp
-end
diff --git a/lib/prime.gemspec b/lib/prime.gemspec
deleted file mode 100644
index 6a9aa683e6..0000000000
--- a/lib/prime.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-begin
-  require_relative "lib/prime"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "prime"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "prime"
-  spec.version       = Prime::VERSION
-  spec.authors       = ["Yuki Sonoda"]
-  spec.email         = ["yugui@yugui.jp"]
-
-  spec.summary       = %q{Prime numbers and factorization library.}
-  spec.description   = %q{Prime numbers and factorization library.}
-  spec.homepage      = "https://github.com/ruby/prime"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/prime.rb", "lib/prime/version.rb", "prime.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/prime.rb b/lib/prime.rb
index 9f6db448be..a6700e3e8b 100644
--- a/lib/prime.rb
+++ b/lib/prime.rb
@@ -35,7 +35,7 @@ class Integer
     return self >= 2 if self <= 3
     return true if self == 5
     return false unless 30.gcd(self) == 1
-    (7..Integer.sqrt(self)).step(30) do |p|
+    (7..Math.sqrt(self).to_i).step(30) do |p|
       return false if
         self%(p)    == 0 || self%(p+4)  == 0 || self%(p+6)  == 0 || self%(p+10) == 0 ||
         self%(p+12) == 0 || self%(p+16) == 0 || self%(p+22) == 0 || self%(p+24) == 0
@@ -95,9 +95,6 @@ end
 #   has many prime factors. e.g. for Prime#prime? .
 
 class Prime
-
-  VERSION = "0.1.0"
-
   include Enumerable
   include Singleton
 
@@ -327,7 +324,7 @@ class Prime
 
   # An implementation of +PseudoPrimeGenerator+ which uses
   # a prime table generated by trial division.
-  class TrialDivisionGenerator < PseudoPrimeGenerator
+  class TrialDivisionGenerator<PseudoPrimeGenerator
     def initialize
       @index = -1
       super
@@ -348,7 +345,7 @@ class Prime
   # This is a pseudo-prime generator, suitable on
   # checking primality of an integer by brute force
   # method.
-  class Generator23 < PseudoPrimeGenerator
+  class Generator23<PseudoPrimeGenerator
     def initialize
       @prime = 1
       @step = nil
@@ -391,6 +388,13 @@ class Prime
       @ulticheck_next_squared = 121   # @primes[@ulticheck_index + 1] ** 2
     end
 
+    # Returns the cached prime numbers.
+    def cache
+      @primes
+    end
+    alias primes cache
+    alias primes_so_far cache
+
     # Returns the +index+th prime number.
     #
     # +index+ is a 0-based index.
@@ -415,7 +419,7 @@ class Prime
     end
   end
 
-  # Internal use. An implementation of Eratosthenes' sieve
+  # Internal use. An implementation of eratosthenes' sieve
   class EratosthenesSieve
     include Singleton
 
@@ -441,7 +445,7 @@ class Prime
 
       segment_min = @max_checked
       segment_max = [segment_min + max_segment_size, max_cached_prime * 2].min
-      root = Integer.sqrt(segment_max)
+      root = Integer(Math.sqrt(segment_max).floor)
 
       segment = ((segment_min + 1) .. segment_max).step(2).to_a
 
diff --git a/lib/profile.rb b/lib/profile.rb
index e58c92125b..39f8370370 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'profiler'
 
 RubyVM::InstructionSequence.compile_option = {
diff --git a/lib/profiler.rb b/lib/profiler.rb
index b3c9f7f46a..ab55e1fe48 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # Profile provides a way to Profile your Ruby application.
 #
 # Profiling your program is a way of determining which methods are called and
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 4daa2e003f..87153ed2cd 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # = PStore -- Transactional File Storage for Ruby Objects
 #
 # pstore.rb -
@@ -8,7 +8,7 @@
 #
 # See PStore for documentation.
 
-require "digest"
+require "digest/md5"
 
 #
 # PStore implements a file based persistence mechanism based on a Hash.  User
@@ -335,7 +335,7 @@ class PStore
             save_data(checksum, original_data_size, file)
           end
         ensure
-          file.close
+          file.close if !file.closed?
         end
       else
         # This can only occur if read_only == true.
@@ -352,12 +352,7 @@ class PStore
 
   private
   # Constant for relieving Ruby's garbage collector.
-  CHECKSUM_ALGO = %w[SHA512 SHA384 SHA256 SHA1 RMD160 MD5].each do |algo|
-    begin
-      break Digest(algo)
-    rescue LoadError
-    end
-  end
+  CHECKSUM_ALGO = Digest::MD5
   EMPTY_STRING = ""
   EMPTY_MARSHAL_DATA = Marshal.dump({})
   EMPTY_MARSHAL_CHECKSUM = CHECKSUM_ALGO.digest(EMPTY_MARSHAL_DATA)
@@ -395,7 +390,7 @@ class PStore
   # Load the given PStore file.
   # If +read_only+ is true, the unmarshalled Hash will be returned.
   # If +read_only+ is false, a 3-tuple will be returned: the unmarshalled
-  # Hash, a checksum of the data, and the size of the data.
+  # Hash, an MD5 checksum of the data, and the size of the data.
   def load_data(file, read_only)
     if read_only
       begin
diff --git a/lib/racc/rdoc/grammar.en.rdoc b/lib/racc/rdoc/grammar.en.rdoc
index af10803f3a..824d0ee13d 100644
--- a/lib/racc/rdoc/grammar.en.rdoc
+++ b/lib/racc/rdoc/grammar.en.rdoc
@@ -4,19 +4,19 @@
 
 == Class Block and User Code Block
 
-There are two blocks on the toplevel. One is the 'class' block, the other is the 'user code'
-block. The 'user code' block MUST be placed after the 'class' block.
+There are two blocks on toplevel. One is 'class' block, another is 'user code'
+block. 'user code' block MUST be placed after 'class' block.
 
 == Comments
 
-You can insert comments about all places. Two styles of comments can be used, Ruby style '#.....' and C style '/\*......*\/'.
+You can insert comments about all places. Two style comments can be used, Ruby style '#.....' and C style '/\*......*\/'.
 
 == Class Block
 
 The class block is formed like this:
 
   class CLASS_NAME
-    [precedence table]
+    [precedance table]
     [token declarations]
     [expected number of S/R conflicts]
     [options]
@@ -25,11 +25,11 @@ The class block is formed like this:
   rule
     GRAMMARS
 
-CLASS_NAME is a name of the parser class. This is the name of the generating parser
+CLASS_NAME is a name of parser class. This is the name of generating parser
 class.
 
-If CLASS_NAME includes '::', Racc outputs the module clause. For example, writing
-"class M::C" causes the code below to be created:
+If CLASS_NAME includes '::', Racc outputs module clause. For example, writing
+"class M::C" causes creating the code below:
 
   module M
     class C
@@ -40,7 +40,7 @@ If CLASS_NAME includes '::', Racc outputs the module clause. For example, writin
 
 == Grammar Block
 
-The grammar block describes grammar which is able to be understood by the parser.
+The grammar block describes grammar which is able to be understood by parser.
 Syntax is:
 
   (token): (token) (token) (token).... (action)
@@ -59,10 +59,10 @@ Note that you cannot use '%' string, here document, '%r' regexp in action.
 
 Actions can be omitted. When it is omitted, '' (empty string) is used.
 
-A return value of action is a value of the left side value ($$). It is the value of the
-result, or the returned value by `return` statement.
+A return value of action is a value of left side value ($$). It is value of
+result, or returned value by `return` statement.
 
-Here is an example of the whole grammar block.
+Here is an example of whole grammar block.
 
   rule
     goal: definition rules source { result = val }
@@ -81,11 +81,11 @@ You can use the following special local variables in action:
 
 * result ($$)
 
-The value of the left-hand side (lhs). A default value is val[0].
+The value of left-hand side (lhs). A default value is val[0].
 
 * val ($1,$2,$3...)
 
-An array of value of the right-hand side (rhs).
+An array of value of right-hand side (rhs).
 
 * _values (...$-2,$-1,$0)
 
diff --git a/lib/rbconfig/.document b/lib/rbconfig/.document
new file mode 100644
index 0000000000..4cea83cd0e
--- /dev/null
+++ b/lib/rbconfig/.document
@@ -0,0 +1 @@
+# these files are obsolete
diff --git a/lib/rbconfig/datadir.rb b/lib/rbconfig/datadir.rb
new file mode 100644
index 0000000000..136162da44
--- /dev/null
+++ b/lib/rbconfig/datadir.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: false
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+# N.B. This file is used by Config.datadir in rubygems.rb, and must not be
+# removed before that require is removed. I require to avoid warning more than
+# once.
+
+warn 'rbconfig/datadir.rb and {Rb}Config.datadir is being deprecated from '\
+ 'RubyGems. It will be removed completely on or after June 2011. If you '\
+ 'wish to rely on a datadir, please use Gem.datadir.'
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index fc8ad9e144..cf909d1699 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 $DEBUG_RDOC = nil
 
 # :main: README.rdoc
@@ -62,7 +62,10 @@ module RDoc
 
   class Error < RuntimeError; end
 
-  require 'rdoc/version'
+  ##
+  # RDoc version you are using
+
+  VERSION = '5.0.0.beta2'
 
   ##
   # Method visibilities
@@ -122,6 +125,8 @@ module RDoc
 
   autoload :RDoc,           'rdoc/rdoc'
 
+  autoload :TestCase,       'rdoc/test_case'
+
   autoload :CrossReference, 'rdoc/cross_reference'
   autoload :ERBIO,          'rdoc/erbio'
   autoload :ERBPartial,     'rdoc/erb_partial'
@@ -143,11 +148,13 @@ module RDoc
 
   autoload :KNOWN_CLASSES,  'rdoc/known_classes'
 
+  autoload :RubyLex,        'rdoc/ruby_lex'
+  autoload :RubyToken,      'rdoc/ruby_token'
   autoload :TokenStream,    'rdoc/token_stream'
 
   autoload :Comment,        'rdoc/comment'
 
-  require 'rdoc/i18n'
+  autoload :I18n,           'rdoc/i18n'
 
   # code objects
   #
diff --git a/lib/rdoc/.document b/lib/rdoc/.document
deleted file mode 100644
index 41333c6411..0000000000
--- a/lib/rdoc/.document
+++ /dev/null
@@ -1 +0,0 @@
-*.rb
diff --git a/lib/rdoc/alias.rb b/lib/rdoc/alias.rb
index 858e053049..1e06fb96e5 100644
--- a/lib/rdoc/alias.rb
+++ b/lib/rdoc/alias.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Represent an alias, which is an old_name/new_name pair associated with a
 # particular context
diff --git a/lib/rdoc/anon_class.rb b/lib/rdoc/anon_class.rb
index d02a38c2cf..098bfdfcf9 100644
--- a/lib/rdoc/anon_class.rb
+++ b/lib/rdoc/anon_class.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An anonymous class like:
 #
diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb
index 9b0d309653..16ac8e024e 100644
--- a/lib/rdoc/any_method.rb
+++ b/lib/rdoc/any_method.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # AnyMethod is the base class for objects representing methods
 
@@ -244,9 +244,9 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     if @block_params then
       # If this method has explicit block parameters, remove any explicit
       # &block
-      params = params.sub(/,?\s*&\w+/, '')
+      params.sub!(/,?\s*&\w+/, '')
     else
-      params = params.sub(/\&(\w+)/, '\1')
+      params.sub!(/\&(\w+)/, '\1')
     end
 
     params = params.gsub(/\s+/, '').split(',').reject(&:empty?)
@@ -265,7 +265,7 @@ class RDoc::AnyMethod < RDoc::MethodAttr
       params = params.sub(/(\|[^|]+\|)\s*\.\.\.\s*(end|\})/, '\1 \2')
     elsif @params then
       params = @params.gsub(/\s*\#.*/, '')
-      params = params.tr_s("\n ", " ")
+      params = params.tr("\n", " ").squeeze(" ")
       params = "(#{params})" unless params[0] == ?(
     else
       params = ''
@@ -274,11 +274,12 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     if @block_params then
       # If this method has explicit block parameters, remove any explicit
       # &block
-      params = params.sub(/,?\s*&\w+/, '')
+      params.sub!(/,?\s*&\w+/, '')
 
-      block = @block_params.tr_s("\n ", " ")
+      block = @block_params.gsub(/\s*\#.*/, '')
+      block = block.tr("\n", " ").squeeze(" ")
       if block[0] == ?(
-        block = block.sub(/^\(/, '').sub(/\)/, '')
+        block.sub!(/^\(/, '').sub!(/\)/, '')
       end
       params << " { |#{block}| ... }"
     end
diff --git a/lib/rdoc/attr.rb b/lib/rdoc/attr.rb
index f780b3b976..f77a5c04a7 100644
--- a/lib/rdoc/attr.rb
+++ b/lib/rdoc/attr.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An attribute created by \#attr, \#attr_reader, \#attr_writer or
 # \#attr_accessor
diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
index fdd56e236b..5881d6cf24 100644
--- a/lib/rdoc/class_module.rb
+++ b/lib/rdoc/class_module.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # ClassModule is the base class for objects representing either a class or a
 # module.
@@ -136,9 +136,7 @@ class RDoc::ClassModule < RDoc::Context
                 normalize_comment comment
               end
 
-    if location.parser == RDoc::Parser::C
-      @comment_location.delete_if { |(_, l)| l == location }
-    end
+    @comment_location.delete_if { |(_, l)| l == location }
 
     @comment_location << [comment, location]
 
diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
index aeb4b4762e..21aa2b09f5 100644
--- a/lib/rdoc/code_object.rb
+++ b/lib/rdoc/code_object.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Base class for the RDoc code tree.
 #
@@ -70,6 +70,13 @@ class RDoc::CodeObject
   attr_reader :metadata
 
   ##
+  # Offset in #file where this CodeObject was defined
+  #--
+  # TODO character or byte?
+
+  attr_accessor :offset
+
+  ##
   # Sets the parent CodeObject
 
   attr_writer :parent
@@ -144,7 +151,7 @@ class RDoc::CodeObject
                    # HACK correct fix is to have #initialize create @comment
                    #      with the correct encoding
                    if String === @comment and @comment.empty? then
-                     @comment = RDoc::Encoding.change_encoding @comment, comment.encoding
+                     @comment.force_encoding comment.encoding
                    end
                    @comment
                  end
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index 434a25ac7f..564849e1d1 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # This file was used to load all the RDoc::CodeObject subclasses at once.  Now
 # autoload handles this.
 
diff --git a/lib/rdoc/comment.rb b/lib/rdoc/comment.rb
index 134f6440a0..c655763b3e 100644
--- a/lib/rdoc/comment.rb
+++ b/lib/rdoc/comment.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A comment holds the text comment for a RDoc::CodeObject and provides a
 # unified way of cleaning it up and parsing it into an RDoc::Markup::Document.
@@ -45,7 +45,7 @@ class RDoc::Comment
 
   def initialize text = nil, location = nil
     @location = location
-    @text     = text.nil? ? nil : text.dup
+    @text     = text
 
     @document   = nil
     @format     = 'rdoc'
@@ -114,14 +114,10 @@ class RDoc::Comment
 
       method.call_seq = seq.chomp
 
-    else
-      regexp = /^\s*:?call-seq:(.*?)(^\s*$|\z)/m
-      if regexp =~ @text then
-        @text = @text.sub(regexp, '')
-        seq = $1
-        seq.gsub!(/^\s*/, '')
-        method.call_seq = seq
-      end
+    elsif @text.sub!(/^\s*:?call-seq:(.*?)(^\s*$|\z)/m, '') then
+      seq = $1
+      seq.gsub!(/^\s*/, '')
+      method.call_seq = seq
     end
 
     method
@@ -137,14 +133,8 @@ class RDoc::Comment
   ##
   # HACK dubious
 
-  def encode! encoding
-    # TODO: Remove this condition after Ruby 2.2 EOL
-    if RUBY_VERSION < '2.3.0'
-      @text = @text.force_encoding encoding
-    else
-      @text = String.new @text, encoding: encoding
-    end
-    self
+  def force_encoding encoding
+    @text.force_encoding encoding
   end
 
   ##
@@ -210,7 +200,7 @@ class RDoc::Comment
   def remove_private
     # Workaround for gsub encoding for Ruby 1.9.2 and earlier
     empty = ''
-    empty = RDoc::Encoding.change_encoding empty, @text.encoding
+    empty.force_encoding @text.encoding
 
     @text = @text.gsub(%r%^\s*([#*]?)--.*?^\s*(\1)\+\+\n?%m, empty)
     @text = @text.sub(%r%^\s*[#*]?--.*%m, '')
@@ -226,7 +216,7 @@ class RDoc::Comment
       @text.nil? and @document
 
     @document = nil
-    @text = text.nil? ? nil : text.dup
+    @text = text
   end
 
   ##
diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb
index 0c3d7505a1..4fd5c5f10f 100644
--- a/lib/rdoc/constant.rb
+++ b/lib/rdoc/constant.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A constant
 
@@ -36,7 +36,7 @@ class RDoc::Constant < RDoc::CodeObject
     @value = value
 
     @is_alias_for = nil
-    @visibility   = :public
+    @visibility   = nil
 
     self.comment = comment
   end
@@ -136,7 +136,7 @@ class RDoc::Constant < RDoc::CodeObject
     initialize array[1], nil, array[5]
 
     @full_name     = array[2]
-    @visibility    = array[3] || :public
+    @visibility    = array[3]
     @is_alias_for  = array[4]
     #                      5 handled above
     #                      6 handled below
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
index 6caf0d6712..6e5f464689 100644
--- a/lib/rdoc/context.rb
+++ b/lib/rdoc/context.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'cgi'
 
 ##
@@ -99,11 +99,6 @@ class RDoc::Context < RDoc::CodeObject
   attr_accessor :visibility
 
   ##
-  # Current visibility of this line
-
-  attr_writer :current_line_visibility
-
-  ##
   # Hash of registered methods. Attributes are also registered here,
   # twice if they are RW.
 
@@ -153,7 +148,6 @@ class RDoc::Context < RDoc::CodeObject
     @extends     = []
     @constants   = []
     @external_aliases = []
-    @current_line_visibility = nil
 
     # This Hash maps a method name to a list of unmatched aliases (aliases of
     # a method not yet encountered).
@@ -239,7 +233,7 @@ class RDoc::Context < RDoc::CodeObject
 
       if known then
         known.comment = attribute.comment if known.comment.empty?
-      elsif registered = @methods_hash[attribute.pretty_name + '='] and
+      elsif registered = @methods_hash[attribute.pretty_name << '='] and
             RDoc::Attr === registered then
         registered.rw = 'RW'
       else
@@ -249,7 +243,7 @@ class RDoc::Context < RDoc::CodeObject
     end
 
     if attribute.rw.index 'W' then
-      key = attribute.pretty_name + '='
+      key = attribute.pretty_name << '='
       known = @methods_hash[key]
 
       if known then
@@ -333,7 +327,7 @@ class RDoc::Context < RDoc::CodeObject
     if full_name == 'BasicObject' then
       superclass = nil
     elsif full_name == 'Object' then
-      superclass = '::BasicObject'
+      superclass = defined?(::BasicObject) ? '::BasicObject' : nil
     end
 
     # find the superclass full name
@@ -407,7 +401,6 @@ class RDoc::Context < RDoc::CodeObject
     mod.section = current_section # TODO declaring context? something is
                                   # wrong here...
     mod.parent = self
-    mod.full_name = nil
     mod.store = @store
 
     unless @done_documenting then
@@ -415,10 +408,6 @@ class RDoc::Context < RDoc::CodeObject
       # this must be done AFTER adding mod to its parent, so that the full
       # name is correct:
       all_hash[mod.full_name] = mod
-      if @store.unmatched_constant_alias[mod.full_name] then
-        to, file = @store.unmatched_constant_alias[mod.full_name]
-        add_module_alias mod, mod.name, to, file
-      end
     end
 
     mod
@@ -489,11 +478,7 @@ class RDoc::Context < RDoc::CodeObject
       end
     else
       @methods_hash[key] = method
-      if @current_line_visibility
-        method.visibility, @current_line_visibility = @current_line_visibility, nil
-      else
-        method.visibility = @visibility
-      end
+      method.visibility = @visibility
       add_to @method_list, method
       resolve_aliases method
     end
@@ -516,52 +501,40 @@ class RDoc::Context < RDoc::CodeObject
   end
 
   ##
-  # Adds a module by +RDoc::NormalModule+ instance. See also #add_module.
-
-  def add_module_by_normal_module(mod)
-    add_class_or_module mod, @modules, @store.modules_hash
-  end
-
-  ##
   # Adds an alias from +from+ (a class or module) to +name+ which was defined
   # in +file+.
 
-  def add_module_alias from, from_name, to, file
+  def add_module_alias from, name, file
     return from if @done_documenting
 
-    to_full_name = child_name to.name
+    to_name = child_name name
 
     # if we already know this name, don't register an alias:
     # see the metaprogramming in lib/active_support/basic_object.rb,
     # where we already know BasicObject is a class when we find
     # BasicObject = BlankSlate
-    return from if @store.find_class_or_module to_full_name
+    return from if @store.find_class_or_module to_name
 
-    unless from
-      @store.unmatched_constant_alias[child_name(from_name)] = [to, file]
-      return to
-    end
-
-    new_to = from.dup
-    new_to.name = to.name
-    new_to.full_name = nil
+    to = from.dup
+    to.name = name
+    to.full_name = nil
 
-    if new_to.module? then
-      @store.modules_hash[to_full_name] = new_to
-      @modules[to.name] = new_to
+    if to.module? then
+      @store.modules_hash[to_name] = to
+      @modules[name] = to
     else
-      @store.classes_hash[to_full_name] = new_to
-      @classes[to.name] = new_to
+      @store.classes_hash[to_name] = to
+      @classes[name] = to
     end
 
     # Registers a constant for this alias.  The constant value and comment
     # will be updated later, when the Ruby parser adds the constant
-    const = RDoc::Constant.new to.name, nil, new_to.comment
+    const = RDoc::Constant.new name, nil, to.comment
     const.record_location file
     const.is_alias_for = from
     add_constant const
 
-    new_to
+    to
   end
 
   ##
@@ -779,7 +752,7 @@ class RDoc::Context < RDoc::CodeObject
     attributes.default = []
 
     sort_sections.each do |section|
-      yield section, constants[section].select(&:display?).sort, attributes[section].select(&:display?).sort
+      yield section, constants[section].sort, attributes[section].sort
     end
   end
 
@@ -880,13 +853,7 @@ class RDoc::Context < RDoc::CodeObject
   # Finds a method named +name+ with singleton value +singleton+.
 
   def find_method(name, singleton)
-    @method_list.find { |m|
-      if m.singleton
-        m.name == name && m.singleton == singleton
-      else
-        m.name == name && !m.singleton && !singleton
-      end
-    }
+    @method_list.find { |m| m.name == name && m.singleton == singleton }
   end
 
   ##
@@ -1102,7 +1069,6 @@ class RDoc::Context < RDoc::CodeObject
     return if [:private, :nodoc].include? min_visibility
     remove_invisible_in @method_list, min_visibility
     remove_invisible_in @attributes, min_visibility
-    remove_invisible_in @constants, min_visibility
   end
 
   ##
@@ -1190,17 +1156,6 @@ class RDoc::Context < RDoc::CodeObject
   end
 
   ##
-  # Given an array +names+ of constants, set the visibility of each constant to
-  # +visibility+
-
-  def set_constant_visibility_for(names, visibility)
-    names.each do |name|
-      constant = @constants_hash[name] or next
-      constant.visibility = visibility
-    end
-  end
-
-  ##
   # Sorts sections alphabetically (default) or in TomDoc fashion (none,
   # Public, Internal, Deprecated)
 
@@ -1256,3 +1211,4 @@ class RDoc::Context < RDoc::CodeObject
   autoload :Section, 'rdoc/context/section'
 
 end
+
diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb
index 11f9ceaf87..7c3c8c603d 100644
--- a/lib/rdoc/context/section.rb
+++ b/lib/rdoc/context/section.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A section of documentation like:
 #
@@ -43,7 +43,7 @@ class RDoc::Context::Section
     @parent = parent
     @title = title ? title.strip : title
 
-    @@sequence = @@sequence.succ
+    @@sequence.succ!
     @sequence = @@sequence.dup
 
     @comments = []
diff --git a/lib/rdoc/cross_reference.rb b/lib/rdoc/cross_reference.rb
index 7b137483d5..0e40d23159 100644
--- a/lib/rdoc/cross_reference.rb
+++ b/lib/rdoc/cross_reference.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # RDoc::CrossReference is a reusable way to create cross references for names.
 
@@ -19,12 +19,12 @@ class RDoc::CrossReference
   #
   # See CLASS_REGEXP_STR
 
-  METHOD_REGEXP_STR = '([a-z]\w*[!?=]?|%|===|\[\]=?|<<|>>|-|\+|\*)(?:\([\w.+*/=<>-]*\))?'
+  METHOD_REGEXP_STR = '([a-z]\w*[!?=]?|%|===|\[\]=?|<<|>>)(?:\([\w.+*/=<>-]*\))?'
 
   ##
   # Regular expressions matching text that should potentially have
-  # cross-reference links generated are passed to add_regexp_handling. Note
-  # that these expressions are meant to pick up text for which cross-references
+  # cross-reference links generated are passed to add_special.  Note that
+  # these expressions are meant to pick up text for which cross-references
   # have been suppressed, since the suppression characters are removed by the
   # code that is triggered.
 
@@ -127,41 +127,23 @@ class RDoc::CrossReference
 
     if /#{CLASS_REGEXP_STR}([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
       type = $2
-      if '.' == type # will find either #method or ::method
-        method = $3
-      else
-        method = "#{type}#{$3}"
-      end
+      type = '' if type == '.'  # will find either #method or ::method
+      method = "#{type}#{$3}"
       container = @context.find_symbol_module($1)
     elsif /^([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
       type = $1
-      if '.' == type
-        method = $2
-      else
-        method = "#{type}#{$2}"
-      end
+      type = '' if type == '.'
+      method = "#{type}#{$2}"
       container = @context
     else
-      type = nil
       container = nil
     end
 
     if container then
-      unless RDoc::TopLevel === container then
-        if '.' == type then
-          if 'new' == method then # AnyClassName.new will be class method
-            ref = container.find_local_symbol method
-            ref = container.find_ancestor_local_symbol method unless ref
-          else
-            ref = container.find_local_symbol "::#{method}"
-            ref = container.find_ancestor_local_symbol "::#{method}" unless ref
-            ref = container.find_local_symbol "##{method}" unless ref
-            ref = container.find_ancestor_local_symbol "##{method}" unless ref
-          end
-        else
-          ref = container.find_local_symbol method
-          ref = container.find_ancestor_local_symbol method unless ref
-        end
+      ref = container.find_local_symbol method
+
+      unless ref || RDoc::TopLevel === container then
+        ref = container.find_ancestor_local_symbol method
       end
     end
 
diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb
index cf60badd24..44881d043c 100644
--- a/lib/rdoc/encoding.rb
+++ b/lib/rdoc/encoding.rb
@@ -1,5 +1,5 @@
 # coding: US-ASCII
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 ##
 # This class is a wrapper around File IO and Encoding that helps RDoc load
@@ -7,18 +7,6 @@
 
 module RDoc::Encoding
 
-  HEADER_REGEXP = /^
-    (?:
-      \A\#!.*\n
-      |
-      ^\#\s+frozen[-_]string[-_]literal[=:].+\n
-      |
-      ^\#[^\n]+\b(?:en)?coding[=:]\s*(?<name>[^\s;]+).*\n
-      |
-      <\?xml[^?]*encoding=(?<quote>["'])(?<name>.*?)\k<quote>.*\n
-    )+
-  /xi # :nodoc:
-
   ##
   # Reads the contents of +filename+ and handles any encoding directives in
   # the file.
@@ -30,32 +18,31 @@ module RDoc::Encoding
   # unknown character in the target encoding will be replaced with '?'
 
   def self.read_file filename, encoding, force_transcode = false
-    content = File.open filename, "rb" do |f| f.read end
+    content = open filename, "rb" do |f| f.read end
     content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/
 
     utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
 
-    enc = RDoc::Encoding.detect_encoding content
-    content = RDoc::Encoding.change_encoding content, enc if enc
+    RDoc::Encoding.set_encoding content
 
     begin
       encoding ||= Encoding.default_external
       orig_encoding = content.encoding
 
       if not orig_encoding.ascii_compatible? then
-        content = content.encode encoding
+        content.encode! encoding
       elsif utf8 then
-        content = RDoc::Encoding.change_encoding content, Encoding::UTF_8
-        content = content.encode encoding
+        content.force_encoding Encoding::UTF_8
+        content.encode! encoding
       else
         # assume the content is in our output encoding
-        content = RDoc::Encoding.change_encoding content, encoding
+        content.force_encoding encoding
       end
 
       unless content.valid_encoding? then
         # revert and try to transcode
-        content = RDoc::Encoding.change_encoding content, orig_encoding
-        content = content.encode encoding
+        content.force_encoding orig_encoding
+        content.encode! encoding
       end
 
       unless content.valid_encoding? then
@@ -65,11 +52,10 @@ module RDoc::Encoding
     rescue Encoding::InvalidByteSequenceError,
            Encoding::UndefinedConversionError => e
       if force_transcode then
-        content = RDoc::Encoding.change_encoding content, orig_encoding
-        content = content.encode(encoding,
-                                 :invalid => :replace,
-                                 :undef => :replace,
-                                 :replace => '?')
+        content.force_encoding orig_encoding
+        content.encode!(encoding,
+                        :invalid => :replace, :undef => :replace,
+                        :replace => '?')
         return content
       else
         warn "unable to convert #{e.message} for #{filename}, skipping"
@@ -91,46 +77,32 @@ module RDoc::Encoding
     first_line = $1
 
     if first_line =~ /\A# +frozen[-_]string[-_]literal[=:].+$/i
-      string = string.sub first_line, ''
+      string.sub! first_line, ''
     end
-
-    string
   end
 
   ##
-  # Detects the encoding of +string+ based on the magic comment
+  # Sets the encoding of +string+ based on the magic comment
 
-  def self.detect_encoding string
-    result = HEADER_REGEXP.match string
-    name = result && result[:name]
+  def self.set_encoding string
+    remove_frozen_string_literal string
 
-    name ? Encoding.find(name) : nil
-  end
+    string =~ /\A(?:#!.*\n)?(.*\n)/
 
-  ##
-  # Removes magic comments and shebang
+    first_line = $1
 
-  def self.remove_magic_comment string
-    string.sub HEADER_REGEXP do |s|
-      s.gsub(/[^\n]/, '')
-    end
-  end
+    name = case first_line
+           when /^<\?xml[^?]*encoding=(["'])(.*?)\1/ then $2
+           when /\b(?:en)?coding[=:]\s*([^\s;]+)/i   then $1
+           else                                           return
+           end
 
-  ##
-  # Changes encoding based on +encoding+ without converting and returns new
-  # string
-
-  def self.change_encoding text, encoding
-    if text.kind_of? RDoc::Comment
-      text.encode! encoding
-    else
-      # TODO: Remove this condition after Ruby 2.2 EOL
-      if RUBY_VERSION < '2.3.0'
-        text.force_encoding encoding
-      else
-        String.new text, encoding: encoding
-      end
-    end
+    string.sub! first_line, ''
+
+    remove_frozen_string_literal string
+
+    enc = Encoding.find name
+    string.force_encoding enc if enc
   end
 
 end
diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb
index 8dc2c46013..d17dda20a9 100644
--- a/lib/rdoc/erb_partial.rb
+++ b/lib/rdoc/erb_partial.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Allows an ERB template to be rendered in the context (binding) of an
 # existing ERB template evaluation.
diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb
index 820a25ae01..a2aaa90e67 100644
--- a/lib/rdoc/erbio.rb
+++ b/lib/rdoc/erbio.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'erb'
 
 ##
@@ -9,7 +9,7 @@ require 'erb'
 #
 #   erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
 #
-#   File.open 'hello.txt', 'w' do |io|
+#   open 'hello.txt', 'w' do |io|
 #     erbio.result binding
 #   end
 #
@@ -21,11 +21,7 @@ class RDoc::ERBIO < ERB
   # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
 
   def initialize str, safe_level = nil, trim_mode = nil, eoutvar = 'io'
-    if RUBY_VERSION >= '2.6'
-      super(str, trim_mode: trim_mode, eoutvar: eoutvar)
-    else
-      super
-    end
+    super
   end
 
   ##
diff --git a/lib/rdoc/extend.rb b/lib/rdoc/extend.rb
index e1b182902e..30b51a1dbd 100644
--- a/lib/rdoc/extend.rb
+++ b/lib/rdoc/extend.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A Module extension to a class with \#extend
 #
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb
index 340dcbf7ae..d37d1db61f 100644
--- a/lib/rdoc/generator.rb
+++ b/lib/rdoc/generator.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # RDoc uses generators to turn parsed source code in the form of an
 # RDoc::CodeObject tree into some form of output.  RDoc comes with the HTML
@@ -49,3 +49,4 @@ module RDoc::Generator
   autoload :POT,       'rdoc/generator/pot'
 
 end
+
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index a07f74e716..e961518fcc 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
 
 require 'erb'
@@ -313,16 +313,12 @@ class RDoc::Generator::Darkfish
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    asset_rel_prefix = rel_prefix + @asset_rel_path
+    # suppress 1.9.3 warning
+    asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = @options.title
 
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, out_file do |io| binding end
   rescue => e
     error = RDoc::Error.new \
       "error generating index.html: #{e.message} (#{e.class})"
@@ -347,19 +343,14 @@ class RDoc::Generator::Darkfish
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-    svninfo          = get_svninfo(current)
+    # suppress 1.9.3 warning
+    asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
+    svninfo          = svninfo          = get_svninfo(current)
 
     @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
 
     debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here.local_variable_set(:svninfo, svninfo)
-      here
-    end
+    render_template template_file, out_file do |io| binding end
   end
 
   ##
@@ -425,7 +416,8 @@ class RDoc::Generator::Darkfish
       search_index_rel_prefix = rel_prefix
       search_index_rel_prefix += @asset_rel_path if @file_output
 
-      asset_rel_prefix = rel_prefix + @asset_rel_path
+      # suppress 1.9.3 warning
+      asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
 
       unless filepage_file then
         if file.text? then
@@ -442,13 +434,7 @@ class RDoc::Generator::Darkfish
       @title += " - #{@options.title}"
       template_file ||= filepage_file
 
-      render_template template_file, out_file do |io|
-        here = binding
-        # suppress 1.9.3 warning
-        here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-        here.local_variable_set(:current, current)
-        here
-      end
+      render_template template_file, out_file do |io| binding end
     end
   rescue => e
     error =
@@ -472,19 +458,14 @@ class RDoc::Generator::Darkfish
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    current          = file
-    asset_rel_prefix = rel_prefix + @asset_rel_path
+    # suppress 1.9.3 warning
+    current          = current          = file
+    asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = "#{file.page_name} - #{@options.title}"
 
     debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:current, current)
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, out_file do |io| binding end
   end
 
   ##
@@ -502,16 +483,12 @@ class RDoc::Generator::Darkfish
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    asset_rel_prefix = ''
+    # suppress 1.9.3 warning
+    asset_rel_prefix = asset_rel_prefix = ''
 
     @title = 'Not Found'
 
-    render_template template_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file do |io| binding end
   rescue => e
     error = RDoc::Error.new \
       "error generating servlet_not_found: #{e.message} (#{e.class})"
@@ -563,16 +540,12 @@ class RDoc::Generator::Darkfish
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    asset_rel_prefix = rel_prefix + @asset_rel_path
+    # suppress 1.9.3 warning
+    asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = "Table of Contents - #{@options.title}"
 
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, out_file do |io| binding end
   rescue => e
     error = RDoc::Error.new \
       "error generating table_of_contents.html: #{e.message} (#{e.class})"
@@ -778,11 +751,7 @@ class RDoc::Generator::Darkfish
       erbout = "_erbout_#{file_var}"
     end
 
-    if RUBY_VERSION >= '2.6'
-      template = klass.new template, trim_mode: '<>', eoutvar: erbout
-    else
-      template = klass.new template, nil, '<>', erbout
-    end
+    template = klass.new template, nil, '<>', erbout
     @template_cache[file] = template
     template
   end
diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
index 3a1000033d..931438b3c3 100644
--- a/lib/rdoc/generator/json_index.rb
+++ b/lib/rdoc/generator/json_index.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'json'
 begin
   require 'zlib'
@@ -147,15 +147,12 @@ class RDoc::Generator::JsonIndex
 
       JSON.dump data, io, 0
     end
-    unless ENV['SOURCE_DATE_EPOCH'].nil?
-      index_file.utime index_file.atime, Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-    end
 
     Dir.chdir @template_dir do
       Dir['**/*.js'].each do |source|
         dest = File.join out_dir, source
 
-        FileUtils.install source, dest, :mode => 0644, :preserve => true, :verbose => $DEBUG_RDOC
+        FileUtils.install source, dest, :mode => 0644, :verbose => $DEBUG_RDOC
       end
     end
   end
@@ -164,7 +161,7 @@ class RDoc::Generator::JsonIndex
   # Compress the search_index.js file using gzip
 
   def generate_gzipped
-    return if @options.dry_run or not defined?(Zlib)
+    return unless defined?(Zlib)
 
     debug_msg "Compressing generated JSON index"
     out_dir = @base_dir + @options.op_dir
@@ -173,7 +170,7 @@ class RDoc::Generator::JsonIndex
     outfile           = out_dir + "#{search_index_file}.gz"
 
     debug_msg "Reading the JSON index file from %s" % search_index_file
-    search_index = search_index_file.read(mode: 'r:utf-8')
+    search_index = search_index_file.read
 
     debug_msg "Writing gzipped search index to %s" % outfile
 
diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb
index 41e132450d..3ca423bb69 100644
--- a/lib/rdoc/generator/markup.rb
+++ b/lib/rdoc/generator/markup.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Handle common RDoc::Markup tasks for various CodeObjects
 #
@@ -65,6 +65,16 @@ end
 
 class RDoc::MethodAttr
 
+  @add_line_numbers = false
+
+  class << self
+    ##
+    # Allows controlling whether <tt>#markup_code</tt> adds line numbers to
+    # the source code.
+
+    attr_accessor :add_line_numbers
+  end
+
   ##
   # Prepend +src+ with line numbers.  Relies on the first line of a source
   # code listing having:
@@ -96,7 +106,7 @@ class RDoc::MethodAttr
   ##
   # Turns the method's token stream into HTML.
   #
-  # Prepends line numbers if +options.line_numbers+ is true.
+  # Prepends line numbers if +add_line_numbers+ is true.
 
   def markup_code
     return '' unless @token_stream
@@ -116,7 +126,7 @@ class RDoc::MethodAttr
     end
     src.gsub!(/^#{' ' * indent}/, '') if indent > 0
 
-    add_line_numbers(src) if options.line_numbers
+    add_line_numbers(src) if RDoc::MethodAttr.add_line_numbers
 
     src
   end
diff --git a/lib/rdoc/generator/pot.rb b/lib/rdoc/generator/pot.rb
index a12cba7505..e2cf22d730 100644
--- a/lib/rdoc/generator/pot.rb
+++ b/lib/rdoc/generator/pot.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Generates a POT file.
 #
@@ -91,8 +91,8 @@ class RDoc::Generator::POT
     extractor.extract
   end
 
-  require 'rdoc/generator/pot/message_extractor'
-  require 'rdoc/generator/pot/po'
-  require 'rdoc/generator/pot/po_entry'
+  autoload :MessageExtractor, 'rdoc/generator/pot/message_extractor'
+  autoload :PO,               'rdoc/generator/pot/po'
+  autoload :POEntry,          'rdoc/generator/pot/po_entry'
 
 end
diff --git a/lib/rdoc/generator/pot/message_extractor.rb b/lib/rdoc/generator/pot/message_extractor.rb
index 313dfd2dc7..0dd2497c26 100644
--- a/lib/rdoc/generator/pot/message_extractor.rb
+++ b/lib/rdoc/generator/pot/message_extractor.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Extracts message from RDoc::Store
 
diff --git a/lib/rdoc/generator/pot/po.rb b/lib/rdoc/generator/pot/po.rb
index 37d45e5258..60e14db831 100644
--- a/lib/rdoc/generator/pot/po.rb
+++ b/lib/rdoc/generator/pot/po.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Generates a PO format text
 
@@ -29,8 +29,8 @@ class RDoc::Generator::POT::PO
   def to_s
     po = ''
     sort_entries.each do |entry|
-      po += "\n" unless po.empty?
-      po += entry.to_s
+      po << "\n" unless po.empty?
+      po << entry.to_s
     end
     po
   end
diff --git a/lib/rdoc/generator/pot/po_entry.rb b/lib/rdoc/generator/pot/po_entry.rb
index 3c278826f4..515d02b48d 100644
--- a/lib/rdoc/generator/pot/po_entry.rb
+++ b/lib/rdoc/generator/pot/po_entry.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A PO entry in PO
 
@@ -40,11 +40,11 @@ class RDoc::Generator::POT::POEntry
 
   def to_s
     entry = ''
-    entry += format_translator_comment
-    entry += format_extracted_comment
-    entry += format_references
-    entry += format_flags
-    entry += <<-ENTRY
+    entry << format_translator_comment
+    entry << format_extracted_comment
+    entry << format_references
+    entry << format_flags
+    entry << <<-ENTRY
 msgid #{format_message(@msgid)}
 msgstr #{format_message(@msgstr)}
     ENTRY
@@ -75,9 +75,9 @@ msgstr #{format_message(@msgstr)}
 
     formatted_comment = ''
     comment.each_line do |line|
-      formatted_comment += "#{mark} #{line}"
+      formatted_comment << "#{mark} #{line}"
     end
-    formatted_comment += "\n" unless formatted_comment.end_with?("\n")
+    formatted_comment << "\n" unless formatted_comment.end_with?("\n")
     formatted_comment
   end
 
@@ -94,7 +94,7 @@ msgstr #{format_message(@msgstr)}
 
     formatted_references = ''
     @references.sort.each do |file, line|
-      formatted_references += "\#: #{file}:#{line}\n"
+      formatted_references << "\#: #{file}:#{line}\n"
     end
     formatted_references
   end
@@ -111,8 +111,8 @@ msgstr #{format_message(@msgstr)}
 
     formatted_message = '""'
     message.each_line do |line|
-      formatted_message += "\n"
-      formatted_message += "\"#{escape(line)}\""
+      formatted_message << "\n"
+      formatted_message << "\"#{escape(line)}\""
     end
     formatted_message
   end
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
index 0eef1d03f5..830777e587 100644
--- a/lib/rdoc/generator/ri.rb
+++ b/lib/rdoc/generator/ri.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Generates ri data files
 
diff --git a/lib/rdoc/generator/template/darkfish/_footer.rhtml b/lib/rdoc/generator/template/darkfish/_footer.rhtml
index 9791b42901..fe5822cc6b 100644
--- a/lib/rdoc/generator/template/darkfish/_footer.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_footer.rhtml
@@ -1,5 +1,5 @@
 <footer id="validator-badges" role="contentinfo">
-  <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> <%= RDoc::VERSION %>.
+  <p><a href="http://validator.w3.org/check/referer">Validate</a>
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> <%= RDoc::VERSION %>.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
index 8304310d4b..f308526823 100644
--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -7,11 +7,8 @@
   var index_rel_prefix = "<%= rel_prefix %>/";
 </script>
 
-<script src="<%= asset_rel_prefix %>/js/navigation.js" defer></script>
-<script src="<%= asset_rel_prefix %>/js/search.js" defer></script>
-<script src="<%= asset_rel_prefix %>/js/search_index.js" defer></script>
-<script src="<%= asset_rel_prefix %>/js/searcher.js" defer></script>
-<script src="<%= asset_rel_prefix %>/js/darkfish.js" defer></script>
+<script src="<%= asset_rel_prefix %>/js/jquery.js"></script>
+<script src="<%= asset_rel_prefix %>/js/darkfish.js"></script>
 
 <link href="<%= asset_rel_prefix %>/css/fonts.css" rel="stylesheet">
 <link href="<%= asset_rel_prefix %>/css/rdoc.css" rel="stylesheet">
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 7733095086..b497000112 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -26,6 +26,8 @@
   </section>
 
   <% klass.each_section do |section, constants, attributes| %>
+  <% constants = constants.select { |const| const.display? } %>
+  <% attributes = attributes.select { |attr| attr.display? } %>
   <section id="<%= section.aref %>" class="documentation-section">
     <% if section.title then %>
     <header class="documentation-section-title">
@@ -114,7 +116,7 @@
         <% else %>
         <div class="method-heading">
           <span class="method-name"><%= h method.name %></span><span
-            class="method-args"><%= h method.param_seq %></span>
+            class="method-args"><%= method.param_seq %></span>
           <% if method.token_stream then %>
           <span class="method-click-advice">click to toggle source</span>
           <% end %>
diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
index 1bdb6e6223..2f4dca7e08 100644
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
@@ -9,8 +9,6 @@
 /* vim: ft=css et sw=2 ts=2 sts=2 */
 /* Base Green is: #6C8C22 */
 
-.hide { display: none !important; }
-
 * { padding: 0; margin: 0; }
 
 body {
@@ -50,16 +48,6 @@ h6:hover span {
   display: inline;
 }
 
-h1:target,
-h2:target,
-h3:target,
-h4:target,
-h5:target,
-h6:target {
-  margin-left: -10px;
-  border-left: 10px solid #f1edba;
-}
-
 :link,
 :visited {
   color: #6C8C22;
@@ -453,16 +441,7 @@ main header h3 {
 /* @group Method Details */
 
 main .method-source-code {
-  max-height: 0;
-  overflow: hidden;
-  transition-duration: 200ms;
-  transition-delay: 0ms;
-  transition-property: all;
-  transition-timing-function: ease-in-out;
-}
-
-main .method-source-code.active-menu {
-  max-height: 100vh;
+  display: none;
 }
 
 main .method-description .method-calls-super {
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
index 111bbf8eb9..38f877ed40 100644
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -8,7 +8,6 @@
  */
 
 /* Provide console simulation for firebug-less environments */
-/*
 if (!("console" in window) || !("firebug" in console)) {
   var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
     "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
@@ -17,35 +16,41 @@ if (!("console" in window) || !("firebug" in console)) {
   for (var i = 0; i < names.length; ++i)
     window.console[names[i]] = function() {};
 };
-*/
+
+
+/**
+ * Unwrap the first element that matches the given @expr@ from the targets and return them.
+ */
+$.fn.unwrap = function( expr ) {
+  return this.each( function() {
+    $(this).parents( expr ).eq( 0 ).after( this ).remove();
+  });
+};
 
 
 function showSource( e ) {
   var target = e.target;
-  while (!target.classList.contains('method-detail')) {
-    target = target.parentNode;
-  }
-  if (typeof target !== "undefined" && target !== null) {
-    target = target.querySelector('.method-source-code');
-  }
-  if (typeof target !== "undefined" && target !== null) {
-    target.classList.toggle('active-menu')
-  }
+  var codeSections = $(target).
+    parents('.method-detail').
+    find('.method-source-code');
+
+  $(target).
+    parents('.method-detail').
+    find('.method-source-code').
+    slideToggle();
 };
 
 function hookSourceViews() {
-  document.querySelectorAll('.method-heading').forEach(function (codeObject) {
-    codeObject.addEventListener('click', showSource);
-  });
+  $('.method-heading').click( showSource );
 };
 
 function hookSearch() {
-  var input  = document.querySelector('#search-field');
-  var result = document.querySelector('#search-results');
-  result.classList.remove("initially-hidden");
+  var input  = $('#search-field').eq(0);
+  var result = $('#search-results').eq(0);
+  $(result).show();
 
-  var search_section = document.querySelector('#search-section');
-  search_section.classList.remove("initially-hidden");
+  var search_section = $('#search-section').get(0);
+  $(search_section).show();
 
   var search = new Search(search_data, input, result);
 
@@ -72,13 +77,85 @@ function hookSearch() {
   }
 
   search.select = function(result) {
-    window.location.href = result.firstChild.firstChild.href;
+    var result_element = result.get(0);
+    window.location.href = result_element.firstChild.firstChild.href;
   }
 
   search.scrollIntoView = search.scrollInWindow;
 };
 
-document.addEventListener('DOMContentLoaded', function() {
+function highlightTarget( anchor ) {
+  console.debug( "Highlighting target '%s'.", anchor );
+
+  $("a[name]").each( function() {
+    if ( $(this).attr("name") == anchor ) {
+      if ( !$(this).parent().parent().hasClass('target-section') ) {
+        console.debug( "Wrapping the target-section" );
+        $('div.method-detail').unwrap( 'div.target-section' );
+        $(this).parent().wrap( '<div class="target-section"></div>' );
+      } else {
+        console.debug( "Already wrapped." );
+      }
+    }
+  });
+};
+
+function highlightLocationTarget() {
+  console.debug( "Location hash: %s", window.location.hash );
+  if ( ! window.location.hash || window.location.hash.length == 0 ) return;
+
+  var anchor = window.location.hash.substring(1);
+  console.debug( "Found anchor: %s; matching %s", anchor, "a[name=" + anchor + "]" );
+
+  highlightTarget( anchor );
+};
+
+function highlightClickTarget( event ) {
+  console.debug( "Highlighting click target for event %o", event.target );
+  try {
+    var anchor = $(event.target).attr( 'href' ).substring(1);
+    console.debug( "Found target anchor: %s", anchor );
+    highlightTarget( anchor );
+  } catch ( err ) {
+    console.error( "Exception while highlighting: %o", err );
+  };
+};
+
+function loadAsync(path, success, prefix) {
+  $.ajax({
+    url: prefix + path,
+    dataType: 'script',
+    success: success,
+    cache: true
+  });
+};
+
+$(document).ready( function() {
   hookSourceViews();
-  hookSearch();
+  highlightLocationTarget();
+  $('ul.link-list a').bind( "click", highlightClickTarget );
+
+  var search_scripts_loaded = {
+    navigation_loaded:   false,
+    search_loaded:       false,
+    search_index_loaded: false,
+    searcher_loaded:     false,
+  }
+
+  var search_success_function = function(variable) {
+    return (function (data, status, xhr) {
+      search_scripts_loaded[variable] = true;
+
+      if (search_scripts_loaded['navigation_loaded']   == true &&
+          search_scripts_loaded['search_loaded']       == true &&
+          search_scripts_loaded['search_index_loaded'] == true &&
+          search_scripts_loaded['searcher_loaded']     == true)
+        hookSearch();
+    });
+  }
+
+  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search.js',       search_success_function('search_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search_index.js', search_success_function('search_index_loaded'), index_rel_prefix);
+  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'), rdoc_rel_prefix);
 });
diff --git a/lib/rdoc/generator/template/darkfish/js/jquery.js b/lib/rdoc/generator/template/darkfish/js/jquery.js
new file mode 100644
index 0000000000..628ed9b316
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */
+(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bA.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bW(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bP,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bW(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bW(a,c,d,e,"*",g));return l}function bV(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bL),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function by(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bt:bu;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bf(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function V(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(Q.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(w,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:H?function(a){return a==null?"":H.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?F.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(!b)return-1;if(I)return I.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=G.call(arguments,2),g=function(){return a.apply(c,f.concat(G.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){J["[object "+b+"]"]=b.toLowerCase()}),A=e.uaMatch(z),A.browser&&(e.browser[A.browser]=!0,e.browser.version=A.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?C=function(){c.removeEventListener("DOMContentLoaded",C,!1),e.ready()}:c.attachEvent&&(C=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",C),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g+"With"](this===b?d:this,[h])}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u,v;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete 
+t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,M(a.origType,a.selector),f.extend({},a,{handler:L,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,M(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?D:C):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=D;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=D;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=D,this.stopPropagation()},isDefaultPrevented:C,isPropagationStopped:C,isImmediatePropagationStopped:C};var E=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},F=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?F:E,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?F:E)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="submit"||c==="image")&&f(b).closest("form").length&&J("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&J("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var G,H=function(a){var b=f.nodeName(a,"input")?a.type:"",c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var K={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||C,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=w.exec(h),k="",j&&(k=j[0],h=h.replace(w,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,K[h]?(a.push(K[h]+k),h=h+k):h=(K[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+M(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+M(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var N=/Until$/,O=/^(?:parents|prevUntil|prevAll)/,P=/,/,Q=/^.[^:#\[\.,]*$/,R=Array.prototype.slice,S=f.expr.match.POS,T={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(V(this,a,!1),"not",a)},filter:function(a){return this.pushStack(V(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=S.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|object|embed|option|style)/i,bb=/checked\s*(?:[^=]|=\s*.checked.)/i,bc=/\/(java|ecma)script/i,bd=/^\s*<!(?:\[CDATA\[|\-\-)/,be={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bb.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bf(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bl)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!ba.test(a[0])&&(f.support.checkClone||!bb.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean
+(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bk(k[i]);else bk(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bc.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bm=/alpha\([^)]*\)/i,bn=/opacity=([^)]*)/,bo=/([A-Z]|^ms)/g,bp=/^-?\d+(?:px)?$/i,bq=/^-?\d/,br=/^([\-+])=([\-+.\de]+)/,bs={position:"absolute",visibility:"hidden",display:"block"},bt=["Left","Right"],bu=["Top","Bottom"],bv,bw,bx;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bv(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=br.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bv)return bv(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return by(a,b,d);f.swap(a,bs,function(){e=by(a,b,d)});return e}},set:function(a,b){if(!bp.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cr(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cq("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cq("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cr(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cq("show",1),slideUp:cq("hide",1),slideToggle:cq("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return d.step(a)}var d=this,e=f.fx;this.startTime=cn||co(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&f.timers.push(g)&&!cl&&(cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||co(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cs=/^t(?:able|d|h)$/i,ct=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cu(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cs.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
+\ No newline at end of file
diff --git a/lib/rdoc/generator/template/darkfish/js/search.js b/lib/rdoc/generator/template/darkfish/js/search.js
index b558ca5b4f..60ac295e6c 100644
--- a/lib/rdoc/generator/template/darkfish/js/search.js
+++ b/lib/rdoc/generator/template/darkfish/js/search.js
@@ -1,29 +1,29 @@
 Search = function(data, input, result) {
   this.data = data;
-  this.input = input;
-  this.result = result;
+  this.$input = $(input);
+  this.$result = $(result);
 
-  this.current = null;
-  this.view = this.result.parentNode;
+  this.$current = null;
+  this.$view = this.$result.parent();
   this.searcher = new Searcher(data.index);
   this.init();
 }
 
-Search.prototype = Object.assign({}, Navigation, new function() {
+Search.prototype = $.extend({}, Navigation, new function() {
   var suid = 1;
 
   this.init = function() {
     var _this = this;
     var observer = function(e) {
-      switch(e.keyCode) {
+      switch(e.originalEvent.keyCode) {
         case 38: // Event.KEY_UP
         case 40: // Event.KEY_DOWN
           return;
       }
-      _this.search(_this.input.value);
+      _this.search(_this.$input[0].value);
     };
-    this.input.addEventListener('keyup', observer);
-    this.input.addEventListener('click', observer); // mac's clear field
+    this.$input.keyup(observer);
+    this.$input.click(observer); // mac's clear field
 
     this.searcher.ready(function(results, isLast) {
       _this.addResults(results, isLast);
@@ -34,7 +34,7 @@ Search.prototype = Object.assign({}, Navigation, new function() {
   }
 
   this.search = function(value, selectFirstMatch) {
-    value = value.trim().toLowerCase();
+    value = jQuery.trim(value).toLowerCase();
     if (value) {
       this.setNavigationActive(true);
     } else {
@@ -43,23 +43,23 @@ Search.prototype = Object.assign({}, Navigation, new function() {
 
     if (value == '') {
       this.lastQuery = value;
-      this.result.innerHTML = '';
-      this.result.setAttribute('aria-expanded', 'false');
+      this.$result.empty();
+      this.$result.attr('aria-expanded', 'false');
       this.setNavigationActive(false);
     } else if (value != this.lastQuery) {
       this.lastQuery = value;
-      this.result.setAttribute('aria-busy',     'true');
-      this.result.setAttribute('aria-expanded', 'true');
+      this.$result.attr('aria-busy',     'true');
+      this.$result.attr('aria-expanded', 'true');
       this.firstRun = true;
       this.searcher.find(value);
     }
   }
 
   this.addResults = function(results, isLast) {
-    var target = this.result;
+    var target = this.$result.get(0);
     if (this.firstRun && (results.length > 0 || isLast)) {
-      this.current = null;
-      this.result.innerHTML = '';
+      this.$current = null;
+      this.$result.empty();
     }
 
     for (var i=0, l = results.length; i < l; i++) {
@@ -70,26 +70,25 @@ Search.prototype = Object.assign({}, Navigation, new function() {
 
     if (this.firstRun && results.length > 0) {
       this.firstRun = false;
-      this.current = target.firstChild;
-      this.current.classList.add('search-selected');
+      this.$current = $(target.firstChild);
+      this.$current.addClass('search-selected');
     }
-    //TODO: ECMAScript
-    //if (jQuery.browser.msie) this.$element[0].className += '';
+    if (jQuery.browser.msie) this.$element[0].className += '';
 
-    if (isLast) this.result.setAttribute('aria-busy', 'false');
+    if (isLast) this.$result.attr('aria-busy', 'false');
   }
 
   this.move = function(isDown) {
-    if (!this.current) return;
-    var next = isDown ? this.current.nextElementSibling : this.current.previousElementSibling;
-    if (next) {
-      this.current.classList.remove('search-selected');
-      next.classList.add('search-selected');
-      this.input.setAttribute('aria-activedescendant', next.getAttribute('id'));
-      this.scrollIntoView(next, this.view);
-      this.current = next;
-      this.input.value = next.firstChild.firstChild.text;
-      this.input.select();
+    if (!this.$current) return;
+    var $next = this.$current[isDown ? 'next' : 'prev']();
+    if ($next.length) {
+      this.$current.removeClass('search-selected');
+      $next.addClass('search-selected');
+      this.$input.attr('aria-activedescendant', $next.attr('id'));
+      this.scrollIntoView($next[0], this.$view[0]);
+      this.$current = $next;
+      this.$input.val($next[0].firstChild.firstChild.text);
+      this.$input.select();
     }
     return true;
   }
diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
index dfad74b1ae..e41268123e 100644
--- a/lib/rdoc/generator/template/json_index/js/navigation.js
+++ b/lib/rdoc/generator/template/json_index/js/navigation.js
@@ -10,8 +10,10 @@ Navigation = new function() {
   this.initNavigation = function() {
     var _this = this;
 
-    document.addEventListener('keydown', function(e) {
+    $(document).keydown(function(e) {
       _this.onkeydown(e);
+    }).keyup(function(e) {
+      _this.onkeyup(e);
     });
 
     this.navigationActive = true;
@@ -19,6 +21,20 @@ Navigation = new function() {
 
   this.setNavigationActive = function(state) {
     this.navigationActive = state;
+    this.clearMoveTimeout();
+  }
+
+  this.onkeyup = function(e) {
+    if (!this.navigationActive) return;
+
+    switch(e.keyCode) {
+      case 37: //Event.KEY_LEFT:
+      case 38: //Event.KEY_UP:
+      case 39: //Event.KEY_RIGHT:
+      case 40: //Event.KEY_DOWN:
+        this.clearMoveTimeout();
+        break;
+    }
   }
 
   this.onkeydown = function(e) {
@@ -30,6 +46,7 @@ Navigation = new function() {
       case 38: //Event.KEY_UP:
         if (e.keyCode == 38 || e.ctrlKey) {
           if (this.moveUp()) e.preventDefault();
+          this.startMoveTimeout(false);
         }
         break;
       case 39: //Event.KEY_RIGHT:
@@ -38,14 +55,34 @@ Navigation = new function() {
       case 40: //Event.KEY_DOWN:
         if (e.keyCode == 40 || e.ctrlKey) {
           if (this.moveDown()) e.preventDefault();
+          this.startMoveTimeout(true);
         }
         break;
       case 13: //Event.KEY_RETURN:
-        if (this.current) e.preventDefault();
-        this.select(this.current);
+        if (this.$current)
+          e.preventDefault();
+          this.select(this.$current);
         break;
     }
-    if (e.ctrlKey && e.shiftKey) this.select(this.current);
+    if (e.ctrlKey && e.shiftKey) this.select(this.$current);
+  }
+
+  this.clearMoveTimeout = function() {
+    clearTimeout(this.moveTimeout);
+    this.moveTimeout = null;
+  }
+
+  this.startMoveTimeout = function(isDown) {
+    if (!$.browser.mozilla && !$.browser.opera) return;
+    if (this.moveTimeout) this.clearMoveTimeout();
+    var _this = this;
+
+    var go = function() {
+      if (!_this.moveTimeout) return;
+      _this[isDown ? 'moveDown' : 'moveUp']();
+      _this.moveTimout = setTimeout(go, 100);
+    }
+    this.moveTimeout = setTimeout(go, 200);
   }
 
   this.moveRight = function() {
diff --git a/lib/rdoc/generator/template/json_index/js/searcher.js b/lib/rdoc/generator/template/json_index/js/searcher.js
index e200a168b0..b3b1c58a0f 100644
--- a/lib/rdoc/generator/template/json_index/js/searcher.js
+++ b/lib/rdoc/generator/template/json_index/js/searcher.js
@@ -51,20 +51,20 @@ Searcher.prototype = new function() {
 
   /*  ----- Utilities ------  */
   function splitQuery(query) {
-    return query.split(/(\s+|::?|\(\)?)/).filter(function(string) {
+    return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
       return string.match(/\S/);
     });
   }
 
   function buildRegexps(queries) {
-    return queries.map(function(query) {
+    return jQuery.map(queries, function(query) {
       return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
     });
   }
 
   function buildHilighters(queries) {
-    return queries.map(function(query) {
-      return query.split('').map(function(l, i) {
+    return jQuery.map(queries, function(query) {
+      return jQuery.map(query.split(''), function(l, i) {
         return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2);
       }).join('');
     });
@@ -221,9 +221,9 @@ Searcher.prototype = new function() {
   }
 
   function triggerResults(results, isLast) {
-    this.handlers.forEach(function(fn) {
+    jQuery.each(this.handlers, function(i, fn) {
       fn.call(this, results, isLast)
-    });
+    })
   }
 }
 
diff --git a/lib/rdoc/ghost_method.rb b/lib/rdoc/ghost_method.rb
index 2488feb9d7..a1f75bfe4b 100644
--- a/lib/rdoc/ghost_method.rb
+++ b/lib/rdoc/ghost_method.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # GhostMethod represents a method referenced only by a comment
 
diff --git a/lib/rdoc/i18n.rb b/lib/rdoc/i18n.rb
index af303858b9..20848aad75 100644
--- a/lib/rdoc/i18n.rb
+++ b/lib/rdoc/i18n.rb
@@ -1,10 +1,10 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
-# This module provides i18n related features.
+# This module provides i18n realated features.
 
 module RDoc::I18n
 
   autoload :Locale, 'rdoc/i18n/locale'
-  require 'rdoc/i18n/text'
+  autoload :Text,   'rdoc/i18n/text'
 
 end
diff --git a/lib/rdoc/i18n/locale.rb b/lib/rdoc/i18n/locale.rb
index 6a70d6c986..735a271bf3 100644
--- a/lib/rdoc/i18n/locale.rb
+++ b/lib/rdoc/i18n/locale.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A message container for a locale.
 #
@@ -92,7 +92,7 @@ class RDoc::I18n::Locale
   end
 
   ##
-  # Translates the +message+ into locale. If there is no translation
+  # Translates the +message+ into locale. If there is no tranlsation
   # messages for +message+ in locale, +message+ itself is returned.
 
   def translate(message)
diff --git a/lib/rdoc/i18n/text.rb b/lib/rdoc/i18n/text.rb
index 7ea6664442..fcfe7611bc 100644
--- a/lib/rdoc/i18n/text.rb
+++ b/lib/rdoc/i18n/text.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An i18n supported text.
 #
@@ -46,9 +46,9 @@ class RDoc::I18n::Text
     parse do |part|
       case part[:type]
       when :paragraph
-        translated_text += locale.translate(part[:paragraph])
+        translated_text << locale.translate(part[:paragraph])
       when :empty_line
-        translated_text += part[:line]
+        translated_text << part[:line]
       else
         raise "should not reach here: unexpected type: #{type}"
       end
@@ -69,14 +69,14 @@ class RDoc::I18n::Text
         if paragraph.empty?
           emit_empty_line_event(line, line_no, &block)
         else
-          paragraph += line
+          paragraph << line
           emit_paragraph_event(paragraph, paragraph_start_line, line_no,
                                &block)
           paragraph = ''
         end
       else
         paragraph_start_line = line_no if paragraph.empty?
-        paragraph += line
+        paragraph << line
       end
     end
 
diff --git a/lib/rdoc/include.rb b/lib/rdoc/include.rb
index b3ad610649..efce43bffb 100644
--- a/lib/rdoc/include.rb
+++ b/lib/rdoc/include.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A Module included in a class with \#include
 #
diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb
index 4d7f4aa995..8d9421255b 100644
--- a/lib/rdoc/known_classes.rb
+++ b/lib/rdoc/known_classes.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module RDoc
 
   ##
diff --git a/lib/rdoc/markdown.rb b/lib/rdoc/markdown.rb
index 43c70c8de6..06fe8cf4d4 100644
--- a/lib/rdoc/markdown.rb
+++ b/lib/rdoc/markdown.rb
@@ -1,5 +1,4 @@
 # coding: UTF-8
-# frozen_string_literal: true
 # :markup: markdown
 
 ##
@@ -82,18 +81,6 @@
 # :   A little insect that is known
 # to enjoy picnics
 #
-# ### Strike
-#
-# Example:
-#
-# ```
-# This is ~~striked~~.
-# ```
-#
-# Produces:
-#
-# This is ~~striked~~.
-#
 # ### Github
 #
 # The #github extension enables a partial set of [Github Flavored Markdown]
@@ -534,6 +521,7 @@ class RDoc::Markdown
 
 
 
+  require 'rubygems'
   require 'rdoc'
   require 'rdoc/markup/to_joined_paragraph'
   require 'rdoc/markdown/entities'
@@ -553,7 +541,6 @@ class RDoc::Markdown
     :github,
     :html,
     :notes,
-    :strike,
   ]
 
   # :section: Extensions
@@ -604,11 +591,6 @@ class RDoc::Markdown
 
   extension :notes
 
-  ##
-  # Enables the strike extension
-
-  extension :strike
-
   # :section:
 
   ##
@@ -697,7 +679,7 @@ class RDoc::Markdown
   # with the linking `text` (usually whitespace).
 
   def link_to content, label = content, text = nil
-    raise ParseError, 'enable notes extension' if
+    raise 'enable notes extension' if
       content.start_with? '^' and label.equal? content
 
     if ref = @references[label] then
@@ -833,17 +815,6 @@ class RDoc::Markdown
     end
   end
 
-  ##
-  # Wraps `text` in strike markup for rdoc inline formatting
-
-  def strike text
-    if text =~ /\A[a-z\d.\/-]+\z/i then
-      "~#{text}~"
-    else
-      "<s>#{text}</s>"
-    end
-  end
-
 
   # :stopdoc:
   def setup_foreign_grammar
@@ -1035,7 +1006,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AtxInline = !@Newline !(@Sp /#*/ @Sp @Newline) Inline
+  # AtxInline = !@Newline !(@Sp? /#*/ @Sp @Newline) Inline
   def _AtxInline
 
     _save = self.pos
@@ -1052,8 +1023,13 @@ class RDoc::Markdown
 
       _save3 = self.pos
       while true # sequence
+        _save4 = self.pos
         _tmp = _Sp()
         unless _tmp
+          _tmp = true
+          self.pos = _save4
+        end
+        unless _tmp
           self.pos = _save3
           break
         end
@@ -1117,7 +1093,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AtxHeading = AtxStart:s @Sp AtxInline+:a (@Sp /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
+  # AtxHeading = AtxStart:s @Sp? AtxInline+:a (@Sp? /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
   def _AtxHeading
 
     _save = self.pos
@@ -1128,12 +1104,17 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
+      _save1 = self.pos
       _tmp = _Sp()
       unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
+      _save2 = self.pos
       _ary = []
       _tmp = apply(:_AtxInline)
       if _tmp
@@ -1146,37 +1127,42 @@ class RDoc::Markdown
         _tmp = true
         @result = _ary
       else
-        self.pos = _save1
+        self.pos = _save2
       end
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
-
       _save3 = self.pos
+
+      _save4 = self.pos
       while true # sequence
+        _save5 = self.pos
         _tmp = _Sp()
         unless _tmp
-          self.pos = _save3
+          _tmp = true
+          self.pos = _save5
+        end
+        unless _tmp
+          self.pos = _save4
           break
         end
         _tmp = scan(/\A(?-mix:#*)/)
         unless _tmp
-          self.pos = _save3
+          self.pos = _save4
           break
         end
         _tmp = _Sp()
         unless _tmp
-          self.pos = _save3
+          self.pos = _save4
         end
         break
       end # end sequence
 
       unless _tmp
         _tmp = true
-        self.pos = _save2
+        self.pos = _save3
       end
       unless _tmp
         self.pos = _save
@@ -1217,12 +1203,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom1 = /={1,}/ @Newline
+  # SetextBottom1 = /={3,}/ @Newline
   def _SetextBottom1
 
     _save = self.pos
     while true # sequence
-      _tmp = scan(/\A(?-mix:={1,})/)
+      _tmp = scan(/\A(?-mix:={3,})/)
       unless _tmp
         self.pos = _save
         break
@@ -1238,12 +1224,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom2 = /-{1,}/ @Newline
+  # SetextBottom2 = /-{3,}/ @Newline
   def _SetextBottom2
 
     _save = self.pos
     while true # sequence
-      _tmp = scan(/\A(?-mix:-{1,})/)
+      _tmp = scan(/\A(?-mix:-{3,})/)
       unless _tmp
         self.pos = _save
         break
@@ -1259,7 +1245,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextHeading1 = &(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
+  # SetextHeading1 = &(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
   def _SetextHeading1
 
     _save = self.pos
@@ -1354,8 +1340,13 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
+      _save8 = self.pos
       _tmp = _Sp()
       unless _tmp
+        _tmp = true
+        self.pos = _save8
+      end
+      unless _tmp
         self.pos = _save
         break
       end
@@ -1381,7 +1372,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextHeading2 = &(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
+  # SetextHeading2 = &(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
   def _SetextHeading2
 
     _save = self.pos
@@ -1476,8 +1467,13 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
+      _save8 = self.pos
       _tmp = _Sp()
       unless _tmp
+        _tmp = true
+        self.pos = _save8
+      end
+      unless _tmp
         self.pos = _save
         break
       end
@@ -8451,162 +8447,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # HtmlBlockOpenHead = "<" Spnl ("head" | "HEAD") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("head")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("HEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseHead = "<" Spnl "/" ("head" | "HEAD") Spnl ">"
-  def _HtmlBlockCloseHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("head")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("HEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockHead = HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead
-  def _HtmlBlockHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenHead)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_HtmlBlockCloseHead)
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseHead)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockInTags = (HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)
+  # HtmlBlockInTags = (HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)
   def _HtmlBlockInTags
 
     _save = self.pos
@@ -8713,9 +8554,6 @@ class RDoc::Markdown
       _tmp = apply(:_HtmlBlockScript)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_HtmlBlockHead)
-      break if _tmp
-      self.pos = _save
       break
     end # end choice
 
@@ -9483,7 +9321,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
+  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
   def _Inline
 
     _save = self.pos
@@ -9506,9 +9344,6 @@ class RDoc::Markdown
       _tmp = apply(:_Emph)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_Strike)
-      break if _tmp
-      self.pos = _save
       _tmp = apply(:_Image)
       break if _tmp
       self.pos = _save
@@ -9835,7 +9670,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { "\n" }
+  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={3,}|-{3,}=/ @Newline) { "\n" }
   def _NormalEndline
 
     _save = self.pos
@@ -9883,7 +9718,7 @@ class RDoc::Markdown
           self.pos = _save5
           break
         end
-        _tmp = scan(/\A(?-mix:={1,}|-{1,})/)
+        _tmp = scan(/\A(?-mix:={3,}|-{3,}=)/)
         unless _tmp
           self.pos = _save5
           break
@@ -10198,166 +10033,147 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Whitespace = (@Spacechar | @Newline)
-  def _Whitespace
+  # OneStarOpen = !StarLine "*" !@Spacechar !@Newline
+  def _OneStarOpen
 
     _save = self.pos
-    while true # choice
+    while true # sequence
+      _save1 = self.pos
+      _tmp = apply(:_StarLine)
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("*")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
       _tmp = _Spacechar()
-      break if _tmp
-      self.pos = _save
+      _tmp = _tmp ? nil : true
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save3 = self.pos
       _tmp = _Newline()
-      break if _tmp
-      self.pos = _save
+      _tmp = _tmp ? nil : true
+      self.pos = _save3
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end # end choice
+    end # end sequence
 
-    set_failed_rule :_Whitespace unless _tmp
+    set_failed_rule :_OneStarOpen unless _tmp
     return _tmp
   end
 
-  # EmphStar = "*" !@Whitespace @StartList:a (!"*" Inline:b { a << b } | StrongStar:b { a << b })+ "*" { emphasis a.join }
-  def _EmphStar
+  # OneStarClose = !@Spacechar !@Newline Inline:a "*" { a }
+  def _OneStarClose
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("*")
+      _save1 = self.pos
+      _tmp = _Spacechar()
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
-      _tmp = _Whitespace()
+      _save2 = self.pos
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
-      self.pos = _save1
+      self.pos = _save2
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = _StartList()
+      _tmp = apply(:_Inline)
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
+      _tmp = match_string("*")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  a ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
-      _save3 = self.pos
-      while true # choice
+    set_failed_rule :_OneStarClose unless _tmp
+    return _tmp
+  end
 
-        _save4 = self.pos
+  # EmphStar = OneStarOpen @StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }
+  def _EmphStar
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_OneStarOpen)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _StartList()
+      a = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+
+        _save2 = self.pos
         while true # sequence
-          _save5 = self.pos
-          _tmp = match_string("*")
+          _save3 = self.pos
+          _tmp = apply(:_OneStarClose)
           _tmp = _tmp ? nil : true
-          self.pos = _save5
+          self.pos = _save3
           unless _tmp
-            self.pos = _save4
+            self.pos = _save2
             break
           end
           _tmp = apply(:_Inline)
-          b = @result
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-
-        _save6 = self.pos
-        while true # sequence
-          _tmp = apply(:_StrongStar)
-          b = @result
+          l = @result
           unless _tmp
-            self.pos = _save6
+            self.pos = _save2
             break
           end
-          @result = begin;  a << b ; end
+          @result = begin;  a << l ; end
           _tmp = true
           unless _tmp
-            self.pos = _save6
+            self.pos = _save2
           end
           break
         end # end sequence
 
-        break if _tmp
-        self.pos = _save3
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
         break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save7 = self.pos
-          while true # choice
-
-            _save8 = self.pos
-            while true # sequence
-              _save9 = self.pos
-              _tmp = match_string("*")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _tmp = apply(:_Inline)
-              b = @result
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save8
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-
-            _save10 = self.pos
-            while true # sequence
-              _tmp = apply(:_StrongStar)
-              b = @result
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
       end
+      _tmp = apply(:_OneStarClose)
+      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("*")
+      @result = begin;  a << l ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
@@ -10374,148 +10190,147 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EmphUl = "_" !@Whitespace @StartList:a (!"_" Inline:b { a << b } | StrongUl:b { a << b })+ "_" { emphasis a.join }
-  def _EmphUl
+  # OneUlOpen = !UlLine "_" !@Spacechar !@Newline
+  def _OneUlOpen
 
     _save = self.pos
     while true # sequence
+      _save1 = self.pos
+      _tmp = apply(:_UlLine)
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = match_string("_")
       unless _tmp
         self.pos = _save
         break
       end
+      _save2 = self.pos
+      _tmp = _Spacechar()
+      _tmp = _tmp ? nil : true
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save3 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save3
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_OneUlOpen unless _tmp
+    return _tmp
+  end
+
+  # OneUlClose = !@Spacechar !@Newline Inline:a "_" { a }
+  def _OneUlClose
+
+    _save = self.pos
+    while true # sequence
       _save1 = self.pos
-      _tmp = _Whitespace()
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = _StartList()
+      _save2 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Inline)
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
+      _tmp = match_string("_")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  a ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
-      _save3 = self.pos
-      while true # choice
+    set_failed_rule :_OneUlClose unless _tmp
+    return _tmp
+  end
 
-        _save4 = self.pos
+  # EmphUl = OneUlOpen @StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }
+  def _EmphUl
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_OneUlOpen)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _StartList()
+      a = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+
+        _save2 = self.pos
         while true # sequence
-          _save5 = self.pos
-          _tmp = match_string("_")
+          _save3 = self.pos
+          _tmp = apply(:_OneUlClose)
           _tmp = _tmp ? nil : true
-          self.pos = _save5
+          self.pos = _save3
           unless _tmp
-            self.pos = _save4
+            self.pos = _save2
             break
           end
           _tmp = apply(:_Inline)
-          b = @result
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-
-        _save6 = self.pos
-        while true # sequence
-          _tmp = apply(:_StrongUl)
-          b = @result
+          l = @result
           unless _tmp
-            self.pos = _save6
+            self.pos = _save2
             break
           end
-          @result = begin;  a << b ; end
+          @result = begin;  a << l ; end
           _tmp = true
           unless _tmp
-            self.pos = _save6
+            self.pos = _save2
           end
           break
         end # end sequence
 
-        break if _tmp
-        self.pos = _save3
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
         break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save7 = self.pos
-          while true # choice
-
-            _save8 = self.pos
-            while true # sequence
-              _save9 = self.pos
-              _tmp = match_string("_")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _tmp = apply(:_Inline)
-              b = @result
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save8
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-
-            _save10 = self.pos
-            while true # sequence
-              _tmp = apply(:_StrongUl)
-              b = @result
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
       end
+      _tmp = apply(:_OneUlClose)
+      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("_")
+      @result = begin;  a << l ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
@@ -10550,89 +10365,69 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StrongStar = "**" !@Whitespace @StartList:a (!"**" Inline:b { a << b })+ "**" { strong a.join }
-  def _StrongStar
+  # TwoStarOpen = !StarLine "**" !@Spacechar !@Newline
+  def _TwoStarOpen
 
     _save = self.pos
     while true # sequence
+      _save1 = self.pos
+      _tmp = apply(:_StarLine)
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = match_string("**")
       unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
-      _tmp = _Whitespace()
+      _save2 = self.pos
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
-      self.pos = _save1
+      self.pos = _save2
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = _StartList()
-      a = @result
+      _save3 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save3
       unless _tmp
         self.pos = _save
-        break
       end
-      _save2 = self.pos
+      break
+    end # end sequence
 
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = match_string("**")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
+    set_failed_rule :_TwoStarOpen unless _tmp
+    return _tmp
+  end
 
-      if _tmp
-        while true
+  # TwoStarClose = !@Spacechar !@Newline Inline:a "**" { a }
+  def _TwoStarClose
 
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("**")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _tmp = _Spacechar()
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
       end
+      _save2 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Inline)
+      a = @result
       unless _tmp
         self.pos = _save
         break
@@ -10642,7 +10437,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  strong a.join ; end
+      @result = begin;  a ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10650,24 +10445,16 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_StrongStar unless _tmp
+    set_failed_rule :_TwoStarClose unless _tmp
     return _tmp
   end
 
-  # StrongUl = "__" !@Whitespace @StartList:a (!"__" Inline:b { a << b })+ "__" { strong a.join }
-  def _StrongUl
+  # StrongStar = TwoStarOpen @StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }
+  def _StrongStar
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("__")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
+      _tmp = apply(:_TwoStarOpen)
       unless _tmp
         self.pos = _save
         break
@@ -10678,70 +10465,47 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _save2 = self.pos
+      while true
 
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = match_string("__")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
+        _save2 = self.pos
+        while true # sequence
+          _save3 = self.pos
+          _tmp = apply(:_TwoStarClose)
+          _tmp = _tmp ? nil : true
           self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("__")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
+          unless _tmp
+            self.pos = _save2
             break
-          end # end sequence
+          end
+          _tmp = apply(:_Inline)
+          l = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          @result = begin;  a << l ; end
+          _tmp = true
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
 
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
+        break unless _tmp
       end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("__")
+      _tmp = apply(:_TwoStarClose)
+      l = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  a << l ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
@@ -10754,110 +10518,156 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_StrongUl unless _tmp
+    set_failed_rule :_StrongStar unless _tmp
     return _tmp
   end
 
-  # Strike = &{ strike? } "~~" !@Whitespace @StartList:a (!"~~" Inline:b { a << b })+ "~~" { strike a.join }
-  def _Strike
+  # TwoUlOpen = !UlLine "__" !@Spacechar !@Newline
+  def _TwoUlOpen
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = begin;  strike? ; end
+      _tmp = apply(:_UlLine)
+      _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("~~")
+      _tmp = match_string("__")
       unless _tmp
         self.pos = _save
         break
       end
       _save2 = self.pos
-      _tmp = _Whitespace()
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = _StartList()
+      _save3 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save3
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TwoUlOpen unless _tmp
+    return _tmp
+  end
+
+  # TwoUlClose = !@Spacechar !@Newline Inline:a "__" { a }
+  def _TwoUlClose
+
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _tmp = _Spacechar()
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _tmp = _Newline()
+      _tmp = _tmp ? nil : true
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Inline)
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _save3 = self.pos
-
-      _save4 = self.pos
-      while true # sequence
-        _save5 = self.pos
-        _tmp = match_string("~~")
-        _tmp = _tmp ? nil : true
-        self.pos = _save5
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save4
-        end
+      _tmp = match_string("__")
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
+      end
+      @result = begin;  a ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
-      if _tmp
-        while true
+    set_failed_rule :_TwoUlClose unless _tmp
+    return _tmp
+  end
 
-          _save6 = self.pos
-          while true # sequence
-            _save7 = self.pos
-            _tmp = match_string("~~")
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save6
-            end
+  # StrongUl = TwoUlOpen @StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }
+  def _StrongUl
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_TwoUlOpen)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _StartList()
+      a = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+
+        _save2 = self.pos
+        while true # sequence
+          _save3 = self.pos
+          _tmp = apply(:_TwoUlClose)
+          _tmp = _tmp ? nil : true
+          self.pos = _save3
+          unless _tmp
+            self.pos = _save2
             break
-          end # end sequence
+          end
+          _tmp = apply(:_Inline)
+          i = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          @result = begin;  a << i ; end
+          _tmp = true
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
 
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save3
+        break unless _tmp
       end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("~~")
+      _tmp = apply(:_TwoUlClose)
+      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  strike a.join ; end
+      @result = begin;  a << l ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  strong a.join ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10865,7 +10675,7 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_Strike unless _tmp
+    set_failed_rule :_StrongUl unless _tmp
     return _tmp
   end
 
@@ -11044,7 +10854,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ExplicitLink = Label:l "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
+  # ExplicitLink = Label:l Spnl "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
   def _ExplicitLink
 
     _save = self.pos
@@ -11055,6 +10865,11 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = match_string("(")
       unless _tmp
         self.pos = _save
@@ -11163,119 +10978,130 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SourceContents = ((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")*
+  # SourceContents = (((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")* | "")
   def _SourceContents
-    while true
 
-      _save1 = self.pos
-      while true # choice
+    _save = self.pos
+    while true # choice
+      while true
+
         _save2 = self.pos
+        while true # choice
+          _save3 = self.pos
 
-        _save3 = self.pos
-        while true # sequence
           _save4 = self.pos
-          _tmp = match_string("(")
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save5 = self.pos
-          _tmp = match_string(")")
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save6 = self.pos
-          _tmp = match_string(">")
-          _tmp = _tmp ? nil : true
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save3
+          while true # sequence
+            _save5 = self.pos
+            _tmp = match_string("(")
+            _tmp = _tmp ? nil : true
+            self.pos = _save5
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _save6 = self.pos
+            _tmp = match_string(")")
+            _tmp = _tmp ? nil : true
+            self.pos = _save6
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _save7 = self.pos
+            _tmp = match_string(">")
+            _tmp = _tmp ? nil : true
+            self.pos = _save7
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_Nonspacechar)
+            unless _tmp
+              self.pos = _save4
+            end
             break
-          end
-          _tmp = apply(:_Nonspacechar)
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
+          end # end sequence
 
-        if _tmp
-          while true
+          if _tmp
+            while true
 
-            _save7 = self.pos
-            while true # sequence
               _save8 = self.pos
-              _tmp = match_string("(")
-              _tmp = _tmp ? nil : true
-              self.pos = _save8
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _save9 = self.pos
-              _tmp = match_string(")")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _save10 = self.pos
-              _tmp = match_string(">")
-              _tmp = _tmp ? nil : true
-              self.pos = _save10
-              unless _tmp
-                self.pos = _save7
+              while true # sequence
+                _save9 = self.pos
+                _tmp = match_string("(")
+                _tmp = _tmp ? nil : true
+                self.pos = _save9
+                unless _tmp
+                  self.pos = _save8
+                  break
+                end
+                _save10 = self.pos
+                _tmp = match_string(")")
+                _tmp = _tmp ? nil : true
+                self.pos = _save10
+                unless _tmp
+                  self.pos = _save8
+                  break
+                end
+                _save11 = self.pos
+                _tmp = match_string(">")
+                _tmp = _tmp ? nil : true
+                self.pos = _save11
+                unless _tmp
+                  self.pos = _save8
+                  break
+                end
+                _tmp = apply(:_Nonspacechar)
+                unless _tmp
+                  self.pos = _save8
+                end
                 break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save7
-              end
-              break
-            end # end sequence
+              end # end sequence
 
-            break unless _tmp
+              break unless _tmp
+            end
+            _tmp = true
+          else
+            self.pos = _save3
           end
-          _tmp = true
-        else
+          break if _tmp
           self.pos = _save2
-        end
-        break if _tmp
-        self.pos = _save1
 
-        _save11 = self.pos
-        while true # sequence
-          _tmp = match_string("(")
-          unless _tmp
-            self.pos = _save11
-            break
-          end
-          _tmp = apply(:_SourceContents)
-          unless _tmp
-            self.pos = _save11
+          _save12 = self.pos
+          while true # sequence
+            _tmp = match_string("(")
+            unless _tmp
+              self.pos = _save12
+              break
+            end
+            _tmp = apply(:_SourceContents)
+            unless _tmp
+              self.pos = _save12
+              break
+            end
+            _tmp = match_string(")")
+            unless _tmp
+              self.pos = _save12
+            end
             break
-          end
-          _tmp = match_string(")")
-          unless _tmp
-            self.pos = _save11
-          end
+          end # end sequence
+
+          break if _tmp
+          self.pos = _save2
           break
-        end # end sequence
+        end # end choice
 
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
+        break unless _tmp
+      end
+      _tmp = true
+      break if _tmp
+      self.pos = _save
+      _tmp = match_string("")
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
 
-      break unless _tmp
-    end
-    _tmp = true
     set_failed_rule :_SourceContents unless _tmp
     return _tmp
   end
@@ -14532,12 +14358,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SpecialChar = (/[~*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
+  # SpecialChar = (/[*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
   def _SpecialChar
 
     _save = self.pos
     while true # choice
-      _tmp = scan(/\A(?-mix:[~*_`&\[\]()<!#\\'"])/)
+      _tmp = scan(/\A(?-mix:[*_`&\[\]()<!#\\'"])/)
       break if _tmp
       self.pos = _save
       _tmp = _ExtendedSpecialChar()
@@ -14630,6 +14456,13 @@ class RDoc::Markdown
     return _tmp
   end
 
+  # NonAlphanumeric = %literals.NonAlphanumeric
+  def _NonAlphanumeric
+    _tmp = @_grammar_literals.external_invoke(self, :_NonAlphanumeric)
+    set_failed_rule :_NonAlphanumeric unless _tmp
+    return _tmp
+  end
+
   # Spacechar = %literals.Spacechar
   def _Spacechar
     _tmp = @_grammar_literals.external_invoke(self, :_Spacechar)
@@ -15357,7 +15190,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # InlineNote = &{ notes? } "^[" @StartList:a (!"]" Inline:l { a << l })+ "]" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }
+  # InlineNote = &{ notes? } "^[" @StartList:a (!"]" Inline:l { a << l })+ "]" {                ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }
   def _InlineNote
 
     _save = self.pos
@@ -15448,7 +15281,8 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  ref = [:inline, @note_order.length]
+      @result = begin;
+               ref = [:inline, @note_order.length]
                @footnotes[ref] = paragraph a
 
                note_for ref
@@ -15591,7 +15425,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # CodeFence = &{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }
+  # CodeFence = &{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format               verbatim             }
   def _CodeFence
 
     _save = self.pos
@@ -15833,7 +15667,7 @@ class RDoc::Markdown
         break
       end
       @result = begin;  verbatim = RDoc::Markup::Verbatim.new text
-              verbatim.format = format.intern if format.instance_of?(String)
+              verbatim.format = format.intern if format
               verbatim
             ; end
       _tmp = true
@@ -16049,14 +15883,14 @@ class RDoc::Markdown
   Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
   Rules[:_Para] = rule_info("Para", "@NonindentSpace Inlines:a @BlankLine+ { paragraph a }")
   Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
-  Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp /\#*/ @Sp @Newline) Inline")
+  Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp? /\#*/ @Sp @Newline) Inline")
   Rules[:_AtxStart] = rule_info("AtxStart", "< /\\\#{1,6}/ > { text.length }")
-  Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s @Sp AtxInline+:a (@Sp /\#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }")
+  Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s @Sp? AtxInline+:a (@Sp? /\#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }")
   Rules[:_SetextHeading] = rule_info("SetextHeading", "(SetextHeading1 | SetextHeading2)")
-  Rules[:_SetextBottom1] = rule_info("SetextBottom1", "/={1,}/ @Newline")
-  Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{1,}/ @Newline")
-  Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
-  Rules[:_SetextHeading2] = rule_info("SetextHeading2", "&(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }")
+  Rules[:_SetextBottom1] = rule_info("SetextBottom1", "/={3,}/ @Newline")
+  Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{3,}/ @Newline")
+  Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
+  Rules[:_SetextHeading2] = rule_info("SetextHeading2", "&(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }")
   Rules[:_Heading] = rule_info("Heading", "(SetextHeading | AtxHeading)")
   Rules[:_BlockQuote] = rule_info("BlockQuote", "BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }")
   Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "@StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }")
@@ -16177,10 +16011,7 @@ class RDoc::Markdown
   Rules[:_HtmlBlockOpenScript] = rule_info("HtmlBlockOpenScript", "\"<\" Spnl (\"script\" | \"SCRIPT\") Spnl HtmlAttribute* \">\"")
   Rules[:_HtmlBlockCloseScript] = rule_info("HtmlBlockCloseScript", "\"<\" Spnl \"/\" (\"script\" | \"SCRIPT\") Spnl \">\"")
   Rules[:_HtmlBlockScript] = rule_info("HtmlBlockScript", "HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript")
-  Rules[:_HtmlBlockOpenHead] = rule_info("HtmlBlockOpenHead", "\"<\" Spnl (\"head\" | \"HEAD\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseHead] = rule_info("HtmlBlockCloseHead", "\"<\" Spnl \"/\" (\"head\" | \"HEAD\") Spnl \">\"")
-  Rules[:_HtmlBlockHead] = rule_info("HtmlBlockHead", "HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead")
-  Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)")
+  Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)")
   Rules[:_HtmlBlock] = rule_info("HtmlBlock", "< (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > @BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }")
   Rules[:_HtmlUnclosed] = rule_info("HtmlUnclosed", "\"<\" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl \">\"")
   Rules[:_HtmlUnclosedType] = rule_info("HtmlUnclosedType", "(\"HR\" | \"hr\")")
@@ -16191,14 +16022,14 @@ class RDoc::Markdown
   Rules[:_InStyleTags] = rule_info("InStyleTags", "StyleOpen (!StyleClose .)* StyleClose")
   Rules[:_StyleBlock] = rule_info("StyleBlock", "< InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }")
   Rules[:_Inlines] = rule_info("Inlines", "(!@Endline Inline:i { i } | @Endline:c &Inline { c })+:chunks @Endline? { chunks }")
-  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
+  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
   Rules[:_Space] = rule_info("Space", "@Spacechar+ { \" \" }")
   Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
   Rules[:_StrChunk] = rule_info("StrChunk", "< (@NormalChar | /_+/ &Alphanumeric)+ > { text }")
   Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !@Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { text }")
   Rules[:_Entity] = rule_info("Entity", "(HexEntity | DecEntity | CharEntity):a { a }")
   Rules[:_Endline] = rule_info("Endline", "(@LineBreak | @TerminalEndline | @NormalEndline)")
-  Rules[:_NormalEndline] = rule_info("NormalEndline", "@Sp @Newline !@BlankLine !\">\" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { \"\\n\" }")
+  Rules[:_NormalEndline] = rule_info("NormalEndline", "@Sp @Newline !@BlankLine !\">\" !AtxStart !(Line /={3,}|-{3,}=/ @Newline) { \"\\n\" }")
   Rules[:_TerminalEndline] = rule_info("TerminalEndline", "@Sp @Newline @Eof")
   Rules[:_LineBreak] = rule_info("LineBreak", "\"  \" @NormalEndline { RDoc::Markup::HardBreak.new }")
   Rules[:_Symbol] = rule_info("Symbol", "< @SpecialChar > { text }")
@@ -16206,21 +16037,27 @@ class RDoc::Markdown
   Rules[:_StarLine] = rule_info("StarLine", "(< /\\*{4,}/ > { text } | < @Spacechar /\\*+/ &@Spacechar > { text })")
   Rules[:_UlLine] = rule_info("UlLine", "(< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })")
   Rules[:_Emph] = rule_info("Emph", "(EmphStar | EmphUl)")
-  Rules[:_Whitespace] = rule_info("Whitespace", "(@Spacechar | @Newline)")
-  Rules[:_EmphStar] = rule_info("EmphStar", "\"*\" !@Whitespace @StartList:a (!\"*\" Inline:b { a << b } | StrongStar:b { a << b })+ \"*\" { emphasis a.join }")
-  Rules[:_EmphUl] = rule_info("EmphUl", "\"_\" !@Whitespace @StartList:a (!\"_\" Inline:b { a << b } | StrongUl:b { a << b })+ \"_\" { emphasis a.join }")
+  Rules[:_OneStarOpen] = rule_info("OneStarOpen", "!StarLine \"*\" !@Spacechar !@Newline")
+  Rules[:_OneStarClose] = rule_info("OneStarClose", "!@Spacechar !@Newline Inline:a \"*\" { a }")
+  Rules[:_EmphStar] = rule_info("EmphStar", "OneStarOpen @StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }")
+  Rules[:_OneUlOpen] = rule_info("OneUlOpen", "!UlLine \"_\" !@Spacechar !@Newline")
+  Rules[:_OneUlClose] = rule_info("OneUlClose", "!@Spacechar !@Newline Inline:a \"_\" { a }")
+  Rules[:_EmphUl] = rule_info("EmphUl", "OneUlOpen @StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }")
   Rules[:_Strong] = rule_info("Strong", "(StrongStar | StrongUl)")
-  Rules[:_StrongStar] = rule_info("StrongStar", "\"**\" !@Whitespace @StartList:a (!\"**\" Inline:b { a << b })+ \"**\" { strong a.join }")
-  Rules[:_StrongUl] = rule_info("StrongUl", "\"__\" !@Whitespace @StartList:a (!\"__\" Inline:b { a << b })+ \"__\" { strong a.join }")
-  Rules[:_Strike] = rule_info("Strike", "&{ strike? } \"~~\" !@Whitespace @StartList:a (!\"~~\" Inline:b { a << b })+ \"~~\" { strike a.join }")
+  Rules[:_TwoStarOpen] = rule_info("TwoStarOpen", "!StarLine \"**\" !@Spacechar !@Newline")
+  Rules[:_TwoStarClose] = rule_info("TwoStarClose", "!@Spacechar !@Newline Inline:a \"**\" { a }")
+  Rules[:_StrongStar] = rule_info("StrongStar", "TwoStarOpen @StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }")
+  Rules[:_TwoUlOpen] = rule_info("TwoUlOpen", "!UlLine \"__\" !@Spacechar !@Newline")
+  Rules[:_TwoUlClose] = rule_info("TwoUlClose", "!@Spacechar !@Newline Inline:a \"__\" { a }")
+  Rules[:_StrongUl] = rule_info("StrongUl", "TwoUlOpen @StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }")
   Rules[:_Image] = rule_info("Image", "\"!\" (ExplicitLink | ReferenceLink):a { \"rdoc-image:\#{a[/\\[(.*)\\]/, 1]}\" }")
   Rules[:_Link] = rule_info("Link", "(ExplicitLink | ReferenceLink | AutoLink)")
   Rules[:_ReferenceLink] = rule_info("ReferenceLink", "(ReferenceLinkDouble | ReferenceLinkSingle)")
   Rules[:_ReferenceLinkDouble] = rule_info("ReferenceLinkDouble", "Label:content < Spnl > !\"[]\" Label:label { link_to content, label, text }")
   Rules[:_ReferenceLinkSingle] = rule_info("ReferenceLinkSingle", "Label:content < (Spnl \"[]\")? > { link_to content, content, text }")
-  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "Label:l \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
+  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "Label:l Spnl \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
   Rules[:_Source] = rule_info("Source", "(\"<\" < SourceContents > \">\" | < SourceContents >) { text }")
-  Rules[:_SourceContents] = rule_info("SourceContents", "((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")*")
+  Rules[:_SourceContents] = rule_info("SourceContents", "(((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")* | \"\")")
   Rules[:_Title] = rule_info("Title", "(TitleSingle | TitleDouble | \"\"):a { a }")
   Rules[:_TitleSingle] = rule_info("TitleSingle", "\"'\" (!(\"'\" @Sp (\")\" | @Newline)) .)* \"'\"")
   Rules[:_TitleDouble] = rule_info("TitleDouble", "\"\\\"\" (!(\"\\\"\" @Sp (\")\" | @Newline)) .)* \"\\\"\"")
@@ -16252,13 +16089,14 @@ class RDoc::Markdown
   Rules[:_Nonspacechar] = rule_info("Nonspacechar", "!@Spacechar !@Newline .")
   Rules[:_Sp] = rule_info("Sp", "@Spacechar*")
   Rules[:_Spnl] = rule_info("Spnl", "@Sp (@Newline @Sp)?")
-  Rules[:_SpecialChar] = rule_info("SpecialChar", "(/[~*_`&\\[\\]()<!\#\\\\'\"]/ | @ExtendedSpecialChar)")
+  Rules[:_SpecialChar] = rule_info("SpecialChar", "(/[*_`&\\[\\]()<!\#\\\\'\"]/ | @ExtendedSpecialChar)")
   Rules[:_NormalChar] = rule_info("NormalChar", "!(@SpecialChar | @Spacechar | @Newline) .")
   Rules[:_Digit] = rule_info("Digit", "[0-9]")
   Rules[:_Alphanumeric] = rule_info("Alphanumeric", "%literals.Alphanumeric")
   Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "%literals.AlphanumericAscii")
   Rules[:_BOM] = rule_info("BOM", "%literals.BOM")
   Rules[:_Newline] = rule_info("Newline", "%literals.Newline")
+  Rules[:_NonAlphanumeric] = rule_info("NonAlphanumeric", "%literals.NonAlphanumeric")
   Rules[:_Spacechar] = rule_info("Spacechar", "%literals.Spacechar")
   Rules[:_HexEntity] = rule_info("HexEntity", "/&\#x/i < /[0-9a-fA-F]+/ > \";\" { [text.to_i(16)].pack 'U' }")
   Rules[:_DecEntity] = rule_info("DecEntity", "\"&\#\" < /[0-9]+/ > \";\" { [text.to_i].pack 'U' }")
@@ -16275,10 +16113,10 @@ class RDoc::Markdown
   Rules[:_NoteReference] = rule_info("NoteReference", "&{ notes? } RawNoteReference:ref { note_for ref }")
   Rules[:_RawNoteReference] = rule_info("RawNoteReference", "\"[^\" < (!@Newline !\"]\" .)+ > \"]\" { text }")
   Rules[:_Note] = rule_info("Note", "&{ notes? } @NonindentSpace RawNoteReference:ref \":\" @Sp @StartList:a RawNoteBlock:i { a.concat i } (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }")
-  Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" @StartList:a (!\"]\" Inline:l { a << l })+ \"]\" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }")
+  Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" @StartList:a (!\"]\" Inline:l { a << l })+ \"]\" {                ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }")
   Rules[:_Notes] = rule_info("Notes", "(Note | SkipBlock)*")
   Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
-  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
+  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format               verbatim             }")
   Rules[:_DefinitionList] = rule_info("DefinitionList", "&{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }")
   Rules[:_DefinitionListItem] = rule_info("DefinitionListItem", "DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = []                        list_items <<                          RDoc::Markup::ListItem.new(label, defns.shift)                         list_items.concat defns.map { |defn|                          RDoc::Markup::ListItem.new nil, defn                        } unless list_items.empty?                         list_items                      }")
   Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "StrChunk:label @Sp @Newline { label }")
diff --git a/lib/rdoc/markdown/entities.rb b/lib/rdoc/markdown/entities.rb
index d2cf610293..d32ae51053 100644
--- a/lib/rdoc/markdown/entities.rb
+++ b/lib/rdoc/markdown/entities.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # HTML entity name map for RDoc::Markdown
 
diff --git a/lib/rdoc/markdown/literals.rb b/lib/rdoc/markdown/literals.rb
index 31cd237f12..cde761a2f7 100644
--- a/lib/rdoc/markdown/literals.rb
+++ b/lib/rdoc/markdown/literals.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
-# frozen_string_literal: true
+# frozen_string_literal: false
 # :markup: markdown
 
 ##
diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
index f20ee1169e..3406522596 100644
--- a/lib/rdoc/markup.rb
+++ b/lib/rdoc/markup.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # RDoc::Markup parses plain text documents and attempts to decompose them into
 # their constituent parts.  Some of these parts are high-level: paragraphs,
@@ -65,16 +65,17 @@
 #   puts h.convert(input_string)
 #
 # You can extend the RDoc::Markup parser to recognize new markup
-# sequences, and to add regexp handling. Here we make WikiWords significant to
-# the parser, and also make the sequences {word} and \<no>text...</no> signify
+# sequences, and to add special processing for text that matches a
+# regular expression.  Here we make WikiWords significant to the parser,
+# and also make the sequences {word} and \<no>text...</no> signify
 # strike-through text.  We then subclass the HTML output class to deal
 # with these:
 #
 #   require 'rdoc'
 #
 #   class WikiHtml < RDoc::Markup::ToHtml
-#     def handle_regexp_WIKIWORD(target)
-#       "<font color=red>" + target.text + "</font>"
+#     def handle_special_WIKIWORD(special)
+#       "<font color=red>" + special.text + "</font>"
 #     end
 #   end
 #
@@ -82,7 +83,7 @@
 #   markup.add_word_pair("{", "}", :STRIKE)
 #   markup.add_html("no", :STRIKE)
 #
-#   markup.add_regexp_handling(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+#   markup.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
 #
 #   wh = WikiHtml.new RDoc::Options.new, markup
 #   wh.add_tag(:STRIKE, "<strike>", "</strike>")
@@ -376,7 +377,7 @@
 #
 # Example links:
 #
-#   https://github.com/ruby/rdoc
+#   https://github.com/rdoc/rdoc
 #   mailto:user@example.com
 #   {RDoc Documentation}[http://rdoc.rubyforge.org]
 #   {RDoc Markup}[rdoc-ref:RDoc::Markup]
@@ -763,7 +764,7 @@ Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
 
 Please file a bug report with the above information at:
 
-https://github.com/ruby/rdoc/issues
+https://github.com/rdoc/rdoc/issues
 
     EOF
     raise
@@ -799,12 +800,13 @@ https://github.com/ruby/rdoc/issues
   # Add to other inline sequences.  For example, we could add WikiWords using
   # something like:
   #
-  #    parser.add_regexp_handling(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+  #    parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
   #
-  # Each wiki word will be presented to the output formatter.
+  # Each wiki word will be presented to the output formatter via the
+  # accept_special method.
 
-  def add_regexp_handling(pattern, name)
-    @attribute_manager.add_regexp_handling(pattern, name)
+  def add_special(pattern, name)
+    @attribute_manager.add_special(pattern, name)
   end
 
   ##
@@ -830,7 +832,7 @@ https://github.com/ruby/rdoc/issues
   autoload :AttrSpan,              'rdoc/markup/attr_span'
   autoload :Attributes,            'rdoc/markup/attributes'
   autoload :AttributeManager,      'rdoc/markup/attribute_manager'
-  autoload :RegexpHandling,        'rdoc/markup/regexp_handling'
+  autoload :Special,               'rdoc/markup/special'
 
   # RDoc::Markup AST
   autoload :BlankLine,             'rdoc/markup/blank_line'
diff --git a/lib/rdoc/markup/attr_changer.rb b/lib/rdoc/markup/attr_changer.rb
index 4c4bc6479e..9a1a9c8c66 100644
--- a/lib/rdoc/markup/attr_changer.rb
+++ b/lib/rdoc/markup/attr_changer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 class RDoc::Markup
 
   AttrChanger = Struct.new :turn_on, :turn_off # :nodoc:
diff --git a/lib/rdoc/markup/attr_span.rb b/lib/rdoc/markup/attr_span.rb
index 63aace60d2..4d9e5b0217 100644
--- a/lib/rdoc/markup/attr_span.rb
+++ b/lib/rdoc/markup/attr_span.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An array of attributes which parallels the characters in a string.
 
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
index f052bc8b01..3296d17af2 100644
--- a/lib/rdoc/markup/attribute_manager.rb
+++ b/lib/rdoc/markup/attribute_manager.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Manages changes of attributes in a block of text
 
@@ -53,10 +53,10 @@ class RDoc::Markup::AttributeManager
   attr_reader :protectable
 
   ##
-  # And this maps _regexp handling_ sequences to a name. A regexp handling
-  # sequence is something like a WikiWord
+  # And this maps _special_ sequences to a name. A special sequence is
+  # something like a WikiWord
 
-  attr_reader :regexp_handlings
+  attr_reader :special
 
   ##
   # Creates a new attribute manager that understands bold, emphasized and
@@ -66,7 +66,7 @@ class RDoc::Markup::AttributeManager
     @html_tags = {}
     @matching_word_pairs = {}
     @protectable = %w[<]
-    @regexp_handlings = []
+    @special = []
     @word_pair_map = {}
     @attributes = RDoc::Markup::Attributes.new
 
@@ -166,22 +166,22 @@ class RDoc::Markup::AttributeManager
   end
 
   ##
-  # Converts regexp handling sequences to RDoc attributes
+  # Converts special sequences to RDoc attributes
 
-  def convert_regexp_handlings str, attrs
-    @regexp_handlings.each do |regexp, attribute|
+  def convert_specials str, attrs
+    @special.each do |regexp, attribute|
       str.scan(regexp) do
         capture = $~.size == 1 ? 0 : 1
 
         s, e = $~.offset capture
 
-        attrs.set_attrs s, e - s, attribute | @attributes.regexp_handling
+        attrs.set_attrs s, e - s, attribute | @attributes.special
       end
     end
   end
 
   ##
-  # Escapes regexp handling sequences of text to prevent conversion to RDoc
+  # Escapes special sequences of text to prevent conversion to RDoc
 
   def mask_protected_sequences
     # protect __send__, __FILE__, etc.
@@ -193,7 +193,7 @@ class RDoc::Markup::AttributeManager
   end
 
   ##
-  # Unescapes regexp handling sequences of text
+  # Unescapes special sequences of text
 
   def unmask_protected_sequences
     @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
@@ -233,28 +233,28 @@ class RDoc::Markup::AttributeManager
   end
 
   ##
-  # Adds a regexp handling for +pattern+ with +name+.  A simple URL handler
+  # Adds a special handler for +pattern+ with +name+.  A simple URL handler
   # would be:
   #
-  #   @am.add_regexp_handling(/((https?:)\S+\w)/, :HYPERLINK)
+  #   @am.add_special(/((https?:)\S+\w)/, :HYPERLINK)
 
-  def add_regexp_handling pattern, name
-    @regexp_handlings << [pattern, @attributes.bitmap_for(name)]
+  def add_special pattern, name
+    @special << [pattern, @attributes.bitmap_for(name)]
   end
 
   ##
-  # Processes +str+ converting attributes, HTML and regexp handlings
+  # Processes +str+ converting attributes, HTML and specials
 
   def flow str
-    @str = str.dup
+    @str = str
 
     mask_protected_sequences
 
     @attrs = RDoc::Markup::AttrSpan.new @str.length
 
-    convert_attrs            @str, @attrs
-    convert_html             @str, @attrs
-    convert_regexp_handlings @str, @attrs
+    convert_attrs    @str, @attrs
+    convert_html     @str, @attrs
+    convert_specials @str, @attrs
 
     unmask_protected_sequences
 
@@ -312,12 +312,12 @@ class RDoc::Markup::AttributeManager
         res << change_attribute(current_attr, new_attr)
         current_attr = new_attr
 
-        if (current_attr & @attributes.regexp_handling) != 0 then
+        if (current_attr & @attributes.special) != 0 then
           i += 1 while
-            i < str_len and (@attrs[i] & @attributes.regexp_handling) != 0
+            i < str_len and (@attrs[i] & @attributes.special) != 0
 
-          res << RDoc::Markup::RegexpHandling.new(current_attr,
-                                                  copy_string(start_pos, i))
+          res << RDoc::Markup::Special.new(current_attr,
+                                           copy_string(start_pos, i))
           start_pos = i
           next
         end
diff --git a/lib/rdoc/markup/attributes.rb b/lib/rdoc/markup/attributes.rb
index ce014ce928..8776c4ed29 100644
--- a/lib/rdoc/markup/attributes.rb
+++ b/lib/rdoc/markup/attributes.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # We manage a set of attributes.  Each attribute has a symbol name and a bit
 # value.
@@ -6,21 +6,21 @@
 class RDoc::Markup::Attributes
 
   ##
-  # The regexp handling attribute type. See RDoc::Markup#add_regexp_handling
+  # The special attribute type.  See RDoc::Markup#add_special
 
-  attr_reader :regexp_handling
+  attr_reader :special
 
   ##
   # Creates a new attributes set.
 
   def initialize
-    @regexp_handling = 1
+    @special = 1
 
     @name_to_bitmap = [
-      [:_REGEXP_HANDLING_, @regexp_handling],
+      [:_SPECIAL_, @special],
     ]
 
-    @next_bitmap = @regexp_handling << 1
+    @next_bitmap = @special << 1
   end
 
   ##
@@ -61,7 +61,7 @@ class RDoc::Markup::Attributes
     return enum_for __method__, bitmap unless block_given?
 
     @name_to_bitmap.each do |name, bit|
-      next if bit == @regexp_handling
+      next if bit == @special
 
       yield name.to_s if (bitmap & bit) != 0
     end
diff --git a/lib/rdoc/markup/blank_line.rb b/lib/rdoc/markup/blank_line.rb
index 3129ab5e7f..2b1ab91b47 100644
--- a/lib/rdoc/markup/blank_line.rb
+++ b/lib/rdoc/markup/blank_line.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An empty line.  This class is a singleton.
 
diff --git a/lib/rdoc/markup/block_quote.rb b/lib/rdoc/markup/block_quote.rb
index 7a4b3e36b0..3be022f9dd 100644
--- a/lib/rdoc/markup/block_quote.rb
+++ b/lib/rdoc/markup/block_quote.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A quoted section which contains markup items.
 
diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb
index f3a5de1fc3..0692c3522f 100644
--- a/lib/rdoc/markup/document.rb
+++ b/lib/rdoc/markup/document.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A Document containing lists, headings, paragraphs, etc.
 
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb
index 6dff96c7d0..197ff003e3 100644
--- a/lib/rdoc/markup/formatter.rb
+++ b/lib/rdoc/markup/formatter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Base class for RDoc markup formatters
 #
@@ -50,7 +50,7 @@ class RDoc::Markup::Formatter
 
     @markup = markup || RDoc::Markup.new
     @am     = @markup.attribute_manager
-    @am.add_regexp_handling(/<br>/, :HARD_BREAK)
+    @am.add_special(/<br>/, :HARD_BREAK)
 
     @attributes = @am.attributes
 
@@ -78,24 +78,23 @@ class RDoc::Markup::Formatter
   end
 
   ##
-  # Adds a regexp handling for links of the form rdoc-...:
+  # Adds a special for links of the form rdoc-...:
 
-  def add_regexp_handling_RDOCLINK
-    @markup.add_regexp_handling(/rdoc-[a-z]+:[^\s\]]+/, :RDOCLINK)
+  def add_special_RDOCLINK
+    @markup.add_special(/rdoc-[a-z]+:[^\s\]]+/, :RDOCLINK)
   end
 
   ##
-  # Adds a regexp handling for links of the form {<text>}[<url>] and
-  # <word>[<url>]
+  # Adds a special for links of the form {<text>}[<url>] and <word>[<url>]
 
-  def add_regexp_handling_TIDYLINK
-    @markup.add_regexp_handling(/(?:
-                                  \{.*?\} |    # multi-word label
-                                  \b[^\s{}]+? # single-word label
-                                 )
+  def add_special_TIDYLINK
+    @markup.add_special(/(?:
+                          \{.*?\} |    # multi-word label
+                          \b[^\s{}]+? # single-word label
+                         )
 
-                                 \[\S+?\]     # link target
-                                /x, :TIDYLINK)
+                         \[\S+?\]     # link target
+                        /x, :TIDYLINK)
   end
 
   ##
@@ -134,8 +133,8 @@ class RDoc::Markup::Formatter
       when RDoc::Markup::AttrChanger then
         off_tags res, item
         on_tags res, item
-      when RDoc::Markup::RegexpHandling then
-        res << convert_regexp_handling(item)
+      when RDoc::Markup::Special then
+        res << convert_special(item)
       else
         raise "Unknown flow element: #{item.inspect}"
       end
@@ -145,29 +144,29 @@ class RDoc::Markup::Formatter
   end
 
   ##
-  # Converts added regexp handlings. See RDoc::Markup#add_regexp_handling
+  # Converts added specials.  See RDoc::Markup#add_special
 
-  def convert_regexp_handling target
-    return target.text if in_tt?
+  def convert_special special
+    return special.text if in_tt?
 
     handled = false
 
-    @attributes.each_name_of target.type do |name|
-      method_name = "handle_regexp_#{name}"
+    @attributes.each_name_of special.type do |name|
+      method_name = "handle_special_#{name}"
 
       if respond_to? method_name then
-        target.text = send method_name, target
+        special.text = send method_name, special
         handled = true
       end
     end
 
     unless handled then
-      target_name = @attributes.as_string target.type
+      special_name = @attributes.as_string special.type
 
-      raise RDoc::Error, "Unhandled regexp handling #{target_name}: #{target}"
+      raise RDoc::Error, "Unhandled special #{special_name}: #{special}"
     end
 
-    target.text
+    special.text
   end
 
   ##
diff --git a/lib/rdoc/markup/formatter_test_case.rb b/lib/rdoc/markup/formatter_test_case.rb
index 076b7c81bb..a5b4933de4 100644
--- a/lib/rdoc/markup/formatter_test_case.rb
+++ b/lib/rdoc/markup/formatter_test_case.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'minitest/unit'
 
 ##
diff --git a/lib/rdoc/markup/hard_break.rb b/lib/rdoc/markup/hard_break.rb
index 046068d5c2..5898bfb644 100644
--- a/lib/rdoc/markup/hard_break.rb
+++ b/lib/rdoc/markup/hard_break.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A hard-break in the middle of a paragraph.
 
diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb
index 93a3a52000..5229287d5b 100644
--- a/lib/rdoc/markup/heading.rb
+++ b/lib/rdoc/markup/heading.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A heading with a level (1-6) and text
 
@@ -23,12 +23,12 @@ RDoc::Markup::Heading =
     return @to_html if @to_html
 
     markup = RDoc::Markup.new
-    markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
+    markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
 
     @to_html = RDoc::Markup::ToHtml.new nil
 
-    def @to_html.handle_regexp_CROSSREF target
-      target.text.sub(/^\\/, '')
+    def @to_html.handle_special_CROSSREF special
+      special.text.sub(/^\\/, '')
     end
 
     @to_html
diff --git a/lib/rdoc/markup/include.rb b/lib/rdoc/markup/include.rb
index ad7c4a9640..891be71b85 100644
--- a/lib/rdoc/markup/include.rb
+++ b/lib/rdoc/markup/include.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A file included at generation time.  Objects of this class are created by
 # RDoc::RD for an extension-less include.
diff --git a/lib/rdoc/markup/indented_paragraph.rb b/lib/rdoc/markup/indented_paragraph.rb
index d42b2e52b8..56a96bd3c9 100644
--- a/lib/rdoc/markup/indented_paragraph.rb
+++ b/lib/rdoc/markup/indented_paragraph.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An Indented Paragraph of text
 
diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb
new file mode 100644
index 0000000000..58072fef06
--- /dev/null
+++ b/lib/rdoc/markup/inline.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+warn "requiring rdoc/markup/inline is deprecated and will be removed in RDoc 4." if $-w
diff --git a/lib/rdoc/markup/list.rb b/lib/rdoc/markup/list.rb
index 05c3609202..bcaea7d7c1 100644
--- a/lib/rdoc/markup/list.rb
+++ b/lib/rdoc/markup/list.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A List is a homogeneous set of ListItems.
 #
diff --git a/lib/rdoc/markup/list_item.rb b/lib/rdoc/markup/list_item.rb
index d22554ee73..115ec0412c 100644
--- a/lib/rdoc/markup/list_item.rb
+++ b/lib/rdoc/markup/list_item.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # An item within a List that contains paragraphs, headings, etc.
 #
diff --git a/lib/rdoc/markup/paragraph.rb b/lib/rdoc/markup/paragraph.rb
index a2e45ef009..fefa12f9ef 100644
--- a/lib/rdoc/markup/paragraph.rb
+++ b/lib/rdoc/markup/paragraph.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A Paragraph of text
 
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
index 14f1f6c719..22cca20420 100644
--- a/lib/rdoc/markup/parser.rb
+++ b/lib/rdoc/markup/parser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'strscan'
 
 ##
@@ -9,9 +9,8 @@ require 'strscan'
 # RDoc::Markup::ToHTML.
 #
 # The parser only handles the block-level constructs Paragraph, List,
-# ListItem, Heading, Verbatim, BlankLine, Rule and BlockQuote.
-# Inline markup such as <tt>\+blah\+</tt> is handled separately by
-# RDoc::Markup::AttributeManager.
+# ListItem, Heading, Verbatim, BlankLine and Rule.  Inline markup such as
+# <tt>\+blah\+</tt> is handled separately by RDoc::Markup::AttributeManager.
 #
 # To see what markup the Parser implements read RDoc.  To see how to use
 # RDoc markup to format text in your program read RDoc::Markup.
@@ -250,7 +249,7 @@ class RDoc::Markup::Parser
 
     min_indent = nil
     generate_leading_spaces = true
-    line = ''.dup
+    line = ''
 
     until @tokens.empty? do
       type, data, column, = get
@@ -258,7 +257,7 @@ class RDoc::Markup::Parser
       if type == :NEWLINE then
         line << data
         verbatim << line
-        line = ''.dup
+        line = ''
         generate_leading_spaces = true
         next
       end
@@ -382,17 +381,6 @@ class RDoc::Markup::Parser
       when :TEXT then
         unget
         parse_text parent, indent
-      when :BLOCKQUOTE then
-        type, _, column = get
-        if type == :NEWLINE
-          type, _, column = get
-        end
-        unget if type
-        bq = RDoc::Markup::BlockQuote.new
-        p :blockquote_start => [data, column] if @debug
-        parse bq, column
-        p :blockquote_end => indent if @debug
-        parent << bq
       when *LIST_TOKENS then
         unget
         parent << build_list(indent)
@@ -516,12 +504,8 @@ class RDoc::Markup::Parser
                  # text:: followed by spaces or end of line => :NOTE
                  when @s.scan(/(.*?)::( +|\r?$)/) then
                    [:NOTE, @s[1], *token_pos(pos)]
-                 # >>> followed by end of line => :BLOCKQUOTE
-                 when @s.scan(/>>> *(\w+)?$/) then
-                   [:BLOCKQUOTE, @s[1], *token_pos(pos)]
                  # anything else: :TEXT
-                 else
-                   @s.scan(/(.*?)(  )?\r?$/)
+                 else @s.scan(/(.*?)(  )?\r?$/)
                    token = [:TEXT, @s[1], *token_pos(pos)]
 
                    if @s[2] then
diff --git a/lib/rdoc/markup/pre_process.rb b/lib/rdoc/markup/pre_process.rb
index d9e0dcac14..d7cef36158 100644
--- a/lib/rdoc/markup/pre_process.rb
+++ b/lib/rdoc/markup/pre_process.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Handle common directives that can occur in a block of text:
 #
@@ -102,10 +102,12 @@ class RDoc::Markup::PreProcess
       text = text.text
     end
 
+    encoding = text.encoding if defined?(Encoding)
+
     # regexp helper (square brackets for optional)
     # $1      $2  $3        $4      $5
     # [prefix][\]:directive:[spaces][param]newline
-    text = text.gsub(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do
+    text.gsub!(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do
       # skip something like ':toto::'
       next $& if $4.empty? and $5 and $5[0, 1] == ':'
 
@@ -120,14 +122,10 @@ class RDoc::Markup::PreProcess
         next "#{$1.strip}\n"
       end
 
-      handle_directive $1, $3, $5, code_object, text.encoding, &block
+      handle_directive $1, $3, $5, code_object, encoding, &block
     end
 
-    if comment then
-      comment.text = text
-    else
-      comment = text
-    end
+    comment = text unless comment
 
     self.class.post_processors.each do |handler|
       handler.call comment, code_object
@@ -154,7 +152,7 @@ class RDoc::Markup::PreProcess
 
     case directive
     when 'arg', 'args' then
-      return "#{prefix}:#{directive}: #{param}\n" unless code_object && code_object.kind_of?(RDoc::AnyMethod)
+      return "#{prefix}:#{directive}: #{param}\n" unless code_object
 
       code_object.params = param
 
@@ -216,7 +214,7 @@ class RDoc::Markup::PreProcess
     when 'yield', 'yields' then
       return blankline unless code_object
       # remove parameter &block
-      code_object.params = code_object.params.sub(/,?\s*&\w+/, '') if code_object.params
+      code_object.params.sub!(/,?\s*&\w+/, '') if code_object.params
 
       code_object.block_params = param
 
@@ -266,7 +264,6 @@ class RDoc::Markup::PreProcess
     end
 
     content = RDoc::Encoding.read_file full_name, encoding, true
-    content = RDoc::Encoding.remove_magic_comment content
 
     # strip magic comment
     content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
@@ -294,3 +291,4 @@ class RDoc::Markup::PreProcess
   end
 
 end
+
diff --git a/lib/rdoc/markup/raw.rb b/lib/rdoc/markup/raw.rb
index 85e2c8b825..8012d2cea6 100644
--- a/lib/rdoc/markup/raw.rb
+++ b/lib/rdoc/markup/raw.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A section of text that is added to the output document as-is
 
diff --git a/lib/rdoc/markup/regexp_handling.rb b/lib/rdoc/markup/regexp_handling.rb
deleted file mode 100644
index 6ed868c2c1..0000000000
--- a/lib/rdoc/markup/regexp_handling.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-##
-# Hold details of a regexp handling sequence
-
-class RDoc::Markup::RegexpHandling
-
-  ##
-  # Regexp handling type
-
-  attr_reader   :type
-
-  ##
-  # Regexp handling text
-
-  attr_accessor :text
-
-  ##
-  # Creates a new regexp handling sequence of +type+ with +text+
-
-  def initialize(type, text)
-    @type, @text = type, text
-  end
-
-  ##
-  # Regexp handlings are equal when the have the same text and type
-
-  def ==(o)
-    self.text == o.text && self.type == o.type
-  end
-
-  def inspect # :nodoc:
-    "#<RDoc::Markup::RegexpHandling:0x%x @type=%p, @text=%p>" % [
-      object_id, @type, text.dump]
-  end
-
-  def to_s # :nodoc:
-    "RegexpHandling: type=#{type} text=#{text.dump}"
-  end
-
-end
-
diff --git a/lib/rdoc/markup/rule.rb b/lib/rdoc/markup/rule.rb
index 38c1dc7f56..b96d4fb293 100644
--- a/lib/rdoc/markup/rule.rb
+++ b/lib/rdoc/markup/rule.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A horizontal rule with a weight
 
diff --git a/lib/rdoc/markup/special.rb b/lib/rdoc/markup/special.rb
new file mode 100644
index 0000000000..4d834b9e37
--- /dev/null
+++ b/lib/rdoc/markup/special.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: false
+##
+# Hold details of a special sequence
+
+class RDoc::Markup::Special
+
+  ##
+  # Special type
+
+  attr_reader   :type
+
+  ##
+  # Special text
+
+  attr_accessor :text
+
+  ##
+  # Creates a new special sequence of +type+ with +text+
+
+  def initialize(type, text)
+    @type, @text = type, text
+  end
+
+  ##
+  # Specials are equal when the have the same text and type
+
+  def ==(o)
+    self.text == o.text && self.type == o.type
+  end
+
+  def inspect # :nodoc:
+    "#<RDoc::Markup::Special:0x%x @type=%p, @text=%p>" % [
+      object_id, @type, text.dump]
+  end
+
+  def to_s # :nodoc:
+    "Special: type=#{type} text=#{text.dump}"
+  end
+
+end
+
diff --git a/lib/rdoc/markup/text_formatter_test_case.rb b/lib/rdoc/markup/text_formatter_test_case.rb
index 22a762b5f0..1c8882aa36 100644
--- a/lib/rdoc/markup/text_formatter_test_case.rb
+++ b/lib/rdoc/markup/text_formatter_test_case.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Test case for creating new plain-text RDoc::Markup formatters.  See also
 # RDoc::Markup::FormatterTestCase
diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb
index 6cc3b70e93..56cd1fe446 100644
--- a/lib/rdoc/markup/to_ansi.rb
+++ b/lib/rdoc/markup/to_ansi.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Outputs RDoc markup with vibrant ANSI color!
 
diff --git a/lib/rdoc/markup/to_bs.rb b/lib/rdoc/markup/to_bs.rb
index f9b86487db..d55f64c5e7 100644
--- a/lib/rdoc/markup/to_bs.rb
+++ b/lib/rdoc/markup/to_bs.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Outputs RDoc markup with hot backspace action!  You will probably need a
 # pager to use this output format.
@@ -41,7 +41,7 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   end
 
   ##
-  # Turns on or off regexp handling for +convert_string+
+  # Turns on or off special handling for +convert_string+
 
   def annotate tag
     case tag
@@ -54,9 +54,9 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   end
 
   ##
-  # Calls convert_string on the result of convert_regexp_handling
+  # Calls convert_string on the result of convert_special
 
-  def convert_regexp_handling target
+  def convert_special special
     convert_string super
   end
 
@@ -64,6 +64,7 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   # Adds bold or underline mixed with backspaces
 
   def convert_string string
+    return string unless string.respond_to? :chars # your ruby is lame
     return string unless @in_b or @in_em
     chars = if @in_b then
               string.chars.map do |char| "#{char}\b#{char}" end
@@ -75,3 +76,4 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   end
 
 end
+
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index 9ae0fff8a7..3bf66c2c31 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'cgi'
 
 ##
@@ -53,18 +53,18 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
     @hard_break = "<br>\n"
 
     # external links
-    @markup.add_regexp_handling(/(?:link:|https?:|mailto:|ftp:|irc:|www\.)\S+\w/,
-                                :HYPERLINK)
+    @markup.add_special(/(?:link:|https?:|mailto:|ftp:|irc:|www\.)\S+\w/,
+                        :HYPERLINK)
 
-    add_regexp_handling_RDOCLINK
-    add_regexp_handling_TIDYLINK
+    add_special_RDOCLINK
+    add_special_TIDYLINK
 
     init_tags
   end
 
-  # :section: Regexp Handling
+  # :section: Special Handling
   #
-  # These methods are used by regexp handling markup added by RDoc::Markup#add_regexp_handling.
+  # These methods handle special markup added by RDoc::Markup#add_special.
 
   def handle_RDOCLINK url # :nodoc:
     case url
@@ -91,14 +91,14 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
   end
 
   ##
-  # +target+ is a <code><br></code>
+  # +special+ is a <code><br></code>
 
-  def handle_regexp_HARD_BREAK target
+  def handle_special_HARD_BREAK special
     '<br>'
   end
 
   ##
-  # +target+ is a potential link.  The following schemes are handled:
+  # +special+ is a potential link.  The following schemes are handled:
   #
   # <tt>mailto:</tt>::
   #   Inserted as-is.
@@ -109,14 +109,14 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
   # <tt>link:</tt>::
   #   Reference to a local file relative to the output directory.
 
-  def handle_regexp_HYPERLINK(target)
-    url = target.text
+  def handle_special_HYPERLINK(special)
+    url = special.text
 
     gen_url url, url
   end
 
   ##
-  # +target+ is an rdoc-schemed link that will be converted into a hyperlink.
+  # +special+ is an rdoc-schemed link that will be converted into a hyperlink.
   #
   # For the +rdoc-ref+ scheme the named reference will be returned without
   # creating a link.
@@ -124,16 +124,16 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
   # For the +rdoc-label+ scheme the footnote and label prefixes are stripped
   # when creating a link.  All other contents will be linked verbatim.
 
-  def handle_regexp_RDOCLINK target
-    handle_RDOCLINK target.text
+  def handle_special_RDOCLINK special
+    handle_RDOCLINK special.text
   end
 
   ##
-  # This +target+ is a link where the label is different from the URL
+  # This +special+ is a link where the label is different from the URL
   # <tt>label[url]</tt> or <tt>{long label}[url]</tt>
 
-  def handle_regexp_TIDYLINK(target)
-    text = target.text
+  def handle_special_TIDYLINK(special)
+    text = special.text
 
     return text unless
       text =~ /^\{(.*)\}\[(.*?)\]$/ or text =~ /^(\S+)\[(.*?)\]$/
@@ -186,7 +186,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
     @res << "\n<p>"
     text = paragraph.text @hard_break
     text = text.gsub(/\r?\n/, ' ')
-    @res << to_html(text)
+    @res << wrap(to_html(text))
     @res << "</p>\n"
   end
 
@@ -200,13 +200,11 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
 
     content = if verbatim.ruby? or parseable? text then
                 begin
-                  tokens = RDoc::Parser::RipperStateLex.parse text
+                  tokens = RDoc::RubyLex.tokenize text, @options
                   klass  = ' class="ruby"'
 
-                  result = RDoc::TokenStream.to_html tokens
-                  result = result + "\n" unless "\n" == result[-1]
-                  result
-                rescue
+                  RDoc::TokenStream.to_html tokens
+                rescue RDoc::RubyLex::Error
                   CGI.escapeHTML text
                 end
               else
@@ -214,7 +212,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
               end
 
     if @options.pipe then
-      @res << "\n<pre><code>#{CGI.escapeHTML text}\n</code></pre>\n"
+      @res << "\n<pre><code>#{CGI.escapeHTML text}</code></pre>\n"
     else
       @res << "\n<pre#{klass}>#{content}</pre>\n"
     end
@@ -312,7 +310,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
 
   ##
   # Generate a link to +url+ with content +text+.  Handles the special cases
-  # for img: and link: described under handle_regexp_HYPERLINK
+  # for img: and link: described under handle_special_HYPERLINK
 
   def gen_url url, text
     scheme, url, id = parse_url url
@@ -385,12 +383,9 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
   # Returns true if text is valid ruby syntax
 
   def parseable? text
-    verbose, $VERBOSE = $VERBOSE, nil
     eval("BEGIN {return true}\n#{text}")
   rescue SyntaxError
     false
-  ensure
-    $VERBOSE = verbose
   end
 
   ##
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
index 2fbddeb83b..3f03c65898 100644
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ b/lib/rdoc/markup/to_html_crossref.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Subclass of the RDoc::Markup::ToHtml class that supports looking up method
 # names, classes, etc to create links.  RDoc::CrossReference is used to
@@ -40,7 +40,7 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
     @show_hash     = @options.show_hash
 
     crossref_re = @hyperlink_all ? ALL_CROSSREF_REGEXP : CROSSREF_REGEXP
-    @markup.add_regexp_handling crossref_re, :CROSSREF
+    @markup.add_special crossref_re, :CROSSREF
 
     @cross_reference = RDoc::CrossReference.new @context
   end
@@ -49,19 +49,16 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   # Creates a link to the reference +name+ if the name exists.  If +text+ is
   # given it is used as the link text, otherwise +name+ is used.
 
-  def cross_reference name, text = nil, code = true
+  def cross_reference name, text = nil
     lookup = name
 
     name = name[1..-1] unless @show_hash if name[0, 1] == '#'
 
-    if name =~ /(.*[^#:])@/
-      text ||= "#{CGI.unescape $'} at <code>#{$1}</code>"
-      code = false
-    else
-      text ||= name
-    end
+    name = "#{CGI.unescape $'} at #{$1}" if name =~ /(.*[^#:])@/
+
+    text = name unless text
 
-    link lookup, text, code
+    link lookup, text
   end
 
   ##
@@ -71,8 +68,8 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   # example, ToHtml is found, even without the <tt>RDoc::Markup::</tt> prefix,
   # because we look for it in module Markup first.
 
-  def handle_regexp_CROSSREF(target)
-    name = target.text
+  def handle_special_CROSSREF(special)
+    name = special.text
 
     return name if name =~ /@[\w-]+\.[\w-]/ # labels that look like emails
 
@@ -90,22 +87,22 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   # Handles <tt>rdoc-ref:</tt> scheme links and allows RDoc::Markup::ToHtml to
   # handle other schemes.
 
-  def handle_regexp_HYPERLINK target
-    return cross_reference $' if target.text =~ /\Ardoc-ref:/
+  def handle_special_HYPERLINK special
+    return cross_reference $' if special.text =~ /\Ardoc-ref:/
 
     super
   end
 
   ##
-  # +target+ is an rdoc-schemed link that will be converted into a hyperlink.
+  # +special+ is an rdoc-schemed link that will be converted into a hyperlink.
   # For the rdoc-ref scheme the cross-reference will be looked up and the
   # given name will be used.
   #
   # All other contents are handled by
-  # {the superclass}[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK]
+  # {the superclass}[rdoc-ref:RDoc::Markup::ToHtml#handle_special_RDOCLINK]
 
-  def handle_regexp_RDOCLINK target
-    url = target.text
+  def handle_special_RDOCLINK special
+    url = special.text
 
     case url
     when /\Ardoc-ref:/ then
@@ -122,14 +119,15 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   def gen_url url, text
     return super unless url =~ /\Ardoc-ref:/
 
-    name = $'
-    cross_reference name, text, name == text
+    cross_reference $', text
   end
 
   ##
   # Creates an HTML link to +name+ with the given +text+.
 
-  def link name, text, code = true
+  def link name, text
+    original_name = name
+
     if name =~ /(.*[^#:])@/ then
       name = $1
       label = $'
@@ -137,16 +135,15 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
 
     ref = @cross_reference.resolve name, text
 
+    text = ref.output_name @context if
+      RDoc::MethodAttr === ref and text == original_name
+
     case ref
     when String then
       ref
     else
       path = ref.as_href @from_path
 
-      if code and RDoc::CodeObject === ref and !(RDoc::TopLevel === ref)
-        text = "<code>#{text}</code>"
-      end
-
       if path =~ /#/ then
         path << "-label-#{label}"
       elsif ref.sections and
diff --git a/lib/rdoc/markup/to_html_snippet.rb b/lib/rdoc/markup/to_html_snippet.rb
index 4eb36592b7..75c1df94d9 100644
--- a/lib/rdoc/markup/to_html_snippet.rb
+++ b/lib/rdoc/markup/to_html_snippet.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Outputs RDoc markup as paragraphs with inline markup only.
 
@@ -44,7 +44,7 @@ class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
     @mask       = 0
     @paragraphs = 0
 
-    @markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
+    @markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
   end
 
   ##
@@ -71,7 +71,7 @@ class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
 
     text = paragraph.text @hard_break
 
-    @res << "#{para}#{to_html text}\n"
+    @res << "#{para}#{wrap to_html text}\n"
 
     add_paragraph
   end
@@ -123,16 +123,16 @@ class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
   end
 
   ##
-  # Removes escaping from the cross-references in +target+
+  # Removes escaping from the cross-references in +special+
 
-  def handle_regexp_CROSSREF target
-    target.text.sub(/\A\\/, '')
+  def handle_special_CROSSREF special
+    special.text.sub(/\A\\/, '')
   end
 
   ##
-  # +target+ is a <code><br></code>
+  # +special+ is a <code><br></code>
 
-  def handle_regexp_HARD_BREAK target
+  def handle_special_HARD_BREAK special
     @characters -= 4
     '<br>'
   end
@@ -226,8 +226,8 @@ class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
       when String then
         text = convert_string item
         res << truncate(text)
-      when RDoc::Markup::RegexpHandling then
-        text = convert_regexp_handling item
+      when RDoc::Markup::Special then
+        text = convert_special item
         res << truncate(text)
       else
         raise "Unknown flow element: #{item.inspect}"
diff --git a/lib/rdoc/markup/to_joined_paragraph.rb b/lib/rdoc/markup/to_joined_paragraph.rb
index 795f3f62ee..293258c092 100644
--- a/lib/rdoc/markup/to_joined_paragraph.rb
+++ b/lib/rdoc/markup/to_joined_paragraph.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Joins the parts of an RDoc::Markup::Paragraph into a single String.
 #
@@ -23,11 +23,37 @@ class RDoc::Markup::ToJoinedParagraph < RDoc::Markup::Formatter
   # Converts the parts of +paragraph+ to a single entry.
 
   def accept_paragraph paragraph
-    parts = paragraph.parts.chunk do |part|
-      String === part
-    end.map do |string, chunk|
-      string ? chunk.join.rstrip : chunk
-    end.flatten
+    parts = []
+    string = false
+
+    paragraph.parts.each do |part|
+      if String === part then
+        if string then
+          string << part
+        else
+          parts << part
+          string = part
+        end
+      else
+        parts << part
+        string = false
+      end
+    end
+
+    parts = parts.map do |part|
+      if String === part then
+        part.rstrip
+      else
+        part
+      end
+    end
+
+    # TODO use Enumerable#chunk when Ruby 1.8 support is dropped
+    #parts = paragraph.parts.chunk do |part|
+    #  String === part
+    #end.map do |string, chunk|
+    #  string ? chunk.join.rstrip : chunk
+    #end.flatten
 
     paragraph.parts.replace parts
   end
diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb
index 3d95ccc2e2..bdf08b7aee 100644
--- a/lib/rdoc/markup/to_label.rb
+++ b/lib/rdoc/markup/to_label.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'cgi'
 
 ##
@@ -16,8 +16,8 @@ class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
   def initialize markup = nil
     super nil, markup
 
-    @markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
-    @markup.add_regexp_handling(/(((\{.*?\})|\b\S+?)\[\S+?\])/, :TIDYLINK)
+    @markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
+    @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\])/, :TIDYLINK)
 
     add_tag :BOLD, '', ''
     add_tag :TT,   '', ''
@@ -36,20 +36,20 @@ class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
   end
 
   ##
-  # Converts the CROSSREF +target+ to plain text, removing the suppression
+  # Converts the CROSSREF +special+ to plain text, removing the suppression
   # marker, if any
 
-  def handle_regexp_CROSSREF target
-    text = target.text
+  def handle_special_CROSSREF special
+    text = special.text
 
     text.sub(/^\\/, '')
   end
 
   ##
-  # Converts the TIDYLINK +target+ to just the text part
+  # Converts the TIDYLINK +special+ to just the text part
 
-  def handle_regexp_TIDYLINK target
-    text = target.text
+  def handle_special_TIDYLINK special
+    text = special.text
 
     return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
 
@@ -68,7 +68,7 @@ class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
   alias accept_rule               ignore
   alias accept_verbatim           ignore
   alias end_accepting             ignore
-  alias handle_regexp_HARD_BREAK  ignore
+  alias handle_special_HARD_BREAK ignore
   alias start_accepting           ignore
 
 end
diff --git a/lib/rdoc/markup/to_markdown.rb b/lib/rdoc/markup/to_markdown.rb
index 3ee48becb0..9074547b4c 100644
--- a/lib/rdoc/markup/to_markdown.rb
+++ b/lib/rdoc/markup/to_markdown.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # :markup: markdown
 
 ##
@@ -19,8 +19,8 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
     @headings[5] = ['##### ',  '']
     @headings[6] = ['###### ', '']
 
-    add_regexp_handling_RDOCLINK
-    add_regexp_handling_TIDYLINK
+    add_special_RDOCLINK
+    add_special_TIDYLINK
 
     @hard_break = "  \n"
   end
@@ -37,7 +37,7 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
   ##
   # Adds a newline to the output
 
-  def handle_regexp_HARD_BREAK target
+  def handle_special_HARD_BREAK special
     "  \n"
   end
 
@@ -131,7 +131,7 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
       @res << part
     end
 
-    @res << "\n"
+    @res << "\n" unless @res =~ /\n\z/
   end
 
   ##
@@ -166,8 +166,8 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
   ##
   # Converts the RDoc markup tidylink into a Markdown.style link.
 
-  def handle_regexp_TIDYLINK target
-    text = target.text
+  def handle_special_TIDYLINK special
+    text = special.text
 
     return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
 
@@ -184,8 +184,8 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
   ##
   # Converts the rdoc-...: links into a Markdown.style links.
 
-  def handle_regexp_RDOCLINK target
-    handle_rdoc_link target.text
+  def handle_special_RDOCLINK special
+    handle_rdoc_link special.text
   end
 
 end
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
index 81b16c4973..a40c09859f 100644
--- a/lib/rdoc/markup/to_rdoc.rb
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Outputs RDoc markup as RDoc markup! (mostly)
 
@@ -45,7 +45,7 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   def initialize markup = nil
     super nil, markup
 
-    @markup.add_regexp_handling(/\\\S/, :SUPPRESSED_CROSSREF)
+    @markup.add_special(/\\\S/, :SUPPRESSED_CROSSREF)
     @width = 78
     init_tags
 
@@ -234,7 +234,7 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
       @res << part
     end
 
-    @res << "\n"
+    @res << "\n" unless @res =~ /\n\z/
   end
 
   ##
@@ -253,10 +253,10 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   end
 
   ##
-  # Removes preceding \\ from the suppressed crossref +target+
+  # Removes preceding \\ from the suppressed crossref +special+
 
-  def handle_regexp_SUPPRESSED_CROSSREF target
-    text = target.text
+  def handle_special_SUPPRESSED_CROSSREF special
+    text = special.text
     text = text.sub('\\', '') unless in_tt?
     text
   end
@@ -264,7 +264,7 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   ##
   # Adds a newline to the output
 
-  def handle_regexp_HARD_BREAK target
+  def handle_special_HARD_BREAK special
     "\n"
   end
 
diff --git a/lib/rdoc/markup/to_table_of_contents.rb b/lib/rdoc/markup/to_table_of_contents.rb
index f68b90bcf6..eae7c59d94 100644
--- a/lib/rdoc/markup/to_table_of_contents.rb
+++ b/lib/rdoc/markup/to_table_of_contents.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Extracts just the RDoc::Markup::Heading elements from a
 # RDoc::Markup::Document to help build a table of contents
diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb
index 61d3cffaf0..7b1fa8c630 100644
--- a/lib/rdoc/markup/to_test.rb
+++ b/lib/rdoc/markup/to_test.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # This Markup outputter is used for testing purposes.
 
diff --git a/lib/rdoc/markup/to_tt_only.rb b/lib/rdoc/markup/to_tt_only.rb
index 9235d33f04..ba20fcdd00 100644
--- a/lib/rdoc/markup/to_tt_only.rb
+++ b/lib/rdoc/markup/to_tt_only.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Extracts sections of text enclosed in plus, tt or code.  Used to discover
 # undocumented parameters.
@@ -91,8 +91,8 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
       when RDoc::Markup::AttrChanger then
         off_tags res, item
         on_tags res, item
-      when RDoc::Markup::RegexpHandling then
-        @res << convert_regexp_handling(item) if in_tt? # TODO can this happen?
+      when RDoc::Markup::Special then
+        @res << convert_special(item) if in_tt? # TODO can this happen?
       else
         raise "Unknown flow element: #{item.inspect}"
       end
diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb
index 7f1bc29a09..a0b1d05928 100644
--- a/lib/rdoc/markup/verbatim.rb
+++ b/lib/rdoc/markup/verbatim.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A section of verbatim text
 
diff --git a/lib/rdoc/meta_method.rb b/lib/rdoc/meta_method.rb
index 7927a9ce9c..408c089dd1 100644
--- a/lib/rdoc/meta_method.rb
+++ b/lib/rdoc/meta_method.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # MetaMethod represents a meta-programmed method
 
diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb
index 3cef78c4a5..50eab141be 100644
--- a/lib/rdoc/method_attr.rb
+++ b/lib/rdoc/method_attr.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Abstract class representing either a method or an attribute.
 
@@ -188,7 +188,7 @@ class RDoc::MethodAttr < RDoc::CodeObject
       next if String === ancestor
       next if parent == ancestor
 
-      other = ancestor.find_method_named('#' + name) ||
+      other = ancestor.find_method_named('#' << name) ||
               ancestor.find_attribute_named(name)
 
       return other if other
diff --git a/lib/rdoc/mixin.rb b/lib/rdoc/mixin.rb
index 379d7cc526..14f04c15e7 100644
--- a/lib/rdoc/mixin.rb
+++ b/lib/rdoc/mixin.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A Mixin adds features from a module into another context.  RDoc::Include and
 # RDoc::Extend are both mixins.
diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb
index 6729b18448..eb53e964dd 100644
--- a/lib/rdoc/normal_class.rb
+++ b/lib/rdoc/normal_class.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A normal class, neither singleton nor anonymous
 
@@ -47,9 +47,9 @@ class RDoc::NormalClass < RDoc::ClassModule
   def to_s # :nodoc:
     display = "#{self.class.name} #{self.full_name}"
     if superclass
-      display += ' < ' + (superclass.is_a?(String) ? superclass : superclass.full_name)
+      display << ' < ' << (superclass.is_a?(String) ? superclass : superclass.full_name)
     end
-    display += ' -> ' + is_alias_for.to_s if is_alias_for
+    display << ' -> ' << is_alias_for.to_s if is_alias_for
     display
   end
 
diff --git a/lib/rdoc/normal_module.rb b/lib/rdoc/normal_module.rb
index 8f364be41c..d046c8cbfe 100644
--- a/lib/rdoc/normal_module.rb
+++ b/lib/rdoc/normal_module.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A normal module, like NormalClass
 
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 801a84b21f..2bc7474eb0 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'optparse'
 require 'pathname'
 
@@ -164,7 +164,7 @@ class RDoc::Options
   ##
   # Files matching this pattern will be excluded
 
-  attr_writer :exclude
+  attr_accessor :exclude
 
   ##
   # The list of files to be processed
@@ -494,20 +494,6 @@ class RDoc::Options
   end
 
   ##
-  # Create a regexp for #exclude
-
-  def exclude
-    if @exclude.nil? or Regexp === @exclude then
-      # done, #finish is being re-run
-      @exclude
-    elsif @exclude.empty? then
-      nil
-    else
-      Regexp.new(@exclude.join("|"))
-    end
-  end
-
-  ##
   # Completes any unfinished option setup business such as filtering for
   # existent files, creating a regexp for #exclude and setting a default
   # #template.
@@ -519,7 +505,13 @@ class RDoc::Options
     root = @root.to_s
     @rdoc_include << root unless @rdoc_include.include?(root)
 
-    @exclude = self.exclude
+    if @exclude.nil? or Regexp === @exclude then
+      # done, #finish is being re-run
+    elsif @exclude.empty? then
+      @exclude = nil
+    else
+      @exclude = Regexp.new(@exclude.join("|"))
+    end
 
     finish_page_dir
 
@@ -632,16 +624,16 @@ Usage: #{opt.program_name} [options] [names...]
       end
 
       parsers.sort.each do |parser, regexp|
-        opt.banner += "  - #{parser}: #{regexp.join ', '}\n"
+        opt.banner << "  - #{parser}: #{regexp.join ', '}\n"
       end
-      opt.banner += "  - TomDoc:  Only in ruby files\n"
+      opt.banner << "  - TomDoc:  Only in ruby files\n"
 
-      opt.banner += "\n  The following options are deprecated:\n\n"
+      opt.banner << "\n  The following options are deprecated:\n\n"
 
       name_length = DEPRECATED.keys.sort_by { |k| k.length }.last.length
 
       DEPRECATED.sort_by { |k,| k }.each do |name, reason|
-        opt.banner += "    %*1$2$s  %3$s\n" % [-name_length, name, reason]
+        opt.banner << "    %*1$2$s  %3$s\n" % [-name_length, name, reason]
       end
 
       opt.accept Template do |template|
@@ -1095,7 +1087,7 @@ Usage: #{opt.program_name} [options] [names...]
 
     unless quiet then
       deprecated.each do |opt|
-        $stderr.puts 'option ' + opt + ' is deprecated: ' + DEPRECATED[opt]
+        $stderr.puts 'option ' << opt << ' is deprecated: ' << DEPRECATED[opt]
       end
     end
 
@@ -1195,6 +1187,19 @@ Usage: #{opt.program_name} [options] [names...]
     end
   end
 
+  ##
+  # This is compatibility code for syck
+
+  def to_yaml opts = {} # :nodoc:
+    return super if YAML.const_defined?(:ENGINE) and not YAML::ENGINE.syck?
+
+    YAML.quick_emit self, opts do |out|
+      out.map taguri, to_yaml_style do |map|
+        encode_with map
+      end
+    end
+  end
+
   # Sets the minimum visibility of a documented method.
   #
   # Accepts +:public+, +:protected+, +:private+, +:nodoc+, or +:all+.
@@ -1225,7 +1230,7 @@ Usage: #{opt.program_name} [options] [names...]
   def write_options
     RDoc.load_yaml
 
-    File.open '.rdoc_options', 'w' do |io|
+    open '.rdoc_options', 'w' do |io|
       io.set_encoding Encoding::UTF_8
 
       YAML.dump self, io
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
index 597bcd6b9d..9c207edcff 100644
--- a/lib/rdoc/parser.rb
+++ b/lib/rdoc/parser.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 ##
 # A parser is simple a class that subclasses RDoc::Parser and implements #scan
@@ -76,15 +76,50 @@ class RDoc::Parser
 
     s = File.read(file, 1024) or return false
 
+    have_encoding = s.respond_to? :encoding
+
     return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
 
-    mode = 'r:utf-8' # default source encoding has been chagened to utf-8
-    s.sub!(/\A#!.*\n/, '')     # assume shebang line isn't longer than 1024.
-    encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
-    mode = "rb:#{encoding}" if encoding
-    s = File.open(file, mode) {|f| f.gets(nil, 1024)}
+    if have_encoding then
+      mode = "r"
+      s.sub!(/\A#!.*\n/, '')     # assume shebang line isn't longer than 1024.
+      encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
+      mode = "rb:#{encoding}" if encoding
+      s = File.open(file, mode) {|f| f.gets(nil, 1024)}
+
+      not s.valid_encoding?
+    else
+      if 0.respond_to? :fdiv then
+        s.count("\x00-\x7F", "^ -~\t\r\n").fdiv(s.size) > 0.3
+      else # HACK 1.8.6
+        (s.count("\x00-\x7F", "^ -~\t\r\n").to_f / s.size) > 0.3
+      end
+    end
+  end
 
-    not s.valid_encoding?
+  ##
+  # Processes common directives for CodeObjects for the C and Ruby parsers.
+  #
+  # Applies +directive+'s +value+ to +code_object+, if appropriate
+
+  def self.process_directive code_object, directive, value
+    warn "RDoc::Parser::process_directive is deprecated and wil be removed in RDoc 4.  Use RDoc::Markup::PreProcess#handle_directive instead" if $-w
+
+    case directive
+    when 'nodoc' then
+      code_object.document_self = nil # notify nodoc
+      code_object.document_children = value.downcase != 'all'
+    when 'doc' then
+      code_object.document_self = true
+      code_object.force_documentation = true
+    when 'yield', 'yields' then
+      # remove parameter &block
+      code_object.params.sub!(/,?\s*&\w+/, '') if code_object.params
+
+      code_object.block_params = value
+    when 'arg', 'args' then
+      code_object.params = value
+    end
   end
 
   ##
@@ -139,7 +174,7 @@ class RDoc::Parser
   # Returns the file type from the modeline in +file_name+
 
   def self.check_modeline file_name
-    line = File.open file_name do |io|
+    line = open file_name do |io|
       io.gets
     end
 
@@ -155,9 +190,7 @@ class RDoc::Parser
     return nil if /coding:/i =~ type
 
     type.downcase
-  rescue ArgumentError
-  rescue Encoding::InvalidByteSequenceError # invalid byte sequence
-
+  rescue ArgumentError # invalid byte sequence, etc.
   end
 
   ##
@@ -275,3 +308,4 @@ require 'rdoc/parser/changelog'
 require 'rdoc/parser/markdown'
 require 'rdoc/parser/rd'
 require 'rdoc/parser/ruby'
+
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
index 425ea11f63..087d56f7b9 100644
--- a/lib/rdoc/parser/c.rb
+++ b/lib/rdoc/parser/c.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'tsort'
 
 ##
@@ -217,7 +217,6 @@ class RDoc::Parser::C < RDoc::Parser
   def deduplicate_call_seq
     @methods.each do |var_name, functions|
       class_name = @known_classes[var_name]
-      next unless class_name
       class_obj  = find_class var_name, class_name
 
       functions.each_value do |method_names|
@@ -667,9 +666,11 @@ class RDoc::Parser::C < RDoc::Parser
 
       #meth_obj.params = params
       meth_obj.start_collecting_tokens
-      tk = { :line_no => 1, :char_no => 1, :text => body }
+      tk = RDoc::RubyToken::Token.new nil, 1, 1
+      tk.set_text body
       meth_obj.add_token tk
       meth_obj.comment = comment
+      meth_obj.offset  = offset
       meth_obj.line    = file_content[0, offset].count("\n") + 1
 
       body
@@ -684,9 +685,11 @@ class RDoc::Parser::C < RDoc::Parser
       find_modifiers comment, meth_obj
 
       meth_obj.start_collecting_tokens
-      tk = { :line_no => 1, :char_no => 1, :text => body }
+      tk = RDoc::RubyToken::Token.new nil, 1, 1
+      tk.set_text body
       meth_obj.add_token tk
       meth_obj.comment = comment
+      meth_obj.offset  = offset
       meth_obj.line    = file_content[0, offset].count("\n") + 1
 
       body
@@ -866,8 +869,8 @@ class RDoc::Parser::C < RDoc::Parser
 
   def handle_attr(var_name, attr_name, read, write)
     rw = ''
-    rw += 'R' if '1' == read
-    rw += 'W' if '1' == write
+    rw << 'R' if '1' == read
+    rw << 'W' if '1' == write
 
     class_name = @known_classes[var_name]
 
@@ -983,8 +986,8 @@ class RDoc::Parser::C < RDoc::Parser
         if new_definition.empty? then # Default to literal C definition
           new_definition = definition
         else
-          new_definition = new_definition.gsub("\:", ":")
-          new_definition = new_definition.gsub("\\", '\\')
+          new_definition.gsub!("\:", ":")
+          new_definition.gsub!("\\", '\\')
         end
 
         new_definition.sub!(/\A(\s+)/, '')
@@ -1238,7 +1241,7 @@ class RDoc::Parser::C < RDoc::Parser
   # when scanning for classes and methods
 
   def remove_commented_out_lines
-    @content = @content.gsub(%r%//.*rb_define_%, '//')
+    @content.gsub!(%r%//.*rb_define_%, '//')
   end
 
   ##
diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb
index 167892f543..c6c2d2bb23 100644
--- a/lib/rdoc/parser/changelog.rb
+++ b/lib/rdoc/parser/changelog.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'time'
 
 ##
@@ -29,13 +29,13 @@ class RDoc::Parser::ChangeLog < RDoc::Parser
 
     if last =~ /\)\s*\z/ and continuation =~ /\A\(/ then
       last.sub!(/\)\s*\z/, ',')
-      continuation = continuation.sub(/\A\(/, '')
+      continuation.sub!(/\A\(/, '')
     end
 
     if last =~ /\s\z/ then
       last << continuation
     else
-      last << ' ' + continuation
+      last << ' ' << continuation
     end
   end
 
@@ -162,12 +162,12 @@ class RDoc::Parser::ChangeLog < RDoc::Parser
 
         entry_body = []
       when /^(\t| {8})?\*\s*(.*)/ then # "\t* file.c (func): ..."
-        entry_body << $2.dup
+        entry_body << $2
       when /^(\t| {8})?\s*(\(.*)/ then # "\t(func): ..."
         entry = $2
 
         if entry_body.last =~ /:/ then
-          entry_body << entry.dup
+          entry_body << entry
         else
           continue_entry_body entry_body, entry
         end
diff --git a/lib/rdoc/parser/markdown.rb b/lib/rdoc/parser/markdown.rb
index 9ff478f872..feffb26ced 100644
--- a/lib/rdoc/parser/markdown.rb
+++ b/lib/rdoc/parser/markdown.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Parse a Markdown format file.  The parsed RDoc::Markup::Document is attached
 # as a file comment.
diff --git a/lib/rdoc/parser/rd.rb b/lib/rdoc/parser/rd.rb
index 25f5711731..e6693b9ac8 100644
--- a/lib/rdoc/parser/rd.rb
+++ b/lib/rdoc/parser/rd.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Parse a RD format file.  The parsed RDoc::Markup::Document is attached as a
 # file comment.
diff --git a/lib/rdoc/parser/ripper_state_lex.rb b/lib/rdoc/parser/ripper_state_lex.rb
deleted file mode 100644
index cc7a87976c..0000000000
--- a/lib/rdoc/parser/ripper_state_lex.rb
+++ /dev/null
@@ -1,589 +0,0 @@
-# frozen_string_literal: true
-require 'ripper'
-
-class RDoc::Parser::RipperStateLex
-  # TODO: Remove this constants after Ruby 2.4 EOL
-  RIPPER_HAS_LEX_STATE = Ripper::Filter.method_defined?(:state)
-
-  Token = Struct.new(:line_no, :char_no, :kind, :text, :state)
-
-  EXPR_NONE = 0
-  EXPR_BEG = 1
-  EXPR_END = 2
-  EXPR_ENDARG = 4
-  EXPR_ENDFN = 8
-  EXPR_ARG = 16
-  EXPR_CMDARG = 32
-  EXPR_MID = 64
-  EXPR_FNAME = 128
-  EXPR_DOT = 256
-  EXPR_CLASS = 512
-  EXPR_LABEL = 1024
-  EXPR_LABELED = 2048
-  EXPR_FITEM = 4096
-  EXPR_VALUE = EXPR_BEG
-  EXPR_BEG_ANY  =  (EXPR_BEG | EXPR_MID | EXPR_CLASS)
-  EXPR_ARG_ANY  =  (EXPR_ARG | EXPR_CMDARG)
-  EXPR_END_ANY  =  (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
-
-  class InnerStateLex < Ripper::Filter
-    attr_accessor :lex_state
-
-    def initialize(code)
-      @lex_state = EXPR_BEG
-      @in_fname = false
-      @continue = false
-      reset
-      super(code)
-    end
-
-    def reset
-      @command_start = false
-      @cmd_state = @command_start
-    end
-
-    def on_nl(tok, data)
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @continue = true
-      else
-        @continue = false
-        @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_ignored_nl(tok, data)
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @continue = true
-      else
-        @continue = false
-        @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_op(tok, data)
-      case tok
-      when '&', '|', '!', '!=', '!~'
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      when '<<'
-        # TODO next token?
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      when '?'
-        @lex_state = EXPR_BEG
-      when '&&', '||', '+=', '-=', '*=', '**=',
-           '&=', '|=', '^=', '<<=', '>>=', '||=', '&&='
-        @lex_state = EXPR_BEG
-      when '::'
-        case @lex_state
-        when EXPR_ARG, EXPR_CMDARG
-          @lex_state = EXPR_DOT
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      else
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_kw(tok, data)
-      case tok
-      when 'class'
-        @lex_state = EXPR_CLASS
-        @in_fname = true
-      when 'def'
-        @lex_state = EXPR_FNAME
-        @continue = true
-        @in_fname = true
-      when 'if', 'unless', 'while', 'until'
-        if ((EXPR_MID | EXPR_END | EXPR_ENDARG | EXPR_ENDFN | EXPR_ARG | EXPR_CMDARG) & @lex_state) != 0 # postfix if
-          @lex_state = EXPR_BEG | EXPR_LABEL
-        else
-          @lex_state = EXPR_BEG
-        end
-      when 'begin', 'case', 'when'
-        @lex_state = EXPR_BEG
-      when 'return', 'break'
-        @lex_state = EXPR_MID
-      else
-        if @lex_state == EXPR_FNAME
-          @lex_state = EXPR_END
-        else
-          @lex_state = EXPR_END
-        end
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_tstring_beg(tok, data)
-      @lex_state = EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_tstring_end(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_CHAR(tok, data)
-      @lex_state = EXPR_END
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_period(tok, data)
-      @lex_state = EXPR_DOT
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_int(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_float(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rational(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_imaginary(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_symbeg(tok, data)
-      @lex_state = EXPR_FNAME
-      @continue = true
-      @in_fname = true
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    private def on_variables(event, tok, data)
-      if @in_fname
-        @lex_state = EXPR_ENDFN
-        @in_fname = false
-        @continue = false
-      elsif @continue
-        case @lex_state
-        when EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_ENDFN
-          @continue = false
-        end
-      else
-        @lex_state = EXPR_CMDARG
-      end
-      data << Token.new(lineno, column, event, tok, @lex_state)
-    end
-
-    def on_ident(tok, data)
-      on_variables(__method__, tok, data)
-    end
-
-    def on_ivar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_cvar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_gvar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_backref(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_lparen(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rparen(tok, data)
-      @lex_state = EXPR_ENDFN
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_lbrace(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rbrace(tok, data)
-      @lex_state = EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_lbracket(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rbracket(tok, data)
-      @lex_state = EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_const(tok, data)
-      case @lex_state
-      when EXPR_FNAME
-        @lex_state = EXPR_ENDFN
-      when EXPR_CLASS, EXPR_CMDARG, EXPR_MID
-        @lex_state = EXPR_ARG
-      else
-        @lex_state = EXPR_CMDARG
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_sp(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_comma(tok, data)
-      @lex_state = EXPR_BEG | EXPR_LABEL if (EXPR_ARG_ANY & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_comment(tok, data)
-      @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_ignored_sp(tok, data)
-      @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_heredoc_beg(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-      @lex_state = EXPR_END
-      data
-    end
-
-    def on_heredoc_end(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-      @lex_state = EXPR_BEG
-      data
-    end
-
-    def on_default(event, tok, data)
-      reset
-      data << Token.new(lineno, column, event, tok, @lex_state)
-    end
-  end unless RIPPER_HAS_LEX_STATE
-
-  class InnerStateLex < Ripper::Filter
-    def initialize(code)
-      super(code)
-    end
-
-    def on_default(event, tok, data)
-      data << Token.new(lineno, column, event, tok, state)
-    end
-  end if RIPPER_HAS_LEX_STATE
-
-  def get_squashed_tk
-    if @buf.empty?
-      tk = @tokens.shift
-    else
-      tk = @buf.shift
-    end
-    return nil if tk.nil?
-    case tk[:kind]
-    when :on_symbeg then
-      tk = get_symbol_tk(tk)
-    when :on_tstring_beg then
-      tk = get_string_tk(tk)
-    when :on_backtick then
-      if (tk[:state] & (EXPR_FNAME | EXPR_ENDFN)) != 0
-        @inner_lex.lex_state = EXPR_ARG unless RIPPER_HAS_LEX_STATE
-        tk[:kind] = :on_ident
-        tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
-      else
-        tk = get_string_tk(tk)
-      end
-    when :on_regexp_beg then
-      tk = get_regexp_tk(tk)
-    when :on_embdoc_beg then
-      tk = get_embdoc_tk(tk)
-    when :on_heredoc_beg then
-      @heredoc_queue << retrieve_heredoc_info(tk)
-      @inner_lex.lex_state = EXPR_END unless RIPPER_HAS_LEX_STATE
-    when :on_nl, :on_ignored_nl, :on_comment, :on_heredoc_end then
-      if !@heredoc_queue.empty?
-        get_heredoc_tk(*@heredoc_queue.shift)
-      elsif tk[:text].nil? # :on_ignored_nl sometimes gives nil
-        tk[:text] = ''
-      end
-    when :on_words_beg then
-      tk = get_words_tk(tk)
-    when :on_qwords_beg then
-      tk = get_words_tk(tk)
-    when :on_symbols_beg then
-      tk = get_words_tk(tk)
-    when :on_qsymbols_beg then
-      tk = get_words_tk(tk)
-    when :on_op then
-      if '&.' == tk[:text]
-        tk[:kind] = :on_period
-      else
-        tk = get_op_tk(tk)
-      end
-    end
-    tk
-  end
-
-  private def get_symbol_tk(tk)
-    is_symbol = true
-    symbol_tk = Token.new(tk.line_no, tk.char_no, :on_symbol)
-    if ":'" == tk[:text] or ':"' == tk[:text]
-      tk1 = get_string_tk(tk)
-      symbol_tk[:text] = tk1[:text]
-      symbol_tk[:state] = tk1[:state]
-    else
-      case (tk1 = get_squashed_tk)[:kind]
-      when :on_ident
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_tstring_content
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = get_squashed_tk[:state] # skip :on_tstring_end
-      when :on_tstring_end
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_op
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_ivar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_cvar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_gvar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_const
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_kw
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      else
-        is_symbol = false
-        tk = tk1
-      end
-    end
-    if is_symbol
-      tk = symbol_tk
-    end
-    tk
-  end
-
-  private def get_string_tk(tk)
-    string = tk[:text]
-    state = nil
-    kind = :on_tstring
-    loop do
-      inner_str_tk = get_squashed_tk
-      if inner_str_tk.nil?
-        break
-      elsif :on_tstring_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        break
-      elsif :on_label_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        kind = :on_symbol
-        break
-      else
-        string = string + inner_str_tk[:text]
-        if :on_embexpr_beg == inner_str_tk[:kind] then
-          kind = :on_dstring if :on_tstring == kind
-        end
-      end
-    end
-    Token.new(tk.line_no, tk.char_no, kind, string, state)
-  end
-
-  private def get_regexp_tk(tk)
-    string = tk[:text]
-    state = nil
-    loop do
-      inner_str_tk = get_squashed_tk
-      if inner_str_tk.nil?
-        break
-      elsif :on_regexp_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        break
-      else
-        string = string + inner_str_tk[:text]
-      end
-    end
-    Token.new(tk.line_no, tk.char_no, :on_regexp, string, state)
-  end
-
-  private def get_embdoc_tk(tk)
-    string = tk[:text]
-    until :on_embdoc_end == (embdoc_tk = get_squashed_tk)[:kind] do
-      string = string + embdoc_tk[:text]
-    end
-    string = string + embdoc_tk[:text]
-    Token.new(tk.line_no, tk.char_no, :on_embdoc, string, embdoc_tk.state)
-  end
-
-  private def get_heredoc_tk(heredoc_name, indent)
-    string = ''
-    start_tk = nil
-    prev_tk = nil
-    until heredoc_end?(heredoc_name, indent, tk = @tokens.shift) do
-      start_tk = tk unless start_tk
-      if (prev_tk.nil? or "\n" == prev_tk[:text][-1]) and 0 != tk[:char_no]
-        string = string + (' ' * tk[:char_no])
-      end
-      string = string + tk[:text]
-      prev_tk = tk
-    end
-    start_tk = tk unless start_tk
-    prev_tk = tk unless prev_tk
-    @buf.unshift tk # closing heredoc
-    heredoc_tk = Token.new(start_tk.line_no, start_tk.char_no, :on_heredoc, string, prev_tk.state)
-    @buf.unshift heredoc_tk
-  end
-
-  private def retrieve_heredoc_info(tk)
-    name = tk[:text].gsub(/\A<<[-~]?(['"`]?)(.+)\1\z/, '\2')
-    indent = tk[:text] =~ /\A<<[-~]/
-    [name, indent]
-  end
-
-  private def heredoc_end?(name, indent, tk)
-    result = false
-    if :on_heredoc_end == tk[:kind] then
-      tk_name = (indent ? tk[:text].gsub(/^ *(.+)\n?$/, '\1') : tk[:text].gsub(/\n\z/, ''))
-      if name == tk_name
-        result = true
-      end
-    end
-    result
-  end
-
-  private def get_words_tk(tk)
-    string = ''
-    start_token = tk[:text]
-    start_quote = tk[:text].rstrip[-1]
-    line_no = tk[:line_no]
-    char_no = tk[:char_no]
-    state = tk[:state]
-    end_quote =
-      case start_quote
-      when ?( then ?)
-      when ?[ then ?]
-      when ?{ then ?}
-      when ?< then ?>
-      else start_quote
-      end
-    end_token = nil
-    loop do
-      tk = get_squashed_tk
-      if tk.nil?
-        end_token = end_quote
-        break
-      elsif :on_tstring_content == tk[:kind] then
-        string += tk[:text]
-      elsif :on_words_sep == tk[:kind] or :on_tstring_end == tk[:kind] then
-        if end_quote == tk[:text].strip then
-          end_token = tk[:text]
-          break
-        else
-          string += tk[:text]
-        end
-      else
-        string += tk[:text]
-      end
-    end
-    text = "#{start_token}#{string}#{end_token}"
-    Token.new(line_no, char_no, :on_dstring, text, state)
-  end
-
-  private def get_op_tk(tk)
-    redefinable_operators = %w[! != !~ % & * ** + +@ - -@ / < << <= <=> == === =~ > >= >> [] []= ^ ` | ~]
-    if redefinable_operators.include?(tk[:text]) and tk[:state] == EXPR_ARG then
-      @inner_lex.lex_state = EXPR_ARG unless RIPPER_HAS_LEX_STATE
-      tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
-      tk[:kind] = :on_ident
-    elsif tk[:text] =~ /^[-+]$/ then
-      tk_ahead = get_squashed_tk
-      case tk_ahead[:kind]
-      when :on_int, :on_float, :on_rational, :on_imaginary then
-        tk[:text] += tk_ahead[:text]
-        tk[:kind] = tk_ahead[:kind]
-        tk[:state] = tk_ahead[:state]
-      when :on_heredoc_beg, :on_tstring, :on_dstring # frozen/non-frozen string literal
-        tk[:text] += tk_ahead[:text]
-        tk[:kind] = tk_ahead[:kind]
-        tk[:state] = tk_ahead[:state]
-      else
-        @buf.unshift tk_ahead
-      end
-    end
-    tk
-  end
-
-  def initialize(code)
-    @buf = []
-    @heredoc_queue = []
-    @inner_lex = InnerStateLex.new(code)
-    @tokens = @inner_lex.parse([])
-  end
-
-  def self.parse(code)
-    lex = self.new(code)
-    tokens = []
-    begin
-      while tk = lex.get_squashed_tk
-        tokens.push tk
-      end
-    rescue StopIteration
-    end
-    tokens
-  end
-
-  def self.end?(token)
-    (token[:state] & EXPR_END)
-  end
-end
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index 97399f87ff..c30dbf0f4e 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # This file contains stuff stolen outright from:
 #
@@ -8,6 +8,8 @@
 #       by Keiju ISHITSUKA (Nippon Rational Inc.)
 #
 
+$TOKEN_DEBUG ||= nil
+
 ##
 # Extracts code elements from a source file returning a TopLevel object
 # containing the constituent file elements.
@@ -22,7 +24,6 @@
 # * aliases
 # * private, public, protected
 # * private_class_function, public_class_function
-# * private_constant, public_constant
 # * module_function
 # * attr, attr_reader, attr_writer, attr_accessor
 # * extra accessors given on the command line
@@ -138,13 +139,11 @@
 # Note that by default, the :method: directive will be ignored if there is a
 # standard rdocable item following it.
 
-require 'ripper'
-require_relative 'ripper_state_lex'
-
 class RDoc::Parser::Ruby < RDoc::Parser
 
   parse_files_matching(/\.rbw?$/)
 
+  include RDoc::RubyToken
   include RDoc::TokenStream
   include RDoc::Parser::RubyTools
 
@@ -164,22 +163,10 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def initialize(top_level, file_name, content, options, stats)
     super
 
-    if /\t/ =~ content then
-      tab_width = @options.tab_width
-      content = content.split(/\n/).map do |line|
-        1 while line.gsub!(/\t+/) {
-          ' ' * (tab_width*$&.length - $`.length % tab_width)
-        }  && $~
-        line
-      end.join("\n")
-    end
-
     @size = 0
     @token_listeners = nil
-    content = RDoc::Encoding.remove_magic_comment content
-    @scanner = RDoc::Parser::RipperStateLex.parse(content)
-    @content = content
-    @scanner_point = 0
+    @scanner = RDoc::RubyLex.new content, @options
+    @scanner.exception_on_syntax_error = false
     @prev_seek = nil
     @markup = @options.markup
     @track_visibility = :nodoc != @options.visibility
@@ -188,10 +175,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
     reset
   end
 
-  def tk_nl?(tk)
-    :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]
-  end
-
   ##
   # Retrieves the read token stream and replaces +pattern+ with +replacement+
   # using gsub.  If the result is only a ";" returns an empty string.
@@ -211,7 +194,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # methods.
 
   def get_visibility_information tk, single # :nodoc:
-    vis_type  = tk[:text]
+    vis_type  = tk.name
     singleton = single == SINGLE
 
     vis =
@@ -240,32 +223,31 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def collect_first_comment
     skip_tkspace
-    comment = ''.dup
-    comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
+    comment = ''
+    comment.force_encoding @encoding if @encoding
     first_line = true
-    first_comment_tk_kind = nil
+    first_comment_tk_class = nil
 
     tk = get_tk
 
-    while tk && (:on_comment == tk[:kind] or :on_embdoc == tk[:kind])
-      comment_body = retrieve_comment_body(tk)
-      if first_line and comment_body =~ /\A#!/ then
+    while TkCOMMENT === tk
+      if first_line and tk.text =~ /\A#!/ then
         skip_tkspace
         tk = get_tk
-      elsif first_line and comment_body =~ /\A#\s*-\*-/ then
+      elsif first_line and tk.text =~ /\A#\s*-\*-/ then
         first_line = false
         skip_tkspace
         tk = get_tk
       else
-        break if first_comment_tk_kind and not first_comment_tk_kind === tk[:kind]
-        first_comment_tk_kind = tk[:kind]
+        break if first_comment_tk_class and not first_comment_tk_class === tk
+        first_comment_tk_class = tk.class
 
         first_line = false
-        comment << comment_body
+        comment << tk.text << "\n"
         tk = get_tk
 
-        if :on_nl === tk then
-          skip_tkspace_without_nl
+        if TkNL === tk then
+          skip_tkspace false
           tk = get_tk
         end
       end
@@ -280,7 +262,8 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Consumes trailing whitespace from the token stream
 
   def consume_trailing_spaces # :nodoc:
-    skip_tkspace_without_nl
+    get_tkread
+    skip_tkspace false
   end
 
   ##
@@ -307,7 +290,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
             container.find_module_named rhs_name
           end
 
-    container.add_module_alias mod, rhs_name, constant, @top_level
+    container.add_module_alias mod, constant.name, @top_level if mod
   end
 
   ##
@@ -320,14 +303,16 @@ class RDoc::Parser::Ruby < RDoc::Parser
   end
 
   ##
-  # Looks for a true or false token.
+  # Looks for a true or false token.  Returns false if TkFALSE or TkNIL are
+  # found.
 
   def get_bool
     skip_tkspace
     tk = get_tk
-    if :on_kw == tk[:kind] && 'true' == tk[:text]
+    case tk
+    when TkTRUE
       true
-    elsif :on_kw == tk[:kind] && ('false' == tk[:text] || 'nil' == tk[:text])
+    when TkFALSE, TkNIL
       false
     else
       unget_tk tk
@@ -343,31 +328,27 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def get_class_or_module container, ignore_constants = false
     skip_tkspace
     name_t = get_tk
-    given_name = ''.dup
+    given_name = ''
 
     # class ::A -> A is in the top level
-    if :on_op == name_t[:kind] and '::' == name_t[:text] then # bug
+    case name_t
+    when TkCOLON2, TkCOLON3 then # bug
       name_t = get_tk
       container = @top_level
       given_name << '::'
     end
 
-    skip_tkspace_without_nl
-    given_name << name_t[:text]
+    skip_tkspace false
+    given_name << name_t.name
 
-    is_self = name_t[:kind] == :on_op && name_t[:text] == '<<'
-    new_modules = []
-    while !is_self && (tk = peek_tk) and :on_op == tk[:kind] and '::' == tk[:text] do
+    while TkCOLON2 === peek_tk do
       prev_container = container
-      container = container.find_module_named name_t[:text]
+      container = container.find_module_named name_t.name
       container ||=
         if ignore_constants then
-          c = RDoc::NormalModule.new name_t[:text]
-          c.store = @store
-          new_modules << [prev_container, c]
-          c
+          RDoc::Context.new
         else
-          c = prev_container.add_module RDoc::NormalModule, name_t[:text]
+          c = prev_container.add_module RDoc::NormalModule, name_t.name
           c.ignore unless prev_container.document_children
           @top_level.add_to_classes_or_modules c
           c
@@ -376,47 +357,35 @@ class RDoc::Parser::Ruby < RDoc::Parser
       record_location container
 
       get_tk
-      skip_tkspace_without_nl
+      skip_tkspace false
       name_t = get_tk
-      unless :on_const == name_t[:kind] || :on_ident == name_t[:kind]
-        raise RDoc::Error, "Invalid class or module definition: #{given_name}"
-      end
-      if prev_container == container and !ignore_constants
-        given_name = name_t[:text]
-      else
-        given_name << '::' + name_t[:text]
-      end
+      given_name << '::' << name_t.name
     end
 
-    skip_tkspace_without_nl
+    skip_tkspace false
 
-    return [container, name_t, given_name, new_modules]
+    return [container, name_t, given_name]
   end
 
   ##
   # Return a superclass, which can be either a constant of an expression
 
   def get_class_specification
-    tk = peek_tk
-    if tk.nil?
-      return ''
-    elsif :on_kw == tk[:kind] && 'self' == tk[:text]
-      return 'self'
-    elsif :on_gvar == tk[:kind]
-      return ''
+    case peek_tk
+    when TkSELF then return 'self'
+    when TkGVAR then return ''
     end
 
     res = get_constant
 
-    skip_tkspace_without_nl
+    skip_tkspace false
 
     get_tkread # empty out read buffer
 
     tk = get_tk
-    return res unless tk
 
-    case tk[:kind]
-    when :on_nl, :on_comment, :on_embdoc, :on_semicolon then
+    case tk
+    when TkNL, TkCOMMENT, TkSEMICOLON then
       unget_tk(tk)
       return res
     end
@@ -431,11 +400,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def get_constant
     res = ""
-    skip_tkspace_without_nl
+    skip_tkspace false
     tk = get_tk
 
-    while tk && ((:on_op == tk[:kind] && '::' == tk[:text]) || :on_const == tk[:kind]) do
-      res += tk[:text]
+    while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
+      res += tk.name
       tk = get_tk
     end
 
@@ -444,83 +413,28 @@ class RDoc::Parser::Ruby < RDoc::Parser
   end
 
   ##
-  # Get an included module that may be surrounded by parens
+  # Get a constant that may be surrounded by parens
 
-  def get_included_module_with_optional_parens
-    skip_tkspace_without_nl
-    get_tkread
-    tk = get_tk
-    end_token = get_end_token tk
-    return '' unless end_token
+  def get_constant_with_optional_parens
+    skip_tkspace false
 
     nest = 0
-    continue = false
-    only_constant = true
 
-    while tk != nil do
-      is_element_of_constant = false
-      case tk[:kind]
-      when :on_semicolon then
-        break if nest == 0
-      when :on_lbracket then
-        nest += 1
-      when :on_rbracket then
-        nest -= 1
-      when :on_lbrace then
-        nest += 1
-      when :on_rbrace then
-        nest -= 1
-        if nest <= 0
-          # we might have a.each { |i| yield i }
-          unget_tk(tk) if nest < 0
-          break
-        end
-      when :on_lparen then
-        nest += 1
-      when end_token[:kind] then
-        if end_token[:kind] == :on_rparen
-          nest -= 1
-          break if nest <= 0
-        else
-          break if nest <= 0
-        end
-      when :on_rparen then
-        nest -= 1
-      when :on_comment, :on_embdoc then
-        @read.pop
-        if :on_nl == end_token[:kind] and "\n" == tk[:text][-1] and
-          (!continue or (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0) then
-          break if !continue and nest <= 0
-        end
-      when :on_comma then
-        continue = true
-      when :on_ident then
-        continue = false if continue
-      when :on_kw then
-        case tk[:text]
-        when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
-          nest += 1
-        when 'if', 'unless', 'while', 'until', 'rescue'
-          # postfix if/unless/while/until/rescue must be EXPR_LABEL
-          nest += 1 unless (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0
-        when 'end'
-          nest -= 1
-          break if nest == 0
-        end
-      when :on_const then
-        is_element_of_constant = true
-      when :on_op then
-        is_element_of_constant = true if '::' == tk[:text]
-      end
-      only_constant = false unless is_element_of_constant
-      tk = get_tk
+    while TkLPAREN === (tk = peek_tk) or TkfLPAREN === tk do
+      get_tk
+      skip_tkspace
+      nest += 1
     end
 
-    if only_constant
-      get_tkread_clean(/\s+/, ' ')
-    else
-      ''
+    name = get_constant
+
+    while nest > 0
+      skip_tkspace
+      tk = get_tk
+      nest -= 1 if TkRPAREN === tk
     end
+
+    name
   end
 
   ##
@@ -532,19 +446,13 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # won't catch all cases (such as "a = yield + 1"
 
   def get_end_token tk # :nodoc:
-    case tk[:kind]
-    when :on_lparen
-      token = RDoc::Parser::RipperStateLex::Token.new
-      token[:kind] = :on_rparen
-      token[:text] = ')'
-      token
-    when :on_rparen
+    case tk
+    when TkLPAREN, TkfLPAREN
+      TkRPAREN
+    when TkRPAREN
       nil
     else
-      token = RDoc::Parser::RipperStateLex::Token.new
-      token[:kind] = :on_nl
-      token[:text] = "\n"
-      token
+      TkNL
     end
   end
 
@@ -553,11 +461,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def get_method_container container, name_t # :nodoc:
     prev_container = container
-    container = container.find_module_named(name_t[:text])
+    container = container.find_module_named(name_t.name)
 
     unless container then
       constant = prev_container.constants.find do |const|
-        const.name == name_t[:text]
+        const.name == name_t.name
       end
 
       if constant then
@@ -568,21 +476,21 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     unless container then
       # TODO seems broken, should starting at Object in @store
-      obj = name_t[:text].split("::").inject(Object) do |state, item|
+      obj = name_t.name.split("::").inject(Object) do |state, item|
         state.const_get(item)
       end rescue nil
 
       type = obj.class == Class ? RDoc::NormalClass : RDoc::NormalModule
 
       unless [Class, Module].include?(obj.class) then
-        warn("Couldn't find #{name_t[:text]}. Assuming it's a module")
+        warn("Couldn't find #{name_t.name}. Assuming it's a module")
       end
 
       if type == RDoc::NormalClass then
         sclass = obj.superclass ? obj.superclass.name : nil
-        container = prev_container.add_class type, name_t[:text], sclass
+        container = prev_container.add_class type, name_t.name, sclass
       else
-        container = prev_container.add_module type, name_t[:text]
+        container = prev_container.add_module type, name_t.name
       end
 
       record_location container
@@ -596,26 +504,32 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def get_symbol_or_name
     tk = get_tk
-    case tk[:kind]
-    when :on_symbol then
-      text = tk[:text].sub(/^:/, '')
+    case tk
+    when TkSYMBOL then
+      text = tk.text.sub(/^:/, '')
 
-      next_tk = peek_tk
-      if next_tk && :on_op == next_tk[:kind] && '=' == next_tk[:text] then
+      if TkASSIGN === peek_tk then
         get_tk
         text << '='
       end
 
       text
-    when :on_ident, :on_const, :on_gvar, :on_cvar, :on_ivar, :on_op, :on_kw then
-      tk[:text]
-    when :on_tstring, :on_dstring then
-      tk[:text][1..-2]
+    when TkId, TkOp then
+      tk.name
+    when TkAMPER,
+         TkDSTRING,
+         TkSTAR,
+         TkSTRING then
+      tk.text
     else
       raise RDoc::Error, "Name or symbol expected (got #{tk})"
     end
   end
 
+  def stop_at_EXPR_END # :nodoc:
+    @scanner.lex_state == :EXPR_END || !@scanner.continue
+  end
+
   ##
   # Marks containers between +container+ and +ancestor+ as ignored
 
@@ -634,31 +548,29 @@ class RDoc::Parser::Ruby < RDoc::Parser
   #
   # This routine modifies its +comment+ parameter.
 
-  def look_for_directives_in container, comment
-    @preprocess.handle comment, container do |directive, param|
+  def look_for_directives_in context, comment
+    @preprocess.handle comment, context do |directive, param|
       case directive
       when 'method', 'singleton-method',
            'attr', 'attr_accessor', 'attr_reader', 'attr_writer' then
         false # handled elsewhere
       when 'section' then
-        break unless container.kind_of?(RDoc::Context)
-        container.set_current_section param, comment.dup
+        context.set_current_section param, comment.dup
         comment.text = ''
         break
       end
     end
 
-    comment.remove_private
+    remove_private_comments comment
   end
 
   ##
   # Adds useful info about the parser to +message+
 
   def make_message message
-    prefix = "#{@file_name}:".dup
+    prefix = "#{@file_name}:"
 
-    tk = peek_tk
-    prefix << "#{tk[:line_no]}:#{tk[:char_no]}:" if tk
+    prefix << "#{@scanner.line_no}:#{@scanner.char_no}:" if @scanner
 
     "#{prefix} #{message}"
   end
@@ -677,22 +589,24 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # +comment+.
 
   def parse_attr(context, single, tk, comment)
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
     args = parse_symbol_arg 1
     if args.size > 0 then
       name = args[0]
       rw = "R"
-      skip_tkspace_without_nl
+      skip_tkspace false
       tk = get_tk
 
-      if :on_comma == tk[:kind] then
+      if TkCOMMA === tk then
         rw = "RW" if get_bool
       else
         unget_tk tk
       end
 
       att = create_attr context, single, name, rw, comment
+      att.offset = offset
       att.line   = line_no
 
       read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
@@ -706,7 +620,8 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # comment for each to +comment+.
 
   def parse_attr_accessor(context, single, tk, comment)
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
     args = parse_symbol_arg
     rw = "?"
@@ -717,7 +632,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
     # and add found items appropriately but here we do not.  I'm not sure why.
     return if @track_visibility and not tmp.document_self
 
-    case tk[:text]
+    case tk.name
     when "attr_reader"   then rw = "R"
     when "attr_writer"   then rw = "W"
     when "attr_accessor" then rw = "RW"
@@ -727,6 +642,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     for name in args
       att = create_attr context, single, name, rw, comment
+      att.offset = offset
       att.line   = line_no
     end
   end
@@ -735,19 +651,22 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Parses an +alias+ in +context+ with +comment+
 
   def parse_alias(context, single, tk, comment)
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
     skip_tkspace
 
-    if :on_lparen === peek_tk[:kind] then
+    if TkLPAREN === peek_tk then
       get_tk
       skip_tkspace
     end
 
     new_name = get_symbol_or_name
 
+    @scanner.lex_state = :EXPR_FNAME
+
     skip_tkspace
-    if :on_comma === peek_tk[:kind] then
+    if TkCOMMA === peek_tk then
       get_tk
       skip_tkspace
     end
@@ -761,6 +680,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
     al = RDoc::Alias.new(get_tkread, old_name, new_name, comment,
                          single == SINGLE)
     record_location al
+    al.offset = offset
     al.line   = line_no
 
     read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
@@ -774,38 +694,34 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Extracts call parameters from the token stream.
 
   def parse_call_parameters(tk)
-    end_token = case tk[:kind]
-                when :on_lparen
-                  :on_rparen
-                when :on_rparen
+    end_token = case tk
+                when TkLPAREN, TkfLPAREN
+                  TkRPAREN
+                when TkRPAREN
                   return ""
                 else
-                  :on_nl
+                  TkNL
                 end
     nest = 0
 
     loop do
-      break if tk.nil?
-      case tk[:kind]
-      when :on_semicolon
+      case tk
+      when TkSEMICOLON
         break
-      when :on_lparen
+      when TkLPAREN, TkfLPAREN
         nest += 1
       when end_token
-        if end_token == :on_rparen
+        if end_token == TkRPAREN
           nest -= 1
-          break if RDoc::Parser::RipperStateLex.end?(tk) and nest <= 0
+          break if @scanner.lex_state == :EXPR_END and nest <= 0
         else
-          break if RDoc::Parser::RipperStateLex.end?(tk)
+          break unless @scanner.continue
         end
-      when :on_comment, :on_embdoc
+      when TkCOMMENT, TkASSIGN, TkOPASGN
         unget_tk(tk)
         break
-      when :on_op
-        if tk[:text] =~ /^(.{1,2})?=$/
-          unget_tk(tk)
-          break
-        end
+      when nil then
+        break
       end
       tk = get_tk
     end
@@ -817,33 +733,33 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Parses a class in +context+ with +comment+
 
   def parse_class container, single, tk, comment
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
     declaration_context = container
-    container, name_t, given_name, = get_class_or_module container
-
-    if name_t[:kind] == :on_const
-      cls = parse_class_regular container, declaration_context, single,
-        name_t, given_name, comment
-    elsif name_t[:kind] == :on_op && name_t[:text] == '<<'
-      case name = get_class_specification
-      when 'self', container.name
-        read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
-        parse_statements container, SINGLE
-        return # don't update line
+    container, name_t, given_name = get_class_or_module container
+
+    cls =
+      case name_t
+      when TkCONSTANT
+        parse_class_regular container, declaration_context, single,
+          name_t, given_name, comment
+      when TkLSHFT
+        case name = get_class_specification
+        when 'self', container.name
+          parse_statements container, SINGLE
+          return # don't update offset or line
+        else
+          parse_class_singleton container, name, comment
+        end
       else
-        cls = parse_class_singleton container, name, comment
+        warn "Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}"
+        return
       end
-    else
-      warn "Expected class name or '<<'. Got #{name_t[:kind]}: #{name_t[:text].inspect}"
-      return
-    end
 
+    cls.offset = offset
     cls.line   = line_no
 
-    # after end modifiers
-    read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
-
     cls
   end
 
@@ -859,8 +775,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
       given_name = $'
     end
 
-    tk = peek_tk
-    if tk[:kind] == :on_op && tk[:text] == '<' then
+    if TkLT === peek_tk then
       get_tk
       skip_tkspace
       superclass = get_class_specification
@@ -930,125 +845,102 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # true, no found constants will be added to RDoc.
 
   def parse_constant container, tk, comment, ignore_constants = false
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
-    name = tk[:text]
-    skip_tkspace_without_nl
+    name = tk.name
+    skip_tkspace false
 
     return unless name =~ /^\w+$/
 
-    new_modules = []
-    if :on_op == peek_tk[:kind] && '::' == peek_tk[:text] then
+    eq_tk = get_tk
+
+    if TkCOLON2 === eq_tk then
+      unget_tk eq_tk
       unget_tk tk
 
-      container, name_t, _, new_modules = get_class_or_module container, true
+      container, name_t, = get_class_or_module container, ignore_constants
 
-      name = name_t[:text]
-    end
+      name = name_t.name
 
-    is_array_or_hash = false
-    if peek_tk && :on_lbracket == peek_tk[:kind]
-      get_tk
-      nest = 1
-      while bracket_tk = get_tk
-        case bracket_tk[:kind]
-        when :on_lbracket
-          nest += 1
-        when :on_rbracket
-          nest -= 1
-          break if nest == 0
-        end
-      end
-      skip_tkspace_without_nl
-      is_array_or_hash = true
+      eq_tk = get_tk
     end
 
-    unless peek_tk && :on_op == peek_tk[:kind] && '=' == peek_tk[:text] then
+    unless TkASSIGN === eq_tk then
+      unget_tk eq_tk
       return false
     end
-    get_tk
 
-    unless ignore_constants
-      new_modules.each do |prev_c, new_module|
-        prev_c.add_module_by_normal_module new_module
-        new_module.ignore unless prev_c.document_children
-        @top_level.add_to_classes_or_modules new_module
-      end
+    if TkGT === peek_tk then
+      unget_tk eq_tk
+      return
     end
 
     value = ''
     con = RDoc::Constant.new name, value, comment
 
-    body = parse_constant_body container, con, is_array_or_hash
+    body = parse_constant_body container, con
 
     return unless body
 
-    con.value = body
+    value.replace body
     record_location con
+    con.offset = offset
     con.line   = line_no
     read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
 
-    return if is_array_or_hash
-
     @stats.add_constant con
     container.add_constant con
 
     true
   end
 
-  def parse_constant_body container, constant, is_array_or_hash # :nodoc:
+  def parse_constant_body container, constant # :nodoc:
     nest     = 0
-    rhs_name = ''.dup
+    rhs_name = ''
 
     get_tkread
 
     tk = get_tk
 
-    body = nil
     loop do
-      break if tk.nil?
-      if :on_semicolon == tk[:kind] then
+      case tk
+      when TkSEMICOLON then
         break if nest <= 0
-      elsif [:on_tlambeg, :on_lparen, :on_lbrace, :on_lbracket].include?(tk[:kind]) then
-        nest += 1
-      elsif (:on_kw == tk[:kind] && 'def' == tk[:text]) then
+      when TkLPAREN, TkfLPAREN, TkLBRACE, TkfLBRACE, TkLBRACK, TkfLBRACK,
+           TkDO, TkIF, TkUNLESS, TkCASE, TkDEF, TkBEGIN then
         nest += 1
-      elsif (:on_kw == tk[:kind] && %w{do if unless case begin}.include?(tk[:text])) then
-        if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-          nest += 1
-        end
-      elsif [:on_rparen, :on_rbrace, :on_rbracket].include?(tk[:kind]) ||
-            (:on_kw == tk[:kind] && 'end' == tk[:text]) then
+      when TkRPAREN, TkRBRACE, TkRBRACK, TkEND then
         nest -= 1
-      elsif (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) then
-        unget_tk tk
-        if nest <= 0 and RDoc::Parser::RipperStateLex.end?(tk) then
-          body = get_tkread_clean(/^[ \t]+/, '')
-          read_documentation_modifiers constant, RDoc::CONSTANT_MODIFIERS
+      when TkCOMMENT then
+        if nest <= 0 and stop_at_EXPR_END then
+          unget_tk tk
           break
         else
+          unget_tk tk
           read_documentation_modifiers constant, RDoc::CONSTANT_MODIFIERS
         end
-      elsif :on_const == tk[:kind] then
-        rhs_name << tk[:text]
+      when TkCONSTANT then
+        rhs_name << tk.name
 
-        next_tk = peek_tk
-        if nest <= 0 and (next_tk.nil? || :on_nl == next_tk[:kind]) then
-          create_module_alias container, constant, rhs_name unless is_array_or_hash
+        if nest <= 0 and TkNL === peek_tk then
+          create_module_alias container, constant, rhs_name
           break
         end
-      elsif :on_nl == tk[:kind] then
-        if nest <= 0 and RDoc::Parser::RipperStateLex.end?(tk) then
+      when TkNL then
+        if nest <= 0 and stop_at_EXPR_END then
           unget_tk tk
           break
         end
-      elsif :on_op == tk[:kind] && '::' == tk[:text]
+      when TkCOLON2, TkCOLON3 then
         rhs_name << '::'
+      when nil then
+        break
       end
       tk = get_tk
     end
 
-    body ? body : get_tkread_clean(/^[ \t]+/, '')
+    get_tkread_clean(/^[ \t]+/, '')
   end
 
   ##
@@ -1057,21 +949,24 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def parse_comment container, tk, comment
     return parse_comment_tomdoc container, tk, comment if @markup == 'tomdoc'
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
+    column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
-    comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3')
-    singleton = !!$~
+    text = comment.text
+
+    singleton = !!text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
 
     co =
-      if (comment.text = comment.text.sub(/^# +:?method: *(\S*).*?\n/i, '')) && !!$~ then
-        parse_comment_ghost container, comment.text, $1, column, line_no, comment
-      elsif (comment.text = comment.text.sub(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '')) && !!$~ then
+      if text.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
+        parse_comment_ghost container, text, $1, column, line_no, comment
+      elsif text.sub!(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
         parse_comment_attr container, $1, $3, comment
       end
 
     if co then
       co.singleton = singleton
+      co.offset    = offset
       co.line      = line_no
     end
 
@@ -1102,11 +997,12 @@ class RDoc::Parser::Ruby < RDoc::Parser
     record_location meth
 
     meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
+    indent = TkSPACE.new 0, 1, 1
+    indent.set_text " " * column
+
+    position_comment = TkCOMMENT.new 0, line_no, 1
+    position_comment.set_text "# File #{@top_level.relative_name}, line #{line_no}"
+    meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
 
     meth.params =
       if text.sub!(/^#\s+:?args?:\s*(.*?)\s*$/i, '') then
@@ -1135,21 +1031,23 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def parse_comment_tomdoc container, tk, comment
     return unless signature = RDoc::TomDoc.signature(comment)
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
+    offset  = tk.seek
+    line_no = tk.line_no
 
     name, = signature.split %r%[ \(]%, 2
 
     meth = RDoc::GhostMethod.new get_tkread, name
     record_location meth
+    meth.offset    = offset
     meth.line      = line_no
 
     meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
+    indent = TkSPACE.new 0, 1, 1
+    indent.set_text " " * offset
+
+    position_comment = TkCOMMENT.new 0, line_no, 1
+    position_comment.set_text "# File #{@top_level.relative_name}, line #{line_no}"
+    meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
 
     meth.call_seq = signature
 
@@ -1172,14 +1070,14 @@ class RDoc::Parser::Ruby < RDoc::Parser
     loop do
       skip_tkspace_comment
 
-      name = get_included_module_with_optional_parens
+      name = get_constant_with_optional_parens
 
       unless name.empty? then
         obj = container.add klass, name, comment
         record_location obj
       end
 
-      return if peek_tk.nil? || :on_comma != peek_tk[:kind]
+      return unless TkCOMMA === peek_tk
 
       get_tk
     end
@@ -1191,14 +1089,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Returns true if the comment was not consumed.
 
   def parse_identifier container, single, tk, comment # :nodoc:
-    case tk[:text]
+    case tk.name
     when 'private', 'protected', 'public', 'private_class_method',
          'public_class_method', 'module_function' then
       parse_visibility container, single, tk
       return true
-    when 'private_constant', 'public_constant'
-      parse_constant_visibility container, single, tk
-      return true
     when 'attr' then
       parse_attr container, single, tk, comment
     when /^attr_(reader|writer|accessor)$/ then
@@ -1263,9 +1158,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
     tmp = RDoc::CodeObject.new
     read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
 
-    regexp = /^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i
-    if regexp =~ comment.text then
-      comment.text = comment.text.sub(regexp, '')
+    if comment.text.sub!(/^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
       rw = case $1
            when 'attr_reader' then 'R'
            when 'attr_writer' then 'W'
@@ -1289,17 +1182,17 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Parses a meta-programmed method
 
   def parse_meta_method(container, single, tk, comment)
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
+    column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
     start_collecting_tokens
     add_token tk
     add_token_listener self
 
-    skip_tkspace_without_nl
+    skip_tkspace false
 
-    comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3')
-    singleton = !!$~
+    singleton = !!comment.text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
 
     name = parse_meta_method_name comment, tk
 
@@ -1307,17 +1200,19 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     meth = RDoc::MetaMethod.new get_tkread, name
     record_location meth
+    meth.offset = offset
     meth.line   = line_no
     meth.singleton = singleton
 
     remove_token_listener self
 
     meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
+    indent = TkSPACE.new 0, 1, 1
+    indent.set_text " " * column
+
+    position_comment = TkCOMMENT.new 0, line_no, 1
+    position_comment.value = "# File #{@top_level.relative_name}, line #{line_no}"
+    meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
     meth.add_tokens @token_stream
 
     parse_meta_method_params container, single, meth, tk, comment
@@ -1341,16 +1236,17 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     name_t = get_tk
 
-    if :on_symbol == name_t[:kind] then
-      name_t[:text][1..-1]
-    elsif :on_tstring == name_t[:kind] then
-      name_t[:text][1..-2]
-    elsif :on_op == name_t[:kind] && '=' == name_t[:text] then # ignore
+    case name_t
+    when TkSYMBOL then
+      name_t.text[1..-1]
+    when TkSTRING then
+      name_t.value[1..-2]
+    when TkASSIGN then # ignore
       remove_token_listener self
 
       nil
     else
-      warn "unknown name token #{name_t.inspect} for meta-method '#{tk[:text]}'"
+      warn "unknown name token #{name_t.inspect} for meta-method '#{tk.name}'"
       'unknown'
     end
   end
@@ -1362,7 +1258,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
     token_listener meth do
       meth.params = ''
 
-      look_for_directives_in meth, comment
       comment.normalize
       comment.extract_call_seq meth
 
@@ -1371,13 +1266,14 @@ class RDoc::Parser::Ruby < RDoc::Parser
       last_tk = tk
 
       while tk = get_tk do
-        if :on_semicolon == tk[:kind] then
+        case tk
+        when TkSEMICOLON then
           break
-        elsif :on_nl == tk[:kind] then
-          break unless last_tk and :on_comma == last_tk[:kind]
-        elsif :on_sp == tk[:kind] then
+        when TkNL then
+          break unless last_tk and TkCOMMA === last_tk
+        when TkSPACE then
           # expression continues
-        elsif :on_kw == tk[:kind] && 'do' == tk[:text] then
+        when TkDO then
           parse_statements container, single, meth
           break
         else
@@ -1394,8 +1290,9 @@ class RDoc::Parser::Ruby < RDoc::Parser
     singleton = nil
     added_container = false
     name = nil
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
+    column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
     start_collecting_tokens
     add_token tk
@@ -1409,18 +1306,19 @@ class RDoc::Parser::Ruby < RDoc::Parser
     return unless name
 
     meth = RDoc::AnyMethod.new get_tkread, name
-    look_for_directives_in meth, comment
     meth.singleton = single == SINGLE ? true : singleton
 
     record_location meth
+    meth.offset = offset
     meth.line   = line_no
 
     meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    token = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    token[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [token, newline, indent]
+    indent = TkSPACE.new 0, 1, 1
+    indent.set_text " " * column
+
+    token = TkCOMMENT.new 0, line_no, 1
+    token.set_text "# File #{@top_level.relative_name}, line #{line_no}"
+    meth.add_tokens [token, NEWLINE_TOKEN, indent]
     meth.add_tokens @token_stream
 
     parse_method_params_and_body container, single, meth, added_container
@@ -1430,9 +1328,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     meth.comment = comment
 
-    # after end modifiers
-    read_documentation_modifiers meth, RDoc::METHOD_MODIFIERS
-
     @stats.add_method meth
   end
 
@@ -1441,6 +1336,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def parse_method_params_and_body container, single, meth, added_container
     token_listener meth do
+      @scanner.continue = false
       parse_method_parameters meth
 
       if meth.document_self or not @track_visibility then
@@ -1483,13 +1379,15 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # it is a singleton or regular method.
 
   def parse_method_name container # :nodoc:
+    @scanner.lex_state = :EXPR_FNAME
+
     skip_tkspace
     name_t = get_tk
-    back_tk = skip_tkspace_without_nl
+    back_tk = skip_tkspace
     singleton = false
 
-    dot = get_tk
-    if dot[:kind] == :on_period || (dot[:kind] == :on_op && dot[:text] == '::') then
+    case dot = get_tk
+    when TkDOT, TkCOLON2 then
       singleton = true
 
       name, container = parse_method_name_singleton container, name_t
@@ -1510,15 +1408,16 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # is parsed from the token stream for a regular method.
 
   def parse_method_name_regular container, name_t # :nodoc:
-    if :on_op == name_t[:kind] && (%w{* & [] []= <<}.include?(name_t[:text])) then
-      name_t[:text]
+    case name_t
+    when TkSTAR, TkAMPER then
+      name_t.text
     else
-      unless [:on_kw, :on_const, :on_ident].include?(name_t[:kind]) then
+      unless name_t.respond_to? :name then
         warn "expected method name token, . or ::, got #{name_t.inspect}"
         skip_method container
         return
       end
-      name_t[:text]
+      name_t.name
     end
   end
 
@@ -1528,42 +1427,47 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # for a singleton method.
 
   def parse_method_name_singleton container, name_t # :nodoc:
+    @scanner.lex_state = :EXPR_FNAME
     skip_tkspace
     name_t2 = get_tk
 
-    if (:on_kw == name_t[:kind] && 'self' == name_t[:text]) || (:on_op == name_t[:kind] && '%' == name_t[:text]) then
-      # NOTE: work around '[' being consumed early
-      if :on_lbracket == name_t2[:kind]
-        get_tk
-        name = '[]'
-      else
-        name = name_t2[:text]
-      end
-    elsif :on_const == name_t[:kind] then
-      name = name_t2[:text]
+    name =
+      case name_t
+      when TkSELF, TkMOD then
+        case name_t2
+          # NOTE: work around '[' being consumed early and not being re-tokenized
+          # as a TkAREF
+        when TkfLBRACK then
+          get_tk
+          '[]'
+        else
+          name_t2.name
+        end
+      when TkCONSTANT then
+        name = name_t2.name
 
-      container = get_method_container container, name_t
+        container = get_method_container container, name_t
 
-      return unless container
+        return unless container
 
-      name
-    elsif :on_ident == name_t[:kind] || :on_ivar == name_t[:kind] || :on_gvar == name_t[:kind] then
-      parse_method_dummy container
+        name
+      when TkIDENTIFIER, TkIVAR, TkGVAR then
+        parse_method_dummy container
 
-      name = nil
-    elsif (:on_kw == name_t[:kind]) && ('true' == name_t[:text] || 'false' == name_t[:text] || 'nil' == name_t[:text]) then
-      klass_name = "#{name_t[:text].capitalize}Class"
-      container = @store.find_class_named klass_name
-      container ||= @top_level.add_class RDoc::NormalClass, klass_name
+        nil
+      when TkTRUE, TkFALSE, TkNIL then
+        klass_name = "#{name_t.name.capitalize}Class"
+        container = @store.find_class_named klass_name
+        container ||= @top_level.add_class RDoc::NormalClass, klass_name
 
-      name = name_t2[:text]
-    else
-      warn "unexpected method name token #{name_t.inspect}"
-      # break
-      skip_method container
+        name_t2.name
+      else
+        warn "unexpected method name token #{name_t.inspect}"
+        # break
+        skip_method container
 
-      name = nil
-    end
+        nil
+      end
 
     return name, container
   end
@@ -1573,56 +1477,45 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def parse_method_or_yield_parameters(method = nil,
                                        modifiers = RDoc::METHOD_MODIFIERS)
-    skip_tkspace_without_nl
+    skip_tkspace false
     tk = get_tk
     end_token = get_end_token tk
     return '' unless end_token
 
     nest = 0
-    continue = false
 
-    while tk != nil do
-      case tk[:kind]
-      when :on_semicolon then
+    loop do
+      case tk
+      when TkSEMICOLON then
         break if nest == 0
-      when :on_lbracket then
+      when TkLBRACE, TkfLBRACE then
         nest += 1
-      when :on_rbracket then
-        nest -= 1
-      when :on_lbrace then
-        nest += 1
-      when :on_rbrace then
+      when TkRBRACE then
         nest -= 1
         if nest <= 0
           # we might have a.each { |i| yield i }
           unget_tk(tk) if nest < 0
           break
         end
-      when :on_lparen then
+      when TkLPAREN, TkfLPAREN then
         nest += 1
-      when end_token[:kind] then
-        if end_token[:kind] == :on_rparen
+      when end_token then
+        if end_token == TkRPAREN
           nest -= 1
           break if nest <= 0
         else
-          break
+          break unless @scanner.continue
         end
-      when :on_rparen then
+      when TkRPAREN then
         nest -= 1
-      when :on_comment, :on_embdoc then
+      when method && method.block_params.nil? && TkCOMMENT then
+        unget_tk tk
+        read_documentation_modifiers method, modifiers
         @read.pop
-        if :on_nl == end_token[:kind] and "\n" == tk[:text][-1] and
-          (!continue or (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0) then
-          if method && method.block_params.nil? then
-            unget_tk tk
-            read_documentation_modifiers method, modifiers
-          end
-          break if !continue and nest <= 0
-        end
-      when :on_comma then
-        continue = true
-      when :on_ident then
-        continue = false if continue
+      when TkCOMMENT then
+        @read.pop
+      when nil then
+        break
       end
       tk = get_tk
     end
@@ -1646,7 +1539,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     return if  method.block_params
 
-    skip_tkspace_without_nl
+    skip_tkspace false
     read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
   end
 
@@ -1656,7 +1549,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def parse_module container, single, tk, comment
     container, name_t, = get_class_or_module container
 
-    name = name_t[:text]
+    name = name_t.name
 
     mod = container.add_module RDoc::NormalModule, name
     mod.ignore unless container.document_children
@@ -1666,9 +1559,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
     mod.add_comment comment, @top_level
     parse_statements mod
 
-    # after end modifiers
-    read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
-
     @stats.add_module mod
   end
 
@@ -1679,12 +1569,12 @@ class RDoc::Parser::Ruby < RDoc::Parser
     skip_tkspace_comment
     tk = get_tk
 
-    if :on_lparen == tk[:kind] then
+    if TkLPAREN === tk then
       skip_tkspace_comment
       tk = get_tk
     end
 
-    name = tk[:text][1..-2] if :on_tstring == tk[:kind]
+    name = tk.text if TkSTRING === tk
 
     if name then
       @top_level.add_require RDoc::Require.new(name, comment)
@@ -1697,30 +1587,19 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Parses a rescue
 
   def parse_rescue
-    skip_tkspace_without_nl
+    skip_tkspace false
 
     while tk = get_tk
-      case tk[:kind]
-      when :on_nl, :on_semicolon, :on_comment then
+      case tk
+      when TkNL, TkSEMICOLON then
         break
-      when :on_comma then
-        skip_tkspace_without_nl
+      when TkCOMMA then
+        skip_tkspace false
 
-        get_tk if :on_nl == peek_tk[:kind]
+        get_tk if TkNL === peek_tk
       end
 
-      skip_tkspace_without_nl
-    end
-  end
-
-  ##
-  # Retrieve comment body without =begin/=end
-
-  def retrieve_comment_body(tk)
-    if :on_embdoc == tk[:kind]
-      tk[:text].gsub(/\A=begin.*\n/, '').gsub(/=end\n?\z/, '')
-    else
-      tk[:text]
+      skip_tkspace false
     end
   end
 
@@ -1730,7 +1609,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def parse_statements(container, single = NORMAL, current_method = nil,
                        comment = new_comment(''))
     raise 'no' unless RDoc::Comment === comment
-    comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
+    comment.force_encoding @encoding if @encoding
 
     nest = 1
     save_visibility = container.visibility
@@ -1741,50 +1620,32 @@ class RDoc::Parser::Ruby < RDoc::Parser
       keep_comment = false
       try_parse_comment = false
 
-      non_comment_seen = true unless (:on_comment == tk[:kind] or :on_embdoc == tk[:kind])
+      non_comment_seen = true unless TkCOMMENT === tk
 
-      case tk[:kind]
-      when :on_nl, :on_ignored_nl, :on_comment, :on_embdoc then
-        if :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]
-          skip_tkspace
-          tk = get_tk
-        else
-          past_tokens = @read.size > 1 ? @read[0..-2] : []
-          nl_position = 0
-          past_tokens.reverse.each_with_index do |read_tk, i|
-            if read_tk =~ /^\n$/ then
-              nl_position = (past_tokens.size - 1) - i
-              break
-            elsif read_tk =~ /^#.*\n$/ then
-              nl_position = ((past_tokens.size - 1) - i) + 1
-              break
-            end
-          end
-          comment_only_line = past_tokens[nl_position..-1].all?{ |c| c =~ /^\s+$/ }
-          unless comment_only_line then
-            tk = get_tk
-          end
-        end
+      case tk
+      when TkNL then
+        skip_tkspace
+        tk = get_tk
 
-        if tk and (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) then
+        if TkCOMMENT === tk then
           if non_comment_seen then
             # Look for RDoc in a comment about to be thrown away
             non_comment_seen = parse_comment container, tk, comment unless
               comment.empty?
 
             comment = ''
-            comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
+            comment.force_encoding @encoding if @encoding
           end
 
-          while tk and (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) do
-            comment_body = retrieve_comment_body(tk)
-            comment += comment_body
-            comment += "\n" unless "\n" == comment_body.chars.to_a.last
+          while TkCOMMENT === tk do
+            comment << tk.text << "\n"
 
-            if comment_body.size > 1 && "\n" == comment_body.chars.to_a.last then
-              skip_tkspace_without_nl # leading spaces
-            end
             tk = get_tk
+
+            if TkNL === tk then
+              skip_tkspace false # leading spaces
+              tk = get_tk
+            end
           end
 
           comment = new_comment comment
@@ -1805,78 +1666,60 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
         unget_tk tk
         keep_comment = true
-        container.current_line_visibility = nil
 
-      when :on_kw then
-        case tk[:text]
-        when 'class' then
-          parse_class container, single, tk, comment
+      when TkCLASS then
+        parse_class container, single, tk, comment
 
-        when 'module' then
-          parse_module container, single, tk, comment
+      when TkMODULE then
+        parse_module container, single, tk, comment
 
-        when 'def' then
-          parse_method container, single, tk, comment
+      when TkDEF then
+        parse_method container, single, tk, comment
 
-        when 'alias' then
-          parse_alias container, single, tk, comment unless current_method
-
-        when 'yield' then
-          if current_method.nil? then
-            warn "Warning: yield outside of method" if container.document_self
-          else
-            parse_yield container, single, tk, current_method
-          end
-
-        when 'until', 'while' then
-          if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-            nest += 1
-            skip_optional_do_after_expression
-          end
-
-        # Until and While can have a 'do', which shouldn't increase the nesting.
-        # We can't solve the general case, but we can handle most occurrences by
-        # ignoring a do at the end of a line.
+      when TkCONSTANT then
+        unless parse_constant container, tk, comment, current_method then
+          try_parse_comment = true
+        end
 
-        # 'for' is trickier
-        when 'for' then
-          nest += 1
-          skip_for_variable
-          skip_optional_do_after_expression
+      when TkALIAS then
+        parse_alias container, single, tk, comment unless current_method
 
-        when 'case', 'do', 'if', 'unless', 'begin' then
-          if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-            nest += 1
-          end
+      when TkYIELD then
+        if current_method.nil? then
+          warn "Warning: yield outside of method" if container.document_self
+        else
+          parse_yield container, single, tk, current_method
+        end
 
-        when 'super' then
-          current_method.calls_super = true if current_method
+      # Until and While can have a 'do', which shouldn't increase the nesting.
+      # We can't solve the general case, but we can handle most occurrences by
+      # ignoring a do at the end of a line.
 
-        when 'rescue' then
-          parse_rescue
+      when TkUNTIL, TkWHILE then
+        nest += 1
+        skip_optional_do_after_expression
 
-        when 'end' then
-          nest -= 1
-          if nest == 0 then
-            container.ongoing_visibility = save_visibility
+      # 'for' is trickier
+      when TkFOR then
+        nest += 1
+        skip_for_variable
+        skip_optional_do_after_expression
 
-            parse_comment container, tk, comment unless comment.empty?
+      when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN then
+        nest += 1
 
-            return
-          end
-        end
+      when TkSUPER then
+        current_method.calls_super = true if current_method
 
-      when :on_const then
-        unless parse_constant container, tk, comment, current_method then
-          try_parse_comment = true
-        end
+      when TkRESCUE then
+        parse_rescue
 
-      when :on_ident then
+      when TkIDENTIFIER then
         if nest == 1 and current_method.nil? then
           keep_comment = parse_identifier container, single, tk, comment
         end
 
-        case tk[:text]
+        case tk.name
         when "require" then
           parse_require container, comment
         when "include" then
@@ -1885,6 +1728,16 @@ class RDoc::Parser::Ruby < RDoc::Parser
           parse_extend_or_include RDoc::Extend, container, comment
         end
 
+      when TkEND then
+        nest -= 1
+        if nest == 0 then
+          read_documentation_modifiers container, RDoc::CLASS_MODIFIERS
+          container.ongoing_visibility = save_visibility
+
+          parse_comment container, tk, comment unless comment.empty?
+
+          return
+        end
       else
         try_parse_comment = nest == 1
       end
@@ -1898,7 +1751,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
       unless keep_comment then
         comment = new_comment ''
-        comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
+        comment.force_encoding @encoding if @encoding
         container.params = nil
         container.block_params = nil
       end
@@ -1916,8 +1769,8 @@ class RDoc::Parser::Ruby < RDoc::Parser
   def parse_symbol_arg(no = nil)
     skip_tkspace_comment
 
-    tk = get_tk
-    if tk[:kind] == :on_lparen
+    case tk = get_tk
+    when TkLPAREN
       parse_symbol_arg_paren no
     else
       parse_symbol_arg_space no, tk
@@ -1939,10 +1792,10 @@ class RDoc::Parser::Ruby < RDoc::Parser
       end
 
       skip_tkspace_comment
-      case (tk2 = get_tk)[:kind]
-      when :on_rparen
+      case tk2 = get_tk
+      when TkRPAREN
         break
-      when :on_comma
+      when TkCOMMA
       else
         warn("unexpected token: '#{tk2.inspect}'") if $DEBUG_RDOC
         break
@@ -1966,10 +1819,10 @@ class RDoc::Parser::Ruby < RDoc::Parser
     end
 
     loop do
-      skip_tkspace_without_nl
+      skip_tkspace false
 
       tk1 = get_tk
-      if tk1.nil? || :on_comma != tk1[:kind] then
+      unless TkCOMMA === tk1 then
         unget_tk tk1
         break
       end
@@ -1988,12 +1841,12 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # Returns symbol text from the next token
 
   def parse_symbol_in_arg
-    tk = get_tk
-    if :on_symbol == tk[:kind] then
-      tk[:text].sub(/^:/, '')
-    elsif :on_tstring == tk[:kind] then
-      tk[:text][1..-2]
-    elsif :on_dstring == tk[:kind] or :on_ident == tk[:kind] then
+    case tk = get_tk
+    when TkSYMBOL
+      tk.text.sub(/^:/, '')
+    when TkSTRING
+      eval @read[-1]
+    when TkDSTRING, TkIDENTIFIER then
       nil # ignore
     else
       warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
@@ -2027,44 +1880,27 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
     skip_tkspace_comment false
 
-    ptk = peek_tk
-    # Ryan Davis suggested the extension to ignore modifiers, because he
-    # often writes
-    #
-    #   protected unless $TESTING
-    #
-    if [:on_nl, :on_semicolon].include?(ptk[:kind]) || (:on_kw == ptk[:kind] && (['if', 'unless'].include?(ptk[:text]))) then
+    case peek_tk
+      # Ryan Davis suggested the extension to ignore modifiers, because he
+      # often writes
+      #
+      #   protected unless $TESTING
+      #
+    when TkNL, TkUNLESS_MOD, TkIF_MOD, TkSEMICOLON then
       container.ongoing_visibility = vis
-    elsif :on_kw == ptk[:kind] && 'def' == ptk[:text]
-      container.current_line_visibility = vis
     else
       update_visibility container, vis_type, vis, singleton
     end
   end
 
   ##
-  # Parses a Module#private_constant or Module#public_constant call from +tk+.
-
-  def parse_constant_visibility(container, single, tk)
-    args = parse_symbol_arg
-    case tk[:text]
-    when 'private_constant'
-      vis = :private
-    when 'public_constant'
-      vis = :public
-    else
-      raise RDoc::Error, 'Unreachable'
-    end
-    container.set_constant_visibility_for args, vis
-  end
-
-  ##
   # Determines the block parameter for +context+
 
   def parse_yield(context, single, tk, method)
     return if method.block_params
 
     get_tkread
+    @scanner.continue = false
     method.block_params = parse_method_or_yield_parameters
   end
 
@@ -2088,10 +1924,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
     while tk = get_tk do
       tokens << tk
 
-      if :on_nl == tk[:kind] or (:on_kw == tk[:kind] && 'def' == tk[:text]) then
+      case tk
+      when TkNL, TkDEF then
         return
-      elsif :on_comment == tk[:kind] or :on_embdoc == tk[:kind] then
-        return unless tk[:text] =~ /\s*:?([\w-]+):\s*(.*)/
+      when TkCOMMENT then
+        return unless tk.text =~ /\s*:?([\w-]+):\s*(.*)/
 
         directive = $1.downcase
 
@@ -2101,7 +1938,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
       end
     end
   ensure
-    unless tokens.length == 1 and (:on_comment == tokens.first[:kind] or :on_embdoc == tokens.first[:kind]) then
+    unless tokens.length == 1 and TkCOMMENT === tokens.first then
       tokens.reverse_each do |token|
         unget_tk token
       end
@@ -2115,7 +1952,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # See also RDoc::Markup::PreProcess#handle_directive
 
   def read_documentation_modifiers context, allowed
-    skip_tkspace_without_nl
     directive, value = read_directive allowed
 
     return unless directive
@@ -2143,6 +1979,15 @@ class RDoc::Parser::Ruby < RDoc::Parser
   end
 
   ##
+  # Removes private comments from +comment+
+  #--
+  # TODO remove
+
+  def remove_private_comments comment
+    comment.remove_private
+  end
+
+  ##
   # Scans this Ruby file for Ruby constructs
 
   def scan
@@ -2153,33 +1998,29 @@ class RDoc::Parser::Ruby < RDoc::Parser
         parse_top_level_statements @top_level
 
       rescue StandardError => e
-        if @content.include?('<%') and @content.include?('%>') then
-          # Maybe, this is ERB.
-          $stderr.puts "\033[2KRDoc detects ERB file. Skips it for compatibility:"
-          $stderr.puts @file_name
-          return
+        bytes = ''
+
+        20.times do @scanner.ungetc end
+        count = 0
+        60.times do |i|
+          count = i
+          byte = @scanner.getc
+          break unless byte
+          bytes << byte
         end
-
-        if @scanner_point >= @scanner.size
-          now_line_no = @scanner[@scanner.size - 1][:line_no]
-        else
-          now_line_no = peek_tk[:line_no]
-        end
-        first_tk_index = @scanner.find_index { |tk| tk[:line_no] == now_line_no }
-        last_tk_index = @scanner.find_index { |tk| tk[:line_no] == now_line_no + 1 }
-        last_tk_index = last_tk_index ? last_tk_index - 1 : @scanner.size - 1
-        code = @scanner[first_tk_index..last_tk_index].map{ |t| t[:text] }.join
+        count -= 20
+        count.times do @scanner.ungetc end
 
         $stderr.puts <<-EOF
 
-#{self.class} failure around line #{now_line_no} of
+#{self.class} failure around line #{@scanner.line_no} of
 #{@file_name}
 
         EOF
 
-        unless code.empty? then
-          $stderr.puts code
+        unless bytes.empty? then
           $stderr.puts
+          $stderr.puts bytes.inspect
         end
 
         raise e
@@ -2193,52 +2034,53 @@ class RDoc::Parser::Ruby < RDoc::Parser
   # while, until, and for have an optional do
 
   def skip_optional_do_after_expression
-    skip_tkspace_without_nl
+    skip_tkspace false
     tk = get_tk
+    end_token = get_end_token tk
 
     b_nest = 0
     nest = 0
+    @scanner.continue = false
 
     loop do
-      break unless tk
-      case tk[:kind]
-      when :on_semicolon, :on_nl, :on_ignored_nl then
+      case tk
+      when TkSEMICOLON then
         break if b_nest.zero?
-      when :on_lparen then
+      when TkLPAREN, TkfLPAREN then
         nest += 1
-      when :on_rparen then
-        nest -= 1
-      when :on_kw then
-        case tk[:text]
-        when 'begin'
-          b_nest += 1
-        when 'end'
-          b_nest -= 1
-        when 'do'
-          break if nest.zero?
-        end
-      when :on_comment, :on_embdoc then
-        if b_nest.zero? and "\n" == tk[:text][-1] then
-          break
+      when TkBEGIN then
+        b_nest += 1
+      when TkEND then
+        b_nest -= 1
+      when TkDO
+        break if nest.zero?
+      when end_token then
+        if end_token == TkRPAREN
+          nest -= 1
+          break if @scanner.lex_state == :EXPR_END and nest.zero?
+        else
+          break unless @scanner.continue
         end
+      when nil then
+        break
       end
       tk = get_tk
     end
 
-    skip_tkspace_without_nl
+    skip_tkspace false
 
-    get_tk if peek_tk && :on_kw == peek_tk[:kind] && 'do' == peek_tk[:text]
+    get_tk if TkDO === peek_tk
   end
 
   ##
   # skip the var [in] part of a 'for' statement
 
   def skip_for_variable
-    skip_tkspace_without_nl
+    skip_tkspace false
     get_tk
-    skip_tkspace_without_nl
+    skip_tkspace false
     tk = get_tk
-    unget_tk(tk) unless :on_kw == tk[:kind] and 'in' == tk[:text]
+    unget_tk(tk) unless TkIN === tk
   end
 
   ##
@@ -2255,9 +2097,8 @@ class RDoc::Parser::Ruby < RDoc::Parser
 
   def skip_tkspace_comment(skip_nl = true)
     loop do
-      skip_nl ? skip_tkspace : skip_tkspace_without_nl
-      next_tk = peek_tk
-      return if next_tk.nil? || (:on_comment != next_tk[:kind] and :on_embdoc != next_tk[:kind])
+      skip_tkspace skip_nl
+      return unless TkCOMMENT === peek_tk
       get_tk
     end
   end
diff --git a/lib/rdoc/parser/ruby_tools.rb b/lib/rdoc/parser/ruby_tools.rb
index 681d7166ce..bbca065b5e 100644
--- a/lib/rdoc/parser/ruby_tools.rb
+++ b/lib/rdoc/parser/ruby_tools.rb
@@ -1,9 +1,12 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
-# Collection of methods for writing parsers
+# Collection of methods for writing parsers against RDoc::RubyLex and
+# RDoc::RubyToken
 
 module RDoc::Parser::RubyTools
 
+  include RDoc::RubyToken
+
   ##
   # Adds a token listener +obj+, but you should probably use token_listener
 
@@ -19,23 +22,36 @@ module RDoc::Parser::RubyTools
     tk = nil
 
     if @tokens.empty? then
-      if @scanner_point >= @scanner.size
-        return nil
-      else
-        tk = @scanner[@scanner_point]
-        @scanner_point += 1
-        @read.push tk[:text]
-      end
+      tk = @scanner.token
+      @read.push @scanner.get_readed
+      puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
     else
       @read.push @unget_read.shift
       tk = @tokens.shift
+      puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
     end
 
-    if tk == nil || :on___end__ == tk[:kind]
-      tk = nil
-    end
+    tk = nil if TkEND_OF_SCRIPT === tk
+
+    if TkSYMBEG === tk then
+      set_token_position tk.line_no, tk.char_no
 
-    return nil unless tk
+      case tk1 = get_tk
+      when TkId, TkOp, TkSTRING, TkDSTRING, TkSTAR, TkAMPER then
+        if tk1.respond_to?(:name) then
+          tk = Token(TkSYMBOL).set_text(":" + tk1.name)
+        else
+          tk = Token(TkSYMBOL).set_text(":" + tk1.text)
+        end
+
+        # remove the identifier we just read to replace it with a symbol
+        @token_listeners.each do |obj|
+          obj.pop_token
+        end if @token_listeners
+      else
+        tk = tk1
+      end
+    end
 
     # inform any listeners of our shiny new token
     @token_listeners.each do |obj|
@@ -106,34 +122,19 @@ module RDoc::Parser::RubyTools
     @tokens     = []
     @unget_read = []
     @nest = 0
-    @scanner_point = 0
-  end
-
-  ##
-  # Skips whitespace tokens including newlines
-
-  def skip_tkspace
-    tokens = []
-
-    while (tk = get_tk) and (:on_sp == tk[:kind] or :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]) do
-      tokens.push(tk)
-    end
-
-    unget_tk(tk)
-    tokens
   end
 
   ##
-  # Skips whitespace tokens excluding newlines
+  # Skips whitespace tokens including newlines if +skip_nl+ is true
 
-  def skip_tkspace_without_nl
+  def skip_tkspace(skip_nl = true) # HACK dup
     tokens = []
 
-    while (tk = get_tk) and :on_sp == tk[:kind] do
-      tokens.push(tk)
+    while TkSPACE === (tk = get_tk) or (skip_nl and TkNL === tk) do
+      tokens.push tk
     end
 
-    unget_tk(tk)
+    unget_tk tk
     tokens
   end
 
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
index b1dabad0f8..f2ab27a92e 100644
--- a/lib/rdoc/parser/simple.rb
+++ b/lib/rdoc/parser/simple.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Parse a non-source file. We basically take the whole thing as one big
 # comment.
@@ -19,7 +19,7 @@ class RDoc::Parser::Simple < RDoc::Parser
 
     preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
 
-    @content = preprocess.handle @content, @top_level
+    preprocess.handle @content, @top_level
   end
 
   ##
@@ -52,7 +52,7 @@ class RDoc::Parser::Simple < RDoc::Parser
   def remove_private_comment comment
     # Workaround for gsub encoding for Ruby 1.9.2 and earlier
     empty = ''
-    empty = RDoc::Encoding.change_encoding empty, comment.encoding
+    empty.force_encoding comment.encoding
 
     comment = comment.gsub(%r%^--\n.*?^\+\+\n?%m, empty)
     comment.sub(%r%^--\n.*%m, empty)
diff --git a/lib/rdoc/parser/text.rb b/lib/rdoc/parser/text.rb
index 01de0cc595..1a13fd1186 100644
--- a/lib/rdoc/parser/text.rb
+++ b/lib/rdoc/parser/text.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Indicates this parser is text and doesn't contain code constructs.
 #
diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb
index 0d3d3cea85..39af3294f5 100644
--- a/lib/rdoc/rd.rb
+++ b/lib/rdoc/rd.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # RDoc::RD implements the RD format from the rdtool gem.
 #
diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb
index 37b35a5924..fc4af97c1a 100644
--- a/lib/rdoc/rd/block_parser.rb
+++ b/lib/rdoc/rd/block_parser.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.14
@@ -208,7 +207,7 @@ def next_token # :nodoc:
       if @in_verbatim
         [:STRINGLINE, line]
       else
-        @indent_stack.push("\s" + newIndent)
+        @indent_stack.push("\s" << newIndent)
         [:ITEMLISTLINE, rest]
       end
     end
@@ -220,7 +219,7 @@ def next_token # :nodoc:
       if @in_verbatim
         [:STRINGLINE, line]
       else
-        @indent_stack.push("\s" * mark.size + newIndent)
+        @indent_stack.push("\s" * mark.size << newIndent)
         [:ENUMLISTLINE, rest]
       end
     end
@@ -254,7 +253,7 @@ def next_token # :nodoc:
       [:STRINGLINE, line]
     end
   else
-    raise "[BUG] parsing error may occurred."
+    raise "[BUG] parsing error may occured."
   end
 end
 
@@ -420,52 +419,52 @@ end
 
 racc_action_table = [
     34,    35,    30,    33,    40,    34,    35,    30,    33,    40,
-    65,    34,    35,    30,    33,    14,    73,    36,    38,    34,
-    15,    88,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    35,    47,    30,    54,
-    33,    15,    34,    35,    30,    33,    54,    47,    14,    14,
-    59,    15,    34,    35,    30,    33,    14,    73,    67,    76,
-    77,    15,    34,    35,    30,    33,    14,    73,    54,    81,
-    38,    15,    34,    35,    30,    33,    14,    73,    38,    40,
-    83,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
+    65,    34,    35,    30,    33,    14,    73,    14,    54,    76,
+    15,    88,    34,    35,    30,    33,    14,    73,    77,    33,
+    54,    15,    34,    35,    30,    33,    14,    73,    81,    38,
+    38,    15,    34,    35,    30,    33,    14,    73,    40,    36,
+    83,    15,    34,    35,    30,    33,    54,    47,    30,    35,
+    34,    15,    34,    35,    30,    33,    14,    73,    38,    67,
+    59,    15,    34,    35,    30,    33,    14,     9,    10,    11,
+    12,    15,    34,    35,    30,    33,    14,    73,    14,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
+   nil,    15,    34,    35,    30,    33,   nil,    47,   nil,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,    61,    63,
+   nil,    15,    34,    35,    30,    33,    14,     9,    10,    11,
+    12,    15,    34,    35,    30,    33,    14,    73,    61,    63,
    nil,    15,    14,    62,    60,    61,    63,    79,    61,    63,
     62,    87,   nil,    62,    34,    35,    30,    33 ]
 
 racc_action_check = [
     41,    41,    41,    41,    41,    15,    15,    15,    15,    15,
-    41,    86,    86,    86,    86,    86,    86,     1,    13,    22,
-    86,    86,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    24,    24,    24,    24,    25,    24,    28,    30,
-    31,    24,    27,    27,    27,    27,    33,    27,    34,    35,
-    36,    27,    45,    45,    45,    45,    45,    45,    44,    49,
-    51,    45,    46,    46,    46,    46,    46,    46,    54,    56,
-    57,    46,    47,    47,    47,    47,    47,    47,    58,    62,
-    66,    47,    68,    68,    68,    68,    68,    68,   nil,   nil,
-   nil,    68,    74,    74,    74,    74,    74,    74,   nil,   nil,
-   nil,    74,    75,    75,    75,    75,    75,    75,   nil,   nil,
-   nil,    75,    78,    78,    78,    78,    78,    78,   nil,   nil,
-   nil,    78,    79,    79,    79,    79,    79,    79,   nil,   nil,
-   nil,    79,    85,    85,    85,    85,    85,    85,    39,    39,
-   nil,    85,    52,    39,    39,    82,    82,    52,    64,    64,
+    41,    86,    86,    86,    86,    86,    86,    34,    33,    49,
+    86,    86,    85,    85,    85,    85,    85,    85,    51,    31,
+    54,    85,    79,    79,    79,    79,    79,    79,    56,    57,
+    58,    79,    78,    78,    78,    78,    78,    78,    62,     1,
+    66,    78,    24,    24,    24,    24,    30,    24,    28,    25,
+    22,    24,    75,    75,    75,    75,    75,    75,    13,    44,
+    36,    75,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    46,    46,    46,    46,    46,    46,    35,   nil,
+   nil,    46,    45,    45,    45,    45,    45,    45,   nil,   nil,
+   nil,    45,    27,    27,    27,    27,   nil,    27,   nil,   nil,
+   nil,    27,    74,    74,    74,    74,    74,    74,   nil,   nil,
+   nil,    74,    68,    68,    68,    68,    68,    68,   nil,   nil,
+   nil,    68,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,    47,    47,    47,    47,    47,    47,    39,    39,
+   nil,    47,    52,    39,    39,    82,    82,    52,    64,    64,
     82,    82,   nil,    64,    20,    20,    20,    20 ]
 
 racc_action_pointer = [
-    19,    17,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    11,   nil,     2,   nil,   nil,   nil,   nil,
-   161,   nil,    16,   nil,    39,    42,   nil,    49,    43,   nil,
-    41,    44,   nil,    48,    51,    52,    60,   nil,   nil,   141,
-   nil,    -3,   nil,   nil,    55,    59,    69,    79,   nil,    56,
-   nil,    57,   145,   nil,    70,   nil,    66,    73,    81,   nil,
-   nil,   nil,    82,   nil,   151,   nil,    77,   nil,    89,   nil,
-   nil,   nil,   nil,   nil,    99,   109,   nil,   nil,   119,   129,
-   nil,   nil,   148,   nil,   nil,   139,     8,   nil,   nil ]
+   129,    49,    69,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    61,   nil,     2,   nil,   nil,   nil,   nil,
+   161,   nil,    57,   nil,    49,    55,   nil,    99,    53,   nil,
+    48,    23,   nil,    10,    10,    81,    70,   nil,   nil,   141,
+   nil,    -3,   nil,   nil,    56,    89,    79,   139,   nil,     6,
+   nil,    15,   145,   nil,    22,   nil,    25,    32,    33,   nil,
+   nil,   nil,    41,   nil,   151,   nil,    37,   nil,   119,   nil,
+   nil,   nil,   nil,   nil,   109,    59,   nil,   nil,    39,    29,
+   nil,   nil,   148,   nil,   nil,    19,     8,   nil,   nil ]
 
 racc_action_default = [
     -2,   -73,    -1,    -4,    -5,    -6,    -7,    -8,    -9,   -10,
@@ -479,26 +478,26 @@ racc_action_default = [
    -60,   -47,   -73,   -29,   -52,   -48,   -73,   -20,   -50 ]
 
 racc_goto_table = [
-     4,    39,     4,    68,    74,    75,     5,     6,     5,     6,
-    44,    42,    51,    49,     3,    56,    37,    57,    58,     1,
+     4,    39,     4,    68,    74,    75,     6,     5,     6,     5,
+    44,    42,    51,    49,     3,    56,    37,    57,    58,    80,
      2,    66,    84,    41,    43,    48,    50,    64,    84,    84,
-    45,    46,    42,    45,    46,    55,    85,    86,    80,    84,
+    46,    45,    42,    46,    45,    55,    85,    86,     1,    84,
     84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    82,   nil,
    nil,   nil,    78 ]
 
 racc_goto_check = [
-     4,    10,     4,    31,    31,    31,     5,     6,     5,     6,
-    21,    12,    27,    21,     3,    27,     3,     9,     9,     1,
+     4,    10,     4,    31,    31,    31,     6,     5,     6,     5,
+    21,    12,    27,    21,     3,    27,     3,     9,     9,    33,
      2,    11,    32,    17,    19,    23,    26,    10,    32,    32,
-     5,     6,    12,     5,     6,    29,    31,    31,    33,    32,
+     6,     5,    12,     6,     5,    29,    31,    31,     1,    32,
     32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
    nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,    19,    20,    14,     0,     6,     7,   nil,   nil,   -17,
+   nil,    38,    20,    14,     0,     7,     6,   nil,   nil,   -17,
    -14,   -20,    -9,   nil,   nil,   nil,   nil,     8,   nil,     2,
    nil,   -14,   nil,     0,   nil,   nil,    -2,   -18,   nil,     4,
-   nil,   -42,   -46,   -16 ]
+   nil,   -42,   -46,   -35 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,    70,    71,    72,     7,     8,    13,
diff --git a/lib/rdoc/rd/inline.rb b/lib/rdoc/rd/inline.rb
index e5cb545728..011ec67e33 100644
--- a/lib/rdoc/rd/inline.rb
+++ b/lib/rdoc/rd/inline.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Inline keeps track of markup and labels to create proper links.
 
@@ -50,11 +50,11 @@ class RDoc::RD::Inline
   def append more
     case more
     when String then
-      @reference += more
-      @rdoc      += more
+      @reference << more
+      @rdoc      << more
     when RDoc::RD::Inline then
-      @reference += more.reference
-      @rdoc      += more.rdoc
+      @reference << more.reference
+      @rdoc      << more.rdoc
     else
       raise "unknown thingy #{more}"
     end
diff --git a/lib/rdoc/rd/inline_parser.rb b/lib/rdoc/rd/inline_parser.rb
index 85e4215964..cc63ea6f70 100644
--- a/lib/rdoc/rd/inline_parser.rb
+++ b/lib/rdoc/rd/inline_parser.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.14
@@ -97,7 +96,7 @@ end
 def parse inline
   @inline = inline
   @src = StringScanner.new inline
-  @pre = "".dup
+  @pre = ""
   @yydebug = true
   do_parse.to_s
 end
@@ -244,34 +243,23 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-   104,   103,   102,   100,   101,    99,   115,   116,   117,    29,
+   104,   103,   102,   100,   101,    99,   115,   116,   117,    86,
    105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-    84,   118,   119,    63,    64,    65,    61,    81,    62,    76,
-    78,    79,    85,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    77,    80,   149,    63,    64,    65,   153,
-    81,    62,    76,    78,    79,    86,    66,    67,    68,    69,
-    70,    71,    72,    73,    74,    75,    77,    80,   152,   104,
-   103,   102,   100,   101,    99,   115,   116,   117,    87,   105,
-   106,   107,   108,   109,   110,   111,   112,   113,   114,    88,
+   164,   118,   119,   104,   103,   102,   100,   101,    99,   115,
+   116,   117,   175,   105,   106,   107,   108,   109,   110,   111,
+   112,   113,   114,    85,   118,   119,    63,    64,    65,    61,
+    81,    62,    76,    78,    79,    84,    66,    67,    68,    69,
+    70,    71,    72,    73,    74,    75,    77,    80,   149,   104,
+   103,   102,   100,   101,    99,   115,   116,   117,    29,   105,
+   106,   107,   108,   109,   110,   111,   112,   113,   114,   173,
    118,   119,   104,   103,   102,   100,   101,    99,   115,   116,
-   117,    89,   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,    96,   118,   119,   104,   103,   102,   100,   101,
-    99,   115,   116,   117,   124,   105,   106,   107,   108,   109,
-   110,   111,   112,   113,   114,   137,   118,   119,    22,    23,
-    24,    25,    26,    21,    18,    19,   176,   177,    13,   148,
-    14,   154,    15,   137,    16,   161,    17,   164,   173,    20,
-    22,    23,    24,    25,    26,    21,    18,    19,   175,   177,
-    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,
-   nil,    20,    22,    23,    24,    25,    26,    21,    18,    19,
-   nil,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   nil,   nil,    20,    22,    23,    24,    25,    26,    21,
-    18,    19,   nil,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
-    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
-    15,   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,
-    24,    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,
-    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,
-    22,    23,    24,    25,    26,    21,    18,    19,   nil,   nil,
+   117,   137,   105,   106,   107,   108,   109,   110,   111,   112,
+   113,   114,   177,   118,   119,    63,    64,    65,   153,    81,
+    62,    76,    78,    79,   148,    66,    67,    68,    69,    70,
+    71,    72,    73,    74,    75,    77,    80,   152,    22,    23,
+    24,    25,    26,    21,    18,    19,   176,   177,    13,   124,
+    14,    96,    15,    89,    16,   154,    17,    88,   137,    20,
+    22,    23,    24,    25,    26,    21,    18,    19,    87,   161,
     13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,    42,
    nil,    20,    54,    38,    53,    55,    56,    57,   nil,    13,
    nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
@@ -279,63 +267,63 @@ racc_action_table = [
    nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
    nil,   nil,    20,    63,    64,    65,    61,    81,    62,    76,
     78,    79,   nil,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    77,    80,   122,   nil,   nil,    54,   nil,
+    73,    74,    75,    77,    80,   145,   nil,   nil,    54,   133,
+    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
+   nil,    16,   nil,    17,   145,   nil,    20,    54,   133,    53,
+    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
+    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
+    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
+    15,   nil,    16,   nil,    17,   145,   nil,    20,    54,   133,
     53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
    nil,    16,   nil,    17,   145,   nil,    20,    54,   133,    53,
     55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   145,   nil,    20,    54,   133,    53,    55,
-    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
-   nil,    17,   145,   nil,    20,    54,   133,    53,    55,    56,
-    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   145,   nil,    20,    54,   133,    53,    55,    56,    57,
+    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
+    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
+    15,   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,
+    24,    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,
+    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,
+    22,    23,    24,    25,    26,    21,    18,    19,   nil,   nil,
+    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,
+   nil,    20,    22,    23,    24,    25,    26,    21,    18,    19,
+   nil,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   122,
+    17,   nil,    54,    20,    53,    55,    56,    57,   nil,    13,
+   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
+    20,   135,   136,    54,   133,    53,    55,    56,    57,   nil,
+    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,
+   nil,    20,   135,   136,    54,   133,    53,    55,    56,    57,
    nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
    nil,   nil,    20,   135,   136,    54,   133,    53,    55,    56,
-    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   nil,   nil,    20,   135,   136,    54,   133,    53,    55,
-    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
-   nil,    17,   nil,   nil,    20,   135,   136,    54,   133,    53,
-    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,    95,   nil,    20,    54,    91,    53,    55,
-    56,    57,   145,   nil,   nil,    54,   133,    53,    55,    56,
-    57,   158,   nil,   nil,    54,   nil,    53,    55,    56,    57,
-   165,   135,   136,    54,   133,    53,    55,    56,    57,   145,
-   nil,   nil,    54,   133,    53,    55,    56,    57,   172,   135,
-   136,    54,   133,    53,    55,    56,    57,   174,   135,   136,
-    54,   133,    53,    55,    56,    57,   178,   135,   136,    54,
-   133,    53,    55,    56,    57,   135,   136,    54,   133,    53,
-    55,    56,    57,   135,   136,    54,   133,    53,    55,    56,
-    57,   135,   136,    54,   133,    53,    55,    56,    57,    22,
-    23,    24,    25,    26,    21 ]
+    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   158,
+    17,   nil,    54,    20,    53,    55,    56,    57,    95,   nil,
+   nil,    54,    91,    53,    55,    56,    57,   145,   nil,   nil,
+    54,   133,    53,    55,    56,    57,   165,   135,   136,    54,
+   133,    53,    55,    56,    57,   145,   nil,   nil,    54,   133,
+    53,    55,    56,    57,   172,   135,   136,    54,   133,    53,
+    55,    56,    57,   174,   135,   136,    54,   133,    53,    55,
+    56,    57,   178,   135,   136,    54,   133,    53,    55,    56,
+    57,   135,   136,    54,   133,    53,    55,    56,    57,   135,
+   136,    54,   133,    53,    55,    56,    57,   135,   136,    54,
+   133,    53,    55,    56,    57,    22,    23,    24,    25,    26,
+    21 ]
 
 racc_action_check = [
-    38,    38,    38,    38,    38,    38,    38,    38,    38,     1,
+    38,    38,    38,    38,    38,    38,    38,    38,    38,    32,
     38,    38,    38,    38,    38,    38,    38,    38,    38,    38,
-    29,    38,    38,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    31,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    59,    59,    59,    59,    61,    61,    61,    61,
-    61,    61,    61,    61,    61,    32,    61,    61,    61,    61,
-    61,    61,    61,    61,    61,    61,    61,    61,    61,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    33,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    91,    34,
-    91,    91,    97,    97,    97,    97,    97,    97,    97,    97,
-    97,    35,    97,    97,    97,    97,    97,    97,    97,    97,
-    97,    97,    37,    97,    97,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,    41,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,   155,    43,   155,   155,     0,     0,
-     0,     0,     0,     0,     0,     0,   165,   165,     0,    58,
-     0,    90,     0,    94,     0,   100,     0,   125,   162,     0,
-     2,     2,     2,     2,     2,     2,     2,     2,   164,   172,
-     2,   nil,     2,   nil,     2,   nil,     2,   nil,     2,   nil,
-   nil,     2,    13,    13,    13,    13,    13,    13,    13,    13,
-   nil,   nil,    13,   nil,    13,   nil,    13,   nil,    13,   nil,
-    13,   nil,   nil,    13,    14,    14,    14,    14,    14,    14,
-    14,    14,   nil,   nil,    14,   nil,    14,   nil,    14,   nil,
-    14,   nil,    14,   nil,   nil,    14,    15,    15,    15,    15,
-    15,    15,    15,    15,   nil,   nil,    15,   nil,    15,   nil,
-    15,   nil,    15,   nil,    15,   nil,   nil,    15,    16,    16,
-    16,    16,    16,    16,    16,    16,   nil,   nil,    16,   nil,
-    16,   nil,    16,   nil,    16,   nil,    16,   nil,   nil,    16,
-    17,    17,    17,    17,    17,    17,    17,    17,   nil,   nil,
+   125,    38,    38,    97,    97,    97,    97,    97,    97,    97,
+    97,    97,   164,    97,    97,    97,    97,    97,    97,    97,
+    97,    97,    97,    31,    97,    97,    59,    59,    59,    59,
+    59,    59,    59,    59,    59,    29,    59,    59,    59,    59,
+    59,    59,    59,    59,    59,    59,    59,    59,    59,    91,
+    91,    91,    91,    91,    91,    91,    91,    91,     1,    91,
+    91,    91,    91,    91,    91,    91,    91,    91,    91,   162,
+    91,    91,   155,   155,   155,   155,   155,   155,   155,   155,
+   155,    43,   155,   155,   155,   155,   155,   155,   155,   155,
+   155,   155,   172,   155,   155,    61,    61,    61,    61,    61,
+    61,    61,    61,    61,    58,    61,    61,    61,    61,    61,
+    61,    61,    61,    61,    61,    61,    61,    61,    16,    16,
+    16,    16,    16,    16,    16,    16,   165,   165,    16,    41,
+    16,    37,    16,    35,    16,    90,    16,    34,    94,    16,
+    17,    17,    17,    17,    17,    17,    17,    17,    33,   100,
     17,   nil,    17,   nil,    17,   nil,    17,   nil,    17,    18,
    nil,    17,    18,    18,    18,    18,    18,    18,   nil,    18,
    nil,    18,   nil,    18,   nil,    18,   nil,    18,   nil,   nil,
@@ -343,53 +331,64 @@ racc_action_check = [
    nil,    19,   nil,    19,   nil,    19,   nil,    19,   nil,    19,
    nil,   nil,    19,    20,    20,    20,    20,    20,    20,    20,
     20,    20,   nil,    20,    20,    20,    20,    20,    20,    20,
-    20,    20,    20,    20,    20,    39,   nil,   nil,    39,   nil,
-    39,    39,    39,    39,   nil,    39,   nil,    39,   nil,    39,
-   nil,    39,   nil,    39,    44,   nil,    39,    44,    44,    44,
+    20,    20,    20,    20,    20,   146,   nil,   nil,   146,   146,
+   146,   146,   146,   146,   nil,   146,   nil,   146,   nil,   146,
+   nil,   146,   nil,   146,   138,   nil,   146,   138,   138,   138,
+   138,   138,   138,   nil,   138,   nil,   138,   nil,   138,   nil,
+   138,   nil,   138,   nil,   nil,   138,     0,     0,     0,     0,
+     0,     0,     0,     0,   nil,   nil,     0,   nil,     0,   nil,
+     0,   nil,     0,   nil,     0,    45,   nil,     0,    45,    45,
+    45,    45,    45,    45,   nil,    45,   nil,    45,   nil,    45,
+   nil,    45,   nil,    45,    44,   nil,    45,    44,    44,    44,
     44,    44,    44,   nil,    44,   nil,    44,   nil,    44,   nil,
-    44,   nil,    44,    45,   nil,    44,    45,    45,    45,    45,
-    45,    45,   nil,    45,   nil,    45,   nil,    45,   nil,    45,
-   nil,    45,   138,   nil,    45,   138,   138,   138,   138,   138,
-   138,   nil,   138,   nil,   138,   nil,   138,   nil,   138,   nil,
-   138,   146,   nil,   138,   146,   146,   146,   146,   146,   146,
-   nil,   146,   nil,   146,   nil,   146,   nil,   146,   nil,   146,
-   nil,   nil,   146,    42,    42,    42,    42,    42,    42,    42,
+    44,   nil,    44,   nil,   nil,    44,     2,     2,     2,     2,
+     2,     2,     2,     2,   nil,   nil,     2,   nil,     2,   nil,
+     2,   nil,     2,   nil,     2,   nil,   nil,     2,    13,    13,
+    13,    13,    13,    13,    13,    13,   nil,   nil,    13,   nil,
+    13,   nil,    13,   nil,    13,   nil,    13,   nil,   nil,    13,
+    14,    14,    14,    14,    14,    14,    14,    14,   nil,   nil,
+    14,   nil,    14,   nil,    14,   nil,    14,   nil,    14,   nil,
+   nil,    14,    15,    15,    15,    15,    15,    15,    15,    15,
+   nil,   nil,    15,   nil,    15,   nil,    15,   nil,    15,    39,
+    15,   nil,    39,    15,    39,    39,    39,    39,   nil,    39,
+   nil,    39,   nil,    39,   nil,    39,   nil,    39,   nil,   nil,
+    39,    42,    42,    42,    42,    42,    42,    42,    42,   nil,
     42,   nil,    42,   nil,    42,   nil,    42,   nil,    42,   nil,
-    42,   nil,   nil,    42,   122,   122,   122,   122,   122,   122,
-   122,   122,   nil,   122,   nil,   122,   nil,   122,   nil,   122,
-   nil,   122,   nil,   nil,   122,   127,   127,   127,   127,   127,
-   127,   127,   127,   nil,   127,   nil,   127,   nil,   127,   nil,
-   127,   nil,   127,    36,   nil,   127,    36,    36,    36,    36,
-    36,    36,    52,   nil,   nil,    52,    52,    52,    52,    52,
-    52,    92,   nil,   nil,    92,   nil,    92,    92,    92,    92,
-   126,   126,   126,   126,   126,   126,   126,   126,   126,   142,
-   nil,   nil,   142,   142,   142,   142,   142,   142,   159,   159,
-   159,   159,   159,   159,   159,   159,   159,   163,   163,   163,
-   163,   163,   163,   163,   163,   163,   171,   171,   171,   171,
-   171,   171,   171,   171,   171,    95,    95,    95,    95,    95,
-    95,    95,    95,   158,   158,   158,   158,   158,   158,   158,
-   158,   168,   168,   168,   168,   168,   168,   168,   168,    27,
-    27,    27,    27,    27,    27 ]
+   nil,    42,   127,   127,   127,   127,   127,   127,   127,   127,
+   nil,   127,   nil,   127,   nil,   127,   nil,   127,   nil,   127,
+   nil,   nil,   127,   122,   122,   122,   122,   122,   122,   122,
+   122,   nil,   122,   nil,   122,   nil,   122,   nil,   122,    92,
+   122,   nil,    92,   122,    92,    92,    92,    92,    36,   nil,
+   nil,    36,    36,    36,    36,    36,    36,    52,   nil,   nil,
+    52,    52,    52,    52,    52,    52,   126,   126,   126,   126,
+   126,   126,   126,   126,   126,   142,   nil,   nil,   142,   142,
+   142,   142,   142,   142,   159,   159,   159,   159,   159,   159,
+   159,   159,   159,   163,   163,   163,   163,   163,   163,   163,
+   163,   163,   171,   171,   171,   171,   171,   171,   171,   171,
+   171,    95,    95,    95,    95,    95,    95,    95,    95,   158,
+   158,   158,   158,   158,   158,   158,   158,   168,   168,   168,
+   168,   168,   168,   168,   168,    27,    27,    27,    27,    27,
+    27 ]
 
 racc_action_pointer = [
-   135,     9,   157,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   179,   201,   223,   245,   267,   286,   308,
-   330,   nil,   nil,   nil,   nil,   nil,   nil,   606,   nil,    20,
-   nil,    18,    39,    60,    69,    79,   510,    89,    -3,   352,
-   nil,   120,   449,   130,   371,   390,   nil,   nil,   nil,   nil,
-   nil,   nil,   519,   nil,   nil,   nil,   nil,   nil,   138,    20,
-   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   283,    78,   343,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   365,   387,   409,   135,   157,   176,   198,
+   220,   nil,   nil,   nil,   nil,   nil,   nil,   602,   nil,    55,
+   nil,    29,    -7,   150,   137,   131,   515,   128,    -3,   426,
+   nil,   145,   447,    96,   321,   302,   nil,   nil,   nil,   nil,
+   nil,   nil,   524,   nil,   nil,   nil,   nil,   nil,   113,    43,
+   nil,   112,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   128,    66,   528,   nil,   148,   581,   nil,    89,   nil,   nil,
-   149,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   132,    66,   506,   nil,   153,   577,   nil,    20,   nil,   nil,
+   163,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   470,   nil,   nil,   154,   537,   491,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   409,   nil,
-   nil,   nil,   546,   nil,   nil,   nil,   428,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,   589,   555,
-   nil,   nil,   155,   564,   164,   142,   nil,   nil,   597,   nil,
-   nil,   573,   164,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   489,   nil,   nil,    17,   533,   468,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   261,   nil,
+   nil,   nil,   542,   nil,   nil,   nil,   242,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    89,   nil,   nil,   585,   551,
+   nil,   nil,    86,   560,    28,   142,   nil,   nil,   593,   nil,
+   nil,   569,   107,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
   -138,  -138,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
@@ -412,15 +411,15 @@ racc_action_default = [
    -60,  -138,   -34,   -36,   -37,   -29,   -30,   -32,   -34 ]
 
 racc_goto_table = [
-   126,    44,   125,    43,   144,   144,   160,    93,    97,    52,
-   166,    82,   144,    40,    41,    39,   138,   146,   169,    30,
-    36,    94,    44,     1,   123,   129,   169,    52,    90,    37,
-    52,   167,   147,    92,   120,   121,    31,    32,    33,    34,
-    35,   170,    58,   166,    59,    83,   170,   166,   151,   nil,
+   126,    44,   125,    52,   144,   144,   160,    93,    97,    43,
+   166,    82,   144,    40,    41,    39,   138,   146,   169,    90,
+    36,    52,    44,     1,    52,   129,   169,    94,    59,    83,
+   123,    30,   151,    92,   120,   121,    31,    32,    33,    34,
+    35,   170,    58,   166,   167,   147,   170,   166,    37,   nil,
    150,   nil,   166,   159,     4,   166,     4,   nil,   nil,   nil,
    nil,   155,   nil,   156,   160,   nil,   nil,     4,     4,     4,
-     4,     4,   nil,     4,     5,   nil,     5,   157,   nil,   nil,
-   163,   nil,   162,    52,   nil,   168,   nil,     5,     5,     5,
+     4,     4,   nil,     4,     5,   nil,     5,    52,   nil,   nil,
+   163,   nil,   162,   157,   nil,   168,   nil,     5,     5,     5,
      5,     5,   nil,     5,   nil,   nil,   nil,   nil,   144,   nil,
    nil,   nil,   144,   nil,   nil,   129,   144,   144,   nil,     6,
    129,     6,   nil,   nil,   nil,   nil,   171,     7,   nil,     7,
@@ -430,15 +429,15 @@ racc_goto_table = [
     11,    11,    11,   nil,    11 ]
 
 racc_goto_check = [
-    22,    24,    21,    23,    36,    36,    37,    18,    16,    34,
-    35,    41,    36,    19,    20,    17,    25,    25,    28,     3,
-    13,    23,    24,     1,    23,    24,    28,    34,    14,    15,
-    34,    29,    32,    17,    19,    20,     1,     1,     1,     1,
-     1,    33,     1,    35,    38,    39,    33,    35,    42,   nil,
+    22,    24,    21,    34,    36,    36,    37,    18,    16,    23,
+    35,    41,    36,    19,    20,    17,    25,    25,    28,    14,
+    13,    34,    24,     1,    34,    24,    28,    23,    38,    39,
+    23,     3,    42,    17,    19,    20,     1,     1,     1,     1,
+     1,    33,     1,    35,    29,    32,    33,    35,    15,   nil,
     41,   nil,    35,    22,     4,    35,     4,   nil,   nil,   nil,
    nil,    16,   nil,    18,    37,   nil,   nil,     4,     4,     4,
-     4,     4,   nil,     4,     5,   nil,     5,    23,   nil,   nil,
-    22,   nil,    21,    34,   nil,    22,   nil,     5,     5,     5,
+     4,     4,   nil,     4,     5,   nil,     5,    34,   nil,   nil,
+    22,   nil,    21,    23,   nil,    22,   nil,     5,     5,     5,
      5,     5,   nil,     5,   nil,   nil,   nil,   nil,    36,   nil,
    nil,   nil,    36,   nil,   nil,    24,    36,    36,   nil,     6,
     24,     6,   nil,   nil,   nil,   nil,    22,     7,   nil,     7,
@@ -448,11 +447,11 @@ racc_goto_check = [
     11,    11,    11,   nil,    11 ]
 
 racc_goto_pointer = [
-   nil,    23,   nil,    17,    54,    74,   109,   117,   127,   nil,
-   nil,   135,   nil,     2,    -8,    11,   -30,    -3,   -29,    -5,
-    -4,   -40,   -42,   -15,   -17,   -28,   nil,   nil,  -120,   -96,
-   nil,   nil,   -20,  -101,    -9,  -116,   -40,   -91,    24,    18,
-   nil,    -9,   -13 ]
+   nil,    23,   nil,    29,    54,    74,   109,   117,   127,   nil,
+   nil,   135,   nil,     2,   -17,    30,   -30,    -3,   -29,    -5,
+    -4,   -40,   -42,    -9,   -17,   -28,   nil,   nil,  -120,   -83,
+   nil,   nil,    -7,  -101,   -15,  -116,   -40,   -91,     8,     2,
+   nil,    -9,   -29 ]
 
 racc_goto_default = [
    nil,   nil,     2,     3,    46,    47,    48,    49,    50,     9,
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
index f28d3e86e5..81ba52f4d0 100644
--- a/lib/rdoc/rdoc.gemspec
+++ b/lib/rdoc/rdoc.gemspec
@@ -1,42 +1,33 @@
-begin
-  require_relative "lib/rdoc/version"
-rescue LoadError
-  # for Ruby repository
-  require_relative "version"
-end
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'rdoc'
 
 Gem::Specification.new do |s|
   s.name = "rdoc"
   s.version = RDoc::VERSION
 
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3")
+
+  s.require_paths = ["lib"]
   s.authors = [
     "Eric Hodel",
     "Dave Thomas",
     "Phil Hagelberg",
     "Tony Strauss",
     "Zachary Scott",
-    "Hiroshi SHIBATA",
-    "ITOYANAGI Sakura"
+    "Hiroshi SHIBATA"
   ]
-  s.email = ["drbrain@segment7.net", "", "", "", "mail@zzak.io", "hsbt@ruby-lang.org", "aycabta@gmail.com"]
 
-  s.summary = "RDoc produces HTML and command-line documentation for Ruby projects"
   s.description = <<-DESCRIPTION
 RDoc produces HTML and command-line documentation for Ruby projects.
 RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.
   DESCRIPTION
-  s.homepage = "https://ruby.github.io/rdoc"
-  s.licenses = ["Ruby"]
+
+  s.email = ["drbrain@segment7.net", "mail@zzak.io", "hsbt@ruby-lang.org"]
 
   s.bindir = "exe"
   s.executables = ["rdoc", "ri"]
-  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)/}) }
-  # files from .gitignore
-  s.files = [".document", ".gitignore", ".travis.yml", "CONTRIBUTING.rdoc", "CVE-2013-0256.rdoc", "ExampleMarkdown.md", "ExampleRDoc.rdoc", "Gemfile", "History.rdoc", "LEGAL.rdoc", "LICENSE.rdoc", "README.rdoc", "RI.rdoc", "Rakefile", "TODO.rdoc", "appveyor.yml", "bin/console", "bin/setup", "exe/rdoc", "exe/ri", "lib/rdoc.rb", "lib/rdoc/alias.rb", "lib/rdoc/anon_class.rb", "lib/rdoc/any_method.rb", "lib/rdoc/attr.rb", "lib/rdoc/class_module.rb", "lib/rdoc/code_object.rb", "lib/rdoc/code_objects.rb", "lib/rdoc/comment.rb", "lib/rdoc/constant.rb", "lib/rdoc/context.rb", "lib/rdoc/context/section.rb", "lib/rdoc/cross_reference.rb", "lib/rdoc/encoding.rb", "lib/rdoc/erb_partial.rb", "lib/rdoc/erbio.rb", "lib/rdoc/extend.rb", "lib/rdoc/generator.rb", "lib/rdoc/generator/darkfish.rb", "lib/rdoc/generator/json_index.rb", "lib/rdoc/generator/markup.rb", "lib/rdoc/generator/pot.rb", "lib/rdoc/generator/pot/message_extractor.rb", "lib/rdoc/generator/pot/po.rb", "lib/rdoc/generator/pot/po_entry.rb", "lib/rdoc/generator/ri.rb", "lib/rdoc/generator/template/darkfish/.document", "lib/rdoc/generator/template/darkfish/_footer.rhtml", "lib/rdoc/generator/template/darkfish/_head.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml", "lib/rdoc/generator/template/darkfish/class.rhtml", "lib/rdoc/generator/template/darkfish/css/fonts.css", "lib/rdoc/generator/template/darkfish/css/rdoc.css", "lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf", "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf", "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf", "lib/rdoc/generator/template/darkfish/images/add.png", "lib/rdoc/generator/template/darkfish/images/arrow_up.png", "lib/rdoc/generator/template/darkfish/images/brick.png", "lib/rdoc/generator/template/darkfish/images/brick_link.png", "lib/rdoc/generator/template/darkfish/images/bug.png", "lib/rdoc/generator/template/darkfish/images/bullet_black.png", "lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png", "lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png", "lib/rdoc/generator/template/darkfish/images/date.png", "lib/rdoc/generator/template/darkfish/images/delete.png", "lib/rdoc/generator/template/darkfish/images/find.png", "lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif", "lib/rdoc/generator/template/darkfish/images/macFFBgHack.png", "lib/rdoc/generator/template/darkfish/images/package.png", "lib/rdoc/generator/template/darkfish/images/page_green.png", "lib/rdoc/generator/template/darkfish/images/page_white_text.png", "lib/rdoc/generator/template/darkfish/images/page_white_width.png", "lib/rdoc/generator/template/darkfish/images/plugin.png", "lib/rdoc/generator/template/darkfish/images/ruby.png", "lib/rdoc/generator/template/darkfish/images/tag_blue.png", "lib/rdoc/generator/template/darkfish/images/tag_green.png", "lib/rdoc/generator/template/darkfish/images/transparent.png", "lib/rdoc/generator/template/darkfish/images/wrench.png", "lib/rdoc/generator/template/darkfish/images/wrench_orange.png", "lib/rdoc/generator/template/darkfish/images/zoom.png", "lib/rdoc/generator/template/darkfish/index.rhtml", "lib/rdoc/generator/template/darkfish/js/darkfish.js", "lib/rdoc/generator/template/darkfish/js/jquery.js", "lib/rdoc/generator/template/darkfish/js/search.js", "lib/rdoc/generator/template/darkfish/page.rhtml", "lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml", "lib/rdoc/generator/template/darkfish/servlet_root.rhtml", "lib/rdoc/generator/template/darkfish/table_of_contents.rhtml", "lib/rdoc/generator/template/json_index/.document", "lib/rdoc/generator/template/json_index/js/navigation.js", "lib/rdoc/generator/template/json_index/js/searcher.js", "lib/rdoc/ghost_method.rb", "lib/rdoc/i18n.rb", "lib/rdoc/i18n/locale.rb", "lib/rdoc/i18n/text.rb", "lib/rdoc/include.rb", "lib/rdoc/known_classes.rb", "lib/rdoc/markdown.kpeg", "lib/rdoc/markdown/entities.rb", "lib/rdoc/markdown/literals.kpeg", "lib/rdoc/markup.rb", "lib/rdoc/markup/attr_changer.rb", "lib/rdoc/markup/attr_span.rb", "lib/rdoc/markup/attribute_manager.rb", "lib/rdoc/markup/attributes.rb", "lib/rdoc/markup/blank_line.rb", "lib/rdoc/markup/block_quote.rb", "lib/rdoc/markup/document.rb", "lib/rdoc/markup/formatter.rb", "lib/rdoc/markup/formatter_test_case.rb", "lib/rdoc/markup/hard_break.rb", "lib/rdoc/markup/heading.rb", "lib/rdoc/markup/include.rb", "lib/rdoc/markup/indented_paragraph.rb", "lib/rdoc/markup/list.rb", "lib/rdoc/markup/list_item.rb", "lib/rdoc/markup/paragraph.rb", "lib/rdoc/markup/parser.rb", "lib/rdoc/markup/pre_process.rb", "lib/rdoc/markup/raw.rb", "lib/rdoc/markup/regexp_handling.rb", "lib/rdoc/markup/rule.rb", "lib/rdoc/markup/text_formatter_test_case.rb", "lib/rdoc/markup/to_ansi.rb", "lib/rdoc/markup/to_bs.rb", "lib/rdoc/markup/to_html.rb", "lib/rdoc/markup/to_html_crossref.rb", "lib/rdoc/markup/to_html_snippet.rb", "lib/rdoc/markup/to_joined_paragraph.rb", "lib/rdoc/markup/to_label.rb", "lib/rdoc/markup/to_markdown.rb", "lib/rdoc/markup/to_rdoc.rb", "lib/rdoc/markup/to_table_of_contents.rb", "lib/rdoc/markup/to_test.rb", "lib/rdoc/markup/to_tt_only.rb", "lib/rdoc/markup/verbatim.rb", "lib/rdoc/meta_method.rb", "lib/rdoc/method_attr.rb", "lib/rdoc/mixin.rb", "lib/rdoc/normal_class.rb", "lib/rdoc/normal_module.rb", "lib/rdoc/options.rb", "lib/rdoc/parser.rb", "lib/rdoc/parser/c.rb", "lib/rdoc/parser/changelog.rb", "lib/rdoc/parser/markdown.rb", "lib/rdoc/parser/rd.rb", "lib/rdoc/parser/ripper_state_lex.rb", "lib/rdoc/parser/ruby.rb", "lib/rdoc/parser/ruby_tools.rb", "lib/rdoc/parser/simple.rb", "lib/rdoc/parser/text.rb", "lib/rdoc/rd.rb", "lib/rdoc/rd/block_parser.ry", "lib/rdoc/rd/inline.rb", "lib/rdoc/rd/inline_parser.ry", "lib/rdoc/rdoc.rb", "lib/rdoc/require.rb", "lib/rdoc/ri.rb", "lib/rdoc/ri/driver.rb", "lib/rdoc/ri/formatter.rb", "lib/rdoc/ri/paths.rb", "lib/rdoc/ri/store.rb", "lib/rdoc/ri/task.rb", "lib/rdoc/rubygems_hook.rb", "lib/rdoc/servlet.rb", "lib/rdoc/single_class.rb", "lib/rdoc/stats.rb", "lib/rdoc/stats/normal.rb", "lib/rdoc/stats/quiet.rb", "lib/rdoc/stats/verbose.rb", "lib/rdoc/store.rb", "lib/rdoc/task.rb", "lib/rdoc/text.rb", "lib/rdoc/token_stream.rb", "lib/rdoc/tom_doc.rb", "lib/rdoc/top_level.rb", "lib/rdoc/version.rb", "rdoc.gemspec"]
-  s.files << "lib/rdoc/rd/block_parser.rb" << "lib/rdoc/rd/inline_parser.rb" << "lib/rdoc/markdown.rb" << "lib/rdoc/markdown/literals.rb"
 
-  s.rdoc_options = ["--main", "README.rdoc"]
   s.extra_rdoc_files += %w[
     CVE-2013-0256.rdoc
     CONTRIBUTING.rdoc
@@ -50,13 +41,21 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     TODO.rdoc
   ]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
+  # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files = [".autotest", ".document", ".gitignore", ".travis.yml", "CONTRIBUTING.rdoc", "CVE-2013-0256.rdoc", "ExampleMarkdown.md", "ExampleRDoc.rdoc", "Gemfile", "History.rdoc", "LEGAL.rdoc", "LICENSE.rdoc", "README.rdoc", "RI.rdoc", "Rakefile", "TODO.rdoc", "bin/console", "bin/setup", "exe/rdoc", "exe/ri", "lib/gauntlet_rdoc.rb", "lib/rdoc.rb", "lib/rdoc/alias.rb", "lib/rdoc/anon_class.rb", "lib/rdoc/any_method.rb", "lib/rdoc/attr.rb", "lib/rdoc/class_module.rb", "lib/rdoc/code_object.rb", "lib/rdoc/code_objects.rb", "lib/rdoc/comment.rb", "lib/rdoc/constant.rb", "lib/rdoc/context.rb", "lib/rdoc/context/section.rb", "lib/rdoc/cross_reference.rb", "lib/rdoc/encoding.rb", "lib/rdoc/erb_partial.rb", "lib/rdoc/erbio.rb", "lib/rdoc/extend.rb", "lib/rdoc/generator.rb", "lib/rdoc/generator/darkfish.rb", "lib/rdoc/generator/json_index.rb", "lib/rdoc/generator/markup.rb", "lib/rdoc/generator/pot.rb", "lib/rdoc/generator/pot/message_extractor.rb", "lib/rdoc/generator/pot/po.rb", "lib/rdoc/generator/pot/po_entry.rb", "lib/rdoc/generator/ri.rb", "lib/rdoc/generator/template/darkfish/.document", "lib/rdoc/generator/template/darkfish/_footer.rhtml", "lib/rdoc/generator/template/darkfish/_head.rhtml","lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml", "lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml", "lib/rdoc/generator/template/darkfish/class.rhtml", "lib/rdoc/generator/template/darkfish/css/fonts.css", "lib/rdoc/generator/template/darkfish/css/rdoc.css", "lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf", "lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf", "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf", "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf", "lib/rdoc/generator/template/darkfish/images/add.png", "lib/rdoc/generator/template/darkfish/images/arrow_up.png", "lib/rdoc/generator/template/darkfish/images/brick.png", "lib/rdoc/generator/template/darkfish/images/brick_link.png", "lib/rdoc/generator/template/darkfish/images/bug.png", "lib/rdoc/generator/template/darkfish/images/bullet_black.png", "lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png", "lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png", "lib/rdoc/generator/template/darkfish/images/date.png", "lib/rdoc/generator/template/darkfish/images/delete.png", "lib/rdoc/generator/template/darkfish/images/find.png", "lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif", "lib/rdoc/generator/template/darkfish/images/macFFBgHack.png", "lib/rdoc/generator/template/darkfish/images/package.png", "lib/rdoc/generator/template/darkfish/images/page_green.png", "lib/rdoc/generator/template/darkfish/images/page_white_text.png", "lib/rdoc/generator/template/darkfish/images/page_white_width.png", "lib/rdoc/generator/template/darkfish/images/plugin.png", "lib/rdoc/generator/template/darkfish/images/ruby.png", "lib/rdoc/generator/template/darkfish/images/tag_blue.png", "lib/rdoc/generator/template/darkfish/images/tag_green.png", "lib/rdoc/generator/template/darkfish/images/transparent.png", "lib/rdoc/generator/template/darkfish/images/wrench.png", "lib/rdoc/generator/template/darkfish/images/wrench_orange.png", "lib/rdoc/generator/template/darkfish/images/zoom.png", "lib/rdoc/generator/template/darkfish/index.rhtml", "lib/rdoc/generator/template/darkfish/js/darkfish.js", "lib/rdoc/generator/template/darkfish/js/jquery.js", "lib/rdoc/generator/template/darkfish/js/search.js", "lib/rdoc/generator/template/darkfish/page.rhtml", "lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml", "lib/rdoc/generator/template/darkfish/servlet_root.rhtml", "lib/rdoc/generator/template/darkfish/table_of_contents.rhtml", "lib/rdoc/generator/template/json_index/.document", "lib/rdoc/generator/template/json_index/js/navigation.js", "lib/rdoc/generator/template/json_index/js/searcher.js", "lib/rdoc/ghost_method.rb", "lib/rdoc/i18n.rb", "lib/rdoc/i18n/locale.rb", "lib/rdoc/i18n/text.rb", "lib/rdoc/include.rb", "lib/rdoc/known_classes.rb", "lib/rdoc/markdown.kpeg", "lib/rdoc/markdown/entities.rb", "lib/rdoc/markdown/literals.kpeg", "lib/rdoc/markdown/literals.rb", "lib/rdoc/markup.rb", "lib/rdoc/markup/attr_changer.rb", "lib/rdoc/markup/attr_span.rb", "lib/rdoc/markup/attribute_manager.rb", "lib/rdoc/markup/attributes.rb", "lib/rdoc/markup/blank_line.rb", "lib/rdoc/markup/block_quote.rb", "lib/rdoc/markup/document.rb", "lib/rdoc/markup/formatter.rb", "lib/rdoc/markup/formatter_test_case.rb", "lib/rdoc/markup/hard_break.rb", "lib/rdoc/markup/heading.rb", "lib/rdoc/markup/include.rb", "lib/rdoc/markup/indented_paragraph.rb", "lib/rdoc/markup/inline.rb", "lib/rdoc/markup/list.rb", "lib/rdoc/markup/list_item.rb", "lib/rdoc/markup/paragraph.rb", "lib/rdoc/markup/parser.rb", "lib/rdoc/markup/pre_process.rb", "lib/rdoc/markup/raw.rb", "lib/rdoc/markup/rule.rb", "lib/rdoc/markup/special.rb", "lib/rdoc/markup/text_formatter_test_case.rb", "lib/rdoc/markup/to_ansi.rb", "lib/rdoc/markup/to_bs.rb", "lib/rdoc/markup/to_html.rb", "lib/rdoc/markup/to_html_crossref.rb", "lib/rdoc/markup/to_html_snippet.rb", "lib/rdoc/markup/to_joined_paragraph.rb", "lib/rdoc/markup/to_label.rb", "lib/rdoc/markup/to_markdown.rb", "lib/rdoc/markup/to_rdoc.rb", "lib/rdoc/markup/to_table_of_contents.rb", "lib/rdoc/markup/to_test.rb", "lib/rdoc/markup/to_tt_only.rb", "lib/rdoc/markup/verbatim.rb", "lib/rdoc/meta_method.rb", "lib/rdoc/method_attr.rb", "lib/rdoc/mixin.rb", "lib/rdoc/normal_class.rb", "lib/rdoc/normal_module.rb", "lib/rdoc/options.rb", "lib/rdoc/parser.rb", "lib/rdoc/parser/c.rb", "lib/rdoc/parser/changelog.rb", "lib/rdoc/parser/markdown.rb", "lib/rdoc/parser/rd.rb", "lib/rdoc/parser/ruby.rb", "lib/rdoc/parser/ruby_tools.rb", "lib/rdoc/parser/simple.rb", "lib/rdoc/parser/text.rb", "lib/rdoc/rd.rb", "lib/rdoc/rd/block_parser.ry", "lib/rdoc/rd/inline.rb", "lib/rdoc/rd/inline_parser.ry", "lib/rdoc/rdoc.rb", "lib/rdoc/require.rb", "lib/rdoc/ri.rb", "lib/rdoc/ri/driver.rb", "lib/rdoc/ri/formatter.rb", "lib/rdoc/ri/paths.rb", "lib/rdoc/ri/store.rb", "lib/rdoc/ri/task.rb", "lib/rdoc/ruby_lex.rb", "lib/rdoc/ruby_token.rb", "lib/rdoc/rubygems_hook.rb", "lib/rdoc/servlet.rb", "lib/rdoc/single_class.rb", "lib/rdoc/stats.rb", "lib/rdoc/stats/normal.rb", "lib/rdoc/stats/quiet.rb", "lib/rdoc/stats/verbose.rb", "lib/rdoc/store.rb", "lib/rdoc/task.rb", "lib/rdoc/test_case.rb", "lib/rdoc/text.rb", "lib/rdoc/token_stream.rb", "lib/rdoc/tom_doc.rb", "lib/rdoc/top_level.rb", "rdoc.gemspec"]
+  # files from .gitignore
+  s.files << "lib/rdoc/rd/block_parser.rb" << "lib/rdoc/rd/inline_parser.rb" << "lib/rdoc/markdown.rb"
+
+  s.homepage = "http://docs.seattlerb.org/rdoc"
+  s.licenses = ["Ruby"]
+
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
   s.rubygems_version = "2.5.2"
-  s.required_rubygems_version = Gem::Requirement.new(">= 2.2")
+  s.summary = "RDoc produces HTML and command-line documentation for Ruby projects"
 
-  s.add_development_dependency("rake")
-  s.add_development_dependency("racc", "> 1.4.10")
-  s.add_development_dependency("kpeg")
-  s.add_development_dependency("minitest", "~> 5")
-  s.add_development_dependency("rubocop")
+  s.add_development_dependency("rake", "~> 10.5")
+  s.add_development_dependency("racc", "~> 1.4", "> 1.4.10")
+  s.add_development_dependency("kpeg", "~> 0.9")
+  s.add_development_dependency("minitest", "~> 4")
 end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index ca2c1abefd..ec50d8eba5 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'rdoc'
 
 require 'find'
@@ -36,6 +36,11 @@ class RDoc::RDoc
   GENERATORS = {}
 
   ##
+  # File pattern to exclude
+
+  attr_accessor :exclude
+
+  ##
   # Generator instance used for creating output
 
   attr_accessor :generator
@@ -88,6 +93,7 @@ class RDoc::RDoc
 
   def initialize
     @current       = nil
+    @exclude       = nil
     @generator     = nil
     @last_modified = {}
     @old_siginfo   = nil
@@ -110,7 +116,7 @@ class RDoc::RDoc
   def gather_files files
     files = ["."] if files.empty?
 
-    file_list = normalized_file_list files, true, @options.exclude
+    file_list = normalized_file_list files, true, @exclude
 
     file_list = file_list.uniq
 
@@ -155,9 +161,15 @@ class RDoc::RDoc
 
     RDoc.load_yaml
 
+    parse_error = if Object.const_defined? :Psych then
+                    Psych::SyntaxError
+                  else
+                    ArgumentError
+                  end
+
     begin
       options = YAML.load_file '.rdoc_options'
-    rescue Psych::SyntaxError
+    rescue *parse_error
     end
 
     raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
@@ -182,7 +194,7 @@ class RDoc::RDoc
       error "#{dir} exists and is not a directory" unless File.directory? dir
 
       begin
-        File.open flag_file do |io|
+        open flag_file do |io|
           unless force then
             Time.parse io.gets
 
@@ -226,11 +238,8 @@ option)
 
   def update_output_dir(op_dir, time, last = {})
     return if @options.dry_run or not @options.update_output_dir
-    unless ENV['SOURCE_DATE_EPOCH'].nil?
-      time = Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-    end
 
-    File.open output_flag_file(op_dir), "w" do |f|
+    open output_flag_file(op_dir), "w" do |f|
       f.puts time.rfc2822
       last.each do |n, t|
         f.puts "#{n}\t#{t.rfc2822}"
@@ -258,7 +267,7 @@ option)
 
     patterns.split.each do |patt|
       candidates = Dir.glob(File.join(in_dir, patt))
-      result.concat normalized_file_list(candidates, false, @options.exclude)
+      result.concat normalized_file_list(candidates)
     end
 
     result
@@ -355,7 +364,7 @@ option)
         relative_path.relative_path_from @options.page_dir
     end
 
-    top_level = @store.add_file filename, relative_name: relative_path.to_s
+    top_level = @store.add_file filename, relative_path.to_s
 
     parser = RDoc::Parser.for top_level, filename, content, @options, @stats
 
@@ -408,7 +417,6 @@ The internal error was:
 
     return [] if file_list.empty?
 
-    original_options = @options.dup
     @stats.begin_adding
 
     file_info = file_list.map do |filename|
@@ -417,7 +425,6 @@ The internal error was:
     end.compact
 
     @stats.done_adding
-    @options = original_options
 
     file_info
   end
@@ -466,11 +473,13 @@ The internal error was:
       exit
     end
 
+    @exclude = @options.exclude
+
     unless @options.coverage_report then
       @last_modified = setup_output_dir @options.op_dir, @options.force_update
     end
 
-    @store.encoding = @options.encoding
+    @store.encoding = @options.encoding if @options.respond_to? :encoding
     @store.dry_run  = @options.dry_run
     @store.main     = @options.main_page
     @store.title    = @options.title
@@ -516,18 +525,13 @@ The internal error was:
   # by the RDoc options
 
   def generate
-    if @options.dry_run then
-      # do nothing
-      @generator.generate
-    else
-      Dir.chdir @options.op_dir do
-        unless @options.quiet then
-          $stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
-        end
-
-        @generator.generate
-        update_output_dir '.', @start_time, @last_modified
+    Dir.chdir @options.op_dir do
+      unless @options.quiet then
+        $stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
       end
+
+      @generator.generate
+      update_output_dir '.', @start_time, @last_modified
     end
   end
 
diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb
index 91f9c24e5d..f565ffad78 100644
--- a/lib/rdoc/require.rb
+++ b/lib/rdoc/require.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A file loaded by \#require
 
diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb
index c798c1fc49..388cb12c70 100644
--- a/lib/rdoc/ri.rb
+++ b/lib/rdoc/ri.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'rdoc'
 
 ##
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 46b98e99b5..7942406ceb 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'abbrev'
 require 'optparse'
 
@@ -47,24 +47,13 @@ class RDoc::RI::Driver
 
   class NotFoundError < Error
 
-    def initialize(klass, suggestions = nil) # :nodoc:
-      @klass = klass
-      @suggestions = suggestions
-    end
-
     ##
     # Name that wasn't found
 
-    def name
-      @klass
-    end
+    alias name message
 
     def message # :nodoc:
-      str = "Nothing known about #{@klass}"
-      if @suggestions and !@suggestions.empty?
-        str += "\nDid you mean?  #{@suggestions.join("\n               ")}"
-      end
-      str
+      "Nothing known about #{super}"
     end
   end
 
@@ -91,6 +80,7 @@ class RDoc::RI::Driver
     options[:interactive] = false
     options[:profile]     = false
     options[:show_all]    = false
+    options[:use_cache]   = true
     options[:use_stdout]  = !$stdout.tty?
     options[:width]       = 72
 
@@ -110,7 +100,7 @@ class RDoc::RI::Driver
   def self.dump data_path
     require 'pp'
 
-    File.open data_path, 'rb' do |io|
+    open data_path, 'rb' do |io|
       pp Marshal.load(io.read)
     end
   end
@@ -132,7 +122,7 @@ class RDoc::RI::Driver
       opt.summary_indent = ' ' * 4
 
       opt.banner = <<-EOT
-Usage: #{opt.program_name} [options] [name ...]
+Usage: #{opt.program_name} [options] [names...]
 
 Where name can be:
 
@@ -142,8 +132,8 @@ Where name can be:
 
   gem_name: | gem_name:README | gem_name:History
 
-All class names may be abbreviated to their minimum unambiguous form.
-If a name is ambiguous, all valid options will be listed.
+All class names may be abbreviated to their minimum unambiguous form. If a name
+is ambiguous, all valid options will be listed.
 
 A '.' matches either class or instance methods, while #method
 matches only instance and ::method matches only class methods.
@@ -161,23 +151,23 @@ For example:
     #{opt.program_name} zip
     #{opt.program_name} rdoc:README
 
-Note that shell quoting or escaping may be required for method names
-containing punctuation:
+Note that shell quoting or escaping may be required for method names containing
+punctuation:
 
     #{opt.program_name} 'Array.[]'
     #{opt.program_name} compact\\!
 
-To see the default directories #{opt.program_name} will search, run:
+To see the default directories ri will search, run:
 
     #{opt.program_name} --list-doc-dirs
 
-Specifying the --system, --site, --home, --gems, or --doc-dir options
-will limit ri to searching only the specified directories.
+Specifying the --system, --site, --home, --gems or --doc-dir options will
+limit ri to searching only the specified directories.
 
-ri options may be set in the RI environment variable.
+ri options may be set in the 'RI' environment variable.
 
-The ri pager can be set with the RI_PAGER environment variable
-or the PAGER environment variable.
+The ri pager can be set with the 'RI_PAGER' environment variable or the
+'PAGER' environment variable.
       EOT
 
       opt.separator nil
@@ -209,15 +199,15 @@ or the PAGER environment variable.
       opt.separator nil
 
       opt.on("--[no-]pager",
-             "Send output to a pager,",
-             "rather than directly to stdout.") do |use_pager|
+             "Send output directly to stdout,",
+             "rather than to a pager.") do |use_pager|
         options[:use_stdout] = !use_pager
       end
 
       opt.separator nil
 
       opt.on("-T",
-             "Synonym for --no-pager.") do
+             "Synonym for --no-pager") do
         options[:use_stdout] = true
       end
 
@@ -230,7 +220,7 @@ or the PAGER environment variable.
 
       opt.separator nil
 
-      opt.on("--server[=PORT]", Integer,
+      opt.on("--server [PORT]", Integer,
              "Run RDoc server on the given port.",
              "The default port is 8214.") do |port|
         options[:server] = port || 8214
@@ -245,30 +235,14 @@ or the PAGER environment variable.
       formatters -= %w[html label test] # remove useless output formats
 
       opt.on("--format=NAME", "-f",
-             "Use the selected formatter.  The default",
+             "Uses the selected formatter. The default",
              "formatter is bs for paged output and ansi",
-             "otherwise.  Valid formatters are:",
-             "#{formatters.join(', ')}.", formatters) do |value|
+             "otherwise. Valid formatters are:",
+             formatters.join(' '), formatters) do |value|
         options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
       end
 
       opt.separator nil
-
-      opt.on("--help", "-h",
-             "Show help and exit.") do
-        puts opts
-        exit
-      end
-
-      opt.separator nil
-
-      opt.on("--version", "-v",
-             "Output version information and exit.") do
-        puts "#{opts.program_name} #{opts.version}"
-        exit
-      end
-
-      opt.separator nil
       opt.separator "Data source options:"
       opt.separator nil
 
@@ -299,7 +273,7 @@ or the PAGER environment variable.
              "Do not include documentation from",
              "the Ruby standard library, site_lib,",
              "installed gems, or ~/.rdoc.",
-             "Use with --doc-dir.") do
+             "Use with --doc-dir") do
         options[:use_system] = false
         options[:use_site] = false
         options[:use_gems] = false
@@ -309,8 +283,8 @@ or the PAGER environment variable.
       opt.separator nil
 
       opt.on("--[no-]system",
-             "Include documentation from Ruby's",
-             "standard library.  Defaults to true.") do |value|
+             "Include documentation from Ruby's standard",
+             "library.  Defaults to true.") do |value|
         options[:use_system] = value
       end
 
@@ -344,14 +318,14 @@ or the PAGER environment variable.
       opt.separator nil
 
       opt.on("--[no-]profile",
-             "Run with the ruby profiler.") do |value|
+             "Run with the ruby profiler") do |value|
         options[:profile] = value
       end
 
       opt.separator nil
 
       opt.on("--dump=CACHE", File,
-             "Dump data from an ri cache or data file.") do |value|
+             "Dumps data from an ri cache or data file") do |value|
         options[:dump_path] = value
       end
     end
@@ -425,7 +399,6 @@ or the PAGER environment variable.
     @server      = options[:server]
     @use_stdout  = options[:use_stdout]
     @show_all    = options[:show_all]
-    @width       = options[:width]
 
     # pager process for jruby
     @jruby_pager_process = nil
@@ -796,9 +769,7 @@ or the PAGER environment variable.
 
   def display document
     page do |io|
-      f = formatter(io)
-      f.width = @width if @width and f.respond_to?(:width)
-      text = document.accept f
+      text = document.accept formatter(io)
 
       io.write text
     end
@@ -931,38 +902,13 @@ or the PAGER environment variable.
     display out
   end
 
-  def check_did_you_mean # :nodoc:
-    if defined? DidYouMean::SpellChecker
-      true
-    else
-      begin
-        require 'did_you_mean'
-        if defined? DidYouMean::SpellChecker
-          true
-        else
-          false
-        end
-      rescue LoadError
-        false
-      end
-    end
-  end
-
   ##
   # Expands abbreviated klass +klass+ into a fully-qualified class.  "Zl::Da"
   # will be expanded to Zlib::DataError.
 
   def expand_class klass
-    class_names = classes.keys
-    ary = class_names.grep(Regexp.new("\\A#{klass.gsub(/(?=::|\z)/, '[^:]*')}\\z"))
-    if ary.length != 1 && ary.first != klass
-      if check_did_you_mean
-        suggestions = DidYouMean::SpellChecker.new(dictionary: class_names).correct(klass)
-        raise NotFoundError.new(klass, suggestions)
-      else
-        raise NotFoundError, klass
-      end
-    end
+    ary = classes.keys.grep(Regexp.new("\\A#{klass.gsub(/(?=::|\z)/, '[^:]*')}\\z"))
+    raise NotFoundError, klass if ary.length != 1 && ary.first != klass
     ary.first
   end
 
@@ -1274,21 +1220,7 @@ or the PAGER environment variable.
   def lookup_method name
     found = load_methods_matching name
 
-    if found.empty?
-      if check_did_you_mean
-        methods = []
-        _, _, method_name = parse_name name
-        find_methods name do |store, klass, ancestor, types, method|
-          methods.push(*store.class_methods[klass]) if [:class, :both].include? types
-          methods.push(*store.instance_methods[klass]) if [:instance, :both].include? types
-        end
-        methods = methods.uniq
-        suggestions = DidYouMean::SpellChecker.new(dictionary: methods).correct(method_name)
-        raise NotFoundError.new(name, suggestions)
-      else
-        raise NotFoundError, name
-      end
-    end
+    raise NotFoundError, name if found.empty?
 
     filter_methods found, name
   end
@@ -1443,13 +1375,7 @@ or the PAGER environment variable.
 
     render_method_arguments out, method.arglists
     render_method_superclass out, method
-    if method.is_alias_for
-      al = method.is_alias_for
-      alias_for = store.load_method al.parent_name, "#{al.name_prefix}#{al.name}"
-      render_method_comment out, method, alias_for
-    else
-      render_method_comment out, method
-    end
+    render_method_comment out, method
   end
 
   def render_method_arguments out, arglists # :nodoc:
@@ -1461,22 +1387,10 @@ or the PAGER environment variable.
     out << RDoc::Markup::Rule.new(1)
   end
 
-  def render_method_comment out, method, alias_for = nil# :nodoc:
-    if alias_for
-      unless method.comment.nil? or method.comment.empty?
-        out << RDoc::Markup::BlankLine.new
-        out << method.comment
-      end
-      out << RDoc::Markup::BlankLine.new
-      out << RDoc::Markup::Paragraph.new("(This method is an alias for #{alias_for.full_name}.)")
-      out << RDoc::Markup::BlankLine.new
-      out << alias_for.comment
-      out << RDoc::Markup::BlankLine.new
-    else
-      out << RDoc::Markup::BlankLine.new
-      out << method.comment
-      out << RDoc::Markup::BlankLine.new
-    end
+  def render_method_comment out, method # :nodoc:
+    out << RDoc::Markup::BlankLine.new
+    out << method.comment
+    out << RDoc::Markup::BlankLine.new
   end
 
   def render_method_superclass out, method # :nodoc:
@@ -1514,7 +1428,7 @@ or the PAGER environment variable.
   def setup_pager
     return if @use_stdout
 
-    jruby = RUBY_ENGINE == 'jruby'
+    jruby = Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
 
diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb
index 832a101e6c..d0c85dbe6b 100644
--- a/lib/rdoc/ri/formatter.rb
+++ b/lib/rdoc/ri/formatter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # For RubyGems backwards compatibility
 
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index d41e610591..94db2216a2 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'rdoc/ri'
 
 ##
diff --git a/lib/rdoc/ri/store.rb b/lib/rdoc/ri/store.rb
index 9f4b03734a..66e234f521 100644
--- a/lib/rdoc/ri/store.rb
+++ b/lib/rdoc/ri/store.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module RDoc::RI
 
   Store = RDoc::Store # :nodoc:
diff --git a/lib/rdoc/ri/task.rb b/lib/rdoc/ri/task.rb
index 6a6ea572bf..cc0a85d4b7 100644
--- a/lib/rdoc/ri/task.rb
+++ b/lib/rdoc/ri/task.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 begin
   gem 'rdoc'
 rescue Gem::LoadError
diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb
new file mode 100644
index 0000000000..25788b6a29
--- /dev/null
+++ b/lib/rdoc/ruby_lex.rb
@@ -0,0 +1,1371 @@
+# coding: US-ASCII
+# frozen_string_literal: false
+
+#--
+#   irb/ruby-lex.rb - ruby lexcal analyzer
+#   	$Release Version: 0.9.5$
+#   	$Revision: 17979 $
+#   	$Date: 2008-07-09 10:17:05 -0700 (Wed, 09 Jul 2008) $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+#++
+
+require "e2mmap"
+require "irb/slex"
+require "stringio"
+
+##
+# Ruby lexer adapted from irb.
+#
+# The internals are not documented because they are scary.
+
+class RDoc::RubyLex
+
+  ##
+  # Raised upon invalid input
+
+  class Error < RDoc::Error
+  end
+
+  # :stopdoc:
+
+  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 RDoc::RubyToken
+  include IRB
+
+  attr_accessor :continue
+  attr_accessor :lex_state
+  attr_reader :reader
+
+  class << self
+    attr_accessor :debug_level
+  end
+
+  def self.debug?
+    @debug_level > 0
+  end
+
+  self.debug_level = 0
+
+  # :startdoc:
+
+  ##
+  # Returns an Array of +ruby+ tokens.  See ::new for a description of
+  # +options+.
+
+  def self.tokenize ruby, options
+    tokens = []
+
+    scanner = RDoc::RubyLex.new ruby, options
+    scanner.exception_on_syntax_error = true
+
+    while token = scanner.token do
+      tokens << token
+    end
+
+    tokens
+  end
+
+  ##
+  # Creates a new lexer for +content+.  +options+ is an RDoc::Options, only
+  # +tab_width is used.
+
+  def initialize(content, options)
+    lex_init
+
+    if /\t/ =~ content then
+      tab_width = options.tab_width
+      content = content.split(/\n/).map do |line|
+        1 while line.gsub!(/\t+/) {
+          ' ' * (tab_width*$&.length - $`.length % tab_width)
+        }  && $~
+        line
+      end.join("\n")
+    end
+
+    content << "\n" unless content[-1, 1] == "\n"
+
+    set_input StringIO.new content
+
+    @base_char_no = 0
+    @char_no = 0
+    @exp_line_no = @line_no = 1
+    @here_readed = []
+    @readed = []
+    @current_readed = @readed
+    @rests = []
+    @seek = 0
+
+    @indent = 0
+    @indent_stack = []
+    @lex_state = :EXPR_BEG
+    @space_seen = false
+
+    @continue = false
+    @line = ""
+
+    @skip_space = false
+    @readed_auto_clean_up = false
+    @exception_on_syntax_error = true
+
+    @prompt = nil
+    @prev_seek = nil
+    @ltype = nil
+  end
+
+  # :stopdoc:
+
+  def inspect # :nodoc:
+    "#<%s:0x%x pos %d lex_state %p space_seen %p>" % [
+      self.class, object_id,
+      @io.pos, @lex_state, @space_seen,
+    ]
+  end
+
+  attr_accessor :skip_space
+  attr_accessor :readed_auto_clean_up
+  attr_accessor :exception_on_syntax_error
+
+  attr_reader :seek
+  attr_reader :char_no
+  attr_reader :line_no
+  attr_reader :indent
+
+  # io functions
+  def set_input(io, p = nil, &block)
+    @io = io
+    if p.respond_to?(:call)
+      @input = p
+    elsif block_given?
+      @input = block
+    else
+      @input = Proc.new{@io.gets}
+    end
+  end
+
+  def get_readed
+    if idx = @readed.rindex("\n")
+      @base_char_no = @readed.size - (idx + 1)
+    else
+      @base_char_no += @readed.size
+    end
+
+    readed = @readed.join("")
+    @readed.clear
+    readed
+  end
+
+  def getc
+    while @rests.empty?
+      #      return nil unless buf_input
+      @rests.push nil unless buf_input
+    end
+    c = @rests.shift
+    @current_readed.push c
+    @seek += 1
+    if c == "\n".freeze
+      @line_no += 1
+      @char_no = 0
+    else
+      @char_no += 1
+    end
+
+    c
+  end
+
+  def gets
+    l = ""
+    while c = getc
+      l.concat(c)
+      break if c == "\n"
+    end
+    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
+
+  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
+      else
+        @char_no = @base_char_no + @readed.size
+      end
+    else
+      @char_no -= 1
+    end
+  end
+
+  def peek_equal?(str)
+    chrs = str.split(//)
+    until @rests.size >= chrs.size
+      return false unless buf_input
+    end
+    @rests[0, chrs.size] == chrs
+  end
+
+  def peek_match?(regexp)
+    while @rests.empty?
+      return false unless buf_input
+    end
+    regexp =~ @rests.join("")
+  end
+
+  def peek(i = 0)
+    while @rests.size <= i
+      return nil unless buf_input
+    end
+    @rests[i]
+  end
+
+  def buf_input
+    prompt
+    line = @input.call
+    return nil unless line
+    @rests.concat line.split(//)
+    true
+  end
+  private :buf_input
+
+  def set_prompt(p = nil, &block)
+    p = block if block_given?
+    if p.respond_to?(:call)
+      @prompt = p
+    else
+      @prompt = Proc.new{print p}
+    end
+  end
+
+  def prompt
+    if @prompt
+      @prompt.call(@ltype, @indent, @continue, @line_no)
+    end
+  end
+
+  def initialize_input
+    @ltype = nil
+    @quoted = nil
+    @indent = 0
+    @indent_stack = []
+    @lex_state = :EXPR_BEG
+    @space_seen = false
+    @current_readed = @readed
+
+    @continue = false
+    prompt
+
+    @line = ""
+    @exp_line_no = @line_no
+  end
+
+  def each_top_level_statement
+    initialize_input
+    catch(:TERM_INPUT) do
+      loop do
+        begin
+          @continue = false
+          prompt
+          unless l = lex
+            throw :TERM_INPUT if @line == ''
+          else
+            #p l
+            @line.concat l
+            if @ltype or @continue or @indent > 0
+              next
+            end
+          end
+          if @line != "\n"
+            yield @line, @exp_line_no
+          end
+          break unless l
+          @line = ''
+          @exp_line_no = @line_no
+
+          @indent = 0
+          @indent_stack = []
+          prompt
+        rescue TerminateLineInput
+          initialize_input
+          prompt
+          get_readed
+        end
+      end
+    end
+  end
+
+  def lex
+    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
+           !@continue or
+      tk.nil?)
+      #p tk
+      #p @lex_state
+      #p self
+    end
+    line = get_readed
+    #      print self.inspect
+    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+      nil
+    else
+      line
+    end
+  end
+
+  def token
+    #      require "tracer"
+    #      Tracer.on
+    @prev_seek = @seek
+    @prev_line_no = @line_no
+    @prev_char_no = @char_no
+    begin
+      begin
+        tk = @OP.match(self)
+        @space_seen = tk.kind_of?(TkSPACE)
+      rescue SyntaxError => e
+        raise Error, "syntax error: #{e.message}" if
+          @exception_on_syntax_error
+
+        tk = TkError.new(@seek, @line_no, @char_no)
+      end
+    end while @skip_space and tk.kind_of?(TkSPACE)
+
+    if @readed_auto_clean_up
+      get_readed
+    end
+    #      Tracer.off
+    tk
+  end
+
+  ENINDENT_CLAUSE = [
+    "case", "class", "def", "do", "for", "if",
+    "module", "unless", "until", "while", "begin" #, "when"
+  ]
+
+  DEINDENT_CLAUSE = ["end" #, "when"
+  ]
+
+  PERCENT_LTYPE = {
+    "q" => "\'",
+    "Q" => "\"",
+    "x" => "\`",
+    "r" => "/",
+    "w" => "]",
+    "W" => "]",
+    "s" => ":"
+  }
+
+  PERCENT_PAREN = {
+    "{" => "}",
+    "[" => "]",
+    "<" => ">",
+    "(" => ")"
+  }
+
+  PERCENT_PAREN_REV = PERCENT_PAREN.invert
+
+  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
+      str = op
+      while (ch = getc) =~ /[ \t\f\r\13]/ do
+        str << ch
+      end
+      ungetc
+      Token TkSPACE, str
+    end
+
+    @OP.def_rule("#") do |op, io|
+      identify_comment
+    end
+
+    @OP.def_rule("=begin",
+                 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
+      |op, io|
+      @ltype = "="
+      res = ''
+      nil until getc == "\n"
+
+      until ( peek_equal?("=end") && peek(4) =~ /\s/ ) do
+        (ch = getc)
+        res << ch
+      end
+
+      gets # consume =end
+
+      @ltype = nil
+      Token(TkRD_COMMENT, res)
+    end
+
+    @OP.def_rule("\n") do |op, io|
+      print "\\n\n" if RDoc::RubyLex.debug?
+      case @lex_state
+      when :EXPR_BEG, :EXPR_FNAME, :EXPR_DOT
+        @continue = true
+      else
+        @continue = false
+        @lex_state = :EXPR_BEG
+        until (@indent_stack.empty? ||
+               [TkLPAREN, TkLBRACK, TkLBRACE,
+                 TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+          @indent_stack.pop
+        end
+      end
+      @current_readed = @readed
+      @here_readed.clear
+      Token(TkNL)
+    end
+
+    @OP.def_rules("*", "**",
+                  "=", "==", "===",
+                  "=~", "<=>",
+                  "<", "<=",
+                  ">", ">=", ">>") do
+      |op, io|
+      case @lex_state
+      when :EXPR_FNAME, :EXPR_DOT
+        @lex_state = :EXPR_ARG
+      else
+        @lex_state = :EXPR_BEG
+      end
+      Token(op)
+    end
+
+    @OP.def_rules("!", "!=", "!~") do
+      |op, io|
+      @lex_state = :EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules("<<") do
+      |op, io|
+      tk = nil
+      if @lex_state != :EXPR_END && @lex_state != :EXPR_CLASS &&
+         (@lex_state != :EXPR_ARG || @space_seen)
+        c = peek(0)
+        if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
+          tk = identify_here_document
+        end
+      end
+      unless tk
+        tk = Token(op)
+        case @lex_state
+        when :EXPR_FNAME, :EXPR_DOT
+          @lex_state = :EXPR_ARG
+        else
+          @lex_state = :EXPR_BEG
+        end
+      end
+      tk
+    end
+
+    @OP.def_rules("'", '"') do
+      |op, io|
+      identify_string(op)
+    end
+
+    @OP.def_rules("`") do
+      |op, io|
+      if @lex_state == :EXPR_FNAME
+        @lex_state = :EXPR_END
+        Token(op)
+      else
+        identify_string(op)
+      end
+    end
+
+    @OP.def_rules('?') do
+      |op, io|
+      if @lex_state == :EXPR_END
+        @lex_state = :EXPR_BEG
+        Token(TkQUESTION)
+      else
+        ch = getc
+        if @lex_state == :EXPR_ARG && ch =~ /\s/
+          ungetc
+          @lex_state = :EXPR_BEG;
+          Token(TkQUESTION)
+        else
+          @lex_state = :EXPR_END
+          Token(TkCHAR, "?#{ch}")
+        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(op)
+          else
+            @lex_state = :EXPR_BEG
+          end
+        elsif @lex_state != :EXPR_END and peek(0) =~ /[0-9]/
+          throw :RET, identify_number(op)
+        else
+          @lex_state = :EXPR_BEG
+        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
+  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|
+      #      p @lex_state.id2name, @space_seen
+      if @lex_state == :EXPR_BEG or @lex_state == :EXPR_ARG && @space_seen
+        @lex_state = :EXPR_BEG
+        Token(TkCOLON3)
+      else
+        @lex_state = :EXPR_DOT
+        Token(TkCOLON2)
+      end
+    end
+
+    @OP.def_rule("/") do
+      |op, io|
+      if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
+        identify_string(op)
+      elsif peek(0) == '='
+        getc
+        @lex_state = :EXPR_BEG
+        Token(TkOPASGN, "/") #/)
+      elsif @lex_state == :EXPR_ARG and @space_seen and peek(0) !~ /\s/
+        identify_string(op)
+      else
+        @lex_state = :EXPR_BEG
+        Token("/") #/)
+      end
+    end
+
+    @OP.def_rules("^") do
+      |op, io|
+      @lex_state = :EXPR_BEG
+      Token("^")
+    end
+
+    #       @OP.def_rules("^=") do
+    # 	@lex_state = :EXPR_BEG
+    # 	Token(OP_ASGN, :^)
+    #       end
+
+    @OP.def_rules(",") do
+      |op, io|
+      @lex_state = :EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules(";") do
+      |op, io|
+      @lex_state = :EXPR_BEG
+      until (@indent_stack.empty? ||
+             [TkLPAREN, TkLBRACK, TkLBRACE,
+               TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+        @indent_stack.pop
+      end
+      Token(op)
+    end
+
+    @OP.def_rule("~") do
+      |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
+        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
+        ungetc
+        Token("\\")
+      end
+    end
+
+    @OP.def_rule('%') do
+      |op, io|
+      if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
+        identify_quotation
+      elsif peek(0) == '='
+        getc
+        Token(TkOPASGN, :%)
+      elsif @lex_state == :EXPR_ARG and @space_seen and peek(0) !~ /\s/
+        identify_quotation
+      else
+        @lex_state = :EXPR_BEG
+        Token("%") #))
+      end
+    end
+
+    @OP.def_rule('$') do
+      |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("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
+    # 	|op, io|
+    # 	@indent += 1
+    # 	@lex_state = :EXPR_FNAME
+    # #	@lex_state = :EXPR_END
+    # #	until @rests[0] == "\n" or @rests[0] == ";"
+    # #	  rests.shift
+    # #	end
+    #       end
+
+    @OP.def_rule("_") do
+      if peek_match?(/_END__/) and @lex_state == :EXPR_BEG then
+        6.times { getc }
+        Token(TkEND_OF_SCRIPT, '__END__')
+      else
+        ungetc
+        identify_identifier
+      end
+    end
+
+    @OP.def_rule("") do
+      |op, io|
+      printf "MATCH: start %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
+      if peek(0) =~ /[0-9]/
+        t = identify_number
+      else
+        t = identify_identifier
+      end
+      printf "MATCH: end %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
+      t
+    end
+
+    p @OP if RDoc::RubyLex.debug?
+  end
+
+  def identify_gvar
+    @lex_state = :EXPR_END
+
+    case ch = getc
+    when /[~_*$?!@\/\\;,=:<>".]/   #"
+      Token(TkGVAR, "$" + ch)
+    when "-"
+      Token(TkGVAR, "$-" + getc)
+    when "&", "`", "'", "+"
+      Token(TkBACK_REF, "$"+ch)
+    when /[1-9]/
+      ref = ch
+      while (ch = getc) =~ /[0-9]/ do ref << ch end
+      ungetc
+      Token(TkNTH_REF, "$#{ref}")
+    when /\w/
+      ungetc
+      ungetc
+      identify_identifier
+    else
+      ungetc
+      Token("$")
+    end
+  end
+
+  IDENT_RE = if defined? Encoding then
+               eval '/[\w\u{0080}-\u{FFFFF}]/u' # 1.8 can't parse \u{}
+             else
+               /[\w\x80-\xFF]/
+             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) =~ IDENT_RE do
+      print " :#{ch}: " if RDoc::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 RDoc::RubyLex.debug?
+
+      token_c, *trans = TkReading2Token[token]
+      if token_c
+        # reserved word?
+
+        if (@lex_state != :EXPR_BEG &&
+            @lex_state != :EXPR_FNAME &&
+            trans[1])
+          # modifiers
+          token_c = TkSymbol2Token[trans[1]]
+          @lex_state = trans[0]
+        else
+          if @lex_state != :EXPR_FNAME
+            if ENINDENT_CLAUSE.include?(token)
+              valid = peek(0) != ':'
+
+              # check for ``class = val'' etc.
+              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 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
+              else
+                token_c = TkIDENTIFIER
+              end
+
+            elsif DEINDENT_CLAUSE.include?(token)
+              @indent -= 1
+              @indent_stack.pop
+            end
+            @lex_state = trans[0]
+          else
+            @lex_state = :EXPR_END
+          end
+        end
+        return Token(token_c, token)
+      end
+    end
+
+    if @lex_state == :EXPR_FNAME
+      @lex_state = :EXPR_END
+      if peek(0) == '='
+        token.concat getc
+      end
+    elsif @lex_state == :EXPR_BEG || @lex_state == :EXPR_DOT ||
+          @lex_state == :EXPR_ARG
+      @lex_state = :EXPR_ARG
+    else
+      @lex_state = :EXPR_END
+    end
+
+    if token[0, 1] =~ /[A-Z]/
+      return Token(TkCONSTANT, token)
+    elsif token[token.size - 1, 1] =~ /[!?]/
+      return Token(TkFID, token)
+    else
+      return Token(TkIDENTIFIER, token)
+    end
+  end
+
+  def identify_here_document
+    ch = getc
+    #    if lt = PERCENT_LTYPE[ch]
+    if ch == "-"
+      ch = getc
+      indent = true
+    end
+    if /['"`]/ =~ ch
+      user_quote = lt = ch
+      quoted = ""
+      while (c = getc) && c != lt
+        quoted.concat c
+      end
+    else
+      user_quote = nil
+      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
+
+    output_heredoc = reserve.join =~ /\A\r?\n\z/
+
+    if output_heredoc then
+      doc = '<<'
+      doc << '-' if indent
+      doc << "#{user_quote}#{quoted}#{user_quote}\n"
+    else
+      doc = '"'
+    end
+
+    @current_readed = @readed
+    while l = gets
+      l = l.sub(/(:?\r)?\n\z/, "\n")
+      if (indent ? l.strip : l.chomp) == quoted
+        break
+      end
+      doc << l
+    end
+
+    if output_heredoc then
+      raise Error, "Missing terminating #{quoted} for string" unless l
+
+      doc << l.chomp
+    else
+      doc << '"'
+    end
+
+    @current_readed = @here_readed
+    @here_readed.concat reserve
+    while ch = reserve.pop
+      ungetc ch
+    end
+
+    token_class = output_heredoc ? RDoc::RubyLex::TkHEREDOC : Ltype2Token[lt]
+    @ltype = ltback
+    @lex_state = :EXPR_END
+    Token(token_class, doc)
+  end
+
+  def identify_quotation
+    type = ch = getc
+    if lt = PERCENT_LTYPE[type]
+      ch = getc
+    elsif type =~ /\W/
+      type = nil
+      lt = "\""
+    else
+      return Token(TkMOD, '%')
+    end
+    #     if ch !~ /\W/
+    #       ungetc
+    #       next
+    #     end
+    #@ltype = lt
+    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
+    identify_string(lt, @quoted, type)
+  end
+
+  def identify_number(op = "")
+    @lex_state = :EXPR_END
+
+    num = op
+
+    if peek(0) == "0" && peek(1) !~ /[.eE]/
+      num << 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]/
+        raise Error, "Illegal octal digit"
+      else
+        return Token(TkINTEGER, num)
+      end
+
+      num << ch if ch
+
+      len0 = true
+      non_digit = false
+      while ch = getc
+        num << ch
+        if match =~ ch
+          if ch == "_"
+            if non_digit
+              raise Error, "trailing `#{ch}' in number"
+            else
+              non_digit = ch
+            end
+          else
+            non_digit = false
+            len0 = false
+          end
+        else
+          ungetc
+          num[-1, 1] = ''
+          if len0
+            raise Error, "numeric literal without digits"
+          end
+          if non_digit
+            raise Error, "trailing `#{non_digit}' in number"
+          end
+          break
+        end
+      end
+      return Token(TkINTEGER, num)
+    end
+
+    type = TkINTEGER
+    allow_point = true
+    allow_e = true
+    non_digit = false
+    while ch = getc
+      num << ch
+      case ch
+      when /[0-9]/
+        non_digit = false
+      when "_"
+        non_digit = ch
+      when allow_point && "."
+        if non_digit
+          raise Error, "trailing `#{non_digit}' in number"
+        end
+        type = TkFLOAT
+        if peek(0) !~ /[0-9]/
+          type = TkINTEGER
+          ungetc
+          num[-1, 1] = ''
+          break
+        end
+        allow_point = false
+      when allow_e && "e", allow_e && "E"
+        if non_digit
+          raise Error, "trailing `#{non_digit}' in number"
+        end
+        type = TkFLOAT
+        if peek(0) =~ /[+-]/
+          num << getc
+        end
+        allow_e = false
+        allow_point = false
+        non_digit = ch
+      else
+        if non_digit
+          raise Error, "trailing `#{non_digit}' in number"
+        end
+        ungetc
+        num[-1, 1] = ''
+        break
+      end
+    end
+
+    Token(type, num)
+  end
+
+  def identify_string(ltype, quoted = ltype, type = nil)
+    close = PERCENT_PAREN.values.include?(quoted)
+    @ltype = ltype
+    @quoted = quoted
+
+    str = if ltype == quoted and %w[" ' /].include? ltype then
+            ltype.dup
+          else
+            "%#{type or PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]||quoted}"
+          end
+
+    subtype = nil
+    begin
+      nest = 0
+
+      while ch = getc
+        str << ch
+
+        if @quoted == ch and nest <= 0
+          break
+        elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
+          ch = getc
+          subtype = true
+          if ch == "{" then
+            str << ch << skip_inner_expression
+            next
+          else
+            ungetc
+          end
+        elsif ch == '\\'
+          if %w[' /].include? @ltype then
+            case ch = getc
+            when "\\", "\n", "'"
+            when @ltype
+              str << ch
+            else
+              ungetc
+            end
+          else
+            str << read_escape
+          end
+        end
+
+        if close then
+          if PERCENT_PAREN[ch] == @quoted
+            nest += 1
+          elsif ch == @quoted
+            nest -= 1
+          end
+        end
+      end
+
+      if @ltype == "/"
+        while peek(0) =~ /i|m|x|o|e|s|u|n/
+          str << getc
+        end
+      end
+
+      if subtype
+        Token(DLtype2Token[ltype], str)
+      else
+        Token(Ltype2Token[ltype], str)
+      end
+    ensure
+      @ltype = nil
+      @quoted = nil
+      @lex_state = :EXPR_END
+    end
+  end
+
+  def skip_inner_expression
+    res = ""
+    nest = 0
+    while ch = getc
+      res << ch
+      if ch == '}'
+        break if nest.zero?
+        nest -= 1
+      elsif ch == '{'
+        nest += 1
+      end
+    end
+    res
+  end
+
+  def identify_comment
+    @ltype = "#"
+
+    comment = '#'
+
+    while ch = getc
+      # if ch == "\\" #"
+      #   read_escape
+      # end
+      if ch == "\n"
+        @ltype = nil
+        ungetc
+        break
+      end
+
+      comment << ch
+    end
+
+    return Token(TkCOMMENT, comment)
+  end
+
+  def read_escape
+    escape = ''
+    ch = getc
+
+    case ch
+    when "\n", "\r", "\f"
+      escape << ch
+    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
+      escape << ch
+    when /[0-7]/
+      ungetc ch
+      3.times do
+        ch = getc
+        case ch
+        when /[0-7]/
+          escape << ch
+        when nil
+          break
+        else
+          ungetc
+          break
+        end
+      end
+
+    when "x"
+      escape << ch
+
+      2.times do
+        ch = getc
+        case ch
+        when /[0-9a-fA-F]/
+          escape << ch
+        when nil
+          break
+        else
+          ungetc
+          break
+        end
+      end
+
+    when "M"
+      escape << ch
+
+      ch = getc
+      if ch != '-'
+        ungetc
+      else
+        escape << ch
+
+        ch = getc
+        if ch == "\\" #"
+          ungetc
+          escape << read_escape
+        else
+          escape << ch
+        end
+      end
+
+    when "C", "c" #, "^"
+      escape << ch
+
+      if ch == "C"
+        ch = getc
+
+        if ch == "-"
+          escape << ch
+          ch = getc
+          escape << ch
+
+          escape << read_escape if ch == "\\"
+        else
+          ungetc
+        end
+      elsif (ch = getc) == "\\" #"
+        escape << ch << read_escape
+      end
+    else
+      escape << ch
+
+      # other characters
+    end
+
+    escape
+  end
+
+  # :startdoc:
+
+end
+
+#RDoc::RubyLex.debug_level = 1
diff --git a/lib/rdoc/ruby_token.rb b/lib/rdoc/ruby_token.rb
new file mode 100644
index 0000000000..d923e24b18
--- /dev/null
+++ b/lib/rdoc/ruby_token.rb
@@ -0,0 +1,461 @@
+# frozen_string_literal: false
+#--
+#   irb/ruby-token.rb - ruby tokens
+#   	$Release Version: 0.9.5$
+#   	$Revision: 11708 $
+#   	$Date: 2007-02-12 15:01:19 -0800 (Mon, 12 Feb 2007) $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#++
+# Definitions of all tokens involved in the lexical analysis.
+#
+# This class is not documented because it is so deep in the internals.
+
+module RDoc::RubyToken
+  # :stopdoc:
+
+  EXPR_BEG = :EXPR_BEG
+  EXPR_MID = :EXPR_MID
+  EXPR_END = :EXPR_END
+  EXPR_ARG = :EXPR_ARG
+  EXPR_FNAME = :EXPR_FNAME
+  EXPR_DOT = :EXPR_DOT
+  EXPR_CLASS = :EXPR_CLASS
+
+  # for ruby 1.4X
+  if !defined?(Symbol)
+    Symbol = Integer
+  end
+
+  def set_token_position(line, char)
+    @prev_line_no = line
+    @prev_char_no = char
+  end
+
+  class Token
+    def initialize(seek, line_no, char_no, text = nil)
+      @seek = seek
+      @line_no = line_no
+      @char_no = char_no
+      @text = text
+    end
+
+    attr_reader :seek
+    attr_reader :line_no
+    attr_reader :char_no
+
+    attr_accessor :text
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.text == @text
+    end
+
+    ##
+    # Because we're used in contexts that expect to return a token, we set the
+    # text string and then return ourselves
+
+    def set_text(text)
+      @text = text
+      self
+    end
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @text]
+    end
+
+  end
+
+  class TkNode < Token
+    def initialize(seek, line_no, char_no, node = nil)
+      super seek, line_no, char_no
+      @node = node
+    end
+
+    attr_reader:node
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.node == @node
+    end
+
+    def set_text text
+      @node = text
+      self
+    end
+
+    alias text node
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @node]
+    end
+
+  end
+
+  class TkId < Token
+    def initialize(seek, line_no, char_no, name)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr_reader:name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
+    end
+
+  end
+
+  class TkKW < TkId
+  end
+
+  class TkVal < Token
+    def initialize(seek, line_no, char_no, value = nil)
+      super(seek, line_no, char_no)
+      @value = value
+    end
+    attr_accessor :value
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.value == @value
+    end
+
+    def set_text text
+      @value = text
+      self
+    end
+
+    alias text value
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %s, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @value]
+    end
+
+  end
+
+  class TkOp < Token
+    def initialize(seek, line_no, char_no, name = nil)
+      super seek, line_no, char_no
+      @name = name
+    end
+
+    attr_accessor :name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
+    end
+
+  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
+      @text = nil
+    end
+
+    attr_reader:op
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.op == @op
+    end
+
+    def text
+      @text ||= "#{TkToken2Reading[op]}="
+    end
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @op]
+    end
+
+  end
+
+  class TkUnknownChar < Token
+    def initialize(seek, line_no, char_no, name)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr_reader:name
+
+    def ==(other)
+      self.class == other.class and
+      other.line_no == @line_no and
+      other.char_no == @char_no and
+      other.name == @name
+    end
+
+    def set_text text
+      @name = text
+      self
+    end
+
+    alias text name
+
+    def inspect # :nodoc:
+      klass = self.class.name.split('::').last
+      "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
+    end
+
+  end
+
+  class TkError < Token
+  end
+
+  def Token(token, value = nil)
+    value ||= TkToken2Reading[token]
+
+    case token
+    when String
+      if (tk = TkReading2Token[token]).nil?
+        IRB.fail TkReading2TokenNoKey, token
+      end
+
+      tk = Token(tk[0], value)
+
+      if tk.kind_of?(TkOp) then
+        tk.name = token
+      end
+    when Symbol
+      if (tk = TkSymbol2Token[token]).nil?
+        IRB.fail TkSymbol2TokenNoKey, token
+      end
+
+      tk = Token(tk[0], value)
+    else
+      if token.instance_method(:initialize).arity == 3 then
+        tk = token.new(@prev_seek, @prev_line_no, @prev_char_no)
+        tk.set_text value
+      else
+        tk = token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
+      end
+    end
+
+    tk
+  end
+
+  TokenDefinitions = [
+    [:TkCLASS,      TkKW,  "class",  :EXPR_CLASS],
+    [:TkMODULE,     TkKW,  "module", :EXPR_BEG],
+    [:TkDEF,        TkKW,  "def",    :EXPR_FNAME],
+    [:TkUNDEF,      TkKW,  "undef",  :EXPR_FNAME],
+    [:TkBEGIN,      TkKW,  "begin",  :EXPR_BEG],
+    [:TkRESCUE,     TkKW,  "rescue", :EXPR_MID],
+    [:TkENSURE,     TkKW,  "ensure", :EXPR_BEG],
+    [:TkEND,        TkKW,  "end",    :EXPR_END],
+    [:TkIF,         TkKW,  "if",     :EXPR_BEG, :TkIF_MOD],
+    [:TkUNLESS,     TkKW,  "unless", :EXPR_BEG, :TkUNLESS_MOD],
+    [:TkTHEN,       TkKW,  "then",   :EXPR_BEG],
+    [:TkELSIF,      TkKW,  "elsif",  :EXPR_BEG],
+    [:TkELSE,       TkKW,  "else",   :EXPR_BEG],
+    [:TkCASE,       TkKW,  "case",   :EXPR_BEG],
+    [:TkWHEN,       TkKW,  "when",   :EXPR_BEG],
+    [:TkWHILE,      TkKW,  "while",  :EXPR_BEG, :TkWHILE_MOD],
+    [:TkUNTIL,      TkKW,  "until",  :EXPR_BEG, :TkUNTIL_MOD],
+    [:TkFOR,        TkKW,  "for",    :EXPR_BEG],
+    [:TkBREAK,      TkKW,  "break",  :EXPR_MID],
+    [:TkNEXT,       TkKW,  "next",   :EXPR_END],
+    [:TkREDO,       TkKW,  "redo",   :EXPR_END],
+    [:TkRETRY,      TkKW,  "retry",  :EXPR_END],
+    [:TkIN,         TkKW,  "in",     :EXPR_BEG],
+    [:TkDO,         TkKW,  "do",     :EXPR_BEG],
+    [:TkRETURN,     TkKW,  "return", :EXPR_MID],
+    [:TkYIELD,      TkKW,  "yield",  :EXPR_END],
+    [:TkSUPER,      TkKW,  "super",  :EXPR_END],
+    [:TkSELF,       TkKW,  "self",   :EXPR_END],
+    [:TkNIL,        TkKW,  "nil",    :EXPR_END],
+    [:TkTRUE,       TkKW,  "true",   :EXPR_END],
+    [:TkFALSE,      TkKW,  "false",  :EXPR_END],
+    [:TkAND,        TkKW,  "and",    :EXPR_BEG],
+    [:TkOR,         TkKW,  "or",     :EXPR_BEG],
+    [:TkNOT,        TkKW,  "not",    :EXPR_BEG],
+    [:TkIF_MOD,     TkKW],
+    [:TkUNLESS_MOD, TkKW],
+    [:TkWHILE_MOD,  TkKW],
+    [:TkUNTIL_MOD,  TkKW],
+    [:TkALIAS,      TkKW,  "alias",    :EXPR_FNAME],
+    [:TkDEFINED,    TkKW,  "defined?", :EXPR_END],
+    [:TklBEGIN,     TkKW,  "BEGIN",    :EXPR_END],
+    [:TklEND,       TkKW,  "END",      :EXPR_END],
+    [:Tk__LINE__,   TkKW,  "__LINE__", :EXPR_END],
+    [:Tk__FILE__,   TkKW,  "__FILE__", :EXPR_END],
+
+    [:TkIDENTIFIER, TkId],
+    [:TkFID,        TkId],
+    [:TkGVAR,       TkId],
+    [:TkCVAR,       TkId],
+    [:TkIVAR,       TkId],
+    [:TkCONSTANT,   TkId],
+
+    [:TkINTEGER,    TkVal],
+    [:TkFLOAT,      TkVal],
+    [:TkSTRING,     TkVal],
+    [:TkHEREDOC,    TkVal],
+    [:TkXSTRING,    TkVal],
+    [:TkREGEXP,     TkVal],
+    [:TkSYMBOL,     TkVal],
+    [:TkCHAR,       TkVal],
+
+    [:TkDSTRING,    TkNode],
+    [:TkDXSTRING,   TkNode],
+    [:TkDREGEXP,    TkNode],
+    [:TkNTH_REF,    TkNode],
+    [:TkBACK_REF,   TkNode],
+
+    [:TkUPLUS,      TkOp,   "+@"],
+    [:TkUMINUS,     TkOp,   "-@"],
+    [:TkPOW,        TkOp,   "**"],
+    [:TkCMP,        TkOp,   "<=>"],
+    [:TkEQ,         TkOp,   "=="],
+    [:TkEQQ,        TkOp,   "==="],
+    [:TkNEQ,        TkOp,   "!="],
+    [:TkGEQ,        TkOp,   ">="],
+    [:TkLEQ,        TkOp,   "<="],
+    [:TkANDOP,      TkOp,   "&&"],
+    [:TkOROP,       TkOp,   "||"],
+    [:TkMATCH,      TkOp,   "=~"],
+    [:TkNMATCH,     TkOp,   "!~"],
+    [:TkDOT2,       TkOp,   ".."],
+    [:TkDOT3,       TkOp,   "..."],
+    [:TkAREF,       TkOp,   "[]"],
+    [:TkASET,       TkOp,   "[]="],
+    [:TkLSHFT,      TkOp,   "<<"],
+    [:TkRSHFT,      TkOp,   ">>"],
+    [:TkCOLON2,     TkOp,   '::'],
+    [:TkCOLON3,     TkOp,   '::'],
+    #[:OPASGN,       TkOp],               # +=, -=  etc. #
+    [:TkASSOC,      TkOp,   "=>"],
+    [:TkQUESTION,   TkOp,   "?"], #?
+    [:TkCOLON,      TkOp,   ":"],        #:
+
+    [:TkfLPAREN,    Token,  "("], # func( #
+    [:TkfLBRACK,    Token,  "["], # func[ #
+    [:TkfLBRACE,    Token,  "{"], # func{ #
+    [:TkSYMBEG,     Token,  ":"], # :SYMBOL
+
+    [:TkAMPER,      TkOp,   "&"],
+    [:TkGT,         TkOp,   ">"],
+    [:TkLT,         TkOp,   "<"],
+    [:TkPLUS,       TkOp,   "+"],
+    [:TkSTAR,       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,    TkVal],
+    [:TkSPACE,      Token,  " "],
+    [:TkNL,         Token,  "\n"],
+    [:TkEND_OF_SCRIPT],
+
+    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
+    [:TkAT,         TkUnknownChar,  "@"],
+    [:TkDOLLAR,     TkUnknownChar,  "$"],
+  ]
+
+  # {reading => token_class}
+  # {reading => [token_class, *opt]}
+  TkReading2Token = {}
+  TkToken2Reading = {}
+  TkSymbol2Token = {}
+
+  def self.def_token(token_n, super_token = Token, reading = nil, *opts)
+    token_n = token_n.id2name if token_n.kind_of?(Symbol)
+    if const_defined?(token_n)
+      IRB.fail AlreadyDefinedToken, token_n
+    end
+    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
+
+    if reading
+      TkToken2Reading[token_c] = reading
+
+      return if TkReading2Token[reading]
+
+      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
+
+  def_token :TkRD_COMMENT, TkCOMMENT
+
+  NEWLINE_TOKEN = TkNL.new 0, 0, 0, "\n"
+
+  class TkSYMBOL
+
+    def to_sym
+      @sym ||= text[1..-1].intern
+    end
+
+  end
+
+  # :startdoc:
+end
+
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb
index 90b0541fcf..e2afb1fa91 100644
--- a/lib/rdoc/rubygems_hook.rb
+++ b/lib/rdoc/rubygems_hook.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'rubygems/user_interaction'
 require 'fileutils'
 require 'rdoc'
@@ -153,7 +153,13 @@ class RDoc::RubygemsHook
     options = nil
 
     args = @spec.rdoc_options
-    args.concat @spec.source_paths
+
+    if @spec.respond_to? :source_paths then
+      args.concat @spec.source_paths
+    else
+      args.concat @spec.require_paths
+    end
+
     args.concat @spec.extra_rdoc_files
 
     case config_args = Gem.configuration[:rdoc]
@@ -177,7 +183,7 @@ class RDoc::RubygemsHook
     @rdoc.options = options
 
     store = RDoc::Store.new
-    store.encoding = options.encoding
+    store.encoding = options.encoding if options.respond_to? :encoding
     store.dry_run  = options.dry_run
     store.main     = options.main_page
     store.title    = options.title
diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
index 79550fe63b..90f403bc64 100644
--- a/lib/rdoc/servlet.rb
+++ b/lib/rdoc/servlet.rb
@@ -1,6 +1,5 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'rdoc'
-require 'erb'
 require 'time'
 require 'json'
 require 'webrick'
@@ -218,7 +217,7 @@ exception:
 <pre>#{ERB::Util.html_escape exception.message}</pre>
 
 <p>Please report this to the
-<a href="https://github.com/ruby/rdoc/issues">RDoc issues tracker</a>.  Please
+<a href="https://github.com/rdoc/rdoc/issues">RDoc issues tracker</a>.  Please
 include the RDoc version, the URI above and exception class, message and
 backtrace.  If you're viewing a gem's documentation, include the gem name and
 version.  If you're viewing Ruby's documentation, include the version of ruby.
@@ -428,14 +427,14 @@ version.  If you're viewing Ruby's documentation, include the version of ruby.
       end
 
       raise WEBrick::HTTPStatus::NotFound,
-            "Could not find gem \"#{ERB::Util.html_escape(source_name)}\". Are you sure you installed it?" unless ri_dir
+            "Could not find gem \"#{source_name}\". Are you sure you installed it?" unless ri_dir
 
       store = RDoc::Store.new ri_dir, type
 
       return store if File.exist? store.cache_path
 
       raise WEBrick::HTTPStatus::NotFound,
-            "Could not find documentation for \"#{ERB::Util.html_escape(source_name)}\". Please run `gem rdoc --ri gem_name`"
+            "Could not find documentation for \"#{source_name}\". Please run `gem rdoc --ri gem_name`"
 
     end
   end
diff --git a/lib/rdoc/single_class.rb b/lib/rdoc/single_class.rb
index 6a7b67deb3..7affa027e1 100644
--- a/lib/rdoc/single_class.rb
+++ b/lib/rdoc/single_class.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A singleton class
 
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
index bd6c0ef23a..354e904b19 100644
--- a/lib/rdoc/stats.rb
+++ b/lib/rdoc/stats.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # RDoc statistics collector which prints a summary and report of a project's
 # documentation totals.
diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb
index 0a22f0582b..f32db48005 100644
--- a/lib/rdoc/stats/normal.rb
+++ b/lib/rdoc/stats/normal.rb
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 begin
   require 'io/console/size'
 rescue LoadError
-  # for JRuby
-  require 'io/console'
 end
 
 ##
@@ -26,28 +24,31 @@ class RDoc::Stats::Normal < RDoc::Stats::Quiet
                            files_so_far,
                            @num_files)
 
-    if $stdout.tty?
-      # Print a progress bar, but make sure it fits on a single line. Filename
-      # will be truncated if necessary.
-      size = IO.respond_to?(:console_size) ? IO.console_size : IO.console.winsize
-      terminal_width = size[1].to_i.nonzero? || 80
-      max_filename_size = (terminal_width - progress_bar.size) - 1
-
-      if filename.size > max_filename_size then
-        # Turn "some_long_filename.rb" to "...ong_filename.rb"
-        filename = filename[(filename.size - max_filename_size) .. -1]
-        filename[0..2] = "..."
-      end
+    # Print a progress bar, but make sure it fits on a single line. Filename
+    # will be truncated if necessary.
+    terminal_width = if defined?(IO) && IO.respond_to?(:console_size)
+                       IO.console_size[1].to_i.nonzero? || 80
+                     else
+                       80
+                     end
+    max_filename_size = terminal_width - progress_bar.size
+
+    if filename.size > max_filename_size then
+      # Turn "some_long_filename.rb" to "...ong_filename.rb"
+      filename = filename[(filename.size - max_filename_size) .. -1]
+      filename[0..2] = "..."
+    end
 
+    line = "#{progress_bar}#{filename}"
+    if $stdout.tty?
       # Clean the line with whitespaces so that leftover output from the
       # previous line doesn't show up.
-      $stdout.print("\r\e[K") if @last_width && @last_width > 0
-      @last_width = progress_bar.size + filename.size
-      term = "\r"
+      $stdout.print("\r" << (" " * @last_width) << ("\b" * @last_width) << "\r") if @last_width && @last_width > 0
+      @last_width = line.size
+      $stdout.print("#{line}\r")
     else
-      term = "\n"
+      $stdout.puts(line)
     end
-    $stdout.print(progress_bar, filename, term)
     $stdout.flush
   end
 
@@ -56,3 +57,4 @@ class RDoc::Stats::Normal < RDoc::Stats::Quiet
   end
 
 end
+
diff --git a/lib/rdoc/stats/quiet.rb b/lib/rdoc/stats/quiet.rb
index bc4161b2d4..561c272ef7 100644
--- a/lib/rdoc/stats/quiet.rb
+++ b/lib/rdoc/stats/quiet.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Stats printer that prints nothing
 
diff --git a/lib/rdoc/stats/verbose.rb b/lib/rdoc/stats/verbose.rb
index 6ace8937a2..e04edade52 100644
--- a/lib/rdoc/stats/verbose.rb
+++ b/lib/rdoc/stats/verbose.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # Stats printer that prints everything documented, including the documented
 # status
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
index f420fc2bd2..37bf03fc24 100644
--- a/lib/rdoc/store.rb
+++ b/lib/rdoc/store.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'fileutils'
 
 ##
@@ -117,11 +117,6 @@ class RDoc::Store
   attr_accessor :encoding
 
   ##
-  # The lazy constants alias will be discovered in passing
-
-  attr_reader :unmatched_constant_alias
-
-  ##
   # Creates a new Store of +type+ that will load or save to +path+
 
   def initialize path = nil, type = nil
@@ -148,7 +143,6 @@ class RDoc::Store
     @classes_hash = {}
     @modules_hash = {}
     @files_hash   = {}
-    @text_files_hash = {}
 
     @c_enclosure_classes = {}
     @c_enclosure_names   = {}
@@ -158,8 +152,6 @@ class RDoc::Store
 
     @unique_classes = nil
     @unique_modules = nil
-
-    @unmatched_constant_alias = {}
   end
 
   ##
@@ -185,24 +177,16 @@ class RDoc::Store
   # Adds the file with +name+ as an RDoc::TopLevel to the store.  Returns the
   # created RDoc::TopLevel.
 
-  def add_file absolute_name, relative_name: absolute_name, parser: nil
+  def add_file absolute_name, relative_name = absolute_name
     unless top_level = @files_hash[relative_name] then
       top_level = RDoc::TopLevel.new absolute_name, relative_name
-      top_level.parser = parser if parser
       top_level.store = self
       @files_hash[relative_name] = top_level
-      @text_files_hash[relative_name] = top_level if top_level.text?
     end
 
     top_level
   end
 
-  def update_parser_of_file(absolute_name, parser)
-    if top_level = @files_hash[absolute_name] then
-      @text_files_hash[absolute_name] = top_level if top_level.text?
-    end
-  end
-
   ##
   # Returns all classes discovered by RDoc
 
@@ -437,8 +421,8 @@ class RDoc::Store
   # +file_name+
 
   def find_text_page file_name
-    @text_files_hash.each_value.find do |file|
-      file.full_name == file_name
+    @files_hash.each_value.find do |file|
+      file.text? and file.full_name == file_name
     end
   end
 
@@ -546,7 +530,6 @@ class RDoc::Store
     @cache[:pages].each do |page_name|
       page = load_page page_name
       @files_hash[page_name] = page
-      @text_files_hash[page_name] = page if page.text?
     end
   end
 
@@ -556,7 +539,7 @@ class RDoc::Store
   def load_cache
     #orig_enc = @encoding
 
-    File.open cache_path, 'rb' do |io|
+    open cache_path, 'rb' do |io|
       @cache = Marshal.load io.read
     end
 
@@ -602,8 +585,6 @@ class RDoc::Store
     case obj
     when RDoc::NormalClass then
       @classes_hash[klass_name] = obj
-    when RDoc::SingleClass then
-      @classes_hash[klass_name] = obj
     when RDoc::NormalModule then
       @modules_hash[klass_name] = obj
     end
@@ -615,7 +596,7 @@ class RDoc::Store
   def load_class_data klass_name
     file = class_file klass_name
 
-    File.open file, 'rb' do |io|
+    open file, 'rb' do |io|
       Marshal.load io.read
     end
   rescue Errno::ENOENT => e
@@ -630,7 +611,7 @@ class RDoc::Store
   def load_method klass_name, method_name
     file = method_file klass_name, method_name
 
-    File.open file, 'rb' do |io|
+    open file, 'rb' do |io|
       obj = Marshal.load io.read
       obj.store = self
       obj.parent =
@@ -650,7 +631,7 @@ class RDoc::Store
   def load_page page_name
     file = page_file page_name
 
-    File.open file, 'rb' do |io|
+    open file, 'rb' do |io|
       obj = Marshal.load io.read
       obj.store = self
       obj
@@ -698,7 +679,12 @@ class RDoc::Store
     method_name =~ /#(.*)/
     method_type = $1 ? 'i' : 'c'
     method_name = $1 if $1
-    method_name = method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+
+    method_name = if ''.respond_to? :ord then
+                    method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+                  else
+                    method_name.gsub(/\W/) { "%%%02x" % $&[0] }
+                  end
 
     File.join class_path(klass_name), "#{method_name}-#{method_type}.ri"
   end
@@ -722,8 +708,8 @@ class RDoc::Store
   # Returns the RDoc::TopLevel that is a text file and has the given +name+
 
   def page name
-    @text_files_hash.each_value.find do |file|
-      file.page_name == name
+    @files_hash.each_value.find do |file|
+      file.text? and file.page_name == name
     end
   end
 
@@ -797,7 +783,7 @@ class RDoc::Store
 
     marshal = Marshal.dump @cache
 
-    File.open cache_path, 'wb' do |io|
+    open cache_path, 'wb' do |io|
       io.write marshal
     end
   end
@@ -873,7 +859,7 @@ class RDoc::Store
 
     marshal = Marshal.dump klass
 
-    File.open path, 'wb' do |io|
+    open path, 'wb' do |io|
       io.write marshal
     end
   end
@@ -898,7 +884,7 @@ class RDoc::Store
 
     marshal = Marshal.dump method
 
-    File.open method_file(full_name, method.full_name), 'wb' do |io|
+    open method_file(full_name, method.full_name), 'wb' do |io|
       io.write marshal
     end
   end
@@ -920,7 +906,7 @@ class RDoc::Store
 
     marshal = Marshal.dump page
 
-    File.open path, 'wb' do |io|
+    open path, 'wb' do |io|
       io.write marshal
     end
   end
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
index 323d00eabc..1074de0197 100644
--- a/lib/rdoc/task.rb
+++ b/lib/rdoc/task.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #--
 # Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
 #
diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb
new file mode 100644
index 0000000000..7c80ecdf9c
--- /dev/null
+++ b/lib/rdoc/test_case.rb
@@ -0,0 +1,204 @@
+# frozen_string_literal: false
+begin
+  gem 'minitest', '~> 4.0' unless defined?(Test::Unit)
+rescue NoMethodError, Gem::LoadError
+  # for ruby tests
+end
+
+require 'minitest/autorun'
+require 'minitest/benchmark' if ENV['BENCHMARK']
+
+require 'fileutils'
+require 'pp'
+require 'tempfile'
+require 'tmpdir'
+require 'stringio'
+
+require 'rdoc'
+
+##
+# RDoc::TestCase is an abstract TestCase to provide common setup and teardown
+# across all RDoc tests.  The test case uses minitest, so all the assertions
+# of minitest may be used.
+#
+# The testcase provides the following:
+#
+# * A reset code-object tree
+# * A reset markup preprocessor (RDoc::Markup::PreProcess)
+# * The <code>@RM</code> alias of RDoc::Markup (for less typing)
+# * <code>@pwd</code> containing the current working directory
+# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
+
+class RDoc::TestCase < MiniTest::Unit::TestCase
+
+  ##
+  # Abstract test-case setup
+
+  def setup
+    super
+
+    @top_level = nil
+
+    @RM = RDoc::Markup
+
+    RDoc::Markup::PreProcess.reset
+
+    @pwd = Dir.pwd
+
+    @store = RDoc::Store.new
+
+    @rdoc = RDoc::RDoc.new
+    @rdoc.store = @store
+    @rdoc.options = RDoc::Options.new
+
+    g = Object.new
+    def g.class_dir() end
+    def g.file_dir() end
+    @rdoc.generator = g
+  end
+
+  ##
+  # Asserts +path+ is a file
+
+  def assert_file path
+    assert File.file?(path), "#{path} is not a file"
+  end
+
+  ##
+  # Asserts +path+ is a directory
+
+  def assert_directory path
+    assert File.directory?(path), "#{path} is not a directory"
+  end
+
+  ##
+  # Refutes +path+ exists
+
+  def refute_file path
+    refute File.exist?(path), "#{path} exists"
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::BlankLine.new
+
+  def blank_line
+    @RM::BlankLine.new
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::BlockQuote.new with +contents+
+
+  def block *contents
+    @RM::BlockQuote.new(*contents)
+  end
+
+  ##
+  # Creates an RDoc::Comment with +text+ which was defined on +top_level+.
+  # By default the comment has the 'rdoc' format.
+
+  def comment text, top_level = @top_level
+    RDoc::Comment.new text, top_level
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Document.new with +contents+
+
+  def doc *contents
+    @RM::Document.new(*contents)
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::HardBreak.new
+
+  def hard_break
+    @RM::HardBreak.new
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Heading.new with +level+ and +text+
+
+  def head level, text
+    @RM::Heading.new level, text
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::ListItem.new with +label+ and +parts+
+
+  def item label = nil, *parts
+    @RM::ListItem.new label, *parts
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::List.new with +type+ and +items+
+
+  def list type = nil, *items
+    @RM::List.new type, *items
+  end
+
+  ##
+  # Enables pretty-print output
+
+  def mu_pp obj # :nodoc:
+    s = ''
+    s = PP.pp obj, s
+    s = s.force_encoding Encoding.default_external if defined? Encoding
+    s.chomp
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Paragraph.new with +contents+
+
+  def para *a
+    @RM::Paragraph.new(*a)
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Rule.new with +weight+
+
+  def rule weight
+    @RM::Rule.new weight
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Raw.new with +contents+
+
+  def raw *contents
+    @RM::Raw.new(*contents)
+  end
+
+  ##
+  # Creates a temporary directory changes the current directory to it for the
+  # duration of the block.
+  #
+  # Depends upon Dir.mktmpdir
+
+  def temp_dir
+    Dir.mktmpdir do |temp_dir|
+      Dir.chdir temp_dir do
+        yield temp_dir
+      end
+    end
+  end
+
+  ##
+  # Shortcut for RDoc::Markup::Verbatim.new with +parts+
+
+  def verb *parts
+    @RM::Verbatim.new(*parts)
+  end
+
+  ##
+  # run capture_io with setting $VERBOSE = true
+
+  def verbose_capture_io
+    capture_io do
+      begin
+        orig_verbose = $VERBOSE
+        $VERBOSE = true
+        yield
+      ensure
+        $VERBOSE = orig_verbose
+      end
+    end
+  end
+end
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
index 22c3777ff9..a38bb921ad 100644
--- a/lib/rdoc/text.rb
+++ b/lib/rdoc/text.rb
@@ -1,4 +1,5 @@
-# frozen_string_literal: true
+# coding: utf-8
+# frozen_string_literal: false
 
 ##
 # For RDoc::Text#to_html
@@ -6,6 +7,16 @@
 require 'strscan'
 
 ##
+# For RDoc::Text#snippet
+
+begin
+  gem 'json'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
+rescue Gem::LoadError
+end
+
+##
 # Methods for manipulating comment text
 
 module RDoc::Text
@@ -60,7 +71,7 @@ module RDoc::Text
     text.each_line do |line|
       nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
         r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
-        r = RDoc::Encoding.change_encoding r, text.encoding
+        r.force_encoding text.encoding
         r
       end
 
@@ -82,7 +93,7 @@ module RDoc::Text
     end
 
     empty = ''
-    empty = RDoc::Encoding.change_encoding empty, text.encoding
+    empty.force_encoding text.encoding
 
     text.gsub(/^ {0,#{indent}}/, empty)
   end
@@ -149,7 +160,7 @@ module RDoc::Text
     return text if text =~ /^(?>\s*)[^\#]/
 
     empty = ''
-    empty = RDoc::Encoding.change_encoding empty, text.encoding
+    empty.force_encoding text.encoding
 
     text.gsub(/^\s*(#+)/) { $1.tr '#', ' ' }.gsub(/^\s+$/, empty)
   end
@@ -169,17 +180,17 @@ module RDoc::Text
 
     encoding = text.encoding
 
-    text = text.gsub %r%Document-method:\s+[\w:.#=!?|^&<>~+\-/*\%@`\[\]]+%, ''
+    text = text.gsub %r%Document-method:\s+[\w:.#=!?]+%, ''
 
     space = ' '
-    space = RDoc::Encoding.change_encoding space, encoding if encoding
+    space.force_encoding encoding if encoding
 
     text.sub!  %r%/\*+%       do space * $&.length end
     text.sub!  %r%\*+/%       do space * $&.length end
     text.gsub! %r%^[ \t]*\*%m do space * $&.length end
 
     empty = ''
-    empty = RDoc::Encoding.change_encoding empty, encoding if encoding
+    empty.force_encoding encoding if encoding
     text.gsub(/^\s+$/, empty)
   end
 
@@ -188,7 +199,7 @@ module RDoc::Text
   # trademark symbols in +text+ to properly encoded characters.
 
   def to_html text
-    html = (''.encode text.encoding).dup
+    html = ''.encode text.encoding
 
     encoded = RDoc::Text::TO_HTML_CHARACTERS[text.encoding]
 
diff --git a/lib/rdoc/token_stream.rb b/lib/rdoc/token_stream.rb
index dbe6c5ae85..b0035227fa 100644
--- a/lib/rdoc/token_stream.rb
+++ b/lib/rdoc/token_stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A TokenStream is a list of tokens, gathered during the parse of some entity
 # (say a method). Entities populate these streams by being registered with the
@@ -10,61 +10,43 @@ module RDoc::TokenStream
 
   ##
   # Converts +token_stream+ to HTML wrapping various tokens with
-  # <tt><span></tt> elements. Some tokens types are wrapped in spans
-  # with the given class names. Other token types are not wrapped in spans.
+  # <tt><span></tt> elements.  The following tokens types are wrapped in spans
+  # with the given class names:
+  #
+  # TkCONSTANT :: 'ruby-constant'
+  # TkKW       :: 'ruby-keyword'
+  # TkIVAR     :: 'ruby-ivar'
+  # TkOp       :: 'ruby-operator'
+  # TkId       :: 'ruby-identifier'
+  # TkNode     :: 'ruby-node'
+  # TkCOMMENT  :: 'ruby-comment'
+  # TkREGEXP   :: 'ruby-regexp'
+  # TkSTRING   :: 'ruby-string'
+  # TkVal      :: 'ruby-value'
+  #
+  # Other token types are not wrapped in spans.
 
   def self.to_html token_stream
-    starting_title = false
-
     token_stream.map do |t|
       next unless t
 
-      style = case t[:kind]
-              when :on_const   then 'ruby-constant'
-              when :on_kw      then 'ruby-keyword'
-              when :on_ivar    then 'ruby-ivar'
-              when :on_cvar    then 'ruby-identifier'
-              when :on_gvar    then 'ruby-identifier'
-              when '=' != t[:text] && :on_op
-                               then 'ruby-operator'
-              when :on_tlambda then 'ruby-operator'
-              when :on_ident   then 'ruby-identifier'
-              when :on_label   then 'ruby-value'
-              when :on_backref, :on_dstring
-                               then 'ruby-node'
-              when :on_comment then 'ruby-comment'
-              when :on_embdoc  then 'ruby-comment'
-              when :on_regexp  then 'ruby-regexp'
-              when :on_tstring then 'ruby-string'
-              when :on_int, :on_float,
-                   :on_rational, :on_imaginary,
-                   :on_heredoc,
-                   :on_symbol, :on_CHAR then 'ruby-value'
-              when :on_heredoc_beg, :on_heredoc_end
-                               then 'ruby-identifier'
+      style = case t
+              when RDoc::RubyToken::TkCONSTANT then 'ruby-constant'
+              when RDoc::RubyToken::TkKW       then 'ruby-keyword'
+              when RDoc::RubyToken::TkIVAR     then 'ruby-ivar'
+              when RDoc::RubyToken::TkOp       then 'ruby-operator'
+              when RDoc::RubyToken::TkId       then 'ruby-identifier'
+              when RDoc::RubyToken::TkNode     then 'ruby-node'
+              when RDoc::RubyToken::TkCOMMENT  then 'ruby-comment'
+              when RDoc::RubyToken::TkREGEXP   then 'ruby-regexp'
+              when RDoc::RubyToken::TkSTRING   then 'ruby-string'
+              when RDoc::RubyToken::TkVal      then 'ruby-value'
               end
 
-      comment_with_nl = false
-      if :on_comment == t[:kind] or :on_embdoc == t[:kind] or :on_heredoc_end == t[:kind]
-        comment_with_nl = true if "\n" == t[:text][-1]
-        text = t[:text].rstrip
-      else
-        text = t[:text]
-      end
-
-      if :on_ident == t[:kind] && starting_title
-        starting_title = false
-        style = 'ruby-identifier ruby-title'
-      end
-
-      if :on_kw == t[:kind] and 'def' == t[:text]
-        starting_title = true
-      end
-
-      text = CGI.escapeHTML text
+      text = CGI.escapeHTML t.text
 
       if style then
-        "<span class=\"#{style}\">#{text}</span>#{"\n" if comment_with_nl}"
+        "<span class=\"#{style}\">#{text}</span>"
       else
         text
       end
@@ -107,7 +89,7 @@ module RDoc::TokenStream
   # Returns a string representation of the token stream
 
   def tokens_to_s
-    token_stream.compact.map { |token| token[:text] }.join ''
+    token_stream.compact.map { |token| token.text }.join ''
   end
 
 end
diff --git a/lib/rdoc/tom_doc.rb b/lib/rdoc/tom_doc.rb
index 625a6b5cfa..d760849938 100644
--- a/lib/rdoc/tom_doc.rb
+++ b/lib/rdoc/tom_doc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 # :markup: tomdoc
 
 # A parser for TomDoc based on TomDoc 1.0.0-rc1 (02adef9b5a)
@@ -180,19 +180,12 @@ class RDoc::TomDoc < RDoc::Markup::Parser
 
       case type
       when :TEXT then
-        @section = 'Returns' if data =~ /\A(Returns|Raises)/
+        @section = 'Returns' if data =~ /\AReturns/
 
         paragraph << data
       when :NEWLINE then
         if :TEXT == peek_token[0] then
-          # Lines beginning with 'Raises' in the Returns section should not be
-          # treated as multiline text
-          if 'Returns' == @section and
-            peek_token[1].start_with?('Raises') then
-            break
-          else
-            paragraph << ' '
-          end
+          paragraph << ' '
         else
           break
         end
@@ -229,7 +222,7 @@ class RDoc::TomDoc < RDoc::Markup::Parser
   # Returns self.
 
   def tokenize text
-    text = text.sub(/\A(Public|Internal|Deprecated):\s+/, '')
+    text.sub!(/\A(Public|Internal|Deprecated):\s+/, '')
 
     setup_scanner text
 
@@ -262,3 +255,4 @@ class RDoc::TomDoc < RDoc::Markup::Parser
   end
 
 end
+
diff --git a/lib/rdoc/top_level.rb b/lib/rdoc/top_level.rb
index b8b6110bb2..38be646ad0 100644
--- a/lib/rdoc/top_level.rb
+++ b/lib/rdoc/top_level.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 ##
 # A TopLevel context is a representation of the contents of a single file
 
@@ -33,7 +33,7 @@ class RDoc::TopLevel < RDoc::Context
   ##
   # The parser class that processed this file
 
-  attr_reader :parser
+  attr_accessor :parser
 
   ##
   # Creates a new TopLevel for the file at +absolute_name+.  If documentation
@@ -52,12 +52,6 @@ class RDoc::TopLevel < RDoc::Context
     @classes_or_modules = []
   end
 
-  def parser=(val)
-    @parser = val
-    @store.update_parser_of_file(absolute_name, val) if @store
-    @parser
-  end
-
   ##
   # An RDoc::TopLevel is equal to another with the same relative_name
 
@@ -278,7 +272,7 @@ class RDoc::TopLevel < RDoc::Context
   # Is this TopLevel from a text file instead of a source code file?
 
   def text?
-    @parser and @parser.include? RDoc::Parser::Text
+    @parser and @parser.ancestors.include? RDoc::Parser::Text
   end
 
   def to_s # :nodoc:
diff --git a/lib/rdoc/version.rb b/lib/rdoc/version.rb
deleted file mode 100644
index 3291414597..0000000000
--- a/lib/rdoc/version.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module RDoc
-
-  ##
-  # RDoc version you are using
-
-  VERSION = '6.1.2'
-
-end
diff --git a/lib/resolv.rb b/lib/resolv.rb
index edca92689d..ca4c7581ba 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -2,6 +2,7 @@
 
 require 'socket'
 require 'timeout'
+require 'thread'
 require 'io/wait'
 
 begin
@@ -24,7 +25,7 @@ end
 #
 #   Resolv::DNS.open do |dns|
 #     ress = dns.getresources "www.ruby-lang.org", Resolv::DNS::Resource::IN::A
-#     p ress.map(&:address)
+#     p ress.map { |r| r.address }
 #     ress = dns.getresources "ruby-lang.org", Resolv::DNS::Resource::IN::MX
 #     p ress.map { |r| [r.exchange.to_s, r.preference] }
 #   end
@@ -169,7 +170,7 @@ class Resolv
     begin
       raise LoadError unless /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
       require 'win32/resolv'
-      DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
+      DefaultFileName = Win32::Resolv.get_hosts_path
     rescue LoadError
       DefaultFileName = '/etc/hosts'
     end
@@ -188,7 +189,7 @@ class Resolv
         unless @initialized
           @name2addr = {}
           @addr2name = {}
-          File.open(@filename, 'rb') {|f|
+          open(@filename, 'rb') {|f|
             f.each {|line|
               line.sub!(/#.*/, '')
               addr, hostname, *aliases = line.split(/\s+/)
@@ -236,7 +237,9 @@ class Resolv
 
     def each_address(name, &proc)
       lazy_initialize
-      @name2addr[name]&.each(&proc)
+      if @name2addr.include?(name)
+        @name2addr[name].each(&proc)
+      end
     end
 
     ##
@@ -261,7 +264,9 @@ class Resolv
 
     def each_name(address, &proc)
       lazy_initialize
-      @addr2name[address]&.each(&proc)
+      if @addr2name.include?(address)
+        @addr2name[address].each(&proc)
+      end
     end
   end
 
@@ -567,13 +572,13 @@ class Resolv
     def extract_resources(msg, name, typeclass) # :nodoc:
       if typeclass < Resource::ANY
         n0 = Name.create(name)
-        msg.each_resource {|n, ttl, data|
+        msg.each_answer {|n, ttl, data|
           yield data if n0 == n
         }
       end
       yielded = false
       n0 = Name.create(name)
-      msg.each_resource {|n, ttl, data|
+      msg.each_answer {|n, ttl, data|
         if n0 == n
           case data
           when typeclass
@@ -585,7 +590,7 @@ class Resolv
         end
       }
       return if yielded
-      msg.each_resource {|n, ttl, data|
+      msg.each_answer {|n, ttl, data|
         if n0 == n
           case data
           when typeclass
@@ -609,6 +614,16 @@ class Resolv
       end
     end
 
+
+    def self.rangerand(range) # :nodoc:
+      base = range.begin
+      len = range.end - range.begin
+      if !range.exclude_end?
+        len += 1
+      end
+      base + random(len)
+    end
+
     RequestID = {} # :nodoc:
     RequestIDMutex = Thread::Mutex.new # :nodoc:
 
@@ -617,7 +632,7 @@ class Resolv
       RequestIDMutex.synchronize {
         h = (RequestID[[host, port]] ||= {})
         begin
-          id = random(0x0000..0xffff)
+          id = rangerand(0x0000..0xffff)
         end while h[id]
         h[id] = true
       }
@@ -638,7 +653,7 @@ class Resolv
 
     def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
       begin
-        port = random(1024..65535)
+        port = rangerand(1024..65535)
         udpsock.bind(bind_host, port)
       rescue Errno::EADDRINUSE, # POSIX
              Errno::EACCES, # SunOS: See PRIV_SYS_NFS in privileges(5)
@@ -707,7 +722,9 @@ class Resolv
       def close
         socks = @socks
         @socks = nil
-        socks&.each(&:close)
+        if socks
+          socks.each {|sock| sock.close }
+        end
       end
 
       class Sender # :nodoc:
@@ -722,47 +739,35 @@ class Resolv
         def initialize(*nameserver_port)
           super()
           @nameserver_port = nameserver_port
-          @initialized = false
-          @mutex = Thread::Mutex.new
-        end
-
-        def lazy_initialize
-          @mutex.synchronize {
-            next if @initialized
-            @initialized = true
-            @socks_hash = {}
-            @socks = []
-            @nameserver_port.each {|host, port|
-              if host.index(':')
-                bind_host = "::"
-                af = Socket::AF_INET6
-              else
-                bind_host = "0.0.0.0"
-                af = Socket::AF_INET
-              end
-              next if @socks_hash[bind_host]
-              begin
-                sock = UDPSocket.new(af)
-              rescue Errno::EAFNOSUPPORT
-                next # The kernel doesn't support the address family.
-              end
-              @socks << sock
-              @socks_hash[bind_host] = sock
-              sock.do_not_reverse_lookup = true
-              DNS.bind_random_port(sock, bind_host)
-            }
+          @socks_hash = {}
+          @socks = []
+          nameserver_port.each {|host, port|
+            if host.index(':')
+              bind_host = "::"
+              af = Socket::AF_INET6
+            else
+              bind_host = "0.0.0.0"
+              af = Socket::AF_INET
+            end
+            next if @socks_hash[bind_host]
+            begin
+              sock = UDPSocket.new(af)
+            rescue Errno::EAFNOSUPPORT
+              next # The kernel doesn't support the address family.
+            end
+            sock.do_not_reverse_lookup = true
+            DNS.bind_random_port(sock, bind_host)
+            @socks << sock
+            @socks_hash[bind_host] = sock
           }
-          self
         end
 
         def recv_reply(readable_socks)
-          lazy_initialize
           reply, from = readable_socks[0].recvfrom(UDPSize)
           return reply, [from[3],from[1]]
         end
 
         def sender(msg, data, host, port=Port)
-          lazy_initialize
           sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
           return nil if !sock
           service = [host, port]
@@ -774,14 +779,9 @@ class Resolv
         end
 
         def close
-          @mutex.synchronize {
-            if @initialized
-              super
-              @senders.each_key {|service, id|
-                DNS.free_request_id(service[0], service[1], id)
-              }
-              @initialized = false
-            end
+          super
+          @senders.each_key {|service, id|
+            DNS.free_request_id(service[0], service[1], id)
           }
         end
 
@@ -805,32 +805,20 @@ class Resolv
           super()
           @host = host
           @port = port
-          @mutex = Thread::Mutex.new
-          @initialized = false
-        end
-
-        def lazy_initialize
-          @mutex.synchronize {
-            next if @initialized
-            @initialized = true
-            is_ipv6 = @host.index(':')
-            sock = UDPSocket.new(is_ipv6 ? Socket::AF_INET6 : Socket::AF_INET)
-            @socks = [sock]
-            sock.do_not_reverse_lookup = true
-            DNS.bind_random_port(sock, is_ipv6 ? "::" : "0.0.0.0")
-            sock.connect(@host, @port)
-          }
-          self
+          is_ipv6 = host.index(':')
+          sock = UDPSocket.new(is_ipv6 ? Socket::AF_INET6 : Socket::AF_INET)
+          @socks = [sock]
+          sock.do_not_reverse_lookup = true
+          DNS.bind_random_port(sock, is_ipv6 ? "::" : "0.0.0.0")
+          sock.connect(host, port)
         end
 
         def recv_reply(readable_socks)
-          lazy_initialize
           reply = readable_socks[0].recv(UDPSize)
           return reply, nil
         end
 
         def sender(msg, data, host=@host, port=@port)
-          lazy_initialize
           unless host == @host && port == @port
             raise RequestError.new("host/port don't match: #{host}:#{port}")
           end
@@ -841,15 +829,10 @@ class Resolv
         end
 
         def close
-          @mutex.synchronize do
-            if @initialized
-              super
-              @senders.each_key {|from, id|
-                DNS.free_request_id(@host, @port, id)
-              }
-              @initialized = false
-            end
-          end
+          super
+          @senders.each_key {|from, id|
+            DNS.free_request_id(@host, @port, id)
+          }
         end
 
         class Sender < Requester::Sender # :nodoc:
@@ -863,7 +846,6 @@ class Resolv
 
       class MDNSOneShot < UnconnectedUDP # :nodoc:
         def sender(msg, data, host, port=Port)
-          lazy_initialize
           id = DNS.allocate_request_id(host, port)
           request = msg.encode
           request[0,2] = [id].pack('n')
@@ -873,7 +855,6 @@ class Resolv
         end
 
         def sender_for(addr, msg)
-          lazy_initialize
           @senders[msg.id]
         end
       end
@@ -952,11 +933,13 @@ class Resolv
         nameserver = []
         search = nil
         ndots = 1
-        File.open(filename, 'rb') {|f|
+        open(filename, 'rb') {|f|
           f.each {|line|
             line.sub!(/[#;].*/, '')
             keyword, *args = line.split(/\s+/)
-            args.each(&:untaint)
+            args.each { |arg|
+              arg.untaint
+            }
             next unless keyword
             case keyword
             when 'nameserver'
@@ -1544,12 +1527,12 @@ class Resolv
         def initialize(data)
           @data = data
           @index = 0
-          @limit = data.bytesize
+          @limit = data.length
           yield self
         end
 
         def inspect
-          "\#<#{self.class}: #{@data.byteslice(0, @index).inspect} #{@data.byteslice(@index..-1).inspect}>"
+          "\#<#{self.class}: #{@data[0, @index].inspect} #{@data[@index..-1].inspect}>"
         end
 
         def get_length16
@@ -1568,7 +1551,7 @@ class Resolv
 
         def get_bytes(len = @limit - @index)
           raise DecodeError.new("limit exceeded") if @limit < @index + len
-          d = @data.byteslice(@index, len)
+          d = @data[@index, len]
           @index += len
           return d
         end
@@ -1596,9 +1579,9 @@ class Resolv
 
         def get_string
           raise DecodeError.new("limit exceeded") if @limit <= @index
-          len = @data.getbyte(@index)
+          len = @data[@index].ord
           raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
-          d = @data.byteslice(@index + 1, len)
+          d = @data[@index + 1, len]
           @index += 1 + len
           return d
         end
@@ -1621,7 +1604,7 @@ class Resolv
           d = []
           while true
             raise DecodeError.new("limit exceeded") if @limit <= @index
-            case @data.getbyte(@index)
+            case @data[@index].ord
             when 0
               @index += 1
               if save_index
@@ -1658,13 +1641,7 @@ class Resolv
           name = self.get_name
           type, klass, ttl = self.get_unpack('nnN')
           typeclass = Resource.get_class(type, klass)
-          res = self.get_length16 do
-            begin
-              typeclass.decode_rdata self
-            rescue => e
-              raise DecodeError, e.message, e.backtrace
-            end
-          end
+          res = self.get_length16 { typeclass.decode_rdata self }
           res.instance_variable_set :@ttl, ttl
           return name, ttl, res
         end
@@ -2627,7 +2604,7 @@ class Resolv
     def each_address(name)
       name = Resolv::DNS::Name.create(name)
 
-      return unless name[-1].to_s == 'local'
+      return unless name.to_a.last == 'local'
 
       super(name)
     end
@@ -2722,12 +2699,10 @@ class Resolv
           return arg
         when String
           coordinates = ''
-          if Regex =~ arg && $1.to_f < 180
-            m = $~
-            hemi = (m[4][/[NE]/]) || (m[4][/[SW]/]) ? 1 : -1
-            coordinates = [ ((m[1].to_i*(36e5)) + (m[2].to_i*(6e4)) +
-                             (m[3].to_f*(1e3))) * hemi+(2**31) ].pack("N")
-            orientation = m[4][/[NS]/] ? 'lat' : 'lon'
+          if Regex =~ arg &&  $1<180
+            hemi = ($4[/([NE])/,1]) || ($4[/([SW])/,1]) ? 1 : -1
+            coordinates = [(($1.to_i*(36e5))+($2.to_i*(6e4))+($3.to_f*(1e3)))*hemi+(2**31)].pack("N")
+            (orientation ||= '') << $4[[/NS/],1] ? 'lat' : 'lon'
           else
             raise ArgumentError.new("not a properly formed Coord string: " + arg)
           end
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb
index 44a91d66d6..dc1d2add0b 100644
--- a/lib/rexml/attlistdecl.rb
+++ b/lib/rexml/attlistdecl.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 #vim:ts=2 sw=2 noexpandtab:
-require_relative 'child'
-require_relative 'source'
+require 'rexml/child'
+require 'rexml/source'
 
 module REXML
   # This class needs:
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index 4ae8b10062..ca5984e178 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative "namespace"
-require_relative 'text'
+require "rexml/namespace"
+require 'rexml/text'
 
 module REXML
   # Defines an Element Attribute; IE, a attribute=value pair, as in:
diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
index 997f5a08db..fe9b49b5f7 100644
--- a/lib/rexml/cdata.rb
+++ b/lib/rexml/cdata.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "text"
+require "rexml/text"
 
 module REXML
   class CData < Text
@@ -58,7 +58,7 @@ module REXML
     #  c = CData.new( " Some text " )
     #  c.write( $stdout )     #->  <![CDATA[ Some text ]]>
     def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
-      Kernel.warn( "#{self.class.name}.write is deprecated", uplevel: 1)
+      Kernel.warn( "#{self.class.name}.write is deprecated" )
       indent( output, indent )
       output << START
       output << @string
diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb
index cc6e9a4719..d23451e71e 100644
--- a/lib/rexml/child.rb
+++ b/lib/rexml/child.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "node"
+require "rexml/node"
 
 module REXML
   ##
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index 52c58b46f6..746af77296 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "child"
+require "rexml/child"
 
 module REXML
   ##
@@ -48,7 +48,7 @@ module REXML
     # ie_hack::
     #    Needed for conformity to the child API, but not used by this class.
     def write( output, indent=-1, transitive=false, ie_hack=false )
-      Kernel.warn("Comment.write is deprecated.  See REXML::Formatters", uplevel: 1)
+      Kernel.warn("Comment.write is deprecated.  See REXML::Formatters")
       indent( output, indent )
       output << START
       output << @string
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 757b639639..1eb1f5b4e1 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: false
-require_relative "parent"
-require_relative "parseexception"
-require_relative "namespace"
-require_relative 'entity'
-require_relative 'attlistdecl'
-require_relative 'xmltokens'
+require "rexml/parent"
+require "rexml/parseexception"
+require "rexml/namespace"
+require 'rexml/entity'
+require 'rexml/attlistdecl'
+require 'rexml/xmltokens'
 
 module REXML
   # Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE
@@ -108,19 +108,13 @@ module REXML
     #   Ignored
     def write( output, indent=0, transitive=false, ie_hack=false )
       f = REXML::Formatters::Default.new
-      c = context
-      if c and c[:prologue_quote] == :apostrophe
-        quote = "'"
-      else
-        quote = "\""
-      end
       indent( output, indent )
       output << START
       output << ' '
       output << @name
-      output << " #{@external_id}" if @external_id
-      output << " #{quote}#{@long_name}#{quote}" if @long_name
-      output << " #{quote}#{@uri}#{quote}" if @uri
+      output << " #@external_id" if @external_id
+      output << " #{@long_name.inspect}" if @long_name
+      output << " #{@uri.inspect}" if @uri
       unless @children.empty?
         output << ' ['
         @children.each { |child|
@@ -133,11 +127,7 @@ module REXML
     end
 
     def context
-      if @parent
-        @parent.context
-      else
-        nil
-      end
+      @parent.context
     end
 
     def entity( name )
@@ -259,16 +249,9 @@ module REXML
     end
 
     def to_s
-      c = nil
-      c = parent.context if parent
-      if c and c[:prologue_quote] == :apostrophe
-        quote = "'"
-      else
-        quote = "\""
-      end
       notation = "<!NOTATION #{@name} #{@middle}"
-      notation << " #{quote}#{@public}#{quote}" if @public
-      notation << " #{quote}#{@system}#{quote}" if @system
+      notation << " #{@public.inspect}" if @public
+      notation << " #{@system.inspect}" if @system
       notation << ">"
       notation
     end
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index adec293066..806bc499cd 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -1,17 +1,17 @@
 # frozen_string_literal: false
-require_relative "security"
-require_relative "element"
-require_relative "xmldecl"
-require_relative "source"
-require_relative "comment"
-require_relative "doctype"
-require_relative "instruction"
-require_relative "rexml"
-require_relative "parseexception"
-require_relative "output"
-require_relative "parsers/baseparser"
-require_relative "parsers/streamparser"
-require_relative "parsers/treeparser"
+require "rexml/security"
+require "rexml/element"
+require "rexml/xmldecl"
+require "rexml/source"
+require "rexml/comment"
+require "rexml/doctype"
+require "rexml/instruction"
+require "rexml/rexml"
+require "rexml/parseexception"
+require "rexml/output"
+require "rexml/parsers/baseparser"
+require "rexml/parsers/streamparser"
+require "rexml/parsers/treeparser"
 
 module REXML
   # Represents a full XML document, including PIs, a doctype, etc.  A
@@ -226,7 +226,7 @@ module REXML
       end
       formatter = if indent > -1
           if transitive
-            require_relative "formatters/transitive"
+            require "rexml/formatters/transitive"
             REXML::Formatters::Transitive.new( indent, ie_hack )
           else
             REXML::Formatters::Pretty.new( indent, ie_hack )
diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb
index 1326cb21e4..32847daadb 100644
--- a/lib/rexml/dtd/attlistdecl.rb
+++ b/lib/rexml/dtd/attlistdecl.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "../child"
+require "rexml/child"
 module REXML
   module DTD
     class AttlistDecl < Child
diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb
index 8b0f2d753a..927d5d847b 100644
--- a/lib/rexml/dtd/dtd.rb
+++ b/lib/rexml/dtd/dtd.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: false
-require_relative "elementdecl"
-require_relative "entitydecl"
-require_relative "../comment"
-require_relative "notationdecl"
-require_relative "attlistdecl"
-require_relative "../parent"
+require "rexml/dtd/elementdecl"
+require "rexml/dtd/entitydecl"
+require "rexml/comment"
+require "rexml/dtd/notationdecl"
+require "rexml/dtd/attlistdecl"
+require "rexml/parent"
 
 module REXML
   module DTD
diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb
index 20ed023244..119fd41a8f 100644
--- a/lib/rexml/dtd/elementdecl.rb
+++ b/lib/rexml/dtd/elementdecl.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "../child"
+require "rexml/child"
 module REXML
   module DTD
     class ElementDecl < Child
diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb
index 312df655ff..45707e2f42 100644
--- a/lib/rexml/dtd/entitydecl.rb
+++ b/lib/rexml/dtd/entitydecl.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "../child"
+require "rexml/child"
 module REXML
   module DTD
     class EntityDecl < Child
diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb
index 04a9b08aa7..cfdf0b9b74 100644
--- a/lib/rexml/dtd/notationdecl.rb
+++ b/lib/rexml/dtd/notationdecl.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "../child"
+require "rexml/child"
 module REXML
   module DTD
     class NotationDecl < Child
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 7903d83453..f725d5a2be 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: false
-require_relative "parent"
-require_relative "namespace"
-require_relative "attribute"
-require_relative "cdata"
-require_relative "xpath"
-require_relative "parseexception"
+require "rexml/parent"
+require "rexml/namespace"
+require "rexml/attribute"
+require "rexml/cdata"
+require "rexml/xpath"
+require "rexml/parseexception"
 
 module REXML
   # An implementation note about namespaces:
@@ -551,30 +551,6 @@ module REXML
     # Attributes                                    #
     #################################################
 
-    # Fetches an attribute value or a child.
-    #
-    # If String or Symbol is specified, it's treated as attribute
-    # name. Attribute value as String or +nil+ is returned. This case
-    # is shortcut of +attributes[name]+.
-    #
-    # If Integer is specified, it's treated as the index of
-    # child. It returns Nth child.
-    #
-    #   doc = REXML::Document.new("<a attr='1'><b/><c/></a>")
-    #   doc.root["attr"]             # => "1"
-    #   doc.root.attributes["attr"]  # => "1"
-    #   doc.root[1]                  # => <c/>
-    def [](name_or_index)
-      case name_or_index
-      when String
-        attributes[name_or_index]
-      when Symbol
-        attributes[name_or_index.to_s]
-      else
-        super
-      end
-    end
-
     def attribute( name, namespace=nil )
       prefix = nil
       if namespaces.respond_to? :key
@@ -710,10 +686,10 @@ module REXML
     #  doc.write( out )     #-> doc is written to the string 'out'
     #  doc.write( $stdout ) #-> doc written to the console
     def write(output=$stdout, indent=-1, transitive=false, ie_hack=false)
-      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters", uplevel: 1)
+      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
       formatter = if indent > -1
           if transitive
-            require_relative "formatters/transitive"
+            require "rexml/formatters/transitive"
             REXML::Formatters::Transitive.new( indent, ie_hack )
           else
             REXML::Formatters::Pretty.new( indent, ie_hack )
@@ -1033,7 +1009,6 @@ module REXML
     #    p attr.expanded_name+" => "+attr.value
     #  }
     def each_attribute # :yields: attribute
-      return to_enum(__method__) unless block_given?
       each_value do |val|
         if val.kind_of? Attribute
           yield val
@@ -1049,7 +1024,6 @@ module REXML
     #  doc = Document.new '<a x="1" y="2"/>'
     #  doc.root.attributes.each {|name, value| p name+" => "+value }
     def each
-      return to_enum(__method__) unless block_given?
       each_attribute do |attr|
         yield [attr.expanded_name, attr.value]
       end
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index d6fd5edd0d..d9a72cc8fa 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: false
-require_relative 'child'
-require_relative 'source'
-require_relative 'xmltokens'
+require 'rexml/child'
+require 'rexml/source'
+require 'rexml/xmltokens'
 
 module REXML
+  # God, I hate DTDs.  I really do.  Why this idiot standard still
+  # plagues us is beyond me.
   class Entity < Child
     include XMLTokens
     PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
@@ -27,7 +29,8 @@ module REXML
     # the constructor with the entity definition, or use the accessor methods.
     # +WARNING+: There is no validation of entity state except when the entity
     # is read from a stream.  If you start poking around with the accessors,
-    # you can easily create a non-conformant Entity.
+    # you can easily create a non-conformant Entity.  The best thing to do is
+    # dump the stupid DTDs and use XMLSchema instead.
     #
     #  e = Entity.new( 'amp', '&' )
     def initialize stream, value=nil, parent=nil, reference=false
diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb
index 811b2ff3d5..b84759d2ff 100644
--- a/lib/rexml/formatters/default.rb
+++ b/lib/rexml/formatters/default.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: false
-
 module REXML
   module Formatters
     class Default
-      # Prints out the XML document with no formatting -- except if ie_hack is
+      # Prints out the XML document with no formatting -- except if id_hack is
       # set.
       #
       # ie_hack::
@@ -102,14 +101,11 @@ module REXML
       end
 
       def write_instruction( node, output )
-        output << Instruction::START
+        output << Instruction::START.sub(/\\/u, '')
         output << node.target
-        content = node.content
-        if content
-          output << ' '
-          output << content
-        end
-        output << Instruction::STOP
+        output << ' '
+        output << node.content
+        output << Instruction::STOP.sub(/\\/u, '')
       end
     end
   end
diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb
index 562ef9462e..a80274bdad 100644
--- a/lib/rexml/formatters/pretty.rb
+++ b/lib/rexml/formatters/pretty.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'default'
+require 'rexml/formatters/default'
 
 module REXML
   module Formatters
diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb
index 5ff51e10f3..81e67f3274 100644
--- a/lib/rexml/formatters/transitive.rb
+++ b/lib/rexml/formatters/transitive.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'pretty'
+require 'rexml/formatters/pretty'
 
 module REXML
   module Formatters
diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb
index 219f9c8db5..ee73b28881 100644
--- a/lib/rexml/functions.rb
+++ b/lib/rexml/functions.rb
@@ -8,28 +8,10 @@ module REXML
   # Therefore, in XML, "local-name()" is identical (and actually becomes)
   # "local_name()"
   module Functions
-    @@available_functions = {}
     @@context = nil
     @@namespace_context = {}
     @@variables = {}
 
-    INTERNAL_METHODS = [
-      :namespace_context,
-      :namespace_context=,
-      :variables,
-      :variables=,
-      :context=,
-      :get_namespace,
-      :send,
-    ]
-    class << self
-      def singleton_method_added(name)
-        unless INTERNAL_METHODS.include?(name)
-          @@available_functions[name] = true
-        end
-      end
-    end
-
     def Functions::namespace_context=(x) ; @@namespace_context=x ; end
     def Functions::variables=(x) ; @@variables=x ; end
     def Functions::namespace_context ; @@namespace_context ; end
@@ -86,14 +68,10 @@ module REXML
     # Helper method.
     def Functions::get_namespace( node_set = nil )
       if node_set == nil
-        yield @@context[:node] if @@context[:node].respond_to?(:namespace)
+        yield @@context[:node] if defined? @@context[:node].namespace
       else
         if node_set.respond_to? :each
-          result = []
-          node_set.each do |node|
-            result << yield(node) if node.respond_to?(:namespace)
-          end
-          result
+          node_set.each { |node| yield node if defined? node.namespace }
         elsif node_set.respond_to? :namespace
           yield node_set
         end
@@ -136,40 +114,21 @@ module REXML
     # An object of a type other than the four basic types is converted to a
     # string in a way that is dependent on that type.
     def Functions::string( object=nil )
-      object = @@context[:node] if object.nil?
-      if object.respond_to?(:node_type)
-        case object.node_type
-        when :attribute
+      #object = @context unless object
+      if object.instance_of? Array
+        string( object[0] )
+      elsif defined? object.node_type
+        if object.node_type == :attribute
           object.value
-        when :element
+        elsif object.node_type == :element || object.node_type == :document
           string_value(object)
-        when :document
-          string_value(object.root)
-        when :processing_instruction
-          object.content
         else
           object.to_s
         end
+      elsif object.nil?
+        return ""
       else
-        case object
-        when Array
-          string(object[0])
-        when Float
-          if object.nan?
-            "NaN"
-          else
-            integer = object.to_i
-            if object == integer
-              "%d" % integer
-            else
-              object.to_s
-            end
-          end
-        when nil
-          ""
-        else
-          object.to_s
-        end
+        object.to_s
       end
     end
 
@@ -190,12 +149,9 @@ module REXML
       rv
     end
 
+    # UNTESTED
     def Functions::concat( *objects )
-      concatenated = ""
-      objects.each do |object|
-        concatenated << string(object)
-      end
-      concatenated
+      objects.join
     end
 
     # Fixed by Mike Stok
@@ -249,8 +205,8 @@ module REXML
 
       # Now, get the bounds.  The XPath bounds are 1..length; the ruby bounds
       # are 0..length.  Therefore, we have to offset the bounds by one.
-      ruby_start = round(ruby_start) - 1
-      ruby_length = round(ruby_length)
+      ruby_start = ruby_start.round - 1
+      ruby_length = ruby_length.round
 
       if ruby_start < 0
        ruby_length += ruby_start unless infinite_length
@@ -420,13 +376,10 @@ module REXML
     end
 
     def Functions::round( number )
-      number = number(number)
       begin
-        neg = number.negative?
-        number = number.abs.round
-        neg ? -number : number
+        number(number).round
       rescue FloatDomainError
-        number
+        number(number)
       end
     end
 
@@ -434,14 +387,9 @@ module REXML
       node.node_type == :processing_instruction
     end
 
-    def Functions::send(name, *args)
-      if @@available_functions[name.to_sym]
-        super
-      else
-        # TODO: Maybe, this is not XPath spec behavior.
-        # This behavior must be reconsidered.
-        XPath.match(@@context[:node], name.to_s)
-      end
+    def Functions::method_missing( id )
+      puts "METHOD MISSING #{id.id2name}"
+      XPath.match( @@context[:node], id.id2name )
     end
   end
 end
diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb
index 318741f03b..576939ca2b 100644
--- a/lib/rexml/instruction.rb
+++ b/lib/rexml/instruction.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: false
-
-require_relative "child"
-require_relative "source"
+require "rexml/child"
+require "rexml/source"
 
 module REXML
   # Represents an XML Instruction; IE, <? ... ?>
   # TODO: Add parent arg (3rd arg) to constructor
   class Instruction < Child
-    START = "<?"
-    STOP = "?>"
+    START = '<\?'
+    STOP = '\?>'
 
     # target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
     # content is everything else.
@@ -18,25 +17,20 @@ module REXML
     # @param target can be one of a number of things.  If String, then
     # the target of this instruction is set to this.  If an Instruction,
     # then the Instruction is shallowly cloned (target and content are
-    # copied).
+    # copied).  If a Source, then the source is scanned and parsed for
+    # an Instruction declaration.
     # @param content Must be either a String, or a Parent.  Can only
     # be a Parent if the target argument is a Source.  Otherwise, this
     # String is set as the content of this instruction.
     def initialize(target, content=nil)
-      case target
-      when String
+      if target.kind_of? String
         super()
         @target = target
         @content = content
-      when Instruction
+      elsif target.kind_of? Instruction
         super(content)
         @target = target.target
         @content = target.content
-      else
-        message =
-          "processing instruction target must be String or REXML::Instruction: "
-        message << "<#{target.inspect}>"
-        raise ArgumentError, message
       end
       @content.strip! if @content
     end
@@ -49,15 +43,13 @@ module REXML
     # See the rexml/formatters package
     #
     def write writer, indent=-1, transitive=false, ie_hack=false
-      Kernel.warn( "#{self.class.name}.write is deprecated", uplevel: 1)
+      Kernel.warn( "#{self.class.name}.write is deprecated" )
       indent(writer, indent)
-      writer << START
+      writer << START.sub(/\\/u, '')
       writer << @target
-      if @content
-        writer << ' '
-        writer << @content
-      end
-      writer << STOP
+      writer << ' '
+      writer << @content
+      writer << STOP.sub(/\\/u, '')
     end
 
     # @return true if other is an Instruction, and the content and target
diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb
index 01177c64d2..d58119a3a4 100644
--- a/lib/rexml/light/node.rb
+++ b/lib/rexml/light/node.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative '../xmltokens'
+require 'rexml/xmltokens'
 
 # [ :element, parent, name, attributes, children* ]
   # a = Node.new
diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb
index 924edf9506..90ba7cc635 100644
--- a/lib/rexml/namespace.rb
+++ b/lib/rexml/namespace.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
-
-require_relative 'xmltokens'
+require 'rexml/xmltokens'
 
 module REXML
   # Adds named attributes to an object.
@@ -15,24 +14,14 @@ module REXML
     # Sets the name and the expanded name
     def name=( name )
       @expanded_name = name
-      case name
-      when NAMESPLIT
-        if $1
-          @prefix = $1
-        else
-          @prefix = ""
-          @namespace = ""
-        end
-        @name = $2
-      when ""
-        @prefix = nil
-        @namespace = nil
-        @name = nil
+      name =~ NAMESPLIT
+      if $1
+        @prefix = $1
       else
-        message = "name must be \#{PREFIX}:\#{LOCAL_NAME} or \#{LOCAL_NAME}: "
-        message += "<#{name.inspect}>"
-        raise ArgumentError, message
+        @prefix = ""
+        @namespace = ""
       end
+      @name = $2
     end
 
     # Compares names optionally WITH namespaces
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index 081caba6cb..c7a3936799 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative "parseexception"
-require_relative "formatters/pretty"
-require_relative "formatters/default"
+require "rexml/parseexception"
+require "rexml/formatters/pretty"
+require "rexml/formatters/default"
 
 module REXML
   # Represents a node in the tree.  Nodes are never encountered except as
@@ -26,7 +26,7 @@ module REXML
     #   REXML::Formatters package for changing the output style.
     def to_s indent=nil
       unless indent.nil?
-        Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated", uplevel: 1)
+        Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated" )
         f = REXML::Formatters::Pretty.new( indent )
         f.write( self, rv = "" )
       else
diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb
index 88a5fb378d..96dfea570e 100644
--- a/lib/rexml/output.rb
+++ b/lib/rexml/output.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'encoding'
+require 'rexml/encoding'
 
 module REXML
   class Output
diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb
index 6a53b37a12..3bd0a96255 100644
--- a/lib/rexml/parent.rb
+++ b/lib/rexml/parent.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "child"
+require "rexml/child"
 
 module REXML
   # A parent has children, and has methods for accessing them.  The Parent
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index 39e9ec3fb1..80eeb0fa79 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: false
-require_relative '../parseexception'
-require_relative '../undefinednamespaceexception'
-require_relative '../source'
+require 'rexml/parseexception'
+require 'rexml/undefinednamespaceexception'
+require 'rexml/source'
 require 'set'
-require "strscan"
 
 module REXML
   module Parsers
@@ -33,12 +32,8 @@ module REXML
       COMBININGCHAR = '' # TODO
       EXTENDER = ''      # TODO
 
-      NCNAME_STR= "[#{LETTER}_][-[:alnum:]._#{COMBININGCHAR}#{EXTENDER}]*"
-      QNAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
-      QNAME = /(#{QNAME_STR})/
-
-      # Just for backward compatibility. For example, kramdown uses this.
-      # It's not used in REXML.
+      NCNAME_STR= "[#{LETTER}_:][-[:alnum:]._:#{COMBININGCHAR}#{EXTENDER}]*"
+      NAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
       UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
 
       NAMECHAR = '[\-\w\.:]'
@@ -51,7 +46,7 @@ module REXML
       DOCTYPE_START = /\A\s*<!DOCTYPE\s/um
       DOCTYPE_END = /\A\s*\]\s*>/um
       DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
-      ATTRIBUTE_PATTERN = /\s*(#{QNAME_STR})\s*=\s*(["'])(.*?)\4/um
+      ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\4/um
       COMMENT_START = /\A<!--/u
       COMMENT_PATTERN = /<!--(.*?)-->/um
       CDATA_START = /\A<!\[CDATA\[/u
@@ -60,9 +55,9 @@ module REXML
       XMLDECL_START = /\A<\?xml\s/u;
       XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>/um
       INSTRUCTION_START = /\A<\?/u
-      INSTRUCTION_PATTERN = /<\?#{NAME}(\s+.*?)?\?>/um
-      TAG_MATCH = /^<((?>#{QNAME_STR}))/um
-      CLOSE_MATCH = /^\s*<\/(#{QNAME_STR})\s*>/um
+      INSTRUCTION_PATTERN = /<\?(.*?)(\s+.*?)?\?>/um
+      TAG_MATCH = /^<((?>#{NAME_STR}))\s*((?>\s+#{UNAME_STR}\s*=\s*(["']).*?\5)*)\s*(\/)?>/um
+      CLOSE_MATCH = /^\s*<\/(#{NAME_STR})\s*>/um
 
       VERSION = /\bversion\s*=\s*["'](.*?)['"]/um
       ENCODING = /\bencoding\s*=\s*["'](.*?)['"]/um
@@ -112,6 +107,13 @@ module REXML
         "apos" => [/&apos;/, "&apos;", "'", /'/]
       }
 
+
+      ######################################################################
+      # These are patterns to identify common markup errors, to make the
+      # error messages more informative.
+      ######################################################################
+      MISSING_ATTRIBUTE_QUOTES = /^<#{NAME_STR}\s+#{NAME_STR}\s*=\s*[^"']/um
+
       def initialize( source )
         self.stream = source
         @listeners = []
@@ -222,7 +224,7 @@ module REXML
             standalone = standalone[1] unless standalone.nil?
             return [ :xmldecl, version, encoding, standalone ]
           when INSTRUCTION_START
-            return process_instruction
+            return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
           when DOCTYPE_START
             md = @source.match( DOCTYPE_PATTERN, true )
             @nsstack.unshift(curr_ns=Set.new)
@@ -334,12 +336,11 @@ module REXML
             if @source.buffer[1] == ?/
               @nsstack.shift
               last_tag = @tags.pop
+              #md = @source.match_to_consume( '>', CLOSE_MATCH)
               md = @source.match( CLOSE_MATCH, true )
-              if md.nil? or last_tag != md[1]
-                message = "Missing end tag for '#{last_tag}'"
-                message << " (got '#{md[1]}')" if md
-                raise REXML::ParseException.new(message, @source)
-              end
+              raise REXML::ParseException.new( "Missing end tag for "+
+                "'#{last_tag}' (got \"#{md[1]}\")",
+                @source) unless last_tag == md[1]
               return [ :end_element, last_tag ]
             elsif @source.buffer[1] == ?!
               md = @source.match(/\A(\s*[^>]*>)/um)
@@ -361,17 +362,52 @@ module REXML
               raise REXML::ParseException.new( "Declarations can only occur "+
                 "in the doctype declaration.", @source)
             elsif @source.buffer[1] == ??
-              return process_instruction
+              md = @source.match( INSTRUCTION_PATTERN, true )
+              return [ :processing_instruction, md[1], md[2] ] if md
+              raise REXML::ParseException.new( "Bad instruction declaration",
+                @source)
             else
               # Get the next tag
               md = @source.match(TAG_MATCH, true)
               unless md
+                # Check for missing attribute quotes
+                raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
                 raise REXML::ParseException.new("malformed XML: missing tag start", @source)
               end
+              attributes = {}
               prefixes = Set.new
               prefixes << md[2] if md[2]
               @nsstack.unshift(curr_ns=Set.new)
-              attributes, closed = parse_attributes(prefixes, curr_ns)
+              if md[4].size > 0
+                attrs = md[4].scan( ATTRIBUTE_PATTERN )
+                raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
+                attrs.each do |attr_name, prefix, local_part, quote, value|
+                  if prefix == "xmlns"
+                    if local_part == "xml"
+                      if value != "http://www.w3.org/XML/1998/namespace"
+                        msg = "The 'xml' prefix must not be bound to any other namespace "+
+                        "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
+                        raise REXML::ParseException.new( msg, @source, self )
+                      end
+                    elsif local_part == "xmlns"
+                      msg = "The 'xmlns' prefix must not be declared "+
+                      "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
+                      raise REXML::ParseException.new( msg, @source, self)
+                    end
+                    curr_ns << local_part
+                  elsif prefix
+                    prefixes << prefix unless prefix == "xml"
+                  end
+
+                  if attributes.has_key?(attr_name)
+                    msg = "Duplicate attribute #{attr_name.inspect}"
+                    raise REXML::ParseException.new(msg, @source, self)
+                  end
+
+                  attributes[attr_name] = value
+                end
+              end
+
               # Verify that all of the prefixes have been defined
               for prefix in prefixes
                 unless @nsstack.find{|k| k.member?(prefix)}
@@ -379,7 +415,7 @@ module REXML
                 end
               end
 
-              if closed
+              if md[6]
                 @closed = md[1]
                 @nsstack.shift
               else
@@ -402,7 +438,7 @@ module REXML
           raise
         rescue REXML::ParseException
           raise
-        rescue => error
+        rescue Exception, NameError => error
           raise REXML::ParseException.new( "Exception parsing",
             @source, self, (error ? error : $!) )
         end
@@ -472,99 +508,6 @@ module REXML
         return false if /\AUTF-16\z/i =~ xml_declaration_encoding
         true
       end
-
-      def process_instruction
-        match_data = @source.match(INSTRUCTION_PATTERN, true)
-        unless match_data
-          message = "Invalid processing instruction node"
-          raise REXML::ParseException.new(message, @source)
-        end
-        [:processing_instruction, match_data[1], match_data[2]]
-      end
-
-      def parse_attributes(prefixes, curr_ns)
-        attributes = {}
-        closed = false
-        match_data = @source.match(/^(.*?)(\/)?>/um, true)
-        if match_data.nil?
-          message = "Start tag isn't ended"
-          raise REXML::ParseException.new(message, @source)
-        end
-
-        raw_attributes = match_data[1]
-        closed = !match_data[2].nil?
-        return attributes, closed if raw_attributes.nil?
-        return attributes, closed if raw_attributes.empty?
-
-        scanner = StringScanner.new(raw_attributes)
-        until scanner.eos?
-          if scanner.scan(/\s+/)
-            break if scanner.eos?
-          end
-
-          pos = scanner.pos
-          loop do
-            break if scanner.scan(ATTRIBUTE_PATTERN)
-            unless scanner.scan(QNAME)
-              message = "Invalid attribute name: <#{scanner.rest}>"
-              raise REXML::ParseException.new(message, @source)
-            end
-            name = scanner[0]
-            unless scanner.scan(/\s*=\s*/um)
-              message = "Missing attribute equal: <#{name}>"
-              raise REXML::ParseException.new(message, @source)
-            end
-            quote = scanner.scan(/['"]/)
-            unless quote
-              message = "Missing attribute value start quote: <#{name}>"
-              raise REXML::ParseException.new(message, @source)
-            end
-            unless scanner.scan(/.*#{Regexp.escape(quote)}/um)
-              match_data = @source.match(/^(.*?)(\/)?>/um, true)
-              if match_data
-                scanner << "/" if closed
-                scanner << ">"
-                scanner << match_data[1]
-                scanner.pos = pos
-                closed = !match_data[2].nil?
-                next
-              end
-              message =
-                "Missing attribute value end quote: <#{name}>: <#{quote}>"
-              raise REXML::ParseException.new(message, @source)
-            end
-          end
-          name = scanner[1]
-          prefix = scanner[2]
-          local_part = scanner[3]
-          # quote = scanner[4]
-          value = scanner[5]
-          if prefix == "xmlns"
-            if local_part == "xml"
-              if value != "http://www.w3.org/XML/1998/namespace"
-                msg = "The 'xml' prefix must not be bound to any other namespace "+
-                  "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
-                raise REXML::ParseException.new( msg, @source, self )
-              end
-            elsif local_part == "xmlns"
-              msg = "The 'xmlns' prefix must not be declared "+
-                "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
-              raise REXML::ParseException.new( msg, @source, self)
-            end
-            curr_ns << local_part
-          elsif prefix
-            prefixes << prefix unless prefix == "xml"
-          end
-
-          if attributes.has_key?(name)
-            msg = "Duplicate attribute #{name.inspect}"
-            raise REXML::ParseException.new(msg, @source, self)
-          end
-
-          attributes[name] = value
-        end
-        return attributes, closed
-      end
     end
   end
 end
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index bdc08276a9..f0601ae51b 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative 'streamparser'
-require_relative 'baseparser'
-require_relative '../light/node'
+require 'rexml/parsers/streamparser'
+require 'rexml/parsers/baseparser'
+require 'rexml/light/node'
 
 module REXML
   module Parsers
diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb
index f8b232a2cd..8c49217553 100644
--- a/lib/rexml/parsers/pullparser.rb
+++ b/lib/rexml/parsers/pullparser.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: false
 require 'forwardable'
 
-require_relative '../parseexception'
-require_relative 'baseparser'
-require_relative '../xmltokens'
+require 'rexml/parseexception'
+require 'rexml/parsers/baseparser'
+require 'rexml/xmltokens'
 
 module REXML
   module Parsers
diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
index 6a24ce2227..1386f69c83 100644
--- a/lib/rexml/parsers/sax2parser.rb
+++ b/lib/rexml/parsers/sax2parser.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: false
-require_relative 'baseparser'
-require_relative '../parseexception'
-require_relative '../namespace'
-require_relative '../text'
+require 'rexml/parsers/baseparser'
+require 'rexml/parseexception'
+require 'rexml/namespace'
+require 'rexml/text'
 
 module REXML
   module Parsers
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
index 9e0eb0b363..b271e6743e 100644
--- a/lib/rexml/parsers/streamparser.rb
+++ b/lib/rexml/parsers/streamparser.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "baseparser"
+require "rexml/parsers/baseparser"
 
 module REXML
   module Parsers
@@ -7,7 +7,6 @@ module REXML
       def initialize source, listener
         @listener = listener
         @parser = BaseParser.new( source )
-        @tag_stack = []
       end
 
       def add_listener( listener )
@@ -20,21 +19,14 @@ module REXML
           event = @parser.pull
           case event[0]
           when :end_document
-            unless @tag_stack.empty?
-              tag_path = "/" + @tag_stack.join("/")
-              raise ParseException.new("Missing end tag for '#{tag_path}'",
-                                       @parser.source)
-            end
             return
           when :start_element
-            @tag_stack << event[1]
             attrs = event[2].each do |n, v|
               event[2][n] = @parser.unnormalize( v )
             end
             @listener.tag_start( event[1], attrs )
           when :end_element
             @listener.tag_end( event[1] )
-            @tag_stack.pop
           when :text
             normalized = @parser.unnormalize( event[1] )
             @listener.text( normalized )
diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb
index bf9a42545b..fc0993c72a 100644
--- a/lib/rexml/parsers/treeparser.rb
+++ b/lib/rexml/parsers/treeparser.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../validation/validationexception'
-require_relative '../undefinednamespaceexception'
+require 'rexml/validation/validationexception'
+require 'rexml/undefinednamespaceexception'
 
 module REXML
   module Parsers
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
index e0029f43da..6571d119bd 100644
--- a/lib/rexml/parsers/ultralightparser.rb
+++ b/lib/rexml/parsers/ultralightparser.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative 'streamparser'
-require_relative 'baseparser'
+require 'rexml/parsers/streamparser'
+require 'rexml/parsers/baseparser'
 
 module REXML
   module Parsers
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
index d01d325e04..32b70bb798 100644
--- a/lib/rexml/parsers/xpathparser.rb
+++ b/lib/rexml/parsers/xpathparser.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../namespace'
-require_relative '../xmltokens'
+require 'rexml/namespace'
+require 'rexml/xmltokens'
 
 module REXML
   module Parsers
@@ -185,7 +185,7 @@ module REXML
       #  | '/' RelativeLocationPath?
       #  | '//' RelativeLocationPath
       def LocationPath path, parsed
-        path = path.lstrip
+        path = path.strip
         if path[0] == ?/
           parsed << :document
           if path[1] == ?/
@@ -209,12 +209,7 @@ module REXML
       #  | RelativeLocationPath '//' Step
       AXIS = /^(ancestor|ancestor-or-self|attribute|child|descendant|descendant-or-self|following|following-sibling|namespace|parent|preceding|preceding-sibling|self)::/
       def RelativeLocationPath path, parsed
-        loop do
-          original_path = path
-          path = path.lstrip
-
-          return original_path if path.empty?
-
+        while path.size > 0
           # (axis or @ or <child::>) nodetest predicate  >
           # OR                                          >  / Step
           # (. or ..)                                    >
@@ -244,25 +239,28 @@ module REXML
             n = []
             path = NodeTest( path, n)
 
-            path = Predicate( path, n )
+            if path[0] == ?[
+              path = Predicate( path, n )
+            end
 
             parsed.concat(n)
           end
 
-          original_path = path
-          path = path.lstrip
-          return original_path if path.empty?
-
-          return original_path if path[0] != ?/
-
-          if path[1] == ?/
-            parsed << :descendant_or_self
-            parsed << :node
-            path = path[2..-1]
-          else
-            path = path[1..-1]
+          if path.size > 0
+            if path[0] == ?/
+              if path[1] == ?/
+                parsed << :descendant_or_self
+                parsed << :node
+                path = path[2..-1]
+              else
+                path = path[1..-1]
+              end
+            else
+              return path
+            end
           end
         end
+        return path
       end
 
       # Returns a 1-1 map of the nodeset
@@ -271,26 +269,15 @@ module REXML
       #   String, if a name match
       #NodeTest
       #  | ('*' | NCNAME ':' '*' | QNAME)                NameTest
-      #  | '*' ':' NCNAME                                NameTest since XPath 2.0
-      #  | NODE_TYPE '(' ')'                             NodeType
+      #  | NODE_TYPE '(' ')'                              NodeType
       #  | PI '(' LITERAL ')'                            PI
       #    | '[' expr ']'                                Predicate
-      PREFIX_WILDCARD = /^\*:(#{NCNAME_STR})/u
-      LOCAL_NAME_WILDCARD = /^(#{NCNAME_STR}):\*/u
+      NCNAMETEST= /^(#{NCNAME_STR}):\*/u
       QNAME     = Namespace::NAMESPLIT
       NODE_TYPE  = /^(comment|text|node)\(\s*\)/m
       PI        = /^processing-instruction\(/
       def NodeTest path, parsed
-        original_path = path
-        path = path.lstrip
         case path
-        when PREFIX_WILDCARD
-          prefix = nil
-          name = $1
-          path = $'
-          parsed << :qname
-          parsed << prefix
-          parsed << name
         when /^\*/
           path = $'
           parsed << :any
@@ -310,7 +297,7 @@ module REXML
           end
           parsed << :processing_instruction
           parsed << (literal || '')
-        when LOCAL_NAME_WILDCARD
+        when NCNAMETEST
           prefix = $1
           path = $'
           parsed << :namespace
@@ -323,17 +310,13 @@ module REXML
           parsed << :qname
           parsed << prefix
           parsed << name
-        else
-          path = original_path
         end
         return path
       end
 
       # Filters the supplied nodeset on the predicate(s)
       def Predicate path, parsed
-        original_path = path
-        path = path.lstrip
-        return original_path unless path[0] == ?[
+        return nil unless path[0] == ?[
         predicates = []
         while path[0] == ?[
           path, expr = get_group(path)
@@ -438,13 +421,13 @@ module REXML
         rest
       end
 
-      #| AdditiveExpr ('+' | '-') MultiplicativeExpr
+      #| AdditiveExpr ('+' | S '-') MultiplicativeExpr
       #| MultiplicativeExpr
       def AdditiveExpr path, parsed
         n = []
         rest = MultiplicativeExpr( path, n )
         if rest != path
-          while rest =~ /^\s*(\+|-)\s*/
+          while rest =~ /^\s*(\+| -)\s*/
             if $1[0] == ?+
               n = [ :plus, n, [] ]
             else
@@ -526,14 +509,13 @@ module REXML
       #| LocationPath
       #| FilterExpr ('/' | '//') RelativeLocationPath
       def PathExpr path, parsed
-        path = path.lstrip
+        path =~ /^\s*/
+        path = $'
         n = []
         rest = FilterExpr( path, n )
         if rest != path
           if rest and rest[0] == ?/
-            rest = RelativeLocationPath(rest, n)
-            parsed.concat(n)
-            return rest
+            return RelativeLocationPath(rest, n)
           end
         end
         rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w*]/
@@ -546,7 +528,7 @@ module REXML
       def FilterExpr path, parsed
         n = []
         path = PrimaryExpr( path, n )
-        path = Predicate(path, n)
+        path = Predicate(path, n) if path and path[0] == ?[
         parsed.concat(n)
         path
       end
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index a0466b25d9..5d6c77ca38 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative 'functions'
-require_relative 'xmltokens'
+require 'rexml/functions'
+require 'rexml/xmltokens'
 
 module REXML
   class QuickPath
diff --git a/lib/rexml/rexml.gemspec b/lib/rexml/rexml.gemspec
deleted file mode 100644
index 6fe7e635f1..0000000000
--- a/lib/rexml/rexml.gemspec
+++ /dev/null
@@ -1,85 +0,0 @@
-begin
-  require_relative "lib/rexml/rexml"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "rexml"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "rexml"
-  spec.version       = REXML::VERSION
-  spec.authors       = ["Kouhei Sutou"]
-  spec.email         = ["kou@cozmixng.org"]
-
-  spec.summary       = %q{An XML toolkit for Ruby}
-  spec.description   = %q{An XML toolkit for Ruby}
-  spec.homepage      = "https://github.com/ruby/rexml"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [
-    ".gitignore",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "NEWS.md",
-    "README.md",
-    "Rakefile",
-    "lib/rexml/attlistdecl.rb",
-    "lib/rexml/attribute.rb",
-    "lib/rexml/cdata.rb",
-    "lib/rexml/child.rb",
-    "lib/rexml/comment.rb",
-    "lib/rexml/doctype.rb",
-    "lib/rexml/document.rb",
-    "lib/rexml/dtd/attlistdecl.rb",
-    "lib/rexml/dtd/dtd.rb",
-    "lib/rexml/dtd/elementdecl.rb",
-    "lib/rexml/dtd/entitydecl.rb",
-    "lib/rexml/dtd/notationdecl.rb",
-    "lib/rexml/element.rb",
-    "lib/rexml/encoding.rb",
-    "lib/rexml/entity.rb",
-    "lib/rexml/formatters/default.rb",
-    "lib/rexml/formatters/pretty.rb",
-    "lib/rexml/formatters/transitive.rb",
-    "lib/rexml/functions.rb",
-    "lib/rexml/instruction.rb",
-    "lib/rexml/light/node.rb",
-    "lib/rexml/namespace.rb",
-    "lib/rexml/node.rb",
-    "lib/rexml/output.rb",
-    "lib/rexml/parent.rb",
-    "lib/rexml/parseexception.rb",
-    "lib/rexml/parsers/baseparser.rb",
-    "lib/rexml/parsers/lightparser.rb",
-    "lib/rexml/parsers/pullparser.rb",
-    "lib/rexml/parsers/sax2parser.rb",
-    "lib/rexml/parsers/streamparser.rb",
-    "lib/rexml/parsers/treeparser.rb",
-    "lib/rexml/parsers/ultralightparser.rb",
-    "lib/rexml/parsers/xpathparser.rb",
-    "lib/rexml/quickpath.rb",
-    "lib/rexml/rexml.rb",
-    "lib/rexml/sax2listener.rb",
-    "lib/rexml/security.rb",
-    "lib/rexml/source.rb",
-    "lib/rexml/streamlistener.rb",
-    "lib/rexml/syncenumerator.rb",
-    "lib/rexml/text.rb",
-    "lib/rexml/undefinednamespaceexception.rb",
-    "lib/rexml/validation/relaxng.rb",
-    "lib/rexml/validation/validation.rb",
-    "lib/rexml/validation/validationexception.rb",
-    "lib/rexml/xmldecl.rb",
-    "lib/rexml/xmltokens.rb",
-    "lib/rexml/xpath.rb",
-    "lib/rexml/xpath_parser.rb",
-    "rexml.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/rexml/rexml.rb b/lib/rexml/rexml.rb
index 7851c78bf5..fbc0d339d8 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 # frozen_string_literal: false
 # REXML is an XML toolkit for Ruby[http://www.ruby-lang.org], in Ruby.
 #
@@ -24,8 +24,8 @@
 module REXML
   COPYRIGHT = "Copyright © 2001-2008 Sean Russell <ser@germane-software.com>"
   DATE = "2008/019"
-  VERSION = "3.1.9"
-  REVISION = ""
+  VERSION = "3.1.7.3"
+  REVISION = %w$Revision$[1] || ''
 
   Copyright = COPYRIGHT
   Version = VERSION
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index 770aefc818..af65cf4751 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -1,6 +1,6 @@
 # coding: US-ASCII
 # frozen_string_literal: false
-require_relative 'encoding'
+require 'rexml/encoding'
 
 module REXML
   # Generates Source-s.  USE THIS CLASS.
@@ -254,7 +254,6 @@ module REXML
           end
         rescue
         end
-        @er_source.seek(pos)
       rescue IOError
         pos = -1
         line = -1
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index 6139caecd7..9ea8ba9df3 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: false
-require_relative 'security'
-require_relative 'entity'
-require_relative 'doctype'
-require_relative 'child'
-require_relative 'doctype'
-require_relative 'parseexception'
+require 'rexml/security'
+require 'rexml/entity'
+require 'rexml/doctype'
+require 'rexml/child'
+require 'rexml/doctype'
+require 'rexml/parseexception'
 
 module REXML
   # Represents text nodes in an XML document
@@ -96,28 +96,27 @@ module REXML
 
       @raw = false
       @parent = nil
-      @entity_filter = nil
 
       if parent
         super( parent )
         @raw = parent.raw
       end
 
+      @raw = raw unless raw.nil?
+      @entity_filter = entity_filter
+      clear_cache
+
       if arg.kind_of? String
         @string = arg.dup
+        @string.squeeze!(" \n\t") unless respect_whitespace
       elsif arg.kind_of? Text
-        @string = arg.instance_variable_get(:@string).dup
+        @string = arg.to_s
         @raw = arg.raw
-        @entity_filter = arg.instance_variable_get(:@entity_filter)
       elsif
         raise "Illegal argument of type #{arg.type} for Text constructor (#{arg})"
       end
 
-      @string.squeeze!(" \n\t") unless respect_whitespace
-      @string.gsub!(/\r\n?/, "\n")
-      @raw = raw unless raw.nil?
-      @entity_filter = entity_filter if entity_filter
-      clear_cache
+      @string.gsub!( /\r\n?/, "\n" )
 
       Text.check(@string, illegal, doctype) if @raw
     end
@@ -182,7 +181,7 @@ module REXML
 
 
     def clone
-      return Text.new(self, true)
+      return Text.new(self)
     end
 
 
@@ -227,7 +226,9 @@ module REXML
     #   u.to_s   #-> "sean russell"
     def to_s
       return @string if @raw
-      @normalized ||= Text::normalize( @string, doctype, @entity_filter )
+      return @normalized if @normalized
+
+      @normalized = Text::normalize( @string, doctype, @entity_filter )
     end
 
     def inspect
@@ -248,7 +249,8 @@ module REXML
     #   u = Text.new( "sean russell", false, nil, true )
     #   u.value   #-> "sean russell"
     def value
-      @unnormalized ||= Text::unnormalize( @string, doctype )
+      return @unnormalized if @unnormalized
+      @unnormalized = Text::unnormalize( @string, doctype )
     end
 
     # Sets the contents of this text node.  This expects the text to be
@@ -264,16 +266,16 @@ module REXML
       @raw = false
     end
 
-    def wrap(string, width, addnewline=false)
-      # Recursively wrap string at width.
-      return string if string.length <= width
-      place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
-      if addnewline then
-        return "\n" + string[0,place] + "\n" + wrap(string[place+1..-1], width)
-      else
-        return string[0,place] + "\n" + wrap(string[place+1..-1], width)
-      end
-    end
+     def wrap(string, width, addnewline=false)
+       # Recursively wrap string at width.
+       return string if string.length <= width
+       place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
+       if addnewline then
+         return "\n" + string[0,place] + "\n" + wrap(string[place+1..-1], width)
+       else
+         return string[0,place] + "\n" + wrap(string[place+1..-1], width)
+       end
+     end
 
     def indent_text(string, level=1, style="\t", indentfirstline=true)
       return string if level < 0
@@ -291,7 +293,7 @@ module REXML
     # See REXML::Formatters
     #
     def write( writer, indent=-1, transitive=false, ie_hack=false )
-      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters", uplevel: 1)
+      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
       formatter = if indent > -1
           REXML::Formatters::Pretty.new( indent )
         else
diff --git a/lib/rexml/undefinednamespaceexception.rb b/lib/rexml/undefinednamespaceexception.rb
index 492a098183..e522ed57ea 100644
--- a/lib/rexml/undefinednamespaceexception.rb
+++ b/lib/rexml/undefinednamespaceexception.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'parseexception'
+require 'rexml/parseexception'
 module REXML
   class UndefinedNamespaceException < ParseException
     def initialize( prefix, source, parser )
diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb
index f29a2c05e5..fb52438290 100644
--- a/lib/rexml/validation/relaxng.rb
+++ b/lib/rexml/validation/relaxng.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative "validation"
-require_relative "../parsers/baseparser"
+require "rexml/validation/validation"
+require "rexml/parsers/baseparser"
 
 module REXML
   module Validation
diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb
index 0ad6ada427..f0c76f976c 100644
--- a/lib/rexml/validation/validation.rb
+++ b/lib/rexml/validation/validation.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'validationexception'
+require 'rexml/validation/validationexception'
 
 module REXML
   module Validation
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 89c0747d49..a37e9f3ddc 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -1,18 +1,17 @@
 # frozen_string_literal: false
-
-require_relative 'encoding'
-require_relative 'source'
+require 'rexml/encoding'
+require 'rexml/source'
 
 module REXML
   # NEEDS DOCUMENTATION
   class XMLDecl < Child
     include Encoding
 
-    DEFAULT_VERSION = "1.0"
-    DEFAULT_ENCODING = "UTF-8"
-    DEFAULT_STANDALONE = "no"
-    START = "<?xml"
-    STOP = "?>"
+    DEFAULT_VERSION = "1.0";
+    DEFAULT_ENCODING = "UTF-8";
+    DEFAULT_STANDALONE = "no";
+    START = '<\?xml';
+    STOP = '\?>';
 
     attr_accessor :version, :standalone
     attr_reader :writeencoding, :writethis
@@ -47,9 +46,9 @@ module REXML
     #   Ignored
     def write(writer, indent=-1, transitive=false, ie_hack=false)
       return nil unless @writethis or writer.kind_of? Output
-      writer << START
+      writer << START.sub(/\\/u, '')
       writer << " #{content encoding}"
-      writer << STOP
+      writer << STOP.sub(/\\/u, '')
     end
 
     def ==( other )
@@ -103,26 +102,14 @@ module REXML
     end
 
     def inspect
-      "#{START} ... #{STOP}"
+      START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
     end
 
     private
     def content(enc)
-      context = nil
-      context = parent.context if parent
-      if context and context[:prologue_quote] == :quote
-        quote = "\""
-      else
-        quote = "'"
-      end
-
-      rv = "version=#{quote}#{@version}#{quote}"
-      if @writeencoding or enc !~ /\Autf-8\z/i
-        rv << " encoding=#{quote}#{enc}#{quote}"
-      end
-      if @standalone
-        rv << " standalone=#{quote}#{@standalone}#{quote}"
-      end
+      rv = "version='#@version'"
+      rv << " encoding='#{enc}'" if @writeencoding || enc !~ /\Autf-8\z/i
+      rv << " standalone='#@standalone'" if @standalone
       rv
     end
   end
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index a0921bd8e1..f1cb99baea 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative 'functions'
-require_relative 'xpath_parser'
+require 'rexml/functions'
+require 'rexml/xpath_parser'
 
 module REXML
   # Wrapper class.  Use this class to access the XPath functions.
@@ -28,10 +28,10 @@ module REXML
     #  XPath.first( doc, "//b"} )
     #  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
     #  XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"})
-    def XPath::first(element, path=nil, namespaces=nil, variables={}, options={})
+    def XPath::first element, path=nil, namespaces=nil, variables={}
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-      parser = XPathParser.new(**options)
+      parser = XPathParser.new
       parser.namespaces = namespaces
       parser.variables = variables
       path = "*" unless path
@@ -57,10 +57,10 @@ module REXML
     #  XPath.each( node, 'ancestor::x' ) { |el| ... }
     #  XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \
     #    {|el| ... }
-    def XPath::each(element, path=nil, namespaces=nil, variables={}, options={}, &block)
+    def XPath::each element, path=nil, namespaces=nil, variables={}, &block
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
-      parser = XPathParser.new(**options)
+      parser = XPathParser.new
       parser.namespaces = namespaces
       parser.variables = variables
       path = "*" unless path
@@ -69,8 +69,8 @@ module REXML
     end
 
     # Returns an array of nodes matching a given XPath.
-    def XPath::match(element, path=nil, namespaces=nil, variables={}, options={})
-      parser = XPathParser.new(**options)
+    def XPath::match element, path=nil, namespaces=nil, variables={}
+      parser = XPathParser.new
       parser.namespaces = namespaces
       parser.variables = variables
       path = "*" unless path
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index e30581d3d0..181b2b6e85 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: false
-require_relative 'namespace'
-require_relative 'xmltokens'
-require_relative 'attribute'
-require_relative 'syncenumerator'
-require_relative 'parsers/xpathparser'
+require 'rexml/namespace'
+require 'rexml/xmltokens'
+require 'rexml/attribute'
+require 'rexml/syncenumerator'
+require 'rexml/parsers/xpathparser'
 
 class Object
   # provides a unified +clone+ operation, for REXML::XPathParser
@@ -47,12 +47,10 @@ module REXML
     include XMLTokens
     LITERAL    = /^'([^']*)'|^"([^"]*)"/u
 
-    def initialize(strict: false)
+    def initialize( )
       @parser = REXML::Parsers::XPathParser.new
       @namespaces = nil
       @variables = {}
-      @nest = 0
-      @strict = strict
     end
 
     def namespaces=( namespaces={} )
@@ -77,7 +75,7 @@ module REXML
 
     def predicate path, nodeset
       path_stack = @parser.parse( path )
-      match( path_stack, nodeset )
+      expr( path_stack, nodeset )
     end
 
     def []=( variable_name, value )
@@ -125,24 +123,13 @@ module REXML
     end
 
 
-    def match(path_stack, nodeset)
-      nodeset = nodeset.collect.with_index do |node, i|
-        position = i + 1
-        XPathNode.new(node, position: position)
-      end
-      result = expr(path_stack, nodeset)
-      case result
-      when Array # nodeset
-        unnode(result)
-      else
-        result
-      end
+    def match( path_stack, nodeset )
+      r = expr( path_stack, nodeset )
+      r
     end
 
     private
-    def strict?
-      @strict
-    end
+
 
     # Returns a String namespace for a node, given a prefix
     # The rules are:
@@ -161,179 +148,233 @@ module REXML
 
     # Expr takes a stack of path elements and a set of nodes (either a Parent
     # or an Array and returns an Array of matching nodes
+    ALL = [ :attribute, :element, :text, :processing_instruction, :comment ]
+    ELEMENTS = [ :element ]
     def expr( path_stack, nodeset, context=nil )
-      # enter(:expr, path_stack, nodeset)
+      node_types = ELEMENTS
       return nodeset if path_stack.length == 0 || nodeset.length == 0
       while path_stack.length > 0
-        # trace(:while, path_stack, nodeset)
         if nodeset.length == 0
           path_stack.clear
           return []
         end
-        op = path_stack.shift
-        case op
+        case (op = path_stack.shift)
         when :document
-          first_raw_node = nodeset.first.raw_node
-          nodeset = [XPathNode.new(first_raw_node.root_node, position: 1)]
+          nodeset = [ nodeset[0].root_node ]
+
+        when :qname
+          prefix = path_stack.shift
+          name = path_stack.shift
+          nodeset.delete_if do |node|
+            # FIXME: This DOUBLES the time XPath searches take
+            ns = get_namespace( node, prefix )
+            if node.node_type == :element
+              if node.name == name
+              end
+            end
+            !(node.node_type == :element and
+              node.name == name and
+              node.namespace == ns )
+          end
+          node_types = ELEMENTS
+
+        when :any
+          nodeset.delete_if { |node| !node_types.include?(node.node_type) }
+
         when :self
-          nodeset = step(path_stack) do
-            [nodeset]
+          # This space left intentionally blank
+
+        when :processing_instruction
+          target = path_stack.shift
+          nodeset.delete_if do |node|
+            (node.node_type != :processing_instruction) or
+            ( target!='' and ( node.target != target ) )
           end
+
+        when :text
+          nodeset.delete_if { |node| node.node_type != :text }
+
+        when :comment
+          nodeset.delete_if { |node| node.node_type != :comment }
+
+        when :node
+          # This space left intentionally blank
+          node_types = ALL
+
         when :child
-          nodeset = step(path_stack) do
-            child(nodeset)
+          new_nodeset = []
+          nt = nil
+          nodeset.each do |node|
+            nt = node.node_type
+            new_nodeset += node.children if nt == :element or nt == :document
           end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
         when :literal
-          # trace(:literal, path_stack, nodeset)
           return path_stack.shift
+
         when :attribute
-          nodeset = step(path_stack, any_type: :attribute) do
-            nodesets = []
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              next unless raw_node.node_type == :element
-              attributes = raw_node.attributes
-              next if attributes.empty?
-              nodesets << attributes.each_attribute.collect.with_index do |attribute, i|
-                XPathNode.new(attribute, position: i + 1)
+          new_nodeset = []
+          case path_stack.shift
+          when :qname
+            prefix = path_stack.shift
+            name = path_stack.shift
+            for element in nodeset
+              if element.node_type == :element
+                attrib = element.attribute( name, get_namespace(element, prefix) )
+                new_nodeset << attrib if attrib
               end
             end
-            nodesets
-          end
-        when :namespace
-          pre_defined_namespaces = {
-            "xml" => "http://www.w3.org/XML/1998/namespace",
-          }
-          nodeset = step(path_stack, any_type: :namespace) do
-            nodesets = []
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              case raw_node.node_type
-              when :element
-                if @namespaces
-                  nodesets << pre_defined_namespaces.merge(@namespaces)
-                else
-                  nodesets << pre_defined_namespaces.merge(raw_node.namespaces)
-                end
-              when :attribute
-                if @namespaces
-                  nodesets << pre_defined_namespaces.merge(@namespaces)
-                else
-                  nodesets << pre_defined_namespaces.merge(raw_node.element.namespaces)
-                end
+          when :any
+            for element in nodeset
+              if element.node_type == :element
+                new_nodeset += element.attributes.to_a
               end
             end
-            nodesets
           end
+          nodeset = new_nodeset
+
         when :parent
-          nodeset = step(path_stack) do
-            nodesets = []
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              if raw_node.node_type == :attribute
-                parent = raw_node.element
-              else
-                parent = raw_node.parent
-              end
-              nodesets << [XPathNode.new(parent, position: 1)] if parent
+          nodeset = nodeset.collect{|n| n.parent}.compact
+          #nodeset = expr(path_stack.dclone, nodeset.collect{|n| n.parent}.compact)
+          node_types = ELEMENTS
+
+        when :ancestor
+          new_nodeset = []
+          nodeset.each do |node|
+            while node.parent
+              node = node.parent
+              new_nodeset << node unless new_nodeset.include? node
             end
-            nodesets
           end
-        when :ancestor
-          nodeset = step(path_stack) do
-            nodesets = []
-            # new_nodes = {}
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              new_nodeset = []
-              while raw_node.parent
-                raw_node = raw_node.parent
-                # next if new_nodes.key?(node)
-                new_nodeset << XPathNode.new(raw_node,
-                                             position: new_nodeset.size + 1)
-                # new_nodes[node] = true
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :ancestor_or_self
+          new_nodeset = []
+          nodeset.each do |node|
+            if node.node_type == :element
+              new_nodeset << node
+              while ( node.parent )
+                node = node.parent
+                new_nodeset << node unless new_nodeset.include? node
               end
-              nodesets << new_nodeset unless new_nodeset.empty?
             end
-            nodesets
           end
-        when :ancestor_or_self
-          nodeset = step(path_stack) do
-            nodesets = []
-            # new_nodes = {}
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              next unless raw_node.node_type == :element
-              new_nodeset = [XPathNode.new(raw_node, position: 1)]
-              # new_nodes[node] = true
-              while raw_node.parent
-                raw_node = raw_node.parent
-                # next if new_nodes.key?(node)
-                new_nodeset << XPathNode.new(raw_node,
-                                             position: new_nodeset.size + 1)
-                # new_nodes[node] = true
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :predicate
+          new_nodeset = []
+          subcontext = { :size => nodeset.size }
+          pred = path_stack.shift
+          nodeset.each_with_index { |node, index|
+            subcontext[ :node ] = node
+            subcontext[ :index ] = index+1
+            pc = pred.dclone
+            result = expr( pc, [node], subcontext )
+            result = result[0] if result.kind_of? Array and result.length == 1
+            if result.kind_of? Numeric
+              new_nodeset << node if result == (index+1)
+            elsif result.instance_of? Array
+              if result.size > 0 and result.inject(false) {|k,s| s or k}
+                new_nodeset << node if result.size > 0
               end
-              nodesets << new_nodeset unless new_nodeset.empty?
+            else
+              new_nodeset << node if result
             end
-            nodesets
+          }
+          nodeset = new_nodeset
+=begin
+          predicate = path_stack.shift
+          ns = nodeset.clone
+          result = expr( predicate, ns )
+          if result.kind_of? Array
+            nodeset = result.zip(ns).collect{|m,n| n if m}.compact
+          else
+            nodeset = result ? nodeset : []
           end
+=end
+
         when :descendant_or_self
-          nodeset = step(path_stack) do
-            descendant(nodeset, true)
-          end
+          rv = descendant_or_self( path_stack, nodeset )
+          path_stack.clear
+          nodeset = rv
+          node_types = ELEMENTS
+
         when :descendant
-          nodeset = step(path_stack) do
-            descendant(nodeset, false)
+          results = []
+          nt = nil
+          nodeset.each do |node|
+            nt = node.node_type
+            results += expr( path_stack.dclone.unshift( :descendant_or_self ),
+              node.children ) if nt == :element or nt == :document
           end
+          nodeset = results
+          node_types = ELEMENTS
+
         when :following_sibling
-          nodeset = step(path_stack) do
-            nodesets = []
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              next unless raw_node.respond_to?(:parent)
-              next if raw_node.parent.nil?
-              all_siblings = raw_node.parent.children
-              current_index = all_siblings.index(raw_node)
-              following_siblings = all_siblings[(current_index + 1)..-1]
-              next if following_siblings.empty?
-              nodesets << following_siblings.collect.with_index do |sibling, i|
-                XPathNode.new(sibling, position: i + 1)
-              end
-            end
-            nodesets
+          results = []
+          nodeset.each do |node|
+            next if node.parent.nil?
+            all_siblings = node.parent.children
+            current_index = all_siblings.index( node )
+            following_siblings = all_siblings[ current_index+1 .. -1 ]
+            results += expr( path_stack.dclone, following_siblings )
           end
+          nodeset = results
+
         when :preceding_sibling
-          nodeset = step(path_stack, order: :reverse) do
-            nodesets = []
-            nodeset.each do |node|
-              raw_node = node.raw_node
-              next unless raw_node.respond_to?(:parent)
-              next if raw_node.parent.nil?
-              all_siblings = raw_node.parent.children
-              current_index = all_siblings.index(raw_node)
-              preceding_siblings = all_siblings[0, current_index].reverse
-              next if preceding_siblings.empty?
-              nodesets << preceding_siblings.collect.with_index do |sibling, i|
-                XPathNode.new(sibling, position: i + 1)
-              end
-            end
-            nodesets
+          results = []
+          nodeset.each do |node|
+            next if node.parent.nil?
+            all_siblings = node.parent.children
+            current_index = all_siblings.index( node )
+            preceding_siblings = all_siblings[ 0, current_index ].reverse
+            results += preceding_siblings
           end
+          nodeset = results
+          node_types = ELEMENTS
+
         when :preceding
-          nodeset = step(path_stack, order: :reverse) do
-            unnode(nodeset) do |node|
-              preceding(node)
-            end
+          new_nodeset = []
+          nodeset.each do |node|
+            new_nodeset += preceding( node )
           end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
         when :following
-          nodeset = step(path_stack) do
-            unnode(nodeset) do |node|
-              following(node)
+          new_nodeset = []
+          nodeset.each do |node|
+            new_nodeset += following( node )
+          end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :namespace
+          new_nodeset = []
+          prefix = path_stack.shift
+          nodeset.each do |node|
+            if (node.node_type == :element or node.node_type == :attribute)
+              if @namespaces
+                namespaces = @namespaces
+              elsif (node.node_type == :element)
+                namespaces = node.namespaces
+              else
+                namespaces = node.element.namesapces
+              end
+              if (node.namespace == namespaces[prefix])
+                new_nodeset << node
+              end
             end
           end
+          nodeset = new_nodeset
+
         when :variable
           var_name = path_stack.shift
-          return [@variables[var_name]]
+          return @variables[ var_name ]
 
         # :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
         # TODO: Special case for :or and :and -- not evaluate the right
@@ -343,7 +384,6 @@ module REXML
           left = expr( path_stack.shift, nodeset.dup, context )
           right = expr( path_stack.shift, nodeset.dup, context )
           res = equality_relational_compare( left, op, right )
-          # trace(op, left, right, res)
           return res
 
         when :and
@@ -356,37 +396,40 @@ module REXML
           res = equality_relational_compare( left, op, right )
           return res
 
-        when :div, :mod, :mult, :plus, :minus
-          left = expr(path_stack.shift, nodeset, context)
-          right = expr(path_stack.shift, nodeset, context)
-          left = unnode(left) if left.is_a?(Array)
-          right = unnode(right) if right.is_a?(Array)
-          left = Functions::number(left)
-          right = Functions::number(right)
-          case op
-          when :div
-            return left / right
-          when :mod
-            return left % right
-          when :mult
-            return left * right
-          when :plus
-            return left + right
-          when :minus
-            return left - right
-          else
-            raise "[BUG] Unexpected operator: <#{op.inspect}>"
-          end
+        when :div
+          left = Functions::number(expr(path_stack.shift, nodeset, context)).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context)).to_f
+          return (left / right)
+
+        when :mod
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left % right)
+
+        when :mult
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left * right)
+
+        when :plus
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left + right)
+
+        when :minus
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left - right)
+
         when :union
           left = expr( path_stack.shift, nodeset, context )
           right = expr( path_stack.shift, nodeset, context )
-          left = unnode(left) if left.is_a?(Array)
-          right = unnode(right) if right.is_a?(Array)
           return (left | right)
+
         when :neg
           res = expr( path_stack, nodeset, context )
-          res = unnode(res) if res.is_a?(Array)
-          return -Functions.number(res)
+          return -(res.to_f)
+
         when :not
         when :function
           func_name = path_stack.shift.tr('-','_')
@@ -395,242 +438,53 @@ module REXML
 
           res = []
           cont = context
-          nodeset.each_with_index do |node, i|
+          nodeset.each_with_index { |n, i|
             if subcontext
-              if node.is_a?(XPathNode)
-                subcontext[:node]  = node.raw_node
-                subcontext[:index] = node.position
-              else
-                subcontext[:node]  = node
-                subcontext[:index] = i
-              end
+              subcontext[:node]  = n
+              subcontext[:index] = i
               cont = subcontext
             end
             arg_clone = arguments.dclone
-            args = arg_clone.collect do |arg|
-              result = expr( arg, [node], cont )
-              result = unnode(result) if result.is_a?(Array)
-              result
-            end
+            args = arg_clone.collect { |arg|
+              expr( arg, [n], cont )
+            }
             Functions.context = cont
             res << Functions.send( func_name, *args )
-          end
+          }
           return res
 
-        else
-          raise "[BUG] Unexpected path: <#{op.inspect}>: <#{path_stack.inspect}>"
         end
       end # while
       return nodeset
-    # ensure
-    #   leave(:expr, path_stack, nodeset)
     end
 
-    def step(path_stack, any_type: :element, order: :forward)
-      nodesets = yield
-      begin
-        # enter(:step, path_stack, nodesets)
-        nodesets = node_test(path_stack, nodesets, any_type: any_type)
-        while path_stack[0] == :predicate
-          path_stack.shift # :predicate
-          predicate_expression = path_stack.shift.dclone
-          nodesets = evaluate_predicate(predicate_expression, nodesets)
-        end
-        if nodesets.size == 1
-          ordered_nodeset = nodesets[0]
-        else
-          raw_nodes = []
-          nodesets.each do |nodeset|
-            nodeset.each do |node|
-              if node.respond_to?(:raw_node)
-                raw_nodes << node.raw_node
-              else
-                raw_nodes << node
-              end
-            end
-          end
-          ordered_nodeset = sort(raw_nodes, order)
-        end
-        new_nodeset = []
-        ordered_nodeset.each do |node|
-          # TODO: Remove duplicated
-          new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
-        end
-        new_nodeset
-      # ensure
-      #   leave(:step, path_stack, new_nodeset)
-      end
-    end
 
-    def node_test(path_stack, nodesets, any_type: :element)
-      # enter(:node_test, path_stack, nodesets)
-      operator = path_stack.shift
-      case operator
-      when :qname
-        prefix = path_stack.shift
-        name = path_stack.shift
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            case raw_node.node_type
-            when :element
-              if prefix.nil?
-                raw_node.name == name
-              elsif prefix.empty?
-                if strict?
-                  raw_node.name == name and raw_node.namespace == ""
-                else
-                  # FIXME: This DOUBLES the time XPath searches take
-                  ns = get_namespace(raw_node, prefix)
-                  raw_node.name == name and raw_node.namespace == ns
-                end
-              else
-                # FIXME: This DOUBLES the time XPath searches take
-                ns = get_namespace(raw_node, prefix)
-                raw_node.name == name and raw_node.namespace == ns
-              end
-            when :attribute
-              if prefix.nil?
-                raw_node.name == name
-              elsif prefix.empty?
-                # FIXME: This DOUBLES the time XPath searches take
-                raw_node.name == name and
-                  raw_node.namespace == raw_node.element.namespace
-              else
-                # FIXME: This DOUBLES the time XPath searches take
-                ns = get_namespace(raw_node.element, prefix)
-                raw_node.name == name and raw_node.namespace == ns
-              end
-            else
-              false
-            end
-          end
-        end
-      when :namespace
-        prefix = path_stack.shift
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            case raw_node.node_type
-            when :element
-              namespaces = @namespaces || raw_node.namespaces
-              raw_node.namespace == namespaces[prefix]
-            when :attribute
-              namespaces = @namespaces || raw_node.element.namespaces
-              raw_node.namespace == namespaces[prefix]
-            else
-              false
-            end
-          end
-        end
-      when :any
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            raw_node.node_type == any_type
-          end
-        end
-      when :comment
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            raw_node.node_type == :comment
-          end
-        end
-      when :text
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            raw_node.node_type == :text
-          end
-        end
-      when :processing_instruction
-        target = path_stack.shift
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            raw_node = node.raw_node
-            (raw_node.node_type == :processing_instruction) and
-              (target.empty? or (raw_node.target == target))
-          end
-        end
-      when :node
-        new_nodesets = nodesets.collect do |nodeset|
-          filter_nodeset(nodeset) do |node|
-            true
-          end
-        end
-      else
-        message = "[BUG] Unexpected node test: " +
-          "<#{operator.inspect}>: <#{path_stack.inspect}>"
-        raise message
-      end
-      new_nodesets
-    # ensure
-    #   leave(:node_test, path_stack, new_nodesets)
-    end
+    ##########################################################
+    # FIXME
+    # The next two methods are BAD MOJO!
+    # This is my achilles heel.  If anybody thinks of a better
+    # way of doing this, be my guest.  This really sucks, but
+    # it is a wonder it works at all.
+    # ########################################################
 
-    def filter_nodeset(nodeset)
-      new_nodeset = []
-      nodeset.each do |node|
-        next unless yield(node)
-        new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
-      end
-      new_nodeset
+    def descendant_or_self( path_stack, nodeset )
+      rs = []
+      d_o_s( path_stack, nodeset, rs )
+      document_order(rs.flatten.compact)
+      #rs.flatten.compact
     end
 
-    def evaluate_predicate(expression, nodesets)
-      # enter(:predicate, expression, nodesets)
-      new_nodesets = nodesets.collect do |nodeset|
-        new_nodeset = []
-        subcontext = { :size => nodeset.size }
-        nodeset.each_with_index do |node, index|
-          if node.is_a?(XPathNode)
-            subcontext[:node] = node.raw_node
-            subcontext[:index] = node.position
-          else
-            subcontext[:node] = node
-            subcontext[:index] = index + 1
-          end
-          result = expr(expression.dclone, [node], subcontext)
-          # trace(:predicate_evaluate, expression, node, subcontext, result)
-          result = result[0] if result.kind_of? Array and result.length == 1
-          if result.kind_of? Numeric
-            if result == node.position
-              new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
-            end
-          elsif result.instance_of? Array
-            if result.size > 0 and result.inject(false) {|k,s| s or k}
-              if result.size > 0
-                new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
-              end
-            end
-          else
-            if result
-              new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
-            end
-          end
-        end
-        new_nodeset
+    def d_o_s( p, ns, r )
+      nt = nil
+      ns.each_index do |i|
+        n = ns[i]
+        x = expr( p.dclone, [ n ] )
+        nt = n.node_type
+        d_o_s( p, n.children, x ) if nt == :element or nt == :document and n.children.size > 0
+        r.concat(x) if x.size > 0
       end
-      new_nodesets
-    # ensure
-    #   leave(:predicate, new_nodesets)
-    end
-
-    def trace(*args)
-      indent = "  " * @nest
-      puts("#{indent}#{args.inspect}")
     end
 
-    def enter(tag, *args)
-      trace(:enter, tag, *args)
-      @nest += 1
-    end
-
-    def leave(tag, *args)
-      @nest -= 1
-      trace(:leave, tag, *args)
-    end
 
     # Reorders an array of nodes so that they are in document order
     # It tries to do this efficiently.
@@ -640,7 +494,7 @@ module REXML
     # in and out of function calls.  If I knew what the index of the nodes was,
     # I wouldn't have to do this.  Maybe add a document IDX for each node?
     # Problems with mutable documents.  Or, rewrite everything.
-    def sort(array_of_nodes, order)
+    def document_order( array_of_nodes )
       new_arry = []
       array_of_nodes.each { |node|
         node_idx = []
@@ -651,68 +505,42 @@ module REXML
         end
         new_arry << [ node_idx.reverse, node ]
       }
-      ordered = new_arry.sort_by do |index, node|
-        if order == :forward
-          index
-        else
-          -index
-        end
-      end
-      ordered.collect do |_index, node|
-        node
-      end
+      new_arry.sort{ |s1, s2| s1[0] <=> s2[0] }.collect{ |s| s[1] }
     end
 
-    def descendant(nodeset, include_self)
-      nodesets = []
-      nodeset.each do |node|
-        new_nodeset = []
-        new_nodes = {}
-        descendant_recursive(node.raw_node, new_nodeset, new_nodes, include_self)
-        nodesets << new_nodeset unless new_nodeset.empty?
+
+    def recurse( nodeset, &block )
+      for node in nodeset
+        yield node
+        recurse( node, &block ) if node.node_type == :element
       end
-      nodesets
     end
 
-    def descendant_recursive(raw_node, new_nodeset, new_nodes, include_self)
-      if include_self
-        return if new_nodes.key?(raw_node)
-        new_nodeset << XPathNode.new(raw_node, position: new_nodeset.size + 1)
-        new_nodes[raw_node] = true
-      end
 
-      node_type = raw_node.node_type
-      if node_type == :element or node_type == :document
-        raw_node.children.each do |child|
-          descendant_recursive(child, new_nodeset, new_nodes, true)
-        end
-      end
-    end
 
     # Builds a nodeset of all of the preceding nodes of the supplied node,
     # in reverse document order
     # preceding:: includes every element in the document that precedes this node,
     # except for ancestors
-    def preceding(node)
+    def preceding( node )
       ancestors = []
-      parent = node.parent
-      while parent
-        ancestors << parent
-        parent = parent.parent
+      p = node.parent
+      while p
+        ancestors << p
+        p = p.parent
       end
 
-      precedings = []
-      preceding_node = preceding_node_of(node)
-      while preceding_node
-        if ancestors.include?(preceding_node)
-          ancestors.delete(preceding_node)
+      acc = []
+      p = preceding_node_of( node )
+      while p
+        if ancestors.include? p
+          ancestors.delete(p)
         else
-          precedings << XPathNode.new(preceding_node,
-                                      position: precedings.size + 1)
+          acc << p
         end
-        preceding_node = preceding_node_of(preceding_node)
+        p = preceding_node_of( p )
       end
-      precedings
+      acc
     end
 
     def preceding_node_of( node )
@@ -730,15 +558,14 @@ module REXML
       psn
     end
 
-    def following(node)
-      followings = []
-      following_node = next_sibling_node(node)
-      while following_node
-        followings << XPathNode.new(following_node,
-                                    position: followings.size + 1)
-        following_node = following_node_of(following_node)
+    def following( node )
+      acc = []
+      p = next_sibling_node( node )
+      while p
+        acc << p
+        p = following_node_of( p )
       end
-      followings
+      acc
     end
 
     def following_node_of( node )
@@ -760,40 +587,13 @@ module REXML
       return psn
     end
 
-    def child(nodeset)
-      nodesets = []
-      nodeset.each do |node|
-        raw_node = node.raw_node
-        node_type = raw_node.node_type
-        # trace(:child, node_type, node)
-        case node_type
-        when :element
-          nodesets << raw_node.children.collect.with_index do |child_node, i|
-            XPathNode.new(child_node, position: i + 1)
-          end
-        when :document
-          new_nodeset = []
-          raw_node.children.each do |child|
-            case child
-            when XMLDecl, Text
-              # Ignore
-            else
-              new_nodeset << XPathNode.new(child, position: new_nodeset.size + 1)
-            end
-          end
-          nodesets << new_nodeset unless new_nodeset.empty?
-        end
-      end
-      nodesets
-    end
-
     def norm b
       case b
       when true, false
         return b
       when 'true', 'false'
         return Functions::boolean( b )
-      when /^\d+(\.\d+)?$/, Numeric
+      when /^\d+(\.\d+)?$/
         return Functions::number( b )
       else
         return Functions::string( b )
@@ -801,10 +601,11 @@ module REXML
     end
 
     def equality_relational_compare( set1, op, set2 )
-      set1 = unnode(set1) if set1.is_a?(Array)
-      set2 = unnode(set2) if set2.is_a?(Array)
       if set1.kind_of? Array and set2.kind_of? Array
-        if set1.size == 0 or set2.size == 0
+        if set1.size == 1 and set2.size == 1
+          set1 = set1[0]
+          set2 = set2[0]
+        elsif set1.size == 0 or set2.size == 0
           nd = set1.size==0 ? set2 : set1
           rv = nd.collect { |il| compare( il, op, nil ) }
           return rv
@@ -835,15 +636,15 @@ module REXML
 
         case b
         when true, false
-          return unnode(a) {|v| compare( Functions::boolean(v), op, b ) }
+          return a.collect {|v| compare( Functions::boolean(v), op, b ) }
         when Numeric
-          return unnode(a) {|v| compare( Functions::number(v), op, b )}
+          return a.collect {|v| compare( Functions::number(v), op, b )}
         when /^\d+(\.\d+)?$/
           b = Functions::number( b )
-          return unnode(a) {|v| compare( Functions::number(v), op, b )}
+          return a.collect {|v| compare( Functions::number(v), op, b )}
         else
           b = Functions::string( b )
-          return unnode(a) { |v| compare( Functions::string(v), op, b ) }
+          return a.collect { |v| compare( Functions::string(v), op, b ) }
         end
       else
         # If neither is nodeset,
@@ -853,10 +654,8 @@ module REXML
         #     Else, convert to string
         #   Else
         #     Convert both to numbers and compare
-        set1 = unnode(set1) if set1.is_a?(Array)
-        set2 = unnode(set2) if set2.is_a?(Array)
-        s1 = Functions.string(set1)
-        s2 = Functions.string(set2)
+        s1 = set1.to_s
+        s2 = set2.to_s
         if s1 == 'true' or s1 == 'false' or s2 == 'true' or s2 == 'false'
           set1 = Functions::boolean( set1 )
           set2 = Functions::boolean( set2 )
@@ -901,34 +700,5 @@ module REXML
         false
       end
     end
-
-    def unnode(nodeset)
-      nodeset.collect do |node|
-        if node.is_a?(XPathNode)
-          unnoded = node.raw_node
-        else
-          unnoded = node
-        end
-        unnoded = yield(unnoded) if block_given?
-        unnoded
-      end
-    end
-  end
-
-  # @private
-  class XPathNode
-    attr_reader :raw_node, :context
-    def initialize(node, context=nil)
-      if node.is_a?(XPathNode)
-        @raw_node = node.raw_node
-      else
-        @raw_node = node
-      end
-      @context = context || {}
-    end
-
-    def position
-      @context[:position]
-    end
   end
 end
diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
index e762286d3b..36c3503aa8 100644
--- a/lib/rinda/rinda.rb
+++ b/lib/rinda/rinda.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 require 'drb/drb'
+require 'thread'
 
 ##
 # A module to implement the Linda distributed computing paradigm in Ruby.
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 948cfaf208..9b3f13eb93 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -3,7 +3,8 @@
 # Note: Rinda::Ring API is unstable.
 #
 require 'drb/drb'
-require_relative 'rinda'
+require 'rinda/rinda'
+require 'thread'
 require 'ipaddr'
 
 module Rinda
@@ -134,6 +135,7 @@ module Rinda
 
       socket = Socket.new(addrinfo.pfamily, addrinfo.socktype,
                           addrinfo.protocol)
+      @sockets << socket
 
       if addrinfo.ipv4_multicast? or addrinfo.ipv6_multicast? then
         if Socket.const_defined?(:SO_REUSEPORT) then
@@ -164,11 +166,6 @@ module Rinda
       end
 
       socket
-    rescue
-      socket = socket.close if socket
-      raise
-    ensure
-      @sockets << socket if socket
     end
 
     ##
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
index 6a41a7ba75..3ce8d2984f 100644
--- a/lib/rinda/tuplespace.rb
+++ b/lib/rinda/tuplespace.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: false
 require 'monitor'
+require 'thread'
 require 'drb/drb'
-require_relative 'rinda'
+require 'rinda/rinda'
 require 'forwardable'
 
 module Rinda
diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb
index 219ccefcdb..d852a6a85e 100644
--- a/lib/rss/0.9.rb
+++ b/lib/rss/0.9.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "parser"
+require "rss/parser"
 
 module RSS
 
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index c8f92fb54e..fb63937c5e 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "parser"
+require "rss/parser"
 
 module RSS
 
diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb
index 48c27330d0..a232e358be 100644
--- a/lib/rss/atom.rb
+++ b/lib/rss/atom.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative 'parser'
+require 'rss/parser'
 
 module RSS
   ##
@@ -37,12 +37,10 @@ module RSS
         end
         klass.class_eval do
           class << self
-            # Returns the Atom URI W3C Namespace
             def required_uri
               URI
             end
 
-            # Returns true
             def need_parent?
               true
             end
@@ -94,11 +92,9 @@ module RSS
     end
 
     # The TextConstruct module is used to define a Text construct Atom element,
-    # which is used to store small quantities of human-readable text.
+    # which is used to store small quantities of human-readable text
     #
     # The TextConstruct has a type attribute, e.g. text, html, xhtml
-    #
-    # Reference: https://validator.w3.org/feed/docs/rfc4287.html#text.constructs
     module TextConstruct
       def self.append_features(klass)
         super
@@ -126,7 +122,6 @@ module RSS
 
       attr_writer :xhtml
 
-      # Returns or builds the XHTML content.
       def xhtml
         return @xhtml if @xhtml.nil?
         if @xhtml.is_a?(XML::Element) and
@@ -140,13 +135,11 @@ module RSS
                          {"xmlns" => XHTML_URI}, children)
       end
 
-      # Returns true if type is "xhtml".
+      # Returns true if type is "xhtml"
       def have_xml_content?
         @type == "xhtml"
       end
 
-      # Raises a MissingTagError or NotExpectedTagError
-      # if the element is not properly formatted.
       def atom_validate(ignore_unknown_element, tags, uri)
         if have_xml_content?
           if @xhtml.nil?
@@ -170,12 +163,10 @@ module RSS
       end
     end
 
-    # The PersonConstruct module is used to define a person Atom element that can be
-    # used to describe a person, corporation or similar entity.
-    #
-    # The PersonConstruct has a Name, Uri and Email child elements.
+    # The PersonConstruct module is used to define a Person Atom element that can be
+    # used to describe a person, corporation, or similar entity
     #
-    # Reference: https://validator.w3.org/feed/docs/rfc4287.html#atomPersonConstruct
+    # The PersonConstruct has a Name, Uri, and Email child elements
     module PersonConstruct
 
       # Adds attributes for name, uri, and email to the +klass+
@@ -196,25 +187,19 @@ module RSS
         target.__send__("new_#{self.class.name.split(/::/).last.downcase}")
       end
 
-      # The name of the person or entity.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.name
+      # The name of the person or entity
       class Name < RSS::Element
         include CommonModel
         include ContentModel
       end
 
-      # The URI of the person or entity.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.uri
+      # The URI of the person or entity
       class Uri < RSS::Element
         include CommonModel
         include URIContentModel
       end
 
-      # The email of the person or entity.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.email
+      # The email of the person or entity
       class Email < RSS::Element
         include CommonModel
         include ContentModel
@@ -260,28 +245,9 @@ module RSS
       end
     end
 
-    # Defines the top-level element of an Atom Feed Document.
-    # It consists of a number of children Entry elements,
-    # and has the following attributes:
+    # Atom feed element
     #
-    # * author
-    # * categories
-    # * category
-    # * content
-    # * contributor
-    # * entries (aliased as items)
-    # * entry
-    # * generator
-    # * icon
-    # * id
-    # * link
-    # * logo
-    # * rights
-    # * subtitle
-    # * title
-    # * updated
-    #
-    # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.feed
+    # A Feed has several metadata attributes in addition to a number of Entry child elements
     class Feed < RSS::Element
       include RootElementMixin
       include CommonModel
@@ -356,23 +322,11 @@ module RSS
         end
       end
 
-      # PersonConstruct that contains information regarding the author
-      # of a Feed or Entry.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.author
       class Author < RSS::Element
         include CommonModel
         include PersonConstruct
       end
 
-      # Contains information about a category associated with a Feed or Entry.
-      # It has the following attributes:
-      #
-      # * term
-      # * scheme
-      # * label
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.category
       class Category < RSS::Element
         include CommonModel
 
@@ -390,18 +344,11 @@ module RSS
         end
       end
 
-      # PersonConstruct that contains information regarding the
-      # contributors of a Feed or Entry.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.contributor
       class Contributor < RSS::Element
         include CommonModel
         include PersonConstruct
       end
 
-      # Contains information on the agent used to generate the feed.
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.generator
       class Generator < RSS::Element
         include CommonModel
         include ContentModel
@@ -422,34 +369,32 @@ module RSS
         end
       end
 
-      # Defines an image that provides a visual identification for a eed.
-      # The image should have an aspect ratio of 1:1.
+      # Atom Icon element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.icon
+      # Image that provides a visual identification for the Feed.  Image should have an aspect
+      # ratio of 1:1
       class Icon < RSS::Element
         include CommonModel
         include URIContentModel
       end
 
-      # Defines the Universally Unique Identifier (UUID) for a Feed or Entry.
+      # Atom ID element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.id
+      # Universally Unique Identifier (UUID) for the Feed
       class Id < RSS::Element
         include CommonModel
         include URIContentModel
       end
 
-      # Defines a reference to a Web resource. It has the following
-      # attributes:
+      # Defines an Atom Link element
       #
+      # A Link has the following attributes:
       # * href
       # * rel
       # * type
       # * hreflang
       # * title
       # * length
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.link
       class Link < RSS::Element
         include CommonModel
 
@@ -470,10 +415,10 @@ module RSS
         end
       end
 
-      # Defines an image that provides a visual identification for the Feed.
-      # The image should have an aspect ratio of 2:1 (horizontal:vertical).
+      # Atom Logo element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.logo
+      # Image that provides a visual identification for the Feed.  Image should have an aspect
+      # ratio of 2:1 (horizontal:vertical)
       class Logo < RSS::Element
         include CommonModel
         include URIContentModel
@@ -488,60 +433,40 @@ module RSS
         end
       end
 
-      # TextConstruct that contains copyright information regarding
-      # the content in an Entry or Feed. It should not be used to
-      # convey machine readable licensing information.
+      # Atom Rights element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.rights
+      # TextConstruct that contains copyright information regarding the content in an Entry or Feed
       class Rights < RSS::Element
         include CommonModel
         include TextConstruct
       end
 
-      # TextConstruct that conveys a description or subtitle for a Feed.
+      # Atom Subtitle element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.subtitle
+      # TextConstruct that conveys a description or subtitle for a Feed
       class Subtitle < RSS::Element
         include CommonModel
         include TextConstruct
       end
 
-      # TextConstruct that conveys a description or title for a Feed or Entry.
+      # Atom Title element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.title
+      # TextConstruct that conveys a description or title for a feed or Entry
       class Title < RSS::Element
         include CommonModel
         include TextConstruct
       end
 
-      # DateConstruct indicating the most recent time when a Feed or
-      # Entry was modified in a way the publisher considers
-      # significant.
+      # Atom Updated element
       #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.updated
+      # DateConstruct indicating the most recent time when an Entry or Feed was modified
+      # in a way the publisher considers significant
       class Updated < RSS::Element
         include CommonModel
         include DateConstruct
       end
 
-      # Defines a child Atom Entry element of an Atom Feed element.
-      # It has the following attributes:
-      #
-      # * author
-      # * category
-      # * categories
-      # * content
-      # * contributor
-      # * id
-      # * link
-      # * published
-      # * rights
-      # * source
-      # * summary
-      # * title
-      # * updated
-      #
-      # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.entry
+      # Defines a child Atom Entry element for an Atom Feed
       class Entry < RSS::Element
         include CommonModel
         include DuplicateLinkChecker
@@ -565,11 +490,9 @@ module RSS
                    tag, URI, occurs, tag, *args)
         end
 
-        # Returns whether any of the following are true:
-        #
+        # Returns whether any of the following are true
         # * There are any authors in the feed
-        # * If the parent element has an author and the +check_parent+
-        #   parameter was given.
+        # * If the parent element has an author and the +check_parent+ parameter was given.
         # * There is a source element that has an author
         def have_author?(check_parent=true)
           authors.any? {|author| !author.to_s.empty?} or
@@ -597,18 +520,9 @@ module RSS
           items.new_item
         end
 
-        # Feed::Author
         Author = Feed::Author
-        # Feed::Category
         Category = Feed::Category
 
-        # Contains or links to the content of the Entry.
-        # It has the following attributes:
-        #
-        # * type
-        # * src
-        #
-        # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.content
         class Content < RSS::Element
           include CommonModel
 
@@ -632,15 +546,11 @@ module RSS
           content_setup
           add_need_initialize_variable("xml")
 
-          # Returns the element content in XML.
           attr_writer :xml
-
-          # Returns true if the element has inline XML content.
           def have_xml_content?
             inline_xhtml? or inline_other_xml?
           end
 
-          # Returns or builds the element content in XML.
           def xml
             return @xml unless inline_xhtml?
             return @xml if @xml.nil?
@@ -655,7 +565,6 @@ module RSS
                              {"xmlns" => XHTML_URI}, children)
           end
 
-          # Returns the element content in XHTML.
           def xhtml
             if inline_xhtml?
               xml
@@ -664,9 +573,6 @@ module RSS
             end
           end
 
-          # Raises a MissingAttributeError, NotAvailableValueError,
-          # MissingTagError or NotExpectedTagError if the element is
-          # not properly formatted.
           def atom_validate(ignore_unknown_element, tags, uri)
             if out_of_line?
               raise MissingAttributeError.new(tag_name, "type") if @type.nil?
@@ -683,27 +589,19 @@ module RSS
             end
           end
 
-          # Returns true if the element contains inline content
-          # that has a text or HTML media type, or no media type at all.
           def inline_text?
             !out_of_line? and [nil, "text", "html"].include?(@type)
           end
 
-          # Returns true if the element contains inline content that
-          # has a HTML media type.
           def inline_html?
             return false if out_of_line?
             @type == "html" or mime_split == ["text", "html"]
           end
 
-          # Returns true if the element contains inline content that
-          # has a XHTML media type.
           def inline_xhtml?
             !out_of_line? and @type == "xhtml"
           end
 
-          # Returns true if the element contains inline content that
-          # has a MIME media type.
           def inline_other?
             return false if out_of_line?
             media_type, subtype = mime_split
@@ -711,8 +609,6 @@ module RSS
             true
           end
 
-          # Returns true if the element contains inline content that
-          # has a text media type.
           def inline_other_text?
             return false unless inline_other?
             return false if inline_other_xml?
@@ -722,8 +618,6 @@ module RSS
             false
           end
 
-          # Returns true if the element contains inline content that
-          # has a XML media type.
           def inline_other_xml?
             return false unless inline_other?
 
@@ -738,18 +632,14 @@ module RSS
             false
           end
 
-          # Returns true if the element contains inline content
-          # encoded in base64.
           def inline_other_base64?
             inline_other? and !inline_other_text? and !inline_other_xml?
           end
 
-          # Returns true if the element contains linked content.
           def out_of_line?
             not @src.nil?
           end
 
-          # Splits the type attribute into an array, e.g. ["text", "xml"]
           def mime_split
             media_type = subtype = nil
             if /\A\s*([a-z]+)\/([a-z\+]+)\s*(?:;.*)?\z/i =~ @type.to_s
@@ -759,7 +649,6 @@ module RSS
             [media_type, subtype]
           end
 
-          # Returns true if the content needs to be encoded in base64.
           def need_base64_encode?
             inline_other_base64?
           end
@@ -770,43 +659,17 @@ module RSS
           end
         end
 
-        # Feed::Contributor
         Contributor = Feed::Contributor
-        # Feed::Id
         Id = Feed::Id
-        # Feed::Link
         Link = Feed::Link
 
-        # DateConstruct that usually indicates the time of the initial
-        # creation of an Entry.
-        #
-        # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.published
         class Published < RSS::Element
           include CommonModel
           include DateConstruct
         end
 
-        # Feed::Rights
         Rights = Feed::Rights
 
-        # Defines a Atom Source element. It has the following attributes:
-        #
-        # * author
-        # * category
-        # * categories
-        # * content
-        # * contributor
-        # * generator
-        # * icon
-        # * id
-        # * link
-        # * logo
-        # * rights
-        # * subtitle
-        # * title
-        # * updated
-        #
-        # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.source
         class Source < RSS::Element
           include CommonModel
 
@@ -829,71 +692,36 @@ module RSS
                      tag, URI, occurs, tag, *args)
           end
 
-          # Returns true if the Source element has an author.
           def have_author?
             !author.to_s.empty?
           end
 
-          # Feed::Author
           Author = Feed::Author
-          # Feed::Category
           Category = Feed::Category
-          # Feed::Contributor
           Contributor = Feed::Contributor
-          # Feed::Generator
           Generator = Feed::Generator
-          # Feed::Icon
           Icon = Feed::Icon
-          # Feed::Id
           Id = Feed::Id
-          # Feed::Link
           Link = Feed::Link
-          # Feed::Logo
           Logo = Feed::Logo
-          # Feed::Rights
           Rights = Feed::Rights
-          # Feed::Subtitle
           Subtitle = Feed::Subtitle
-          # Feed::Title
           Title = Feed::Title
-          # Feed::Updated
           Updated = Feed::Updated
         end
 
-        # TextConstruct that describes a summary of the Entry.
-        #
-        # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.summary
         class Summary < RSS::Element
           include CommonModel
           include TextConstruct
         end
 
-        # Feed::Title
         Title = Feed::Title
-        # Feed::Updated
         Updated = Feed::Updated
       end
     end
 
-    # Defines a top-level Atom Entry element,
-    # used as the document element of a stand-alone Atom Entry Document.
-    # It has the following attributes:
-    #
-    # * author
-    # * category
-    # * categories
-    # * content
-    # * contributor
-    # * id
-    # * link
-    # * published
-    # * rights
-    # * source
-    # * summary
-    # * title
-    # * updated
+    # Defines a top-level Atom Entry element
     #
-    # Reference: https://validator.w3.org/feed/docs/rfc4287.html#element.entry]
     class Entry < RSS::Element
       include RootElementMixin
       include CommonModel
@@ -918,26 +746,25 @@ module RSS
                  tag, URI, occurs, tag, *args)
       end
 
-      # Creates a new Atom Entry element.
+      # Creates a new Atom Entry element
       def initialize(version=nil, encoding=nil, standalone=nil)
         super("1.0", version, encoding, standalone)
         @feed_type = "atom"
         @feed_subtype = "entry"
       end
 
-      # Returns the Entry in an array.
+      # Returns the Entry in an array
       def items
         [self]
       end
 
-      # Sets up the +maker+ for constructing Entry elements.
+      # sets up the +maker+ for constructing Entry elements
       def setup_maker(maker)
         maker = maker.maker if maker.respond_to?("maker")
         super(maker)
       end
 
-      # Returns where there are any authors present or there is a
-      # source with an author.
+      # Returns where there are any authors present or there is a source with an author
       def have_author?
         authors.any? {|author| !author.to_s.empty?} or
           (source and source.have_author?)
@@ -959,29 +786,17 @@ module RSS
         maker.items.new_item
       end
 
-      # Feed::Entry::Author
       Author = Feed::Entry::Author
-      # Feed::Entry::Category
       Category = Feed::Entry::Category
-      # Feed::Entry::Content
       Content = Feed::Entry::Content
-      # Feed::Entry::Contributor
       Contributor = Feed::Entry::Contributor
-      # Feed::Entry::Id
       Id = Feed::Entry::Id
-      # Feed::Entry::Link
       Link = Feed::Entry::Link
-      # Feed::Entry::Published
       Published = Feed::Entry::Published
-      # Feed::Entry::Rights
       Rights = Feed::Entry::Rights
-      # Feed::Entry::Source
       Source = Feed::Entry::Source
-      # Feed::Entry::Summary
       Summary = Feed::Entry::Summary
-      # Feed::Entry::Title
       Title = Feed::Entry::Title
-      # Feed::Entry::Updated
       Updated = Feed::Entry::Updated
     end
   end
diff --git a/lib/rss/content.rb b/lib/rss/content.rb
index 78c18d103c..d35311075a 100644
--- a/lib/rss/content.rb
+++ b/lib/rss/content.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "rss"
+require "rss/rss"
 
 module RSS
   # The prefix for the Content XML namespace.
diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb
index d372e06725..b92e35a051 100644
--- a/lib/rss/converter.rb
+++ b/lib/rss/converter.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "utils"
+require "rss/utils"
 
 module RSS
 
diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
index 85b836d3bf..8d1a551947 100644
--- a/lib/rss/dublincore.rb
+++ b/lib/rss/dublincore.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "rss"
+require "rss/rss"
 
 module RSS
   # The prefix for the Dublin Core XML namespace.
@@ -161,4 +161,4 @@ end
 
 require 'rss/dublincore/1.0'
 require 'rss/dublincore/2.0'
-require_relative 'dublincore/atom'
+require 'rss/dublincore/atom'
diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb
index 1cfcdec677..0b8b11e440 100644
--- a/lib/rss/dublincore/atom.rb
+++ b/lib/rss/dublincore/atom.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "../atom"
+require "rss/atom"
 
 module RSS
   module Atom
diff --git a/lib/rss/image.rb b/lib/rss/image.rb
index 837f7d18f4..6b86ec0e5b 100644
--- a/lib/rss/image.rb
+++ b/lib/rss/image.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'rss/1.0'
-require_relative 'dublincore'
+require 'rss/dublincore'
 
 module RSS
 
diff --git a/lib/rss/itunes.rb b/lib/rss/itunes.rb
index 987b090f21..827970c209 100644
--- a/lib/rss/itunes.rb
+++ b/lib/rss/itunes.rb
@@ -51,7 +51,7 @@ module RSS
 
     ELEMENT_INFOS = [["author"],
                      ["block", :yes_other],
-                     ["explicit", :explicit_clean_other],
+                     ["explicit", :yes_clean_other],
                      ["keywords", :csv],
                      ["subtitle"],
                      ["summary"]]
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
index e32de81806..33d285f6af 100644
--- a/lib/rss/maker.rb
+++ b/lib/rss/maker.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "rss"
+require "rss/rss"
 
 module RSS
   ##
@@ -65,15 +65,15 @@ module RSS
   end
 end
 
-require_relative "maker/1.0"
-require_relative "maker/2.0"
-require_relative "maker/feed"
-require_relative "maker/entry"
-require_relative "maker/content"
-require_relative "maker/dublincore"
-require_relative "maker/slash"
-require_relative "maker/syndication"
-require_relative "maker/taxonomy"
-require_relative "maker/trackback"
-require_relative "maker/image"
-require_relative "maker/itunes"
+require "rss/maker/1.0"
+require "rss/maker/2.0"
+require "rss/maker/feed"
+require "rss/maker/entry"
+require "rss/maker/content"
+require "rss/maker/dublincore"
+require "rss/maker/slash"
+require "rss/maker/syndication"
+require "rss/maker/taxonomy"
+require "rss/maker/trackback"
+require "rss/maker/image"
+require "rss/maker/itunes"
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
index 7f961b392e..622a4c30b4 100644
--- a/lib/rss/maker/0.9.rb
+++ b/lib/rss/maker/0.9.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative "../0.9"
+require "rss/0.9"
 
-require_relative "base"
+require "rss/maker/base"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 3934f9536c..3aee77e913 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative "../1.0"
+require "rss/1.0"
 
-require_relative "base"
+require "rss/maker/base"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb
index 43d00226b7..1f77a014d1 100644
--- a/lib/rss/maker/2.0.rb
+++ b/lib/rss/maker/2.0.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative "../2.0"
+require "rss/2.0"
 
-require_relative "0.9"
+require "rss/maker/0.9"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/atom.rb b/lib/rss/maker/atom.rb
index cdd1d8753e..e0cd7623c8 100644
--- a/lib/rss/maker/atom.rb
+++ b/lib/rss/maker/atom.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative "../atom"
+require "rss/atom"
 
-require_relative "base"
+require "rss/maker/base"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
index 17537b7006..bc4ca84141 100644
--- a/lib/rss/maker/base.rb
+++ b/lib/rss/maker/base.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'forwardable'
 
-require_relative '../rss'
+require 'rss/rss'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/content.rb b/lib/rss/maker/content.rb
index b3f4e5036e..3559a45ad0 100644
--- a/lib/rss/maker/content.rb
+++ b/lib/rss/maker/content.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative '../content'
-require_relative '1.0'
-require_relative '2.0'
+require 'rss/content'
+require 'rss/maker/1.0'
+require 'rss/maker/2.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index beea3134b4..988209c045 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../dublincore'
-require_relative '1.0'
+require 'rss/dublincore'
+require 'rss/maker/1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
index ccdf9608ae..f806cbcaae 100644
--- a/lib/rss/maker/entry.rb
+++ b/lib/rss/maker/entry.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative "atom"
-require_relative "feed"
+require "rss/maker/atom"
+require "rss/maker/feed"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb
index 72ee704d6a..fdef7ad643 100644
--- a/lib/rss/maker/feed.rb
+++ b/lib/rss/maker/feed.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "atom"
+require "rss/maker/atom"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index e3e62d8b9e..1957ba8689 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative '../image'
-require_relative '1.0'
-require_relative 'dublincore'
+require 'rss/image'
+require 'rss/maker/1.0'
+require 'rss/maker/dublincore'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb
index 28cca32021..cc1051ae0c 100644
--- a/lib/rss/maker/itunes.rb
+++ b/lib/rss/maker/itunes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../itunes'
-require_relative '2.0'
+require 'rss/itunes'
+require 'rss/maker/2.0'
 
 module RSS
   module Maker
@@ -13,8 +13,8 @@ module RSS
           klass.def_other_element(full_name)
         when :yes_other
           def_yes_other_accessor(klass, full_name)
-        when :explicit_clean_other
-          def_explicit_clean_other_accessor(klass, full_name)
+        when :yes_clean_other
+          def_yes_clean_other_accessor(klass, full_name)
         when :csv
           def_csv_accessor(klass, full_name)
         when :element, :attribute
@@ -43,11 +43,11 @@ module RSS
         EOC
       end
 
-      def def_explicit_clean_other_accessor(klass, full_name)
+      def def_yes_clean_other_accessor(klass, full_name)
         klass.def_other_element(full_name)
         klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           def #{full_name}?
-            Utils::ExplicitCleanOther.parse(#{full_name})
+            Utils::YesCleanOther.parse(#{full_name})
           end
         EOC
       end
diff --git a/lib/rss/maker/slash.rb b/lib/rss/maker/slash.rb
index 473991903f..3bd82d3057 100644
--- a/lib/rss/maker/slash.rb
+++ b/lib/rss/maker/slash.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../slash'
-require_relative '1.0'
+require 'rss/slash'
+require 'rss/maker/1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/syndication.rb b/lib/rss/maker/syndication.rb
index 9fd0efe99e..840b70229a 100644
--- a/lib/rss/maker/syndication.rb
+++ b/lib/rss/maker/syndication.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
-require_relative '../syndication'
-require_relative '1.0'
+require 'rss/syndication'
+require 'rss/maker/1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
index f9858922da..76a2d1600d 100644
--- a/lib/rss/maker/taxonomy.rb
+++ b/lib/rss/maker/taxonomy.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative '../taxonomy'
-require_relative '1.0'
-require_relative 'dublincore'
+require 'rss/taxonomy'
+require 'rss/maker/1.0'
+require 'rss/maker/dublincore'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb
index f78b4058f9..f97691c608 100644
--- a/lib/rss/maker/trackback.rb
+++ b/lib/rss/maker/trackback.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require_relative '../trackback'
-require_relative '1.0'
-require_relative '2.0'
+require 'rss/trackback'
+require 'rss/maker/1.0'
+require 'rss/maker/2.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 3a34d0adb4..a9842e6d40 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -2,8 +2,8 @@
 require "forwardable"
 require "open-uri"
 
-require_relative "rss"
-require_relative "xml"
+require "rss/rss"
+require "rss/xml"
 
 module RSS
 
@@ -72,31 +72,13 @@ module RSS
         end
       end
 
-      def parse(rss, *args)
-        if args.last.is_a?(Hash)
-          options = args.pop
-        else
-          options = {}
-        end
-        do_validate = boolean_argument(args[0], options[:validate], true)
-        ignore_unknown_element =
-          boolean_argument(args[1], options[:ignore_unknown_element], true)
-        parser_class = args[2] || options[:parser_class] || default_parser
+      def parse(rss, do_validate=true, ignore_unknown_element=true,
+                parser_class=default_parser)
         parser = new(rss, parser_class)
         parser.do_validate = do_validate
         parser.ignore_unknown_element = ignore_unknown_element
         parser.parse
       end
-
-      private
-      def boolean_argument(positioned_value, option_value, default)
-        value = positioned_value
-        if value.nil? and not option_value.nil?
-          value = option_value
-        end
-        value = default if value.nil?
-        value
-      end
     end
 
     def_delegators(:@parser, :parse, :rss,
diff --git a/lib/rss/rss.gemspec b/lib/rss/rss.gemspec
deleted file mode 100644
index 669c6c1ad4..0000000000
--- a/lib/rss/rss.gemspec
+++ /dev/null
@@ -1,38 +0,0 @@
-begin
-  require_relative "lib/rss"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "rss"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "rss"
-  spec.version       = RSS::VERSION
-  spec.authors       = ["Kouhei Sutou"]
-  spec.email         = ["kou@cozmixng.org"]
-
-  spec.summary       = %q{Family of libraries that support various formats of XML "feeds".}
-  spec.description   = %q{Family of libraries that support various formats of XML "feeds".}
-  spec.homepage      = "https://github.com/ruby/rss"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile",
-  "bin/console", "bin/setup", "lib/rss.rb", "lib/rss/0.9.rb", "lib/rss/1.0.rb", "lib/rss/2.0.rb",
-  "lib/rss/atom.rb", "lib/rss/content.rb", "lib/rss/content/1.0.rb", "lib/rss/content/2.0.rb",
-  "lib/rss/converter.rb", "lib/rss/dublincore.rb", "lib/rss/dublincore/1.0.rb", "lib/rss/dublincore/2.0.rb",
-  "lib/rss/dublincore/atom.rb", "lib/rss/image.rb", "lib/rss/itunes.rb", "lib/rss/maker.rb",
-  "lib/rss/maker/0.9.rb", "lib/rss/maker/1.0.rb", "lib/rss/maker/2.0.rb", "lib/rss/maker/atom.rb",
-  "lib/rss/maker/base.rb", "lib/rss/maker/content.rb", "lib/rss/maker/dublincore.rb", "lib/rss/maker/entry.rb",
-  "lib/rss/maker/feed.rb", "lib/rss/maker/image.rb", "lib/rss/maker/itunes.rb", "lib/rss/maker/slash.rb",
-  "lib/rss/maker/syndication.rb", "lib/rss/maker/taxonomy.rb", "lib/rss/maker/trackback.rb",
-  "lib/rss/parser.rb", "lib/rss/rexmlparser.rb", "lib/rss/rss.rb", "lib/rss/slash.rb", "lib/rss/syndication.rb",
-  "lib/rss/taxonomy.rb", "lib/rss/trackback.rb", "lib/rss/utils.rb", "lib/rss/xml-stylesheet.rb",
-  "lib/rss/xml.rb", "lib/rss/xmlparser.rb", "lib/rss/xmlscanner.rb", "rss.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/rss/rss.rb b/lib/rss/rss.rb
index daaf6793b9..5b9c5d4745 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -63,9 +63,9 @@ end
 
 
 require "English"
-require_relative "utils"
-require_relative "converter"
-require_relative "xml-stylesheet"
+require "rss/utils"
+require "rss/converter"
+require "rss/xml-stylesheet"
 
 module RSS
 
@@ -326,6 +326,7 @@ EOC
 
     def inherit_convert_attr_reader(*attrs)
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{attr}_without_inherit
           convert(@#{attr})
@@ -346,6 +347,7 @@ EOC
 
     def uri_convert_attr_reader(*attrs)
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{attr}_without_base
           convert(@#{attr})
@@ -366,6 +368,7 @@ EOC
 
     def convert_attr_reader(*attrs)
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{attr}
           convert(@#{attr})
@@ -374,12 +377,13 @@ EOC
       end
     end
 
-    def explicit_clean_other_attr_reader(*attrs)
+    def yes_clean_other_attr_reader(*attrs)
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           attr_reader(:#{attr})
           def #{attr}?
-            ExplicitCleanOther.parse(@#{attr})
+            YesCleanOther.parse(@#{attr})
           end
         EOC
       end
@@ -387,6 +391,7 @@ EOC
 
     def yes_other_attr_reader(*attrs)
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           attr_reader(:#{attr})
           def #{attr}?
@@ -404,6 +409,7 @@ EOC
       end
       separator ||= ", "
       attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           attr_reader(:#{attr})
           def #{attr}_content
@@ -544,7 +550,7 @@ EOC
 EOC
     end
 
-    def explicit_clean_other_writer(name, disp_name=name)
+    def yes_clean_other_writer(name, disp_name=name)
       module_eval(<<-EOC, __FILE__, __LINE__ + 1)
         def #{name}=(value)
           value = (value ? "yes" : "no") if [true, false].include?(value)
@@ -596,10 +602,11 @@ EOC
 
       def #{accessor_name}=(*args)
         receiver = self.class.name
-        warn("Don't use `\#{receiver}\##{accessor_name} = XXX'/" \
+        warn("Warning:\#{caller.first.sub(/:in `.*'\z/, '')}: " \
+             "Don't use `\#{receiver}\##{accessor_name} = XXX'/" \
              "`\#{receiver}\#set_#{accessor_name}(XXX)'. " \
              "Those APIs are not sense of Ruby. " \
-             "Use `\#{receiver}\##{plural_name} << XXX' instead of them.", uplevel: 1)
+             "Use `\#{receiver}\##{plural_name} << XXX' instead of them.")
         if args.size == 1
           @#{accessor_name}.push(args[0])
         else
@@ -762,8 +769,8 @@ EOC
           text_type_writer name, disp_name
         when :content
           content_writer name, disp_name
-        when :explicit_clean_other
-          explicit_clean_other_writer name, disp_name
+        when :yes_clean_other
+          yes_clean_other_writer name, disp_name
         when :yes_other
           yes_other_writer name, disp_name
         when :csv
@@ -781,8 +788,8 @@ EOC
           inherit_convert_attr_reader name
         when :uri
           uri_convert_attr_reader name
-        when :explicit_clean_other
-          explicit_clean_other_attr_reader name
+        when :yes_clean_other
+          yes_clean_other_attr_reader name
         when :yes_other
           yes_other_attr_reader name
         when :csv
@@ -956,7 +963,7 @@ EOC
             children = child
             children.any? {|c| c.have_required_elements?}
           else
-            not child.nil?
+            !child.to_s.empty?
           end
         else
           true
diff --git a/lib/rss/taxonomy.rb b/lib/rss/taxonomy.rb
index 50688ee6c1..b7ea219e8c 100644
--- a/lib/rss/taxonomy.rb
+++ b/lib/rss/taxonomy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require "rss/1.0"
-require_relative "dublincore"
+require "rss/dublincore"
 
 module RSS
   # The prefix for the Taxonomy XML namespace.
diff --git a/lib/rss/utils.rb b/lib/rss/utils.rb
index 9203df9a9b..ce7dbf1b02 100644
--- a/lib/rss/utils.rb
+++ b/lib/rss/utils.rb
@@ -125,16 +125,16 @@ module RSS
       [true, false].include?(args[0]) and args[1].is_a?(Hash)
     end
 
-    module ExplicitCleanOther
+    module YesCleanOther
       module_function
       def parse(value)
         if [true, false, nil].include?(value)
           value
         else
           case value.to_s
-          when /\Aexplicit|yes|true\z/i
+          when /\Ayes\z/i
             true
-          when /\Aclean|no|false\z/i
+          when /\Aclean\z/i
             false
           else
             nil
diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb
index 175c95fbcd..be9cfaaf64 100644
--- a/lib/rss/xml-stylesheet.rb
+++ b/lib/rss/xml-stylesheet.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "utils"
+require "rss/utils"
 
 module RSS
 
diff --git a/lib/rss/xml.rb b/lib/rss/xml.rb
index b74630295f..cda8668044 100644
--- a/lib/rss/xml.rb
+++ b/lib/rss/xml.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require_relative "utils"
+require "rss/utils"
 
 module RSS
   module XML
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 616887838c..ce9dc6a66a 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -7,9 +7,10 @@
 #++
 
 require 'rbconfig'
+require 'thread'
 
 module Gem
-  VERSION = "3.0.3".freeze
+  VERSION = '2.6.6'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -38,7 +39,7 @@ require 'rubygems/errors'
 # Further RubyGems documentation can be found at:
 #
 # * {RubyGems Guides}[http://guides.rubygems.org]
-# * {RubyGems API}[http://www.rubydoc.info/github/rubygems/rubygems] (also available from
+# * {RubyGems API}[http://rubygems.rubyforge.org/rdoc] (also available from
 #   <tt>gem server</tt>)
 #
 # == RubyGems Plugins
@@ -46,14 +47,15 @@ require 'rubygems/errors'
 # As of RubyGems 1.3.2, RubyGems will load plugins installed in gems or
 # $LOAD_PATH.  Plugins must be named 'rubygems_plugin' (.rb, .so, etc) and
 # placed at the root of your gem's #require_path.  Plugins are discovered via
-# Gem::find_files and then loaded.
+# Gem::find_files then loaded.  Take care when implementing a plugin as your
+# plugin file may be loaded multiple times if multiple versions of your gem
+# are installed.
 #
-# For an example plugin, see the {Graph gem}[https://github.com/seattlerb/graph]
-# which adds a `gem graph` command.
+# For an example plugin, see the graph gem which adds a `gem graph` command.
 #
 # == RubyGems Defaults, Packaging
 #
-# RubyGems defaults are stored in lib/rubygems/defaults.rb.  If you're packaging
+# RubyGems defaults are stored in rubygems/defaults.rb.  If you're packaging
 # RubyGems or implementing Ruby you can change RubyGems' defaults.
 #
 # For RubyGems packagers, provide lib/rubygems/defaults/operating_system.rb
@@ -63,7 +65,7 @@ require 'rubygems/errors'
 # override any defaults from lib/rubygems/defaults.rb.
 #
 # If you need RubyGems to perform extra work on install or uninstall, your
-# defaults override file can set pre/post install and uninstall hooks.
+# defaults override file can set pre and post install and uninstall hooks.
 # See Gem::pre_install, Gem::pre_uninstall, Gem::post_install,
 # Gem::post_uninstall.
 #
@@ -104,8 +106,6 @@ require 'rubygems/errors'
 #
 # (If your name is missing, PLEASE let us know!)
 #
-# == License
-#
 # See {LICENSE.txt}[rdoc-ref:lib/rubygems/LICENSE.txt] for permissions.
 #
 # Thanks!
@@ -126,14 +126,13 @@ module Gem
     /mingw/i,
     /mswin/i,
     /wince/i,
-  ].freeze
+  ]
 
   GEM_DEP_FILES = %w[
     gem.deps.rb
-    gems.rb
     Gemfile
     Isolate
-  ].freeze
+  ]
 
   ##
   # Subdirectories in a gem repository
@@ -145,7 +144,7 @@ module Gem
     extensions
     gems
     specifications
-  ].freeze
+  ]
 
   ##
   # Subdirectories in a gem repository for default gems
@@ -153,14 +152,14 @@ module Gem
   REPOSITORY_DEFAULT_GEM_SUBDIRECTORIES = %w[
     gems
     specifications/default
-  ].freeze
+  ]
 
   ##
   # Exception classes used in a Gem.read_binary +rescue+ statement. Not all of
   # these are defined in Ruby 1.8.7, hence the need for this convoluted setup.
 
   READ_BINARY_ERRORS = begin
-    read_binary_errors = [Errno::EACCES, Errno::EROFS, Errno::ENOSYS]
+    read_binary_errors = [Errno::EACCES]
     read_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)
     read_binary_errors
   end.freeze
@@ -170,13 +169,11 @@ module Gem
   # these are defined in Ruby 1.8.7.
 
   WRITE_BINARY_ERRORS = begin
-    write_binary_errors = [Errno::ENOSYS]
+    write_binary_errors = []
     write_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)
     write_binary_errors
   end.freeze
 
-  USE_BUNDLER_FOR_GEMDEPS = !ENV['DONT_USE_BUNDLER_FOR_GEMDEPS'] # :nodoc:
-
   @@win_platform = nil
 
   @configuration = nil
@@ -202,7 +199,7 @@ module Gem
   # activation succeeded or wasn't needed because it was already
   # activated. Returns false if it can't find the path in a gem.
 
-  def self.try_activate(path)
+  def self.try_activate path
     # finds the _latest_ version... regardless of loaded specs and their deps
     # if another gem had a requirement that would mean we shouldn't
     # activate the latest version, then either it would already be activated
@@ -237,7 +234,6 @@ module Gem
 
   def self.finish_resolve(request_set=Gem::RequestSet.new)
     request_set.import Gem::Specification.unresolved_deps.values
-    request_set.import Gem.loaded_specs.values.map {|s| Gem::Dependency.new(s.name, s.version) }
 
     request_set.resolve_current.each do |s|
       s.full_spec.activate
@@ -246,7 +242,7 @@ module Gem
 
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
-  # is not given, an exception will be raised, otherwise the
+  # is not given, the gem's default_executable is chosen, otherwise the
   # specified executable's path is returned.  +requirements+ allows
   # you to specify specific gem versions.
 
@@ -262,7 +258,7 @@ module Gem
     find_spec_for_exe(name, exec_name, requirements).bin_file exec_name
   end
 
-  def self.find_spec_for_exe(name, exec_name, requirements)
+  def self.find_spec_for_exe name, exec_name, requirements
     dep = Gem::Dependency.new name, requirements
 
     loaded = Gem.loaded_specs[name]
@@ -271,15 +267,15 @@ module Gem
 
     specs = dep.matching_specs(true)
 
+    raise Gem::GemNotFoundException,
+          "can't find gem #{dep}" if specs.empty?
+
     specs = specs.find_all { |spec|
       spec.executables.include? exec_name
     } if exec_name
 
     unless spec = specs.first
-      msg = "can't find gem #{dep} with executable #{exec_name}"
-      if name == "bundler" && bundler_message = Gem::BundlerVersionFinder.missing_version_message
-        msg = bundler_message
-      end
+      msg = "can't find gem #{name} (#{requirements}) with executable #{exec_name}"
       raise Gem::GemNotFoundException, msg
     end
 
@@ -289,7 +285,7 @@ module Gem
 
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
-  # is not given, an exception will be raised, otherwise the
+  # is not given, the gem's default_executable is chosen, otherwise the
   # specified executable's path is returned.  +requirements+ allows
   # you to specify specific gem versions.
   #
@@ -298,12 +294,9 @@ module Gem
   #
   # This method should *only* be used in bin stub files.
 
-  def self.activate_bin_path(name, exec_name, requirement) # :nodoc:
+  def self.activate_bin_path name, exec_name, requirement # :nodoc:
     spec = find_spec_for_exe name, exec_name, [requirement]
-    Gem::LOADED_SPECS_MUTEX.synchronize do
-      spec.activate
-      finish_resolve
-    end
+    Gem::LOADED_SPECS_MUTEX.synchronize { spec.activate }
     spec.bin_file exec_name
   end
 
@@ -362,6 +355,7 @@ module Gem
   # package is not available as a gem, return nil.
 
   def self.datadir(gem_name)
+# TODO: deprecate
     spec = @loaded_specs[gem_name]
     return nil if spec.nil?
     spec.datadir
@@ -441,7 +435,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   #
   # World-writable directories will never be created.
 
-  def self.ensure_gem_subdirectories(dir = Gem.dir, mode = nil)
+  def self.ensure_gem_subdirectories dir = Gem.dir, mode = nil
     ensure_subdirectories(dir, mode, REPOSITORY_SUBDIRECTORIES)
   end
 
@@ -454,11 +448,11 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   #
   # World-writable directories will never be created.
 
-  def self.ensure_default_gem_subdirectories(dir = Gem.dir, mode = nil)
+  def self.ensure_default_gem_subdirectories dir = Gem.dir, mode = nil
     ensure_subdirectories(dir, mode, REPOSITORY_DEFAULT_GEM_SUBDIRECTORIES)
   end
 
-  def self.ensure_subdirectories(dir, mode, subdirs) # :nodoc:
+  def self.ensure_subdirectories dir, mode, subdirs # :nodoc:
     old_umask = File.umask
     File.umask old_umask | 002
 
@@ -482,7 +476,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # distinction as extensions cannot be shared between the two.
 
   def self.extension_api_version # :nodoc:
-    if 'no' == RbConfig::CONFIG['ENABLE_SHARED']
+    if 'no' == RbConfig::CONFIG['ENABLE_SHARED'] then
       "#{ruby_api_version}-static"
     else
       ruby_api_version
@@ -519,10 +513,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     return files
   end
 
-  def self.find_files_from_load_path(glob) # :nodoc:
-    glob_with_suffixes = "#{glob}#{Gem.suffix_pattern}"
+  def self.find_files_from_load_path glob # :nodoc:
     $LOAD_PATH.map { |load_path|
-      Gem::Util.glob_files_in_dir(glob_with_suffixes, load_path)
+      Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
     }.flatten.select { |file| File.file? file.untaint }
   end
 
@@ -572,9 +565,20 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   #++
 
   def self.find_home
-    Dir.home.dup
+    windows = File::ALT_SEPARATOR
+    if not windows or RUBY_VERSION >= '1.9' then
+      File.expand_path "~"
+    else
+      ['HOME', 'USERPROFILE'].each do |key|
+        return File.expand_path ENV[key] if ENV[key]
+      end
+
+      if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
+        File.expand_path "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
+      end
+    end
   rescue
-    if Gem.win_platform?
+    if windows then
       File.expand_path File.join(ENV['HOMEDRIVE'] || ENV['SystemDrive'], '/')
     else
       File.expand_path "/"
@@ -583,44 +587,32 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
   private_class_method :find_home
 
-  # TODO:  remove in RubyGems 4.0
+  # FIXME deprecate these in 3.0
 
   ##
   # Zlib::GzipReader wrapper that unzips +data+.
 
   def self.gunzip(data)
+    require 'rubygems/util'
     Gem::Util.gunzip data
   end
 
-  class << self
-    extend Gem::Deprecate
-    deprecate :gunzip, "Gem::Util.gunzip", 2018, 12
-  end
-
   ##
   # Zlib::GzipWriter wrapper that zips +data+.
 
   def self.gzip(data)
+    require 'rubygems/util'
     Gem::Util.gzip data
   end
 
-  class << self
-    extend Gem::Deprecate
-    deprecate :gzip, "Gem::Util.gzip", 2018, 12
-  end
-
   ##
   # A Zlib::Inflate#inflate wrapper
 
   def self.inflate(data)
+    require 'rubygems/util'
     Gem::Util.inflate data
   end
 
-  class << self
-    extend Gem::Deprecate
-    deprecate :inflate, "Gem::Util.inflate", 2018, 12
-  end
-
   ##
   # Top level install helper method. Allows you to install gems interactively:
   #
@@ -629,7 +621,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   #   Fetching: minitest-3.0.1.gem (100%)
   #   => [#<Gem::Specification:0x1013b4528 @name="minitest", ...>]
 
-  def self.install(name, version = Gem::Requirement.default, *options)
+  def self.install name, version = Gem::Requirement.default, *options
     require "rubygems/dependency_installer"
     inst = Gem::DependencyInstaller.new(*options)
     inst.install name, version
@@ -647,7 +639,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
   ## Set the default RubyGems API host.
 
-  def self.host=(host)
+  def self.host= host
     # TODO: move to utils
     @host = host
   end
@@ -675,31 +667,43 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     return if @yaml_loaded
     return unless defined?(gem)
 
-    begin
-      gem 'psych', '>= 2.0.0'
-    rescue Gem::LoadError
-      # It's OK if the user does not have the psych gem installed.  We will
-      # attempt to require the stdlib version
-    end
+    test_syck = ENV['TEST_SYCK']
 
-    begin
-      # Try requiring the gem version *or* stdlib version of psych.
-      require 'psych'
-    rescue ::LoadError
-      # If we can't load psych, thats fine, go on.
-    else
-      # If 'yaml' has already been required, then we have to
-      # be sure to switch it over to the newly loaded psych.
-      if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != "psych"
-        YAML::ENGINE.yamler = "psych"
+    # Only Ruby 1.8 and 1.9 have syck
+    test_syck = false unless /^1\./ =~ RUBY_VERSION
+
+    unless test_syck
+      begin
+        gem 'psych', '>= 1.2.1'
+      rescue Gem::LoadError
+        # It's OK if the user does not have the psych gem installed.  We will
+        # attempt to require the stdlib version
       end
 
-      require 'rubygems/psych_additions'
-      require 'rubygems/psych_tree'
+      begin
+        # Try requiring the gem version *or* stdlib version of psych.
+        require 'psych'
+      rescue ::LoadError
+        # If we can't load psych, thats fine, go on.
+      else
+        # If 'yaml' has already been required, then we have to
+        # be sure to switch it over to the newly loaded psych.
+        if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != "psych"
+          YAML::ENGINE.yamler = "psych"
+        end
+
+        require 'rubygems/psych_additions'
+        require 'rubygems/psych_tree'
+      end
     end
 
     require 'yaml'
-    require 'rubygems/safe_yaml'
+
+    # If we're supposed to be using syck, then we may have to force
+    # activate it via the YAML::ENGINE API.
+    if test_syck and defined?(YAML::ENGINE)
+      YAML::ENGINE.yamler = "syck" unless YAML::ENGINE.syck?
+    end
 
     # Now that we're sure some kind of yaml library is loaded, pull
     # in our hack to deal with Syck's DefaultKey ugliness.
@@ -710,20 +714,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
   ##
   # The file name and line number of the caller of the caller of this method.
-  #
-  # +depth+ is how many layers up the call stack it should go.
-  #
-  # e.g.,
-  #
-  # def a; Gem.location_of_caller; end
-  # a #=> ["x.rb", 2]  # (it'll vary depending on file name and line number)
-  #
-  # def b; c; end
-  # def c; Gem.location_of_caller(2); end
-  # b #=> ["x.rb", 6]  # (it'll vary depending on file name and line number)
 
-  def self.location_of_caller(depth = 1)
-    caller[depth] =~ /(.*?):(\d+).*?$/i
+  def self.location_of_caller
+    caller[1] =~ /(.*?):(\d+).*?$/i
     file = $1
     lineno = $2.to_i
 
@@ -836,7 +829,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
     if prefix != File.expand_path(RbConfig::CONFIG['sitelibdir']) and
        prefix != File.expand_path(RbConfig::CONFIG['libdir']) and
-       'lib' == File.basename(RUBYGEMS_DIR)
+       'lib' == File.basename(RUBYGEMS_DIR) then
       prefix
     end
   end
@@ -852,19 +845,19 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Safely read a file in binary mode on all platforms.
 
   def self.read_binary(path)
-    File.open path, 'rb+' do |f|
+    open path, 'rb+' do |f|
       f.flock(File::LOCK_EX)
       f.read
     end
   rescue *READ_BINARY_ERRORS
-    File.open path, 'rb' do |f|
+    open path, 'rb' do |f|
       f.read
     end
   rescue Errno::ENOLCK # NFS
     if Thread.main != Thread.current
       raise
     else
-      File.open path, 'rb' do |f|
+      open path, 'rb' do |f|
         f.read
       end
     end
@@ -894,7 +887,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # The path to the running Ruby interpreter.
 
   def self.ruby
-    if @ruby.nil?
+    if @ruby.nil? then
       @ruby = File.join(RbConfig::CONFIG['bindir'],
                         "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
 
@@ -923,7 +916,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   ##
   # Returns the latest release-version specification for the gem +name+.
 
-  def self.latest_spec_for(name)
+  def self.latest_spec_for name
     dependency   = Gem::Dependency.new name
     fetcher      = Gem::SpecFetcher.fetcher
     spec_tuples, = fetcher.spec_for_dependency dependency
@@ -944,7 +937,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   ##
   # Returns the version of the latest release-version of gem +name+
 
-  def self.latest_version_for(name)
+  def self.latest_version_for name
     spec = latest_spec_for name
     spec and spec.version
   end
@@ -956,15 +949,10 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     return @ruby_version if defined? @ruby_version
     version = RUBY_VERSION.dup
 
-    if defined?(RUBY_PATCHLEVEL) && RUBY_PATCHLEVEL != -1
+    if defined?(RUBY_PATCHLEVEL) && RUBY_PATCHLEVEL != -1 then
       version << ".#{RUBY_PATCHLEVEL}"
-    elsif defined?(RUBY_DESCRIPTION)
-      if RUBY_ENGINE == "ruby"
-        desc = RUBY_DESCRIPTION[/\Aruby #{Regexp.quote(RUBY_VERSION)}([^ ]+) /, 1]
-      else
-        desc = RUBY_DESCRIPTION[/\A#{RUBY_ENGINE} #{Regexp.quote(RUBY_ENGINE_VERSION)} \(#{RUBY_VERSION}([^ ]+)\) /, 1]
-      end
-      version << ".#{desc}" if desc
+    elsif defined?(RUBY_REVISION) then
+      version << ".dev.#{RUBY_REVISION}"
     end
 
     @ruby_version = Gem::Version.new version
@@ -983,8 +971,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # default_sources if the sources list is empty.
 
   def self.sources
-    source_list = configuration.sources || default_sources
-    @sources ||= Gem::SourceList.from(source_list)
+    @sources ||= Gem::SourceList.from(default_sources)
   end
 
   ##
@@ -994,7 +981,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # DOC: This comment is not documentation about the method itself, it's
   # more of a code comment about the implementation.
 
-  def self.sources=(new_sources)
+  def self.sources= new_sources
     if !new_sources
       @sources = nil
     else
@@ -1071,7 +1058,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Is this a windows platform?
 
   def self.win_platform?
-    if @@win_platform.nil?
+    if @@win_platform.nil? then
       ruby_platform = RbConfig::CONFIG['host_os']
       @@win_platform = !!WIN_PATTERNS.find { |r| ruby_platform =~ r }
     end
@@ -1082,7 +1069,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   ##
   # Load +plugins+ as Ruby files
 
-  def self.load_plugin_files(plugins) # :nodoc:
+  def self.load_plugin_files plugins # :nodoc:
     plugins.each do |plugin|
 
       # Skip older versions of the GemCutter plugin: Its commands are in
@@ -1119,9 +1106,8 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     path = "rubygems_plugin"
 
     files = []
-    glob = "#{path}#{Gem.suffix_pattern}"
     $LOAD_PATH.each do |load_path|
-      globbed = Gem::Util.glob_files_in_dir(glob, load_path)
+      globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
 
       globbed.each do |load_path_file|
         files << load_path_file if File.file?(load_path_file.untaint)
@@ -1151,7 +1137,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # execution of arbitrary code when used from directories outside your
   # control.
 
-  def self.use_gemdeps(path = nil)
+  def self.use_gemdeps path = nil
     raise_exception = path
 
     path ||= ENV['RUBYGEMS_GEMDEPS']
@@ -1159,7 +1145,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
     path = path.dup
 
-    if path == "-"
+    if path == "-" then
+      require 'rubygems/util'
+
       Gem::Util.traverse_parents Dir.pwd do |directory|
         dep_file = GEM_DEP_FILES.find { |f| File.file?(f) }
 
@@ -1172,52 +1160,31 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
     path.untaint
 
-    unless File.file? path
+    unless File.file? path then
       return unless raise_exception
 
       raise ArgumentError, "Unable to find gem dependencies file at #{path}"
     end
 
-    if USE_BUNDLER_FOR_GEMDEPS
-
-      ENV["BUNDLE_GEMFILE"] ||= File.expand_path(path)
-      require 'rubygems/user_interaction'
-      Gem::DefaultUserInteraction.use_ui(ui) do
-        require "bundler"
-        @gemdeps = Bundler.setup
-        Bundler.ui = nil
-        @gemdeps.requested_specs.map(&:to_spec).sort_by(&:name)
-      end
-
-    else
-
-      rs = Gem::RequestSet.new
-      @gemdeps = rs.load_gemdeps path
-
-      rs.resolve_current.map do |s|
-        s.full_spec.tap(&:activate)
-      end
+    rs = Gem::RequestSet.new
+    @gemdeps = rs.load_gemdeps path
 
+    rs.resolve_current.map do |s|
+      sp = s.full_spec
+      sp.activate
+      sp
     end
-  rescue => e
-    case e
-    when Gem::LoadError, Gem::UnsatisfiableDependencyError, (defined?(Bundler::GemNotFound) ? Bundler::GemNotFound : Gem::LoadError)
-      warn e.message
-      warn "You may need to `gem install -g` to install missing gems"
-      warn ""
-    else
-      raise
-    end
+  rescue Gem::LoadError, Gem::UnsatisfiableDependencyError => e
+    warn e.message
+    warn "You may need to `gem install -g` to install missing gems"
+    warn ""
   end
 
   class << self
     ##
-    # TODO remove with RubyGems 4.0
+    # TODO remove with RubyGems 3.0
 
     alias detect_gemdeps use_gemdeps # :nodoc:
-
-    extend Gem::Deprecate
-    deprecate :detect_gemdeps, "Gem.use_gemdeps", 2018, 12
   end
 
   # FIX: Almost everywhere else we use the `def self.` way of defining class
@@ -1256,8 +1223,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
         prefix_pattern = /^(#{prefix_group})/
       end
 
-      suffix_pattern = /#{Regexp.union(Gem.suffixes)}\z/
-
       spec.files.each do |file|
         if new_format
           file = file.sub(prefix_pattern, "")
@@ -1265,7 +1230,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
         end
 
         @path_to_default_spec_map[file] = spec
-        @path_to_default_spec_map[file.sub(suffix_pattern, "")] = spec
       end
     end
 
@@ -1273,7 +1237,11 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     # Find a Gem::Specification of default gem from +path+
 
     def find_unresolved_default_spec(path)
-      @path_to_default_spec_map[path]
+      Gem.suffixes.each do |suffix|
+        spec = @path_to_default_spec_map["#{path}#{suffix}"]
+        return spec if spec
+      end
+      nil
     end
 
     ##
@@ -1342,12 +1310,12 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   ##
   # Location of Marshal quick gemspecs on remote repositories
 
-  MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/".freeze
+  MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
 
-  autoload :BundlerVersionFinder, 'rubygems/bundler_version_finder'
   autoload :ConfigFile,         'rubygems/config_file'
   autoload :Dependency,         'rubygems/dependency'
   autoload :DependencyList,     'rubygems/dependency_list'
+  autoload :DependencyResolver, 'rubygems/resolver'
   autoload :Installer,          'rubygems/installer'
   autoload :Licenses,           'rubygems/util/licenses'
   autoload :PathSupport,        'rubygems/path_support'
@@ -1359,7 +1327,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   autoload :SourceList,         'rubygems/source_list'
   autoload :SpecFetcher,        'rubygems/spec_fetcher'
   autoload :Specification,      'rubygems/specification'
-  autoload :Util,               'rubygems/util'
   autoload :Version,            'rubygems/version'
 
   require "rubygems/specification"
@@ -1368,22 +1335,25 @@ end
 require 'rubygems/exceptions'
 
 # REFACTOR: This should be pulled out into some kind of hacks file.
-begin
-  ##
-  # Defaults the operating system (or packager) wants to provide for RubyGems.
-
-  require 'rubygems/defaults/operating_system'
-rescue LoadError
-end
-
-if defined?(RUBY_ENGINE)
+gem_preluded = Gem::GEM_PRELUDE_SUCKAGE and defined? Gem
+unless gem_preluded then # TODO: remove guard after 1.9.2 dropped
   begin
     ##
-    # Defaults the Ruby implementation wants to provide for RubyGems
+    # Defaults the operating system (or packager) wants to provide for RubyGems.
 
-    require "rubygems/defaults/#{RUBY_ENGINE}"
+    require 'rubygems/defaults/operating_system'
   rescue LoadError
   end
+
+  if defined?(RUBY_ENGINE) then
+    begin
+      ##
+      # Defaults the Ruby implementation wants to provide for RubyGems
+
+      require "rubygems/defaults/#{RUBY_ENGINE}"
+    rescue LoadError
+    end
+  end
 end
 
 ##
@@ -1392,6 +1362,5 @@ Gem::Specification.load_defaults
 
 require 'rubygems/core_ext/kernel_gem'
 require 'rubygems/core_ext/kernel_require'
-require 'rubygems/core_ext/kernel_warn'
 
 Gem.use_gemdeps
diff --git a/lib/rubygems/LICENSE.txt b/lib/rubygems/LICENSE.txt
new file mode 100644
index 0000000000..8a0a51dec1
--- /dev/null
+++ b/lib/rubygems/LICENSE.txt
@@ -0,0 +1,54 @@
+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 (see the file MIT.txt), 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.
+
diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb
index 8334a73ecb..49b5d5fd06 100644
--- a/lib/rubygems/available_set.rb
+++ b/lib/rubygems/available_set.rb
@@ -103,7 +103,7 @@ class Gem::AvailableSet
   # Other options are :shallow for only direct development dependencies of the
   # gems in this set or :all for all development dependencies.
 
-  def to_request_set(development = :none)
+  def to_request_set development = :none
     request_set = Gem::RequestSet.new
     request_set.development = :all == development
 
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index d1878021ba..5aed17437e 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -65,13 +65,13 @@ class Gem::BasicSpecification
   ##
   # Return true if this spec can require +file+.
 
-  def contains_requirable_file?(file)
-    if @ignored
+  def contains_requirable_file? file
+    if @ignored then
       return false
-    elsif missing_extensions?
+    elsif missing_extensions? then
       @ignored = true
 
-      warn "Ignoring #{full_name} because its extensions are not built. " +
+      warn "Ignoring #{full_name} because its extensions are not built.  " +
         "Try: gem pristine #{name} --version #{version}"
       return false
     end
@@ -124,7 +124,7 @@ class Gem::BasicSpecification
   # default Ruby platform.
 
   def full_name
-    if platform == Gem::Platform::RUBY or platform.nil?
+    if platform == Gem::Platform::RUBY or platform.nil? then
       "#{name}-#{version}".dup.untaint
     else
       "#{name}-#{version}-#{platform}".dup.untaint
@@ -152,7 +152,7 @@ class Gem::BasicSpecification
   # The path to the data directory for this gem.
 
   def datadir
-    # TODO: drop the extra ", gem_name" which is uselessly redundant
+# TODO: drop the extra ", gem_name" which is uselessly redundant
     File.expand_path(File.join(gems_dir, full_name, "data", name)).untaint
   end
 
@@ -160,8 +160,8 @@ class Gem::BasicSpecification
   # Full path of the target library file.
   # If the file is not in this gem, return nil.
 
-  def to_fullpath(path)
-    if activated?
+  def to_fullpath path
+    if activated? then
       @paths_map ||= {}
       @paths_map[path] ||=
       begin
@@ -249,7 +249,7 @@ class Gem::BasicSpecification
   def source_paths
     paths = raw_require_paths.dup
 
-    if have_extensions?
+    if have_extensions? then
       ext_dirs = extensions.map do |extension|
         extension.split(File::SEPARATOR, 2).first
       end.uniq
@@ -263,7 +263,7 @@ class Gem::BasicSpecification
   ##
   # Return all files in this gem that match for +glob+.
 
-  def matches_for_glob(glob) # TODO: rename?
+  def matches_for_glob glob # TODO: rename?
     # TODO: do we need these?? Kill it
     glob = File.join(self.lib_dirs_glob, glob)
 
@@ -275,14 +275,10 @@ class Gem::BasicSpecification
   # for this spec.
 
   def lib_dirs_glob
-    dirs = if self.raw_require_paths
-             if self.raw_require_paths.size > 1
-               "{#{self.raw_require_paths.join(',')}}"
-             else
-               self.raw_require_paths.first
-             end
+    dirs = if self.require_paths.size > 1 then
+             "{#{self.require_paths.join(',')}}"
            else
-             "lib" # default value for require_paths for bundler/inline
+             self.require_paths.first
            end
 
     "#{self.full_gem_path}/#{dirs}".dup.untaint
@@ -316,7 +312,7 @@ class Gem::BasicSpecification
 
   def have_extensions?; !extensions.empty?; end
 
-  def have_file?(file, suffixes)
+  def have_file? file, suffixes
     return true if raw_require_paths.any? do |path|
       base = File.join(gems_dir, full_name, path.untaint, file).untaint
       suffixes.any? { |suf| File.file? base + suf }
diff --git a/lib/rubygems/bundler_version_finder.rb b/lib/rubygems/bundler_version_finder.rb
deleted file mode 100644
index e74baca1ee..0000000000
--- a/lib/rubygems/bundler_version_finder.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/util"
-
-module Gem::BundlerVersionFinder
-  def self.bundler_version
-    version, _ = bundler_version_with_reason
-
-    return unless version
-
-    Gem::Version.new(version)
-  end
-
-  def self.bundler_version_with_reason
-    if v = ENV["BUNDLER_VERSION"]
-      return [v, "`$BUNDLER_VERSION`"]
-    end
-    if v = bundle_update_bundler_version
-      return if v == true
-      return [v, "`bundle update --bundler`"]
-    end
-    v, lockfile = lockfile_version
-    if v
-      return [v, "your #{lockfile}"]
-    end
-  end
-
-  def self.missing_version_message
-    return unless vr = bundler_version_with_reason
-    <<-EOS
-Could not find 'bundler' (#{vr.first}) required by #{vr.last}.
-To update to the latest version installed on your system, run `bundle update --bundler`.
-To install the missing version, run `gem install bundler:#{vr.first}`
-    EOS
-  end
-
-  def self.compatible?(spec)
-    return true unless spec.name == "bundler".freeze
-    return true unless bundler_version = self.bundler_version
-
-    spec.version.segments.first == bundler_version.segments.first
-  end
-
-  def self.filter!(specs)
-    return unless bundler_version = self.bundler_version
-
-    specs.reject! { |spec| spec.version.segments.first != bundler_version.segments.first }
-  end
-
-  def self.bundle_update_bundler_version
-    return unless File.basename($0) == "bundle".freeze
-    return unless "update".start_with?(ARGV.first || " ")
-    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 || true
-      update_index = i
-    end
-    bundler_version
-  end
-  private_class_method :bundle_update_bundler_version
-
-  def self.lockfile_version
-    return unless lockfile = lockfile_contents
-    lockfile, contents = lockfile
-    lockfile ||= "lockfile"
-    regexp = /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    return unless contents =~ regexp
-    [$1, lockfile]
-  end
-  private_class_method :lockfile_version
-
-  def self.lockfile_contents
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    gemfile = nil if gemfile && gemfile.empty?
-    Gem::Util.traverse_parents Dir.pwd do |directory|
-      next unless gemfile = Gem::GEM_DEP_FILES.find { |f| File.file?(f.untaint) }
-
-      gemfile = File.join directory, gemfile
-      break
-    end unless gemfile
-
-    return unless gemfile
-
-    lockfile = case gemfile
-               when "gems.rb" then "gems.locked"
-               else "#{gemfile}.lock"
-               end.dup.untaint
-
-    return unless File.file?(lockfile)
-
-    [lockfile, File.read(lockfile)]
-  end
-  private_class_method :lockfile_contents
-end
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
index 5b8868b0cd..14b70b75ec 100644
--- a/lib/rubygems/command.rb
+++ b/lib/rubygems/command.rb
@@ -152,24 +152,16 @@ class Gem::Command
   #--
   # TODO: replace +domain+ with a parameter to suppress suggestions
 
-  def show_lookup_failure(gem_name, version, errors, domain, required_by = nil)
-    gem = "'#{gem_name}' (#{version})"
-    msg = String.new "Could not find a valid gem #{gem}"
-
+  def show_lookup_failure(gem_name, version, errors, domain)
     if errors and !errors.empty?
-      msg << ", here is why:\n"
+      msg = "Could not find a valid gem '#{gem_name}' (#{version}), here is why:\n".dup
       errors.each { |x| msg << "          #{x.wordy}\n" }
+      alert_error msg
     else
-      if required_by and gem != required_by
-        msg << " (required by #{required_by}) in any repository"
-      else
-        msg << " in any repository"
-      end
+      alert_error "Could not find a valid gem '#{gem_name}' (#{version}) in any repository"
     end
 
-    alert_error msg
-
-    unless domain == :local  # HACK
+    unless domain == :local then # HACK
       suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name gem_name
 
       unless suggestions.empty?
@@ -184,7 +176,7 @@ class Gem::Command
   def get_all_gem_names
     args = options[:args]
 
-    if args.nil? or args.empty?
+    if args.nil? or args.empty? then
       raise Gem::CommandLineError,
             "Please specify at least one gem name (e.g. gem build GEMNAME)"
     end
@@ -214,12 +206,12 @@ class Gem::Command
   def get_one_gem_name
     args = options[:args]
 
-    if args.nil? or args.empty?
+    if args.nil? or args.empty? then
       raise Gem::CommandLineError,
             "Please specify a gem name on the command line (e.g. gem build GEMNAME)"
     end
 
-    if args.size > 1
+    if args.size > 1 then
       raise Gem::CommandLineError,
             "Too many gem names (#{args.join(', ')}); please specify only one"
     end
@@ -308,23 +300,15 @@ class Gem::Command
 
     options[:build_args] = build_args
 
-    if options[:silent]
-      old_ui = self.ui
-      self.ui = ui = Gem::SilentUI.new
-    end
+    self.ui = Gem::SilentUI.new if options[:silent]
 
-    if options[:help]
+    if options[:help] then
       show_help
-    elsif @when_invoked
+    elsif @when_invoked then
       @when_invoked.call options
     else
       execute
     end
-  ensure
-    if ui
-      self.ui = old_ui
-      ui.close
-    end
   end
 
   ##
@@ -361,7 +345,7 @@ class Gem::Command
 
   def remove_option(name)
     @option_groups.each do |_, option_list|
-      option_list.reject! { |args, _| args.any? { |x| x.is_a?(String) && x =~ /^#{name}/ } }
+      option_list.reject! { |args, _| args.any? { |x| x =~ /^#{name}/ } }
     end
   end
 
@@ -451,7 +435,7 @@ class Gem::Command
   # Adds a section with +title+ and +content+ to the parser help view.  Used
   # for adding command arguments and default arguments.
 
-  def add_parser_run_info(title, content)
+  def add_parser_run_info title, content
     return if content.empty?
 
     @parser.separator nil
@@ -504,6 +488,7 @@ class Gem::Command
     @parser.separator "  #{header}Options:"
 
     option_list.each do |args, handler|
+      args.select { |arg| arg =~ /^-/ }
       @parser.on(*args) do |value|
         handler.call(value, @options)
       end
@@ -530,7 +515,7 @@ class Gem::Command
   add_common_option('-V', '--[no-]verbose',
                     'Set the verbose level of output') do |value, options|
     # Set us to "really verbose" so the progress meter works
-    if Gem.configuration.verbose and value
+    if Gem.configuration.verbose and value then
       Gem.configuration.verbose = 1
     else
       Gem.configuration.verbose = value
@@ -542,7 +527,7 @@ class Gem::Command
   end
 
   add_common_option("--silent",
-                    "Silence RubyGems output") do |value, options|
+                    "Silence rubygems output") do |value, options|
     options[:silent] = true
   end
 
@@ -569,7 +554,7 @@ class Gem::Command
 
   # :stopdoc:
 
-  HELP = <<-HELP.freeze
+  HELP = <<-HELP
 RubyGems is a sophisticated package manager for Ruby.  This is a
 basic help message containing pointers to more information.
 
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
index 8ad723be55..451b719c46 100644
--- a/lib/rubygems/command_manager.rb
+++ b/lib/rubygems/command_manager.rb
@@ -7,7 +7,6 @@
 
 require 'rubygems/command'
 require 'rubygems/user_interaction'
-require 'rubygems/text'
 
 ##
 # The command manager registers and installs all the individual sub-commands
@@ -33,7 +32,6 @@ require 'rubygems/text'
 
 class Gem::CommandManager
 
-  include Gem::Text
   include Gem::UserInteraction
 
   BUILTIN_COMMANDS = [ # :nodoc:
@@ -47,7 +45,6 @@ class Gem::CommandManager
     :fetch,
     :generate_index,
     :help,
-    :info,
     :install,
     :list,
     :lock,
@@ -61,8 +58,6 @@ class Gem::CommandManager
     :rdoc,
     :search,
     :server,
-    :signin,
-    :signout,
     :sources,
     :specification,
     :stale,
@@ -71,11 +66,7 @@ class Gem::CommandManager
     :update,
     :which,
     :yank,
-  ].freeze
-
-  ALIAS_COMMANDS = {
-    'i' => 'install'
-  }.freeze
+  ]
 
   ##
   # Return the authoritative instance of the command manager.
@@ -147,17 +138,17 @@ class Gem::CommandManager
   def run(args, build_args=nil)
     process_args(args, build_args)
   rescue StandardError, Timeout::Error => ex
-    alert_error clean_text("While executing gem ... (#{ex.class})\n    #{ex}")
+    alert_error "While executing gem ... (#{ex.class})\n    #{ex}"
     ui.backtrace ex
 
     terminate_interaction(1)
   rescue Interrupt
-    alert_error clean_text("Interrupted")
+    alert_error "Interrupted"
     terminate_interaction(1)
   end
 
   def process_args(args, build_args=nil)
-    if args.empty?
+    if args.empty? then
       say Gem::Command::HELP
       terminate_interaction 1
     end
@@ -170,7 +161,7 @@ class Gem::CommandManager
       say Gem::VERSION
       terminate_interaction 0
     when /^-/ then
-      alert_error clean_text("Invalid option: #{args.first}. See 'gem --help'.")
+      alert_error "Invalid option: #{args.first}.  See 'gem --help'."
       terminate_interaction 1
     else
       cmd_name = args.shift.downcase
@@ -180,25 +171,18 @@ class Gem::CommandManager
   end
 
   def find_command(cmd_name)
-    cmd_name = find_alias_command cmd_name
-
     possibilities = find_command_possibilities cmd_name
 
-    if possibilities.size > 1
+    if possibilities.size > 1 then
       raise Gem::CommandLineError,
             "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
-    elsif possibilities.empty?
+    elsif possibilities.empty? then
       raise Gem::CommandLineError, "Unknown command #{cmd_name}"
     end
 
     self[possibilities.first]
   end
 
-  def find_alias_command(cmd_name)
-    alias_name = ALIAS_COMMANDS[cmd_name]
-    alias_name ? alias_name : cmd_name
-  end
-
   def find_command_possibilities(cmd_name)
     len = cmd_name.length
 
@@ -226,9 +210,10 @@ class Gem::CommandManager
     rescue Exception => e
       e = load_error if load_error
 
-      alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}")
+      alert_error "Loading command: #{command_name} (#{e.class})\n\t#{e}"
       ui.backtrace e
     end
   end
 
 end
+
diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb
index e59471e976..38c45e46f0 100644
--- a/lib/rubygems/commands/build_command.rb
+++ b/lib/rubygems/commands/build_command.rb
@@ -10,14 +10,6 @@ class Gem::Commands::BuildCommand < Gem::Command
     add_option '--force', 'skip validation of the spec' do |value, options|
       options[:force] = true
     end
-
-    add_option '--strict', 'consider warnings as errors when validating the spec' do |value, options|
-      options[:strict] = true
-    end
-
-    add_option '-o', '--output FILE', 'output gem with the given filename' do |value, options|
-      options[:output] = value
-    end
   end
 
   def arguments # :nodoc:
@@ -40,11 +32,6 @@ with gem spec:
   $ cd my_gem-1.0
   [edit gem contents]
   $ gem build my_gem-1.0.gemspec
-
-Gems can be saved to a specified filename with the output option:
-
-  $ gem build my_gem-1.0.gemspec --output=release.gem
-
     EOF
   end
 
@@ -59,21 +46,14 @@ Gems can be saved to a specified filename with the output option:
       gemspec += '.gemspec' if File.exist? gemspec + '.gemspec'
     end
 
-    if File.exist? gemspec
-      Dir.chdir(File.dirname(gemspec)) do
-        spec = Gem::Specification.load File.basename(gemspec)
+    if File.exist? gemspec then
+      spec = Gem::Specification.load gemspec
 
-        if spec
-          Gem::Package.build(
-            spec,
-            options[:force],
-            options[:strict],
-            options[:output]
-          )
-        else
-          alert_error "Error loading gemspec. Aborting."
-          terminate_interaction 1
-        end
+      if spec then
+        Gem::Package.build spec, options[:force]
+      else
+        alert_error "Error loading gemspec. Aborting."
+        terminate_interaction 1
       end
     else
       alert_error "Gemspec file not found: #{gemspec}"
@@ -82,3 +62,4 @@ Gems can be saved to a specified filename with the output option:
   end
 
 end
+
diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
index 5695460d94..7adf5b01b1 100644
--- a/lib/rubygems/commands/cert_command.rb
+++ b/lib/rubygems/commands/cert_command.rb
@@ -14,16 +14,15 @@ class Gem::Commands::CertCommand < Gem::Command
     super 'cert', 'Manage RubyGems certificates and signing settings',
           :add => [], :remove => [], :list => [], :build => [], :sign => []
 
-    OptionParser.accept OpenSSL::X509::Certificate do |certificate_file|
+    OptionParser.accept OpenSSL::X509::Certificate do |certificate|
       begin
-        certificate = OpenSSL::X509::Certificate.new File.read certificate_file
+        OpenSSL::X509::Certificate.new File.read certificate
       rescue Errno::ENOENT
-        raise OptionParser::InvalidArgument, "#{certificate_file}: does not exist"
+        raise OptionParser::InvalidArgument, "#{certificate}: does not exist"
       rescue OpenSSL::X509::CertificateError
         raise OptionParser::InvalidArgument,
-          "#{certificate_file}: invalid X509 certificate"
+          "#{certificate}: invalid X509 certificate"
       end
-      [certificate, certificate_file]
     end
 
     OptionParser.accept OpenSSL::PKey::RSA do |key_file|
@@ -43,7 +42,7 @@ class Gem::Commands::CertCommand < Gem::Command
     end
 
     add_option('-a', '--add CERT', OpenSSL::X509::Certificate,
-               'Add a trusted certificate.') do |(cert, _), options|
+               'Add a trusted certificate.') do |cert, options|
       options[:add] << cert
     end
 
@@ -68,9 +67,8 @@ class Gem::Commands::CertCommand < Gem::Command
     end
 
     add_option('-C', '--certificate CERT', OpenSSL::X509::Certificate,
-               'Signing certificate for --sign') do |(cert, cert_file), options|
+               'Signing certificate for --sign') do |cert, options|
       options[:issuer_cert] = cert
-      options[:issuer_cert_file] = cert_file
     end
 
     add_option('-K', '--private-key KEY', OpenSSL::PKey::RSA,
@@ -86,19 +84,9 @@ class Gem::Commands::CertCommand < Gem::Command
 
       options[:sign] << cert_file
     end
-
-    add_option('-d', '--days NUMBER_OF_DAYS',
-               'Days before the certificate expires') do |days, options|
-      options[:expiration_length_days] = days.to_i
-    end
-
-    add_option('-R', '--re-sign',
-               'Re-signs the certificate from -C with the key from -K') do |resign, options|
-      options[:resign] = resign
-    end
   end
 
-  def add_certificate(certificate) # :nodoc:
+  def add_certificate certificate # :nodoc:
     Gem::Security.trust_dir.trust_cert certificate
 
     say "Added '#{certificate.subject}'"
@@ -117,28 +105,16 @@ class Gem::Commands::CertCommand < Gem::Command
       list_certificates_matching filter
     end
 
-    options[:build].each do |email|
-      build email
-    end
-
-    if options[:resign]
-      re_sign_cert(
-        options[:issuer_cert],
-        options[:issuer_cert_file],
-        options[:key]
-      )
+    options[:build].each do |name|
+      build name
     end
 
     sign_certificates unless options[:sign].empty?
   end
 
-  def build(email)
-    if !valid_email?(email)
-      raise Gem::CommandLineError, "Invalid email address #{email}"
-    end
-
+  def build name
     key, key_path = build_key
-    cert_path = build_cert email, key
+    cert_path = build_cert name, key
 
     say "Certificate: #{cert_path}"
 
@@ -148,16 +124,8 @@ class Gem::Commands::CertCommand < Gem::Command
     end
   end
 
-  def build_cert(email, key) # :nodoc:
-    expiration_length_days = options[:expiration_length_days] ||
-      Gem.configuration.cert_expiration_length_days
-
-    cert = Gem::Security.create_cert_email(
-      email,
-      key,
-      (Gem::Security::ONE_DAY * expiration_length_days)
-    )
-
+  def build_cert name, key # :nodoc:
+    cert = Gem::Security.create_cert_email name, key
     Gem::Security.write cert, "gem-public_cert.pem"
   end
 
@@ -179,7 +147,7 @@ class Gem::Commands::CertCommand < Gem::Command
     return key, key_path
   end
 
-  def certificates_matching(filter)
+  def certificates_matching filter
     return enum_for __method__, filter unless block_given?
 
     Gem::Security.trusted_certificates.select do |certificate, _|
@@ -231,7 +199,7 @@ For further reading on signing gems see `ri Gem::Security`.
     EOF
   end
 
-  def list_certificates_matching(filter) # :nodoc:
+  def list_certificates_matching filter # :nodoc:
     certificates_matching filter do |certificate, _|
       # this could probably be formatted more gracefully
       say certificate.subject.to_s
@@ -276,14 +244,14 @@ For further reading on signing gems see `ri Gem::Security`.
     load_default_key  unless options[:key]
   end
 
-  def remove_certificates_matching(filter) # :nodoc:
+  def remove_certificates_matching filter # :nodoc:
     certificates_matching filter do |certificate, path|
       FileUtils.rm path
       say "Removed '#{certificate.subject}'"
     end
   end
 
-  def sign(cert_file)
+  def sign cert_file
     cert = File.read cert_file
     cert = OpenSSL::X509::Certificate.new cert
 
@@ -305,19 +273,5 @@ For further reading on signing gems see `ri Gem::Security`.
     end
   end
 
-  def re_sign_cert(cert, cert_path, private_key)
-    Gem::Security::Signer.re_sign_cert(cert, cert_path, private_key) do |expired_cert_path, new_expired_cert_path|
-      alert("Your certificate #{expired_cert_path} has been re-signed")
-      alert("Your expired certificate will be located at: #{new_expired_cert_path}")
-    end
-  end
-
-  private
-
-  def valid_email?(email)
-    # It's simple, but is all we need
-    email =~ /\A.+@.+\z/
-  end
-
-
 end if defined?(OpenSSL::SSL)
+
diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
index 7905b8ab69..818cb05f55 100644
--- a/lib/rubygems/commands/check_command.rb
+++ b/lib/rubygems/commands/check_command.rb
@@ -44,7 +44,7 @@ class Gem::Commands::CheckCommand < Gem::Command
     gems = get_all_gem_names rescue []
 
     Gem::Validator.new.alien(gems).sort.each do |key, val|
-      unless val.empty?
+      unless val.empty? then
         say "#{key} has #{val.size} problems"
         val.each do |error_entry|
           say "  #{error_entry.path}:"
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
index aeb4d82fae..83ee6b5c7c 100644
--- a/lib/rubygems/commands/cleanup_command.rb
+++ b/lib/rubygems/commands/cleanup_command.rb
@@ -8,26 +8,13 @@ class Gem::Commands::CleanupCommand < Gem::Command
   def initialize
     super 'cleanup',
           'Clean up old versions of installed gems',
-          :force => false, :install_dir => Gem.dir,
-          :check_dev => true
+          :force => false, :install_dir => Gem.dir
 
     add_option('-n', '-d', '--dryrun',
                'Do not uninstall gems') do |value, options|
       options[:dryrun] = true
     end
 
-    add_option('-D', '--[no-]check-development',
-               'Check development dependencies while uninstalling',
-               '(default: true)') do |value, options|
-      options[:check_dev] = value
-    end
-
-    add_option('--[no-]user-install',
-               'Cleanup in user\'s home directory instead',
-               'of GEM_HOME.') do |value, options|
-      options[:user_install] = value
-    end
-
     @candidate_gems  = nil
     @default_gems    = []
     @full            = nil
@@ -62,7 +49,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
   def execute
     say "Cleaning up installed gems..."
 
-    if options[:args].empty?
+    if options[:args].empty? then
       done     = false
       last_set = nil
 
@@ -79,7 +66,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
       clean_gems
     end
 
-    say "Clean up complete"
+    say "Clean Up Complete"
 
     verbose do
       skipped = @default_gems.map { |spec| spec.full_name }
@@ -111,7 +98,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
   end
 
   def get_candidate_gems
-    @candidate_gems = unless options[:args].empty?
+    @candidate_gems = unless options[:args].empty? then
                         options[:args].map do |gem_name|
                           Gem::Specification.find_all_by_name gem_name
                         end.flatten
@@ -121,6 +108,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
   end
 
   def get_gems_to_cleanup
+
     gems_to_cleanup = @candidate_gems.select { |spec|
       @primary_gems[spec.name].version != spec.version
     }
@@ -129,10 +117,8 @@ If no gems are named all gems in GEM_HOME are cleaned.
       spec.default_gem?
     }
 
-    uninstall_from = options[:user_install] ? Gem.user_dir : @original_home
-
     gems_to_cleanup = gems_to_cleanup.select { |spec|
-      spec.base_dir == uninstall_from
+      spec.base_dir == @original_home
     }
 
     @default_gems += default_gems
@@ -145,16 +131,16 @@ If no gems are named all gems in GEM_HOME are cleaned.
 
     Gem::Specification.each do |spec|
       if @primary_gems[spec.name].nil? or
-         @primary_gems[spec.name].version < spec.version
+         @primary_gems[spec.name].version < spec.version then
         @primary_gems[spec.name] = spec
       end
     end
   end
 
-  def uninstall_dep(spec)
-    return unless @full.ok_to_remove?(spec.full_name, options[:check_dev])
+  def uninstall_dep spec
+    return unless @full.ok_to_remove?(spec.full_name)
 
-    if options[:dryrun]
+    if options[:dryrun] then
       say "Dry Run Mode: Would uninstall #{spec.full_name}"
       return
     end
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
index 6da89a136e..e0f2eedb5d 100644
--- a/lib/rubygems/commands/contents_command.rb
+++ b/lib/rubygems/commands/contents_command.rb
@@ -73,7 +73,7 @@ prefix or only the files that are requireable.
 
     names.each do |name|
       found =
-        if options[:show_install_dir]
+        if options[:show_install_dir] then
           gem_install_dir name
         else
           gem_contents name
@@ -83,15 +83,15 @@ prefix or only the files that are requireable.
     end
   end
 
-  def files_in(spec)
-    if spec.default_gem?
+  def files_in spec
+    if spec.default_gem? then
       files_in_default_gem spec
     else
       files_in_gem spec
     end
   end
 
-  def files_in_gem(spec)
+  def files_in_gem spec
     gem_path  = spec.full_gem_path
     extra     = "/{#{spec.require_paths.join ','}}" if options[:lib_only]
     glob      = "#{gem_path}#{extra}/**/*"
@@ -102,7 +102,7 @@ prefix or only the files that are requireable.
     end
   end
 
-  def files_in_default_gem(spec)
+  def files_in_default_gem spec
     spec.files.map do |file|
       case file
       when /\A#{spec.bindir}\//
@@ -115,7 +115,7 @@ prefix or only the files that are requireable.
     end
   end
 
-  def gem_contents(name)
+  def gem_contents name
     spec = spec_for name
 
     return false unless spec
@@ -127,7 +127,7 @@ prefix or only the files that are requireable.
     true
   end
 
-  def gem_install_dir(name)
+  def gem_install_dir name
     spec = spec_for name
 
     return false unless spec
@@ -138,27 +138,27 @@ prefix or only the files that are requireable.
   end
 
   def gem_names # :nodoc:
-    if options[:all]
+    if options[:all] then
       Gem::Specification.map(&:name)
     else
       get_all_gem_names
     end
   end
 
-  def path_description(spec_dirs) # :nodoc:
-    if spec_dirs.empty?
+  def path_description spec_dirs # :nodoc:
+    if spec_dirs.empty? then
       "default gem paths"
     else
       "specified path"
     end
   end
 
-  def show_files(files)
+  def show_files files
     files.sort.each do |prefix, basename|
       absolute_path = File.join(prefix, basename)
       next if File.directory? absolute_path
 
-      if options[:prefix]
+      if options[:prefix] then
         say absolute_path
       else
         say basename
@@ -166,14 +166,14 @@ prefix or only the files that are requireable.
     end
   end
 
-  def spec_for(name)
+  def spec_for name
     spec = Gem::Specification.find_all_by_name(name, @version).last
 
     return spec if spec
 
     say "Unable to find gem '#{name}' in #{@path_kind}"
 
-    if Gem.configuration.verbose
+    if Gem.configuration.verbose then
       say "\nDirectories searched:"
       @spec_dirs.sort.each { |dir| say dir }
     end
@@ -188,3 +188,4 @@ prefix or only the files that are requireable.
   end
 
 end
+
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index 9e88b04ea5..97fd812ffa 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -54,7 +54,7 @@ use with other commands.
     "#{program_name} REGEXP"
   end
 
-  def fetch_remote_specs(dependency) # :nodoc:
+  def fetch_remote_specs dependency # :nodoc:
     fetcher = Gem::SpecFetcher.fetcher
 
     ss, = fetcher.spec_for_dependency dependency
@@ -62,7 +62,7 @@ use with other commands.
     ss.map { |spec, _| spec }
   end
 
-  def fetch_specs(name_pattern, dependency) # :nodoc:
+  def fetch_specs name_pattern, dependency # :nodoc:
     specs = []
 
     if local?
@@ -79,7 +79,7 @@ use with other commands.
     specs.uniq.sort
   end
 
-  def gem_dependency(pattern, version, prerelease) # :nodoc:
+  def gem_dependency pattern, version, prerelease # :nodoc:
     dependency = Gem::Deprecate.skip_during {
       Gem::Dependency.new pattern, version
     }
@@ -89,9 +89,9 @@ use with other commands.
     dependency
   end
 
-  def display_pipe(specs) # :nodoc:
+  def display_pipe specs # :nodoc:
     specs.each do |spec|
-      unless spec.dependencies.empty?
+      unless spec.dependencies.empty? then
         spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
           say "#{dep.name} --version '#{dep.requirement}'"
         end
@@ -99,12 +99,12 @@ use with other commands.
     end
   end
 
-  def display_readable(specs, reverse) # :nodoc:
+  def display_readable specs, reverse # :nodoc:
     response = String.new
 
     specs.each do |spec|
       response << print_dependencies(spec)
-      unless reverse[spec.full_name].empty?
+      unless reverse[spec.full_name].empty? then
         response << "  Used by\n"
         reverse[spec.full_name].each do |sp, dep|
           response << "    #{sp} (#{dep})\n"
@@ -128,7 +128,7 @@ use with other commands.
 
     reverse = reverse_dependencies specs
 
-    if options[:pipe_format]
+    if options[:pipe_format] then
       display_pipe specs
     else
       display_readable specs, reverse
@@ -136,13 +136,13 @@ use with other commands.
   end
 
   def ensure_local_only_reverse_dependencies # :nodoc:
-    if options[:reverse_dependencies] and remote? and not local?
+    if options[:reverse_dependencies] and remote? and not local? then
       alert_error 'Only reverse dependencies for local gems are supported.'
       terminate_interaction 1
     end
   end
 
-  def ensure_specs(specs) # :nodoc:
+  def ensure_specs specs # :nodoc:
     return unless specs.empty?
 
     patterns = options[:args].join ','
@@ -155,7 +155,7 @@ use with other commands.
   def print_dependencies(spec, level = 0) # :nodoc:
     response = String.new
     response << '  ' * level + "Gem #{spec.full_name}\n"
-    unless spec.dependencies.empty?
+    unless spec.dependencies.empty? then
       spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
         response << '  ' * level + "  #{dep}\n"
       end
@@ -163,7 +163,7 @@ use with other commands.
     response
   end
 
-  def remote_specs(dependency) # :nodoc:
+  def remote_specs dependency # :nodoc:
     fetcher = Gem::SpecFetcher.fetcher
 
     ss, _ = fetcher.spec_for_dependency dependency
@@ -171,7 +171,7 @@ use with other commands.
     ss.map { |s,o| s }
   end
 
-  def reverse_dependencies(specs) # :nodoc:
+  def reverse_dependencies specs # :nodoc:
     reverse = Hash.new { |h, k| h[k] = [] }
 
     return reverse unless options[:reverse_dependencies]
@@ -186,7 +186,7 @@ use with other commands.
   ##
   # Returns an Array of [specification, dep] that are satisfied by +spec+.
 
-  def find_reverse_dependencies(spec) # :nodoc:
+  def find_reverse_dependencies spec # :nodoc:
     result = []
 
     Gem::Specification.each do |sp|
@@ -194,7 +194,7 @@ use with other commands.
         dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
 
         if spec.name == dep.name and
-           dep.requirement.satisfied_by?(spec.version)
+           dep.requirement.satisfied_by?(spec.version) then
           result << [sp.full_name, dep]
         end
       end
@@ -205,10 +205,10 @@ use with other commands.
 
   private
 
-  def name_pattern(args)
+  def name_pattern args
     args << '' if args.empty?
 
-    if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m
+    if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m then
       flags = $2 ? Regexp::IGNORECASE : nil
       Regexp.new $1, flags
     else
diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
index 11fb45f68d..e825c761ad 100644
--- a/lib/rubygems/commands/environment_command.rb
+++ b/lib/rubygems/commands/environment_command.rb
@@ -97,7 +97,7 @@ lib/rubygems/defaults/operating_system.rb
     true
   end
 
-  def add_path(out, path)
+  def add_path out, path
     path.each do |component|
       out << "     - #{component}\n"
     end
@@ -120,8 +120,6 @@ lib/rubygems/defaults/operating_system.rb
 
     out << "  - RUBY EXECUTABLE: #{Gem.ruby}\n"
 
-    out << "  - GIT EXECUTABLE: #{git_path}\n"
-
     out << "  - EXECUTABLE DIRECTORY: #{Gem.bindir}\n"
 
     out << "  - SPEC CACHE DIRECTORY: #{Gem.spec_cache_dir}\n"
@@ -159,21 +157,4 @@ lib/rubygems/defaults/operating_system.rb
     out
   end
 
-  private
-
-  ##
-  # Git binary path
-
-  def git_path
-    exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-    ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-      exts.each do |ext|
-        exe = File.join(path, "git#{ext}")
-        return exe if File.executable?(exe) && !File.directory?(exe)
-      end
-    end
-
-    return nil
-  end
-
 end
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
index 66562d7fb7..19559a7774 100644
--- a/lib/rubygems/commands/fetch_command.rb
+++ b/lib/rubygems/commands/fetch_command.rb
@@ -56,14 +56,14 @@ then repackaging it.
       specs_and_sources, errors =
         Gem::SpecFetcher.fetcher.spec_for_dependency dep
 
-      if platform
+      if platform then
         filtered = specs_and_sources.select { |s,| s.platform == platform }
         specs_and_sources = filtered unless filtered.empty?
       end
 
       spec, source = specs_and_sources.max_by { |s,| s.version }
 
-      if spec.nil?
+      if spec.nil? then
         show_lookup_failure gem_name, version, errors, options[:domain]
         next
       end
@@ -75,3 +75,4 @@ then repackaging it.
   end
 
 end
+
diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
index 941637ea9c..01f1f88405 100644
--- a/lib/rubygems/commands/generate_index_command.rb
+++ b/lib/rubygems/commands/generate_index_command.rb
@@ -67,13 +67,13 @@ Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
     options[:build_modern] = true
 
     if not File.exist?(options[:directory]) or
-       not File.directory?(options[:directory])
-      alert_error "unknown directory name #{options[:directory]}."
+       not File.directory?(options[:directory]) then
+      alert_error "unknown directory name #{directory}."
       terminate_interaction 1
     else
       indexer = Gem::Indexer.new options.delete(:directory), options
 
-      if options[:update]
+      if options[:update] then
         indexer.update_index
       else
         indexer.generate_index
@@ -82,3 +82,4 @@ Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
   end
 
 end
+
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
index 9f14e22f90..de3f175fad 100644
--- a/lib/rubygems/commands/help_command.rb
+++ b/lib/rubygems/commands/help_command.rb
@@ -4,7 +4,7 @@ require 'rubygems/command'
 class Gem::Commands::HelpCommand < Gem::Command
 
   # :stopdoc:
-  EXAMPLES = <<-EOF.freeze
+  EXAMPLES = <<-EOF
 Some examples of 'gem' usage.
 
 * Install 'rake', either from local directory or remote server:
@@ -53,7 +53,7 @@ Some examples of 'gem' usage.
     gem update --system
   EOF
 
-  GEM_DEPENDENCIES = <<-EOF.freeze
+  GEM_DEPENDENCIES = <<-EOF
 A gem dependencies file allows installation of a consistent set of gems across
 multiple environments.  The RubyGems implementation is designed to be
 compatible with Bundler's Gemfile format.  You can see additional
@@ -230,7 +230,7 @@ default.  This may be overridden with the :development_group option:
 
   EOF
 
-  PLATFORMS = <<-'EOF'.freeze
+  PLATFORMS = <<-'EOF'
 RubyGems platforms are composed of three parts, a CPU, an OS, and a
 version.  These values are taken from values in rbconfig.rb.  You can view
 your current platform by running `gem environment`.
@@ -277,7 +277,7 @@ platform.
     ["examples",         EXAMPLES],
     ["gem_dependencies", GEM_DEPENDENCIES],
     ["platforms",        PLATFORMS],
-  ].freeze
+  ]
   # :startdoc:
 
   def initialize
@@ -297,8 +297,8 @@ platform.
       begins? command, arg
     end
 
-    if help
-      if Symbol === help
+    if help then
+      if Symbol === help then
         send help
       else
         say help
@@ -306,10 +306,10 @@ platform.
       return
     end
 
-    if options[:help]
+    if options[:help] then
       show_help
 
-    elsif arg
+    elsif arg then
       show_command_help arg
 
     else
@@ -334,7 +334,7 @@ platform.
       command = @command_manager[cmd_name]
 
       summary =
-        if command
+        if command then
           command.summary
         else
           "[No command found for #{cmd_name}]"
@@ -356,19 +356,20 @@ platform.
     say out.join("\n")
   end
 
-  def show_command_help(command_name) # :nodoc:
+  def show_command_help command_name # :nodoc:
     command_name = command_name.downcase
 
     possibilities = @command_manager.find_command_possibilities command_name
 
-    if possibilities.size == 1
+    if possibilities.size == 1 then
       command = @command_manager[possibilities.first]
       command.invoke("--help")
-    elsif possibilities.size > 1
+    elsif possibilities.size > 1 then
       alert_warning "Ambiguous command #{command_name} (#{possibilities.join(', ')})"
     else
-      alert_warning "Unknown command #{command_name}. Try: gem help commands"
+      alert_warning "Unknown command #{command_name}.  Try: gem help commands"
     end
   end
 
 end
+
diff --git a/lib/rubygems/commands/info_command.rb b/lib/rubygems/commands/info_command.rb
deleted file mode 100644
index 8d9611a957..0000000000
--- a/lib/rubygems/commands/info_command.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems/command'
-require 'rubygems/commands/query_command'
-
-class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand
-  def initialize
-    super "info", "Show information for the given gem"
-
-    remove_option('--name-matches')
-    remove_option('-d')
-
-    defaults[:details] = true
-    defaults[:exact] = true
-  end
-
-  def description # :nodoc:
-    "Info prints information about the gem such as name,"\
-    " description, website, license and installed paths"
-  end
-
-  def usage # :nodoc:
-    "#{program_name} GEMNAME"
-  end
-
-  def arguments # :nodoc:
-    "GEMNAME        name of the gem to print information about"
-  end
-
-  def defaults_str
-    "--local"
-  end
-end
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index 776b58651f..3a7d50517f 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -117,13 +117,6 @@ to write the specification by hand.  For example:
   some_extension_gem (1.0)
   $
 
-Command Alias
-==========================
-
-You can use `i` command instead of `install`.
-
-  $ gem i GEMNAME
-
     EOF
   end
 
@@ -132,7 +125,7 @@ You can use `i` command instead of `install`.
   end
 
   def check_install_dir # :nodoc:
-    if options[:install_dir] and options[:user_install]
+    if options[:install_dir] and options[:user_install] then
       alert_error "Use --install-dir or --user-install but not both"
       terminate_interaction 1
     end
@@ -140,22 +133,22 @@ You can use `i` command instead of `install`.
 
   def check_version # :nodoc:
     if options[:version] != Gem::Requirement.default and
-         get_all_gem_names.size > 1
-      alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
-                  " version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
+         get_all_gem_names.size > 1 then
+      alert_error "Can't use --version w/ multiple gems. Use name:ver instead."
       terminate_interaction 1
     end
   end
 
   def execute
-    if options.include? :gemdeps
+
+    if options.include? :gemdeps then
       install_from_gemdeps
       return # not reached
     end
 
     @installed_specs = []
 
-    ENV.delete 'GEM_PATH' if options[:install_dir].nil?
+    ENV.delete 'GEM_PATH' if options[:install_dir].nil? and RUBY_VERSION > '1.9'
 
     check_install_dir
     check_version
@@ -188,13 +181,13 @@ You can use `i` command instead of `install`.
     terminate_interaction
   end
 
-  def install_gem(name, version) # :nodoc:
+  def install_gem name, version # :nodoc:
     return if options[:conservative] and
       not Gem::Dependency.new(name, version).matching_specs.empty?
 
     req = Gem::Requirement.create(version)
 
-    if options[:ignore_dependencies]
+    if options[:ignore_dependencies] then
       install_gem_without_dependencies name, req
     else
       inst = Gem::DependencyInstaller.new options
@@ -216,11 +209,11 @@ You can use `i` command instead of `install`.
     end
   end
 
-  def install_gem_without_dependencies(name, req) # :nodoc:
+  def install_gem_without_dependencies name, req # :nodoc:
     gem = nil
 
-    if local?
-      if name =~ /\.gem$/ and File.file? name
+    if local? then
+      if name =~ /\.gem$/ and File.file? name then
         source = Gem::Source::SpecificFile.new name
         spec = source.spec
       else
@@ -230,7 +223,7 @@ You can use `i` command instead of `install`.
       gem = source.download spec if spec
     end
 
-    if remote? and not gem
+    if remote? and not gem then
       dependency = Gem::Dependency.new name, req
       dependency.prerelease = options[:prerelease]
 
@@ -257,23 +250,18 @@ You can use `i` command instead of `install`.
 
     get_all_gem_names_and_versions.each do |gem_name, gem_version|
       gem_version ||= options[:version]
-      domain = options[:domain]
-      domain = :local unless options[:suggest_alternate]
 
       begin
         install_gem gem_name, gem_version
       rescue Gem::InstallError => e
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
         exit_code |= 1
-      rescue Gem::GemNotFoundException => e
+      rescue Gem::GemNotFoundException, Gem::UnsatisfiableDependencyError => e
+        domain = options[:domain]
+        domain = :local unless options[:suggest_alternate]
         show_lookup_failure e.name, e.version, e.errors, domain
 
         exit_code |= 2
-      rescue Gem::UnsatisfiableDependencyError => e
-        show_lookup_failure e.name, e.version, e.errors, domain,
-                            "'#{gem_name}' (#{gem_version})"
-
-        exit_code |= 2
       end
     end
 
@@ -292,7 +280,7 @@ You can use `i` command instead of `install`.
     require 'rubygems/rdoc'
   end
 
-  def show_install_errors(errors) # :nodoc:
+  def show_install_errors errors # :nodoc:
     return unless errors
 
     errors.each do |x|
@@ -312,3 +300,4 @@ You can use `i` command instead of `install`.
   end
 
 end
+
diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb
index cd21543537..1acb49e5fb 100644
--- a/lib/rubygems/commands/list_command.rb
+++ b/lib/rubygems/commands/list_command.rb
@@ -38,3 +38,4 @@ To search for remote gems use the search command.
   end
 
 end
+
diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb
index 7f02e9feda..3eebfadc05 100644
--- a/lib/rubygems/commands/lock_command.rb
+++ b/lib/rubygems/commands/lock_command.rb
@@ -59,7 +59,7 @@ lock it down to the exact version.
   end
 
   def complain(message)
-    if options[:strict]
+    if options[:strict] then
       raise Gem::Exception, message
     else
       say "# #{message}"
@@ -78,7 +78,7 @@ lock it down to the exact version.
 
       spec = Gem::Specification.load spec_path(full_name)
 
-      if spec.nil?
+      if spec.nil? then
         complain "Could not find gem #{full_name}, try using the full name"
         next
       end
@@ -90,7 +90,7 @@ lock it down to the exact version.
         next if locked[dep.name]
         candidates = dep.matching_specs
 
-        if candidates.empty?
+        if candidates.empty? then
           complain "Unable to satisfy '#{dep}' from currently installed gems"
         else
           pending << candidates.last.full_name
@@ -108,3 +108,4 @@ lock it down to the exact version.
   end
 
 end
+
diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb
index 2794fe05e6..a89b7421e3 100644
--- a/lib/rubygems/commands/open_command.rb
+++ b/lib/rubygems/commands/open_command.rb
@@ -11,9 +11,9 @@ class Gem::Commands::OpenCommand < Gem::Command
   def initialize
     super 'open', 'Open gem sources in editor'
 
-    add_option('-e', '--editor COMMAND', String,
-               "Prepends COMMAND to gem path. Could be used to specify editor.") do |command, options|
-      options[:editor] = command || get_env_editor
+    add_option('-e', '--editor EDITOR', String,
+               "Opens gem sources in EDITOR") do |editor, options|
+      options[:editor] = editor || get_env_editor
     end
     add_option('-v', '--version VERSION', String,
                "Opens specific gem version") do |version|
@@ -32,14 +32,14 @@ class Gem::Commands::OpenCommand < Gem::Command
   def description # :nodoc:
     <<-EOF
         The open command opens gem in editor and changes current path
-        to gem's source directory.
-        Editor command can be specified with -e option, otherwise rubygems
-        will look for editor in $EDITOR, $VISUAL and $GEM_EDITOR variables.
+        to gem's source directory. Editor can be specified with -e option,
+        otherwise rubygems will look for editor in $EDITOR, $VISUAL and
+        $GEM_EDITOR variables.
     EOF
   end
 
   def usage # :nodoc:
-    "#{program_name} GEMNAME [-e COMMAND]"
+    "#{program_name} GEMNAME [-e EDITOR]"
   end
 
   def get_env_editor
@@ -58,27 +58,21 @@ class Gem::Commands::OpenCommand < Gem::Command
     terminate_interaction 1 unless found
   end
 
-  def open_gem(name)
+  def open_gem name
     spec = spec_for name
-
     return false unless spec
 
-    if spec.default_gem?
-      say "'#{name}' is a default gem and can't be opened."
-      return false
-    end
-
     open_editor(spec.full_gem_path)
   end
 
-  def open_editor(path)
+  def open_editor path
     Dir.chdir(path) do
       system(*@editor.split(/\s+/) + [path])
     end
   end
 
-  def spec_for(name)
-    spec = Gem::Specification.find_all_by_name(name, @version).first
+  def spec_for name
+    spec = Gem::Specification.find_all_by_name(name, @version).last
 
     return spec if spec
 
diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
index 22b7327683..4b99434e87 100644
--- a/lib/rubygems/commands/owner_command.rb
+++ b/lib/rubygems/commands/owner_command.rb
@@ -2,11 +2,8 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/gemcutter_utilities'
-require 'rubygems/text'
 
 class Gem::Commands::OwnerCommand < Gem::Command
-
-  include Gem::Text
   include Gem::LocalRemoteOptions
   include Gem::GemcutterUtilities
 
@@ -33,7 +30,6 @@ permission to.
     super 'owner', 'Manage gem owners of a gem on the push server'
     add_proxy_option
     add_key_option
-    add_otp_option
     defaults.merge! :add => [], :remove => []
 
     add_option '-a', '--add EMAIL', 'Add an owner' do |value, options|
@@ -44,9 +40,7 @@ permission to.
       options[:remove] << value
     end
 
-    add_option '-h', '--host HOST',
-               'Use another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)' do |value, options|
+    add_option '-h', '--host HOST', 'Use another gemcutter-compatible host' do |value, options|
       options[:host] = value
     end
   end
@@ -62,13 +56,13 @@ permission to.
     show_owners   name
   end
 
-  def show_owners(name)
+  def show_owners name
     response = rubygems_api_request :get, "api/v1/gems/#{name}/owners.yaml" do |request|
       request.add_field "Authorization", api_key
     end
 
     with_response response do |resp|
-      owners = Gem::SafeYAML.load clean_text(resp.body)
+      owners = YAML.load resp.body
 
       say "Owners for gem: #{name}"
       owners.each do |owner|
@@ -77,21 +71,20 @@ permission to.
     end
   end
 
-  def add_owners(name, owners)
+  def add_owners name, owners
     manage_owners :post, name, owners
   end
 
-  def remove_owners(name, owners)
+  def remove_owners name, owners
     manage_owners :delete, name, owners
   end
 
-  def manage_owners(method, name, owners)
+  def manage_owners method, name, owners
     owners.each do |owner|
       begin
-        response = send_owner_request(method, name, owner)
-
-        if need_otp? response
-          response = send_owner_request(method, name, owner, true)
+        response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
+          request.set_form_data 'email' => owner
+          request.add_field "Authorization", api_key
         end
 
         action = method == :delete ? "Removing" : "Adding"
@@ -103,14 +96,4 @@ permission to.
     end
   end
 
-  private
-
-  def send_owner_request(method, name, owner, use_otp = false)
-    rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
-      request.set_form_data 'email' => owner
-      request.add_field "Authorization", api_key
-      request.add_field "OTP", options[:otp] if use_otp
-    end
-  end
-
 end
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 41decde856..6cab572b86 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -24,8 +24,7 @@ class Gem::Commands::PristineCommand < Gem::Command
 
     add_option('--skip=gem_name',
                'used on --all, skip if name == gem_name') do |value, options|
-      options[:skip] ||= []
-      options[:skip] << value
+      options[:skip] = value
     end
 
     add_option('--[no-]extensions',
@@ -46,12 +45,6 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:env_shebang] = value
     end
 
-    add_option('-n', '--bindir DIR',
-               'Directory where executables are',
-               'located') do |value, options|
-      options[:bin_dir] = File.expand_path(value)
-    end
-
     add_version_option('restore to', 'pristine condition')
   end
 
@@ -88,13 +81,13 @@ extensions will be restored.
   end
 
   def execute
-    specs = if options[:all]
+    specs = if options[:all] then
               Gem::Specification.map
 
             # `--extensions` must be explicitly given to pristine only gems
             # with extensions.
             elsif options[:extensions_set] and
-                  options[:extensions] and options[:args].empty?
+                  options[:extensions] and options[:args].empty? then
               Gem::Specification.select do |spec|
                 spec.extensions and not spec.extensions.empty?
               end
@@ -104,7 +97,7 @@ extensions will be restored.
               end.flatten
             end
 
-    if specs.to_a.empty?
+    if specs.to_a.empty? then
       raise Gem::Exception,
             "Failed to find gems #{options[:args]} #{options[:version]}"
     end
@@ -122,21 +115,24 @@ extensions will be restored.
         next
       end
 
-      if options.has_key? :skip
-        if options[:skip].include? spec.name
-          say "Skipped #{spec.full_name}, it was given through options"
-          next
-        end
+      if spec.name == options[:skip]
+        say "Skipped #{spec.full_name}, it was given through options"
+        next
       end
 
-      unless spec.extensions.empty? or options[:extensions] or options[:only_executables]
+      if spec.bundled_gem_in_old_ruby?
+        say "Skipped #{spec.full_name}, it is bundled with old Ruby"
+        next
+      end
+
+      unless spec.extensions.empty? or options[:extensions] then
         say "Skipped #{spec.full_name}, it needs to compile an extension"
         next
       end
 
       gem = spec.cache_file
 
-      unless File.exist? gem or options[:only_executables]
+      unless File.exist? gem then
         require 'rubygems/remote_fetcher'
 
         say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
@@ -154,29 +150,23 @@ extensions will be restored.
       end
 
       env_shebang =
-        if options.include? :env_shebang
+        if options.include? :env_shebang then
           options[:env_shebang]
         else
           install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
           install_defaults.to_s['--env-shebang']
         end
 
-      bin_dir = options[:bin_dir] if options[:bin_dir]
-
-      installer_options = {
-        :wrappers => true,
-        :force => true,
-        :install_dir => spec.base_dir,
-        :env_shebang => env_shebang,
-        :build_args => spec.build_args,
-        :bin_dir => bin_dir
-      }
+      installer = Gem::Installer.at(gem,
+                                     :wrappers => true,
+                                     :force => true,
+                                     :install_dir => spec.base_dir,
+                                     :env_shebang => env_shebang,
+                                     :build_args => spec.build_args)
 
-      if options[:only_executables]
-        installer = Gem::Installer.for_spec(spec, installer_options)
+      if options[:only_executables] then
         installer.generate_bin
       else
-        installer = Gem::Installer.at(gem, installer_options)
         installer.install
       end
 
diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb
index 3ea4703a3e..6adeff6b30 100644
--- a/lib/rubygems/commands/push_command.rb
+++ b/lib/rubygems/commands/push_command.rb
@@ -13,7 +13,7 @@ class Gem::Commands::PushCommand < Gem::Command
 The push command uploads a gem to the push server (the default is
 https://rubygems.org) and adds it to the index.
 
-The gem can be removed from the index and deleted from the server using the yank
+The gem can be removed from the index (but only the index) using the yank
 command.  For further discussion see the help for the yank command.
     EOF
   end
@@ -29,58 +29,33 @@ command.  For further discussion see the help for the yank command.
   def initialize
     super 'push', 'Push a gem up to the gem server', :host => self.host
 
-    @user_defined_host = false
-
     add_proxy_option
     add_key_option
-    add_otp_option
 
     add_option('--host HOST',
-               'Push to another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)') do |value, options|
+               'Push to another gemcutter-compatible host') do |value, options|
       options[:host] = value
-      @user_defined_host = true
     end
 
     @host = nil
   end
 
   def execute
-    gem_name = get_one_gem_name
-    default_gem_server, push_host = get_hosts_for(gem_name)
-
-    default_host = nil
-    user_defined_host = nil
-
-    if @user_defined_host
-      user_defined_host = options[:host]
-    else
-      default_host = options[:host]
-    end
-
-    @host = if user_defined_host
-              user_defined_host
-            elsif default_gem_server
-              default_gem_server
-            elsif push_host
-              push_host
-            else
-              default_host
-            end
+    @host = options[:host]
 
     sign_in @host
 
-    send_gem(gem_name)
+    send_gem get_one_gem_name
   end
 
-  def send_gem(name)
+  def send_gem name
     args = [:post, "api/v1/gems"]
 
     latest_rubygems_version = Gem.latest_rubygems_version
 
     if latest_rubygems_version < Gem.rubygems_version and
          Gem.rubygems_version.prerelease? and
-         Gem::Version.new('2.0.0.rc.2') != Gem.rubygems_version
+         Gem::Version.new('2.0.0.rc.2') != Gem.rubygems_version then
       alert_error <<-ERROR
 You are using a beta release of RubyGems (#{Gem::VERSION}) which is not
 allowed to push gems.  Please downgrade or upgrade to a release version.
@@ -97,7 +72,7 @@ You can upgrade or downgrade to the latest release version with:
 
     gem_data = Gem::Package.new(name)
 
-    unless @host
+    unless @host then
       @host = gem_data.spec.metadata['default_gem_server']
     end
 
@@ -114,33 +89,15 @@ You can upgrade or downgrade to the latest release version with:
 
     say "Pushing gem to #{@host || Gem.host}..."
 
-    response = send_push_request(name, args)
-
-    if need_otp? response
-      response = send_push_request(name, args, true)
-    end
-
-    with_response response
-  end
-
-  private
-
-  def send_push_request(name, args, use_otp = false)
-    rubygems_api_request(*args) do |request|
+    response = rubygems_api_request(*args) do |request|
       request.body = Gem.read_binary name
       request.add_field "Content-Length", request.body.size
       request.add_field "Content-Type",   "application/octet-stream"
       request.add_field "Authorization",  api_key
-      request.add_field "OTP", options[:otp] if use_otp
     end
-  end
 
-  def get_hosts_for(name)
-    gem_metadata = Gem::Package.new(name).spec.metadata
-
-    [
-      gem_metadata["default_gem_server"],
-      gem_metadata["allowed_push_host"]
-    ]
+    with_response response
   end
+
 end
+
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
index d947d588ef..f25d120b88 100644
--- a/lib/rubygems/commands/query_command.rb
+++ b/lib/rubygems/commands/query_command.rb
@@ -86,13 +86,13 @@ is too hard to use.
       name = Array(options[:name])
     else
       args = options[:args].to_a
-      name = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i }
+      name = options[:exact] ? args : args.map{|arg| /#{arg}/i }
     end
 
     prerelease = options[:prerelease]
 
-    unless options[:installed].nil?
-      if no_name
+    unless options[:installed].nil? then
+      if no_name then
         alert_error "You must specify a gem name"
         exit_code |= 4
       elsif name.count > 1
@@ -102,7 +102,7 @@ is too hard to use.
         installed = installed? name.first, options[:version]
         installed = !installed unless options[:installed]
 
-        if installed
+        if installed then
           say "true"
         else
           say "false"
@@ -119,8 +119,8 @@ is too hard to use.
 
   private
 
-  def display_header(type)
-    if (ui.outs.tty? and Gem.configuration.verbose) or both?
+  def display_header type
+    if (ui.outs.tty? and Gem.configuration.verbose) or both? then
       say
       say "*** #{type} GEMS ***"
       say
@@ -128,14 +128,14 @@ is too hard to use.
   end
 
   #Guts of original execute
-  def show_gems(name, prerelease)
+  def show_gems name, prerelease
     req = Gem::Requirement.default
     # TODO: deprecate for real
     dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req }
     dep.prerelease = prerelease
 
-    if local?
-      if prerelease and not both?
+    if local? then
+      if prerelease and not both? then
         alert_warning "prereleases are always shown locally"
       end
 
@@ -152,7 +152,7 @@ is too hard to use.
       output_query_results spec_tuples
     end
 
-    if remote?
+    if remote? then
       display_header 'REMOTE'
 
       fetcher = Gem::SpecFetcher.fetcher
@@ -205,7 +205,7 @@ is too hard to use.
     say output.join(options[:details] ? "\n\n" : "\n")
   end
 
-  def output_versions(output, versions)
+  def output_versions output, versions
     versions.each do |gem_name, matching_tuples|
       matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse
 
@@ -218,7 +218,7 @@ is too hard to use.
       seen = {}
 
       matching_tuples.delete_if do |n,_|
-        if seen[n.version]
+        if seen[n.version] then
           true
         else
           seen[n.version] = true
@@ -226,11 +226,11 @@ is too hard to use.
         end
       end
 
-      output << clean_text(make_entry(matching_tuples, platforms))
+      output << make_entry(matching_tuples, platforms)
     end
   end
 
-  def entry_details(entry, detail_tuple, specs, platforms)
+  def entry_details entry, detail_tuple, specs, platforms
     return unless options[:details]
 
     name_tuple, spec = detail_tuple
@@ -247,36 +247,37 @@ is too hard to use.
     spec_summary     entry, spec
   end
 
-  def entry_versions(entry, name_tuples, platforms, specs)
+  def entry_versions entry, name_tuples, platforms, specs
     return unless options[:versions]
 
     list =
-      if platforms.empty? or options[:details]
+      if platforms.empty? or options[:details] then
         name_tuples.map { |n| n.version }.uniq
       else
         platforms.sort.reverse.map do |version, pls|
-          out = version.to_s
-
-          if options[:domain] == :local
-            default = specs.any? do |s|
-              !s.is_a?(Gem::Source) && s.version == version && s.default_gem?
+          if pls == [Gem::Platform::RUBY] then
+            if options[:domain] == :remote || specs.all? { |spec| spec.is_a? Gem::Source }
+              version
+            else
+              spec = specs.select { |s| s.version == version }
+              if spec.first.default_gem?
+                "default: #{version}"
+              else
+                version
+              end
             end
-            out = "default: #{out}" if default
-          end
-
-          if pls != [Gem::Platform::RUBY]
-            platform_list = [pls.delete(Gem::Platform::RUBY), *pls.sort].compact
-            out = platform_list.unshift(out).join(' ')
+          else
+            ruby = pls.delete Gem::Platform::RUBY
+            platform_list = [ruby, *pls.sort].compact
+            "#{version} #{platform_list.join ' '}"
           end
-
-          out
         end
       end
 
     entry << " (#{list.join ', '})"
   end
 
-  def make_entry(entry_tuples, platforms)
+  def make_entry entry_tuples, platforms
     detail_tuple = entry_tuples.first
 
     name_tuples, specs = entry_tuples.flatten.partition do |item|
@@ -291,19 +292,19 @@ is too hard to use.
     entry.join
   end
 
-  def spec_authors(entry, spec)
+  def spec_authors entry, spec
     authors = "Author#{spec.authors.length > 1 ? 's' : ''}: ".dup
     authors << spec.authors.join(', ')
     entry << format_text(authors, 68, 4)
   end
 
-  def spec_homepage(entry, spec)
+  def spec_homepage entry, spec
     return if spec.homepage.nil? or spec.homepage.empty?
 
     entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
   end
 
-  def spec_license(entry, spec)
+  def spec_license entry, spec
     return if spec.license.nil? or spec.license.empty?
 
     licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: ".dup
@@ -311,10 +312,10 @@ is too hard to use.
     entry << "\n" << format_text(licenses, 68, 4)
   end
 
-  def spec_loaded_from(entry, spec, specs)
+  def spec_loaded_from entry, spec, specs
     return unless spec.loaded_from
 
-    if specs.length == 1
+    if specs.length == 1 then
       default = spec.default_gem? ? ' (default)' : nil
       entry << "\n" << "    Installed at#{default}: #{spec.base_dir}"
     else
@@ -328,14 +329,14 @@ is too hard to use.
     end
   end
 
-  def spec_platforms(entry, platforms)
+  def spec_platforms entry, platforms
     non_ruby = platforms.any? do |_, pls|
       pls.any? { |pl| pl != Gem::Platform::RUBY }
     end
 
     return unless non_ruby
 
-    if platforms.length == 1
+    if platforms.length == 1 then
       title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
       entry << "    #{title}: #{platforms.values.sort.join ', '}\n"
     else
@@ -351,9 +352,8 @@ is too hard to use.
     end
   end
 
-  def spec_summary(entry, spec)
-    summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
-    entry << "\n\n" << format_text(summary, 68, 4)
+  def spec_summary entry, spec
+    entry << "\n\n" << format_text(spec.summary, 68, 4)
   end
 
 end
diff --git a/lib/rubygems/commands/rdoc_command.rb b/lib/rubygems/commands/rdoc_command.rb
index 5f8b72eb7a..6992040dca 100644
--- a/lib/rubygems/commands/rdoc_command.rb
+++ b/lib/rubygems/commands/rdoc_command.rb
@@ -60,7 +60,7 @@ Use --overwrite to force rebuilding of documentation.
   end
 
   def execute
-    specs = if options[:all]
+    specs = if options[:all] then
               Gem::Specification.to_a
             else
               get_all_gem_names.map do |name|
@@ -68,7 +68,7 @@ Use --overwrite to force rebuilding of documentation.
               end.flatten.uniq
             end
 
-    if specs.empty?
+    if specs.empty? then
       alert_error 'No matching gems found'
       terminate_interaction 1
     end
@@ -78,7 +78,7 @@ Use --overwrite to force rebuilding of documentation.
 
       doc.force = options[:overwrite]
 
-      if options[:overwrite]
+      if options[:overwrite] then
         FileUtils.rm_rf File.join(spec.doc_dir, 'ri')
         FileUtils.rm_rf File.join(spec.doc_dir, 'rdoc')
       end
@@ -94,3 +94,4 @@ Use --overwrite to force rebuilding of documentation.
   end
 
 end
+
diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
index c9cb1f2d43..933436d84d 100644
--- a/lib/rubygems/commands/search_command.rb
+++ b/lib/rubygems/commands/search_command.rb
@@ -38,3 +38,4 @@ To list local gems use the list command.
   end
 
 end
+
diff --git a/lib/rubygems/commands/server_command.rb b/lib/rubygems/commands/server_command.rb
index e91a8e5176..245156d50d 100644
--- a/lib/rubygems/commands/server_command.rb
+++ b/lib/rubygems/commands/server_command.rb
@@ -9,7 +9,7 @@ class Gem::Commands::ServerCommand < Gem::Command
           :port => 8808, :gemdir => [], :daemon => false
 
     OptionParser.accept :Port do |port|
-      if port =~ /\A\d+\z/
+      if port =~ /\A\d+\z/ then
         port = Integer port
         raise OptionParser::InvalidArgument, "#{port}: not a port number" if
           port > 65535
@@ -84,3 +84,4 @@ You can set up a shortcut to gem server documentation using the URL:
   end
 
 end
+
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index c9c00b5be4..ebb08d24d7 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -6,10 +6,8 @@ require 'rubygems/command'
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
-  HISTORY_HEADER = /^===\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
-  VERSION_MATCHER = /^===\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
-
-  ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
+  HISTORY_HEADER = /^===\s*[\d.]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
+  VERSION_MATCHER = /^===\s*([\d.]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
 
   def initialize
     require 'tmpdir'
@@ -17,11 +15,10 @@ class Gem::Commands::SetupCommand < Gem::Command
     super 'setup', 'Install RubyGems',
           :format_executable => true, :document => %w[ri],
           :site_or_vendor => 'sitelibdir',
-          :destdir => '', :prefix => '', :previous_version => '',
-          :regenerate_binstubs => true
+          :destdir => '', :prefix => '', :previous_version => ''
 
     add_option '--previous-version=VERSION',
-               'Previous version of RubyGems',
+               'Previous version of rubygems',
                'Used for changelog processing' do |version, options|
       options[:previous_version] = version
     end
@@ -45,12 +42,12 @@ class Gem::Commands::SetupCommand < Gem::Command
 
     add_option '--[no-]format-executable',
                'Makes `gem` match ruby',
-               'If Ruby is ruby18, gem will be gem18' do |value, options|
+               'If ruby is ruby18, gem will be gem18' do |value, options|
       options[:format_executable] = value
     end
 
     add_option '--[no-]document [TYPES]', Array,
-               'Generate documentation for RubyGems',
+               'Generate documentation for RubyGems.',
                'List the documentation types you wish to',
                'generate.  For example: rdoc,ri' do |value, options|
       options[:document] = case value
@@ -62,7 +59,7 @@ class Gem::Commands::SetupCommand < Gem::Command
 
     add_option '--[no-]rdoc',
                'Generate RDoc documentation for RubyGems' do |value, options|
-      if value
+      if value then
         options[:document] << 'rdoc'
       else
         options[:document].delete 'rdoc'
@@ -73,7 +70,7 @@ class Gem::Commands::SetupCommand < Gem::Command
 
     add_option '--[no-]ri',
                'Generate RI documentation for RubyGems' do |value, options|
-      if value
+      if value then
         options[:document] << 'ri'
       else
         options[:document].delete 'ri'
@@ -82,31 +79,20 @@ class Gem::Commands::SetupCommand < Gem::Command
       options[:document].uniq!
     end
 
-    add_option '--[no-]regenerate-binstubs',
-               'Regenerate gem binstubs' do |value, options|
-      options[:regenerate_binstubs] = value
-    end
-
-    add_option('-E', '--[no-]env-shebang',
-               'Rewrite executables with a shebang',
-               'of /usr/bin/env') do |value, options|
-      options[:env_shebang] = value
-    end
-
     @verbose = nil
   end
 
   def check_ruby_version
     required_version = Gem::Requirement.new '>= 1.8.7'
 
-    unless required_version.satisfied_by? Gem.ruby_version
+    unless required_version.satisfied_by? Gem.ruby_version then
       alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
       terminate_interaction 1
     end
   end
 
   def defaults_str # :nodoc:
-    "--format-executable --document ri --regenerate-binstubs"
+    "--format-executable --document ri"
   end
 
   def description # :nodoc:
@@ -127,19 +113,12 @@ By default, this RubyGems will install gem as:
     EOF
   end
 
-  module MakeDirs
-    def mkdir_p(path, *opts)
-      super
-      (@mkdirs ||= []) << path
-    end
-  end
-
   def execute
     @verbose = Gem.configuration.really_verbose
 
     install_destdir = options[:destdir]
 
-    unless install_destdir.empty?
+    unless install_destdir.empty? then
       ENV['GEM_HOME'] ||= File.join(install_destdir,
                                     Gem.default_dir.gsub(/^[a-zA-Z]:/, ''))
     end
@@ -147,12 +126,11 @@ By default, this RubyGems will install gem as:
     check_ruby_version
 
     require 'fileutils'
-    if Gem.configuration.really_verbose
+    if Gem.configuration.really_verbose then
       extend FileUtils::Verbose
     else
       extend FileUtils
     end
-    extend MakeDirs
 
     lib_dir, bin_dir = make_destination_dirs install_destdir
 
@@ -164,23 +142,14 @@ By default, this RubyGems will install gem as:
 
     remove_old_lib_files lib_dir
 
-    install_default_bundler_gem
-
-    if mode = options[:dir_mode]
-      @mkdirs.uniq!
-      File.chmod(mode, @mkdirs)
-    end
-
     say "RubyGems #{Gem::VERSION} installed"
 
-    regenerate_binstubs if options[:regenerate_binstubs]
-
     uninstall_old_gemcutter
 
     documentation_success = install_rdoc
 
     say
-    if @verbose
+    if @verbose then
       say "-" * 78
       say
     end
@@ -201,14 +170,14 @@ By default, this RubyGems will install gem as:
     say @bin_file_names.map { |name| "\t#{name}\n" }
     say
 
-    unless @bin_file_names.grep(/#{File::SEPARATOR}gem$/)
+    unless @bin_file_names.grep(/#{File::SEPARATOR}gem$/) then
       say "If `gem` was installed by a previous RubyGems installation, you may need"
       say "to remove it by hand."
       say
     end
 
     if documentation_success
-      if options[:document].include? 'rdoc'
+      if options[:document].include? 'rdoc' then
         say "Rdoc documentation was installed. You may now invoke:"
         say "  gem server"
         say "and then peruse beautifully formatted documentation for your gems"
@@ -219,9 +188,9 @@ By default, this RubyGems will install gem as:
         say
       end
 
-      if options[:document].include? 'ri'
+      if options[:document].include? 'ri' then
         say "Ruby Interactive (ri) documentation was installed. ri is kind of like man "
-        say "pages for Ruby libraries. You may access it like this:"
+        say "pages for ruby libraries. You may access it like this:"
         say "  ri Classname"
         say "  ri Classname.class_method"
         say "  ri Classname#instance_method"
@@ -233,110 +202,85 @@ By default, this RubyGems will install gem as:
     end
   end
 
-
   def install_executables(bin_dir)
+    say "Installing gem executable" if @verbose
+
     @bin_file_names = []
 
-    prog_mode = options[:prog_mode] || 0755
+    Dir.chdir 'bin' do
+      bin_files = Dir['*']
 
-    executables = { 'gem' => 'bin' }
-    executables['bundler'] = 'bundler/exe' if Gem::USE_BUNDLER_FOR_GEMDEPS
-    executables.each do |tool, path|
-      say "Installing #{tool} executable" if @verbose
+      bin_files.delete 'update_rubygems'
 
-      Dir.chdir path do
-        bin_files = Dir['*']
+      bin_files.each do |bin_file|
+        bin_file_formatted = if options[:format_executable] then
+                               Gem.default_exec_format % bin_file
+                             else
+                               bin_file
+                             end
 
-        bin_files -= %w[update_rubygems bundler bundle_ruby]
+        dest_file = File.join bin_dir, bin_file_formatted
+        bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
 
-        bin_files.each do |bin_file|
-          bin_file_formatted = if options[:format_executable]
-                                 Gem.default_exec_format % bin_file
-                               else
-                                 bin_file
-                               end
+        begin
+          bin = File.readlines bin_file
+          bin[0] = "#!#{Gem.ruby}\n"
 
-          dest_file = File.join bin_dir, bin_file_formatted
-          bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
+          File.open bin_tmp_file, 'w' do |fp|
+            fp.puts bin.join
+          end
 
-          begin
-            bin = File.readlines bin_file
-            bin[0] = shebang
+          install bin_tmp_file, dest_file, :mode => 0755
+          @bin_file_names << dest_file
+        ensure
+          rm bin_tmp_file
+        end
 
-            File.open bin_tmp_file, 'w' do |fp|
-              fp.puts bin.join
-            end
+        next unless Gem.win_platform?
 
-            install bin_tmp_file, dest_file, :mode => prog_mode
-            @bin_file_names << dest_file
-          ensure
-            rm bin_tmp_file
-          end
+        begin
+          bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
 
-          next unless Gem.win_platform?
-
-          begin
-            bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
-
-            File.open bin_cmd_file, 'w' do |file|
-              file.puts <<-TEXT
-  @ECHO OFF
-  IF NOT "%~f0" == "~f0" GOTO :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-  GOTO :EOF
-  :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
-  TEXT
-            end
-
-            install bin_cmd_file, "#{dest_file}.bat", :mode => prog_mode
-          ensure
-            rm bin_cmd_file
+          File.open bin_cmd_file, 'w' do |file|
+            file.puts <<-TEXT
+@ECHO OFF
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
+TEXT
           end
+
+          install bin_cmd_file, "#{dest_file}.bat", :mode => 0755
+        ensure
+          rm bin_cmd_file
         end
       end
     end
   end
 
-  def shebang
-    if options[:env_shebang]
-      ruby_name = RbConfig::CONFIG['ruby_install_name']
-      @env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
-      "#!#{@env_path} #{ruby_name}\n"
-    else
-      "#!#{Gem.ruby}\n"
-    end
-  end
-
-  def install_file(file, dest_dir)
+  def install_file file, dest_dir
     dest_file = File.join dest_dir, file
     dest_dir = File.dirname dest_file
-    unless File.directory? dest_dir
-      mkdir_p dest_dir, :mode => 0755
-    end
+    mkdir_p dest_dir unless File.directory? dest_dir
 
-    install file, dest_file, :mode => options[:data_mode] || 0644
+    install file, dest_file, :mode => 0644
   end
 
   def install_lib(lib_dir)
-    libs = { 'RubyGems' => 'lib' }
-    libs['Bundler'] = 'bundler/lib' if Gem::USE_BUNDLER_FOR_GEMDEPS
-    libs.each do |tool, path|
-      say "Installing #{tool}" if @verbose
-
-      lib_files = rb_files_in path
-      lib_files.concat(template_files) if tool == 'Bundler'
+    say "Installing RubyGems" if @verbose
 
-      pem_files = pem_files_in path
+    lib_files = rb_files_in 'lib'
+    pem_files = pem_files_in 'lib'
 
-      Dir.chdir path do
-        lib_files.each do |lib_file|
-          install_file lib_file, lib_dir
-        end
+    Dir.chdir 'lib' do
+      lib_files.each do |lib_file|
+        install_file lib_file, lib_dir
+      end
 
-        pem_files.each do |pem_file|
-          install_file pem_file, lib_dir
-        end
+      pem_files.each do |pem_file|
+        install_file pem_file, lib_dir
       end
     end
   end
@@ -354,7 +298,7 @@ By default, this RubyGems will install gem as:
 
     if File.writable? gem_doc_dir and
        (not File.exist? rubygems_doc_dir or
-        File.writable? rubygems_doc_dir)
+        File.writable? rubygems_doc_dir) then
       say "Removing old RubyGems RDoc and ri" if @verbose
       Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
         rm_rf dir
@@ -374,7 +318,7 @@ By default, this RubyGems will install gem as:
       rdoc.generate
 
       return true
-    elsif @verbose
+    elsif @verbose then
       say "Skipping RDoc generation, #{gem_doc_dir} not writable"
       say "Set the GEM_HOME environment variable if you want RDoc generated"
     end
@@ -382,63 +326,6 @@ By default, this RubyGems will install gem as:
     return false
   end
 
-  def install_default_bundler_gem
-    return unless Gem::USE_BUNDLER_FOR_GEMDEPS
-
-    specs_dir = Gem::Specification.default_specifications_dir
-    specs_dir = File.join(options[:destdir], specs_dir) unless Gem.win_platform?
-    mkdir_p specs_dir, :mode => 0755
-
-    # Workaround for non-git environment.
-    gemspec = File.open('bundler/bundler.gemspec', 'rb'){|f| f.read.gsub(/`git ls-files -z`/, "''") }
-    File.open('bundler/bundler.gemspec', 'w'){|f| f.write gemspec }
-
-    bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
-    bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] }
-    bundler_spec.executables -= %w[bundler bundle_ruby]
-
-    # Remove bundler-*.gemspec in default specification directory.
-    Dir.entries(specs_dir).
-      select {|gs| gs.start_with?("bundler-") }.
-      each {|gs| File.delete(File.join(specs_dir, gs)) }
-
-    default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")
-    Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
-
-    bundler_spec = Gem::Specification.load(default_spec_path)
-
-    # Remove gemspec that was same version of vendored bundler.
-    normal_gemspec = File.join(Gem.default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
-    if File.file? normal_gemspec
-      File.delete normal_gemspec
-    end
-
-    # Remove gem files that were same version of vendored bundler.
-    if File.directory? bundler_spec.gems_dir
-      Dir.entries(bundler_spec.gems_dir).
-        select {|default_gem| File.basename(default_gem) == "bundler-#{bundler_spec.version}" }.
-        each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }
-    end
-
-    bundler_bin_dir = bundler_spec.bin_dir
-    bundler_bin_dir = File.join(options[:destdir], bundler_bin_dir) unless Gem.win_platform?
-    mkdir_p bundler_bin_dir, :mode => 0755
-    bundler_spec.executables.each do |e|
-      cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)
-    end
-
-    if Gem.win_platform?
-      require 'rubygems/installer'
-
-      installer = Gem::Installer.for_spec bundler_spec
-      bundler_spec.executables.each do |e|
-        installer.generate_windows_script e, bundler_spec.bin_dir
-      end
-    end
-
-    say "Bundler #{bundler_spec.version} installed"
-  end
-
   def make_destination_dirs(install_destdir)
     lib_dir, bin_dir = Gem.default_rubygems_dirs
 
@@ -446,8 +333,8 @@ By default, this RubyGems will install gem as:
       lib_dir, bin_dir = generate_default_dirs(install_destdir)
     end
 
-    mkdir_p lib_dir, :mode => 0755
-    mkdir_p bin_dir, :mode => 0755
+    mkdir_p lib_dir
+    mkdir_p bin_dir
 
     return lib_dir, bin_dir
   end
@@ -456,7 +343,7 @@ By default, this RubyGems will install gem as:
     prefix = options[:prefix]
     site_or_vendor = options[:site_or_vendor]
 
-    if prefix.empty?
+    if prefix.empty? then
       lib_dir = RbConfig::CONFIG[site_or_vendor]
       bin_dir = RbConfig::CONFIG['bindir']
     else
@@ -467,16 +354,16 @@ By default, this RubyGems will install gem as:
         # just in case Apple and RubyGems don't get this patched up proper.
         (prefix == RbConfig::CONFIG['libdir'] or
          # this one is important
-         prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby'))
-        lib_dir = RbConfig::CONFIG[site_or_vendor]
-        bin_dir = RbConfig::CONFIG['bindir']
+         prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby')) then
+         lib_dir = RbConfig::CONFIG[site_or_vendor]
+         bin_dir = RbConfig::CONFIG['bindir']
       else
         lib_dir = File.join prefix, 'lib'
         bin_dir = File.join prefix, 'bin'
       end
     end
 
-    unless install_destdir.empty?
+    unless install_destdir.empty? then
       lib_dir = File.join install_destdir, lib_dir.gsub(/^[a-zA-Z]:/, '')
       bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
     end
@@ -484,34 +371,18 @@ By default, this RubyGems will install gem as:
     [lib_dir, bin_dir]
   end
 
-  def pem_files_in(dir)
+  def pem_files_in dir
     Dir.chdir dir do
       Dir[File.join('**', '*pem')]
     end
   end
 
-  def rb_files_in(dir)
+  def rb_files_in dir
     Dir.chdir dir do
       Dir[File.join('**', '*rb')]
     end
   end
 
-  # for installation of bundler as default gems
-  def template_files
-    Dir.chdir "bundler/lib" do
-      (Dir[File.join('bundler', 'templates', '**', '{*,.*}')]).
-        select{|f| !File.directory?(f)}
-    end
-  end
-
-  # for cleanup old bundler files
-  def template_files_in(dir)
-    Dir.chdir dir do
-      (Dir[File.join('templates', '**', '{*,.*}')]).
-        select{|f| !File.directory?(f)}
-    end
-  end
-
   def remove_old_bin_files(bin_dir)
     old_bin_files = {
       'gem_mirror' => 'gem mirror',
@@ -526,7 +397,7 @@ By default, this RubyGems will install gem as:
       old_bin_path = File.join bin_dir, old_bin_file
       next unless File.exist? old_bin_path
 
-      deprecation_message = "`#{old_bin_file}` has been deprecated. Use `#{new_name}` instead."
+      deprecation_message = "`#{old_bin_file}` has been deprecated.  Use `#{new_name}` instead."
 
       File.open old_bin_path, 'w' do |fp|
         fp.write <<-EOF
@@ -544,29 +415,24 @@ abort "#{deprecation_message}"
     end
   end
 
-  def remove_old_lib_files(lib_dir)
-    lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' }
-    lib_dirs[File.join(lib_dir, 'bundler')] = 'bundler/lib/bundler' if Gem::USE_BUNDLER_FOR_GEMDEPS
-    lib_dirs.each do |old_lib_dir, new_lib_dir|
-      lib_files = rb_files_in(new_lib_dir)
-      lib_files.concat(template_files_in(new_lib_dir)) if new_lib_dir =~ /bundler/
+  def remove_old_lib_files lib_dir
+    rubygems_dir = File.join lib_dir, 'rubygems'
+    lib_files = rb_files_in 'lib/rubygems'
 
-      old_lib_files = rb_files_in(old_lib_dir)
-      old_lib_files.concat(template_files_in(old_lib_dir)) if old_lib_dir =~ /bundler/
+    old_lib_files = rb_files_in rubygems_dir
 
-      to_remove = old_lib_files - lib_files
+    to_remove = old_lib_files - lib_files
 
-      to_remove.delete_if do |file|
-        file.start_with? 'defaults'
-      end
+    to_remove.delete_if do |file|
+      file.start_with? 'defaults'
+    end
 
-      Dir.chdir old_lib_dir do
-        to_remove.each do |file|
-          FileUtils.rm_f file
+    Dir.chdir rubygems_dir do
+      to_remove.each do |file|
+        FileUtils.rm_f file
 
-          warn "unable to remove old file #{file} please remove it by hand" if
-            File.exist? file
-        end
+        warn "unable to remove old file #{file} please remove it by hand" if
+          File.exist? file
       end
     end
   end
@@ -575,10 +441,11 @@ abort "#{deprecation_message}"
     release_notes = File.join Dir.pwd, 'History.txt'
 
     release_notes =
-      if File.exist? release_notes
+      if File.exist? release_notes then
         history = File.read release_notes
 
-        history.force_encoding Encoding::UTF_8
+        history.force_encoding Encoding::UTF_8 if
+          Object.const_defined? :Encoding
 
         history = history.sub(/^# coding:.*?(?=^=)/m, '')
 
@@ -613,17 +480,5 @@ abort "#{deprecation_message}"
   rescue Gem::InstallError
   end
 
-  def regenerate_binstubs
-    require "rubygems/commands/pristine_command"
-    say "Regenerating binstubs"
-
-    args = %w[--all --only-executables --silent]
-    if options[:env_shebang]
-      args << "--env-shebang"
-    end
-
-    command = Gem::Commands::PristineCommand.new
-    command.invoke(*args)
-  end
-
 end
+
diff --git a/lib/rubygems/commands/signin_command.rb b/lib/rubygems/commands/signin_command.rb
deleted file mode 100644
index 0d527fc339..0000000000
--- a/lib/rubygems/commands/signin_command.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/gemcutter_utilities'
-
-class Gem::Commands::SigninCommand < Gem::Command
-  include Gem::GemcutterUtilities
-
-  def initialize
-    super 'signin', 'Sign in to any gemcutter-compatible host. '\
-          'It defaults to https://rubygems.org'
-
-    add_option('--host HOST', 'Push to another gemcutter-compatible host') do |value, options|
-      options[:host] = value
-    end
-
-    add_otp_option
-  end
-
-  def description # :nodoc:
-    'The signin command executes host sign in for a push server (the default is'\
-    ' https://rubygems.org). The host can be provided with the host flag or can'\
-    ' be inferred from the provided gem. Host resolution matches the resolution'\
-    ' strategy for the push command.'
-  end
-
-  def usage # :nodoc:
-    program_name
-  end
-
-  def execute
-    sign_in options[:host]
-  end
-
-end
diff --git a/lib/rubygems/commands/signout_command.rb b/lib/rubygems/commands/signout_command.rb
deleted file mode 100644
index 2d7329c590..0000000000
--- a/lib/rubygems/commands/signout_command.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems/command'
-
-class Gem::Commands::SignoutCommand < Gem::Command
-
-  def initialize
-    super 'signout', 'Sign out from all the current sessions.'
-  end
-
-  def description # :nodoc:
-    'The `signout` command is used to sign out from all current sessions,'\
-    ' allowing you to sign in using a different set of credentials.'
-  end
-
-  def usage # :nodoc:
-    program_name
-  end
-
-  def execute
-    credentials_path = Gem.configuration.credentials_path
-
-    if !File.exist?(credentials_path)
-      alert_error 'You are not currently signed in.'
-    elsif !File.writable?(credentials_path)
-      alert_error "File '#{Gem.configuration.credentials_path}' is read-only."\
-                  ' Please make sure it is writable.'
-    else
-      Gem.configuration.unset_api_key!
-      say 'You have successfully signed out from all sessions.'
-    end
-  end
-
-end
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
index af145fd7b4..9832afd214 100644
--- a/lib/rubygems/commands/sources_command.rb
+++ b/lib/rubygems/commands/sources_command.rb
@@ -38,13 +38,13 @@ class Gem::Commands::SourcesCommand < Gem::Command
     add_proxy_option
   end
 
-  def add_source(source_uri) # :nodoc:
+  def add_source source_uri # :nodoc:
     check_rubygems_https source_uri
 
     source = Gem::Source.new source_uri
 
     begin
-      if Gem.sources.include? source
+      if Gem.sources.include? source_uri then
         say "source #{source_uri} already present in the cache"
       else
         source.load_specs :released
@@ -62,11 +62,11 @@ class Gem::Commands::SourcesCommand < Gem::Command
     end
   end
 
-  def check_rubygems_https(source_uri) # :nodoc:
+  def check_rubygems_https source_uri # :nodoc:
     uri = URI source_uri
 
     if uri.scheme and uri.scheme.downcase == 'http' and
-       uri.host.downcase == 'rubygems.org'
+       uri.host.downcase == 'rubygems.org' then
       question = <<-QUESTION.chomp
 https://rubygems.org is recommended for security over #{uri}
 
@@ -81,10 +81,10 @@ Do you want to add this insecure source?
     path = Gem.spec_cache_dir
     FileUtils.rm_rf path
 
-    unless File.exist? path
+    unless File.exist? path then
       say "*** Removed specs cache ***"
     else
-      unless File.writable? path
+      unless File.writable? path then
         say "*** Unable to remove source cache (write protected) ***"
       else
         say "*** Unable to remove source cache ***"
@@ -175,8 +175,8 @@ To remove a source use the --remove argument:
     list if list?
   end
 
-  def remove_source(source_uri) # :nodoc:
-    unless Gem.sources.include? source_uri
+  def remove_source source_uri # :nodoc:
+    unless Gem.sources.include? source_uri then
       say "source #{source_uri} not present in cache"
     else
       Gem.sources.delete source_uri
@@ -195,12 +195,12 @@ To remove a source use the --remove argument:
     say "source cache successfully updated"
   end
 
-  def remove_cache_file(desc, path) # :nodoc:
+  def remove_cache_file desc, path # :nodoc:
     FileUtils.rm_rf path
 
-    if not File.exist?(path)
+    if not File.exist?(path) then
       say "*** Removed #{desc} source cache ***"
-    elsif not File.writable?(path)
+    elsif not File.writable?(path) then
       say "*** Unable to remove #{desc} source cache (write protected) ***"
     else
       say "*** Unable to remove #{desc} source cache ***"
@@ -208,3 +208,4 @@ To remove a source use the --remove argument:
   end
 
 end
+
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
index 56b9371686..ad8840adc2 100644
--- a/lib/rubygems/commands/specification_command.rb
+++ b/lib/rubygems/commands/specification_command.rb
@@ -75,7 +75,7 @@ Specific fields in the specification can be extracted in YAML format:
     specs = []
     gem = options[:args].shift
 
-    unless gem
+    unless gem then
       raise Gem::CommandLineError,
             "Please specify a gem name or file on the command line"
     end
@@ -105,29 +105,29 @@ Specific fields in the specification can be extracted in YAML format:
     raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
       field and options[:format] == :ruby
 
-    if local?
-      if File.exist? gem
+    if local? then
+      if File.exist? gem then
         specs << Gem::Package.new(gem).spec rescue nil
       end
 
-      if specs.empty?
+      if specs.empty? then
         specs.push(*dep.matching_specs)
       end
     end
 
-    if remote?
+    if remote? then
       dep.prerelease = options[:prerelease]
       found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
 
       specs.push(*found.map { |spec,| spec })
     end
 
-    if specs.empty?
+    if specs.empty? then
       alert_error "No gem matching '#{dep}' found"
       terminate_interaction 1
     end
 
-    unless options[:all]
+    unless options[:all] then
       specs = [specs.max_by { |s| s.version }]
     end
 
diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
index 9de0ea722b..fe97790194 100644
--- a/lib/rubygems/commands/uninstall_command.rb
+++ b/lib/rubygems/commands/uninstall_command.rb
@@ -20,7 +20,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
 
     add_option('-a', '--[no-]all',
       'Uninstall all matching versions'
-    ) do |value, options|
+      ) do |value, options|
       options[:all] = value
     end
 
@@ -30,7 +30,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
       options[:ignore] = value
     end
 
-    add_option('-D', '--[no-]check-development',
+    add_option('-D', '--[no-]-check-development',
                'Check development dependencies while uninstalling',
                '(default: false)') do |value, options|
       options[:check_dev] = value
@@ -48,7 +48,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
     end
 
     add_option('-n', '--bindir DIR',
-               'Directory to remove executables from') do |value, options|
+               'Directory to remove binaries from') do |value, options|
       options[:bin_dir] = File.expand_path(value)
     end
 
@@ -81,7 +81,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
     add_option('--vendor',
                'Uninstall gem from the vendor directory.',
                'Only for use by gem repackagers.') do |value, options|
-      unless Gem.vendor_dir
+      unless Gem.vendor_dir then
         raise OptionParser::InvalidOption.new 'your platform is not supported'
       end
 
@@ -114,21 +114,10 @@ that is a dependency of an existing gem.  You can use the
     "#{program_name} GEMNAME [GEMNAME ...]"
   end
 
-  def check_version # :nodoc:
-    if options[:version] != Gem::Requirement.default and
-         get_all_gem_names.size > 1
-      alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
-                  " version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
-      terminate_interaction 1
-    end
-  end
-
   def execute
-    check_version
-
-    if options[:all] and not options[:args].empty?
+    if options[:all] and not options[:args].empty? then
       uninstall_specific
-    elsif options[:all]
+    elsif options[:all] then
       uninstall_all
     else
       uninstall_specific
@@ -140,7 +129,11 @@ that is a dependency of an existing gem.  You can use the
 
     specs.each do |spec|
       options[:version] = spec.version
-      uninstall_gem spec.name
+
+      begin
+        Gem::Uninstaller.new(spec.name, options).uninstall
+      rescue Gem::InstallError
+      end
     end
 
     alert "Uninstalled all gems in #{options[:install_dir]}"
@@ -149,40 +142,24 @@ that is a dependency of an existing gem.  You can use the
   def uninstall_specific
     deplist = Gem::DependencyList.new
 
-    get_all_gem_names_and_versions.each do |name, version|
-      requirement = Array(version || options[:version])
-      gem_specs = Gem::Specification.find_all_by_name(name, *requirement)
-      say("Gem '#{name}' is not installed") if gem_specs.empty?
-      gem_specs.each do |spec|
+    get_all_gem_names.uniq.each do |name|
+      Gem::Specification.find_all_by_name(name).each do |spec|
         deplist.add spec
       end
     end
 
     deps = deplist.strongly_connected_components.flatten.reverse
 
-    deps.each do |dep|
-      options[:version] = dep.version
-      uninstall_gem(dep.name)
+    deps.map(&:name).uniq.each do |gem_name|
+      begin
+        Gem::Uninstaller.new(gem_name, options).uninstall
+      rescue Gem::GemNotInHomeException => e
+        spec = e.spec
+        alert("In order to remove #{spec.name}, please execute:\n" +
+              "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
+      end
     end
   end
 
-  def uninstall_gem(gem_name)
-    uninstall(gem_name)
-  rescue Gem::InstallError
-    nil
-  rescue Gem::GemNotInHomeException => e
-    spec = e.spec
-    alert("In order to remove #{spec.name}, please execute:\n" +
-          "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
-  rescue Gem::UninstallError => e
-    spec = e.spec
-    alert_error("Error: unable to successfully uninstall '#{spec.name}' which is " +
-          "located at '#{spec.full_gem_path}'. This is most likely because" +
-          "the current user does not have the appropriate permissions")
-    terminate_interaction 1
-  end
-
-  def uninstall(gem_name)
-    Gem::Uninstaller.new(gem_name, options).uninstall
-  end
 end
+
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
index 4a1bd8a0d6..ffa429de6f 100644
--- a/lib/rubygems/commands/unpack_command.rb
+++ b/lib/rubygems/commands/unpack_command.rb
@@ -2,20 +2,11 @@
 require 'rubygems/command'
 require 'rubygems/installer'
 require 'rubygems/version_option'
-require 'rubygems/security_option'
 require 'rubygems/remote_fetcher'
 
-# forward-declare
-
-module Gem::Security # :nodoc:
-  class Policy # :nodoc:
-  end
-end
-
 class Gem::Commands::UnpackCommand < Gem::Command
 
   include Gem::VersionOption
-  include Gem::SecurityOption
 
   def initialize
     require 'fileutils'
@@ -33,7 +24,6 @@ class Gem::Commands::UnpackCommand < Gem::Command
       options[:spec] = true
     end
 
-    add_security_option
     add_version_option
   end
 
@@ -73,45 +63,33 @@ command help for an example.
   # at the same time.)
 
   def execute
-    security_policy = options[:security_policy]
-
     get_all_gem_names.each do |name|
       dependency = Gem::Dependency.new name, options[:version]
       path = get_path dependency
 
-      unless path
+      unless path then
         alert_error "Gem '#{name}' not installed nor fetchable."
         next
       end
 
-      if @options[:spec]
-        spec, metadata = get_metadata path, security_policy
+      if @options[:spec] then
+        spec, metadata = get_metadata path
 
-        if metadata.nil?
+        if metadata.nil? then
           alert_error "--spec is unsupported on '#{name}' (old format gem)"
           next
         end
 
         spec_file = File.basename spec.spec_file
 
-        FileUtils.mkdir_p @options[:target] if @options[:target]
-
-        destination = begin
-          if @options[:target]
-            File.join @options[:target], spec_file
-          else
-            spec_file
-          end
-        end
-
-        File.open destination, 'w' do |io|
+        open spec_file, 'w' do |io|
           io.write metadata
         end
       else
         basename = File.basename path, '.gem'
         target_dir = File.expand_path basename, options[:target]
 
-        package = Gem::Package.new path, security_policy
+        package = Gem::Package.new path
         package.extract_files target_dir
 
         say "Unpacked gem: '#{target_dir}'"
@@ -152,7 +130,7 @@ command help for an example.
   # TODO: It just uses Gem.dir for now.  What's an easy way to get the list of
   # source directories?
 
-  def get_path(dependency)
+  def get_path dependency
     return dependency.name if dependency.name =~ /\.gem$/i
 
     specs = dependency.matching_specs
@@ -180,20 +158,20 @@ command help for an example.
   #--
   # TODO move to Gem::Package as #raw_spec or something
 
-  def get_metadata(path, security_policy = nil)
-    format = Gem::Package.new path, security_policy
+  def get_metadata path
+    format = Gem::Package.new path
     spec = format.spec
 
     metadata = nil
 
-    File.open path, Gem.binary_mode do |io|
+    open path, Gem.binary_mode do |io|
       tar = Gem::Package::TarReader.new io
       tar.each_entry do |entry|
         case entry.full_name
         when 'metadata' then
           metadata = entry.read
         when 'metadata.gz' then
-          metadata = Gem::Util.gunzip entry.read
+          metadata = Gem.gunzip entry.read
         end
       end
     end
@@ -202,3 +180,4 @@ command help for an example.
   end
 
 end
+
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
index 9ab3b80e96..f3d70a92a6 100644
--- a/lib/rubygems/commands/update_command.rb
+++ b/lib/rubygems/commands/update_command.rb
@@ -68,9 +68,9 @@ command to remove old versions.
     "#{program_name} GEMNAME [GEMNAME ...]"
   end
 
-  def check_latest_rubygems(version) # :nodoc:
-    if Gem.rubygems_version == version
-      say "Latest version already installed. Done."
+  def check_latest_rubygems version # :nodoc:
+    if Gem.rubygems_version == version then
+      say "Latest version currently installed. Aborting."
       terminate_interaction
     end
 
@@ -78,40 +78,31 @@ command to remove old versions.
   end
 
   def check_update_arguments # :nodoc:
-    unless options[:args].empty?
+    unless options[:args].empty? then
       alert_error "Gem names are not allowed with the --system option"
       terminate_interaction 1
     end
   end
 
   def execute
-    if options[:system]
+
+    if options[:system] then
       update_rubygems
       return
     end
 
+    say "Updating installed gems"
+
     hig = highest_installed_gems
 
     gems_to_update = which_to_update hig, options[:args].uniq
 
-    if options[:explain]
-      say "Gems to update:"
-
-      gems_to_update.each do |(name, version)|
-        say "  #{name}-#{version}"
-      end
-
-      return
-    end
-
-    say "Updating installed gems"
-
     updated = update_gems gems_to_update
 
     updated_names = updated.map { |spec| spec.name }
     not_updated_names = options[:args].uniq - updated_names
 
-    if updated.empty?
+    if updated.empty? then
       say "Nothing to update"
     else
       say "Gems updated: #{updated_names.join(' ')}"
@@ -119,7 +110,7 @@ command to remove old versions.
     end
   end
 
-  def fetch_remote_gems(spec) # :nodoc:
+  def fetch_remote_gems spec # :nodoc:
     dependency = Gem::Dependency.new spec.name, "> #{spec.version}"
     dependency.prerelease = options[:prerelease]
 
@@ -138,7 +129,7 @@ command to remove old versions.
     hig = {} # highest installed gems
 
     Gem::Specification.each do |spec|
-      if hig[spec.name].nil? or hig[spec.name].version < spec.version
+      if hig[spec.name].nil? or hig[spec.name].version < spec.version then
         hig[spec.name] = spec
       end
     end
@@ -146,7 +137,7 @@ command to remove old versions.
     hig
   end
 
-  def highest_remote_version(spec) # :nodoc:
+  def highest_remote_version spec # :nodoc:
     spec_tuples = fetch_remote_gems spec
 
     matching_gems = spec_tuples.select do |g,_|
@@ -160,7 +151,7 @@ command to remove old versions.
     highest_remote_gem.first.version
   end
 
-  def install_rubygems(version) # :nodoc:
+  def install_rubygems version # :nodoc:
     args = update_rubygems_arguments
 
     update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
@@ -168,8 +159,12 @@ command to remove old versions.
     Dir.chdir update_dir do
       say "Installing RubyGems #{version}"
 
-      installed = system Gem.ruby, '--disable-gems', 'setup.rb', *args
+      # Make sure old rubygems isn't loaded
+      old = ENV["RUBYOPT"]
+      ENV.delete("RUBYOPT") if old
+      installed = system Gem.ruby, 'setup.rb', *args
       say "RubyGems system software updated" if installed
+      ENV["RUBYOPT"] = old if old
     end
   end
 
@@ -177,7 +172,7 @@ command to remove old versions.
     version = options[:system]
     update_latest = version == true
 
-    if update_latest
+    if update_latest then
       version     = Gem::Version.new     Gem::VERSION
       requirement = Gem::Requirement.new ">= #{Gem::VERSION}"
     else
@@ -196,7 +191,7 @@ command to remove old versions.
     gems_to_update = which_to_update hig, options[:args], :system
     _, up_ver   = gems_to_update.first
 
-    target = if update_latest
+    target = if update_latest then
                up_ver
              else
                version
@@ -205,7 +200,7 @@ command to remove old versions.
     return target, requirement
   end
 
-  def update_gem(name, version = Gem::Requirement.default)
+  def update_gem name, version = Gem::Requirement.default
     return if @updated.any? { |spec| spec.name == name }
 
     update_options = options.dup
@@ -225,7 +220,7 @@ command to remove old versions.
     end
   end
 
-  def update_gems(gems_to_update)
+  def update_gems gems_to_update
     gems_to_update.uniq.sort.each do |(name, version)|
       update_gem name, version
     end
@@ -264,7 +259,7 @@ command to remove old versions.
     args
   end
 
-  def which_to_update(highest_installed_gems, gem_names, system = false)
+  def which_to_update highest_installed_gems, gem_names, system = false
     result = []
 
     highest_installed_gems.each do |l_name, l_spec|
@@ -273,7 +268,7 @@ command to remove old versions.
 
       highest_remote_ver = highest_remote_version l_spec
 
-      if system or (l_spec.version < highest_remote_ver)
+      if system or (l_spec.version < highest_remote_ver) then
         result << [l_spec.name, [l_spec.version, highest_remote_ver].max]
       end
     end
diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
index 5c51ed72dd..c028d5d49f 100644
--- a/lib/rubygems/commands/which_command.rb
+++ b/lib/rubygems/commands/which_command.rb
@@ -44,8 +44,8 @@ requiring to see why it does not behave as you expect.
 
       spec = Gem::Specification.find_by_path arg
 
-      if spec
-        if options[:search_gems_first]
+      if spec then
+        if options[:search_gems_first] then
           dirs = spec.full_require_paths + $LOAD_PATH
         else
           dirs = $LOAD_PATH + spec.full_require_paths
@@ -55,8 +55,8 @@ requiring to see why it does not behave as you expect.
       # TODO: this is totally redundant and stupid
       paths = find_paths arg, dirs
 
-      if paths.empty?
-        alert_error "Can't find Ruby library file or shared library #{arg}"
+      if paths.empty? then
+        alert_error "Can't find ruby library file or shared library #{arg}"
 
         found &&= false
       else
@@ -73,7 +73,7 @@ requiring to see why it does not behave as you expect.
     dirs.each do |dir|
       Gem.suffixes.each do |ext|
         full_path = File.join dir, "#{package_name}#{ext}"
-        if File.exist? full_path and not File.directory? full_path
+        if File.exist? full_path and not File.directory? full_path then
           result << full_path
           return result unless options[:show_all]
         end
@@ -88,3 +88,4 @@ requiring to see why it does not behave as you expect.
   end
 
 end
+
diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb
index d13b674b48..0d6575b272 100644
--- a/lib/rubygems/commands/yank_command.rb
+++ b/lib/rubygems/commands/yank_command.rb
@@ -11,11 +11,19 @@ class Gem::Commands::YankCommand < Gem::Command
 
   def description # :nodoc:
     <<-EOF
-The yank command permanently removes a gem you pushed to a server.
+The yank command removes a gem you pushed to a server from the server's
+index.
+
+Note that if you push a gem to rubygems.org the yank command does not
+prevent other people from downloading the gem via the download link.
 
 Once you have pushed a gem several downloads will happen automatically
-via the webhooks. If you accidentally pushed passwords or other sensitive
+via the webhooks.  If you accidentally pushed passwords or other sensitive
 data you will need to change them immediately and yank your gem.
+
+If you are yanking a gem due to intellectual property reasons contact
+http://help.rubygems.org for permanent removal.  Be sure to mention this
+as the reason for the removal request.
     EOF
   end
 
@@ -34,8 +42,7 @@ data you will need to change them immediately and yank your gem.
     add_platform_option("remove")
 
     add_option('--host HOST',
-               'Yank from another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)') do |value, options|
+               'Yank from another gemcutter-compatible host') do |value, options|
       options[:host] = value
     end
 
@@ -51,7 +58,7 @@ data you will need to change them immediately and yank your gem.
     version   = get_version_from_requirements(options[:version])
     platform  = get_platform_from_requirements(options)
 
-    if version
+    if version then
       yank_gem(version, platform)
     else
       say "A version argument is required: #{usage}"
@@ -93,3 +100,4 @@ data you will need to change them immediately and yank your gem.
   end
 
 end
+
diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb
index b4332eb9f1..2056b5b53a 100644
--- a/lib/rubygems/compatibility.rb
+++ b/lib/rubygems/compatibility.rb
@@ -9,6 +9,26 @@
 # Ruby 1.9.x has introduced some things that are awkward, and we need to
 # support them, so we define some constants to use later.
 #++
+module Gem
+  # Only MRI 1.9.2 has the custom prelude.
+  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/ and RUBY_ENGINE == "ruby"
+end
+
+# Gem::QuickLoader exists in the gem prelude code in ruby 1.9.2 itself.
+# We gotta get rid of it if it's there, before we do anything else.
+if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
+  Gem::QuickLoader.remove
+
+  $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
+
+  if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
+    raise LoadError, "another rubygems is already loaded from #{path}"
+  end
+
+  class << Gem
+    remove_method :try_activate if Gem.respond_to?(:try_activate, true)
+  end
+end
 
 module Gem
   RubyGemsVersion = VERSION
@@ -22,7 +42,7 @@ module Gem
     EXEEXT RUBY_SO_NAME arch bindir datadir libdir ruby_install_name
     ruby_version rubylibprefix sitedir sitelibdir vendordir vendorlibdir
     rubylibdir
-  ].freeze
+  ]
 
   unless defined?(ConfigMap)
     ##
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index e02655fc51..3a5e7718df 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -27,7 +27,6 @@ require 'rbconfig'
 # +:backtrace+:: See #backtrace
 # +:sources+:: Sets Gem::sources
 # +:verbose+:: See #verbose
-# +:concurrent_downloads+:: See #concurrent_downloads
 #
 # gemrc files may exist in various locations and are read and merged in
 # the following order:
@@ -44,14 +43,12 @@ class Gem::ConfigFile
   DEFAULT_BULK_THRESHOLD = 1000
   DEFAULT_VERBOSITY = true
   DEFAULT_UPDATE_SOURCES = true
-  DEFAULT_CONCURRENT_DOWNLOADS = 8
-  DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
 
   ##
   # For Ruby packagers to set configuration defaults.  Set in
   # rubygems/defaults/operating_system.rb
 
-  OPERATING_SYSTEM_DEFAULTS = Gem.operating_system_defaults
+  OPERATING_SYSTEM_DEFAULTS = {}
 
   ##
   # For Ruby implementers to set configuration defaults.  Set in
@@ -66,7 +63,26 @@ class Gem::ConfigFile
       require "etc"
       Etc.sysconfdir
     rescue LoadError, NoMethodError
-      RbConfig::CONFIG["sysconfdir"] || "/etc"
+      begin
+        # TODO: remove after we drop 1.8.7 and 1.9.1
+        require 'Win32API'
+
+        CSIDL_COMMON_APPDATA = 0x0023
+        path = 0.chr * 260
+        if RUBY_VERSION > '1.9' then
+          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
+          'L', :stdcall
+          SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
+        else
+          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
+          'L'
+          SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
+        end
+
+        path.strip
+      rescue LoadError
+        RbConfig::CONFIG["sysconfdir"] || "/etc"
+      end
     end
 
   # :startdoc:
@@ -108,11 +124,6 @@ class Gem::ConfigFile
   attr_accessor :verbose
 
   ##
-  # Number of gem downloads that should be performed concurrently.
-
-  attr_accessor :concurrent_downloads
-
-  ##
   # True if we want to update the SourceInfoCache every time, false otherwise
 
   attr_accessor :update_sources
@@ -133,15 +144,6 @@ class Gem::ConfigFile
   attr_accessor :ssl_ca_cert
 
   ##
-  # sources to look for gems
-  attr_accessor :sources
-
-  ##
-  # Expiration length to sign a certificate
-
-  attr_accessor :cert_expiration_length_days
-
-  ##
   # Path name of directory or file of openssl client certificate, used for remote https connection with client authentication
 
   attr_reader :ssl_client_cert
@@ -174,12 +176,12 @@ class Gem::ConfigFile
     arg_list = []
 
     args.each do |arg|
-      if need_config_file_name
+      if need_config_file_name then
         @config_file_name = arg
         need_config_file_name = false
-      elsif arg =~ /^--config-file=(.*)/
+      elsif arg =~ /^--config-file=(.*)/ then
         @config_file_name = $1
-      elsif arg =~ /^--config-file$/
+      elsif arg =~ /^--config-file$/ then
         need_config_file_name = true
       else
         arg_list << arg
@@ -190,8 +192,6 @@ class Gem::ConfigFile
     @bulk_threshold = DEFAULT_BULK_THRESHOLD
     @verbose = DEFAULT_VERBOSITY
     @update_sources = DEFAULT_UPDATE_SOURCES
-    @concurrent_downloads = DEFAULT_CONCURRENT_DOWNLOADS
-    @cert_expiration_length_days = DEFAULT_CERT_EXPIRATION_LENGTH_DAYS
 
     operating_system_config = Marshal.load Marshal.dump(OPERATING_SYSTEM_DEFAULTS)
     platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
@@ -209,15 +209,13 @@ class Gem::ConfigFile
     end
 
     # HACK these override command-line args, which is bad
-    @backtrace                   = @hash[:backtrace]                   if @hash.key? :backtrace
-    @bulk_threshold              = @hash[:bulk_threshold]              if @hash.key? :bulk_threshold
-    @home                        = @hash[:gemhome]                     if @hash.key? :gemhome
-    @path                        = @hash[:gempath]                     if @hash.key? :gempath
-    @update_sources              = @hash[:update_sources]              if @hash.key? :update_sources
-    @verbose                     = @hash[:verbose]                     if @hash.key? :verbose
-    @disable_default_gem_server  = @hash[:disable_default_gem_server]  if @hash.key? :disable_default_gem_server
-    @sources                     = @hash[:sources]                     if @hash.key? :sources
-    @cert_expiration_length_days = @hash[:cert_expiration_length_days] if @hash.key? :cert_expiration_length_days
+    @backtrace                  = @hash[:backtrace]                  if @hash.key? :backtrace
+    @bulk_threshold             = @hash[:bulk_threshold]             if @hash.key? :bulk_threshold
+    @home                       = @hash[:gemhome]                    if @hash.key? :gemhome
+    @path                       = @hash[:gempath]                    if @hash.key? :gempath
+    @update_sources             = @hash[:update_sources]             if @hash.key? :update_sources
+    @verbose                    = @hash[:verbose]                    if @hash.key? :verbose
+    @disable_default_gem_server = @hash[:disable_default_gem_server] if @hash.key? :disable_default_gem_server
 
     @ssl_verify_mode  = @hash[:ssl_verify_mode]  if @hash.key? :ssl_verify_mode
     @ssl_ca_cert      = @hash[:ssl_ca_cert]      if @hash.key? :ssl_ca_cert
@@ -226,6 +224,7 @@ class Gem::ConfigFile
     @api_keys         = nil
     @rubygems_api_key = nil
 
+    Gem.sources = @hash[:sources] if @hash.key? :sources
     handle_arguments arg_list
   end
 
@@ -281,13 +280,13 @@ if you believe they were disclosed to a third party.
   def load_api_keys
     check_credentials_permissions
 
-    @api_keys = if File.exist? credentials_path
+    @api_keys = if File.exist? credentials_path then
                   load_file(credentials_path)
                 else
                   @hash
                 end
 
-    if @api_keys.key? :rubygems_api_key
+    if @api_keys.key? :rubygems_api_key then
       @rubygems_api_key    = @api_keys[:rubygems_api_key]
       @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless
         @api_keys.key? :rubygems
@@ -306,7 +305,7 @@ if you believe they were disclosed to a third party.
   ##
   # Sets the RubyGems.org API key to +api_key+
 
-  def rubygems_api_key=(api_key)
+  def rubygems_api_key= api_key
     set_api_key :rubygems_api_key, api_key
 
     @rubygems_api_key = api_key
@@ -315,7 +314,7 @@ if you believe they were disclosed to a third party.
   ##
   # Set a specific host's API key to +api_key+
 
-  def set_api_key(host, api_key)
+  def set_api_key host, api_key
     check_credentials_permissions
 
     config = load_file(credentials_path).merge(host => api_key)
@@ -333,15 +332,6 @@ if you believe they were disclosed to a third party.
     load_api_keys # reload
   end
 
-  ##
-  # Remove the +~/.gem/credentials+ file to clear all the current sessions.
-
-  def unset_api_key!
-    return false unless File.exist?(credentials_path)
-
-    File.delete(credentials_path)
-  end
-
   def load_file(filename)
     Gem.load_yaml
 
@@ -351,7 +341,7 @@ if you believe they were disclosed to a third party.
     return {} unless filename and File.exist? filename
 
     begin
-      content = Gem::SafeYAML.load(File.read(filename))
+      content = YAML.load(File.read(filename))
       unless content.kind_of? Hash
         warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
         return {}
@@ -425,14 +415,31 @@ if you believe they were disclosed to a third party.
   # to_yaml only overwrites things you can't override on the command line.
   def to_yaml # :nodoc:
     yaml_hash = {}
-    yaml_hash[:backtrace] = @hash.fetch(:backtrace, DEFAULT_BACKTRACE)
-    yaml_hash[:bulk_threshold] = @hash.fetch(:bulk_threshold, DEFAULT_BULK_THRESHOLD)
+    yaml_hash[:backtrace] = if @hash.key?(:backtrace)
+                              @hash[:backtrace]
+                            else
+                              DEFAULT_BACKTRACE
+                            end
+
+    yaml_hash[:bulk_threshold] = if @hash.key?(:bulk_threshold)
+                                   @hash[:bulk_threshold]
+                                 else
+                                   DEFAULT_BULK_THRESHOLD
+                                 end
+
     yaml_hash[:sources] = Gem.sources.to_a
-    yaml_hash[:update_sources] = @hash.fetch(:update_sources, DEFAULT_UPDATE_SOURCES)
-    yaml_hash[:verbose] = @hash.fetch(:verbose, DEFAULT_VERBOSITY)
 
-    yaml_hash[:concurrent_downloads] =
-      @hash.fetch(:concurrent_downloads, DEFAULT_CONCURRENT_DOWNLOADS)
+    yaml_hash[:update_sources] = if @hash.key?(:update_sources)
+                                   @hash[:update_sources]
+                                 else
+                                   DEFAULT_UPDATE_SOURCES
+                                 end
+
+    yaml_hash[:verbose] = if @hash.key?(:verbose)
+                            @hash[:verbose]
+                          else
+                            DEFAULT_VERBOSITY
+                          end
 
     yaml_hash[:ssl_verify_mode] =
       @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
@@ -458,7 +465,7 @@ if you believe they were disclosed to a third party.
 
   # Writes out this config file, replacing its source.
   def write
-    File.open config_file_name, 'w' do |io|
+    open config_file_name, 'w' do |io|
       io.write to_yaml
     end
   end
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index 3b78011619..aa56ab5ec4 100755
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -11,8 +11,13 @@ module Kernel
 
   RUBYGEMS_ACTIVATION_MONITOR = Monitor.new # :nodoc:
 
-  # Make sure we have a reference to Ruby's original Kernel#require
-  unless defined?(gem_original_require)
+  if defined?(gem_original_require) then
+    # Ruby ships with a custom_require, override its require
+    remove_method :require
+  else
+    ##
+    # The Kernel#require from before RubyGems was loaded.
+
     alias gem_original_require require
     private :gem_original_require
   end
@@ -31,25 +36,21 @@ module Kernel
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
 
-  def require(path)
+  def require path
     RUBYGEMS_ACTIVATION_MONITOR.enter
 
     path = path.to_path if path.respond_to? :to_path
 
-    if spec = Gem.find_unresolved_default_spec(path)
+    spec = Gem.find_unresolved_default_spec(path)
+    if spec
       Gem.remove_unresolved_default_spec(spec)
-      begin
-        Kernel.send(:gem, spec.name)
-      rescue Exception
-        RUBYGEMS_ACTIVATION_MONITOR.exit
-        raise
-      end
+      gem(spec.name)
     end
 
     # If there are no unresolved deps, then we can use just try
     # normal require handle loading a gem from the rescue below.
 
-    if Gem::Specification.unresolved_deps.empty?
+    if Gem::Specification.unresolved_deps.empty? then
       RUBYGEMS_ACTIVATION_MONITOR.exit
       return gem_original_require(path)
     end
@@ -60,10 +61,12 @@ module Kernel
     #--
     # TODO request access to the C implementation of this to speed up RubyGems
 
-    if Gem::Specification.find_active_stub_by_path(path)
+    spec = Gem::Specification.find_active_stub_by_path path
+
+    begin
       RUBYGEMS_ACTIVATION_MONITOR.exit
       return gem_original_require(path)
-    end
+    end if spec
 
     # Attempt to find +path+ in any unresolved gems...
 
@@ -79,7 +82,7 @@ module Kernel
     # requested, then find_in_unresolved_tree will find d.rb in d because
     # it's a dependency of c.
     #
-    if found_specs.empty?
+    if found_specs.empty? then
       found_specs = Gem::Specification.find_in_unresolved_tree path
 
       found_specs.each do |found_spec|
@@ -94,16 +97,16 @@ module Kernel
       # versions of the same gem
       names = found_specs.map(&:name).uniq
 
-      if names.size > 1
+      if names.size > 1 then
         RUBYGEMS_ACTIVATION_MONITOR.exit
         raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ', '}"
       end
 
       # Ok, now find a gem that has no conflicts, starting
       # at the highest version.
-      valid = found_specs.find { |s| !s.has_conflicts? }
+      valid = found_specs.reject { |s| s.has_conflicts? }.first
 
-      unless valid
+      unless valid then
         le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
         le.name = names.first
         RUBYGEMS_ACTIVATION_MONITOR.exit
@@ -120,7 +123,7 @@ module Kernel
 
     begin
       if load_error.message.start_with?("Could not find") or
-          (load_error.message.end_with?(path) and Gem.try_activate(path))
+          (load_error.message.end_with?(path) and Gem.try_activate(path)) then
         require_again = true
       end
     ensure
@@ -135,3 +138,4 @@ module Kernel
   private :require
 
 end
+
diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb
deleted file mode 100755
index 3e531441ed..0000000000
--- a/lib/rubygems/core_ext/kernel_warn.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-# `uplevel` keyword argument of Kernel#warn is available since ruby 2.5.
-if RUBY_VERSION >= "2.5"
-
-  module Kernel
-    path = "#{__dir__}/" # Frames to be skipped start with this path.
-
-    # Suppress "method redefined" warning
-    original_warn = instance_method(:warn)
-    Module.new {define_method(:warn, original_warn)}
-
-    original_warn = method(:warn)
-
-    module_function define_method(:warn) {|*messages, uplevel: nil|
-      unless uplevel
-        return original_warn.call(*messages)
-      end
-
-      # Ensure `uplevel` fits a `long`
-      uplevel, = [uplevel].pack("l!").unpack("l!")
-
-      if uplevel >= 0
-        start = 0
-        while uplevel >= 0
-          loc, = caller_locations(start, 1)
-          unless loc
-            # No more backtrace
-            start += uplevel
-            break
-          end
-
-          start += 1
-
-          unless loc.path.start_with?(path)
-            # Non-rubygems frames
-            uplevel -= 1
-          end
-        end
-        uplevel = start
-      end
-      original_warn.call(*messages, uplevel: uplevel)
-    }
-  end
-end
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 50f46b32a2..43d57fc808 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Gem
-  DEFAULT_HOST = "https://rubygems.org".freeze
+  DEFAULT_HOST = "https://rubygems.org"
 
   @post_install_hooks   ||= []
   @done_installing_hooks  ||= []
@@ -28,17 +28,17 @@ module Gem
   # specified in the environment
 
   def self.default_dir
-    path = if defined? RUBY_FRAMEWORK_VERSION
+    path = if defined? RUBY_FRAMEWORK_VERSION then
              [
                File.dirname(RbConfig::CONFIG['sitedir']),
                'Gems',
                RbConfig::CONFIG['ruby_version']
              ]
-           elsif RbConfig::CONFIG['rubylibprefix']
+           elsif RbConfig::CONFIG['rubylibprefix'] then
              [
-               RbConfig::CONFIG['rubylibprefix'],
-               'gems',
-               RbConfig::CONFIG['ruby_version']
+              RbConfig::CONFIG['rubylibprefix'],
+              'gems',
+              RbConfig::CONFIG['ruby_version']
              ]
            else
              [
@@ -59,7 +59,7 @@ module Gem
   # By default, the binary extensions are located side by side with their
   # Ruby counterparts, therefore nil is returned
 
-  def self.default_ext_dir_for(base_dir)
+  def self.default_ext_dir_for base_dir
     nil
   end
 
@@ -103,7 +103,7 @@ module Gem
   def self.default_exec_format
     exec_format = RbConfig::CONFIG['ruby_install_name'].sub('ruby', '%s') rescue '%s'
 
-    unless exec_format =~ /%s/
+    unless exec_format =~ /%s/ then
       raise Gem::Exception,
         "[BUG] invalid exec_format #{exec_format.inspect}, no %s"
     end
@@ -115,7 +115,7 @@ module Gem
   # The default directory for binaries
 
   def self.default_bindir
-    if defined? RUBY_FRAMEWORK_VERSION  # mac framework support
+    if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
       '/usr/bin'
     else # generic install
       RbConfig::CONFIG['bindir']
@@ -126,7 +126,7 @@ module Gem
   # A wrapper around RUBY_ENGINE const that may not be defined
 
   def self.ruby_engine
-    if defined? RUBY_ENGINE
+    if defined? RUBY_ENGINE then
       RUBY_ENGINE
     else
       'ruby'
@@ -165,7 +165,7 @@ module Gem
   # Directory where vendor gems are installed.
 
   def self.vendor_dir # :nodoc:
-    if vendor_dir = ENV['GEM_VENDOR']
+    if vendor_dir = ENV['GEM_VENDOR'] then
       return vendor_dir.dup
     end
 
@@ -176,26 +176,7 @@ module Gem
   end
 
   ##
-  # Default options for gem commands for Ruby packagers.
-  #
-  # The options here should be structured as an array of string "gem"
-  # command names as keys and a string of the default options as values.
-  #
-  # Example:
-  #
-  # def self.operating_system_defaults
-  #   {
-  #       'install' => '--no-rdoc --no-ri --env-shebang',
-  #       'update' => '--no-rdoc --no-ri --env-shebang'
-  #   }
-  # end
-
-  def self.operating_system_defaults
-    {}
-  end
-
-  ##
-  # Default options for gem commands for Ruby implementers.
+  # Default options for gem commands.
   #
   # The options here should be structured as an array of string "gem"
   # command names as keys and a string of the default options as values.
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
index 33ba1968d1..ecfd0b7909 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -2,7 +2,6 @@
 ##
 # The Dependency class holds a Gem name and a Gem::Requirement.
 
-require "rubygems/bundler_version_finder"
 require "rubygems/requirement"
 
 class Gem::Dependency
@@ -19,7 +18,7 @@ class Gem::Dependency
   TYPES = [
     :development,
     :runtime,
-  ].freeze
+  ]
 
   ##
   # Dependency name or regular expression.
@@ -36,7 +35,7 @@ class Gem::Dependency
   # argument can optionally be the dependency type, which defaults to
   # <tt>:runtime</tt>.
 
-  def initialize(name, *requirements)
+  def initialize name, *requirements
     case name
     when String then # ok
     when Regexp then
@@ -76,7 +75,7 @@ class Gem::Dependency
   end
 
   def inspect # :nodoc:
-    if prerelease?
+    if prerelease? then
       "<%s type=%p name=%p requirements=%p prerelease=ok>" %
         [self.class, self.type, self.name, requirement.to_s]
     else
@@ -100,7 +99,7 @@ class Gem::Dependency
     @requirement.none?
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 1, 'Gem::Dependency.new(', ')' do
       q.pp name
       q.text ','
@@ -152,7 +151,7 @@ class Gem::Dependency
   end
 
   def to_s # :nodoc:
-    if type != :runtime
+    if type != :runtime then
       "#{name} (#{requirement}, #{type})"
     else
       "#{name} (#{requirement})"
@@ -170,7 +169,7 @@ class Gem::Dependency
     @type == :runtime || !@type
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     Gem::Dependency === other &&
       self.name        == other.name &&
       self.type        == other.type &&
@@ -180,7 +179,7 @@ class Gem::Dependency
   ##
   # Dependencies are ordered by name.
 
-  def <=>(other)
+  def <=> other
     self.name <=> other.name
   end
 
@@ -190,7 +189,7 @@ class Gem::Dependency
   # other has only an equal version requirement that satisfies this
   # dependency.
 
-  def =~(other)
+  def =~ other
     unless Gem::Dependency === other
       return unless other.respond_to?(:name) && other.respond_to?(:version)
       other = Gem::Dependency.new other.name, other.version
@@ -222,7 +221,7 @@ class Gem::Dependency
   # NOTE:  Unlike #matches_spec? this method does not return true when the
   # version is a prerelease version unless this is a prerelease dependency.
 
-  def match?(obj, version=nil, allow_prerelease=false)
+  def match? obj, version=nil, allow_prerelease=false
     if !version
       name = obj.name
       version = obj.version
@@ -249,7 +248,7 @@ class Gem::Dependency
   # returns true when +spec+ is a prerelease version even if this dependency
   # is not a prerelease dependency.
 
-  def matches_spec?(spec)
+  def matches_spec? spec
     return false unless name === spec.name
     return true  if requirement.none?
 
@@ -259,8 +258,8 @@ class Gem::Dependency
   ##
   # Merges the requirements of +other+ into this dependency
 
-  def merge(other)
-    unless name == other.name
+  def merge other
+    unless name == other.name then
       raise ArgumentError,
             "#{self} and #{other} have different names"
     end
@@ -275,14 +274,12 @@ class Gem::Dependency
     self.class.new name, self_req.as_list.concat(other_req.as_list)
   end
 
-  def matching_specs(platform_only = false)
+  def matching_specs platform_only = false
     env_req = Gem.env_requirement(name)
     matches = Gem::Specification.stubs_for(name).find_all { |spec|
       requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
     }.map(&:to_spec)
 
-    Gem::BundlerVersionFinder.filter!(matches) if name == "bundler".freeze
-
     if platform_only
       matches.reject! { |spec|
         spec.nil? || !Gem::Platform.match(spec.platform)
@@ -304,7 +301,7 @@ class Gem::Dependency
 
     # TODO: check Gem.activated_spec[self.name] in case matches falls outside
 
-    if matches.empty?
+    if matches.empty? then
       specs = Gem::Specification.stubs_for name
 
       if specs.empty?
@@ -320,16 +317,13 @@ class Gem::Dependency
   end
 
   def to_spec
-    matches = self.to_specs.compact
+    matches = self.to_specs
 
-    active = matches.find { |spec| spec.activated? }
-    return active if active
+    active = matches.find { |spec| spec && spec.activated? }
 
-    return matches.first if prerelease?
+    return active if active
 
-    # Move prereleases to the end of the list for >= 0 requirements
-    pre, matches = matches.partition { |spec| spec.version.prerelease? }
-    matches += pre if requirement == Gem::Requirement.default
+    matches.delete_if { |spec| spec.nil? || spec.version.prerelease? } unless prerelease?
 
     matches.first
   end
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index 346208603c..28848f7373 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -7,7 +7,6 @@ require 'rubygems/spec_fetcher'
 require 'rubygems/user_interaction'
 require 'rubygems/source'
 require 'rubygems/available_set'
-require 'rubygems/deprecate'
 
 ##
 # Installs a gem along with all its dependencies from local and remote gems.
@@ -15,7 +14,6 @@ require 'rubygems/deprecate'
 class Gem::DependencyInstaller
 
   include Gem::UserInteraction
-  extend Gem::Deprecate
 
   DEFAULT_OPTIONS = { # :nodoc:
     :env_shebang         => false,
@@ -43,6 +41,12 @@ class Gem::DependencyInstaller
   attr_reader :errors
 
   ##
+  #--
+  # TODO remove, no longer used
+
+  attr_reader :gems_to_install # :nodoc:
+
+  ##
   # List of gems installed by #install in alphabetic order
 
   attr_reader :installed_gems
@@ -66,7 +70,7 @@ class Gem::DependencyInstaller
   # :wrappers:: See Gem::Installer::new
   # :build_args:: See Gem::Installer::new
 
-  def initialize(options = {})
+  def initialize options = {}
     @only_install_dir = !!options[:install_dir]
     @install_dir = options[:install_dir] || Gem.dir
     @build_root = options[:build_root]
@@ -89,9 +93,6 @@ class Gem::DependencyInstaller
     @build_args          = options[:build_args]
     @build_docs_in_background = options[:build_docs_in_background]
     @install_as_default  = options[:install_as_default]
-    @dir_mode            = options[:dir_mode]
-    @data_mode           = options[:data_mode]
-    @prog_mode           = options[:prog_mode]
 
     # Indicates that we should not try to update any deps unless
     # we absolutely must.
@@ -108,9 +109,9 @@ class Gem::DependencyInstaller
 
   ##
   #--
-  # TODO remove at RubyGems 4, no longer used
+  # TODO remove, no longer used
 
-  def add_found_dependencies(to_do, dependency_list) # :nodoc:
+  def add_found_dependencies to_do, dependency_list # :nodoc:
     seen = {}
     dependencies = Hash.new { |h, name| h[name] = Gem::Dependency.new name }
 
@@ -158,14 +159,13 @@ class Gem::DependencyInstaller
 
     dependency_list.remove_specs_unsatisfied_by dependencies
   end
-  deprecate :add_found_dependencies, :none, 2018, 12
 
   ##
   # Creates an AvailableSet to install from based on +dep_or_name+ and
   # +version+
 
-  def available_set_for(dep_or_name, version) # :nodoc:
-    if String === dep_or_name
+  def available_set_for dep_or_name, version # :nodoc:
+    if String === dep_or_name then
       find_spec_by_name_and_version dep_or_name, version, @prerelease
     else
       dep = dep_or_name.dup
@@ -198,7 +198,7 @@ class Gem::DependencyInstaller
   # sources.  Gems are sorted with newer gems preferred over older gems, and
   # local gems preferred over remote gems.
 
-  def find_gems_with_sources(dep, best_only=false) # :nodoc:
+  def find_gems_with_sources dep, best_only=false # :nodoc:
     set = Gem::AvailableSet.new
 
     if consider_local?
@@ -272,16 +272,16 @@ class Gem::DependencyInstaller
   # +version+.  Returns an Array of specs and sources required for
   # installation of the gem.
 
-  def find_spec_by_name_and_version(gem_name,
+  def find_spec_by_name_and_version gem_name,
                                     version = Gem::Requirement.default,
-                                    prerelease = false)
+                                    prerelease = false
     set = Gem::AvailableSet.new
 
     if consider_local?
-      if gem_name =~ /\.gem$/ and File.file? gem_name
+      if gem_name =~ /\.gem$/ and File.file? gem_name then
         src = Gem::Source::SpecificFile.new(gem_name)
         set.add src.spec, src
-      elsif gem_name =~ /\.gem$/
+      elsif gem_name =~ /\.gem$/ then
         Dir[gem_name].each do |name|
           begin
             src = Gem::Source::SpecificFile.new name
@@ -317,7 +317,7 @@ class Gem::DependencyInstaller
   # Gathers all dependencies necessary for the installation from local and
   # remote sources unless the ignore_dependencies was given.
   #--
-  # TODO remove at RubyGems 4
+  # TODO remove at RubyGems 3
 
   def gather_dependencies # :nodoc:
     specs = @available.all_specs
@@ -341,7 +341,7 @@ class Gem::DependencyInstaller
       Gem::Specification.include?(spec)
     }
 
-    unless dependency_list.ok? or @ignore_dependencies or @force
+    unless dependency_list.ok? or @ignore_dependencies or @force then
       reason = dependency_list.why_not_ok?.map { |k,v|
         "#{k} requires #{v.join(", ")}"
       }.join("; ")
@@ -350,9 +350,8 @@ class Gem::DependencyInstaller
 
     @gems_to_install = dependency_list.dependency_order.reverse
   end
-  deprecate :gather_dependencies, :none, 2018, 12
 
-  def in_background(what) # :nodoc:
+  def in_background what # :nodoc:
     fork_happened = false
     if @build_docs_in_background and Process.respond_to?(:fork)
       begin
@@ -381,7 +380,7 @@ class Gem::DependencyInstaller
   # c-1.a, b-1 and a-1.a will be installed.  b-1.a will need to be installed
   # separately.
 
-  def install(dep_or_name, version = Gem::Requirement.default)
+  def install dep_or_name, version = Gem::Requirement.default
     request_set = resolve_dependencies dep_or_name, version
 
     @installed_gems = []
@@ -399,10 +398,7 @@ class Gem::DependencyInstaller
       :user_install        => @user_install,
       :wrappers            => @wrappers,
       :build_root          => @build_root,
-      :install_as_default  => @install_as_default,
-      :dir_mode            => @dir_mode,
-      :data_mode           => @data_mode,
-      :prog_mode           => @prog_mode,
+      :install_as_default  => @install_as_default
     }
     options[:install_dir] = @install_dir if @only_install_dir
 
@@ -425,16 +421,16 @@ class Gem::DependencyInstaller
   end
 
   def install_development_deps # :nodoc:
-    if @development and @dev_shallow
+    if @development and @dev_shallow then
       :shallow
-    elsif @development
+    elsif @development then
       :all
     else
       :none
     end
   end
 
-  def resolve_dependencies(dep_or_name, version) # :nodoc:
+  def resolve_dependencies dep_or_name, version # :nodoc:
     request_set = Gem::RequestSet.new
     request_set.development         = @development
     request_set.development_shallow = @dev_shallow
@@ -446,11 +442,11 @@ class Gem::DependencyInstaller
     installer_set.ignore_installed = @only_install_dir
 
     if consider_local?
-      if dep_or_name =~ /\.gem$/ and File.file? dep_or_name
+      if dep_or_name =~ /\.gem$/ and File.file? dep_or_name then
         src = Gem::Source::SpecificFile.new dep_or_name
         installer_set.add_local dep_or_name, src.spec, src
         version = src.spec.version if version == Gem::Requirement.default
-      elsif dep_or_name =~ /\.gem$/
+      elsif dep_or_name =~ /\.gem$/ then
         Dir[dep_or_name].each do |name|
           begin
             src = Gem::Source::SpecificFile.new name
@@ -458,14 +454,14 @@ class Gem::DependencyInstaller
           rescue Gem::Package::FormatError
           end
         end
-        # else This is a dependency. InstallerSet handles this case
+      # else This is a dependency. InstallerSet handles this case
       end
     end
 
     dependency =
-      if spec = installer_set.local?(dep_or_name)
+      if spec = installer_set.local?(dep_or_name) then
         Gem::Dependency.new spec.name, version
-      elsif String === dep_or_name
+      elsif String === dep_or_name then
         Gem::Dependency.new dep_or_name, version
       else
         dep_or_name
@@ -479,7 +475,7 @@ class Gem::DependencyInstaller
 
     request_set.always_install = installer_set.always_install
 
-    if @ignore_dependencies
+    if @ignore_dependencies then
       installer_set.ignore_dependencies = true
       request_set.ignore_dependencies   = true
       request_set.soft_missing          = true
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
index ee2e4c7343..35fe7c4c1a 100644
--- a/lib/rubygems/dependency_list.rb
+++ b/lib/rubygems/dependency_list.rb
@@ -40,7 +40,7 @@ class Gem::DependencyList
   # Creates a new DependencyList.  If +development+ is true, development
   # dependencies will be included.
 
-  def initialize(development = false)
+  def initialize development = false
     @specs = []
 
     @development = development
@@ -79,8 +79,8 @@ class Gem::DependencyList
     seen = {}
 
     sorted.each do |spec|
-      if index = seen[spec.name]
-        if result[index].version < spec.version
+      if index = seen[spec.name] then
+        if result[index].version < spec.version then
           result[index] = spec
         end
       else
@@ -104,7 +104,7 @@ class Gem::DependencyList
   end
 
   def inspect # :nodoc:
-    "%s %p>" % [super[0..-2], map { |s| s.full_name }]
+    "#<%s:0x%x %p>" % [self.class, object_id, map { |s| s.full_name }]
   end
 
   ##
@@ -114,7 +114,7 @@ class Gem::DependencyList
     why_not_ok?(:quick).empty?
   end
 
-  def why_not_ok?(quick = false)
+  def why_not_ok? quick = false
     unsatisfied = Hash.new { |h,k| h[k] = [] }
     each do |spec|
       spec.runtime_dependencies.each do |dep|
@@ -123,7 +123,7 @@ class Gem::DependencyList
             dep.requirement.satisfied_by? installed_spec.version
         }
 
-        unless inst or @specs.find { |s| s.satisfies_requirement? dep }
+        unless inst or @specs.find { |s| s.satisfies_requirement? dep } then
           unsatisfied[spec.name] << dep
           return unsatisfied if quick
         end
@@ -172,7 +172,7 @@ class Gem::DependencyList
   # satisfy items in +dependencies+ (a hash of gem names to arrays of
   # dependencies).
 
-  def remove_specs_unsatisfied_by(dependencies)
+  def remove_specs_unsatisfied_by dependencies
     specs.reject! { |spec|
       dep = dependencies[spec.name]
       dep and not dep.requirement.satisfied_by? spec.version
@@ -200,7 +200,7 @@ class Gem::DependencyList
         next if spec == other
 
         other.dependencies.each do |dep|
-          if spec.satisfies_requirement? dep
+          if spec.satisfies_requirement? dep then
             result[spec] << other
           end
         end
@@ -222,7 +222,7 @@ class Gem::DependencyList
 
     dependencies.each do |dep|
       specs.each do |spec|
-        if spec.satisfies_requirement? dep
+        if spec.satisfies_requirement? dep then
           yield spec
           break
         end
@@ -241,3 +241,4 @@ class Gem::DependencyList
   end
 
 end
+
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index 815f42ae8c..375194c1e8 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -27,7 +27,7 @@ module Gem::Deprecate
     @skip ||= false
   end
 
-  def self.skip=(v) # :nodoc:
+  def self.skip= v # :nodoc:
     @skip = v
   end
 
@@ -47,7 +47,7 @@ module Gem::Deprecate
   # telling the user of +repl+ (unless +repl+ is :none) and the
   # year/month that it is planned to go away.
 
-  def deprecate(name, repl, year, month)
+  def deprecate name, repl, year, month
     class_eval {
       old = "_deprecated_#{name}"
       alias_method old, name
@@ -68,3 +68,4 @@ module Gem::Deprecate
   module_function :deprecate, :skip_during
 
 end
+
diff --git a/lib/rubygems/doctor.rb b/lib/rubygems/doctor.rb
index 661ae5a4e1..ec4a16c3f8 100644
--- a/lib/rubygems/doctor.rb
+++ b/lib/rubygems/doctor.rb
@@ -26,7 +26,7 @@ class Gem::Doctor
     ['doc',            ''],
     ['extensions',     ''],
     ['gems',           ''],
-  ].freeze
+  ]
 
   missing =
     Gem::REPOSITORY_SUBDIRECTORIES.sort -
@@ -41,7 +41,7 @@ class Gem::Doctor
   #
   # If +dry_run+ is true no files or directories will be removed.
 
-  def initialize(gem_repository, dry_run = false)
+  def initialize gem_repository, dry_run = false
     @gem_repository = gem_repository
     @dry_run        = dry_run
 
@@ -73,7 +73,7 @@ class Gem::Doctor
 
     Gem.use_paths @gem_repository.to_s
 
-    unless gem_repository?
+    unless gem_repository? then
       say 'This directory does not appear to be a RubyGems repository, ' +
           'skipping'
       say
@@ -99,7 +99,7 @@ class Gem::Doctor
   ##
   # Removes files in +sub_directory+ with +extension+
 
-  def doctor_child(sub_directory, extension) # :nodoc:
+  def doctor_child sub_directory, extension # :nodoc:
     directory = File.join(@gem_repository, sub_directory)
 
     Dir.entries(directory).sort.each do |ent|
@@ -115,7 +115,7 @@ class Gem::Doctor
 
       type = File.directory?(child) ? 'directory' : 'file'
 
-      action = if @dry_run
+      action = if @dry_run then
                  'Extra'
                else
                  FileUtils.rm_r(child)
@@ -129,3 +129,4 @@ class Gem::Doctor
   end
 
 end
+
diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb
index 6773bbcd26..5cd5b14c58 100644
--- a/lib/rubygems/errors.rb
+++ b/lib/rubygems/errors.rb
@@ -25,7 +25,7 @@ module Gem
   # system.  Instead of rescuing from this class, make sure to rescue from the
   # superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecError < Gem::LoadError
-    def initialize(name, requirement)
+    def initialize name, requirement
       @name        = name
       @requirement = requirement
     end
@@ -50,7 +50,7 @@ module Gem
   class MissingSpecVersionError < MissingSpecError
     attr_reader :specs
 
-    def initialize(name, requirement, specs)
+    def initialize name, requirement, specs
       super(name, requirement)
       @specs = specs
     end
@@ -58,9 +58,6 @@ module Gem
     private
 
     def build_message
-      if name == "bundler" && message = Gem::BundlerVersionFinder.missing_version_message
-        return message
-      end
       names = specs.map(&:full_name)
       "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
     end
@@ -81,7 +78,7 @@ module Gem
 
     attr_reader :target
 
-    def initialize(target, conflicts)
+    def initialize target, conflicts
       @target    = target
       @conflicts = conflicts
       @name      = target.name
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb
index a387cd390f..9089eae4d5 100644
--- a/lib/rubygems/exceptions.rb
+++ b/lib/rubygems/exceptions.rb
@@ -4,8 +4,6 @@
 # Each exception needs a brief description and the scenarios where it is
 # likely to be raised
 
-require 'rubygems/deprecate'
-
 ##
 # Base exception class for RubyGems.  All exception raised by RubyGems are a
 # subclass of this one.
@@ -13,12 +11,10 @@ class Gem::Exception < RuntimeError
 
   ##
   #--
-  # TODO: remove in RubyGems 4, nobody sets this
+  # TODO: remove in RubyGems 3, nobody sets this
 
   attr_accessor :source_exception # :nodoc:
 
-  extend Gem::Deprecate
-  deprecate :source_exception, :none, 2018, 12
 end
 
 class Gem::CommandLineError < Gem::Exception; end
@@ -36,7 +32,7 @@ class Gem::DependencyResolutionError < Gem::DependencyError
 
   attr_reader :conflict
 
-  def initialize(conflict)
+  def initialize conflict
     @conflict = conflict
     a, b = conflicting_dependencies
 
@@ -56,13 +52,6 @@ class Gem::GemNotInHomeException < Gem::Exception
   attr_accessor :spec
 end
 
-###
-# Raised when removing a gem with the uninstall command fails
-
-class Gem::UninstallError < Gem::Exception
-  attr_accessor :spec
-end
-
 class Gem::DocumentError < Gem::Exception; end
 
 ##
@@ -77,7 +66,7 @@ class Gem::FilePermissionError < Gem::Exception
 
   attr_reader :directory
 
-  def initialize(directory)
+  def initialize directory
     @directory = directory
 
     super "You don't have write permissions for the #{directory} directory."
@@ -137,7 +126,7 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
   attr_reader :conflicts
   attr_reader :request
 
-  def initialize(request, conflicts)
+  def initialize request, conflicts
     @request   = request
     @conflicts = conflicts
 
@@ -165,12 +154,6 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
 end
 
 class Gem::InstallError < Gem::Exception; end
-class Gem::RuntimeRequirementNotMetError < Gem::InstallError
-  attr_accessor :suggestion
-  def message
-    [suggestion, super].compact.join("\n\t")
-  end
-end
 
 ##
 # Potentially raised when a specification is validated.
@@ -249,7 +232,7 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError
   # Creates a new UnsatisfiableDependencyError for the unsatisfiable
   # Gem::Resolver::DependencyRequest +dep+
 
-  def initialize(dep, platform_mismatch=nil)
+  def initialize dep, platform_mismatch=nil
     if platform_mismatch and !platform_mismatch.empty?
       plats = platform_mismatch.map { |x| x.platform.to_s }.sort.uniq
       super "Unable to resolve dependency: No match for '#{dep}' on this platform. Found: #{plats.join(', ')}"
diff --git a/lib/rubygems/ext.rb b/lib/rubygems/ext.rb
index 35a486606a..18d2bc233a 100644
--- a/lib/rubygems/ext.rb
+++ b/lib/rubygems/ext.rb
@@ -16,3 +16,4 @@ require 'rubygems/ext/configure_builder'
 require 'rubygems/ext/ext_conf_builder'
 require 'rubygems/ext/rake_builder'
 require 'rubygems/ext/cmake_builder'
+
diff --git a/lib/rubygems/ext/build_error.rb b/lib/rubygems/ext/build_error.rb
index 6dffddb5cc..0b3c17a9a0 100644
--- a/lib/rubygems/ext/build_error.rb
+++ b/lib/rubygems/ext/build_error.rb
@@ -4,3 +4,4 @@
 
 class Gem::Ext::BuildError < Gem::InstallError
 end
+
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index f578e7feee..699903ab0e 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -6,6 +6,7 @@
 #++
 
 require 'rubygems/user_interaction'
+require 'thread'
 
 class Gem::Ext::Builder
 
@@ -27,18 +28,18 @@ class Gem::Ext::Builder
   end
 
   def self.make(dest_path, results)
-    unless File.exist? 'Makefile'
+    unless File.exist? 'Makefile' then
       raise Gem::InstallError, 'Makefile not found'
     end
 
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
     make_program = ENV['MAKE'] || ENV['make'] || $1
-    unless make_program
+    unless make_program then
       make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
 
-    destdir = '"DESTDIR=%s"' % ENV['DESTDIR']
+    destdir = '"DESTDIR=%s"' % ENV['DESTDIR'] if RUBY_VERSION > '2.0'
 
     ['clean', '', 'install'].each do |target|
       # Pass DESTDIR via command line to override what's in MAKEFLAGS
@@ -56,7 +57,6 @@ class Gem::Ext::Builder
   end
 
   def self.redirector
-    warn "#{caller[0]}: Use IO.popen(..., err: [:child, :out])"
     '2>&1'
   end
 
@@ -64,35 +64,28 @@ class Gem::Ext::Builder
     verbose = Gem.configuration.really_verbose
 
     begin
+      # TODO use Process.spawn when ruby 1.8 support is dropped.
       rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
       if verbose
         puts("current directory: #{Dir.pwd}")
-        p(command)
+        puts(command)
+        system(command)
+      else
+        results << "current directory: #{Dir.pwd}"
+        results << command
+        results << `#{command} #{redirector}`
       end
-      results << "current directory: #{Dir.pwd}"
-      results << (command.respond_to?(:shelljoin) ? command.shelljoin : command)
-
-      redirections = verbose ? {} : {err: [:child, :out]}
-      IO.popen(command, "r", redirections) do |io|
-        if verbose
-          IO.copy_stream(io, $stdout)
-        else
-          results << io.read
-        end
-      end
-    rescue => error
-      raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
     ensure
       ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
     end
 
-    unless $?.success?
+    unless $?.success? then
       results << "Building has failed. See above output for more information on the failure." if verbose
 
       exit_reason =
-        if $?.exited?
+        if $?.exited? then
           ", exit code #{$?.exitstatus}"
-        elsif $?.signaled?
+        elsif $?.signaled? then
           ", uncaught signal #{$?.termsig}"
         end
 
@@ -105,7 +98,7 @@ class Gem::Ext::Builder
   # have build arguments, saved, set +build_args+ which is an ARGV-style
   # array.
 
-  def initialize(spec, build_args = spec.build_args)
+  def initialize spec, build_args = spec.build_args
     @spec       = spec
     @build_args = build_args
     @gem_dir    = spec.full_gem_path
@@ -116,7 +109,7 @@ class Gem::Ext::Builder
   ##
   # Chooses the extension builder class for +extension+
 
-  def builder_for(extension) # :nodoc:
+  def builder_for extension # :nodoc:
     case extension
     when /extconf/ then
       Gem::Ext::ExtConfBuilder
@@ -138,7 +131,7 @@ class Gem::Ext::Builder
   ##
   # Logs the build +output+ in +build_dir+, then raises Gem::Ext::BuildError.
 
-  def build_error(build_dir, output, backtrace = nil) # :nodoc:
+  def build_error build_dir, output, backtrace = nil # :nodoc:
     gem_make_out = write_gem_make_out output
 
     message = <<-EOF
@@ -153,24 +146,12 @@ EOF
     raise Gem::Ext::BuildError, message, backtrace
   end
 
-  def build_extension(extension, dest_path) # :nodoc:
+  def build_extension extension, dest_path # :nodoc:
     results = []
 
-    # FIXME: Determine if this line is necessary and, if so, why.
-    # Notes:
-    # 1. As far as I can tell, this method is only called by +build_extensions+.
-    # 2. The existence of this line implies +extension+ is, or previously was,
-    #    sometimes +false+ or +nil+.
-    # 3. #1 and #2 combined suggests, but does not confirm, that
-    #    +@specs.extensions+ sometimes contained +false+ or +nil+ values.
-    # 4. Nothing seems to explicitly handle +extension+ being empty,
-    #    which makes me wonder both what it should do and what it does.
-    #
-    # - @duckinator
     extension ||= '' # I wish I knew why this line existed
-
     extension_dir =
-      File.expand_path File.join(@gem_dir, File.dirname(extension))
+      File.expand_path File.join @gem_dir, File.dirname(extension)
     lib_dir = File.join @spec.full_gem_path, @spec.raw_require_paths.first
 
     builder = builder_for extension
@@ -179,19 +160,11 @@ EOF
       FileUtils.mkdir_p dest_path
 
       CHDIR_MUTEX.synchronize do
-        pwd = Dir.getwd
-        Dir.chdir extension_dir
-        begin
-          results = builder.build(extension, dest_path,
+        Dir.chdir extension_dir do
+          results = builder.build(extension, @gem_dir, dest_path,
                                   results, @build_args, lib_dir)
 
           verbose { results.join("\n") }
-        ensure
-          begin
-            Dir.chdir pwd
-          rescue SystemCallError
-            Dir.chdir dest_path
-          end
         end
       end
 
@@ -210,7 +183,7 @@ EOF
     return if @spec.extensions.empty?
 
     if @build_args.empty?
-      say "Building native extensions. This could take a while..."
+      say "Building native extensions.  This could take a while..."
     else
       say "Building native extensions with: '#{@build_args.join ' '}'"
       say "This could take a while..."
@@ -220,7 +193,6 @@ EOF
 
     FileUtils.rm_f @spec.gem_build_complete_path
 
-    # FIXME: action at a distance: @ran_rake modified deep in build_extension(). - @duckinator
     @ran_rake = false # only run rake once
 
     @spec.extensions.each do |extension|
@@ -235,14 +207,15 @@ EOF
   ##
   # Writes +output+ to gem_make.out in the extension install directory.
 
-  def write_gem_make_out(output) # :nodoc:
+  def write_gem_make_out output # :nodoc:
     destination = File.join @spec.extension_dir, 'gem_make.out'
 
     FileUtils.mkdir_p @spec.extension_dir
 
-    File.open destination, 'wb' do |io| io.puts output end
+    open destination, 'wb' do |io| io.puts output end
 
     destination
   end
 
 end
+
diff --git a/lib/rubygems/ext/cmake_builder.rb b/lib/rubygems/ext/cmake_builder.rb
index ab226733d9..efa3bd1d88 100644
--- a/lib/rubygems/ext/cmake_builder.rb
+++ b/lib/rubygems/ext/cmake_builder.rb
@@ -2,8 +2,8 @@
 require 'rubygems/command'
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
+    unless File.exist?('Makefile') then
       cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
       cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
 
diff --git a/lib/rubygems/ext/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb
index 7d105c9bd3..8b42bf7ee9 100644
--- a/lib/rubygems/ext/configure_builder.rb
+++ b/lib/rubygems/ext/configure_builder.rb
@@ -7,8 +7,8 @@
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
 
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
+    unless File.exist?('Makefile') then
       cmd = "sh ./configure --prefix=#{dest_path}"
       cmd << " #{args.join ' '}" unless args.empty?
 
@@ -21,3 +21,4 @@ class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
   end
 
 end
+
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 5a2b3eb533..59e243b972 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -7,12 +7,11 @@
 
 require 'fileutils'
 require 'tempfile'
-require 'shellwords'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   FileEntry = FileUtils::Entry_ # :nodoc:
 
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
     tmp_dest = Dir.mktmpdir(".gem.", ".")
 
     # Some versions of `mktmpdir` return absolute paths, which will break make
@@ -24,9 +23,13 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     # spaces do not work.
     #
     # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
-    tmp_dest = get_relative_path(tmp_dest)
+    #
+    # TODO: Make this unconditional when rubygems no longer supports Ruby 1.9.x.
+    tmp_dest = get_relative_path(tmp_dest) unless Gem.win_platform? && RUBY_VERSION <= '2.0'
 
+    t = nil
     Tempfile.open %w"siteconf .rb", "." do |siteconf|
+      t = siteconf
       siteconf.puts "require 'rbconfig'"
       siteconf.puts "dest_path = #{tmp_dest.dump}"
       %w[sitearchdir sitelibdir].each do |dir|
@@ -34,24 +37,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
       end
 
-      siteconf.close
+      siteconf.flush
 
       destdir = ENV["DESTDIR"]
 
       begin
-        cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../../..", __FILE__) <<
-              "-r" << get_relative_path(siteconf.path) << File.basename(extension)
-        cmd.push(*args)
+        cmd = [Gem.ruby, "-r", get_relative_path(siteconf.path), File.basename(extension), *args].join ' '
 
         begin
           run cmd, results
         ensure
           if File.exist? 'mkmf.log'
-            unless $?.success?
-              results << "To see why this extension failed to compile, please check" \
-                " the mkmf.log which can be found here:\n"
-              results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
-            end
+            results << "To see why this extension failed to compile, please check" \
+              " the mkmf.log which can be found here:\n"
+            results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
             FileUtils.mv 'mkmf.log', dest_path
           end
           siteconf.unlink
@@ -63,7 +62,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
         if tmp_dest
           # TODO remove in RubyGems 3
-          if Gem.install_extension_in_lib and lib_dir
+          if Gem.install_extension_in_lib and lib_dir then
             FileUtils.mkdir_p lib_dir
             entries = Dir.entries(tmp_dest) - %w[. ..]
             entries = entries.map { |entry| File.join tmp_dest, entry }
@@ -77,9 +76,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         end
       ensure
         ENV["DESTDIR"] = destdir
-        siteconf.close!
       end
     end
+    t.unlink if t and t.path
 
     results
   ensure
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
index 52041a2713..682f1253e1 100644
--- a/lib/rubygems/ext/rake_builder.rb
+++ b/lib/rubygems/ext/rake_builder.rb
@@ -5,31 +5,33 @@
 # See LICENSE.txt for permissions.
 #++
 
-require "shellwords"
-
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
 
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    if File.basename(extension) =~ /mkrf_conf/i
-      run([Gem.ruby, File.basename(extension), *args], results)
+  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
+    if File.basename(extension) =~ /mkrf_conf/i then
+      cmd = "#{Gem.ruby} #{File.basename extension}"
+      cmd << " #{args.join " "}" unless args.empty?
+      run cmd, results
     end
 
+    # Deal with possible spaces in the path, e.g. C:/Program Files
+    dest_path = '"' + dest_path.to_s + '"' if dest_path.to_s.include?(' ')
+
     rake = ENV['rake']
 
-    if rake
-      rake = rake.shellsplit
-    else
-      begin
-        rake = [Gem.ruby, "-rrubygems", Gem.bin_path('rake', 'rake')]
-      rescue Gem::Exception
-        rake = [Gem.default_exec_format % 'rake']
-      end
-    end
+    rake ||= begin
+               "#{Gem.ruby} -rubygems #{Gem.bin_path('rake', 'rake')}"
+             rescue Gem::Exception
+             end
 
-    rake_args = ["RUBYARCHDIR=#{dest_path}", "RUBYLIBDIR=#{dest_path}", *args]
-    run(rake + rake_args, results)
+    rake ||= Gem.default_exec_format % 'rake'
+
+    cmd = "#{rake} RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
+
+    run cmd, results
 
     results
   end
 
 end
+
diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb
index 4159d81389..fec9e403da 100644
--- a/lib/rubygems/gem_runner.rb
+++ b/lib/rubygems/gem_runner.rb
@@ -8,7 +8,6 @@
 require 'rubygems'
 require 'rubygems/command_manager'
 require 'rubygems/config_file'
-require 'rubygems/deprecate'
 
 ##
 # Load additional plugins from $LOAD_PATH
@@ -27,10 +26,7 @@ Gem.load_env_plugins rescue nil
 class Gem::GemRunner
 
   def initialize(options={})
-    if !options.empty? && !Gem::Deprecate.skip
-      Kernel.warn "NOTE: passing options to Gem::GemRunner.new is deprecated with no replacement. It will be removed on or after 2016-10-01."
-    end
-
+    # TODO: nuke these options
     @command_manager_class = options[:command_manager] || Gem::CommandManager
     @config_file_class = options[:config_file] || Gem::ConfigFile
   end
@@ -38,7 +34,7 @@ class Gem::GemRunner
   ##
   # Run the gem command with the following arguments.
 
-  def run(args)
+  def run args
     build_args = extract_build_args args
 
     do_configuration args
@@ -63,7 +59,7 @@ class Gem::GemRunner
   # Separates the build arguments (those following <code>--</code>) from the
   # other arguments in the list.
 
-  def extract_build_args(args) # :nodoc:
+  def extract_build_args args # :nodoc:
     return [] unless offset = args.index('--')
 
     build_args = args.slice!(offset...args.length)
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index e49bff36f9..7c6d6bb364 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 require 'rubygems/remote_fetcher'
-require 'rubygems/text'
 
 ##
 # Utility methods for using the RubyGems API.
 
 module Gem::GemcutterUtilities
 
-  include Gem::Text
-
   # TODO: move to Gem::Command
   OptionParser.accept Symbol do |value|
     value.to_sym
@@ -28,20 +25,10 @@ module Gem::GemcutterUtilities
   end
 
   ##
-  # Add the --otp option
-
-  def add_otp_option
-    add_option('--otp CODE',
-               'Digit code for multifactor authentication') do |value, options|
-      options[:otp] = value
-    end
-  end
-
-  ##
   # The API key from the command options or from the user's configuration.
 
   def api_key
-    if options[:key]
+    if options[:key] then
       verify_api_key options[:key]
     elsif Gem.configuration.api_keys.key?(host)
       Gem.configuration.api_keys[host]
@@ -103,11 +90,11 @@ module Gem::GemcutterUtilities
   # Signs in with the RubyGems API at +sign_in_host+ and sets the rubygems API
   # key.
 
-  def sign_in(sign_in_host = nil)
+  def sign_in sign_in_host = nil
     sign_in_host ||= self.host
     return if api_key
 
-    pretty_host = if Gem::DEFAULT_HOST == sign_in_host
+    pretty_host = if Gem::DEFAULT_HOST == sign_in_host then
                     'RubyGems.org'
                   else
                     sign_in_host
@@ -126,13 +113,6 @@ module Gem::GemcutterUtilities
       request.basic_auth email, password
     end
 
-    if need_otp? response
-      response = rubygems_api_request(:get, "api/v1/api_key", sign_in_host) do |request|
-        request.basic_auth email, password
-        request.add_field "OTP", options[:otp]
-      end
-    end
-
     with_response response do |resp|
       say "Signed in."
       set_api_key host, resp.body
@@ -144,7 +124,7 @@ module Gem::GemcutterUtilities
   # an error.
 
   def verify_api_key(key)
-    if Gem.configuration.api_keys.key? key
+    if Gem.configuration.api_keys.key? key then
       Gem.configuration.api_keys[key]
     else
       alert_error "No such API key. Please add it to your configuration (done automatically on initial `gem push`)."
@@ -159,38 +139,24 @@ module Gem::GemcutterUtilities
   # If the response was not successful, shows an error to the user including
   # the +error_prefix+ and the response body.
 
-  def with_response(response, error_prefix = nil)
+  def with_response response, error_prefix = nil
     case response
     when Net::HTTPSuccess then
-      if block_given?
+      if block_given? then
         yield response
       else
-        say clean_text(response.body)
+        say response.body
       end
     else
       message = response.body
       message = "#{error_prefix}: #{message}" if error_prefix
 
-      say clean_text(message)
+      say message
       terminate_interaction 1 # TODO: question this
     end
   end
 
-  ##
-  # Returns true when the user has enabled multifactor authentication from
-  # +response+ text.
-
-  def need_otp?(response)
-    return unless response.kind_of?(Net::HTTPUnauthorized) &&
-        response.body.start_with?('You have enabled multifactor authentication')
-    return true if options[:otp]
-
-    say 'You have enabled multi-factor authentication. Please enter OTP code.'
-    options[:otp] = ask 'Code: '
-    true
-  end
-
-  def set_api_key(host, key)
+  def set_api_key host, key
     if host == Gem::DEFAULT_HOST
       Gem.configuration.rubygems_api_key = key
     else
@@ -199,3 +165,4 @@ module Gem::GemcutterUtilities
   end
 
 end
+
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
index b97347177d..871cc09d8d 100644
--- a/lib/rubygems/indexer.rb
+++ b/lib/rubygems/indexer.rb
@@ -2,19 +2,11 @@
 require 'rubygems'
 require 'rubygems/package'
 require 'time'
-require 'tmpdir'
 
-rescue_exceptions = [LoadError]
-begin
-  require 'bundler/errors'
-rescue LoadError # this rubygems + old ruby
-else # this rubygems + ruby trunk with bundler
-  rescue_exceptions << Bundler::GemfileNotFound
-end
 begin
   gem 'builder'
   require 'builder/xchar'
-rescue *rescue_exceptions
+rescue LoadError
 end
 
 ##
@@ -62,7 +54,7 @@ class Gem::Indexer
     require 'tmpdir'
     require 'zlib'
 
-    unless defined?(Builder::XChar)
+    unless defined?(Builder::XChar) then
       raise "Gem::Indexer requires that the XML Builder library be installed:" +
             "\n\tgem install builder"
     end
@@ -72,7 +64,7 @@ class Gem::Indexer
     @build_modern = options[:build_modern]
 
     @dest_directory = directory
-    @directory = Dir.mktmpdir 'gem_generate_index'
+    @directory = File.join(Dir.tmpdir, "gem_generate_index_#{$$}")
 
     marshal_name = "Marshal.#{Gem.marshal_version}"
 
@@ -116,7 +108,7 @@ class Gem::Indexer
   ##
   # Builds Marshal quick index gemspecs.
 
-  def build_marshal_gemspecs(specs)
+  def build_marshal_gemspecs specs
     count = specs.count
     progress = ui.progress_reporter count,
                                     "Generating Marshal quick index gemspecs for #{count} gems",
@@ -131,7 +123,7 @@ class Gem::Indexer
         marshal_name = File.join @quick_marshal_dir, spec_file_name
 
         marshal_zipped = Gem.deflate Marshal.dump(spec)
-        File.open marshal_name, 'wb' do |io| io.write marshal_zipped end
+        open marshal_name, 'wb' do |io| io.write marshal_zipped end
 
         files << marshal_name
 
@@ -161,7 +153,7 @@ class Gem::Indexer
           platform = spec.original_platform
 
           # win32-api-1.0.4-x86-mswin32-60
-          unless String === platform
+          unless String === platform then
             alert_warning "Skipping invalid platform in gem: #{spec.full_name}"
             next
           end
@@ -179,7 +171,7 @@ class Gem::Indexer
   ##
   # Builds indices for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
-  def build_modern_indices(specs)
+  def build_modern_indices specs
     prerelease, released = specs.partition { |s|
       s.version.prerelease?
     }
@@ -199,9 +191,9 @@ class Gem::Indexer
                "#{@prerelease_specs_index}.gz"]
   end
 
-  def map_gems_to_specs(gems)
+  def map_gems_to_specs gems
     gems.map { |gemfile|
-      if File.size(gemfile) == 0
+      if File.size(gemfile) == 0 then
         alert_warning "Skipping zero-length gem: #{gemfile}"
         next
       end
@@ -235,7 +227,7 @@ class Gem::Indexer
     say "Compressing indices"
 
     Gem.time 'Compressed indices' do
-      if @build_modern
+      if @build_modern then
         gzip @specs_index
         gzip @latest_specs_index
         gzip @prerelease_specs_index
@@ -269,7 +261,7 @@ class Gem::Indexer
 
     zipped = Gem.deflate data
 
-    File.open "#{filename}.#{extension}", 'wb' do |io|
+    open "#{filename}.#{extension}", 'wb' do |io|
       io.write zipped
     end
   end
@@ -278,7 +270,7 @@ class Gem::Indexer
   # List of gem file names to index.
 
   def gem_file_list
-    Gem::Util.glob_files_in_dir("*.gem", File.join(@dest_directory, "gems"))
+    Dir[File.join(@dest_directory, "gems", '*.gem')]
   end
 
   ##
@@ -313,7 +305,7 @@ class Gem::Indexer
     files = @files
     files.delete @quick_marshal_dir if files.include? @quick_dir
 
-    if files.include? @quick_marshal_dir and not files.include? @quick_dir
+    if files.include? @quick_marshal_dir and not files.include? @quick_dir then
       files.delete @quick_marshal_dir
 
       dst_name = File.join(@dest_directory, @quick_marshal_dir_base)
@@ -354,7 +346,7 @@ class Gem::Indexer
     data = Gem.read_binary path
     compressed_data = Gem.read_binary "#{path}.#{extension}"
 
-    unless data == Gem::Util.inflate(compressed_data)
+    unless data == Gem.inflate(compressed_data) then
       raise "Compressed file #{compressed_path} does not match uncompressed file #{path}"
     end
   end
@@ -374,7 +366,7 @@ class Gem::Indexer
       gem_mtime >= specs_mtime
     end
 
-    if updated_gems.empty?
+    if updated_gems.empty? then
       say 'No new gems'
       terminate_interaction 0
     end
@@ -435,7 +427,7 @@ class Gem::Indexer
 
     specs_index = compact_specs specs_index.uniq.sort
 
-    File.open dest, 'wb' do |io|
+    open dest, 'wb' do |io|
       Marshal.dump specs_index, io
     end
   end
diff --git a/lib/rubygems/install_default_message.rb b/lib/rubygems/install_default_message.rb
index f68fd2fd04..dc73fd962b 100644
--- a/lib/rubygems/install_default_message.rb
+++ b/lib/rubygems/install_default_message.rb
@@ -10,3 +10,4 @@ Gem.post_install do |installer|
   ui = Gem::DefaultUserInteraction.ui
   ui.say "Successfully installed #{installer.spec.full_name} as a default gem"
 end
+
diff --git a/lib/rubygems/install_message.rb b/lib/rubygems/install_message.rb
index 3c13888a84..6880db583e 100644
--- a/lib/rubygems/install_message.rb
+++ b/lib/rubygems/install_message.rb
@@ -10,3 +10,4 @@ Gem.post_install do |installer|
   ui = Gem::DefaultUserInteraction.ui
   ui.say "Successfully installed #{installer.spec.full_name}"
 end
+
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index 38a0682958..5559c94370 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -6,18 +6,37 @@
 #++
 
 require 'rubygems'
-require 'rubygems/security_option'
+
+# forward-declare
+
+module Gem::Security # :nodoc:
+  class Policy # :nodoc:
+  end
+end
 
 ##
 # Mixin methods for install and update options for Gem::Commands
 
 module Gem::InstallUpdateOptions
-  include Gem::SecurityOption
 
   ##
   # Add the install/update options to the option parser.
 
   def add_install_update_options
+    # TODO: use @parser.accept
+    OptionParser.accept Gem::Security::Policy do |value|
+      require 'rubygems/security'
+
+      raise OptionParser::InvalidArgument, 'OpenSSL not installed' unless
+        defined?(Gem::Security::HighSecurity)
+
+      value = Gem::Security::Policies[value]
+      valid = Gem::Security::Policies.keys.sort
+      message = "#{value} (#{valid.join ', '} are valid)"
+      raise OptionParser::InvalidArgument, message if value.nil?
+      value
+    end
+
     add_option(:"Install/Update", '-i', '--install-dir DIR',
                'Gem repository directory to get installed',
                'gems') do |value, options|
@@ -25,12 +44,12 @@ module Gem::InstallUpdateOptions
     end
 
     add_option(:"Install/Update", '-n', '--bindir DIR',
-               'Directory where executables are',
+               'Directory where binary files are',
                'located') do |value, options|
       options[:bin_dir] = File.expand_path(value)
     end
 
-    add_option(:"Install/Update",       '--document [TYPES]', Array,
+    add_option(:"Install/Update",       '--[no-]document [TYPES]', Array,
                'Generate documentation for installed gems',
                'List the documentation types you wish to',
                'generate.  For example: rdoc,ri') do |value, options|
@@ -50,7 +69,7 @@ module Gem::InstallUpdateOptions
     add_option(:"Install/Update", '--vendor',
                'Install gem into the vendor directory.',
                'Only for use by gem repackagers.') do |value, options|
-      unless Gem.vendor_dir
+      unless Gem.vendor_dir then
         raise OptionParser::InvalidOption.new 'your platform is not supported'
       end
 
@@ -63,6 +82,30 @@ module Gem::InstallUpdateOptions
       options[:document] = []
     end
 
+    add_option(:Deprecated, '--[no-]rdoc',
+               'Generate RDoc for installed gems',
+               'Use --document instead') do |value, options|
+      if value then
+        options[:document] << 'rdoc'
+      else
+        options[:document].delete 'rdoc'
+      end
+
+      options[:document].uniq!
+    end
+
+    add_option(:Deprecated, '--[no-]ri',
+               'Generate ri data for installed gems.',
+               'Use --document instead') do |value, options|
+      if value then
+        options[:document] << 'ri'
+      else
+        options[:document].delete 'ri'
+      end
+
+      options[:document].uniq!
+    end
+
     add_option(:"Install/Update", '-E', '--[no-]env-shebang',
                "Rewrite the shebang line on installed",
                "scripts to use /usr/bin/env") do |value, options|
@@ -81,7 +124,11 @@ module Gem::InstallUpdateOptions
       options[:wrappers] = value
     end
 
-    add_security_option
+    add_option(:"Install/Update", '-P', '--trust-policy POLICY',
+               Gem::Security::Policy,
+               'Specify gem trust policy') do |value, options|
+      options[:security_policy] = value
+    end
 
     add_option(:"Install/Update", '--ignore-dependencies',
                'Do not install any required dependent gems') do |value, options|
@@ -89,8 +136,8 @@ module Gem::InstallUpdateOptions
     end
 
     add_option(:"Install/Update",       '--[no-]format-executable',
-               'Make installed executable names match Ruby.',
-               'If Ruby is ruby18, foo_exec will be',
+               'Make installed executable names match ruby.',
+               'If ruby is ruby18, foo_exec will be',
                'foo_exec18') do |value, options|
       options[:format_executable] = value
     end
@@ -140,7 +187,7 @@ module Gem::InstallUpdateOptions
         File.exist? file
       end unless v
 
-      unless v
+      unless v then
         message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})"
 
         raise OptionParser::InvalidArgument,
@@ -178,6 +225,7 @@ module Gem::InstallUpdateOptions
                'Suggest alternates when gems are not found') do |v,o|
       options[:suggest_alternate] = v
     end
+
   end
 
   ##
@@ -188,3 +236,4 @@ module Gem::InstallUpdateOptions
   end
 
 end
+
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index d26b1e88f6..6e77185547 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -7,7 +7,6 @@
 
 require 'rubygems/command'
 require 'rubygems/exceptions'
-require 'rubygems/deprecate'
 require 'rubygems/package'
 require 'rubygems/ext'
 require 'rubygems/user_interaction'
@@ -28,13 +27,11 @@ require 'fileutils'
 
 class Gem::Installer
 
-  extend Gem::Deprecate
-
   ##
   # Paths where env(1) might live.  Some systems are broken and have it in
   # /bin
 
-  ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
+  ENV_PATHS = %w[/usr/bin/env /bin/env]
 
   ##
   # Deprecated in favor of Gem::Ext::BuildError
@@ -101,7 +98,7 @@ class Gem::Installer
   ##
   # Construct an installer object for the gem file located at +path+
 
-  def self.at(path, options = {})
+  def self.at path, options = {}
     security_policy = options[:security_policy]
     package = Gem::Package.new path, security_policy
     new package, options
@@ -110,15 +107,11 @@ class Gem::Installer
   class FakePackage
     attr_accessor :spec
 
-    attr_accessor :dir_mode
-    attr_accessor :prog_mode
-    attr_accessor :data_mode
-
     def initialize(spec)
       @spec = spec
     end
 
-    def extract_files(destination_dir, pattern = '*')
+    def extract_files destination_dir, pattern = '*'
       FileUtils.mkdir_p destination_dir
 
       spec.files.each do |file|
@@ -129,7 +122,7 @@ class Gem::Installer
       end
     end
 
-    def copy_to(path)
+    def copy_to path
     end
   end
 
@@ -137,15 +130,14 @@ class Gem::Installer
   # Construct an installer object for an ephemeral gem (one where we don't
   # actually have a .gem file, just a spec)
 
-  def self.for_spec(spec, options = {})
+  def self.for_spec spec, options = {}
     # FIXME: we should have a real Package class for this
     new FakePackage.new(spec), options
   end
 
   ##
-  # Constructs an Installer instance that will install the gem at +package+ which
-  # can either be a path or an instance of Gem::Package.  +options+ is a Hash
-  # with the following keys:
+  # Constructs an Installer instance that will install the gem located at
+  # +gem+.  +options+ is a Hash with the following keys:
   #
   # :bin_dir:: Where to put a bin wrapper if needed.
   # :development:: Whether or not development dependencies should be installed.
@@ -165,7 +157,6 @@ class Gem::Installer
   # :wrappers:: Install wrappers if true, symlinks if false.
   # :build_args:: An Array of arguments to pass to the extension builder
   #               process. If not set, then Gem::Command.build_args is used
-  # :post_install_message:: Print gem post install message if true
 
   def initialize(package, options={})
     require 'fileutils'
@@ -183,13 +174,7 @@ class Gem::Installer
 
     process_options
 
-    @package.dir_mode = options[:dir_mode]
-    @package.prog_mode = options[:prog_mode]
-    @package.data_mode = options[:data_mode]
-
-    @bin_dir = options[:bin_dir] if options[:bin_dir]
-
-    if options[:user_install] and not options[:unpack]
+    if options[:user_install] and not options[:unpack] then
       @gem_home = Gem.user_dir
       @bin_dir = Gem.bindir gem_home unless options[:bin_dir]
       check_that_user_bin_dir_is_in_path
@@ -209,7 +194,7 @@ class Gem::Installer
   #
   # Otherwise +filename+ is overwritten.
 
-  def check_executable_overwrite(filename) # :nodoc:
+  def check_executable_overwrite filename # :nodoc:
     return if @force
 
     generated_bin = File.join @bin_dir, formatted_program_filename(filename)
@@ -219,7 +204,7 @@ class Gem::Installer
     ruby_executable = false
     existing = nil
 
-    File.open generated_bin, 'rb' do |io|
+    open generated_bin, 'rb' do |io|
       next unless io.gets =~ /^#!/ # shebang
       io.gets # blankline
 
@@ -229,7 +214,7 @@ class Gem::Installer
 
       ruby_executable = true
       existing = io.read.slice(%r{
-          ^\s*(
+          ^(
             gem \s |
             load \s Gem\.bin_path\( |
             load \s Gem\.activate_bin_path\(
@@ -245,7 +230,7 @@ class Gem::Installer
 
     question = "#{spec.name}'s executable \"#{filename}\" conflicts with ".dup
 
-    if ruby_executable
+    if ruby_executable then
       question << (existing || 'an unknown executable')
 
       return if ask_yes_no "#{question}\nOverwrite the executable?", false
@@ -297,24 +282,18 @@ class Gem::Installer
 
     run_pre_install_hooks
 
-    # Set loaded_from to ensure extension_dir is correct
-    if @options[:install_as_default]
-      spec.loaded_from = default_spec_file
-    else
-      spec.loaded_from = spec_file
-    end
-
     # Completely remove any previous gem files
     FileUtils.rm_rf gem_dir
     FileUtils.rm_rf spec.extension_dir
 
-    dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p gem_dir, :mode => dir_mode && 0755
+    FileUtils.mkdir_p gem_dir
 
     if @options[:install_as_default]
+      spec.loaded_from = default_spec_file
       extract_bin
       write_default_spec
     else
+      spec.loaded_from = spec_file
       extract_files
 
       build_extensions
@@ -326,8 +305,6 @@ class Gem::Installer
       write_cache_file
     end
 
-    File.chmod(dir_mode, gem_dir) if dir_mode
-
     say spec.post_install_message if options[:post_install_message] && !spec.post_install_message.nil?
 
     Gem::Installer.install_lock.synchronize { Gem::Specification.reset }
@@ -344,7 +321,7 @@ class Gem::Installer
 
   def run_pre_install_hooks # :nodoc:
     Gem.pre_install_hooks.each do |hook|
-      if hook.call(self) == false
+      if hook.call(self) == false then
         location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
 
         message = "pre-install hook#{location} failed for #{spec.full_name}"
@@ -355,7 +332,7 @@ class Gem::Installer
 
   def run_post_build_hooks # :nodoc:
     Gem.post_build_hooks.each do |hook|
-      if hook.call(self) == false
+      if hook.call(self) == false then
         FileUtils.rm_rf gem_dir
 
         location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
@@ -381,7 +358,7 @@ class Gem::Installer
     @specs ||= begin
       specs = []
 
-      Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path|
+      Dir[File.join(gem_home, "specifications", "*.gemspec")].each do |path|
         spec = Gem::Specification.load path.untaint
         specs << spec if spec
       end
@@ -398,7 +375,7 @@ class Gem::Installer
   # dependency :: Gem::Dependency
 
   def ensure_dependency(spec, dependency)
-    unless installation_satisfies_dependency? dependency
+    unless installation_satisfies_dependency? dependency then
       raise Gem::InstallError, "#{spec.name} requires #{dependency}"
     end
     true
@@ -443,7 +420,7 @@ class Gem::Installer
   # specifications directory.
 
   def write_spec
-    File.open spec_file, 'w' do |file|
+    open spec_file, 'w' do |file|
       spec.installed_by_version = Gem.rubygems_version
 
       file.puts spec.to_ruby_for_cache
@@ -466,7 +443,7 @@ class Gem::Installer
   # Creates windows .bat files for easy running of commands
 
   def generate_windows_script(filename, bindir)
-    if Gem.win_platform?
+    if Gem.win_platform? then
       script_name = filename + ".bat"
       script_path = File.join bindir, File.basename(script_name)
       File.open script_path, 'w' do |file|
@@ -480,31 +457,25 @@ class Gem::Installer
   def generate_bin # :nodoc:
     return if spec.executables.nil? or spec.executables.empty?
 
-    begin
-      Dir.mkdir @bin_dir, *[options[:dir_mode] && 0755].compact
-    rescue SystemCallError
-      raise unless File.directory? @bin_dir
-    end
-
+    Dir.mkdir @bin_dir unless File.exist? @bin_dir
     raise Gem::FilePermissionError.new(@bin_dir) unless File.writable? @bin_dir
 
     spec.executables.each do |filename|
       filename.untaint
       bin_path = File.join gem_dir, spec.bindir, filename
 
-      unless File.exist? bin_path
+      unless File.exist? bin_path then
         # TODO change this to a more useful warning
-        warn "`#{bin_path}` does not exist, maybe `gem pristine #{spec.name}` will fix it?"
+        warn "#{bin_path} maybe `gem pristine #{spec.name}` will fix it?"
         next
       end
 
       mode = File.stat(bin_path).mode
-      dir_mode = options[:prog_mode] || (mode | 0111)
-      FileUtils.chmod dir_mode, bin_path unless dir_mode == mode
+      FileUtils.chmod mode | 0111, bin_path unless (mode | 0111) == mode
 
       check_executable_overwrite filename
 
-      if @wrappers
+      if @wrappers then
         generate_bin_script filename, @bin_dir
       else
         generate_bin_symlink filename, @bin_dir
@@ -527,7 +498,6 @@ class Gem::Installer
 
     File.open bin_script_path, 'wb', 0755 do |file|
       file.print app_script_text(filename)
-      file.chmod(options[:prog_mode] || 0755)
     end
 
     verbose bin_script_path
@@ -543,8 +513,8 @@ class Gem::Installer
     src = File.join gem_dir, spec.bindir, filename
     dst = File.join bindir, formatted_program_filename(filename)
 
-    if File.exist? dst
-      if File.symlink? dst
+    if File.exist? dst then
+      if File.symlink? dst then
         link = File.readlink(dst).split File::SEPARATOR
         cur_version = Gem::Version.create(link[-3].sub(/^.*-/, ''))
         return if spec.version < cur_version
@@ -578,7 +548,7 @@ class Gem::Installer
     path = File.join gem_dir, spec.bindir, bin_file_name
     first_line = File.open(path, "rb") {|file| file.gets}
 
-    if /\A#!/ =~ first_line
+    if /\A#!/ =~ first_line then
       # Preserve extra words on shebang line, like "-w".  Thanks RPA.
       shebang = first_line.sub(/\A\#!.*?ruby\S*((\s+\S+)+)/, "#!#{Gem.ruby}")
       opts = $1
@@ -603,9 +573,9 @@ class Gem::Installer
       end
 
       "#!#{which}"
-    elsif not ruby_name
+    elsif not ruby_name then
       "#!#{Gem.ruby}#{opts}"
-    elsif opts
+    elsif opts then
       "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
     else
       # Create a plain shebang line.
@@ -631,21 +601,18 @@ class Gem::Installer
   end
 
   def ensure_required_ruby_version_met # :nodoc:
-    if rrv = spec.required_ruby_version
-      ruby_version = Gem.ruby_version
-      unless rrv.satisfied_by? ruby_version
-        raise Gem::RuntimeRequirementNotMetError,
-          "#{spec.name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
+    if rrv = spec.required_ruby_version then
+      unless rrv.satisfied_by? Gem.ruby_version then
+        raise Gem::InstallError, "#{spec.name} requires Ruby version #{rrv}."
       end
     end
   end
 
   def ensure_required_rubygems_version_met # :nodoc:
-    if rrgv = spec.required_rubygems_version
-      unless rrgv.satisfied_by? Gem.rubygems_version
-        rg_version = Gem::VERSION
-        raise Gem::RuntimeRequirementNotMetError,
-          "#{spec.name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
+    if rrgv = spec.required_rubygems_version then
+      unless rrgv.satisfied_by? Gem.rubygems_version then
+        raise Gem::InstallError,
+          "#{spec.name} requires RubyGems version #{rrgv}. " +
           "Try 'gem update --system' to update RubyGems itself."
       end
     end
@@ -702,16 +669,16 @@ class Gem::Installer
       File::ALT_SEPARATOR
 
     path = ENV['PATH']
-    if Gem.win_platform?
+    if Gem.win_platform? then
       path = path.downcase
       user_bin_dir = user_bin_dir.downcase
     end
 
     path = path.split(File::PATH_SEPARATOR)
 
-    unless path.include? user_bin_dir
+    unless path.include? user_bin_dir then
       unless !Gem.win_platform? && (path.include? user_bin_dir.sub(ENV['HOME'], '~'))
-        unless self.class.path_warning
+        unless self.class.path_warning then
           alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables will not run."
           self.class.path_warning = true
         end
@@ -720,39 +687,15 @@ class Gem::Installer
   end
 
   def verify_gem_home(unpack = false) # :nodoc:
-    FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0755
+    FileUtils.mkdir_p gem_home
     raise Gem::FilePermissionError, gem_home unless
       unpack or File.writable?(gem_home)
   end
 
-  def verify_spec
-    unless spec.name =~ Gem::Specification::VALID_NAME_PATTERN
-      raise Gem::InstallError, "#{spec} has an invalid name"
-    end
-
-    if spec.raw_require_paths.any?{|path| path =~ /\R/ }
-      raise Gem::InstallError, "#{spec} has an invalid require_paths"
-    end
-
-    if spec.extensions.any?{|ext| ext =~ /\R/ }
-      raise Gem::InstallError, "#{spec} has an invalid extensions"
-    end
-
-    unless spec.specification_version.to_s =~ /\A\d+\z/
-      raise Gem::InstallError, "#{spec} has an invalid specification_version"
-    end
-
-    if spec.dependencies.any? {|dep| dep.type =~ /\R/ || dep.name =~ /\R/ }
-      raise Gem::InstallError, "#{spec} has an invalid dependencies"
-    end
-  end
-
   ##
   # Return the text for an application file.
 
   def app_script_text(bin_file_name)
-    # note that the `load` lines cannot be indented, as old RG versions match
-    # against the beginning of the line
     return <<-TEXT
 #{shebang bin_file_name}
 #
@@ -766,21 +709,16 @@ require 'rubygems'
 
 version = "#{Gem::Requirement.default}.a"
 
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
+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('#{spec.name}', '#{bin_file_name}', version)
-else
-gem #{spec.name.dump}, version
-load Gem.bin_path(#{spec.name.dump}, #{bin_file_name.dump}, version)
-end
 TEXT
   end
 
@@ -788,38 +726,17 @@ TEXT
   # return the stub script text used to launch the true Ruby script
 
   def windows_stub_script(bindir, bin_file_name)
-    rb_config = RbConfig::CONFIG
-    rb_topdir = RbConfig::TOPDIR || File.dirname(rb_config["bindir"])
-
-    # get ruby executable file name from RbConfig
-    ruby_exe = "#{rb_config['RUBY_INSTALL_NAME']}#{rb_config['EXEEXT']}"
-    ruby_exe = "ruby.exe" if ruby_exe.empty?
-
-    if File.exist?(File.join bindir, ruby_exe)
-      # stub & ruby.exe withing same folder.  Portable
-      <<-TEXT
-@ECHO OFF
-@"%~dp0ruby.exe" "%~dpn0" %*
-      TEXT
-    elsif bindir.downcase.start_with? rb_topdir.downcase
-      # stub within ruby folder, but not standard bin.  Portable
-      require 'pathname'
-      from = Pathname.new bindir
-      to   = Pathname.new "#{rb_topdir}/bin"
-      rel  = to.relative_path_from from
-      <<-TEXT
-@ECHO OFF
-@"%~dp0#{rel}/ruby.exe" "%~dpn0" %*
-      TEXT
-    else
-      # outside ruby folder, maybe -user-install or bundler.  Portable, but ruby
-      # is dependent on PATH
-      <<-TEXT
+    ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\")
+    return <<-TEXT
 @ECHO OFF
-@ruby.exe "%~dpn0" %*
-      TEXT
-    end
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"#{ruby}" "#{File.join(bindir, bin_file_name)}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+@"#{ruby}" "%~dpn0" %*
+TEXT
   end
+
   ##
   # Builds extensions.  Valid types of extensions are extconf.rb files,
   # configure scripts and rakefiles or mkrf_conf files.
@@ -833,14 +750,13 @@ TEXT
   ##
   # Logs the build +output+ in +build_dir+, then raises Gem::Ext::BuildError.
   #
-  # TODO:  Delete this for RubyGems 4.  It remains for API compatibility
+  # TODO:  Delete this for RubyGems 3.  It remains for API compatibility
 
   def extension_build_error(build_dir, output, backtrace = nil) # :nodoc:
     builder = Gem::Ext::Builder.new spec, @build_args
 
     builder.build_error build_dir, output, backtrace
   end
-  deprecate :extension_build_error, :none, 2018, 12
 
   ##
   # Reads the file index and extracts each file into the gem directory.
@@ -864,7 +780,7 @@ TEXT
   # Prefix and suffix the program filename the same as ruby.
 
   def formatted_program_filename(filename)
-    if @format_executable
+    if @format_executable then
       self.class.exec_format % File.basename(filename)
     else
       filename
@@ -888,15 +804,11 @@ TEXT
   #
   # Version and dependency checks are skipped if this install is forced.
   #
-  # The dependent check will be skipped if the install is ignoring dependencies.
+  # The dependent check will be skipped this install is ignoring dependencies.
 
   def pre_install_checks
     verify_gem_home options[:unpack]
 
-    # The name and require_paths must be verified first, since it could contain
-    # ruby code that would be eval'ed in #ensure_loadable_spec
-    verify_spec
-
     ensure_loadable_spec
 
     if options[:install_as_default]
@@ -923,18 +835,15 @@ TEXT
 
     build_info_dir = File.join gem_home, 'build_info'
 
-    dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p build_info_dir, :mode => dir_mode && 0755
+    FileUtils.mkdir_p build_info_dir
 
     build_info_file = File.join build_info_dir, "#{spec.full_name}.info"
 
-    File.open build_info_file, 'w' do |io|
+    open build_info_file, 'w' do |io|
       @build_args.each do |arg|
         io.puts arg
       end
     end
-
-    File.chmod(dir_mode, build_info_dir) if dir_mode
   end
 
   ##
diff --git a/lib/rubygems/installer_test_case.rb b/lib/rubygems/installer_test_case.rb
index d6d16a9194..eccd5711c2 100644
--- a/lib/rubygems/installer_test_case.rb
+++ b/lib/rubygems/installer_test_case.rb
@@ -72,7 +72,7 @@ class Gem::InstallerTestCase < Gem::TestCase
   #   a spec named 'a', intended for regular installs
   # @user_spec::
   #   a spec named 'b', intended for user installs
-  #
+
   # @gem::
   #   the path to a built gem from @spec
   # @user_spec::
@@ -106,6 +106,16 @@ class Gem::InstallerTestCase < Gem::TestCase
     Gem::Installer.path_warning = false
   end
 
+  def util_gem_bindir spec = @spec # :nodoc:
+    # TODO: deprecate
+    spec.bin_dir
+  end
+
+  def util_gem_dir spec = @spec # :nodoc:
+    # TODO: deprecate
+    spec.gem_dir
+  end
+
   ##
   # The path where installed executables live
 
@@ -183,3 +193,4 @@ class Gem::InstallerTestCase < Gem::TestCase
   end
 
 end
+
diff --git a/lib/rubygems/local_remote_options.rb b/lib/rubygems/local_remote_options.rb
index 9fa256b08a..597b87ea03 100644
--- a/lib/rubygems/local_remote_options.rb
+++ b/lib/rubygems/local_remote_options.rb
@@ -24,10 +24,8 @@ module Gem::LocalRemoteOptions
         raise OptionParser::InvalidArgument, value
       end
 
-      valid_uri_schemes = ["http", "https", "file", "s3"]
-      unless valid_uri_schemes.include?(uri.scheme)
-        msg =  "Invalid uri scheme for #{value}\nPreface URLs with one of #{valid_uri_schemes.map{|s| "#{s}://"}}"
-        raise ArgumentError, msg
+      unless ['http', 'https', 'file', 's3'].include?(uri.scheme)
+         raise OptionParser::InvalidArgument, value
       end
 
       value
@@ -108,7 +106,7 @@ module Gem::LocalRemoteOptions
 
       source << '/' if source !~ /\/\z/
 
-      if options.delete :sources_cleared
+      if options.delete :sources_cleared then
         Gem.sources = [source]
       else
         Gem.sources << source unless Gem.sources.include?(source)
@@ -148,3 +146,4 @@ module Gem::LocalRemoteOptions
   end
 
 end
+
diff --git a/lib/rubygems/mock_gem_ui.rb b/lib/rubygems/mock_gem_ui.rb
index 92ec85625c..0223f8c35d 100644
--- a/lib/rubygems/mock_gem_ui.rb
+++ b/lib/rubygems/mock_gem_ui.rb
@@ -12,7 +12,7 @@ class Gem::MockGemUi < Gem::StreamUI
 
   class InputEOFError < RuntimeError
 
-    def initialize(question)
+    def initialize question
       super "Out of input for MockGemUi on #{question.inspect}"
     end
 
@@ -21,7 +21,7 @@ class Gem::MockGemUi < Gem::StreamUI
   class TermError < RuntimeError
     attr_reader :exit_code
 
-    def initialize(exit_code)
+    def initialize exit_code
       super
       @exit_code = exit_code
     end
@@ -56,7 +56,7 @@ class Gem::MockGemUi < Gem::StreamUI
     @terminated = false
   end
 
-  def ask(question)
+  def ask question
     raise InputEOFError, question if @ins.eof?
 
     super
@@ -86,3 +86,4 @@ class Gem::MockGemUi < Gem::StreamUI
   end
 
 end
+
diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb
index e948fb3d86..316329a0bd 100644
--- a/lib/rubygems/name_tuple.rb
+++ b/lib/rubygems/name_tuple.rb
@@ -24,7 +24,7 @@ class Gem::NameTuple
   # Turn an array of [name, version, platform] into an array of
   # NameTuple objects.
 
-  def self.from_list(list)
+  def self.from_list list
     list.map { |t| new(*t) }
   end
 
@@ -32,7 +32,7 @@ class Gem::NameTuple
   # Turn an array of NameTuple objects back into an array of
   # [name, version, platform] tuples.
 
-  def self.to_basic(list)
+  def self.to_basic list
     list.map { |t| t.to_a }
   end
 
@@ -90,7 +90,7 @@ class Gem::NameTuple
 
   alias to_s inspect # :nodoc:
 
-  def <=>(other)
+  def <=> other
     [@name, @version, @platform == Gem::Platform::RUBY ? -1 : 1] <=>
       [other.name, other.version,
        other.platform == Gem::Platform::RUBY ? -1 : 1]
@@ -102,7 +102,7 @@ class Gem::NameTuple
   # Compare with +other+. Supports another NameTuple or an Array
   # in the [name, version, platform] format.
 
-  def ==(other)
+  def == other
     case other
     when self.class
       @name == other.name and
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 3bf4f8fd62..c36e71d800 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -55,7 +55,7 @@ class Gem::Package
   class FormatError < Error
     attr_reader :path
 
-    def initialize(message, source = nil)
+    def initialize message, source = nil
       if source
         @path = source.path
 
@@ -68,7 +68,7 @@ class Gem::Package
   end
 
   class PathError < Error
-    def initialize(destination, destination_dir)
+    def initialize destination, destination_dir
       super "installing into parent path %s of %s is not allowed" %
               [destination, destination_dir]
     end
@@ -107,24 +107,12 @@ class Gem::Package
 
   attr_writer :spec
 
-  ##
-  # Permission for directories
-  attr_accessor :dir_mode
-
-  ##
-  # Permission for program files
-  attr_accessor :prog_mode
-
-  ##
-  # Permission for other files
-  attr_accessor :data_mode
-
-  def self.build(spec, skip_validation = false, strict_validation = false, file_name = nil)
-    gem_file = file_name || spec.file_name
+  def self.build spec, skip_validation=false
+    gem_file = spec.file_name
 
     package = new gem_file
     package.spec = spec
-    package.build skip_validation, strict_validation
+    package.build skip_validation
 
     gem_file
   end
@@ -136,7 +124,7 @@ class Gem::Package
   # If +gem+ is an existing file in the old format a Gem::Package::Old will be
   # returned.
 
-  def self.new(gem, security_policy = nil)
+  def self.new gem, security_policy = nil
     gem = if gem.is_a?(Gem::Package::Source)
             gem
           elsif gem.respond_to? :read
@@ -157,10 +145,10 @@ class Gem::Package
   ##
   # Creates a new package that will read or write to the file +gem+.
 
-  def initialize(gem, security_policy) # :notnew:
+  def initialize gem, security_policy # :notnew:
     @gem = gem
 
-    @build_time      = ENV["SOURCE_DATE_EPOCH"] ? Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc : Time.now
+    @build_time      = Time.now
     @checksums       = {}
     @contents        = nil
     @digests         = Hash.new { |h, algorithm| h[algorithm] = {} }
@@ -174,14 +162,14 @@ class Gem::Package
   ##
   # Copies this package to +path+ (if possible)
 
-  def copy_to(path)
+  def copy_to path
     FileUtils.cp @gem.path, path unless File.exist? path
   end
 
   ##
   # Adds a checksum for each entry in the gem to checksums.yaml.gz.
 
-  def add_checksums(tar)
+  def add_checksums tar
     Gem.load_yaml
 
     checksums_by_algorithm = Hash.new { |h, algorithm| h[algorithm] = {} }
@@ -203,7 +191,7 @@ class Gem::Package
   # Adds the files listed in the packages's Gem::Specification to data.tar.gz
   # and adds this file to the +tar+.
 
-  def add_contents(tar) # :nodoc:
+  def add_contents tar # :nodoc:
     digests = tar.add_file_signed 'data.tar.gz', 0444, @signer do |io|
       gzip_to io do |gz_io|
         Gem::Package::TarWriter.new gz_io do |data_tar|
@@ -218,25 +206,20 @@ class Gem::Package
   ##
   # Adds files included the package's Gem::Specification to the +tar+ file
 
-  def add_files(tar) # :nodoc:
+  def add_files tar # :nodoc:
     @spec.files.each do |file|
       stat = File.lstat file
 
       if stat.symlink?
-        target_path = File.readlink(file)
-
-        unless target_path.start_with? '.'
-          relative_dir = File.dirname(file).sub("#{Dir.pwd}/", '')
-          target_path = File.join(relative_dir, target_path)
-        end
-
+        relative_dir = File.dirname(file).sub("#{Dir.pwd}/", '')
+        target_path = File.join(relative_dir, File.readlink(file))
         tar.add_symlink file, target_path, stat.mode
       end
 
       next unless stat.file?
 
       tar.add_file_simple file, stat.mode, stat.size do |dst_io|
-        File.open file, 'rb' do |src_io|
+        open file, 'rb' do |src_io|
           dst_io.write src_io.read 16384 until src_io.eof?
         end
       end
@@ -246,7 +229,7 @@ class Gem::Package
   ##
   # Adds the package's Gem::Specification to the +tar+ file
 
-  def add_metadata(tar) # :nodoc:
+  def add_metadata tar # :nodoc:
     digests = tar.add_file_signed 'metadata.gz', 0444, @signer do |io|
       gzip_to io do |gz_io|
         gz_io.write @spec.to_yaml
@@ -259,20 +242,14 @@ class Gem::Package
   ##
   # Builds this package based on the specification set by #spec=
 
-  def build(skip_validation = false, strict_validation = false)
-    raise ArgumentError, "skip_validation = true and strict_validation = true are incompatible" if skip_validation && strict_validation
-
+  def build skip_validation = false
     Gem.load_yaml
     require 'rubygems/security'
 
     @spec.mark_version
-    @spec.validate true, strict_validation unless skip_validation
+    @spec.validate unless skip_validation
 
-    setup_signer(
-      signer_options: {
-        expiration_length_days: Gem.configuration.cert_expiration_length_days
-      }
-    )
+    setup_signer
 
     @gem.with_write_io do |gem_io|
       Gem::Package::TarWriter.new gem_io do |gem|
@@ -286,7 +263,7 @@ class Gem::Package
   Successfully built RubyGem
   Name: #{@spec.name}
   Version: #{@spec.version}
-  File: #{File.basename @gem.path}
+  File: #{File.basename @spec.cache_file}
 EOM
   ensure
     @signer = nil
@@ -323,8 +300,8 @@ EOM
   # Creates a digest of the TarEntry +entry+ from the digest algorithm set by
   # the security policy.
 
-  def digest(entry) # :nodoc:
-    algorithms = if @checksums
+  def digest entry # :nodoc:
+    algorithms = if @checksums then
                    @checksums.keys
                  else
                    [Gem::Security::DIGEST_NAME].compact
@@ -332,7 +309,7 @@ EOM
 
     algorithms.each do |algorithm|
       digester =
-        if defined?(OpenSSL::Digest)
+        if defined?(OpenSSL::Digest) then
           OpenSSL::Digest.new algorithm
         else
           Digest.const_get(algorithm).new
@@ -354,10 +331,10 @@ EOM
   # If +pattern+ is specified, only entries matching that glob will be
   # extracted.
 
-  def extract_files(destination_dir, pattern = "*")
+  def extract_files destination_dir, pattern = "*"
     verify unless @spec
 
-    FileUtils.mkdir_p destination_dir, :mode => dir_mode && 0755
+    FileUtils.mkdir_p destination_dir
 
     @gem.with_read_io do |io|
       reader = Gem::Package::TarReader.new io
@@ -383,8 +360,7 @@ EOM
   # If +pattern+ is specified, only entries matching that glob will be
   # extracted.
 
-  def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
-    directories = [] if dir_mode
+  def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:
     open_tar_gz io do |tar|
       tar.each do |entry|
         next unless File.fnmatch pattern, entry.full_name, File::FNM_DOTMATCH
@@ -394,20 +370,19 @@ EOM
         FileUtils.rm_rf destination
 
         mkdir_options = {}
-        mkdir_options[:mode] = dir_mode ? 0755 : (entry.header.mode if entry.directory?)
+        mkdir_options[:mode] = entry.header.mode if entry.directory?
         mkdir =
-          if entry.directory?
+          if entry.directory? then
             destination
           else
             File.dirname destination
           end
-        directories << mkdir if directories
 
-        mkdir_p_safe mkdir, mkdir_options, destination_dir, entry.full_name
+        FileUtils.mkdir_p mkdir, mkdir_options
 
-        File.open destination, 'wb' do |out|
+        open destination, 'wb' do |out|
           out.write entry.read
-          FileUtils.chmod file_mode(entry.header.mode), destination
+          FileUtils.chmod entry.header.mode, destination
         end if entry.file?
 
         File.symlink(entry.header.linkname, destination) if entry.symlink?
@@ -415,15 +390,6 @@ EOM
         verbose destination
       end
     end
-
-    if directories
-      directories.uniq!
-      File.chmod(dir_mode, *directories)
-    end
-  end
-
-  def file_mode(mode) # :nodoc:
-    ((mode & 0111).zero? ? data_mode : prog_mode) || mode
   end
 
   ##
@@ -432,7 +398,7 @@ EOM
   # Also sets the gzip modification time to the package build time to ease
   # testing.
 
-  def gzip_to(io) # :yields: gz_io
+  def gzip_to io # :yields: gz_io
     gz_io = Zlib::GzipWriter.new io, Zlib::BEST_COMPRESSION
     gz_io.mtime = @build_time
 
@@ -446,65 +412,36 @@ EOM
   #
   # If +filename+ is not inside +destination_dir+ an exception is raised.
 
-  def install_location(filename, destination_dir) # :nodoc:
+  def install_location filename, destination_dir # :nodoc:
     raise Gem::Package::PathError.new(filename, destination_dir) if
       filename.start_with? '/'
 
-    destination_dir = File.expand_path(File.realpath(destination_dir))
-    destination = File.expand_path(File.join(destination_dir, filename))
+    destination_dir = File.realpath destination_dir if
+      File.respond_to? :realpath
+    destination_dir = File.expand_path destination_dir
 
-    raise Gem::Package::PathError.new(destination, destination_dir) unless
-      destination.start_with? destination_dir + '/'
+    destination = File.join destination_dir, filename
+    destination = File.expand_path destination
 
-    begin
-      real_destination = File.expand_path(File.realpath(destination))
-    rescue
-      # it's fine if the destination doesn't exist, because rm -rf'ing it can't cause any damage
-      nil
-    else
-      raise Gem::Package::PathError.new(real_destination, destination_dir) unless
-        real_destination.start_with? destination_dir + '/'
-    end
+    raise Gem::Package::PathError.new(destination, destination_dir) unless
+      destination.start_with? destination_dir
 
     destination.untaint
     destination
   end
 
-  def normalize_path(pathname)
-    if Gem.win_platform?
-      pathname.downcase
-    else
-      pathname
-    end
-  end
-
-  def mkdir_p_safe(mkdir, mkdir_options, destination_dir, file_name)
-    destination_dir = File.realpath(File.expand_path(destination_dir))
-    parts = mkdir.split(File::SEPARATOR)
-    parts.reduce do |path, basename|
-      path = File.realpath(path) unless path == ""
-      path = File.expand_path(path + File::SEPARATOR + basename)
-      lstat = File.lstat path rescue nil
-      if !lstat || !lstat.directory?
-        unless normalize_path(path).start_with? normalize_path(destination_dir) and (FileUtils.mkdir path, mkdir_options rescue false)
-          raise Gem::Package::PathError.new(file_name, destination_dir)
-        end
-      end
-      path
-    end
-  end
-
   ##
   # Loads a Gem::Specification from the TarEntry +entry+
 
-  def load_spec(entry) # :nodoc:
+  def load_spec entry # :nodoc:
     case entry.full_name
     when 'metadata' then
       @spec = Gem::Specification.from_yaml entry.read
     when 'metadata.gz' then
       args = [entry]
       args << { :external_encoding => Encoding::UTF_8 } if
-        Zlib::GzipReader.method(:wrap).arity != 1
+        Object.const_defined?(:Encoding) &&
+          Zlib::GzipReader.method(:wrap).arity != 1
 
       Zlib::GzipReader.wrap(*args) do |gzio|
         @spec = Gem::Specification.from_yaml gzio.read
@@ -515,7 +452,7 @@ EOM
   ##
   # Opens +io+ as a gzipped tar archive
 
-  def open_tar_gz(io) # :nodoc:
+  def open_tar_gz io # :nodoc:
     Zlib::GzipReader.wrap io do |gzio|
       tar = Gem::Package::TarReader.new gzio
 
@@ -526,12 +463,12 @@ EOM
   ##
   # Reads and loads checksums.yaml.gz from the tar file +gem+
 
-  def read_checksums(gem)
+  def read_checksums gem
     Gem.load_yaml
 
     @checksums = gem.seek 'checksums.yaml.gz' do |entry|
       Zlib::GzipReader.wrap entry do |gz_io|
-        Gem::SafeYAML.safe_load gz_io.read
+        YAML.load gz_io.read
       end
     end
   end
@@ -540,17 +477,10 @@ EOM
   # Prepares the gem for signing and checksum generation.  If a signing
   # certificate and key are not present only checksum generation is set up.
 
-  def setup_signer(signer_options: {})
+  def setup_signer
     passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
-    if @spec.signing_key
-      @signer =
-        Gem::Security::Signer.new(
-          @spec.signing_key,
-          @spec.cert_chain,
-          passphrase,
-          signer_options
-        )
-
+    if @spec.signing_key then
+      @signer = Gem::Security::Signer.new @spec.signing_key, @spec.cert_chain, passphrase
       @spec.signing_key = nil
       @spec.cert_chain = @signer.cert_chain.map { |cert| cert.to_s }
     else
@@ -615,14 +545,14 @@ EOM
   # Verifies the +checksums+ against the +digests+.  This check is not
   # cryptographically secure.  Missing checksums are ignored.
 
-  def verify_checksums(digests, checksums) # :nodoc:
+  def verify_checksums digests, checksums # :nodoc:
     return unless checksums
 
     checksums.sort.each do |algorithm, gem_digests|
       gem_digests.sort.each do |file_name, gem_hexdigest|
         computed_digest = digests[algorithm][file_name]
 
-        unless computed_digest.hexdigest == gem_hexdigest
+        unless computed_digest.hexdigest == gem_hexdigest then
           raise Gem::Package::FormatError.new \
             "#{algorithm} checksum mismatch for #{file_name}", @gem
         end
@@ -633,7 +563,7 @@ EOM
   ##
   # Verifies +entry+ in a .gem file.
 
-  def verify_entry(entry)
+  def verify_entry entry
     file_name = entry.full_name
     @files << file_name
 
@@ -646,7 +576,7 @@ EOM
     end
 
     case file_name
-    when "metadata", "metadata.gz" then
+    when /^metadata(.gz)?$/ then
       load_spec entry
     when 'data.tar.gz' then
       verify_gz entry
@@ -660,29 +590,25 @@ EOM
   ##
   # Verifies the files of the +gem+
 
-  def verify_files(gem)
+  def verify_files gem
     gem.each do |entry|
       verify_entry entry
     end
 
-    unless @spec
+    unless @spec then
       raise Gem::Package::FormatError.new 'package metadata is missing', @gem
     end
 
-    unless @files.include? 'data.tar.gz'
+    unless @files.include? 'data.tar.gz' then
       raise Gem::Package::FormatError.new \
               'package content (data.tar.gz) is missing', @gem
     end
-
-    if duplicates = @files.group_by {|f| f }.select {|k,v| v.size > 1 }.map(&:first) and duplicates.any?
-      raise Gem::Security::Exception, "duplicate files in the package: (#{duplicates.map(&:inspect).join(', ')})"
-    end
   end
 
   ##
   # Verifies that +entry+ is a valid gzipped file.
 
-  def verify_gz(entry) # :nodoc:
+  def verify_gz entry # :nodoc:
     Zlib::GzipReader.wrap entry do |gzio|
       gzio.read 16384 until gzio.eof? # gzip checksum verification
     end
diff --git a/lib/rubygems/package/digest_io.rb b/lib/rubygems/package/digest_io.rb
index d9e6c3c021..4930c9aa7d 100644
--- a/lib/rubygems/package/digest_io.rb
+++ b/lib/rubygems/package/digest_io.rb
@@ -31,7 +31,7 @@ class Gem::Package::DigestIO
   #   digests['SHA1'].hexdigest   #=> "aaf4c61d[...]"
   #   digests['SHA512'].hexdigest #=> "9b71d224[...]"
 
-  def self.wrap(io, digests)
+  def self.wrap io, digests
     digest_io = new io, digests
 
     yield digest_io
@@ -43,7 +43,7 @@ class Gem::Package::DigestIO
   # Creates a new DigestIO instance.  Using ::wrap is recommended, see the
   # ::wrap documentation for documentation of +io+ and +digests+.
 
-  def initialize(io, digests)
+  def initialize io, digests
     @io = io
     @digests = digests
   end
@@ -51,7 +51,7 @@ class Gem::Package::DigestIO
   ##
   # Writes +data+ to the underlying IO and updates the digests
 
-  def write(data)
+  def write data
     result = @io.write data
 
     @digests.each do |_, digest|
@@ -62,3 +62,4 @@ class Gem::Package::DigestIO
   end
 
 end
+
diff --git a/lib/rubygems/package/file_source.rb b/lib/rubygems/package/file_source.rb
index 8a4f9da6f2..1a4dc4c824 100644
--- a/lib/rubygems/package/file_source.rb
+++ b/lib/rubygems/package/file_source.rb
@@ -10,7 +10,7 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
 
   attr_reader :path
 
-  def initialize(path)
+  def initialize path
     @path = path
   end
 
@@ -22,12 +22,13 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
     File.exist? path
   end
 
-  def with_write_io(&block)
-    File.open path, 'wb', &block
+  def with_write_io &block
+    open path, 'wb', &block
   end
 
-  def with_read_io(&block)
-    File.open path, 'rb', &block
+  def with_read_io &block
+    open path, 'rb', &block
   end
 
 end
+
diff --git a/lib/rubygems/package/io_source.rb b/lib/rubygems/package/io_source.rb
index 669a859d0a..ee79a21083 100644
--- a/lib/rubygems/package/io_source.rb
+++ b/lib/rubygems/package/io_source.rb
@@ -11,7 +11,7 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
 
   attr_reader :io
 
-  def initialize(io)
+  def initialize io
     @io = io
   end
 
@@ -43,3 +43,4 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
   end
 
 end
+
diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb
index f574b989aa..5e722baa35 100644
--- a/lib/rubygems/package/old.rb
+++ b/lib/rubygems/package/old.rb
@@ -19,7 +19,7 @@ class Gem::Package::Old < Gem::Package
   # Creates a new old-format package reader for +gem+.  Old-format packages
   # cannot be written.
 
-  def initialize(gem, security_policy)
+  def initialize gem, security_policy
     require 'fileutils'
     require 'zlib'
     Gem.load_yaml
@@ -49,7 +49,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Extracts the files in this package into +destination_dir+
 
-  def extract_files(destination_dir)
+  def extract_files destination_dir
     verify
 
     errstr = "Error reading files from gem"
@@ -78,9 +78,9 @@ class Gem::Package::Old < Gem::Package
 
         FileUtils.rm_rf destination
 
-        FileUtils.mkdir_p File.dirname(destination), :mode => dir_mode && 0755
+        FileUtils.mkdir_p File.dirname destination
 
-        File.open destination, 'wb', file_mode(entry['mode']) do |out|
+        open destination, 'wb', entry['mode'] do |out|
           out.write file_data
         end
 
@@ -94,20 +94,20 @@ class Gem::Package::Old < Gem::Package
   ##
   # Reads the file list section from the old-format gem +io+
 
-  def file_list(io) # :nodoc:
+  def file_list io # :nodoc:
     header = String.new
 
     read_until_dashes io do |line|
       header << line
     end
 
-    Gem::SafeYAML.safe_load header
+    YAML.load header
   end
 
   ##
   # Reads lines until a "---" separator is found
 
-  def read_until_dashes(io) # :nodoc:
+  def read_until_dashes io # :nodoc:
     while (line = io.gets) && line.chomp.strip != "---" do
       yield line if block_given?
     end
@@ -116,7 +116,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Skips the Ruby self-install header in +io+.
 
-  def skip_ruby(io) # :nodoc:
+  def skip_ruby io # :nodoc:
     loop do
       line = io.gets
 
@@ -124,7 +124,7 @@ class Gem::Package::Old < Gem::Package
       break unless line
     end
 
-    raise Gem::Exception, "Failed to find end of Ruby script while reading gem"
+    raise Gem::Exception, "Failed to find end of ruby script while reading gem"
   end
 
   ##
@@ -144,9 +144,17 @@ class Gem::Package::Old < Gem::Package
       end
     end
 
+    yaml_error = if RUBY_VERSION < '1.9' then
+                   YAML::ParseError
+                 elsif YAML.const_defined?(:ENGINE) && YAML::ENGINE.yamler == 'syck' then
+                   YAML::ParseError
+                 else
+                   YAML::SyntaxError
+                 end
+
     begin
       @spec = Gem::Specification.from_yaml yaml
-    rescue YAML::SyntaxError
+    rescue yaml_error
       raise Gem::Exception, "Failed to parse gem specification out of gem file"
     end
   rescue ArgumentError
diff --git a/lib/rubygems/package/source.rb b/lib/rubygems/package/source.rb
index 69701e55e9..fe19776c38 100644
--- a/lib/rubygems/package/source.rb
+++ b/lib/rubygems/package/source.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 class Gem::Package::Source # :nodoc:
 end
+
diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
index c7b5f88dbd..c54bd14d57 100644
--- a/lib/rubygems/package/tar_header.rb
+++ b/lib/rubygems/package/tar_header.rb
@@ -50,7 +50,7 @@ class Gem::Package::TarHeader
     :uid,
     :uname,
     :version,
-  ].freeze
+  ]
 
   ##
   # Pack format for a tar header
@@ -94,47 +94,40 @@ class Gem::Package::TarHeader
 
   attr_reader(*FIELDS)
 
-  EMPTY_HEADER = ("\0" * 512).freeze # :nodoc:
-
   ##
   # Creates a tar header from IO +stream+
 
   def self.from(stream)
     header = stream.read 512
-    empty = (EMPTY_HEADER == header)
+    empty = (header == "\0" * 512)
 
     fields = header.unpack UNPACK_FORMAT
 
     new :name     => fields.shift,
-        :mode     => strict_oct(fields.shift),
-        :uid      => strict_oct(fields.shift),
-        :gid      => strict_oct(fields.shift),
-        :size     => strict_oct(fields.shift),
-        :mtime    => strict_oct(fields.shift),
-        :checksum => strict_oct(fields.shift),
+        :mode     => fields.shift.oct,
+        :uid      => fields.shift.oct,
+        :gid      => fields.shift.oct,
+        :size     => fields.shift.oct,
+        :mtime    => fields.shift.oct,
+        :checksum => fields.shift.oct,
         :typeflag => fields.shift,
         :linkname => fields.shift,
         :magic    => fields.shift,
-        :version  => strict_oct(fields.shift),
+        :version  => fields.shift.oct,
         :uname    => fields.shift,
         :gname    => fields.shift,
-        :devmajor => strict_oct(fields.shift),
-        :devminor => strict_oct(fields.shift),
+        :devmajor => fields.shift.oct,
+        :devminor => fields.shift.oct,
         :prefix   => fields.shift,
 
         :empty => empty
   end
 
-  def self.strict_oct(str)
-    return str.oct if str =~ /\A[0-7]*\z/
-    raise ArgumentError, "#{str.inspect} is not an octal string"
-  end
-
   ##
   # Creates a new TarHeader using +vals+
 
   def initialize(vals)
-    unless vals[:name] && vals[:size] && vals[:prefix] && vals[:mode]
+    unless vals[:name] && vals[:size] && vals[:prefix] && vals[:mode] then
       raise ArgumentError, ":name, :size, :prefix and :mode required"
     end
 
diff --git a/lib/rubygems/package/tar_reader.rb b/lib/rubygems/package/tar_reader.rb
index f64915eaea..1098336e36 100644
--- a/lib/rubygems/package/tar_reader.rb
+++ b/lib/rubygems/package/tar_reader.rb
@@ -92,9 +92,11 @@ class Gem::Package::TarReader
   # NOTE: Do not call #rewind during #each
 
   def rewind
-    if @init_pos == 0
+    if @init_pos == 0 then
+      raise Gem::Package::NonSeekableIO unless @io.respond_to? :rewind
       @io.rewind
     else
+      raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
       @io.pos = @init_pos
     end
   end
@@ -104,7 +106,7 @@ class Gem::Package::TarReader
   # yields it.  Rewinds the tar file to the beginning when the block
   # terminates.
 
-  def seek(name) # :yields: entry
+  def seek name # :yields: entry
     found = find do |entry|
       entry.full_name == name
     end
diff --git a/lib/rubygems/package/tar_reader/entry.rb b/lib/rubygems/package/tar_reader/entry.rb
index 19054c1635..5f958edc2f 100644
--- a/lib/rubygems/package/tar_reader/entry.rb
+++ b/lib/rubygems/package/tar_reader/entry.rb
@@ -64,7 +64,7 @@ class Gem::Package::TarReader::Entry
   # Full name of the tar entry
 
   def full_name
-    if @header.prefix != ""
+    if @header.prefix != "" then
       File.join @header.prefix, @header.name
     else
       @header.name
@@ -119,12 +119,6 @@ class Gem::Package::TarReader::Entry
     bytes_read
   end
 
-  def size
-    @header.size
-  end
-
-  alias length size
-
   ##
   # Reads +len+ bytes from the tar file entry, or the rest of the entry if
   # nil
@@ -143,19 +137,7 @@ class Gem::Package::TarReader::Entry
     ret
   end
 
-  def readpartial(maxlen = nil, outbuf = "".b)
-    check_closed
-
-    raise EOFError if @read >= @header.size
-
-    maxlen ||= @header.size - @read
-    max_read = [maxlen, @header.size - @read].min
-
-    @io.readpartial(max_read, outbuf)
-    @read += outbuf.size
-
-    outbuf
-  end
+  alias readpartial read # :nodoc:
 
   ##
   # Rewinds to the beginning of the tar file entry
@@ -163,6 +145,8 @@ class Gem::Package::TarReader::Entry
   def rewind
     check_closed
 
+    raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
+
     @io.pos = @orig_pos
     @read = 0
   end
diff --git a/lib/rubygems/package/tar_test_case.rb b/lib/rubygems/package/tar_test_case.rb
index 75978c8ed0..46ac949587 100644
--- a/lib/rubygems/package/tar_test_case.rb
+++ b/lib/rubygems/package/tar_test_case.rb
@@ -52,7 +52,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
       name = fields.shift
       length = fields.shift.to_i
 
-      if name == "checksum"
+      if name == "checksum" then
         chksum_off = offset
         offset += length
         next
@@ -94,7 +94,13 @@ class Gem::Package::TarTestCase < Gem::TestCase
       ASCIIZ(dname, 155)     # char prefix[155];   ASCII + (Z unless filled)
     ]
 
-    h = arr.join
+    format = "C100C8C8C8C12C12C8CC100C6C2C32C32C8C8C155"
+    h = if RUBY_VERSION >= "1.9" then
+          arr.join
+        else
+          arr = arr.join("").split(//).map{|x| x[0]}
+          arr.pack format
+        end
     ret = h + "\0" * (512 - h.size)
     assert_equal(512, ret.size)
     ret
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb
index 87ee39a944..f68b8d4c5e 100644
--- a/lib/rubygems/package/tar_writer.rb
+++ b/lib/rubygems/package/tar_writer.rb
@@ -106,10 +106,12 @@ class Gem::Package::TarWriter
   def add_file(name, mode) # :yields: io
     check_closed
 
+    raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
+
     name, prefix = split_name name
 
     init_pos = @io.pos
-    @io.write Gem::Package::TarHeader::EMPTY_HEADER # placeholder for the header
+    @io.write "\0" * 512 # placeholder for the header
 
     yield RestrictedStream.new(@io) if block_given?
 
@@ -123,7 +125,7 @@ class Gem::Package::TarWriter
 
     header = Gem::Package::TarHeader.new :name => name, :mode => mode,
                                          :size => size, :prefix => prefix,
-                                         :mtime => ENV["SOURCE_DATE_EPOCH"] ? Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc : Time.now
+                                         :mtime => Time.now
 
     @io.write header
     @io.pos = final_pos
@@ -139,11 +141,11 @@ class Gem::Package::TarWriter
   #
   # The created digest object is returned.
 
-  def add_file_digest(name, mode, digest_algorithms) # :yields: io
+  def add_file_digest name, mode, digest_algorithms # :yields: io
     digests = digest_algorithms.map do |digest_algorithm|
       digest = digest_algorithm.new
       digest_name =
-        if digest.respond_to? :name
+        if digest.respond_to? :name then
           digest.name
         else
           /::([^:]+)$/ =~ digest_algorithm.name
@@ -172,7 +174,7 @@ class Gem::Package::TarWriter
   #
   # Returns the digest.
 
-  def add_file_signed(name, mode, signer)
+  def add_file_signed name, mode, signer
     digest_algorithms = [
       signer.digest_algorithm,
       Digest::SHA512,
@@ -184,18 +186,17 @@ class Gem::Package::TarWriter
 
     signature_digest = digests.values.compact.find do |digest|
       digest_name =
-        if digest.respond_to? :name
+        if digest.respond_to? :name then
           digest.name
         else
-          digest.class.name[/::([^:]+)\z/, 1]
+          /::([^:]+)$/ =~ digest.class.name
+          $1
         end
 
       digest_name == signer.digest_name
     end
 
-    raise "no #{signer.digest_name} in #{digests.values.compact}" unless signature_digest
-
-    if signer.key
+    if signer.key then
       signature = signer.sign signature_digest.digest
 
       add_file_simple "#{name}.sig", 0444, signature.length do |io|
@@ -217,7 +218,7 @@ class Gem::Package::TarWriter
 
     header = Gem::Package::TarHeader.new(:name => name, :mode => mode,
                                          :size => size, :prefix => prefix,
-                                         :mtime => ENV["SOURCE_DATE_EPOCH"] ? Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc : Time.now).to_s
+                                         :mtime => Time.now).to_s
 
     @io.write header
     os = BoundedStream.new @io, size
@@ -245,7 +246,7 @@ class Gem::Package::TarWriter
                                          :size => 0, :typeflag => "2",
                                          :linkname => target,
                                          :prefix => prefix,
-                                         :mtime => ENV["SOURCE_DATE_EPOCH"] ? Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc : Time.now).to_s
+                                         :mtime => Time.now).to_s
 
     @io.write header
 
@@ -298,7 +299,7 @@ class Gem::Package::TarWriter
     header = Gem::Package::TarHeader.new :name => name, :mode => mode,
                                          :typeflag => "5", :size => 0,
                                          :prefix => prefix,
-                                         :mtime => ENV["SOURCE_DATE_EPOCH"] ? Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc : Time.now
+                                         :mtime => Time.now
 
     @io.write header
 
@@ -309,12 +310,12 @@ class Gem::Package::TarWriter
   # Splits +name+ into a name and prefix that can fit in the TarHeader
 
   def split_name(name) # :nodoc:
-    if name.bytesize > 256
+    if name.bytesize > 256 then
       raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
     end
 
     prefix = ''
-    if name.bytesize > 100
+    if name.bytesize > 100 then
       parts = name.split('/', -1) # parts are never empty here
       name = parts.pop            # initially empty for names with a trailing slash ("foo/.../bar/")
       prefix = parts.join('/')    # if empty, then it's impossible to split (parts is empty too)
@@ -323,11 +324,11 @@ class Gem::Package::TarWriter
         prefix = parts.join('/')
       end
 
-      if name.bytesize > 100 or prefix.empty?
+      if name.bytesize > 100 or prefix.empty? then
         raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
       end
 
-      if prefix.bytesize > 155
+      if prefix.bytesize > 155 then
         raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
       end
     end
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
index a11d09fb21..d554e3697b 100644
--- a/lib/rubygems/package_task.rb
+++ b/lib/rubygems/package_task.rb
@@ -126,3 +126,4 @@ class Gem::PackageTask < Rake::PackageTask
   end
 
 end
+
diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb
index ed680d6553..618bc793c4 100644
--- a/lib/rubygems/path_support.rb
+++ b/lib/rubygems/path_support.rb
@@ -23,14 +23,12 @@ class Gem::PathSupport
   # hashtable, or defaults to ENV, the system environment.
   #
   def initialize(env)
-    @home = env["GEM_HOME"] || Gem.default_dir
+    @home     = env["GEM_HOME"] || Gem.default_dir
 
-    if File::ALT_SEPARATOR
-      @home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
+    if File::ALT_SEPARATOR then
+      @home   = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
     end
 
-    @home = expand(@home)
-
     @path = split_gem_path env["GEM_PATH"], @home
 
     @spec_cache_dir = env["GEM_SPEC_CACHE"] || Gem.default_spec_cache_dir
@@ -43,7 +41,7 @@ class Gem::PathSupport
   ##
   # Split the Gem search path (as reported by Gem.path).
 
-  def split_gem_path(gpaths, home)
+  def split_gem_path gpaths, home
     # FIX: it should be [home, *path], not [*path, home]
 
     gem_path = []
@@ -56,7 +54,7 @@ class Gem::PathSupport
         gem_path += default_path
       end
 
-      if File::ALT_SEPARATOR
+      if File::ALT_SEPARATOR then
         gem_path.map! do |this_path|
           this_path.gsub File::ALT_SEPARATOR, File::SEPARATOR
         end
@@ -67,7 +65,7 @@ class Gem::PathSupport
       gem_path = default_path
     end
 
-    gem_path.map { |path| expand(path) }.uniq
+    gem_path.uniq
   end
 
   # Return the default Gem path
@@ -79,12 +77,4 @@ class Gem::PathSupport
     end
     gem_path
   end
-
-  def expand(path)
-    if File.directory?(path)
-      File.realpath(path)
-    else
-      path
-    end
-  end
 end
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
index f8fe4dad54..d22d91ae54 100644
--- a/lib/rubygems/platform.rb
+++ b/lib/rubygems/platform.rb
@@ -56,7 +56,7 @@ class Gem::Platform
     when String then
       arch = arch.split '-'
 
-      if arch.length > 2 and arch.last !~ /\d/  # reassemble x86-linux-gnu
+      if arch.length > 2 and arch.last !~ /\d/ then # reassemble x86-linux-gnu
         extra = arch.pop
         arch.last << "-#{extra}"
       end
@@ -68,7 +68,7 @@ class Gem::Platform
              else cpu
              end
 
-      if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/  # for command-line
+      if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ then # for command-line
         @os, @version = arch
         return
       end
@@ -112,7 +112,7 @@ class Gem::Platform
   end
 
   def inspect
-    "%s @cpu=%p, @os=%p, @version=%p>" % [super[0..-2], *to_a]
+    "#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a]
   end
 
   def to_a
@@ -195,11 +195,12 @@ class Gem::Platform
   # A pure-Ruby gem that may use Gem::Specification#extensions to build
   # binary files.
 
-  RUBY = 'ruby'.freeze
+  RUBY = 'ruby'
 
   ##
   # A platform-specific gem that is built for the packaging Ruby's platform.
   # This will be replaced with Gem::Platform::local.
 
-  CURRENT = 'current'.freeze
+  CURRENT = 'current'
 end
+
diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb
index 6f399a289e..41a7314b53 100644
--- a/lib/rubygems/psych_tree.rb
+++ b/lib/rubygems/psych_tree.rb
@@ -18,7 +18,7 @@ module Gem
       end
 
       # This is ported over from the yaml_tree in 1.9.3
-      def format_time(time)
+      def format_time time
         if time.utc?
           time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
         else
diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
index dfaf7c55bf..7043bd2a31 100644
--- a/lib/rubygems/rdoc.rb
+++ b/lib/rubygems/rdoc.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 require 'rubygems'
+require 'rubygems/user_interaction'
+require 'fileutils'
 
 begin
   gem 'rdoc'
@@ -13,12 +15,321 @@ else
   Gem.finish_resolve
 end
 
+loaded_hook = false
+
 begin
   require 'rdoc/rubygems_hook'
+  loaded_hook = true
   module Gem
     RDoc = ::RDoc::RubygemsHook
   end
 rescue LoadError
 end
 
+##
+# Gem::RDoc provides methods to generate RDoc and ri data for installed gems.
+# It works for RDoc 1.0.1 (in Ruby 1.8) up to RDoc 3.6.
+#
+# This implementation is considered obsolete.  The RDoc project is the
+# appropriate location to find this functionality.  This file provides the
+# hooks to load RDoc generation code from the "rdoc" gem and a fallback in
+# case the installed version of RDoc does not have them.
+
+class Gem::RDoc # :nodoc: all
+
+  include Gem::UserInteraction
+  extend  Gem::UserInteraction
+
+  @rdoc_version = nil
+  @specs = []
+
+  ##
+  # Force installation of documentation?
+
+  attr_accessor :force
+
+  ##
+  # Generate rdoc?
+
+  attr_accessor :generate_rdoc
+
+  ##
+  # Generate ri data?
+
+  attr_accessor :generate_ri
+
+  class << self
+
+    ##
+    # Loaded version of RDoc.  Set by ::load_rdoc
+
+    attr_reader :rdoc_version
+
+  end
+
+  ##
+  # Post installs hook that generates documentation for each specification in
+  # +specs+
+
+  def self.generation_hook installer, specs
+    start = Time.now
+    types = installer.document
+
+    generate_rdoc = types.include? 'rdoc'
+    generate_ri   = types.include? 'ri'
+
+    specs.each do |spec|
+      new(spec, generate_rdoc, generate_ri).generate
+    end
+
+    return unless generate_rdoc or generate_ri
+
+    duration = (Time.now - start).to_i
+    names    = specs.map(&:name).join ', '
+
+    say "Done installing documentation for #{names} after #{duration} seconds"
+  end
+
+  ##
+  # Loads the RDoc generator
+
+  def self.load_rdoc
+    return if @rdoc_version
+
+    require 'rdoc/rdoc'
+
+    @rdoc_version = if ::RDoc.const_defined? :VERSION then
+                      Gem::Version.new ::RDoc::VERSION
+                    else
+                      Gem::Version.new '1.0.1'
+                    end
+
+  rescue LoadError => e
+    raise Gem::DocumentError, "RDoc is not installed: #{e}"
+  end
+
+  ##
+  # Creates a new documentation generator for +spec+.  RDoc and ri data
+  # generation can be enabled or disabled through +generate_rdoc+ and
+  # +generate_ri+ respectively.
+  #
+  # Only +generate_ri+ is enabled by default.
+
+  def initialize spec, generate_rdoc = true, generate_ri = true
+    @doc_dir   = spec.doc_dir
+    @file_info = nil
+    @force     = false
+    @rdoc      = nil
+    @spec      = spec
+
+    @generate_rdoc = generate_rdoc
+    @generate_ri   = generate_ri
+
+    @rdoc_dir = spec.doc_dir 'rdoc'
+    @ri_dir   = spec.doc_dir 'ri'
+  end
+
+  ##
+  # Removes legacy rdoc arguments from +args+
+  #--
+  # TODO move to RDoc::Options
+
+  def delete_legacy_args args
+    args.delete '--inline-source'
+    args.delete '--promiscuous'
+    args.delete '-p'
+    args.delete '--one-file'
+  end
+
+  ##
+  # Generates documentation using the named +generator+ ("darkfish" or "ri")
+  # and following the given +options+.
+  #
+  # Documentation will be generated into +destination+
+
+  def document generator, options, destination
+    generator_name = generator
+
+    options = options.dup
+    options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
+    options.setup_generator generator
+    options.op_dir = destination
+    options.finish
+
+    generator = options.generator.new @rdoc.store, options
+
+    @rdoc.options = options
+    @rdoc.generator = generator
+
+    say "Installing #{generator_name} documentation for #{@spec.full_name}"
+
+    FileUtils.mkdir_p options.op_dir
+
+    Dir.chdir options.op_dir do
+      begin
+        @rdoc.class.current = @rdoc
+        @rdoc.generator.generate @file_info
+      ensure
+        @rdoc.class.current = nil
+      end
+    end
+  end
+
+  ##
+  # Generates RDoc and ri data
+
+  def generate
+    return unless @generate_ri or @generate_rdoc
+
+    setup
+
+    options = nil
+
+    if Gem::Requirement.new('< 3').satisfied_by? self.class.rdoc_version then
+      generate_legacy
+      return
+    end
+
+    ::RDoc::TopLevel.reset # TODO ::RDoc::RDoc.reset
+    ::RDoc::Parser::C.reset
+
+    args = @spec.rdoc_options
+    args.concat @spec.source_paths
+    args.concat @spec.extra_rdoc_files
+
+    case config_args = Gem.configuration[:rdoc]
+    when String then
+      args = args.concat config_args.split
+    when Array then
+      args = args.concat config_args
+    end
+
+    delete_legacy_args args
+
+    Dir.chdir @spec.full_gem_path do
+      options = ::RDoc::Options.new
+      options.default_title = "#{@spec.full_name} Documentation"
+      options.parse args
+    end
+
+    options.quiet = !Gem.configuration.really_verbose
+
+    @rdoc = new_rdoc
+    @rdoc.options = options
+
+    say "Parsing documentation for #{@spec.full_name}"
+
+    Dir.chdir @spec.full_gem_path do
+      @file_info = @rdoc.parse_files options.files
+    end
+
+    document 'ri',       options, @ri_dir if
+      @generate_ri   and (@force or not File.exist? @ri_dir)
+
+    document 'darkfish', options, @rdoc_dir if
+      @generate_rdoc and (@force or not File.exist? @rdoc_dir)
+  end
+
+  ##
+  # Generates RDoc and ri data for legacy RDoc versions.  This method will not
+  # exist in future versions.
+
+  def generate_legacy
+    if @generate_rdoc then
+      FileUtils.rm_rf @rdoc_dir
+      say "Installing RDoc documentation for #{@spec.full_name}"
+      legacy_rdoc '--op', @rdoc_dir
+    end
+
+    if @generate_ri then
+      FileUtils.rm_rf @ri_dir
+      say "Installing ri documentation for #{@spec.full_name}"
+      legacy_rdoc '--ri', '--op', @ri_dir
+    end
+  end
+
+  ##
+  # Generates RDoc using a legacy version of RDoc from the ARGV-like +args+.
+  # This method will not exist in future versions.
+
+  def legacy_rdoc *args
+    args << @spec.rdoc_options
+    args << '--quiet'
+    args << @spec.require_paths.clone
+    args << @spec.extra_rdoc_files
+    args << '--title' << "#{@spec.full_name} Documentation"
+    args = args.flatten.map do |arg| arg.to_s end
+
+    delete_legacy_args args if
+      Gem::Requirement.new('>= 2.4.0') =~ self.class.rdoc_version
+
+    r = new_rdoc
+    verbose { "rdoc #{args.join ' '}" }
+
+    Dir.chdir @spec.full_gem_path do
+      begin
+        r.document args
+      rescue Errno::EACCES => e
+        dirname = File.dirname e.message.split("-")[1].strip
+        raise Gem::FilePermissionError, dirname
+      rescue Interrupt => e
+        raise e
+      rescue Exception => ex
+        alert_error "While generating documentation for #{@spec.full_name}"
+        ui.errs.puts "... MESSAGE:   #{ex}"
+        ui.errs.puts "... RDOC args: #{args.join(' ')}"
+        ui.backtrace ex
+        ui.errs.puts "(continuing with the rest of the installation)"
+      end
+    end
+  end
+
+  ##
+  # #new_rdoc creates a new RDoc instance.  This method is provided only to
+  # make testing easier.
+
+  def new_rdoc # :nodoc:
+    ::RDoc::RDoc.new
+  end
+
+  ##
+  # Is rdoc documentation installed?
+
+  def rdoc_installed?
+    File.exist? @rdoc_dir
+  end
+
+  ##
+  # Removes generated RDoc and ri data
+
+  def remove
+    base_dir = @spec.base_dir
+
+    raise Gem::FilePermissionError, base_dir unless File.writable? base_dir
+
+    FileUtils.rm_rf @rdoc_dir
+    FileUtils.rm_rf @ri_dir
+  end
+
+  ##
+  # Is ri data installed?
+
+  def ri_installed?
+    File.exist? @ri_dir
+  end
+
+  ##
+  # Prepares the spec for documentation generation
+
+  def setup
+    self.class.load_rdoc
+
+    raise Gem::FilePermissionError, @doc_dir if
+      File.exist?(@doc_dir) and not File.writable?(@doc_dir)
+
+    FileUtils.mkdir_p @doc_dir unless File.exist? @doc_dir
+  end
+
+end unless loaded_hook
+
 Gem.done_installing(&Gem::RDoc.method(:generation_hook))
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
index 69879df67c..da4db724a1 100644
--- a/lib/rubygems/remote_fetcher.rb
+++ b/lib/rubygems/remote_fetcher.rb
@@ -71,10 +71,13 @@ class Gem::RemoteFetcher
   #        HTTP_PROXY_PASS)
   # * <tt>:no_proxy</tt>: ignore environment variables and _don't_ use a proxy
   #
+  # +dns+: An object to use for DNS resolution of the API endpoint.
+  #        By default, use Resolv::DNS.
+  #
   # +headers+: A set of additional HTTP headers to be sent to the server when
   #            fetching the gem.
 
-  def initialize(proxy=nil, dns=nil, headers={})
+  def initialize(proxy=nil, dns=Resolv::DNS.new, headers={})
     require 'net/http'
     require 'stringio'
     require 'time'
@@ -87,17 +90,42 @@ class Gem::RemoteFetcher
     @pool_lock = Mutex.new
     @cert_files = Gem::Request.get_cert_files
 
+    @dns = dns
     @headers = headers
   end
 
   ##
+  # Given a source at +uri+, calculate what hostname to actually
+  # connect to query the data for it.
+
+  def api_endpoint(uri)
+    host = uri.host
+
+    begin
+      res = @dns.getresource "_rubygems._tcp.#{host}",
+                             Resolv::DNS::Resource::IN::SRV
+    rescue Resolv::ResolvError => e
+      verbose "Getting SRV record failed: #{e}"
+      uri
+    else
+      target = res.target.to_s.strip
+
+      if /\.#{Regexp.quote(host)}\z/ =~ target
+        return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
+      end
+
+      uri
+    end
+  end
+
+  ##
   # Given a name and requirement, downloads this gem into cache and returns the
   # filename. Returns nil if the gem cannot be located.
   #--
   # Should probably be integrated with #download below, but that will be a
   # larger, more encompassing effort. -erikh
 
-  def download_to_cache(dependency)
+  def download_to_cache dependency
     found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
 
     return if found.empty?
@@ -114,9 +142,9 @@ class Gem::RemoteFetcher
 
   def download(spec, source_uri, install_dir = Gem.dir)
     cache_dir =
-      if Dir.pwd == install_dir  # see fetch_command
+      if Dir.pwd == install_dir then # see fetch_command
         install_dir
-      elsif File.writable? install_dir
+      elsif File.writable? install_dir then
         File.join install_dir, "cache"
       else
         File.join Gem.user_dir, "cache"
@@ -136,7 +164,9 @@ class Gem::RemoteFetcher
       begin
         source_uri = URI.parse(source_uri)
       rescue
-        source_uri = URI.parse(URI::DEFAULT_PARSER.escape(source_uri.to_s))
+        source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
+                               URI::DEFAULT_PARSER.escape(source_uri.to_s) :
+                               URI.escape(source_uri.to_s))
       end
     end
 
@@ -149,7 +179,7 @@ class Gem::RemoteFetcher
     # REFACTOR: be sure to clean up fake fetcher when you do this... cleaner
     case scheme
     when 'http', 'https', 's3' then
-      unless File.exist? local_gem_path
+      unless File.exist? local_gem_path then
         begin
           verbose "Downloading gem #{gem_file_name}"
 
@@ -183,7 +213,7 @@ class Gem::RemoteFetcher
       verbose "Using local gem #{local_gem_path}"
     when nil then # TODO test for local overriding cache
       source_path = if Gem.win_platform? && source_uri.scheme &&
-                       !source_uri.path.include?(':')
+                       !source_uri.path.include?(':') then
                       "#{source_uri.scheme}:#{source_uri.path}"
                     else
                       source_uri.path
@@ -209,14 +239,14 @@ class Gem::RemoteFetcher
   ##
   # File Fetcher. Dispatched by +fetch_path+. Use it instead.
 
-  def fetch_file(uri, *_)
+  def fetch_file uri, *_
     Gem.read_binary correct_for_windows_path uri.path
   end
 
   ##
   # HTTP Fetcher. Dispatched by +fetch_path+. Use it instead.
 
-  def fetch_http(uri, last_modified = nil, head = false, depth = 0)
+  def fetch_http uri, last_modified = nil, head = false, depth = 0
     fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
     response   = request uri, fetch_type, last_modified do |req|
       headers.each { |k,v| req.add_field(k,v) }
@@ -230,9 +260,6 @@ class Gem::RemoteFetcher
          Net::HTTPTemporaryRedirect then
       raise FetchError.new('too many redirects', uri) if depth > 10
 
-      unless location = response['Location']
-        raise FetchError.new("redirecting but no redirect location was given", uri)
-      end
       location = URI.parse response['Location']
 
       if https?(uri) && !https?(location)
@@ -263,7 +290,7 @@ class Gem::RemoteFetcher
 
     if data and !head and uri.to_s =~ /\.gz$/
       begin
-        data = Gem::Util.gunzip data
+        data = Gem.gunzip data
       rescue Zlib::GzipFile::Error
         raise FetchError.new("server did not return a valid file", uri.to_s)
       end
@@ -274,8 +301,7 @@ class Gem::RemoteFetcher
     raise
   rescue Timeout::Error
     raise UnknownHostError.new('timed out', uri.to_s)
-  rescue IOError, SocketError, SystemCallError,
-    *(OpenSSL::SSL::SSLError if defined?(OpenSSL)) => e
+  rescue IOError, SocketError, SystemCallError => e
     if e.message =~ /getaddrinfo/
       raise UnknownHostError.new('no such name', uri.to_s)
     else
@@ -292,7 +318,7 @@ class Gem::RemoteFetcher
   # Downloads +uri+ to +path+ if necessary. If no path is given, it just
   # passes the data.
 
-  def cache_update_path(uri, path = nil, update = true)
+  def cache_update_path uri, path = nil, update = true
     mtime = path && File.stat(path).mtime rescue nil
 
     data = fetch_path(uri, mtime)
@@ -357,15 +383,17 @@ class Gem::RemoteFetcher
     require 'base64'
     require 'openssl'
 
-    id, secret = s3_source_auth uri
+    unless uri.user && uri.password
+      raise FetchError.new("credentials needed in s3 source, like s3://key:secret@bucket-name/", uri.to_s)
+    end
 
     expiration ||= s3_expiration
     canonical_path = "/#{uri.host}#{uri.path}"
     payload = "GET\n\n\n#{expiration}\n#{canonical_path}"
-    digest = OpenSSL::HMAC.digest('sha1', secret, payload)
+    digest = OpenSSL::HMAC.digest('sha1', uri.password, payload)
     # URI.escape is deprecated, and there isn't yet a replacement that does quite what we want
     signature = Base64.encode64(digest).gsub("\n", '').gsub(/[\+\/=]/) { |c| BASE64_URI_TRANSLATE[c] }
-    URI.parse("https://#{uri.host}.s3.amazonaws.com#{uri.path}?AWSAccessKeyId=#{id}&Expires=#{expiration}&Signature=#{signature}")
+    URI.parse("https://#{uri.host}.s3.amazonaws.com#{uri.path}?AWSAccessKeyId=#{uri.user}&Expires=#{expiration}&Signature=#{signature}")
   end
 
   def s3_expiration
@@ -376,30 +404,13 @@ class Gem::RemoteFetcher
 
   private
 
-  def proxy_for(proxy, uri)
+  def proxy_for proxy, uri
     Gem::Request.proxy_uri(proxy || Gem::Request.get_proxy_from_env(uri.scheme))
   end
 
-  def pools_for(proxy)
+  def pools_for proxy
     @pool_lock.synchronize do
       @pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files
     end
   end
-
-  def s3_source_auth(uri)
-    return [uri.user, uri.password] if uri.user && uri.password
-
-    s3_source = Gem.configuration[:s3_source] || Gem.configuration['s3_source']
-    host = uri.host
-    raise FetchError.new("no s3_source key exists in .gemrc", "s3://#{host}") unless s3_source
-
-    auth = s3_source[host] || s3_source[host.to_sym]
-    raise FetchError.new("no key for host #{host} in s3_source in .gemrc", "s3://#{host}") unless auth
-
-    id = auth[:id] || auth['id']
-    secret = auth[:secret] || auth['secret']
-    raise FetchError.new("s3_source for #{host} missing id or secret", "s3://#{host}") unless id and secret
-
-    [id, secret]
-  end
 end
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
index fb164d79cf..9de04a0c4b 100644
--- a/lib/rubygems/request.rb
+++ b/lib/rubygems/request.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 require 'net/http'
+require 'thread'
 require 'time'
 require 'rubygems/user_interaction'
 
 class Gem::Request
 
-  extend Gem::UserInteraction
   include Gem::UserInteraction
 
   ###
   # Legacy.  This is used in tests.
-  def self.create_with_proxy(uri, request_class, last_modified, proxy) # :nodoc:
+  def self.create_with_proxy uri, request_class, last_modified, proxy # :nodoc:
     cert_files = get_cert_files
     proxy ||= get_proxy_from_env(uri.scheme)
     pool       = ConnectionPools.new proxy_uri(proxy), cert_files
@@ -18,7 +18,7 @@ class Gem::Request
     new(uri, request_class, last_modified, pool.pool_for(uri))
   end
 
-  def self.proxy_uri(proxy) # :nodoc:
+  def self.proxy_uri proxy # :nodoc:
     case proxy
     when :no_proxy then nil
     when URI::HTTP then proxy
@@ -51,7 +51,7 @@ class Gem::Request
       Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
     store = OpenSSL::X509::Store.new
 
-    if Gem.configuration.ssl_client_cert
+    if Gem.configuration.ssl_client_cert then
       pem = File.read Gem.configuration.ssl_client_cert
       connection.cert = OpenSSL::X509::Certificate.new pem
       connection.key = OpenSSL::PKey::RSA.new pem
@@ -69,60 +69,13 @@ class Gem::Request
       end
     end
     connection.cert_store = store
-
-    connection.verify_callback = proc do |preverify_ok, store_context|
-      verify_certificate store_context unless preverify_ok
-
-      preverify_ok
-    end
-
     connection
   rescue LoadError => e
     raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
                  e.message =~ / -- openssl$/
 
     raise Gem::Exception.new(
-            'Unable to require openssl, install OpenSSL and rebuild Ruby (preferred) or use non-HTTPS sources')
-  end
-
-  def self.verify_certificate(store_context)
-    depth  = store_context.error_depth
-    error  = store_context.error_string
-    number = store_context.error
-    cert   = store_context.current_cert
-
-    ui.alert_error "SSL verification error at depth #{depth}: #{error} (#{number})"
-
-    extra_message = verify_certificate_message number, cert
-
-    ui.alert_error extra_message if extra_message
-  end
-
-  def self.verify_certificate_message(error_number, cert)
-    return unless cert
-    case error_number
-    when OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED then
-      "Certificate #{cert.subject} expired at #{cert.not_after.iso8601}"
-    when OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID then
-      "Certificate #{cert.subject} not valid until #{cert.not_before.iso8601}"
-    when OpenSSL::X509::V_ERR_CERT_REJECTED then
-      "Certificate #{cert.subject} is rejected"
-    when OpenSSL::X509::V_ERR_CERT_UNTRUSTED then
-      "Certificate #{cert.subject} is not trusted"
-    when OpenSSL::X509::V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT then
-      "Certificate #{cert.issuer} is not trusted"
-    when OpenSSL::X509::V_ERR_INVALID_CA then
-      "Certificate #{cert.subject} is an invalid CA certificate"
-    when OpenSSL::X509::V_ERR_INVALID_PURPOSE then
-      "Certificate #{cert.subject} has an invalid purpose"
-    when OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN then
-      "Root certificate is not trusted (#{cert.subject})"
-    when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY then
-      "You must add #{cert.issuer} to your local trusted store"
-    when
-      OpenSSL::X509::V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE then
-      "Cannot verify certificate issued by #{cert.issuer}"
-    end
+            'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
   end
 
   ##
@@ -139,7 +92,7 @@ class Gem::Request
   def fetch
     request = @request_class.new @uri.request_uri
 
-    unless @uri.nil? || @uri.user.nil? || @uri.user.empty?
+    unless @uri.nil? || @uri.user.nil? || @uri.user.empty? then
       request.basic_auth Gem::UriFormatter.new(@uri.user).unescape,
                          Gem::UriFormatter.new(@uri.password).unescape
     end
@@ -148,7 +101,7 @@ class Gem::Request
     request.add_field 'Connection', 'keep-alive'
     request.add_field 'Keep-Alive', '30'
 
-    if @last_modified
+    if @last_modified then
       request.add_field 'If-Modified-Since', @last_modified.httpdate
     end
 
@@ -161,7 +114,7 @@ class Gem::Request
   # Returns a proxy URI for the given +scheme+ if one is set in the
   # environment variables.
 
-  def self.get_proxy_from_env(scheme = 'http')
+  def self.get_proxy_from_env scheme = 'http'
     _scheme = scheme.downcase
     _SCHEME = scheme.upcase
     env_proxy = ENV["#{_scheme}_proxy"] || ENV["#{_SCHEME}_PROXY"]
@@ -173,7 +126,7 @@ class Gem::Request
 
     uri = URI(Gem::UriFormatter.new(env_proxy).normalize)
 
-    if uri and uri.user.nil? and uri.password.nil?
+    if uri and uri.user.nil? and uri.password.nil? then
       user     = ENV["#{_scheme}_proxy_user"] || ENV["#{_SCHEME}_PROXY_USER"]
       password = ENV["#{_scheme}_proxy_pass"] || ENV["#{_SCHEME}_PROXY_PASS"]
 
@@ -184,7 +137,7 @@ class Gem::Request
     uri
   end
 
-  def perform_request(request) # :nodoc:
+  def perform_request request # :nodoc:
     connection = connection_for @uri
 
     retried = false
@@ -276,9 +229,9 @@ class Gem::Request
     ruby_version += 'dev' if RUBY_PATCHLEVEL == -1
 
     ua << " Ruby/#{ruby_version} (#{RUBY_RELEASE_DATE}"
-    if RUBY_PATCHLEVEL >= 0
+    if RUBY_PATCHLEVEL >= 0 then
       ua << " patchlevel #{RUBY_PATCHLEVEL}"
-    elsif defined?(RUBY_REVISION)
+    elsif defined?(RUBY_REVISION) then
       ua << " revision #{RUBY_REVISION}"
     end
     ua << ")"
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb
index c02f083b63..31fc609800 100644
--- a/lib/rubygems/request/connection_pools.rb
+++ b/lib/rubygems/request/connection_pools.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'thread'
 
 class Gem::Request::ConnectionPools # :nodoc:
 
@@ -8,19 +9,19 @@ class Gem::Request::ConnectionPools # :nodoc:
     attr_accessor :client
   end
 
-  def initialize(proxy_uri, cert_files)
+  def initialize proxy_uri, cert_files
     @proxy_uri  = proxy_uri
     @cert_files = cert_files
     @pools      = {}
     @pool_mutex = Mutex.new
   end
 
-  def pool_for(uri)
+  def pool_for uri
     http_args = net_http_args(uri, @proxy_uri)
     key       = http_args + [https?(uri)]
     @pool_mutex.synchronize do
       @pools[key] ||=
-        if https? uri
+        if https? uri then
           Gem::Request::HTTPSPool.new(http_args, @cert_files, @proxy_uri)
         else
           Gem::Request::HTTPPool.new(http_args, @cert_files, @proxy_uri)
@@ -45,35 +46,22 @@ class Gem::Request::ConnectionPools # :nodoc:
     env_no_proxy.split(/\s*,\s*/)
   end
 
-  def https?(uri)
+  def https? uri
     uri.scheme.downcase == 'https'
   end
 
-  def no_proxy?(host, env_no_proxy)
+  def no_proxy? host, env_no_proxy
     host = host.downcase
 
     env_no_proxy.any? do |pattern|
-      env_no_proxy_pattern = pattern.downcase.dup
+      pattern = pattern.downcase
 
-      # Remove dot in front of pattern for wildcard matching
-      env_no_proxy_pattern[0] = "" if env_no_proxy_pattern[0] == "."
-
-      host_tokens = host.split(".")
-      pattern_tokens = env_no_proxy_pattern.split(".")
-
-      intersection = (host_tokens - pattern_tokens) | (pattern_tokens - host_tokens)
-
-      # When we do the split into tokens we miss a dot character, so add it back if we need it
-      missing_dot = intersection.length > 0 ? 1 : 0
-      start = intersection.join(".").size + missing_dot
-
-      no_proxy_host = host[start..-1]
-
-      env_no_proxy_pattern == no_proxy_host
+      host[-pattern.length, pattern.length] == pattern or
+        (pattern.start_with? '.' and pattern[1..-1] == host)
     end
   end
 
-  def net_http_args(uri, proxy_uri)
+  def net_http_args uri, proxy_uri
     # URI::Generic#hostname was added in ruby 1.9.3, use it if exists, otherwise
     # don't support IPv6 literals and use host.
     hostname = uri.respond_to?(:hostname) ? uri.hostname : uri.host
@@ -81,7 +69,7 @@ class Gem::Request::ConnectionPools # :nodoc:
 
     no_proxy = get_no_proxy_from_env
 
-    if proxy_uri and not no_proxy?(hostname, no_proxy)
+    if proxy_uri and not no_proxy?(hostname, no_proxy) then
       proxy_hostname = proxy_uri.respond_to?(:hostname) ? proxy_uri.hostname : proxy_uri.host
       net_http_args + [
         proxy_hostname,
@@ -89,7 +77,7 @@ class Gem::Request::ConnectionPools # :nodoc:
         Gem::UriFormatter.new(proxy_uri.user).unescape,
         Gem::UriFormatter.new(proxy_uri.password).unescape,
       ]
-    elsif no_proxy? hostname, no_proxy
+    elsif no_proxy? hostname, no_proxy then
       net_http_args + [nil, nil]
     else
       net_http_args
@@ -97,3 +85,4 @@ class Gem::Request::ConnectionPools # :nodoc:
   end
 
 end
+
diff --git a/lib/rubygems/request/http_pool.rb b/lib/rubygems/request/http_pool.rb
index a85fc2bdf6..bfcd15399d 100644
--- a/lib/rubygems/request/http_pool.rb
+++ b/lib/rubygems/request/http_pool.rb
@@ -8,7 +8,7 @@
 class Gem::Request::HTTPPool # :nodoc:
   attr_reader :cert_files, :proxy_uri
 
-  def initialize(http_args, cert_files, proxy_uri)
+  def initialize http_args, cert_files, proxy_uri
     @http_args  = http_args
     @cert_files = cert_files
     @proxy_uri  = proxy_uri
@@ -20,7 +20,7 @@ class Gem::Request::HTTPPool # :nodoc:
     @queue.pop || make_connection
   end
 
-  def checkin(connection)
+  def checkin connection
     @queue.push connection
   end
 
@@ -39,9 +39,10 @@ class Gem::Request::HTTPPool # :nodoc:
     setup_connection Gem::Request::ConnectionPools.client.new(*@http_args)
   end
 
-  def setup_connection(connection)
+  def setup_connection connection
     connection.start
     connection
   end
 
 end
+
diff --git a/lib/rubygems/request/https_pool.rb b/lib/rubygems/request/https_pool.rb
index 50f42d9e0d..e82c2440e1 100644
--- a/lib/rubygems/request/https_pool.rb
+++ b/lib/rubygems/request/https_pool.rb
@@ -2,8 +2,10 @@
 class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc:
   private
 
-  def setup_connection(connection)
+  def setup_connection connection
     Gem::Request.configure_connection_for_https(connection, @cert_files)
     super
   end
 end
+
+
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index 6017d15d13..5541e64b88 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -91,7 +91,7 @@ class Gem::RequestSet
   #
   #   set = Gem::RequestSet.new nokogiri, pg
 
-  def initialize(*deps)
+  def initialize *deps
     @dependencies = deps
 
     @always_install      = []
@@ -119,8 +119,8 @@ class Gem::RequestSet
   ##
   # Declare that a gem of name +name+ with +reqs+ requirements is needed.
 
-  def gem(name, *reqs)
-    if dep = @dependency_names[name]
+  def gem name, *reqs
+    if dep = @dependency_names[name] then
       dep.requirement.concat reqs
     else
       dep = Gem::Dependency.new name, *reqs
@@ -132,7 +132,7 @@ class Gem::RequestSet
   ##
   # Add +deps+ Gem::Dependency objects to the set.
 
-  def import(deps)
+  def import deps
     @dependencies.concat deps
   end
 
@@ -143,7 +143,7 @@ class Gem::RequestSet
   # The +installer+ will be +nil+ if a gem matching the request was already
   # installed.
 
-  def install(options, &block) # :yields: request, installer
+  def install options, &block # :yields: request, installer
     if dir = options[:install_dir]
       requests = install_into dir, false, options, &block
       return requests
@@ -152,73 +152,42 @@ class Gem::RequestSet
     @prerelease = options[:prerelease]
 
     requests = []
-    download_queue = Queue.new
 
-    # Create a thread-safe list of gems to download
     sorted_requests.each do |req|
-      download_queue << req
-    end
-
-    # Create N threads in a pool, have them download all the gems
-    threads = Gem.configuration.concurrent_downloads.times.map do
-      # When a thread pops this item, it knows to stop running. The symbol
-      # is queued here so that there will be one symbol per thread.
-      download_queue << :stop
-
-      Thread.new do
-        # The pop method will block waiting for items, so the only way
-        # to stop a thread from running is to provide a final item that
-        # means the thread should stop.
-        while req = download_queue.pop
-          break if req == :stop
-          req.spec.download options unless req.installed?
-        end
-      end
-    end
-
-    # Wait for all the downloads to finish before continuing
-    threads.each(&:value)
-
-    # Install requested gems after they have been downloaded
-    sorted_requests.each do |req|
-      if req.installed?
+      if req.installed? then
         req.spec.spec.build_extensions
 
-        if @always_install.none? { |spec| spec == req.spec.spec }
+        if @always_install.none? { |spec| spec == req.spec.spec } then
           yield req, nil if block_given?
           next
         end
       end
 
-      spec =
-        begin
-          req.spec.install options do |installer|
-            yield req, installer if block_given?
-          end
-        rescue Gem::RuntimeRequirementNotMetError => e
-          recent_match = req.spec.set.find_all(req.request).sort_by(&:version).reverse_each.find do |s|
-            s = s.spec
-            s.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
-              s.required_rubygems_version.satisfied_by?(Gem.rubygems_version) &&
-              Gem::Platform.installable?(s)
-          end
-          if recent_match
-            suggestion = "The last version of #{req.request} to support your Ruby & RubyGems was #{recent_match.version}. Try installing it with `gem install #{recent_match.name} -v #{recent_match.version}`"
-            suggestion += " and then running the current command again" unless @always_install.include?(req.spec.spec)
-          else
-            suggestion = "There are no versions of #{req.request} compatible with your Ruby & RubyGems"
-            suggestion += ". Maybe try installing an older version of the gem you're looking for?" unless @always_install.include?(req.spec.spec)
-          end
-          e.suggestion = suggestion
-          raise
-        end
+      spec = req.spec.install options do |installer|
+        yield req, installer if block_given?
+      end
 
       requests << spec
     end
 
     return requests if options[:gemdeps]
 
-    install_hooks requests, options
+    specs = requests.map do |request|
+      case request
+      when Gem::Resolver::ActivationRequest then
+        request.spec.spec
+      else
+        request
+      end
+    end
+
+    require 'rubygems/dependency_installer'
+    inst = Gem::DependencyInstaller.new options
+    inst.installed_gems.replace specs
+
+    Gem.done_installing_hooks.each do |hook|
+      hook.call inst, specs
+    end unless Gem.done_installing_hooks.empty?
 
     requests
   end
@@ -230,7 +199,7 @@ class Gem::RequestSet
   # If +:without_groups+ is given in the +options+, those groups in the gem
   # dependencies file are not used.  See Gem::Installer for other +options+.
 
-  def install_from_gemdeps(options, &block)
+  def install_from_gemdeps options, &block
     gemdeps = options[:gemdeps]
 
     @install_dir = options[:install_dir] || Gem.dir
@@ -255,7 +224,7 @@ class Gem::RequestSet
     else
       installed = install options, &block
 
-      if options.fetch :lock, true
+      if options.fetch :lock, true then
         lockfile =
           Gem::RequestSet::Lockfile.build self, gemdeps, gem_deps_api.dependencies
         lockfile.write
@@ -265,7 +234,7 @@ class Gem::RequestSet
     end
   end
 
-  def install_into(dir, force = true, options = {})
+  def install_into dir, force = true, options = {}
     gem_home, ENV['GEM_HOME'] = ENV['GEM_HOME'], dir
 
     existing = force ? [] : specs_in(dir)
@@ -283,7 +252,7 @@ class Gem::RequestSet
     sorted_requests.each do |request|
       spec = request.spec
 
-      if existing.find { |s| s.full_name == spec.full_name }
+      if existing.find { |s| s.full_name == spec.full_name } then
         yield request, nil if block_given?
         next
       end
@@ -295,39 +264,15 @@ class Gem::RequestSet
       installed << request
     end
 
-    install_hooks installed, options
-
     installed
   ensure
     ENV['GEM_HOME'] = gem_home
   end
 
   ##
-  # Call hooks on installed gems
-
-  def install_hooks(requests, options)
-    specs = requests.map do |request|
-      case request
-      when Gem::Resolver::ActivationRequest then
-        request.spec.spec
-      else
-        request
-      end
-    end
-
-    require "rubygems/dependency_installer"
-    inst = Gem::DependencyInstaller.new options
-    inst.installed_gems.replace specs
-
-    Gem.done_installing_hooks.each do |hook|
-      hook.call inst, specs
-    end unless Gem.done_installing_hooks.empty?
-  end
-
-  ##
   # Load a dependency management file.
 
-  def load_gemdeps(path, without_groups = [], installing = false)
+  def load_gemdeps path, without_groups = [], installing = false
     @git_set    = Gem::Resolver::GitSet.new
     @vendor_set = Gem::Resolver::VendorSet.new
     @source_set = Gem::Resolver::SourceSet.new
@@ -348,29 +293,29 @@ class Gem::RequestSet
     gf.load
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[RequestSet:', ']' do
       q.breakable
 
-      if @remote
+      if @remote then
         q.text 'remote'
         q.breakable
       end
 
-      if @prerelease
+      if @prerelease then
         q.text 'prerelease'
         q.breakable
       end
 
-      if @development_shallow
+      if @development_shallow then
         q.text 'shallow development'
         q.breakable
-      elsif @development
+      elsif @development then
         q.text 'development'
         q.breakable
       end
 
-      if @soft_missing
+      if @soft_missing then
         q.text 'soft missing'
       end
 
@@ -394,7 +339,7 @@ class Gem::RequestSet
   # Resolve the requested dependencies and return an Array of Specification
   # objects to be activated.
 
-  def resolve(set = Gem::Resolver::BestSet.new)
+  def resolve set = Gem::Resolver::BestSet.new
     @sets << set
     @sets << @git_set
     @sets << @vendor_set
@@ -443,17 +388,17 @@ class Gem::RequestSet
     @specs ||= @requests.map { |r| r.full_spec }
   end
 
-  def specs_in(dir)
-    Gem::Util.glob_files_in_dir("*.gemspec", File.join(dir, "specifications")).map do |g|
+  def specs_in dir
+    Dir["#{dir}/specifications/*.gemspec"].map do |g|
       Gem::Specification.load g
     end
   end
 
-  def tsort_each_node(&block) # :nodoc:
+  def tsort_each_node &block # :nodoc:
     @requests.each(&block)
   end
 
-  def tsort_each_child(node) # :nodoc:
+  def tsort_each_child node # :nodoc:
     node.spec.dependencies.each do |dep|
       next if dep.type == :development and not @development
 
@@ -461,7 +406,7 @@ class Gem::RequestSet
         dep.match? r.spec.name, r.spec.version, @prerelease
       }
 
-      unless match
+      unless match then
         next if dep.type == :development and @development_shallow
         next if @soft_missing
         raise Gem::DependencyError,
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb
index 3892e7aa5f..4b2699d7d2 100644
--- a/lib/rubygems/request_set/gem_dependency_api.rb
+++ b/lib/rubygems/request_set/gem_dependency_api.rb
@@ -48,7 +48,7 @@ class Gem::RequestSet::GemDependencyAPI
     :ruby_19      => %w[ruby rbx maglev],
     :ruby_20      => %w[ruby rbx maglev],
     :ruby_21      => %w[ruby rbx maglev],
-  }.freeze
+  }
 
   mswin     = Gem::Platform.new 'x86-mswin32'
   mswin64   = Gem::Platform.new 'x64-mswin64'
@@ -88,7 +88,7 @@ class Gem::RequestSet::GemDependencyAPI
     :x64_mingw    => x64_mingw,
     :x64_mingw_20 => x64_mingw,
     :x64_mingw_21 => x64_mingw
-  }.freeze
+  }
 
   gt_eq_0        = Gem::Requirement.new '>= 0'
   tilde_gt_1_8_0 = Gem::Requirement.new '~> 1.8.0'
@@ -129,7 +129,7 @@ class Gem::RequestSet::GemDependencyAPI
     :x64_mingw    => gt_eq_0,
     :x64_mingw_20 => tilde_gt_2_0_0,
     :x64_mingw_21 => tilde_gt_2_1_0,
-  }.freeze
+  }
 
   WINDOWS = { # :nodoc:
     :mingw        => :only,
@@ -160,7 +160,7 @@ class Gem::RequestSet::GemDependencyAPI
     :x64_mingw    => :only,
     :x64_mingw_20 => :only,
     :x64_mingw_21 => :only,
-  }.freeze
+  }
 
   ##
   # The gems required by #gem statements in the gem.deps.rb file
@@ -191,7 +191,7 @@ class Gem::RequestSet::GemDependencyAPI
   # Creates a new GemDependencyAPI that will add dependencies to the
   # Gem::RequestSet +set+ based on the dependency API description in +path+.
 
-  def initialize(set, path)
+  def initialize set, path
     @set = set
     @path = path
 
@@ -228,7 +228,7 @@ class Gem::RequestSet::GemDependencyAPI
   # Adds +dependencies+ to the request set if any of the +groups+ are allowed.
   # This is used for gemspec dependencies.
 
-  def add_dependencies(groups, dependencies) # :nodoc:
+  def add_dependencies groups, dependencies # :nodoc:
     return unless (groups & @without_groups).empty?
 
     dependencies.each do |dep|
@@ -241,7 +241,7 @@ class Gem::RequestSet::GemDependencyAPI
   ##
   # Finds a gemspec with the given +name+ that lives at +path+.
 
-  def find_gemspec(name, path) # :nodoc:
+  def find_gemspec name, path # :nodoc:
     glob = File.join path, "#{name}.gemspec"
 
     spec_files = Dir[glob]
@@ -269,7 +269,7 @@ class Gem::RequestSet::GemDependencyAPI
   # In installing mode certain restrictions are ignored such as ruby version
   # mismatch checks.
 
-  def installing=(installing) # :nodoc:
+  def installing= installing # :nodoc:
     @installing = installing
   end
 
@@ -353,7 +353,7 @@ class Gem::RequestSet::GemDependencyAPI
   # tag: ::
   #   Use the given tag for git:, gist: and github: dependencies.
 
-  def gem(name, *requirements)
+  def gem name, *requirements
     options = requirements.pop if requirements.last.kind_of?(Hash)
     options ||= {}
 
@@ -369,9 +369,9 @@ class Gem::RequestSet::GemDependencyAPI
     duplicate = @dependencies.include? name
 
     @dependencies[name] =
-      if requirements.empty? and not source_set
+      if requirements.empty? and not source_set then
         Gem::Requirement.default
-      elsif source_set
+      elsif source_set then
         Gem::Requirement.source_set
       else
         Gem::Requirement.create requirements
@@ -387,7 +387,7 @@ class Gem::RequestSet::GemDependencyAPI
 
     gem_requires name, options
 
-    if duplicate
+    if duplicate then
       warn <<-WARNING
 Gem dependencies file #{@path} requires #{name} more than once.
       WARNING
@@ -401,8 +401,8 @@ Gem dependencies file #{@path} requires #{name} more than once.
   #
   # Returns +true+ if the gist or git option was handled.
 
-  def gem_git(name, options) # :nodoc:
-    if gist = options.delete(:gist)
+  def gem_git name, options # :nodoc:
+    if gist = options.delete(:gist) then
       options[:git] = "https://gist.github.com/#{gist}.git"
     end
 
@@ -424,7 +424,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
   #
   # Returns reference for the git gem.
 
-  def gem_git_reference(options) # :nodoc:
+  def gem_git_reference options # :nodoc:
     ref    = options.delete :ref
     branch = options.delete :branch
     tag    = options.delete :tag
@@ -457,7 +457,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   #
   # Returns +true+ if the custom source option was handled.
 
-  def gem_git_source(name, options) # :nodoc:
+  def gem_git_source name, options # :nodoc:
     return unless git_source = (@git_sources.keys & options.keys).last
 
     source_callback = @git_sources[git_source]
@@ -478,7 +478,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # Handles the :group and :groups +options+ for the gem with the given
   # +name+.
 
-  def gem_group(name, options) # :nodoc:
+  def gem_group name, options # :nodoc:
     g = options.delete :group
     all_groups  = g ? Array(g) : []
 
@@ -497,7 +497,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   #
   # Returns +true+ if the path option was handled.
 
-  def gem_path(name, options) # :nodoc:
+  def gem_path name, options # :nodoc:
     return unless directory = options.delete(:path)
 
     pin_gem_source name, :path, directory
@@ -514,7 +514,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   #
   # Returns +true+ if the source option was handled.
 
-  def gem_source(name, options) # :nodoc:
+  def gem_source name, options # :nodoc:
     return unless source = options.delete(:source)
 
     pin_gem_source name, :source, source
@@ -530,7 +530,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # Handles the platforms: option from +options+.  Returns true if the
   # platform matches the current platform.
 
-  def gem_platforms(options) # :nodoc:
+  def gem_platforms options # :nodoc:
     platform_names = Array(options.delete :platform)
     platform_names.concat Array(options.delete :platforms)
     platform_names.concat @current_platforms if @current_platforms
@@ -543,7 +543,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
 
       next false unless Gem::Platform.match platform
 
-      if engines = ENGINE_MAP[platform_name]
+      if engines = ENGINE_MAP[platform_name] then
         next false unless engines.include? Gem.ruby_engine
       end
 
@@ -564,9 +564,9 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # Records the require: option from +options+ and adds those files, or the
   # default file to the require list for +name+.
 
-  def gem_requires(name, options) # :nodoc:
-    if options.include? :require
-      if requires = options.delete(:require)
+  def gem_requires name, options # :nodoc:
+    if options.include? :require then
+      if requires = options.delete(:require) then
         @requires[name].concat Array requires
       end
     else
@@ -587,7 +587,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   #     gem 'activerecord'
   #   end
 
-  def git(repository)
+  def git repository
     @current_repository = repository
 
     yield
@@ -601,7 +601,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # for use in gems built from git repositories.  You must provide a block
   # that accepts a git repository name for expansion.
 
-  def git_source(name, &callback)
+  def git_source name, &callback
     @git_sources[name] = callback
   end
 
@@ -634,7 +634,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   #   The group to add development dependencies to.  By default this is
   #   :development.  Only one group may be specified.
 
-  def gemspec(options = {})
+  def gemspec options = {}
     name              = options.delete(:name) || '{,*}'
     path              = options.delete(:path) || '.'
     development_group = options.delete(:development_group) || :development
@@ -679,7 +679,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # development`.  See `gem help install` and `gem help gem_dependencies` for
   # further details.
 
-  def group(*groups)
+  def group *groups
     @current_groups = groups
 
     yield
@@ -692,7 +692,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # Pins the gem +name+ to the given +source+.  Adding a gem with the same
   # name from a different +source+ will raise an exception.
 
-  def pin_gem_source(name, type = :default, source = nil)
+  def pin_gem_source name, type = :default, source = nil
     source_description =
       case type
       when :default then '(default)'
@@ -754,7 +754,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # NOTE:  There is inconsistency in what environment a platform matches.  You
   # may need to read the source to know the exact details.
 
-  def platform(*platforms)
+  def platform *platforms
     @current_platforms = platforms
 
     yield
@@ -781,36 +781,36 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # version.  This matching is performed by using the RUBY_ENGINE and
   # engine_specific VERSION constants.  (For JRuby, JRUBY_VERSION).
 
-  def ruby(version, options = {})
+  def ruby version, options = {}
     engine         = options[:engine]
     engine_version = options[:engine_version]
 
     raise ArgumentError,
-          'You must specify engine_version along with the Ruby engine' if
+          'you must specify engine_version along with the ruby engine' if
             engine and not engine_version
 
     return true if @installing
 
-    unless RUBY_VERSION == version
+    unless RUBY_VERSION == version then
       message = "Your Ruby version is #{RUBY_VERSION}, " +
                 "but your #{gem_deps_file} requires #{version}"
 
       raise Gem::RubyVersionMismatch, message
     end
 
-    if engine and engine != Gem.ruby_engine
-      message = "Your Ruby engine is #{Gem.ruby_engine}, " +
+    if engine and engine != Gem.ruby_engine then
+      message = "Your ruby engine is #{Gem.ruby_engine}, " +
                 "but your #{gem_deps_file} requires #{engine}"
 
       raise Gem::RubyVersionMismatch, message
     end
 
-    if engine_version
+    if engine_version then
       my_engine_version = Object.const_get "#{Gem.ruby_engine.upcase}_VERSION"
 
-      if engine_version != my_engine_version
+      if engine_version != my_engine_version then
         message =
-          "Your Ruby engine version is #{Gem.ruby_engine} #{my_engine_version}, " +
+          "Your ruby engine version is #{Gem.ruby_engine} #{my_engine_version}, " +
           "but your #{gem_deps_file} requires #{engine} #{engine_version}"
 
         raise Gem::RubyVersionMismatch, message
@@ -834,7 +834,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # * The +prepend:+ option is not supported.  If you wish to order sources
   #   then list them in your preferred order.
 
-  def source(url)
+  def source url
     Gem.sources.clear if @default_sources
 
     @default_sources = false
@@ -842,4 +842,8 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
     Gem.sources << url
   end
 
+  # TODO: remove this typo name at RubyGems 3.0
+
+  Gem::RequestSet::GemDepedencyAPI = self # :nodoc:
+
 end
diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb
index 1b374660f0..7f6eadb939 100644
--- a/lib/rubygems/request_set/lockfile.rb
+++ b/lib/rubygems/request_set/lockfile.rb
@@ -29,7 +29,7 @@ class Gem::RequestSet::Lockfile
     # Raises a ParseError with the given +message+ which was encountered at a
     # +line+ and +column+ while parsing.
 
-    def initialize(message, column, line, path)
+    def initialize message, column, line, path
       @line   = line
       @column = column
       @path   = path
@@ -41,13 +41,13 @@ class Gem::RequestSet::Lockfile
   # Creates a new Lockfile for the given +request_set+ and +gem_deps_file+
   # location.
 
-  def self.build(request_set, gem_deps_file, dependencies = nil)
+  def self.build request_set, gem_deps_file, dependencies = nil
     request_set.resolve
     dependencies ||= requests_to_deps request_set.sorted_requests
     new request_set, gem_deps_file, dependencies
   end
 
-  def self.requests_to_deps(requests) # :nodoc:
+  def self.requests_to_deps requests # :nodoc:
     deps = {}
 
     requests.each do |request|
@@ -56,7 +56,7 @@ class Gem::RequestSet::Lockfile
       requirement = request.request.dependency.requirement
 
       deps[name] = if [Gem::Resolver::VendorSpecification,
-                       Gem::Resolver::GitSpecification].include? spec.class
+                       Gem::Resolver::GitSpecification].include? spec.class then
                      Gem::Requirement.source_set
                    else
                      requirement
@@ -71,7 +71,7 @@ class Gem::RequestSet::Lockfile
 
   attr_reader :platforms
 
-  def initialize(request_set, gem_deps_file, dependencies)
+  def initialize request_set, gem_deps_file, dependencies
     @set           = request_set
     @dependencies  = dependencies
     @gem_deps_file = File.expand_path(gem_deps_file)
@@ -82,7 +82,7 @@ class Gem::RequestSet::Lockfile
     @platforms      = []
   end
 
-  def add_DEPENDENCIES(out) # :nodoc:
+  def add_DEPENDENCIES out # :nodoc:
     out << "DEPENDENCIES"
 
     out.concat @dependencies.sort_by { |name,| name }.map { |name, requirement|
@@ -92,7 +92,7 @@ class Gem::RequestSet::Lockfile
     out << nil
   end
 
-  def add_GEM(out, spec_groups) # :nodoc:
+  def add_GEM out, spec_groups # :nodoc:
     return if spec_groups.empty?
 
     source_groups = spec_groups.values.flatten.group_by do |request|
@@ -122,7 +122,7 @@ class Gem::RequestSet::Lockfile
     end
   end
 
-  def add_GIT(out, git_requests)
+  def add_GIT out, git_requests
     return if git_requests.empty?
 
     by_repository_revision = git_requests.group_by do |request|
@@ -148,11 +148,11 @@ class Gem::RequestSet::Lockfile
     end
   end
 
-  def relative_path_from(dest, base) # :nodoc:
+  def relative_path_from dest, base # :nodoc:
     dest = File.expand_path(dest)
     base = File.expand_path(base)
 
-    if dest.index(base) == 0
+    if dest.index(base) == 0 then
       offset = dest[base.size+1..-1]
 
       return '.' unless offset
@@ -163,7 +163,7 @@ class Gem::RequestSet::Lockfile
     end
   end
 
-  def add_PATH(out, path_requests) # :nodoc:
+  def add_PATH out, path_requests # :nodoc:
     return if path_requests.empty?
 
     out << "PATH"
@@ -178,7 +178,7 @@ class Gem::RequestSet::Lockfile
     out << nil
   end
 
-  def add_PLATFORMS(out) # :nodoc:
+  def add_PLATFORMS out # :nodoc:
     out << "PLATFORMS"
 
     platforms = requests.map { |request| request.spec.platform }.uniq
@@ -223,7 +223,7 @@ class Gem::RequestSet::Lockfile
   def write
     content = to_s
 
-    File.open "#{@gem_deps_file}.lock", 'w' do |io|
+    open "#{@gem_deps_file}.lock", 'w' do |io|
       io.write content
     end
   end
diff --git a/lib/rubygems/request_set/lockfile/parser.rb b/lib/rubygems/request_set/lockfile/parser.rb
index 0fe0405e32..ebea940188 100644
--- a/lib/rubygems/request_set/lockfile/parser.rb
+++ b/lib/rubygems/request_set/lockfile/parser.rb
@@ -3,7 +3,7 @@ class Gem::RequestSet::Lockfile::Parser
   ###
   # Parses lockfiles
 
-  def initialize(tokenizer, set, platforms, filename = nil)
+  def initialize tokenizer, set, platforms, filename = nil
     @tokens    = tokenizer
     @filename  = filename
     @set       = set
@@ -41,10 +41,10 @@ class Gem::RequestSet::Lockfile::Parser
   ##
   # Gets the next token for a Lockfile
 
-  def get(expected_types = nil, expected_value = nil) # :nodoc:
+  def get expected_types = nil, expected_value = nil # :nodoc:
     token = @tokens.shift
 
-    if expected_types and not Array(expected_types).include? token.type
+    if expected_types and not Array(expected_types).include? token.type then
       unget token
 
       message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " +
@@ -53,7 +53,7 @@ class Gem::RequestSet::Lockfile::Parser
       raise Gem::RequestSet::Lockfile::ParseError.new message, token.column, token.line, @filename
     end
 
-    if expected_value and expected_value != token.value
+    if expected_value and expected_value != token.value then
       unget token
 
       message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " +
@@ -93,7 +93,7 @@ class Gem::RequestSet::Lockfile::Parser
 
         get :r_paren
 
-        if peek[0] == :bang
+        if peek[0] == :bang then
           requirements.clear
           requirements << pinned_requirement(token.value)
 
@@ -144,7 +144,7 @@ class Gem::RequestSet::Lockfile::Parser
         type = token.type
         data = token.value
 
-        if type == :text and column == 4
+        if type == :text and column == 4 then
           version, platform = data.split '-', 2
 
           platform =
@@ -183,7 +183,7 @@ class Gem::RequestSet::Lockfile::Parser
 
     type = peek.type
     value = peek.value
-    if type == :entry and %w[branch ref tag].include? value
+    if type == :entry and %w[branch ref tag].include? value then
       get
       get :text
 
@@ -214,7 +214,7 @@ class Gem::RequestSet::Lockfile::Parser
         type = token.type
         data = token.value
 
-        if type == :text and column == 4
+        if type == :text and column == 4 then
           last_spec = set.add_git_spec name, data, repository, revision, true
         else
           dependency = parse_dependency name, data
@@ -261,7 +261,7 @@ class Gem::RequestSet::Lockfile::Parser
         type = token.type
         data = token.value
 
-        if type == :text and column == 4
+        if type == :text and column == 4 then
           last_spec = set.add_vendor_gem name, directory
         else
           dependency = parse_dependency name, data
@@ -294,7 +294,7 @@ class Gem::RequestSet::Lockfile::Parser
   # Parses the requirements following the dependency +name+ and the +op+ for
   # the first token of the requirements and returns a Gem::Dependency object.
 
-  def parse_dependency(name, op) # :nodoc:
+  def parse_dependency name, op # :nodoc:
     return Gem::Dependency.new name, op unless peek[0] == :text
 
     version = get(:text).value
@@ -314,7 +314,7 @@ class Gem::RequestSet::Lockfile::Parser
 
   private
 
-  def skip(type) # :nodoc:
+  def skip type # :nodoc:
     @tokens.skip type
   end
 
@@ -325,19 +325,30 @@ class Gem::RequestSet::Lockfile::Parser
     @tokens.peek
   end
 
-  def pinned_requirement(name) # :nodoc:
-    requirement = Gem::Dependency.new name
-    specification = @set.sets.flat_map { |set|
-      set.find_all(requirement)
-    }.compact.first
+  if [].respond_to? :flat_map
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.flat_map { |set|
+        set.find_all(requirement)
+      }.compact.first
 
-    specification && specification.version
+      specification && specification.version
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.map { |set|
+        set.find_all(requirement)
+      }.flatten(1).compact.first
+
+      specification && specification.version
+    end
   end
 
   ##
   # Ungets the last token retrieved by #get
 
-  def unget(token) # :nodoc:
+  def unget token # :nodoc:
     @tokens.unshift token
   end
 end
diff --git a/lib/rubygems/request_set/lockfile/tokenizer.rb b/lib/rubygems/request_set/lockfile/tokenizer.rb
index bb69c85fb4..c9f1fac75b 100644
--- a/lib/rubygems/request_set/lockfile/tokenizer.rb
+++ b/lib/rubygems/request_set/lockfile/tokenizer.rb
@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+require 'strscan'
 require 'rubygems/request_set/lockfile/parser'
 
 class Gem::RequestSet::Lockfile::Tokenizer
   Token = Struct.new :type, :value, :column, :line
   EOF   = Token.new :EOF
 
-  def self.from_file(file)
+  def self.from_file file
     new File.read(file), file
   end
 
-  def initialize(input, filename = nil, line = 0, pos = 0)
+  def initialize input, filename = nil, line = 0, pos = 0
     @line     = line
     @line_pos = pos
     @tokens   = []
@@ -17,7 +18,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
     tokenize input
   end
 
-  def make_parser(set, platforms)
+  def make_parser set, platforms
     Gem::RequestSet::Lockfile::Parser.new self, set, platforms, @filename
   end
 
@@ -25,7 +26,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
     @tokens.map { |token| [token.type, token.value, token.column, token.line] }
   end
 
-  def skip(type)
+  def skip type
     @tokens.shift while not @tokens.empty? and peek.type == type
   end
 
@@ -33,7 +34,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
   # Calculates the column (by byte) and the line of the current token based on
   # +byte_offset+.
 
-  def token_pos(byte_offset) # :nodoc:
+  def token_pos byte_offset # :nodoc:
     [byte_offset - @line_pos, @line]
   end
 
@@ -41,7 +42,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
     @tokens.empty?
   end
 
-  def unshift(token)
+  def unshift token
     @tokens.unshift token
   end
 
@@ -56,8 +57,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
 
   private
 
-  def tokenize(input)
-    require 'strscan'
+  def tokenize input
     s = StringScanner.new input
 
     until s.eos? do
@@ -65,7 +65,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
 
       pos = s.pos if leading_whitespace = s.scan(/ +/)
 
-      if s.scan(/[<|=>]{7}/)
+      if s.scan(/[<|=>]{7}/) then
         message = "your #{@filename} contains merge conflict markers"
         column, line = token_pos pos
 
@@ -80,7 +80,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
           @line += 1
           token
         when s.scan(/[A-Z]+/) then
-          if leading_whitespace
+          if leading_whitespace then
             text = s.matched
             text += s.scan(/[^\s)]*/).to_s # in case of no match
             Token.new(:text, text, *token_pos(pos))
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
index 48f4b00d63..32dc769055 100644
--- a/lib/rubygems/requirement.rb
+++ b/lib/rubygems/requirement.rb
@@ -22,22 +22,22 @@ class Gem::Requirement
     ">=" =>  lambda { |v, r| v >= r },
     "<=" =>  lambda { |v, r| v <= r },
     "~>" =>  lambda { |v, r| v >= r && v.release < r.bump }
-  }.freeze
+  }
 
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
 
   quoted  = OPS.keys.map { |k| Regexp.quote k }.join "|"
-  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
+  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
 
   ##
   # A regular expression that matches a requirement
 
-  PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+  PATTERN = /\A#{PATTERN_RAW}\z/
 
   ##
   # The default requirement matches any version
 
-  DefaultRequirement = [">=", Gem::Version.new(0)].freeze
+  DefaultRequirement = [">=", Gem::Version.new(0)]
 
   ##
   # Raised when a bad requirement is encountered
@@ -51,11 +51,7 @@ class Gem::Requirement
   # If the input is "weird", the default version requirement is
   # returned.
 
-  def self.create(*inputs)
-    return new inputs if inputs.length > 1
-
-    input = inputs.shift
-
+  def self.create input
     case input
     when Gem::Requirement then
       input
@@ -64,7 +60,7 @@ class Gem::Requirement
     when '!' then
       source_set
     else
-      if input.respond_to? :to_str
+      if input.respond_to? :to_str then
         new [input.to_str]
       else
         default
@@ -98,7 +94,7 @@ class Gem::Requirement
   #     parse("1.0")                   # => ["=", Gem::Version.new("1.0")]
   #     parse(Gem::Version.new("1.0")) # => ["=,  Gem::Version.new("1.0")]
 
-  def self.parse(obj)
+  def self.parse obj
     return ["=", obj] if Gem::Version === obj
 
     unless PATTERN =~ obj.to_s
@@ -124,7 +120,7 @@ class Gem::Requirement
   # requirements are ignored. An empty set of +requirements+ is the
   # same as <tt>">= 0"</tt>.
 
-  def initialize(*requirements)
+  def initialize *requirements
     requirements = requirements.flatten
     requirements.compact!
     requirements.uniq!
@@ -133,21 +129,19 @@ class Gem::Requirement
       @requirements = [DefaultRequirement]
     else
       @requirements = requirements.map! { |r| self.class.parse r }
-      sort_requirements!
     end
   end
 
   ##
   # Concatenates the +new+ requirements onto this requirement.
 
-  def concat(new)
+  def concat new
     new = new.flatten
     new.compact!
     new.uniq!
     new = new.map { |r| self.class.parse r }
 
     @requirements.concat new
-    sort_requirements!
   end
 
   ##
@@ -185,11 +179,11 @@ class Gem::Requirement
   end
 
   def as_list # :nodoc:
-    requirements.map { |op, version| "#{op} #{version}" }
+    requirements.map { |op, version| "#{op} #{version}" }.sort
   end
 
   def hash # :nodoc:
-    requirements.hash
+    requirements.sort.hash
   end
 
   def marshal_dump # :nodoc:
@@ -198,7 +192,7 @@ class Gem::Requirement
     [@requirements]
   end
 
-  def marshal_load(array) # :nodoc:
+  def marshal_load array # :nodoc:
     @requirements = array[0]
 
     fix_syck_default_key_in_requirements
@@ -213,7 +207,7 @@ class Gem::Requirement
     fix_syck_default_key_in_requirements
   end
 
-  def init_with(coder) # :nodoc:
+  def init_with coder # :nodoc:
     yaml_initialize coder.tag, coder.map
   end
 
@@ -221,7 +215,7 @@ class Gem::Requirement
     ["@requirements"]
   end
 
-  def encode_with(coder) # :nodoc:
+  def encode_with coder # :nodoc:
     coder.add 'requirements', @requirements
   end
 
@@ -233,7 +227,7 @@ class Gem::Requirement
     requirements.any? { |r| r.last.prerelease? }
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 1, 'Gem::Requirement.new(', ')' do
       q.pp as_list
     end
@@ -242,7 +236,7 @@ class Gem::Requirement
   ##
   # True if +version+ satisfies this Requirement.
 
-  def satisfied_by?(version)
+  def satisfied_by? version
     raise ArgumentError, "Need a Gem::Version: #{version.inspect}" unless
       Gem::Version === version
     # #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey
@@ -265,24 +259,8 @@ class Gem::Requirement
     as_list.join ", "
   end
 
-  def ==(other) # :nodoc:
-    return unless Gem::Requirement === other
-
-    # An == check is always necessary
-    return false unless requirements == other.requirements
-
-    # An == check is sufficient unless any requirements use ~>
-    return true unless _tilde_requirements.any?
-
-    # If any requirements use ~> we use the stricter `#eql?` that also checks
-    # that version precision is the same
-    _tilde_requirements.eql?(other._tilde_requirements)
-  end
-
-  protected
-
-  def _tilde_requirements
-    requirements.select { |r| r.first == "~>" }
+  def == other # :nodoc:
+    Gem::Requirement === other and to_s == other.to_s
   end
 
   private
@@ -297,14 +275,6 @@ class Gem::Requirement
       end
     end
   end
-
-  def sort_requirements! # :nodoc:
-    @requirements.sort! do |l, r|
-      comp = l.last <=> r.last # first, sort by the requirement's version
-      next comp unless comp == 0
-      l.first <=> r.first # then, sort by the operator (for stability)
-    end
-  end
 end
 
 class Gem::Version
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
index 46276f3260..50a547e1be 100644
--- a/lib/rubygems/resolver.rb
+++ b/lib/rubygems/resolver.rb
@@ -4,6 +4,9 @@ require 'rubygems/exceptions'
 require 'rubygems/util'
 require 'rubygems/util/list'
 
+require 'uri'
+require 'net/http'
+
 ##
 # Given a set of Gem::Dependency objects as +needed+ and a way to query the
 # set of available specs via +set+, calculates a set of ActivationRequest
@@ -59,7 +62,7 @@ class Gem::Resolver
   # uniform manner.  If one of the +sets+ is itself a ComposedSet its sets are
   # flattened into the result ComposedSet.
 
-  def self.compose_sets(*sets)
+  def self.compose_sets *sets
     sets.compact!
 
     sets = sets.map do |set|
@@ -87,7 +90,7 @@ class Gem::Resolver
   # Creates a Resolver that queries only against the already installed gems
   # for the +needed+ dependencies.
 
-  def self.for_current_gems(needed)
+  def self.for_current_gems needed
     new needed, Gem::Resolver::CurrentSet.new
   end
 
@@ -99,7 +102,7 @@ class Gem::Resolver
   # satisfy the Dependencies. This defaults to IndexSet, which will query
   # rubygems.org.
 
-  def initialize(needed, set = nil)
+  def initialize needed, set = nil
     @set = set || Gem::Resolver::IndexSet.new
     @needed = needed
 
@@ -112,14 +115,14 @@ class Gem::Resolver
     @stats               = Gem::Resolver::Stats.new
   end
 
-  def explain(stage, *data) # :nodoc:
+  def explain stage, *data # :nodoc:
     return unless DEBUG_RESOLVER
 
     d = data.map { |x| x.pretty_inspect }.join(", ")
     $stderr.printf "%10s %s\n", stage.to_s.upcase, d
   end
 
-  def explain_list(stage) # :nodoc:
+  def explain_list stage # :nodoc:
     return unless DEBUG_RESOLVER
 
     data = yield
@@ -133,7 +136,7 @@ class Gem::Resolver
   #
   # Returns the Specification and the ActivationRequest
 
-  def activation_request(dep, possible) # :nodoc:
+  def activation_request dep, possible # :nodoc:
     spec = possible.pop
 
     explain :activate, [spec.full_name, possible.size]
@@ -145,7 +148,7 @@ class Gem::Resolver
     return spec, activation_request
   end
 
-  def requests(s, act, reqs=[]) # :nodoc:
+  def requests s, act, reqs=[] # :nodoc:
     return reqs if @ignore_dependencies
 
     s.fetch_development_dependencies if @development
@@ -171,7 +174,7 @@ class Gem::Resolver
   include Molinillo::UI
 
   def output
-    @output ||= debug? ? $stdout : File.open(IO::NULL, 'w')
+    @output ||= debug? ? $stdout : File.open(Gem::Util::NULL_DEVICE, 'w')
   end
 
   def debug?
@@ -197,7 +200,7 @@ class Gem::Resolver
   # Extracts the specifications that may be able to fulfill +dependency+ and
   # returns those that match the local platform and all those that match.
 
-  def find_possible(dependency) # :nodoc:
+  def find_possible dependency # :nodoc:
     all = @set.find_all dependency
 
     if (skip_dep_gems = skip_gems[dependency.name]) && !skip_dep_gems.empty?
@@ -216,7 +219,7 @@ class Gem::Resolver
   ##
   # Returns the gems in +specs+ that match the local platform.
 
-  def select_local_platforms(specs) # :nodoc:
+  def select_local_platforms specs # :nodoc:
     specs.select do |spec|
       Gem::Platform.installable? spec
     end
@@ -230,28 +233,8 @@ class Gem::Resolver
       exc.errors = @set.errors
       raise exc
     end
-
-    sources = []
-
-    groups = Hash.new { |hash, key| hash[key] = [] }
-
-    # create groups & sources in the same loop
-    sources = possibles.map { |spec|
-      source = spec.source
-      groups[source] << spec
-      source
-    }.uniq.reverse
-
-    activation_requests = []
-
-    sources.each do |source|
-      groups[source].
-        sort_by { |spec| [spec.version, Gem::Platform.local =~ spec.platform ? 1 : 0] }.
-        map { |spec| ActivationRequest.new spec, dependency, [] }.
-        each { |activation_request| activation_requests << activation_request }
-    end
-
-    activation_requests
+    possibles.sort_by { |s| [s.source, s.version, Gem::Platform.local =~ s.platform ? 1 : 0] }.
+      map { |s| ActivationRequest.new s, dependency, [] }
   end
 
   def dependencies_for(specification)
@@ -273,46 +256,12 @@ class Gem::Resolver
     @soft_missing
   end
 
-  def sort_dependencies(dependencies, activated, conflicts)
-    dependencies.sort_by.with_index do |dependency, i|
-      name = name_for(dependency)
-      [
-        activated.vertex_named(name).payload ? 0 : 1,
-        amount_constrained(dependency),
-        conflicts[name] ? 0 : 1,
-        activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
-        i # for stable sort
-      ]
-    end
-  end
-
-  SINGLE_POSSIBILITY_CONSTRAINT_PENALTY = 1_000_000
-  private_constant :SINGLE_POSSIBILITY_CONSTRAINT_PENALTY if defined?(private_constant)
+end
 
-  # 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
-      name_dependency = Gem::Dependency.new(dependency.name)
-      dependency_request_for_name = Gem::Resolver::DependencyRequest.new(name_dependency, dependency.requester)
-      all = @set.find_all(dependency_request_for_name).size
-
-      if all <= 1
-        all - SINGLE_POSSIBILITY_CONSTRAINT_PENALTY
-      else
-        search = search_for(dependency).size
-        search - all
-      end
-    end
-  end
-  private :amount_constrained
+##
+# TODO remove in RubyGems 3
 
-end
+Gem::DependencyResolver = Gem::Resolver # :nodoc:
 
 require 'rubygems/resolver/activation_request'
 require 'rubygems/resolver/conflict'
diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb
index b28e1bef32..135d75d6bc 100644
--- a/lib/rubygems/resolver/activation_request.rb
+++ b/lib/rubygems/resolver/activation_request.rb
@@ -22,13 +22,13 @@ class Gem::Resolver::ActivationRequest
   # +others_possible+ indicates that other specifications may also match this
   # activation request.
 
-  def initialize(spec, request, others_possible = true)
+  def initialize spec, request, others_possible = true
     @spec = spec
     @request = request
     @others_possible = others_possible
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     case other
     when Gem::Specification
       @spec == other
@@ -49,7 +49,7 @@ class Gem::Resolver::ActivationRequest
   ##
   # Downloads a gem at +path+ and returns the file path.
 
-  def download(path)
+  def download path
     Gem.ensure_gem_subdirectories path
 
     if @spec.respond_to? :sources
@@ -97,7 +97,7 @@ class Gem::Resolver::ActivationRequest
       when false then # TODO remove at RubyGems 3
         nil
       else
-        unless @others_possible.empty?
+        unless @others_possible.empty? then
           others = @others_possible.map { |s| s.full_name }
           " (others possible: #{others.join ', '})"
         end
@@ -152,7 +152,7 @@ class Gem::Resolver::ActivationRequest
     @request.requester
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Activation request', ']' do
       q.breakable
       q.pp @spec
@@ -167,7 +167,7 @@ class Gem::Resolver::ActivationRequest
         q.breakable
         q.text 'others possible'
       else
-        unless @others_possible.empty?
+        unless @others_possible.empty? then
           q.breakable
           q.text 'others '
           q.pp @others_possible.map { |s| s.full_name }
diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb
index 6fd91e3b73..ee3046af63 100644
--- a/lib/rubygems/resolver/api_set.rb
+++ b/lib/rubygems/resolver/api_set.rb
@@ -25,7 +25,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # API URL +dep_uri+ which is described at
   # http://guides.rubygems.org/rubygems-org-api
 
-  def initialize(dep_uri = 'https://rubygems.org/api/v1/dependencies')
+  def initialize dep_uri = 'https://rubygems.org/api/v1/dependencies'
     super()
 
     dep_uri = URI dep_uri unless URI === dep_uri # for ruby 1.8
@@ -43,7 +43,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # Return an array of APISpecification objects matching
   # DependencyRequest +req+.
 
-  def find_all(req)
+  def find_all req
     res = []
 
     return res unless @remote
@@ -65,7 +65,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # A hint run by the resolver to allow the Set to fetch
   # data for DependencyRequests +reqs+.
 
-  def prefetch(reqs)
+  def prefetch reqs
     return unless @remote
     names = reqs.map { |r| r.dependency.name }
     needed = names - @data.keys - @to_fetch
@@ -93,7 +93,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
     end
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[APISet', ']' do
       q.breakable
       q.text "URI: #{@dep_uri}"
@@ -107,7 +107,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   ##
   # Return data for all versions of the gem +name+.
 
-  def versions(name) # :nodoc:
+  def versions name # :nodoc:
     if @data.key?(name)
       return @data[name]
     end
@@ -123,3 +123,4 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb
index 9bbc095788..1e22dd0b6f 100644
--- a/lib/rubygems/resolver/api_specification.rb
+++ b/lib/rubygems/resolver/api_specification.rb
@@ -21,13 +21,12 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
     @name = api_data[:name]
     @version = Gem::Version.new api_data[:number]
     @platform = Gem::Platform.new api_data[:platform]
-    @original_platform = api_data[:platform]
     @dependencies = api_data[:dependencies].map do |name, ver|
       Gem::Dependency.new name, ver.split(/\s*,\s*/)
     end
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and
       @set          == other.set and
       @name         == other.name and
@@ -46,7 +45,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
     Gem::Platform.match @platform
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[APISpecification', ']' do
       q.breakable
       q.text "name: #{name}"
@@ -74,11 +73,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
     @spec ||=
       begin
         tuple = Gem::NameTuple.new @name, @version, @platform
-        source.fetch_spec tuple
-      rescue Gem::RemoteFetcher::FetchError
-        raise if @original_platform == @platform
 
-        tuple = Gem::NameTuple.new @name, @version, @original_platform
         source.fetch_spec tuple
       end
   end
@@ -88,3 +83,4 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb
index cc91b65c0b..4479535abe 100644
--- a/lib/rubygems/resolver/best_set.rb
+++ b/lib/rubygems/resolver/best_set.rb
@@ -10,7 +10,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
   # Creates a BestSet for the given +sources+ or Gem::sources if none are
   # specified.  +sources+ must be a Gem::SourceList.
 
-  def initialize(sources = Gem.sources)
+  def initialize sources = Gem.sources
     super()
 
     @sources = sources
@@ -25,7 +25,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
     end
   end
 
-  def find_all(req) # :nodoc:
+  def find_all req # :nodoc:
     pick_sets if @remote and @sets.empty?
 
     super
@@ -35,13 +35,13 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
     retry
   end
 
-  def prefetch(reqs) # :nodoc:
+  def prefetch reqs # :nodoc:
     pick_sets if @remote and @sets.empty?
 
     super
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[BestSet', ']' do
       q.breakable
       q.text 'sets:'
@@ -58,7 +58,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
   #
   # The calling method must retry the exception to repeat the lookup.
 
-  def replace_failed_api_set(error) # :nodoc:
+  def replace_failed_api_set error # :nodoc:
     uri = error.uri
     uri = URI uri unless URI === uri
     uri.query = nil
@@ -76,3 +76,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
   end
 
 end
+
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
index 4baac9c75b..0b65942dca 100644
--- a/lib/rubygems/resolver/composed_set.rb
+++ b/lib/rubygems/resolver/composed_set.rb
@@ -16,7 +16,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   # Creates a new ComposedSet containing +sets+.  Use
   # Gem::Resolver::compose_sets instead.
 
-  def initialize(*sets)
+  def initialize *sets
     super()
 
     @sets = sets
@@ -26,7 +26,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   # When +allow_prerelease+ is set to +true+ prereleases gems are allowed to
   # match dependencies.
 
-  def prerelease=(allow_prerelease)
+  def prerelease= allow_prerelease
     super
 
     sets.each do |set|
@@ -37,7 +37,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   ##
   # Sets the remote network access for all composed sets.
 
-  def remote=(remote)
+  def remote= remote
     super
 
     @sets.each { |set| set.remote = remote }
@@ -50,7 +50,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   ##
   # Finds all specs matching +req+ in all sets.
 
-  def find_all(req)
+  def find_all req
     @sets.map do |s|
       s.find_all req
     end.flatten
@@ -59,8 +59,9 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   ##
   # Prefetches +reqs+ in all sets.
 
-  def prefetch(reqs)
+  def prefetch reqs
     @sets.each { |s| s.prefetch(reqs) }
   end
 
 end
+
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index fb1e661b21..7997f92950 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -27,7 +27,7 @@ class Gem::Resolver::Conflict
     @failed_dep = failed_dep
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and
       @dependency == other.dependency and
       @activated  == other.activated  and
@@ -57,7 +57,7 @@ class Gem::Resolver::Conflict
     requirement = dependency.requirement
     alternates  = dependency.matching_specs.map { |spec| spec.full_name }
 
-    unless alternates.empty?
+    unless alternates.empty? then
       matching = <<-MATCHING.chomp
 
   Gems matching %s:
@@ -97,7 +97,7 @@ class Gem::Resolver::Conflict
     @dependency.name == spec.name
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Dependency conflict: ', ']' do
       q.breakable
 
@@ -109,7 +109,7 @@ class Gem::Resolver::Conflict
       q.pp @dependency
 
       q.breakable
-      if @dependency == @failed_dep
+      if @dependency == @failed_dep then
         q.text ' failed'
       else
         q.text ' failed dependency '
@@ -121,7 +121,7 @@ class Gem::Resolver::Conflict
   ##
   # Path of activations from the +current+ list.
 
-  def request_path(current)
+  def request_path current
     path = []
 
     while current do
diff --git a/lib/rubygems/resolver/current_set.rb b/lib/rubygems/resolver/current_set.rb
index d60e46389d..265c639f15 100644
--- a/lib/rubygems/resolver/current_set.rb
+++ b/lib/rubygems/resolver/current_set.rb
@@ -6,8 +6,9 @@
 
 class Gem::Resolver::CurrentSet < Gem::Resolver::Set
 
-  def find_all(req)
+  def find_all req
     req.dependency.matching_specs
   end
 
 end
+
diff --git a/lib/rubygems/resolver/dependency_request.rb b/lib/rubygems/resolver/dependency_request.rb
index 1984aa9ddc..c2918911cd 100644
--- a/lib/rubygems/resolver/dependency_request.rb
+++ b/lib/rubygems/resolver/dependency_request.rb
@@ -19,12 +19,12 @@ class Gem::Resolver::DependencyRequest
   # Creates a new DependencyRequest for +dependency+ from +requester+.
   # +requester may be nil if the request came from a user.
 
-  def initialize(dependency, requester)
+  def initialize dependency, requester
     @dependency = dependency
     @requester  = requester
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     case other
     when Gem::Dependency
       @dependency == other
@@ -48,7 +48,7 @@ class Gem::Resolver::DependencyRequest
   # NOTE:  #match? only matches prerelease versions when #dependency is a
   # prerelease dependency.
 
-  def match?(spec, allow_prerelease = false)
+  def match? spec, allow_prerelease = false
     @dependency.match? spec, nil, allow_prerelease
   end
 
@@ -95,7 +95,7 @@ class Gem::Resolver::DependencyRequest
     @requester ? @requester.request : "(unknown)"
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Dependency request ', ']' do
       q.breakable
       q.text @dependency.to_s
diff --git a/lib/rubygems/resolver/git_set.rb b/lib/rubygems/resolver/git_set.rb
index 6340b92fae..723a202d7a 100644
--- a/lib/rubygems/resolver/git_set.rb
+++ b/lib/rubygems/resolver/git_set.rb
@@ -43,7 +43,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
     @specs           = {}
   end
 
-  def add_git_gem(name, repository, reference, submodules) # :nodoc:
+  def add_git_gem name, repository, reference, submodules # :nodoc:
     @repositories[name] = [repository, reference]
     @need_submodules[repository] = submodules
   end
@@ -56,7 +56,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   # This fills in the prefetch information as enough information about the gem
   # is present in the arguments.
 
-  def add_git_spec(name, version, repository, reference, submodules) # :nodoc:
+  def add_git_spec name, version, repository, reference, submodules # :nodoc:
     add_git_gem name, repository, reference, submodules
 
     source = Gem::Source::Git.new name, repository, reference
@@ -77,7 +77,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   ##
   # Finds all git gems matching +req+
 
-  def find_all(req)
+  def find_all req
     prefetch nil
 
     specs.values.select do |spec|
@@ -88,7 +88,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   ##
   # Prefetches specifications from the git repositories in this set.
 
-  def prefetch(reqs)
+  def prefetch reqs
     return unless @specs.empty?
 
     @repositories.each do |name, (repository, reference)|
@@ -104,7 +104,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
     end
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[GitSet', ']' do
       next if @repositories.empty?
       q.breakable
@@ -120,3 +120,4 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/git_specification.rb b/lib/rubygems/resolver/git_specification.rb
index f43cfba853..2448797d3f 100644
--- a/lib/rubygems/resolver/git_specification.rb
+++ b/lib/rubygems/resolver/git_specification.rb
@@ -6,14 +6,14 @@
 
 class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and
       @set  == other.set and
       @spec == other.spec and
       @source == other.source
   end
 
-  def add_dependency(dependency) # :nodoc:
+  def add_dependency dependency # :nodoc:
     spec.dependencies << dependency
   end
 
@@ -21,7 +21,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
   # Installing a git gem only involves building the extensions and generating
   # the executables.
 
-  def install(options = {})
+  def install options = {}
     require 'rubygems/installer'
 
     installer = Gem::Installer.for_spec spec, options
@@ -35,7 +35,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
     installer.run_post_install_hooks
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[GitSpecification', ']' do
       q.breakable
       q.text "name: #{name}"
@@ -56,3 +56,4 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/index_set.rb b/lib/rubygems/resolver/index_set.rb
index e32e1fa5ba..2450f14b4f 100644
--- a/lib/rubygems/resolver/index_set.rb
+++ b/lib/rubygems/resolver/index_set.rb
@@ -5,11 +5,11 @@
 
 class Gem::Resolver::IndexSet < Gem::Resolver::Set
 
-  def initialize(source = nil) # :nodoc:
+  def initialize source = nil # :nodoc:
     super()
 
     @f =
-      if source
+      if source then
         sources = Gem::SourceList.from [source]
 
         Gem::SpecFetcher.new sources
@@ -36,7 +36,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
   # Return an array of IndexSpecification objects matching
   # DependencyRequest +req+.
 
-  def find_all(req)
+  def find_all req
     res = []
 
     return res unless @remote
@@ -44,7 +44,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
     name = req.dependency.name
 
     @all[name].each do |uri, n|
-      if req.match? n, @prerelease
+      if req.match? n, @prerelease then
         res << Gem::Resolver::IndexSpecification.new(
           self, n.name, n.version, uri, n.platform)
       end
@@ -53,7 +53,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
     res
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[IndexSet', ']' do
       q.breakable
       q.text 'sources:'
@@ -78,3 +78,4 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb
index ed9423791c..4340f46943 100644
--- a/lib/rubygems/resolver/index_specification.rb
+++ b/lib/rubygems/resolver/index_specification.rb
@@ -15,7 +15,7 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
   # The +name+, +version+ and +platform+ are the name, version and platform of
   # the gem.
 
-  def initialize(set, name, version, source, platform)
+  def initialize set, name, version, source, platform
     super()
 
     @set = set
@@ -38,12 +38,12 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
     '#<%s %s source %s>' % [self.class, full_name, @source]
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Index specification', ']' do
       q.breakable
       q.text full_name
 
-      unless Gem::Platform::RUBY == @platform
+      unless Gem::Platform::RUBY == @platform then
         q.breakable
         q.text @platform.to_s
       end
@@ -67,3 +67,4 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/installed_specification.rb b/lib/rubygems/resolver/installed_specification.rb
index 9d996fc1da..d9c6a5e5cf 100644
--- a/lib/rubygems/resolver/installed_specification.rb
+++ b/lib/rubygems/resolver/installed_specification.rb
@@ -5,7 +5,7 @@
 
 class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and
       @set  == other.set and
       @spec == other.spec
@@ -15,7 +15,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
   # This is a null install as this specification is already installed.
   # +options+ are ignored.
 
-  def install(options = {})
+  def install options = {}
     yield nil
   end
 
@@ -30,7 +30,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
     super
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[InstalledSpecification', ']' do
       q.breakable
       q.text "name: #{name}"
@@ -56,3 +56,4 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb
index f3827ad4e9..07fffeb150 100644
--- a/lib/rubygems/resolver/installer_set.rb
+++ b/lib/rubygems/resolver/installer_set.rb
@@ -29,7 +29,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   ##
   # Creates a new InstallerSet that will look for gems in +domain+.
 
-  def initialize(domain)
+  def initialize domain
     super()
 
     @domain = domain
@@ -41,7 +41,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @ignore_dependencies = false
     @ignore_installed    = false
     @local               = {}
-    @local_source        = Gem::Source::Local.new
     @remote_set          = Gem::Resolver::BestSet.new
     @specs               = {}
   end
@@ -50,7 +49,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Looks up the latest specification for +dependency+ and adds it to the
   # always_install list.
 
-  def add_always_install(dependency)
+  def add_always_install dependency
     request = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = find_all request
@@ -65,7 +64,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
         Gem::Platform.local === s.platform
     end
 
-    if found.empty?
+    if found.empty? then
       exc = Gem::UnsatisfiableDependencyError.new request
       exc.errors = errors
 
@@ -83,7 +82,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Adds a local gem requested using +dep_name+ with the given +spec+ that can
   # be loaded and installed using the +source+.
 
-  def add_local(dep_name, spec, source)
+  def add_local dep_name, spec, source
     @local[dep_name] = [spec, source]
   end
 
@@ -112,7 +111,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Returns an array of IndexSpecification objects matching DependencyRequest
   # +req+.
 
-  def find_all(req)
+  def find_all req
     res = []
 
     dep  = req.dependency
@@ -128,7 +127,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       res << Gem::Resolver::InstalledSpecification.new(self, gemspec)
     end unless @ignore_installed
 
-    if consider_local?
+    if consider_local? then
       matching_local = @local.values.select do |spec, _|
         req.match? spec
       end.map do |spec, source|
@@ -137,11 +136,13 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
       res.concat matching_local
 
+      local_source = Gem::Source::Local.new
+
       begin
-        if local_spec = @local_source.find_gem(name, dep.requirement)
+        if local_spec = local_source.find_gem(name, dep.requirement) then
           res << Gem::Resolver::IndexSpecification.new(
             self, local_spec.name, local_spec.version,
-            @local_source, local_spec.platform)
+            local_source, local_spec.platform)
         end
       rescue Gem::Package::FormatError
         # ignore
@@ -161,7 +162,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @remote_set.prefetch(reqs) if consider_remote?
   end
 
-  def prerelease=(allow_prerelease)
+  def prerelease= allow_prerelease
     super
 
     @remote_set.prerelease = allow_prerelease
@@ -179,7 +180,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Called from IndexSpecification to get a true Specification
   # object.
 
-  def load_spec(name, ver, platform, source) # :nodoc:
+  def load_spec name, ver, platform, source # :nodoc:
     key = "#{name}-#{ver}-#{platform}"
 
     @specs.fetch key do
@@ -192,13 +193,13 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   ##
   # Has a local gem for +dep_name+ been added to this set?
 
-  def local?(dep_name) # :nodoc:
-    spec, _ = @local[dep_name]
+  def local? dep_name # :nodoc:
+    spec, = @local[dep_name]
 
     spec
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[InstallerSet', ']' do
       q.breakable
       q.text "domain: #{@domain}"
@@ -213,7 +214,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     end
   end
 
-  def remote=(remote) # :nodoc:
+  def remote= remote # :nodoc:
     case @domain
     when :local then
       @domain = :both if remote
@@ -225,3 +226,4 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/local_specification.rb b/lib/rubygems/resolver/local_specification.rb
index 7418cfcc86..1d9d22f0ac 100644
--- a/lib/rubygems/resolver/local_specification.rb
+++ b/lib/rubygems/resolver/local_specification.rb
@@ -17,7 +17,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
     true
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[LocalSpecification', ']' do
       q.breakable
       q.text "name: #{name}"
@@ -39,3 +39,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb
index 4002a963a4..7fddc93e1c 100644
--- a/lib/rubygems/resolver/lock_set.rb
+++ b/lib/rubygems/resolver/lock_set.rb
@@ -9,7 +9,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   ##
   # Creates a new LockSet from the given +sources+
 
-  def initialize(sources)
+  def initialize sources
     super()
 
     @sources = sources.map do |source|
@@ -26,7 +26,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # The specification's set will be the current set, and the source will be
   # the current set's source.
 
-  def add(name, version, platform) # :nodoc:
+  def add name, version, platform # :nodoc:
     version = Gem::Version.new version
     specs = [
       Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
@@ -41,7 +41,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # Returns an Array of IndexSpecification objects matching the
   # DependencyRequest +req+.
 
-  def find_all(req)
+  def find_all req
     @specs.select do |spec|
       req.match? spec
     end
@@ -51,7 +51,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # Loads a Gem::Specification with the given +name+, +version+ and
   # +platform+.  +source+ is ignored.
 
-  def load_spec(name, version, platform, source) # :nodoc:
+  def load_spec name, version, platform, source # :nodoc:
     dep = Gem::Dependency.new name, version
 
     found = @specs.find do |spec|
@@ -63,7 +63,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
     found.source.fetch_spec tuple
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[LockSet', ']' do
       q.breakable
       q.text 'source:'
@@ -80,3 +80,4 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/lock_specification.rb b/lib/rubygems/resolver/lock_specification.rb
index e29b567de4..f485675673 100644
--- a/lib/rubygems/resolver/lock_specification.rb
+++ b/lib/rubygems/resolver/lock_specification.rb
@@ -9,7 +9,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
 
   attr_reader :sources
 
-  def initialize(set, name, version, sources, platform)
+  def initialize set, name, version, sources, platform
     super()
 
     @name     = name
@@ -27,10 +27,10 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   # This is a null install as a locked specification is considered installed.
   # +options+ are ignored.
 
-  def install(options = {})
+  def install options = {}
     destination = options[:install_dir] || Gem.dir
 
-    if File.exist? File.join(destination, 'specifications', spec.spec_name)
+    if File.exist? File.join(destination, 'specifications', spec.spec_name) then
       yield nil
       return
     end
@@ -41,11 +41,11 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   ##
   # Adds +dependency+ from the lockfile to this specification
 
-  def add_dependency(dependency) # :nodoc:
+  def add_dependency dependency # :nodoc:
     @dependencies << dependency
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[LockSpecification', ']' do
       q.breakable
       q.text "name: #{@name}"
@@ -53,12 +53,12 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
       q.breakable
       q.text "version: #{@version}"
 
-      unless @platform == Gem::Platform::RUBY
+      unless @platform == Gem::Platform::RUBY then
         q.breakable
         q.text "platform: #{@platform}"
       end
 
-      unless @dependencies.empty?
+      unless @dependencies.empty? then
         q.breakable
         q.text 'dependencies:'
         q.breakable
@@ -85,3 +85,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
index b413e3ab6a..6189a717cd 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
@@ -98,27 +98,18 @@ module Gem::Resolver::Molinillo
       "#{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?
-
+    def to_dot
       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}]"
+          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=\"#{e.requirement}\"]"
         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
@@ -128,12 +119,10 @@ module Gem::Resolver::Molinillo
     #   {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
+        return false unless other_vertex.successors.map(&:name).to_set == vertex.successors.map(&:name).to_set
       end
     end
 
@@ -145,7 +134,6 @@ module Gem::Resolver::Molinillo
     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_node = vertex_named(parent_name)
         add_edge(parent_node, vertex, requirement)
@@ -164,7 +152,7 @@ module Gem::Resolver::Molinillo
     # 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
+    # @return [void]
     def detach_vertex_named(name)
       log.detach_vertex_named(self, name)
     end
@@ -194,13 +182,6 @@ module Gem::Resolver::Molinillo
       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
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
index eeedabb069..dbf4b0b803 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
@@ -7,7 +7,7 @@ module Gem::Resolver::Molinillo
       # rubocop:disable Lint/UnusedMethodArgument
 
       # @return [Symbol] The name of the action.
-      def self.action_name
+      def self.name
         raise 'Abstract'
       end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
index e994e59d05..b2d569ddc9 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
@@ -7,8 +7,8 @@ module Gem::Resolver::Molinillo
     class AddEdgeNoCircular < Action
       # @!group Action
 
-      # (see Action.action_name)
-      def self.action_name
+      # (see Action.name)
+      def self.name
         :add_vertex
       end
 
@@ -23,8 +23,8 @@ module Gem::Resolver::Molinillo
       # (see Action#down)
       def down(graph)
         edge = make_edge(graph)
-        delete_first(edge.origin.outgoing_edges, edge)
-        delete_first(edge.destination.incoming_edges, edge)
+        edge.origin.outgoing_edges.delete(edge)
+        edge.destination.incoming_edges.delete(edge)
       end
 
       # @!group AddEdgeNoCircular
@@ -53,13 +53,6 @@ module Gem::Resolver::Molinillo
         @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/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
index 6cde933080..e8b4278ba4 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
@@ -7,8 +7,8 @@ module Gem::Resolver::Molinillo
     class AddVertex < Action # :nodoc:
       # @!group Action
 
-      # (see Action.action_name)
-      def self.action_name
+      # (see Action.name)
+      def self.name
         :add_vertex
       end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
deleted file mode 100644
index d44aaf1f06..0000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action'
-module Gem::Resolver::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/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
index fa03e2d365..59ef7d8c09 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
@@ -8,29 +8,22 @@ module Gem::Resolver::Molinillo
       # @!group Action
 
       # (see Action#name)
-      def self.action_name
+      def self.name
         :add_vertex
       end
 
       # (see Action#up)
       def up(graph)
-        return [] unless @vertex = graph.vertices.delete(name)
-
-        removed_vertices = [@vertex]
+        return unless @vertex = graph.vertices.delete(name)
         @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
+          graph.detach_vertex_named(v.name) unless v.root? || v.predecessors.any?
         end
-
         @vertex.incoming_edges.each do |e|
           v = e.origin
           v.outgoing_edges.delete(e)
         end
-
-        removed_vertices
       end
 
       # (see Action#down)
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
index 5cdd84b5c1..874c4480e3 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular'
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex'
-require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge'
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named'
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload'
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag'
@@ -41,16 +40,6 @@ module Gem::Resolver::Molinillo
         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))
@@ -103,7 +92,7 @@ module Gem::Resolver::Molinillo
         loop do
           action = pop!(graph)
           raise "No tag #{tag.inspect} found" unless action
-          break if action.class.action_name == :tag && action.tag == tag
+          break if action.class.name == :tag && action.tag == tag
         end
       end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
index 02cfba64a7..633bc64601 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
@@ -7,8 +7,8 @@ module Gem::Resolver::Molinillo
     class SetPayload < Action # :nodoc:
       # @!group Action
 
-      # (see Action.action_name)
-      def self.action_name
+      # (see Action.name)
+      def self.name
         :set_payload
       end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
index 0cb08075ca..808cd6a3d8 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
@@ -7,8 +7,8 @@ module Gem::Resolver::Molinillo
     class Tag < Action
       # @!group Action
 
-      # (see Action.action_name)
-      def self.action_name
+      # (see Action.name)
+      def self.name
         :tag
       end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
index cebd9cafdd..88d109c94f 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
@@ -10,7 +10,7 @@ module Gem::Resolver::Molinillo
       # @return [Object] the payload the vertex holds
       attr_accessor :payload
 
-      # @return [Array<Object>] the explicit requirements that required
+      # @return [Arrary<Object>] the explicit requirements that required
       #   this vertex
       attr_reader :explicit_requirements
 
@@ -81,7 +81,6 @@ module Gem::Resolver::Molinillo
       # @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
@@ -90,7 +89,6 @@ module Gem::Resolver::Molinillo
       # @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
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
index c5b5bd729f..1a82da0e7a 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Gem::Resolver::Molinillo
   # The version of Gem::Resolver::Molinillo.
-  VERSION = '0.5.7'.freeze
+  VERSION = '0.5.0'.freeze
 end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
index dbc4e000e4..540b5b809c 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
@@ -48,7 +48,7 @@ module Gem::Resolver::Molinillo
       if debug?
         debug_info = yield
         debug_info = debug_info.inspect unless debug_info.is_a?(String)
-        output.puts debug_info.split("\n").map { |s| ' ' * depth + s }
+        output.puts debug_info.split("\n").map { |s| '  ' * depth + s }
       end
     end
 
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
index 73a4242157..1fb7a1e921 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
+++ b/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
@@ -52,7 +52,7 @@ module Gem::Resolver::Molinillo
         @base = base
         @states = []
         @iteration_counter = 0
-        @parents_of = Hash.new { |h, k| h[k] = [] }
+        @parent_of = {}
       end
 
       # Resolves the {#original_requested} dependencies into a full dependency
@@ -105,7 +105,7 @@ module Gem::Resolver::Molinillo
 
         handle_missing_or_push_dependency_state(initial_state)
 
-        debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
+        debug { "Starting resolution (#{@started_at})" }
         resolver_ui.before_resolution
       end
 
@@ -178,14 +178,12 @@ module Gem::Resolver::Molinillo
       # Unwinds the states stack because a conflict has been encountered
       # @return [void]
       def unwind_for_conflict
-        debug(depth) { "Unwinding for conflict: #{requirement} to #{state_index_for_unwind / 2}" }
+        debug(depth) { "Unwinding for conflict: #{requirement}" }
         conflicts.tap do |c|
           sliced_states = states.slice!((state_index_for_unwind + 1)..-1)
           raise VersionConflict.new(c) unless state
           activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
           state.conflicts = c
-          index = states.size - 1
-          @parents_of.each { |_, a| a.reject! { |i| i >= index } }
         end
       end
 
@@ -194,29 +192,24 @@ module Gem::Resolver::Molinillo
       def state_index_for_unwind
         current_requirement = requirement
         existing_requirement = requirement_for_existing_name(name)
-        index = -1
-        [current_requirement, existing_requirement].each do |r|
-          until r.nil?
-            current_state = find_state_for(r)
-            if state_any?(current_state)
-              current_index = states.index(current_state)
-              index = current_index if current_index > index
-              break
-            end
-            r = parent_of(r)
-          end
+        until current_requirement.nil?
+          current_state = find_state_for(current_requirement)
+          return states.index(current_state) if state_any?(current_state)
+          current_requirement = parent_of(current_requirement)
         end
 
-        index
+        until existing_requirement.nil?
+          existing_state = find_state_for(existing_requirement)
+          return states.index(existing_state) if state_any?(existing_state)
+          existing_requirement = parent_of(existing_requirement)
+        end
+        -1
       end
 
       # @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
+        @parent_of[requirement]
       end
 
       # @return [Object] the requirement that led to a version of a possibility
@@ -356,40 +349,20 @@ module Gem::Resolver::Molinillo
       # Ensures there are no orphaned successors to the given {vertex}.
       # @param [DependencyGraph::Vertex] vertex the vertex to fix up.
       # @return [void]
-      def fixup_swapped_children(vertex) # rubocop:disable Metrics/CyclomaticComplexity
+      def fixup_swapped_children(vertex)
         payload = vertex.payload
-        deps = dependencies_for(payload).group_by(&method(:name_for))
-        vertex.outgoing_edges.each do |outgoing_edge|
-          requirement = outgoing_edge.requirement
-          parent_index = @parents_of[requirement].last
-          succ = outgoing_edge.destination
-          matching_deps = Array(deps[succ.name])
-          dep_matched = matching_deps.include?(requirement)
-
-          # only push the current index when it was originally required by the
-          # same named spec
-          if parent_index && states[parent_index].name == name
-            @parents_of[requirement].push(states.size - 1)
-          end
-
-          if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
+        dep_names = dependencies_for(payload).map(&method(:name_for))
+        vertex.successors.each do |succ|
+          if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
-            succ.requirements.each { |r| @parents_of.delete(r) }
+            activated.detach_vertex_named(succ.name)
 
-            removed_names = activated.detach_vertex_named(succ.name).map(&:name)
-            requirements.delete_if do |r|
-              # the only removed vertices are those with no other requirements,
-              # so it's safe to delete only based upon name here
-              removed_names.include?(name_for(r))
+            all_successor_names = succ.recursive_successors.map(&:name)
+
+            requirements.delete_if do |requirement|
+              requirement_name = name_for(requirement)
+              (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
             end
-          elsif !dep_matched
-            debug(depth) { "Removing orphaned dependency #{requirement} after swapping #{name}" }
-            # also reset if we're removing the edge, but only if its parent has
-            # already been fixed up
-            @parents_of[requirement].push(states.size - 1) if @parents_of[requirement].empty?
-
-            activated.delete_edge(outgoing_edge)
-            requirements.delete(requirement)
           end
         end
       end
@@ -409,18 +382,13 @@ module Gem::Resolver::Molinillo
       # @return [Boolean] whether the current spec is satisfied as a new
       # possibility.
       def new_spec_satisfied?
-        unless requirement_satisfied_by?(requirement, activated, possibility)
-          debug(depth) { 'Unsatisfied by requested spec' }
-          return false
-        end
-
         locked_requirement = locked_requirement_named(name)
-
+        requested_spec_satisfied = requirement_satisfied_by?(requirement, activated, possibility)
         locked_spec_satisfied = !locked_requirement ||
           requirement_satisfied_by?(locked_requirement, activated, possibility)
+        debug(depth) { 'Unsatisfied by requested spec' } unless requested_spec_satisfied
         debug(depth) { 'Unsatisfied by locked spec' } unless locked_spec_satisfied
-
-        locked_spec_satisfied
+        requested_spec_satisfied && locked_spec_satisfied
       end
 
       # @param [String] requirement_name the spec name to search for
@@ -436,7 +404,7 @@ module Gem::Resolver::Molinillo
       # @return [void]
       def activate_spec
         conflicts.delete(name)
-        debug(depth) { "Activated #{name} at #{possibility}" }
+        debug(depth) { 'Activated ' + name + ' at ' + possibility.to_s }
         activated.set_payload(name, possibility)
         require_nested_dependencies_for(possibility)
       end
@@ -450,9 +418,7 @@ module Gem::Resolver::Molinillo
         debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each do |d|
           activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
-          parent_index = states.size - 1
-          parents = @parents_of[d]
-          parents << parent_index if parents.empty?
+          @parent_of[d] = requirement
         end
 
         push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
diff --git a/lib/rubygems/resolver/requirement_list.rb b/lib/rubygems/resolver/requirement_list.rb
index 98d086e63c..2768c80170 100644
--- a/lib/rubygems/resolver/requirement_list.rb
+++ b/lib/rubygems/resolver/requirement_list.rb
@@ -18,7 +18,7 @@ class Gem::Resolver::RequirementList
     @list = []
   end
 
-  def initialize_copy(other) # :nodoc:
+  def initialize_copy other # :nodoc:
     @exact = @exact.dup
     @list = @list.dup
   end
diff --git a/lib/rubygems/resolver/set.rb b/lib/rubygems/resolver/set.rb
index 242f9cd3dc..cc12633d46 100644
--- a/lib/rubygems/resolver/set.rb
+++ b/lib/rubygems/resolver/set.rb
@@ -21,7 +21,6 @@ class Gem::Resolver::Set
   attr_accessor :prerelease
 
   def initialize # :nodoc:
-    require 'uri'
     @prerelease = false
     @remote     = true
     @errors     = []
@@ -31,7 +30,7 @@ class Gem::Resolver::Set
   # The find_all method must be implemented.  It returns all Resolver
   # Specification objects matching the given DependencyRequest +req+.
 
-  def find_all(req)
+  def find_all req
     raise NotImplementedError
   end
 
@@ -43,7 +42,7 @@ class Gem::Resolver::Set
   # When overridden, the #prefetch method should look up specifications
   # matching +reqs+.
 
-  def prefetch(reqs)
+  def prefetch reqs
   end
 
   ##
@@ -55,3 +54,4 @@ class Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/source_set.rb b/lib/rubygems/resolver/source_set.rb
index 8e799514fd..66f5963e54 100644
--- a/lib/rubygems/resolver/source_set.rb
+++ b/lib/rubygems/resolver/source_set.rb
@@ -16,7 +16,7 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set
     @sets  = {}
   end
 
-  def find_all(req) # :nodoc:
+  def find_all req # :nodoc:
     if set = get_set(req.dependency.name)
       set.find_all req
     else
@@ -25,7 +25,7 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set
   end
 
   # potentially no-op
-  def prefetch(reqs) # :nodoc:
+  def prefetch reqs # :nodoc:
     reqs.each do |req|
       if set = get_set(req.dependency.name)
         set.prefetch reqs
@@ -33,11 +33,11 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set
     end
   end
 
-  def add_source_gem(name, source)
+  def add_source_gem name, source
     @links[name] = source
   end
 
-  private
+private
 
   def get_set(name)
     link = @links[name]
@@ -45,3 +45,4 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/spec_specification.rb b/lib/rubygems/resolver/spec_specification.rb
index d0e744f3a7..35ee8cc247 100644
--- a/lib/rubygems/resolver/spec_specification.rb
+++ b/lib/rubygems/resolver/spec_specification.rb
@@ -10,7 +10,7 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
   # +spec+.  The +source+ is either where the +spec+ came from, or should be
   # loaded from.
 
-  def initialize(set, spec, source = nil)
+  def initialize set, spec, source = nil
     @set    = set
     @source = source
     @spec   = spec
@@ -54,3 +54,4 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
   end
 
 end
+
diff --git a/lib/rubygems/resolver/specification.rb b/lib/rubygems/resolver/specification.rb
index 7c1e9be702..44989d39ae 100644
--- a/lib/rubygems/resolver/specification.rb
+++ b/lib/rubygems/resolver/specification.rb
@@ -81,10 +81,14 @@ class Gem::Resolver::Specification
   # After installation #spec is updated to point to the just-installed
   # specification.
 
-  def install(options = {})
+  def install options = {}
     require 'rubygems/installer'
 
-    gem = download options
+    destination = options[:install_dir] || Gem.dir
+
+    Gem.ensure_gem_subdirectories destination
+
+    gem = source.download spec, destination
 
     installer = Gem::Installer.at gem, options
 
@@ -93,14 +97,6 @@ class Gem::Resolver::Specification
     @spec = installer.install
   end
 
-  def download(options)
-    dir = options[:install_dir] || Gem.dir
-
-    Gem.ensure_gem_subdirectories dir
-
-    source.download spec, dir
-  end
-
   ##
   # Returns true if this specification is installable on this platform.
 
@@ -112,3 +108,4 @@ class Gem::Resolver::Specification
     false
   end
 end
+
diff --git a/lib/rubygems/resolver/stats.rb b/lib/rubygems/resolver/stats.rb
index 64b458f504..3b95efebf7 100644
--- a/lib/rubygems/resolver/stats.rb
+++ b/lib/rubygems/resolver/stats.rb
@@ -32,7 +32,7 @@ class Gem::Resolver::Stats
     @iterations += 1
   end
 
-  PATTERN = "%20s: %d\n".freeze
+  PATTERN = "%20s: %d\n"
 
   def display
     $stdout.puts "=== Resolver Statistics ==="
diff --git a/lib/rubygems/resolver/vendor_set.rb b/lib/rubygems/resolver/vendor_set.rb
index 7e2e917d5c..f30ce534af 100644
--- a/lib/rubygems/resolver/vendor_set.rb
+++ b/lib/rubygems/resolver/vendor_set.rb
@@ -32,7 +32,7 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
   # Adds a specification to the set with the given +name+ which has been
   # unpacked into the given +directory+.
 
-  def add_vendor_gem(name, directory) # :nodoc:
+  def add_vendor_gem name, directory # :nodoc:
     gemspec = File.join directory, "#{name}.gemspec"
 
     spec = Gem::Specification.load gemspec
@@ -52,7 +52,7 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
   # Returns an Array of VendorSpecification objects matching the
   # DependencyRequest +req+.
 
-  def find_all(req)
+  def find_all req
     @specs.values.select do |spec|
       req.match? spec
     end.map do |spec|
@@ -65,11 +65,11 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
   # Loads a spec with the given +name+. +version+, +platform+ and +source+ are
   # ignored.
 
-  def load_spec(name, version, platform, source) # :nodoc:
+  def load_spec name, version, platform, source # :nodoc:
     @specs.fetch name
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[VendorSet', ']' do
       next if @directories.empty?
       q.breakable
@@ -85,3 +85,4 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
   end
 
 end
+
diff --git a/lib/rubygems/resolver/vendor_specification.rb b/lib/rubygems/resolver/vendor_specification.rb
index 56f2e6eb2c..c624f3e834 100644
--- a/lib/rubygems/resolver/vendor_specification.rb
+++ b/lib/rubygems/resolver/vendor_specification.rb
@@ -6,7 +6,7 @@
 
 class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and
       @set  == other.set and
       @spec == other.spec and
@@ -17,8 +17,9 @@ class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification
   # This is a null install as this gem was unpacked into a directory.
   # +options+ are ignored.
 
-  def install(options = {})
+  def install options = {}
     yield nil
   end
 
 end
+
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
deleted file mode 100644
index 3540fd74dd..0000000000
--- a/lib/rubygems/safe_yaml.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-module Gem
-
-  ###
-  # This module is used for safely loading YAML specs from a gem.  The
-  # `safe_load` method defined on this module is specifically designed for
-  # loading Gem specifications.  For loading other YAML safely, please see
-  # Psych.safe_load
-
-  module SafeYAML
-    PERMITTED_CLASSES = %w(
-      Symbol
-      Time
-      Date
-      Gem::Dependency
-      Gem::Platform
-      Gem::Requirement
-      Gem::Specification
-      Gem::Version
-      Gem::Version::Requirement
-      YAML::Syck::DefaultKey
-      Syck::DefaultKey
-    ).freeze
-
-    PERMITTED_SYMBOLS = %w(
-      development
-      runtime
-    ).freeze
-
-    if ::YAML.respond_to? :safe_load
-      def self.safe_load(input)
-        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
-          ::YAML.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
-        else
-          ::YAML.safe_load(input, PERMITTED_CLASSES, PERMITTED_SYMBOLS, true)
-        end
-      end
-
-      def self.load(input)
-        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
-          ::YAML.safe_load(input, permitted_classes: [::Symbol])
-        else
-          ::YAML.safe_load(input, [::Symbol])
-        end
-      end
-    else
-      unless Gem::Deprecate.skip
-        warn "YAML safe loading is not available. Please upgrade psych to a version that supports safe loading (>= 2.0)."
-      end
-
-      def self.safe_load(input, *args)
-        ::YAML.load input
-      end
-
-      def self.load(input)
-        ::YAML.load input
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
index 7b0a0b3c6a..119d6d56f7 100644
--- a/lib/rubygems/security.rb
+++ b/lib/rubygems/security.rb
@@ -340,37 +340,30 @@ module Gem::Security
   # Digest algorithm used to sign gems
 
   DIGEST_ALGORITHM =
-    if defined?(OpenSSL::Digest::SHA256)
-      OpenSSL::Digest::SHA256
-    elsif defined?(OpenSSL::Digest::SHA1)
+    if defined?(OpenSSL::Digest::SHA1) then
       OpenSSL::Digest::SHA1
-    else
-      require 'digest'
-      Digest::SHA512
     end
 
   ##
   # Used internally to select the signing digest from all computed digests
 
   DIGEST_NAME = # :nodoc:
-    if DIGEST_ALGORITHM.method_defined? :name
+    if DIGEST_ALGORITHM then
       DIGEST_ALGORITHM.new.name
-    else
-      DIGEST_ALGORITHM.name[/::([^:]+)\z/, 1]
     end
 
   ##
   # Algorithm for creating the key pair used to sign gems
 
   KEY_ALGORITHM =
-    if defined?(OpenSSL::PKey::RSA)
+    if defined?(OpenSSL::PKey::RSA) then
       OpenSSL::PKey::RSA
     end
 
   ##
   # Length of keys created by KEY_ALGORITHM
 
-  KEY_LENGTH = 3072
+  KEY_LENGTH = 2048
 
   ##
   # Cipher used to encrypt the key pair used to sign gems.
@@ -379,14 +372,9 @@ module Gem::Security
   KEY_CIPHER = OpenSSL::Cipher.new('AES-256-CBC') if defined?(OpenSSL::Cipher)
 
   ##
-  # One day in seconds
-
-  ONE_DAY = 86400
-
-  ##
   # One year in seconds
 
-  ONE_YEAR = ONE_DAY * 365
+  ONE_YEAR = 86400 * 365
 
   ##
   # The default set of extensions are:
@@ -401,9 +389,9 @@ module Gem::Security
     'keyUsage'             =>
       'keyEncipherment,dataEncipherment,digitalSignature',
     'subjectKeyIdentifier' => 'hash',
-  }.freeze
+  }
 
-  def self.alt_name_or_x509_entry(certificate, x509_entry)
+  def self.alt_name_or_x509_entry certificate, x509_entry
     alt_name = certificate.extensions.find do |extension|
       extension.oid == "#{x509_entry}AltName"
     end
@@ -419,8 +407,8 @@ module Gem::Security
   #
   # The +extensions+ restrict the key to the indicated uses.
 
-  def self.create_cert(subject, key, age = ONE_YEAR, extensions = EXTENSIONS,
-                       serial = 1)
+  def self.create_cert subject, key, age = ONE_YEAR, extensions = EXTENSIONS,
+                       serial = 1
     cert = OpenSSL::X509::Certificate.new
 
     cert.public_key = key.public_key
@@ -446,7 +434,7 @@ module Gem::Security
   # a subject alternative name of +email+ and the given +extensions+ for the
   # +key+.
 
-  def self.create_cert_email(email, key, age = ONE_YEAR, extensions = EXTENSIONS)
+  def self.create_cert_email email, key, age = ONE_YEAR, extensions = EXTENSIONS
     subject = email_to_name email
 
     extensions = extensions.merge "subjectAltName" => "email:#{email}"
@@ -458,8 +446,8 @@ module Gem::Security
   # Creates a self-signed certificate with an issuer and subject of +subject+
   # and the given +extensions+ for the +key+.
 
-  def self.create_cert_self_signed(subject, key, age = ONE_YEAR,
-                                   extensions = EXTENSIONS, serial = 1)
+  def self.create_cert_self_signed subject, key, age = ONE_YEAR,
+                                   extensions = EXTENSIONS, serial = 1
     certificate = create_cert subject, key, age, extensions
 
     sign certificate, key, certificate, age, extensions, serial
@@ -467,16 +455,16 @@ module Gem::Security
 
   ##
   # Creates a new key pair of the specified +length+ and +algorithm+.  The
-  # default is a 3072 bit RSA key.
+  # default is a 2048 bit RSA key.
 
-  def self.create_key(length = KEY_LENGTH, algorithm = KEY_ALGORITHM)
+  def self.create_key length = KEY_LENGTH, algorithm = KEY_ALGORITHM
     algorithm.new length
   end
 
   ##
   # Turns +email_address+ into an OpenSSL::X509::Name
 
-  def self.email_to_name(email_address)
+  def self.email_to_name email_address
     email_address = email_address.gsub(/[^\w@.-]+/i, '_')
 
     cn, dcs = email_address.split '@'
@@ -494,15 +482,15 @@ module Gem::Security
   #--
   # TODO increment serial
 
-  def self.re_sign(expired_certificate, private_key, age = ONE_YEAR,
-                   extensions = EXTENSIONS)
+  def self.re_sign expired_certificate, private_key, age = ONE_YEAR,
+                   extensions = EXTENSIONS
     raise Gem::Security::Exception,
           "incorrect signing key for re-signing " +
           "#{expired_certificate.subject}" unless
       expired_certificate.public_key.to_pem == private_key.public_key.to_pem
 
     unless expired_certificate.subject.to_s ==
-           expired_certificate.issuer.to_s
+           expired_certificate.issuer.to_s then
       subject = alt_name_or_x509_entry expired_certificate, :subject
       issuer  = alt_name_or_x509_entry expired_certificate, :issuer
 
@@ -531,8 +519,8 @@ module Gem::Security
   #
   # Returns the newly signed certificate.
 
-  def self.sign(certificate, signing_key, signing_cert,
-                age = ONE_YEAR, extensions = EXTENSIONS, serial = 1)
+  def self.sign certificate, signing_key, signing_cert,
+                age = ONE_YEAR, extensions = EXTENSIONS, serial = 1
     signee_subject = certificate.subject
     signee_key     = certificate.public_key
 
@@ -571,7 +559,7 @@ module Gem::Security
   ##
   # Enumerates the trusted certificates via Gem::Security::TrustDir.
 
-  def self.trusted_certificates(&block)
+  def self.trusted_certificates &block
     trust_dir.each_certificate(&block)
   end
 
@@ -580,10 +568,10 @@ module Gem::Security
   # +permissions+. If passed +cipher+ and +passphrase+ those arguments will be
   # passed to +to_pem+.
 
-  def self.write(pemmable, path, permissions = 0600, passphrase = nil, cipher = KEY_CIPHER)
+  def self.write pemmable, path, permissions = 0600, passphrase = nil, cipher = KEY_CIPHER
     path = File.expand_path path
 
-    File.open path, 'wb', permissions do |io|
+    open path, 'wb', permissions do |io|
       if passphrase and cipher
         io.write pemmable.to_pem cipher, passphrase
       else
@@ -598,10 +586,11 @@ module Gem::Security
 
 end
 
-if defined?(OpenSSL::SSL)
+if defined?(OpenSSL::SSL) then
   require 'rubygems/security/policy'
   require 'rubygems/security/policies'
   require 'rubygems/security/trust_dir'
 end
 
 require 'rubygems/security/signer'
+
diff --git a/lib/rubygems/security/policies.rb b/lib/rubygems/security/policies.rb
index 8f6ad99316..f16c46306a 100644
--- a/lib/rubygems/security/policies.rb
+++ b/lib/rubygems/security/policies.rb
@@ -110,6 +110,7 @@ module Gem::Security
     'MediumSecurity'   => MediumSecurity,
     'HighSecurity'     => HighSecurity,
     # SigningPolicy is not intended for use by `gem -P` so do not list it
-  }.freeze
+  }
 
 end
+
diff --git a/lib/rubygems/security/policy.rb b/lib/rubygems/security/policy.rb
index 1aa6eab18c..f43e6c8c96 100644
--- a/lib/rubygems/security/policy.rb
+++ b/lib/rubygems/security/policy.rb
@@ -24,7 +24,7 @@ class Gem::Security::Policy
   # Create a new Gem::Security::Policy object with the given mode and
   # options.
 
-  def initialize(name, policy = {}, opt = {})
+  def initialize name, policy = {}, opt = {}
     require 'openssl'
 
     @name = name
@@ -55,7 +55,7 @@ class Gem::Security::Policy
   # Verifies each certificate in +chain+ has signed the following certificate
   # and is valid for the given +time+.
 
-  def check_chain(chain, time)
+  def check_chain chain, time
     raise Gem::Security::Exception, 'missing signing chain' unless chain
     raise Gem::Security::Exception, 'empty signing chain' if chain.empty?
 
@@ -74,7 +74,7 @@ class Gem::Security::Policy
   # Verifies that +data+ matches the +signature+ created by +public_key+ and
   # the +digest+ algorithm.
 
-  def check_data(public_key, digest, signature, data)
+  def check_data public_key, digest, signature, data
     raise Gem::Security::Exception, "invalid signature" unless
       public_key.verify digest.new, signature, data.digest
 
@@ -85,22 +85,22 @@ class Gem::Security::Policy
   # Ensures that +signer+ is valid for +time+ and was signed by the +issuer+.
   # If the +issuer+ is +nil+ no verification is performed.
 
-  def check_cert(signer, issuer, time)
+  def check_cert signer, issuer, time
     raise Gem::Security::Exception, 'missing signing certificate' unless
       signer
 
     message = "certificate #{signer.subject}"
 
-    if not_before = signer.not_before and not_before > time
+    if not_before = signer.not_before and not_before > time then
       raise Gem::Security::Exception,
             "#{message} not valid before #{not_before}"
     end
 
-    if not_after = signer.not_after and not_after < time
+    if not_after = signer.not_after and not_after < time then
       raise Gem::Security::Exception, "#{message} not valid after #{not_after}"
     end
 
-    if issuer and not signer.verify issuer.public_key
+    if issuer and not signer.verify issuer.public_key then
       raise Gem::Security::Exception,
             "#{message} was not issued by #{issuer.subject}"
     end
@@ -111,8 +111,8 @@ class Gem::Security::Policy
   ##
   # Ensures the public key of +key+ matches the public key in +signer+
 
-  def check_key(signer, key)
-    unless signer and key
+  def check_key signer, key
+    unless signer and key then
       return true unless @only_signed
 
       raise Gem::Security::Exception, 'missing key or signature'
@@ -129,7 +129,7 @@ class Gem::Security::Policy
   # Ensures the root certificate in +chain+ is self-signed and valid for
   # +time+.
 
-  def check_root(chain, time)
+  def check_root chain, time
     raise Gem::Security::Exception, 'missing signing chain' unless chain
 
     root = chain.first
@@ -148,7 +148,7 @@ class Gem::Security::Policy
   # Ensures the root of +chain+ has a trusted certificate in +trust_dir+ and
   # the digests of the two certificates match according to +digester+
 
-  def check_trust(chain, digester, trust_dir)
+  def check_trust chain, digester, trust_dir
     raise Gem::Security::Exception, 'missing signing chain' unless chain
 
     root = chain.first
@@ -157,7 +157,7 @@ class Gem::Security::Policy
 
     path = Gem::Security.trust_dir.cert_path root
 
-    unless File.exist? path
+    unless File.exist? path then
       message = "root cert #{root.subject} is not trusted".dup
 
       message << " (root of signing cert #{chain.last.subject})" if
@@ -183,7 +183,7 @@ class Gem::Security::Policy
   ##
   # Extracts the email or subject from +certificate+
 
-  def subject(certificate) # :nodoc:
+  def subject certificate # :nodoc:
     certificate.extensions.each do |extension|
       next unless extension.oid == 'subjectAltName'
 
@@ -196,9 +196,9 @@ class Gem::Security::Policy
   def inspect # :nodoc:
     ("[Policy: %s - data: %p signer: %p chain: %p root: %p " +
      "signed-only: %p trusted-only: %p]") % [
-       @name, @verify_chain, @verify_data, @verify_root, @verify_signer,
-       @only_signed, @only_trusted,
-     ]
+      @name, @verify_chain, @verify_data, @verify_root, @verify_signer,
+      @only_signed, @only_trusted,
+    ]
   end
 
   ##
@@ -208,13 +208,13 @@ class Gem::Security::Policy
   #
   # If +key+ is given it is used to validate the signing certificate.
 
-  def verify(chain, key = nil, digests = {}, signatures = {},
-             full_name = '(unknown)')
-    if signatures.empty?
-      if @only_signed
+  def verify chain, key = nil, digests = {}, signatures = {},
+             full_name = '(unknown)'
+    if signatures.empty? then
+      if @only_signed then
         raise Gem::Security::Exception,
           "unsigned gems are not allowed by the #{name} policy"
-      elsif digests.empty?
+      elsif digests.empty? then
         # lack of signatures is irrelevant if there is nothing to check
         # against
       else
@@ -232,7 +232,7 @@ class Gem::Security::Policy
       file_digests.values.first.name == Gem::Security::DIGEST_NAME
     end
 
-    if @verify_data
+    if @verify_data then
       raise Gem::Security::Exception, 'no digests provided (probable bug)' if
         signer_digests.nil? or signer_digests.empty?
     else
@@ -249,9 +249,9 @@ class Gem::Security::Policy
 
     check_root chain, time if @verify_root
 
-    if @only_trusted
+    if @only_trusted then
       check_trust chain, digester, trust_dir
-    elsif signatures.empty? and digests.empty?
+    elsif signatures.empty? and digests.empty? then
       # trust is irrelevant if there's no signatures to verify
     else
       alert_warning "#{subject signer} is not trusted for #{full_name}"
@@ -280,7 +280,7 @@ class Gem::Security::Policy
   # Extracts the certificate chain from the +spec+ and calls #verify to ensure
   # the signatures and certificate chain is valid according to the policy..
 
-  def verify_signatures(spec, digests, signatures)
+  def verify_signatures spec, digests, signatures
     chain = spec.cert_chain.map do |cert_pem|
       OpenSSL::X509::Certificate.new cert_pem
     end
diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb
index 34e86e921a..0c6ef60a9a 100644
--- a/lib/rubygems/security/signer.rb
+++ b/lib/rubygems/security/signer.rb
@@ -2,12 +2,8 @@
 ##
 # Basic OpenSSL-based package signing class.
 
-require "rubygems/user_interaction"
-
 class Gem::Security::Signer
 
-  include Gem::UserInteraction
-
   ##
   # The chain of certificates for signing including the signing certificate
 
@@ -30,53 +26,20 @@ class Gem::Security::Signer
   attr_reader :digest_name # :nodoc:
 
   ##
-  # Gem::Security::Signer options
-
-  attr_reader :options
-
-  DEFAULT_OPTIONS = {
-    expiration_length_days: 365
-  }.freeze
-
-  ##
-  # Attemps to re-sign an expired cert with a given private key
-  def self.re_sign_cert(expired_cert, expired_cert_path, private_key)
-    return unless expired_cert.not_after < Time.now
-
-    expiry = expired_cert.not_after.strftime('%Y%m%d%H%M%S')
-    expired_cert_file = "#{File.basename(expired_cert_path)}.expired.#{expiry}"
-    new_expired_cert_path = File.join(Gem.user_home, ".gem", expired_cert_file)
-
-    Gem::Security.write(expired_cert, new_expired_cert_path)
-
-    re_signed_cert = Gem::Security.re_sign(
-      expired_cert,
-      private_key,
-      (Gem::Security::ONE_DAY * Gem.configuration.cert_expiration_length_days)
-    )
-
-    Gem::Security.write(re_signed_cert, expired_cert_path)
-
-    yield(expired_cert_path, new_expired_cert_path) if block_given?
-  end
-
-  ##
   # Creates a new signer with an RSA +key+ or path to a key, and a certificate
   # +chain+ containing X509 certificates, encoding certificates or paths to
   # certificates.
 
-  def initialize(key, cert_chain, passphrase = nil, options = {})
+  def initialize key, cert_chain, passphrase = nil
     @cert_chain = cert_chain
     @key        = key
-    @passphrase = passphrase
-    @options = DEFAULT_OPTIONS.merge(options)
 
-    unless @key
+    unless @key then
       default_key  = File.join Gem.default_key_path
       @key = default_key if File.exist? default_key
     end
 
-    unless @cert_chain
+    unless @cert_chain then
       default_cert = File.join Gem.default_cert_path
       @cert_chain = [default_cert] if File.exist? default_cert
     end
@@ -84,12 +47,10 @@ class Gem::Security::Signer
     @digest_algorithm = Gem::Security::DIGEST_ALGORITHM
     @digest_name      = Gem::Security::DIGEST_NAME
 
-    if @key && !@key.is_a?(OpenSSL::PKey::RSA)
-      @passphrase ||= ask_for_password("Enter PEM pass phrase:")
-      @key = OpenSSL::PKey::RSA.new(File.read(@key), @passphrase)
-    end
+    @key = OpenSSL::PKey::RSA.new File.read(@key), passphrase if
+      @key and not OpenSSL::PKey::RSA === @key
 
-    if @cert_chain
+    if @cert_chain then
       @cert_chain = @cert_chain.compact.map do |cert|
         next cert if OpenSSL::X509::Certificate === cert
 
@@ -106,10 +67,10 @@ class Gem::Security::Signer
   # Extracts the full name of +cert+.  If the certificate has a subjectAltName
   # this value is preferred, otherwise the subject is used.
 
-  def extract_name(cert) # :nodoc:
+  def extract_name cert # :nodoc:
     subject_alt_name = cert.extensions.find { |e| 'subjectAltName' == e.oid }
 
-    if subject_alt_name
+    if subject_alt_name then
       /\Aemail:/ =~ subject_alt_name.value
 
       $' || subject_alt_name.value
@@ -138,15 +99,13 @@ class Gem::Security::Signer
   ##
   # Sign data with given digest algorithm
 
-  def sign(data)
+  def sign data
     return unless @key
 
     raise Gem::Security::Exception, 'no certs provided' if @cert_chain.empty?
 
-    if @cert_chain.length == 1 and @cert_chain.last.not_after < Time.now
-      re_sign_key(
-        expiration_length: (Gem::Security::ONE_DAY * options[:expiration_length_days])
-      )
+    if @cert_chain.length == 1 and @cert_chain.last.not_after < Time.now then
+      re_sign_key
     end
 
     full_name = extract_name @cert_chain.last
@@ -162,7 +121,6 @@ class Gem::Security::Signer
   # The key will be re-signed if:
   # * The expired certificate is self-signed
   # * The expired certificate is saved at ~/.gem/gem-public_cert.pem
-  #   and the private key is saved at ~/.gem/gem-private_key.pem
   # * There is no file matching the expiry date at
   #   ~/.gem/gem-public_cert.pem.expired.%Y%m%d%H%M%S
   #
@@ -170,32 +128,25 @@ class Gem::Security::Signer
   # be saved as ~/.gem/gem-public_cert.pem.expired.%Y%m%d%H%M%S where the
   # expiry time (not after) is used for the timestamp.
 
-  def re_sign_key(expiration_length: Gem::Security::ONE_YEAR) # :nodoc:
+  def re_sign_key # :nodoc:
     old_cert = @cert_chain.last
 
-    disk_cert_path = File.join(Gem.default_cert_path)
-    disk_cert = File.read(disk_cert_path) rescue nil
+    disk_cert_path = File.join Gem.default_cert_path
+    disk_cert = File.read disk_cert_path rescue nil
+    disk_key  =
+      File.read File.join(Gem.default_key_path) rescue nil
 
-    disk_key_path = File.join(Gem.default_key_path)
-    disk_key =
-      OpenSSL::PKey::RSA.new(File.read(disk_key_path), @passphrase) rescue nil
-
-    return unless disk_key
-
-    if disk_key.to_pem == @key.to_pem && disk_cert == old_cert.to_pem
-      expiry = old_cert.not_after.strftime('%Y%m%d%H%M%S')
+    if disk_key == @key.to_pem and disk_cert == old_cert.to_pem then
+      expiry = old_cert.not_after.strftime '%Y%m%d%H%M%S'
       old_cert_file = "gem-public_cert.pem.expired.#{expiry}"
-      old_cert_path = File.join(Gem.user_home, ".gem", old_cert_file)
+      old_cert_path = File.join Gem.user_home, ".gem", old_cert_file
 
-      unless File.exist?(old_cert_path)
-        Gem::Security.write(old_cert, old_cert_path)
+      unless File.exist? old_cert_path then
+        Gem::Security.write old_cert, old_cert_path
 
-        cert = Gem::Security.re_sign(old_cert, @key, expiration_length)
+        cert = Gem::Security.re_sign old_cert, @key
 
-        Gem::Security.write(cert, disk_cert_path)
-
-        alert("Your cert: #{disk_cert_path} has been auto re-signed with the key: #{disk_key_path}")
-        alert("Your expired cert will be located at: #{old_cert_path}")
+        Gem::Security.write cert, disk_cert_path
 
         @cert_chain = [cert]
       end
@@ -203,3 +154,4 @@ class Gem::Security::Signer
   end
 
 end
+
diff --git a/lib/rubygems/security/trust_dir.rb b/lib/rubygems/security/trust_dir.rb
index 98031ea22b..bf44975cc6 100644
--- a/lib/rubygems/security/trust_dir.rb
+++ b/lib/rubygems/security/trust_dir.rb
@@ -11,7 +11,7 @@ class Gem::Security::TrustDir
   DEFAULT_PERMISSIONS = {
     :trust_dir    => 0700,
     :trusted_cert => 0600,
-  }.freeze
+  }
 
   ##
   # The directory where trusted certificates will be stored.
@@ -22,7 +22,7 @@ class Gem::Security::TrustDir
   # Creates a new TrustDir using +dir+ where the directory and file
   # permissions will be checked according to +permissions+
 
-  def initialize(dir, permissions = DEFAULT_PERMISSIONS)
+  def initialize dir, permissions = DEFAULT_PERMISSIONS
     @dir = dir
     @permissions = permissions
 
@@ -32,7 +32,7 @@ class Gem::Security::TrustDir
   ##
   # Returns the path to the trusted +certificate+
 
-  def cert_path(certificate)
+  def cert_path certificate
     name_path certificate.subject
   end
 
@@ -59,7 +59,7 @@ class Gem::Security::TrustDir
   # Returns the issuer certificate of the given +certificate+ if it exists in
   # the trust directory.
 
-  def issuer_of(certificate)
+  def issuer_of certificate
     path = name_path certificate.issuer
 
     return unless File.exist? path
@@ -70,7 +70,7 @@ class Gem::Security::TrustDir
   ##
   # Returns the path to the trusted certificate with the given ASN.1 +name+
 
-  def name_path(name)
+  def name_path name
     digest = @digester.hexdigest name.to_s
 
     File.join @dir, "cert-#{digest}.pem"
@@ -79,7 +79,7 @@ class Gem::Security::TrustDir
   ##
   # Loads the given +certificate_file+
 
-  def load_certificate(certificate_file)
+  def load_certificate certificate_file
     pem = File.read certificate_file
 
     OpenSSL::X509::Certificate.new pem
@@ -88,14 +88,13 @@ class Gem::Security::TrustDir
   ##
   # Add a certificate to trusted certificate list.
 
-  def trust_cert(certificate)
+  def trust_cert certificate
     verify
 
     destination = cert_path certificate
 
-    File.open destination, 'wb', 0600 do |io|
+    open destination, 'wb', @permissions[:trusted_cert] do |io|
       io.write certificate.to_pem
-      io.chmod(@permissions[:trusted_cert])
     end
   end
 
@@ -105,7 +104,7 @@ class Gem::Security::TrustDir
   # permissions.
 
   def verify
-    if File.exist? @dir
+    if File.exist? @dir then
       raise Gem::Security::Exception,
         "trust directory #{@dir} is not a directory" unless
           File.directory? @dir
@@ -117,3 +116,4 @@ class Gem::Security::TrustDir
   end
 
 end
+
diff --git a/lib/rubygems/security_option.rb b/lib/rubygems/security_option.rb
deleted file mode 100644
index 4e3473acb4..0000000000
--- a/lib/rubygems/security_option.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-# forward-declare
-
-module Gem::Security # :nodoc:
-  class Policy # :nodoc:
-  end
-end
-
-##
-# Mixin methods for security option for Gem::Commands
-
-module Gem::SecurityOption
-  def add_security_option
-    # TODO: use @parser.accept
-    OptionParser.accept Gem::Security::Policy do |value|
-      require 'rubygems/security'
-
-      raise OptionParser::InvalidArgument, 'OpenSSL not installed' unless
-        defined?(Gem::Security::HighSecurity)
-
-      policy = Gem::Security::Policies[value]
-      unless policy
-        valid = Gem::Security::Policies.keys.sort
-        raise OptionParser::InvalidArgument, "#{value} (#{valid.join ', '} are valid)"
-      end
-      policy
-    end
-
-    add_option(:"Install/Update", '-P', '--trust-policy POLICY',
-               Gem::Security::Policy,
-               'Specify gem trust policy') do |value, options|
-      options[:security_policy] = value
-    end
-  end
-end
diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb
index 1453bf2323..63dfe31b35 100644
--- a/lib/rubygems/server.rb
+++ b/lib/rubygems/server.rb
@@ -2,7 +2,6 @@
 require 'webrick'
 require 'zlib'
 require 'erb'
-require 'uri'
 
 require 'rubygems'
 require 'rubygems/rdoc'
@@ -35,7 +34,7 @@ class Gem::Server
   include ERB::Util
   include Gem::UserInteraction
 
-  SEARCH = <<-ERB.freeze
+  SEARCH = <<-ERB
       <form class="headerSearch" name="headerSearchForm" method="get" action="/rdoc">
         <div id="search" style="float:right">
           <label for="q">Filter/Search</label>
@@ -45,7 +44,7 @@ class Gem::Server
       </form>
   ERB
 
-  DOC_TEMPLATE = <<-'ERB'.freeze
+  DOC_TEMPLATE = <<-'ERB'
   <?xml version="1.0" encoding="iso-8859-1"?>
   <!DOCTYPE html
        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -69,7 +68,7 @@ class Gem::Server
         <h1>Summary</h1>
   <p>There are <%=values["gem_count"]%> gems installed:</p>
   <p>
-  <%= values["specs"].map { |v| "<a href=\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
+  <%= values["specs"].map { |v| "<a href\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
   <h1>Gems</h1>
 
   <dl>
@@ -82,20 +81,20 @@ class Gem::Server
     <b><%=h spec["name"]%> <%=h spec["version"]%></b>
 
     <% if spec["ri_installed"] || spec["rdoc_installed"] then %>
-      <a href="<%=spec["doc_path"]%>">[rdoc]</a>
+      <a href="<%=u spec["doc_path"]%>">[rdoc]</a>
     <% else %>
       <span title="rdoc not installed">[rdoc]</span>
     <% end %>
 
     <% if spec["homepage"] then %>
-      <a href="<%=uri_encode spec["homepage"]%>" title="<%=h spec["homepage"]%>">[www]</a>
+      <a href="<%=u spec["homepage"]%>" title="<%=h spec["homepage"]%>">[www]</a>
     <% else %>
       <span title="no homepage available">[www]</span>
     <% end %>
 
     <% if spec["has_deps"] then %>
      - depends on
-      <%= spec["dependencies"].map { |v| "<a href=\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
+      <%= spec["dependencies"].map { |v| "<a href=\"##{u v["name"]}>#{h v["name"]}</a>" }.join ', ' %>.
     <% end %>
     </dt>
     <dd>
@@ -129,7 +128,7 @@ class Gem::Server
   ERB
 
   # CSS is copy & paste from rdoc-style.css, RDoc V1.0.1 - 20041108
-  RDOC_CSS = <<-CSS.freeze
+  RDOC_CSS = <<-CSS
 body {
     font-family: Verdana,Arial,Helvetica,sans-serif;
     font-size:   90%;
@@ -339,7 +338,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 .ruby-value   { color: #7fffd4; background: transparent; }
   CSS
 
-  RDOC_NO_DOCUMENTATION = <<-'ERB'.freeze
+  RDOC_NO_DOCUMENTATION = <<-'ERB'
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -373,7 +372,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 </html>
   ERB
 
-  RDOC_SEARCH_TEMPLATE = <<-'ERB'.freeze
+  RDOC_SEARCH_TEMPLATE = <<-'ERB'
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -450,20 +449,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     @have_rdoc_4_plus = nil
   end
 
-  def add_date(res)
+  def add_date res
     res['date'] = @spec_dirs.map do |spec_dir|
       File.stat(spec_dir).mtime
     end.max
   end
 
-  def uri_encode(str)
-    str.gsub(URI::UNSAFE) do |match|
-      match.each_byte.map { |c| sprintf('%%%02X', c.ord) }.join
-    end
-  end
-
-  def doc_root(gem_name)
-    if have_rdoc_4_plus?
+  def doc_root gem_name
+    if have_rdoc_4_plus? then
       "/doc_root/#{u gem_name}/"
     else
       "/doc_root/#{u gem_name}/rdoc/index.html"
@@ -491,14 +484,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 
     specs = Marshal.dump specs
 
-    if req.path =~ /\.gz$/
-      specs = Gem::Util.gzip specs
+    if req.path =~ /\.gz$/ then
+      specs = Gem.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
 
-    if req.request_method == 'HEAD'
+    if req.request_method == 'HEAD' then
       res['content-length'] = specs.length
     else
       res.body << specs
@@ -509,7 +502,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   # Creates server sockets based on the addresses option.  If no addresses
   # were given a server socket for all interfaces is created.
 
-  def listen(addresses = @addresses)
+  def listen addresses = @addresses
     addresses = [nil] unless addresses
 
     listeners = 0
@@ -529,14 +522,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       end
     end
 
-    if @server.listeners.empty?
+    if @server.listeners.empty? then
       say "Unable to start a server."
       say "Check for running servers or your --bind and --port arguments"
       terminate_interaction 1
     end
   end
 
-  def prerelease_specs(req, res)
+  def prerelease_specs req, res
     reset_gems
 
     res['content-type'] = 'application/x-gzip'
@@ -552,14 +545,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 
     specs = Marshal.dump specs
 
-    if req.path =~ /\.gz$/
-      specs = Gem::Util.gzip specs
+    if req.path =~ /\.gz$/ then
+      specs = Gem.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
 
-    if req.request_method == 'HEAD'
+    if req.request_method == 'HEAD' then
       res['content-length'] = specs.length
     else
       res.body << specs
@@ -573,19 +566,27 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     add_date res
 
     case req.request_uri.path
-    when %r|^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)\.gemspec\.rz$| then
-      marshal_format, full_name = $1, $2
-      specs = Gem::Specification.find_all_by_full_name(full_name)
+    when %r|^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)-([0-9.]+[^-]*?)(-.*?)?\.gemspec\.rz$| then
+      marshal_format, name, version, platform = $1, $2, $3, $4
+      specs = Gem::Specification.find_all_by_name name, version
+
+      selector = [name, version, platform].map(&:inspect).join ' '
+
+      platform = if platform then
+                   Gem::Platform.new platform.sub(/^-/, '')
+                 else
+                   Gem::Platform::RUBY
+                 end
 
-      selector = full_name.inspect
+      specs = specs.select { |s| s.platform == platform }
 
-      if specs.empty?
+      if specs.empty? then
         res.status = 404
         res.body = "No gems found matching #{selector}"
-      elsif specs.length > 1
+      elsif specs.length > 1 then
         res.status = 500
         res.body = "Multiple gems found matching #{selector}"
-      elsif marshal_format
+      elsif marshal_format then
         res['content-type'] = 'application/x-deflate'
         res.body << Gem.deflate(Marshal.dump(specs.first))
       end
@@ -623,18 +624,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       executables = nil if executables.empty?
       executables.last["is_last"] = true if executables
 
-      # Pre-process spec homepage for safety reasons
-      begin
-        homepage_uri = URI.parse(spec.homepage)
-        if [URI::HTTP, URI::HTTPS].member? homepage_uri.class
-          homepage_uri = spec.homepage
-        else
-          homepage_uri = "."
-        end
-      rescue URI::InvalidURIError
-        homepage_uri = "."
-      end
-
       specs << {
         "authors"             => spec.authors.sort.join(", "),
         "date"                => spec.date.to_s,
@@ -644,7 +633,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
         "only_one_executable" => (executables && executables.size == 1),
         "full_name"           => spec.full_name,
         "has_deps"            => !deps.empty?,
-        "homepage"            => homepage_uri,
+        "homepage"            => spec.homepage,
         "name"                => spec.name,
         "rdoc_installed"      => Gem::RDoc.new(spec).rdoc_installed?,
         "ri_installed"        => Gem::RDoc.new(spec).ri_installed?,
@@ -661,7 +650,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       "only_one_executable" => true,
       "full_name" => "rubygems-#{Gem::VERSION}",
       "has_deps" => false,
-      "homepage" => "http://guides.rubygems.org/",
+      "homepage" => "http://docs.rubygems.org/",
       "name" => 'rubygems',
       "ri_installed" => true,
       "summary" => "RubyGems itself",
@@ -818,7 +807,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       '/gems' => '/cache/',
     }
 
-    if have_rdoc_4_plus?
+    if have_rdoc_4_plus? then
       @server.mount '/doc_root', RDoc::Servlet, '/doc_root'
     else
       file_handlers['/doc_root'] = '/doc/'
@@ -851,14 +840,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 
     specs = Marshal.dump specs
 
-    if req.path =~ /\.gz$/
-      specs = Gem::Util.gzip specs
+    if req.path =~ /\.gz$/ then
+      specs = Gem.gzip specs
       res['content-type'] = 'application/x-gzip'
     else
       res['content-type'] = 'application/octet-stream'
     end
 
-    if req.request_method == 'HEAD'
+    if req.request_method == 'HEAD' then
       res['content-length'] = specs.length
     else
       res.body << specs
diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb
index faed7bd350..85f5268fa3 100644
--- a/lib/rubygems/source.rb
+++ b/lib/rubygems/source.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-autoload :FileUtils, 'fileutils'
-autoload :URI, 'uri'
+require 'uri'
+require 'fileutils'
 
 ##
 # A Source knows how to list and fetch gems from a RubyGems marshal index.
@@ -16,7 +16,7 @@ class Gem::Source
     :released   => 'specs',
     :latest     => 'latest_specs',
     :prerelease => 'prerelease_specs',
-  }.freeze
+  }
 
   ##
   # The URI this source will fetch gems from.
@@ -36,6 +36,15 @@ class Gem::Source
     end
 
     @uri = uri
+    @api_uri = nil
+  end
+
+  ##
+  # Use an SRV record on the host to look up the true endpoint for the index.
+
+  def api_uri # :nodoc:
+    require 'rubygems/remote_fetcher'
+    @api_uri ||= Gem::RemoteFetcher.fetcher.api_endpoint uri
   end
 
   ##
@@ -58,17 +67,13 @@ class Gem::Source
 
       return -1 if !other.uri
 
-      # Returning 1 here ensures that when sorting a list of sources, the
-      # original ordering of sources supplied by the user is preserved.
-      return 1 unless @uri.to_s == other.uri.to_s
-
-      0
+      @uri.to_s <=> other.uri.to_s
     else
       nil
     end
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other and @uri == other.uri
   end
 
@@ -78,9 +83,9 @@ class Gem::Source
   # Returns a Set that can fetch specifications from this source.
 
   def dependency_resolver_set # :nodoc:
-    return Gem::Resolver::IndexSet.new self if 'file' == uri.scheme
+    return Gem::Resolver::IndexSet.new self if 'file' == api_uri.scheme
 
-    bundler_api_uri = uri + './api/v1/dependencies'
+    bundler_api_uri = api_uri + './api/v1/dependencies'
 
     begin
       fetcher = Gem::RemoteFetcher.fetcher
@@ -88,7 +93,7 @@ class Gem::Source
     rescue Gem::RemoteFetcher::FetchError
       Gem::Resolver::IndexSet.new self
     else
-      if response.respond_to? :uri
+      if response.respond_to? :uri then
         Gem::Resolver::APISet.new response.uri
       else
         Gem::Resolver::APISet.new bundler_api_uri
@@ -126,32 +131,32 @@ class Gem::Source
   ##
   # Fetches a specification for the given +name_tuple+.
 
-  def fetch_spec(name_tuple)
+  def fetch_spec name_tuple
     fetcher = Gem::RemoteFetcher.fetcher
 
     spec_file_name = name_tuple.spec_name
 
-    source_uri = uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
+    uri = api_uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
 
-    cache_dir = cache_dir source_uri
+    cache_dir = cache_dir uri
 
     local_spec = File.join cache_dir, spec_file_name
 
-    if File.exist? local_spec
+    if File.exist? local_spec then
       spec = Gem.read_binary local_spec
       spec = Marshal.load(spec) rescue nil
       return spec if spec
     end
 
-    source_uri.path << '.rz'
+    uri.path << '.rz'
 
-    spec = fetcher.fetch_path source_uri
-    spec = Gem::Util.inflate spec
+    spec = fetcher.fetch_path uri
+    spec = Gem.inflate spec
 
-    if update_cache?
+    if update_cache? then
       FileUtils.mkdir_p cache_dir
 
-      File.open local_spec, 'wb' do |io|
+      open local_spec, 'wb' do |io|
         io.write spec
       end
     end
@@ -175,7 +180,7 @@ class Gem::Source
     file       = FILES[type]
     fetcher    = Gem::RemoteFetcher.fetcher
     file_name  = "#{file}.#{Gem.marshal_version}"
-    spec_path  = uri + "#{file_name}.gz"
+    spec_path  = api_uri + "#{file_name}.gz"
     cache_dir  = cache_dir spec_path
     local_file = File.join(cache_dir, file_name)
     retried    = false
@@ -203,15 +208,15 @@ class Gem::Source
 
   def download(spec, dir=Dir.pwd)
     fetcher = Gem::RemoteFetcher.fetcher
-    fetcher.download spec, uri.to_s, dir
+    fetcher.download spec, api_uri.to_s, dir
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Remote:', ']' do
       q.breakable
       q.text @uri.to_s
 
-      if api = uri
+      if api = api_uri
         q.breakable
         q.text 'API URI: '
         q.text api.to_s
@@ -227,3 +232,4 @@ require 'rubygems/source/specific_file'
 require 'rubygems/source/local'
 require 'rubygems/source/lock'
 require 'rubygems/source/vendor'
+
diff --git a/lib/rubygems/source/git.rb b/lib/rubygems/source/git.rb
index 0b8a4339cc..0900da0cbc 100644
--- a/lib/rubygems/source/git.rb
+++ b/lib/rubygems/source/git.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'digest'
 require 'rubygems/util'
 
 ##
@@ -50,7 +51,7 @@ class Gem::Source::Git < Gem::Source
   # repository may contain multiple gems.  If +submodules+ is true, submodules
   # will be checked out when the gem is installed.
 
-  def initialize(name, repository, reference, submodules = false)
+  def initialize name, repository, reference, submodules = false
     super repository
 
     @name            = name
@@ -63,7 +64,7 @@ class Gem::Source::Git < Gem::Source
     @git      = ENV['git'] || 'git'
   end
 
-  def <=>(other)
+  def <=> other
     case other
     when Gem::Source::Git then
       0
@@ -77,7 +78,7 @@ class Gem::Source::Git < Gem::Source
     end
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     super and
       @name            == other.name and
       @repository      == other.repository and
@@ -93,7 +94,7 @@ class Gem::Source::Git < Gem::Source
 
     return false unless File.exist? repo_cache_dir
 
-    unless File.exist? install_dir
+    unless File.exist? install_dir then
       system @git, 'clone', '--quiet', '--no-checkout',
              repo_cache_dir, install_dir
     end
@@ -117,7 +118,7 @@ class Gem::Source::Git < Gem::Source
   def cache # :nodoc:
     return unless @remote
 
-    if File.exist? repo_cache_dir
+    if File.exist? repo_cache_dir then
       Dir.chdir repo_cache_dir do
         system @git, 'fetch', '--quiet', '--force', '--tags',
                @repository, 'refs/heads/*:refs/heads/*'
@@ -145,7 +146,7 @@ class Gem::Source::Git < Gem::Source
   ##
   # Nothing to download for git gems
 
-  def download(full_spec, path) # :nodoc:
+  def download full_spec, path # :nodoc:
   end
 
   ##
@@ -157,7 +158,7 @@ class Gem::Source::Git < Gem::Source
     File.join base_dir, 'gems', "#{@name}-#{dir_shortref}"
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Git: ', ']' do
       q.breakable
       q.text @repository
@@ -206,7 +207,7 @@ class Gem::Source::Git < Gem::Source
 
         Dir.chdir directory do
           spec = Gem::Specification.load file
-          if spec
+          if spec then
             spec.base_dir = base_dir
 
             spec.extension_dir =
@@ -225,10 +226,8 @@ class Gem::Source::Git < Gem::Source
   # A hash for the git gem based on the git repository URI.
 
   def uri_hash # :nodoc:
-    require 'digest' # required here to avoid deadlocking in Gem.activate_bin_path (because digest is a gem on 2.5+)
-
     normalized =
-      if @repository =~ %r%^\w+://(\w+@)?%
+      if @repository =~ %r%^\w+://(\w+@)?% then
         uri = URI(@repository).normalize.to_s.sub %r%/$%,''
         uri.sub(/\A(\w+)/) { $1.downcase }
       else
@@ -239,3 +238,4 @@ class Gem::Source::Git < Gem::Source
   end
 
 end
+
diff --git a/lib/rubygems/source/installed.rb b/lib/rubygems/source/installed.rb
index 8e20cbd76d..300491e467 100644
--- a/lib/rubygems/source/installed.rb
+++ b/lib/rubygems/source/installed.rb
@@ -11,7 +11,7 @@ class Gem::Source::Installed < Gem::Source
   ##
   # Installed sources sort before all other sources
 
-  def <=>(other)
+  def <=> other
     case other
     when Gem::Source::Git,
          Gem::Source::Lock,
@@ -29,12 +29,13 @@ class Gem::Source::Installed < Gem::Source
   ##
   # We don't need to download an installed gem
 
-  def download(spec, path)
+  def download spec, path
     nil
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.text '[Installed]'
   end
 
 end
+
diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb
index 875e992d85..3227fb61b0 100644
--- a/lib/rubygems/source/local.rb
+++ b/lib/rubygems/source/local.rb
@@ -9,13 +9,12 @@ class Gem::Source::Local < Gem::Source
     @specs   = nil
     @api_uri = nil
     @uri     = nil
-    @load_specs_names = {}
   end
 
   ##
   # Local sorts before Gem::Source and after Gem::Source::Installed
 
-  def <=>(other)
+  def <=> other
     case other
     when Gem::Source::Installed,
          Gem::Source::Lock then
@@ -34,52 +33,50 @@ class Gem::Source::Local < Gem::Source
     "#<%s specs: %p>" % [self.class, keys]
   end
 
-  def load_specs(type) # :nodoc:
-    @load_specs_names[type] ||= begin
-      names = []
+  def load_specs type # :nodoc:
+    names = []
 
-      @specs = {}
+    @specs = {}
 
-      Dir["*.gem"].each do |file|
-        begin
-          pkg = Gem::Package.new(file)
-        rescue SystemCallError, Gem::Package::FormatError
-          # ignore
-        else
-          tup = pkg.spec.name_tuple
-          @specs[tup] = [File.expand_path(file), pkg]
-
-          case type
-          when :released
-            unless pkg.spec.version.prerelease?
-              names << pkg.spec.name_tuple
-            end
-          when :prerelease
-            if pkg.spec.version.prerelease?
-              names << pkg.spec.name_tuple
-            end
-          when :latest
-            tup = pkg.spec.name_tuple
-
-            cur = names.find { |x| x.name == tup.name }
-            if !cur
-              names << tup
-            elsif cur.version < tup.version
-              names.delete cur
-              names << tup
-            end
-          else
+    Dir["*.gem"].each do |file|
+      begin
+        pkg = Gem::Package.new(file)
+      rescue SystemCallError, Gem::Package::FormatError
+        # ignore
+      else
+        tup = pkg.spec.name_tuple
+        @specs[tup] = [File.expand_path(file), pkg]
+
+        case type
+        when :released
+          unless pkg.spec.version.prerelease?
             names << pkg.spec.name_tuple
           end
+        when :prerelease
+          if pkg.spec.version.prerelease?
+            names << pkg.spec.name_tuple
+          end
+        when :latest
+          tup = pkg.spec.name_tuple
+
+          cur = names.find { |x| x.name == tup.name }
+          if !cur
+            names << tup
+          elsif cur.version < tup.version
+            names.delete cur
+            names << tup
+          end
+        else
+          names << pkg.spec.name_tuple
         end
       end
-
-      names
     end
+
+    names
   end
 
-  def find_gem(gem_name, version = Gem::Requirement.default, # :nodoc:
-               prerelease = false)
+  def find_gem gem_name, version = Gem::Requirement.default, # :nodoc:
+               prerelease = false
     load_specs :complete
 
     found = []
@@ -91,7 +88,7 @@ class Gem::Source::Local < Gem::Source
         if version.satisfied_by?(s.version)
           if prerelease
             found << s
-          elsif !s.version.prerelease? || version.prerelease?
+          elsif !s.version.prerelease?
             found << s
           end
         end
@@ -101,7 +98,7 @@ class Gem::Source::Local < Gem::Source
     found.max_by { |s| s.version }
   end
 
-  def fetch_spec(name) # :nodoc:
+  def fetch_spec name # :nodoc:
     load_specs :complete
 
     if data = @specs[name]
@@ -111,7 +108,7 @@ class Gem::Source::Local < Gem::Source
     end
   end
 
-  def download(spec, cache_dir = nil) # :nodoc:
+  def download spec, cache_dir = nil # :nodoc:
     load_specs :complete
 
     @specs.each do |name, data|
@@ -121,7 +118,7 @@ class Gem::Source::Local < Gem::Source
     raise Gem::Exception, "Unable to find file for '#{spec.full_name}'"
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[Local gems:', ']' do
       q.breakable
       q.seplist @specs.keys do |v|
diff --git a/lib/rubygems/source/lock.rb b/lib/rubygems/source/lock.rb
index 3b3f491750..86b16e964c 100644
--- a/lib/rubygems/source/lock.rb
+++ b/lib/rubygems/source/lock.rb
@@ -15,11 +15,11 @@ class Gem::Source::Lock < Gem::Source
   # Creates a new Lock source that wraps +source+ and moves it earlier in the
   # sort list.
 
-  def initialize(source)
+  def initialize source
     @wrapped = source
   end
 
-  def <=>(other) # :nodoc:
+  def <=> other # :nodoc:
     case other
     when Gem::Source::Lock then
       @wrapped <=> other.wrapped
@@ -30,18 +30,14 @@ class Gem::Source::Lock < Gem::Source
     end
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     0 == (self <=> other)
   end
 
-  def hash # :nodoc:
-    @wrapped.hash ^ 3
-  end
-
   ##
   # Delegates to the wrapped source's fetch_spec method.
 
-  def fetch_spec(name_tuple)
+  def fetch_spec name_tuple
     @wrapped.fetch_spec name_tuple
   end
 
@@ -50,3 +46,4 @@ class Gem::Source::Lock < Gem::Source
   end
 
 end
+
diff --git a/lib/rubygems/source/specific_file.rb b/lib/rubygems/source/specific_file.rb
index a22772b9c0..459c803e1a 100644
--- a/lib/rubygems/source/specific_file.rb
+++ b/lib/rubygems/source/specific_file.rb
@@ -27,22 +27,22 @@ class Gem::Source::SpecificFile < Gem::Source
 
   attr_reader :spec
 
-  def load_specs(*a) # :nodoc:
+  def load_specs *a # :nodoc:
     [@name]
   end
 
-  def fetch_spec(name) # :nodoc:
+  def fetch_spec name # :nodoc:
     return @spec if name == @name
     raise Gem::Exception, "Unable to find '#{name}'"
     @spec
   end
 
-  def download(spec, dir = nil) # :nodoc:
+  def download spec, dir = nil # :nodoc:
     return @path if spec == @spec
     raise Gem::Exception, "Unable to download '#{spec.full_name}'"
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[SpecificFile:', ']' do
       q.breakable
       q.text @path
@@ -59,7 +59,7 @@ class Gem::Source::SpecificFile < Gem::Source
   #
   # Otherwise Gem::Source#<=> is used.
 
-  def <=>(other)
+  def <=> other
     case other
     when Gem::Source::SpecificFile then
       return nil if @spec.name != other.spec.name
diff --git a/lib/rubygems/source/vendor.rb b/lib/rubygems/source/vendor.rb
index a87fa63331..e1b3698607 100644
--- a/lib/rubygems/source/vendor.rb
+++ b/lib/rubygems/source/vendor.rb
@@ -7,11 +7,11 @@ class Gem::Source::Vendor < Gem::Source::Installed
   ##
   # Creates a new Vendor source for a gem that was unpacked at +path+.
 
-  def initialize(path)
+  def initialize path
     @uri = path
   end
 
-  def <=>(other)
+  def <=> other
     case other
     when Gem::Source::Lock then
       -1
@@ -25,3 +25,4 @@ class Gem::Source::Vendor < Gem::Source::Installed
   end
 
 end
+
diff --git a/lib/rubygems/source_list.rb b/lib/rubygems/source_list.rb
index 83b689f78e..66ce4d57ed 100644
--- a/lib/rubygems/source_list.rb
+++ b/lib/rubygems/source_list.rb
@@ -105,7 +105,7 @@ class Gem::SourceList
     @sources.empty?
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     to_a == other
   end
 
@@ -140,7 +140,7 @@ class Gem::SourceList
   ##
   # Deletes +source+ from the source list which may be a Gem::Source or a URI.
 
-  def delete(source)
+  def delete source
     if source.kind_of? Gem::Source
       @sources.delete source
     else
diff --git a/lib/rubygems/source_local.rb b/lib/rubygems/source_local.rb
index 5107069fd0..07cb9e6e8f 100644
--- a/lib/rubygems/source_local.rb
+++ b/lib/rubygems/source_local.rb
@@ -2,6 +2,5 @@
 require 'rubygems/source'
 require 'rubygems/source_local'
 
-unless Gem::Deprecate.skip
-  Kernel.warn "#{Gem.location_of_caller(3).join(':')}: Warning: Requiring rubygems/source_local is deprecated; please use rubygems/source/local instead."
-end
+# TODO warn upon require, this file is deprecated.
+
diff --git a/lib/rubygems/source_specific_file.rb b/lib/rubygems/source_specific_file.rb
index b676b1d3a2..d42e6e7440 100644
--- a/lib/rubygems/source_specific_file.rb
+++ b/lib/rubygems/source_specific_file.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'rubygems/source/specific_file'
 
-unless Gem::Deprecate.skip
-  Kernel.warn "#{Gem.location_of_caller(3).join(':')}: Warning: Requiring rubygems/source_specific_file is deprecated; please use rubygems/source/specific_file instead."
-end
+# TODO warn upon require, this file is deprecated.
+
diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb
index ca901cb8bf..755d4be1eb 100644
--- a/lib/rubygems/spec_fetcher.rb
+++ b/lib/rubygems/spec_fetcher.rb
@@ -54,7 +54,7 @@ class Gem::SpecFetcher
   # If you need to retrieve specifications from a different +source+, you can
   # send it as an argument.
 
-  def initialize(sources = nil)
+  def initialize sources = nil
     @sources = sources || Gem.sources
 
     @update_cache =
@@ -184,10 +184,10 @@ class Gem::SpecFetcher
   # Suggests gems based on the supplied +gem_name+. Returns an array of
   # alternative gem names.
 
-  def suggest_gems_from_name(gem_name, type = :latest)
+  def suggest_gems_from_name gem_name
     gem_name        = gem_name.downcase.tr('_-', '')
     max             = gem_name.size / 2
-    names           = available_specs(type).first.values.flatten(1)
+    names           = available_specs(:latest).first.values.flatten(1)
 
     matches = names.map { |n|
       next unless n.match_platform?
@@ -201,11 +201,7 @@ class Gem::SpecFetcher
       [n.name, distance]
     }.compact
 
-    matches = if matches.empty? && type != :prerelease
-                suggest_gems_from_name gem_name, :prerelease
-              else
-                matches.uniq.sort_by { |name, dist| dist }
-              end
+    matches = matches.uniq.sort_by { |name, dist| dist }
 
     matches.first(5).map { |name, dist| name }
   end
@@ -271,3 +267,4 @@ class Gem::SpecFetcher
   end
 
 end
+
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index bba3ffeab5..bb912ce24c 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -13,7 +13,6 @@ require 'rubygems/platform'
 require 'rubygems/deprecate'
 require 'rubygems/basic_specification'
 require 'rubygems/stub_specification'
-require 'rubygems/specification_policy'
 require 'rubygems/util/list'
 require 'stringio'
 
@@ -31,7 +30,6 @@ require 'stringio'
 #     s.email       = 'rubycoder@example.com'
 #     s.files       = ["lib/example.rb"]
 #     s.homepage    = 'https://rubygems.org/gems/example'
-#     s.metadata    = { "source_code_uri" => "https://github.com/example/example" }
 #   end
 #
 # Starting in RubyGems 2.0, a Specification can hold arbitrary
@@ -40,8 +38,6 @@ require 'stringio'
 
 class Gem::Specification < Gem::BasicSpecification
 
-  extend Gem::Deprecate
-
   # REFACTOR: Consider breaking out this version stuff into a separate
   # module. There's enough special stuff around it that it may justify
   # a separate class.
@@ -89,13 +85,13 @@ class Gem::Specification < Gem::BasicSpecification
       'Added "required_rubygems_version"',
       'Now forward-compatible with future versions',
     ],
-    3  => [
-      'Added Fixnum validation to the specification_version'
+    3 => [
+       'Added Fixnum validation to the specification_version'
     ],
-    4  => [
+    4 => [
       'Added sandboxed freeform metadata to the specification version.'
     ]
-  }.freeze
+  }
 
   MARSHAL_FIELDS = { # :nodoc:
     -1 => 16,
@@ -103,19 +99,15 @@ class Gem::Specification < Gem::BasicSpecification
      2 => 16,
      3 => 17,
      4 => 18,
-  }.freeze
+  }
 
   today = Time.now.utc
   TODAY = Time.utc(today.year, today.month, today.day) # :nodoc:
 
-  # rubocop:disable Style/MutableConstant
   LOAD_CACHE = {} # :nodoc:
-  # rubocop:enable Style/MutableConstant
 
   private_constant :LOAD_CACHE if defined? private_constant
 
-  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc:
-
   # :startdoc:
 
   ##
@@ -137,7 +129,7 @@ class Gem::Specification < Gem::BasicSpecification
     :autorequire               => nil,
     :bindir                    => 'bin',
     :cert_chain                => [],
-    :date                      => nil,
+    :date                      => TODAY,
     :dependencies              => [],
     :description               => nil,
     :email                     => nil,
@@ -156,29 +148,24 @@ class Gem::Specification < Gem::BasicSpecification
     :required_ruby_version     => Gem::Requirement.default,
     :required_rubygems_version => Gem::Requirement.default,
     :requirements              => [],
+    :rubyforge_project         => nil,
     :rubygems_version          => Gem::VERSION,
     :signing_key               => nil,
     :specification_version     => CURRENT_SPECIFICATION_VERSION,
     :summary                   => nil,
     :test_files                => [],
     :version                   => nil,
-  }.freeze
+  }
 
-  # rubocop:disable Style/MutableConstant
-  INITIALIZE_CODE_FOR_DEFAULTS = { } # :nodoc:
-  # rubocop:enable Style/MutableConstant
+  Dupable = { } # :nodoc:
 
   @@default_value.each do |k,v|
-    INITIALIZE_CODE_FOR_DEFAULTS[k] = case v
-                                      when [], {}, true, false, nil, Numeric, Symbol
-                                        v.inspect
-                                      when String
-                                        v.dump
-                                      when Numeric
-                                        "default_value(:#{k})"
-                                      else
-                                        "default_value(:#{k}).dup"
-                                      end
+    case v
+    when Time, Numeric, Symbol, true, false, nil
+      Dupable[k] = false
+    else
+      Dupable[k] = true
+    end
   end
 
   @@attributes = @@default_value.keys.sort_by { |s| s.to_s }
@@ -220,218 +207,65 @@ class Gem::Specification < Gem::BasicSpecification
   attr_reader :version
 
   ##
-  # A short summary of this gem's description.  Displayed in `gem list -d`.
-  #
-  # The #description should be more detailed than the summary.
-  #
-  # Usage:
-  #
-  #   spec.summary = "This is a small summary of my gem"
-
-  attr_reader :summary
-
-  ##
-  # Files included in this gem.  You cannot append to this accessor, you must
-  # assign to it.
-  #
-  # Only add files you can require to this list, not directories, etc.
-  #
-  # Directories are automatically stripped from this list when building a gem,
-  # other non-files cause an error.
-  #
-  # Usage:
-  #
-  #   require 'rake'
-  #   spec.files = FileList['lib/**/*.rb',
-  #                         'bin/*',
-  #                         '[A-Z]*',
-  #                         'test/**/*'].to_a
-  #
-  #   # or without Rake...
-  #   spec.files = Dir['lib/**/*.rb'] + Dir['bin/*']
-  #   spec.files += Dir['[A-Z]*'] + Dir['test/**/*']
-  #   spec.files.reject! { |fn| fn.include? "CVS" }
-
-  def files
-    # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
-    # DOC: Why isn't it normal? Why does it suck? How can we fix this?
-    @files = [@files,
-              @test_files,
-              add_bindir(@executables),
-              @extra_rdoc_files,
-              @extensions,
-             ].flatten.compact.uniq.sort
-  end
-
-  ##
-  # A list of authors for this gem.
+  # Paths in the gem to add to <code>$LOAD_PATH</code> when this gem is
+  # activated.
+  #--
+  # See also #require_paths
+  #++
+  # If you have an extension you do not need to add <code>"ext"</code> to the
+  # require path, the extension build process will copy the extension files
+  # into "lib" for you.
   #
-  # Alternatively, a single author can be specified by assigning a string to
-  # `spec.author`
+  # The default value is <code>"lib"</code>
   #
   # Usage:
   #
-  #   spec.authors = ['John Jones', 'Mary Smith']
+  #   # If all library files are in the root directory...
+  #   spec.require_paths = ['.']
 
-  def authors=(value)
-    @authors = Array(value).flatten.grep(String)
+  def require_paths=(val)
+    @require_paths = Array(val)
   end
 
-  ######################################################################
-  # :section: Recommended gemspec attributes
-
   ##
-  # A long description of this gem
-  #
-  # The description should be more detailed than the summary but not
-  # excessively long.  A few paragraphs is a recommended length with no
-  # examples or formatting.
-  #
-  # Usage:
-  #
-  #   spec.description = <<-EOF
-  #     Rake is a Make-like program implemented in Ruby. Tasks and
-  #     dependencies are specified in standard Ruby syntax.
-  #   EOF
-
-  attr_reader :description
-
-  ##
-  # A contact email address (or addresses) for this gem
-  #
-  # Usage:
-  #
-  #   spec.email = 'john.jones@example.com'
-  #   spec.email = ['jack@example.com', 'jill@example.com']
-
-  attr_accessor :email
-
-  ##
-  # The URL of this gem's home page
-  #
-  # Usage:
-  #
-  #   spec.homepage = 'https://github.com/ruby/rake'
-
-  attr_accessor :homepage
-
-  ##
-  # The license for this gem.
-  #
-  # The license must be no more than 64 characters.
-  #
-  # This should just be the name of your license. The full text of the license
-  # should be inside of the gem (at the top level) when you build it.
-  #
-  # The simplest way, is to specify the standard SPDX ID
-  # https://spdx.org/licenses/ for the license.
-  # Ideally you should pick one that is OSI (Open Source Initiative)
-  # http://opensource.org/licenses/alphabetical approved.
-  #
-  # The most commonly used OSI approved licenses are MIT and Apache-2.0.
-  # GitHub also provides a license picker at http://choosealicense.com/.
-  #
-  # You should specify a license for your gem so that people know how they are
-  # permitted to use it, and any restrictions you're placing on it.  Not
-  # specifying a license means all rights are reserved; others have no rights
-  # to use the code for any purpose.
-  #
-  # You can set multiple licenses with #licenses=
+  # The version of RubyGems used to create this gem.
   #
-  # Usage:
-  #   spec.license = 'MIT'
+  # Do not set this, it is set automatically when the gem is packaged.
 
-  def license=(o)
-    self.licenses = [o]
-  end
+  attr_accessor :rubygems_version
 
   ##
-  # The license(s) for the library.
-  #
-  # Each license must be a short name, no more than 64 characters.
-  #
-  # This should just be the name of your license. The full
-  # text of the license should be inside of the gem when you build it.
+  # A short summary of this gem's description.  Displayed in `gem list -d`.
   #
-  # See #license= for more discussion
+  # The #description should be more detailed than the summary.
   #
   # Usage:
-  #   spec.licenses = ['MIT', 'GPL-2.0']
-
-  def licenses=(licenses)
-    @licenses = Array licenses
-  end
-
-  ##
-  # The metadata holds extra data for this gem that may be useful to other
-  # consumers and is settable by gem authors without requiring an update to
-  # the rubygems software.
-  #
-  # Metadata items have the following restrictions:
-  #
-  # * The metadata must be a Hash object
-  # * All keys and values must be Strings
-  # * Keys can be a maximum of 128 bytes and values can be a maximum of 1024
-  #   bytes
-  # * All strings must be UTF-8, no binary data is allowed
-  #
-  # You can use metadata to specify links to your gem's homepage, codebase,
-  # documentation, wiki, mailing list, issue tracker and changelog.
-  #
-  #   s.metadata = {
-  #     "bug_tracker_uri"   => "https://example.com/user/bestgemever/issues",
-  #     "changelog_uri"     => "https://example.com/user/bestgemever/CHANGELOG.md",
-  #     "documentation_uri" => "https://www.example.info/gems/bestgemever/0.0.1",
-  #     "homepage_uri"      => "https://bestgemever.example.io",
-  #     "mailing_list_uri"  => "https://groups.example.com/bestgemever",
-  #     "source_code_uri"   => "https://example.com/user/bestgemever",
-  #     "wiki_uri"          => "https://example.com/user/bestgemever/wiki"
-  #   }
-  #
-  # These links will be used on your gem's page on rubygems.org and must pass
-  # validation against following regex.
   #
-  #   %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z}
-
-  attr_accessor :metadata
+  #   spec.summary = "This is a small summary of my gem"
 
-  ######################################################################
-  # :section: Optional gemspec attributes
+  attr_reader :summary
 
   ##
-  # Singular (alternative) writer for #authors
+  # Singular writer for #authors
   #
   # Usage:
   #
   #   spec.author = 'John Jones'
 
-  def author=(o)
+  def author= o
     self.authors = [o]
   end
 
   ##
-  # The path in the gem for executable scripts.  Usually 'bin'
-  #
-  # Usage:
-  #
-  #   spec.bindir = 'bin'
-
-  attr_accessor :bindir
-
-  ##
-  # The certificate chain used to sign this gem.  See Gem::Security for
-  # details.
-
-  attr_accessor :cert_chain
-
-  ##
-  # A message that gets displayed after the gem is installed.
+  # Sets the list of authors, ensuring it is an array.
   #
   # Usage:
   #
-  #   spec.post_install_message = "Thanks for installing!"
+  #   spec.authors = ['John Jones', 'Mary Smith']
 
-  attr_accessor :post_install_message
+  def authors= value
+    @authors = Array(value).flatten.grep(String)
+  end
 
   ##
   # The platform this gem runs on.
@@ -456,9 +290,9 @@ class Gem::Specification < Gem::BasicSpecification
   #
   #   spec.platform = Gem::Platform.local
 
-  def platform=(platform)
+  def platform= platform
     if @original_platform.nil? or
-       @original_platform == Gem::Platform::RUBY
+       @original_platform == Gem::Platform::RUBY then
       @original_platform = platform
     end
 
@@ -491,26 +325,104 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   ##
-  # Paths in the gem to add to <code>$LOAD_PATH</code> when this gem is
-  # activated.
-  #--
-  # See also #require_paths
-  #++
-  # If you have an extension you do not need to add <code>"ext"</code> to the
-  # require path, the extension build process will copy the extension files
-  # into "lib" for you.
+  # Files included in this gem.  You cannot append to this accessor, you must
+  # assign to it.
   #
-  # The default value is <code>"lib"</code>
+  # Only add files you can require to this list, not directories, etc.
+  #
+  # Directories are automatically stripped from this list when building a gem,
+  # other non-files cause an error.
   #
   # Usage:
   #
-  #   # If all library files are in the root directory...
-  #   spec.require_paths = ['.']
+  #   require 'rake'
+  #   spec.files = FileList['lib/**/*.rb',
+  #                         'bin/*',
+  #                         '[A-Z]*',
+  #                         'test/**/*'].to_a
+  #
+  #   # or without Rake...
+  #   spec.files = Dir['lib/**/*.rb'] + Dir['bin/*']
+  #   spec.files += Dir['[A-Z]*'] + Dir['test/**/*']
+  #   spec.files.reject! { |fn| fn.include? "CVS" }
 
-  def require_paths=(val)
-    @require_paths = Array(val)
+  def files
+    # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
+    # DOC: Why isn't it normal? Why does it suck? How can we fix this?
+    @files = [@files,
+              @test_files,
+              add_bindir(@executables),
+              @extra_rdoc_files,
+              @extensions,
+             ].flatten.compact.uniq.sort
   end
 
+  ######################################################################
+  # :section: Optional gemspec attributes
+
+  ##
+  # The path in the gem for executable scripts.  Usually 'bin'
+  #
+  # Usage:
+  #
+  #   spec.bindir = 'bin'
+
+  attr_accessor :bindir
+
+  ##
+  # The certificate chain used to sign this gem.  See Gem::Security for
+  # details.
+
+  attr_accessor :cert_chain
+
+  ##
+  # A long description of this gem
+  #
+  # The description should be more detailed than the summary but not
+  # excessively long.  A few paragraphs is a recommended length with no
+  # examples or formatting.
+  #
+  # Usage:
+  #
+  #   spec.description = <<-EOF
+  #     Rake is a Make-like program implemented in Ruby. Tasks and
+  #     dependencies are specified in standard Ruby syntax.
+  #   EOF
+
+  attr_reader :description
+
+  ##
+  # :category: Recommended gemspec attributes
+  #
+  # A contact email address (or addresses) for this gem
+  #
+  # Usage:
+  #
+  #   spec.email = 'john.jones@example.com'
+  #   spec.email = ['jack@example.com', 'jill@example.com']
+
+  attr_accessor :email
+
+  ##
+  # :category: Recommended gemspec attributes
+  #
+  # The URL of this gem's home page
+  #
+  # Usage:
+  #
+  #   spec.homepage = 'https://github.com/ruby/rake'
+
+  attr_accessor :homepage
+
+  ##
+  # A message that gets displayed after the gem is installed.
+  #
+  # Usage:
+  #
+  #   spec.post_install_message = "Thanks for installing!"
+
+  attr_accessor :post_install_message
+
   ##
   # The version of Ruby required by this gem
 
@@ -522,16 +434,30 @@ class Gem::Specification < Gem::BasicSpecification
   attr_reader :required_rubygems_version
 
   ##
-  # The version of RubyGems used to create this gem.
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
+  # The key used to sign this gem.  See Gem::Security for details.
 
-  attr_accessor :rubygems_version
+  attr_accessor :signing_key
 
   ##
-  # The key used to sign this gem.  See Gem::Security for details.
+  # :attr_accessor: metadata
+  #
+  # The metadata holds extra data for this gem that may be useful to other
+  # consumers and is settable by gem authors without requiring an update to
+  # the rubygems software.
+  #
+  # Metadata items have the following restrictions:
+  #
+  # * The metadata must be a Hash object
+  # * All keys and values must be Strings
+  # * Keys can be a maximum of 128 bytes and values can be a maximum of 1024
+  #   bytes
+  # * All strings must be UTF-8, no binary data is allowed
+  #
+  # To add metadata for the location of a issue tracker:
+  #
+  #   s.metadata = { "issue_tracker" => "https://example/issues" }
 
-  attr_accessor :signing_key
+  attr_accessor :metadata
 
   ##
   # Adds a development dependency named +gem+ with +requirements+ to this
@@ -545,7 +471,7 @@ class Gem::Specification < Gem::BasicSpecification
   # activated when a gem is required.
 
   def add_development_dependency(gem, *requirements)
-    add_dependency_with_type(gem, :development, requirements)
+    add_dependency_with_type(gem, :development, *requirements)
   end
 
   ##
@@ -556,7 +482,7 @@ class Gem::Specification < Gem::BasicSpecification
   #   spec.add_runtime_dependency 'example', '~> 1.1', '>= 1.1.4'
 
   def add_runtime_dependency(gem, *requirements)
-    add_dependency_with_type(gem, :runtime, requirements)
+    add_dependency_with_type(gem, :runtime, *requirements)
   end
 
   ##
@@ -624,11 +550,61 @@ class Gem::Specification < Gem::BasicSpecification
   # Sets the version of RubyGems that installed this gem.  See also
   # #installed_by_version.
 
-  def installed_by_version=(version) # :nodoc:
+  def installed_by_version= version # :nodoc:
     @installed_by_version = Gem::Version.new version
   end
 
   ##
+  # :category: Recommended gemspec attributes
+  #
+  # The license for this gem.
+  #
+  # The license must be no more than 64 characters.
+  #
+  # This should just be the name of your license. The full text of the license
+  # should be inside of the gem (at the top level) when you build it.
+  #
+  # The simplest way, is to specify the standard SPDX ID
+  # https://spdx.org/licenses/ for the license.
+  # Ideally you should pick one that is OSI (Open Source Initiative)
+  # http://opensource.org/licenses/alphabetical approved.
+  #
+  # The most commonly used OSI approved licenses are MIT and Apache-2.0.
+  # GitHub also provides a license picker at http://choosealicense.com/.
+  #
+  # You should specify a license for your gem so that people know how they are
+  # permitted to use it, and any restrictions you're placing on it.  Not
+  # specifying a license means all rights are reserved; others have no rights
+  # to use the code for any purpose.
+  #
+  # You can set multiple licenses with #licenses=
+  #
+  # Usage:
+  #   spec.license = 'MIT'
+
+  def license=o
+    self.licenses = [o]
+  end
+
+  ##
+  # :category: Recommended gemspec attributes
+  # The license(s) for the library.
+  #
+  # Each license must be a short name, no more than 64 characters.
+  #
+  # This should just be the name of your license. The full
+  # text of the license should be inside of the gem when you build it.
+  #
+  # See #license= for more discussion
+  #
+  # Usage:
+  #   spec.licenses = ['MIT', 'GPL-2.0']
+
+  def licenses= licenses
+    @licenses = Array licenses
+  end
+
+  ##
   # Specifies the rdoc options to be used when generating API documentation.
   #
   # Usage:
@@ -649,7 +625,9 @@ class Gem::Specification < Gem::BasicSpecification
   #   ruby 2.0.0p247 (2013-06-27 revision 41674) [x86_64-darwin12.4.0]
   #   #<Gem::Version "2.0.0.247">
   #
-  # Prereleases can also be specified.
+  # Because patch-level is taken into account, be very careful specifying using
+  # `<=`: `<= 2.2.2` will not match any patch-level of 2.2.2 after the `p0`
+  # release. It is much safer to specify `< 2.2.3` instead
   #
   # Usage:
   #
@@ -659,17 +637,17 @@ class Gem::Specification < Gem::BasicSpecification
   #  # Only with ruby 2.0.x
   #  spec.required_ruby_version = '~> 2.0'
   #
-  #  # Only prereleases or final releases after 2.6.0.preview2
-  #  spec.required_ruby_version = '> 2.6.0.preview2'
+  #  # Only with ruby between 2.2.0 and 2.2.2
+  #  spec.required_ruby_version = ['>= 2.2.0', '< 2.2.3']
 
-  def required_ruby_version=(req)
+  def required_ruby_version= req
     @required_ruby_version = Gem::Requirement.create req
   end
 
   ##
   # The RubyGems version required by this gem
 
-  def required_rubygems_version=(req)
+  def required_rubygems_version= req
     @required_rubygems_version = Gem::Requirement.create req
   end
 
@@ -694,7 +672,7 @@ class Gem::Specification < Gem::BasicSpecification
   #   spec.test_files = Dir.glob('test/tc_*.rb')
   #   spec.test_files = ['tests/test-suite.rb']
 
-  def test_files=(files) # :nodoc:
+  def test_files= files # :nodoc:
     @test_files = Array files
   end
 
@@ -721,7 +699,6 @@ class Gem::Specification < Gem::BasicSpecification
   # Deprecated: You must now specify the executable name to  Gem.bin_path.
 
   attr_writer :default_executable
-  deprecate :default_executable=, :none,       2018, 12
 
   ##
   # Allows deinstallation of gems with legacy platforms.
@@ -729,11 +706,12 @@ class Gem::Specification < Gem::BasicSpecification
   attr_writer :original_platform # :nodoc:
 
   ##
-  # Deprecated and ignored.
+  # The rubyforge project this gem lives under.  i.e. RubyGems'
+  # rubyforge_project is "rubygems".
   #
-  # Formerly used to set rubyforge project.
+  # This option is deprecated.
 
-  attr_writer :rubyforge_project
+  attr_accessor :rubyforge_project
 
   ##
   # The Gem::Specification version of this gemspec.
@@ -743,11 +721,8 @@ class Gem::Specification < Gem::BasicSpecification
   attr_accessor :specification_version
 
   def self._all # :nodoc:
-    unless defined?(@@all) && @@all
+    unless defined?(@@all) && @@all then
       @@all = stubs.map(&:to_spec)
-      if @@all.any?(&:nil?) # TODO: remove once we're happy
-        raise "pid: #{$$} nil spec! included in #{stubs.inspect}"
-      end
 
       # After a reset, make sure already loaded specs
       # are still marked as activated.
@@ -764,18 +739,18 @@ class Gem::Specification < Gem::BasicSpecification
 
   def self.each_gemspec(dirs) # :nodoc:
     dirs.each do |dir|
-      Gem::Util.glob_files_in_dir("*.gemspec", dir).each do |path|
+      Dir[File.join(dir, "*.gemspec")].each do |path|
         yield path.untaint
       end
     end
   end
 
-  def self.gemspec_stubs_in(dir, pattern)
-    Gem::Util.glob_files_in_dir(pattern, dir).map { |path| yield path }.select(&:valid?)
+  def self.gemspec_stubs_in dir, pattern
+    Dir[File.join(dir, pattern)].map { |path| yield path }.select(&:valid?)
   end
   private_class_method :gemspec_stubs_in
 
-  def self.default_stubs(pattern)
+  def self.default_stubs pattern
     base_dir = Gem.default_dir
     gems_dir = File.join base_dir, "gems"
     gemspec_stubs_in(default_specifications_dir, pattern) do |path|
@@ -784,29 +759,59 @@ class Gem::Specification < Gem::BasicSpecification
   end
   private_class_method :default_stubs
 
-  def self.installed_stubs(dirs, pattern)
+  def self.installed_stubs dirs, pattern
     map_stubs(dirs, pattern) do |path, base_dir, gems_dir|
       Gem::StubSpecification.gemspec_stub(path, base_dir, gems_dir)
     end
   end
   private_class_method :installed_stubs
 
-  def self.map_stubs(dirs, pattern) # :nodoc:
-    dirs.flat_map { |dir|
-      base_dir = File.dirname dir
-      gems_dir = File.join base_dir, "gems"
-      gemspec_stubs_in(dir, pattern) { |path| yield path, base_dir, gems_dir }
-    }
+  if [].respond_to? :flat_map
+    def self.map_stubs(dirs, pattern) # :nodoc:
+      dirs.flat_map { |dir|
+        base_dir = File.dirname dir
+        gems_dir = File.join base_dir, "gems"
+        gemspec_stubs_in(dir, pattern) { |path| yield path, base_dir, gems_dir }
+      }
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def self.map_stubs(dirs, pattern) # :nodoc:
+      dirs.map { |dir|
+        base_dir = File.dirname dir
+        gems_dir = File.join base_dir, "gems"
+        gemspec_stubs_in(dir, pattern) { |path| yield path, base_dir, gems_dir }
+      }.flatten 1
+    end
   end
   private_class_method :map_stubs
 
-  def self.uniq_by(list, &block) # :nodoc:
-    list.uniq(&block)
+  uniq_takes_a_block = false
+  [1,2].uniq { uniq_takes_a_block = true }
+
+  if uniq_takes_a_block
+    def self.uniq_by(list, &block) # :nodoc:
+      list.uniq(&block)
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def self.uniq_by(list) # :nodoc:
+      values = {}
+      list.each { |item|
+        value = yield item
+        values[value] ||= item
+      }
+      values.values
+    end
   end
   private_class_method :uniq_by
 
-  def self.sort_by!(list, &block)
-    list.sort_by!(&block)
+  if [].respond_to? :sort_by!
+    def self.sort_by! list, &block
+      list.sort_by!(&block)
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def self.sort_by! list, &block
+      list.replace list.sort_by(&block)
+    end
   end
   private_class_method :sort_by!
 
@@ -823,11 +828,11 @@ class Gem::Specification < Gem::BasicSpecification
   def self.stubs
     @@stubs ||= begin
       pattern = "*.gemspec"
-      stubs = Gem.loaded_specs.values + default_stubs(pattern) + installed_stubs(dirs, pattern)
+      stubs = default_stubs(pattern).concat installed_stubs(dirs, pattern)
       stubs = uniq_by(stubs) { |stub| stub.full_name }
 
       _resort!(stubs)
-      @@stubs_by_name = stubs.select { |s| Gem::Platform.match s.platform }.group_by(&:name)
+      @@stubs_by_name = stubs.group_by(&:name)
       stubs
     end
   end
@@ -836,15 +841,13 @@ class Gem::Specification < Gem::BasicSpecification
 
   ##
   # Returns a Gem::StubSpecification for installed gem named +name+
-  # only returns stubs that match Gem.platforms
 
-  def self.stubs_for(name)
+  def self.stubs_for name
     if @@stubs
       @@stubs_by_name[name] || []
     else
       pattern = "#{name}-*.gemspec"
-      stubs = Gem.loaded_specs.values + default_stubs(pattern) +
-        installed_stubs(dirs, pattern).select { |s| Gem::Platform.match s.platform }
+      stubs = default_stubs(pattern) + installed_stubs(dirs, pattern)
       stubs = uniq_by(stubs) { |stub| stub.full_name }.group_by(&:name)
       stubs.each_value { |v| _resort!(v) }
 
@@ -876,8 +879,8 @@ class Gem::Specification < Gem::BasicSpecification
   # Adds +spec+ to the known specifications, keeping the collection
   # properly sorted.
 
-  def self.add_spec(spec)
-    warn "Gem::Specification.add_spec is deprecated and will be removed in RubyGems 3.0" unless Gem::Deprecate.skip
+  def self.add_spec spec
+    warn "Gem::Specification.add_spec is deprecated and will be removed in Rubygems 3.0" unless Gem::Deprecate.skip
     # TODO: find all extraneous adds
     # puts
     # p :add_spec => [spec.full_name, caller.reject { |s| s =~ /minitest/ }]
@@ -901,8 +904,8 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Adds multiple specs to the known specifications.
 
-  def self.add_specs(*specs)
-    warn "Gem::Specification.add_specs is deprecated and will be removed in RubyGems 3.0" unless Gem::Deprecate.skip
+  def self.add_specs *specs
+    warn "Gem::Specification.add_specs is deprecated and will be removed in Rubygems 3.0" unless Gem::Deprecate.skip
 
     raise "nil spec!" if specs.any?(&:nil?) # TODO: remove once we're happy
 
@@ -939,8 +942,7 @@ class Gem::Specification < Gem::BasicSpecification
   #
   # -- wilsonb
 
-  def self.all=(specs)
-    raise "nil spec!" if specs.any?(&:nil?) # TODO: remove once we're happy
+  def self.all= specs
     @@stubs_by_name = specs.group_by(&:name)
     @@all = @@stubs = specs
   end
@@ -983,7 +985,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Set the directories that Specification uses to find specs. Setting
   # this resets the list of known specs.
 
-  def self.dirs=(dirs)
+  def self.dirs= dirs
     self.reset
 
     @@dirs = Array(dirs).map { |dir| File.join dir, "specifications" }
@@ -1006,7 +1008,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Returns every spec that matches +name+ and optional +requirements+.
 
-  def self.find_all_by_name(name, *requirements)
+  def self.find_all_by_name name, *requirements
     requirements = Gem::Requirement.default if requirements.empty?
 
     # TODO: maybe try: find_all { |s| spec === dep }
@@ -1015,17 +1017,10 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   ##
-  # Returns every spec that has the given +full_name+
-
-  def self.find_all_by_full_name(full_name)
-    stubs.select {|s| s.full_name == full_name }.map(&:to_spec)
-  end
-
-  ##
   # Find the best specification matching a +name+ and +requirements+. Raises
   # if the dependency doesn't resolve to a valid specification.
 
-  def self.find_by_name(name, *requirements)
+  def self.find_by_name name, *requirements
     requirements = Gem::Requirement.default if requirements.empty?
 
     # TODO: maybe try: find { |s| spec === dep }
@@ -1036,10 +1031,9 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Return the best specification that contains the file matching +path+.
 
-  def self.find_by_path(path)
+  def self.find_by_path path
     path = path.dup.freeze
     spec = @@spec_with_requirable_file[path] ||= (stubs.find { |s|
-      next unless Gem::BundlerVersionFinder.compatible?(s)
       s.contains_requirable_file? path
     } || NOT_FOUND)
     spec.to_spec
@@ -1049,16 +1043,14 @@ class Gem::Specification < Gem::BasicSpecification
   # Return the best specification that contains the file matching +path+
   # amongst the specs that are not activated.
 
-  def self.find_inactive_by_path(path)
+  def self.find_inactive_by_path path
     stub = stubs.find { |s|
-      next if s.activated?
-      next unless Gem::BundlerVersionFinder.compatible?(s)
-      s.contains_requirable_file? path
+      s.contains_requirable_file? path unless s.activated?
     }
     stub && stub.to_spec
   end
 
-  def self.find_active_stub_by_path(path)
+  def self.find_active_stub_by_path path
     stub = @@active_stub_with_requirable_file[path] ||= (stubs.find { |s|
       s.activated? and s.contains_requirable_file? path
     } || NOT_FOUND)
@@ -1068,7 +1060,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Return currently unresolved specs that contain the file matching +path+.
 
-  def self.find_in_unresolved(path)
+  def self.find_in_unresolved path
     # TODO: do we need these?? Kill it
     specs = unresolved_deps.values.map { |dep| dep.to_specs }.flatten
 
@@ -1079,7 +1071,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Search through all unresolved deps and sub-dependencies and return
   # specs that contain the file matching +path+.
 
-  def self.find_in_unresolved_tree(path)
+  def self.find_in_unresolved_tree path
     specs = unresolved_deps.values.map { |dep| dep.to_specs }.flatten
 
     specs.each do |spec|
@@ -1107,13 +1099,13 @@ class Gem::Specification < Gem::BasicSpecification
     Gem.load_yaml
 
     input = normalize_yaml_input input
-    spec = Gem::SafeYAML.safe_load input
+    spec = YAML.load input
 
-    if spec && spec.class == FalseClass
+    if spec && spec.class == FalseClass then
       raise Gem::EndOfYAMLException
     end
 
-    unless Gem::Specification === spec
+    unless Gem::Specification === spec then
       raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
     end
 
@@ -1127,11 +1119,11 @@ class Gem::Specification < Gem::BasicSpecification
   # Return the latest specs, optionally including prerelease specs if
   # +prerelease+ is true.
 
-  def self.latest_specs(prerelease = false)
+  def self.latest_specs prerelease = false
     _latest_specs Gem::Specification._all, prerelease
   end
 
-  def self._latest_specs(specs, prerelease = false) # :nodoc:
+  def self._latest_specs specs, prerelease = false # :nodoc:
     result = Hash.new { |h,k| h[k] = {} }
     native = {}
 
@@ -1151,7 +1143,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Loads Ruby format gemspec from +file+.
 
-  def self.load(file)
+  def self.load file
     return unless file
 
     _spec = LOAD_CACHE[file]
@@ -1160,7 +1152,11 @@ class Gem::Specification < Gem::BasicSpecification
     file = file.dup.untaint
     return unless File.file?(file)
 
-    code = File.read file, :mode => 'r:UTF-8:-'
+    code = if defined? Encoding
+             File.read file, :mode => 'r:UTF-8:-'
+           else
+             File.read file
+           end
 
     code.untaint
 
@@ -1247,8 +1243,8 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Removes +spec+ from the known specs.
 
-  def self.remove_spec(spec)
-    warn "Gem::Specification.remove_spec is deprecated and will be removed in RubyGems 3.0" unless Gem::Deprecate.skip
+  def self.remove_spec spec
+    warn "Gem::Specification.remove_spec is deprecated and will be removed in Rubygems 3.0" unless Gem::Deprecate.skip
     _all.delete spec
     stubs.delete_if { |s| s.full_name == spec.full_name }
     (@@stubs_by_name[spec.name] || []).delete_if { |s| s.full_name == spec.full_name }
@@ -1283,19 +1279,13 @@ class Gem::Specification < Gem::BasicSpecification
     @@active_stub_with_requirable_file   = {}
     _clear_load_cache
     unresolved = unresolved_deps
-    unless unresolved.empty?
+    unless unresolved.empty? then
       w = "W" + "ARN"
-      warn "#{w}: Unresolved or ambigious specs during Gem::Specification.reset:"
+      warn "#{w}: Unresolved specs during Gem::Specification.reset:"
       unresolved.values.each do |dep|
         warn "      #{dep}"
-
-        versions = find_all_by_name(dep.name)
-        unless versions.empty?
-          warn "      Available/installed versions of this gem:"
-          versions.each { |s| warn "      - #{s.version}" }
-        end
       end
-      warn "#{w}: Clearing out unresolved specs. Try 'gem cleanup <gem>'"
+      warn "#{w}: Clearing out unresolved specs."
       warn "Please report a bug if this causes problems."
       unresolved.clear
     end
@@ -1318,7 +1308,7 @@ class Gem::Specification < Gem::BasicSpecification
 
     current_version = CURRENT_SPECIFICATION_VERSION
 
-    field_count = if spec.specification_version > current_version
+    field_count = if spec.specification_version > current_version then
                     spec.instance_variable_set :@specification_version,
                                                current_version
                     MARSHAL_FIELDS[current_version]
@@ -1326,7 +1316,7 @@ class Gem::Specification < Gem::BasicSpecification
                     MARSHAL_FIELDS[spec.specification_version]
                   end
 
-    if array.size < field_count
+    if array.size < field_count then
       raise TypeError, "invalid Gem::Specification format #{array.inspect}"
     end
 
@@ -1345,7 +1335,7 @@ class Gem::Specification < Gem::BasicSpecification
     spec.instance_variable_set :@required_rubygems_version, array[7]
     spec.instance_variable_set :@original_platform,         array[8]
     spec.instance_variable_set :@dependencies,              array[9]
-    # offset due to rubyforge_project removal
+    spec.instance_variable_set :@rubyforge_project,         array[10]
     spec.instance_variable_set :@email,                     array[11]
     spec.instance_variable_set :@authors,                   array[12]
     spec.instance_variable_set :@description,               array[13]
@@ -1365,7 +1355,7 @@ class Gem::Specification < Gem::BasicSpecification
     sort_obj <=> other.sort_obj
   end
 
-  def ==(other) # :nodoc:
+  def == other # :nodoc:
     self.class === other &&
       name == other.name &&
       version == other.version &&
@@ -1390,7 +1380,7 @@ class Gem::Specification < Gem::BasicSpecification
       @required_rubygems_version,
       @original_platform,
       @dependencies,
-      '', # rubyforge_project
+      @rubyforge_project,
       @email,
       @authors,
       @description,
@@ -1410,7 +1400,7 @@ class Gem::Specification < Gem::BasicSpecification
 
   def activate
     other = Gem.loaded_specs[self.name]
-    if other
+    if other then
       check_version_conflict other
       return false
     end
@@ -1448,7 +1438,7 @@ class Gem::Specification < Gem::BasicSpecification
 
       specs = spec_dep.to_specs
 
-      if specs.size == 1
+      if specs.size == 1 then
         specs.first.activate
       else
         name = spec_dep.name
@@ -1510,7 +1500,7 @@ class Gem::Specification < Gem::BasicSpecification
   def add_bindir(executables)
     return nil if executables.nil?
 
-    if @bindir
+    if @bindir then
       Array(executables).map { |e| File.join(@bindir, e) }
     else
       executables
@@ -1524,8 +1514,8 @@ class Gem::Specification < Gem::BasicSpecification
   # +requirements+.  Valid types are currently <tt>:runtime</tt> and
   # <tt>:development</tt>.
 
-  def add_dependency_with_type(dependency, type, requirements)
-    requirements = if requirements.empty?
+  def add_dependency_with_type(dependency, type, *requirements)
+    requirements = if requirements.empty? then
                      Gem::Requirement.default
                    else
                      requirements.flatten
@@ -1554,7 +1544,7 @@ class Gem::Specification < Gem::BasicSpecification
     # gem directories must come after -I and ENV['RUBYLIB']
     insert_index = Gem.load_path_insert_index
 
-    if insert_index
+    if insert_index then
       # gem directories must come after -I and ENV['RUBYLIB']
       $LOAD_PATH.insert(insert_index, *paths)
     else
@@ -1592,7 +1582,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Returns the full path to an executable named +name+ in this gem.
 
-  def bin_file(name)
+  def bin_file name
     File.join bin_dir, name
   end
 
@@ -1659,6 +1649,16 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   ##
+  # Used to detect if the gem is bundled in older version of Ruby, but not
+  # detectable as default gem (see BasicSpecification#default_gem?).
+
+  def bundled_gem_in_old_ruby?
+    !default_gem? &&
+      RUBY_VERSION < "2.0.0" &&
+      summary == "This #{name} is bundled with Ruby"
+  end
+
+  ##
   # Returns the full path to the cache directory containing this
   # spec's cached gem.
 
@@ -1705,7 +1705,7 @@ class Gem::Specification < Gem::BasicSpecification
   def has_conflicts?
     return true unless Gem.env_requirement(name).satisfied_by?(version)
     self.dependencies.any? { |dep|
-      if dep.runtime?
+      if dep.runtime? then
         spec = Gem.loaded_specs[dep.name]
         spec and not spec.satisfies_requirement? dep
       else
@@ -1714,16 +1714,13 @@ class Gem::Specification < Gem::BasicSpecification
     }
   end
 
-  # The date this gem was created.
-  #
-  # If SOURCE_DATE_EPOCH is set as an environment variable, use that to support
-  # reproducible builds; otherwise, default to the current UTC date.
+  ##
+  # The date this gem was created.  Lazily defaults to the current UTC date.
   #
-  # Details on SOURCE_DATE_EPOCH:
-  # https://reproducible-builds.org/specs/source-date-epoch/
+  # There is no need to set this in your gem specification.
 
   def date
-    @date ||= ENV["SOURCE_DATE_EPOCH"] ? Time.utc(*Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc.to_a[3..5].reverse) : TODAY
+    @date ||= TODAY
   end
 
   DateLike = Object.new # :nodoc:
@@ -1735,26 +1732,26 @@ class Gem::Specification < Gem::BasicSpecification
     /\A
      (\d{4})-(\d{2})-(\d{2})
      (\s+ \d{2}:\d{2}:\d{2}\.\d+ \s* (Z | [-+]\d\d:\d\d) )?
-     \Z/x.freeze
+     \Z/x
 
   ##
   # The date this gem was created
   #
   # DO NOT set this, it is set automatically when the gem is packaged.
 
-  def date=(date)
+  def date= date
     # We want to end up with a Time object with one-day resolution.
     # This is the cleanest, most-readable, faster-than-using-Date
     # way to do it.
     @date = case date
             when String then
-              if DateTimeFormat =~ date
+              if DateTimeFormat =~ date then
                 Time.utc($1.to_i, $2.to_i, $3.to_i)
 
               # Workaround for where the date format output from psych isn't
               # parsed as a Time object by syck and thus comes through as a
               # string.
-              elsif /\A(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}\.\d+?Z\z/ =~ date
+              elsif /\A(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}\.\d+?Z\z/ =~ date then
                 Time.utc($1.to_i, $2.to_i, $3.to_i)
               else
                 raise(Gem::InvalidSpecificationException,
@@ -1783,12 +1780,11 @@ class Gem::Specification < Gem::BasicSpecification
     end
     result
   end
-  deprecate :default_executable,  :none,       2018, 12
 
   ##
   # The default value for specification attribute +name+
 
-  def default_value(name)
+  def default_value name
     @@default_value[name]
   end
 
@@ -1812,7 +1808,7 @@ class Gem::Specification < Gem::BasicSpecification
     out = []
     Gem::Specification.each do |spec|
       spec.dependencies.each do |dep|
-        if self.satisfies_requirement?(dep)
+        if self.satisfies_requirement?(dep) then
           sats = []
           find_all_satisfiers(dep) do |sat|
             sats << sat
@@ -1834,7 +1830,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # A detailed description of this gem.  See also #summary
 
-  def description=(str)
+  def description= str
     @description = str.to_s
   end
 
@@ -1853,17 +1849,17 @@ class Gem::Specification < Gem::BasicSpecification
   #
   #   spec.doc_dir 'ri' # => "/path/to/gem_repo/doc/a-1/ri"
 
-  def doc_dir(type = nil)
+  def doc_dir type = nil
     @doc_dir ||= File.join base_dir, 'doc', full_name
 
-    if type
+    if type then
       File.join @doc_dir, type
     else
       @doc_dir
     end
   end
 
-  def encode_with(coder) # :nodoc:
+  def encode_with coder # :nodoc:
     mark_version
 
     coder.add 'name', @name
@@ -1884,7 +1880,7 @@ class Gem::Specification < Gem::BasicSpecification
     end
   end
 
-  def eql?(other) # :nodoc:
+  def eql? other # :nodoc:
     self.class === other && same_attributes?(other)
   end
 
@@ -1898,7 +1894,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Singular accessor for #executables
 
-  def executable=(o)
+  def executable=o
     self.executables = [o]
   end
 
@@ -1906,7 +1902,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Sets executables to +value+, ensuring it is an array. Don't
   # use this, push onto the array instead.
 
-  def executables=(value)
+  def executables= value
     # TODO: warn about setting instead of pushing
     @executables = Array(value)
   end
@@ -1915,7 +1911,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Sets extensions to +extensions+, ensuring it is an array. Don't
   # use this, push onto the array instead.
 
-  def extensions=(extensions)
+  def extensions= extensions
     # TODO: warn about setting instead of pushing
     @extensions = Array extensions
   end
@@ -1924,7 +1920,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Sets extra_rdoc_files to +files+, ensuring it is an array. Don't
   # use this, push onto the array instead.
 
-  def extra_rdoc_files=(files)
+  def extra_rdoc_files= files
     # TODO: warn about setting instead of pushing
     @extra_rdoc_files = Array files
   end
@@ -1941,14 +1937,14 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Sets files to +files+, ensuring it is an array.
 
-  def files=(files)
+  def files= files
     @files = Array files
   end
 
   ##
   # Finds all gems that satisfy +dep+
 
-  def find_all_satisfiers(dep)
+  def find_all_satisfiers dep
     Gem::Specification.each do |spec|
       yield spec if spec.satisfies_requirement? dep
     end
@@ -1992,20 +1988,17 @@ class Gem::Specification < Gem::BasicSpecification
   def has_rdoc # :nodoc:
     true
   end
-  deprecate :has_rdoc,            :none,       2018, 12
 
   ##
   # Deprecated and ignored.
   #
   # Formerly used to indicate this gem was RDoc-capable.
 
-  def has_rdoc=(ignored) # :nodoc:
+  def has_rdoc= ignored # :nodoc:
     @has_rdoc = true
   end
-  deprecate :has_rdoc=,           :none,       2018, 12
 
   alias :has_rdoc? :has_rdoc # :nodoc:
-  deprecate :has_rdoc?,           :none,       2018, 12
 
   ##
   # True if this gem has files in test_files
@@ -2022,31 +2015,17 @@ class Gem::Specification < Gem::BasicSpecification
     name.hash ^ version.hash
   end
 
-  def init_with(coder) # :nodoc:
+  def init_with coder # :nodoc:
     @installed_by_version ||= nil
     yaml_initialize coder.tag, coder.map
   end
 
-
-
-  eval <<-RB, binding, __FILE__, __LINE__ + 1
-    def set_nil_attributes_to_nil
-      #{@@nil_attributes.map {|key| "@#{key} = nil" }.join "; "}
-    end
-    private :set_nil_attributes_to_nil
-
-    def set_not_nil_attributes_to_default_values
-      #{@@non_nil_attributes.map {|key| "@#{key} = #{INITIALIZE_CODE_FOR_DEFAULTS[key]}" }.join ";"}
-    end
-    private :set_not_nil_attributes_to_default_values
-  RB
-
   ##
   # Specification constructor. Assigns the default values to the attributes
   # and yields itself for further initialization.  Optionally takes +name+ and
   # +version+.
 
-  def initialize(name = nil, version = nil)
+  def initialize name = nil, version = nil
     super()
     @gems_dir              = nil
     @base_dir              = nil
@@ -2056,8 +2035,15 @@ class Gem::Specification < Gem::BasicSpecification
     @original_platform = nil
     @installed_by_version = nil
 
-    set_nil_attributes_to_nil
-    set_not_nil_attributes_to_default_values
+    @@nil_attributes.each do |key|
+      instance_variable_set "@#{key}", nil
+    end
+
+    @@non_nil_attributes.each do |key|
+      default = default_value(key)
+      value = Dupable[key] ? default.dup : default
+      instance_variable_set "@#{key}", value
+    end
 
     @new_platform = Gem::Platform::RUBY
 
@@ -2070,14 +2056,14 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Duplicates array_attributes from +other_spec+ so state isn't shared.
 
-  def initialize_copy(other_spec)
+  def initialize_copy other_spec
     self.class.array_attributes.each do |name|
       name = :"@#{name}"
       next unless other_spec.instance_variable_defined? name
 
       begin
         val = other_spec.instance_variable_get(name)
-        if val
+        if val then
           instance_variable_set name, val.dup
         elsif Gem.configuration.really_verbose
           warn "WARNING: #{full_name} has an invalid nil value for #{name}"
@@ -2094,7 +2080,7 @@ class Gem::Specification < Gem::BasicSpecification
 
   def base_dir
     return Gem.dir unless loaded_from
-    @base_dir ||= if default_gem?
+    @base_dir ||= if default_gem? then
                     File.dirname File.dirname File.dirname loaded_from
                   else
                     File.dirname File.dirname loaded_from
@@ -2116,7 +2102,7 @@ class Gem::Specification < Gem::BasicSpecification
     if $DEBUG
       super
     else
-      "#{super[0..-2]} #{full_name}>"
+      "#<#{self.class}:0x#{__id__.to_s(16)} #{full_name}>"
     end
   end
 
@@ -2170,7 +2156,7 @@ class Gem::Specification < Gem::BasicSpecification
 
   def method_missing(sym, *a, &b) # :nodoc:
     if @specification_version > CURRENT_SPECIFICATION_VERSION and
-      sym.to_s =~ /=$/
+      sym.to_s =~ /=$/ then
       warn "ignoring #{sym} loading #{full_name}" if $DEBUG
     else
       super
@@ -2197,7 +2183,7 @@ class Gem::Specification < Gem::BasicSpecification
   #   file list.
 
   def normalize
-    if defined?(@extra_rdoc_files) and @extra_rdoc_files
+    if defined?(@extra_rdoc_files) and @extra_rdoc_files then
       @extra_rdoc_files.uniq!
       @files ||= []
       @files.concat(@extra_rdoc_files)
@@ -2222,7 +2208,7 @@ class Gem::Specification < Gem::BasicSpecification
   # platform.  For use with legacy gems.
 
   def original_name # :nodoc:
-    if platform == Gem::Platform::RUBY or platform.nil?
+    if platform == Gem::Platform::RUBY or platform.nil? then
       "#{@name}-#{@version}"
     else
       "#{@name}-#{@version}-#{@original_platform}"
@@ -2255,11 +2241,11 @@ class Gem::Specification < Gem::BasicSpecification
       attributes.each do |attr_name|
         current_value = self.send attr_name
         if current_value != default_value(attr_name) or
-           self.class.required_attribute? attr_name
+           self.class.required_attribute? attr_name then
 
           q.text "s.#{attr_name} = "
 
-          if attr_name == :date
+          if attr_name == :date then
             current_value = current_value.utc
 
             q.text "Time.utc(#{current_value.year}, #{current_value.month}, #{current_value.day})"
@@ -2277,7 +2263,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Raise an exception if the version of this spec conflicts with the one
   # that is already loaded (+other+)
 
-  def check_version_conflict(other) # :nodoc:
+  def check_version_conflict other # :nodoc:
     return if self.version == other.version
 
     # This gem is already loaded.  If the currently loaded gem is not in the
@@ -2298,7 +2284,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Check the spec for possible conflicts and freak out if there are any.
 
   def raise_if_conflicts # :nodoc:
-    if has_conflicts?
+    if has_conflicts? then
       raise Gem::ConflictError.new self, conflicts
     end
   end
@@ -2307,7 +2293,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Sets rdoc_options to +value+, ensuring it is an array. Don't
   # use this, push onto the array instead.
 
-  def rdoc_options=(options)
+  def rdoc_options= options
     # TODO: warn about setting instead of pushing
     @rdoc_options = Array options
   end
@@ -2322,7 +2308,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Singular accessor for #require_paths
 
-  def require_path=(path)
+  def require_path= path
     self.require_paths = Array(path)
   end
 
@@ -2330,12 +2316,12 @@ class Gem::Specification < Gem::BasicSpecification
   # Set requirements to +req+, ensuring it is an array. Don't
   # use this, push onto the array instead.
 
-  def requirements=(req)
+  def requirements= req
     # TODO: warn about setting instead of pushing
     @requirements = Array req
   end
 
-  def respond_to_missing?(m, include_private = false) # :nodoc:
+  def respond_to_missing? m, include_private = false # :nodoc:
     false
   end
 
@@ -2382,7 +2368,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # True if this gem has the same attributes as +other+.
 
-  def same_attributes?(spec)
+  def same_attributes? spec
     @@attributes.all? { |name, default| self.send(name) == spec.send(name) }
   end
 
@@ -2391,7 +2377,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Checks if this specification meets the requirement of +dependency+.
 
-  def satisfies_requirement?(dependency)
+  def satisfies_requirement? dependency
     return @name == dependency.name &&
       dependency.requirement.satisfied_by?(@version)
   end
@@ -2438,7 +2424,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # A short summary of this gem's description.
 
-  def summary=(str)
+  def summary= str
     @summary = str.to_s.strip.
       gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').gsub(/\n[ \t]*/, " ") # so. weird.
   end
@@ -2453,7 +2439,7 @@ class Gem::Specification < Gem::BasicSpecification
   ##
   # Singular mutator for #test_files
 
-  def test_file=(file) # :nodoc:
+  def test_file= file # :nodoc:
     self.test_files = [file]
   end
 
@@ -2465,11 +2451,11 @@ class Gem::Specification < Gem::BasicSpecification
     # Handle the possibility that we have @test_suite_file but not
     # @test_files.  This will happen when an old gem is loaded via
     # YAML.
-    if defined? @test_suite_file
+    if defined? @test_suite_file then
       @test_files = [@test_suite_file].flatten
       @test_suite_file = nil
     end
-    if defined?(@test_files) and @test_files
+    if defined?(@test_files) and @test_files then
       @test_files
     else
       @test_files = []
@@ -2493,7 +2479,7 @@ class Gem::Specification < Gem::BasicSpecification
 
     result << "  s.name = #{ruby_code name}"
     result << "  s.version = #{ruby_code version}"
-    unless platform.nil? or platform == Gem::Platform::RUBY
+    unless platform.nil? or platform == Gem::Platform::RUBY then
       result << "  s.platform = #{ruby_code original_platform}"
     end
     result << ""
@@ -2521,17 +2507,17 @@ class Gem::Specification < Gem::BasicSpecification
       next if handled.include? attr_name
       current_value = self.send(attr_name)
       if current_value != default_value(attr_name) or
-         self.class.required_attribute? attr_name
+         self.class.required_attribute? attr_name then
         result << "  s.#{attr_name} = #{ruby_code current_value}"
       end
     end
 
-    if @installed_by_version
+    if @installed_by_version then
       result << nil
       result << "  s.installed_by_version = \"#{Gem::VERSION}\" if s.respond_to? :installed_by_version"
     end
 
-    unless dependencies.empty?
+    unless dependencies.empty? then
       result << nil
       result << "  if s.respond_to? :specification_version then"
       result << "    s.specification_version = #{specification_version}"
@@ -2590,30 +2576,39 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   def to_yaml(opts = {}) # :nodoc:
-    # Because the user can switch the YAML engine behind our
-    # back, we have to check again here to make sure that our
-    # psych code was properly loaded, and load it if not.
-    unless Gem.const_defined?(:NoAliasYAMLTree)
-      require 'rubygems/psych_tree'
-    end
+    if (YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?) ||
+        (defined?(Psych) && YAML == Psych) then
+      # Because the user can switch the YAML engine behind our
+      # back, we have to check again here to make sure that our
+      # psych code was properly loaded, and load it if not.
+      unless Gem.const_defined?(:NoAliasYAMLTree)
+        require 'rubygems/psych_tree'
+      end
 
-    builder = Gem::NoAliasYAMLTree.create
-    builder << self
-    ast = builder.tree
+      builder = Gem::NoAliasYAMLTree.create
+      builder << self
+      ast = builder.tree
 
-    io = StringIO.new
-    io.set_encoding Encoding::UTF_8
+      io = StringIO.new
+      io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
 
-    Psych::Visitors::Emitter.new(io).accept(ast)
+      Psych::Visitors::Emitter.new(io).accept(ast)
 
-    io.string.gsub(/ !!null \n/, " \n")
+      io.string.gsub(/ !!null \n/, " \n")
+    else
+      YAML.quick_emit object_id, opts do |out|
+        out.map taguri, to_yaml_style do |map|
+          encode_with map
+        end
+      end
+    end
   end
 
   ##
   # Recursively walk dependencies of this spec, executing the +block+ for each
   # hop.
 
-  def traverse(trail = [], visited = {}, &block)
+  def traverse trail = [], visited = {}, &block
     trail.push(self)
     begin
       dependencies.each do |dep|
@@ -2646,40 +2641,304 @@ class Gem::Specification < Gem::BasicSpecification
   # Raises InvalidSpecificationException if the spec does not pass the
   # checks..
 
-  def validate(packaging = true, strict = false)
+  def validate packaging = true
+    @warnings = 0
     require 'rubygems/user_interaction'
     extend Gem::UserInteraction
     normalize
 
-    validation_policy = Gem::SpecificationPolicy.new(self)
-    validation_policy.packaging = packaging
-    validation_policy.validate(strict)
-  end
+    nil_attributes = self.class.non_nil_attributes.find_all do |attrname|
+      instance_variable_get("@#{attrname}").nil?
+    end
+
+    unless nil_attributes.empty? then
+      raise Gem::InvalidSpecificationException,
+        "#{nil_attributes.join ', '} must not be nil"
+    end
+
+    if packaging and rubygems_version != Gem::VERSION then
+      raise Gem::InvalidSpecificationException,
+            "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
+    end
+
+    @@required_attributes.each do |symbol|
+      unless self.send symbol then
+        raise Gem::InvalidSpecificationException,
+              "missing value for attribute #{symbol}"
+      end
+    end
+
+    unless String === name then
+      raise Gem::InvalidSpecificationException,
+            "invalid value for attribute name: \"#{name.inspect}\""
+    end
+
+    if raw_require_paths.empty? then
+      raise Gem::InvalidSpecificationException,
+            'specification must have at least one require_path'
+    end
 
-  def keep_only_files_and_directories
-    @executables.delete_if      { |x| File.directory?(File.join(@bindir, x)) }
-    @extensions.delete_if       { |x| File.directory?(x) && !File.symlink?(x) }
-    @extra_rdoc_files.delete_if { |x| File.directory?(x) && !File.symlink?(x) }
     @files.delete_if            { |x| File.directory?(x) && !File.symlink?(x) }
     @test_files.delete_if       { |x| File.directory?(x) && !File.symlink?(x) }
-  end
+    @executables.delete_if      { |x| File.directory?(File.join(@bindir, x)) }
+    @extra_rdoc_files.delete_if { |x| File.directory?(x) && !File.symlink?(x) }
+    @extensions.delete_if       { |x| File.directory?(x) && !File.symlink?(x) }
+
+    non_files = files.reject { |x| File.file?(x) || File.symlink?(x) }
+
+    unless not packaging or non_files.empty? then
+      raise Gem::InvalidSpecificationException,
+            "[\"#{non_files.join "\", \""}\"] are not files"
+    end
+
+    if files.include? file_name then
+      raise Gem::InvalidSpecificationException,
+            "#{full_name} contains itself (#{file_name}), check your files list"
+    end
+
+    unless specification_version.is_a?(Integer)
+      raise Gem::InvalidSpecificationException,
+            'specification_version must be a Integer (did you mean version?)'
+    end
+
+    case platform
+    when Gem::Platform, Gem::Platform::RUBY then # ok
+    else
+      raise Gem::InvalidSpecificationException,
+            "invalid platform #{platform.inspect}, see Gem::Platform"
+    end
+
+    self.class.array_attributes.each do |field|
+      val = self.send field
+      klass = case field
+              when :dependencies
+                Gem::Dependency
+              else
+                String
+              end
+
+      unless Array === val and val.all? { |x| x.kind_of?(klass) } then
+        raise(Gem::InvalidSpecificationException,
+              "#{field} must be an Array of #{klass}")
+      end
+    end
+
+    [:authors].each do |field|
+      val = self.send field
+      raise Gem::InvalidSpecificationException, "#{field} may not be empty" if
+        val.empty?
+    end
+
+    unless Hash === metadata
+      raise Gem::InvalidSpecificationException,
+              'metadata must be a hash'
+    end
+
+    metadata.keys.each do |k|
+      if !k.kind_of?(String)
+        raise Gem::InvalidSpecificationException,
+                'metadata keys must be a String'
+      end
+
+      if k.size > 128
+        raise Gem::InvalidSpecificationException,
+                "metadata key too large (#{k.size} > 128)"
+      end
+    end
+
+    metadata.values.each do |k|
+      if !k.kind_of?(String)
+        raise Gem::InvalidSpecificationException,
+                'metadata values must be a String'
+      end
+
+      if k.size > 1024
+        raise Gem::InvalidSpecificationException,
+                "metadata value too large (#{k.size} > 1024)"
+      end
+    end
+
+    licenses.each { |license|
+      if license.length > 64
+        raise Gem::InvalidSpecificationException,
+          "each license must be 64 characters or less"
+      end
 
-  def validate_metadata
-    Gem::SpecificationPolicy.new(self).validate_metadata
+      if !Gem::Licenses.match?(license)
+        suggestions = Gem::Licenses.suggestions(license)
+        message = <<-warning
+license value '#{license}' is invalid.  Use a license identifier from
+http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
+        warning
+        message += "Did you mean #{suggestions.map { |s| "'#{s}'"}.join(', ')}?\n" unless suggestions.nil?
+        warning(message)
+      end
+    }
+
+    warning <<-warning if licenses.empty?
+licenses is empty, but is recommended.  Use a license identifier from
+http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
+    warning
+
+    validate_permissions
+
+    # reject lazy developers:
+
+    lazy = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '')
+
+    unless authors.grep(/FI XME|TO DO/x).empty? then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not an author"
+    end
+
+    unless Array(email).grep(/FI XME|TO DO/x).empty? then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not an email"
+    end
+
+    if description =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a description"
+    end
+
+    if summary =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
+    end
+
+    if homepage and not homepage.empty? and
+       homepage !~ /\A[a-z][a-z\d+.-]*:/i then
+      raise Gem::InvalidSpecificationException,
+            "\"#{homepage}\" is not a URI"
+    end
+
+    # Warnings
+
+    %w[author email homepage summary].each do |attribute|
+      value = self.send attribute
+      warning "no #{attribute} specified" if value.nil? or value.empty?
+    end
+
+    if description == summary then
+      warning 'description and summary are identical'
+    end
+
+    # TODO: raise at some given date
+    warning "deprecated autorequire specified" if autorequire
+
+    executables.each do |executable|
+      executable_path = File.join(bindir, executable)
+      shebang = File.read(executable_path, 2) == '#!'
+
+      warning "#{executable_path} is missing #! line" unless shebang
+    end
+
+    files.each do |file|
+      next unless File.symlink?(file)
+      warning "#{file} is a symlink, which is not supported on all platforms"
+    end
+
+    validate_dependencies
+
+    true
+  ensure
+    if $! or @warnings > 0 then
+      alert_warning "See http://guides.rubygems.org/specification-reference/ for help"
+    end
   end
 
   ##
   # Checks that dependencies use requirements as we recommend.  Warnings are
   # issued when dependencies are open-ended or overly strict for semantic
   # versioning.
-  def validate_dependencies
-    Gem::SpecificationPolicy.new(self).validate_dependencies
+
+  def validate_dependencies # :nodoc:
+    # NOTE: see REFACTOR note in Gem::Dependency about types - this might be brittle
+    seen = Gem::Dependency::TYPES.inject({}) { |types, type| types.merge({ type => {}}) }
+
+    error_messages = []
+    warning_messages = []
+    dependencies.each do |dep|
+      if prev = seen[dep.type][dep.name] then
+        error_messages << <<-MESSAGE
+duplicate dependency on #{dep}, (#{prev.requirement}) use:
+    add_#{dep.type}_dependency '#{dep.name}', '#{dep.requirement}', '#{prev.requirement}'
+        MESSAGE
+      end
+
+      seen[dep.type][dep.name] = dep
+
+      prerelease_dep = dep.requirements_list.any? do |req|
+        Gem::Requirement.new(req).prerelease?
+      end
+
+      warning_messages << "prerelease dependency on #{dep} is not recommended" if
+        prerelease_dep && !version.prerelease?
+
+      overly_strict = dep.requirement.requirements.length == 1 &&
+        dep.requirement.requirements.any? do |op, version|
+          op == '~>' and
+            not version.prerelease? and
+            version.segments.length > 2 and
+            version.segments.first != 0
+        end
+
+      if overly_strict then
+        _, dep_version = dep.requirement.requirements.first
+
+        base = dep_version.segments.first 2
+
+        warning_messages << <<-WARNING
+pessimistic dependency on #{dep} may be overly strict
+  if #{dep.name} is semantically versioned, use:
+    add_#{dep.type}_dependency '#{dep.name}', '~> #{base.join '.'}', '>= #{dep_version}'
+        WARNING
+      end
+
+      open_ended = dep.requirement.requirements.all? do |op, version|
+        not version.prerelease? and (op == '>' or op == '>=')
+      end
+
+      if open_ended then
+        op, dep_version = dep.requirement.requirements.first
+
+        base = dep_version.segments.first 2
+
+        bugfix = if op == '>' then
+                   ", '> #{dep_version}'"
+                 elsif op == '>=' and base != dep_version.segments then
+                   ", '>= #{dep_version}'"
+                 end
+
+        warning_messages << <<-WARNING
+open-ended dependency on #{dep} is not recommended
+  if #{dep.name} is semantically versioned, use:
+    add_#{dep.type}_dependency '#{dep.name}', '~> #{base.join '.'}'#{bugfix}
+        WARNING
+      end
+    end
+    if error_messages.any?
+      raise Gem::InvalidSpecificationException, error_messages.join
+    end
+    if warning_messages.any?
+      warning_messages.each { |warning_message| warning warning_message }
+    end
   end
 
   ##
   # Checks to see if the files to be packaged are world-readable.
+
   def validate_permissions
-    Gem::SpecificationPolicy.new(self).validate_permissions
+    return if Gem.win_platform?
+
+    files.each do |file|
+      next unless File.file?(file)
+      next if File.stat(file).mode & 0444 == 0444
+      warning "#{file} is not world-readable"
+    end
+
+    executables.each do |name|
+      exec = File.join @bindir, name
+      next unless File.file?(exec)
+      next if File.stat(exec).executable?
+      warning "#{exec} is not executable"
+    end
   end
 
   ##
@@ -2687,13 +2946,9 @@ class Gem::Specification < Gem::BasicSpecification
   # required_rubygems_version if +version+ indicates it is a
   # prerelease.
 
-  def version=(version)
+  def version= version
     @version = Gem::Version.create(version)
-    # skip to set required_ruby_version when pre-released rubygems.
-    # It caused to raise CircularDependencyError
-    if @version.prerelease? && (@name.nil? || @name.strip != "rubygems")
-      self.required_rubygems_version = '> 1.3.1'
-    end
+    self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
     invalidate_memoized_attributes
 
     return @version
@@ -2740,10 +2995,26 @@ class Gem::Specification < Gem::BasicSpecification
     @installed_by_version ||= nil
   end
 
+  def warning statement # :nodoc:
+    @warnings += 1
+
+    alert_warning statement
+  end
+
   def raw_require_paths # :nodoc:
     @require_paths
   end
 
+  extend Gem::Deprecate
+
+  # TODO:
+  # deprecate :has_rdoc,            :none,       2011, 10
+  # deprecate :has_rdoc?,           :none,       2011, 10
+  # deprecate :has_rdoc=,           :none,       2011, 10
+  # deprecate :default_executable,  :none,       2011, 10
+  # deprecate :default_executable=, :none,       2011, 10
+  # deprecate :file_name,           :cache_file, 2011, 10
+  # deprecate :full_gem_path,     :cache_file, 2011, 10
 end
 
 # DOC: What is this and why is it here, randomly, at the end of this file?
diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb
deleted file mode 100644
index 4b79c1ac61..0000000000
--- a/lib/rubygems/specification_policy.rb
+++ /dev/null
@@ -1,407 +0,0 @@
-require 'delegate'
-require 'uri'
-
-class Gem::SpecificationPolicy < SimpleDelegator
-  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc:
-
-  SPECIAL_CHARACTERS = /\A[#{Regexp.escape('.-_')}]+/.freeze # :nodoc:
-
-  VALID_URI_PATTERN = %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z}.freeze  # :nodoc:
-
-  METADATA_LINK_KEYS = %w[
-    bug_tracker_uri
-    changelog_uri
-    documentation_uri
-    homepage_uri
-    mailing_list_uri
-    source_code_uri
-    wiki_uri
-  ].freeze # :nodoc:
-
-  def initialize(specification)
-    @warnings = 0
-
-    super(specification)
-  end
-
-  ##
-  # If set to true, run packaging-specific checks, as well.
-
-  attr_accessor :packaging
-
-  ##
-  # Checks that the specification contains all required fields, and does a
-  # very basic sanity check.
-  #
-  # Raises InvalidSpecificationException if the spec does not pass the
-  # checks.
-
-  def validate(strict = false)
-    validate_nil_attributes
-
-    validate_rubygems_version
-
-    validate_required_attributes
-
-    validate_name
-
-    validate_require_paths
-
-    keep_only_files_and_directories
-
-    validate_non_files
-
-    validate_self_inclusion_in_files_list
-
-    validate_specification_version
-
-    validate_platform
-
-    validate_array_attributes
-
-    validate_authors_field
-
-    validate_metadata
-
-    validate_licenses
-
-    validate_permissions
-
-    validate_lazy_metadata
-
-    validate_values
-
-    validate_dependencies
-
-    if @warnings > 0
-      if strict
-        error "specification has warnings"
-      else
-        alert_warning help_text
-      end
-    end
-
-    true
-  end
-
-  ##
-  # Implementation for Specification#validate_metadata
-
-  def validate_metadata
-    unless Hash === metadata
-      error 'metadata must be a hash'
-    end
-
-    metadata.each do |key, value|
-      if !key.kind_of?(String)
-        error "metadata keys must be a String"
-      end
-
-      if key.size > 128
-        error "metadata key too large (#{key.size} > 128)"
-      end
-
-      if !value.kind_of?(String)
-        error "metadata values must be a String"
-      end
-
-      if value.size > 1024
-        error "metadata value too large (#{value.size} > 1024)"
-      end
-
-      if METADATA_LINK_KEYS.include? key
-        if value !~ VALID_URI_PATTERN
-          error "metadata['#{key}'] has invalid link: #{value.inspect}"
-        end
-      end
-    end
-  end
-
-  ##
-  # Implementation for Specification#validate_dependencies
-
-  def validate_dependencies # :nodoc:
-    # NOTE: see REFACTOR note in Gem::Dependency about types - this might be brittle
-    seen = Gem::Dependency::TYPES.inject({}) { |types, type| types.merge({ type => {}}) }
-
-    error_messages = []
-    warning_messages = []
-    dependencies.each do |dep|
-      if prev = seen[dep.type][dep.name]
-        error_messages << <<-MESSAGE
-duplicate dependency on #{dep}, (#{prev.requirement}) use:
-    add_#{dep.type}_dependency '#{dep.name}', '#{dep.requirement}', '#{prev.requirement}'
-        MESSAGE
-      end
-
-      seen[dep.type][dep.name] = dep
-
-      prerelease_dep = dep.requirements_list.any? do |req|
-        Gem::Requirement.new(req).prerelease?
-      end
-
-      warning_messages << "prerelease dependency on #{dep} is not recommended" if
-          prerelease_dep && !version.prerelease?
-
-      open_ended = dep.requirement.requirements.all? do |op, version|
-        not version.prerelease? and (op == '>' or op == '>=')
-      end
-
-      if open_ended
-        op, dep_version = dep.requirement.requirements.first
-
-        segments = dep_version.segments
-
-        base = segments.first 2
-
-        recommendation = if (op == '>' || op == '>=') && segments == [0]
-                           "  use a bounded requirement, such as '~> x.y'"
-                         else
-                           bugfix = if op == '>'
-                                      ", '> #{dep_version}'"
-                                    elsif op == '>=' and base != segments
-                                      ", '>= #{dep_version}'"
-                                    end
-
-                           "  if #{dep.name} is semantically versioned, use:\n" \
-                           "    add_#{dep.type}_dependency '#{dep.name}', '~> #{base.join '.'}'#{bugfix}"
-                         end
-
-        warning_messages << ["open-ended dependency on #{dep} is not recommended", recommendation].join("\n") + "\n"
-      end
-    end
-    if error_messages.any?
-      error error_messages.join
-    end
-    if warning_messages.any?
-      warning_messages.each { |warning_message| warning warning_message }
-    end
-  end
-
-  ##
-  # Issues a warning for each file to be packaged which is world-readable.
-  #
-  # Implementation for Specification#validate_permissions
-
-  def validate_permissions
-    return if Gem.win_platform?
-
-    files.each do |file|
-      next unless File.file?(file)
-      next if File.stat(file).mode & 0444 == 0444
-      warning "#{file} is not world-readable"
-    end
-
-    executables.each do |name|
-      exec = File.join bindir, name
-      next unless File.file?(exec)
-      next if File.stat(exec).executable?
-      warning "#{exec} is not executable"
-    end
-  end
-
-  private
-
-  def validate_nil_attributes
-    nil_attributes = Gem::Specification.non_nil_attributes.select do |attrname|
-      __getobj__.instance_variable_get("@#{attrname}").nil?
-    end
-    return if nil_attributes.empty?
-    error "#{nil_attributes.join ', '} must not be nil"
-  end
-
-  def validate_rubygems_version
-    return unless packaging
-    return if rubygems_version == Gem::VERSION
-
-    error "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
-  end
-
-  def validate_required_attributes
-    Gem::Specification.required_attributes.each do |symbol|
-      unless send symbol
-        error "missing value for attribute #{symbol}"
-      end
-    end
-  end
-
-  def validate_name
-    if !name.is_a?(String)
-      error "invalid value for attribute name: \"#{name.inspect}\" must be a string"
-    elsif name !~ /[a-zA-Z]/
-      error "invalid value for attribute name: #{name.dump} must include at least one letter"
-    elsif name !~ VALID_NAME_PATTERN
-      error "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores"
-    elsif name =~ SPECIAL_CHARACTERS
-      error "invalid value for attribute name: #{name.dump} can not begin with a period, dash, or underscore"
-    end
-  end
-
-  def validate_require_paths
-    return unless raw_require_paths.empty?
-
-    error 'specification must have at least one require_path'
-  end
-
-  def validate_non_files
-    return unless packaging
-    non_files = files.reject {|x| File.file?(x) || File.symlink?(x)}
-
-    unless non_files.empty?
-      error "[\"#{non_files.join "\", \""}\"] are not files"
-    end
-  end
-
-  def validate_self_inclusion_in_files_list
-    return unless files.include?(file_name)
-
-    error "#{full_name} contains itself (#{file_name}), check your files list"
-  end
-
-  def validate_specification_version
-    return if specification_version.is_a?(Integer)
-
-    error 'specification_version must be an Integer (did you mean version?)'
-  end
-
-  def validate_platform
-    case platform
-    when Gem::Platform, Gem::Platform::RUBY  # ok
-    else
-      error "invalid platform #{platform.inspect}, see Gem::Platform"
-    end
-  end
-
-  def validate_array_attributes
-    Gem::Specification.array_attributes.each do |field|
-      validate_array_attribute(field)
-    end
-  end
-
-  def validate_array_attribute(field)
-    val = self.send(field)
-    klass = case field
-            when :dependencies then
-              Gem::Dependency
-            else
-              String
-            end
-
-    unless Array === val and val.all? {|x| x.kind_of?(klass)}
-      raise(Gem::InvalidSpecificationException,
-            "#{field} must be an Array of #{klass}")
-    end
-  end
-
-  def validate_authors_field
-    return unless authors.empty?
-
-    error "authors may not be empty"
-  end
-
-  def validate_licenses
-    licenses.each { |license|
-      if license.length > 64
-        error "each license must be 64 characters or less"
-      end
-
-      if !Gem::Licenses.match?(license)
-        suggestions = Gem::Licenses.suggestions(license)
-        message = <<-warning
-license value '#{license}' is invalid.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
-        warning
-        message += "Did you mean #{suggestions.map { |s| "'#{s}'"}.join(', ')}?\n" unless suggestions.nil?
-        warning(message)
-      end
-    }
-
-    warning <<-warning if licenses.empty?
-licenses is empty, but is recommended.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
-    warning
-  end
-
-  LAZY = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '')
-  LAZY_PATTERN = /FI XME|TO DO/x.freeze
-  HOMEPAGE_URI_PATTERN = /\A[a-z][a-z\d+.-]*:/i.freeze
-
-  def validate_lazy_metadata
-    unless authors.grep(LAZY_PATTERN).empty?
-      error "#{LAZY} is not an author"
-    end
-
-    unless Array(email).grep(LAZY_PATTERN).empty?
-      error "#{LAZY} is not an email"
-    end
-
-    if description =~ LAZY_PATTERN
-      error "#{LAZY} is not a description"
-    end
-
-    if summary =~ LAZY_PATTERN
-      error "#{LAZY} is not a summary"
-    end
-
-    # Make sure a homepage is valid HTTP/HTTPS URI
-    if homepage and not homepage.empty?
-      begin
-        homepage_uri = URI.parse(homepage)
-        unless [URI::HTTP, URI::HTTPS].member? homepage_uri.class
-          error "\"#{homepage}\" is not a valid HTTP URI"
-        end
-      rescue URI::InvalidURIError
-        error "\"#{homepage}\" is not a valid HTTP URI"
-      end
-    end
-  end
-
-  def validate_values
-    %w[author homepage summary files].each do |attribute|
-      validate_attribute_present(attribute)
-    end
-
-    if description == summary
-      warning "description and summary are identical"
-    end
-
-    # TODO: raise at some given date
-    warning "deprecated autorequire specified" if autorequire
-
-    executables.each do |executable|
-      validate_shebang_line_in(executable)
-    end
-
-    files.select { |f| File.symlink?(f) }.each do |file|
-      warning "#{file} is a symlink, which is not supported on all platforms"
-    end
-  end
-
-  def validate_attribute_present(attribute)
-    value = self.send attribute
-    warning("no #{attribute} specified") if value.nil? || value.empty?
-  end
-
-  def validate_shebang_line_in(executable)
-    executable_path = File.join(bindir, executable)
-    return if File.read(executable_path, 2) == '#!'
-
-    warning "#{executable_path} is missing #! line"
-  end
-
-  def warning(statement) # :nodoc:
-    @warnings += 1
-
-    alert_warning statement
-  end
-
-  def error(statement) # :nodoc:
-    raise Gem::InvalidSpecificationException, statement
-  ensure
-    alert_warning help_text
-  end
-
-  def help_text # :nodoc:
-    "See http://guides.rubygems.org/specification-reference/ for help"
-  end
-end
diff --git a/lib/rubygems/stub_specification.rb b/lib/rubygems/stub_specification.rb
index 022da9185d..1c56a102c5 100644
--- a/lib/rubygems/stub_specification.rb
+++ b/lib/rubygems/stub_specification.rb
@@ -6,10 +6,14 @@
 
 class Gem::StubSpecification < Gem::BasicSpecification
   # :nodoc:
-  PREFIX = "# stub: ".freeze
+  PREFIX = "# stub: "
 
-  # :nodoc:
-  OPEN_MODE = 'r:UTF-8:-'.freeze
+  OPEN_MODE = # :nodoc:
+    if Object.const_defined? :Encoding then
+      'r:UTF-8:-'
+    else
+      'r'
+    end
 
   class StubLine # :nodoc: all
     attr_reader :name, :version, :platform, :require_paths, :extensions,
@@ -22,7 +26,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
       'lib'  => 'lib'.freeze,
       'test' => 'test'.freeze,
       'ext'  => 'ext'.freeze,
-    }.freeze
+    }
 
     # These are common require path lists.  This hash is used to optimize
     # and consolidate require_path objects.  Most specs just specify "lib"
@@ -30,17 +34,12 @@ class Gem::StubSpecification < Gem::BasicSpecification
     # a require path list for that case.
     REQUIRE_PATH_LIST = { # :nodoc:
       'lib' => ['lib'].freeze
-    }.freeze
+    }
 
-    def initialize(data, extensions)
+    def initialize data, extensions
       parts          = data[PREFIX.length..-1].split(" ".freeze, 4)
       @name          = parts[0].freeze
-      @version       = if Gem::Version.correct?(parts[1])
-                         Gem::Version.new(parts[1])
-                       else
-                         Gem::Version.new(0)
-                       end
-
+      @version       = Gem::Version.new parts[1]
       @platform      = Gem::Platform.new parts[2]
       @extensions    = extensions
       @full_name     = if platform == Gem::Platform::RUBY
@@ -56,17 +55,17 @@ class Gem::StubSpecification < Gem::BasicSpecification
     end
   end
 
-  def self.default_gemspec_stub(filename, base_dir, gems_dir)
+  def self.default_gemspec_stub filename, base_dir, gems_dir
     new filename, base_dir, gems_dir, true
   end
 
-  def self.gemspec_stub(filename, base_dir, gems_dir)
+  def self.gemspec_stub filename, base_dir, gems_dir
     new filename, base_dir, gems_dir, false
   end
 
   attr_reader :base_dir, :gems_dir
 
-  def initialize(filename, base_dir, gems_dir, default_gem)
+  def initialize filename, base_dir, gems_dir, default_gem
     super()
     filename.untaint
 
@@ -109,13 +108,11 @@ class Gem::StubSpecification < Gem::BasicSpecification
     unless @data
       begin
         saved_lineno = $.
-
-        # TODO It should be use `File.open`, but bundler-1.16.1 example expects Kernel#open.
         open loaded_from, OPEN_MODE do |file|
           begin
             file.readline # discard encoding line
             stubline = file.readline.chomp
-            if stubline.start_with?(PREFIX)
+            if stubline.start_with?(PREFIX) then
               extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
                              $'.split "\0"
                            else
@@ -185,9 +182,10 @@ class Gem::StubSpecification < Gem::BasicSpecification
   # The full Gem::Specification for this gem, loaded from evalling its gemspec
 
   def to_spec
-    @spec ||= if @data
-                loaded = Gem.loaded_specs[name]
-                loaded if loaded && loaded.version == version
+    @spec ||= if @data then
+                Gem.loaded_specs.values.find { |spec|
+                  spec.name == name and spec.version == version
+                }
               end
 
     @spec ||= Gem::Specification.load(loaded_from)
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index a93f749240..f7ae97cd8d 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -2,7 +2,7 @@
 # TODO: $SAFE = 1
 
 begin
-  gem 'minitest', '~> 5.0'
+  gem 'minitest', '~> 4.0'
 rescue NoMethodError, Gem::LoadError
   # for ruby tests
 end
@@ -13,30 +13,11 @@ else
   require 'rubygems'
 end
 
-# If bundler gemspec exists, add to stubs
-bundler_gemspec = File.expand_path("../../../bundler/bundler.gemspec", __FILE__)
-if File.exist?(bundler_gemspec)
-  Gem::Specification.dirs.unshift File.dirname(bundler_gemspec)
-  Gem::Specification.class_variable_set :@@stubs, nil
-  Gem::Specification.stubs
-  Gem::Specification.dirs.shift
-end
-
 begin
   gem 'minitest'
 rescue Gem::LoadError
 end
 
-begin
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/test/"
-    add_filter "/bundler/"
-    add_filter "/lib/rubygems/resolver/molinillo"
-  end
-rescue LoadError
-end
-
 # We have to load these up front because otherwise we'll try to load
 # them while we're testing rubygems, and thus we can't actually load them.
 unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
@@ -44,9 +25,6 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
   gem 'json'
 end
 
-if Gem::USE_BUNDLER_FOR_GEMDEPS
-  require 'bundler'
-end
 require 'minitest/autorun'
 
 require 'rubygems/deprecate'
@@ -84,7 +62,7 @@ module Gem
   # Allows setting path to Ruby.  This method is available when requiring
   # 'rubygems/test_case'
 
-  def self.ruby=(ruby)
+  def self.ruby= ruby
     @ruby = ruby
   end
 
@@ -105,9 +83,7 @@ end
 #
 # Tests are always run at a safe level of 1.
 
-class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
-
-  extend Gem::Deprecate
+class Gem::TestCase < MiniTest::Unit::TestCase
 
   attr_accessor :fetcher # :nodoc:
 
@@ -115,7 +91,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
   attr_accessor :uri # :nodoc:
 
-  def assert_activate(expected, *specs)
+  def assert_activate expected, *specs
     specs.each do |spec|
       case spec
       when String then
@@ -133,7 +109,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   end
 
   # TODO: move to minitest
-  def assert_path_exists(path, msg = nil)
+  def assert_path_exists path, msg = nil
     msg = message(msg) { "Expected path '#{path}' to exist" }
     assert File.exist?(path), msg
   end
@@ -142,13 +118,13 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   # Sets the ENABLE_SHARED entry in RbConfig::CONFIG to +value+ and restores
   # the original value when the block ends
 
-  def enable_shared(value)
+  def enable_shared value
     enable_shared = RbConfig::CONFIG['ENABLE_SHARED']
     RbConfig::CONFIG['ENABLE_SHARED'] = value
 
     yield
   ensure
-    if enable_shared
+    if enable_shared then
       RbConfig::CONFIG['enable_shared'] = enable_shared
     else
       RbConfig::CONFIG.delete 'enable_shared'
@@ -156,7 +132,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   end
 
   # TODO: move to minitest
-  def refute_path_exists(path, msg = nil)
+  def refute_path_exists path, msg = nil
     msg = message(msg) { "Expected path '#{path}' to not exist" }
     refute File.exist?(path), msg
   end
@@ -246,7 +222,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     @orig_gem_vendor = ENV['GEM_VENDOR']
     @orig_gem_spec_cache = ENV['GEM_SPEC_CACHE']
     @orig_rubygems_gemdeps = ENV['RUBYGEMS_GEMDEPS']
-    @orig_bundle_gemfile   = ENV['BUNDLE_GEMFILE']
     @orig_rubygems_host = ENV['RUBYGEMS_HOST']
     ENV.keys.find_all { |k| k.start_with?('GEM_REQUIREMENT_') }.each do |k|
       ENV.delete k
@@ -254,24 +229,15 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     @orig_gem_env_requirements = ENV.to_hash
 
     ENV['GEM_VENDOR'] = nil
-    ENV['SOURCE_DATE_EPOCH'] = nil
 
     @current_dir = Dir.pwd
     @fetcher     = nil
-
-    if Gem::USE_BUNDLER_FOR_GEMDEPS
-      Bundler.ui                     = Bundler::UI::Silent.new
-    end
-    @back_ui                       = Gem::DefaultUserInteraction.ui
-    @ui                            = Gem::MockGemUi.new
-    # This needs to be a new instance since we call use_ui(@ui) when we want to
-    # capture output
-    Gem::DefaultUserInteraction.ui = Gem::MockGemUi.new
+    @ui          = Gem::MockGemUi.new
 
     tmpdir = File.expand_path Dir.tmpdir
     tmpdir.untaint
 
-    if ENV['KEEP_FILES']
+    if ENV['KEEP_FILES'] then
       @tempdir = File.join(tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}")
     else
       @tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
@@ -305,7 +271,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     @userhome = File.join @tempdir, 'userhome'
     ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache'
 
-    @orig_ruby = if ENV['RUBY']
+    @orig_ruby = if ENV['RUBY'] then
                    ruby = Gem.ruby
                    Gem.ruby = ENV['RUBY']
                    ruby
@@ -317,16 +283,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
     @orig_LOAD_PATH = $LOAD_PATH.dup
     $LOAD_PATH.map! { |s|
-      expand_path = File.expand_path(s)
-      if expand_path != s
-        expand_path.untaint
-        if s.instance_variable_defined?(:@gem_prelude_index)
-          expand_path.instance_variable_set(:@gem_prelude_index, expand_path)
-        end
-        expand_path.freeze if s.frozen?
-        s = expand_path
-      end
-      s
+      (expand_path = File.expand_path(s)) == s ? s : expand_path.untaint
     }
 
     Dir.chdir @tempdir
@@ -366,9 +323,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     Gem.loaded_specs.clear
     Gem.clear_default_specs
     Gem::Specification.unresolved_deps.clear
-    if Gem::USE_BUNDLER_FOR_GEMDEPS
-      Bundler.reset!
-    end
 
     Gem.configuration.verbose = true
     Gem.configuration.update_sources = true
@@ -392,11 +346,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
       util_set_arch 'i686-darwin8.10.1'
     end
 
-    @orig_hooks = {}
-    %w[post_install_hooks done_installing_hooks post_uninstall_hooks pre_uninstall_hooks pre_install_hooks pre_reset_hooks post_reset_hooks post_build_hooks].each do |name|
-      @orig_hooks[name] = Gem.send(name).dup
-    end
-
     @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
     @orig_LOADED_FEATURES = $LOADED_FEATURES.dup
   end
@@ -427,7 +376,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     end
     RbConfig::CONFIG['arch'] = @orig_arch
 
-    if defined? Gem::RemoteFetcher
+    if defined? Gem::RemoteFetcher then
       Gem::RemoteFetcher.fetcher = nil
     end
 
@@ -445,12 +394,11 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     ENV['GEM_VENDOR'] = @orig_gem_vendor
     ENV['GEM_SPEC_CACHE'] = @orig_gem_spec_cache
     ENV['RUBYGEMS_GEMDEPS'] = @orig_rubygems_gemdeps
-    ENV['BUNDLE_GEMFILE']   = @orig_bundle_gemfile
     ENV['RUBYGEMS_HOST'] = @orig_rubygems_host
 
     Gem.ruby = @orig_ruby if @orig_ruby
 
-    if @orig_ENV_HOME
+    if @orig_ENV_HOME then
       ENV['HOME'] = @orig_ENV_HOME
     else
       ENV.delete 'HOME'
@@ -462,13 +410,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
     Gem::Specification._clear_load_cache
     Gem::Specification.unresolved_deps.clear
-    Gem::refresh
-
-    @orig_hooks.each do |name, hooks|
-      Gem.send(name).replace hooks
-    end
-
-    @back_ui.close
   end
 
   def common_installer_setup
@@ -514,7 +455,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   #
   # Yields the +specification+ to the block, if given
 
-  def git_gem(name = 'a', version = 1)
+  def git_gem name = 'a', version = 1
     have_git?
 
     directory = File.join 'git', name
@@ -528,14 +469,14 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
     gemspec = "#{name}.gemspec"
 
-    File.open File.join(directory, gemspec), 'w' do |io|
+    open File.join(directory, gemspec), 'w' do |io|
       io.write git_spec.to_ruby
     end
 
     head = nil
 
     Dir.chdir directory do
-      unless File.exist? '.git'
+      unless File.exist? '.git' then
         system @git, 'init', '--quiet'
         system @git, 'config', 'user.name',  'RubyGems Tests'
         system @git, 'config', 'user.email', 'rubygems@example'
@@ -543,7 +484,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
       system @git, 'add', gemspec
       system @git, 'commit', '-a', '-m', 'a non-empty commit message', '--quiet'
-      head = Gem::Util.popen(@git, 'rev-parse', 'master').strip
+      head = Gem::Util.popen('git', 'rev-parse', 'master').strip
     end
 
     return name, git_spec.version, directory, head
@@ -558,7 +499,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     skip 'cannot find git executable, use GIT environment variable to set'
   end
 
-  def in_path?(executable) # :nodoc:
+  def in_path? executable # :nodoc:
     return true if %r%\A([A-Z]:|/)% =~ executable and File.exist? executable
 
     ENV['PATH'].split(File::PATH_SEPARATOR).any? do |directory|
@@ -569,12 +510,12 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   ##
   # Builds and installs the Gem::Specification +spec+
 
-  def install_gem(spec, options = {})
+  def install_gem spec, options = {}
     require 'rubygems/installer'
 
     gem = File.join @tempdir, "gems", "#{spec.full_name}.gem"
 
-    unless File.exist? gem
+    unless File.exist? gem then
       use_ui Gem::MockGemUi.new do
         Dir.chdir @tempdir do
           Gem::Package.build spec
@@ -590,17 +531,17 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   ##
   # Builds and installs the Gem::Specification +spec+ into the user dir
 
-  def install_gem_user(spec)
+  def install_gem_user spec
     install_gem spec, :user_install => true
   end
 
   ##
   # Uninstalls the Gem::Specification +spec+
-  def uninstall_gem(spec)
+  def uninstall_gem spec
     require 'rubygems/uninstaller'
 
     Class.new(Gem::Uninstaller) {
-      def ask_if_ok(spec)
+      def ask_if_ok spec
         true
       end
     }.new(spec.name, :executables => true, :user_install => true).uninstall
@@ -624,7 +565,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   def mu_pp(obj)
     s = String.new
     s = PP.pp obj, s
-    s = s.force_encoding(Encoding.default_external)
+    s = s.force_encoding(Encoding.default_external) if defined? Encoding
     s.chomp
   end
 
@@ -632,7 +573,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   # Reads a Marshal file at +path+
 
   def read_cache(path)
-    File.open path.dup.untaint, 'rb' do |io|
+    open path.dup.untaint, 'rb' do |io|
       Marshal.load io.read
     end
   end
@@ -652,7 +593,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     dir = File.dirname path
     FileUtils.mkdir_p dir unless File.directory? dir
 
-    File.open path, 'wb' do |io|
+    open path, 'wb' do |io|
       yield io if block_given?
     end
 
@@ -703,13 +644,11 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   end
 
   ##
-  # TODO:  remove in RubyGems 4.0
+  # TODO:  remove in RubyGems 3.0
 
-  def quick_spec(name, version = '2') # :nodoc:
+  def quick_spec name, version = '2' # :nodoc:
     util_spec name, version
   end
-  deprecate :quick_spec, :util_spec, 2018, 12
-
 
   ##
   # Builds a gem from +spec+ and places it in <tt>File.join @gemhome,
@@ -769,7 +708,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     install_default_specs(*specs)
 
     specs.each do |spec|
-      File.open spec.loaded_from, 'w' do |io|
+      open spec.loaded_from, 'w' do |io|
         io.write spec.to_ruby_for_cache
       end
     end
@@ -798,18 +737,15 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     old_loaded_features = $LOADED_FEATURES.dup
     yield
   ensure
-    prefix = File.dirname(__FILE__) + "/"
-    new_features = ($LOADED_FEATURES - old_loaded_features)
-    old_loaded_features.concat(new_features.select {|f| f.rindex(prefix, 0)})
     $LOADED_FEATURES.replace old_loaded_features
   end
 
   ##
   # new_spec is deprecated as it is never used.
   #
-  # TODO:  remove in RubyGems 4.0
+  # TODO:  remove in RubyGems 3.0
 
-  def new_spec(name, version, deps = nil, *files) # :nodoc:
+  def new_spec name, version, deps = nil, *files # :nodoc:
     require 'rubygems/specification'
 
     spec = Gem::Specification.new do |s|
@@ -833,7 +769,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
     spec.loaded_from = spec.spec_file
 
-    unless files.empty?
+    unless files.empty? then
       write_file spec.spec_file do |io|
         io.write spec.to_ruby_for_cache
       end
@@ -848,7 +784,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
     spec
   end
-  deprecate :new_spec, :none, 2018, 12
 
   def new_default_spec(name, version, deps = nil, *files)
     spec = util_spec name, version, deps
@@ -873,7 +808,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
   # Creates a spec with +name+, +version+.  +deps+ can specify the dependency
   # or a +block+ can be given for full customization of the specification.
 
-  def util_spec(name, version = 2, deps = nil, *files) # :yields: specification
+  def util_spec name, version = 2, deps = nil # :yields: specification
     raise "deps or block, not both" if deps and block_given?
 
     spec = Gem::Specification.new do |s|
@@ -886,12 +821,10 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
       s.summary     = "this is a summary"
       s.description = "This is a test description"
 
-      s.files.push(*files) unless files.empty?
-
       yield s if block_given?
     end
 
-    if deps
+    if deps then
       # Since Hash#each is unordered in 1.8, sort the keys and iterate that
       # way so the tests are deterministic on all implementations.
       deps.keys.sort.each do |n|
@@ -899,19 +832,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
       end
     end
 
-    unless files.empty?
-      write_file spec.spec_file do |io|
-        io.write spec.to_ruby_for_cache
-      end
-
-      util_build_gem spec
-
-      cache_file = File.join @tempdir, 'gems', "#{spec.full_name}.gem"
-      FileUtils.mkdir_p File.dirname cache_file
-      FileUtils.mv spec.cache_file, cache_file
-      FileUtils.rm spec.spec_file
-    end
-
     Gem::Specification.reset
 
     return spec
@@ -927,7 +847,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     # TODO: deprecate
     raise "deps or block, not both" if deps and block
 
-    if deps
+    if deps then
       block = proc do |s|
         # Since Hash#each is unordered in 1.8, sort
         # the keys and iterate that way so the tests are
@@ -1123,7 +1043,7 @@ Also, a list:
     end
 
     # HACK for test_download_to_cache
-    unless Gem::RemoteFetcher === @fetcher
+    unless Gem::RemoteFetcher === @fetcher then
       v = Gem.marshal_version
 
       specs = all.map { |spec| spec.name_tuple }
@@ -1162,51 +1082,35 @@ Also, a list:
     Zlib::Deflate.deflate data
   end
 
-  def util_set_RUBY_VERSION(version, patchlevel = nil, revision = nil, description = nil, engine = "ruby", engine_version = nil)
+  def util_set_RUBY_VERSION(version, patchlevel = nil, revision = nil)
     if Gem.instance_variables.include? :@ruby_version or
-       Gem.instance_variables.include? '@ruby_version'
+       Gem.instance_variables.include? '@ruby_version' then
       Gem.send :remove_instance_variable, :@ruby_version
     end
 
-    @RUBY_VERSION        = RUBY_VERSION
-    @RUBY_PATCHLEVEL     = RUBY_PATCHLEVEL     if defined?(RUBY_PATCHLEVEL)
-    @RUBY_REVISION       = RUBY_REVISION       if defined?(RUBY_REVISION)
-    @RUBY_DESCRIPTION    = RUBY_DESCRIPTION    if defined?(RUBY_DESCRIPTION)
-    @RUBY_ENGINE         = RUBY_ENGINE
-    @RUBY_ENGINE_VERSION = RUBY_ENGINE_VERSION if defined?(RUBY_ENGINE_VERSION)
+    @RUBY_VERSION    = RUBY_VERSION
+    @RUBY_PATCHLEVEL = RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
+    @RUBY_REVISION   = RUBY_REVISION   if defined?(RUBY_REVISION)
 
-    util_clear_RUBY_VERSION
+    Object.send :remove_const, :RUBY_VERSION
+    Object.send :remove_const, :RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
+    Object.send :remove_const, :RUBY_REVISION   if defined?(RUBY_REVISION)
 
-    Object.const_set :RUBY_VERSION,        version
-    Object.const_set :RUBY_PATCHLEVEL,     patchlevel     if patchlevel
-    Object.const_set :RUBY_REVISION,       revision       if revision
-    Object.const_set :RUBY_DESCRIPTION,    description    if description
-    Object.const_set :RUBY_ENGINE,         engine
-    Object.const_set :RUBY_ENGINE_VERSION, engine_version if engine_version
+    Object.const_set :RUBY_VERSION,    version
+    Object.const_set :RUBY_PATCHLEVEL, patchlevel if patchlevel
+    Object.const_set :RUBY_REVISION,   revision   if revision
   end
 
   def util_restore_RUBY_VERSION
-    util_clear_RUBY_VERSION
+    Object.send :remove_const, :RUBY_VERSION
+    Object.send :remove_const, :RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
+    Object.send :remove_const, :RUBY_REVISION   if defined?(RUBY_REVISION)
 
-    Object.const_set :RUBY_VERSION,        @RUBY_VERSION
-    Object.const_set :RUBY_PATCHLEVEL,     @RUBY_PATCHLEVEL  if
+    Object.const_set :RUBY_VERSION,    @RUBY_VERSION
+    Object.const_set :RUBY_PATCHLEVEL, @RUBY_PATCHLEVEL if
       defined?(@RUBY_PATCHLEVEL)
-    Object.const_set :RUBY_REVISION,       @RUBY_REVISION    if
+    Object.const_set :RUBY_REVISION,   @RUBY_REVISION   if
       defined?(@RUBY_REVISION)
-    Object.const_set :RUBY_DESCRIPTION,    @RUBY_DESCRIPTION if
-      defined?(@RUBY_DESCRIPTION)
-    Object.const_set :RUBY_ENGINE,         @RUBY_ENGINE
-    Object.const_set :RUBY_ENGINE_VERSION, @RUBY_ENGINE_VERSION if
-      defined?(@RUBY_ENGINE_VERSION)
-  end
-
-  def util_clear_RUBY_VERSION
-    Object.send :remove_const, :RUBY_VERSION
-    Object.send :remove_const, :RUBY_PATCHLEVEL     if defined?(RUBY_PATCHLEVEL)
-    Object.send :remove_const, :RUBY_REVISION       if defined?(RUBY_REVISION)
-    Object.send :remove_const, :RUBY_DESCRIPTION    if defined?(RUBY_DESCRIPTION)
-    Object.send :remove_const, :RUBY_ENGINE
-    Object.send :remove_const, :RUBY_ENGINE_VERSION if defined?(RUBY_ENGINE_VERSION)
   end
 
   ##
@@ -1336,31 +1240,14 @@ Also, a list:
     end
   end
 
-  class << self
-    # :nodoc:
-    ##
-    # Return the join path, with escaping backticks, dollars, and
-    # double-quotes.  Unlike `shellescape`, equal-sign is not escaped.
-    private
-    def escape_path(*path)
-      path = File.join(*path)
-      if %r'\A[-+:/=@,.\w]+\z' =~ path
-        path
-      else
-        "\"#{path.gsub(/[`$"]/, '\\&')}\""
-      end
-    end
-  end
-
   @@ruby = rubybin
-  gempath = File.expand_path('../../../test/rubygems', __FILE__)
-  @@good_rake = "#{rubybin} #{escape_path(gempath, 'good_rake.rb')}"
-  @@bad_rake = "#{rubybin} #{escape_path(gempath, 'bad_rake.rb')}"
+  @@good_rake = "#{rubybin} \"#{File.expand_path('../../../test/rubygems/good_rake.rb', __FILE__)}\""
+  @@bad_rake = "#{rubybin} \"#{File.expand_path('../../../test/rubygems/bad_rake.rb', __FILE__)}\""
 
   ##
   # Construct a new Gem::Dependency.
 
-  def dep(name, *requirements)
+  def dep name, *requirements
     Gem::Dependency.new name, *requirements
   end
 
@@ -1369,10 +1256,10 @@ Also, a list:
   # Gem::Dependency +dep+, a +from_name+ and +from_version+ requesting the
   # dependency and a +parent+ DependencyRequest
 
-  def dependency_request(dep, from_name, from_version, parent = nil)
+  def dependency_request dep, from_name, from_version, parent = nil
     remote = Gem::Source.new @uri
 
-    unless parent
+    unless parent then
       parent_dep = dep from_name, from_version
       parent = Gem::Resolver::DependencyRequest.new parent_dep, nil
     end
@@ -1387,7 +1274,7 @@ Also, a list:
   ##
   # Constructs a new Gem::Requirement.
 
-  def req(*requirements)
+  def req *requirements
     return requirements.first if Gem::Requirement === requirements.first
     Gem::Requirement.create requirements
   end
@@ -1395,7 +1282,7 @@ Also, a list:
   ##
   # Constructs a new Gem::Specification.
 
-  def spec(name, version, &block)
+  def spec name, version, &block
     Gem::Specification.new name, v(version), &block
   end
 
@@ -1419,7 +1306,7 @@ Also, a list:
   #     end
   #   end
 
-  def spec_fetcher(repository = @gem_repo)
+  def spec_fetcher repository = @gem_repo
     Gem::TestCase::SpecFetcherSetup.declare self, repository do |spec_fetcher_setup|
       yield spec_fetcher_setup if block_given?
     end
@@ -1428,7 +1315,7 @@ Also, a list:
   ##
   # Construct a new Gem::Version.
 
-  def v(string)
+  def v string
     Gem::Version.create string
   end
 
@@ -1438,7 +1325,7 @@ Also, a list:
   #
   # Yields the +specification+ to the block, if given
 
-  def vendor_gem(name = 'a', version = 1)
+  def vendor_gem name = 'a', version = 1
     directory = File.join 'vendor', name
 
     FileUtils.mkdir_p directory
@@ -1447,17 +1334,17 @@ Also, a list:
   end
 
   ##
-  # create_gemspec creates gem specification in given +directory+ or '.'
+  # create_gemspec creates gem specification in given +direcotry+ or '.'
   # for the given +name+ and +version+.
   #
   # Yields the +specification+ to the block, if given
 
-  def save_gemspec(name = 'a', version = 1, directory = '.')
+  def save_gemspec name = 'a', version = 1, directory = '.'
     vendor_spec = Gem::Specification.new name, version do |specification|
       yield specification if block_given?
     end
 
-    File.open File.join(directory, "#{name}.gemspec"), 'w' do |io|
+    open File.join(directory, "#{name}.gemspec"), 'w' do |io|
       io.write vendor_spec.to_ruby
     end
 
@@ -1489,7 +1376,7 @@ Also, a list:
     ##
     # Adds +spec+ to this set.
 
-    def add(spec)
+    def add spec
       @specs << spec
     end
 
@@ -1513,7 +1400,7 @@ Also, a list:
     # Loads a Gem::Specification from this set which has the given +name+,
     # version +ver+, +platform+.  The +source+ is ignored.
 
-    def load_spec(name, ver, platform, source)
+    def load_spec name, ver, platform, source
       dep = Gem::Dependency.new name, ver
       spec = find_spec dep
 
@@ -1522,14 +1409,14 @@ Also, a list:
       end
     end
 
-    def prefetch(reqs) # :nodoc:
+    def prefetch reqs # :nodoc:
     end
   end
 
   ##
   # Loads certificate named +cert_name+ from <tt>test/rubygems/</tt>.
 
-  def self.load_cert(cert_name)
+  def self.load_cert cert_name
     cert_file = cert_path cert_name
 
     cert = File.read cert_file
@@ -1541,8 +1428,8 @@ Also, a list:
   # Returns the path to the certificate named +cert_name+ from
   # <tt>test/rubygems/</tt>.
 
-  def self.cert_path(cert_name)
-    if 32 == (Time.at(2**32) rescue 32)
+  def self.cert_path cert_name
+    if 32 == (Time.at(2**32) rescue 32) then
       cert_file =
         File.expand_path "../../../test/rubygems/#{cert_name}_cert_32.pem",
                          __FILE__
@@ -1556,7 +1443,7 @@ Also, a list:
   ##
   # Loads an RSA private key named +key_name+ with +passphrase+ in <tt>test/rubygems/</tt>
 
-  def self.load_key(key_name, passphrase = nil)
+  def self.load_key key_name, passphrase = nil
     key_file = key_path key_name
 
     key = File.read key_file
@@ -1567,14 +1454,14 @@ Also, a list:
   ##
   # Returns the path to the key named +key_name+ from <tt>test/rubygems</tt>
 
-  def self.key_path(key_name)
+  def self.key_path key_name
     File.expand_path "../../../test/rubygems/#{key_name}_key.pem", __FILE__
   end
 
   # :stopdoc:
   # only available in RubyGems tests
 
-  PRIVATE_KEY_PASSPHRASE      = 'Foo bar'.freeze
+  PRIVATE_KEY_PASSPHRASE      = 'Foo bar'
 
   begin
     PRIVATE_KEY                 = load_key 'private'
@@ -1611,8 +1498,6 @@ end
 begin
   gem 'rdoc'
   require 'rdoc'
-
-  require 'rubygems/rdoc'
 rescue LoadError, Gem::LoadError
 end
 
@@ -1629,4 +1514,3 @@ tmpdirs << (ENV['GEM_PATH'] = Dir.mktmpdir("path"))
 pid = $$
 END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid}
 Gem.clear_paths
-Gem.loaded_specs.clear
diff --git a/lib/rubygems/test_utilities.rb b/lib/rubygems/test_utilities.rb
index d531239812..686916ea02 100644
--- a/lib/rubygems/test_utilities.rb
+++ b/lib/rubygems/test_utilities.rb
@@ -25,17 +25,23 @@ class Gem::FakeFetcher
 
   attr_reader :data
   attr_reader :last_request
+  attr_reader :api_endpoints
   attr_accessor :paths
 
   def initialize
     @data = {}
     @paths = []
+    @api_endpoints = {}
+  end
+
+  def api_endpoint(uri)
+    @api_endpoints[uri] || uri
   end
 
   def find_data(path)
     return File.read path.path if URI === path and 'file' == path.scheme
 
-    if URI === path and "URI::#{path.scheme.upcase}" != path.class.name
+    if URI === path and "URI::#{path.scheme.upcase}" != path.class.name then
       raise ArgumentError,
         "mismatch for scheme #{path.scheme} and class #{path.class}"
     end
@@ -44,28 +50,28 @@ class Gem::FakeFetcher
     @paths << path
     raise ArgumentError, 'need full URI' unless path =~ %r'^https?://'
 
-    unless @data.key? path
+    unless @data.key? path then
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
     end
 
     @data[path]
   end
 
-  def fetch_path(path, mtime = nil, head = false)
+  def fetch_path path, mtime = nil, head = false
     data = find_data(path)
 
-    if data.respond_to?(:call)
+    if data.respond_to?(:call) then
       data.call
     else
-      if path.to_s =~ /gz$/ and not data.nil? and not data.empty?
-        data = Gem::Util.gunzip data
+      if path.to_s =~ /gz$/ and not data.nil? and not data.empty? then
+        data = Gem.gunzip data
       end
 
       data
     end
   end
 
-  def cache_update_path(uri, path = nil, update = true)
+  def cache_update_path uri, path = nil, update = true
     if data = fetch_path(uri)
       open(path, 'wb') { |io| io.write data } if path and update
       data
@@ -87,7 +93,7 @@ class Gem::FakeFetcher
 
   def request(uri, request_class, last_modified = nil)
     data = find_data(uri)
-    body, code, msg = (data.respond_to?(:call) ? data.call : data)
+    body, code, msg = data
 
     @last_request = request_class.new uri.request_uri
     yield @last_request if block_given?
@@ -98,13 +104,21 @@ class Gem::FakeFetcher
     response
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.group 2, '[FakeFetcher', ']' do
       q.breakable
       q.text 'URIs:'
 
       q.breakable
       q.pp @data.keys
+
+      unless @api_endpoints.empty? then
+        q.breakable
+        q.text 'API endpoints:'
+
+        q.breakable
+        q.pp @api_endpoints.keys
+      end
     end
   end
 
@@ -114,7 +128,7 @@ class Gem::FakeFetcher
 
     raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
 
-    unless @data.key? path
+    unless @data.key? path then
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
     end
 
@@ -123,9 +137,9 @@ class Gem::FakeFetcher
     data.respond_to?(:call) ? data.call : data.length
   end
 
-  def download(spec, source_uri, install_dir = Gem.dir)
+  def download spec, source_uri, install_dir = Gem.dir
     name = File.basename spec.cache_file
-    path = if Dir.pwd == install_dir  # see fetch_command
+    path = if Dir.pwd == install_dir then # see fetch_command
              install_dir
            else
              File.join install_dir, "cache"
@@ -133,7 +147,7 @@ class Gem::FakeFetcher
 
     path = File.join path, name
 
-    if source_uri =~ /^http/
+    if source_uri =~ /^http/ then
       File.open(path, "wb") do |f|
         f.write fetch_path(File.join(source_uri, "gems", name))
       end
@@ -144,7 +158,7 @@ class Gem::FakeFetcher
     path
   end
 
-  def download_to_cache(dependency)
+  def download_to_cache dependency
     found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
 
     return if found.empty?
@@ -187,7 +201,7 @@ class Gem::TestCase::SpecFetcherSetup
   # Executes a SpecFetcher setup block.  Yields an instance then creates the
   # gems and specifications defined in the instance.
 
-  def self.declare(test, repository)
+  def self.declare test, repository
     setup = new test, repository
 
     yield setup
@@ -195,7 +209,7 @@ class Gem::TestCase::SpecFetcherSetup
     setup.execute
   end
 
-  def initialize(test, repository) # :nodoc:
+  def initialize test, repository # :nodoc:
     @test       = test
     @repository = repository
 
@@ -263,7 +277,7 @@ class Gem::TestCase::SpecFetcherSetup
   # The specification will be yielded before gem creation for customization,
   # but only the block or the dependencies may be set, not both.
 
-  def gem(name, version, dependencies = nil, &block)
+  def gem name, version, dependencies = nil, &block
     @operations << [:gem, name, version, dependencies, block]
   end
 
@@ -274,7 +288,7 @@ class Gem::TestCase::SpecFetcherSetup
   # The specification will be yielded before gem creation for customization,
   # but only the block or the dependencies may be set, not both.
 
-  def download(name, version, dependencies = nil, &block)
+  def download name, version, dependencies = nil, &block
     @operations << [:download, name, version, dependencies, block]
   end
 
@@ -293,7 +307,7 @@ class Gem::TestCase::SpecFetcherSetup
     require 'socket'
     require 'rubygems/remote_fetcher'
 
-    unless @test.fetcher
+    unless @test.fetcher then
       @test.fetcher = Gem::FakeFetcher.new
       Gem::RemoteFetcher.fetcher = @test.fetcher
     end
@@ -327,12 +341,12 @@ class Gem::TestCase::SpecFetcherSetup
   # The specification will be yielded before creation for customization,
   # but only the block or the dependencies may be set, not both.
 
-  def spec(name, version, dependencies = nil, &block)
+  def spec name, version, dependencies = nil, &block
     @operations << [:spec, name, version, dependencies, block]
   end
 
-  def write_spec(spec) # :nodoc:
-    File.open spec.spec_file, 'w' do |io|
+  def write_spec spec # :nodoc:
+    open spec.spec_file, 'w' do |io|
       io.write spec.to_ruby_for_cache
     end
   end
@@ -367,3 +381,4 @@ class TempIO < Tempfile
     Gem.read_binary path
   end
 end
+
diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb
index 5d346b496b..732f1b99f2 100644
--- a/lib/rubygems/text.rb
+++ b/lib/rubygems/text.rb
@@ -7,28 +7,15 @@ require 'rubygems'
 module Gem::Text
 
   ##
-  # Remove any non-printable characters and make the text suitable for
-  # printing.
-  def clean_text(text)
-    text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze)
-  end
-
-  def truncate_text(text, description, max_length = 100_000)
-    raise ArgumentError, "max_length must be positive" unless max_length > 0
-    return text if text.size <= max_length
-    "Truncating #{description} to #{max_length.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse} characters:\n" + text[0, max_length]
-  end
-
-  ##
   # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
   # characters
 
   def format_text(text, wrap, indent=0)
     result = []
-    work = clean_text(text)
+    work = text.dup
 
     while work.length > wrap do
-      if work =~ /^(.{0,#{wrap}})[ \n]/
+      if work =~ /^(.{0,#{wrap}})[ \n]/ then
         result << $1.rstrip
         work.slice!(0, $&.length)
       else
@@ -40,10 +27,10 @@ module Gem::Text
     result.join("\n").gsub(/^/, " " * indent)
   end
 
-  def min3(a, b, c) # :nodoc:
-    if a < b && a < c
+  def min3 a, b, c # :nodoc:
+    if a < b && a < c then
       a
-    elsif b < c
+    elsif b < c then
       b
     else
       c
@@ -52,7 +39,7 @@ module Gem::Text
 
   # This code is based directly on the Text gem implementation
   # Returns a value representing the "cost" of transforming str1 into str2
-  def levenshtein_distance(str1, str2)
+  def levenshtein_distance str1, str2
     s = str1
     t = str2
     n = s.length
@@ -73,7 +60,7 @@ module Gem::Text
              d[j+1] + 1, # insertion
              e + 1,      # deletion
              d[j] + cost # substitution
-           )
+            )
         d[j] = e
         e = x
       end
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
index c213cf656e..89f47a45fe 100644
--- a/lib/rubygems/uninstaller.rb
+++ b/lib/rubygems/uninstaller.rb
@@ -99,7 +99,7 @@ class Gem::Uninstaller
 
     list.sort!
 
-    if list.empty?
+    if list.empty? then
       if other_repo_specs.empty?
         if default_specs.empty?
           raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
@@ -119,19 +119,19 @@ class Gem::Uninstaller
       }
 
       raise Gem::InstallError, message.join("\n")
-    elsif @force_all
+    elsif @force_all then
       remove_all list
 
-    elsif list.size > 1
+    elsif list.size > 1 then
       gem_names = list.map { |gem| gem.full_name }
       gem_names << "All versions"
 
       say
       _, index = choose_from_list "Select gem to uninstall:", gem_names
 
-      if index == list.size
+      if index == list.size then
         remove_all list
-      elsif index >= 0 && index < list.size
+      elsif index >= 0 && index < list.size then
         uninstall_gem list[index]
       else
         say "Error: must enter a number [1-#{list.size+1}]"
@@ -194,7 +194,7 @@ class Gem::Uninstaller
 
     executables = executables.map { |exec| formatted_program_filename exec }
 
-    remove = if @force_executables.nil?
+    remove = if @force_executables.nil? then
                ask_yes_no("Remove executables:\n" +
                           "\t#{executables.join ', '}\n\n" +
                           "in addition to the gem?",
@@ -203,7 +203,7 @@ class Gem::Uninstaller
                @force_executables
              end
 
-    if remove
+    if remove then
       bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
 
       raise Gem::FilePermissionError, bin_dir unless File.writable? bin_dir
@@ -213,8 +213,8 @@ class Gem::Uninstaller
 
         exe_file = File.join bin_dir, exe_name
 
-        safe_delete { FileUtils.rm exe_file }
-        safe_delete { FileUtils.rm "#{exe_file}.bat" }
+        FileUtils.rm_f exe_file
+        FileUtils.rm_f "#{exe_file}.bat"
       end
     else
       say "Executables and scripts will remain installed."
@@ -239,7 +239,7 @@ class Gem::Uninstaller
 
   def remove(spec)
     unless path_ok?(@gem_home, spec) or
-           (@user_install and path_ok?(Gem.user_dir, spec))
+           (@user_install and path_ok?(Gem.user_dir, spec)) then
       e = Gem::GemNotInHomeException.new \
             "Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
       e.spec = spec
@@ -250,26 +250,26 @@ class Gem::Uninstaller
     raise Gem::FilePermissionError, spec.base_dir unless
       File.writable?(spec.base_dir)
 
-    safe_delete { FileUtils.rm_r spec.full_gem_path }
-    safe_delete { FileUtils.rm_r spec.extension_dir }
+    FileUtils.rm_rf spec.full_gem_path
+    FileUtils.rm_rf spec.extension_dir
 
     old_platform_name = spec.original_name
+    gemspec           = spec.spec_file
+
+    unless File.exist? gemspec then
+      gemspec = File.join(File.dirname(gemspec), "#{old_platform_name}.gemspec")
+    end
+
+    FileUtils.rm_rf gemspec
 
     gem = spec.cache_file
     gem = File.join(spec.cache_dir, "#{old_platform_name}.gem") unless
       File.exist? gem
 
-    safe_delete { FileUtils.rm_r gem }
+    FileUtils.rm_rf gem
 
     Gem::RDoc.new(spec).remove
 
-    gemspec = spec.spec_file
-
-    unless File.exist? gemspec
-      gemspec = File.join(File.dirname(gemspec), "#{old_platform_name}.gemspec")
-    end
-
-    safe_delete { FileUtils.rm_r gemspec }
     say "Successfully uninstalled #{spec.full_name}"
 
     Gem::Specification.reset
@@ -289,7 +289,7 @@ class Gem::Uninstaller
   # Returns true if it is OK to remove +spec+ or this is a forced
   # uninstallation.
 
-  def dependencies_ok?(spec) # :nodoc:
+  def dependencies_ok? spec # :nodoc:
     return true if @force_ignore
 
     deplist = Gem::DependencyList.from_specs
@@ -308,15 +308,15 @@ class Gem::Uninstaller
   ##
   # Asks if it is OK to remove +spec+.  Returns true if it is OK.
 
-  def ask_if_ok(spec) # :nodoc:
+  def ask_if_ok spec # :nodoc:
     msg = ['']
     msg << 'You have requested to uninstall the gem:'
     msg << "\t#{spec.full_name}"
     msg << ''
 
     siblings = Gem::Specification.select do |s|
-      s.name == spec.name && s.full_name != spec.full_name
-    end
+                 s.name == spec.name && s.full_name != spec.full_name
+               end
 
     spec.dependent_gems.each do |dep_spec, dep, satlist|
       unless siblings.any? { |s| s.satisfies_requirement? dep }
@@ -332,26 +332,15 @@ class Gem::Uninstaller
   ##
   # Returns the formatted version of the executable +filename+
 
-  def formatted_program_filename(filename) # :nodoc:
+  def formatted_program_filename filename # :nodoc:
     # TODO perhaps the installer should leave a small manifest
     # of what it did for us to find rather than trying to recreate
     # it again.
-    if @format_executable
+    if @format_executable then
       require 'rubygems/installer'
       Gem::Installer.exec_format % File.basename(filename)
     else
       filename
     end
   end
-
-  def safe_delete(&block)
-    block.call
-  rescue Errno::ENOENT
-    nil
-  rescue Errno::EPERM
-    e = Gem::UninstallError.new
-    e.spec = @spec
-
-    raise e
-  end
 end
diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb
index 0a24dde24d..bb128e4ef9 100644
--- a/lib/rubygems/uri_formatter.rb
+++ b/lib/rubygems/uri_formatter.rb
@@ -19,7 +19,7 @@ class Gem::UriFormatter
   ##
   # Creates a new URI formatter for +uri+.
 
-  def initialize(uri)
+  def initialize uri
     @uri = uri
   end
 
@@ -47,3 +47,4 @@ class Gem::UriFormatter
   end
 
 end
+
diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
index 0696d54951..390d0f2aea 100644
--- a/lib/rubygems/user_interaction.rb
+++ b/lib/rubygems/user_interaction.rb
@@ -6,8 +6,11 @@
 #++
 
 require 'rubygems/util'
-require 'rubygems/deprecate'
-require 'rubygems/text'
+
+begin
+  require 'io/console'
+rescue LoadError
+end
 
 ##
 # Module that defines the default UserInteraction.  Any class including this
@@ -15,8 +18,6 @@ require 'rubygems/text'
 
 module Gem::DefaultUserInteraction
 
-  include Gem::Text
-
   ##
   # The default UI is a class variable of the singleton class for this
   # module.
@@ -98,7 +99,7 @@ module Gem::UserInteraction
   ##
   # Displays an alert +statement+.  Asks a +question+ if given.
 
-  def alert(statement, question = nil)
+  def alert statement, question = nil
     ui.alert statement, question
   end
 
@@ -106,7 +107,7 @@ module Gem::UserInteraction
   # Displays an error +statement+ to the error output location.  Asks a
   # +question+ if given.
 
-  def alert_error(statement, question = nil)
+  def alert_error statement, question = nil
     ui.alert_error statement, question
   end
 
@@ -114,49 +115,49 @@ module Gem::UserInteraction
   # Displays a warning +statement+ to the warning output location.  Asks a
   # +question+ if given.
 
-  def alert_warning(statement, question = nil)
+  def alert_warning statement, question = nil
     ui.alert_warning statement, question
   end
 
   ##
   # Asks a +question+ and returns the answer.
 
-  def ask(question)
+  def ask question
     ui.ask question
   end
 
   ##
   # Asks for a password with a +prompt+
 
-  def ask_for_password(prompt)
+  def ask_for_password prompt
     ui.ask_for_password prompt
   end
 
   ##
   # Asks a yes or no +question+.  Returns true for yes, false for no.
 
-  def ask_yes_no(question, default = nil)
+  def ask_yes_no question, default = nil
     ui.ask_yes_no question, default
   end
 
   ##
   # Asks the user to answer +question+ with an answer from the given +list+.
 
-  def choose_from_list(question, list)
+  def choose_from_list question, list
     ui.choose_from_list question, list
   end
 
   ##
   # Displays the given +statement+ on the standard output (or equivalent).
 
-  def say(statement = '')
+  def say statement = ''
     ui.say statement
   end
 
   ##
   # Terminates the RubyGems process with the given +exit_code+
 
-  def terminate_interaction(exit_code = 0)
+  def terminate_interaction exit_code = 0
     ui.terminate_interaction exit_code
   end
 
@@ -164,8 +165,8 @@ module Gem::UserInteraction
   # Calls +say+ with +msg+ or the results of the block if really_verbose
   # is true.
 
-  def verbose(msg = nil)
-    say(clean_text(msg || yield)) if Gem.configuration.really_verbose
+  def verbose msg = nil
+    say(msg || yield) if Gem.configuration.really_verbose
   end
 end
 
@@ -174,8 +175,6 @@ end
 
 class Gem::StreamUI
 
-  extend Gem::Deprecate
-
   ##
   # The input stream
 
@@ -208,14 +207,18 @@ class Gem::StreamUI
   # Returns true if TTY methods should be used on this StreamUI.
 
   def tty?
-    @usetty && @ins.tty?
+    if RUBY_VERSION < '1.9.3' and RUBY_PLATFORM =~ /mingw|mswin/ then
+      @usetty
+    else
+      @usetty && @ins.tty?
+    end
   end
 
   ##
   # Prints a formatted backtrace to the errors stream if backtraces are
   # enabled.
 
-  def backtrace(exception)
+  def backtrace exception
     return unless Gem.configuration.backtrace
 
     @errs.puts "\t#{exception.backtrace.join "\n\t"}"
@@ -250,8 +253,8 @@ class Gem::StreamUI
   # default.
 
   def ask_yes_no(question, default=nil)
-    unless tty?
-      if default.nil?
+    unless tty? then
+      if default.nil? then
         raise Gem::OperationNotSupportedError,
               "Not connected to a tty and no default specified"
       else
@@ -311,21 +314,36 @@ class Gem::StreamUI
     password
   end
 
-  def require_io_console
-    @require_io_console ||= begin
+  if IO.method_defined?(:noecho) then
+    def _gets_noecho
+      @ins.noecho {@ins.gets}
+    end
+  elsif Gem.win_platform?
+    def _gets_noecho
+      require "Win32API"
+      password = ''
+
+      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+        break if char == 10 || char == 13 # received carriage return or newline
+        if char == 127 || char == 8 # backspace and delete
+          password.slice!(-1, 1)
+        else
+          password << char.chr
+        end
+      end
+      password
+    end
+  else
+    def _gets_noecho
+      system "stty -echo"
       begin
-        require 'io/console'
-      rescue LoadError
+        @ins.gets
+      ensure
+        system "stty echo"
       end
-      true
     end
   end
 
-  def _gets_noecho
-    require_io_console
-    @ins.noecho {@ins.gets}
-  end
-
   ##
   # Display a statement.
 
@@ -364,7 +382,6 @@ class Gem::StreamUI
   def debug(statement)
     @errs.puts statement
   end
-  deprecate :debug, :none, 2018, 12
 
   ##
   # Terminate the application with exit code +status+, running any exit
@@ -515,10 +532,11 @@ class Gem::StreamUI
   # Return a download reporter object chosen from the current verbosity
 
   def download_reporter(*args)
-    if [nil, false].include?(Gem.configuration.verbose) || !@outs.tty?
+    case Gem.configuration.verbose
+    when nil, false
       SilentDownloadReporter.new(@outs, *args)
     else
-      ThreadedDownloadReporter.new(@outs, *args)
+      VerboseDownloadReporter.new(@outs, *args)
     end
   end
 
@@ -555,11 +573,9 @@ class Gem::StreamUI
   end
 
   ##
-  # A progress reporter that behaves nicely with threaded downloading.
-
-  class ThreadedDownloadReporter
+  # A progress reporter that prints out messages about the current progress.
 
-    MUTEX = Mutex.new
+  class VerboseDownloadReporter
 
     ##
     # The current file name being displayed
@@ -567,44 +583,71 @@ class Gem::StreamUI
     attr_reader :file_name
 
     ##
-    # Creates a new threaded download reporter that will display on
+    # The total bytes in the file
+
+    attr_reader :total_bytes
+
+    ##
+    # The current progress (0 to 100)
+
+    attr_reader :progress
+
+    ##
+    # Creates a new verbose download reporter that will display on
     # +out_stream+.  The other arguments are ignored.
 
     def initialize(out_stream, *args)
-      @file_name = nil
       @out = out_stream
+      @progress = 0
     end
 
     ##
-    # Tells the download reporter that the +file_name+ is being fetched.
-    # The other arguments are ignored.
+    # Tells the download reporter that the +file_name+ is being fetched and
+    # contains +total_bytes+.
 
-    def fetch(file_name, *args)
-      if @file_name.nil?
-        @file_name = file_name
-        locked_puts "Fetching #{@file_name}"
-      end
+    def fetch(file_name, total_bytes)
+      @file_name = file_name
+      @total_bytes = total_bytes.to_i
+      @units = @total_bytes.zero? ? 'B' : '%'
+
+      update_display(false)
     end
 
     ##
-    # Updates the threaded download reporter for the given number of +bytes+.
+    # Updates the verbose download reporter for the given number of +bytes+.
 
     def update(bytes)
-      # Do nothing.
+      new_progress = if @units == 'B' then
+                       bytes
+                     else
+                       ((bytes.to_f * 100) / total_bytes.to_f).ceil
+                     end
+
+      return if new_progress == @progress
+
+      @progress = new_progress
+      update_display
     end
 
     ##
     # Indicates the download is complete.
 
     def done
-      # Do nothing.
+      @progress = 100 if @units == '%'
+      update_display(true, true)
     end
 
     private
-    def locked_puts(message)
-      MUTEX.synchronize do
-        @out.puts message
+
+    def update_display(show_progress = true, new_line = false) # :nodoc:
+      return unless @out.tty?
+
+      if show_progress then
+        @out.print "\rFetching: %s (%3d%s)" % [@file_name, @progress, @units]
+      else
+        @out.print "Fetching: %s" % @file_name
       end
+      @out.puts if new_line
     end
   end
 end
@@ -635,8 +678,8 @@ class Gem::SilentUI < Gem::StreamUI
   def initialize
     reader, writer = nil, nil
 
-    reader = File.open(IO::NULL, 'r')
-    writer = File.open(IO::NULL, 'w')
+    reader = File.open(Gem::Util::NULL_DEVICE, 'r')
+    writer = File.open(Gem::Util::NULL_DEVICE, 'w')
 
     super reader, writer, writer, false
   end
diff --git a/lib/rubygems/util.rb b/lib/rubygems/util.rb
index b9e5dfc8c7..ead2babc1f 100644
--- a/lib/rubygems/util.rb
+++ b/lib/rubygems/util.rb
@@ -15,7 +15,7 @@ module Gem::Util
     data = StringIO.new(data, 'r')
 
     unzipped = Zlib::GzipReader.new(data).read
-    unzipped.force_encoding Encoding::BINARY
+    unzipped.force_encoding Encoding::BINARY if Object.const_defined? :Encoding
     unzipped
   end
 
@@ -26,7 +26,7 @@ module Gem::Util
     require 'zlib'
     require 'stringio'
     zipped = StringIO.new(String.new, 'w')
-    zipped.set_encoding Encoding::BINARY
+    zipped.set_encoding Encoding::BINARY if Object.const_defined? :Encoding
 
     Zlib::GzipWriter.wrap zipped do |io| io.write data end
 
@@ -46,7 +46,7 @@ module Gem::Util
   # and implements an IO.popen-like behavior where it does not accept an array
   # for a command.
 
-  def self.popen(*command)
+  def self.popen *command
     IO.popen command, &:read
   rescue TypeError # ruby 1.8 only supports string command
     r, w = IO.pipe
@@ -67,11 +67,13 @@ module Gem::Util
     end
   end
 
+  NULL_DEVICE = defined?(IO::NULL) ? IO::NULL : Gem.win_platform? ? 'NUL' : '/dev/null'
+
   ##
   # Invokes system, but silences all output.
 
-  def self.silent_system(*command)
-    opt = {:out => IO::NULL, :err => [:child, :out]}
+  def self.silent_system *command
+    opt = {:out => NULL_DEVICE, :err => [:child, :out]}
     if Hash === command.last
       opt.update(command.last)
       cmds = command[0...-1]
@@ -80,15 +82,19 @@ module Gem::Util
     end
     return system(*(cmds << opt))
   rescue TypeError
+    require 'thread'
+
     @silent_mutex ||= Mutex.new
 
+    null_device = NULL_DEVICE
+
     @silent_mutex.synchronize do
       begin
         stdout = STDOUT.dup
         stderr = STDERR.dup
 
-        STDOUT.reopen IO::NULL, 'w'
-        STDERR.reopen IO::NULL, 'w'
+        STDOUT.reopen null_device, 'w'
+        STDERR.reopen null_device, 'w'
 
         return system(*command)
       ensure
@@ -103,28 +109,26 @@ module Gem::Util
   ##
   # Enumerates the parents of +directory+.
 
-  def self.traverse_parents(directory, &block)
+  def self.traverse_parents directory
     return enum_for __method__, directory unless block_given?
 
     here = File.expand_path directory
-    loop do
-      Dir.chdir here, &block rescue Errno::EACCES
+    start = here
 
-      new_here = File.expand_path('..', here)
-      return if new_here == here # toplevel
-      here = new_here
-    end
-  end
+    Dir.chdir start
 
-  ##
-  # Globs for files matching +pattern+ inside of +directory+,
-  # returning absolute paths to the matching files.
+    begin
+      loop do
+        yield here
 
-  def self.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.expand_path(glob, base_path))
+        Dir.chdir '..'
+
+        return if Dir.pwd == here # toplevel
+
+        here = Dir.pwd
+      end
+    ensure
+      Dir.chdir start
     end
   end
 
diff --git a/lib/rubygems/util/licenses.rb b/lib/rubygems/util/licenses.rb
index 2a536575c0..f4a99af39e 100644
--- a/lib/rubygems/util/licenses.rb
+++ b/lib/rubygems/util/licenses.rb
@@ -8,7 +8,7 @@ class Gem::Licenses
 
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
-  LICENSE_IDENTIFIERS = %w(
+  IDENTIFIERS = %w(
       0BSD
       AAL
       ADSL
@@ -19,8 +19,6 @@ class Gem::Licenses
       AFL-3.0
       AGPL-1.0
       AGPL-3.0
-      AGPL-3.0-only
-      AGPL-3.0-or-later
       AMDPLPA
       AML
       AMPAS
@@ -43,22 +41,16 @@ class Gem::Licenses
       Artistic-1.0-Perl
       Artistic-1.0-cl8
       Artistic-2.0
-      BSD-1-Clause
       BSD-2-Clause
       BSD-2-Clause-FreeBSD
       BSD-2-Clause-NetBSD
-      BSD-2-Clause-Patent
       BSD-3-Clause
       BSD-3-Clause-Attribution
       BSD-3-Clause-Clear
       BSD-3-Clause-LBNL
-      BSD-3-Clause-No-Nuclear-License
-      BSD-3-Clause-No-Nuclear-License-2014
-      BSD-3-Clause-No-Nuclear-Warranty
       BSD-4-Clause
       BSD-4-Clause-UC
       BSD-Protection
-      BSD-Source-Code
       BSL-1.0
       Bahyph
       Barr
@@ -100,8 +92,6 @@ class Gem::Licenses
       CC0-1.0
       CDDL-1.0
       CDDL-1.1
-      CDLA-Permissive-1.0
-      CDLA-Sharing-1.0
       CECILL-1.0
       CECILL-1.1
       CECILL-2.0
@@ -130,15 +120,12 @@ class Gem::Licenses
       EFL-1.0
       EFL-2.0
       EPL-1.0
-      EPL-2.0
       EUDatagrid
       EUPL-1.0
       EUPL-1.1
-      EUPL-1.2
       Entessa
       ErlPL-1.1
       Eurosym
-      FSFAP
       FSFUL
       FSFULLR
       FTL
@@ -146,34 +133,12 @@ class Gem::Licenses
       Frameworx-1.0
       FreeImage
       GFDL-1.1
-      GFDL-1.1-only
-      GFDL-1.1-or-later
       GFDL-1.2
-      GFDL-1.2-only
-      GFDL-1.2-or-later
       GFDL-1.3
-      GFDL-1.3-only
-      GFDL-1.3-or-later
       GL2PS
       GPL-1.0
-      GPL-1.0+
-      GPL-1.0-only
-      GPL-1.0-or-later
       GPL-2.0
-      GPL-2.0+
-      GPL-2.0-only
-      GPL-2.0-or-later
-      GPL-2.0-with-GCC-exception
-      GPL-2.0-with-autoconf-exception
-      GPL-2.0-with-bison-exception
-      GPL-2.0-with-classpath-exception
-      GPL-2.0-with-font-exception
       GPL-3.0
-      GPL-3.0+
-      GPL-3.0-only
-      GPL-3.0-or-later
-      GPL-3.0-with-GCC-exception
-      GPL-3.0-with-autoconf-exception
       Giftware
       Glide
       Glulxe
@@ -187,26 +152,14 @@ class Gem::Licenses
       ISC
       ImageMagick
       Imlib2
-      Info-ZIP
       Intel
       Intel-ACPI
       Interbase-1.0
       JSON
       JasPer-2.0
-      LAL-1.2
-      LAL-1.3
       LGPL-2.0
-      LGPL-2.0+
-      LGPL-2.0-only
-      LGPL-2.0-or-later
       LGPL-2.1
-      LGPL-2.1+
-      LGPL-2.1-only
-      LGPL-2.1-or-later
       LGPL-3.0
-      LGPL-3.0+
-      LGPL-3.0-only
-      LGPL-3.0-or-later
       LGPLLR
       LPL-1.0
       LPL-1.02
@@ -217,9 +170,6 @@ class Gem::Licenses
       LPPL-1.3c
       Latex2e
       Leptonica
-      LiLiQ-P-1.1
-      LiLiQ-R-1.1
-      LiLiQ-Rplus-1.1
       Libpng
       MIT
       MIT-CMU
@@ -243,7 +193,6 @@ class Gem::Licenses
       NBPL-1.0
       NCSA
       NGPL
-      NLOD-1.0
       NLPL
       NOSL
       NPL-1.0
@@ -252,13 +201,11 @@ class Gem::Licenses
       NRL
       NTP
       Naumen
-      Net-SNMP
       NetCDF
       Newsletr
       Nokia
       Noweb
       Nunit
-      OCCT-PL
       OCLC-2.0
       ODbL-1.0
       OFL-1.0
@@ -282,7 +229,6 @@ class Gem::Licenses
       OLDAP-2.8
       OML
       OPL-1.0
-      OSET-PL-2.1
       OSL-1.0
       OSL-1.1
       OSL-2.0
@@ -313,7 +259,6 @@ class Gem::Licenses
       SISSL
       SISSL-1.2
       SMLNJ
-      SMPPL
       SNIA
       SPL-1.0
       SWL
@@ -324,16 +269,12 @@ class Gem::Licenses
       Spencer-86
       Spencer-94
       Spencer-99
-      StandardML-NJ
       SugarCRM-1.1.3
       TCL
-      TCP-wrappers
       TMate
       TORQUE-1.1
       TOSL
       UPL-1.0
-      Unicode-DFS-2015
-      Unicode-DFS-2016
       Unicode-TOU
       Unlicense
       VOSTROM
@@ -341,7 +282,6 @@ class Gem::Licenses
       Vim
       W3C
       W3C-19980720
-      W3C-20150513
       WTFPL
       Watcom-1.0
       Wsuipa
@@ -362,10 +302,8 @@ class Gem::Licenses
       Zlib
       bzip2-1.0.5
       bzip2-1.0.6
-      curl
       diffmark
       dvipdfm
-      eCos-2.0
       eGenix
       gSOAP-1.3b
       gnuplot
@@ -374,49 +312,17 @@ class Gem::Licenses
       mpich2
       psfrag
       psutils
-      wxWindows
       xinetd
       xpp
       zlib-acknowledgement
   ).freeze
 
-  # exception identifiers
-  EXCEPTION_IDENTIFIERS = %w(
-      389-exception
-      Autoconf-exception-2.0
-      Autoconf-exception-3.0
-      Bison-exception-2.2
-      Bootloader-exception
-      CLISP-exception-2.0
-      Classpath-exception-2.0
-      DigiRule-FOSS-exception
-      FLTK-exception
-      Fawkes-Runtime-exception
-      Font-exception-2.0
-      GCC-exception-2.0
-      GCC-exception-3.1
-      LZMA-exception
-      Libtool-exception
-      Linux-syscall-note
-      Nokia-Qt-exception-1.1
-      OCCT-exception-1.0
-      Qwt-exception-1.0
-      WxWindows-exception-3.1
-      eCos-exception-2.0
-      freertos-exception-2.0
-      gnu-javamail-exception
-      i2p-gpl-java-exception
-      mif-exception
-      openvpn-openssl-exception
-      u-boot-exception-2.0
-  ).freeze
-
   REGEXP = %r{
     \A
     (
-      #{Regexp.union(LICENSE_IDENTIFIERS)}
+      #{Regexp.union(IDENTIFIERS)}
       \+?
-      (\s WITH \s #{Regexp.union(EXCEPTION_IDENTIFIERS)})?
+      (\s WITH \s .+)?
       | #{NONSTANDARD}
     )
     \Z
@@ -427,7 +333,7 @@ class Gem::Licenses
   end
 
   def self.suggestions(license)
-    by_distance = LICENSE_IDENTIFIERS.group_by do |identifier|
+    by_distance = IDENTIFIERS.group_by do |identifier|
       levenshtein_distance(identifier, license)
     end
     lowest = by_distance.keys.min
diff --git a/lib/rubygems/util/list.rb b/lib/rubygems/util/list.rb
index 33c40af4bb..9c25f6b6dc 100644
--- a/lib/rubygems/util/list.rb
+++ b/lib/rubygems/util/list.rb
@@ -25,7 +25,7 @@ module Gem
       List.new value, self
     end
 
-    def pretty_print(q) # :nodoc:
+    def pretty_print q # :nodoc:
       q.pp to_a
     end
 
diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb
index 828497f700..83448229bb 100644
--- a/lib/rubygems/validator.rb
+++ b/lib/rubygems/validator.rb
@@ -34,7 +34,7 @@ class Gem::Validator
   # gem_path:: [String] Path to gem file
 
   def verify_gem_file(gem_path)
-    File.open gem_path, Gem.binary_mode do |file|
+    open gem_path, Gem.binary_mode do |file|
       gem_data = file.read
       verify_gem gem_data
     end
@@ -62,7 +62,7 @@ class Gem::Validator
   # Describes a problem with a file in a gem.
 
   ErrorData = Struct.new :path, :problem do
-    def <=>(other) # :nodoc:
+    def <=> other # :nodoc:
       return nil unless self.class === other
 
       [path, problem] <=> [other.path, other.problem]
@@ -94,13 +94,13 @@ class Gem::Validator
       spec_path     = spec.spec_file
       gem_directory = spec.full_gem_path
 
-      unless File.directory? gem_directory
+      unless File.directory? gem_directory then
         errors[gem_name][spec.full_name] =
           "Gem registered but doesn't exist at #{gem_directory}"
         next
       end
 
-      unless File.exist? spec_path
+      unless File.exist? spec_path then
         errors[gem_name][spec_path] = "Spec file missing for installed gem"
       end
 
@@ -109,7 +109,7 @@ class Gem::Validator
 
         good, gone, unreadable = nil, nil, nil, nil
 
-        File.open gem_path, Gem.binary_mode do |file|
+        open gem_path, Gem.binary_mode do |file|
           package = Gem::Package.new gem_path
 
           good, gone = package.contents.partition { |file_name|
@@ -134,8 +134,8 @@ class Gem::Validator
 
               source = File.join gem_directory, entry['path']
 
-              File.open source, Gem.binary_mode do |f|
-                unless f.read == data
+              open source, Gem.binary_mode do |f|
+                unless f.read == data then
                   errors[gem_name][entry['path']] = "Modified from original"
                 end
               end
@@ -163,3 +163,4 @@ class Gem::Validator
     errors
   end
 end
+
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index f2f10569e8..2f6cfae6ed 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -154,8 +154,8 @@ class Gem::Version
 
   include Comparable
 
-  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?'.freeze # :nodoc:
-  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze # :nodoc:
+  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?' # :nodoc:
+  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
 
   ##
   # A string representation of this Version.
@@ -169,12 +169,8 @@ class Gem::Version
   ##
   # True if the +version+ string matches RubyGems' requirements.
 
-  def self.correct?(version)
-    unless Gem::Deprecate.skip
-      warn "nil versions are discouraged and will be deprecated in Rubygems 4" if version.nil?
-    end
-
-    !!(version.to_s =~ ANCHORED_VERSION_PATTERN)
+  def self.correct? version
+    version.to_s =~ ANCHORED_VERSION_PATTERN
   end
 
   ##
@@ -185,10 +181,10 @@ class Gem::Version
   #   ver2 = Version.create(ver1)       # -> (ver1)
   #   ver3 = Version.create(nil)        # -> nil
 
-  def self.create(input)
-    if self === input  # check yourself before you wreck yourself
+  def self.create input
+    if self === input then # check yourself before you wreck yourself
       input
-    elsif input.nil?
+    elsif input.nil? then
       nil
     else
       new input
@@ -197,7 +193,7 @@ class Gem::Version
 
   @@all = {}
 
-  def self.new(version) # :nodoc:
+  def self.new version # :nodoc:
     return super unless Gem::Version == self
 
     @@all[version] ||= super
@@ -207,13 +203,9 @@ class Gem::Version
   # Constructs a Version from the +version+ string.  A version string is a
   # series of digits or ASCII letters separated by dots.
 
-  def initialize(version)
-    unless self.class.correct?(version)
-      raise ArgumentError, "Malformed version number string #{version}"
-    end
-
-    # If version is an empty string convert it to 0
-    version = 0 if version.is_a?(String) && version =~ /\A\s*\Z/
+  def initialize version
+    raise ArgumentError, "Malformed version number string #{version}" unless
+      self.class.correct?(version)
 
     @version = version.to_s.strip.gsub("-",".pre.")
     @segments = nil
@@ -240,15 +232,15 @@ class Gem::Version
   # A Version is only eql? to another version if it's specified to the
   # same precision. Version "1.0" is not the same as version "1".
 
-  def eql?(other)
+  def eql? other
     self.class === other and @version == other._version
   end
 
   def hash # :nodoc:
-    canonical_segments.hash
+    @version.hash
   end
 
-  def init_with(coder) # :nodoc:
+  def init_with coder # :nodoc:
     yaml_initialize coder.tag, coder.map
   end
 
@@ -268,7 +260,7 @@ class Gem::Version
   # Load custom marshal format. It's a string for backwards (RubyGems
   # 1.3.5 and earlier) compatibility.
 
-  def marshal_load(array)
+  def marshal_load array
     initialize array[0]
   end
 
@@ -282,7 +274,7 @@ class Gem::Version
     ["@version"]
   end
 
-  def encode_with(coder) # :nodoc:
+  def encode_with coder # :nodoc:
     coder.add 'version', @version
   end
 
@@ -296,7 +288,7 @@ class Gem::Version
     @prerelease
   end
 
-  def pretty_print(q) # :nodoc:
+  def pretty_print q # :nodoc:
     q.text "Gem::Version.new(#{version.inspect})"
   end
 
@@ -328,9 +320,7 @@ class Gem::Version
     segments.pop    while segments.size > 2
     segments.push 0 while segments.size < 2
 
-    recommendation = "~> #{segments.join(".")}"
-    recommendation += ".a" if prerelease?
-    recommendation
+    "~> #{segments.join(".")}"
   end
 
   ##
@@ -339,9 +329,9 @@ class Gem::Version
   # one. Attempts to compare to something that's not a
   # <tt>Gem::Version</tt> return +nil+.
 
-  def <=>(other)
+  def <=> other
     return unless Gem::Version === other
-    return 0 if @version == other._version || canonical_segments == other.canonical_segments
+    return 0 if @version == other._version
 
     lhsegments = _segments
     rhsegments = other._segments
@@ -366,13 +356,6 @@ class Gem::Version
     return 0
   end
 
-  def canonical_segments
-    @canonical_segments ||=
-      _split_segments.map! do |segments|
-        segments.reverse_each.drop_while {|s| s == 0 }.reverse
-      end.reduce(&:concat)
-  end
-
   protected
 
   def _version
@@ -388,11 +371,4 @@ class Gem::Version
       /^\d+$/ =~ s ? s.to_i : s
     end.freeze
   end
-
-  def _split_segments
-    string_start = _segments.index {|s| s.is_a?(String) }
-    string_segments  = segments
-    numeric_segments = string_segments.slice!(0, string_start || string_segments.size)
-    return numeric_segments, string_segments
-  end
 end
diff --git a/lib/rubygems/version_option.rb b/lib/rubygems/version_option.rb
index 458a7a6601..3209d95f0f 100644
--- a/lib/rubygems/version_option.rb
+++ b/lib/rubygems/version_option.rb
@@ -17,7 +17,7 @@ module Gem::VersionOption
 
   def add_platform_option(task = command, *wrap)
     OptionParser.accept Gem::Platform do |value|
-      if value == Gem::Platform::RUBY
+      if value == Gem::Platform::RUBY then
         value
       else
         Gem::Platform.new value
@@ -27,7 +27,7 @@ module Gem::VersionOption
     add_option('--platform PLATFORM', Gem::Platform,
                "Specify the platform of gem to #{task}", *wrap) do
                  |value, options|
-      unless options[:added_platform]
+      unless options[:added_platform] then
         Gem.platforms = [Gem::Platform::RUBY]
         options[:added_platform] = true
       end
@@ -58,12 +58,7 @@ module Gem::VersionOption
     add_option('-v', '--version VERSION', Gem::Requirement,
                "Specify version of gem to #{task}", *wrap) do
                  |value, options|
-      # Allow handling for multiple --version operators
-      if options[:version] && !options[:version].none?
-        options[:version].concat([value])
-      else
-        options[:version] = value
-      end
+      options[:version] = value
 
       explicit_prerelease_set = !options[:explicit_prerelease].nil?
       options[:explicit_prerelease] = false unless explicit_prerelease_set
@@ -74,3 +69,4 @@ module Gem::VersionOption
   end
 
 end
+
diff --git a/lib/scanf.gemspec b/lib/scanf.gemspec
deleted file mode 100644
index e845427215..0000000000
--- a/lib/scanf.gemspec
+++ /dev/null
@@ -1,24 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "scanf"
-  spec.version       = "1.0.0"
-  spec.authors       = ["David Alan Black"]
-  spec.email         = ['dblack@superlink.net']
-
-  spec.summary       = "scanf is an implementation of the C function scanf(3)."
-  spec.description   = "scanf is an implementation of the C function scanf(3)."
-  spec.homepage      = "https://github.com/ruby/scanf"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = ["lib/scanf.rb"]
-  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", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "test-unit"
-end
diff --git a/lib/scanf.rb b/lib/scanf.rb
index 495f8705a4..a98c359573 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -13,7 +13,7 @@
 # scanf is an implementation of the C function scanf(3), modified as necessary
 # for Ruby compatibility.
 #
-# The methods provided are String#scanf, IO#scanf, and
+# the methods provided are String#scanf, IO#scanf, and
 # Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf.  IO#scanf
 # can be used on any IO stream, including file handles and sockets.
 # scanf can be called either with or without a block.
@@ -31,8 +31,8 @@
 # the conversions themselves are returned as an array.
 #
 # The format string may also contain characters other than those in the
-# conversion specifiers.  Whitespace (blanks, tabs, or newlines) in the
-# format string matches any amount of whitespace, including none, in
+# conversion specifiers.  White space (blanks, tabs, or newlines) in the
+# format string matches any amount of white space, including none, in
 # the input.  Everything else matches only itself.
 #
 # Scanning stops, and scanf returns, when any input character fails to
@@ -80,7 +80,7 @@
 # see below).  Otherwise, given a field width of <em>n</em> for a given
 # conversion, at most <em>n</em> characters are scanned in processing
 # that conversion.  Before conversion begins, most conversions skip
-# whitespace in the input string; this whitespace is not counted
+# white space in the input string; this white space is not counted
 # against the field width.
 #
 # The following conversions are available.
@@ -113,17 +113,17 @@
 #
 # [s]
 #   Matches a sequence of non-white-space character. The input string stops at
-#   whitespace or at the maximum field width, whichever occurs first.
+#   white space or at the maximum field width, whichever occurs first.
 #
 # [c]
 #   Matches a single character, or a sequence of <em>n</em> characters if a
 #   field width of <em>n</em> is specified. The usual skip of leading white
-#   space is suppressed. To skip whitespace first, use an explicit space in
+#   space is suppressed. To skip white space first, use an explicit space in
 #   the format.
 #
 # [[]
 #   Matches a nonempty sequence of characters from the specified set
-#   of accepted characters.  The usual skip of leading whitespace is
+#   of accepted characters.  The usual skip of leading white space is
 #   suppressed.  This bracketed sub-expression is interpreted exactly like a
 #   character class in a Ruby regular expression.  (In fact, it is placed as-is
 #   in a regular expression.)  The matching against the input string ends with
@@ -295,7 +295,7 @@ module Scanf
 
     def extract_float(s)
       return nil unless s &&! skip
-      if /\A(?<sign>[-+]?)0[xX](?<frac>\.\h+|\h+(?:\.\h*)?)[pP](?<exp>[-+]?\d+)/ =~ s
+      if /\A(?<sign>[-+]?)0[xX](?<frac>\.\h+|\h+(?:\.\h*)?)[pP](?<exp>[-+]\d+)/ =~ s
         f1, f2 = frac.split('.')
         f = f1.hex
         if f2
@@ -411,11 +411,11 @@ module Scanf
 
           # %f
         when /%\*?[aefgAEFG]/
-          [ '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]?\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))', :extract_float ]
+          [ '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))', :extract_float ]
 
           # %5f
         when /%\*?(\d+)[aefgAEFG]/
-          [ '(?=[-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]?\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))' +
+          [ '(?=[-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))' +
             "(\\S{1,#{$1}})", :extract_float ]
 
           # %5s
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index d01b47499d..9201c9337a 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -1,5 +1,9 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: true
+begin
+  require 'openssl'
+rescue LoadError
+end
 
 # == Secure random number generator interface.
 #
@@ -22,78 +26,36 @@
 #
 #   require 'securerandom'
 #
-#   SecureRandom.hex(10) #=> "52750b30ffbc7de3b362"
-#   SecureRandom.hex(10) #=> "92b15d6c8dc4beb5f559"
-#   SecureRandom.hex(13) #=> "39b290146bea6ce975c37cfc23"
+#   p SecureRandom.hex(10) #=> "52750b30ffbc7de3b362"
+#   p SecureRandom.hex(10) #=> "92b15d6c8dc4beb5f559"
+#   p SecureRandom.hex(13) #=> "39b290146bea6ce975c37cfc23"
 #
 # Generate random base64 strings:
 #
-#   SecureRandom.base64(10) #=> "EcmTPZwWRAozdA=="
-#   SecureRandom.base64(10) #=> "KO1nIU+p9DKxGg=="
-#   SecureRandom.base64(12) #=> "7kJSM/MzBJI+75j8"
+#   p SecureRandom.base64(10) #=> "EcmTPZwWRAozdA=="
+#   p SecureRandom.base64(10) #=> "KO1nIU+p9DKxGg=="
+#   p SecureRandom.base64(12) #=> "7kJSM/MzBJI+75j8"
 #
 # Generate random binary strings:
 #
-#   SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301"
-#   SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
-#
-# Generate alphanumeric strings:
-#
-#   SecureRandom.alphanumeric(10) #=> "S8baxMJnPl"
-#   SecureRandom.alphanumeric(10) #=> "aOxAg8BAJe"
+#   p SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301"
+#   p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
 #
 # Generate UUIDs:
 #
-#   SecureRandom.uuid #=> "2d931510-d99f-494a-8c67-87feb05e1594"
-#   SecureRandom.uuid #=> "bad85eb9-0713-4da7-8d36-07a8e4b00eab"
+#   p SecureRandom.uuid #=> "2d931510-d99f-494a-8c67-87feb05e1594"
+#   p SecureRandom.uuid #=> "bad85eb9-0713-4da7-8d36-07a8e4b00eab"
 #
 
 module SecureRandom
-  @rng_chooser = Mutex.new # :nodoc:
-
-  class << self
-    def bytes(n)
-      return gen_random(n)
-    end
-
-    def gen_random(n)
-      ret = Random.urandom(1)
-      if ret.nil?
-        begin
-          require 'openssl'
-        rescue NoMethodError
-          raise NotImplementedError, "No random device"
-        else
-          @rng_chooser.synchronize do
-            class << self
-              remove_method :gen_random
-              alias gen_random gen_random_openssl
-              public :gen_random
-            end
-          end
-          return gen_random(n)
-        end
-      else
-        @rng_chooser.synchronize do
-          class << self
-            remove_method :gen_random
-            alias gen_random gen_random_urandom
-            public :gen_random
-          end
-        end
-        return gen_random(n)
-      end
-    end
-
-    private
-
-    def gen_random_openssl(n)
+  if defined?(OpenSSL::Random) && /mswin|mingw/ !~ RUBY_PLATFORM
+    def self.gen_random(n)
       @pid = 0 unless defined?(@pid)
       pid = $$
       unless @pid == pid
         now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
         OpenSSL::Random.random_add([now, @pid, pid].join(""), 0.0)
-        seed = Random.urandom(16)
+        seed = Random.raw_seed(16)
         if (seed)
           OpenSSL::Random.random_add(seed, 16)
         end
@@ -101,9 +63,9 @@ module SecureRandom
       end
       return OpenSSL::Random.random_bytes(n)
     end
-
-    def gen_random_urandom(n)
-      ret = Random.urandom(n)
+  else
+    def self.gen_random(n)
+      ret = Random.raw_seed(n)
       unless ret
         raise NotImplementedError, "No random device"
       end
@@ -113,6 +75,10 @@ module SecureRandom
       ret
     end
   end
+
+  class << self
+    alias bytes gen_random
+  end
 end
 
 module Random::Formatter
@@ -126,10 +92,8 @@ module Random::Formatter
   #
   # The result may contain any byte: "\x00" - "\xff".
   #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.random_bytes #=> "\xD8\\\xE0\xF4\r\xB2\xFC*WM\xFF\x83\x18\xF45\xB6"
-  #   SecureRandom.random_bytes #=> "m\xDC\xFC/\a\x00Uf\xB2\xB2P\xBD\xFF6S\x97"
+  #   p SecureRandom.random_bytes #=> "\xD8\\\xE0\xF4\r\xB2\xFC*WM\xFF\x83\x18\xF45\xB6"
+  #   p SecureRandom.random_bytes #=> "m\xDC\xFC/\a\x00Uf\xB2\xB2P\xBD\xFF6S\x97"
   #
   # If a secure random number generator is not available,
   # +NotImplementedError+ is raised.
@@ -148,10 +112,8 @@ module Random::Formatter
   #
   # The result may contain 0-9 and a-f.
   #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.hex #=> "eb693ec8252cd630102fd0d0fb7c3485"
-  #   SecureRandom.hex #=> "91dc3bfb4de5b11d029d376634589b61"
+  #   p SecureRandom.hex #=> "eb693ec8252cd630102fd0d0fb7c3485"
+  #   p SecureRandom.hex #=> "91dc3bfb4de5b11d029d376634589b61"
   #
   # If a secure random number generator is not available,
   # +NotImplementedError+ is raised.
@@ -169,10 +131,8 @@ module Random::Formatter
   #
   # The result may contain A-Z, a-z, 0-9, "+", "/" and "=".
   #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.base64 #=> "/2BuBuLf3+WfSKyQbRcc/A=="
-  #   SecureRandom.base64 #=> "6BbW0pxO0YENxn38HMUbcQ=="
+  #   p SecureRandom.base64 #=> "/2BuBuLf3+WfSKyQbRcc/A=="
+  #   p SecureRandom.base64 #=> "6BbW0pxO0YENxn38HMUbcQ=="
   #
   # If a secure random number generator is not available,
   # +NotImplementedError+ is raised.
@@ -198,13 +158,11 @@ module Random::Formatter
   # The result may contain A-Z, a-z, 0-9, "-" and "_".
   # "=" is also used if _padding_ is true.
   #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.urlsafe_base64 #=> "b4GOKm4pOYU_-BOXcrUGDg"
-  #   SecureRandom.urlsafe_base64 #=> "UZLdOkzop70Ddx-IJR0ABg"
+  #   p SecureRandom.urlsafe_base64 #=> "b4GOKm4pOYU_-BOXcrUGDg"
+  #   p SecureRandom.urlsafe_base64 #=> "UZLdOkzop70Ddx-IJR0ABg"
   #
-  #   SecureRandom.urlsafe_base64(nil, true) #=> "i0XQ-7gglIsHGV2_BNPrdQ=="
-  #   SecureRandom.urlsafe_base64(nil, true) #=> "-M8rLhr7JEpJlqFGUMmOxg=="
+  #   p SecureRandom.urlsafe_base64(nil, true) #=> "i0XQ-7gglIsHGV2_BNPrdQ=="
+  #   p SecureRandom.urlsafe_base64(nil, true) #=> "-M8rLhr7JEpJlqFGUMmOxg=="
   #
   # If a secure random number generator is not available,
   # +NotImplementedError+ is raised.
@@ -217,13 +175,58 @@ module Random::Formatter
     s
   end
 
-  # SecureRandom.uuid generates a random v4 UUID (Universally Unique IDentifier).
+=begin
+  # SecureRandom.random_number generates a random number.
+  #
+  # If a positive integer is given as _n_,
+  # +SecureRandom.random_number+ returns an integer, such that:
+  # +0 <= SecureRandom.random_number(n) < n+.
   #
-  #   require 'securerandom'
+  #   p SecureRandom.random_number(100) #=> 15
+  #   p SecureRandom.random_number(100) #=> 88
   #
-  #   SecureRandom.uuid #=> "2d931510-d99f-494a-8c67-87feb05e1594"
-  #   SecureRandom.uuid #=> "bad85eb9-0713-4da7-8d36-07a8e4b00eab"
-  #   SecureRandom.uuid #=> "62936e70-1815-439b-bf89-8492855a7e6b"
+  # If 0 is given or an argument is not given,
+  # +SecureRandom.random_number+ returns a float, such that:
+  # +0.0 <= SecureRandom.random_number() < 1.0+.
+  #
+  #   p SecureRandom.random_number #=> 0.596506046187744
+  #   p SecureRandom.random_number #=> 0.350621695741409
+  #
+  def random_number(n=0)
+    if 0 < n
+      if defined? OpenSSL::BN
+        OpenSSL::BN.rand_range(n).to_i
+      else
+        hex = n.to_s(16)
+        hex = '0' + hex if (hex.length & 1) == 1
+        bin = [hex].pack("H*")
+        mask = bin[0].ord
+        mask |= mask >> 1
+        mask |= mask >> 2
+        mask |= mask >> 4
+        begin
+          rnd = random_bytes(bin.length)
+          rnd[0] = (rnd[0].ord & mask).chr
+        end until rnd < bin
+        rnd.unpack("H*")[0].hex
+      end
+    else
+      # assumption: Float::MANT_DIG <= 64
+      if defined? OpenSSL::BN
+        i64 = OpenSSL::BN.rand(64, -1).to_i
+      else
+        i64 = random_bytes(8).unpack("Q")[0]
+      end
+      Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
+    end
+  end
+=end
+
+  # SecureRandom.uuid generates a random v4 UUID (Universally Unique IDentifier).
+  #
+  #   p SecureRandom.uuid #=> "2d931510-d99f-494a-8c67-87feb05e1594"
+  #   p SecureRandom.uuid #=> "bad85eb9-0713-4da7-8d36-07a8e4b00eab"
+  #   p SecureRandom.uuid #=> "62936e70-1815-439b-bf89-8492855a7e6b"
   #
   # The version 4 UUID is purely random (except the version).
   # It doesn't contain meaningful information such as MAC addresses, timestamps, etc.
@@ -239,78 +242,10 @@ module Random::Formatter
     "%08x-%04x-%04x-%04x-%04x%08x" % ary
   end
 
-  private def gen_random(n)
+  private
+  def gen_random(n)
     self.bytes(n)
   end
-
-  # SecureRandom.choose generates a string that randomly draws from a
-  # source array of characters.
-  #
-  # The argument _source_ specifies the array of characters from which
-  # to generate the string.
-  # The argument _n_ specifies the length, in characters, of the string to be
-  # generated.
-  #
-  # The result may contain whatever characters are in the source array.
-  #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.choose([*'l'..'r'], 16) #=> "lmrqpoonmmlqlron"
-  #   SecureRandom.choose([*'0'..'9'], 5)  #=> "27309"
-  #
-  # If a secure random number generator is not available,
-  # +NotImplementedError+ is raised.
-  private def choose(source, n)
-    size = source.size
-    m = 1
-    limit = size
-    while limit * size <= 0x100000000
-      limit *= size
-      m += 1
-    end
-    result = ''.dup
-    while m <= n
-      rs = random_number(limit)
-      is = rs.digits(size)
-      (m-is.length).times { is << 0 }
-      result << source.values_at(*is).join('')
-      n -= m
-    end
-    if 0 < n
-      rs = random_number(limit)
-      is = rs.digits(size)
-      if is.length < n
-        (n-is.length).times { is << 0 }
-      else
-        is.pop while n < is.length
-      end
-      result.concat source.values_at(*is).join('')
-    end
-    result
-  end
-
-  ALPHANUMERIC = [*'A'..'Z', *'a'..'z', *'0'..'9']
-  # SecureRandom.alphanumeric generates a random alphanumeric string.
-  #
-  # The argument _n_ specifies the length, in characters, of the alphanumeric
-  # string to be generated.
-  #
-  # If _n_ is not specified or is nil, 16 is assumed.
-  # It may be larger in the future.
-  #
-  # The result may contain A-Z, a-z and 0-9.
-  #
-  #   require 'securerandom'
-  #
-  #   SecureRandom.alphanumeric     #=> "2BuBuLf3WfSKyQbR"
-  #   SecureRandom.alphanumeric(10) #=> "i6K93NdqiH"
-  #
-  # If a secure random number generator is not available,
-  # +NotImplementedError+ is raised.
-  def alphanumeric(n=nil)
-    n = 16 if n.nil?
-    choose(ALPHANUMERIC, n)
-  end
 end
 
 SecureRandom.extend(Random::Formatter)
diff --git a/lib/set.rb b/lib/set.rb
index e639636c97..e77af5de2e 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -3,7 +3,7 @@
 #
 # set.rb - defines the Set class
 #++
-# Copyright (c) 2002-2016 Akinori MUSHA <knu@iDaemons.org>
+# Copyright (c) 2002-2013 Akinori MUSHA <knu@iDaemons.org>
 #
 # Documentation by Akinori MUSHA and Gavin Sinclair.
 #
@@ -37,8 +37,7 @@
 # Set uses Hash as storage, so you must note the following points:
 #
 # * Equality of elements is determined according to Object#eql? and
-#   Object#hash.  Use Set#compare_by_identity to make a set compare
-#   its elements by their identity.
+#   Object#hash.
 # * Set assumes that the identity of each element does not change
 #   while it is stored.  Modifying an element of a set will render the
 #   set to an unreliable state.
@@ -47,21 +46,21 @@
 #
 # == Comparison
 #
-# The comparison operators <, >, <=, and >= are implemented as
+# The comparison operators <, >, <= and >= are implemented as
 # shorthand for the {proper_,}{subset?,superset?} methods.  However,
 # the <=> operator is intentionally left out because not every pair of
-# sets is comparable ({x, y} vs. {x, z} for example).
+# sets is comparable. ({x,y} vs. {x,z} for example)
 #
 # == Example
 #
 #   require 'set'
-#   s1 = Set[1, 2]                        #=> #<Set: {1, 2}>
-#   s2 = [1, 2].to_set                    #=> #<Set: {1, 2}>
-#   s1 == s2                              #=> true
-#   s1.add("foo")                         #=> #<Set: {1, 2, "foo"}>
-#   s1.merge([2, 6])                      #=> #<Set: {1, 2, "foo", 6}>
-#   s1.subset?(s2)                        #=> false
-#   s2.subset?(s1)                        #=> true
+#   s1 = Set.new [1, 2]                   # -> #<Set: {1, 2}>
+#   s2 = [1, 2].to_set                    # -> #<Set: {1, 2}>
+#   s1 == s2                              # -> true
+#   s1.add("foo")                         # -> #<Set: {1, 2, "foo"}>
+#   s1.merge([2, 6])                      # -> #<Set: {1, 2, "foo", 6}>
+#   s1.subset? s2                         # -> false
+#   s2.subset? s1                         # -> true
 #
 # == Contact
 #
@@ -71,10 +70,6 @@ class Set
   include Enumerable
 
   # Creates a new set containing the given objects.
-  #
-  #     Set[1, 2]                   # => #<Set: {1, 2}>
-  #     Set[1, 2, 1]                # => #<Set: {1, 2}>
-  #     Set[1, 'c', :s]             # => #<Set: {1, "c", :s}>
   def self.[](*ary)
     new(ary)
   end
@@ -84,12 +79,6 @@ class Set
   #
   # If a block is given, the elements of enum are preprocessed by the
   # given block.
-  #
-  #     Set.new([1, 2])                       #=> #<Set: {1, 2}>
-  #     Set.new([1, 2, 1])                    #=> #<Set: {1, 2}>
-  #     Set.new([1, 'c', :s])                 #=> #<Set: {1, "c", :s}>
-  #     Set.new(1..5)                         #=> #<Set: {1, 2, 3, 4, 5}>
-  #     Set.new([1, 2, 3]) { |x| x * x }      #=> #<Set: {1, 4, 9}>
   def initialize(enum = nil, &block) # :yields: o
     @hash ||= Hash.new(false)
 
@@ -102,23 +91,6 @@ class Set
     end
   end
 
-  # Makes the set compare its elements by their identity and returns
-  # self.  This method may not be supported by all subclasses of Set.
-  def compare_by_identity
-    if @hash.respond_to?(:compare_by_identity)
-      @hash.compare_by_identity
-      self
-    else
-      raise NotImplementedError, "#{self.class.name}\##{__method__} is not implemented"
-    end
-  end
-
-  # Returns true if the set will compare its elements by their
-  # identity.  Also see Set#compare_by_identity.
-  def compare_by_identity?
-    @hash.respond_to?(:compare_by_identity?) && @hash.compare_by_identity?
-  end
-
   def do_with_enum(enum, &block) # :nodoc:
     if enum.respond_to?(:each_entry)
       enum.each_entry(&block) if block
@@ -169,10 +141,6 @@ class Set
   end
 
   # Removes all elements and returns self.
-  #
-  #     set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
-  #     set.clear                         #=> #<Set: {}>
-  #     set                               #=> #<Set: {}>
   def clear
     @hash.clear
     self
@@ -180,10 +148,6 @@ class Set
 
   # Replaces the contents of the set with the contents of the given
   # enumerable object and returns self.
-  #
-  #     set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
-  #     set.replace([1, 2])               #=> #<Set: {1, 2}>
-  #     set                               #=> #<Set: {1, 2}>
   def replace(enum)
     if enum.instance_of?(self.class)
       @hash.replace(enum.instance_variable_get(:@hash))
@@ -196,9 +160,6 @@ class Set
   end
 
   # Converts the set to an array.  The order of elements is uncertain.
-  #
-  #     Set[1, 2].to_a                    #=> [1, 2]
-  #     Set[1, 'c', :s].to_a              #=> [1, "c", :s]
   def to_a
     @hash.keys
   end
@@ -258,7 +219,7 @@ class Set
   # Returns true if the set is a superset of the given set.
   def superset?(set)
     case
-    when set.instance_of?(self.class) && @hash.respond_to?(:>=)
+    when set.instance_of?(self.class)
       @hash >= set.instance_variable_get(:@hash)
     when set.is_a?(Set)
       size >= set.size && set.all? { |o| include?(o) }
@@ -271,7 +232,7 @@ class Set
   # Returns true if the set is a proper superset of the given set.
   def proper_superset?(set)
     case
-    when set.instance_of?(self.class) && @hash.respond_to?(:>)
+    when set.instance_of?(self.class)
       @hash > set.instance_variable_get(:@hash)
     when set.is_a?(Set)
       size > set.size && set.all? { |o| include?(o) }
@@ -284,7 +245,7 @@ class Set
   # Returns true if the set is a subset of the given set.
   def subset?(set)
     case
-    when set.instance_of?(self.class) && @hash.respond_to?(:<=)
+    when set.instance_of?(self.class)
       @hash <= set.instance_variable_get(:@hash)
     when set.is_a?(Set)
       size <= set.size && all? { |o| set.include?(o) }
@@ -297,7 +258,7 @@ class Set
   # Returns true if the set is a proper subset of the given set.
   def proper_subset?(set)
     case
-    when set.instance_of?(self.class) && @hash.respond_to?(:<)
+    when set.instance_of?(self.class)
       @hash < set.instance_variable_get(:@hash)
     when set.is_a?(Set)
       size < set.size && all? { |o| set.include?(o) }
@@ -310,8 +271,11 @@ class Set
   # Returns true if the set and the given set have at least one
   # element in common.
   #
-  #   Set[1, 2, 3].intersect? Set[4, 5]   #=> false
-  #   Set[1, 2, 3].intersect? Set[3, 4]   #=> true
+  # e.g.:
+  #
+  #   require 'set'
+  #   Set[1, 2, 3].intersect? Set[4, 5] # => false
+  #   Set[1, 2, 3].intersect? Set[3, 4] # => true
   def intersect?(set)
     set.is_a?(Set) or raise ArgumentError, "value must be a set"
     if size < set.size
@@ -324,8 +288,12 @@ class Set
   # Returns true if the set and the given set have no element in
   # common.  This method is the opposite of +intersect?+.
   #
-  #   Set[1, 2, 3].disjoint? Set[3, 4]   #=> false
-  #   Set[1, 2, 3].disjoint? Set[4, 5]   #=> true
+  # e.g.:
+  #
+  #   require 'set'
+  #   Set[1, 2, 3].disjoint? Set[3, 4] # => false
+  #   Set[1, 2, 3].disjoint? Set[4, 5] # => true
+
   def disjoint?(set)
     !intersect?(set)
   end
@@ -341,10 +309,6 @@ class Set
 
   # Adds the given object to the set and returns self.  Use +merge+ to
   # add many elements at once.
-  #
-  #     Set[1, 2].add(3)                    #=> #<Set: {1, 2, 3}>
-  #     Set[1, 2].add([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
-  #     Set[1, 2].add(2)                    #=> #<Set: {1, 2}>
   def add(o)
     @hash[o] = true
     self
@@ -353,10 +317,6 @@ class Set
 
   # Adds the given object to the set and returns self.  If the
   # object is already in the set, returns nil.
-  #
-  #     Set[1, 2].add?(3)                    #=> #<Set: {1, 2, 3}>
-  #     Set[1, 2].add?([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
-  #     Set[1, 2].add?(2)                    #=> nil
   def add?(o)
     add(o) unless include?(o)
   end
@@ -400,9 +360,7 @@ class Set
   # Returns an enumerator if no block is given.
   def collect!
     block_given? or return enum_for(__method__) { size }
-    set = self.class.new
-    each { |o| set << yield(o) }
-    replace(set)
+    replace(self.class.new(self) { |o| yield(o) })
   end
   alias map! collect!
 
@@ -424,9 +382,6 @@ class Set
     self if size != n
   end
 
-  # Equivalent to Set#select!
-  alias filter! select!
-
   # Merges the elements of the given enumerable object to the set and
   # returns self.
   def merge(enum)
@@ -448,43 +403,31 @@ class Set
 
   # Returns a new set built by merging the set and the elements of the
   # given enumerable object.
-  #
-  #     Set[1, 2, 3] | Set[2, 4, 5]         #=> #<Set: {1, 2, 3, 4, 5}>
-  #     Set[1, 5, 'z'] | (1..6)             #=> #<Set: {1, 5, "z", 2, 3, 4, 6}>
   def |(enum)
     dup.merge(enum)
   end
-  alias + |
-  alias union |
+  alias + |             ##
+  alias union |         ##
 
   # Returns a new set built by duplicating the set, removing every
   # element that appears in the given enumerable object.
-  #
-  #     Set[1, 3, 5] - Set[1, 5]                #=> #<Set: {3}>
-  #     Set['a', 'b', 'z'] - ['a', 'c']         #=> #<Set: {"b", "z"}>
   def -(enum)
     dup.subtract(enum)
   end
-  alias difference -
+  alias difference -    ##
 
   # Returns a new set containing elements common to the set and the
   # given enumerable object.
-  #
-  #     Set[1, 3, 5] & Set[3, 2, 1]             #=> #<Set: {3, 1}>
-  #     Set['a', 'b', 'z'] & ['a', 'b', 'c']    #=> #<Set: {"a", "b"}>
   def &(enum)
     n = self.class.new
     do_with_enum(enum) { |o| n.add(o) if include?(o) }
     n
   end
-  alias intersection &
+  alias intersection &  ##
 
   # Returns a new set containing elements exclusive between the set
   # and the given enumerable object.  (set ^ enum) is equivalent to
   # ((set | enum) - (set & enum)).
-  #
-  #     Set[1, 2] ^ Set[2, 3]                   #=> #<Set: {3, 1}>
-  #     Set[1, 'b', 'c'] ^ ['b', 'd']           #=> #<Set: {"d", 1, "c"}>
   def ^(enum)
     n = Set.new(enum)
     each { |o| n.add(o) unless n.delete?(o) }
@@ -493,11 +436,6 @@ class Set
 
   # Returns true if two sets are equal.  The equality of each couple
   # of elements is defined according to Object#eql?.
-  #
-  #     Set[1, 2] == Set[2, 1]                       #=> true
-  #     Set[1, 3, 5] == Set[1, 5]                    #=> false
-  #     Set['a', 'b', 'c'] == Set['a', 'c', 'b']     #=> true
-  #     Set['a', 'b', 'c'] == ['a', 'c', 'b']        #=> false
   def ==(other)
     if self.equal?(other)
       true
@@ -519,52 +457,19 @@ class Set
     @hash.eql?(o.instance_variable_get(:@hash))
   end
 
-  # Resets the internal state after modification to existing elements
-  # and returns self.
-  #
-  # Elements will be reindexed and deduplicated.
-  def reset
-    if @hash.respond_to?(:rehash)
-      @hash.rehash # This should perform frozenness check.
-    else
-      raise "can't modify frozen #{self.class.name}" if frozen?
-    end
-    self
-  end
-
-  # Returns true if the given object is a member of the set,
-  # and false otherwise.
-  #
-  # Used in case statements:
-  #
-  #   require 'set'
-  #
-  #   case :apple
-  #   when Set[:potato, :carrot]
-  #     "vegetable"
-  #   when Set[:apple, :banana]
-  #     "fruit"
-  #   end
-  #   # => "fruit"
-  #
-  # Or by itself:
-  #
-  #   Set[1, 2, 3] === 2   #=> true
-  #   Set[1, 2, 3] === 4   #=> false
-  #
-  alias === include?
-
   # Classifies the set by the return value of the given block and
   # returns a hash of {value => set of elements} pairs.  The block is
   # called once for each element of the set, passing the element as
   # parameter.
   #
+  # e.g.:
+  #
   #   require 'set'
   #   files = Set.new(Dir.glob("*.rb"))
   #   hash = files.classify { |f| File.mtime(f).year }
-  #   hash       #=> {2000=>#<Set: {"a.rb", "b.rb"}>,
-  #              #    2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
-  #              #    2002=>#<Set: {"f.rb"}>}
+  #   p hash    # => {2000=>#<Set: {"a.rb", "b.rb"}>,
+  #             #     2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
+  #             #     2002=>#<Set: {"f.rb"}>}
   #
   # Returns an enumerator if no block is given.
   def classify # :yields: o
@@ -586,13 +491,15 @@ class Set
   # if block.call(o1, o2) is true.  Otherwise, elements o1 and o2 are
   # in common if block.call(o1) == block.call(o2).
   #
+  # e.g.:
+  #
   #   require 'set'
   #   numbers = Set[1, 3, 4, 6, 9, 10, 11]
   #   set = numbers.divide { |i,j| (i - j).abs == 1 }
-  #   set        #=> #<Set: {#<Set: {1}>,
-  #              #           #<Set: {11, 9, 10}>,
-  #              #           #<Set: {3, 4}>,
-  #              #           #<Set: {6}>}>
+  #   p set     # => #<Set: {#<Set: {1}>,
+  #             #            #<Set: {11, 9, 10}>,
+  #             #            #<Set: {3, 4}>,
+  #             #            #<Set: {6}>}>
   #
   # Returns an enumerator if no block is given.
   def divide(&func)
@@ -628,7 +535,7 @@ class Set
   InspectKey = :__inspect_key__         # :nodoc:
 
   # Returns a string containing a human-readable representation of the
-  # set ("#<Set: {element1, element2, ...}>").
+  # set. ("#<Set: {element1, element2, ...}>")
   def inspect
     ids = (Thread.current[InspectKey] ||= [])
 
@@ -644,8 +551,6 @@ class Set
     end
   end
 
-  alias to_s inspect
-
   def pretty_print(pp)  # :nodoc:
     pp.text sprintf('#<%s: {', self.class.name)
     pp.nest(1) {
@@ -692,7 +597,6 @@ end
 #
 class SortedSet < Set
   @@setup = false
-  @@mutex = Mutex.new
 
   class << self
     def [](*ary)        # :nodoc:
@@ -702,103 +606,94 @@ class SortedSet < Set
     def setup   # :nodoc:
       @@setup and return
 
-      @@mutex.synchronize do
+      module_eval {
         # a hack to shut up warning
-        alias_method :old_init, :initialize
-
-        begin
-          require 'rbtree'
-
-          module_eval <<-END, __FILE__, __LINE__+1
-            def initialize(*args)
-              @hash = RBTree.new
-              super
-            end
-
-            def add(o)
-              o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
-              super
-            end
-            alias << add
-          END
-        rescue LoadError
-          module_eval <<-END, __FILE__, __LINE__+1
-            def initialize(*args)
-              @keys = nil
-              super
-            end
-
-            def clear
-              @keys = nil
-              super
-            end
-
-            def replace(enum)
-              @keys = nil
-              super
-            end
-
-            def add(o)
-              o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
-              @keys = nil
-              super
-            end
-            alias << add
-
-            def delete(o)
-              @keys = nil
-              @hash.delete(o)
-              self
-            end
-
-            def delete_if
-              block_given? or return enum_for(__method__) { size }
-              n = @hash.size
-              super
-              @keys = nil if @hash.size != n
-              self
-            end
-
-            def keep_if
-              block_given? or return enum_for(__method__) { size }
-              n = @hash.size
-              super
-              @keys = nil if @hash.size != n
-              self
-            end
-
-            def merge(enum)
-              @keys = nil
-              super
-            end
-
-            def each(&block)
-              block or return enum_for(__method__) { size }
-              to_a.each(&block)
-              self
-            end
-
-            def to_a
-              (@keys = @hash.keys).sort! unless @keys
-              @keys
-            end
-
-            def freeze
-              to_a
-              super
-            end
-
-            def rehash
-              @keys = nil
-              super
-            end
-          END
-        end
+        alias old_init initialize
+      }
+      begin
+        require 'rbtree'
+
+        module_eval <<-END, __FILE__, __LINE__+1
+          def initialize(*args)
+            @hash = RBTree.new
+            super
+          end
+
+          def add(o)
+            o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
+            super
+          end
+          alias << add
+        END
+      rescue LoadError
+        module_eval <<-END, __FILE__, __LINE__+1
+          def initialize(*args)
+            @keys = nil
+            super
+          end
+
+          def clear
+            @keys = nil
+            super
+          end
+
+          def replace(enum)
+            @keys = nil
+            super
+          end
+
+          def add(o)
+            o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
+            @keys = nil
+            super
+          end
+          alias << add
+
+          def delete(o)
+            @keys = nil
+            @hash.delete(o)
+            self
+          end
+
+          def delete_if
+            block_given? or return enum_for(__method__) { size }
+            n = @hash.size
+            super
+            @keys = nil if @hash.size != n
+            self
+          end
+
+          def keep_if
+            block_given? or return enum_for(__method__) { size }
+            n = @hash.size
+            super
+            @keys = nil if @hash.size != n
+            self
+          end
+
+          def merge(enum)
+            @keys = nil
+            super
+          end
+
+          def each(&block)
+            block or return enum_for(__method__) { size }
+            to_a.each(&block)
+            self
+          end
+
+          def to_a
+            (@keys = @hash.keys).sort! unless @keys
+            @keys
+          end
+        END
+      end
+      module_eval {
         # a hack to shut up warning
         remove_method :old_init
+      }
 
-        @@setup = true
-      end
+      @@setup = true
     end
   end
 
diff --git a/lib/shell.rb b/lib/shell.rb
index 77b3b97ed3..b0bdc8194f 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -17,7 +17,6 @@ require "forwardable"
 require "shell/error"
 require "shell/command-processor"
 require "shell/process-controller"
-require "shell/version"
 
 # Shell implements an idiomatic Ruby interface for common UNIX shell commands.
 #
@@ -100,14 +99,11 @@ class Shell
   @debug_display_process_id = false
   @debug_display_thread_id = true
   @debug_output_mutex = Thread::Mutex.new
-  @default_system_path = nil
-  @default_record_separator = nil
 
   class << Shell
     extend Forwardable
 
-    attr_accessor :cascade, :verbose
-    attr_reader :debug
+    attr_accessor :cascade, :debug, :verbose
 
     alias debug? debug
     alias verbose? verbose
@@ -212,8 +208,7 @@ class Shell
   # Returns the umask
   attr_accessor :umask
   attr_accessor :record_separator
-  attr_accessor :verbose
-  attr_reader :debug
+  attr_accessor :verbose, :debug
 
   def debug=(val)
     @debug = val
diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb
index a6a9d232ad..c76fa81ee1 100644
--- a/lib/shell/builtin-command.rb
+++ b/lib/shell/builtin-command.rb
@@ -10,10 +10,10 @@
 #
 #
 
-require_relative "filter"
+require "shell/filter"
 
 class Shell
-  class BuiltInCommand < Filter
+  class BuiltInCommand<Filter
     def wait?
       false
     end
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index 82af76dd5e..2239ca98f6 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -11,11 +11,12 @@
 #
 
 require "e2mmap"
+require "thread"
 
-require_relative "error"
-require_relative "filter"
-require_relative "system-command"
-require_relative "builtin-command"
+require "shell/error"
+require "shell/filter"
+require "shell/system-command"
+require "shell/builtin-command"
 
 class Shell
   # In order to execute a command on your OS, you need to define it as a
@@ -53,9 +54,8 @@ class Shell
     # include run file.
     #
     def self.run_config
-      rc = "~/.rb_shell"
       begin
-        load File.expand_path(rc) if ENV.key?("HOME")
+        load File.expand_path("~/.rb_shell") if ENV.key?("HOME")
       rescue LoadError, Errno::ENOENT
       rescue
         print "load error: #{rc}\n"
@@ -180,9 +180,6 @@ class Shell
             top_level_test(command, file1)
           end
         else
-          unless FileTest.methods(false).include?(command.to_sym)
-            raise "unsupported command: #{ command }"
-          end
           if file2
             FileTest.send(command, file1, file2)
           else
diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb
index caa976ae3e..c1f4b28a45 100644
--- a/lib/shell/filter.rb
+++ b/lib/shell/filter.rb
@@ -47,7 +47,7 @@ class Shell #:nodoc:
     #
     # Inputs from +source+, which is either a string of a file name or an IO
     # object.
-    def <(src)
+    def < (src)
       case src
       when String
         cat = Cat.new(@shell, src)
@@ -56,7 +56,7 @@ class Shell #:nodoc:
         self.input = src
         self
       else
-        Shell.Fail Error::CantApplyMethod, "<", src.class
+        Shell.Fail Error::CantApplyMethod, "<", to.class
       end
     end
 
@@ -65,7 +65,7 @@ class Shell #:nodoc:
     #
     # Outputs from +source+, which is either a string of a file name or an IO
     # object.
-    def >(to)
+    def > (to)
       case to
       when String
         dst = @shell.open(to, "w")
@@ -87,7 +87,7 @@ class Shell #:nodoc:
     #
     # Appends the output to +source+, which is either a string of a file name
     # or an IO object.
-    def >>(to)
+    def >> (to)
       begin
         Shell.cd(@shell.pwd).append(to, self)
       rescue CantApplyMethod
@@ -99,7 +99,7 @@ class Shell #:nodoc:
     #   | filter
     #
     # Processes a pipeline.
-    def |(filter)
+    def | (filter)
       filter.input = self
       if active?
         @shell.process_controller.start_job filter
@@ -111,7 +111,7 @@ class Shell #:nodoc:
     #   filter1 + filter2
     #
     # Outputs +filter1+, and then +filter2+ using Join.new
-    def +(filter)
+    def + (filter)
       Join.new(@shell, self, filter)
     end
 
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index d54da68cb0..a536ebd6ee 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -10,6 +10,8 @@
 #
 #
 require "forwardable"
+
+require "thread"
 require "sync"
 
 class Shell
@@ -258,7 +260,7 @@ class Shell
 
             ObjectSpace.each_object(IO) do |io|
               if ![STDIN, STDOUT, STDERR].include?(io)
-                io.close
+                io.close unless io.closed?
               end
             end
 
diff --git a/lib/shell/shell.gemspec b/lib/shell/shell.gemspec
deleted file mode 100644
index 1c27670ca4..0000000000
--- a/lib/shell/shell.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/shell/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "shell"
-  spec.version       = Shell::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{An idiomatic Ruby interface for common UNIX shell commands.}
-  spec.description   = %q{An idiomatic Ruby interface for common UNIX shell commands.}
-  spec.homepage      = "https://github.com/ruby/shell"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/shell.rb", "lib/shell/builtin-command.rb", "lib/shell/command-processor.rb", "lib/shell/error.rb", "lib/shell/filter.rb", "lib/shell/process-controller.rb", "lib/shell/system-command.rb", "lib/shell/version.rb", "shell.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/shell/system-command.rb b/lib/shell/system-command.rb
index 767a9ee12c..81456e7db3 100644
--- a/lib/shell/system-command.rb
+++ b/lib/shell/system-command.rb
@@ -10,13 +10,13 @@
 #
 #
 
-require_relative "filter"
+require "shell/filter"
 
 class Shell
   class SystemCommand < Filter
     def initialize(sh, command, *opts)
       if t = opts.find{|opt| !opt.kind_of?(String) && opt.class}
-        Shell.Fail TypeError, t.class, "String"
+        Shell.Fail Error::TypeError, t.class, "String"
       end
       super(sh)
       @command = command
diff --git a/lib/shell/version.rb b/lib/shell/version.rb
index f48f781b2c..bb4e7dfb8e 100644
--- a/lib/shell/version.rb
+++ b/lib/shell/version.rb
@@ -11,7 +11,6 @@
 #
 
 class Shell # :nodoc:
-  VERSION = "0.7"
-  @RELEASE_VERSION = VERSION
+  @RELEASE_VERSION = "0.7"
   @LAST_UPDATE_DATE = "07/03/20"
 end
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index eb5fa2d226..0030f0784f 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -6,8 +6,7 @@
 # of the UNIX Bourne shell.
 #
 # The shellwords() function was originally a port of shellwords.pl,
-# but modified to conform to the Shell & Utilities volume of the IEEE
-# Std 1003.1-2008, 2016 Edition [1].
+# but modified to conform to POSIX / SUSv3 (IEEE Std 1003.1-2001 [1]).
 #
 # === Usage
 #
@@ -56,7 +55,7 @@
 #
 # === Resources
 #
-# 1: {IEEE Std 1003.1-2008, 2016 Edition, the Shell & Utilities volume}[http://pubs.opengroup.org/onlinepubs/9699919799/utilities/contents.html]
+# 1: {IEEE Std 1003.1-2004}[http://pubs.opengroup.org/onlinepubs/009695399/toc.htm]
 
 module Shellwords
   # Splits a string into an array of tokens in the same way the UNIX
@@ -82,14 +81,7 @@ module Shellwords
     line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do
       |word, sq, dq, esc, garbage, sep|
       raise ArgumentError, "Unmatched double quote: #{line.inspect}" if garbage
-      # 2.2.3 Double-Quotes:
-      #
-      #   The <backslash> shall retain its special meaning as an
-      #   escape character only when followed by one of the following
-      #   characters when considered special:
-      #
-      #   $ ` " \ <newline>
-      field << (word || sq || (dq && dq.gsub(/\\([$`"\\\n])/, '\\1')) || esc.gsub(/\\(.)/, '\\1'))
+      field << (word || sq || (dq || esc).gsub(/\\(.)/, '\\1'))
       if sep
         words << field
         field = String.new
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 368febc74d..deb0f52cd6 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+require 'thread'
 
 # The Singleton module implements the Singleton pattern.
 #
diff --git a/lib/sync.gemspec b/lib/sync.gemspec
deleted file mode 100644
index 42d40f3e66..0000000000
--- a/lib/sync.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-begin
-  require_relative "lib/sync"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "sync"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "sync"
-  spec.version       = Sync::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{A module that provides a two-phase lock with a counter.}
-  spec.description   = %q{A module that provides a two-phase lock with a counter.}
-  spec.homepage      = "https://github.com/ruby/sync"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/sync.rb", "sync.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/sync.rb b/lib/sync.rb
index 998e2b7b92..c95343594f 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -38,6 +38,10 @@
 #
 #
 
+unless defined? Thread
+  raise "Thread not available for this ruby interpreter"
+end
+
 ##
 # A module that provides a two-phase lock with a counter.
 
@@ -64,7 +68,7 @@ module Sync_m
       Message = "Unknown lock mode(%s)"
       def LockModeFailer.Fail(mode)
         if mode.id2name
-          mode = mode.id2name
+          mode = id2name
         end
         super(mode)
       end
@@ -300,7 +304,7 @@ module Sync_m
         ret = false
       end
     else
-      Err::LockModeFailer.Fail m
+      Err::LockModeFailer.Fail mode
     end
     return ret
   end
@@ -316,9 +320,6 @@ Synchronizer_m = Sync_m
 # details.
 
 class Sync
-
-  VERSION = "0.5.0"
-
   include Sync_m
 end
 
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index f703709113..223637f84a 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #
 # tempfile - manipulates temporary files
 #
@@ -47,7 +47,7 @@ require 'tmpdir'
 #
 #   file = Tempfile.new('foo')
 #   begin
-#      # ...do something with file...
+#      ...do something with file...
 #   ensure
 #      file.close
 #      file.unlink   # deletes the temp file
@@ -79,6 +79,9 @@ require 'tmpdir'
 # same Tempfile object from multiple threads then you should protect it with a
 # mutex.
 class Tempfile < DelegateClass(File)
+  # call-seq:
+  #    new(basename = "", [tmpdir = Dir.tmpdir], [options])
+  #
   # Creates a temporary file with permissions 0600 (= only readable and
   # writable by the owner) and opens it with mode "w+".
   #
@@ -111,20 +114,17 @@ class Tempfile < DelegateClass(File)
   # +File.open+. This is mostly useful for specifying encoding
   # options, e.g.:
   #
-  #   Tempfile.new('hello', '/home/aisaka', encoding: 'ascii-8bit')
+  #   Tempfile.new('hello', '/home/aisaka', :encoding => 'ascii-8bit')
   #
   #   # You can also omit the 'tmpdir' parameter:
-  #   Tempfile.new('hello', encoding: 'ascii-8bit')
-  #
-  # Note: +mode+ keyword argument, as accepted by Tempfile, can only be
-  # numeric, combination of the modes defined in File::Constants.
+  #   Tempfile.new('hello', :encoding => 'ascii-8bit')
   #
   # === Exceptions
   #
   # If Tempfile.new cannot find a unique filename within a limited
   # number of tries, then it will raise an exception.
   def initialize(basename="", tmpdir=nil, mode: 0, **options)
-    warn "Tempfile.new doesn't call the given block.", uplevel: 1 if block_given?
+    warn "Tempfile.new doesn't call the given block." if block_given?
 
     @unlinked = false
     @mode = mode|File::RDWR|File::CREAT|File::EXCL
@@ -147,7 +147,7 @@ class Tempfile < DelegateClass(File)
   end
 
   def _close    # :nodoc:
-    @tmpfile.close
+    @tmpfile.close unless @tmpfile.closed?
   end
   protected :_close
 
@@ -174,7 +174,7 @@ class Tempfile < DelegateClass(File)
   #
   #   file = Tempfile.new('foo')
   #   begin
-  #      # ...do something with file...
+  #      ...do something with file...
   #   ensure
   #      file.close
   #      file.unlink   # deletes the temp file
@@ -195,7 +195,7 @@ class Tempfile < DelegateClass(File)
   #   file = Tempfile.new('foo')
   #   file.unlink   # On Windows this silently fails.
   #   begin
-  #      # ... do something with file ...
+  #      ... do something with file ...
   #   ensure
   #      file.close!   # Closes the file handle. If the file wasn't unlinked
   #                    # because #unlink failed, then this method will attempt
@@ -227,7 +227,7 @@ class Tempfile < DelegateClass(File)
     if !@tmpfile.closed?
       @tmpfile.size # File#size calls rb_io_flush_raw()
     else
-      File.size(@tmpfile.path)
+      File.size?(@tmpfile.path)
     end
   end
   alias length size
@@ -241,7 +241,7 @@ class Tempfile < DelegateClass(File)
     end
   end
 
-  class Remover # :nodoc:
+  class Remover
     def initialize(tmpfile)
       @pid = Process.pid
       @tmpfile = tmpfile
@@ -250,15 +250,15 @@ class Tempfile < DelegateClass(File)
     def call(*args)
       return if @pid != Process.pid
 
-      $stderr.puts "removing #{@tmpfile.path}..." if $DEBUG
+      warn "removing #{@tmpfile.path}..." if $DEBUG
 
-      @tmpfile.close
+      @tmpfile.close unless @tmpfile.closed?
       begin
         File.unlink(@tmpfile.path)
       rescue Errno::ENOENT
       end
 
-      $stderr.puts "done" if $DEBUG
+      warn "done" if $DEBUG
     end
   end
 
@@ -274,16 +274,16 @@ class Tempfile < DelegateClass(File)
     # object will be automatically closed after the block terminates.
     # The call returns the value of the block.
     #
-    # In any case, all arguments (<code>*args</code>) will be passed to Tempfile.new.
+    # In any case, all arguments (+*args+) will be passed to Tempfile.new.
     #
     #   Tempfile.open('foo', '/home/temp') do |f|
-    #      # ... do something with f ...
+    #      ... do something with f ...
     #   end
     #
     #   # Equivalent:
     #   f = Tempfile.open('foo', '/home/temp')
     #   begin
-    #      # ... do something with f ...
+    #      ... do something with f ...
     #   ensure
     #      f.close
     #   end
@@ -317,14 +317,13 @@ end
 # the temporary file is removed after the block terminates.
 # The call returns the value of the block.
 #
-# In any case, all arguments (+basename+, +tmpdir+, +mode+, and
-# <code>**options</code>) will be treated as Tempfile.new.
+# In any case, all arguments (+*args+) will be treated as Tempfile.new.
 #
 #   Tempfile.create('foo', '/home/temp') do |f|
-#      # ... do something with f ...
+#      ... do something with f ...
 #   end
 #
-def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options)
+def Tempfile.create(basename, tmpdir=nil, mode: 0, **options)
   tmpfile = nil
   Dir::Tmpname.create(basename, tmpdir, options) do |tmpname, n, opts|
     mode |= File::RDWR|File::CREAT|File::EXCL
@@ -335,18 +334,8 @@ def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options)
     begin
       yield tmpfile
     ensure
-      unless tmpfile.closed?
-        if File.identical?(tmpfile, tmpfile.path)
-          unlinked = File.unlink tmpfile.path rescue nil
-        end
-        tmpfile.close
-      end
-      unless unlinked
-        begin
-          File.unlink tmpfile.path
-        rescue Errno::ENOENT
-        end
-      end
+      tmpfile.close if !tmpfile.closed?
+      File.unlink tmpfile
     end
   else
     tmpfile
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 541fe1e3c3..239915baef 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -5,7 +5,8 @@
 #       $Revision: 1.3 $
 #       by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
 
-require "e2mmap"
+require "thread.rb"
+require "e2mmap.rb"
 
 #
 # This class watches for termination of multiple threads.  Basic functionality
diff --git a/lib/thwait/thwait.gemspec b/lib/thwait/thwait.gemspec
deleted file mode 100644
index fc03942aba..0000000000
--- a/lib/thwait/thwait.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/thwait/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "thwait"
-  spec.version       = ThreadsWait::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Watches for termination of multiple threads.}
-  spec.description   = %q{Watches for termination of multiple threads.}
-  spec.homepage      = "https://github.com/ruby/thwait"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/thwait.rb", "lib/thwait/version.rb", "thwait.gemspec"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
diff --git a/lib/thwait/version.rb b/lib/thwait/version.rb
deleted file mode 100644
index a3ffb3af16..0000000000
--- a/lib/thwait/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ThreadsWait
-  VERSION = "0.1.0"
-end
diff --git a/lib/time.rb b/lib/time.rb
index 81c0ebd7ba..69e524fd61 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -2,8 +2,6 @@
 
 require 'date'
 
-# :stopdoc:
-
 # = time.rb
 #
 # When 'time' is required, Time is extended with additional methods for parsing
@@ -20,8 +18,73 @@ require 'date'
 #   8601}[http://www.iso.org/iso/date_and_time_format])
 # * various formats handled by Date._parse
 # * custom formats handled by Date._strptime
-
-# :startdoc:
+#
+# == Examples
+#
+# All examples assume you have loaded Time with:
+#
+#   require 'time'
+#
+# All of these examples were done using the EST timezone which is GMT-5.
+#
+# === Converting to a String
+#
+#   t = Time.now
+#   t.iso8601  # => "2011-10-05T22:26:12-04:00"
+#   t.rfc2822  # => "Wed, 05 Oct 2011 22:26:12 -0400"
+#   t.httpdate # => "Thu, 06 Oct 2011 02:26:12 GMT"
+#
+# === Time.parse
+#
+# #parse takes a string representation of a Time and attempts to parse it
+# using a heuristic.
+#
+#   Time.parse("2010-10-31") #=> 2010-10-31 00:00:00 -0500
+#
+# Any missing pieces of the date are inferred based on the current date.
+#
+#   # assuming the current date is "2011-10-31"
+#   Time.parse("12:00") #=> 2011-10-31 12:00:00 -0500
+#
+# We can change the date used to infer our missing elements by passing a second
+# object that responds to #mon, #day and #year, such as Date, Time or DateTime.
+# We can also use our own object.
+#
+#   class MyDate
+#     attr_reader :mon, :day, :year
+#
+#     def initialize(mon, day, year)
+#       @mon, @day, @year = mon, day, year
+#     end
+#   end
+#
+#   d  = Date.parse("2010-10-28")
+#   t  = Time.parse("2010-10-29")
+#   dt = DateTime.parse("2010-10-30")
+#   md = MyDate.new(10,31,2010)
+#
+#   Time.parse("12:00", d)  #=> 2010-10-28 12:00:00 -0500
+#   Time.parse("12:00", t)  #=> 2010-10-29 12:00:00 -0500
+#   Time.parse("12:00", dt) #=> 2010-10-30 12:00:00 -0500
+#   Time.parse("12:00", md) #=> 2010-10-31 12:00:00 -0500
+#
+# #parse also accepts an optional block. You can use this block to specify how
+# to handle the year component of the date. This is specifically designed for
+# handling two digit years. For example, if you wanted to treat all two digit
+# years prior to 70 as the year 2000+ you could write this:
+#
+#   Time.parse("01-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
+#   #=> 2001-10-31 00:00:00 -0500
+#   Time.parse("70-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
+#   #=> 1970-10-31 00:00:00 -0500
+#
+# === Time.strptime
+#
+# #strptime works similar to +parse+ except that instead of using a heuristic
+# to detect the format of the input string, you provide a second argument that
+# describes the format of the string. For example:
+#
+#   Time.strptime("2000-10-31", "%Y-%m-%d") #=> 2000-10-31 00:00:00 -0500
 
 class Time
   class << Time
@@ -68,19 +131,12 @@ class Time
     #
     # If +zone_offset+ is unable to determine the offset, nil will be
     # returned.
-    #
-    #     require 'time'
-    #
-    #     Time.zone_offset("EST") #=> -18000
-    #
-    # You must require 'time' to use this method.
-    #
     def zone_offset(zone, year=self.now.year)
       off = nil
       zone = zone.upcase
-      if /\A([+-])(\d\d)(:?)(\d\d)(?:\3(\d\d))?\z/ =~ zone
-        off = ($1 == '-' ? -1 : 1) * (($2.to_i * 60 + $4.to_i) * 60 + $5.to_i)
-      elsif zone.match?(/\A[+-]\d\d\z/)
+      if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
+        off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
+      elsif /\A[+-]\d\d\z/ =~ zone
         off = zone.to_i * 3600
       elsif ZoneOffset.include?(zone)
         off = ZoneOffset[zone] * 3600
@@ -112,7 +168,11 @@ class Time
       #   They are not appropriate for specific time zone such as
       #   Europe/London because time zone neutral,
       #   So -00:00 and -0000 are treated as UTC.
-      zone.match?(/\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i)
+      if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
+        true
+      else
+        false
+      end
     end
     private :zone_utc?
 
@@ -189,43 +249,19 @@ class Time
     end
     private :apply_offset
 
-    def make_time(date, year, yday, mon, day, hour, min, sec, sec_fraction, zone, now)
-      if !year && !yday && !mon && !day && !hour && !min && !sec && !sec_fraction
+    def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, now)
+      if !year && !mon && !day && !hour && !min && !sec && !sec_fraction
         raise ArgumentError, "no time information in #{date.inspect}"
       end
 
+      off_year = year || now.year
       off = nil
-      if year || now
-        off_year = year || now.year
-        off = zone_offset(zone, off_year) if zone
-      end
+      off = zone_offset(zone, off_year) if zone
 
-      if yday
-        unless (1..366) === yday
-          raise ArgumentError, "yday #{yday} out of range"
-        end
-        mon, day = (yday-1).divmod(31)
-        mon += 1
-        day += 1
-        t = make_time(date, year, nil, mon, day, hour, min, sec, sec_fraction, zone, now)
-        diff = yday - t.yday
-        return t if diff.zero?
-        day += diff
-        if day > 28 and day > (mday = month_days(off_year, mon))
-          if (mon += 1) > 12
-            raise ArgumentError, "yday #{yday} out of range"
-          end
-          day -= mday
-        end
-        return make_time(date, year, nil, mon, day, hour, min, sec, sec_fraction, zone, now)
-      end
-
-      if now and now.respond_to?(:getlocal)
-        if off
-          now = now.getlocal(off) if now.utc_offset != off
-        else
-          now = now.getlocal
-        end
+      if off
+        now = now.getlocal(off) if now.utc_offset != off
+      else
+        now = now.getlocal
       end
 
       usec = nil
@@ -269,62 +305,17 @@ class Time
     private :make_time
 
     #
-    # Takes a string representation of a Time and attempts to parse it
-    # using a heuristic.
-    #
-    #     require 'time'
-    #
-    #     Time.parse("2010-10-31") #=> 2010-10-31 00:00:00 -0500
-    #
-    # Any missing pieces of the date are inferred based on the current date.
-    #
-    #     require 'time'
-    #
-    #     # assuming the current date is "2011-10-31"
-    #     Time.parse("12:00") #=> 2011-10-31 12:00:00 -0500
-    #
-    # We can change the date used to infer our missing elements by passing a second
-    # object that responds to #mon, #day and #year, such as Date, Time or DateTime.
-    # We can also use our own object.
-    #
-    #     require 'time'
-    #
-    #     class MyDate
-    #       attr_reader :mon, :day, :year
+    # Parses +date+ using Date._parse and converts it to a Time object.
     #
-    #       def initialize(mon, day, year)
-    #         @mon, @day, @year = mon, day, year
-    #       end
-    #     end
-    #
-    #     d  = Date.parse("2010-10-28")
-    #     t  = Time.parse("2010-10-29")
-    #     dt = DateTime.parse("2010-10-30")
-    #     md = MyDate.new(10,31,2010)
-    #
-    #     Time.parse("12:00", d)  #=> 2010-10-28 12:00:00 -0500
-    #     Time.parse("12:00", t)  #=> 2010-10-29 12:00:00 -0500
-    #     Time.parse("12:00", dt) #=> 2010-10-30 12:00:00 -0500
-    #     Time.parse("12:00", md) #=> 2010-10-31 12:00:00 -0500
-    #
-    # If a block is given, the year described in +date+ is converted
-    # by the block.  This is specifically designed for handling two
-    # digit years. For example, if you wanted to treat all two digit
-    # years prior to 70 as the year 2000+ you could write this:
-    #
-    #     require 'time'
+    # If a block is given, the year described in +date+ is converted by the
+    # block.  For example:
     #
-    #     Time.parse("01-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
-    #     #=> 2001-10-31 00:00:00 -0500
-    #     Time.parse("70-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
-    #     #=> 1970-10-31 00:00:00 -0500
+    #     Time.parse(...) {|y| 0 <= y && y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
     #
     # If the upper components of the given time are broken or missing, they are
     # supplied with those of +now+.  For the lower components, the minimum
     # values (1 or 0) are assumed if broken or missing.  For example:
     #
-    #     require 'time'
-    #
     #     # Suppose it is "Thu Nov 29 14:33:20 2001" now and
     #     # your time zone is EST which is GMT-5.
     #     now = Time.parse("Thu Nov 29 14:33:20 2001")
@@ -372,13 +363,11 @@ class Time
       d = Date._parse(date, comp)
       year = d[:year]
       year = yield(year) if year && !comp
-      make_time(date, year, d[:yday], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
+      make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
     end
 
     #
-    # Works similar to +parse+ except that instead of using a
-    # heuristic to detect the format of the input string, you provide
-    # a second argument that describes the format of the string.
+    # Parses +date+ using Date._strptime and converts it to a Time object.
     #
     # If a block is given, the year described in +date+ is converted by the
     # block.  For example:
@@ -407,10 +396,12 @@ class Time
     # %m :: Month of the year (01..12)
     # %M :: Minute of the hour (00..59)
     # %n :: Newline (\n)
-    # %N :: Fractional seconds digits
+    # %N :: Fractional seconds digits, default is 9 digits (nanosecond)
+    #       %3N :: millisecond (3 digits)
+    #       %6N :: microsecond (6 digits)
+    #       %9N :: nanosecond (9 digits)
     # %p :: Meridian indicator ("AM" or "PM")
     # %P :: Meridian indicator ("am" or "pm")
-    # %Q :: Number of milliseconds since 1970-01-01 00:00:00 UTC.
     # %r :: time, 12-hour (same as %I:%M:%S %p)
     # %R :: time, 24-hour (%H:%M)
     # %s :: Number of seconds since 1970-01-01 00:00:00 UTC.
@@ -432,17 +423,10 @@ class Time
     # %z :: Time zone as  hour offset from UTC (e.g. +0900)
     # %Z :: Time zone name
     # %% :: Literal "%" character
-    # %+ :: date(1) (%a %b %e %H:%M:%S %Z %Y)
-    #
-    #     require 'time'
-    #
-    #     Time.strptime("2000-10-31", "%Y-%m-%d") #=> 2000-10-31 00:00:00 -0500
-    #
-    # You must require 'time' to use this method.
-    #
+
     def strptime(date, format, now=self.now)
       d = Date._strptime(date, format)
-      raise ArgumentError, "invalid date or strptime format - `#{date}' `#{format}'" unless d
+      raise ArgumentError, "invalid strptime format - `#{format}'" unless d
       if seconds = d[:seconds]
         if sec_fraction = d[:sec_fraction]
           usec = sec_fraction * 1000000
@@ -457,7 +441,7 @@ class Time
       else
         year = d[:year]
         year = yield(year) if year && block_given?
-        t = make_time(date, year, d[:yday], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
+        t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
       end
       t
     end
@@ -477,11 +461,6 @@ class Time
     #
     # See #rfc2822 for more information on this format.
     #
-    #     require 'time'
-    #
-    #     Time.rfc2822("Wed, 05 Oct 2011 22:26:12 -0400")
-    #     #=> 2010-10-05 22:26:12 -0400
-    #
     # You must require 'time' to use this method.
     #
     def rfc2822(date)
@@ -535,22 +514,17 @@ class Time
     #
     # See #httpdate for more information on this format.
     #
-    #     require 'time'
-    #
-    #     Time.httpdate("Thu, 06 Oct 2011 02:26:12 GMT")
-    #     #=> 2011-10-06 02:26:12 UTC
-    #
     # You must require 'time' to use this method.
     #
     def httpdate(date)
-      if date.match?(/\A\s*
+      if /\A\s*
           (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\x20
           (\d{2})\x20
           (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
           (\d{4})\x20
           (\d{2}):(\d{2}):(\d{2})\x20
           GMT
-          \s*\z/ix)
+          \s*\z/ix =~ date
         self.rfc2822(date).utc
       elsif /\A\s*
              (?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20
@@ -589,11 +563,6 @@ class Time
     #
     # See #xmlschema for more information on this format.
     #
-    #     require 'time'
-    #
-    #     Time.xmlschema("2011-10-05T22:26:12-04:00")
-    #     #=> 2011-10-05 22:26:12-04:00
-    #
     # You must require 'time' to use this method.
     #
     def xmlschema(date)
@@ -602,7 +571,7 @@ class Time
           T
           (\d\d):(\d\d):(\d\d)
           (\.\d+)?
-          (Z|[+-]\d\d(?::?\d\d)?)?
+          (Z|[+-]\d\d:\d\d)?
           \s*\z/ix =~ date
         year = $1.to_i
         mon = $2.to_i
@@ -641,11 +610,6 @@ class Time
   #
   # If +self+ is a UTC time, -0000 is used as zone.
   #
-  #     require 'time'
-  #
-  #     t = Time.now
-  #     t.rfc2822  # => "Wed, 05 Oct 2011 22:26:12 -0400"
-  #
   # You must require 'time' to use this method.
   #
   def rfc2822
@@ -681,11 +645,6 @@ class Time
   #
   # Note that the result is always UTC (GMT).
   #
-  #     require 'time'
-  #
-  #     t = Time.now
-  #     t.httpdate # => "Thu, 06 Oct 2011 02:26:12 GMT"
-  #
   # You must require 'time' to use this method.
   #
   def httpdate
@@ -710,11 +669,6 @@ class Time
   # +fractional_digits+ specifies a number of digits to use for fractional
   # seconds.  Its default value is 0.
   #
-  #     require 'time'
-  #
-  #     t = Time.now
-  #     t.iso8601  # => "2011-10-05T22:26:12-04:00"
-  #
   # You must require 'time' to use this method.
   #
   def xmlschema(fraction_digits=0)
diff --git a/lib/timeout.rb b/lib/timeout.rb
index a33bb4ce65..9a0fc91156 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -15,7 +15,7 @@
 #
 # Previous versions didn't use a module for namespacing, however
 # #timeout is provided for backwards compatibility.  You
-# should prefer Timeout.timeout instead.
+# should prefer Timeout#timeout instead.
 #
 # == Copyright
 #
@@ -23,7 +23,7 @@
 # Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
 
 module Timeout
-  # Raised by Timeout.timeout when the block times out.
+  # Raised by Timeout#timeout when the block times out.
   class Error < RuntimeError
     attr_reader :thread
 
@@ -118,7 +118,7 @@ module Timeout
 end
 
 def timeout(*args, &block)
-  warn "Object##{__method__} is deprecated, use Timeout.timeout instead.", uplevel: 1
+  warn "#{caller_locations(1, 1)[0]}: Object##{__method__} is deprecated, use Timeout.timeout instead."
   Timeout.timeout(*args, &block)
 end
 
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 87e53a83be..d12afa1ae6 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -83,20 +83,14 @@ class Dir
   #  end
   #
   def self.mktmpdir(prefix_suffix=nil, *rest)
-    base = nil
-    path = Tmpname.create(prefix_suffix || "d", *rest) {|path, _, _, d|
-      base = d
-      mkdir(path, 0700)
-    }
+    path = Tmpname.create(prefix_suffix || "d", *rest) {|n| mkdir(n, 0700)}
     if block_given?
       begin
         yield path
       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
+        stat = File.stat(File.dirname(path))
+        if stat.world_writable? and !stat.sticky?
+          raise ArgumentError, "parent directory is world writable but not sticky"
         end
         FileUtils.remove_entry path
       end
@@ -112,27 +106,28 @@ class Dir
       Dir.tmpdir
     end
 
+    def make_tmpname((prefix, suffix), n)
+      prefix = (String.try_convert(prefix) or
+                raise ArgumentError, "unexpected prefix: #{prefix.inspect}")
+      suffix &&= (String.try_convert(suffix) or
+                  raise ArgumentError, "unexpected suffix: #{suffix.inspect}")
+      t = Time.now.strftime("%Y%m%d")
+      path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}".dup
+      path << "-#{n}" if n
+      path << suffix if suffix
+      path
+    end
+
     def create(basename, tmpdir=nil, max_try: nil, **opts)
       if $SAFE > 0 and tmpdir.tainted?
         tmpdir = '/tmp'
       else
-        origdir = tmpdir
         tmpdir ||= tmpdir()
       end
       n = nil
-      prefix, suffix = basename
-      prefix = (String.try_convert(prefix) or
-                raise ArgumentError, "unexpected prefix: #{prefix.inspect}")
-      prefix = prefix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}")
-      suffix &&= (String.try_convert(suffix) or
-                  raise ArgumentError, "unexpected suffix: #{suffix.inspect}")
-      suffix &&= suffix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}")
       begin
-        t = Time.now.strftime("%Y%m%d")
-        path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"\
-               "#{n ? %[-#{n}] : ''}#{suffix||''}"
-        path = File.join(tmpdir, path)
-        yield(path, n, opts, origdir)
+        path = File.join(tmpdir, make_tmpname(basename, n))
+        yield(path, n, opts)
       rescue Errno::EEXIST
         n ||= 0
         n += 1
diff --git a/lib/tracer.rb b/lib/tracer.rb
index e463ae1467..24a5313f4c 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -2,6 +2,7 @@
 #--
 # $Release Version: 0.3$
 # $Revision: 1.12 $
+require "thread"
 
 ##
 # Outputs a source level execution trace of a Ruby program.
@@ -60,7 +61,6 @@
 # by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 class Tracer
-
   class << self
     # display additional debug information (defaults to false)
     attr_accessor :verbose
diff --git a/lib/tracer/tracer.gemspec b/lib/tracer/tracer.gemspec
deleted file mode 100644
index f198f3b3c2..0000000000
--- a/lib/tracer/tracer.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/tracer/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "tracer"
-  spec.version       = Tracer::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Outputs a source level execution trace of a Ruby program.}
-  spec.description   = %q{Outputs a source level execution trace of a Ruby program.}
-  spec.homepage      = "https://github.com/ruby/tracer"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/tracer.rb", "lib/tracer/version.rb", "tracer.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/tracer/version.rb b/lib/tracer/version.rb
deleted file mode 100644
index f1b6dcd094..0000000000
--- a/lib/tracer/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class Tracer
-  VERSION = "0.1.0"
-end
diff --git a/lib/ubygems.rb b/lib/ubygems.rb
new file mode 100644
index 0000000000..51ee23e880
--- /dev/null
+++ b/lib/ubygems.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# This file allows for the running of rubygems with a nice
+# command line look-and-feel: ruby -rubygems foo.rb
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+require 'rubygems'
diff --git a/lib/un.rb b/lib/un.rb
index 14f5b10fec..b644fd9be4 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -47,7 +47,7 @@ def setup(options = "", *long_options)
     end
     long_options.each do |s|
       opt_name, arg_name = s.split(/(?=[\s=])/, 2)
-      opt_name.delete_prefix!('--')
+      opt_name.sub!(/\A--/, '')
       s = "--#{opt_name.gsub(/([A-Z]+|[a-z])([A-Z])/, '\1-\2').downcase}#{arg_name}"
       puts "#{opt_name}=>#{s}" if $DEBUG
       opt_name = opt_name.intern
@@ -313,33 +313,18 @@ end
 #   --do-not-reverse-lookup     disable reverse lookup
 #   --request-timeout=SECOND    request timeout in seconds
 #   --http-version=VERSION      HTTP version
-#   --server-name=NAME          name of the server host
-#   --server-software=NAME      name and version of the server
-#   --ssl-certificate=CERT      The SSL certificate file for the server
-#   --ssl-private-key=KEY       The SSL private key file for the server certificate
 #   -v                          verbose
 #
 
 def httpd
   setup("", "BindAddress=ADDR", "Port=PORT", "MaxClients=NUM", "TempDir=DIR",
-        "DoNotReverseLookup", "RequestTimeout=SECOND", "HTTPVersion=VERSION",
-        "ServerName=NAME", "ServerSoftware=NAME",
-        "SSLCertificate=CERT", "SSLPrivateKey=KEY") do
+        "DoNotReverseLookup", "RequestTimeout=SECOND", "HTTPVersion=VERSION") do
     |argv, options|
     require 'webrick'
     opt = options[:RequestTimeout] and options[:RequestTimeout] = opt.to_i
     [:Port, :MaxClients].each do |name|
       opt = options[name] and (options[name] = Integer(opt)) rescue nil
     end
-    if cert = options[:SSLCertificate]
-      key = options[:SSLPrivateKey] or
-        raise "--ssl-private-key option must also be given"
-      require 'webrick/https'
-      options[:SSLEnable] = true
-      options[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(cert))
-      options[:SSLPrivateKey] = OpenSSL::PKey.read(File.read(key))
-      options[:Port] ||= 8443   # HTTPS Alternate
-    end
     options[:Port] ||= 8080     # HTTP Alternate
     options[:DocumentRoot] = argv.shift || '.'
     s = WEBrick::HTTPServer.new(options)
diff --git a/lib/unicode_normalize.rb b/lib/unicode_normalize.rb
new file mode 100644
index 0000000000..8daf7b301a
--- /dev/null
+++ b/lib/unicode_normalize.rb
@@ -0,0 +1,79 @@
+# coding: utf-8
+# frozen_string_literal: false
+
+# Copyright Ayumu Nojima (野島 歩) and Martin J. Dürst (duerst@it.aoyama.ac.jp)
+
+# additions to class String for Unicode normalization
+class String
+  # === Unicode Normalization
+  #
+  # :call-seq:
+  #    str.unicode_normalize(form=:nfc)
+  #
+  # Returns a normalized form of +str+, using Unicode normalizations
+  # NFC, NFD, NFKC, or NFKD. The normalization form used is determined
+  # by +form+, which is any of the four values :nfc, :nfd, :nfkc, or :nfkd.
+  # The default is :nfc.
+  #
+  # If the string is not in a Unicode Encoding, then an Exception is raised.
+  # In this context, 'Unicode Encoding' means any of  UTF-8, UTF-16BE/LE,
+  # and UTF-32BE/LE, as well as GB18030, UCS_2BE, and UCS_4BE. Anything
+  # else than UTF-8 is implemented by converting to UTF-8,
+  # which makes it slower than UTF-8.
+  #
+  # _Examples_
+  #
+  #   "a\u0300".unicode_normalize        #=> 'à' (same as "\u00E0")
+  #   "a\u0300".unicode_normalize(:nfc)  #=> 'à' (same as "\u00E0")
+  #   "\u00E0".unicode_normalize(:nfd)   #=> 'à' (same as "a\u0300")
+  #   "\xE0".force_encoding('ISO-8859-1').unicode_normalize(:nfd)
+  #                                      #=> Encoding::CompatibilityError raised
+  #
+  def unicode_normalize(form = :nfc)
+    require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+    ## The following line can be uncommented to avoid repeated checking for
+    ## UnicodeNormalize. However, tests didn't show any noticeable speedup
+    ## when doing this. This comment also applies to the commented out lines
+    ## in String#unicode_normalize! and String#unicode_normalized?.
+    # String.send(:define_method, :unicode_normalize, ->(form = :nfc) { UnicodeNormalize.normalize(self, form) } )
+    UnicodeNormalize.normalize(self, form)
+  end
+
+  # :call-seq:
+  #    str.unicode_normalize!(form=:nfc)
+  #
+  # Destructive version of String#unicode_normalize, doing Unicode
+  # normalization in place.
+  #
+  def unicode_normalize!(form = :nfc)
+    require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+    # String.send(:define_method, :unicode_normalize!, ->(form = :nfc) { replace(unicode_normalize(form)) } )
+    replace(unicode_normalize(form))
+  end
+
+  # :call-seq:
+  #    str.unicode_normalized?(form=:nfc)
+  #
+  # Checks whether +str+ is in Unicode normalization form +form+,
+  # which is any of the four values :nfc, :nfd, :nfkc, or :nfkd.
+  # The default is :nfc.
+  #
+  # If the string is not in a Unicode Encoding, then an Exception is raised.
+  # For details, see String#unicode_normalize.
+  #
+  # _Examples_
+  #
+  #   "a\u0300".unicode_normalized?        #=> false
+  #   "a\u0300".unicode_normalized?(:nfd)  #=> true
+  #   "\u00E0".unicode_normalized?         #=> true
+  #   "\u00E0".unicode_normalized?(:nfd)   #=> false
+  #   "\xE0".force_encoding('ISO-8859-1').unicode_normalized?
+  #                                        #=> Encoding::CompatibilityError raised
+  #
+  def unicode_normalized?(form = :nfc)
+    require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+    # String.send(:define_method, :unicode_normalized?, ->(form = :nfc) { UnicodeNormalize.normalized?(self, form) } )
+    UnicodeNormalize.normalized?(self, form)
+  end
+end
+
diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb
index b27cdadaaa..8f0e8a20d1 100644
--- a/lib/unicode_normalize/normalize.rb
+++ b/lib/unicode_normalize/normalize.rb
@@ -3,25 +3,10 @@
 
 # Copyright Ayumu Nojima (野島 歩) and Martin J. Dürst (duerst@it.aoyama.ac.jp)
 
-# This file, the companion file tables.rb (autogenerated), and the module,
-# constants, and method defined herein are part of the implementation of the
-# built-in String class, not part of the standard library. They should
-# therefore never be gemified. They implement the methods
-# String#unicode_normalize, String#unicode_normalize!, and String#unicode_normalized?.
-#
-# They are placed here because they are written in Ruby. They are loaded on
-# demand when any of the three methods mentioned above is executed for the
-# first time. This reduces the memory footprint and startup time for scripts
-# and applications that do not use those methods.
-#
-# The name and even the existence of the module UnicodeNormalize and all of its
-# content are purely an implementation detail, and should not be exposed in
-# any test or spec or otherwise.
+require 'unicode_normalize/tables.rb'
 
-require_relative 'tables'
 
-
-module UnicodeNormalize  # :nodoc:
+module UnicodeNormalize
   ## Constant for max hash capacity to avoid DoS attack
   MAX_HASH_LENGTH = 18000 # enough for all test cases, otherwise tests get slow
 
@@ -70,7 +55,7 @@ module UnicodeNormalize  # :nodoc:
     if length>1 and 0 <= (lead =string[0].ord-LBASE) and lead  < LCOUNT and
                     0 <= (vowel=string[1].ord-VBASE) and vowel < VCOUNT
       lead_vowel = SBASE + (lead * VCOUNT + vowel) * TCOUNT
-      if length>2 and 0 < (trail=string[2].ord-TBASE) and trail < TCOUNT
+      if length>2 and 0 <= (trail=string[2].ord-TBASE) and trail < TCOUNT
         (lead_vowel + trail).chr(Encoding::UTF_8) + string[3..-1]
       else
         lead_vowel.chr(Encoding::UTF_8) + string[2..-1]
@@ -172,4 +157,5 @@ module UnicodeNormalize  # :nodoc:
       raise Encoding::CompatibilityError, "Unicode Normalization not appropriate for #{encoding}"
     end
   end
+
 end # module
diff --git a/lib/unicode_normalize/tables.rb b/lib/unicode_normalize/tables.rb
index a36daa84e6..13a48f739c 100644
--- a/lib/unicode_normalize/tables.rb
+++ b/lib/unicode_normalize/tables.rb
@@ -3,9037 +3,1165 @@
 
 # automatically generated by template/unicode_norm_gen.tmpl
 
-module UnicodeNormalize  # :nodoc:
+module UnicodeNormalize
   accents = "" \
-    "[\u0300-\u034E" \
-    "\u0350-\u036F" \
-    "\u0483-\u0487" \
-    "\u0591-\u05BD" \
-    "\u05BF" \
-    "\u05C1\u05C2" \
-    "\u05C4\u05C5" \
-    "\u05C7" \
-    "\u0610-\u061A" \
-    "\u064B-\u065F" \
-    "\u0670" \
-    "\u06D6-\u06DC" \
-    "\u06DF-\u06E4" \
-    "\u06E7\u06E8" \
-    "\u06EA-\u06ED" \
-    "\u0711" \
-    "\u0730-\u074A" \
-    "\u07EB-\u07F3" \
-    "\u07FD" \
-    "\u0816-\u0819" \
-    "\u081B-\u0823" \
-    "\u0825-\u0827" \
-    "\u0829-\u082D" \
-    "\u0859-\u085B" \
-    "\u08D3-\u08E1" \
-    "\u08E3-\u08FF" \
-    "\u093C" \
-    "\u094D" \
-    "\u0951-\u0954" \
-    "\u09BC" \
-    "\u09BE" \
-    "\u09CD" \
-    "\u09D7" \
-    "\u09FE" \
-    "\u0A3C" \
-    "\u0A4D" \
-    "\u0ABC" \
-    "\u0ACD" \
-    "\u0B3C" \
-    "\u0B3E" \
-    "\u0B4D" \
-    "\u0B56\u0B57" \
-    "\u0BBE" \
-    "\u0BCD" \
-    "\u0BD7" \
-    "\u0C4D" \
-    "\u0C55\u0C56" \
-    "\u0CBC" \
-    "\u0CC2" \
-    "\u0CCD" \
-    "\u0CD5\u0CD6" \
-    "\u0D3B\u0D3C" \
-    "\u0D3E" \
-    "\u0D4D" \
-    "\u0D57" \
-    "\u0DCA" \
-    "\u0DCF" \
-    "\u0DDF" \
-    "\u0E38-\u0E3A" \
-    "\u0E48-\u0E4B" \
-    "\u0EB8-\u0EBA" \
-    "\u0EC8-\u0ECB" \
-    "\u0F18\u0F19" \
-    "\u0F35" \
-    "\u0F37" \
-    "\u0F39" \
-    "\u0F71\u0F72" \
-    "\u0F74" \
-    "\u0F7A-\u0F7D" \
-    "\u0F80" \
-    "\u0F82-\u0F84" \
-    "\u0F86\u0F87" \
-    "\u0FC6" \
-    "\u102E" \
-    "\u1037" \
-    "\u1039\u103A" \
-    "\u108D" \
-    "\u135D-\u135F" \
-    "\u1714" \
-    "\u1734" \
-    "\u17D2" \
-    "\u17DD" \
-    "\u18A9" \
-    "\u1939-\u193B" \
-    "\u1A17\u1A18" \
-    "\u1A60" \
-    "\u1A75-\u1A7C" \
-    "\u1A7F" \
-    "\u1AB0-\u1ABD" \
-    "\u1B34\u1B35" \
-    "\u1B44" \
-    "\u1B6B-\u1B73" \
-    "\u1BAA\u1BAB" \
-    "\u1BE6" \
-    "\u1BF2\u1BF3" \
-    "\u1C37" \
-    "\u1CD0-\u1CD2" \
-    "\u1CD4-\u1CE0" \
-    "\u1CE2-\u1CE8" \
-    "\u1CED" \
-    "\u1CF4" \
-    "\u1CF8\u1CF9" \
-    "\u1DC0-\u1DF9" \
-    "\u1DFB-\u1DFF" \
-    "\u20D0-\u20DC" \
-    "\u20E1" \
-    "\u20E5-\u20F0" \
-    "\u2CEF-\u2CF1" \
-    "\u2D7F" \
-    "\u2DE0-\u2DFF" \
-    "\u302A-\u302F" \
-    "\u3099\u309A" \
-    "\uA66F" \
-    "\uA674-\uA67D" \
-    "\uA69E\uA69F" \
-    "\uA6F0\uA6F1" \
-    "\uA806" \
-    "\uA8C4" \
-    "\uA8E0-\uA8F1" \
-    "\uA92B-\uA92D" \
-    "\uA953" \
-    "\uA9B3" \
-    "\uA9C0" \
-    "\uAAB0" \
-    "\uAAB2-\uAAB4" \
-    "\uAAB7\uAAB8" \
-    "\uAABE\uAABF" \
-    "\uAAC1" \
-    "\uAAF6" \
-    "\uABED" \
-    "\uFB1E" \
-    "\uFE20-\uFE2F" \
-    "\u{101FD}" \
-    "\u{102E0}" \
-    "\u{10376}-\u{1037A}" \
-    "\u{10A0D}" \
-    "\u{10A0F}" \
-    "\u{10A38}-\u{10A3A}" \
-    "\u{10A3F}" \
-    "\u{10AE5}\u{10AE6}" \
-    "\u{10D24}-\u{10D27}" \
-    "\u{10F46}-\u{10F50}" \
-    "\u{11046}" \
-    "\u{1107F}" \
-    "\u{110B9}\u{110BA}" \
-    "\u{11100}-\u{11102}" \
-    "\u{11127}" \
-    "\u{11133}\u{11134}" \
-    "\u{11173}" \
-    "\u{111C0}" \
-    "\u{111CA}" \
-    "\u{11235}\u{11236}" \
-    "\u{112E9}\u{112EA}" \
-    "\u{1133B}\u{1133C}" \
-    "\u{1133E}" \
-    "\u{1134D}" \
-    "\u{11357}" \
-    "\u{11366}-\u{1136C}" \
-    "\u{11370}-\u{11374}" \
-    "\u{11442}" \
-    "\u{11446}" \
-    "\u{1145E}" \
-    "\u{114B0}" \
-    "\u{114BA}" \
-    "\u{114BD}" \
-    "\u{114C2}\u{114C3}" \
-    "\u{115AF}" \
-    "\u{115BF}\u{115C0}" \
-    "\u{1163F}" \
-    "\u{116B6}\u{116B7}" \
-    "\u{1172B}" \
-    "\u{11839}\u{1183A}" \
-    "\u{119E0}" \
-    "\u{11A34}" \
-    "\u{11A47}" \
-    "\u{11A99}" \
-    "\u{11C3F}" \
-    "\u{11D42}" \
-    "\u{11D44}\u{11D45}" \
-    "\u{11D97}" \
-    "\u{16AF0}-\u{16AF4}" \
-    "\u{16B30}-\u{16B36}" \
-    "\u{1BC9E}" \
-    "\u{1D165}-\u{1D169}" \
-    "\u{1D16D}-\u{1D172}" \
-    "\u{1D17B}-\u{1D182}" \
-    "\u{1D185}-\u{1D18B}" \
-    "\u{1D1AA}-\u{1D1AD}" \
-    "\u{1D242}-\u{1D244}" \
-    "\u{1E000}-\u{1E006}" \
-    "\u{1E008}-\u{1E018}" \
-    "\u{1E01B}-\u{1E021}" \
-    "\u{1E023}\u{1E024}" \
-    "\u{1E026}-\u{1E02A}" \
-    "\u{1E130}-\u{1E136}" \
-    "\u{1E2EC}-\u{1E2EF}" \
-    "\u{1E8D0}-\u{1E8D6}" \
-    "\u{1E944}-\u{1E94A}" \
+    "[\u0300-\u034E\u0350-\u036F\u0483-\u0487\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7" \
+    "\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711" \
+    "\u0730-\u074A\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D4-\u08E1" \
+    "\u08E3-\u08FF\u093C\u094D\u0951-\u0954\u09BC\u09BE\u09CD\u09D7" \
+    "\u0A3C\u0A4D\u0ABC\u0ACD\u0B3C\u0B3E\u0B4D\u0B56\u0B57" \
+    "\u0BBE\u0BCD\u0BD7\u0C4D\u0C55\u0C56\u0CBC\u0CC2\u0CCD" \
+    "\u0CD5\u0CD6\u0D3E\u0D4D\u0D57\u0DCA\u0DCF\u0DDF\u0E38-\u0E3A" \
+    "\u0E48-\u0E4B\u0EB8\u0EB9\u0EC8-\u0ECB\u0F18\u0F19\u0F35\u0F37\u0F39\u0F71\u0F72" \
+    "\u0F74\u0F7A-\u0F7D\u0F80\u0F82-\u0F84\u0F86\u0F87\u0FC6\u102E\u1037" \
+    "\u1039\u103A\u108D\u135D-\u135F\u1714\u1734\u17D2\u17DD\u18A9" \
+    "\u1939-\u193B\u1A17\u1A18\u1A60\u1A75-\u1A7C\u1A7F\u1AB0-\u1ABD\u1B34\u1B35\u1B44" \
+    "\u1B6B-\u1B73\u1BAA\u1BAB\u1BE6\u1BF2\u1BF3\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE0\u1CE2-\u1CE8" \
+    "\u1CED\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFB-\u1DFF\u20D0-\u20DC\u20E1\u20E5-\u20F0" \
+    "\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F\uA674-\uA67D\uA69E\uA69F" \
+    "\uA6F0\uA6F1\uA806\uA8C4\uA8E0-\uA8F1\uA92B-\uA92D\uA953\uA9B3\uA9C0" \
+    "\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAF6\uABED\uFB1E" \
+    "\uFE20-\uFE2F\u{101FD}\u{102E0}\u{10376}-\u{1037A}\u{10A0D}\u{10A0F}\u{10A38}-\u{10A3A}\u{10A3F}" \
+    "\u{10AE5}\u{10AE6}\u{11046}\u{1107F}\u{110B9}\u{110BA}\u{11100}-\u{11102}\u{11127}\u{11133}\u{11134}\u{11173}" \
+    "\u{111C0}\u{111CA}\u{11235}\u{11236}\u{112E9}\u{112EA}\u{1133C}\u{1133E}\u{1134D}\u{11357}" \
+    "\u{11366}-\u{1136C}\u{11370}-\u{11374}\u{11442}\u{11446}\u{114B0}\u{114BA}\u{114BD}\u{114C2}\u{114C3}" \
+    "\u{115AF}\u{115BF}\u{115C0}\u{1163F}\u{116B6}\u{116B7}\u{1172B}\u{11C3F}\u{16AF0}-\u{16AF4}\u{16B30}-\u{16B36}" \
+    "\u{1BC9E}\u{1D165}-\u{1D169}\u{1D16D}-\u{1D172}\u{1D17B}-\u{1D182}\u{1D185}-\u{1D18B}\u{1D1AA}-\u{1D1AD}\u{1D242}-\u{1D244}\u{1E000}-\u{1E006}" \
+    "\u{1E008}-\u{1E018}\u{1E01B}-\u{1E021}\u{1E023}\u{1E024}\u{1E026}-\u{1E02A}\u{1E8D0}-\u{1E8D6}\u{1E944}-\u{1E94A}" \
     "]"
   ACCENTS = accents
   REGEXP_D_STRING = "#{''  # composition starters and composition exclusions
     }" \
-    "[\u00C0-\u00C5" \
-    "\u00C7-\u00CF" \
-    "\u00D1-\u00D6" \
-    "\u00D9-\u00DD" \
-    "\u00E0-\u00E5" \
-    "\u00E7-\u00EF" \
-    "\u00F1-\u00F6" \
-    "\u00F9-\u00FD" \
-    "\u00FF-\u010F" \
-    "\u0112-\u0125" \
-    "\u0128-\u0130" \
-    "\u0134-\u0137" \
-    "\u0139-\u013E" \
-    "\u0143-\u0148" \
-    "\u014C-\u0151" \
-    "\u0154-\u0165" \
-    "\u0168-\u017E" \
-    "\u01A0\u01A1" \
-    "\u01AF\u01B0" \
-    "\u01CD-\u01DC" \
-    "\u01DE-\u01E3" \
-    "\u01E6-\u01F0" \
-    "\u01F4\u01F5" \
-    "\u01F8-\u021B" \
-    "\u021E\u021F" \
-    "\u0226-\u0233" \
-    "\u0340\u0341" \
-    "\u0343\u0344" \
-    "\u0374" \
-    "\u037E" \
-    "\u0385-\u038A" \
-    "\u038C" \
-    "\u038E-\u0390" \
-    "\u03AA-\u03B0" \
-    "\u03CA-\u03CE" \
-    "\u03D3\u03D4" \
-    "\u0400\u0401" \
-    "\u0403" \
-    "\u0407" \
-    "\u040C-\u040E" \
-    "\u0419" \
-    "\u0439" \
-    "\u0450\u0451" \
-    "\u0453" \
-    "\u0457" \
-    "\u045C-\u045E" \
-    "\u0476\u0477" \
-    "\u04C1\u04C2" \
-    "\u04D0-\u04D3" \
-    "\u04D6\u04D7" \
-    "\u04DA-\u04DF" \
-    "\u04E2-\u04E7" \
-    "\u04EA-\u04F5" \
-    "\u04F8\u04F9" \
-    "\u0622-\u0626" \
-    "\u06C0" \
-    "\u06C2" \
-    "\u06D3" \
-    "\u0929" \
-    "\u0931" \
-    "\u0934" \
-    "\u0958-\u095F" \
-    "\u09CB\u09CC" \
-    "\u09DC\u09DD" \
-    "\u09DF" \
-    "\u0A33" \
-    "\u0A36" \
-    "\u0A59-\u0A5B" \
-    "\u0A5E" \
-    "\u0B48" \
-    "\u0B4B\u0B4C" \
-    "\u0B5C\u0B5D" \
-    "\u0B94" \
-    "\u0BCA-\u0BCC" \
-    "\u0C48" \
-    "\u0CC0" \
-    "\u0CC7\u0CC8" \
-    "\u0CCA\u0CCB" \
-    "\u0D4A-\u0D4C" \
-    "\u0DDA" \
-    "\u0DDC-\u0DDE" \
-    "\u0F43" \
-    "\u0F4D" \
-    "\u0F52" \
-    "\u0F57" \
-    "\u0F5C" \
-    "\u0F69" \
-    "\u0F73" \
-    "\u0F75\u0F76" \
-    "\u0F78" \
-    "\u0F81" \
-    "\u0F93" \
-    "\u0F9D" \
-    "\u0FA2" \
-    "\u0FA7" \
-    "\u0FAC" \
-    "\u0FB9" \
-    "\u1026" \
-    "\u1B06" \
-    "\u1B08" \
-    "\u1B0A" \
-    "\u1B0C" \
-    "\u1B0E" \
-    "\u1B12" \
-    "\u1B3B" \
-    "\u1B3D" \
-    "\u1B40\u1B41" \
-    "\u1B43" \
-    "\u1E00-\u1E99" \
-    "\u1E9B" \
-    "\u1EA0-\u1EF9" \
-    "\u1F00-\u1F15" \
-    "\u1F18-\u1F1D" \
-    "\u1F20-\u1F45" \
-    "\u1F48-\u1F4D" \
-    "\u1F50-\u1F57" \
-    "\u1F59" \
-    "\u1F5B" \
-    "\u1F5D" \
-    "\u1F5F-\u1F7D" \
-    "\u1F80-\u1FB4" \
-    "\u1FB6-\u1FBC" \
-    "\u1FBE" \
-    "\u1FC1-\u1FC4" \
-    "\u1FC6-\u1FD3" \
-    "\u1FD6-\u1FDB" \
-    "\u1FDD-\u1FEF" \
-    "\u1FF2-\u1FF4" \
-    "\u1FF6-\u1FFD" \
-    "\u2000\u2001" \
-    "\u2126" \
-    "\u212A\u212B" \
-    "\u219A\u219B" \
-    "\u21AE" \
-    "\u21CD-\u21CF" \
-    "\u2204" \
-    "\u2209" \
-    "\u220C" \
-    "\u2224" \
-    "\u2226" \
-    "\u2241" \
-    "\u2244" \
-    "\u2247" \
-    "\u2249" \
-    "\u2260" \
-    "\u2262" \
-    "\u226D-\u2271" \
-    "\u2274\u2275" \
-    "\u2278\u2279" \
-    "\u2280\u2281" \
-    "\u2284\u2285" \
-    "\u2288\u2289" \
-    "\u22AC-\u22AF" \
-    "\u22E0-\u22E3" \
-    "\u22EA-\u22ED" \
-    "\u2329\u232A" \
-    "\u2ADC" \
-    "\u304C" \
-    "\u304E" \
-    "\u3050" \
-    "\u3052" \
-    "\u3054" \
-    "\u3056" \
-    "\u3058" \
-    "\u305A" \
-    "\u305C" \
-    "\u305E" \
-    "\u3060" \
-    "\u3062" \
-    "\u3065" \
-    "\u3067" \
-    "\u3069" \
-    "\u3070\u3071" \
-    "\u3073\u3074" \
-    "\u3076\u3077" \
-    "\u3079\u307A" \
-    "\u307C\u307D" \
-    "\u3094" \
-    "\u309E" \
-    "\u30AC" \
-    "\u30AE" \
-    "\u30B0" \
-    "\u30B2" \
-    "\u30B4" \
-    "\u30B6" \
-    "\u30B8" \
-    "\u30BA" \
-    "\u30BC" \
-    "\u30BE" \
-    "\u30C0" \
-    "\u30C2" \
-    "\u30C5" \
-    "\u30C7" \
-    "\u30C9" \
-    "\u30D0\u30D1" \
-    "\u30D3\u30D4" \
-    "\u30D6\u30D7" \
-    "\u30D9\u30DA" \
-    "\u30DC\u30DD" \
-    "\u30F4" \
-    "\u30F7-\u30FA" \
-    "\u30FE" \
-    "\uF900-\uFA0D" \
-    "\uFA10" \
-    "\uFA12" \
-    "\uFA15-\uFA1E" \
-    "\uFA20" \
-    "\uFA22" \
-    "\uFA25\uFA26" \
-    "\uFA2A-\uFA6D" \
-    "\uFA70-\uFAD9" \
-    "\uFB1D" \
-    "\uFB1F" \
-    "\uFB2A-\uFB36" \
-    "\uFB38-\uFB3C" \
-    "\uFB3E" \
-    "\uFB40\uFB41" \
-    "\uFB43\uFB44" \
-    "\uFB46-\uFB4E" \
-    "\u{1109A}" \
-    "\u{1109C}" \
-    "\u{110AB}" \
-    "\u{1112E}\u{1112F}" \
-    "\u{1134B}\u{1134C}" \
-    "\u{114BB}\u{114BC}" \
-    "\u{114BE}" \
-    "\u{115BA}\u{115BB}" \
-    "\u{1D15E}-\u{1D164}" \
-    "\u{1D1BB}-\u{1D1C0}" \
-    "\u{2F800}-\u{2FA1D}" \
+    "[\u00C0-\u00C5\u00C7-\u00CF\u00D1-\u00D6\u00D9-\u00DD\u00E0-\u00E5\u00E7-\u00EF\u00F1-\u00F6\u00F9-\u00FD" \
+    "\u00FF-\u010F\u0112-\u0125\u0128-\u0130\u0134-\u0137\u0139-\u013E\u0143-\u0148\u014C-\u0151\u0154-\u0165" \
+    "\u0168-\u017E\u01A0\u01A1\u01AF\u01B0\u01CD-\u01DC\u01DE-\u01E3\u01E6-\u01F0\u01F4\u01F5\u01F8-\u021B" \
+    "\u021E\u021F\u0226-\u0233\u0340\u0341\u0343\u0344\u0374\u037E\u0385-\u038A\u038C" \
+    "\u038E-\u0390\u03AA-\u03B0\u03CA-\u03CE\u03D3\u03D4\u0400\u0401\u0403\u0407\u040C-\u040E" \
+    "\u0419\u0439\u0450\u0451\u0453\u0457\u045C-\u045E\u0476\u0477\u04C1\u04C2" \
+    "\u04D0-\u04D3\u04D6\u04D7\u04DA-\u04DF\u04E2-\u04E7\u04EA-\u04F5\u04F8\u04F9\u0622-\u0626\u06C0" \
+    "\u06C2\u06D3\u0929\u0931\u0934\u0958-\u095F\u09CB\u09CC\u09DC\u09DD" \
+    "\u09DF\u0A33\u0A36\u0A59-\u0A5B\u0A5E\u0B48\u0B4B\u0B4C\u0B5C\u0B5D" \
+    "\u0B94\u0BCA-\u0BCC\u0C48\u0CC0\u0CC7\u0CC8\u0CCA\u0CCB\u0D4A-\u0D4C\u0DDA" \
+    "\u0DDC-\u0DDE\u0F43\u0F4D\u0F52\u0F57\u0F5C\u0F69\u0F73" \
+    "\u0F75\u0F76\u0F78\u0F81\u0F93\u0F9D\u0FA2\u0FA7\u0FAC" \
+    "\u0FB9\u1026\u1B06\u1B08\u1B0A\u1B0C\u1B0E\u1B12" \
+    "\u1B3B\u1B3D\u1B40\u1B41\u1B43\u1E00-\u1E99\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15" \
+    "\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D" \
+    "\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC1-\u1FC4\u1FC6-\u1FD3\u1FD6-\u1FDB\u1FDD-\u1FEF\u1FF2-\u1FF4" \
+    "\u1FF6-\u1FFD\u2000\u2001\u2126\u212A\u212B\u219A\u219B\u21AE\u21CD-\u21CF\u2204" \
+    "\u2209\u220C\u2224\u2226\u2241\u2244\u2247\u2249" \
+    "\u2260\u2262\u226D-\u2271\u2274\u2275\u2278\u2279\u2280\u2281\u2284\u2285\u2288\u2289" \
+    "\u22AC-\u22AF\u22E0-\u22E3\u22EA-\u22ED\u2329\u232A\u2ADC\u304C\u304E\u3050" \
+    "\u3052\u3054\u3056\u3058\u305A\u305C\u305E\u3060" \
+    "\u3062\u3065\u3067\u3069\u3070\u3071\u3073\u3074\u3076\u3077\u3079\u307A" \
+    "\u307C\u307D\u3094\u309E\u30AC\u30AE\u30B0\u30B2\u30B4" \
+    "\u30B6\u30B8\u30BA\u30BC\u30BE\u30C0\u30C2\u30C5" \
+    "\u30C7\u30C9\u30D0\u30D1\u30D3\u30D4\u30D6\u30D7\u30D9\u30DA\u30DC\u30DD\u30F4" \
+    "\u30F7-\u30FA\u30FE\uF900-\uFA0D\uFA10\uFA12\uFA15-\uFA1E\uFA20\uFA22" \
+    "\uFA25\uFA26\uFA2A-\uFA6D\uFA70-\uFAD9\uFB1D\uFB1F\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E" \
+    "\uFB40\uFB41\uFB43\uFB44\uFB46-\uFB4E\u{1109A}\u{1109C}\u{110AB}\u{1112E}\u{1112F}\u{1134B}\u{1134C}" \
+    "\u{114BB}\u{114BC}\u{114BE}\u{115BA}\u{115BB}\u{1D15E}-\u{1D164}\u{1D1BB}-\u{1D1C0}\u{2F800}-\u{2FA1D}" \
     "]#{accents}*" \
     "|#{''  # characters that can be the result of a composition, except composition starters
     }" \
-    "[<->" \
-    "A-P" \
-    "R-Z" \
-    "a-p" \
-    "r-z" \
-    "\u00A8" \
-    "\u00C6" \
-    "\u00D8" \
-    "\u00E6" \
-    "\u00F8" \
-    "\u017F" \
-    "\u01B7" \
-    "\u0292" \
-    "\u0391" \
-    "\u0395" \
-    "\u0397" \
-    "\u0399" \
-    "\u039F" \
-    "\u03A1" \
-    "\u03A5" \
-    "\u03A9" \
-    "\u03B1" \
-    "\u03B5" \
-    "\u03B7" \
-    "\u03B9" \
-    "\u03BF" \
-    "\u03C1" \
-    "\u03C5" \
-    "\u03C9" \
-    "\u03D2" \
-    "\u0406" \
-    "\u0410" \
-    "\u0413" \
-    "\u0415-\u0418" \
-    "\u041A" \
-    "\u041E" \
-    "\u0423" \
-    "\u0427" \
-    "\u042B" \
-    "\u042D" \
-    "\u0430" \
-    "\u0433" \
-    "\u0435-\u0438" \
-    "\u043A" \
-    "\u043E" \
-    "\u0443" \
-    "\u0447" \
-    "\u044B" \
-    "\u044D" \
-    "\u0456" \
-    "\u0474\u0475" \
-    "\u04D8\u04D9" \
-    "\u04E8\u04E9" \
-    "\u0627" \
-    "\u0648" \
-    "\u064A" \
-    "\u06C1" \
-    "\u06D2" \
-    "\u06D5" \
-    "\u0928" \
-    "\u0930" \
-    "\u0933" \
-    "\u09C7" \
-    "\u0B47" \
-    "\u0B92" \
-    "\u0BC6\u0BC7" \
-    "\u0C46" \
-    "\u0CBF" \
-    "\u0CC6" \
-    "\u0D46\u0D47" \
-    "\u0DD9" \
-    "\u1025" \
-    "\u1B05" \
-    "\u1B07" \
-    "\u1B09" \
-    "\u1B0B" \
-    "\u1B0D" \
-    "\u1B11" \
-    "\u1B3A" \
-    "\u1B3C" \
-    "\u1B3E\u1B3F" \
-    "\u1B42" \
-    "\u1FBF" \
-    "\u1FFE" \
-    "\u2190" \
-    "\u2192" \
-    "\u2194" \
-    "\u21D0" \
-    "\u21D2" \
-    "\u21D4" \
-    "\u2203" \
-    "\u2208" \
-    "\u220B" \
-    "\u2223" \
-    "\u2225" \
-    "\u223C" \
-    "\u2243" \
-    "\u2245" \
-    "\u2248" \
-    "\u224D" \
-    "\u2261" \
-    "\u2264\u2265" \
-    "\u2272\u2273" \
-    "\u2276\u2277" \
-    "\u227A-\u227D" \
-    "\u2282\u2283" \
-    "\u2286\u2287" \
-    "\u2291\u2292" \
-    "\u22A2" \
-    "\u22A8\u22A9" \
-    "\u22AB" \
-    "\u22B2-\u22B5" \
-    "\u3046" \
-    "\u304B" \
-    "\u304D" \
-    "\u304F" \
-    "\u3051" \
-    "\u3053" \
-    "\u3055" \
-    "\u3057" \
-    "\u3059" \
-    "\u305B" \
-    "\u305D" \
-    "\u305F" \
-    "\u3061" \
-    "\u3064" \
-    "\u3066" \
-    "\u3068" \
-    "\u306F" \
-    "\u3072" \
-    "\u3075" \
-    "\u3078" \
-    "\u307B" \
-    "\u309D" \
-    "\u30A6" \
-    "\u30AB" \
-    "\u30AD" \
-    "\u30AF" \
-    "\u30B1" \
-    "\u30B3" \
-    "\u30B5" \
-    "\u30B7" \
-    "\u30B9" \
-    "\u30BB" \
-    "\u30BD" \
-    "\u30BF" \
-    "\u30C1" \
-    "\u30C4" \
-    "\u30C6" \
-    "\u30C8" \
-    "\u30CF" \
-    "\u30D2" \
-    "\u30D5" \
-    "\u30D8" \
-    "\u30DB" \
-    "\u30EF-\u30F2" \
-    "\u30FD" \
-    "\u{11099}" \
-    "\u{1109B}" \
-    "\u{110A5}" \
-    "\u{11131}\u{11132}" \
-    "\u{11347}" \
-    "\u{114B9}" \
-    "\u{115B8}\u{115B9}" \
+    "[<->A-PR-Za-pr-z\u00A8\u00C6\u00D8" \
+    "\u00E6\u00F8\u017F\u01B7\u0292\u0391\u0395\u0397" \
+    "\u0399\u039F\u03A1\u03A5\u03A9\u03B1\u03B5\u03B7" \
+    "\u03B9\u03BF\u03C1\u03C5\u03C9\u03D2\u0406\u0410" \
+    "\u0413\u0415-\u0418\u041A\u041E\u0423\u0427\u042B\u042D" \
+    "\u0430\u0433\u0435-\u0438\u043A\u043E\u0443\u0447\u044B" \
+    "\u044D\u0456\u0474\u0475\u04D8\u04D9\u04E8\u04E9\u0627\u0648\u064A" \
+    "\u06C1\u06D2\u06D5\u0928\u0930\u0933\u09C7\u0B47" \
+    "\u0B92\u0BC6\u0BC7\u0C46\u0CBF\u0CC6\u0D46\u0D47\u0DD9\u1025" \
+    "\u1B05\u1B07\u1B09\u1B0B\u1B0D\u1B11\u1B3A\u1B3C" \
+    "\u1B3E\u1B3F\u1B42\u1FBF\u1FFE\u2190\u2192\u2194\u21D0" \
+    "\u21D2\u21D4\u2203\u2208\u220B\u2223\u2225\u223C" \
+    "\u2243\u2245\u2248\u224D\u2261\u2264\u2265\u2272\u2273\u2276\u2277" \
+    "\u227A-\u227D\u2282\u2283\u2286\u2287\u2291\u2292\u22A2\u22A8\u22A9\u22AB\u22B2-\u22B5" \
+    "\u3046\u304B\u304D\u304F\u3051\u3053\u3055\u3057" \
+    "\u3059\u305B\u305D\u305F\u3061\u3064\u3066\u3068" \
+    "\u306F\u3072\u3075\u3078\u307B\u309D\u30A6\u30AB" \
+    "\u30AD\u30AF\u30B1\u30B3\u30B5\u30B7\u30B9\u30BB" \
+    "\u30BD\u30BF\u30C1\u30C4\u30C6\u30C8\u30CF\u30D2" \
+    "\u30D5\u30D8\u30DB\u30EF-\u30F2\u30FD\u{11099}\u{1109B}\u{110A5}" \
+    "\u{11131}\u{11132}\u{11347}\u{114B9}\u{115B8}\u{115B9}" \
     "]?#{accents}+" \
     "|#{''  # precomposed Hangul syllables
     }" \
     "[\u{AC00}-\u{D7A4}]"
   REGEXP_C_STRING = "#{''  # composition exclusions
     }" \
-    "[\u0340\u0341" \
-    "\u0343\u0344" \
-    "\u0374" \
-    "\u037E" \
-    "\u0387" \
-    "\u0958-\u095F" \
-    "\u09DC\u09DD" \
-    "\u09DF" \
-    "\u0A33" \
-    "\u0A36" \
-    "\u0A59-\u0A5B" \
-    "\u0A5E" \
-    "\u0B5C\u0B5D" \
-    "\u0F43" \
-    "\u0F4D" \
-    "\u0F52" \
-    "\u0F57" \
-    "\u0F5C" \
-    "\u0F69" \
-    "\u0F73" \
-    "\u0F75\u0F76" \
-    "\u0F78" \
-    "\u0F81" \
-    "\u0F93" \
-    "\u0F9D" \
-    "\u0FA2" \
-    "\u0FA7" \
-    "\u0FAC" \
-    "\u0FB9" \
-    "\u1F71" \
-    "\u1F73" \
-    "\u1F75" \
-    "\u1F77" \
-    "\u1F79" \
-    "\u1F7B" \
-    "\u1F7D" \
-    "\u1FBB" \
-    "\u1FBE" \
-    "\u1FC9" \
-    "\u1FCB" \
-    "\u1FD3" \
-    "\u1FDB" \
-    "\u1FE3" \
-    "\u1FEB" \
-    "\u1FEE\u1FEF" \
-    "\u1FF9" \
-    "\u1FFB" \
-    "\u1FFD" \
-    "\u2000\u2001" \
-    "\u2126" \
-    "\u212A\u212B" \
-    "\u2329\u232A" \
-    "\u2ADC" \
-    "\uF900-\uFA0D" \
-    "\uFA10" \
-    "\uFA12" \
-    "\uFA15-\uFA1E" \
-    "\uFA20" \
-    "\uFA22" \
-    "\uFA25\uFA26" \
-    "\uFA2A-\uFA6D" \
-    "\uFA70-\uFAD9" \
-    "\uFB1D" \
-    "\uFB1F" \
-    "\uFB2A-\uFB36" \
-    "\uFB38-\uFB3C" \
-    "\uFB3E" \
-    "\uFB40\uFB41" \
-    "\uFB43\uFB44" \
-    "\uFB46-\uFB4E" \
-    "\u{1D15E}-\u{1D164}" \
-    "\u{1D1BB}-\u{1D1C0}" \
+    "[\u0340\u0341\u0343\u0344\u0374\u037E\u0387\u0958-\u095F\u09DC\u09DD\u09DF" \
+    "\u0A33\u0A36\u0A59-\u0A5B\u0A5E\u0B5C\u0B5D\u0F43\u0F4D\u0F52" \
+    "\u0F57\u0F5C\u0F69\u0F73\u0F75\u0F76\u0F78\u0F81\u0F93" \
+    "\u0F9D\u0FA2\u0FA7\u0FAC\u0FB9\u1F71\u1F73\u1F75" \
+    "\u1F77\u1F79\u1F7B\u1F7D\u1FBB\u1FBE\u1FC9\u1FCB" \
+    "\u1FD3\u1FDB\u1FE3\u1FEB\u1FEE\u1FEF\u1FF9\u1FFB\u1FFD" \
+    "\u2000\u2001\u2126\u212A\u212B\u2329\u232A\u2ADC\uF900-\uFA0D\uFA10\uFA12" \
+    "\uFA15-\uFA1E\uFA20\uFA22\uFA25\uFA26\uFA2A-\uFA6D\uFA70-\uFAD9\uFB1D\uFB1F" \
+    "\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFB4E\u{1D15E}-\u{1D164}\u{1D1BB}-\u{1D1C0}" \
     "\u{2F800}-\u{2FA1D}" \
     "]#{accents}*" \
     "|#{''  # composition starters and characters that can be the result of a composition
     }" \
-    "[<->" \
-    "A-P" \
-    "R-Z" \
-    "a-p" \
-    "r-z" \
-    "\u00A8" \
-    "\u00C0-\u00CF" \
-    "\u00D1-\u00D6" \
-    "\u00D8-\u00DD" \
-    "\u00E0-\u00EF" \
-    "\u00F1-\u00F6" \
-    "\u00F8-\u00FD" \
-    "\u00FF-\u010F" \
-    "\u0112-\u0125" \
-    "\u0128-\u0130" \
-    "\u0134-\u0137" \
-    "\u0139-\u013E" \
-    "\u0143-\u0148" \
-    "\u014C-\u0151" \
-    "\u0154-\u0165" \
-    "\u0168-\u017F" \
-    "\u01A0\u01A1" \
-    "\u01AF\u01B0" \
-    "\u01B7" \
-    "\u01CD-\u01DC" \
-    "\u01DE-\u01E3" \
-    "\u01E6-\u01F0" \
-    "\u01F4\u01F5" \
-    "\u01F8-\u021B" \
-    "\u021E\u021F" \
-    "\u0226-\u0233" \
-    "\u0292" \
-    "\u0385\u0386" \
-    "\u0388-\u038A" \
-    "\u038C" \
-    "\u038E-\u0391" \
-    "\u0395" \
-    "\u0397" \
-    "\u0399" \
-    "\u039F" \
-    "\u03A1" \
-    "\u03A5" \
-    "\u03A9-\u03B1" \
-    "\u03B5" \
-    "\u03B7" \
-    "\u03B9" \
-    "\u03BF" \
-    "\u03C1" \
-    "\u03C5" \
-    "\u03C9-\u03CE" \
-    "\u03D2-\u03D4" \
-    "\u0400\u0401" \
-    "\u0403" \
-    "\u0406\u0407" \
-    "\u040C-\u040E" \
-    "\u0410" \
-    "\u0413" \
-    "\u0415-\u041A" \
-    "\u041E" \
-    "\u0423" \
-    "\u0427" \
-    "\u042B" \
-    "\u042D" \
-    "\u0430" \
-    "\u0433" \
-    "\u0435-\u043A" \
-    "\u043E" \
-    "\u0443" \
-    "\u0447" \
-    "\u044B" \
-    "\u044D" \
-    "\u0450\u0451" \
-    "\u0453" \
-    "\u0456\u0457" \
-    "\u045C-\u045E" \
-    "\u0474-\u0477" \
-    "\u04C1\u04C2" \
-    "\u04D0-\u04D3" \
-    "\u04D6-\u04DF" \
-    "\u04E2-\u04F5" \
-    "\u04F8\u04F9" \
-    "\u0622-\u0627" \
-    "\u0648" \
-    "\u064A" \
-    "\u06C0-\u06C2" \
-    "\u06D2\u06D3" \
-    "\u06D5" \
-    "\u0928\u0929" \
-    "\u0930\u0931" \
-    "\u0933\u0934" \
-    "\u09C7" \
-    "\u09CB\u09CC" \
-    "\u0B47\u0B48" \
-    "\u0B4B\u0B4C" \
-    "\u0B92" \
-    "\u0B94" \
-    "\u0BC6\u0BC7" \
-    "\u0BCA-\u0BCC" \
-    "\u0C46" \
-    "\u0C48" \
-    "\u0CBF\u0CC0" \
-    "\u0CC6-\u0CC8" \
-    "\u0CCA\u0CCB" \
-    "\u0D46\u0D47" \
-    "\u0D4A-\u0D4C" \
-    "\u0DD9\u0DDA" \
-    "\u0DDC-\u0DDE" \
-    "\u1025\u1026" \
-    "\u1B05-\u1B0E" \
-    "\u1B11\u1B12" \
-    "\u1B3A-\u1B43" \
-    "\u1E00-\u1E99" \
-    "\u1E9B" \
-    "\u1EA0-\u1EF9" \
-    "\u1F00-\u1F15" \
-    "\u1F18-\u1F1D" \
-    "\u1F20-\u1F45" \
-    "\u1F48-\u1F4D" \
-    "\u1F50-\u1F57" \
-    "\u1F59" \
-    "\u1F5B" \
-    "\u1F5D" \
-    "\u1F5F-\u1F70" \
-    "\u1F72" \
-    "\u1F74" \
-    "\u1F76" \
-    "\u1F78" \
-    "\u1F7A" \
-    "\u1F7C" \
-    "\u1F80-\u1FB4" \
-    "\u1FB6-\u1FBA" \
-    "\u1FBC" \
-    "\u1FBF" \
-    "\u1FC1-\u1FC4" \
-    "\u1FC6-\u1FC8" \
-    "\u1FCA" \
-    "\u1FCC-\u1FD2" \
-    "\u1FD6-\u1FDA" \
-    "\u1FDD-\u1FE2" \
-    "\u1FE4-\u1FEA" \
-    "\u1FEC\u1FED" \
-    "\u1FF2-\u1FF4" \
-    "\u1FF6-\u1FF8" \
-    "\u1FFA" \
-    "\u1FFC" \
-    "\u1FFE" \
-    "\u2190" \
-    "\u2192" \
-    "\u2194" \
-    "\u219A\u219B" \
-    "\u21AE" \
-    "\u21CD-\u21D0" \
-    "\u21D2" \
-    "\u21D4" \
-    "\u2203\u2204" \
-    "\u2208\u2209" \
-    "\u220B\u220C" \
-    "\u2223-\u2226" \
-    "\u223C" \
-    "\u2241" \
-    "\u2243-\u2245" \
-    "\u2247-\u2249" \
-    "\u224D" \
-    "\u2260-\u2262" \
-    "\u2264\u2265" \
-    "\u226D-\u227D" \
-    "\u2280-\u2289" \
-    "\u2291\u2292" \
-    "\u22A2" \
-    "\u22A8\u22A9" \
-    "\u22AB-\u22AF" \
-    "\u22B2-\u22B5" \
-    "\u22E0-\u22E3" \
-    "\u22EA-\u22ED" \
-    "\u3046" \
-    "\u304B-\u3062" \
-    "\u3064-\u3069" \
-    "\u306F-\u307D" \
-    "\u3094" \
-    "\u309D\u309E" \
-    "\u30A6" \
-    "\u30AB-\u30C2" \
-    "\u30C4-\u30C9" \
-    "\u30CF-\u30DD" \
-    "\u30EF-\u30F2" \
-    "\u30F4" \
-    "\u30F7-\u30FA" \
-    "\u30FD\u30FE" \
-    "\u{11099}-\u{1109C}" \
-    "\u{110A5}" \
-    "\u{110AB}" \
-    "\u{1112E}\u{1112F}" \
-    "\u{11131}\u{11132}" \
-    "\u{11347}" \
-    "\u{1134B}\u{1134C}" \
-    "\u{114B9}" \
-    "\u{114BB}\u{114BC}" \
-    "\u{114BE}" \
-    "\u{115B8}-\u{115BB}" \
+    "[<->A-PR-Za-pr-z\u00A8\u00C0-\u00CF\u00D1-\u00D6" \
+    "\u00D8-\u00DD\u00E0-\u00EF\u00F1-\u00F6\u00F8-\u00FD\u00FF-\u010F\u0112-\u0125\u0128-\u0130\u0134-\u0137" \
+    "\u0139-\u013E\u0143-\u0148\u014C-\u0151\u0154-\u0165\u0168-\u017F\u01A0\u01A1\u01AF\u01B0\u01B7" \
+    "\u01CD-\u01DC\u01DE-\u01E3\u01E6-\u01F0\u01F4\u01F5\u01F8-\u021B\u021E\u021F\u0226-\u0233\u0292" \
+    "\u0385\u0386\u0388-\u038A\u038C\u038E-\u0391\u0395\u0397\u0399\u039F" \
+    "\u03A1\u03A5\u03A9-\u03B1\u03B5\u03B7\u03B9\u03BF\u03C1" \
+    "\u03C5\u03C9-\u03CE\u03D2-\u03D4\u0400\u0401\u0403\u0406\u0407\u040C-\u040E\u0410" \
+    "\u0413\u0415-\u041A\u041E\u0423\u0427\u042B\u042D\u0430" \
+    "\u0433\u0435-\u043A\u043E\u0443\u0447\u044B\u044D\u0450\u0451" \
+    "\u0453\u0456\u0457\u045C-\u045E\u0474-\u0477\u04C1\u04C2\u04D0-\u04D3\u04D6-\u04DF\u04E2-\u04F5" \
+    "\u04F8\u04F9\u0622-\u0627\u0648\u064A\u06C0-\u06C2\u06D2\u06D3\u06D5\u0928\u0929" \
+    "\u0930\u0931\u0933\u0934\u09C7\u09CB\u09CC\u0B47\u0B48\u0B4B\u0B4C\u0B92\u0B94" \
+    "\u0BC6\u0BC7\u0BCA-\u0BCC\u0C46\u0C48\u0CBF\u0CC0\u0CC6-\u0CC8\u0CCA\u0CCB\u0D46\u0D47" \
+    "\u0D4A-\u0D4C\u0DD9\u0DDA\u0DDC-\u0DDE\u1025\u1026\u1B05-\u1B0E\u1B11\u1B12\u1B3A-\u1B43\u1E00-\u1E99" \
+    "\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59" \
+    "\u1F5B\u1F5D\u1F5F-\u1F70\u1F72\u1F74\u1F76\u1F78\u1F7A" \
+    "\u1F7C\u1F80-\u1FB4\u1FB6-\u1FBA\u1FBC\u1FBF\u1FC1-\u1FC4\u1FC6-\u1FC8\u1FCA" \
+    "\u1FCC-\u1FD2\u1FD6-\u1FDA\u1FDD-\u1FE2\u1FE4-\u1FEA\u1FEC\u1FED\u1FF2-\u1FF4\u1FF6-\u1FF8\u1FFA" \
+    "\u1FFC\u1FFE\u2190\u2192\u2194\u219A\u219B\u21AE\u21CD-\u21D0" \
+    "\u21D2\u21D4\u2203\u2204\u2208\u2209\u220B\u220C\u2223-\u2226\u223C\u2241" \
+    "\u2243-\u2245\u2247-\u2249\u224D\u2260-\u2262\u2264\u2265\u226D-\u227D\u2280-\u2289\u2291\u2292" \
+    "\u22A2\u22A8\u22A9\u22AB-\u22AF\u22B2-\u22B5\u22E0-\u22E3\u22EA-\u22ED\u3046\u304B-\u3062" \
+    "\u3064-\u3069\u306F-\u307D\u3094\u309D\u309E\u30A6\u30AB-\u30C2\u30C4-\u30C9\u30CF-\u30DD" \
+    "\u30EF-\u30F2\u30F4\u30F7-\u30FA\u30FD\u30FE\u{11099}-\u{1109C}\u{110A5}\u{110AB}\u{1112E}\u{1112F}" \
+    "\u{11131}\u{11132}\u{11347}\u{1134B}\u{1134C}\u{114B9}\u{114BB}\u{114BC}\u{114BE}\u{115B8}-\u{115BB}" \
     "]?#{accents}+" \
     "|#{''  # Hangul syllables with separate trailer
     }" \
-    "[\uAC00" \
-    "\uAC1C" \
-    "\uAC38" \
-    "\uAC54" \
-    "\uAC70" \
-    "\uAC8C" \
-    "\uACA8" \
-    "\uACC4" \
-    "\uACE0" \
-    "\uACFC" \
-    "\uAD18" \
-    "\uAD34" \
-    "\uAD50" \
-    "\uAD6C" \
-    "\uAD88" \
-    "\uADA4" \
-    "\uADC0" \
-    "\uADDC" \
-    "\uADF8" \
-    "\uAE14" \
-    "\uAE30" \
-    "\uAE4C" \
-    "\uAE68" \
-    "\uAE84" \
-    "\uAEA0" \
-    "\uAEBC" \
-    "\uAED8" \
-    "\uAEF4" \
-    "\uAF10" \
-    "\uAF2C" \
-    "\uAF48" \
-    "\uAF64" \
-    "\uAF80" \
-    "\uAF9C" \
-    "\uAFB8" \
-    "\uAFD4" \
-    "\uAFF0" \
-    "\uB00C" \
-    "\uB028" \
-    "\uB044" \
-    "\uB060" \
-    "\uB07C" \
-    "\uB098" \
-    "\uB0B4" \
-    "\uB0D0" \
-    "\uB0EC" \
-    "\uB108" \
-    "\uB124" \
-    "\uB140" \
-    "\uB15C" \
-    "\uB178" \
-    "\uB194" \
-    "\uB1B0" \
-    "\uB1CC" \
-    "\uB1E8" \
-    "\uB204" \
-    "\uB220" \
-    "\uB23C" \
-    "\uB258" \
-    "\uB274" \
-    "\uB290" \
-    "\uB2AC" \
-    "\uB2C8" \
-    "\uB2E4" \
-    "\uB300" \
-    "\uB31C" \
-    "\uB338" \
-    "\uB354" \
-    "\uB370" \
-    "\uB38C" \
-    "\uB3A8" \
-    "\uB3C4" \
-    "\uB3E0" \
-    "\uB3FC" \
-    "\uB418" \
-    "\uB434" \
-    "\uB450" \
-    "\uB46C" \
-    "\uB488" \
-    "\uB4A4" \
-    "\uB4C0" \
-    "\uB4DC" \
-    "\uB4F8" \
-    "\uB514" \
-    "\uB530" \
-    "\uB54C" \
-    "\uB568" \
-    "\uB584" \
-    "\uB5A0" \
-    "\uB5BC" \
-    "\uB5D8" \
-    "\uB5F4" \
-    "\uB610" \
-    "\uB62C" \
-    "\uB648" \
-    "\uB664" \
-    "\uB680" \
-    "\uB69C" \
-    "\uB6B8" \
-    "\uB6D4" \
-    "\uB6F0" \
-    "\uB70C" \
-    "\uB728" \
-    "\uB744" \
-    "\uB760" \
-    "\uB77C" \
-    "\uB798" \
-    "\uB7B4" \
-    "\uB7D0" \
-    "\uB7EC" \
-    "\uB808" \
-    "\uB824" \
-    "\uB840" \
-    "\uB85C" \
-    "\uB878" \
-    "\uB894" \
-    "\uB8B0" \
-    "\uB8CC" \
-    "\uB8E8" \
-    "\uB904" \
-    "\uB920" \
-    "\uB93C" \
-    "\uB958" \
-    "\uB974" \
-    "\uB990" \
-    "\uB9AC" \
-    "\uB9C8" \
-    "\uB9E4" \
-    "\uBA00" \
-    "\uBA1C" \
-    "\uBA38" \
-    "\uBA54" \
-    "\uBA70" \
-    "\uBA8C" \
-    "\uBAA8" \
-    "\uBAC4" \
-    "\uBAE0" \
-    "\uBAFC" \
-    "\uBB18" \
-    "\uBB34" \
-    "\uBB50" \
-    "\uBB6C" \
-    "\uBB88" \
-    "\uBBA4" \
-    "\uBBC0" \
-    "\uBBDC" \
-    "\uBBF8" \
-    "\uBC14" \
-    "\uBC30" \
-    "\uBC4C" \
-    "\uBC68" \
-    "\uBC84" \
-    "\uBCA0" \
-    "\uBCBC" \
-    "\uBCD8" \
-    "\uBCF4" \
-    "\uBD10" \
-    "\uBD2C" \
-    "\uBD48" \
-    "\uBD64" \
-    "\uBD80" \
-    "\uBD9C" \
-    "\uBDB8" \
-    "\uBDD4" \
-    "\uBDF0" \
-    "\uBE0C" \
-    "\uBE28" \
-    "\uBE44" \
-    "\uBE60" \
-    "\uBE7C" \
-    "\uBE98" \
-    "\uBEB4" \
-    "\uBED0" \
-    "\uBEEC" \
-    "\uBF08" \
-    "\uBF24" \
-    "\uBF40" \
-    "\uBF5C" \
-    "\uBF78" \
-    "\uBF94" \
-    "\uBFB0" \
-    "\uBFCC" \
-    "\uBFE8" \
-    "\uC004" \
-    "\uC020" \
-    "\uC03C" \
-    "\uC058" \
-    "\uC074" \
-    "\uC090" \
-    "\uC0AC" \
-    "\uC0C8" \
-    "\uC0E4" \
-    "\uC100" \
-    "\uC11C" \
-    "\uC138" \
-    "\uC154" \
-    "\uC170" \
-    "\uC18C" \
-    "\uC1A8" \
-    "\uC1C4" \
-    "\uC1E0" \
-    "\uC1FC" \
-    "\uC218" \
-    "\uC234" \
-    "\uC250" \
-    "\uC26C" \
-    "\uC288" \
-    "\uC2A4" \
-    "\uC2C0" \
-    "\uC2DC" \
-    "\uC2F8" \
-    "\uC314" \
-    "\uC330" \
-    "\uC34C" \
-    "\uC368" \
-    "\uC384" \
-    "\uC3A0" \
-    "\uC3BC" \
-    "\uC3D8" \
-    "\uC3F4" \
-    "\uC410" \
-    "\uC42C" \
-    "\uC448" \
-    "\uC464" \
-    "\uC480" \
-    "\uC49C" \
-    "\uC4B8" \
-    "\uC4D4" \
-    "\uC4F0" \
-    "\uC50C" \
-    "\uC528" \
-    "\uC544" \
-    "\uC560" \
-    "\uC57C" \
-    "\uC598" \
-    "\uC5B4" \
-    "\uC5D0" \
-    "\uC5EC" \
-    "\uC608" \
-    "\uC624" \
-    "\uC640" \
-    "\uC65C" \
-    "\uC678" \
-    "\uC694" \
-    "\uC6B0" \
-    "\uC6CC" \
-    "\uC6E8" \
-    "\uC704" \
-    "\uC720" \
-    "\uC73C" \
-    "\uC758" \
-    "\uC774" \
-    "\uC790" \
-    "\uC7AC" \
-    "\uC7C8" \
-    "\uC7E4" \
-    "\uC800" \
-    "\uC81C" \
-    "\uC838" \
-    "\uC854" \
-    "\uC870" \
-    "\uC88C" \
-    "\uC8A8" \
-    "\uC8C4" \
-    "\uC8E0" \
-    "\uC8FC" \
-    "\uC918" \
-    "\uC934" \
-    "\uC950" \
-    "\uC96C" \
-    "\uC988" \
-    "\uC9A4" \
-    "\uC9C0" \
-    "\uC9DC" \
-    "\uC9F8" \
-    "\uCA14" \
-    "\uCA30" \
-    "\uCA4C" \
-    "\uCA68" \
-    "\uCA84" \
-    "\uCAA0" \
-    "\uCABC" \
-    "\uCAD8" \
-    "\uCAF4" \
-    "\uCB10" \
-    "\uCB2C" \
-    "\uCB48" \
-    "\uCB64" \
-    "\uCB80" \
-    "\uCB9C" \
-    "\uCBB8" \
-    "\uCBD4" \
-    "\uCBF0" \
-    "\uCC0C" \
-    "\uCC28" \
-    "\uCC44" \
-    "\uCC60" \
-    "\uCC7C" \
-    "\uCC98" \
-    "\uCCB4" \
-    "\uCCD0" \
-    "\uCCEC" \
-    "\uCD08" \
-    "\uCD24" \
-    "\uCD40" \
-    "\uCD5C" \
-    "\uCD78" \
-    "\uCD94" \
-    "\uCDB0" \
-    "\uCDCC" \
-    "\uCDE8" \
-    "\uCE04" \
-    "\uCE20" \
-    "\uCE3C" \
-    "\uCE58" \
-    "\uCE74" \
-    "\uCE90" \
-    "\uCEAC" \
-    "\uCEC8" \
-    "\uCEE4" \
-    "\uCF00" \
-    "\uCF1C" \
-    "\uCF38" \
-    "\uCF54" \
-    "\uCF70" \
-    "\uCF8C" \
-    "\uCFA8" \
-    "\uCFC4" \
-    "\uCFE0" \
-    "\uCFFC" \
-    "\uD018" \
-    "\uD034" \
-    "\uD050" \
-    "\uD06C" \
-    "\uD088" \
-    "\uD0A4" \
-    "\uD0C0" \
-    "\uD0DC" \
-    "\uD0F8" \
-    "\uD114" \
-    "\uD130" \
-    "\uD14C" \
-    "\uD168" \
-    "\uD184" \
-    "\uD1A0" \
-    "\uD1BC" \
-    "\uD1D8" \
-    "\uD1F4" \
-    "\uD210" \
-    "\uD22C" \
-    "\uD248" \
-    "\uD264" \
-    "\uD280" \
-    "\uD29C" \
-    "\uD2B8" \
-    "\uD2D4" \
-    "\uD2F0" \
-    "\uD30C" \
-    "\uD328" \
-    "\uD344" \
-    "\uD360" \
-    "\uD37C" \
-    "\uD398" \
-    "\uD3B4" \
-    "\uD3D0" \
-    "\uD3EC" \
-    "\uD408" \
-    "\uD424" \
-    "\uD440" \
-    "\uD45C" \
-    "\uD478" \
-    "\uD494" \
-    "\uD4B0" \
-    "\uD4CC" \
-    "\uD4E8" \
-    "\uD504" \
-    "\uD520" \
-    "\uD53C" \
-    "\uD558" \
-    "\uD574" \
-    "\uD590" \
-    "\uD5AC" \
-    "\uD5C8" \
-    "\uD5E4" \
-    "\uD600" \
-    "\uD61C" \
-    "\uD638" \
-    "\uD654" \
-    "\uD670" \
-    "\uD68C" \
-    "\uD6A8" \
-    "\uD6C4" \
-    "\uD6E0" \
-    "\uD6FC" \
-    "\uD718" \
-    "\uD734" \
-    "\uD750" \
-    "\uD76C" \
-    "\uD788" \
+    "[\uAC00\uAC1C\uAC38\uAC54\uAC70\uAC8C\uACA8\uACC4" \
+    "\uACE0\uACFC\uAD18\uAD34\uAD50\uAD6C\uAD88\uADA4" \
+    "\uADC0\uADDC\uADF8\uAE14\uAE30\uAE4C\uAE68\uAE84" \
+    "\uAEA0\uAEBC\uAED8\uAEF4\uAF10\uAF2C\uAF48\uAF64" \
+    "\uAF80\uAF9C\uAFB8\uAFD4\uAFF0\uB00C\uB028\uB044" \
+    "\uB060\uB07C\uB098\uB0B4\uB0D0\uB0EC\uB108\uB124" \
+    "\uB140\uB15C\uB178\uB194\uB1B0\uB1CC\uB1E8\uB204" \
+    "\uB220\uB23C\uB258\uB274\uB290\uB2AC\uB2C8\uB2E4" \
+    "\uB300\uB31C\uB338\uB354\uB370\uB38C\uB3A8\uB3C4" \
+    "\uB3E0\uB3FC\uB418\uB434\uB450\uB46C\uB488\uB4A4" \
+    "\uB4C0\uB4DC\uB4F8\uB514\uB530\uB54C\uB568\uB584" \
+    "\uB5A0\uB5BC\uB5D8\uB5F4\uB610\uB62C\uB648\uB664" \
+    "\uB680\uB69C\uB6B8\uB6D4\uB6F0\uB70C\uB728\uB744" \
+    "\uB760\uB77C\uB798\uB7B4\uB7D0\uB7EC\uB808\uB824" \
+    "\uB840\uB85C\uB878\uB894\uB8B0\uB8CC\uB8E8\uB904" \
+    "\uB920\uB93C\uB958\uB974\uB990\uB9AC\uB9C8\uB9E4" \
+    "\uBA00\uBA1C\uBA38\uBA54\uBA70\uBA8C\uBAA8\uBAC4" \
+    "\uBAE0\uBAFC\uBB18\uBB34\uBB50\uBB6C\uBB88\uBBA4" \
+    "\uBBC0\uBBDC\uBBF8\uBC14\uBC30\uBC4C\uBC68\uBC84" \
+    "\uBCA0\uBCBC\uBCD8\uBCF4\uBD10\uBD2C\uBD48\uBD64" \
+    "\uBD80\uBD9C\uBDB8\uBDD4\uBDF0\uBE0C\uBE28\uBE44" \
+    "\uBE60\uBE7C\uBE98\uBEB4\uBED0\uBEEC\uBF08\uBF24" \
+    "\uBF40\uBF5C\uBF78\uBF94\uBFB0\uBFCC\uBFE8\uC004" \
+    "\uC020\uC03C\uC058\uC074\uC090\uC0AC\uC0C8\uC0E4" \
+    "\uC100\uC11C\uC138\uC154\uC170\uC18C\uC1A8\uC1C4" \
+    "\uC1E0\uC1FC\uC218\uC234\uC250\uC26C\uC288\uC2A4" \
+    "\uC2C0\uC2DC\uC2F8\uC314\uC330\uC34C\uC368\uC384" \
+    "\uC3A0\uC3BC\uC3D8\uC3F4\uC410\uC42C\uC448\uC464" \
+    "\uC480\uC49C\uC4B8\uC4D4\uC4F0\uC50C\uC528\uC544" \
+    "\uC560\uC57C\uC598\uC5B4\uC5D0\uC5EC\uC608\uC624" \
+    "\uC640\uC65C\uC678\uC694\uC6B0\uC6CC\uC6E8\uC704" \
+    "\uC720\uC73C\uC758\uC774\uC790\uC7AC\uC7C8\uC7E4" \
+    "\uC800\uC81C\uC838\uC854\uC870\uC88C\uC8A8\uC8C4" \
+    "\uC8E0\uC8FC\uC918\uC934\uC950\uC96C\uC988\uC9A4" \
+    "\uC9C0\uC9DC\uC9F8\uCA14\uCA30\uCA4C\uCA68\uCA84" \
+    "\uCAA0\uCABC\uCAD8\uCAF4\uCB10\uCB2C\uCB48\uCB64" \
+    "\uCB80\uCB9C\uCBB8\uCBD4\uCBF0\uCC0C\uCC28\uCC44" \
+    "\uCC60\uCC7C\uCC98\uCCB4\uCCD0\uCCEC\uCD08\uCD24" \
+    "\uCD40\uCD5C\uCD78\uCD94\uCDB0\uCDCC\uCDE8\uCE04" \
+    "\uCE20\uCE3C\uCE58\uCE74\uCE90\uCEAC\uCEC8\uCEE4" \
+    "\uCF00\uCF1C\uCF38\uCF54\uCF70\uCF8C\uCFA8\uCFC4" \
+    "\uCFE0\uCFFC\uD018\uD034\uD050\uD06C\uD088\uD0A4" \
+    "\uD0C0\uD0DC\uD0F8\uD114\uD130\uD14C\uD168\uD184" \
+    "\uD1A0\uD1BC\uD1D8\uD1F4\uD210\uD22C\uD248\uD264" \
+    "\uD280\uD29C\uD2B8\uD2D4\uD2F0\uD30C\uD328\uD344" \
+    "\uD360\uD37C\uD398\uD3B4\uD3D0\uD3EC\uD408\uD424" \
+    "\uD440\uD45C\uD478\uD494\uD4B0\uD4CC\uD4E8\uD504" \
+    "\uD520\uD53C\uD558\uD574\uD590\uD5AC\uD5C8\uD5E4" \
+    "\uD600\uD61C\uD638\uD654\uD670\uD68C\uD6A8\uD6C4" \
+    "\uD6E0\uD6FC\uD718\uD734\uD750\uD76C\uD788" \
     "][\u11A8-\u11C2]" \
     "|#{''  # decomposed Hangul syllables
     }" \
     "[\u1100-\u1112][\u1161-\u1175][\u11A8-\u11C2]?"
   REGEXP_K_STRING = "" \
-    "[\u00A0" \
-    "\u00A8" \
-    "\u00AA" \
-    "\u00AF" \
-    "\u00B2-\u00B5" \
-    "\u00B8-\u00BA" \
-    "\u00BC-\u00BE" \
-    "\u0132\u0133" \
-    "\u013F\u0140" \
-    "\u0149" \
-    "\u017F" \
-    "\u01C4-\u01CC" \
-    "\u01F1-\u01F3" \
-    "\u02B0-\u02B8" \
-    "\u02D8-\u02DD" \
-    "\u02E0-\u02E4" \
-    "\u037A" \
-    "\u0384\u0385" \
-    "\u03D0-\u03D6" \
-    "\u03F0-\u03F2" \
-    "\u03F4\u03F5" \
-    "\u03F9" \
-    "\u0587" \
-    "\u0675-\u0678" \
-    "\u0E33" \
-    "\u0EB3" \
-    "\u0EDC\u0EDD" \
-    "\u0F0C" \
-    "\u0F77" \
-    "\u0F79" \
-    "\u10FC" \
-    "\u1D2C-\u1D2E" \
-    "\u1D30-\u1D3A" \
-    "\u1D3C-\u1D4D" \
-    "\u1D4F-\u1D6A" \
-    "\u1D78" \
-    "\u1D9B-\u1DBF" \
-    "\u1E9A\u1E9B" \
-    "\u1FBD" \
-    "\u1FBF-\u1FC1" \
-    "\u1FCD-\u1FCF" \
-    "\u1FDD-\u1FDF" \
-    "\u1FED\u1FEE" \
-    "\u1FFD\u1FFE" \
-    "\u2000-\u200A" \
-    "\u2011" \
-    "\u2017" \
-    "\u2024-\u2026" \
-    "\u202F" \
-    "\u2033\u2034" \
-    "\u2036\u2037" \
-    "\u203C" \
-    "\u203E" \
-    "\u2047-\u2049" \
-    "\u2057" \
-    "\u205F" \
-    "\u2070\u2071" \
-    "\u2074-\u208E" \
-    "\u2090-\u209C" \
-    "\u20A8" \
-    "\u2100-\u2103" \
-    "\u2105-\u2107" \
-    "\u2109-\u2113" \
-    "\u2115\u2116" \
-    "\u2119-\u211D" \
-    "\u2120-\u2122" \
-    "\u2124" \
-    "\u2128" \
-    "\u212C\u212D" \
-    "\u212F-\u2131" \
-    "\u2133-\u2139" \
-    "\u213B-\u2140" \
-    "\u2145-\u2149" \
-    "\u2150-\u217F" \
-    "\u2189" \
-    "\u222C\u222D" \
-    "\u222F\u2230" \
-    "\u2460-\u24EA" \
-    "\u2A0C" \
-    "\u2A74-\u2A76" \
-    "\u2C7C\u2C7D" \
-    "\u2D6F" \
-    "\u2E9F" \
-    "\u2EF3" \
-    "\u2F00-\u2FD5" \
-    "\u3000" \
-    "\u3036" \
-    "\u3038-\u303A" \
-    "\u309B\u309C" \
-    "\u309F" \
-    "\u30FF" \
-    "\u3131-\u318E" \
-    "\u3192-\u319F" \
-    "\u3200-\u321E" \
-    "\u3220-\u3247" \
-    "\u3250-\u327E" \
-    "\u3280-\u33FF" \
-    "\uA69C\uA69D" \
-    "\uA770" \
-    "\uA7F8\uA7F9" \
-    "\uAB5C-\uAB5F" \
-    "\uFB00-\uFB06" \
-    "\uFB13-\uFB17" \
-    "\uFB20-\uFB29" \
-    "\uFB4F-\uFBB1" \
-    "\uFBD3-\uFD3D" \
-    "\uFD50-\uFD8F" \
-    "\uFD92-\uFDC7" \
-    "\uFDF0-\uFDFC" \
-    "\uFE10-\uFE19" \
-    "\uFE30-\uFE44" \
-    "\uFE47-\uFE52" \
-    "\uFE54-\uFE66" \
-    "\uFE68-\uFE6B" \
-    "\uFE70-\uFE72" \
-    "\uFE74" \
-    "\uFE76-\uFEFC" \
-    "\uFF01-\uFFBE" \
-    "\uFFC2-\uFFC7" \
-    "\uFFCA-\uFFCF" \
-    "\uFFD2-\uFFD7" \
-    "\uFFDA-\uFFDC" \
-    "\uFFE0-\uFFE6" \
-    "\uFFE8-\uFFEE" \
-    "\u{1D400}-\u{1D454}" \
-    "\u{1D456}-\u{1D49C}" \
-    "\u{1D49E}\u{1D49F}" \
-    "\u{1D4A2}" \
-    "\u{1D4A5}\u{1D4A6}" \
-    "\u{1D4A9}-\u{1D4AC}" \
-    "\u{1D4AE}-\u{1D4B9}" \
-    "\u{1D4BB}" \
-    "\u{1D4BD}-\u{1D4C3}" \
-    "\u{1D4C5}-\u{1D505}" \
-    "\u{1D507}-\u{1D50A}" \
-    "\u{1D50D}-\u{1D514}" \
-    "\u{1D516}-\u{1D51C}" \
-    "\u{1D51E}-\u{1D539}" \
-    "\u{1D53B}-\u{1D53E}" \
-    "\u{1D540}-\u{1D544}" \
-    "\u{1D546}" \
-    "\u{1D54A}-\u{1D550}" \
-    "\u{1D552}-\u{1D6A5}" \
-    "\u{1D6A8}-\u{1D7CB}" \
-    "\u{1D7CE}-\u{1D7FF}" \
-    "\u{1EE00}-\u{1EE03}" \
-    "\u{1EE05}-\u{1EE1F}" \
-    "\u{1EE21}\u{1EE22}" \
-    "\u{1EE24}" \
-    "\u{1EE27}" \
-    "\u{1EE29}-\u{1EE32}" \
-    "\u{1EE34}-\u{1EE37}" \
-    "\u{1EE39}" \
-    "\u{1EE3B}" \
-    "\u{1EE42}" \
-    "\u{1EE47}" \
-    "\u{1EE49}" \
-    "\u{1EE4B}" \
-    "\u{1EE4D}-\u{1EE4F}" \
-    "\u{1EE51}\u{1EE52}" \
-    "\u{1EE54}" \
-    "\u{1EE57}" \
-    "\u{1EE59}" \
-    "\u{1EE5B}" \
-    "\u{1EE5D}" \
-    "\u{1EE5F}" \
-    "\u{1EE61}\u{1EE62}" \
-    "\u{1EE64}" \
-    "\u{1EE67}-\u{1EE6A}" \
-    "\u{1EE6C}-\u{1EE72}" \
-    "\u{1EE74}-\u{1EE77}" \
-    "\u{1EE79}-\u{1EE7C}" \
-    "\u{1EE7E}" \
-    "\u{1EE80}-\u{1EE89}" \
-    "\u{1EE8B}-\u{1EE9B}" \
-    "\u{1EEA1}-\u{1EEA3}" \
-    "\u{1EEA5}-\u{1EEA9}" \
-    "\u{1EEAB}-\u{1EEBB}" \
-    "\u{1F100}-\u{1F10A}" \
-    "\u{1F110}-\u{1F12E}" \
-    "\u{1F130}-\u{1F14F}" \
-    "\u{1F16A}-\u{1F16C}" \
-    "\u{1F190}" \
-    "\u{1F200}-\u{1F202}" \
-    "\u{1F210}-\u{1F23B}" \
-    "\u{1F240}-\u{1F248}" \
-    "\u{1F250}\u{1F251}" \
+    "[\u00A0\u00A8\u00AA\u00AF\u00B2-\u00B5\u00B8-\u00BA\u00BC-\u00BE\u0132\u0133" \
+    "\u013F\u0140\u0149\u017F\u01C4-\u01CC\u01F1-\u01F3\u02B0-\u02B8\u02D8-\u02DD\u02E0-\u02E4" \
+    "\u037A\u0384\u0385\u03D0-\u03D6\u03F0-\u03F2\u03F4\u03F5\u03F9\u0587\u0675-\u0678" \
+    "\u0E33\u0EB3\u0EDC\u0EDD\u0F0C\u0F77\u0F79\u10FC\u1D2C-\u1D2E" \
+    "\u1D30-\u1D3A\u1D3C-\u1D4D\u1D4F-\u1D6A\u1D78\u1D9B-\u1DBF\u1E9A\u1E9B\u1FBD\u1FBF-\u1FC1" \
+    "\u1FCD-\u1FCF\u1FDD-\u1FDF\u1FED\u1FEE\u1FFD\u1FFE\u2000-\u200A\u2011\u2017\u2024-\u2026" \
+    "\u202F\u2033\u2034\u2036\u2037\u203C\u203E\u2047-\u2049\u2057\u205F" \
+    "\u2070\u2071\u2074-\u208E\u2090-\u209C\u20A8\u2100-\u2103\u2105-\u2107\u2109-\u2113\u2115\u2116" \
+    "\u2119-\u211D\u2120-\u2122\u2124\u2128\u212C\u212D\u212F-\u2131\u2133-\u2139\u213B-\u2140" \
+    "\u2145-\u2149\u2150-\u217F\u2189\u222C\u222D\u222F\u2230\u2460-\u24EA\u2A0C\u2A74-\u2A76" \
+    "\u2C7C\u2C7D\u2D6F\u2E9F\u2EF3\u2F00-\u2FD5\u3000\u3036\u3038-\u303A" \
+    "\u309B\u309C\u309F\u30FF\u3131-\u318E\u3192-\u319F\u3200-\u321E\u3220-\u3247\u3250-\u327E" \
+    "\u3280-\u32FE\u3300-\u33FF\uA69C\uA69D\uA770\uA7F8\uA7F9\uAB5C-\uAB5F\uFB00-\uFB06\uFB13-\uFB17" \
+    "\uFB20-\uFB29\uFB4F-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFC\uFE10-\uFE19\uFE30-\uFE44" \
+    "\uFE47-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFE70-\uFE72\uFE74\uFE76-\uFEFC\uFF01-\uFFBE\uFFC2-\uFFC7" \
+    "\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC\uFFE0-\uFFE6\uFFE8-\uFFEE\u{1D400}-\u{1D454}\u{1D456}-\u{1D49C}\u{1D49E}\u{1D49F}" \
+    "\u{1D4A2}\u{1D4A5}\u{1D4A6}\u{1D4A9}-\u{1D4AC}\u{1D4AE}-\u{1D4B9}\u{1D4BB}\u{1D4BD}-\u{1D4C3}\u{1D4C5}-\u{1D505}\u{1D507}-\u{1D50A}" \
+    "\u{1D50D}-\u{1D514}\u{1D516}-\u{1D51C}\u{1D51E}-\u{1D539}\u{1D53B}-\u{1D53E}\u{1D540}-\u{1D544}\u{1D546}\u{1D54A}-\u{1D550}\u{1D552}-\u{1D6A5}" \
+    "\u{1D6A8}-\u{1D7CB}\u{1D7CE}-\u{1D7FF}\u{1EE00}-\u{1EE03}\u{1EE05}-\u{1EE1F}\u{1EE21}\u{1EE22}\u{1EE24}\u{1EE27}\u{1EE29}-\u{1EE32}" \
+    "\u{1EE34}-\u{1EE37}\u{1EE39}\u{1EE3B}\u{1EE42}\u{1EE47}\u{1EE49}\u{1EE4B}\u{1EE4D}-\u{1EE4F}" \
+    "\u{1EE51}\u{1EE52}\u{1EE54}\u{1EE57}\u{1EE59}\u{1EE5B}\u{1EE5D}\u{1EE5F}\u{1EE61}\u{1EE62}" \
+    "\u{1EE64}\u{1EE67}-\u{1EE6A}\u{1EE6C}-\u{1EE72}\u{1EE74}-\u{1EE77}\u{1EE79}-\u{1EE7C}\u{1EE7E}\u{1EE80}-\u{1EE89}\u{1EE8B}-\u{1EE9B}" \
+    "\u{1EEA1}-\u{1EEA3}\u{1EEA5}-\u{1EEA9}\u{1EEAB}-\u{1EEBB}\u{1F100}-\u{1F10A}\u{1F110}-\u{1F12E}\u{1F130}-\u{1F14F}\u{1F16A}\u{1F16B}\u{1F190}" \
+    "\u{1F200}-\u{1F202}\u{1F210}-\u{1F23B}\u{1F240}-\u{1F248}\u{1F250}\u{1F251}" \
     "]"
 
   class_table = {
-    "\u0300"=>230,
-    "\u0301"=>230,
-    "\u0302"=>230,
-    "\u0303"=>230,
-    "\u0304"=>230,
-    "\u0305"=>230,
-    "\u0306"=>230,
-    "\u0307"=>230,
-    "\u0308"=>230,
-    "\u0309"=>230,
-    "\u030A"=>230,
-    "\u030B"=>230,
-    "\u030C"=>230,
-    "\u030D"=>230,
-    "\u030E"=>230,
-    "\u030F"=>230,
-    "\u0310"=>230,
-    "\u0311"=>230,
-    "\u0312"=>230,
-    "\u0313"=>230,
-    "\u0314"=>230,
-    "\u0315"=>232,
-    "\u0316"=>220,
-    "\u0317"=>220,
-    "\u0318"=>220,
-    "\u0319"=>220,
-    "\u031A"=>232,
-    "\u031B"=>216,
-    "\u031C"=>220,
-    "\u031D"=>220,
-    "\u031E"=>220,
-    "\u031F"=>220,
-    "\u0320"=>220,
-    "\u0321"=>202,
-    "\u0322"=>202,
-    "\u0323"=>220,
-    "\u0324"=>220,
-    "\u0325"=>220,
-    "\u0326"=>220,
-    "\u0327"=>202,
-    "\u0328"=>202,
-    "\u0329"=>220,
-    "\u032A"=>220,
-    "\u032B"=>220,
-    "\u032C"=>220,
-    "\u032D"=>220,
-    "\u032E"=>220,
-    "\u032F"=>220,
-    "\u0330"=>220,
-    "\u0331"=>220,
-    "\u0332"=>220,
-    "\u0333"=>220,
-    "\u0334"=>1,
-    "\u0335"=>1,
-    "\u0336"=>1,
-    "\u0337"=>1,
-    "\u0338"=>1,
-    "\u0339"=>220,
-    "\u033A"=>220,
-    "\u033B"=>220,
-    "\u033C"=>220,
-    "\u033D"=>230,
-    "\u033E"=>230,
-    "\u033F"=>230,
-    "\u0340"=>230,
-    "\u0341"=>230,
-    "\u0342"=>230,
-    "\u0343"=>230,
-    "\u0344"=>230,
-    "\u0345"=>240,
-    "\u0346"=>230,
-    "\u0347"=>220,
-    "\u0348"=>220,
-    "\u0349"=>220,
-    "\u034A"=>230,
-    "\u034B"=>230,
-    "\u034C"=>230,
-    "\u034D"=>220,
-    "\u034E"=>220,
-    "\u0350"=>230,
-    "\u0351"=>230,
-    "\u0352"=>230,
-    "\u0353"=>220,
-    "\u0354"=>220,
-    "\u0355"=>220,
-    "\u0356"=>220,
-    "\u0357"=>230,
-    "\u0358"=>232,
-    "\u0359"=>220,
-    "\u035A"=>220,
-    "\u035B"=>230,
-    "\u035C"=>233,
-    "\u035D"=>234,
-    "\u035E"=>234,
-    "\u035F"=>233,
-    "\u0360"=>234,
-    "\u0361"=>234,
-    "\u0362"=>233,
-    "\u0363"=>230,
-    "\u0364"=>230,
-    "\u0365"=>230,
-    "\u0366"=>230,
-    "\u0367"=>230,
-    "\u0368"=>230,
-    "\u0369"=>230,
-    "\u036A"=>230,
-    "\u036B"=>230,
-    "\u036C"=>230,
-    "\u036D"=>230,
-    "\u036E"=>230,
-    "\u036F"=>230,
-    "\u0483"=>230,
-    "\u0484"=>230,
-    "\u0485"=>230,
-    "\u0486"=>230,
-    "\u0487"=>230,
-    "\u0591"=>220,
-    "\u0592"=>230,
-    "\u0593"=>230,
-    "\u0594"=>230,
-    "\u0595"=>230,
-    "\u0596"=>220,
-    "\u0597"=>230,
-    "\u0598"=>230,
-    "\u0599"=>230,
-    "\u059A"=>222,
-    "\u059B"=>220,
-    "\u059C"=>230,
-    "\u059D"=>230,
-    "\u059E"=>230,
-    "\u059F"=>230,
-    "\u05A0"=>230,
-    "\u05A1"=>230,
-    "\u05A2"=>220,
-    "\u05A3"=>220,
-    "\u05A4"=>220,
-    "\u05A5"=>220,
-    "\u05A6"=>220,
-    "\u05A7"=>220,
-    "\u05A8"=>230,
-    "\u05A9"=>230,
-    "\u05AA"=>220,
-    "\u05AB"=>230,
-    "\u05AC"=>230,
-    "\u05AD"=>222,
-    "\u05AE"=>228,
-    "\u05AF"=>230,
-    "\u05B0"=>10,
-    "\u05B1"=>11,
-    "\u05B2"=>12,
-    "\u05B3"=>13,
-    "\u05B4"=>14,
-    "\u05B5"=>15,
-    "\u05B6"=>16,
-    "\u05B7"=>17,
-    "\u05B8"=>18,
-    "\u05B9"=>19,
-    "\u05BA"=>19,
-    "\u05BB"=>20,
-    "\u05BC"=>21,
-    "\u05BD"=>22,
-    "\u05BF"=>23,
-    "\u05C1"=>24,
-    "\u05C2"=>25,
-    "\u05C4"=>230,
-    "\u05C5"=>220,
-    "\u05C7"=>18,
-    "\u0610"=>230,
-    "\u0611"=>230,
-    "\u0612"=>230,
-    "\u0613"=>230,
-    "\u0614"=>230,
-    "\u0615"=>230,
-    "\u0616"=>230,
-    "\u0617"=>230,
-    "\u0618"=>30,
-    "\u0619"=>31,
-    "\u061A"=>32,
-    "\u064B"=>27,
-    "\u064C"=>28,
-    "\u064D"=>29,
-    "\u064E"=>30,
-    "\u064F"=>31,
-    "\u0650"=>32,
-    "\u0651"=>33,
-    "\u0652"=>34,
-    "\u0653"=>230,
-    "\u0654"=>230,
-    "\u0655"=>220,
-    "\u0656"=>220,
-    "\u0657"=>230,
-    "\u0658"=>230,
-    "\u0659"=>230,
-    "\u065A"=>230,
-    "\u065B"=>230,
-    "\u065C"=>220,
-    "\u065D"=>230,
-    "\u065E"=>230,
-    "\u065F"=>220,
-    "\u0670"=>35,
-    "\u06D6"=>230,
-    "\u06D7"=>230,
-    "\u06D8"=>230,
-    "\u06D9"=>230,
-    "\u06DA"=>230,
-    "\u06DB"=>230,
-    "\u06DC"=>230,
-    "\u06DF"=>230,
-    "\u06E0"=>230,
-    "\u06E1"=>230,
-    "\u06E2"=>230,
-    "\u06E3"=>220,
-    "\u06E4"=>230,
-    "\u06E7"=>230,
-    "\u06E8"=>230,
-    "\u06EA"=>220,
-    "\u06EB"=>230,
-    "\u06EC"=>230,
-    "\u06ED"=>220,
-    "\u0711"=>36,
-    "\u0730"=>230,
-    "\u0731"=>220,
-    "\u0732"=>230,
-    "\u0733"=>230,
-    "\u0734"=>220,
-    "\u0735"=>230,
-    "\u0736"=>230,
-    "\u0737"=>220,
-    "\u0738"=>220,
-    "\u0739"=>220,
-    "\u073A"=>230,
-    "\u073B"=>220,
-    "\u073C"=>220,
-    "\u073D"=>230,
-    "\u073E"=>220,
-    "\u073F"=>230,
-    "\u0740"=>230,
-    "\u0741"=>230,
-    "\u0742"=>220,
-    "\u0743"=>230,
-    "\u0744"=>220,
-    "\u0745"=>230,
-    "\u0746"=>220,
-    "\u0747"=>230,
-    "\u0748"=>220,
-    "\u0749"=>230,
-    "\u074A"=>230,
-    "\u07EB"=>230,
-    "\u07EC"=>230,
-    "\u07ED"=>230,
-    "\u07EE"=>230,
-    "\u07EF"=>230,
-    "\u07F0"=>230,
-    "\u07F1"=>230,
-    "\u07F2"=>220,
-    "\u07F3"=>230,
-    "\u07FD"=>220,
-    "\u0816"=>230,
-    "\u0817"=>230,
-    "\u0818"=>230,
-    "\u0819"=>230,
-    "\u081B"=>230,
-    "\u081C"=>230,
-    "\u081D"=>230,
-    "\u081E"=>230,
-    "\u081F"=>230,
-    "\u0820"=>230,
-    "\u0821"=>230,
-    "\u0822"=>230,
-    "\u0823"=>230,
-    "\u0825"=>230,
-    "\u0826"=>230,
-    "\u0827"=>230,
-    "\u0829"=>230,
-    "\u082A"=>230,
-    "\u082B"=>230,
-    "\u082C"=>230,
-    "\u082D"=>230,
-    "\u0859"=>220,
-    "\u085A"=>220,
-    "\u085B"=>220,
-    "\u08D3"=>220,
-    "\u08D4"=>230,
-    "\u08D5"=>230,
-    "\u08D6"=>230,
-    "\u08D7"=>230,
-    "\u08D8"=>230,
-    "\u08D9"=>230,
-    "\u08DA"=>230,
-    "\u08DB"=>230,
-    "\u08DC"=>230,
-    "\u08DD"=>230,
-    "\u08DE"=>230,
-    "\u08DF"=>230,
-    "\u08E0"=>230,
-    "\u08E1"=>230,
-    "\u08E3"=>220,
-    "\u08E4"=>230,
-    "\u08E5"=>230,
-    "\u08E6"=>220,
-    "\u08E7"=>230,
-    "\u08E8"=>230,
-    "\u08E9"=>220,
-    "\u08EA"=>230,
-    "\u08EB"=>230,
-    "\u08EC"=>230,
-    "\u08ED"=>220,
-    "\u08EE"=>220,
-    "\u08EF"=>220,
-    "\u08F0"=>27,
-    "\u08F1"=>28,
-    "\u08F2"=>29,
-    "\u08F3"=>230,
-    "\u08F4"=>230,
-    "\u08F5"=>230,
-    "\u08F6"=>220,
-    "\u08F7"=>230,
-    "\u08F8"=>230,
-    "\u08F9"=>220,
-    "\u08FA"=>220,
-    "\u08FB"=>230,
-    "\u08FC"=>230,
-    "\u08FD"=>230,
-    "\u08FE"=>230,
-    "\u08FF"=>230,
-    "\u093C"=>7,
-    "\u094D"=>9,
-    "\u0951"=>230,
-    "\u0952"=>220,
-    "\u0953"=>230,
-    "\u0954"=>230,
-    "\u09BC"=>7,
-    "\u09CD"=>9,
-    "\u09FE"=>230,
-    "\u0A3C"=>7,
-    "\u0A4D"=>9,
-    "\u0ABC"=>7,
-    "\u0ACD"=>9,
-    "\u0B3C"=>7,
-    "\u0B4D"=>9,
-    "\u0BCD"=>9,
-    "\u0C4D"=>9,
-    "\u0C55"=>84,
-    "\u0C56"=>91,
-    "\u0CBC"=>7,
-    "\u0CCD"=>9,
-    "\u0D3B"=>9,
-    "\u0D3C"=>9,
-    "\u0D4D"=>9,
-    "\u0DCA"=>9,
-    "\u0E38"=>103,
-    "\u0E39"=>103,
-    "\u0E3A"=>9,
-    "\u0E48"=>107,
-    "\u0E49"=>107,
-    "\u0E4A"=>107,
-    "\u0E4B"=>107,
-    "\u0EB8"=>118,
-    "\u0EB9"=>118,
-    "\u0EBA"=>9,
-    "\u0EC8"=>122,
-    "\u0EC9"=>122,
-    "\u0ECA"=>122,
-    "\u0ECB"=>122,
-    "\u0F18"=>220,
-    "\u0F19"=>220,
-    "\u0F35"=>220,
-    "\u0F37"=>220,
-    "\u0F39"=>216,
-    "\u0F71"=>129,
-    "\u0F72"=>130,
-    "\u0F74"=>132,
-    "\u0F7A"=>130,
-    "\u0F7B"=>130,
-    "\u0F7C"=>130,
-    "\u0F7D"=>130,
-    "\u0F80"=>130,
-    "\u0F82"=>230,
-    "\u0F83"=>230,
-    "\u0F84"=>9,
-    "\u0F86"=>230,
-    "\u0F87"=>230,
-    "\u0FC6"=>220,
-    "\u1037"=>7,
-    "\u1039"=>9,
-    "\u103A"=>9,
-    "\u108D"=>220,
-    "\u135D"=>230,
-    "\u135E"=>230,
-    "\u135F"=>230,
-    "\u1714"=>9,
-    "\u1734"=>9,
-    "\u17D2"=>9,
-    "\u17DD"=>230,
-    "\u18A9"=>228,
-    "\u1939"=>222,
-    "\u193A"=>230,
-    "\u193B"=>220,
-    "\u1A17"=>230,
-    "\u1A18"=>220,
-    "\u1A60"=>9,
-    "\u1A75"=>230,
-    "\u1A76"=>230,
-    "\u1A77"=>230,
-    "\u1A78"=>230,
-    "\u1A79"=>230,
-    "\u1A7A"=>230,
-    "\u1A7B"=>230,
-    "\u1A7C"=>230,
-    "\u1A7F"=>220,
-    "\u1AB0"=>230,
-    "\u1AB1"=>230,
-    "\u1AB2"=>230,
-    "\u1AB3"=>230,
-    "\u1AB4"=>230,
-    "\u1AB5"=>220,
-    "\u1AB6"=>220,
-    "\u1AB7"=>220,
-    "\u1AB8"=>220,
-    "\u1AB9"=>220,
-    "\u1ABA"=>220,
-    "\u1ABB"=>230,
-    "\u1ABC"=>230,
-    "\u1ABD"=>220,
-    "\u1B34"=>7,
-    "\u1B44"=>9,
-    "\u1B6B"=>230,
-    "\u1B6C"=>220,
-    "\u1B6D"=>230,
-    "\u1B6E"=>230,
-    "\u1B6F"=>230,
-    "\u1B70"=>230,
-    "\u1B71"=>230,
-    "\u1B72"=>230,
-    "\u1B73"=>230,
-    "\u1BAA"=>9,
-    "\u1BAB"=>9,
-    "\u1BE6"=>7,
-    "\u1BF2"=>9,
-    "\u1BF3"=>9,
-    "\u1C37"=>7,
-    "\u1CD0"=>230,
-    "\u1CD1"=>230,
-    "\u1CD2"=>230,
-    "\u1CD4"=>1,
-    "\u1CD5"=>220,
-    "\u1CD6"=>220,
-    "\u1CD7"=>220,
-    "\u1CD8"=>220,
-    "\u1CD9"=>220,
-    "\u1CDA"=>230,
-    "\u1CDB"=>230,
-    "\u1CDC"=>220,
-    "\u1CDD"=>220,
-    "\u1CDE"=>220,
-    "\u1CDF"=>220,
-    "\u1CE0"=>230,
-    "\u1CE2"=>1,
-    "\u1CE3"=>1,
-    "\u1CE4"=>1,
-    "\u1CE5"=>1,
-    "\u1CE6"=>1,
-    "\u1CE7"=>1,
-    "\u1CE8"=>1,
-    "\u1CED"=>220,
-    "\u1CF4"=>230,
-    "\u1CF8"=>230,
-    "\u1CF9"=>230,
-    "\u1DC0"=>230,
-    "\u1DC1"=>230,
-    "\u1DC2"=>220,
-    "\u1DC3"=>230,
-    "\u1DC4"=>230,
-    "\u1DC5"=>230,
-    "\u1DC6"=>230,
-    "\u1DC7"=>230,
-    "\u1DC8"=>230,
-    "\u1DC9"=>230,
-    "\u1DCA"=>220,
-    "\u1DCB"=>230,
-    "\u1DCC"=>230,
-    "\u1DCD"=>234,
-    "\u1DCE"=>214,
-    "\u1DCF"=>220,
-    "\u1DD0"=>202,
-    "\u1DD1"=>230,
-    "\u1DD2"=>230,
-    "\u1DD3"=>230,
-    "\u1DD4"=>230,
-    "\u1DD5"=>230,
-    "\u1DD6"=>230,
-    "\u1DD7"=>230,
-    "\u1DD8"=>230,
-    "\u1DD9"=>230,
-    "\u1DDA"=>230,
-    "\u1DDB"=>230,
-    "\u1DDC"=>230,
-    "\u1DDD"=>230,
-    "\u1DDE"=>230,
-    "\u1DDF"=>230,
-    "\u1DE0"=>230,
-    "\u1DE1"=>230,
-    "\u1DE2"=>230,
-    "\u1DE3"=>230,
-    "\u1DE4"=>230,
-    "\u1DE5"=>230,
-    "\u1DE6"=>230,
-    "\u1DE7"=>230,
-    "\u1DE8"=>230,
-    "\u1DE9"=>230,
-    "\u1DEA"=>230,
-    "\u1DEB"=>230,
-    "\u1DEC"=>230,
-    "\u1DED"=>230,
-    "\u1DEE"=>230,
-    "\u1DEF"=>230,
-    "\u1DF0"=>230,
-    "\u1DF1"=>230,
-    "\u1DF2"=>230,
-    "\u1DF3"=>230,
-    "\u1DF4"=>230,
-    "\u1DF5"=>230,
-    "\u1DF6"=>232,
-    "\u1DF7"=>228,
-    "\u1DF8"=>228,
-    "\u1DF9"=>220,
-    "\u1DFB"=>230,
-    "\u1DFC"=>233,
-    "\u1DFD"=>220,
-    "\u1DFE"=>230,
-    "\u1DFF"=>220,
-    "\u20D0"=>230,
-    "\u20D1"=>230,
-    "\u20D2"=>1,
-    "\u20D3"=>1,
-    "\u20D4"=>230,
-    "\u20D5"=>230,
-    "\u20D6"=>230,
-    "\u20D7"=>230,
-    "\u20D8"=>1,
-    "\u20D9"=>1,
-    "\u20DA"=>1,
-    "\u20DB"=>230,
-    "\u20DC"=>230,
-    "\u20E1"=>230,
-    "\u20E5"=>1,
-    "\u20E6"=>1,
-    "\u20E7"=>230,
-    "\u20E8"=>220,
-    "\u20E9"=>230,
-    "\u20EA"=>1,
-    "\u20EB"=>1,
-    "\u20EC"=>220,
-    "\u20ED"=>220,
-    "\u20EE"=>220,
-    "\u20EF"=>220,
-    "\u20F0"=>230,
-    "\u2CEF"=>230,
-    "\u2CF0"=>230,
-    "\u2CF1"=>230,
-    "\u2D7F"=>9,
-    "\u2DE0"=>230,
-    "\u2DE1"=>230,
-    "\u2DE2"=>230,
-    "\u2DE3"=>230,
-    "\u2DE4"=>230,
-    "\u2DE5"=>230,
-    "\u2DE6"=>230,
-    "\u2DE7"=>230,
-    "\u2DE8"=>230,
-    "\u2DE9"=>230,
-    "\u2DEA"=>230,
-    "\u2DEB"=>230,
-    "\u2DEC"=>230,
-    "\u2DED"=>230,
-    "\u2DEE"=>230,
-    "\u2DEF"=>230,
-    "\u2DF0"=>230,
-    "\u2DF1"=>230,
-    "\u2DF2"=>230,
-    "\u2DF3"=>230,
-    "\u2DF4"=>230,
-    "\u2DF5"=>230,
-    "\u2DF6"=>230,
-    "\u2DF7"=>230,
-    "\u2DF8"=>230,
-    "\u2DF9"=>230,
-    "\u2DFA"=>230,
-    "\u2DFB"=>230,
-    "\u2DFC"=>230,
-    "\u2DFD"=>230,
-    "\u2DFE"=>230,
-    "\u2DFF"=>230,
-    "\u302A"=>218,
-    "\u302B"=>228,
-    "\u302C"=>232,
-    "\u302D"=>222,
-    "\u302E"=>224,
-    "\u302F"=>224,
-    "\u3099"=>8,
-    "\u309A"=>8,
-    "\uA66F"=>230,
-    "\uA674"=>230,
-    "\uA675"=>230,
-    "\uA676"=>230,
-    "\uA677"=>230,
-    "\uA678"=>230,
-    "\uA679"=>230,
-    "\uA67A"=>230,
-    "\uA67B"=>230,
-    "\uA67C"=>230,
-    "\uA67D"=>230,
-    "\uA69E"=>230,
-    "\uA69F"=>230,
-    "\uA6F0"=>230,
-    "\uA6F1"=>230,
-    "\uA806"=>9,
-    "\uA8C4"=>9,
-    "\uA8E0"=>230,
-    "\uA8E1"=>230,
-    "\uA8E2"=>230,
-    "\uA8E3"=>230,
-    "\uA8E4"=>230,
-    "\uA8E5"=>230,
-    "\uA8E6"=>230,
-    "\uA8E7"=>230,
-    "\uA8E8"=>230,
-    "\uA8E9"=>230,
-    "\uA8EA"=>230,
-    "\uA8EB"=>230,
-    "\uA8EC"=>230,
-    "\uA8ED"=>230,
-    "\uA8EE"=>230,
-    "\uA8EF"=>230,
-    "\uA8F0"=>230,
-    "\uA8F1"=>230,
-    "\uA92B"=>220,
-    "\uA92C"=>220,
-    "\uA92D"=>220,
-    "\uA953"=>9,
-    "\uA9B3"=>7,
-    "\uA9C0"=>9,
-    "\uAAB0"=>230,
-    "\uAAB2"=>230,
-    "\uAAB3"=>230,
-    "\uAAB4"=>220,
-    "\uAAB7"=>230,
-    "\uAAB8"=>230,
-    "\uAABE"=>230,
-    "\uAABF"=>230,
-    "\uAAC1"=>230,
-    "\uAAF6"=>9,
-    "\uABED"=>9,
-    "\uFB1E"=>26,
-    "\uFE20"=>230,
-    "\uFE21"=>230,
-    "\uFE22"=>230,
-    "\uFE23"=>230,
-    "\uFE24"=>230,
-    "\uFE25"=>230,
-    "\uFE26"=>230,
-    "\uFE27"=>220,
-    "\uFE28"=>220,
-    "\uFE29"=>220,
-    "\uFE2A"=>220,
-    "\uFE2B"=>220,
-    "\uFE2C"=>220,
-    "\uFE2D"=>220,
-    "\uFE2E"=>230,
-    "\uFE2F"=>230,
-    "\u{101FD}"=>220,
-    "\u{102E0}"=>220,
-    "\u{10376}"=>230,
-    "\u{10377}"=>230,
-    "\u{10378}"=>230,
-    "\u{10379}"=>230,
-    "\u{1037A}"=>230,
-    "\u{10A0D}"=>220,
-    "\u{10A0F}"=>230,
-    "\u{10A38}"=>230,
-    "\u{10A39}"=>1,
-    "\u{10A3A}"=>220,
-    "\u{10A3F}"=>9,
-    "\u{10AE5}"=>230,
-    "\u{10AE6}"=>220,
-    "\u{10D24}"=>230,
-    "\u{10D25}"=>230,
-    "\u{10D26}"=>230,
-    "\u{10D27}"=>230,
-    "\u{10F46}"=>220,
-    "\u{10F47}"=>220,
-    "\u{10F48}"=>230,
-    "\u{10F49}"=>230,
-    "\u{10F4A}"=>230,
-    "\u{10F4B}"=>220,
-    "\u{10F4C}"=>230,
-    "\u{10F4D}"=>220,
-    "\u{10F4E}"=>220,
-    "\u{10F4F}"=>220,
-    "\u{10F50}"=>220,
-    "\u{11046}"=>9,
-    "\u{1107F}"=>9,
-    "\u{110B9}"=>9,
-    "\u{110BA}"=>7,
-    "\u{11100}"=>230,
-    "\u{11101}"=>230,
-    "\u{11102}"=>230,
-    "\u{11133}"=>9,
-    "\u{11134}"=>9,
-    "\u{11173}"=>7,
-    "\u{111C0}"=>9,
-    "\u{111CA}"=>7,
-    "\u{11235}"=>9,
-    "\u{11236}"=>7,
-    "\u{112E9}"=>7,
-    "\u{112EA}"=>9,
-    "\u{1133B}"=>7,
-    "\u{1133C}"=>7,
-    "\u{1134D}"=>9,
-    "\u{11366}"=>230,
-    "\u{11367}"=>230,
-    "\u{11368}"=>230,
-    "\u{11369}"=>230,
-    "\u{1136A}"=>230,
-    "\u{1136B}"=>230,
-    "\u{1136C}"=>230,
-    "\u{11370}"=>230,
-    "\u{11371}"=>230,
-    "\u{11372}"=>230,
-    "\u{11373}"=>230,
-    "\u{11374}"=>230,
-    "\u{11442}"=>9,
-    "\u{11446}"=>7,
-    "\u{1145E}"=>230,
-    "\u{114C2}"=>9,
-    "\u{114C3}"=>7,
-    "\u{115BF}"=>9,
-    "\u{115C0}"=>7,
-    "\u{1163F}"=>9,
-    "\u{116B6}"=>9,
-    "\u{116B7}"=>7,
-    "\u{1172B}"=>9,
-    "\u{11839}"=>9,
-    "\u{1183A}"=>7,
-    "\u{119E0}"=>9,
-    "\u{11A34}"=>9,
-    "\u{11A47}"=>9,
-    "\u{11A99}"=>9,
-    "\u{11C3F}"=>9,
-    "\u{11D42}"=>7,
-    "\u{11D44}"=>9,
-    "\u{11D45}"=>9,
-    "\u{11D97}"=>9,
-    "\u{16AF0}"=>1,
-    "\u{16AF1}"=>1,
-    "\u{16AF2}"=>1,
-    "\u{16AF3}"=>1,
-    "\u{16AF4}"=>1,
-    "\u{16B30}"=>230,
-    "\u{16B31}"=>230,
-    "\u{16B32}"=>230,
-    "\u{16B33}"=>230,
-    "\u{16B34}"=>230,
-    "\u{16B35}"=>230,
-    "\u{16B36}"=>230,
-    "\u{1BC9E}"=>1,
-    "\u{1D165}"=>216,
-    "\u{1D166}"=>216,
-    "\u{1D167}"=>1,
-    "\u{1D168}"=>1,
-    "\u{1D169}"=>1,
-    "\u{1D16D}"=>226,
-    "\u{1D16E}"=>216,
-    "\u{1D16F}"=>216,
-    "\u{1D170}"=>216,
-    "\u{1D171}"=>216,
-    "\u{1D172}"=>216,
-    "\u{1D17B}"=>220,
-    "\u{1D17C}"=>220,
-    "\u{1D17D}"=>220,
-    "\u{1D17E}"=>220,
-    "\u{1D17F}"=>220,
-    "\u{1D180}"=>220,
-    "\u{1D181}"=>220,
-    "\u{1D182}"=>220,
-    "\u{1D185}"=>230,
-    "\u{1D186}"=>230,
-    "\u{1D187}"=>230,
-    "\u{1D188}"=>230,
-    "\u{1D189}"=>230,
-    "\u{1D18A}"=>220,
-    "\u{1D18B}"=>220,
-    "\u{1D1AA}"=>230,
-    "\u{1D1AB}"=>230,
-    "\u{1D1AC}"=>230,
-    "\u{1D1AD}"=>230,
-    "\u{1D242}"=>230,
-    "\u{1D243}"=>230,
-    "\u{1D244}"=>230,
-    "\u{1E000}"=>230,
-    "\u{1E001}"=>230,
-    "\u{1E002}"=>230,
-    "\u{1E003}"=>230,
-    "\u{1E004}"=>230,
-    "\u{1E005}"=>230,
-    "\u{1E006}"=>230,
-    "\u{1E008}"=>230,
-    "\u{1E009}"=>230,
-    "\u{1E00A}"=>230,
-    "\u{1E00B}"=>230,
-    "\u{1E00C}"=>230,
-    "\u{1E00D}"=>230,
-    "\u{1E00E}"=>230,
-    "\u{1E00F}"=>230,
-    "\u{1E010}"=>230,
-    "\u{1E011}"=>230,
-    "\u{1E012}"=>230,
-    "\u{1E013}"=>230,
-    "\u{1E014}"=>230,
-    "\u{1E015}"=>230,
-    "\u{1E016}"=>230,
-    "\u{1E017}"=>230,
-    "\u{1E018}"=>230,
-    "\u{1E01B}"=>230,
-    "\u{1E01C}"=>230,
-    "\u{1E01D}"=>230,
-    "\u{1E01E}"=>230,
-    "\u{1E01F}"=>230,
-    "\u{1E020}"=>230,
-    "\u{1E021}"=>230,
-    "\u{1E023}"=>230,
-    "\u{1E024}"=>230,
-    "\u{1E026}"=>230,
-    "\u{1E027}"=>230,
-    "\u{1E028}"=>230,
-    "\u{1E029}"=>230,
-    "\u{1E02A}"=>230,
-    "\u{1E130}"=>230,
-    "\u{1E131}"=>230,
-    "\u{1E132}"=>230,
-    "\u{1E133}"=>230,
-    "\u{1E134}"=>230,
-    "\u{1E135}"=>230,
-    "\u{1E136}"=>230,
-    "\u{1E2EC}"=>230,
-    "\u{1E2ED}"=>230,
-    "\u{1E2EE}"=>230,
-    "\u{1E2EF}"=>230,
-    "\u{1E8D0}"=>220,
-    "\u{1E8D1}"=>220,
-    "\u{1E8D2}"=>220,
-    "\u{1E8D3}"=>220,
-    "\u{1E8D4}"=>220,
-    "\u{1E8D5}"=>220,
-    "\u{1E8D6}"=>220,
-    "\u{1E944}"=>230,
-    "\u{1E945}"=>230,
-    "\u{1E946}"=>230,
-    "\u{1E947}"=>230,
-    "\u{1E948}"=>230,
-    "\u{1E949}"=>230,
-    "\u{1E94A}"=>7,
+    "\u0300"=>230, "\u0301"=>230, "\u0302"=>230, "\u0303"=>230, "\u0304"=>230, "\u0305"=>230, "\u0306"=>230, "\u0307"=>230,
+    "\u0308"=>230, "\u0309"=>230, "\u030A"=>230, "\u030B"=>230, "\u030C"=>230, "\u030D"=>230, "\u030E"=>230, "\u030F"=>230,
+    "\u0310"=>230, "\u0311"=>230, "\u0312"=>230, "\u0313"=>230, "\u0314"=>230, "\u0315"=>232, "\u0316"=>220, "\u0317"=>220,
+    "\u0318"=>220, "\u0319"=>220, "\u031A"=>232, "\u031B"=>216, "\u031C"=>220, "\u031D"=>220, "\u031E"=>220, "\u031F"=>220,
+    "\u0320"=>220, "\u0321"=>202, "\u0322"=>202, "\u0323"=>220, "\u0324"=>220, "\u0325"=>220, "\u0326"=>220, "\u0327"=>202,
+    "\u0328"=>202, "\u0329"=>220, "\u032A"=>220, "\u032B"=>220, "\u032C"=>220, "\u032D"=>220, "\u032E"=>220, "\u032F"=>220,
+    "\u0330"=>220, "\u0331"=>220, "\u0332"=>220, "\u0333"=>220, "\u0334"=>1, "\u0335"=>1, "\u0336"=>1, "\u0337"=>1,
+    "\u0338"=>1, "\u0339"=>220, "\u033A"=>220, "\u033B"=>220, "\u033C"=>220, "\u033D"=>230, "\u033E"=>230, "\u033F"=>230,
+    "\u0340"=>230, "\u0341"=>230, "\u0342"=>230, "\u0343"=>230, "\u0344"=>230, "\u0345"=>240, "\u0346"=>230, "\u0347"=>220,
+    "\u0348"=>220, "\u0349"=>220, "\u034A"=>230, "\u034B"=>230, "\u034C"=>230, "\u034D"=>220, "\u034E"=>220, "\u0350"=>230,
+    "\u0351"=>230, "\u0352"=>230, "\u0353"=>220, "\u0354"=>220, "\u0355"=>220, "\u0356"=>220, "\u0357"=>230, "\u0358"=>232,
+    "\u0359"=>220, "\u035A"=>220, "\u035B"=>230, "\u035C"=>233, "\u035D"=>234, "\u035E"=>234, "\u035F"=>233, "\u0360"=>234,
+    "\u0361"=>234, "\u0362"=>233, "\u0363"=>230, "\u0364"=>230, "\u0365"=>230, "\u0366"=>230, "\u0367"=>230, "\u0368"=>230,
+    "\u0369"=>230, "\u036A"=>230, "\u036B"=>230, "\u036C"=>230, "\u036D"=>230, "\u036E"=>230, "\u036F"=>230, "\u0483"=>230,
+    "\u0484"=>230, "\u0485"=>230, "\u0486"=>230, "\u0487"=>230, "\u0591"=>220, "\u0592"=>230, "\u0593"=>230, "\u0594"=>230,
+    "\u0595"=>230, "\u0596"=>220, "\u0597"=>230, "\u0598"=>230, "\u0599"=>230, "\u059A"=>222, "\u059B"=>220, "\u059C"=>230,
+    "\u059D"=>230, "\u059E"=>230, "\u059F"=>230, "\u05A0"=>230, "\u05A1"=>230, "\u05A2"=>220, "\u05A3"=>220, "\u05A4"=>220,
+    "\u05A5"=>220, "\u05A6"=>220, "\u05A7"=>220, "\u05A8"=>230, "\u05A9"=>230, "\u05AA"=>220, "\u05AB"=>230, "\u05AC"=>230,
+    "\u05AD"=>222, "\u05AE"=>228, "\u05AF"=>230, "\u05B0"=>10, "\u05B1"=>11, "\u05B2"=>12, "\u05B3"=>13, "\u05B4"=>14,
+    "\u05B5"=>15, "\u05B6"=>16, "\u05B7"=>17, "\u05B8"=>18, "\u05B9"=>19, "\u05BA"=>19, "\u05BB"=>20, "\u05BC"=>21,
+    "\u05BD"=>22, "\u05BF"=>23, "\u05C1"=>24, "\u05C2"=>25, "\u05C4"=>230, "\u05C5"=>220, "\u05C7"=>18, "\u0610"=>230,
+    "\u0611"=>230, "\u0612"=>230, "\u0613"=>230, "\u0614"=>230, "\u0615"=>230, "\u0616"=>230, "\u0617"=>230, "\u0618"=>30,
+    "\u0619"=>31, "\u061A"=>32, "\u064B"=>27, "\u064C"=>28, "\u064D"=>29, "\u064E"=>30, "\u064F"=>31, "\u0650"=>32,
+    "\u0651"=>33, "\u0652"=>34, "\u0653"=>230, "\u0654"=>230, "\u0655"=>220, "\u0656"=>220, "\u0657"=>230, "\u0658"=>230,
+    "\u0659"=>230, "\u065A"=>230, "\u065B"=>230, "\u065C"=>220, "\u065D"=>230, "\u065E"=>230, "\u065F"=>220, "\u0670"=>35,
+    "\u06D6"=>230, "\u06D7"=>230, "\u06D8"=>230, "\u06D9"=>230, "\u06DA"=>230, "\u06DB"=>230, "\u06DC"=>230, "\u06DF"=>230,
+    "\u06E0"=>230, "\u06E1"=>230, "\u06E2"=>230, "\u06E3"=>220, "\u06E4"=>230, "\u06E7"=>230, "\u06E8"=>230, "\u06EA"=>220,
+    "\u06EB"=>230, "\u06EC"=>230, "\u06ED"=>220, "\u0711"=>36, "\u0730"=>230, "\u0731"=>220, "\u0732"=>230, "\u0733"=>230,
+    "\u0734"=>220, "\u0735"=>230, "\u0736"=>230, "\u0737"=>220, "\u0738"=>220, "\u0739"=>220, "\u073A"=>230, "\u073B"=>220,
+    "\u073C"=>220, "\u073D"=>230, "\u073E"=>220, "\u073F"=>230, "\u0740"=>230, "\u0741"=>230, "\u0742"=>220, "\u0743"=>230,
+    "\u0744"=>220, "\u0745"=>230, "\u0746"=>220, "\u0747"=>230, "\u0748"=>220, "\u0749"=>230, "\u074A"=>230, "\u07EB"=>230,
+    "\u07EC"=>230, "\u07ED"=>230, "\u07EE"=>230, "\u07EF"=>230, "\u07F0"=>230, "\u07F1"=>230, "\u07F2"=>220, "\u07F3"=>230,
+    "\u0816"=>230, "\u0817"=>230, "\u0818"=>230, "\u0819"=>230, "\u081B"=>230, "\u081C"=>230, "\u081D"=>230, "\u081E"=>230,
+    "\u081F"=>230, "\u0820"=>230, "\u0821"=>230, "\u0822"=>230, "\u0823"=>230, "\u0825"=>230, "\u0826"=>230, "\u0827"=>230,
+    "\u0829"=>230, "\u082A"=>230, "\u082B"=>230, "\u082C"=>230, "\u082D"=>230, "\u0859"=>220, "\u085A"=>220, "\u085B"=>220,
+    "\u08D4"=>230, "\u08D5"=>230, "\u08D6"=>230, "\u08D7"=>230, "\u08D8"=>230, "\u08D9"=>230, "\u08DA"=>230, "\u08DB"=>230,
+    "\u08DC"=>230, "\u08DD"=>230, "\u08DE"=>230, "\u08DF"=>230, "\u08E0"=>230, "\u08E1"=>230, "\u08E3"=>220, "\u08E4"=>230,
+    "\u08E5"=>230, "\u08E6"=>220, "\u08E7"=>230, "\u08E8"=>230, "\u08E9"=>220, "\u08EA"=>230, "\u08EB"=>230, "\u08EC"=>230,
+    "\u08ED"=>220, "\u08EE"=>220, "\u08EF"=>220, "\u08F0"=>27, "\u08F1"=>28, "\u08F2"=>29, "\u08F3"=>230, "\u08F4"=>230,
+    "\u08F5"=>230, "\u08F6"=>220, "\u08F7"=>230, "\u08F8"=>230, "\u08F9"=>220, "\u08FA"=>220, "\u08FB"=>230, "\u08FC"=>230,
+    "\u08FD"=>230, "\u08FE"=>230, "\u08FF"=>230, "\u093C"=>7, "\u094D"=>9, "\u0951"=>230, "\u0952"=>220, "\u0953"=>230,
+    "\u0954"=>230, "\u09BC"=>7, "\u09CD"=>9, "\u0A3C"=>7, "\u0A4D"=>9, "\u0ABC"=>7, "\u0ACD"=>9, "\u0B3C"=>7,
+    "\u0B4D"=>9, "\u0BCD"=>9, "\u0C4D"=>9, "\u0C55"=>84, "\u0C56"=>91, "\u0CBC"=>7, "\u0CCD"=>9, "\u0D4D"=>9,
+    "\u0DCA"=>9, "\u0E38"=>103, "\u0E39"=>103, "\u0E3A"=>9, "\u0E48"=>107, "\u0E49"=>107, "\u0E4A"=>107, "\u0E4B"=>107,
+    "\u0EB8"=>118, "\u0EB9"=>118, "\u0EC8"=>122, "\u0EC9"=>122, "\u0ECA"=>122, "\u0ECB"=>122, "\u0F18"=>220, "\u0F19"=>220,
+    "\u0F35"=>220, "\u0F37"=>220, "\u0F39"=>216, "\u0F71"=>129, "\u0F72"=>130, "\u0F74"=>132, "\u0F7A"=>130, "\u0F7B"=>130,
+    "\u0F7C"=>130, "\u0F7D"=>130, "\u0F80"=>130, "\u0F82"=>230, "\u0F83"=>230, "\u0F84"=>9, "\u0F86"=>230, "\u0F87"=>230,
+    "\u0FC6"=>220, "\u1037"=>7, "\u1039"=>9, "\u103A"=>9, "\u108D"=>220, "\u135D"=>230, "\u135E"=>230, "\u135F"=>230,
+    "\u1714"=>9, "\u1734"=>9, "\u17D2"=>9, "\u17DD"=>230, "\u18A9"=>228, "\u1939"=>222, "\u193A"=>230, "\u193B"=>220,
+    "\u1A17"=>230, "\u1A18"=>220, "\u1A60"=>9, "\u1A75"=>230, "\u1A76"=>230, "\u1A77"=>230, "\u1A78"=>230, "\u1A79"=>230,
+    "\u1A7A"=>230, "\u1A7B"=>230, "\u1A7C"=>230, "\u1A7F"=>220, "\u1AB0"=>230, "\u1AB1"=>230, "\u1AB2"=>230, "\u1AB3"=>230,
+    "\u1AB4"=>230, "\u1AB5"=>220, "\u1AB6"=>220, "\u1AB7"=>220, "\u1AB8"=>220, "\u1AB9"=>220, "\u1ABA"=>220, "\u1ABB"=>230,
+    "\u1ABC"=>230, "\u1ABD"=>220, "\u1B34"=>7, "\u1B44"=>9, "\u1B6B"=>230, "\u1B6C"=>220, "\u1B6D"=>230, "\u1B6E"=>230,
+    "\u1B6F"=>230, "\u1B70"=>230, "\u1B71"=>230, "\u1B72"=>230, "\u1B73"=>230, "\u1BAA"=>9, "\u1BAB"=>9, "\u1BE6"=>7,
+    "\u1BF2"=>9, "\u1BF3"=>9, "\u1C37"=>7, "\u1CD0"=>230, "\u1CD1"=>230, "\u1CD2"=>230, "\u1CD4"=>1, "\u1CD5"=>220,
+    "\u1CD6"=>220, "\u1CD7"=>220, "\u1CD8"=>220, "\u1CD9"=>220, "\u1CDA"=>230, "\u1CDB"=>230, "\u1CDC"=>220, "\u1CDD"=>220,
+    "\u1CDE"=>220, "\u1CDF"=>220, "\u1CE0"=>230, "\u1CE2"=>1, "\u1CE3"=>1, "\u1CE4"=>1, "\u1CE5"=>1, "\u1CE6"=>1,
+    "\u1CE7"=>1, "\u1CE8"=>1, "\u1CED"=>220, "\u1CF4"=>230, "\u1CF8"=>230, "\u1CF9"=>230, "\u1DC0"=>230, "\u1DC1"=>230,
+    "\u1DC2"=>220, "\u1DC3"=>230, "\u1DC4"=>230, "\u1DC5"=>230, "\u1DC6"=>230, "\u1DC7"=>230, "\u1DC8"=>230, "\u1DC9"=>230,
+    "\u1DCA"=>220, "\u1DCB"=>230, "\u1DCC"=>230, "\u1DCD"=>234, "\u1DCE"=>214, "\u1DCF"=>220, "\u1DD0"=>202, "\u1DD1"=>230,
+    "\u1DD2"=>230, "\u1DD3"=>230, "\u1DD4"=>230, "\u1DD5"=>230, "\u1DD6"=>230, "\u1DD7"=>230, "\u1DD8"=>230, "\u1DD9"=>230,
+    "\u1DDA"=>230, "\u1DDB"=>230, "\u1DDC"=>230, "\u1DDD"=>230, "\u1DDE"=>230, "\u1DDF"=>230, "\u1DE0"=>230, "\u1DE1"=>230,
+    "\u1DE2"=>230, "\u1DE3"=>230, "\u1DE4"=>230, "\u1DE5"=>230, "\u1DE6"=>230, "\u1DE7"=>230, "\u1DE8"=>230, "\u1DE9"=>230,
+    "\u1DEA"=>230, "\u1DEB"=>230, "\u1DEC"=>230, "\u1DED"=>230, "\u1DEE"=>230, "\u1DEF"=>230, "\u1DF0"=>230, "\u1DF1"=>230,
+    "\u1DF2"=>230, "\u1DF3"=>230, "\u1DF4"=>230, "\u1DF5"=>230, "\u1DFB"=>230, "\u1DFC"=>233, "\u1DFD"=>220, "\u1DFE"=>230,
+    "\u1DFF"=>220, "\u20D0"=>230, "\u20D1"=>230, "\u20D2"=>1, "\u20D3"=>1, "\u20D4"=>230, "\u20D5"=>230, "\u20D6"=>230,
+    "\u20D7"=>230, "\u20D8"=>1, "\u20D9"=>1, "\u20DA"=>1, "\u20DB"=>230, "\u20DC"=>230, "\u20E1"=>230, "\u20E5"=>1,
+    "\u20E6"=>1, "\u20E7"=>230, "\u20E8"=>220, "\u20E9"=>230, "\u20EA"=>1, "\u20EB"=>1, "\u20EC"=>220, "\u20ED"=>220,
+    "\u20EE"=>220, "\u20EF"=>220, "\u20F0"=>230, "\u2CEF"=>230, "\u2CF0"=>230, "\u2CF1"=>230, "\u2D7F"=>9, "\u2DE0"=>230,
+    "\u2DE1"=>230, "\u2DE2"=>230, "\u2DE3"=>230, "\u2DE4"=>230, "\u2DE5"=>230, "\u2DE6"=>230, "\u2DE7"=>230, "\u2DE8"=>230,
+    "\u2DE9"=>230, "\u2DEA"=>230, "\u2DEB"=>230, "\u2DEC"=>230, "\u2DED"=>230, "\u2DEE"=>230, "\u2DEF"=>230, "\u2DF0"=>230,
+    "\u2DF1"=>230, "\u2DF2"=>230, "\u2DF3"=>230, "\u2DF4"=>230, "\u2DF5"=>230, "\u2DF6"=>230, "\u2DF7"=>230, "\u2DF8"=>230,
+    "\u2DF9"=>230, "\u2DFA"=>230, "\u2DFB"=>230, "\u2DFC"=>230, "\u2DFD"=>230, "\u2DFE"=>230, "\u2DFF"=>230, "\u302A"=>218,
+    "\u302B"=>228, "\u302C"=>232, "\u302D"=>222, "\u302E"=>224, "\u302F"=>224, "\u3099"=>8, "\u309A"=>8, "\uA66F"=>230,
+    "\uA674"=>230, "\uA675"=>230, "\uA676"=>230, "\uA677"=>230, "\uA678"=>230, "\uA679"=>230, "\uA67A"=>230, "\uA67B"=>230,
+    "\uA67C"=>230, "\uA67D"=>230, "\uA69E"=>230, "\uA69F"=>230, "\uA6F0"=>230, "\uA6F1"=>230, "\uA806"=>9, "\uA8C4"=>9,
+    "\uA8E0"=>230, "\uA8E1"=>230, "\uA8E2"=>230, "\uA8E3"=>230, "\uA8E4"=>230, "\uA8E5"=>230, "\uA8E6"=>230, "\uA8E7"=>230,
+    "\uA8E8"=>230, "\uA8E9"=>230, "\uA8EA"=>230, "\uA8EB"=>230, "\uA8EC"=>230, "\uA8ED"=>230, "\uA8EE"=>230, "\uA8EF"=>230,
+    "\uA8F0"=>230, "\uA8F1"=>230, "\uA92B"=>220, "\uA92C"=>220, "\uA92D"=>220, "\uA953"=>9, "\uA9B3"=>7, "\uA9C0"=>9,
+    "\uAAB0"=>230, "\uAAB2"=>230, "\uAAB3"=>230, "\uAAB4"=>220, "\uAAB7"=>230, "\uAAB8"=>230, "\uAABE"=>230, "\uAABF"=>230,
+    "\uAAC1"=>230, "\uAAF6"=>9, "\uABED"=>9, "\uFB1E"=>26, "\uFE20"=>230, "\uFE21"=>230, "\uFE22"=>230, "\uFE23"=>230,
+    "\uFE24"=>230, "\uFE25"=>230, "\uFE26"=>230, "\uFE27"=>220, "\uFE28"=>220, "\uFE29"=>220, "\uFE2A"=>220, "\uFE2B"=>220,
+    "\uFE2C"=>220, "\uFE2D"=>220, "\uFE2E"=>230, "\uFE2F"=>230, "\u{101FD}"=>220, "\u{102E0}"=>220, "\u{10376}"=>230, "\u{10377}"=>230,
+    "\u{10378}"=>230, "\u{10379}"=>230, "\u{1037A}"=>230, "\u{10A0D}"=>220, "\u{10A0F}"=>230, "\u{10A38}"=>230, "\u{10A39}"=>1, "\u{10A3A}"=>220,
+    "\u{10A3F}"=>9, "\u{10AE5}"=>230, "\u{10AE6}"=>220, "\u{11046}"=>9, "\u{1107F}"=>9, "\u{110B9}"=>9, "\u{110BA}"=>7, "\u{11100}"=>230,
+    "\u{11101}"=>230, "\u{11102}"=>230, "\u{11133}"=>9, "\u{11134}"=>9, "\u{11173}"=>7, "\u{111C0}"=>9, "\u{111CA}"=>7, "\u{11235}"=>9,
+    "\u{11236}"=>7, "\u{112E9}"=>7, "\u{112EA}"=>9, "\u{1133C}"=>7, "\u{1134D}"=>9, "\u{11366}"=>230, "\u{11367}"=>230, "\u{11368}"=>230,
+    "\u{11369}"=>230, "\u{1136A}"=>230, "\u{1136B}"=>230, "\u{1136C}"=>230, "\u{11370}"=>230, "\u{11371}"=>230, "\u{11372}"=>230, "\u{11373}"=>230,
+    "\u{11374}"=>230, "\u{11442}"=>9, "\u{11446}"=>7, "\u{114C2}"=>9, "\u{114C3}"=>7, "\u{115BF}"=>9, "\u{115C0}"=>7, "\u{1163F}"=>9,
+    "\u{116B6}"=>9, "\u{116B7}"=>7, "\u{1172B}"=>9, "\u{11C3F}"=>9, "\u{16AF0}"=>1, "\u{16AF1}"=>1, "\u{16AF2}"=>1, "\u{16AF3}"=>1,
+    "\u{16AF4}"=>1, "\u{16B30}"=>230, "\u{16B31}"=>230, "\u{16B32}"=>230, "\u{16B33}"=>230, "\u{16B34}"=>230, "\u{16B35}"=>230, "\u{16B36}"=>230,
+    "\u{1BC9E}"=>1, "\u{1D165}"=>216, "\u{1D166}"=>216, "\u{1D167}"=>1, "\u{1D168}"=>1, "\u{1D169}"=>1, "\u{1D16D}"=>226, "\u{1D16E}"=>216,
+    "\u{1D16F}"=>216, "\u{1D170}"=>216, "\u{1D171}"=>216, "\u{1D172}"=>216, "\u{1D17B}"=>220, "\u{1D17C}"=>220, "\u{1D17D}"=>220, "\u{1D17E}"=>220,
+    "\u{1D17F}"=>220, "\u{1D180}"=>220, "\u{1D181}"=>220, "\u{1D182}"=>220, "\u{1D185}"=>230, "\u{1D186}"=>230, "\u{1D187}"=>230, "\u{1D188}"=>230,
+    "\u{1D189}"=>230, "\u{1D18A}"=>220, "\u{1D18B}"=>220, "\u{1D1AA}"=>230, "\u{1D1AB}"=>230, "\u{1D1AC}"=>230, "\u{1D1AD}"=>230, "\u{1D242}"=>230,
+    "\u{1D243}"=>230, "\u{1D244}"=>230, "\u{1E000}"=>230, "\u{1E001}"=>230, "\u{1E002}"=>230, "\u{1E003}"=>230, "\u{1E004}"=>230, "\u{1E005}"=>230,
+    "\u{1E006}"=>230, "\u{1E008}"=>230, "\u{1E009}"=>230, "\u{1E00A}"=>230, "\u{1E00B}"=>230, "\u{1E00C}"=>230, "\u{1E00D}"=>230, "\u{1E00E}"=>230,
+    "\u{1E00F}"=>230, "\u{1E010}"=>230, "\u{1E011}"=>230, "\u{1E012}"=>230, "\u{1E013}"=>230, "\u{1E014}"=>230, "\u{1E015}"=>230, "\u{1E016}"=>230,
+    "\u{1E017}"=>230, "\u{1E018}"=>230, "\u{1E01B}"=>230, "\u{1E01C}"=>230, "\u{1E01D}"=>230, "\u{1E01E}"=>230, "\u{1E01F}"=>230, "\u{1E020}"=>230,
+    "\u{1E021}"=>230, "\u{1E023}"=>230, "\u{1E024}"=>230, "\u{1E026}"=>230, "\u{1E027}"=>230, "\u{1E028}"=>230, "\u{1E029}"=>230, "\u{1E02A}"=>230,
+    "\u{1E8D0}"=>220, "\u{1E8D1}"=>220, "\u{1E8D2}"=>220, "\u{1E8D3}"=>220, "\u{1E8D4}"=>220, "\u{1E8D5}"=>220, "\u{1E8D6}"=>220, "\u{1E944}"=>230,
+    "\u{1E945}"=>230, "\u{1E946}"=>230, "\u{1E947}"=>230, "\u{1E948}"=>230, "\u{1E949}"=>230, "\u{1E94A}"=>7,
   }
   class_table.default = 0
   CLASS_TABLE = class_table.freeze
 
   DECOMPOSITION_TABLE = {
-    "\u00C0"=>"A\u0300",
-    "\u00C1"=>"A\u0301",
-    "\u00C2"=>"A\u0302",
-    "\u00C3"=>"A\u0303",
-    "\u00C4"=>"A\u0308",
-    "\u00C5"=>"A\u030A",
-    "\u00C7"=>"C\u0327",
-    "\u00C8"=>"E\u0300",
-    "\u00C9"=>"E\u0301",
-    "\u00CA"=>"E\u0302",
-    "\u00CB"=>"E\u0308",
-    "\u00CC"=>"I\u0300",
-    "\u00CD"=>"I\u0301",
-    "\u00CE"=>"I\u0302",
-    "\u00CF"=>"I\u0308",
-    "\u00D1"=>"N\u0303",
-    "\u00D2"=>"O\u0300",
-    "\u00D3"=>"O\u0301",
-    "\u00D4"=>"O\u0302",
-    "\u00D5"=>"O\u0303",
-    "\u00D6"=>"O\u0308",
-    "\u00D9"=>"U\u0300",
-    "\u00DA"=>"U\u0301",
-    "\u00DB"=>"U\u0302",
-    "\u00DC"=>"U\u0308",
-    "\u00DD"=>"Y\u0301",
-    "\u00E0"=>"a\u0300",
-    "\u00E1"=>"a\u0301",
-    "\u00E2"=>"a\u0302",
-    "\u00E3"=>"a\u0303",
-    "\u00E4"=>"a\u0308",
-    "\u00E5"=>"a\u030A",
-    "\u00E7"=>"c\u0327",
-    "\u00E8"=>"e\u0300",
-    "\u00E9"=>"e\u0301",
-    "\u00EA"=>"e\u0302",
-    "\u00EB"=>"e\u0308",
-    "\u00EC"=>"i\u0300",
-    "\u00ED"=>"i\u0301",
-    "\u00EE"=>"i\u0302",
-    "\u00EF"=>"i\u0308",
-    "\u00F1"=>"n\u0303",
-    "\u00F2"=>"o\u0300",
-    "\u00F3"=>"o\u0301",
-    "\u00F4"=>"o\u0302",
-    "\u00F5"=>"o\u0303",
-    "\u00F6"=>"o\u0308",
-    "\u00F9"=>"u\u0300",
-    "\u00FA"=>"u\u0301",
-    "\u00FB"=>"u\u0302",
-    "\u00FC"=>"u\u0308",
-    "\u00FD"=>"y\u0301",
-    "\u00FF"=>"y\u0308",
-    "\u0100"=>"A\u0304",
-    "\u0101"=>"a\u0304",
-    "\u0102"=>"A\u0306",
-    "\u0103"=>"a\u0306",
-    "\u0104"=>"A\u0328",
-    "\u0105"=>"a\u0328",
-    "\u0106"=>"C\u0301",
-    "\u0107"=>"c\u0301",
-    "\u0108"=>"C\u0302",
-    "\u0109"=>"c\u0302",
-    "\u010A"=>"C\u0307",
-    "\u010B"=>"c\u0307",
-    "\u010C"=>"C\u030C",
-    "\u010D"=>"c\u030C",
-    "\u010E"=>"D\u030C",
-    "\u010F"=>"d\u030C",
-    "\u0112"=>"E\u0304",
-    "\u0113"=>"e\u0304",
-    "\u0114"=>"E\u0306",
-    "\u0115"=>"e\u0306",
-    "\u0116"=>"E\u0307",
-    "\u0117"=>"e\u0307",
-    "\u0118"=>"E\u0328",
-    "\u0119"=>"e\u0328",
-    "\u011A"=>"E\u030C",
-    "\u011B"=>"e\u030C",
-    "\u011C"=>"G\u0302",
-    "\u011D"=>"g\u0302",
-    "\u011E"=>"G\u0306",
-    "\u011F"=>"g\u0306",
-    "\u0120"=>"G\u0307",
-    "\u0121"=>"g\u0307",
-    "\u0122"=>"G\u0327",
-    "\u0123"=>"g\u0327",
-    "\u0124"=>"H\u0302",
-    "\u0125"=>"h\u0302",
-    "\u0128"=>"I\u0303",
-    "\u0129"=>"i\u0303",
-    "\u012A"=>"I\u0304",
-    "\u012B"=>"i\u0304",
-    "\u012C"=>"I\u0306",
-    "\u012D"=>"i\u0306",
-    "\u012E"=>"I\u0328",
-    "\u012F"=>"i\u0328",
-    "\u0130"=>"I\u0307",
-    "\u0134"=>"J\u0302",
-    "\u0135"=>"j\u0302",
-    "\u0136"=>"K\u0327",
-    "\u0137"=>"k\u0327",
-    "\u0139"=>"L\u0301",
-    "\u013A"=>"l\u0301",
-    "\u013B"=>"L\u0327",
-    "\u013C"=>"l\u0327",
-    "\u013D"=>"L\u030C",
-    "\u013E"=>"l\u030C",
-    "\u0143"=>"N\u0301",
-    "\u0144"=>"n\u0301",
-    "\u0145"=>"N\u0327",
-    "\u0146"=>"n\u0327",
-    "\u0147"=>"N\u030C",
-    "\u0148"=>"n\u030C",
-    "\u014C"=>"O\u0304",
-    "\u014D"=>"o\u0304",
-    "\u014E"=>"O\u0306",
-    "\u014F"=>"o\u0306",
-    "\u0150"=>"O\u030B",
-    "\u0151"=>"o\u030B",
-    "\u0154"=>"R\u0301",
-    "\u0155"=>"r\u0301",
-    "\u0156"=>"R\u0327",
-    "\u0157"=>"r\u0327",
-    "\u0158"=>"R\u030C",
-    "\u0159"=>"r\u030C",
-    "\u015A"=>"S\u0301",
-    "\u015B"=>"s\u0301",
-    "\u015C"=>"S\u0302",
-    "\u015D"=>"s\u0302",
-    "\u015E"=>"S\u0327",
-    "\u015F"=>"s\u0327",
-    "\u0160"=>"S\u030C",
-    "\u0161"=>"s\u030C",
-    "\u0162"=>"T\u0327",
-    "\u0163"=>"t\u0327",
-    "\u0164"=>"T\u030C",
-    "\u0165"=>"t\u030C",
-    "\u0168"=>"U\u0303",
-    "\u0169"=>"u\u0303",
-    "\u016A"=>"U\u0304",
-    "\u016B"=>"u\u0304",
-    "\u016C"=>"U\u0306",
-    "\u016D"=>"u\u0306",
-    "\u016E"=>"U\u030A",
-    "\u016F"=>"u\u030A",
-    "\u0170"=>"U\u030B",
-    "\u0171"=>"u\u030B",
-    "\u0172"=>"U\u0328",
-    "\u0173"=>"u\u0328",
-    "\u0174"=>"W\u0302",
-    "\u0175"=>"w\u0302",
-    "\u0176"=>"Y\u0302",
-    "\u0177"=>"y\u0302",
-    "\u0178"=>"Y\u0308",
-    "\u0179"=>"Z\u0301",
-    "\u017A"=>"z\u0301",
-    "\u017B"=>"Z\u0307",
-    "\u017C"=>"z\u0307",
-    "\u017D"=>"Z\u030C",
-    "\u017E"=>"z\u030C",
-    "\u01A0"=>"O\u031B",
-    "\u01A1"=>"o\u031B",
-    "\u01AF"=>"U\u031B",
-    "\u01B0"=>"u\u031B",
-    "\u01CD"=>"A\u030C",
-    "\u01CE"=>"a\u030C",
-    "\u01CF"=>"I\u030C",
-    "\u01D0"=>"i\u030C",
-    "\u01D1"=>"O\u030C",
-    "\u01D2"=>"o\u030C",
-    "\u01D3"=>"U\u030C",
-    "\u01D4"=>"u\u030C",
-    "\u01D5"=>"U\u0308\u0304",
-    "\u01D6"=>"u\u0308\u0304",
-    "\u01D7"=>"U\u0308\u0301",
-    "\u01D8"=>"u\u0308\u0301",
-    "\u01D9"=>"U\u0308\u030C",
-    "\u01DA"=>"u\u0308\u030C",
-    "\u01DB"=>"U\u0308\u0300",
-    "\u01DC"=>"u\u0308\u0300",
-    "\u01DE"=>"A\u0308\u0304",
-    "\u01DF"=>"a\u0308\u0304",
-    "\u01E0"=>"A\u0307\u0304",
-    "\u01E1"=>"a\u0307\u0304",
-    "\u01E2"=>"\u00C6\u0304",
-    "\u01E3"=>"\u00E6\u0304",
-    "\u01E6"=>"G\u030C",
-    "\u01E7"=>"g\u030C",
-    "\u01E8"=>"K\u030C",
-    "\u01E9"=>"k\u030C",
-    "\u01EA"=>"O\u0328",
-    "\u01EB"=>"o\u0328",
-    "\u01EC"=>"O\u0328\u0304",
-    "\u01ED"=>"o\u0328\u0304",
-    "\u01EE"=>"\u01B7\u030C",
-    "\u01EF"=>"\u0292\u030C",
-    "\u01F0"=>"j\u030C",
-    "\u01F4"=>"G\u0301",
-    "\u01F5"=>"g\u0301",
-    "\u01F8"=>"N\u0300",
-    "\u01F9"=>"n\u0300",
-    "\u01FA"=>"A\u030A\u0301",
-    "\u01FB"=>"a\u030A\u0301",
-    "\u01FC"=>"\u00C6\u0301",
-    "\u01FD"=>"\u00E6\u0301",
-    "\u01FE"=>"\u00D8\u0301",
-    "\u01FF"=>"\u00F8\u0301",
-    "\u0200"=>"A\u030F",
-    "\u0201"=>"a\u030F",
-    "\u0202"=>"A\u0311",
-    "\u0203"=>"a\u0311",
-    "\u0204"=>"E\u030F",
-    "\u0205"=>"e\u030F",
-    "\u0206"=>"E\u0311",
-    "\u0207"=>"e\u0311",
-    "\u0208"=>"I\u030F",
-    "\u0209"=>"i\u030F",
-    "\u020A"=>"I\u0311",
-    "\u020B"=>"i\u0311",
-    "\u020C"=>"O\u030F",
-    "\u020D"=>"o\u030F",
-    "\u020E"=>"O\u0311",
-    "\u020F"=>"o\u0311",
-    "\u0210"=>"R\u030F",
-    "\u0211"=>"r\u030F",
-    "\u0212"=>"R\u0311",
-    "\u0213"=>"r\u0311",
-    "\u0214"=>"U\u030F",
-    "\u0215"=>"u\u030F",
-    "\u0216"=>"U\u0311",
-    "\u0217"=>"u\u0311",
-    "\u0218"=>"S\u0326",
-    "\u0219"=>"s\u0326",
-    "\u021A"=>"T\u0326",
-    "\u021B"=>"t\u0326",
-    "\u021E"=>"H\u030C",
-    "\u021F"=>"h\u030C",
-    "\u0226"=>"A\u0307",
-    "\u0227"=>"a\u0307",
-    "\u0228"=>"E\u0327",
-    "\u0229"=>"e\u0327",
-    "\u022A"=>"O\u0308\u0304",
-    "\u022B"=>"o\u0308\u0304",
-    "\u022C"=>"O\u0303\u0304",
-    "\u022D"=>"o\u0303\u0304",
-    "\u022E"=>"O\u0307",
-    "\u022F"=>"o\u0307",
-    "\u0230"=>"O\u0307\u0304",
-    "\u0231"=>"o\u0307\u0304",
-    "\u0232"=>"Y\u0304",
-    "\u0233"=>"y\u0304",
-    "\u0340"=>"\u0300",
-    "\u0341"=>"\u0301",
-    "\u0343"=>"\u0313",
-    "\u0344"=>"\u0308\u0301",
-    "\u0374"=>"\u02B9",
-    "\u037E"=>";",
-    "\u0385"=>"\u00A8\u0301",
-    "\u0386"=>"\u0391\u0301",
-    "\u0387"=>"\u00B7",
-    "\u0388"=>"\u0395\u0301",
-    "\u0389"=>"\u0397\u0301",
-    "\u038A"=>"\u0399\u0301",
-    "\u038C"=>"\u039F\u0301",
-    "\u038E"=>"\u03A5\u0301",
-    "\u038F"=>"\u03A9\u0301",
-    "\u0390"=>"\u03B9\u0308\u0301",
-    "\u03AA"=>"\u0399\u0308",
-    "\u03AB"=>"\u03A5\u0308",
-    "\u03AC"=>"\u03B1\u0301",
-    "\u03AD"=>"\u03B5\u0301",
-    "\u03AE"=>"\u03B7\u0301",
-    "\u03AF"=>"\u03B9\u0301",
-    "\u03B0"=>"\u03C5\u0308\u0301",
-    "\u03CA"=>"\u03B9\u0308",
-    "\u03CB"=>"\u03C5\u0308",
-    "\u03CC"=>"\u03BF\u0301",
-    "\u03CD"=>"\u03C5\u0301",
-    "\u03CE"=>"\u03C9\u0301",
-    "\u03D3"=>"\u03D2\u0301",
-    "\u03D4"=>"\u03D2\u0308",
-    "\u0400"=>"\u0415\u0300",
-    "\u0401"=>"\u0415\u0308",
-    "\u0403"=>"\u0413\u0301",
-    "\u0407"=>"\u0406\u0308",
-    "\u040C"=>"\u041A\u0301",
-    "\u040D"=>"\u0418\u0300",
-    "\u040E"=>"\u0423\u0306",
-    "\u0419"=>"\u0418\u0306",
-    "\u0439"=>"\u0438\u0306",
-    "\u0450"=>"\u0435\u0300",
-    "\u0451"=>"\u0435\u0308",
-    "\u0453"=>"\u0433\u0301",
-    "\u0457"=>"\u0456\u0308",
-    "\u045C"=>"\u043A\u0301",
-    "\u045D"=>"\u0438\u0300",
-    "\u045E"=>"\u0443\u0306",
-    "\u0476"=>"\u0474\u030F",
-    "\u0477"=>"\u0475\u030F",
-    "\u04C1"=>"\u0416\u0306",
-    "\u04C2"=>"\u0436\u0306",
-    "\u04D0"=>"\u0410\u0306",
-    "\u04D1"=>"\u0430\u0306",
-    "\u04D2"=>"\u0410\u0308",
-    "\u04D3"=>"\u0430\u0308",
-    "\u04D6"=>"\u0415\u0306",
-    "\u04D7"=>"\u0435\u0306",
-    "\u04DA"=>"\u04D8\u0308",
-    "\u04DB"=>"\u04D9\u0308",
-    "\u04DC"=>"\u0416\u0308",
-    "\u04DD"=>"\u0436\u0308",
-    "\u04DE"=>"\u0417\u0308",
-    "\u04DF"=>"\u0437\u0308",
-    "\u04E2"=>"\u0418\u0304",
-    "\u04E3"=>"\u0438\u0304",
-    "\u04E4"=>"\u0418\u0308",
-    "\u04E5"=>"\u0438\u0308",
-    "\u04E6"=>"\u041E\u0308",
-    "\u04E7"=>"\u043E\u0308",
-    "\u04EA"=>"\u04E8\u0308",
-    "\u04EB"=>"\u04E9\u0308",
-    "\u04EC"=>"\u042D\u0308",
-    "\u04ED"=>"\u044D\u0308",
-    "\u04EE"=>"\u0423\u0304",
-    "\u04EF"=>"\u0443\u0304",
-    "\u04F0"=>"\u0423\u0308",
-    "\u04F1"=>"\u0443\u0308",
-    "\u04F2"=>"\u0423\u030B",
-    "\u04F3"=>"\u0443\u030B",
-    "\u04F4"=>"\u0427\u0308",
-    "\u04F5"=>"\u0447\u0308",
-    "\u04F8"=>"\u042B\u0308",
-    "\u04F9"=>"\u044B\u0308",
-    "\u0622"=>"\u0627\u0653",
-    "\u0623"=>"\u0627\u0654",
-    "\u0624"=>"\u0648\u0654",
-    "\u0625"=>"\u0627\u0655",
-    "\u0626"=>"\u064A\u0654",
-    "\u06C0"=>"\u06D5\u0654",
-    "\u06C2"=>"\u06C1\u0654",
-    "\u06D3"=>"\u06D2\u0654",
-    "\u0929"=>"\u0928\u093C",
-    "\u0931"=>"\u0930\u093C",
-    "\u0934"=>"\u0933\u093C",
-    "\u0958"=>"\u0915\u093C",
-    "\u0959"=>"\u0916\u093C",
-    "\u095A"=>"\u0917\u093C",
-    "\u095B"=>"\u091C\u093C",
-    "\u095C"=>"\u0921\u093C",
-    "\u095D"=>"\u0922\u093C",
-    "\u095E"=>"\u092B\u093C",
-    "\u095F"=>"\u092F\u093C",
-    "\u09CB"=>"\u09C7\u09BE",
-    "\u09CC"=>"\u09C7\u09D7",
-    "\u09DC"=>"\u09A1\u09BC",
-    "\u09DD"=>"\u09A2\u09BC",
-    "\u09DF"=>"\u09AF\u09BC",
-    "\u0A33"=>"\u0A32\u0A3C",
-    "\u0A36"=>"\u0A38\u0A3C",
-    "\u0A59"=>"\u0A16\u0A3C",
-    "\u0A5A"=>"\u0A17\u0A3C",
-    "\u0A5B"=>"\u0A1C\u0A3C",
-    "\u0A5E"=>"\u0A2B\u0A3C",
-    "\u0B48"=>"\u0B47\u0B56",
-    "\u0B4B"=>"\u0B47\u0B3E",
-    "\u0B4C"=>"\u0B47\u0B57",
-    "\u0B5C"=>"\u0B21\u0B3C",
-    "\u0B5D"=>"\u0B22\u0B3C",
-    "\u0B94"=>"\u0B92\u0BD7",
-    "\u0BCA"=>"\u0BC6\u0BBE",
-    "\u0BCB"=>"\u0BC7\u0BBE",
-    "\u0BCC"=>"\u0BC6\u0BD7",
-    "\u0C48"=>"\u0C46\u0C56",
-    "\u0CC0"=>"\u0CBF\u0CD5",
-    "\u0CC7"=>"\u0CC6\u0CD5",
-    "\u0CC8"=>"\u0CC6\u0CD6",
-    "\u0CCA"=>"\u0CC6\u0CC2",
-    "\u0CCB"=>"\u0CC6\u0CC2\u0CD5",
-    "\u0D4A"=>"\u0D46\u0D3E",
-    "\u0D4B"=>"\u0D47\u0D3E",
-    "\u0D4C"=>"\u0D46\u0D57",
-    "\u0DDA"=>"\u0DD9\u0DCA",
-    "\u0DDC"=>"\u0DD9\u0DCF",
-    "\u0DDD"=>"\u0DD9\u0DCF\u0DCA",
-    "\u0DDE"=>"\u0DD9\u0DDF",
-    "\u0F43"=>"\u0F42\u0FB7",
-    "\u0F4D"=>"\u0F4C\u0FB7",
-    "\u0F52"=>"\u0F51\u0FB7",
-    "\u0F57"=>"\u0F56\u0FB7",
-    "\u0F5C"=>"\u0F5B\u0FB7",
-    "\u0F69"=>"\u0F40\u0FB5",
-    "\u0F73"=>"\u0F71\u0F72",
-    "\u0F75"=>"\u0F71\u0F74",
-    "\u0F76"=>"\u0FB2\u0F80",
-    "\u0F78"=>"\u0FB3\u0F80",
-    "\u0F81"=>"\u0F71\u0F80",
-    "\u0F93"=>"\u0F92\u0FB7",
-    "\u0F9D"=>"\u0F9C\u0FB7",
-    "\u0FA2"=>"\u0FA1\u0FB7",
-    "\u0FA7"=>"\u0FA6\u0FB7",
-    "\u0FAC"=>"\u0FAB\u0FB7",
-    "\u0FB9"=>"\u0F90\u0FB5",
-    "\u1026"=>"\u1025\u102E",
-    "\u1B06"=>"\u1B05\u1B35",
-    "\u1B08"=>"\u1B07\u1B35",
-    "\u1B0A"=>"\u1B09\u1B35",
-    "\u1B0C"=>"\u1B0B\u1B35",
-    "\u1B0E"=>"\u1B0D\u1B35",
-    "\u1B12"=>"\u1B11\u1B35",
-    "\u1B3B"=>"\u1B3A\u1B35",
-    "\u1B3D"=>"\u1B3C\u1B35",
-    "\u1B40"=>"\u1B3E\u1B35",
-    "\u1B41"=>"\u1B3F\u1B35",
-    "\u1B43"=>"\u1B42\u1B35",
-    "\u1E00"=>"A\u0325",
-    "\u1E01"=>"a\u0325",
-    "\u1E02"=>"B\u0307",
-    "\u1E03"=>"b\u0307",
-    "\u1E04"=>"B\u0323",
-    "\u1E05"=>"b\u0323",
-    "\u1E06"=>"B\u0331",
-    "\u1E07"=>"b\u0331",
-    "\u1E08"=>"C\u0327\u0301",
-    "\u1E09"=>"c\u0327\u0301",
-    "\u1E0A"=>"D\u0307",
-    "\u1E0B"=>"d\u0307",
-    "\u1E0C"=>"D\u0323",
-    "\u1E0D"=>"d\u0323",
-    "\u1E0E"=>"D\u0331",
-    "\u1E0F"=>"d\u0331",
-    "\u1E10"=>"D\u0327",
-    "\u1E11"=>"d\u0327",
-    "\u1E12"=>"D\u032D",
-    "\u1E13"=>"d\u032D",
-    "\u1E14"=>"E\u0304\u0300",
-    "\u1E15"=>"e\u0304\u0300",
-    "\u1E16"=>"E\u0304\u0301",
-    "\u1E17"=>"e\u0304\u0301",
-    "\u1E18"=>"E\u032D",
-    "\u1E19"=>"e\u032D",
-    "\u1E1A"=>"E\u0330",
-    "\u1E1B"=>"e\u0330",
-    "\u1E1C"=>"E\u0327\u0306",
-    "\u1E1D"=>"e\u0327\u0306",
-    "\u1E1E"=>"F\u0307",
-    "\u1E1F"=>"f\u0307",
-    "\u1E20"=>"G\u0304",
-    "\u1E21"=>"g\u0304",
-    "\u1E22"=>"H\u0307",
-    "\u1E23"=>"h\u0307",
-    "\u1E24"=>"H\u0323",
-    "\u1E25"=>"h\u0323",
-    "\u1E26"=>"H\u0308",
-    "\u1E27"=>"h\u0308",
-    "\u1E28"=>"H\u0327",
-    "\u1E29"=>"h\u0327",
-    "\u1E2A"=>"H\u032E",
-    "\u1E2B"=>"h\u032E",
-    "\u1E2C"=>"I\u0330",
-    "\u1E2D"=>"i\u0330",
-    "\u1E2E"=>"I\u0308\u0301",
-    "\u1E2F"=>"i\u0308\u0301",
-    "\u1E30"=>"K\u0301",
-    "\u1E31"=>"k\u0301",
-    "\u1E32"=>"K\u0323",
-    "\u1E33"=>"k\u0323",
-    "\u1E34"=>"K\u0331",
-    "\u1E35"=>"k\u0331",
-    "\u1E36"=>"L\u0323",
-    "\u1E37"=>"l\u0323",
-    "\u1E38"=>"L\u0323\u0304",
-    "\u1E39"=>"l\u0323\u0304",
-    "\u1E3A"=>"L\u0331",
-    "\u1E3B"=>"l\u0331",
-    "\u1E3C"=>"L\u032D",
-    "\u1E3D"=>"l\u032D",
-    "\u1E3E"=>"M\u0301",
-    "\u1E3F"=>"m\u0301",
-    "\u1E40"=>"M\u0307",
-    "\u1E41"=>"m\u0307",
-    "\u1E42"=>"M\u0323",
-    "\u1E43"=>"m\u0323",
-    "\u1E44"=>"N\u0307",
-    "\u1E45"=>"n\u0307",
-    "\u1E46"=>"N\u0323",
-    "\u1E47"=>"n\u0323",
-    "\u1E48"=>"N\u0331",
-    "\u1E49"=>"n\u0331",
-    "\u1E4A"=>"N\u032D",
-    "\u1E4B"=>"n\u032D",
-    "\u1E4C"=>"O\u0303\u0301",
-    "\u1E4D"=>"o\u0303\u0301",
-    "\u1E4E"=>"O\u0303\u0308",
-    "\u1E4F"=>"o\u0303\u0308",
-    "\u1E50"=>"O\u0304\u0300",
-    "\u1E51"=>"o\u0304\u0300",
-    "\u1E52"=>"O\u0304\u0301",
-    "\u1E53"=>"o\u0304\u0301",
-    "\u1E54"=>"P\u0301",
-    "\u1E55"=>"p\u0301",
-    "\u1E56"=>"P\u0307",
-    "\u1E57"=>"p\u0307",
-    "\u1E58"=>"R\u0307",
-    "\u1E59"=>"r\u0307",
-    "\u1E5A"=>"R\u0323",
-    "\u1E5B"=>"r\u0323",
-    "\u1E5C"=>"R\u0323\u0304",
-    "\u1E5D"=>"r\u0323\u0304",
-    "\u1E5E"=>"R\u0331",
-    "\u1E5F"=>"r\u0331",
-    "\u1E60"=>"S\u0307",
-    "\u1E61"=>"s\u0307",
-    "\u1E62"=>"S\u0323",
-    "\u1E63"=>"s\u0323",
-    "\u1E64"=>"S\u0301\u0307",
-    "\u1E65"=>"s\u0301\u0307",
-    "\u1E66"=>"S\u030C\u0307",
-    "\u1E67"=>"s\u030C\u0307",
-    "\u1E68"=>"S\u0323\u0307",
-    "\u1E69"=>"s\u0323\u0307",
-    "\u1E6A"=>"T\u0307",
-    "\u1E6B"=>"t\u0307",
-    "\u1E6C"=>"T\u0323",
-    "\u1E6D"=>"t\u0323",
-    "\u1E6E"=>"T\u0331",
-    "\u1E6F"=>"t\u0331",
-    "\u1E70"=>"T\u032D",
-    "\u1E71"=>"t\u032D",
-    "\u1E72"=>"U\u0324",
-    "\u1E73"=>"u\u0324",
-    "\u1E74"=>"U\u0330",
-    "\u1E75"=>"u\u0330",
-    "\u1E76"=>"U\u032D",
-    "\u1E77"=>"u\u032D",
-    "\u1E78"=>"U\u0303\u0301",
-    "\u1E79"=>"u\u0303\u0301",
-    "\u1E7A"=>"U\u0304\u0308",
-    "\u1E7B"=>"u\u0304\u0308",
-    "\u1E7C"=>"V\u0303",
-    "\u1E7D"=>"v\u0303",
-    "\u1E7E"=>"V\u0323",
-    "\u1E7F"=>"v\u0323",
-    "\u1E80"=>"W\u0300",
-    "\u1E81"=>"w\u0300",
-    "\u1E82"=>"W\u0301",
-    "\u1E83"=>"w\u0301",
-    "\u1E84"=>"W\u0308",
-    "\u1E85"=>"w\u0308",
-    "\u1E86"=>"W\u0307",
-    "\u1E87"=>"w\u0307",
-    "\u1E88"=>"W\u0323",
-    "\u1E89"=>"w\u0323",
-    "\u1E8A"=>"X\u0307",
-    "\u1E8B"=>"x\u0307",
-    "\u1E8C"=>"X\u0308",
-    "\u1E8D"=>"x\u0308",
-    "\u1E8E"=>"Y\u0307",
-    "\u1E8F"=>"y\u0307",
-    "\u1E90"=>"Z\u0302",
-    "\u1E91"=>"z\u0302",
-    "\u1E92"=>"Z\u0323",
-    "\u1E93"=>"z\u0323",
-    "\u1E94"=>"Z\u0331",
-    "\u1E95"=>"z\u0331",
-    "\u1E96"=>"h\u0331",
-    "\u1E97"=>"t\u0308",
-    "\u1E98"=>"w\u030A",
-    "\u1E99"=>"y\u030A",
-    "\u1E9B"=>"\u017F\u0307",
-    "\u1EA0"=>"A\u0323",
-    "\u1EA1"=>"a\u0323",
-    "\u1EA2"=>"A\u0309",
-    "\u1EA3"=>"a\u0309",
-    "\u1EA4"=>"A\u0302\u0301",
-    "\u1EA5"=>"a\u0302\u0301",
-    "\u1EA6"=>"A\u0302\u0300",
-    "\u1EA7"=>"a\u0302\u0300",
-    "\u1EA8"=>"A\u0302\u0309",
-    "\u1EA9"=>"a\u0302\u0309",
-    "\u1EAA"=>"A\u0302\u0303",
-    "\u1EAB"=>"a\u0302\u0303",
-    "\u1EAC"=>"A\u0323\u0302",
-    "\u1EAD"=>"a\u0323\u0302",
-    "\u1EAE"=>"A\u0306\u0301",
-    "\u1EAF"=>"a\u0306\u0301",
-    "\u1EB0"=>"A\u0306\u0300",
-    "\u1EB1"=>"a\u0306\u0300",
-    "\u1EB2"=>"A\u0306\u0309",
-    "\u1EB3"=>"a\u0306\u0309",
-    "\u1EB4"=>"A\u0306\u0303",
-    "\u1EB5"=>"a\u0306\u0303",
-    "\u1EB6"=>"A\u0323\u0306",
-    "\u1EB7"=>"a\u0323\u0306",
-    "\u1EB8"=>"E\u0323",
-    "\u1EB9"=>"e\u0323",
-    "\u1EBA"=>"E\u0309",
-    "\u1EBB"=>"e\u0309",
-    "\u1EBC"=>"E\u0303",
-    "\u1EBD"=>"e\u0303",
-    "\u1EBE"=>"E\u0302\u0301",
-    "\u1EBF"=>"e\u0302\u0301",
-    "\u1EC0"=>"E\u0302\u0300",
-    "\u1EC1"=>"e\u0302\u0300",
-    "\u1EC2"=>"E\u0302\u0309",
-    "\u1EC3"=>"e\u0302\u0309",
-    "\u1EC4"=>"E\u0302\u0303",
-    "\u1EC5"=>"e\u0302\u0303",
-    "\u1EC6"=>"E\u0323\u0302",
-    "\u1EC7"=>"e\u0323\u0302",
-    "\u1EC8"=>"I\u0309",
-    "\u1EC9"=>"i\u0309",
-    "\u1ECA"=>"I\u0323",
-    "\u1ECB"=>"i\u0323",
-    "\u1ECC"=>"O\u0323",
-    "\u1ECD"=>"o\u0323",
-    "\u1ECE"=>"O\u0309",
-    "\u1ECF"=>"o\u0309",
-    "\u1ED0"=>"O\u0302\u0301",
-    "\u1ED1"=>"o\u0302\u0301",
-    "\u1ED2"=>"O\u0302\u0300",
-    "\u1ED3"=>"o\u0302\u0300",
-    "\u1ED4"=>"O\u0302\u0309",
-    "\u1ED5"=>"o\u0302\u0309",
-    "\u1ED6"=>"O\u0302\u0303",
-    "\u1ED7"=>"o\u0302\u0303",
-    "\u1ED8"=>"O\u0323\u0302",
-    "\u1ED9"=>"o\u0323\u0302",
-    "\u1EDA"=>"O\u031B\u0301",
-    "\u1EDB"=>"o\u031B\u0301",
-    "\u1EDC"=>"O\u031B\u0300",
-    "\u1EDD"=>"o\u031B\u0300",
-    "\u1EDE"=>"O\u031B\u0309",
-    "\u1EDF"=>"o\u031B\u0309",
-    "\u1EE0"=>"O\u031B\u0303",
-    "\u1EE1"=>"o\u031B\u0303",
-    "\u1EE2"=>"O\u031B\u0323",
-    "\u1EE3"=>"o\u031B\u0323",
-    "\u1EE4"=>"U\u0323",
-    "\u1EE5"=>"u\u0323",
-    "\u1EE6"=>"U\u0309",
-    "\u1EE7"=>"u\u0309",
-    "\u1EE8"=>"U\u031B\u0301",
-    "\u1EE9"=>"u\u031B\u0301",
-    "\u1EEA"=>"U\u031B\u0300",
-    "\u1EEB"=>"u\u031B\u0300",
-    "\u1EEC"=>"U\u031B\u0309",
-    "\u1EED"=>"u\u031B\u0309",
-    "\u1EEE"=>"U\u031B\u0303",
-    "\u1EEF"=>"u\u031B\u0303",
-    "\u1EF0"=>"U\u031B\u0323",
-    "\u1EF1"=>"u\u031B\u0323",
-    "\u1EF2"=>"Y\u0300",
-    "\u1EF3"=>"y\u0300",
-    "\u1EF4"=>"Y\u0323",
-    "\u1EF5"=>"y\u0323",
-    "\u1EF6"=>"Y\u0309",
-    "\u1EF7"=>"y\u0309",
-    "\u1EF8"=>"Y\u0303",
-    "\u1EF9"=>"y\u0303",
-    "\u1F00"=>"\u03B1\u0313",
-    "\u1F01"=>"\u03B1\u0314",
-    "\u1F02"=>"\u03B1\u0313\u0300",
-    "\u1F03"=>"\u03B1\u0314\u0300",
-    "\u1F04"=>"\u03B1\u0313\u0301",
-    "\u1F05"=>"\u03B1\u0314\u0301",
-    "\u1F06"=>"\u03B1\u0313\u0342",
-    "\u1F07"=>"\u03B1\u0314\u0342",
-    "\u1F08"=>"\u0391\u0313",
-    "\u1F09"=>"\u0391\u0314",
-    "\u1F0A"=>"\u0391\u0313\u0300",
-    "\u1F0B"=>"\u0391\u0314\u0300",
-    "\u1F0C"=>"\u0391\u0313\u0301",
-    "\u1F0D"=>"\u0391\u0314\u0301",
-    "\u1F0E"=>"\u0391\u0313\u0342",
-    "\u1F0F"=>"\u0391\u0314\u0342",
-    "\u1F10"=>"\u03B5\u0313",
-    "\u1F11"=>"\u03B5\u0314",
-    "\u1F12"=>"\u03B5\u0313\u0300",
-    "\u1F13"=>"\u03B5\u0314\u0300",
-    "\u1F14"=>"\u03B5\u0313\u0301",
-    "\u1F15"=>"\u03B5\u0314\u0301",
-    "\u1F18"=>"\u0395\u0313",
-    "\u1F19"=>"\u0395\u0314",
-    "\u1F1A"=>"\u0395\u0313\u0300",
-    "\u1F1B"=>"\u0395\u0314\u0300",
-    "\u1F1C"=>"\u0395\u0313\u0301",
-    "\u1F1D"=>"\u0395\u0314\u0301",
-    "\u1F20"=>"\u03B7\u0313",
-    "\u1F21"=>"\u03B7\u0314",
-    "\u1F22"=>"\u03B7\u0313\u0300",
-    "\u1F23"=>"\u03B7\u0314\u0300",
-    "\u1F24"=>"\u03B7\u0313\u0301",
-    "\u1F25"=>"\u03B7\u0314\u0301",
-    "\u1F26"=>"\u03B7\u0313\u0342",
-    "\u1F27"=>"\u03B7\u0314\u0342",
-    "\u1F28"=>"\u0397\u0313",
-    "\u1F29"=>"\u0397\u0314",
-    "\u1F2A"=>"\u0397\u0313\u0300",
-    "\u1F2B"=>"\u0397\u0314\u0300",
-    "\u1F2C"=>"\u0397\u0313\u0301",
-    "\u1F2D"=>"\u0397\u0314\u0301",
-    "\u1F2E"=>"\u0397\u0313\u0342",
-    "\u1F2F"=>"\u0397\u0314\u0342",
-    "\u1F30"=>"\u03B9\u0313",
-    "\u1F31"=>"\u03B9\u0314",
-    "\u1F32"=>"\u03B9\u0313\u0300",
-    "\u1F33"=>"\u03B9\u0314\u0300",
-    "\u1F34"=>"\u03B9\u0313\u0301",
-    "\u1F35"=>"\u03B9\u0314\u0301",
-    "\u1F36"=>"\u03B9\u0313\u0342",
-    "\u1F37"=>"\u03B9\u0314\u0342",
-    "\u1F38"=>"\u0399\u0313",
-    "\u1F39"=>"\u0399\u0314",
-    "\u1F3A"=>"\u0399\u0313\u0300",
-    "\u1F3B"=>"\u0399\u0314\u0300",
-    "\u1F3C"=>"\u0399\u0313\u0301",
-    "\u1F3D"=>"\u0399\u0314\u0301",
-    "\u1F3E"=>"\u0399\u0313\u0342",
-    "\u1F3F"=>"\u0399\u0314\u0342",
-    "\u1F40"=>"\u03BF\u0313",
-    "\u1F41"=>"\u03BF\u0314",
-    "\u1F42"=>"\u03BF\u0313\u0300",
-    "\u1F43"=>"\u03BF\u0314\u0300",
-    "\u1F44"=>"\u03BF\u0313\u0301",
-    "\u1F45"=>"\u03BF\u0314\u0301",
-    "\u1F48"=>"\u039F\u0313",
-    "\u1F49"=>"\u039F\u0314",
-    "\u1F4A"=>"\u039F\u0313\u0300",
-    "\u1F4B"=>"\u039F\u0314\u0300",
-    "\u1F4C"=>"\u039F\u0313\u0301",
-    "\u1F4D"=>"\u039F\u0314\u0301",
-    "\u1F50"=>"\u03C5\u0313",
-    "\u1F51"=>"\u03C5\u0314",
-    "\u1F52"=>"\u03C5\u0313\u0300",
-    "\u1F53"=>"\u03C5\u0314\u0300",
-    "\u1F54"=>"\u03C5\u0313\u0301",
-    "\u1F55"=>"\u03C5\u0314\u0301",
-    "\u1F56"=>"\u03C5\u0313\u0342",
-    "\u1F57"=>"\u03C5\u0314\u0342",
-    "\u1F59"=>"\u03A5\u0314",
-    "\u1F5B"=>"\u03A5\u0314\u0300",
-    "\u1F5D"=>"\u03A5\u0314\u0301",
-    "\u1F5F"=>"\u03A5\u0314\u0342",
-    "\u1F60"=>"\u03C9\u0313",
-    "\u1F61"=>"\u03C9\u0314",
-    "\u1F62"=>"\u03C9\u0313\u0300",
-    "\u1F63"=>"\u03C9\u0314\u0300",
-    "\u1F64"=>"\u03C9\u0313\u0301",
-    "\u1F65"=>"\u03C9\u0314\u0301",
-    "\u1F66"=>"\u03C9\u0313\u0342",
-    "\u1F67"=>"\u03C9\u0314\u0342",
-    "\u1F68"=>"\u03A9\u0313",
-    "\u1F69"=>"\u03A9\u0314",
-    "\u1F6A"=>"\u03A9\u0313\u0300",
-    "\u1F6B"=>"\u03A9\u0314\u0300",
-    "\u1F6C"=>"\u03A9\u0313\u0301",
-    "\u1F6D"=>"\u03A9\u0314\u0301",
-    "\u1F6E"=>"\u03A9\u0313\u0342",
-    "\u1F6F"=>"\u03A9\u0314\u0342",
-    "\u1F70"=>"\u03B1\u0300",
-    "\u1F71"=>"\u03B1\u0301",
-    "\u1F72"=>"\u03B5\u0300",
-    "\u1F73"=>"\u03B5\u0301",
-    "\u1F74"=>"\u03B7\u0300",
-    "\u1F75"=>"\u03B7\u0301",
-    "\u1F76"=>"\u03B9\u0300",
-    "\u1F77"=>"\u03B9\u0301",
-    "\u1F78"=>"\u03BF\u0300",
-    "\u1F79"=>"\u03BF\u0301",
-    "\u1F7A"=>"\u03C5\u0300",
-    "\u1F7B"=>"\u03C5\u0301",
-    "\u1F7C"=>"\u03C9\u0300",
-    "\u1F7D"=>"\u03C9\u0301",
-    "\u1F80"=>"\u03B1\u0313\u0345",
-    "\u1F81"=>"\u03B1\u0314\u0345",
-    "\u1F82"=>"\u03B1\u0313\u0300\u0345",
-    "\u1F83"=>"\u03B1\u0314\u0300\u0345",
-    "\u1F84"=>"\u03B1\u0313\u0301\u0345",
-    "\u1F85"=>"\u03B1\u0314\u0301\u0345",
-    "\u1F86"=>"\u03B1\u0313\u0342\u0345",
-    "\u1F87"=>"\u03B1\u0314\u0342\u0345",
-    "\u1F88"=>"\u0391\u0313\u0345",
-    "\u1F89"=>"\u0391\u0314\u0345",
-    "\u1F8A"=>"\u0391\u0313\u0300\u0345",
-    "\u1F8B"=>"\u0391\u0314\u0300\u0345",
-    "\u1F8C"=>"\u0391\u0313\u0301\u0345",
-    "\u1F8D"=>"\u0391\u0314\u0301\u0345",
-    "\u1F8E"=>"\u0391\u0313\u0342\u0345",
-    "\u1F8F"=>"\u0391\u0314\u0342\u0345",
-    "\u1F90"=>"\u03B7\u0313\u0345",
-    "\u1F91"=>"\u03B7\u0314\u0345",
-    "\u1F92"=>"\u03B7\u0313\u0300\u0345",
-    "\u1F93"=>"\u03B7\u0314\u0300\u0345",
-    "\u1F94"=>"\u03B7\u0313\u0301\u0345",
-    "\u1F95"=>"\u03B7\u0314\u0301\u0345",
-    "\u1F96"=>"\u03B7\u0313\u0342\u0345",
-    "\u1F97"=>"\u03B7\u0314\u0342\u0345",
-    "\u1F98"=>"\u0397\u0313\u0345",
-    "\u1F99"=>"\u0397\u0314\u0345",
-    "\u1F9A"=>"\u0397\u0313\u0300\u0345",
-    "\u1F9B"=>"\u0397\u0314\u0300\u0345",
-    "\u1F9C"=>"\u0397\u0313\u0301\u0345",
-    "\u1F9D"=>"\u0397\u0314\u0301\u0345",
-    "\u1F9E"=>"\u0397\u0313\u0342\u0345",
-    "\u1F9F"=>"\u0397\u0314\u0342\u0345",
-    "\u1FA0"=>"\u03C9\u0313\u0345",
-    "\u1FA1"=>"\u03C9\u0314\u0345",
-    "\u1FA2"=>"\u03C9\u0313\u0300\u0345",
-    "\u1FA3"=>"\u03C9\u0314\u0300\u0345",
-    "\u1FA4"=>"\u03C9\u0313\u0301\u0345",
-    "\u1FA5"=>"\u03C9\u0314\u0301\u0345",
-    "\u1FA6"=>"\u03C9\u0313\u0342\u0345",
-    "\u1FA7"=>"\u03C9\u0314\u0342\u0345",
-    "\u1FA8"=>"\u03A9\u0313\u0345",
-    "\u1FA9"=>"\u03A9\u0314\u0345",
-    "\u1FAA"=>"\u03A9\u0313\u0300\u0345",
-    "\u1FAB"=>"\u03A9\u0314\u0300\u0345",
-    "\u1FAC"=>"\u03A9\u0313\u0301\u0345",
-    "\u1FAD"=>"\u03A9\u0314\u0301\u0345",
-    "\u1FAE"=>"\u03A9\u0313\u0342\u0345",
-    "\u1FAF"=>"\u03A9\u0314\u0342\u0345",
-    "\u1FB0"=>"\u03B1\u0306",
-    "\u1FB1"=>"\u03B1\u0304",
-    "\u1FB2"=>"\u03B1\u0300\u0345",
-    "\u1FB3"=>"\u03B1\u0345",
-    "\u1FB4"=>"\u03B1\u0301\u0345",
-    "\u1FB6"=>"\u03B1\u0342",
-    "\u1FB7"=>"\u03B1\u0342\u0345",
-    "\u1FB8"=>"\u0391\u0306",
-    "\u1FB9"=>"\u0391\u0304",
-    "\u1FBA"=>"\u0391\u0300",
-    "\u1FBB"=>"\u0391\u0301",
-    "\u1FBC"=>"\u0391\u0345",
-    "\u1FBE"=>"\u03B9",
-    "\u1FC1"=>"\u00A8\u0342",
-    "\u1FC2"=>"\u03B7\u0300\u0345",
-    "\u1FC3"=>"\u03B7\u0345",
-    "\u1FC4"=>"\u03B7\u0301\u0345",
-    "\u1FC6"=>"\u03B7\u0342",
-    "\u1FC7"=>"\u03B7\u0342\u0345",
-    "\u1FC8"=>"\u0395\u0300",
-    "\u1FC9"=>"\u0395\u0301",
-    "\u1FCA"=>"\u0397\u0300",
-    "\u1FCB"=>"\u0397\u0301",
-    "\u1FCC"=>"\u0397\u0345",
-    "\u1FCD"=>"\u1FBF\u0300",
-    "\u1FCE"=>"\u1FBF\u0301",
-    "\u1FCF"=>"\u1FBF\u0342",
-    "\u1FD0"=>"\u03B9\u0306",
-    "\u1FD1"=>"\u03B9\u0304",
-    "\u1FD2"=>"\u03B9\u0308\u0300",
-    "\u1FD3"=>"\u03B9\u0308\u0301",
-    "\u1FD6"=>"\u03B9\u0342",
-    "\u1FD7"=>"\u03B9\u0308\u0342",
-    "\u1FD8"=>"\u0399\u0306",
-    "\u1FD9"=>"\u0399\u0304",
-    "\u1FDA"=>"\u0399\u0300",
-    "\u1FDB"=>"\u0399\u0301",
-    "\u1FDD"=>"\u1FFE\u0300",
-    "\u1FDE"=>"\u1FFE\u0301",
-    "\u1FDF"=>"\u1FFE\u0342",
-    "\u1FE0"=>"\u03C5\u0306",
-    "\u1FE1"=>"\u03C5\u0304",
-    "\u1FE2"=>"\u03C5\u0308\u0300",
-    "\u1FE3"=>"\u03C5\u0308\u0301",
-    "\u1FE4"=>"\u03C1\u0313",
-    "\u1FE5"=>"\u03C1\u0314",
-    "\u1FE6"=>"\u03C5\u0342",
-    "\u1FE7"=>"\u03C5\u0308\u0342",
-    "\u1FE8"=>"\u03A5\u0306",
-    "\u1FE9"=>"\u03A5\u0304",
-    "\u1FEA"=>"\u03A5\u0300",
-    "\u1FEB"=>"\u03A5\u0301",
-    "\u1FEC"=>"\u03A1\u0314",
-    "\u1FED"=>"\u00A8\u0300",
-    "\u1FEE"=>"\u00A8\u0301",
-    "\u1FEF"=>"`",
-    "\u1FF2"=>"\u03C9\u0300\u0345",
-    "\u1FF3"=>"\u03C9\u0345",
-    "\u1FF4"=>"\u03C9\u0301\u0345",
-    "\u1FF6"=>"\u03C9\u0342",
-    "\u1FF7"=>"\u03C9\u0342\u0345",
-    "\u1FF8"=>"\u039F\u0300",
-    "\u1FF9"=>"\u039F\u0301",
-    "\u1FFA"=>"\u03A9\u0300",
-    "\u1FFB"=>"\u03A9\u0301",
-    "\u1FFC"=>"\u03A9\u0345",
-    "\u1FFD"=>"\u00B4",
-    "\u2000"=>"\u2002",
-    "\u2001"=>"\u2003",
-    "\u2126"=>"\u03A9",
-    "\u212A"=>"K",
-    "\u212B"=>"A\u030A",
-    "\u219A"=>"\u2190\u0338",
-    "\u219B"=>"\u2192\u0338",
-    "\u21AE"=>"\u2194\u0338",
-    "\u21CD"=>"\u21D0\u0338",
-    "\u21CE"=>"\u21D4\u0338",
-    "\u21CF"=>"\u21D2\u0338",
-    "\u2204"=>"\u2203\u0338",
-    "\u2209"=>"\u2208\u0338",
-    "\u220C"=>"\u220B\u0338",
-    "\u2224"=>"\u2223\u0338",
-    "\u2226"=>"\u2225\u0338",
-    "\u2241"=>"\u223C\u0338",
-    "\u2244"=>"\u2243\u0338",
-    "\u2247"=>"\u2245\u0338",
-    "\u2249"=>"\u2248\u0338",
-    "\u2260"=>"=\u0338",
-    "\u2262"=>"\u2261\u0338",
-    "\u226D"=>"\u224D\u0338",
-    "\u226E"=>"<\u0338",
-    "\u226F"=>">\u0338",
-    "\u2270"=>"\u2264\u0338",
-    "\u2271"=>"\u2265\u0338",
-    "\u2274"=>"\u2272\u0338",
-    "\u2275"=>"\u2273\u0338",
-    "\u2278"=>"\u2276\u0338",
-    "\u2279"=>"\u2277\u0338",
-    "\u2280"=>"\u227A\u0338",
-    "\u2281"=>"\u227B\u0338",
-    "\u2284"=>"\u2282\u0338",
-    "\u2285"=>"\u2283\u0338",
-    "\u2288"=>"\u2286\u0338",
-    "\u2289"=>"\u2287\u0338",
-    "\u22AC"=>"\u22A2\u0338",
-    "\u22AD"=>"\u22A8\u0338",
-    "\u22AE"=>"\u22A9\u0338",
-    "\u22AF"=>"\u22AB\u0338",
-    "\u22E0"=>"\u227C\u0338",
-    "\u22E1"=>"\u227D\u0338",
-    "\u22E2"=>"\u2291\u0338",
-    "\u22E3"=>"\u2292\u0338",
-    "\u22EA"=>"\u22B2\u0338",
-    "\u22EB"=>"\u22B3\u0338",
-    "\u22EC"=>"\u22B4\u0338",
-    "\u22ED"=>"\u22B5\u0338",
-    "\u2329"=>"\u3008",
-    "\u232A"=>"\u3009",
-    "\u2ADC"=>"\u2ADD\u0338",
-    "\u304C"=>"\u304B\u3099",
-    "\u304E"=>"\u304D\u3099",
-    "\u3050"=>"\u304F\u3099",
-    "\u3052"=>"\u3051\u3099",
-    "\u3054"=>"\u3053\u3099",
-    "\u3056"=>"\u3055\u3099",
-    "\u3058"=>"\u3057\u3099",
-    "\u305A"=>"\u3059\u3099",
-    "\u305C"=>"\u305B\u3099",
-    "\u305E"=>"\u305D\u3099",
-    "\u3060"=>"\u305F\u3099",
-    "\u3062"=>"\u3061\u3099",
-    "\u3065"=>"\u3064\u3099",
-    "\u3067"=>"\u3066\u3099",
-    "\u3069"=>"\u3068\u3099",
-    "\u3070"=>"\u306F\u3099",
-    "\u3071"=>"\u306F\u309A",
-    "\u3073"=>"\u3072\u3099",
-    "\u3074"=>"\u3072\u309A",
-    "\u3076"=>"\u3075\u3099",
-    "\u3077"=>"\u3075\u309A",
-    "\u3079"=>"\u3078\u3099",
-    "\u307A"=>"\u3078\u309A",
-    "\u307C"=>"\u307B\u3099",
-    "\u307D"=>"\u307B\u309A",
-    "\u3094"=>"\u3046\u3099",
-    "\u309E"=>"\u309D\u3099",
-    "\u30AC"=>"\u30AB\u3099",
-    "\u30AE"=>"\u30AD\u3099",
-    "\u30B0"=>"\u30AF\u3099",
-    "\u30B2"=>"\u30B1\u3099",
-    "\u30B4"=>"\u30B3\u3099",
-    "\u30B6"=>"\u30B5\u3099",
-    "\u30B8"=>"\u30B7\u3099",
-    "\u30BA"=>"\u30B9\u3099",
-    "\u30BC"=>"\u30BB\u3099",
-    "\u30BE"=>"\u30BD\u3099",
-    "\u30C0"=>"\u30BF\u3099",
-    "\u30C2"=>"\u30C1\u3099",
-    "\u30C5"=>"\u30C4\u3099",
-    "\u30C7"=>"\u30C6\u3099",
-    "\u30C9"=>"\u30C8\u3099",
-    "\u30D0"=>"\u30CF\u3099",
-    "\u30D1"=>"\u30CF\u309A",
-    "\u30D3"=>"\u30D2\u3099",
-    "\u30D4"=>"\u30D2\u309A",
-    "\u30D6"=>"\u30D5\u3099",
-    "\u30D7"=>"\u30D5\u309A",
-    "\u30D9"=>"\u30D8\u3099",
-    "\u30DA"=>"\u30D8\u309A",
-    "\u30DC"=>"\u30DB\u3099",
-    "\u30DD"=>"\u30DB\u309A",
-    "\u30F4"=>"\u30A6\u3099",
-    "\u30F7"=>"\u30EF\u3099",
-    "\u30F8"=>"\u30F0\u3099",
-    "\u30F9"=>"\u30F1\u3099",
-    "\u30FA"=>"\u30F2\u3099",
-    "\u30FE"=>"\u30FD\u3099",
-    "\uF900"=>"\u8C48",
-    "\uF901"=>"\u66F4",
-    "\uF902"=>"\u8ECA",
-    "\uF903"=>"\u8CC8",
-    "\uF904"=>"\u6ED1",
-    "\uF905"=>"\u4E32",
-    "\uF906"=>"\u53E5",
-    "\uF907"=>"\u9F9C",
-    "\uF908"=>"\u9F9C",
-    "\uF909"=>"\u5951",
-    "\uF90A"=>"\u91D1",
-    "\uF90B"=>"\u5587",
-    "\uF90C"=>"\u5948",
-    "\uF90D"=>"\u61F6",
-    "\uF90E"=>"\u7669",
-    "\uF90F"=>"\u7F85",
-    "\uF910"=>"\u863F",
-    "\uF911"=>"\u87BA",
-    "\uF912"=>"\u88F8",
-    "\uF913"=>"\u908F",
-    "\uF914"=>"\u6A02",
-    "\uF915"=>"\u6D1B",
-    "\uF916"=>"\u70D9",
-    "\uF917"=>"\u73DE",
-    "\uF918"=>"\u843D",
-    "\uF919"=>"\u916A",
-    "\uF91A"=>"\u99F1",
-    "\uF91B"=>"\u4E82",
-    "\uF91C"=>"\u5375",
-    "\uF91D"=>"\u6B04",
-    "\uF91E"=>"\u721B",
-    "\uF91F"=>"\u862D",
-    "\uF920"=>"\u9E1E",
-    "\uF921"=>"\u5D50",
-    "\uF922"=>"\u6FEB",
-    "\uF923"=>"\u85CD",
-    "\uF924"=>"\u8964",
-    "\uF925"=>"\u62C9",
-    "\uF926"=>"\u81D8",
-    "\uF927"=>"\u881F",
-    "\uF928"=>"\u5ECA",
-    "\uF929"=>"\u6717",
-    "\uF92A"=>"\u6D6A",
-    "\uF92B"=>"\u72FC",
-    "\uF92C"=>"\u90CE",
-    "\uF92D"=>"\u4F86",
-    "\uF92E"=>"\u51B7",
-    "\uF92F"=>"\u52DE",
-    "\uF930"=>"\u64C4",
-    "\uF931"=>"\u6AD3",
-    "\uF932"=>"\u7210",
-    "\uF933"=>"\u76E7",
-    "\uF934"=>"\u8001",
-    "\uF935"=>"\u8606",
-    "\uF936"=>"\u865C",
-    "\uF937"=>"\u8DEF",
-    "\uF938"=>"\u9732",
-    "\uF939"=>"\u9B6F",
-    "\uF93A"=>"\u9DFA",
-    "\uF93B"=>"\u788C",
-    "\uF93C"=>"\u797F",
-    "\uF93D"=>"\u7DA0",
-    "\uF93E"=>"\u83C9",
-    "\uF93F"=>"\u9304",
-    "\uF940"=>"\u9E7F",
-    "\uF941"=>"\u8AD6",
-    "\uF942"=>"\u58DF",
-    "\uF943"=>"\u5F04",
-    "\uF944"=>"\u7C60",
-    "\uF945"=>"\u807E",
-    "\uF946"=>"\u7262",
-    "\uF947"=>"\u78CA",
-    "\uF948"=>"\u8CC2",
-    "\uF949"=>"\u96F7",
-    "\uF94A"=>"\u58D8",
-    "\uF94B"=>"\u5C62",
-    "\uF94C"=>"\u6A13",
-    "\uF94D"=>"\u6DDA",
-    "\uF94E"=>"\u6F0F",
-    "\uF94F"=>"\u7D2F",
-    "\uF950"=>"\u7E37",
-    "\uF951"=>"\u964B",
-    "\uF952"=>"\u52D2",
-    "\uF953"=>"\u808B",
-    "\uF954"=>"\u51DC",
-    "\uF955"=>"\u51CC",
-    "\uF956"=>"\u7A1C",
-    "\uF957"=>"\u7DBE",
-    "\uF958"=>"\u83F1",
-    "\uF959"=>"\u9675",
-    "\uF95A"=>"\u8B80",
-    "\uF95B"=>"\u62CF",
-    "\uF95C"=>"\u6A02",
-    "\uF95D"=>"\u8AFE",
-    "\uF95E"=>"\u4E39",
-    "\uF95F"=>"\u5BE7",
-    "\uF960"=>"\u6012",
-    "\uF961"=>"\u7387",
-    "\uF962"=>"\u7570",
-    "\uF963"=>"\u5317",
-    "\uF964"=>"\u78FB",
-    "\uF965"=>"\u4FBF",
-    "\uF966"=>"\u5FA9",
-    "\uF967"=>"\u4E0D",
-    "\uF968"=>"\u6CCC",
-    "\uF969"=>"\u6578",
-    "\uF96A"=>"\u7D22",
-    "\uF96B"=>"\u53C3",
-    "\uF96C"=>"\u585E",
-    "\uF96D"=>"\u7701",
-    "\uF96E"=>"\u8449",
-    "\uF96F"=>"\u8AAA",
-    "\uF970"=>"\u6BBA",
-    "\uF971"=>"\u8FB0",
-    "\uF972"=>"\u6C88",
-    "\uF973"=>"\u62FE",
-    "\uF974"=>"\u82E5",
-    "\uF975"=>"\u63A0",
-    "\uF976"=>"\u7565",
-    "\uF977"=>"\u4EAE",
-    "\uF978"=>"\u5169",
-    "\uF979"=>"\u51C9",
-    "\uF97A"=>"\u6881",
-    "\uF97B"=>"\u7CE7",
-    "\uF97C"=>"\u826F",
-    "\uF97D"=>"\u8AD2",
-    "\uF97E"=>"\u91CF",
-    "\uF97F"=>"\u52F5",
-    "\uF980"=>"\u5442",
-    "\uF981"=>"\u5973",
-    "\uF982"=>"\u5EEC",
-    "\uF983"=>"\u65C5",
-    "\uF984"=>"\u6FFE",
-    "\uF985"=>"\u792A",
-    "\uF986"=>"\u95AD",
-    "\uF987"=>"\u9A6A",
-    "\uF988"=>"\u9E97",
-    "\uF989"=>"\u9ECE",
-    "\uF98A"=>"\u529B",
-    "\uF98B"=>"\u66C6",
-    "\uF98C"=>"\u6B77",
-    "\uF98D"=>"\u8F62",
-    "\uF98E"=>"\u5E74",
-    "\uF98F"=>"\u6190",
-    "\uF990"=>"\u6200",
-    "\uF991"=>"\u649A",
-    "\uF992"=>"\u6F23",
-    "\uF993"=>"\u7149",
-    "\uF994"=>"\u7489",
-    "\uF995"=>"\u79CA",
-    "\uF996"=>"\u7DF4",
-    "\uF997"=>"\u806F",
-    "\uF998"=>"\u8F26",
-    "\uF999"=>"\u84EE",
-    "\uF99A"=>"\u9023",
-    "\uF99B"=>"\u934A",
-    "\uF99C"=>"\u5217",
-    "\uF99D"=>"\u52A3",
-    "\uF99E"=>"\u54BD",
-    "\uF99F"=>"\u70C8",
-    "\uF9A0"=>"\u88C2",
-    "\uF9A1"=>"\u8AAA",
-    "\uF9A2"=>"\u5EC9",
-    "\uF9A3"=>"\u5FF5",
-    "\uF9A4"=>"\u637B",
-    "\uF9A5"=>"\u6BAE",
-    "\uF9A6"=>"\u7C3E",
-    "\uF9A7"=>"\u7375",
-    "\uF9A8"=>"\u4EE4",
-    "\uF9A9"=>"\u56F9",
-    "\uF9AA"=>"\u5BE7",
-    "\uF9AB"=>"\u5DBA",
-    "\uF9AC"=>"\u601C",
-    "\uF9AD"=>"\u73B2",
-    "\uF9AE"=>"\u7469",
-    "\uF9AF"=>"\u7F9A",
-    "\uF9B0"=>"\u8046",
-    "\uF9B1"=>"\u9234",
-    "\uF9B2"=>"\u96F6",
-    "\uF9B3"=>"\u9748",
-    "\uF9B4"=>"\u9818",
-    "\uF9B5"=>"\u4F8B",
-    "\uF9B6"=>"\u79AE",
-    "\uF9B7"=>"\u91B4",
-    "\uF9B8"=>"\u96B8",
-    "\uF9B9"=>"\u60E1",
-    "\uF9BA"=>"\u4E86",
-    "\uF9BB"=>"\u50DA",
-    "\uF9BC"=>"\u5BEE",
-    "\uF9BD"=>"\u5C3F",
-    "\uF9BE"=>"\u6599",
-    "\uF9BF"=>"\u6A02",
-    "\uF9C0"=>"\u71CE",
-    "\uF9C1"=>"\u7642",
-    "\uF9C2"=>"\u84FC",
-    "\uF9C3"=>"\u907C",
-    "\uF9C4"=>"\u9F8D",
-    "\uF9C5"=>"\u6688",
-    "\uF9C6"=>"\u962E",
-    "\uF9C7"=>"\u5289",
-    "\uF9C8"=>"\u677B",
-    "\uF9C9"=>"\u67F3",
-    "\uF9CA"=>"\u6D41",
-    "\uF9CB"=>"\u6E9C",
-    "\uF9CC"=>"\u7409",
-    "\uF9CD"=>"\u7559",
-    "\uF9CE"=>"\u786B",
-    "\uF9CF"=>"\u7D10",
-    "\uF9D0"=>"\u985E",
-    "\uF9D1"=>"\u516D",
-    "\uF9D2"=>"\u622E",
-    "\uF9D3"=>"\u9678",
-    "\uF9D4"=>"\u502B",
-    "\uF9D5"=>"\u5D19",
-    "\uF9D6"=>"\u6DEA",
-    "\uF9D7"=>"\u8F2A",
-    "\uF9D8"=>"\u5F8B",
-    "\uF9D9"=>"\u6144",
-    "\uF9DA"=>"\u6817",
-    "\uF9DB"=>"\u7387",
-    "\uF9DC"=>"\u9686",
-    "\uF9DD"=>"\u5229",
-    "\uF9DE"=>"\u540F",
-    "\uF9DF"=>"\u5C65",
-    "\uF9E0"=>"\u6613",
-    "\uF9E1"=>"\u674E",
-    "\uF9E2"=>"\u68A8",
-    "\uF9E3"=>"\u6CE5",
-    "\uF9E4"=>"\u7406",
-    "\uF9E5"=>"\u75E2",
-    "\uF9E6"=>"\u7F79",
-    "\uF9E7"=>"\u88CF",
-    "\uF9E8"=>"\u88E1",
-    "\uF9E9"=>"\u91CC",
-    "\uF9EA"=>"\u96E2",
-    "\uF9EB"=>"\u533F",
-    "\uF9EC"=>"\u6EBA",
-    "\uF9ED"=>"\u541D",
-    "\uF9EE"=>"\u71D0",
-    "\uF9EF"=>"\u7498",
-    "\uF9F0"=>"\u85FA",
-    "\uF9F1"=>"\u96A3",
-    "\uF9F2"=>"\u9C57",
-    "\uF9F3"=>"\u9E9F",
-    "\uF9F4"=>"\u6797",
-    "\uF9F5"=>"\u6DCB",
-    "\uF9F6"=>"\u81E8",
-    "\uF9F7"=>"\u7ACB",
-    "\uF9F8"=>"\u7B20",
-    "\uF9F9"=>"\u7C92",
-    "\uF9FA"=>"\u72C0",
-    "\uF9FB"=>"\u7099",
-    "\uF9FC"=>"\u8B58",
-    "\uF9FD"=>"\u4EC0",
-    "\uF9FE"=>"\u8336",
-    "\uF9FF"=>"\u523A",
-    "\uFA00"=>"\u5207",
-    "\uFA01"=>"\u5EA6",
-    "\uFA02"=>"\u62D3",
-    "\uFA03"=>"\u7CD6",
-    "\uFA04"=>"\u5B85",
-    "\uFA05"=>"\u6D1E",
-    "\uFA06"=>"\u66B4",
-    "\uFA07"=>"\u8F3B",
-    "\uFA08"=>"\u884C",
-    "\uFA09"=>"\u964D",
-    "\uFA0A"=>"\u898B",
-    "\uFA0B"=>"\u5ED3",
-    "\uFA0C"=>"\u5140",
-    "\uFA0D"=>"\u55C0",
-    "\uFA10"=>"\u585A",
-    "\uFA12"=>"\u6674",
-    "\uFA15"=>"\u51DE",
-    "\uFA16"=>"\u732A",
-    "\uFA17"=>"\u76CA",
-    "\uFA18"=>"\u793C",
-    "\uFA19"=>"\u795E",
-    "\uFA1A"=>"\u7965",
-    "\uFA1B"=>"\u798F",
-    "\uFA1C"=>"\u9756",
-    "\uFA1D"=>"\u7CBE",
-    "\uFA1E"=>"\u7FBD",
-    "\uFA20"=>"\u8612",
-    "\uFA22"=>"\u8AF8",
-    "\uFA25"=>"\u9038",
-    "\uFA26"=>"\u90FD",
-    "\uFA2A"=>"\u98EF",
-    "\uFA2B"=>"\u98FC",
-    "\uFA2C"=>"\u9928",
-    "\uFA2D"=>"\u9DB4",
-    "\uFA2E"=>"\u90DE",
-    "\uFA2F"=>"\u96B7",
-    "\uFA30"=>"\u4FAE",
-    "\uFA31"=>"\u50E7",
-    "\uFA32"=>"\u514D",
-    "\uFA33"=>"\u52C9",
-    "\uFA34"=>"\u52E4",
-    "\uFA35"=>"\u5351",
-    "\uFA36"=>"\u559D",
-    "\uFA37"=>"\u5606",
-    "\uFA38"=>"\u5668",
-    "\uFA39"=>"\u5840",
-    "\uFA3A"=>"\u58A8",
-    "\uFA3B"=>"\u5C64",
-    "\uFA3C"=>"\u5C6E",
-    "\uFA3D"=>"\u6094",
-    "\uFA3E"=>"\u6168",
-    "\uFA3F"=>"\u618E",
-    "\uFA40"=>"\u61F2",
-    "\uFA41"=>"\u654F",
-    "\uFA42"=>"\u65E2",
-    "\uFA43"=>"\u6691",
-    "\uFA44"=>"\u6885",
-    "\uFA45"=>"\u6D77",
-    "\uFA46"=>"\u6E1A",
-    "\uFA47"=>"\u6F22",
-    "\uFA48"=>"\u716E",
-    "\uFA49"=>"\u722B",
-    "\uFA4A"=>"\u7422",
-    "\uFA4B"=>"\u7891",
-    "\uFA4C"=>"\u793E",
-    "\uFA4D"=>"\u7949",
-    "\uFA4E"=>"\u7948",
-    "\uFA4F"=>"\u7950",
-    "\uFA50"=>"\u7956",
-    "\uFA51"=>"\u795D",
-    "\uFA52"=>"\u798D",
-    "\uFA53"=>"\u798E",
-    "\uFA54"=>"\u7A40",
-    "\uFA55"=>"\u7A81",
-    "\uFA56"=>"\u7BC0",
-    "\uFA57"=>"\u7DF4",
-    "\uFA58"=>"\u7E09",
-    "\uFA59"=>"\u7E41",
-    "\uFA5A"=>"\u7F72",
-    "\uFA5B"=>"\u8005",
-    "\uFA5C"=>"\u81ED",
-    "\uFA5D"=>"\u8279",
-    "\uFA5E"=>"\u8279",
-    "\uFA5F"=>"\u8457",
-    "\uFA60"=>"\u8910",
-    "\uFA61"=>"\u8996",
-    "\uFA62"=>"\u8B01",
-    "\uFA63"=>"\u8B39",
-    "\uFA64"=>"\u8CD3",
-    "\uFA65"=>"\u8D08",
-    "\uFA66"=>"\u8FB6",
-    "\uFA67"=>"\u9038",
-    "\uFA68"=>"\u96E3",
-    "\uFA69"=>"\u97FF",
-    "\uFA6A"=>"\u983B",
-    "\uFA6B"=>"\u6075",
-    "\uFA6C"=>"\u{242EE}",
-    "\uFA6D"=>"\u8218",
-    "\uFA70"=>"\u4E26",
-    "\uFA71"=>"\u51B5",
-    "\uFA72"=>"\u5168",
-    "\uFA73"=>"\u4F80",
-    "\uFA74"=>"\u5145",
-    "\uFA75"=>"\u5180",
-    "\uFA76"=>"\u52C7",
-    "\uFA77"=>"\u52FA",
-    "\uFA78"=>"\u559D",
-    "\uFA79"=>"\u5555",
-    "\uFA7A"=>"\u5599",
-    "\uFA7B"=>"\u55E2",
-    "\uFA7C"=>"\u585A",
-    "\uFA7D"=>"\u58B3",
-    "\uFA7E"=>"\u5944",
-    "\uFA7F"=>"\u5954",
-    "\uFA80"=>"\u5A62",
-    "\uFA81"=>"\u5B28",
-    "\uFA82"=>"\u5ED2",
-    "\uFA83"=>"\u5ED9",
-    "\uFA84"=>"\u5F69",
-    "\uFA85"=>"\u5FAD",
-    "\uFA86"=>"\u60D8",
-    "\uFA87"=>"\u614E",
-    "\uFA88"=>"\u6108",
-    "\uFA89"=>"\u618E",
-    "\uFA8A"=>"\u6160",
-    "\uFA8B"=>"\u61F2",
-    "\uFA8C"=>"\u6234",
-    "\uFA8D"=>"\u63C4",
-    "\uFA8E"=>"\u641C",
-    "\uFA8F"=>"\u6452",
-    "\uFA90"=>"\u6556",
-    "\uFA91"=>"\u6674",
-    "\uFA92"=>"\u6717",
-    "\uFA93"=>"\u671B",
-    "\uFA94"=>"\u6756",
-    "\uFA95"=>"\u6B79",
-    "\uFA96"=>"\u6BBA",
-    "\uFA97"=>"\u6D41",
-    "\uFA98"=>"\u6EDB",
-    "\uFA99"=>"\u6ECB",
-    "\uFA9A"=>"\u6F22",
-    "\uFA9B"=>"\u701E",
-    "\uFA9C"=>"\u716E",
-    "\uFA9D"=>"\u77A7",
-    "\uFA9E"=>"\u7235",
-    "\uFA9F"=>"\u72AF",
-    "\uFAA0"=>"\u732A",
-    "\uFAA1"=>"\u7471",
-    "\uFAA2"=>"\u7506",
-    "\uFAA3"=>"\u753B",
-    "\uFAA4"=>"\u761D",
-    "\uFAA5"=>"\u761F",
-    "\uFAA6"=>"\u76CA",
-    "\uFAA7"=>"\u76DB",
-    "\uFAA8"=>"\u76F4",
-    "\uFAA9"=>"\u774A",
-    "\uFAAA"=>"\u7740",
-    "\uFAAB"=>"\u78CC",
-    "\uFAAC"=>"\u7AB1",
-    "\uFAAD"=>"\u7BC0",
-    "\uFAAE"=>"\u7C7B",
-    "\uFAAF"=>"\u7D5B",
-    "\uFAB0"=>"\u7DF4",
-    "\uFAB1"=>"\u7F3E",
-    "\uFAB2"=>"\u8005",
-    "\uFAB3"=>"\u8352",
-    "\uFAB4"=>"\u83EF",
-    "\uFAB5"=>"\u8779",
-    "\uFAB6"=>"\u8941",
-    "\uFAB7"=>"\u8986",
-    "\uFAB8"=>"\u8996",
-    "\uFAB9"=>"\u8ABF",
-    "\uFABA"=>"\u8AF8",
-    "\uFABB"=>"\u8ACB",
-    "\uFABC"=>"\u8B01",
-    "\uFABD"=>"\u8AFE",
-    "\uFABE"=>"\u8AED",
-    "\uFABF"=>"\u8B39",
-    "\uFAC0"=>"\u8B8A",
-    "\uFAC1"=>"\u8D08",
-    "\uFAC2"=>"\u8F38",
-    "\uFAC3"=>"\u9072",
-    "\uFAC4"=>"\u9199",
-    "\uFAC5"=>"\u9276",
-    "\uFAC6"=>"\u967C",
-    "\uFAC7"=>"\u96E3",
-    "\uFAC8"=>"\u9756",
-    "\uFAC9"=>"\u97DB",
-    "\uFACA"=>"\u97FF",
-    "\uFACB"=>"\u980B",
-    "\uFACC"=>"\u983B",
-    "\uFACD"=>"\u9B12",
-    "\uFACE"=>"\u9F9C",
-    "\uFACF"=>"\u{2284A}",
-    "\uFAD0"=>"\u{22844}",
-    "\uFAD1"=>"\u{233D5}",
-    "\uFAD2"=>"\u3B9D",
-    "\uFAD3"=>"\u4018",
-    "\uFAD4"=>"\u4039",
-    "\uFAD5"=>"\u{25249}",
-    "\uFAD6"=>"\u{25CD0}",
-    "\uFAD7"=>"\u{27ED3}",
-    "\uFAD8"=>"\u9F43",
-    "\uFAD9"=>"\u9F8E",
-    "\uFB1D"=>"\u05D9\u05B4",
-    "\uFB1F"=>"\u05F2\u05B7",
-    "\uFB2A"=>"\u05E9\u05C1",
-    "\uFB2B"=>"\u05E9\u05C2",
-    "\uFB2C"=>"\u05E9\u05BC\u05C1",
-    "\uFB2D"=>"\u05E9\u05BC\u05C2",
-    "\uFB2E"=>"\u05D0\u05B7",
-    "\uFB2F"=>"\u05D0\u05B8",
-    "\uFB30"=>"\u05D0\u05BC",
-    "\uFB31"=>"\u05D1\u05BC",
-    "\uFB32"=>"\u05D2\u05BC",
-    "\uFB33"=>"\u05D3\u05BC",
-    "\uFB34"=>"\u05D4\u05BC",
-    "\uFB35"=>"\u05D5\u05BC",
-    "\uFB36"=>"\u05D6\u05BC",
-    "\uFB38"=>"\u05D8\u05BC",
-    "\uFB39"=>"\u05D9\u05BC",
-    "\uFB3A"=>"\u05DA\u05BC",
-    "\uFB3B"=>"\u05DB\u05BC",
-    "\uFB3C"=>"\u05DC\u05BC",
-    "\uFB3E"=>"\u05DE\u05BC",
-    "\uFB40"=>"\u05E0\u05BC",
-    "\uFB41"=>"\u05E1\u05BC",
-    "\uFB43"=>"\u05E3\u05BC",
-    "\uFB44"=>"\u05E4\u05BC",
-    "\uFB46"=>"\u05E6\u05BC",
-    "\uFB47"=>"\u05E7\u05BC",
-    "\uFB48"=>"\u05E8\u05BC",
-    "\uFB49"=>"\u05E9\u05BC",
-    "\uFB4A"=>"\u05EA\u05BC",
-    "\uFB4B"=>"\u05D5\u05B9",
-    "\uFB4C"=>"\u05D1\u05BF",
-    "\uFB4D"=>"\u05DB\u05BF",
-    "\uFB4E"=>"\u05E4\u05BF",
-    "\u{1109A}"=>"\u{11099}\u{110BA}",
-    "\u{1109C}"=>"\u{1109B}\u{110BA}",
-    "\u{110AB}"=>"\u{110A5}\u{110BA}",
-    "\u{1112E}"=>"\u{11131}\u{11127}",
-    "\u{1112F}"=>"\u{11132}\u{11127}",
-    "\u{1134B}"=>"\u{11347}\u{1133E}",
-    "\u{1134C}"=>"\u{11347}\u{11357}",
-    "\u{114BB}"=>"\u{114B9}\u{114BA}",
-    "\u{114BC}"=>"\u{114B9}\u{114B0}",
-    "\u{114BE}"=>"\u{114B9}\u{114BD}",
-    "\u{115BA}"=>"\u{115B8}\u{115AF}",
-    "\u{115BB}"=>"\u{115B9}\u{115AF}",
-    "\u{1D15E}"=>"\u{1D157}\u{1D165}",
-    "\u{1D15F}"=>"\u{1D158}\u{1D165}",
-    "\u{1D160}"=>"\u{1D158}\u{1D165}\u{1D16E}",
-    "\u{1D161}"=>"\u{1D158}\u{1D165}\u{1D16F}",
-    "\u{1D162}"=>"\u{1D158}\u{1D165}\u{1D170}",
-    "\u{1D163}"=>"\u{1D158}\u{1D165}\u{1D171}",
-    "\u{1D164}"=>"\u{1D158}\u{1D165}\u{1D172}",
-    "\u{1D1BB}"=>"\u{1D1B9}\u{1D165}",
-    "\u{1D1BC}"=>"\u{1D1BA}\u{1D165}",
-    "\u{1D1BD}"=>"\u{1D1B9}\u{1D165}\u{1D16E}",
-    "\u{1D1BE}"=>"\u{1D1BA}\u{1D165}\u{1D16E}",
-    "\u{1D1BF}"=>"\u{1D1B9}\u{1D165}\u{1D16F}",
-    "\u{1D1C0}"=>"\u{1D1BA}\u{1D165}\u{1D16F}",
-    "\u{2F800}"=>"\u4E3D",
-    "\u{2F801}"=>"\u4E38",
-    "\u{2F802}"=>"\u4E41",
-    "\u{2F803}"=>"\u{20122}",
-    "\u{2F804}"=>"\u4F60",
-    "\u{2F805}"=>"\u4FAE",
-    "\u{2F806}"=>"\u4FBB",
-    "\u{2F807}"=>"\u5002",
-    "\u{2F808}"=>"\u507A",
-    "\u{2F809}"=>"\u5099",
-    "\u{2F80A}"=>"\u50E7",
-    "\u{2F80B}"=>"\u50CF",
-    "\u{2F80C}"=>"\u349E",
-    "\u{2F80D}"=>"\u{2063A}",
-    "\u{2F80E}"=>"\u514D",
-    "\u{2F80F}"=>"\u5154",
-    "\u{2F810}"=>"\u5164",
-    "\u{2F811}"=>"\u5177",
-    "\u{2F812}"=>"\u{2051C}",
-    "\u{2F813}"=>"\u34B9",
-    "\u{2F814}"=>"\u5167",
-    "\u{2F815}"=>"\u518D",
-    "\u{2F816}"=>"\u{2054B}",
-    "\u{2F817}"=>"\u5197",
-    "\u{2F818}"=>"\u51A4",
-    "\u{2F819}"=>"\u4ECC",
-    "\u{2F81A}"=>"\u51AC",
-    "\u{2F81B}"=>"\u51B5",
-    "\u{2F81C}"=>"\u{291DF}",
-    "\u{2F81D}"=>"\u51F5",
-    "\u{2F81E}"=>"\u5203",
-    "\u{2F81F}"=>"\u34DF",
-    "\u{2F820}"=>"\u523B",
-    "\u{2F821}"=>"\u5246",
-    "\u{2F822}"=>"\u5272",
-    "\u{2F823}"=>"\u5277",
-    "\u{2F824}"=>"\u3515",
-    "\u{2F825}"=>"\u52C7",
-    "\u{2F826}"=>"\u52C9",
-    "\u{2F827}"=>"\u52E4",
-    "\u{2F828}"=>"\u52FA",
-    "\u{2F829}"=>"\u5305",
-    "\u{2F82A}"=>"\u5306",
-    "\u{2F82B}"=>"\u5317",
-    "\u{2F82C}"=>"\u5349",
-    "\u{2F82D}"=>"\u5351",
-    "\u{2F82E}"=>"\u535A",
-    "\u{2F82F}"=>"\u5373",
-    "\u{2F830}"=>"\u537D",
-    "\u{2F831}"=>"\u537F",
-    "\u{2F832}"=>"\u537F",
-    "\u{2F833}"=>"\u537F",
-    "\u{2F834}"=>"\u{20A2C}",
-    "\u{2F835}"=>"\u7070",
-    "\u{2F836}"=>"\u53CA",
-    "\u{2F837}"=>"\u53DF",
-    "\u{2F838}"=>"\u{20B63}",
-    "\u{2F839}"=>"\u53EB",
-    "\u{2F83A}"=>"\u53F1",
-    "\u{2F83B}"=>"\u5406",
-    "\u{2F83C}"=>"\u549E",
-    "\u{2F83D}"=>"\u5438",
-    "\u{2F83E}"=>"\u5448",
-    "\u{2F83F}"=>"\u5468",
-    "\u{2F840}"=>"\u54A2",
-    "\u{2F841}"=>"\u54F6",
-    "\u{2F842}"=>"\u5510",
-    "\u{2F843}"=>"\u5553",
-    "\u{2F844}"=>"\u5563",
-    "\u{2F845}"=>"\u5584",
-    "\u{2F846}"=>"\u5584",
-    "\u{2F847}"=>"\u5599",
-    "\u{2F848}"=>"\u55AB",
-    "\u{2F849}"=>"\u55B3",
-    "\u{2F84A}"=>"\u55C2",
-    "\u{2F84B}"=>"\u5716",
-    "\u{2F84C}"=>"\u5606",
-    "\u{2F84D}"=>"\u5717",
-    "\u{2F84E}"=>"\u5651",
-    "\u{2F84F}"=>"\u5674",
-    "\u{2F850}"=>"\u5207",
-    "\u{2F851}"=>"\u58EE",
-    "\u{2F852}"=>"\u57CE",
-    "\u{2F853}"=>"\u57F4",
-    "\u{2F854}"=>"\u580D",
-    "\u{2F855}"=>"\u578B",
-    "\u{2F856}"=>"\u5832",
-    "\u{2F857}"=>"\u5831",
-    "\u{2F858}"=>"\u58AC",
-    "\u{2F859}"=>"\u{214E4}",
-    "\u{2F85A}"=>"\u58F2",
-    "\u{2F85B}"=>"\u58F7",
-    "\u{2F85C}"=>"\u5906",
-    "\u{2F85D}"=>"\u591A",
-    "\u{2F85E}"=>"\u5922",
-    "\u{2F85F}"=>"\u5962",
-    "\u{2F860}"=>"\u{216A8}",
-    "\u{2F861}"=>"\u{216EA}",
-    "\u{2F862}"=>"\u59EC",
-    "\u{2F863}"=>"\u5A1B",
-    "\u{2F864}"=>"\u5A27",
-    "\u{2F865}"=>"\u59D8",
-    "\u{2F866}"=>"\u5A66",
-    "\u{2F867}"=>"\u36EE",
-    "\u{2F868}"=>"\u36FC",
-    "\u{2F869}"=>"\u5B08",
-    "\u{2F86A}"=>"\u5B3E",
-    "\u{2F86B}"=>"\u5B3E",
-    "\u{2F86C}"=>"\u{219C8}",
-    "\u{2F86D}"=>"\u5BC3",
-    "\u{2F86E}"=>"\u5BD8",
-    "\u{2F86F}"=>"\u5BE7",
-    "\u{2F870}"=>"\u5BF3",
-    "\u{2F871}"=>"\u{21B18}",
-    "\u{2F872}"=>"\u5BFF",
-    "\u{2F873}"=>"\u5C06",
-    "\u{2F874}"=>"\u5F53",
-    "\u{2F875}"=>"\u5C22",
-    "\u{2F876}"=>"\u3781",
-    "\u{2F877}"=>"\u5C60",
-    "\u{2F878}"=>"\u5C6E",
-    "\u{2F879}"=>"\u5CC0",
-    "\u{2F87A}"=>"\u5C8D",
-    "\u{2F87B}"=>"\u{21DE4}",
-    "\u{2F87C}"=>"\u5D43",
-    "\u{2F87D}"=>"\u{21DE6}",
-    "\u{2F87E}"=>"\u5D6E",
-    "\u{2F87F}"=>"\u5D6B",
-    "\u{2F880}"=>"\u5D7C",
-    "\u{2F881}"=>"\u5DE1",
-    "\u{2F882}"=>"\u5DE2",
-    "\u{2F883}"=>"\u382F",
-    "\u{2F884}"=>"\u5DFD",
-    "\u{2F885}"=>"\u5E28",
-    "\u{2F886}"=>"\u5E3D",
-    "\u{2F887}"=>"\u5E69",
-    "\u{2F888}"=>"\u3862",
-    "\u{2F889}"=>"\u{22183}",
-    "\u{2F88A}"=>"\u387C",
-    "\u{2F88B}"=>"\u5EB0",
-    "\u{2F88C}"=>"\u5EB3",
-    "\u{2F88D}"=>"\u5EB6",
-    "\u{2F88E}"=>"\u5ECA",
-    "\u{2F88F}"=>"\u{2A392}",
-    "\u{2F890}"=>"\u5EFE",
-    "\u{2F891}"=>"\u{22331}",
-    "\u{2F892}"=>"\u{22331}",
-    "\u{2F893}"=>"\u8201",
-    "\u{2F894}"=>"\u5F22",
-    "\u{2F895}"=>"\u5F22",
-    "\u{2F896}"=>"\u38C7",
-    "\u{2F897}"=>"\u{232B8}",
-    "\u{2F898}"=>"\u{261DA}",
-    "\u{2F899}"=>"\u5F62",
-    "\u{2F89A}"=>"\u5F6B",
-    "\u{2F89B}"=>"\u38E3",
-    "\u{2F89C}"=>"\u5F9A",
-    "\u{2F89D}"=>"\u5FCD",
-    "\u{2F89E}"=>"\u5FD7",
-    "\u{2F89F}"=>"\u5FF9",
-    "\u{2F8A0}"=>"\u6081",
-    "\u{2F8A1}"=>"\u393A",
-    "\u{2F8A2}"=>"\u391C",
-    "\u{2F8A3}"=>"\u6094",
-    "\u{2F8A4}"=>"\u{226D4}",
-    "\u{2F8A5}"=>"\u60C7",
-    "\u{2F8A6}"=>"\u6148",
-    "\u{2F8A7}"=>"\u614C",
-    "\u{2F8A8}"=>"\u614E",
-    "\u{2F8A9}"=>"\u614C",
-    "\u{2F8AA}"=>"\u617A",
-    "\u{2F8AB}"=>"\u618E",
-    "\u{2F8AC}"=>"\u61B2",
-    "\u{2F8AD}"=>"\u61A4",
-    "\u{2F8AE}"=>"\u61AF",
-    "\u{2F8AF}"=>"\u61DE",
-    "\u{2F8B0}"=>"\u61F2",
-    "\u{2F8B1}"=>"\u61F6",
-    "\u{2F8B2}"=>"\u6210",
-    "\u{2F8B3}"=>"\u621B",
-    "\u{2F8B4}"=>"\u625D",
-    "\u{2F8B5}"=>"\u62B1",
-    "\u{2F8B6}"=>"\u62D4",
-    "\u{2F8B7}"=>"\u6350",
-    "\u{2F8B8}"=>"\u{22B0C}",
-    "\u{2F8B9}"=>"\u633D",
-    "\u{2F8BA}"=>"\u62FC",
-    "\u{2F8BB}"=>"\u6368",
-    "\u{2F8BC}"=>"\u6383",
-    "\u{2F8BD}"=>"\u63E4",
-    "\u{2F8BE}"=>"\u{22BF1}",
-    "\u{2F8BF}"=>"\u6422",
-    "\u{2F8C0}"=>"\u63C5",
-    "\u{2F8C1}"=>"\u63A9",
-    "\u{2F8C2}"=>"\u3A2E",
-    "\u{2F8C3}"=>"\u6469",
-    "\u{2F8C4}"=>"\u647E",
-    "\u{2F8C5}"=>"\u649D",
-    "\u{2F8C6}"=>"\u6477",
-    "\u{2F8C7}"=>"\u3A6C",
-    "\u{2F8C8}"=>"\u654F",
-    "\u{2F8C9}"=>"\u656C",
-    "\u{2F8CA}"=>"\u{2300A}",
-    "\u{2F8CB}"=>"\u65E3",
-    "\u{2F8CC}"=>"\u66F8",
-    "\u{2F8CD}"=>"\u6649",
-    "\u{2F8CE}"=>"\u3B19",
-    "\u{2F8CF}"=>"\u6691",
-    "\u{2F8D0}"=>"\u3B08",
-    "\u{2F8D1}"=>"\u3AE4",
-    "\u{2F8D2}"=>"\u5192",
-    "\u{2F8D3}"=>"\u5195",
-    "\u{2F8D4}"=>"\u6700",
-    "\u{2F8D5}"=>"\u669C",
-    "\u{2F8D6}"=>"\u80AD",
-    "\u{2F8D7}"=>"\u43D9",
-    "\u{2F8D8}"=>"\u6717",
-    "\u{2F8D9}"=>"\u671B",
-    "\u{2F8DA}"=>"\u6721",
-    "\u{2F8DB}"=>"\u675E",
-    "\u{2F8DC}"=>"\u6753",
-    "\u{2F8DD}"=>"\u{233C3}",
-    "\u{2F8DE}"=>"\u3B49",
-    "\u{2F8DF}"=>"\u67FA",
-    "\u{2F8E0}"=>"\u6785",
-    "\u{2F8E1}"=>"\u6852",
-    "\u{2F8E2}"=>"\u6885",
-    "\u{2F8E3}"=>"\u{2346D}",
-    "\u{2F8E4}"=>"\u688E",
-    "\u{2F8E5}"=>"\u681F",
-    "\u{2F8E6}"=>"\u6914",
-    "\u{2F8E7}"=>"\u3B9D",
-    "\u{2F8E8}"=>"\u6942",
-    "\u{2F8E9}"=>"\u69A3",
-    "\u{2F8EA}"=>"\u69EA",
-    "\u{2F8EB}"=>"\u6AA8",
-    "\u{2F8EC}"=>"\u{236A3}",
-    "\u{2F8ED}"=>"\u6ADB",
-    "\u{2F8EE}"=>"\u3C18",
-    "\u{2F8EF}"=>"\u6B21",
-    "\u{2F8F0}"=>"\u{238A7}",
-    "\u{2F8F1}"=>"\u6B54",
-    "\u{2F8F2}"=>"\u3C4E",
-    "\u{2F8F3}"=>"\u6B72",
-    "\u{2F8F4}"=>"\u6B9F",
-    "\u{2F8F5}"=>"\u6BBA",
-    "\u{2F8F6}"=>"\u6BBB",
-    "\u{2F8F7}"=>"\u{23A8D}",
-    "\u{2F8F8}"=>"\u{21D0B}",
-    "\u{2F8F9}"=>"\u{23AFA}",
-    "\u{2F8FA}"=>"\u6C4E",
-    "\u{2F8FB}"=>"\u{23CBC}",
-    "\u{2F8FC}"=>"\u6CBF",
-    "\u{2F8FD}"=>"\u6CCD",
-    "\u{2F8FE}"=>"\u6C67",
-    "\u{2F8FF}"=>"\u6D16",
-    "\u{2F900}"=>"\u6D3E",
-    "\u{2F901}"=>"\u6D77",
-    "\u{2F902}"=>"\u6D41",
-    "\u{2F903}"=>"\u6D69",
-    "\u{2F904}"=>"\u6D78",
-    "\u{2F905}"=>"\u6D85",
-    "\u{2F906}"=>"\u{23D1E}",
-    "\u{2F907}"=>"\u6D34",
-    "\u{2F908}"=>"\u6E2F",
-    "\u{2F909}"=>"\u6E6E",
-    "\u{2F90A}"=>"\u3D33",
-    "\u{2F90B}"=>"\u6ECB",
-    "\u{2F90C}"=>"\u6EC7",
-    "\u{2F90D}"=>"\u{23ED1}",
-    "\u{2F90E}"=>"\u6DF9",
-    "\u{2F90F}"=>"\u6F6E",
-    "\u{2F910}"=>"\u{23F5E}",
-    "\u{2F911}"=>"\u{23F8E}",
-    "\u{2F912}"=>"\u6FC6",
-    "\u{2F913}"=>"\u7039",
-    "\u{2F914}"=>"\u701E",
-    "\u{2F915}"=>"\u701B",
-    "\u{2F916}"=>"\u3D96",
-    "\u{2F917}"=>"\u704A",
-    "\u{2F918}"=>"\u707D",
-    "\u{2F919}"=>"\u7077",
-    "\u{2F91A}"=>"\u70AD",
-    "\u{2F91B}"=>"\u{20525}",
-    "\u{2F91C}"=>"\u7145",
-    "\u{2F91D}"=>"\u{24263}",
-    "\u{2F91E}"=>"\u719C",
-    "\u{2F91F}"=>"\u{243AB}",
-    "\u{2F920}"=>"\u7228",
-    "\u{2F921}"=>"\u7235",
-    "\u{2F922}"=>"\u7250",
-    "\u{2F923}"=>"\u{24608}",
-    "\u{2F924}"=>"\u7280",
-    "\u{2F925}"=>"\u7295",
-    "\u{2F926}"=>"\u{24735}",
-    "\u{2F927}"=>"\u{24814}",
-    "\u{2F928}"=>"\u737A",
-    "\u{2F929}"=>"\u738B",
-    "\u{2F92A}"=>"\u3EAC",
-    "\u{2F92B}"=>"\u73A5",
-    "\u{2F92C}"=>"\u3EB8",
-    "\u{2F92D}"=>"\u3EB8",
-    "\u{2F92E}"=>"\u7447",
-    "\u{2F92F}"=>"\u745C",
-    "\u{2F930}"=>"\u7471",
-    "\u{2F931}"=>"\u7485",
-    "\u{2F932}"=>"\u74CA",
-    "\u{2F933}"=>"\u3F1B",
-    "\u{2F934}"=>"\u7524",
-    "\u{2F935}"=>"\u{24C36}",
-    "\u{2F936}"=>"\u753E",
-    "\u{2F937}"=>"\u{24C92}",
-    "\u{2F938}"=>"\u7570",
-    "\u{2F939}"=>"\u{2219F}",
-    "\u{2F93A}"=>"\u7610",
-    "\u{2F93B}"=>"\u{24FA1}",
-    "\u{2F93C}"=>"\u{24FB8}",
-    "\u{2F93D}"=>"\u{25044}",
-    "\u{2F93E}"=>"\u3FFC",
-    "\u{2F93F}"=>"\u4008",
-    "\u{2F940}"=>"\u76F4",
-    "\u{2F941}"=>"\u{250F3}",
-    "\u{2F942}"=>"\u{250F2}",
-    "\u{2F943}"=>"\u{25119}",
-    "\u{2F944}"=>"\u{25133}",
-    "\u{2F945}"=>"\u771E",
-    "\u{2F946}"=>"\u771F",
-    "\u{2F947}"=>"\u771F",
-    "\u{2F948}"=>"\u774A",
-    "\u{2F949}"=>"\u4039",
-    "\u{2F94A}"=>"\u778B",
-    "\u{2F94B}"=>"\u4046",
-    "\u{2F94C}"=>"\u4096",
-    "\u{2F94D}"=>"\u{2541D}",
-    "\u{2F94E}"=>"\u784E",
-    "\u{2F94F}"=>"\u788C",
-    "\u{2F950}"=>"\u78CC",
-    "\u{2F951}"=>"\u40E3",
-    "\u{2F952}"=>"\u{25626}",
-    "\u{2F953}"=>"\u7956",
-    "\u{2F954}"=>"\u{2569A}",
-    "\u{2F955}"=>"\u{256C5}",
-    "\u{2F956}"=>"\u798F",
-    "\u{2F957}"=>"\u79EB",
-    "\u{2F958}"=>"\u412F",
-    "\u{2F959}"=>"\u7A40",
-    "\u{2F95A}"=>"\u7A4A",
-    "\u{2F95B}"=>"\u7A4F",
-    "\u{2F95C}"=>"\u{2597C}",
-    "\u{2F95D}"=>"\u{25AA7}",
-    "\u{2F95E}"=>"\u{25AA7}",
-    "\u{2F95F}"=>"\u7AEE",
-    "\u{2F960}"=>"\u4202",
-    "\u{2F961}"=>"\u{25BAB}",
-    "\u{2F962}"=>"\u7BC6",
-    "\u{2F963}"=>"\u7BC9",
-    "\u{2F964}"=>"\u4227",
-    "\u{2F965}"=>"\u{25C80}",
-    "\u{2F966}"=>"\u7CD2",
-    "\u{2F967}"=>"\u42A0",
-    "\u{2F968}"=>"\u7CE8",
-    "\u{2F969}"=>"\u7CE3",
-    "\u{2F96A}"=>"\u7D00",
-    "\u{2F96B}"=>"\u{25F86}",
-    "\u{2F96C}"=>"\u7D63",
-    "\u{2F96D}"=>"\u4301",
-    "\u{2F96E}"=>"\u7DC7",
-    "\u{2F96F}"=>"\u7E02",
-    "\u{2F970}"=>"\u7E45",
-    "\u{2F971}"=>"\u4334",
-    "\u{2F972}"=>"\u{26228}",
-    "\u{2F973}"=>"\u{26247}",
-    "\u{2F974}"=>"\u4359",
-    "\u{2F975}"=>"\u{262D9}",
-    "\u{2F976}"=>"\u7F7A",
-    "\u{2F977}"=>"\u{2633E}",
-    "\u{2F978}"=>"\u7F95",
-    "\u{2F979}"=>"\u7FFA",
-    "\u{2F97A}"=>"\u8005",
-    "\u{2F97B}"=>"\u{264DA}",
-    "\u{2F97C}"=>"\u{26523}",
-    "\u{2F97D}"=>"\u8060",
-    "\u{2F97E}"=>"\u{265A8}",
-    "\u{2F97F}"=>"\u8070",
-    "\u{2F980}"=>"\u{2335F}",
-    "\u{2F981}"=>"\u43D5",
-    "\u{2F982}"=>"\u80B2",
-    "\u{2F983}"=>"\u8103",
-    "\u{2F984}"=>"\u440B",
-    "\u{2F985}"=>"\u813E",
-    "\u{2F986}"=>"\u5AB5",
-    "\u{2F987}"=>"\u{267A7}",
-    "\u{2F988}"=>"\u{267B5}",
-    "\u{2F989}"=>"\u{23393}",
-    "\u{2F98A}"=>"\u{2339C}",
-    "\u{2F98B}"=>"\u8201",
-    "\u{2F98C}"=>"\u8204",
-    "\u{2F98D}"=>"\u8F9E",
-    "\u{2F98E}"=>"\u446B",
-    "\u{2F98F}"=>"\u8291",
-    "\u{2F990}"=>"\u828B",
-    "\u{2F991}"=>"\u829D",
-    "\u{2F992}"=>"\u52B3",
-    "\u{2F993}"=>"\u82B1",
-    "\u{2F994}"=>"\u82B3",
-    "\u{2F995}"=>"\u82BD",
-    "\u{2F996}"=>"\u82E6",
-    "\u{2F997}"=>"\u{26B3C}",
-    "\u{2F998}"=>"\u82E5",
-    "\u{2F999}"=>"\u831D",
-    "\u{2F99A}"=>"\u8363",
-    "\u{2F99B}"=>"\u83AD",
-    "\u{2F99C}"=>"\u8323",
-    "\u{2F99D}"=>"\u83BD",
-    "\u{2F99E}"=>"\u83E7",
-    "\u{2F99F}"=>"\u8457",
-    "\u{2F9A0}"=>"\u8353",
-    "\u{2F9A1}"=>"\u83CA",
-    "\u{2F9A2}"=>"\u83CC",
-    "\u{2F9A3}"=>"\u83DC",
-    "\u{2F9A4}"=>"\u{26C36}",
-    "\u{2F9A5}"=>"\u{26D6B}",
-    "\u{2F9A6}"=>"\u{26CD5}",
-    "\u{2F9A7}"=>"\u452B",
-    "\u{2F9A8}"=>"\u84F1",
-    "\u{2F9A9}"=>"\u84F3",
-    "\u{2F9AA}"=>"\u8516",
-    "\u{2F9AB}"=>"\u{273CA}",
-    "\u{2F9AC}"=>"\u8564",
-    "\u{2F9AD}"=>"\u{26F2C}",
-    "\u{2F9AE}"=>"\u455D",
-    "\u{2F9AF}"=>"\u4561",
-    "\u{2F9B0}"=>"\u{26FB1}",
-    "\u{2F9B1}"=>"\u{270D2}",
-    "\u{2F9B2}"=>"\u456B",
-    "\u{2F9B3}"=>"\u8650",
-    "\u{2F9B4}"=>"\u865C",
-    "\u{2F9B5}"=>"\u8667",
-    "\u{2F9B6}"=>"\u8669",
-    "\u{2F9B7}"=>"\u86A9",
-    "\u{2F9B8}"=>"\u8688",
-    "\u{2F9B9}"=>"\u870E",
-    "\u{2F9BA}"=>"\u86E2",
-    "\u{2F9BB}"=>"\u8779",
-    "\u{2F9BC}"=>"\u8728",
-    "\u{2F9BD}"=>"\u876B",
-    "\u{2F9BE}"=>"\u8786",
-    "\u{2F9BF}"=>"\u45D7",
-    "\u{2F9C0}"=>"\u87E1",
-    "\u{2F9C1}"=>"\u8801",
-    "\u{2F9C2}"=>"\u45F9",
-    "\u{2F9C3}"=>"\u8860",
-    "\u{2F9C4}"=>"\u8863",
-    "\u{2F9C5}"=>"\u{27667}",
-    "\u{2F9C6}"=>"\u88D7",
-    "\u{2F9C7}"=>"\u88DE",
-    "\u{2F9C8}"=>"\u4635",
-    "\u{2F9C9}"=>"\u88FA",
-    "\u{2F9CA}"=>"\u34BB",
-    "\u{2F9CB}"=>"\u{278AE}",
-    "\u{2F9CC}"=>"\u{27966}",
-    "\u{2F9CD}"=>"\u46BE",
-    "\u{2F9CE}"=>"\u46C7",
-    "\u{2F9CF}"=>"\u8AA0",
-    "\u{2F9D0}"=>"\u8AED",
-    "\u{2F9D1}"=>"\u8B8A",
-    "\u{2F9D2}"=>"\u8C55",
-    "\u{2F9D3}"=>"\u{27CA8}",
-    "\u{2F9D4}"=>"\u8CAB",
-    "\u{2F9D5}"=>"\u8CC1",
-    "\u{2F9D6}"=>"\u8D1B",
-    "\u{2F9D7}"=>"\u8D77",
-    "\u{2F9D8}"=>"\u{27F2F}",
-    "\u{2F9D9}"=>"\u{20804}",
-    "\u{2F9DA}"=>"\u8DCB",
-    "\u{2F9DB}"=>"\u8DBC",
-    "\u{2F9DC}"=>"\u8DF0",
-    "\u{2F9DD}"=>"\u{208DE}",
-    "\u{2F9DE}"=>"\u8ED4",
-    "\u{2F9DF}"=>"\u8F38",
-    "\u{2F9E0}"=>"\u{285D2}",
-    "\u{2F9E1}"=>"\u{285ED}",
-    "\u{2F9E2}"=>"\u9094",
-    "\u{2F9E3}"=>"\u90F1",
-    "\u{2F9E4}"=>"\u9111",
-    "\u{2F9E5}"=>"\u{2872E}",
-    "\u{2F9E6}"=>"\u911B",
-    "\u{2F9E7}"=>"\u9238",
-    "\u{2F9E8}"=>"\u92D7",
-    "\u{2F9E9}"=>"\u92D8",
-    "\u{2F9EA}"=>"\u927C",
-    "\u{2F9EB}"=>"\u93F9",
-    "\u{2F9EC}"=>"\u9415",
-    "\u{2F9ED}"=>"\u{28BFA}",
-    "\u{2F9EE}"=>"\u958B",
-    "\u{2F9EF}"=>"\u4995",
-    "\u{2F9F0}"=>"\u95B7",
-    "\u{2F9F1}"=>"\u{28D77}",
-    "\u{2F9F2}"=>"\u49E6",
-    "\u{2F9F3}"=>"\u96C3",
-    "\u{2F9F4}"=>"\u5DB2",
-    "\u{2F9F5}"=>"\u9723",
-    "\u{2F9F6}"=>"\u{29145}",
-    "\u{2F9F7}"=>"\u{2921A}",
-    "\u{2F9F8}"=>"\u4A6E",
-    "\u{2F9F9}"=>"\u4A76",
-    "\u{2F9FA}"=>"\u97E0",
-    "\u{2F9FB}"=>"\u{2940A}",
-    "\u{2F9FC}"=>"\u4AB2",
-    "\u{2F9FD}"=>"\u{29496}",
-    "\u{2F9FE}"=>"\u980B",
-    "\u{2F9FF}"=>"\u980B",
-    "\u{2FA00}"=>"\u9829",
-    "\u{2FA01}"=>"\u{295B6}",
-    "\u{2FA02}"=>"\u98E2",
-    "\u{2FA03}"=>"\u4B33",
-    "\u{2FA04}"=>"\u9929",
-    "\u{2FA05}"=>"\u99A7",
-    "\u{2FA06}"=>"\u99C2",
-    "\u{2FA07}"=>"\u99FE",
-    "\u{2FA08}"=>"\u4BCE",
-    "\u{2FA09}"=>"\u{29B30}",
-    "\u{2FA0A}"=>"\u9B12",
-    "\u{2FA0B}"=>"\u9C40",
-    "\u{2FA0C}"=>"\u9CFD",
-    "\u{2FA0D}"=>"\u4CCE",
-    "\u{2FA0E}"=>"\u4CED",
-    "\u{2FA0F}"=>"\u9D67",
-    "\u{2FA10}"=>"\u{2A0CE}",
-    "\u{2FA11}"=>"\u4CF8",
-    "\u{2FA12}"=>"\u{2A105}",
-    "\u{2FA13}"=>"\u{2A20E}",
-    "\u{2FA14}"=>"\u{2A291}",
-    "\u{2FA15}"=>"\u9EBB",
-    "\u{2FA16}"=>"\u4D56",
-    "\u{2FA17}"=>"\u9EF9",
-    "\u{2FA18}"=>"\u9EFE",
-    "\u{2FA19}"=>"\u9F05",
-    "\u{2FA1A}"=>"\u9F0F",
-    "\u{2FA1B}"=>"\u9F16",
-    "\u{2FA1C}"=>"\u9F3B",
-    "\u{2FA1D}"=>"\u{2A600}",
+    "\u00C0"=>"A\u0300", "\u00C1"=>"A\u0301", "\u00C2"=>"A\u0302", "\u00C3"=>"A\u0303", "\u00C4"=>"A\u0308", "\u00C5"=>"A\u030A", "\u00C7"=>"C\u0327", "\u00C8"=>"E\u0300",
+    "\u00C9"=>"E\u0301", "\u00CA"=>"E\u0302", "\u00CB"=>"E\u0308", "\u00CC"=>"I\u0300", "\u00CD"=>"I\u0301", "\u00CE"=>"I\u0302", "\u00CF"=>"I\u0308", "\u00D1"=>"N\u0303",
+    "\u00D2"=>"O\u0300", "\u00D3"=>"O\u0301", "\u00D4"=>"O\u0302", "\u00D5"=>"O\u0303", "\u00D6"=>"O\u0308", "\u00D9"=>"U\u0300", "\u00DA"=>"U\u0301", "\u00DB"=>"U\u0302",
+    "\u00DC"=>"U\u0308", "\u00DD"=>"Y\u0301", "\u00E0"=>"a\u0300", "\u00E1"=>"a\u0301", "\u00E2"=>"a\u0302", "\u00E3"=>"a\u0303", "\u00E4"=>"a\u0308", "\u00E5"=>"a\u030A",
+    "\u00E7"=>"c\u0327", "\u00E8"=>"e\u0300", "\u00E9"=>"e\u0301", "\u00EA"=>"e\u0302", "\u00EB"=>"e\u0308", "\u00EC"=>"i\u0300", "\u00ED"=>"i\u0301", "\u00EE"=>"i\u0302",
+    "\u00EF"=>"i\u0308", "\u00F1"=>"n\u0303", "\u00F2"=>"o\u0300", "\u00F3"=>"o\u0301", "\u00F4"=>"o\u0302", "\u00F5"=>"o\u0303", "\u00F6"=>"o\u0308", "\u00F9"=>"u\u0300",
+    "\u00FA"=>"u\u0301", "\u00FB"=>"u\u0302", "\u00FC"=>"u\u0308", "\u00FD"=>"y\u0301", "\u00FF"=>"y\u0308", "\u0100"=>"A\u0304", "\u0101"=>"a\u0304", "\u0102"=>"A\u0306",
+    "\u0103"=>"a\u0306", "\u0104"=>"A\u0328", "\u0105"=>"a\u0328", "\u0106"=>"C\u0301", "\u0107"=>"c\u0301", "\u0108"=>"C\u0302", "\u0109"=>"c\u0302", "\u010A"=>"C\u0307",
+    "\u010B"=>"c\u0307", "\u010C"=>"C\u030C", "\u010D"=>"c\u030C", "\u010E"=>"D\u030C", "\u010F"=>"d\u030C", "\u0112"=>"E\u0304", "\u0113"=>"e\u0304", "\u0114"=>"E\u0306",
+    "\u0115"=>"e\u0306", "\u0116"=>"E\u0307", "\u0117"=>"e\u0307", "\u0118"=>"E\u0328", "\u0119"=>"e\u0328", "\u011A"=>"E\u030C", "\u011B"=>"e\u030C", "\u011C"=>"G\u0302",
+    "\u011D"=>"g\u0302", "\u011E"=>"G\u0306", "\u011F"=>"g\u0306", "\u0120"=>"G\u0307", "\u0121"=>"g\u0307", "\u0122"=>"G\u0327", "\u0123"=>"g\u0327", "\u0124"=>"H\u0302",
+    "\u0125"=>"h\u0302", "\u0128"=>"I\u0303", "\u0129"=>"i\u0303", "\u012A"=>"I\u0304", "\u012B"=>"i\u0304", "\u012C"=>"I\u0306", "\u012D"=>"i\u0306", "\u012E"=>"I\u0328",
+    "\u012F"=>"i\u0328", "\u0130"=>"I\u0307", "\u0134"=>"J\u0302", "\u0135"=>"j\u0302", "\u0136"=>"K\u0327", "\u0137"=>"k\u0327", "\u0139"=>"L\u0301", "\u013A"=>"l\u0301",
+    "\u013B"=>"L\u0327", "\u013C"=>"l\u0327", "\u013D"=>"L\u030C", "\u013E"=>"l\u030C", "\u0143"=>"N\u0301", "\u0144"=>"n\u0301", "\u0145"=>"N\u0327", "\u0146"=>"n\u0327",
+    "\u0147"=>"N\u030C", "\u0148"=>"n\u030C", "\u014C"=>"O\u0304", "\u014D"=>"o\u0304", "\u014E"=>"O\u0306", "\u014F"=>"o\u0306", "\u0150"=>"O\u030B", "\u0151"=>"o\u030B",
+    "\u0154"=>"R\u0301", "\u0155"=>"r\u0301", "\u0156"=>"R\u0327", "\u0157"=>"r\u0327", "\u0158"=>"R\u030C", "\u0159"=>"r\u030C", "\u015A"=>"S\u0301", "\u015B"=>"s\u0301",
+    "\u015C"=>"S\u0302", "\u015D"=>"s\u0302", "\u015E"=>"S\u0327", "\u015F"=>"s\u0327", "\u0160"=>"S\u030C", "\u0161"=>"s\u030C", "\u0162"=>"T\u0327", "\u0163"=>"t\u0327",
+    "\u0164"=>"T\u030C", "\u0165"=>"t\u030C", "\u0168"=>"U\u0303", "\u0169"=>"u\u0303", "\u016A"=>"U\u0304", "\u016B"=>"u\u0304", "\u016C"=>"U\u0306", "\u016D"=>"u\u0306",
+    "\u016E"=>"U\u030A", "\u016F"=>"u\u030A", "\u0170"=>"U\u030B", "\u0171"=>"u\u030B", "\u0172"=>"U\u0328", "\u0173"=>"u\u0328", "\u0174"=>"W\u0302", "\u0175"=>"w\u0302",
+    "\u0176"=>"Y\u0302", "\u0177"=>"y\u0302", "\u0178"=>"Y\u0308", "\u0179"=>"Z\u0301", "\u017A"=>"z\u0301", "\u017B"=>"Z\u0307", "\u017C"=>"z\u0307", "\u017D"=>"Z\u030C",
+    "\u017E"=>"z\u030C", "\u01A0"=>"O\u031B", "\u01A1"=>"o\u031B", "\u01AF"=>"U\u031B", "\u01B0"=>"u\u031B", "\u01CD"=>"A\u030C", "\u01CE"=>"a\u030C", "\u01CF"=>"I\u030C",
+    "\u01D0"=>"i\u030C", "\u01D1"=>"O\u030C", "\u01D2"=>"o\u030C", "\u01D3"=>"U\u030C", "\u01D4"=>"u\u030C", "\u01D5"=>"U\u0308\u0304", "\u01D6"=>"u\u0308\u0304", "\u01D7"=>"U\u0308\u0301",
+    "\u01D8"=>"u\u0308\u0301", "\u01D9"=>"U\u0308\u030C", "\u01DA"=>"u\u0308\u030C", "\u01DB"=>"U\u0308\u0300", "\u01DC"=>"u\u0308\u0300", "\u01DE"=>"A\u0308\u0304", "\u01DF"=>"a\u0308\u0304", "\u01E0"=>"A\u0307\u0304",
+    "\u01E1"=>"a\u0307\u0304", "\u01E2"=>"\u00C6\u0304", "\u01E3"=>"\u00E6\u0304", "\u01E6"=>"G\u030C", "\u01E7"=>"g\u030C", "\u01E8"=>"K\u030C", "\u01E9"=>"k\u030C", "\u01EA"=>"O\u0328",
+    "\u01EB"=>"o\u0328", "\u01EC"=>"O\u0328\u0304", "\u01ED"=>"o\u0328\u0304", "\u01EE"=>"\u01B7\u030C", "\u01EF"=>"\u0292\u030C", "\u01F0"=>"j\u030C", "\u01F4"=>"G\u0301", "\u01F5"=>"g\u0301",
+    "\u01F8"=>"N\u0300", "\u01F9"=>"n\u0300", "\u01FA"=>"A\u030A\u0301", "\u01FB"=>"a\u030A\u0301", "\u01FC"=>"\u00C6\u0301", "\u01FD"=>"\u00E6\u0301", "\u01FE"=>"\u00D8\u0301", "\u01FF"=>"\u00F8\u0301",
+    "\u0200"=>"A\u030F", "\u0201"=>"a\u030F", "\u0202"=>"A\u0311", "\u0203"=>"a\u0311", "\u0204"=>"E\u030F", "\u0205"=>"e\u030F", "\u0206"=>"E\u0311", "\u0207"=>"e\u0311",
+    "\u0208"=>"I\u030F", "\u0209"=>"i\u030F", "\u020A"=>"I\u0311", "\u020B"=>"i\u0311", "\u020C"=>"O\u030F", "\u020D"=>"o\u030F", "\u020E"=>"O\u0311", "\u020F"=>"o\u0311",
+    "\u0210"=>"R\u030F", "\u0211"=>"r\u030F", "\u0212"=>"R\u0311", "\u0213"=>"r\u0311", "\u0214"=>"U\u030F", "\u0215"=>"u\u030F", "\u0216"=>"U\u0311", "\u0217"=>"u\u0311",
+    "\u0218"=>"S\u0326", "\u0219"=>"s\u0326", "\u021A"=>"T\u0326", "\u021B"=>"t\u0326", "\u021E"=>"H\u030C", "\u021F"=>"h\u030C", "\u0226"=>"A\u0307", "\u0227"=>"a\u0307",
+    "\u0228"=>"E\u0327", "\u0229"=>"e\u0327", "\u022A"=>"O\u0308\u0304", "\u022B"=>"o\u0308\u0304", "\u022C"=>"O\u0303\u0304", "\u022D"=>"o\u0303\u0304", "\u022E"=>"O\u0307", "\u022F"=>"o\u0307",
+    "\u0230"=>"O\u0307\u0304", "\u0231"=>"o\u0307\u0304", "\u0232"=>"Y\u0304", "\u0233"=>"y\u0304", "\u0340"=>"\u0300", "\u0341"=>"\u0301", "\u0343"=>"\u0313", "\u0344"=>"\u0308\u0301",
+    "\u0374"=>"\u02B9", "\u037E"=>";", "\u0385"=>"\u00A8\u0301", "\u0386"=>"\u0391\u0301", "\u0387"=>"\u00B7", "\u0388"=>"\u0395\u0301", "\u0389"=>"\u0397\u0301", "\u038A"=>"\u0399\u0301",
+    "\u038C"=>"\u039F\u0301", "\u038E"=>"\u03A5\u0301", "\u038F"=>"\u03A9\u0301", "\u0390"=>"\u03B9\u0308\u0301", "\u03AA"=>"\u0399\u0308", "\u03AB"=>"\u03A5\u0308", "\u03AC"=>"\u03B1\u0301", "\u03AD"=>"\u03B5\u0301",
+    "\u03AE"=>"\u03B7\u0301", "\u03AF"=>"\u03B9\u0301", "\u03B0"=>"\u03C5\u0308\u0301", "\u03CA"=>"\u03B9\u0308", "\u03CB"=>"\u03C5\u0308", "\u03CC"=>"\u03BF\u0301", "\u03CD"=>"\u03C5\u0301", "\u03CE"=>"\u03C9\u0301",
+    "\u03D3"=>"\u03D2\u0301", "\u03D4"=>"\u03D2\u0308", "\u0400"=>"\u0415\u0300", "\u0401"=>"\u0415\u0308", "\u0403"=>"\u0413\u0301", "\u0407"=>"\u0406\u0308", "\u040C"=>"\u041A\u0301", "\u040D"=>"\u0418\u0300",
+    "\u040E"=>"\u0423\u0306", "\u0419"=>"\u0418\u0306", "\u0439"=>"\u0438\u0306", "\u0450"=>"\u0435\u0300", "\u0451"=>"\u0435\u0308", "\u0453"=>"\u0433\u0301", "\u0457"=>"\u0456\u0308", "\u045C"=>"\u043A\u0301",
+    "\u045D"=>"\u0438\u0300", "\u045E"=>"\u0443\u0306", "\u0476"=>"\u0474\u030F", "\u0477"=>"\u0475\u030F", "\u04C1"=>"\u0416\u0306", "\u04C2"=>"\u0436\u0306", "\u04D0"=>"\u0410\u0306", "\u04D1"=>"\u0430\u0306",
+    "\u04D2"=>"\u0410\u0308", "\u04D3"=>"\u0430\u0308", "\u04D6"=>"\u0415\u0306", "\u04D7"=>"\u0435\u0306", "\u04DA"=>"\u04D8\u0308", "\u04DB"=>"\u04D9\u0308", "\u04DC"=>"\u0416\u0308", "\u04DD"=>"\u0436\u0308",
+    "\u04DE"=>"\u0417\u0308", "\u04DF"=>"\u0437\u0308", "\u04E2"=>"\u0418\u0304", "\u04E3"=>"\u0438\u0304", "\u04E4"=>"\u0418\u0308", "\u04E5"=>"\u0438\u0308", "\u04E6"=>"\u041E\u0308", "\u04E7"=>"\u043E\u0308",
+    "\u04EA"=>"\u04E8\u0308", "\u04EB"=>"\u04E9\u0308", "\u04EC"=>"\u042D\u0308", "\u04ED"=>"\u044D\u0308", "\u04EE"=>"\u0423\u0304", "\u04EF"=>"\u0443\u0304", "\u04F0"=>"\u0423\u0308", "\u04F1"=>"\u0443\u0308",
+    "\u04F2"=>"\u0423\u030B", "\u04F3"=>"\u0443\u030B", "\u04F4"=>"\u0427\u0308", "\u04F5"=>"\u0447\u0308", "\u04F8"=>"\u042B\u0308", "\u04F9"=>"\u044B\u0308", "\u0622"=>"\u0627\u0653", "\u0623"=>"\u0627\u0654",
+    "\u0624"=>"\u0648\u0654", "\u0625"=>"\u0627\u0655", "\u0626"=>"\u064A\u0654", "\u06C0"=>"\u06D5\u0654", "\u06C2"=>"\u06C1\u0654", "\u06D3"=>"\u06D2\u0654", "\u0929"=>"\u0928\u093C", "\u0931"=>"\u0930\u093C",
+    "\u0934"=>"\u0933\u093C", "\u0958"=>"\u0915\u093C", "\u0959"=>"\u0916\u093C", "\u095A"=>"\u0917\u093C", "\u095B"=>"\u091C\u093C", "\u095C"=>"\u0921\u093C", "\u095D"=>"\u0922\u093C", "\u095E"=>"\u092B\u093C",
+    "\u095F"=>"\u092F\u093C", "\u09CB"=>"\u09C7\u09BE", "\u09CC"=>"\u09C7\u09D7", "\u09DC"=>"\u09A1\u09BC", "\u09DD"=>"\u09A2\u09BC", "\u09DF"=>"\u09AF\u09BC", "\u0A33"=>"\u0A32\u0A3C", "\u0A36"=>"\u0A38\u0A3C",
+    "\u0A59"=>"\u0A16\u0A3C", "\u0A5A"=>"\u0A17\u0A3C", "\u0A5B"=>"\u0A1C\u0A3C", "\u0A5E"=>"\u0A2B\u0A3C", "\u0B48"=>"\u0B47\u0B56", "\u0B4B"=>"\u0B47\u0B3E", "\u0B4C"=>"\u0B47\u0B57", "\u0B5C"=>"\u0B21\u0B3C",
+    "\u0B5D"=>"\u0B22\u0B3C", "\u0B94"=>"\u0B92\u0BD7", "\u0BCA"=>"\u0BC6\u0BBE", "\u0BCB"=>"\u0BC7\u0BBE", "\u0BCC"=>"\u0BC6\u0BD7", "\u0C48"=>"\u0C46\u0C56", "\u0CC0"=>"\u0CBF\u0CD5", "\u0CC7"=>"\u0CC6\u0CD5",
+    "\u0CC8"=>"\u0CC6\u0CD6", "\u0CCA"=>"\u0CC6\u0CC2", "\u0CCB"=>"\u0CC6\u0CC2\u0CD5", "\u0D4A"=>"\u0D46\u0D3E", "\u0D4B"=>"\u0D47\u0D3E", "\u0D4C"=>"\u0D46\u0D57", "\u0DDA"=>"\u0DD9\u0DCA", "\u0DDC"=>"\u0DD9\u0DCF",
+    "\u0DDD"=>"\u0DD9\u0DCF\u0DCA", "\u0DDE"=>"\u0DD9\u0DDF", "\u0F43"=>"\u0F42\u0FB7", "\u0F4D"=>"\u0F4C\u0FB7", "\u0F52"=>"\u0F51\u0FB7", "\u0F57"=>"\u0F56\u0FB7", "\u0F5C"=>"\u0F5B\u0FB7", "\u0F69"=>"\u0F40\u0FB5",
+    "\u0F73"=>"\u0F71\u0F72", "\u0F75"=>"\u0F71\u0F74", "\u0F76"=>"\u0FB2\u0F80", "\u0F78"=>"\u0FB3\u0F80", "\u0F81"=>"\u0F71\u0F80", "\u0F93"=>"\u0F92\u0FB7", "\u0F9D"=>"\u0F9C\u0FB7", "\u0FA2"=>"\u0FA1\u0FB7",
+    "\u0FA7"=>"\u0FA6\u0FB7", "\u0FAC"=>"\u0FAB\u0FB7", "\u0FB9"=>"\u0F90\u0FB5", "\u1026"=>"\u1025\u102E", "\u1B06"=>"\u1B05\u1B35", "\u1B08"=>"\u1B07\u1B35", "\u1B0A"=>"\u1B09\u1B35", "\u1B0C"=>"\u1B0B\u1B35",
+    "\u1B0E"=>"\u1B0D\u1B35", "\u1B12"=>"\u1B11\u1B35", "\u1B3B"=>"\u1B3A\u1B35", "\u1B3D"=>"\u1B3C\u1B35", "\u1B40"=>"\u1B3E\u1B35", "\u1B41"=>"\u1B3F\u1B35", "\u1B43"=>"\u1B42\u1B35", "\u1E00"=>"A\u0325",
+    "\u1E01"=>"a\u0325", "\u1E02"=>"B\u0307", "\u1E03"=>"b\u0307", "\u1E04"=>"B\u0323", "\u1E05"=>"b\u0323", "\u1E06"=>"B\u0331", "\u1E07"=>"b\u0331", "\u1E08"=>"C\u0327\u0301",
+    "\u1E09"=>"c\u0327\u0301", "\u1E0A"=>"D\u0307", "\u1E0B"=>"d\u0307", "\u1E0C"=>"D\u0323", "\u1E0D"=>"d\u0323", "\u1E0E"=>"D\u0331", "\u1E0F"=>"d\u0331", "\u1E10"=>"D\u0327",
+    "\u1E11"=>"d\u0327", "\u1E12"=>"D\u032D", "\u1E13"=>"d\u032D", "\u1E14"=>"E\u0304\u0300", "\u1E15"=>"e\u0304\u0300", "\u1E16"=>"E\u0304\u0301", "\u1E17"=>"e\u0304\u0301", "\u1E18"=>"E\u032D",
+    "\u1E19"=>"e\u032D", "\u1E1A"=>"E\u0330", "\u1E1B"=>"e\u0330", "\u1E1C"=>"E\u0327\u0306", "\u1E1D"=>"e\u0327\u0306", "\u1E1E"=>"F\u0307", "\u1E1F"=>"f\u0307", "\u1E20"=>"G\u0304",
+    "\u1E21"=>"g\u0304", "\u1E22"=>"H\u0307", "\u1E23"=>"h\u0307", "\u1E24"=>"H\u0323", "\u1E25"=>"h\u0323", "\u1E26"=>"H\u0308", "\u1E27"=>"h\u0308", "\u1E28"=>"H\u0327",
+    "\u1E29"=>"h\u0327", "\u1E2A"=>"H\u032E", "\u1E2B"=>"h\u032E", "\u1E2C"=>"I\u0330", "\u1E2D"=>"i\u0330", "\u1E2E"=>"I\u0308\u0301", "\u1E2F"=>"i\u0308\u0301", "\u1E30"=>"K\u0301",
+    "\u1E31"=>"k\u0301", "\u1E32"=>"K\u0323", "\u1E33"=>"k\u0323", "\u1E34"=>"K\u0331", "\u1E35"=>"k\u0331", "\u1E36"=>"L\u0323", "\u1E37"=>"l\u0323", "\u1E38"=>"L\u0323\u0304",
+    "\u1E39"=>"l\u0323\u0304", "\u1E3A"=>"L\u0331", "\u1E3B"=>"l\u0331", "\u1E3C"=>"L\u032D", "\u1E3D"=>"l\u032D", "\u1E3E"=>"M\u0301", "\u1E3F"=>"m\u0301", "\u1E40"=>"M\u0307",
+    "\u1E41"=>"m\u0307", "\u1E42"=>"M\u0323", "\u1E43"=>"m\u0323", "\u1E44"=>"N\u0307", "\u1E45"=>"n\u0307", "\u1E46"=>"N\u0323", "\u1E47"=>"n\u0323", "\u1E48"=>"N\u0331",
+    "\u1E49"=>"n\u0331", "\u1E4A"=>"N\u032D", "\u1E4B"=>"n\u032D", "\u1E4C"=>"O\u0303\u0301", "\u1E4D"=>"o\u0303\u0301", "\u1E4E"=>"O\u0303\u0308", "\u1E4F"=>"o\u0303\u0308", "\u1E50"=>"O\u0304\u0300",
+    "\u1E51"=>"o\u0304\u0300", "\u1E52"=>"O\u0304\u0301", "\u1E53"=>"o\u0304\u0301", "\u1E54"=>"P\u0301", "\u1E55"=>"p\u0301", "\u1E56"=>"P\u0307", "\u1E57"=>"p\u0307", "\u1E58"=>"R\u0307",
+    "\u1E59"=>"r\u0307", "\u1E5A"=>"R\u0323", "\u1E5B"=>"r\u0323", "\u1E5C"=>"R\u0323\u0304", "\u1E5D"=>"r\u0323\u0304", "\u1E5E"=>"R\u0331", "\u1E5F"=>"r\u0331", "\u1E60"=>"S\u0307",
+    "\u1E61"=>"s\u0307", "\u1E62"=>"S\u0323", "\u1E63"=>"s\u0323", "\u1E64"=>"S\u0301\u0307", "\u1E65"=>"s\u0301\u0307", "\u1E66"=>"S\u030C\u0307", "\u1E67"=>"s\u030C\u0307", "\u1E68"=>"S\u0323\u0307",
+    "\u1E69"=>"s\u0323\u0307", "\u1E6A"=>"T\u0307", "\u1E6B"=>"t\u0307", "\u1E6C"=>"T\u0323", "\u1E6D"=>"t\u0323", "\u1E6E"=>"T\u0331", "\u1E6F"=>"t\u0331", "\u1E70"=>"T\u032D",
+    "\u1E71"=>"t\u032D", "\u1E72"=>"U\u0324", "\u1E73"=>"u\u0324", "\u1E74"=>"U\u0330", "\u1E75"=>"u\u0330", "\u1E76"=>"U\u032D", "\u1E77"=>"u\u032D", "\u1E78"=>"U\u0303\u0301",
+    "\u1E79"=>"u\u0303\u0301", "\u1E7A"=>"U\u0304\u0308", "\u1E7B"=>"u\u0304\u0308", "\u1E7C"=>"V\u0303", "\u1E7D"=>"v\u0303", "\u1E7E"=>"V\u0323", "\u1E7F"=>"v\u0323", "\u1E80"=>"W\u0300",
+    "\u1E81"=>"w\u0300", "\u1E82"=>"W\u0301", "\u1E83"=>"w\u0301", "\u1E84"=>"W\u0308", "\u1E85"=>"w\u0308", "\u1E86"=>"W\u0307", "\u1E87"=>"w\u0307", "\u1E88"=>"W\u0323",
+    "\u1E89"=>"w\u0323", "\u1E8A"=>"X\u0307", "\u1E8B"=>"x\u0307", "\u1E8C"=>"X\u0308", "\u1E8D"=>"x\u0308", "\u1E8E"=>"Y\u0307", "\u1E8F"=>"y\u0307", "\u1E90"=>"Z\u0302",
+    "\u1E91"=>"z\u0302", "\u1E92"=>"Z\u0323", "\u1E93"=>"z\u0323", "\u1E94"=>"Z\u0331", "\u1E95"=>"z\u0331", "\u1E96"=>"h\u0331", "\u1E97"=>"t\u0308", "\u1E98"=>"w\u030A",
+    "\u1E99"=>"y\u030A", "\u1E9B"=>"\u017F\u0307", "\u1EA0"=>"A\u0323", "\u1EA1"=>"a\u0323", "\u1EA2"=>"A\u0309", "\u1EA3"=>"a\u0309", "\u1EA4"=>"A\u0302\u0301", "\u1EA5"=>"a\u0302\u0301",
+    "\u1EA6"=>"A\u0302\u0300", "\u1EA7"=>"a\u0302\u0300", "\u1EA8"=>"A\u0302\u0309", "\u1EA9"=>"a\u0302\u0309", "\u1EAA"=>"A\u0302\u0303", "\u1EAB"=>"a\u0302\u0303", "\u1EAC"=>"A\u0323\u0302", "\u1EAD"=>"a\u0323\u0302",
+    "\u1EAE"=>"A\u0306\u0301", "\u1EAF"=>"a\u0306\u0301", "\u1EB0"=>"A\u0306\u0300", "\u1EB1"=>"a\u0306\u0300", "\u1EB2"=>"A\u0306\u0309", "\u1EB3"=>"a\u0306\u0309", "\u1EB4"=>"A\u0306\u0303", "\u1EB5"=>"a\u0306\u0303",
+    "\u1EB6"=>"A\u0323\u0306", "\u1EB7"=>"a\u0323\u0306", "\u1EB8"=>"E\u0323", "\u1EB9"=>"e\u0323", "\u1EBA"=>"E\u0309", "\u1EBB"=>"e\u0309", "\u1EBC"=>"E\u0303", "\u1EBD"=>"e\u0303",
+    "\u1EBE"=>"E\u0302\u0301", "\u1EBF"=>"e\u0302\u0301", "\u1EC0"=>"E\u0302\u0300", "\u1EC1"=>"e\u0302\u0300", "\u1EC2"=>"E\u0302\u0309", "\u1EC3"=>"e\u0302\u0309", "\u1EC4"=>"E\u0302\u0303", "\u1EC5"=>"e\u0302\u0303",
+    "\u1EC6"=>"E\u0323\u0302", "\u1EC7"=>"e\u0323\u0302", "\u1EC8"=>"I\u0309", "\u1EC9"=>"i\u0309", "\u1ECA"=>"I\u0323", "\u1ECB"=>"i\u0323", "\u1ECC"=>"O\u0323", "\u1ECD"=>"o\u0323",
+    "\u1ECE"=>"O\u0309", "\u1ECF"=>"o\u0309", "\u1ED0"=>"O\u0302\u0301", "\u1ED1"=>"o\u0302\u0301", "\u1ED2"=>"O\u0302\u0300", "\u1ED3"=>"o\u0302\u0300", "\u1ED4"=>"O\u0302\u0309", "\u1ED5"=>"o\u0302\u0309",
+    "\u1ED6"=>"O\u0302\u0303", "\u1ED7"=>"o\u0302\u0303", "\u1ED8"=>"O\u0323\u0302", "\u1ED9"=>"o\u0323\u0302", "\u1EDA"=>"O\u031B\u0301", "\u1EDB"=>"o\u031B\u0301", "\u1EDC"=>"O\u031B\u0300", "\u1EDD"=>"o\u031B\u0300",
+    "\u1EDE"=>"O\u031B\u0309", "\u1EDF"=>"o\u031B\u0309", "\u1EE0"=>"O\u031B\u0303", "\u1EE1"=>"o\u031B\u0303", "\u1EE2"=>"O\u031B\u0323", "\u1EE3"=>"o\u031B\u0323", "\u1EE4"=>"U\u0323", "\u1EE5"=>"u\u0323",
+    "\u1EE6"=>"U\u0309", "\u1EE7"=>"u\u0309", "\u1EE8"=>"U\u031B\u0301", "\u1EE9"=>"u\u031B\u0301", "\u1EEA"=>"U\u031B\u0300", "\u1EEB"=>"u\u031B\u0300", "\u1EEC"=>"U\u031B\u0309", "\u1EED"=>"u\u031B\u0309",
+    "\u1EEE"=>"U\u031B\u0303", "\u1EEF"=>"u\u031B\u0303", "\u1EF0"=>"U\u031B\u0323", "\u1EF1"=>"u\u031B\u0323", "\u1EF2"=>"Y\u0300", "\u1EF3"=>"y\u0300", "\u1EF4"=>"Y\u0323", "\u1EF5"=>"y\u0323",
+    "\u1EF6"=>"Y\u0309", "\u1EF7"=>"y\u0309", "\u1EF8"=>"Y\u0303", "\u1EF9"=>"y\u0303", "\u1F00"=>"\u03B1\u0313", "\u1F01"=>"\u03B1\u0314", "\u1F02"=>"\u03B1\u0313\u0300", "\u1F03"=>"\u03B1\u0314\u0300",
+    "\u1F04"=>"\u03B1\u0313\u0301", "\u1F05"=>"\u03B1\u0314\u0301", "\u1F06"=>"\u03B1\u0313\u0342", "\u1F07"=>"\u03B1\u0314\u0342", "\u1F08"=>"\u0391\u0313", "\u1F09"=>"\u0391\u0314", "\u1F0A"=>"\u0391\u0313\u0300", "\u1F0B"=>"\u0391\u0314\u0300",
+    "\u1F0C"=>"\u0391\u0313\u0301", "\u1F0D"=>"\u0391\u0314\u0301", "\u1F0E"=>"\u0391\u0313\u0342", "\u1F0F"=>"\u0391\u0314\u0342", "\u1F10"=>"\u03B5\u0313", "\u1F11"=>"\u03B5\u0314", "\u1F12"=>"\u03B5\u0313\u0300", "\u1F13"=>"\u03B5\u0314\u0300",
+    "\u1F14"=>"\u03B5\u0313\u0301", "\u1F15"=>"\u03B5\u0314\u0301", "\u1F18"=>"\u0395\u0313", "\u1F19"=>"\u0395\u0314", "\u1F1A"=>"\u0395\u0313\u0300", "\u1F1B"=>"\u0395\u0314\u0300", "\u1F1C"=>"\u0395\u0313\u0301", "\u1F1D"=>"\u0395\u0314\u0301",
+    "\u1F20"=>"\u03B7\u0313", "\u1F21"=>"\u03B7\u0314", "\u1F22"=>"\u03B7\u0313\u0300", "\u1F23"=>"\u03B7\u0314\u0300", "\u1F24"=>"\u03B7\u0313\u0301", "\u1F25"=>"\u03B7\u0314\u0301", "\u1F26"=>"\u03B7\u0313\u0342", "\u1F27"=>"\u03B7\u0314\u0342",
+    "\u1F28"=>"\u0397\u0313", "\u1F29"=>"\u0397\u0314", "\u1F2A"=>"\u0397\u0313\u0300", "\u1F2B"=>"\u0397\u0314\u0300", "\u1F2C"=>"\u0397\u0313\u0301", "\u1F2D"=>"\u0397\u0314\u0301", "\u1F2E"=>"\u0397\u0313\u0342", "\u1F2F"=>"\u0397\u0314\u0342",
+    "\u1F30"=>"\u03B9\u0313", "\u1F31"=>"\u03B9\u0314", "\u1F32"=>"\u03B9\u0313\u0300", "\u1F33"=>"\u03B9\u0314\u0300", "\u1F34"=>"\u03B9\u0313\u0301", "\u1F35"=>"\u03B9\u0314\u0301", "\u1F36"=>"\u03B9\u0313\u0342", "\u1F37"=>"\u03B9\u0314\u0342",
+    "\u1F38"=>"\u0399\u0313", "\u1F39"=>"\u0399\u0314", "\u1F3A"=>"\u0399\u0313\u0300", "\u1F3B"=>"\u0399\u0314\u0300", "\u1F3C"=>"\u0399\u0313\u0301", "\u1F3D"=>"\u0399\u0314\u0301", "\u1F3E"=>"\u0399\u0313\u0342", "\u1F3F"=>"\u0399\u0314\u0342",
+    "\u1F40"=>"\u03BF\u0313", "\u1F41"=>"\u03BF\u0314", "\u1F42"=>"\u03BF\u0313\u0300", "\u1F43"=>"\u03BF\u0314\u0300", "\u1F44"=>"\u03BF\u0313\u0301", "\u1F45"=>"\u03BF\u0314\u0301", "\u1F48"=>"\u039F\u0313", "\u1F49"=>"\u039F\u0314",
+    "\u1F4A"=>"\u039F\u0313\u0300", "\u1F4B"=>"\u039F\u0314\u0300", "\u1F4C"=>"\u039F\u0313\u0301", "\u1F4D"=>"\u039F\u0314\u0301", "\u1F50"=>"\u03C5\u0313", "\u1F51"=>"\u03C5\u0314", "\u1F52"=>"\u03C5\u0313\u0300", "\u1F53"=>"\u03C5\u0314\u0300",
+    "\u1F54"=>"\u03C5\u0313\u0301", "\u1F55"=>"\u03C5\u0314\u0301", "\u1F56"=>"\u03C5\u0313\u0342", "\u1F57"=>"\u03C5\u0314\u0342", "\u1F59"=>"\u03A5\u0314", "\u1F5B"=>"\u03A5\u0314\u0300", "\u1F5D"=>"\u03A5\u0314\u0301", "\u1F5F"=>"\u03A5\u0314\u0342",
+    "\u1F60"=>"\u03C9\u0313", "\u1F61"=>"\u03C9\u0314", "\u1F62"=>"\u03C9\u0313\u0300", "\u1F63"=>"\u03C9\u0314\u0300", "\u1F64"=>"\u03C9\u0313\u0301", "\u1F65"=>"\u03C9\u0314\u0301", "\u1F66"=>"\u03C9\u0313\u0342", "\u1F67"=>"\u03C9\u0314\u0342",
+    "\u1F68"=>"\u03A9\u0313", "\u1F69"=>"\u03A9\u0314", "\u1F6A"=>"\u03A9\u0313\u0300", "\u1F6B"=>"\u03A9\u0314\u0300", "\u1F6C"=>"\u03A9\u0313\u0301", "\u1F6D"=>"\u03A9\u0314\u0301", "\u1F6E"=>"\u03A9\u0313\u0342", "\u1F6F"=>"\u03A9\u0314\u0342",
+    "\u1F70"=>"\u03B1\u0300", "\u1F71"=>"\u03B1\u0301", "\u1F72"=>"\u03B5\u0300", "\u1F73"=>"\u03B5\u0301", "\u1F74"=>"\u03B7\u0300", "\u1F75"=>"\u03B7\u0301", "\u1F76"=>"\u03B9\u0300", "\u1F77"=>"\u03B9\u0301",
+    "\u1F78"=>"\u03BF\u0300", "\u1F79"=>"\u03BF\u0301", "\u1F7A"=>"\u03C5\u0300", "\u1F7B"=>"\u03C5\u0301", "\u1F7C"=>"\u03C9\u0300", "\u1F7D"=>"\u03C9\u0301", "\u1F80"=>"\u03B1\u0313\u0345", "\u1F81"=>"\u03B1\u0314\u0345",
+    "\u1F82"=>"\u03B1\u0313\u0300\u0345", "\u1F83"=>"\u03B1\u0314\u0300\u0345", "\u1F84"=>"\u03B1\u0313\u0301\u0345", "\u1F85"=>"\u03B1\u0314\u0301\u0345", "\u1F86"=>"\u03B1\u0313\u0342\u0345", "\u1F87"=>"\u03B1\u0314\u0342\u0345", "\u1F88"=>"\u0391\u0313\u0345", "\u1F89"=>"\u0391\u0314\u0345",
+    "\u1F8A"=>"\u0391\u0313\u0300\u0345", "\u1F8B"=>"\u0391\u0314\u0300\u0345", "\u1F8C"=>"\u0391\u0313\u0301\u0345", "\u1F8D"=>"\u0391\u0314\u0301\u0345", "\u1F8E"=>"\u0391\u0313\u0342\u0345", "\u1F8F"=>"\u0391\u0314\u0342\u0345", "\u1F90"=>"\u03B7\u0313\u0345", "\u1F91"=>"\u03B7\u0314\u0345",
+    "\u1F92"=>"\u03B7\u0313\u0300\u0345", "\u1F93"=>"\u03B7\u0314\u0300\u0345", "\u1F94"=>"\u03B7\u0313\u0301\u0345", "\u1F95"=>"\u03B7\u0314\u0301\u0345", "\u1F96"=>"\u03B7\u0313\u0342\u0345", "\u1F97"=>"\u03B7\u0314\u0342\u0345", "\u1F98"=>"\u0397\u0313\u0345", "\u1F99"=>"\u0397\u0314\u0345",
+    "\u1F9A"=>"\u0397\u0313\u0300\u0345", "\u1F9B"=>"\u0397\u0314\u0300\u0345", "\u1F9C"=>"\u0397\u0313\u0301\u0345", "\u1F9D"=>"\u0397\u0314\u0301\u0345", "\u1F9E"=>"\u0397\u0313\u0342\u0345", "\u1F9F"=>"\u0397\u0314\u0342\u0345", "\u1FA0"=>"\u03C9\u0313\u0345", "\u1FA1"=>"\u03C9\u0314\u0345",
+    "\u1FA2"=>"\u03C9\u0313\u0300\u0345", "\u1FA3"=>"\u03C9\u0314\u0300\u0345", "\u1FA4"=>"\u03C9\u0313\u0301\u0345", "\u1FA5"=>"\u03C9\u0314\u0301\u0345", "\u1FA6"=>"\u03C9\u0313\u0342\u0345", "\u1FA7"=>"\u03C9\u0314\u0342\u0345", "\u1FA8"=>"\u03A9\u0313\u0345", "\u1FA9"=>"\u03A9\u0314\u0345",
+    "\u1FAA"=>"\u03A9\u0313\u0300\u0345", "\u1FAB"=>"\u03A9\u0314\u0300\u0345", "\u1FAC"=>"\u03A9\u0313\u0301\u0345", "\u1FAD"=>"\u03A9\u0314\u0301\u0345", "\u1FAE"=>"\u03A9\u0313\u0342\u0345", "\u1FAF"=>"\u03A9\u0314\u0342\u0345", "\u1FB0"=>"\u03B1\u0306", "\u1FB1"=>"\u03B1\u0304",
+    "\u1FB2"=>"\u03B1\u0300\u0345", "\u1FB3"=>"\u03B1\u0345", "\u1FB4"=>"\u03B1\u0301\u0345", "\u1FB6"=>"\u03B1\u0342", "\u1FB7"=>"\u03B1\u0342\u0345", "\u1FB8"=>"\u0391\u0306", "\u1FB9"=>"\u0391\u0304", "\u1FBA"=>"\u0391\u0300",
+    "\u1FBB"=>"\u0391\u0301", "\u1FBC"=>"\u0391\u0345", "\u1FBE"=>"\u03B9", "\u1FC1"=>"\u00A8\u0342", "\u1FC2"=>"\u03B7\u0300\u0345", "\u1FC3"=>"\u03B7\u0345", "\u1FC4"=>"\u03B7\u0301\u0345", "\u1FC6"=>"\u03B7\u0342",
+    "\u1FC7"=>"\u03B7\u0342\u0345", "\u1FC8"=>"\u0395\u0300", "\u1FC9"=>"\u0395\u0301", "\u1FCA"=>"\u0397\u0300", "\u1FCB"=>"\u0397\u0301", "\u1FCC"=>"\u0397\u0345", "\u1FCD"=>"\u1FBF\u0300", "\u1FCE"=>"\u1FBF\u0301",
+    "\u1FCF"=>"\u1FBF\u0342", "\u1FD0"=>"\u03B9\u0306", "\u1FD1"=>"\u03B9\u0304", "\u1FD2"=>"\u03B9\u0308\u0300", "\u1FD3"=>"\u03B9\u0308\u0301", "\u1FD6"=>"\u03B9\u0342", "\u1FD7"=>"\u03B9\u0308\u0342", "\u1FD8"=>"\u0399\u0306",
+    "\u1FD9"=>"\u0399\u0304", "\u1FDA"=>"\u0399\u0300", "\u1FDB"=>"\u0399\u0301", "\u1FDD"=>"\u1FFE\u0300", "\u1FDE"=>"\u1FFE\u0301", "\u1FDF"=>"\u1FFE\u0342", "\u1FE0"=>"\u03C5\u0306", "\u1FE1"=>"\u03C5\u0304",
+    "\u1FE2"=>"\u03C5\u0308\u0300", "\u1FE3"=>"\u03C5\u0308\u0301", "\u1FE4"=>"\u03C1\u0313", "\u1FE5"=>"\u03C1\u0314", "\u1FE6"=>"\u03C5\u0342", "\u1FE7"=>"\u03C5\u0308\u0342", "\u1FE8"=>"\u03A5\u0306", "\u1FE9"=>"\u03A5\u0304",
+    "\u1FEA"=>"\u03A5\u0300", "\u1FEB"=>"\u03A5\u0301", "\u1FEC"=>"\u03A1\u0314", "\u1FED"=>"\u00A8\u0300", "\u1FEE"=>"\u00A8\u0301", "\u1FEF"=>"`", "\u1FF2"=>"\u03C9\u0300\u0345", "\u1FF3"=>"\u03C9\u0345",
+    "\u1FF4"=>"\u03C9\u0301\u0345", "\u1FF6"=>"\u03C9\u0342", "\u1FF7"=>"\u03C9\u0342\u0345", "\u1FF8"=>"\u039F\u0300", "\u1FF9"=>"\u039F\u0301", "\u1FFA"=>"\u03A9\u0300", "\u1FFB"=>"\u03A9\u0301", "\u1FFC"=>"\u03A9\u0345",
+    "\u1FFD"=>"\u00B4", "\u2000"=>"\u2002", "\u2001"=>"\u2003", "\u2126"=>"\u03A9", "\u212A"=>"K", "\u212B"=>"A\u030A", "\u219A"=>"\u2190\u0338", "\u219B"=>"\u2192\u0338",
+    "\u21AE"=>"\u2194\u0338", "\u21CD"=>"\u21D0\u0338", "\u21CE"=>"\u21D4\u0338", "\u21CF"=>"\u21D2\u0338", "\u2204"=>"\u2203\u0338", "\u2209"=>"\u2208\u0338", "\u220C"=>"\u220B\u0338", "\u2224"=>"\u2223\u0338",
+    "\u2226"=>"\u2225\u0338", "\u2241"=>"\u223C\u0338", "\u2244"=>"\u2243\u0338", "\u2247"=>"\u2245\u0338", "\u2249"=>"\u2248\u0338", "\u2260"=>"=\u0338", "\u2262"=>"\u2261\u0338", "\u226D"=>"\u224D\u0338",
+    "\u226E"=>"<\u0338", "\u226F"=>">\u0338", "\u2270"=>"\u2264\u0338", "\u2271"=>"\u2265\u0338", "\u2274"=>"\u2272\u0338", "\u2275"=>"\u2273\u0338", "\u2278"=>"\u2276\u0338", "\u2279"=>"\u2277\u0338",
+    "\u2280"=>"\u227A\u0338", "\u2281"=>"\u227B\u0338", "\u2284"=>"\u2282\u0338", "\u2285"=>"\u2283\u0338", "\u2288"=>"\u2286\u0338", "\u2289"=>"\u2287\u0338", "\u22AC"=>"\u22A2\u0338", "\u22AD"=>"\u22A8\u0338",
+    "\u22AE"=>"\u22A9\u0338", "\u22AF"=>"\u22AB\u0338", "\u22E0"=>"\u227C\u0338", "\u22E1"=>"\u227D\u0338", "\u22E2"=>"\u2291\u0338", "\u22E3"=>"\u2292\u0338", "\u22EA"=>"\u22B2\u0338", "\u22EB"=>"\u22B3\u0338",
+    "\u22EC"=>"\u22B4\u0338", "\u22ED"=>"\u22B5\u0338", "\u2329"=>"\u3008", "\u232A"=>"\u3009", "\u2ADC"=>"\u2ADD\u0338", "\u304C"=>"\u304B\u3099", "\u304E"=>"\u304D\u3099", "\u3050"=>"\u304F\u3099",
+    "\u3052"=>"\u3051\u3099", "\u3054"=>"\u3053\u3099", "\u3056"=>"\u3055\u3099", "\u3058"=>"\u3057\u3099", "\u305A"=>"\u3059\u3099", "\u305C"=>"\u305B\u3099", "\u305E"=>"\u305D\u3099", "\u3060"=>"\u305F\u3099",
+    "\u3062"=>"\u3061\u3099", "\u3065"=>"\u3064\u3099", "\u3067"=>"\u3066\u3099", "\u3069"=>"\u3068\u3099", "\u3070"=>"\u306F\u3099", "\u3071"=>"\u306F\u309A", "\u3073"=>"\u3072\u3099", "\u3074"=>"\u3072\u309A",
+    "\u3076"=>"\u3075\u3099", "\u3077"=>"\u3075\u309A", "\u3079"=>"\u3078\u3099", "\u307A"=>"\u3078\u309A", "\u307C"=>"\u307B\u3099", "\u307D"=>"\u307B\u309A", "\u3094"=>"\u3046\u3099", "\u309E"=>"\u309D\u3099",
+    "\u30AC"=>"\u30AB\u3099", "\u30AE"=>"\u30AD\u3099", "\u30B0"=>"\u30AF\u3099", "\u30B2"=>"\u30B1\u3099", "\u30B4"=>"\u30B3\u3099", "\u30B6"=>"\u30B5\u3099", "\u30B8"=>"\u30B7\u3099", "\u30BA"=>"\u30B9\u3099",
+    "\u30BC"=>"\u30BB\u3099", "\u30BE"=>"\u30BD\u3099", "\u30C0"=>"\u30BF\u3099", "\u30C2"=>"\u30C1\u3099", "\u30C5"=>"\u30C4\u3099", "\u30C7"=>"\u30C6\u3099", "\u30C9"=>"\u30C8\u3099", "\u30D0"=>"\u30CF\u3099",
+    "\u30D1"=>"\u30CF\u309A", "\u30D3"=>"\u30D2\u3099", "\u30D4"=>"\u30D2\u309A", "\u30D6"=>"\u30D5\u3099", "\u30D7"=>"\u30D5\u309A", "\u30D9"=>"\u30D8\u3099", "\u30DA"=>"\u30D8\u309A", "\u30DC"=>"\u30DB\u3099",
+    "\u30DD"=>"\u30DB\u309A", "\u30F4"=>"\u30A6\u3099", "\u30F7"=>"\u30EF\u3099", "\u30F8"=>"\u30F0\u3099", "\u30F9"=>"\u30F1\u3099", "\u30FA"=>"\u30F2\u3099", "\u30FE"=>"\u30FD\u3099", "\uF900"=>"\u8C48",
+    "\uF901"=>"\u66F4", "\uF902"=>"\u8ECA", "\uF903"=>"\u8CC8", "\uF904"=>"\u6ED1", "\uF905"=>"\u4E32", "\uF906"=>"\u53E5", "\uF907"=>"\u9F9C", "\uF908"=>"\u9F9C",
+    "\uF909"=>"\u5951", "\uF90A"=>"\u91D1", "\uF90B"=>"\u5587", "\uF90C"=>"\u5948", "\uF90D"=>"\u61F6", "\uF90E"=>"\u7669", "\uF90F"=>"\u7F85", "\uF910"=>"\u863F",
+    "\uF911"=>"\u87BA", "\uF912"=>"\u88F8", "\uF913"=>"\u908F", "\uF914"=>"\u6A02", "\uF915"=>"\u6D1B", "\uF916"=>"\u70D9", "\uF917"=>"\u73DE", "\uF918"=>"\u843D",
+    "\uF919"=>"\u916A", "\uF91A"=>"\u99F1", "\uF91B"=>"\u4E82", "\uF91C"=>"\u5375", "\uF91D"=>"\u6B04", "\uF91E"=>"\u721B", "\uF91F"=>"\u862D", "\uF920"=>"\u9E1E",
+    "\uF921"=>"\u5D50", "\uF922"=>"\u6FEB", "\uF923"=>"\u85CD", "\uF924"=>"\u8964", "\uF925"=>"\u62C9", "\uF926"=>"\u81D8", "\uF927"=>"\u881F", "\uF928"=>"\u5ECA",
+    "\uF929"=>"\u6717", "\uF92A"=>"\u6D6A", "\uF92B"=>"\u72FC", "\uF92C"=>"\u90CE", "\uF92D"=>"\u4F86", "\uF92E"=>"\u51B7", "\uF92F"=>"\u52DE", "\uF930"=>"\u64C4",
+    "\uF931"=>"\u6AD3", "\uF932"=>"\u7210", "\uF933"=>"\u76E7", "\uF934"=>"\u8001", "\uF935"=>"\u8606", "\uF936"=>"\u865C", "\uF937"=>"\u8DEF", "\uF938"=>"\u9732",
+    "\uF939"=>"\u9B6F", "\uF93A"=>"\u9DFA", "\uF93B"=>"\u788C", "\uF93C"=>"\u797F", "\uF93D"=>"\u7DA0", "\uF93E"=>"\u83C9", "\uF93F"=>"\u9304", "\uF940"=>"\u9E7F",
+    "\uF941"=>"\u8AD6", "\uF942"=>"\u58DF", "\uF943"=>"\u5F04", "\uF944"=>"\u7C60", "\uF945"=>"\u807E", "\uF946"=>"\u7262", "\uF947"=>"\u78CA", "\uF948"=>"\u8CC2",
+    "\uF949"=>"\u96F7", "\uF94A"=>"\u58D8", "\uF94B"=>"\u5C62", "\uF94C"=>"\u6A13", "\uF94D"=>"\u6DDA", "\uF94E"=>"\u6F0F", "\uF94F"=>"\u7D2F", "\uF950"=>"\u7E37",
+    "\uF951"=>"\u964B", "\uF952"=>"\u52D2", "\uF953"=>"\u808B", "\uF954"=>"\u51DC", "\uF955"=>"\u51CC", "\uF956"=>"\u7A1C", "\uF957"=>"\u7DBE", "\uF958"=>"\u83F1",
+    "\uF959"=>"\u9675", "\uF95A"=>"\u8B80", "\uF95B"=>"\u62CF", "\uF95C"=>"\u6A02", "\uF95D"=>"\u8AFE", "\uF95E"=>"\u4E39", "\uF95F"=>"\u5BE7", "\uF960"=>"\u6012",
+    "\uF961"=>"\u7387", "\uF962"=>"\u7570", "\uF963"=>"\u5317", "\uF964"=>"\u78FB", "\uF965"=>"\u4FBF", "\uF966"=>"\u5FA9", "\uF967"=>"\u4E0D", "\uF968"=>"\u6CCC",
+    "\uF969"=>"\u6578", "\uF96A"=>"\u7D22", "\uF96B"=>"\u53C3", "\uF96C"=>"\u585E", "\uF96D"=>"\u7701", "\uF96E"=>"\u8449", "\uF96F"=>"\u8AAA", "\uF970"=>"\u6BBA",
+    "\uF971"=>"\u8FB0", "\uF972"=>"\u6C88", "\uF973"=>"\u62FE", "\uF974"=>"\u82E5", "\uF975"=>"\u63A0", "\uF976"=>"\u7565", "\uF977"=>"\u4EAE", "\uF978"=>"\u5169",
+    "\uF979"=>"\u51C9", "\uF97A"=>"\u6881", "\uF97B"=>"\u7CE7", "\uF97C"=>"\u826F", "\uF97D"=>"\u8AD2", "\uF97E"=>"\u91CF", "\uF97F"=>"\u52F5", "\uF980"=>"\u5442",
+    "\uF981"=>"\u5973", "\uF982"=>"\u5EEC", "\uF983"=>"\u65C5", "\uF984"=>"\u6FFE", "\uF985"=>"\u792A", "\uF986"=>"\u95AD", "\uF987"=>"\u9A6A", "\uF988"=>"\u9E97",
+    "\uF989"=>"\u9ECE", "\uF98A"=>"\u529B", "\uF98B"=>"\u66C6", "\uF98C"=>"\u6B77", "\uF98D"=>"\u8F62", "\uF98E"=>"\u5E74", "\uF98F"=>"\u6190", "\uF990"=>"\u6200",
+    "\uF991"=>"\u649A", "\uF992"=>"\u6F23", "\uF993"=>"\u7149", "\uF994"=>"\u7489", "\uF995"=>"\u79CA", "\uF996"=>"\u7DF4", "\uF997"=>"\u806F", "\uF998"=>"\u8F26",
+    "\uF999"=>"\u84EE", "\uF99A"=>"\u9023", "\uF99B"=>"\u934A", "\uF99C"=>"\u5217", "\uF99D"=>"\u52A3", "\uF99E"=>"\u54BD", "\uF99F"=>"\u70C8", "\uF9A0"=>"\u88C2",
+    "\uF9A1"=>"\u8AAA", "\uF9A2"=>"\u5EC9", "\uF9A3"=>"\u5FF5", "\uF9A4"=>"\u637B", "\uF9A5"=>"\u6BAE", "\uF9A6"=>"\u7C3E", "\uF9A7"=>"\u7375", "\uF9A8"=>"\u4EE4",
+    "\uF9A9"=>"\u56F9", "\uF9AA"=>"\u5BE7", "\uF9AB"=>"\u5DBA", "\uF9AC"=>"\u601C", "\uF9AD"=>"\u73B2", "\uF9AE"=>"\u7469", "\uF9AF"=>"\u7F9A", "\uF9B0"=>"\u8046",
+    "\uF9B1"=>"\u9234", "\uF9B2"=>"\u96F6", "\uF9B3"=>"\u9748", "\uF9B4"=>"\u9818", "\uF9B5"=>"\u4F8B", "\uF9B6"=>"\u79AE", "\uF9B7"=>"\u91B4", "\uF9B8"=>"\u96B8",
+    "\uF9B9"=>"\u60E1", "\uF9BA"=>"\u4E86", "\uF9BB"=>"\u50DA", "\uF9BC"=>"\u5BEE", "\uF9BD"=>"\u5C3F", "\uF9BE"=>"\u6599", "\uF9BF"=>"\u6A02", "\uF9C0"=>"\u71CE",
+    "\uF9C1"=>"\u7642", "\uF9C2"=>"\u84FC", "\uF9C3"=>"\u907C", "\uF9C4"=>"\u9F8D", "\uF9C5"=>"\u6688", "\uF9C6"=>"\u962E", "\uF9C7"=>"\u5289", "\uF9C8"=>"\u677B",
+    "\uF9C9"=>"\u67F3", "\uF9CA"=>"\u6D41", "\uF9CB"=>"\u6E9C", "\uF9CC"=>"\u7409", "\uF9CD"=>"\u7559", "\uF9CE"=>"\u786B", "\uF9CF"=>"\u7D10", "\uF9D0"=>"\u985E",
+    "\uF9D1"=>"\u516D", "\uF9D2"=>"\u622E", "\uF9D3"=>"\u9678", "\uF9D4"=>"\u502B", "\uF9D5"=>"\u5D19", "\uF9D6"=>"\u6DEA", "\uF9D7"=>"\u8F2A", "\uF9D8"=>"\u5F8B",
+    "\uF9D9"=>"\u6144", "\uF9DA"=>"\u6817", "\uF9DB"=>"\u7387", "\uF9DC"=>"\u9686", "\uF9DD"=>"\u5229", "\uF9DE"=>"\u540F", "\uF9DF"=>"\u5C65", "\uF9E0"=>"\u6613",
+    "\uF9E1"=>"\u674E", "\uF9E2"=>"\u68A8", "\uF9E3"=>"\u6CE5", "\uF9E4"=>"\u7406", "\uF9E5"=>"\u75E2", "\uF9E6"=>"\u7F79", "\uF9E7"=>"\u88CF", "\uF9E8"=>"\u88E1",
+    "\uF9E9"=>"\u91CC", "\uF9EA"=>"\u96E2", "\uF9EB"=>"\u533F", "\uF9EC"=>"\u6EBA", "\uF9ED"=>"\u541D", "\uF9EE"=>"\u71D0", "\uF9EF"=>"\u7498", "\uF9F0"=>"\u85FA",
+    "\uF9F1"=>"\u96A3", "\uF9F2"=>"\u9C57", "\uF9F3"=>"\u9E9F", "\uF9F4"=>"\u6797", "\uF9F5"=>"\u6DCB", "\uF9F6"=>"\u81E8", "\uF9F7"=>"\u7ACB", "\uF9F8"=>"\u7B20",
+    "\uF9F9"=>"\u7C92", "\uF9FA"=>"\u72C0", "\uF9FB"=>"\u7099", "\uF9FC"=>"\u8B58", "\uF9FD"=>"\u4EC0", "\uF9FE"=>"\u8336", "\uF9FF"=>"\u523A", "\uFA00"=>"\u5207",
+    "\uFA01"=>"\u5EA6", "\uFA02"=>"\u62D3", "\uFA03"=>"\u7CD6", "\uFA04"=>"\u5B85", "\uFA05"=>"\u6D1E", "\uFA06"=>"\u66B4", "\uFA07"=>"\u8F3B", "\uFA08"=>"\u884C",
+    "\uFA09"=>"\u964D", "\uFA0A"=>"\u898B", "\uFA0B"=>"\u5ED3", "\uFA0C"=>"\u5140", "\uFA0D"=>"\u55C0", "\uFA10"=>"\u585A", "\uFA12"=>"\u6674", "\uFA15"=>"\u51DE",
+    "\uFA16"=>"\u732A", "\uFA17"=>"\u76CA", "\uFA18"=>"\u793C", "\uFA19"=>"\u795E", "\uFA1A"=>"\u7965", "\uFA1B"=>"\u798F", "\uFA1C"=>"\u9756", "\uFA1D"=>"\u7CBE",
+    "\uFA1E"=>"\u7FBD", "\uFA20"=>"\u8612", "\uFA22"=>"\u8AF8", "\uFA25"=>"\u9038", "\uFA26"=>"\u90FD", "\uFA2A"=>"\u98EF", "\uFA2B"=>"\u98FC", "\uFA2C"=>"\u9928",
+    "\uFA2D"=>"\u9DB4", "\uFA2E"=>"\u90DE", "\uFA2F"=>"\u96B7", "\uFA30"=>"\u4FAE", "\uFA31"=>"\u50E7", "\uFA32"=>"\u514D", "\uFA33"=>"\u52C9", "\uFA34"=>"\u52E4",
+    "\uFA35"=>"\u5351", "\uFA36"=>"\u559D", "\uFA37"=>"\u5606", "\uFA38"=>"\u5668", "\uFA39"=>"\u5840", "\uFA3A"=>"\u58A8", "\uFA3B"=>"\u5C64", "\uFA3C"=>"\u5C6E",
+    "\uFA3D"=>"\u6094", "\uFA3E"=>"\u6168", "\uFA3F"=>"\u618E", "\uFA40"=>"\u61F2", "\uFA41"=>"\u654F", "\uFA42"=>"\u65E2", "\uFA43"=>"\u6691", "\uFA44"=>"\u6885",
+    "\uFA45"=>"\u6D77", "\uFA46"=>"\u6E1A", "\uFA47"=>"\u6F22", "\uFA48"=>"\u716E", "\uFA49"=>"\u722B", "\uFA4A"=>"\u7422", "\uFA4B"=>"\u7891", "\uFA4C"=>"\u793E",
+    "\uFA4D"=>"\u7949", "\uFA4E"=>"\u7948", "\uFA4F"=>"\u7950", "\uFA50"=>"\u7956", "\uFA51"=>"\u795D", "\uFA52"=>"\u798D", "\uFA53"=>"\u798E", "\uFA54"=>"\u7A40",
+    "\uFA55"=>"\u7A81", "\uFA56"=>"\u7BC0", "\uFA57"=>"\u7DF4", "\uFA58"=>"\u7E09", "\uFA59"=>"\u7E41", "\uFA5A"=>"\u7F72", "\uFA5B"=>"\u8005", "\uFA5C"=>"\u81ED",
+    "\uFA5D"=>"\u8279", "\uFA5E"=>"\u8279", "\uFA5F"=>"\u8457", "\uFA60"=>"\u8910", "\uFA61"=>"\u8996", "\uFA62"=>"\u8B01", "\uFA63"=>"\u8B39", "\uFA64"=>"\u8CD3",
+    "\uFA65"=>"\u8D08", "\uFA66"=>"\u8FB6", "\uFA67"=>"\u9038", "\uFA68"=>"\u96E3", "\uFA69"=>"\u97FF", "\uFA6A"=>"\u983B", "\uFA6B"=>"\u6075", "\uFA6C"=>"\u{242EE}",
+    "\uFA6D"=>"\u8218", "\uFA70"=>"\u4E26", "\uFA71"=>"\u51B5", "\uFA72"=>"\u5168", "\uFA73"=>"\u4F80", "\uFA74"=>"\u5145", "\uFA75"=>"\u5180", "\uFA76"=>"\u52C7",
+    "\uFA77"=>"\u52FA", "\uFA78"=>"\u559D", "\uFA79"=>"\u5555", "\uFA7A"=>"\u5599", "\uFA7B"=>"\u55E2", "\uFA7C"=>"\u585A", "\uFA7D"=>"\u58B3", "\uFA7E"=>"\u5944",
+    "\uFA7F"=>"\u5954", "\uFA80"=>"\u5A62", "\uFA81"=>"\u5B28", "\uFA82"=>"\u5ED2", "\uFA83"=>"\u5ED9", "\uFA84"=>"\u5F69", "\uFA85"=>"\u5FAD", "\uFA86"=>"\u60D8",
+    "\uFA87"=>"\u614E", "\uFA88"=>"\u6108", "\uFA89"=>"\u618E", "\uFA8A"=>"\u6160", "\uFA8B"=>"\u61F2", "\uFA8C"=>"\u6234", "\uFA8D"=>"\u63C4", "\uFA8E"=>"\u641C",
+    "\uFA8F"=>"\u6452", "\uFA90"=>"\u6556", "\uFA91"=>"\u6674", "\uFA92"=>"\u6717", "\uFA93"=>"\u671B", "\uFA94"=>"\u6756", "\uFA95"=>"\u6B79", "\uFA96"=>"\u6BBA",
+    "\uFA97"=>"\u6D41", "\uFA98"=>"\u6EDB", "\uFA99"=>"\u6ECB", "\uFA9A"=>"\u6F22", "\uFA9B"=>"\u701E", "\uFA9C"=>"\u716E", "\uFA9D"=>"\u77A7", "\uFA9E"=>"\u7235",
+    "\uFA9F"=>"\u72AF", "\uFAA0"=>"\u732A", "\uFAA1"=>"\u7471", "\uFAA2"=>"\u7506", "\uFAA3"=>"\u753B", "\uFAA4"=>"\u761D", "\uFAA5"=>"\u761F", "\uFAA6"=>"\u76CA",
+    "\uFAA7"=>"\u76DB", "\uFAA8"=>"\u76F4", "\uFAA9"=>"\u774A", "\uFAAA"=>"\u7740", "\uFAAB"=>"\u78CC", "\uFAAC"=>"\u7AB1", "\uFAAD"=>"\u7BC0", "\uFAAE"=>"\u7C7B",
+    "\uFAAF"=>"\u7D5B", "\uFAB0"=>"\u7DF4", "\uFAB1"=>"\u7F3E", "\uFAB2"=>"\u8005", "\uFAB3"=>"\u8352", "\uFAB4"=>"\u83EF", "\uFAB5"=>"\u8779", "\uFAB6"=>"\u8941",
+    "\uFAB7"=>"\u8986", "\uFAB8"=>"\u8996", "\uFAB9"=>"\u8ABF", "\uFABA"=>"\u8AF8", "\uFABB"=>"\u8ACB", "\uFABC"=>"\u8B01", "\uFABD"=>"\u8AFE", "\uFABE"=>"\u8AED",
+    "\uFABF"=>"\u8B39", "\uFAC0"=>"\u8B8A", "\uFAC1"=>"\u8D08", "\uFAC2"=>"\u8F38", "\uFAC3"=>"\u9072", "\uFAC4"=>"\u9199", "\uFAC5"=>"\u9276", "\uFAC6"=>"\u967C",
+    "\uFAC7"=>"\u96E3", "\uFAC8"=>"\u9756", "\uFAC9"=>"\u97DB", "\uFACA"=>"\u97FF", "\uFACB"=>"\u980B", "\uFACC"=>"\u983B", "\uFACD"=>"\u9B12", "\uFACE"=>"\u9F9C",
+    "\uFACF"=>"\u{2284A}", "\uFAD0"=>"\u{22844}", "\uFAD1"=>"\u{233D5}", "\uFAD2"=>"\u3B9D", "\uFAD3"=>"\u4018", "\uFAD4"=>"\u4039", "\uFAD5"=>"\u{25249}", "\uFAD6"=>"\u{25CD0}",
+    "\uFAD7"=>"\u{27ED3}", "\uFAD8"=>"\u9F43", "\uFAD9"=>"\u9F8E", "\uFB1D"=>"\u05D9\u05B4", "\uFB1F"=>"\u05F2\u05B7", "\uFB2A"=>"\u05E9\u05C1", "\uFB2B"=>"\u05E9\u05C2", "\uFB2C"=>"\u05E9\u05BC\u05C1",
+    "\uFB2D"=>"\u05E9\u05BC\u05C2", "\uFB2E"=>"\u05D0\u05B7", "\uFB2F"=>"\u05D0\u05B8", "\uFB30"=>"\u05D0\u05BC", "\uFB31"=>"\u05D1\u05BC", "\uFB32"=>"\u05D2\u05BC", "\uFB33"=>"\u05D3\u05BC", "\uFB34"=>"\u05D4\u05BC",
+    "\uFB35"=>"\u05D5\u05BC", "\uFB36"=>"\u05D6\u05BC", "\uFB38"=>"\u05D8\u05BC", "\uFB39"=>"\u05D9\u05BC", "\uFB3A"=>"\u05DA\u05BC", "\uFB3B"=>"\u05DB\u05BC", "\uFB3C"=>"\u05DC\u05BC", "\uFB3E"=>"\u05DE\u05BC",
+    "\uFB40"=>"\u05E0\u05BC", "\uFB41"=>"\u05E1\u05BC", "\uFB43"=>"\u05E3\u05BC", "\uFB44"=>"\u05E4\u05BC", "\uFB46"=>"\u05E6\u05BC", "\uFB47"=>"\u05E7\u05BC", "\uFB48"=>"\u05E8\u05BC", "\uFB49"=>"\u05E9\u05BC",
+    "\uFB4A"=>"\u05EA\u05BC", "\uFB4B"=>"\u05D5\u05B9", "\uFB4C"=>"\u05D1\u05BF", "\uFB4D"=>"\u05DB\u05BF", "\uFB4E"=>"\u05E4\u05BF", "\u{1109A}"=>"\u{11099}\u{110BA}", "\u{1109C}"=>"\u{1109B}\u{110BA}", "\u{110AB}"=>"\u{110A5}\u{110BA}",
+    "\u{1112E}"=>"\u{11131}\u{11127}", "\u{1112F}"=>"\u{11132}\u{11127}", "\u{1134B}"=>"\u{11347}\u{1133E}", "\u{1134C}"=>"\u{11347}\u{11357}", "\u{114BB}"=>"\u{114B9}\u{114BA}", "\u{114BC}"=>"\u{114B9}\u{114B0}", "\u{114BE}"=>"\u{114B9}\u{114BD}", "\u{115BA}"=>"\u{115B8}\u{115AF}",
+    "\u{115BB}"=>"\u{115B9}\u{115AF}", "\u{1D15E}"=>"\u{1D157}\u{1D165}", "\u{1D15F}"=>"\u{1D158}\u{1D165}", "\u{1D160}"=>"\u{1D158}\u{1D165}\u{1D16E}", "\u{1D161}"=>"\u{1D158}\u{1D165}\u{1D16F}", "\u{1D162}"=>"\u{1D158}\u{1D165}\u{1D170}", "\u{1D163}"=>"\u{1D158}\u{1D165}\u{1D171}", "\u{1D164}"=>"\u{1D158}\u{1D165}\u{1D172}",
+    "\u{1D1BB}"=>"\u{1D1B9}\u{1D165}", "\u{1D1BC}"=>"\u{1D1BA}\u{1D165}", "\u{1D1BD}"=>"\u{1D1B9}\u{1D165}\u{1D16E}", "\u{1D1BE}"=>"\u{1D1BA}\u{1D165}\u{1D16E}", "\u{1D1BF}"=>"\u{1D1B9}\u{1D165}\u{1D16F}", "\u{1D1C0}"=>"\u{1D1BA}\u{1D165}\u{1D16F}", "\u{2F800}"=>"\u4E3D", "\u{2F801}"=>"\u4E38",
+    "\u{2F802}"=>"\u4E41", "\u{2F803}"=>"\u{20122}", "\u{2F804}"=>"\u4F60", "\u{2F805}"=>"\u4FAE", "\u{2F806}"=>"\u4FBB", "\u{2F807}"=>"\u5002", "\u{2F808}"=>"\u507A", "\u{2F809}"=>"\u5099",
+    "\u{2F80A}"=>"\u50E7", "\u{2F80B}"=>"\u50CF", "\u{2F80C}"=>"\u349E", "\u{2F80D}"=>"\u{2063A}", "\u{2F80E}"=>"\u514D", "\u{2F80F}"=>"\u5154", "\u{2F810}"=>"\u5164", "\u{2F811}"=>"\u5177",
+    "\u{2F812}"=>"\u{2051C}", "\u{2F813}"=>"\u34B9", "\u{2F814}"=>"\u5167", "\u{2F815}"=>"\u518D", "\u{2F816}"=>"\u{2054B}", "\u{2F817}"=>"\u5197", "\u{2F818}"=>"\u51A4", "\u{2F819}"=>"\u4ECC",
+    "\u{2F81A}"=>"\u51AC", "\u{2F81B}"=>"\u51B5", "\u{2F81C}"=>"\u{291DF}", "\u{2F81D}"=>"\u51F5", "\u{2F81E}"=>"\u5203", "\u{2F81F}"=>"\u34DF", "\u{2F820}"=>"\u523B", "\u{2F821}"=>"\u5246",
+    "\u{2F822}"=>"\u5272", "\u{2F823}"=>"\u5277", "\u{2F824}"=>"\u3515", "\u{2F825}"=>"\u52C7", "\u{2F826}"=>"\u52C9", "\u{2F827}"=>"\u52E4", "\u{2F828}"=>"\u52FA", "\u{2F829}"=>"\u5305",
+    "\u{2F82A}"=>"\u5306", "\u{2F82B}"=>"\u5317", "\u{2F82C}"=>"\u5349", "\u{2F82D}"=>"\u5351", "\u{2F82E}"=>"\u535A", "\u{2F82F}"=>"\u5373", "\u{2F830}"=>"\u537D", "\u{2F831}"=>"\u537F",
+    "\u{2F832}"=>"\u537F", "\u{2F833}"=>"\u537F", "\u{2F834}"=>"\u{20A2C}", "\u{2F835}"=>"\u7070", "\u{2F836}"=>"\u53CA", "\u{2F837}"=>"\u53DF", "\u{2F838}"=>"\u{20B63}", "\u{2F839}"=>"\u53EB",
+    "\u{2F83A}"=>"\u53F1", "\u{2F83B}"=>"\u5406", "\u{2F83C}"=>"\u549E", "\u{2F83D}"=>"\u5438", "\u{2F83E}"=>"\u5448", "\u{2F83F}"=>"\u5468", "\u{2F840}"=>"\u54A2", "\u{2F841}"=>"\u54F6",
+    "\u{2F842}"=>"\u5510", "\u{2F843}"=>"\u5553", "\u{2F844}"=>"\u5563", "\u{2F845}"=>"\u5584", "\u{2F846}"=>"\u5584", "\u{2F847}"=>"\u5599", "\u{2F848}"=>"\u55AB", "\u{2F849}"=>"\u55B3",
+    "\u{2F84A}"=>"\u55C2", "\u{2F84B}"=>"\u5716", "\u{2F84C}"=>"\u5606", "\u{2F84D}"=>"\u5717", "\u{2F84E}"=>"\u5651", "\u{2F84F}"=>"\u5674", "\u{2F850}"=>"\u5207", "\u{2F851}"=>"\u58EE",
+    "\u{2F852}"=>"\u57CE", "\u{2F853}"=>"\u57F4", "\u{2F854}"=>"\u580D", "\u{2F855}"=>"\u578B", "\u{2F856}"=>"\u5832", "\u{2F857}"=>"\u5831", "\u{2F858}"=>"\u58AC", "\u{2F859}"=>"\u{214E4}",
+    "\u{2F85A}"=>"\u58F2", "\u{2F85B}"=>"\u58F7", "\u{2F85C}"=>"\u5906", "\u{2F85D}"=>"\u591A", "\u{2F85E}"=>"\u5922", "\u{2F85F}"=>"\u5962", "\u{2F860}"=>"\u{216A8}", "\u{2F861}"=>"\u{216EA}",
+    "\u{2F862}"=>"\u59EC", "\u{2F863}"=>"\u5A1B", "\u{2F864}"=>"\u5A27", "\u{2F865}"=>"\u59D8", "\u{2F866}"=>"\u5A66", "\u{2F867}"=>"\u36EE", "\u{2F868}"=>"\u36FC", "\u{2F869}"=>"\u5B08",
+    "\u{2F86A}"=>"\u5B3E", "\u{2F86B}"=>"\u5B3E", "\u{2F86C}"=>"\u{219C8}", "\u{2F86D}"=>"\u5BC3", "\u{2F86E}"=>"\u5BD8", "\u{2F86F}"=>"\u5BE7", "\u{2F870}"=>"\u5BF3", "\u{2F871}"=>"\u{21B18}",
+    "\u{2F872}"=>"\u5BFF", "\u{2F873}"=>"\u5C06", "\u{2F874}"=>"\u5F53", "\u{2F875}"=>"\u5C22", "\u{2F876}"=>"\u3781", "\u{2F877}"=>"\u5C60", "\u{2F878}"=>"\u5C6E", "\u{2F879}"=>"\u5CC0",
+    "\u{2F87A}"=>"\u5C8D", "\u{2F87B}"=>"\u{21DE4}", "\u{2F87C}"=>"\u5D43", "\u{2F87D}"=>"\u{21DE6}", "\u{2F87E}"=>"\u5D6E", "\u{2F87F}"=>"\u5D6B", "\u{2F880}"=>"\u5D7C", "\u{2F881}"=>"\u5DE1",
+    "\u{2F882}"=>"\u5DE2", "\u{2F883}"=>"\u382F", "\u{2F884}"=>"\u5DFD", "\u{2F885}"=>"\u5E28", "\u{2F886}"=>"\u5E3D", "\u{2F887}"=>"\u5E69", "\u{2F888}"=>"\u3862", "\u{2F889}"=>"\u{22183}",
+    "\u{2F88A}"=>"\u387C", "\u{2F88B}"=>"\u5EB0", "\u{2F88C}"=>"\u5EB3", "\u{2F88D}"=>"\u5EB6", "\u{2F88E}"=>"\u5ECA", "\u{2F88F}"=>"\u{2A392}", "\u{2F890}"=>"\u5EFE", "\u{2F891}"=>"\u{22331}",
+    "\u{2F892}"=>"\u{22331}", "\u{2F893}"=>"\u8201", "\u{2F894}"=>"\u5F22", "\u{2F895}"=>"\u5F22", "\u{2F896}"=>"\u38C7", "\u{2F897}"=>"\u{232B8}", "\u{2F898}"=>"\u{261DA}", "\u{2F899}"=>"\u5F62",
+    "\u{2F89A}"=>"\u5F6B", "\u{2F89B}"=>"\u38E3", "\u{2F89C}"=>"\u5F9A", "\u{2F89D}"=>"\u5FCD", "\u{2F89E}"=>"\u5FD7", "\u{2F89F}"=>"\u5FF9", "\u{2F8A0}"=>"\u6081", "\u{2F8A1}"=>"\u393A",
+    "\u{2F8A2}"=>"\u391C", "\u{2F8A3}"=>"\u6094", "\u{2F8A4}"=>"\u{226D4}", "\u{2F8A5}"=>"\u60C7", "\u{2F8A6}"=>"\u6148", "\u{2F8A7}"=>"\u614C", "\u{2F8A8}"=>"\u614E", "\u{2F8A9}"=>"\u614C",
+    "\u{2F8AA}"=>"\u617A", "\u{2F8AB}"=>"\u618E", "\u{2F8AC}"=>"\u61B2", "\u{2F8AD}"=>"\u61A4", "\u{2F8AE}"=>"\u61AF", "\u{2F8AF}"=>"\u61DE", "\u{2F8B0}"=>"\u61F2", "\u{2F8B1}"=>"\u61F6",
+    "\u{2F8B2}"=>"\u6210", "\u{2F8B3}"=>"\u621B", "\u{2F8B4}"=>"\u625D", "\u{2F8B5}"=>"\u62B1", "\u{2F8B6}"=>"\u62D4", "\u{2F8B7}"=>"\u6350", "\u{2F8B8}"=>"\u{22B0C}", "\u{2F8B9}"=>"\u633D",
+    "\u{2F8BA}"=>"\u62FC", "\u{2F8BB}"=>"\u6368", "\u{2F8BC}"=>"\u6383", "\u{2F8BD}"=>"\u63E4", "\u{2F8BE}"=>"\u{22BF1}", "\u{2F8BF}"=>"\u6422", "\u{2F8C0}"=>"\u63C5", "\u{2F8C1}"=>"\u63A9",
+    "\u{2F8C2}"=>"\u3A2E", "\u{2F8C3}"=>"\u6469", "\u{2F8C4}"=>"\u647E", "\u{2F8C5}"=>"\u649D", "\u{2F8C6}"=>"\u6477", "\u{2F8C7}"=>"\u3A6C", "\u{2F8C8}"=>"\u654F", "\u{2F8C9}"=>"\u656C",
+    "\u{2F8CA}"=>"\u{2300A}", "\u{2F8CB}"=>"\u65E3", "\u{2F8CC}"=>"\u66F8", "\u{2F8CD}"=>"\u6649", "\u{2F8CE}"=>"\u3B19", "\u{2F8CF}"=>"\u6691", "\u{2F8D0}"=>"\u3B08", "\u{2F8D1}"=>"\u3AE4",
+    "\u{2F8D2}"=>"\u5192", "\u{2F8D3}"=>"\u5195", "\u{2F8D4}"=>"\u6700", "\u{2F8D5}"=>"\u669C", "\u{2F8D6}"=>"\u80AD", "\u{2F8D7}"=>"\u43D9", "\u{2F8D8}"=>"\u6717", "\u{2F8D9}"=>"\u671B",
+    "\u{2F8DA}"=>"\u6721", "\u{2F8DB}"=>"\u675E", "\u{2F8DC}"=>"\u6753", "\u{2F8DD}"=>"\u{233C3}", "\u{2F8DE}"=>"\u3B49", "\u{2F8DF}"=>"\u67FA", "\u{2F8E0}"=>"\u6785", "\u{2F8E1}"=>"\u6852",
+    "\u{2F8E2}"=>"\u6885", "\u{2F8E3}"=>"\u{2346D}", "\u{2F8E4}"=>"\u688E", "\u{2F8E5}"=>"\u681F", "\u{2F8E6}"=>"\u6914", "\u{2F8E7}"=>"\u3B9D", "\u{2F8E8}"=>"\u6942", "\u{2F8E9}"=>"\u69A3",
+    "\u{2F8EA}"=>"\u69EA", "\u{2F8EB}"=>"\u6AA8", "\u{2F8EC}"=>"\u{236A3}", "\u{2F8ED}"=>"\u6ADB", "\u{2F8EE}"=>"\u3C18", "\u{2F8EF}"=>"\u6B21", "\u{2F8F0}"=>"\u{238A7}", "\u{2F8F1}"=>"\u6B54",
+    "\u{2F8F2}"=>"\u3C4E", "\u{2F8F3}"=>"\u6B72", "\u{2F8F4}"=>"\u6B9F", "\u{2F8F5}"=>"\u6BBA", "\u{2F8F6}"=>"\u6BBB", "\u{2F8F7}"=>"\u{23A8D}", "\u{2F8F8}"=>"\u{21D0B}", "\u{2F8F9}"=>"\u{23AFA}",
+    "\u{2F8FA}"=>"\u6C4E", "\u{2F8FB}"=>"\u{23CBC}", "\u{2F8FC}"=>"\u6CBF", "\u{2F8FD}"=>"\u6CCD", "\u{2F8FE}"=>"\u6C67", "\u{2F8FF}"=>"\u6D16", "\u{2F900}"=>"\u6D3E", "\u{2F901}"=>"\u6D77",
+    "\u{2F902}"=>"\u6D41", "\u{2F903}"=>"\u6D69", "\u{2F904}"=>"\u6D78", "\u{2F905}"=>"\u6D85", "\u{2F906}"=>"\u{23D1E}", "\u{2F907}"=>"\u6D34", "\u{2F908}"=>"\u6E2F", "\u{2F909}"=>"\u6E6E",
+    "\u{2F90A}"=>"\u3D33", "\u{2F90B}"=>"\u6ECB", "\u{2F90C}"=>"\u6EC7", "\u{2F90D}"=>"\u{23ED1}", "\u{2F90E}"=>"\u6DF9", "\u{2F90F}"=>"\u6F6E", "\u{2F910}"=>"\u{23F5E}", "\u{2F911}"=>"\u{23F8E}",
+    "\u{2F912}"=>"\u6FC6", "\u{2F913}"=>"\u7039", "\u{2F914}"=>"\u701E", "\u{2F915}"=>"\u701B", "\u{2F916}"=>"\u3D96", "\u{2F917}"=>"\u704A", "\u{2F918}"=>"\u707D", "\u{2F919}"=>"\u7077",
+    "\u{2F91A}"=>"\u70AD", "\u{2F91B}"=>"\u{20525}", "\u{2F91C}"=>"\u7145", "\u{2F91D}"=>"\u{24263}", "\u{2F91E}"=>"\u719C", "\u{2F91F}"=>"\u{243AB}", "\u{2F920}"=>"\u7228", "\u{2F921}"=>"\u7235",
+    "\u{2F922}"=>"\u7250", "\u{2F923}"=>"\u{24608}", "\u{2F924}"=>"\u7280", "\u{2F925}"=>"\u7295", "\u{2F926}"=>"\u{24735}", "\u{2F927}"=>"\u{24814}", "\u{2F928}"=>"\u737A", "\u{2F929}"=>"\u738B",
+    "\u{2F92A}"=>"\u3EAC", "\u{2F92B}"=>"\u73A5", "\u{2F92C}"=>"\u3EB8", "\u{2F92D}"=>"\u3EB8", "\u{2F92E}"=>"\u7447", "\u{2F92F}"=>"\u745C", "\u{2F930}"=>"\u7471", "\u{2F931}"=>"\u7485",
+    "\u{2F932}"=>"\u74CA", "\u{2F933}"=>"\u3F1B", "\u{2F934}"=>"\u7524", "\u{2F935}"=>"\u{24C36}", "\u{2F936}"=>"\u753E", "\u{2F937}"=>"\u{24C92}", "\u{2F938}"=>"\u7570", "\u{2F939}"=>"\u{2219F}",
+    "\u{2F93A}"=>"\u7610", "\u{2F93B}"=>"\u{24FA1}", "\u{2F93C}"=>"\u{24FB8}", "\u{2F93D}"=>"\u{25044}", "\u{2F93E}"=>"\u3FFC", "\u{2F93F}"=>"\u4008", "\u{2F940}"=>"\u76F4", "\u{2F941}"=>"\u{250F3}",
+    "\u{2F942}"=>"\u{250F2}", "\u{2F943}"=>"\u{25119}", "\u{2F944}"=>"\u{25133}", "\u{2F945}"=>"\u771E", "\u{2F946}"=>"\u771F", "\u{2F947}"=>"\u771F", "\u{2F948}"=>"\u774A", "\u{2F949}"=>"\u4039",
+    "\u{2F94A}"=>"\u778B", "\u{2F94B}"=>"\u4046", "\u{2F94C}"=>"\u4096", "\u{2F94D}"=>"\u{2541D}", "\u{2F94E}"=>"\u784E", "\u{2F94F}"=>"\u788C", "\u{2F950}"=>"\u78CC", "\u{2F951}"=>"\u40E3",
+    "\u{2F952}"=>"\u{25626}", "\u{2F953}"=>"\u7956", "\u{2F954}"=>"\u{2569A}", "\u{2F955}"=>"\u{256C5}", "\u{2F956}"=>"\u798F", "\u{2F957}"=>"\u79EB", "\u{2F958}"=>"\u412F", "\u{2F959}"=>"\u7A40",
+    "\u{2F95A}"=>"\u7A4A", "\u{2F95B}"=>"\u7A4F", "\u{2F95C}"=>"\u{2597C}", "\u{2F95D}"=>"\u{25AA7}", "\u{2F95E}"=>"\u{25AA7}", "\u{2F95F}"=>"\u7AEE", "\u{2F960}"=>"\u4202", "\u{2F961}"=>"\u{25BAB}",
+    "\u{2F962}"=>"\u7BC6", "\u{2F963}"=>"\u7BC9", "\u{2F964}"=>"\u4227", "\u{2F965}"=>"\u{25C80}", "\u{2F966}"=>"\u7CD2", "\u{2F967}"=>"\u42A0", "\u{2F968}"=>"\u7CE8", "\u{2F969}"=>"\u7CE3",
+    "\u{2F96A}"=>"\u7D00", "\u{2F96B}"=>"\u{25F86}", "\u{2F96C}"=>"\u7D63", "\u{2F96D}"=>"\u4301", "\u{2F96E}"=>"\u7DC7", "\u{2F96F}"=>"\u7E02", "\u{2F970}"=>"\u7E45", "\u{2F971}"=>"\u4334",
+    "\u{2F972}"=>"\u{26228}", "\u{2F973}"=>"\u{26247}", "\u{2F974}"=>"\u4359", "\u{2F975}"=>"\u{262D9}", "\u{2F976}"=>"\u7F7A", "\u{2F977}"=>"\u{2633E}", "\u{2F978}"=>"\u7F95", "\u{2F979}"=>"\u7FFA",
+    "\u{2F97A}"=>"\u8005", "\u{2F97B}"=>"\u{264DA}", "\u{2F97C}"=>"\u{26523}", "\u{2F97D}"=>"\u8060", "\u{2F97E}"=>"\u{265A8}", "\u{2F97F}"=>"\u8070", "\u{2F980}"=>"\u{2335F}", "\u{2F981}"=>"\u43D5",
+    "\u{2F982}"=>"\u80B2", "\u{2F983}"=>"\u8103", "\u{2F984}"=>"\u440B", "\u{2F985}"=>"\u813E", "\u{2F986}"=>"\u5AB5", "\u{2F987}"=>"\u{267A7}", "\u{2F988}"=>"\u{267B5}", "\u{2F989}"=>"\u{23393}",
+    "\u{2F98A}"=>"\u{2339C}", "\u{2F98B}"=>"\u8201", "\u{2F98C}"=>"\u8204", "\u{2F98D}"=>"\u8F9E", "\u{2F98E}"=>"\u446B", "\u{2F98F}"=>"\u8291", "\u{2F990}"=>"\u828B", "\u{2F991}"=>"\u829D",
+    "\u{2F992}"=>"\u52B3", "\u{2F993}"=>"\u82B1", "\u{2F994}"=>"\u82B3", "\u{2F995}"=>"\u82BD", "\u{2F996}"=>"\u82E6", "\u{2F997}"=>"\u{26B3C}", "\u{2F998}"=>"\u82E5", "\u{2F999}"=>"\u831D",
+    "\u{2F99A}"=>"\u8363", "\u{2F99B}"=>"\u83AD", "\u{2F99C}"=>"\u8323", "\u{2F99D}"=>"\u83BD", "\u{2F99E}"=>"\u83E7", "\u{2F99F}"=>"\u8457", "\u{2F9A0}"=>"\u8353", "\u{2F9A1}"=>"\u83CA",
+    "\u{2F9A2}"=>"\u83CC", "\u{2F9A3}"=>"\u83DC", "\u{2F9A4}"=>"\u{26C36}", "\u{2F9A5}"=>"\u{26D6B}", "\u{2F9A6}"=>"\u{26CD5}", "\u{2F9A7}"=>"\u452B", "\u{2F9A8}"=>"\u84F1", "\u{2F9A9}"=>"\u84F3",
+    "\u{2F9AA}"=>"\u8516", "\u{2F9AB}"=>"\u{273CA}", "\u{2F9AC}"=>"\u8564", "\u{2F9AD}"=>"\u{26F2C}", "\u{2F9AE}"=>"\u455D", "\u{2F9AF}"=>"\u4561", "\u{2F9B0}"=>"\u{26FB1}", "\u{2F9B1}"=>"\u{270D2}",
+    "\u{2F9B2}"=>"\u456B", "\u{2F9B3}"=>"\u8650", "\u{2F9B4}"=>"\u865C", "\u{2F9B5}"=>"\u8667", "\u{2F9B6}"=>"\u8669", "\u{2F9B7}"=>"\u86A9", "\u{2F9B8}"=>"\u8688", "\u{2F9B9}"=>"\u870E",
+    "\u{2F9BA}"=>"\u86E2", "\u{2F9BB}"=>"\u8779", "\u{2F9BC}"=>"\u8728", "\u{2F9BD}"=>"\u876B", "\u{2F9BE}"=>"\u8786", "\u{2F9BF}"=>"\u45D7", "\u{2F9C0}"=>"\u87E1", "\u{2F9C1}"=>"\u8801",
+    "\u{2F9C2}"=>"\u45F9", "\u{2F9C3}"=>"\u8860", "\u{2F9C4}"=>"\u8863", "\u{2F9C5}"=>"\u{27667}", "\u{2F9C6}"=>"\u88D7", "\u{2F9C7}"=>"\u88DE", "\u{2F9C8}"=>"\u4635", "\u{2F9C9}"=>"\u88FA",
+    "\u{2F9CA}"=>"\u34BB", "\u{2F9CB}"=>"\u{278AE}", "\u{2F9CC}"=>"\u{27966}", "\u{2F9CD}"=>"\u46BE", "\u{2F9CE}"=>"\u46C7", "\u{2F9CF}"=>"\u8AA0", "\u{2F9D0}"=>"\u8AED", "\u{2F9D1}"=>"\u8B8A",
+    "\u{2F9D2}"=>"\u8C55", "\u{2F9D3}"=>"\u{27CA8}", "\u{2F9D4}"=>"\u8CAB", "\u{2F9D5}"=>"\u8CC1", "\u{2F9D6}"=>"\u8D1B", "\u{2F9D7}"=>"\u8D77", "\u{2F9D8}"=>"\u{27F2F}", "\u{2F9D9}"=>"\u{20804}",
+    "\u{2F9DA}"=>"\u8DCB", "\u{2F9DB}"=>"\u8DBC", "\u{2F9DC}"=>"\u8DF0", "\u{2F9DD}"=>"\u{208DE}", "\u{2F9DE}"=>"\u8ED4", "\u{2F9DF}"=>"\u8F38", "\u{2F9E0}"=>"\u{285D2}", "\u{2F9E1}"=>"\u{285ED}",
+    "\u{2F9E2}"=>"\u9094", "\u{2F9E3}"=>"\u90F1", "\u{2F9E4}"=>"\u9111", "\u{2F9E5}"=>"\u{2872E}", "\u{2F9E6}"=>"\u911B", "\u{2F9E7}"=>"\u9238", "\u{2F9E8}"=>"\u92D7", "\u{2F9E9}"=>"\u92D8",
+    "\u{2F9EA}"=>"\u927C", "\u{2F9EB}"=>"\u93F9", "\u{2F9EC}"=>"\u9415", "\u{2F9ED}"=>"\u{28BFA}", "\u{2F9EE}"=>"\u958B", "\u{2F9EF}"=>"\u4995", "\u{2F9F0}"=>"\u95B7", "\u{2F9F1}"=>"\u{28D77}",
+    "\u{2F9F2}"=>"\u49E6", "\u{2F9F3}"=>"\u96C3", "\u{2F9F4}"=>"\u5DB2", "\u{2F9F5}"=>"\u9723", "\u{2F9F6}"=>"\u{29145}", "\u{2F9F7}"=>"\u{2921A}", "\u{2F9F8}"=>"\u4A6E", "\u{2F9F9}"=>"\u4A76",
+    "\u{2F9FA}"=>"\u97E0", "\u{2F9FB}"=>"\u{2940A}", "\u{2F9FC}"=>"\u4AB2", "\u{2F9FD}"=>"\u{29496}", "\u{2F9FE}"=>"\u980B", "\u{2F9FF}"=>"\u980B", "\u{2FA00}"=>"\u9829", "\u{2FA01}"=>"\u{295B6}",
+    "\u{2FA02}"=>"\u98E2", "\u{2FA03}"=>"\u4B33", "\u{2FA04}"=>"\u9929", "\u{2FA05}"=>"\u99A7", "\u{2FA06}"=>"\u99C2", "\u{2FA07}"=>"\u99FE", "\u{2FA08}"=>"\u4BCE", "\u{2FA09}"=>"\u{29B30}",
+    "\u{2FA0A}"=>"\u9B12", "\u{2FA0B}"=>"\u9C40", "\u{2FA0C}"=>"\u9CFD", "\u{2FA0D}"=>"\u4CCE", "\u{2FA0E}"=>"\u4CED", "\u{2FA0F}"=>"\u9D67", "\u{2FA10}"=>"\u{2A0CE}", "\u{2FA11}"=>"\u4CF8",
+    "\u{2FA12}"=>"\u{2A105}", "\u{2FA13}"=>"\u{2A20E}", "\u{2FA14}"=>"\u{2A291}", "\u{2FA15}"=>"\u9EBB", "\u{2FA16}"=>"\u4D56", "\u{2FA17}"=>"\u9EF9", "\u{2FA18}"=>"\u9EFE", "\u{2FA19}"=>"\u9F05",
+    "\u{2FA1A}"=>"\u9F0F", "\u{2FA1B}"=>"\u9F16", "\u{2FA1C}"=>"\u9F3B", "\u{2FA1D}"=>"\u{2A600}",
   }.freeze
 
   KOMPATIBLE_TABLE = {
-    "\u00A0"=>" ",
-    "\u00A8"=>" \u0308",
-    "\u00AA"=>"a",
-    "\u00AF"=>" \u0304",
-    "\u00B2"=>"2",
-    "\u00B3"=>"3",
-    "\u00B4"=>" \u0301",
-    "\u00B5"=>"\u03BC",
-    "\u00B8"=>" \u0327",
-    "\u00B9"=>"1",
-    "\u00BA"=>"o",
-    "\u00BC"=>"1\u20444",
-    "\u00BD"=>"1\u20442",
-    "\u00BE"=>"3\u20444",
-    "\u0132"=>"IJ",
-    "\u0133"=>"ij",
-    "\u013F"=>"L\u00B7",
-    "\u0140"=>"l\u00B7",
-    "\u0149"=>"\u02BCn",
-    "\u017F"=>"s",
-    "\u01C4"=>"D\u017D",
-    "\u01C5"=>"D\u017E",
-    "\u01C6"=>"d\u017E",
-    "\u01C7"=>"LJ",
-    "\u01C8"=>"Lj",
-    "\u01C9"=>"lj",
-    "\u01CA"=>"NJ",
-    "\u01CB"=>"Nj",
-    "\u01CC"=>"nj",
-    "\u01F1"=>"DZ",
-    "\u01F2"=>"Dz",
-    "\u01F3"=>"dz",
-    "\u02B0"=>"h",
-    "\u02B1"=>"\u0266",
-    "\u02B2"=>"j",
-    "\u02B3"=>"r",
-    "\u02B4"=>"\u0279",
-    "\u02B5"=>"\u027B",
-    "\u02B6"=>"\u0281",
-    "\u02B7"=>"w",
-    "\u02B8"=>"y",
-    "\u02D8"=>" \u0306",
-    "\u02D9"=>" \u0307",
-    "\u02DA"=>" \u030A",
-    "\u02DB"=>" \u0328",
-    "\u02DC"=>" \u0303",
-    "\u02DD"=>" \u030B",
-    "\u02E0"=>"\u0263",
-    "\u02E1"=>"l",
-    "\u02E2"=>"s",
-    "\u02E3"=>"x",
-    "\u02E4"=>"\u0295",
-    "\u037A"=>" \u0345",
-    "\u0384"=>" \u0301",
-    "\u03D0"=>"\u03B2",
-    "\u03D1"=>"\u03B8",
-    "\u03D2"=>"\u03A5",
-    "\u03D5"=>"\u03C6",
-    "\u03D6"=>"\u03C0",
-    "\u03F0"=>"\u03BA",
-    "\u03F1"=>"\u03C1",
-    "\u03F2"=>"\u03C2",
-    "\u03F4"=>"\u0398",
-    "\u03F5"=>"\u03B5",
-    "\u03F9"=>"\u03A3",
-    "\u0587"=>"\u0565\u0582",
-    "\u0675"=>"\u0627\u0674",
-    "\u0676"=>"\u0648\u0674",
-    "\u0677"=>"\u06C7\u0674",
-    "\u0678"=>"\u064A\u0674",
-    "\u0E33"=>"\u0E4D\u0E32",
-    "\u0EB3"=>"\u0ECD\u0EB2",
-    "\u0EDC"=>"\u0EAB\u0E99",
-    "\u0EDD"=>"\u0EAB\u0EA1",
-    "\u0F0C"=>"\u0F0B",
-    "\u0F77"=>"\u0FB2\u0F81",
-    "\u0F79"=>"\u0FB3\u0F81",
-    "\u10FC"=>"\u10DC",
-    "\u1D2C"=>"A",
-    "\u1D2D"=>"\u00C6",
-    "\u1D2E"=>"B",
-    "\u1D30"=>"D",
-    "\u1D31"=>"E",
-    "\u1D32"=>"\u018E",
-    "\u1D33"=>"G",
-    "\u1D34"=>"H",
-    "\u1D35"=>"I",
-    "\u1D36"=>"J",
-    "\u1D37"=>"K",
-    "\u1D38"=>"L",
-    "\u1D39"=>"M",
-    "\u1D3A"=>"N",
-    "\u1D3C"=>"O",
-    "\u1D3D"=>"\u0222",
-    "\u1D3E"=>"P",
-    "\u1D3F"=>"R",
-    "\u1D40"=>"T",
-    "\u1D41"=>"U",
-    "\u1D42"=>"W",
-    "\u1D43"=>"a",
-    "\u1D44"=>"\u0250",
-    "\u1D45"=>"\u0251",
-    "\u1D46"=>"\u1D02",
-    "\u1D47"=>"b",
-    "\u1D48"=>"d",
-    "\u1D49"=>"e",
-    "\u1D4A"=>"\u0259",
-    "\u1D4B"=>"\u025B",
-    "\u1D4C"=>"\u025C",
-    "\u1D4D"=>"g",
-    "\u1D4F"=>"k",
-    "\u1D50"=>"m",
-    "\u1D51"=>"\u014B",
-    "\u1D52"=>"o",
-    "\u1D53"=>"\u0254",
-    "\u1D54"=>"\u1D16",
-    "\u1D55"=>"\u1D17",
-    "\u1D56"=>"p",
-    "\u1D57"=>"t",
-    "\u1D58"=>"u",
-    "\u1D59"=>"\u1D1D",
-    "\u1D5A"=>"\u026F",
-    "\u1D5B"=>"v",
-    "\u1D5C"=>"\u1D25",
-    "\u1D5D"=>"\u03B2",
-    "\u1D5E"=>"\u03B3",
-    "\u1D5F"=>"\u03B4",
-    "\u1D60"=>"\u03C6",
-    "\u1D61"=>"\u03C7",
-    "\u1D62"=>"i",
-    "\u1D63"=>"r",
-    "\u1D64"=>"u",
-    "\u1D65"=>"v",
-    "\u1D66"=>"\u03B2",
-    "\u1D67"=>"\u03B3",
-    "\u1D68"=>"\u03C1",
-    "\u1D69"=>"\u03C6",
-    "\u1D6A"=>"\u03C7",
-    "\u1D78"=>"\u043D",
-    "\u1D9B"=>"\u0252",
-    "\u1D9C"=>"c",
-    "\u1D9D"=>"\u0255",
-    "\u1D9E"=>"\u00F0",
-    "\u1D9F"=>"\u025C",
-    "\u1DA0"=>"f",
-    "\u1DA1"=>"\u025F",
-    "\u1DA2"=>"\u0261",
-    "\u1DA3"=>"\u0265",
-    "\u1DA4"=>"\u0268",
-    "\u1DA5"=>"\u0269",
-    "\u1DA6"=>"\u026A",
-    "\u1DA7"=>"\u1D7B",
-    "\u1DA8"=>"\u029D",
-    "\u1DA9"=>"\u026D",
-    "\u1DAA"=>"\u1D85",
-    "\u1DAB"=>"\u029F",
-    "\u1DAC"=>"\u0271",
-    "\u1DAD"=>"\u0270",
-    "\u1DAE"=>"\u0272",
-    "\u1DAF"=>"\u0273",
-    "\u1DB0"=>"\u0274",
-    "\u1DB1"=>"\u0275",
-    "\u1DB2"=>"\u0278",
-    "\u1DB3"=>"\u0282",
-    "\u1DB4"=>"\u0283",
-    "\u1DB5"=>"\u01AB",
-    "\u1DB6"=>"\u0289",
-    "\u1DB7"=>"\u028A",
-    "\u1DB8"=>"\u1D1C",
-    "\u1DB9"=>"\u028B",
-    "\u1DBA"=>"\u028C",
-    "\u1DBB"=>"z",
-    "\u1DBC"=>"\u0290",
-    "\u1DBD"=>"\u0291",
-    "\u1DBE"=>"\u0292",
-    "\u1DBF"=>"\u03B8",
-    "\u1E9A"=>"a\u02BE",
-    "\u1FBD"=>" \u0313",
-    "\u1FBF"=>" \u0313",
-    "\u1FC0"=>" \u0342",
-    "\u1FFE"=>" \u0314",
-    "\u2002"=>" ",
-    "\u2003"=>" ",
-    "\u2004"=>" ",
-    "\u2005"=>" ",
-    "\u2006"=>" ",
-    "\u2007"=>" ",
-    "\u2008"=>" ",
-    "\u2009"=>" ",
-    "\u200A"=>" ",
-    "\u2011"=>"\u2010",
-    "\u2017"=>" \u0333",
-    "\u2024"=>".",
-    "\u2025"=>"..",
-    "\u2026"=>"...",
-    "\u202F"=>" ",
-    "\u2033"=>"\u2032\u2032",
-    "\u2034"=>"\u2032\u2032\u2032",
-    "\u2036"=>"\u2035\u2035",
-    "\u2037"=>"\u2035\u2035\u2035",
-    "\u203C"=>"!!",
-    "\u203E"=>" \u0305",
-    "\u2047"=>"??",
-    "\u2048"=>"?!",
-    "\u2049"=>"!?",
-    "\u2057"=>"\u2032\u2032\u2032\u2032",
-    "\u205F"=>" ",
-    "\u2070"=>"0",
-    "\u2071"=>"i",
-    "\u2074"=>"4",
-    "\u2075"=>"5",
-    "\u2076"=>"6",
-    "\u2077"=>"7",
-    "\u2078"=>"8",
-    "\u2079"=>"9",
-    "\u207A"=>"+",
-    "\u207B"=>"\u2212",
-    "\u207C"=>"=",
-    "\u207D"=>"(",
-    "\u207E"=>")",
-    "\u207F"=>"n",
-    "\u2080"=>"0",
-    "\u2081"=>"1",
-    "\u2082"=>"2",
-    "\u2083"=>"3",
-    "\u2084"=>"4",
-    "\u2085"=>"5",
-    "\u2086"=>"6",
-    "\u2087"=>"7",
-    "\u2088"=>"8",
-    "\u2089"=>"9",
-    "\u208A"=>"+",
-    "\u208B"=>"\u2212",
-    "\u208C"=>"=",
-    "\u208D"=>"(",
-    "\u208E"=>")",
-    "\u2090"=>"a",
-    "\u2091"=>"e",
-    "\u2092"=>"o",
-    "\u2093"=>"x",
-    "\u2094"=>"\u0259",
-    "\u2095"=>"h",
-    "\u2096"=>"k",
-    "\u2097"=>"l",
-    "\u2098"=>"m",
-    "\u2099"=>"n",
-    "\u209A"=>"p",
-    "\u209B"=>"s",
-    "\u209C"=>"t",
-    "\u20A8"=>"Rs",
-    "\u2100"=>"a/c",
-    "\u2101"=>"a/s",
-    "\u2102"=>"C",
-    "\u2103"=>"\u00B0C",
-    "\u2105"=>"c/o",
-    "\u2106"=>"c/u",
-    "\u2107"=>"\u0190",
-    "\u2109"=>"\u00B0F",
-    "\u210A"=>"g",
-    "\u210B"=>"H",
-    "\u210C"=>"H",
-    "\u210D"=>"H",
-    "\u210E"=>"h",
-    "\u210F"=>"\u0127",
-    "\u2110"=>"I",
-    "\u2111"=>"I",
-    "\u2112"=>"L",
-    "\u2113"=>"l",
-    "\u2115"=>"N",
-    "\u2116"=>"No",
-    "\u2119"=>"P",
-    "\u211A"=>"Q",
-    "\u211B"=>"R",
-    "\u211C"=>"R",
-    "\u211D"=>"R",
-    "\u2120"=>"SM",
-    "\u2121"=>"TEL",
-    "\u2122"=>"TM",
-    "\u2124"=>"Z",
-    "\u2128"=>"Z",
-    "\u212C"=>"B",
-    "\u212D"=>"C",
-    "\u212F"=>"e",
-    "\u2130"=>"E",
-    "\u2131"=>"F",
-    "\u2133"=>"M",
-    "\u2134"=>"o",
-    "\u2135"=>"\u05D0",
-    "\u2136"=>"\u05D1",
-    "\u2137"=>"\u05D2",
-    "\u2138"=>"\u05D3",
-    "\u2139"=>"i",
-    "\u213B"=>"FAX",
-    "\u213C"=>"\u03C0",
-    "\u213D"=>"\u03B3",
-    "\u213E"=>"\u0393",
-    "\u213F"=>"\u03A0",
-    "\u2140"=>"\u2211",
-    "\u2145"=>"D",
-    "\u2146"=>"d",
-    "\u2147"=>"e",
-    "\u2148"=>"i",
-    "\u2149"=>"j",
-    "\u2150"=>"1\u20447",
-    "\u2151"=>"1\u20449",
-    "\u2152"=>"1\u204410",
-    "\u2153"=>"1\u20443",
-    "\u2154"=>"2\u20443",
-    "\u2155"=>"1\u20445",
-    "\u2156"=>"2\u20445",
-    "\u2157"=>"3\u20445",
-    "\u2158"=>"4\u20445",
-    "\u2159"=>"1\u20446",
-    "\u215A"=>"5\u20446",
-    "\u215B"=>"1\u20448",
-    "\u215C"=>"3\u20448",
-    "\u215D"=>"5\u20448",
-    "\u215E"=>"7\u20448",
-    "\u215F"=>"1\u2044",
-    "\u2160"=>"I",
-    "\u2161"=>"II",
-    "\u2162"=>"III",
-    "\u2163"=>"IV",
-    "\u2164"=>"V",
-    "\u2165"=>"VI",
-    "\u2166"=>"VII",
-    "\u2167"=>"VIII",
-    "\u2168"=>"IX",
-    "\u2169"=>"X",
-    "\u216A"=>"XI",
-    "\u216B"=>"XII",
-    "\u216C"=>"L",
-    "\u216D"=>"C",
-    "\u216E"=>"D",
-    "\u216F"=>"M",
-    "\u2170"=>"i",
-    "\u2171"=>"ii",
-    "\u2172"=>"iii",
-    "\u2173"=>"iv",
-    "\u2174"=>"v",
-    "\u2175"=>"vi",
-    "\u2176"=>"vii",
-    "\u2177"=>"viii",
-    "\u2178"=>"ix",
-    "\u2179"=>"x",
-    "\u217A"=>"xi",
-    "\u217B"=>"xii",
-    "\u217C"=>"l",
-    "\u217D"=>"c",
-    "\u217E"=>"d",
-    "\u217F"=>"m",
-    "\u2189"=>"0\u20443",
-    "\u222C"=>"\u222B\u222B",
-    "\u222D"=>"\u222B\u222B\u222B",
-    "\u222F"=>"\u222E\u222E",
-    "\u2230"=>"\u222E\u222E\u222E",
-    "\u2460"=>"1",
-    "\u2461"=>"2",
-    "\u2462"=>"3",
-    "\u2463"=>"4",
-    "\u2464"=>"5",
-    "\u2465"=>"6",
-    "\u2466"=>"7",
-    "\u2467"=>"8",
-    "\u2468"=>"9",
-    "\u2469"=>"10",
-    "\u246A"=>"11",
-    "\u246B"=>"12",
-    "\u246C"=>"13",
-    "\u246D"=>"14",
-    "\u246E"=>"15",
-    "\u246F"=>"16",
-    "\u2470"=>"17",
-    "\u2471"=>"18",
-    "\u2472"=>"19",
-    "\u2473"=>"20",
-    "\u2474"=>"(1)",
-    "\u2475"=>"(2)",
-    "\u2476"=>"(3)",
-    "\u2477"=>"(4)",
-    "\u2478"=>"(5)",
-    "\u2479"=>"(6)",
-    "\u247A"=>"(7)",
-    "\u247B"=>"(8)",
-    "\u247C"=>"(9)",
-    "\u247D"=>"(10)",
-    "\u247E"=>"(11)",
-    "\u247F"=>"(12)",
-    "\u2480"=>"(13)",
-    "\u2481"=>"(14)",
-    "\u2482"=>"(15)",
-    "\u2483"=>"(16)",
-    "\u2484"=>"(17)",
-    "\u2485"=>"(18)",
-    "\u2486"=>"(19)",
-    "\u2487"=>"(20)",
-    "\u2488"=>"1.",
-    "\u2489"=>"2.",
-    "\u248A"=>"3.",
-    "\u248B"=>"4.",
-    "\u248C"=>"5.",
-    "\u248D"=>"6.",
-    "\u248E"=>"7.",
-    "\u248F"=>"8.",
-    "\u2490"=>"9.",
-    "\u2491"=>"10.",
-    "\u2492"=>"11.",
-    "\u2493"=>"12.",
-    "\u2494"=>"13.",
-    "\u2495"=>"14.",
-    "\u2496"=>"15.",
-    "\u2497"=>"16.",
-    "\u2498"=>"17.",
-    "\u2499"=>"18.",
-    "\u249A"=>"19.",
-    "\u249B"=>"20.",
-    "\u249C"=>"(a)",
-    "\u249D"=>"(b)",
-    "\u249E"=>"(c)",
-    "\u249F"=>"(d)",
-    "\u24A0"=>"(e)",
-    "\u24A1"=>"(f)",
-    "\u24A2"=>"(g)",
-    "\u24A3"=>"(h)",
-    "\u24A4"=>"(i)",
-    "\u24A5"=>"(j)",
-    "\u24A6"=>"(k)",
-    "\u24A7"=>"(l)",
-    "\u24A8"=>"(m)",
-    "\u24A9"=>"(n)",
-    "\u24AA"=>"(o)",
-    "\u24AB"=>"(p)",
-    "\u24AC"=>"(q)",
-    "\u24AD"=>"(r)",
-    "\u24AE"=>"(s)",
-    "\u24AF"=>"(t)",
-    "\u24B0"=>"(u)",
-    "\u24B1"=>"(v)",
-    "\u24B2"=>"(w)",
-    "\u24B3"=>"(x)",
-    "\u24B4"=>"(y)",
-    "\u24B5"=>"(z)",
-    "\u24B6"=>"A",
-    "\u24B7"=>"B",
-    "\u24B8"=>"C",
-    "\u24B9"=>"D",
-    "\u24BA"=>"E",
-    "\u24BB"=>"F",
-    "\u24BC"=>"G",
-    "\u24BD"=>"H",
-    "\u24BE"=>"I",
-    "\u24BF"=>"J",
-    "\u24C0"=>"K",
-    "\u24C1"=>"L",
-    "\u24C2"=>"M",
-    "\u24C3"=>"N",
-    "\u24C4"=>"O",
-    "\u24C5"=>"P",
-    "\u24C6"=>"Q",
-    "\u24C7"=>"R",
-    "\u24C8"=>"S",
-    "\u24C9"=>"T",
-    "\u24CA"=>"U",
-    "\u24CB"=>"V",
-    "\u24CC"=>"W",
-    "\u24CD"=>"X",
-    "\u24CE"=>"Y",
-    "\u24CF"=>"Z",
-    "\u24D0"=>"a",
-    "\u24D1"=>"b",
-    "\u24D2"=>"c",
-    "\u24D3"=>"d",
-    "\u24D4"=>"e",
-    "\u24D5"=>"f",
-    "\u24D6"=>"g",
-    "\u24D7"=>"h",
-    "\u24D8"=>"i",
-    "\u24D9"=>"j",
-    "\u24DA"=>"k",
-    "\u24DB"=>"l",
-    "\u24DC"=>"m",
-    "\u24DD"=>"n",
-    "\u24DE"=>"o",
-    "\u24DF"=>"p",
-    "\u24E0"=>"q",
-    "\u24E1"=>"r",
-    "\u24E2"=>"s",
-    "\u24E3"=>"t",
-    "\u24E4"=>"u",
-    "\u24E5"=>"v",
-    "\u24E6"=>"w",
-    "\u24E7"=>"x",
-    "\u24E8"=>"y",
-    "\u24E9"=>"z",
-    "\u24EA"=>"0",
-    "\u2A0C"=>"\u222B\u222B\u222B\u222B",
-    "\u2A74"=>"::=",
-    "\u2A75"=>"==",
-    "\u2A76"=>"===",
-    "\u2C7C"=>"j",
-    "\u2C7D"=>"V",
-    "\u2D6F"=>"\u2D61",
-    "\u2E9F"=>"\u6BCD",
-    "\u2EF3"=>"\u9F9F",
-    "\u2F00"=>"\u4E00",
-    "\u2F01"=>"\u4E28",
-    "\u2F02"=>"\u4E36",
-    "\u2F03"=>"\u4E3F",
-    "\u2F04"=>"\u4E59",
-    "\u2F05"=>"\u4E85",
-    "\u2F06"=>"\u4E8C",
-    "\u2F07"=>"\u4EA0",
-    "\u2F08"=>"\u4EBA",
-    "\u2F09"=>"\u513F",
-    "\u2F0A"=>"\u5165",
-    "\u2F0B"=>"\u516B",
-    "\u2F0C"=>"\u5182",
-    "\u2F0D"=>"\u5196",
-    "\u2F0E"=>"\u51AB",
-    "\u2F0F"=>"\u51E0",
-    "\u2F10"=>"\u51F5",
-    "\u2F11"=>"\u5200",
-    "\u2F12"=>"\u529B",
-    "\u2F13"=>"\u52F9",
-    "\u2F14"=>"\u5315",
-    "\u2F15"=>"\u531A",
-    "\u2F16"=>"\u5338",
-    "\u2F17"=>"\u5341",
-    "\u2F18"=>"\u535C",
-    "\u2F19"=>"\u5369",
-    "\u2F1A"=>"\u5382",
-    "\u2F1B"=>"\u53B6",
-    "\u2F1C"=>"\u53C8",
-    "\u2F1D"=>"\u53E3",
-    "\u2F1E"=>"\u56D7",
-    "\u2F1F"=>"\u571F",
-    "\u2F20"=>"\u58EB",
-    "\u2F21"=>"\u5902",
-    "\u2F22"=>"\u590A",
-    "\u2F23"=>"\u5915",
-    "\u2F24"=>"\u5927",
-    "\u2F25"=>"\u5973",
-    "\u2F26"=>"\u5B50",
-    "\u2F27"=>"\u5B80",
-    "\u2F28"=>"\u5BF8",
-    "\u2F29"=>"\u5C0F",
-    "\u2F2A"=>"\u5C22",
-    "\u2F2B"=>"\u5C38",
-    "\u2F2C"=>"\u5C6E",
-    "\u2F2D"=>"\u5C71",
-    "\u2F2E"=>"\u5DDB",
-    "\u2F2F"=>"\u5DE5",
-    "\u2F30"=>"\u5DF1",
-    "\u2F31"=>"\u5DFE",
-    "\u2F32"=>"\u5E72",
-    "\u2F33"=>"\u5E7A",
-    "\u2F34"=>"\u5E7F",
-    "\u2F35"=>"\u5EF4",
-    "\u2F36"=>"\u5EFE",
-    "\u2F37"=>"\u5F0B",
-    "\u2F38"=>"\u5F13",
-    "\u2F39"=>"\u5F50",
-    "\u2F3A"=>"\u5F61",
-    "\u2F3B"=>"\u5F73",
-    "\u2F3C"=>"\u5FC3",
-    "\u2F3D"=>"\u6208",
-    "\u2F3E"=>"\u6236",
-    "\u2F3F"=>"\u624B",
-    "\u2F40"=>"\u652F",
-    "\u2F41"=>"\u6534",
-    "\u2F42"=>"\u6587",
-    "\u2F43"=>"\u6597",
-    "\u2F44"=>"\u65A4",
-    "\u2F45"=>"\u65B9",
-    "\u2F46"=>"\u65E0",
-    "\u2F47"=>"\u65E5",
-    "\u2F48"=>"\u66F0",
-    "\u2F49"=>"\u6708",
-    "\u2F4A"=>"\u6728",
-    "\u2F4B"=>"\u6B20",
-    "\u2F4C"=>"\u6B62",
-    "\u2F4D"=>"\u6B79",
-    "\u2F4E"=>"\u6BB3",
-    "\u2F4F"=>"\u6BCB",
-    "\u2F50"=>"\u6BD4",
-    "\u2F51"=>"\u6BDB",
-    "\u2F52"=>"\u6C0F",
-    "\u2F53"=>"\u6C14",
-    "\u2F54"=>"\u6C34",
-    "\u2F55"=>"\u706B",
-    "\u2F56"=>"\u722A",
-    "\u2F57"=>"\u7236",
-    "\u2F58"=>"\u723B",
-    "\u2F59"=>"\u723F",
-    "\u2F5A"=>"\u7247",
-    "\u2F5B"=>"\u7259",
-    "\u2F5C"=>"\u725B",
-    "\u2F5D"=>"\u72AC",
-    "\u2F5E"=>"\u7384",
-    "\u2F5F"=>"\u7389",
-    "\u2F60"=>"\u74DC",
-    "\u2F61"=>"\u74E6",
-    "\u2F62"=>"\u7518",
-    "\u2F63"=>"\u751F",
-    "\u2F64"=>"\u7528",
-    "\u2F65"=>"\u7530",
-    "\u2F66"=>"\u758B",
-    "\u2F67"=>"\u7592",
-    "\u2F68"=>"\u7676",
-    "\u2F69"=>"\u767D",
-    "\u2F6A"=>"\u76AE",
-    "\u2F6B"=>"\u76BF",
-    "\u2F6C"=>"\u76EE",
-    "\u2F6D"=>"\u77DB",
-    "\u2F6E"=>"\u77E2",
-    "\u2F6F"=>"\u77F3",
-    "\u2F70"=>"\u793A",
-    "\u2F71"=>"\u79B8",
-    "\u2F72"=>"\u79BE",
-    "\u2F73"=>"\u7A74",
-    "\u2F74"=>"\u7ACB",
-    "\u2F75"=>"\u7AF9",
-    "\u2F76"=>"\u7C73",
-    "\u2F77"=>"\u7CF8",
-    "\u2F78"=>"\u7F36",
-    "\u2F79"=>"\u7F51",
-    "\u2F7A"=>"\u7F8A",
-    "\u2F7B"=>"\u7FBD",
-    "\u2F7C"=>"\u8001",
-    "\u2F7D"=>"\u800C",
-    "\u2F7E"=>"\u8012",
-    "\u2F7F"=>"\u8033",
-    "\u2F80"=>"\u807F",
-    "\u2F81"=>"\u8089",
-    "\u2F82"=>"\u81E3",
-    "\u2F83"=>"\u81EA",
-    "\u2F84"=>"\u81F3",
-    "\u2F85"=>"\u81FC",
-    "\u2F86"=>"\u820C",
-    "\u2F87"=>"\u821B",
-    "\u2F88"=>"\u821F",
-    "\u2F89"=>"\u826E",
-    "\u2F8A"=>"\u8272",
-    "\u2F8B"=>"\u8278",
-    "\u2F8C"=>"\u864D",
-    "\u2F8D"=>"\u866B",
-    "\u2F8E"=>"\u8840",
-    "\u2F8F"=>"\u884C",
-    "\u2F90"=>"\u8863",
-    "\u2F91"=>"\u897E",
-    "\u2F92"=>"\u898B",
-    "\u2F93"=>"\u89D2",
-    "\u2F94"=>"\u8A00",
-    "\u2F95"=>"\u8C37",
-    "\u2F96"=>"\u8C46",
-    "\u2F97"=>"\u8C55",
-    "\u2F98"=>"\u8C78",
-    "\u2F99"=>"\u8C9D",
-    "\u2F9A"=>"\u8D64",
-    "\u2F9B"=>"\u8D70",
-    "\u2F9C"=>"\u8DB3",
-    "\u2F9D"=>"\u8EAB",
-    "\u2F9E"=>"\u8ECA",
-    "\u2F9F"=>"\u8F9B",
-    "\u2FA0"=>"\u8FB0",
-    "\u2FA1"=>"\u8FB5",
-    "\u2FA2"=>"\u9091",
-    "\u2FA3"=>"\u9149",
-    "\u2FA4"=>"\u91C6",
-    "\u2FA5"=>"\u91CC",
-    "\u2FA6"=>"\u91D1",
-    "\u2FA7"=>"\u9577",
-    "\u2FA8"=>"\u9580",
-    "\u2FA9"=>"\u961C",
-    "\u2FAA"=>"\u96B6",
-    "\u2FAB"=>"\u96B9",
-    "\u2FAC"=>"\u96E8",
-    "\u2FAD"=>"\u9751",
-    "\u2FAE"=>"\u975E",
-    "\u2FAF"=>"\u9762",
-    "\u2FB0"=>"\u9769",
-    "\u2FB1"=>"\u97CB",
-    "\u2FB2"=>"\u97ED",
-    "\u2FB3"=>"\u97F3",
-    "\u2FB4"=>"\u9801",
-    "\u2FB5"=>"\u98A8",
-    "\u2FB6"=>"\u98DB",
-    "\u2FB7"=>"\u98DF",
-    "\u2FB8"=>"\u9996",
-    "\u2FB9"=>"\u9999",
-    "\u2FBA"=>"\u99AC",
-    "\u2FBB"=>"\u9AA8",
-    "\u2FBC"=>"\u9AD8",
-    "\u2FBD"=>"\u9ADF",
-    "\u2FBE"=>"\u9B25",
-    "\u2FBF"=>"\u9B2F",
-    "\u2FC0"=>"\u9B32",
-    "\u2FC1"=>"\u9B3C",
-    "\u2FC2"=>"\u9B5A",
-    "\u2FC3"=>"\u9CE5",
-    "\u2FC4"=>"\u9E75",
-    "\u2FC5"=>"\u9E7F",
-    "\u2FC6"=>"\u9EA5",
-    "\u2FC7"=>"\u9EBB",
-    "\u2FC8"=>"\u9EC3",
-    "\u2FC9"=>"\u9ECD",
-    "\u2FCA"=>"\u9ED1",
-    "\u2FCB"=>"\u9EF9",
-    "\u2FCC"=>"\u9EFD",
-    "\u2FCD"=>"\u9F0E",
-    "\u2FCE"=>"\u9F13",
-    "\u2FCF"=>"\u9F20",
-    "\u2FD0"=>"\u9F3B",
-    "\u2FD1"=>"\u9F4A",
-    "\u2FD2"=>"\u9F52",
-    "\u2FD3"=>"\u9F8D",
-    "\u2FD4"=>"\u9F9C",
-    "\u2FD5"=>"\u9FA0",
-    "\u3000"=>" ",
-    "\u3036"=>"\u3012",
-    "\u3038"=>"\u5341",
-    "\u3039"=>"\u5344",
-    "\u303A"=>"\u5345",
-    "\u309B"=>" \u3099",
-    "\u309C"=>" \u309A",
-    "\u309F"=>"\u3088\u308A",
-    "\u30FF"=>"\u30B3\u30C8",
-    "\u3131"=>"\u1100",
-    "\u3132"=>"\u1101",
-    "\u3133"=>"\u11AA",
-    "\u3134"=>"\u1102",
-    "\u3135"=>"\u11AC",
-    "\u3136"=>"\u11AD",
-    "\u3137"=>"\u1103",
-    "\u3138"=>"\u1104",
-    "\u3139"=>"\u1105",
-    "\u313A"=>"\u11B0",
-    "\u313B"=>"\u11B1",
-    "\u313C"=>"\u11B2",
-    "\u313D"=>"\u11B3",
-    "\u313E"=>"\u11B4",
-    "\u313F"=>"\u11B5",
-    "\u3140"=>"\u111A",
-    "\u3141"=>"\u1106",
-    "\u3142"=>"\u1107",
-    "\u3143"=>"\u1108",
-    "\u3144"=>"\u1121",
-    "\u3145"=>"\u1109",
-    "\u3146"=>"\u110A",
-    "\u3147"=>"\u110B",
-    "\u3148"=>"\u110C",
-    "\u3149"=>"\u110D",
-    "\u314A"=>"\u110E",
-    "\u314B"=>"\u110F",
-    "\u314C"=>"\u1110",
-    "\u314D"=>"\u1111",
-    "\u314E"=>"\u1112",
-    "\u314F"=>"\u1161",
-    "\u3150"=>"\u1162",
-    "\u3151"=>"\u1163",
-    "\u3152"=>"\u1164",
-    "\u3153"=>"\u1165",
-    "\u3154"=>"\u1166",
-    "\u3155"=>"\u1167",
-    "\u3156"=>"\u1168",
-    "\u3157"=>"\u1169",
-    "\u3158"=>"\u116A",
-    "\u3159"=>"\u116B",
-    "\u315A"=>"\u116C",
-    "\u315B"=>"\u116D",
-    "\u315C"=>"\u116E",
-    "\u315D"=>"\u116F",
-    "\u315E"=>"\u1170",
-    "\u315F"=>"\u1171",
-    "\u3160"=>"\u1172",
-    "\u3161"=>"\u1173",
-    "\u3162"=>"\u1174",
-    "\u3163"=>"\u1175",
-    "\u3164"=>"\u1160",
-    "\u3165"=>"\u1114",
-    "\u3166"=>"\u1115",
-    "\u3167"=>"\u11C7",
-    "\u3168"=>"\u11C8",
-    "\u3169"=>"\u11CC",
-    "\u316A"=>"\u11CE",
-    "\u316B"=>"\u11D3",
-    "\u316C"=>"\u11D7",
-    "\u316D"=>"\u11D9",
-    "\u316E"=>"\u111C",
-    "\u316F"=>"\u11DD",
-    "\u3170"=>"\u11DF",
-    "\u3171"=>"\u111D",
-    "\u3172"=>"\u111E",
-    "\u3173"=>"\u1120",
-    "\u3174"=>"\u1122",
-    "\u3175"=>"\u1123",
-    "\u3176"=>"\u1127",
-    "\u3177"=>"\u1129",
-    "\u3178"=>"\u112B",
-    "\u3179"=>"\u112C",
-    "\u317A"=>"\u112D",
-    "\u317B"=>"\u112E",
-    "\u317C"=>"\u112F",
-    "\u317D"=>"\u1132",
-    "\u317E"=>"\u1136",
-    "\u317F"=>"\u1140",
-    "\u3180"=>"\u1147",
-    "\u3181"=>"\u114C",
-    "\u3182"=>"\u11F1",
-    "\u3183"=>"\u11F2",
-    "\u3184"=>"\u1157",
-    "\u3185"=>"\u1158",
-    "\u3186"=>"\u1159",
-    "\u3187"=>"\u1184",
-    "\u3188"=>"\u1185",
-    "\u3189"=>"\u1188",
-    "\u318A"=>"\u1191",
-    "\u318B"=>"\u1192",
-    "\u318C"=>"\u1194",
-    "\u318D"=>"\u119E",
-    "\u318E"=>"\u11A1",
-    "\u3192"=>"\u4E00",
-    "\u3193"=>"\u4E8C",
-    "\u3194"=>"\u4E09",
-    "\u3195"=>"\u56DB",
-    "\u3196"=>"\u4E0A",
-    "\u3197"=>"\u4E2D",
-    "\u3198"=>"\u4E0B",
-    "\u3199"=>"\u7532",
-    "\u319A"=>"\u4E59",
-    "\u319B"=>"\u4E19",
-    "\u319C"=>"\u4E01",
-    "\u319D"=>"\u5929",
-    "\u319E"=>"\u5730",
-    "\u319F"=>"\u4EBA",
-    "\u3200"=>"(\u1100)",
-    "\u3201"=>"(\u1102)",
-    "\u3202"=>"(\u1103)",
-    "\u3203"=>"(\u1105)",
-    "\u3204"=>"(\u1106)",
-    "\u3205"=>"(\u1107)",
-    "\u3206"=>"(\u1109)",
-    "\u3207"=>"(\u110B)",
-    "\u3208"=>"(\u110C)",
-    "\u3209"=>"(\u110E)",
-    "\u320A"=>"(\u110F)",
-    "\u320B"=>"(\u1110)",
-    "\u320C"=>"(\u1111)",
-    "\u320D"=>"(\u1112)",
-    "\u320E"=>"(\u1100\u1161)",
-    "\u320F"=>"(\u1102\u1161)",
-    "\u3210"=>"(\u1103\u1161)",
-    "\u3211"=>"(\u1105\u1161)",
-    "\u3212"=>"(\u1106\u1161)",
-    "\u3213"=>"(\u1107\u1161)",
-    "\u3214"=>"(\u1109\u1161)",
-    "\u3215"=>"(\u110B\u1161)",
-    "\u3216"=>"(\u110C\u1161)",
-    "\u3217"=>"(\u110E\u1161)",
-    "\u3218"=>"(\u110F\u1161)",
-    "\u3219"=>"(\u1110\u1161)",
-    "\u321A"=>"(\u1111\u1161)",
-    "\u321B"=>"(\u1112\u1161)",
-    "\u321C"=>"(\u110C\u116E)",
-    "\u321D"=>"(\u110B\u1169\u110C\u1165\u11AB)",
-    "\u321E"=>"(\u110B\u1169\u1112\u116E)",
-    "\u3220"=>"(\u4E00)",
-    "\u3221"=>"(\u4E8C)",
-    "\u3222"=>"(\u4E09)",
-    "\u3223"=>"(\u56DB)",
-    "\u3224"=>"(\u4E94)",
-    "\u3225"=>"(\u516D)",
-    "\u3226"=>"(\u4E03)",
-    "\u3227"=>"(\u516B)",
-    "\u3228"=>"(\u4E5D)",
-    "\u3229"=>"(\u5341)",
-    "\u322A"=>"(\u6708)",
-    "\u322B"=>"(\u706B)",
-    "\u322C"=>"(\u6C34)",
-    "\u322D"=>"(\u6728)",
-    "\u322E"=>"(\u91D1)",
-    "\u322F"=>"(\u571F)",
-    "\u3230"=>"(\u65E5)",
-    "\u3231"=>"(\u682A)",
-    "\u3232"=>"(\u6709)",
-    "\u3233"=>"(\u793E)",
-    "\u3234"=>"(\u540D)",
-    "\u3235"=>"(\u7279)",
-    "\u3236"=>"(\u8CA1)",
-    "\u3237"=>"(\u795D)",
-    "\u3238"=>"(\u52B4)",
-    "\u3239"=>"(\u4EE3)",
-    "\u323A"=>"(\u547C)",
-    "\u323B"=>"(\u5B66)",
-    "\u323C"=>"(\u76E3)",
-    "\u323D"=>"(\u4F01)",
-    "\u323E"=>"(\u8CC7)",
-    "\u323F"=>"(\u5354)",
-    "\u3240"=>"(\u796D)",
-    "\u3241"=>"(\u4F11)",
-    "\u3242"=>"(\u81EA)",
-    "\u3243"=>"(\u81F3)",
-    "\u3244"=>"\u554F",
-    "\u3245"=>"\u5E7C",
-    "\u3246"=>"\u6587",
-    "\u3247"=>"\u7B8F",
-    "\u3250"=>"PTE",
-    "\u3251"=>"21",
-    "\u3252"=>"22",
-    "\u3253"=>"23",
-    "\u3254"=>"24",
-    "\u3255"=>"25",
-    "\u3256"=>"26",
-    "\u3257"=>"27",
-    "\u3258"=>"28",
-    "\u3259"=>"29",
-    "\u325A"=>"30",
-    "\u325B"=>"31",
-    "\u325C"=>"32",
-    "\u325D"=>"33",
-    "\u325E"=>"34",
-    "\u325F"=>"35",
-    "\u3260"=>"\u1100",
-    "\u3261"=>"\u1102",
-    "\u3262"=>"\u1103",
-    "\u3263"=>"\u1105",
-    "\u3264"=>"\u1106",
-    "\u3265"=>"\u1107",
-    "\u3266"=>"\u1109",
-    "\u3267"=>"\u110B",
-    "\u3268"=>"\u110C",
-    "\u3269"=>"\u110E",
-    "\u326A"=>"\u110F",
-    "\u326B"=>"\u1110",
-    "\u326C"=>"\u1111",
-    "\u326D"=>"\u1112",
-    "\u326E"=>"\u1100\u1161",
-    "\u326F"=>"\u1102\u1161",
-    "\u3270"=>"\u1103\u1161",
-    "\u3271"=>"\u1105\u1161",
-    "\u3272"=>"\u1106\u1161",
-    "\u3273"=>"\u1107\u1161",
-    "\u3274"=>"\u1109\u1161",
-    "\u3275"=>"\u110B\u1161",
-    "\u3276"=>"\u110C\u1161",
-    "\u3277"=>"\u110E\u1161",
-    "\u3278"=>"\u110F\u1161",
-    "\u3279"=>"\u1110\u1161",
-    "\u327A"=>"\u1111\u1161",
-    "\u327B"=>"\u1112\u1161",
-    "\u327C"=>"\u110E\u1161\u11B7\u1100\u1169",
-    "\u327D"=>"\u110C\u116E\u110B\u1174",
-    "\u327E"=>"\u110B\u116E",
-    "\u3280"=>"\u4E00",
-    "\u3281"=>"\u4E8C",
-    "\u3282"=>"\u4E09",
-    "\u3283"=>"\u56DB",
-    "\u3284"=>"\u4E94",
-    "\u3285"=>"\u516D",
-    "\u3286"=>"\u4E03",
-    "\u3287"=>"\u516B",
-    "\u3288"=>"\u4E5D",
-    "\u3289"=>"\u5341",
-    "\u328A"=>"\u6708",
-    "\u328B"=>"\u706B",
-    "\u328C"=>"\u6C34",
-    "\u328D"=>"\u6728",
-    "\u328E"=>"\u91D1",
-    "\u328F"=>"\u571F",
-    "\u3290"=>"\u65E5",
-    "\u3291"=>"\u682A",
-    "\u3292"=>"\u6709",
-    "\u3293"=>"\u793E",
-    "\u3294"=>"\u540D",
-    "\u3295"=>"\u7279",
-    "\u3296"=>"\u8CA1",
-    "\u3297"=>"\u795D",
-    "\u3298"=>"\u52B4",
-    "\u3299"=>"\u79D8",
-    "\u329A"=>"\u7537",
-    "\u329B"=>"\u5973",
-    "\u329C"=>"\u9069",
-    "\u329D"=>"\u512A",
-    "\u329E"=>"\u5370",
-    "\u329F"=>"\u6CE8",
-    "\u32A0"=>"\u9805",
-    "\u32A1"=>"\u4F11",
-    "\u32A2"=>"\u5199",
-    "\u32A3"=>"\u6B63",
-    "\u32A4"=>"\u4E0A",
-    "\u32A5"=>"\u4E2D",
-    "\u32A6"=>"\u4E0B",
-    "\u32A7"=>"\u5DE6",
-    "\u32A8"=>"\u53F3",
-    "\u32A9"=>"\u533B",
-    "\u32AA"=>"\u5B97",
-    "\u32AB"=>"\u5B66",
-    "\u32AC"=>"\u76E3",
-    "\u32AD"=>"\u4F01",
-    "\u32AE"=>"\u8CC7",
-    "\u32AF"=>"\u5354",
-    "\u32B0"=>"\u591C",
-    "\u32B1"=>"36",
-    "\u32B2"=>"37",
-    "\u32B3"=>"38",
-    "\u32B4"=>"39",
-    "\u32B5"=>"40",
-    "\u32B6"=>"41",
-    "\u32B7"=>"42",
-    "\u32B8"=>"43",
-    "\u32B9"=>"44",
-    "\u32BA"=>"45",
-    "\u32BB"=>"46",
-    "\u32BC"=>"47",
-    "\u32BD"=>"48",
-    "\u32BE"=>"49",
-    "\u32BF"=>"50",
-    "\u32C0"=>"1\u6708",
-    "\u32C1"=>"2\u6708",
-    "\u32C2"=>"3\u6708",
-    "\u32C3"=>"4\u6708",
-    "\u32C4"=>"5\u6708",
-    "\u32C5"=>"6\u6708",
-    "\u32C6"=>"7\u6708",
-    "\u32C7"=>"8\u6708",
-    "\u32C8"=>"9\u6708",
-    "\u32C9"=>"10\u6708",
-    "\u32CA"=>"11\u6708",
-    "\u32CB"=>"12\u6708",
-    "\u32CC"=>"Hg",
-    "\u32CD"=>"erg",
-    "\u32CE"=>"eV",
-    "\u32CF"=>"LTD",
-    "\u32D0"=>"\u30A2",
-    "\u32D1"=>"\u30A4",
-    "\u32D2"=>"\u30A6",
-    "\u32D3"=>"\u30A8",
-    "\u32D4"=>"\u30AA",
-    "\u32D5"=>"\u30AB",
-    "\u32D6"=>"\u30AD",
-    "\u32D7"=>"\u30AF",
-    "\u32D8"=>"\u30B1",
-    "\u32D9"=>"\u30B3",
-    "\u32DA"=>"\u30B5",
-    "\u32DB"=>"\u30B7",
-    "\u32DC"=>"\u30B9",
-    "\u32DD"=>"\u30BB",
-    "\u32DE"=>"\u30BD",
-    "\u32DF"=>"\u30BF",
-    "\u32E0"=>"\u30C1",
-    "\u32E1"=>"\u30C4",
-    "\u32E2"=>"\u30C6",
-    "\u32E3"=>"\u30C8",
-    "\u32E4"=>"\u30CA",
-    "\u32E5"=>"\u30CB",
-    "\u32E6"=>"\u30CC",
-    "\u32E7"=>"\u30CD",
-    "\u32E8"=>"\u30CE",
-    "\u32E9"=>"\u30CF",
-    "\u32EA"=>"\u30D2",
-    "\u32EB"=>"\u30D5",
-    "\u32EC"=>"\u30D8",
-    "\u32ED"=>"\u30DB",
-    "\u32EE"=>"\u30DE",
-    "\u32EF"=>"\u30DF",
-    "\u32F0"=>"\u30E0",
-    "\u32F1"=>"\u30E1",
-    "\u32F2"=>"\u30E2",
-    "\u32F3"=>"\u30E4",
-    "\u32F4"=>"\u30E6",
-    "\u32F5"=>"\u30E8",
-    "\u32F6"=>"\u30E9",
-    "\u32F7"=>"\u30EA",
-    "\u32F8"=>"\u30EB",
-    "\u32F9"=>"\u30EC",
-    "\u32FA"=>"\u30ED",
-    "\u32FB"=>"\u30EF",
-    "\u32FC"=>"\u30F0",
-    "\u32FD"=>"\u30F1",
-    "\u32FE"=>"\u30F2",
-    "\u32FF"=>"\u4EE4\u548C",
-    "\u3300"=>"\u30A2\u30D1\u30FC\u30C8",
-    "\u3301"=>"\u30A2\u30EB\u30D5\u30A1",
-    "\u3302"=>"\u30A2\u30F3\u30DA\u30A2",
-    "\u3303"=>"\u30A2\u30FC\u30EB",
-    "\u3304"=>"\u30A4\u30CB\u30F3\u30B0",
-    "\u3305"=>"\u30A4\u30F3\u30C1",
-    "\u3306"=>"\u30A6\u30A9\u30F3",
-    "\u3307"=>"\u30A8\u30B9\u30AF\u30FC\u30C9",
-    "\u3308"=>"\u30A8\u30FC\u30AB\u30FC",
-    "\u3309"=>"\u30AA\u30F3\u30B9",
-    "\u330A"=>"\u30AA\u30FC\u30E0",
-    "\u330B"=>"\u30AB\u30A4\u30EA",
-    "\u330C"=>"\u30AB\u30E9\u30C3\u30C8",
-    "\u330D"=>"\u30AB\u30ED\u30EA\u30FC",
-    "\u330E"=>"\u30AC\u30ED\u30F3",
-    "\u330F"=>"\u30AC\u30F3\u30DE",
-    "\u3310"=>"\u30AE\u30AC",
-    "\u3311"=>"\u30AE\u30CB\u30FC",
-    "\u3312"=>"\u30AD\u30E5\u30EA\u30FC",
-    "\u3313"=>"\u30AE\u30EB\u30C0\u30FC",
-    "\u3314"=>"\u30AD\u30ED",
-    "\u3315"=>"\u30AD\u30ED\u30B0\u30E9\u30E0",
-    "\u3316"=>"\u30AD\u30ED\u30E1\u30FC\u30C8\u30EB",
-    "\u3317"=>"\u30AD\u30ED\u30EF\u30C3\u30C8",
-    "\u3318"=>"\u30B0\u30E9\u30E0",
-    "\u3319"=>"\u30B0\u30E9\u30E0\u30C8\u30F3",
-    "\u331A"=>"\u30AF\u30EB\u30BC\u30A4\u30ED",
-    "\u331B"=>"\u30AF\u30ED\u30FC\u30CD",
-    "\u331C"=>"\u30B1\u30FC\u30B9",
-    "\u331D"=>"\u30B3\u30EB\u30CA",
-    "\u331E"=>"\u30B3\u30FC\u30DD",
-    "\u331F"=>"\u30B5\u30A4\u30AF\u30EB",
-    "\u3320"=>"\u30B5\u30F3\u30C1\u30FC\u30E0",
-    "\u3321"=>"\u30B7\u30EA\u30F3\u30B0",
-    "\u3322"=>"\u30BB\u30F3\u30C1",
-    "\u3323"=>"\u30BB\u30F3\u30C8",
-    "\u3324"=>"\u30C0\u30FC\u30B9",
-    "\u3325"=>"\u30C7\u30B7",
-    "\u3326"=>"\u30C9\u30EB",
-    "\u3327"=>"\u30C8\u30F3",
-    "\u3328"=>"\u30CA\u30CE",
-    "\u3329"=>"\u30CE\u30C3\u30C8",
-    "\u332A"=>"\u30CF\u30A4\u30C4",
-    "\u332B"=>"\u30D1\u30FC\u30BB\u30F3\u30C8",
-    "\u332C"=>"\u30D1\u30FC\u30C4",
-    "\u332D"=>"\u30D0\u30FC\u30EC\u30EB",
-    "\u332E"=>"\u30D4\u30A2\u30B9\u30C8\u30EB",
-    "\u332F"=>"\u30D4\u30AF\u30EB",
-    "\u3330"=>"\u30D4\u30B3",
-    "\u3331"=>"\u30D3\u30EB",
-    "\u3332"=>"\u30D5\u30A1\u30E9\u30C3\u30C9",
-    "\u3333"=>"\u30D5\u30A3\u30FC\u30C8",
-    "\u3334"=>"\u30D6\u30C3\u30B7\u30A7\u30EB",
-    "\u3335"=>"\u30D5\u30E9\u30F3",
-    "\u3336"=>"\u30D8\u30AF\u30BF\u30FC\u30EB",
-    "\u3337"=>"\u30DA\u30BD",
-    "\u3338"=>"\u30DA\u30CB\u30D2",
-    "\u3339"=>"\u30D8\u30EB\u30C4",
-    "\u333A"=>"\u30DA\u30F3\u30B9",
-    "\u333B"=>"\u30DA\u30FC\u30B8",
-    "\u333C"=>"\u30D9\u30FC\u30BF",
-    "\u333D"=>"\u30DD\u30A4\u30F3\u30C8",
-    "\u333E"=>"\u30DC\u30EB\u30C8",
-    "\u333F"=>"\u30DB\u30F3",
-    "\u3340"=>"\u30DD\u30F3\u30C9",
-    "\u3341"=>"\u30DB\u30FC\u30EB",
-    "\u3342"=>"\u30DB\u30FC\u30F3",
-    "\u3343"=>"\u30DE\u30A4\u30AF\u30ED",
-    "\u3344"=>"\u30DE\u30A4\u30EB",
-    "\u3345"=>"\u30DE\u30C3\u30CF",
-    "\u3346"=>"\u30DE\u30EB\u30AF",
-    "\u3347"=>"\u30DE\u30F3\u30B7\u30E7\u30F3",
-    "\u3348"=>"\u30DF\u30AF\u30ED\u30F3",
-    "\u3349"=>"\u30DF\u30EA",
-    "\u334A"=>"\u30DF\u30EA\u30D0\u30FC\u30EB",
-    "\u334B"=>"\u30E1\u30AC",
-    "\u334C"=>"\u30E1\u30AC\u30C8\u30F3",
-    "\u334D"=>"\u30E1\u30FC\u30C8\u30EB",
-    "\u334E"=>"\u30E4\u30FC\u30C9",
-    "\u334F"=>"\u30E4\u30FC\u30EB",
-    "\u3350"=>"\u30E6\u30A2\u30F3",
-    "\u3351"=>"\u30EA\u30C3\u30C8\u30EB",
-    "\u3352"=>"\u30EA\u30E9",
-    "\u3353"=>"\u30EB\u30D4\u30FC",
-    "\u3354"=>"\u30EB\u30FC\u30D6\u30EB",
-    "\u3355"=>"\u30EC\u30E0",
-    "\u3356"=>"\u30EC\u30F3\u30C8\u30B2\u30F3",
-    "\u3357"=>"\u30EF\u30C3\u30C8",
-    "\u3358"=>"0\u70B9",
-    "\u3359"=>"1\u70B9",
-    "\u335A"=>"2\u70B9",
-    "\u335B"=>"3\u70B9",
-    "\u335C"=>"4\u70B9",
-    "\u335D"=>"5\u70B9",
-    "\u335E"=>"6\u70B9",
-    "\u335F"=>"7\u70B9",
-    "\u3360"=>"8\u70B9",
-    "\u3361"=>"9\u70B9",
-    "\u3362"=>"10\u70B9",
-    "\u3363"=>"11\u70B9",
-    "\u3364"=>"12\u70B9",
-    "\u3365"=>"13\u70B9",
-    "\u3366"=>"14\u70B9",
-    "\u3367"=>"15\u70B9",
-    "\u3368"=>"16\u70B9",
-    "\u3369"=>"17\u70B9",
-    "\u336A"=>"18\u70B9",
-    "\u336B"=>"19\u70B9",
-    "\u336C"=>"20\u70B9",
-    "\u336D"=>"21\u70B9",
-    "\u336E"=>"22\u70B9",
-    "\u336F"=>"23\u70B9",
-    "\u3370"=>"24\u70B9",
-    "\u3371"=>"hPa",
-    "\u3372"=>"da",
-    "\u3373"=>"AU",
-    "\u3374"=>"bar",
-    "\u3375"=>"oV",
-    "\u3376"=>"pc",
-    "\u3377"=>"dm",
-    "\u3378"=>"dm2",
-    "\u3379"=>"dm3",
-    "\u337A"=>"IU",
-    "\u337B"=>"\u5E73\u6210",
-    "\u337C"=>"\u662D\u548C",
-    "\u337D"=>"\u5927\u6B63",
-    "\u337E"=>"\u660E\u6CBB",
-    "\u337F"=>"\u682A\u5F0F\u4F1A\u793E",
-    "\u3380"=>"pA",
-    "\u3381"=>"nA",
-    "\u3382"=>"\u03BCA",
-    "\u3383"=>"mA",
-    "\u3384"=>"kA",
-    "\u3385"=>"KB",
-    "\u3386"=>"MB",
-    "\u3387"=>"GB",
-    "\u3388"=>"cal",
-    "\u3389"=>"kcal",
-    "\u338A"=>"pF",
-    "\u338B"=>"nF",
-    "\u338C"=>"\u03BCF",
-    "\u338D"=>"\u03BCg",
-    "\u338E"=>"mg",
-    "\u338F"=>"kg",
-    "\u3390"=>"Hz",
-    "\u3391"=>"kHz",
-    "\u3392"=>"MHz",
-    "\u3393"=>"GHz",
-    "\u3394"=>"THz",
-    "\u3395"=>"\u03BCl",
-    "\u3396"=>"ml",
-    "\u3397"=>"dl",
-    "\u3398"=>"kl",
-    "\u3399"=>"fm",
-    "\u339A"=>"nm",
-    "\u339B"=>"\u03BCm",
-    "\u339C"=>"mm",
-    "\u339D"=>"cm",
-    "\u339E"=>"km",
-    "\u339F"=>"mm2",
-    "\u33A0"=>"cm2",
-    "\u33A1"=>"m2",
-    "\u33A2"=>"km2",
-    "\u33A3"=>"mm3",
-    "\u33A4"=>"cm3",
-    "\u33A5"=>"m3",
-    "\u33A6"=>"km3",
-    "\u33A7"=>"m\u2215s",
-    "\u33A8"=>"m\u2215s2",
-    "\u33A9"=>"Pa",
-    "\u33AA"=>"kPa",
-    "\u33AB"=>"MPa",
-    "\u33AC"=>"GPa",
-    "\u33AD"=>"rad",
-    "\u33AE"=>"rad\u2215s",
-    "\u33AF"=>"rad\u2215s2",
-    "\u33B0"=>"ps",
-    "\u33B1"=>"ns",
-    "\u33B2"=>"\u03BCs",
-    "\u33B3"=>"ms",
-    "\u33B4"=>"pV",
-    "\u33B5"=>"nV",
-    "\u33B6"=>"\u03BCV",
-    "\u33B7"=>"mV",
-    "\u33B8"=>"kV",
-    "\u33B9"=>"MV",
-    "\u33BA"=>"pW",
-    "\u33BB"=>"nW",
-    "\u33BC"=>"\u03BCW",
-    "\u33BD"=>"mW",
-    "\u33BE"=>"kW",
-    "\u33BF"=>"MW",
-    "\u33C0"=>"k\u03A9",
-    "\u33C1"=>"M\u03A9",
-    "\u33C2"=>"a.m.",
-    "\u33C3"=>"Bq",
-    "\u33C4"=>"cc",
-    "\u33C5"=>"cd",
-    "\u33C6"=>"C\u2215kg",
-    "\u33C7"=>"Co.",
-    "\u33C8"=>"dB",
-    "\u33C9"=>"Gy",
-    "\u33CA"=>"ha",
-    "\u33CB"=>"HP",
-    "\u33CC"=>"in",
-    "\u33CD"=>"KK",
-    "\u33CE"=>"KM",
-    "\u33CF"=>"kt",
-    "\u33D0"=>"lm",
-    "\u33D1"=>"ln",
-    "\u33D2"=>"log",
-    "\u33D3"=>"lx",
-    "\u33D4"=>"mb",
-    "\u33D5"=>"mil",
-    "\u33D6"=>"mol",
-    "\u33D7"=>"PH",
-    "\u33D8"=>"p.m.",
-    "\u33D9"=>"PPM",
-    "\u33DA"=>"PR",
-    "\u33DB"=>"sr",
-    "\u33DC"=>"Sv",
-    "\u33DD"=>"Wb",
-    "\u33DE"=>"V\u2215m",
-    "\u33DF"=>"A\u2215m",
-    "\u33E0"=>"1\u65E5",
-    "\u33E1"=>"2\u65E5",
-    "\u33E2"=>"3\u65E5",
-    "\u33E3"=>"4\u65E5",
-    "\u33E4"=>"5\u65E5",
-    "\u33E5"=>"6\u65E5",
-    "\u33E6"=>"7\u65E5",
-    "\u33E7"=>"8\u65E5",
-    "\u33E8"=>"9\u65E5",
-    "\u33E9"=>"10\u65E5",
-    "\u33EA"=>"11\u65E5",
-    "\u33EB"=>"12\u65E5",
-    "\u33EC"=>"13\u65E5",
-    "\u33ED"=>"14\u65E5",
-    "\u33EE"=>"15\u65E5",
-    "\u33EF"=>"16\u65E5",
-    "\u33F0"=>"17\u65E5",
-    "\u33F1"=>"18\u65E5",
-    "\u33F2"=>"19\u65E5",
-    "\u33F3"=>"20\u65E5",
-    "\u33F4"=>"21\u65E5",
-    "\u33F5"=>"22\u65E5",
-    "\u33F6"=>"23\u65E5",
-    "\u33F7"=>"24\u65E5",
-    "\u33F8"=>"25\u65E5",
-    "\u33F9"=>"26\u65E5",
-    "\u33FA"=>"27\u65E5",
-    "\u33FB"=>"28\u65E5",
-    "\u33FC"=>"29\u65E5",
-    "\u33FD"=>"30\u65E5",
-    "\u33FE"=>"31\u65E5",
-    "\u33FF"=>"gal",
-    "\uA69C"=>"\u044A",
-    "\uA69D"=>"\u044C",
-    "\uA770"=>"\uA76F",
-    "\uA7F8"=>"\u0126",
-    "\uA7F9"=>"\u0153",
-    "\uAB5C"=>"\uA727",
-    "\uAB5D"=>"\uAB37",
-    "\uAB5E"=>"\u026B",
-    "\uAB5F"=>"\uAB52",
-    "\uFB00"=>"ff",
-    "\uFB01"=>"fi",
-    "\uFB02"=>"fl",
-    "\uFB03"=>"ffi",
-    "\uFB04"=>"ffl",
-    "\uFB05"=>"st",
-    "\uFB06"=>"st",
-    "\uFB13"=>"\u0574\u0576",
-    "\uFB14"=>"\u0574\u0565",
-    "\uFB15"=>"\u0574\u056B",
-    "\uFB16"=>"\u057E\u0576",
-    "\uFB17"=>"\u0574\u056D",
-    "\uFB20"=>"\u05E2",
-    "\uFB21"=>"\u05D0",
-    "\uFB22"=>"\u05D3",
-    "\uFB23"=>"\u05D4",
-    "\uFB24"=>"\u05DB",
-    "\uFB25"=>"\u05DC",
-    "\uFB26"=>"\u05DD",
-    "\uFB27"=>"\u05E8",
-    "\uFB28"=>"\u05EA",
-    "\uFB29"=>"+",
-    "\uFB4F"=>"\u05D0\u05DC",
-    "\uFB50"=>"\u0671",
-    "\uFB51"=>"\u0671",
-    "\uFB52"=>"\u067B",
-    "\uFB53"=>"\u067B",
-    "\uFB54"=>"\u067B",
-    "\uFB55"=>"\u067B",
-    "\uFB56"=>"\u067E",
-    "\uFB57"=>"\u067E",
-    "\uFB58"=>"\u067E",
-    "\uFB59"=>"\u067E",
-    "\uFB5A"=>"\u0680",
-    "\uFB5B"=>"\u0680",
-    "\uFB5C"=>"\u0680",
-    "\uFB5D"=>"\u0680",
-    "\uFB5E"=>"\u067A",
-    "\uFB5F"=>"\u067A",
-    "\uFB60"=>"\u067A",
-    "\uFB61"=>"\u067A",
-    "\uFB62"=>"\u067F",
-    "\uFB63"=>"\u067F",
-    "\uFB64"=>"\u067F",
-    "\uFB65"=>"\u067F",
-    "\uFB66"=>"\u0679",
-    "\uFB67"=>"\u0679",
-    "\uFB68"=>"\u0679",
-    "\uFB69"=>"\u0679",
-    "\uFB6A"=>"\u06A4",
-    "\uFB6B"=>"\u06A4",
-    "\uFB6C"=>"\u06A4",
-    "\uFB6D"=>"\u06A4",
-    "\uFB6E"=>"\u06A6",
-    "\uFB6F"=>"\u06A6",
-    "\uFB70"=>"\u06A6",
-    "\uFB71"=>"\u06A6",
-    "\uFB72"=>"\u0684",
-    "\uFB73"=>"\u0684",
-    "\uFB74"=>"\u0684",
-    "\uFB75"=>"\u0684",
-    "\uFB76"=>"\u0683",
-    "\uFB77"=>"\u0683",
-    "\uFB78"=>"\u0683",
-    "\uFB79"=>"\u0683",
-    "\uFB7A"=>"\u0686",
-    "\uFB7B"=>"\u0686",
-    "\uFB7C"=>"\u0686",
-    "\uFB7D"=>"\u0686",
-    "\uFB7E"=>"\u0687",
-    "\uFB7F"=>"\u0687",
-    "\uFB80"=>"\u0687",
-    "\uFB81"=>"\u0687",
-    "\uFB82"=>"\u068D",
-    "\uFB83"=>"\u068D",
-    "\uFB84"=>"\u068C",
-    "\uFB85"=>"\u068C",
-    "\uFB86"=>"\u068E",
-    "\uFB87"=>"\u068E",
-    "\uFB88"=>"\u0688",
-    "\uFB89"=>"\u0688",
-    "\uFB8A"=>"\u0698",
-    "\uFB8B"=>"\u0698",
-    "\uFB8C"=>"\u0691",
-    "\uFB8D"=>"\u0691",
-    "\uFB8E"=>"\u06A9",
-    "\uFB8F"=>"\u06A9",
-    "\uFB90"=>"\u06A9",
-    "\uFB91"=>"\u06A9",
-    "\uFB92"=>"\u06AF",
-    "\uFB93"=>"\u06AF",
-    "\uFB94"=>"\u06AF",
-    "\uFB95"=>"\u06AF",
-    "\uFB96"=>"\u06B3",
-    "\uFB97"=>"\u06B3",
-    "\uFB98"=>"\u06B3",
-    "\uFB99"=>"\u06B3",
-    "\uFB9A"=>"\u06B1",
-    "\uFB9B"=>"\u06B1",
-    "\uFB9C"=>"\u06B1",
-    "\uFB9D"=>"\u06B1",
-    "\uFB9E"=>"\u06BA",
-    "\uFB9F"=>"\u06BA",
-    "\uFBA0"=>"\u06BB",
-    "\uFBA1"=>"\u06BB",
-    "\uFBA2"=>"\u06BB",
-    "\uFBA3"=>"\u06BB",
-    "\uFBA4"=>"\u06C0",
-    "\uFBA5"=>"\u06C0",
-    "\uFBA6"=>"\u06C1",
-    "\uFBA7"=>"\u06C1",
-    "\uFBA8"=>"\u06C1",
-    "\uFBA9"=>"\u06C1",
-    "\uFBAA"=>"\u06BE",
-    "\uFBAB"=>"\u06BE",
-    "\uFBAC"=>"\u06BE",
-    "\uFBAD"=>"\u06BE",
-    "\uFBAE"=>"\u06D2",
-    "\uFBAF"=>"\u06D2",
-    "\uFBB0"=>"\u06D3",
-    "\uFBB1"=>"\u06D3",
-    "\uFBD3"=>"\u06AD",
-    "\uFBD4"=>"\u06AD",
-    "\uFBD5"=>"\u06AD",
-    "\uFBD6"=>"\u06AD",
-    "\uFBD7"=>"\u06C7",
-    "\uFBD8"=>"\u06C7",
-    "\uFBD9"=>"\u06C6",
-    "\uFBDA"=>"\u06C6",
-    "\uFBDB"=>"\u06C8",
-    "\uFBDC"=>"\u06C8",
-    "\uFBDD"=>"\u06C7\u0674",
-    "\uFBDE"=>"\u06CB",
-    "\uFBDF"=>"\u06CB",
-    "\uFBE0"=>"\u06C5",
-    "\uFBE1"=>"\u06C5",
-    "\uFBE2"=>"\u06C9",
-    "\uFBE3"=>"\u06C9",
-    "\uFBE4"=>"\u06D0",
-    "\uFBE5"=>"\u06D0",
-    "\uFBE6"=>"\u06D0",
-    "\uFBE7"=>"\u06D0",
-    "\uFBE8"=>"\u0649",
-    "\uFBE9"=>"\u0649",
-    "\uFBEA"=>"\u0626\u0627",
-    "\uFBEB"=>"\u0626\u0627",
-    "\uFBEC"=>"\u0626\u06D5",
-    "\uFBED"=>"\u0626\u06D5",
-    "\uFBEE"=>"\u0626\u0648",
-    "\uFBEF"=>"\u0626\u0648",
-    "\uFBF0"=>"\u0626\u06C7",
-    "\uFBF1"=>"\u0626\u06C7",
-    "\uFBF2"=>"\u0626\u06C6",
-    "\uFBF3"=>"\u0626\u06C6",
-    "\uFBF4"=>"\u0626\u06C8",
-    "\uFBF5"=>"\u0626\u06C8",
-    "\uFBF6"=>"\u0626\u06D0",
-    "\uFBF7"=>"\u0626\u06D0",
-    "\uFBF8"=>"\u0626\u06D0",
-    "\uFBF9"=>"\u0626\u0649",
-    "\uFBFA"=>"\u0626\u0649",
-    "\uFBFB"=>"\u0626\u0649",
-    "\uFBFC"=>"\u06CC",
-    "\uFBFD"=>"\u06CC",
-    "\uFBFE"=>"\u06CC",
-    "\uFBFF"=>"\u06CC",
-    "\uFC00"=>"\u0626\u062C",
-    "\uFC01"=>"\u0626\u062D",
-    "\uFC02"=>"\u0626\u0645",
-    "\uFC03"=>"\u0626\u0649",
-    "\uFC04"=>"\u0626\u064A",
-    "\uFC05"=>"\u0628\u062C",
-    "\uFC06"=>"\u0628\u062D",
-    "\uFC07"=>"\u0628\u062E",
-    "\uFC08"=>"\u0628\u0645",
-    "\uFC09"=>"\u0628\u0649",
-    "\uFC0A"=>"\u0628\u064A",
-    "\uFC0B"=>"\u062A\u062C",
-    "\uFC0C"=>"\u062A\u062D",
-    "\uFC0D"=>"\u062A\u062E",
-    "\uFC0E"=>"\u062A\u0645",
-    "\uFC0F"=>"\u062A\u0649",
-    "\uFC10"=>"\u062A\u064A",
-    "\uFC11"=>"\u062B\u062C",
-    "\uFC12"=>"\u062B\u0645",
-    "\uFC13"=>"\u062B\u0649",
-    "\uFC14"=>"\u062B\u064A",
-    "\uFC15"=>"\u062C\u062D",
-    "\uFC16"=>"\u062C\u0645",
-    "\uFC17"=>"\u062D\u062C",
-    "\uFC18"=>"\u062D\u0645",
-    "\uFC19"=>"\u062E\u062C",
-    "\uFC1A"=>"\u062E\u062D",
-    "\uFC1B"=>"\u062E\u0645",
-    "\uFC1C"=>"\u0633\u062C",
-    "\uFC1D"=>"\u0633\u062D",
-    "\uFC1E"=>"\u0633\u062E",
-    "\uFC1F"=>"\u0633\u0645",
-    "\uFC20"=>"\u0635\u062D",
-    "\uFC21"=>"\u0635\u0645",
-    "\uFC22"=>"\u0636\u062C",
-    "\uFC23"=>"\u0636\u062D",
-    "\uFC24"=>"\u0636\u062E",
-    "\uFC25"=>"\u0636\u0645",
-    "\uFC26"=>"\u0637\u062D",
-    "\uFC27"=>"\u0637\u0645",
-    "\uFC28"=>"\u0638\u0645",
-    "\uFC29"=>"\u0639\u062C",
-    "\uFC2A"=>"\u0639\u0645",
-    "\uFC2B"=>"\u063A\u062C",
-    "\uFC2C"=>"\u063A\u0645",
-    "\uFC2D"=>"\u0641\u062C",
-    "\uFC2E"=>"\u0641\u062D",
-    "\uFC2F"=>"\u0641\u062E",
-    "\uFC30"=>"\u0641\u0645",
-    "\uFC31"=>"\u0641\u0649",
-    "\uFC32"=>"\u0641\u064A",
-    "\uFC33"=>"\u0642\u062D",
-    "\uFC34"=>"\u0642\u0645",
-    "\uFC35"=>"\u0642\u0649",
-    "\uFC36"=>"\u0642\u064A",
-    "\uFC37"=>"\u0643\u0627",
-    "\uFC38"=>"\u0643\u062C",
-    "\uFC39"=>"\u0643\u062D",
-    "\uFC3A"=>"\u0643\u062E",
-    "\uFC3B"=>"\u0643\u0644",
-    "\uFC3C"=>"\u0643\u0645",
-    "\uFC3D"=>"\u0643\u0649",
-    "\uFC3E"=>"\u0643\u064A",
-    "\uFC3F"=>"\u0644\u062C",
-    "\uFC40"=>"\u0644\u062D",
-    "\uFC41"=>"\u0644\u062E",
-    "\uFC42"=>"\u0644\u0645",
-    "\uFC43"=>"\u0644\u0649",
-    "\uFC44"=>"\u0644\u064A",
-    "\uFC45"=>"\u0645\u062C",
-    "\uFC46"=>"\u0645\u062D",
-    "\uFC47"=>"\u0645\u062E",
-    "\uFC48"=>"\u0645\u0645",
-    "\uFC49"=>"\u0645\u0649",
-    "\uFC4A"=>"\u0645\u064A",
-    "\uFC4B"=>"\u0646\u062C",
-    "\uFC4C"=>"\u0646\u062D",
-    "\uFC4D"=>"\u0646\u062E",
-    "\uFC4E"=>"\u0646\u0645",
-    "\uFC4F"=>"\u0646\u0649",
-    "\uFC50"=>"\u0646\u064A",
-    "\uFC51"=>"\u0647\u062C",
-    "\uFC52"=>"\u0647\u0645",
-    "\uFC53"=>"\u0647\u0649",
-    "\uFC54"=>"\u0647\u064A",
-    "\uFC55"=>"\u064A\u062C",
-    "\uFC56"=>"\u064A\u062D",
-    "\uFC57"=>"\u064A\u062E",
-    "\uFC58"=>"\u064A\u0645",
-    "\uFC59"=>"\u064A\u0649",
-    "\uFC5A"=>"\u064A\u064A",
-    "\uFC5B"=>"\u0630\u0670",
-    "\uFC5C"=>"\u0631\u0670",
-    "\uFC5D"=>"\u0649\u0670",
-    "\uFC5E"=>" \u064C\u0651",
-    "\uFC5F"=>" \u064D\u0651",
-    "\uFC60"=>" \u064E\u0651",
-    "\uFC61"=>" \u064F\u0651",
-    "\uFC62"=>" \u0650\u0651",
-    "\uFC63"=>" \u0651\u0670",
-    "\uFC64"=>"\u0626\u0631",
-    "\uFC65"=>"\u0626\u0632",
-    "\uFC66"=>"\u0626\u0645",
-    "\uFC67"=>"\u0626\u0646",
-    "\uFC68"=>"\u0626\u0649",
-    "\uFC69"=>"\u0626\u064A",
-    "\uFC6A"=>"\u0628\u0631",
-    "\uFC6B"=>"\u0628\u0632",
-    "\uFC6C"=>"\u0628\u0645",
-    "\uFC6D"=>"\u0628\u0646",
-    "\uFC6E"=>"\u0628\u0649",
-    "\uFC6F"=>"\u0628\u064A",
-    "\uFC70"=>"\u062A\u0631",
-    "\uFC71"=>"\u062A\u0632",
-    "\uFC72"=>"\u062A\u0645",
-    "\uFC73"=>"\u062A\u0646",
-    "\uFC74"=>"\u062A\u0649",
-    "\uFC75"=>"\u062A\u064A",
-    "\uFC76"=>"\u062B\u0631",
-    "\uFC77"=>"\u062B\u0632",
-    "\uFC78"=>"\u062B\u0645",
-    "\uFC79"=>"\u062B\u0646",
-    "\uFC7A"=>"\u062B\u0649",
-    "\uFC7B"=>"\u062B\u064A",
-    "\uFC7C"=>"\u0641\u0649",
-    "\uFC7D"=>"\u0641\u064A",
-    "\uFC7E"=>"\u0642\u0649",
-    "\uFC7F"=>"\u0642\u064A",
-    "\uFC80"=>"\u0643\u0627",
-    "\uFC81"=>"\u0643\u0644",
-    "\uFC82"=>"\u0643\u0645",
-    "\uFC83"=>"\u0643\u0649",
-    "\uFC84"=>"\u0643\u064A",
-    "\uFC85"=>"\u0644\u0645",
-    "\uFC86"=>"\u0644\u0649",
-    "\uFC87"=>"\u0644\u064A",
-    "\uFC88"=>"\u0645\u0627",
-    "\uFC89"=>"\u0645\u0645",
-    "\uFC8A"=>"\u0646\u0631",
-    "\uFC8B"=>"\u0646\u0632",
-    "\uFC8C"=>"\u0646\u0645",
-    "\uFC8D"=>"\u0646\u0646",
-    "\uFC8E"=>"\u0646\u0649",
-    "\uFC8F"=>"\u0646\u064A",
-    "\uFC90"=>"\u0649\u0670",
-    "\uFC91"=>"\u064A\u0631",
-    "\uFC92"=>"\u064A\u0632",
-    "\uFC93"=>"\u064A\u0645",
-    "\uFC94"=>"\u064A\u0646",
-    "\uFC95"=>"\u064A\u0649",
-    "\uFC96"=>"\u064A\u064A",
-    "\uFC97"=>"\u0626\u062C",
-    "\uFC98"=>"\u0626\u062D",
-    "\uFC99"=>"\u0626\u062E",
-    "\uFC9A"=>"\u0626\u0645",
-    "\uFC9B"=>"\u0626\u0647",
-    "\uFC9C"=>"\u0628\u062C",
-    "\uFC9D"=>"\u0628\u062D",
-    "\uFC9E"=>"\u0628\u062E",
-    "\uFC9F"=>"\u0628\u0645",
-    "\uFCA0"=>"\u0628\u0647",
-    "\uFCA1"=>"\u062A\u062C",
-    "\uFCA2"=>"\u062A\u062D",
-    "\uFCA3"=>"\u062A\u062E",
-    "\uFCA4"=>"\u062A\u0645",
-    "\uFCA5"=>"\u062A\u0647",
-    "\uFCA6"=>"\u062B\u0645",
-    "\uFCA7"=>"\u062C\u062D",
-    "\uFCA8"=>"\u062C\u0645",
-    "\uFCA9"=>"\u062D\u062C",
-    "\uFCAA"=>"\u062D\u0645",
-    "\uFCAB"=>"\u062E\u062C",
-    "\uFCAC"=>"\u062E\u0645",
-    "\uFCAD"=>"\u0633\u062C",
-    "\uFCAE"=>"\u0633\u062D",
-    "\uFCAF"=>"\u0633\u062E",
-    "\uFCB0"=>"\u0633\u0645",
-    "\uFCB1"=>"\u0635\u062D",
-    "\uFCB2"=>"\u0635\u062E",
-    "\uFCB3"=>"\u0635\u0645",
-    "\uFCB4"=>"\u0636\u062C",
-    "\uFCB5"=>"\u0636\u062D",
-    "\uFCB6"=>"\u0636\u062E",
-    "\uFCB7"=>"\u0636\u0645",
-    "\uFCB8"=>"\u0637\u062D",
-    "\uFCB9"=>"\u0638\u0645",
-    "\uFCBA"=>"\u0639\u062C",
-    "\uFCBB"=>"\u0639\u0645",
-    "\uFCBC"=>"\u063A\u062C",
-    "\uFCBD"=>"\u063A\u0645",
-    "\uFCBE"=>"\u0641\u062C",
-    "\uFCBF"=>"\u0641\u062D",
-    "\uFCC0"=>"\u0641\u062E",
-    "\uFCC1"=>"\u0641\u0645",
-    "\uFCC2"=>"\u0642\u062D",
-    "\uFCC3"=>"\u0642\u0645",
-    "\uFCC4"=>"\u0643\u062C",
-    "\uFCC5"=>"\u0643\u062D",
-    "\uFCC6"=>"\u0643\u062E",
-    "\uFCC7"=>"\u0643\u0644",
-    "\uFCC8"=>"\u0643\u0645",
-    "\uFCC9"=>"\u0644\u062C",
-    "\uFCCA"=>"\u0644\u062D",
-    "\uFCCB"=>"\u0644\u062E",
-    "\uFCCC"=>"\u0644\u0645",
-    "\uFCCD"=>"\u0644\u0647",
-    "\uFCCE"=>"\u0645\u062C",
-    "\uFCCF"=>"\u0645\u062D",
-    "\uFCD0"=>"\u0645\u062E",
-    "\uFCD1"=>"\u0645\u0645",
-    "\uFCD2"=>"\u0646\u062C",
-    "\uFCD3"=>"\u0646\u062D",
-    "\uFCD4"=>"\u0646\u062E",
-    "\uFCD5"=>"\u0646\u0645",
-    "\uFCD6"=>"\u0646\u0647",
-    "\uFCD7"=>"\u0647\u062C",
-    "\uFCD8"=>"\u0647\u0645",
-    "\uFCD9"=>"\u0647\u0670",
-    "\uFCDA"=>"\u064A\u062C",
-    "\uFCDB"=>"\u064A\u062D",
-    "\uFCDC"=>"\u064A\u062E",
-    "\uFCDD"=>"\u064A\u0645",
-    "\uFCDE"=>"\u064A\u0647",
-    "\uFCDF"=>"\u0626\u0645",
-    "\uFCE0"=>"\u0626\u0647",
-    "\uFCE1"=>"\u0628\u0645",
-    "\uFCE2"=>"\u0628\u0647",
-    "\uFCE3"=>"\u062A\u0645",
-    "\uFCE4"=>"\u062A\u0647",
-    "\uFCE5"=>"\u062B\u0645",
-    "\uFCE6"=>"\u062B\u0647",
-    "\uFCE7"=>"\u0633\u0645",
-    "\uFCE8"=>"\u0633\u0647",
-    "\uFCE9"=>"\u0634\u0645",
-    "\uFCEA"=>"\u0634\u0647",
-    "\uFCEB"=>"\u0643\u0644",
-    "\uFCEC"=>"\u0643\u0645",
-    "\uFCED"=>"\u0644\u0645",
-    "\uFCEE"=>"\u0646\u0645",
-    "\uFCEF"=>"\u0646\u0647",
-    "\uFCF0"=>"\u064A\u0645",
-    "\uFCF1"=>"\u064A\u0647",
-    "\uFCF2"=>"\u0640\u064E\u0651",
-    "\uFCF3"=>"\u0640\u064F\u0651",
-    "\uFCF4"=>"\u0640\u0650\u0651",
-    "\uFCF5"=>"\u0637\u0649",
-    "\uFCF6"=>"\u0637\u064A",
-    "\uFCF7"=>"\u0639\u0649",
-    "\uFCF8"=>"\u0639\u064A",
-    "\uFCF9"=>"\u063A\u0649",
-    "\uFCFA"=>"\u063A\u064A",
-    "\uFCFB"=>"\u0633\u0649",
-    "\uFCFC"=>"\u0633\u064A",
-    "\uFCFD"=>"\u0634\u0649",
-    "\uFCFE"=>"\u0634\u064A",
-    "\uFCFF"=>"\u062D\u0649",
-    "\uFD00"=>"\u062D\u064A",
-    "\uFD01"=>"\u062C\u0649",
-    "\uFD02"=>"\u062C\u064A",
-    "\uFD03"=>"\u062E\u0649",
-    "\uFD04"=>"\u062E\u064A",
-    "\uFD05"=>"\u0635\u0649",
-    "\uFD06"=>"\u0635\u064A",
-    "\uFD07"=>"\u0636\u0649",
-    "\uFD08"=>"\u0636\u064A",
-    "\uFD09"=>"\u0634\u062C",
-    "\uFD0A"=>"\u0634\u062D",
-    "\uFD0B"=>"\u0634\u062E",
-    "\uFD0C"=>"\u0634\u0645",
-    "\uFD0D"=>"\u0634\u0631",
-    "\uFD0E"=>"\u0633\u0631",
-    "\uFD0F"=>"\u0635\u0631",
-    "\uFD10"=>"\u0636\u0631",
-    "\uFD11"=>"\u0637\u0649",
-    "\uFD12"=>"\u0637\u064A",
-    "\uFD13"=>"\u0639\u0649",
-    "\uFD14"=>"\u0639\u064A",
-    "\uFD15"=>"\u063A\u0649",
-    "\uFD16"=>"\u063A\u064A",
-    "\uFD17"=>"\u0633\u0649",
-    "\uFD18"=>"\u0633\u064A",
-    "\uFD19"=>"\u0634\u0649",
-    "\uFD1A"=>"\u0634\u064A",
-    "\uFD1B"=>"\u062D\u0649",
-    "\uFD1C"=>"\u062D\u064A",
-    "\uFD1D"=>"\u062C\u0649",
-    "\uFD1E"=>"\u062C\u064A",
-    "\uFD1F"=>"\u062E\u0649",
-    "\uFD20"=>"\u062E\u064A",
-    "\uFD21"=>"\u0635\u0649",
-    "\uFD22"=>"\u0635\u064A",
-    "\uFD23"=>"\u0636\u0649",
-    "\uFD24"=>"\u0636\u064A",
-    "\uFD25"=>"\u0634\u062C",
-    "\uFD26"=>"\u0634\u062D",
-    "\uFD27"=>"\u0634\u062E",
-    "\uFD28"=>"\u0634\u0645",
-    "\uFD29"=>"\u0634\u0631",
-    "\uFD2A"=>"\u0633\u0631",
-    "\uFD2B"=>"\u0635\u0631",
-    "\uFD2C"=>"\u0636\u0631",
-    "\uFD2D"=>"\u0634\u062C",
-    "\uFD2E"=>"\u0634\u062D",
-    "\uFD2F"=>"\u0634\u062E",
-    "\uFD30"=>"\u0634\u0645",
-    "\uFD31"=>"\u0633\u0647",
-    "\uFD32"=>"\u0634\u0647",
-    "\uFD33"=>"\u0637\u0645",
-    "\uFD34"=>"\u0633\u062C",
-    "\uFD35"=>"\u0633\u062D",
-    "\uFD36"=>"\u0633\u062E",
-    "\uFD37"=>"\u0634\u062C",
-    "\uFD38"=>"\u0634\u062D",
-    "\uFD39"=>"\u0634\u062E",
-    "\uFD3A"=>"\u0637\u0645",
-    "\uFD3B"=>"\u0638\u0645",
-    "\uFD3C"=>"\u0627\u064B",
-    "\uFD3D"=>"\u0627\u064B",
-    "\uFD50"=>"\u062A\u062C\u0645",
-    "\uFD51"=>"\u062A\u062D\u062C",
-    "\uFD52"=>"\u062A\u062D\u062C",
-    "\uFD53"=>"\u062A\u062D\u0645",
-    "\uFD54"=>"\u062A\u062E\u0645",
-    "\uFD55"=>"\u062A\u0645\u062C",
-    "\uFD56"=>"\u062A\u0645\u062D",
-    "\uFD57"=>"\u062A\u0645\u062E",
-    "\uFD58"=>"\u062C\u0645\u062D",
-    "\uFD59"=>"\u062C\u0645\u062D",
-    "\uFD5A"=>"\u062D\u0645\u064A",
-    "\uFD5B"=>"\u062D\u0645\u0649",
-    "\uFD5C"=>"\u0633\u062D\u062C",
-    "\uFD5D"=>"\u0633\u062C\u062D",
-    "\uFD5E"=>"\u0633\u062C\u0649",
-    "\uFD5F"=>"\u0633\u0645\u062D",
-    "\uFD60"=>"\u0633\u0645\u062D",
-    "\uFD61"=>"\u0633\u0645\u062C",
-    "\uFD62"=>"\u0633\u0645\u0645",
-    "\uFD63"=>"\u0633\u0645\u0645",
-    "\uFD64"=>"\u0635\u062D\u062D",
-    "\uFD65"=>"\u0635\u062D\u062D",
-    "\uFD66"=>"\u0635\u0645\u0645",
-    "\uFD67"=>"\u0634\u062D\u0645",
-    "\uFD68"=>"\u0634\u062D\u0645",
-    "\uFD69"=>"\u0634\u062C\u064A",
-    "\uFD6A"=>"\u0634\u0645\u062E",
-    "\uFD6B"=>"\u0634\u0645\u062E",
-    "\uFD6C"=>"\u0634\u0645\u0645",
-    "\uFD6D"=>"\u0634\u0645\u0645",
-    "\uFD6E"=>"\u0636\u062D\u0649",
-    "\uFD6F"=>"\u0636\u062E\u0645",
-    "\uFD70"=>"\u0636\u062E\u0645",
-    "\uFD71"=>"\u0637\u0645\u062D",
-    "\uFD72"=>"\u0637\u0645\u062D",
-    "\uFD73"=>"\u0637\u0645\u0645",
-    "\uFD74"=>"\u0637\u0645\u064A",
-    "\uFD75"=>"\u0639\u062C\u0645",
-    "\uFD76"=>"\u0639\u0645\u0645",
-    "\uFD77"=>"\u0639\u0645\u0645",
-    "\uFD78"=>"\u0639\u0645\u0649",
-    "\uFD79"=>"\u063A\u0645\u0645",
-    "\uFD7A"=>"\u063A\u0645\u064A",
-    "\uFD7B"=>"\u063A\u0645\u0649",
-    "\uFD7C"=>"\u0641\u062E\u0645",
-    "\uFD7D"=>"\u0641\u062E\u0645",
-    "\uFD7E"=>"\u0642\u0645\u062D",
-    "\uFD7F"=>"\u0642\u0645\u0645",
-    "\uFD80"=>"\u0644\u062D\u0645",
-    "\uFD81"=>"\u0644\u062D\u064A",
-    "\uFD82"=>"\u0644\u062D\u0649",
-    "\uFD83"=>"\u0644\u062C\u062C",
-    "\uFD84"=>"\u0644\u062C\u062C",
-    "\uFD85"=>"\u0644\u062E\u0645",
-    "\uFD86"=>"\u0644\u062E\u0645",
-    "\uFD87"=>"\u0644\u0645\u062D",
-    "\uFD88"=>"\u0644\u0645\u062D",
-    "\uFD89"=>"\u0645\u062D\u062C",
-    "\uFD8A"=>"\u0645\u062D\u0645",
-    "\uFD8B"=>"\u0645\u062D\u064A",
-    "\uFD8C"=>"\u0645\u062C\u062D",
-    "\uFD8D"=>"\u0645\u062C\u0645",
-    "\uFD8E"=>"\u0645\u062E\u062C",
-    "\uFD8F"=>"\u0645\u062E\u0645",
-    "\uFD92"=>"\u0645\u062C\u062E",
-    "\uFD93"=>"\u0647\u0645\u062C",
-    "\uFD94"=>"\u0647\u0645\u0645",
-    "\uFD95"=>"\u0646\u062D\u0645",
-    "\uFD96"=>"\u0646\u062D\u0649",
-    "\uFD97"=>"\u0646\u062C\u0645",
-    "\uFD98"=>"\u0646\u062C\u0645",
-    "\uFD99"=>"\u0646\u062C\u0649",
-    "\uFD9A"=>"\u0646\u0645\u064A",
-    "\uFD9B"=>"\u0646\u0645\u0649",
-    "\uFD9C"=>"\u064A\u0645\u0645",
-    "\uFD9D"=>"\u064A\u0645\u0645",
-    "\uFD9E"=>"\u0628\u062E\u064A",
-    "\uFD9F"=>"\u062A\u062C\u064A",
-    "\uFDA0"=>"\u062A\u062C\u0649",
-    "\uFDA1"=>"\u062A\u062E\u064A",
-    "\uFDA2"=>"\u062A\u062E\u0649",
-    "\uFDA3"=>"\u062A\u0645\u064A",
-    "\uFDA4"=>"\u062A\u0645\u0649",
-    "\uFDA5"=>"\u062C\u0645\u064A",
-    "\uFDA6"=>"\u062C\u062D\u0649",
-    "\uFDA7"=>"\u062C\u0645\u0649",
-    "\uFDA8"=>"\u0633\u062E\u0649",
-    "\uFDA9"=>"\u0635\u062D\u064A",
-    "\uFDAA"=>"\u0634\u062D\u064A",
-    "\uFDAB"=>"\u0636\u062D\u064A",
-    "\uFDAC"=>"\u0644\u062C\u064A",
-    "\uFDAD"=>"\u0644\u0645\u064A",
-    "\uFDAE"=>"\u064A\u062D\u064A",
-    "\uFDAF"=>"\u064A\u062C\u064A",
-    "\uFDB0"=>"\u064A\u0645\u064A",
-    "\uFDB1"=>"\u0645\u0645\u064A",
-    "\uFDB2"=>"\u0642\u0645\u064A",
-    "\uFDB3"=>"\u0646\u062D\u064A",
-    "\uFDB4"=>"\u0642\u0645\u062D",
-    "\uFDB5"=>"\u0644\u062D\u0645",
-    "\uFDB6"=>"\u0639\u0645\u064A",
-    "\uFDB7"=>"\u0643\u0645\u064A",
-    "\uFDB8"=>"\u0646\u062C\u062D",
-    "\uFDB9"=>"\u0645\u062E\u064A",
-    "\uFDBA"=>"\u0644\u062C\u0645",
-    "\uFDBB"=>"\u0643\u0645\u0645",
-    "\uFDBC"=>"\u0644\u062C\u0645",
-    "\uFDBD"=>"\u0646\u062C\u062D",
-    "\uFDBE"=>"\u062C\u062D\u064A",
-    "\uFDBF"=>"\u062D\u062C\u064A",
-    "\uFDC0"=>"\u0645\u062C\u064A",
-    "\uFDC1"=>"\u0641\u0645\u064A",
-    "\uFDC2"=>"\u0628\u062D\u064A",
-    "\uFDC3"=>"\u0643\u0645\u0645",
-    "\uFDC4"=>"\u0639\u062C\u0645",
-    "\uFDC5"=>"\u0635\u0645\u0645",
-    "\uFDC6"=>"\u0633\u062E\u064A",
-    "\uFDC7"=>"\u0646\u062C\u064A",
-    "\uFDF0"=>"\u0635\u0644\u06D2",
-    "\uFDF1"=>"\u0642\u0644\u06D2",
-    "\uFDF2"=>"\u0627\u0644\u0644\u0647",
-    "\uFDF3"=>"\u0627\u0643\u0628\u0631",
-    "\uFDF4"=>"\u0645\u062D\u0645\u062F",
-    "\uFDF5"=>"\u0635\u0644\u0639\u0645",
-    "\uFDF6"=>"\u0631\u0633\u0648\u0644",
-    "\uFDF7"=>"\u0639\u0644\u064A\u0647",
-    "\uFDF8"=>"\u0648\u0633\u0644\u0645",
-    "\uFDF9"=>"\u0635\u0644\u0649",
-    "\uFDFA"=>"\u0635\u0644\u0649 \u0627\u0644\u0644\u0647 \u0639\u0644\u064A\u0647 \u0648\u0633\u0644\u0645",
-    "\uFDFB"=>"\u062C\u0644 \u062C\u0644\u0627\u0644\u0647",
-    "\uFDFC"=>"\u0631\u06CC\u0627\u0644",
-    "\uFE10"=>",",
-    "\uFE11"=>"\u3001",
-    "\uFE12"=>"\u3002",
-    "\uFE13"=>":",
-    "\uFE14"=>";",
-    "\uFE15"=>"!",
-    "\uFE16"=>"?",
-    "\uFE17"=>"\u3016",
-    "\uFE18"=>"\u3017",
-    "\uFE19"=>"...",
-    "\uFE30"=>"..",
-    "\uFE31"=>"\u2014",
-    "\uFE32"=>"\u2013",
-    "\uFE33"=>"_",
-    "\uFE34"=>"_",
-    "\uFE35"=>"(",
-    "\uFE36"=>")",
-    "\uFE37"=>"{",
-    "\uFE38"=>"}",
-    "\uFE39"=>"\u3014",
-    "\uFE3A"=>"\u3015",
-    "\uFE3B"=>"\u3010",
-    "\uFE3C"=>"\u3011",
-    "\uFE3D"=>"\u300A",
-    "\uFE3E"=>"\u300B",
-    "\uFE3F"=>"\u3008",
-    "\uFE40"=>"\u3009",
-    "\uFE41"=>"\u300C",
-    "\uFE42"=>"\u300D",
-    "\uFE43"=>"\u300E",
-    "\uFE44"=>"\u300F",
-    "\uFE47"=>"[",
-    "\uFE48"=>"]",
-    "\uFE49"=>" \u0305",
-    "\uFE4A"=>" \u0305",
-    "\uFE4B"=>" \u0305",
-    "\uFE4C"=>" \u0305",
-    "\uFE4D"=>"_",
-    "\uFE4E"=>"_",
-    "\uFE4F"=>"_",
-    "\uFE50"=>",",
-    "\uFE51"=>"\u3001",
-    "\uFE52"=>".",
-    "\uFE54"=>";",
-    "\uFE55"=>":",
-    "\uFE56"=>"?",
-    "\uFE57"=>"!",
-    "\uFE58"=>"\u2014",
-    "\uFE59"=>"(",
-    "\uFE5A"=>")",
-    "\uFE5B"=>"{",
-    "\uFE5C"=>"}",
-    "\uFE5D"=>"\u3014",
-    "\uFE5E"=>"\u3015",
-    "\uFE5F"=>"#",
-    "\uFE60"=>"&",
-    "\uFE61"=>"*",
-    "\uFE62"=>"+",
-    "\uFE63"=>"-",
-    "\uFE64"=>"<",
-    "\uFE65"=>">",
-    "\uFE66"=>"=",
-    "\uFE68"=>"\\",
-    "\uFE69"=>"$",
-    "\uFE6A"=>"%",
-    "\uFE6B"=>"@",
-    "\uFE70"=>" \u064B",
-    "\uFE71"=>"\u0640\u064B",
-    "\uFE72"=>" \u064C",
-    "\uFE74"=>" \u064D",
-    "\uFE76"=>" \u064E",
-    "\uFE77"=>"\u0640\u064E",
-    "\uFE78"=>" \u064F",
-    "\uFE79"=>"\u0640\u064F",
-    "\uFE7A"=>" \u0650",
-    "\uFE7B"=>"\u0640\u0650",
-    "\uFE7C"=>" \u0651",
-    "\uFE7D"=>"\u0640\u0651",
-    "\uFE7E"=>" \u0652",
-    "\uFE7F"=>"\u0640\u0652",
-    "\uFE80"=>"\u0621",
-    "\uFE81"=>"\u0622",
-    "\uFE82"=>"\u0622",
-    "\uFE83"=>"\u0623",
-    "\uFE84"=>"\u0623",
-    "\uFE85"=>"\u0624",
-    "\uFE86"=>"\u0624",
-    "\uFE87"=>"\u0625",
-    "\uFE88"=>"\u0625",
-    "\uFE89"=>"\u0626",
-    "\uFE8A"=>"\u0626",
-    "\uFE8B"=>"\u0626",
-    "\uFE8C"=>"\u0626",
-    "\uFE8D"=>"\u0627",
-    "\uFE8E"=>"\u0627",
-    "\uFE8F"=>"\u0628",
-    "\uFE90"=>"\u0628",
-    "\uFE91"=>"\u0628",
-    "\uFE92"=>"\u0628",
-    "\uFE93"=>"\u0629",
-    "\uFE94"=>"\u0629",
-    "\uFE95"=>"\u062A",
-    "\uFE96"=>"\u062A",
-    "\uFE97"=>"\u062A",
-    "\uFE98"=>"\u062A",
-    "\uFE99"=>"\u062B",
-    "\uFE9A"=>"\u062B",
-    "\uFE9B"=>"\u062B",
-    "\uFE9C"=>"\u062B",
-    "\uFE9D"=>"\u062C",
-    "\uFE9E"=>"\u062C",
-    "\uFE9F"=>"\u062C",
-    "\uFEA0"=>"\u062C",
-    "\uFEA1"=>"\u062D",
-    "\uFEA2"=>"\u062D",
-    "\uFEA3"=>"\u062D",
-    "\uFEA4"=>"\u062D",
-    "\uFEA5"=>"\u062E",
-    "\uFEA6"=>"\u062E",
-    "\uFEA7"=>"\u062E",
-    "\uFEA8"=>"\u062E",
-    "\uFEA9"=>"\u062F",
-    "\uFEAA"=>"\u062F",
-    "\uFEAB"=>"\u0630",
-    "\uFEAC"=>"\u0630",
-    "\uFEAD"=>"\u0631",
-    "\uFEAE"=>"\u0631",
-    "\uFEAF"=>"\u0632",
-    "\uFEB0"=>"\u0632",
-    "\uFEB1"=>"\u0633",
-    "\uFEB2"=>"\u0633",
-    "\uFEB3"=>"\u0633",
-    "\uFEB4"=>"\u0633",
-    "\uFEB5"=>"\u0634",
-    "\uFEB6"=>"\u0634",
-    "\uFEB7"=>"\u0634",
-    "\uFEB8"=>"\u0634",
-    "\uFEB9"=>"\u0635",
-    "\uFEBA"=>"\u0635",
-    "\uFEBB"=>"\u0635",
-    "\uFEBC"=>"\u0635",
-    "\uFEBD"=>"\u0636",
-    "\uFEBE"=>"\u0636",
-    "\uFEBF"=>"\u0636",
-    "\uFEC0"=>"\u0636",
-    "\uFEC1"=>"\u0637",
-    "\uFEC2"=>"\u0637",
-    "\uFEC3"=>"\u0637",
-    "\uFEC4"=>"\u0637",
-    "\uFEC5"=>"\u0638",
-    "\uFEC6"=>"\u0638",
-    "\uFEC7"=>"\u0638",
-    "\uFEC8"=>"\u0638",
-    "\uFEC9"=>"\u0639",
-    "\uFECA"=>"\u0639",
-    "\uFECB"=>"\u0639",
-    "\uFECC"=>"\u0639",
-    "\uFECD"=>"\u063A",
-    "\uFECE"=>"\u063A",
-    "\uFECF"=>"\u063A",
-    "\uFED0"=>"\u063A",
-    "\uFED1"=>"\u0641",
-    "\uFED2"=>"\u0641",
-    "\uFED3"=>"\u0641",
-    "\uFED4"=>"\u0641",
-    "\uFED5"=>"\u0642",
-    "\uFED6"=>"\u0642",
-    "\uFED7"=>"\u0642",
-    "\uFED8"=>"\u0642",
-    "\uFED9"=>"\u0643",
-    "\uFEDA"=>"\u0643",
-    "\uFEDB"=>"\u0643",
-    "\uFEDC"=>"\u0643",
-    "\uFEDD"=>"\u0644",
-    "\uFEDE"=>"\u0644",
-    "\uFEDF"=>"\u0644",
-    "\uFEE0"=>"\u0644",
-    "\uFEE1"=>"\u0645",
-    "\uFEE2"=>"\u0645",
-    "\uFEE3"=>"\u0645",
-    "\uFEE4"=>"\u0645",
-    "\uFEE5"=>"\u0646",
-    "\uFEE6"=>"\u0646",
-    "\uFEE7"=>"\u0646",
-    "\uFEE8"=>"\u0646",
-    "\uFEE9"=>"\u0647",
-    "\uFEEA"=>"\u0647",
-    "\uFEEB"=>"\u0647",
-    "\uFEEC"=>"\u0647",
-    "\uFEED"=>"\u0648",
-    "\uFEEE"=>"\u0648",
-    "\uFEEF"=>"\u0649",
-    "\uFEF0"=>"\u0649",
-    "\uFEF1"=>"\u064A",
-    "\uFEF2"=>"\u064A",
-    "\uFEF3"=>"\u064A",
-    "\uFEF4"=>"\u064A",
-    "\uFEF5"=>"\u0644\u0622",
-    "\uFEF6"=>"\u0644\u0622",
-    "\uFEF7"=>"\u0644\u0623",
-    "\uFEF8"=>"\u0644\u0623",
-    "\uFEF9"=>"\u0644\u0625",
-    "\uFEFA"=>"\u0644\u0625",
-    "\uFEFB"=>"\u0644\u0627",
-    "\uFEFC"=>"\u0644\u0627",
-    "\uFF01"=>"!",
-    "\uFF02"=>"\"",
-    "\uFF03"=>"#",
-    "\uFF04"=>"$",
-    "\uFF05"=>"%",
-    "\uFF06"=>"&",
-    "\uFF07"=>"'",
-    "\uFF08"=>"(",
-    "\uFF09"=>")",
-    "\uFF0A"=>"*",
-    "\uFF0B"=>"+",
-    "\uFF0C"=>",",
-    "\uFF0D"=>"-",
-    "\uFF0E"=>".",
-    "\uFF0F"=>"/",
-    "\uFF10"=>"0",
-    "\uFF11"=>"1",
-    "\uFF12"=>"2",
-    "\uFF13"=>"3",
-    "\uFF14"=>"4",
-    "\uFF15"=>"5",
-    "\uFF16"=>"6",
-    "\uFF17"=>"7",
-    "\uFF18"=>"8",
-    "\uFF19"=>"9",
-    "\uFF1A"=>":",
-    "\uFF1B"=>";",
-    "\uFF1C"=>"<",
-    "\uFF1D"=>"=",
-    "\uFF1E"=>">",
-    "\uFF1F"=>"?",
-    "\uFF20"=>"@",
-    "\uFF21"=>"A",
-    "\uFF22"=>"B",
-    "\uFF23"=>"C",
-    "\uFF24"=>"D",
-    "\uFF25"=>"E",
-    "\uFF26"=>"F",
-    "\uFF27"=>"G",
-    "\uFF28"=>"H",
-    "\uFF29"=>"I",
-    "\uFF2A"=>"J",
-    "\uFF2B"=>"K",
-    "\uFF2C"=>"L",
-    "\uFF2D"=>"M",
-    "\uFF2E"=>"N",
-    "\uFF2F"=>"O",
-    "\uFF30"=>"P",
-    "\uFF31"=>"Q",
-    "\uFF32"=>"R",
-    "\uFF33"=>"S",
-    "\uFF34"=>"T",
-    "\uFF35"=>"U",
-    "\uFF36"=>"V",
-    "\uFF37"=>"W",
-    "\uFF38"=>"X",
-    "\uFF39"=>"Y",
-    "\uFF3A"=>"Z",
-    "\uFF3B"=>"[",
-    "\uFF3C"=>"\\",
-    "\uFF3D"=>"]",
-    "\uFF3E"=>"^",
-    "\uFF3F"=>"_",
-    "\uFF40"=>"`",
-    "\uFF41"=>"a",
-    "\uFF42"=>"b",
-    "\uFF43"=>"c",
-    "\uFF44"=>"d",
-    "\uFF45"=>"e",
-    "\uFF46"=>"f",
-    "\uFF47"=>"g",
-    "\uFF48"=>"h",
-    "\uFF49"=>"i",
-    "\uFF4A"=>"j",
-    "\uFF4B"=>"k",
-    "\uFF4C"=>"l",
-    "\uFF4D"=>"m",
-    "\uFF4E"=>"n",
-    "\uFF4F"=>"o",
-    "\uFF50"=>"p",
-    "\uFF51"=>"q",
-    "\uFF52"=>"r",
-    "\uFF53"=>"s",
-    "\uFF54"=>"t",
-    "\uFF55"=>"u",
-    "\uFF56"=>"v",
-    "\uFF57"=>"w",
-    "\uFF58"=>"x",
-    "\uFF59"=>"y",
-    "\uFF5A"=>"z",
-    "\uFF5B"=>"{",
-    "\uFF5C"=>"|",
-    "\uFF5D"=>"}",
-    "\uFF5E"=>"~",
-    "\uFF5F"=>"\u2985",
-    "\uFF60"=>"\u2986",
-    "\uFF61"=>"\u3002",
-    "\uFF62"=>"\u300C",
-    "\uFF63"=>"\u300D",
-    "\uFF64"=>"\u3001",
-    "\uFF65"=>"\u30FB",
-    "\uFF66"=>"\u30F2",
-    "\uFF67"=>"\u30A1",
-    "\uFF68"=>"\u30A3",
-    "\uFF69"=>"\u30A5",
-    "\uFF6A"=>"\u30A7",
-    "\uFF6B"=>"\u30A9",
-    "\uFF6C"=>"\u30E3",
-    "\uFF6D"=>"\u30E5",
-    "\uFF6E"=>"\u30E7",
-    "\uFF6F"=>"\u30C3",
-    "\uFF70"=>"\u30FC",
-    "\uFF71"=>"\u30A2",
-    "\uFF72"=>"\u30A4",
-    "\uFF73"=>"\u30A6",
-    "\uFF74"=>"\u30A8",
-    "\uFF75"=>"\u30AA",
-    "\uFF76"=>"\u30AB",
-    "\uFF77"=>"\u30AD",
-    "\uFF78"=>"\u30AF",
-    "\uFF79"=>"\u30B1",
-    "\uFF7A"=>"\u30B3",
-    "\uFF7B"=>"\u30B5",
-    "\uFF7C"=>"\u30B7",
-    "\uFF7D"=>"\u30B9",
-    "\uFF7E"=>"\u30BB",
-    "\uFF7F"=>"\u30BD",
-    "\uFF80"=>"\u30BF",
-    "\uFF81"=>"\u30C1",
-    "\uFF82"=>"\u30C4",
-    "\uFF83"=>"\u30C6",
-    "\uFF84"=>"\u30C8",
-    "\uFF85"=>"\u30CA",
-    "\uFF86"=>"\u30CB",
-    "\uFF87"=>"\u30CC",
-    "\uFF88"=>"\u30CD",
-    "\uFF89"=>"\u30CE",
-    "\uFF8A"=>"\u30CF",
-    "\uFF8B"=>"\u30D2",
-    "\uFF8C"=>"\u30D5",
-    "\uFF8D"=>"\u30D8",
-    "\uFF8E"=>"\u30DB",
-    "\uFF8F"=>"\u30DE",
-    "\uFF90"=>"\u30DF",
-    "\uFF91"=>"\u30E0",
-    "\uFF92"=>"\u30E1",
-    "\uFF93"=>"\u30E2",
-    "\uFF94"=>"\u30E4",
-    "\uFF95"=>"\u30E6",
-    "\uFF96"=>"\u30E8",
-    "\uFF97"=>"\u30E9",
-    "\uFF98"=>"\u30EA",
-    "\uFF99"=>"\u30EB",
-    "\uFF9A"=>"\u30EC",
-    "\uFF9B"=>"\u30ED",
-    "\uFF9C"=>"\u30EF",
-    "\uFF9D"=>"\u30F3",
-    "\uFF9E"=>"\u3099",
-    "\uFF9F"=>"\u309A",
-    "\uFFA0"=>"\u1160",
-    "\uFFA1"=>"\u1100",
-    "\uFFA2"=>"\u1101",
-    "\uFFA3"=>"\u11AA",
-    "\uFFA4"=>"\u1102",
-    "\uFFA5"=>"\u11AC",
-    "\uFFA6"=>"\u11AD",
-    "\uFFA7"=>"\u1103",
-    "\uFFA8"=>"\u1104",
-    "\uFFA9"=>"\u1105",
-    "\uFFAA"=>"\u11B0",
-    "\uFFAB"=>"\u11B1",
-    "\uFFAC"=>"\u11B2",
-    "\uFFAD"=>"\u11B3",
-    "\uFFAE"=>"\u11B4",
-    "\uFFAF"=>"\u11B5",
-    "\uFFB0"=>"\u111A",
-    "\uFFB1"=>"\u1106",
-    "\uFFB2"=>"\u1107",
-    "\uFFB3"=>"\u1108",
-    "\uFFB4"=>"\u1121",
-    "\uFFB5"=>"\u1109",
-    "\uFFB6"=>"\u110A",
-    "\uFFB7"=>"\u110B",
-    "\uFFB8"=>"\u110C",
-    "\uFFB9"=>"\u110D",
-    "\uFFBA"=>"\u110E",
-    "\uFFBB"=>"\u110F",
-    "\uFFBC"=>"\u1110",
-    "\uFFBD"=>"\u1111",
-    "\uFFBE"=>"\u1112",
-    "\uFFC2"=>"\u1161",
-    "\uFFC3"=>"\u1162",
-    "\uFFC4"=>"\u1163",
-    "\uFFC5"=>"\u1164",
-    "\uFFC6"=>"\u1165",
-    "\uFFC7"=>"\u1166",
-    "\uFFCA"=>"\u1167",
-    "\uFFCB"=>"\u1168",
-    "\uFFCC"=>"\u1169",
-    "\uFFCD"=>"\u116A",
-    "\uFFCE"=>"\u116B",
-    "\uFFCF"=>"\u116C",
-    "\uFFD2"=>"\u116D",
-    "\uFFD3"=>"\u116E",
-    "\uFFD4"=>"\u116F",
-    "\uFFD5"=>"\u1170",
-    "\uFFD6"=>"\u1171",
-    "\uFFD7"=>"\u1172",
-    "\uFFDA"=>"\u1173",
-    "\uFFDB"=>"\u1174",
-    "\uFFDC"=>"\u1175",
-    "\uFFE0"=>"\u00A2",
-    "\uFFE1"=>"\u00A3",
-    "\uFFE2"=>"\u00AC",
-    "\uFFE3"=>" \u0304",
-    "\uFFE4"=>"\u00A6",
-    "\uFFE5"=>"\u00A5",
-    "\uFFE6"=>"\u20A9",
-    "\uFFE8"=>"\u2502",
-    "\uFFE9"=>"\u2190",
-    "\uFFEA"=>"\u2191",
-    "\uFFEB"=>"\u2192",
-    "\uFFEC"=>"\u2193",
-    "\uFFED"=>"\u25A0",
-    "\uFFEE"=>"\u25CB",
-    "\u{1D400}"=>"A",
-    "\u{1D401}"=>"B",
-    "\u{1D402}"=>"C",
-    "\u{1D403}"=>"D",
-    "\u{1D404}"=>"E",
-    "\u{1D405}"=>"F",
-    "\u{1D406}"=>"G",
-    "\u{1D407}"=>"H",
-    "\u{1D408}"=>"I",
-    "\u{1D409}"=>"J",
-    "\u{1D40A}"=>"K",
-    "\u{1D40B}"=>"L",
-    "\u{1D40C}"=>"M",
-    "\u{1D40D}"=>"N",
-    "\u{1D40E}"=>"O",
-    "\u{1D40F}"=>"P",
-    "\u{1D410}"=>"Q",
-    "\u{1D411}"=>"R",
-    "\u{1D412}"=>"S",
-    "\u{1D413}"=>"T",
-    "\u{1D414}"=>"U",
-    "\u{1D415}"=>"V",
-    "\u{1D416}"=>"W",
-    "\u{1D417}"=>"X",
-    "\u{1D418}"=>"Y",
-    "\u{1D419}"=>"Z",
-    "\u{1D41A}"=>"a",
-    "\u{1D41B}"=>"b",
-    "\u{1D41C}"=>"c",
-    "\u{1D41D}"=>"d",
-    "\u{1D41E}"=>"e",
-    "\u{1D41F}"=>"f",
-    "\u{1D420}"=>"g",
-    "\u{1D421}"=>"h",
-    "\u{1D422}"=>"i",
-    "\u{1D423}"=>"j",
-    "\u{1D424}"=>"k",
-    "\u{1D425}"=>"l",
-    "\u{1D426}"=>"m",
-    "\u{1D427}"=>"n",
-    "\u{1D428}"=>"o",
-    "\u{1D429}"=>"p",
-    "\u{1D42A}"=>"q",
-    "\u{1D42B}"=>"r",
-    "\u{1D42C}"=>"s",
-    "\u{1D42D}"=>"t",
-    "\u{1D42E}"=>"u",
-    "\u{1D42F}"=>"v",
-    "\u{1D430}"=>"w",
-    "\u{1D431}"=>"x",
-    "\u{1D432}"=>"y",
-    "\u{1D433}"=>"z",
-    "\u{1D434}"=>"A",
-    "\u{1D435}"=>"B",
-    "\u{1D436}"=>"C",
-    "\u{1D437}"=>"D",
-    "\u{1D438}"=>"E",
-    "\u{1D439}"=>"F",
-    "\u{1D43A}"=>"G",
-    "\u{1D43B}"=>"H",
-    "\u{1D43C}"=>"I",
-    "\u{1D43D}"=>"J",
-    "\u{1D43E}"=>"K",
-    "\u{1D43F}"=>"L",
-    "\u{1D440}"=>"M",
-    "\u{1D441}"=>"N",
-    "\u{1D442}"=>"O",
-    "\u{1D443}"=>"P",
-    "\u{1D444}"=>"Q",
-    "\u{1D445}"=>"R",
-    "\u{1D446}"=>"S",
-    "\u{1D447}"=>"T",
-    "\u{1D448}"=>"U",
-    "\u{1D449}"=>"V",
-    "\u{1D44A}"=>"W",
-    "\u{1D44B}"=>"X",
-    "\u{1D44C}"=>"Y",
-    "\u{1D44D}"=>"Z",
-    "\u{1D44E}"=>"a",
-    "\u{1D44F}"=>"b",
-    "\u{1D450}"=>"c",
-    "\u{1D451}"=>"d",
-    "\u{1D452}"=>"e",
-    "\u{1D453}"=>"f",
-    "\u{1D454}"=>"g",
-    "\u{1D456}"=>"i",
-    "\u{1D457}"=>"j",
-    "\u{1D458}"=>"k",
-    "\u{1D459}"=>"l",
-    "\u{1D45A}"=>"m",
-    "\u{1D45B}"=>"n",
-    "\u{1D45C}"=>"o",
-    "\u{1D45D}"=>"p",
-    "\u{1D45E}"=>"q",
-    "\u{1D45F}"=>"r",
-    "\u{1D460}"=>"s",
-    "\u{1D461}"=>"t",
-    "\u{1D462}"=>"u",
-    "\u{1D463}"=>"v",
-    "\u{1D464}"=>"w",
-    "\u{1D465}"=>"x",
-    "\u{1D466}"=>"y",
-    "\u{1D467}"=>"z",
-    "\u{1D468}"=>"A",
-    "\u{1D469}"=>"B",
-    "\u{1D46A}"=>"C",
-    "\u{1D46B}"=>"D",
-    "\u{1D46C}"=>"E",
-    "\u{1D46D}"=>"F",
-    "\u{1D46E}"=>"G",
-    "\u{1D46F}"=>"H",
-    "\u{1D470}"=>"I",
-    "\u{1D471}"=>"J",
-    "\u{1D472}"=>"K",
-    "\u{1D473}"=>"L",
-    "\u{1D474}"=>"M",
-    "\u{1D475}"=>"N",
-    "\u{1D476}"=>"O",
-    "\u{1D477}"=>"P",
-    "\u{1D478}"=>"Q",
-    "\u{1D479}"=>"R",
-    "\u{1D47A}"=>"S",
-    "\u{1D47B}"=>"T",
-    "\u{1D47C}"=>"U",
-    "\u{1D47D}"=>"V",
-    "\u{1D47E}"=>"W",
-    "\u{1D47F}"=>"X",
-    "\u{1D480}"=>"Y",
-    "\u{1D481}"=>"Z",
-    "\u{1D482}"=>"a",
-    "\u{1D483}"=>"b",
-    "\u{1D484}"=>"c",
-    "\u{1D485}"=>"d",
-    "\u{1D486}"=>"e",
-    "\u{1D487}"=>"f",
-    "\u{1D488}"=>"g",
-    "\u{1D489}"=>"h",
-    "\u{1D48A}"=>"i",
-    "\u{1D48B}"=>"j",
-    "\u{1D48C}"=>"k",
-    "\u{1D48D}"=>"l",
-    "\u{1D48E}"=>"m",
-    "\u{1D48F}"=>"n",
-    "\u{1D490}"=>"o",
-    "\u{1D491}"=>"p",
-    "\u{1D492}"=>"q",
-    "\u{1D493}"=>"r",
-    "\u{1D494}"=>"s",
-    "\u{1D495}"=>"t",
-    "\u{1D496}"=>"u",
-    "\u{1D497}"=>"v",
-    "\u{1D498}"=>"w",
-    "\u{1D499}"=>"x",
-    "\u{1D49A}"=>"y",
-    "\u{1D49B}"=>"z",
-    "\u{1D49C}"=>"A",
-    "\u{1D49E}"=>"C",
-    "\u{1D49F}"=>"D",
-    "\u{1D4A2}"=>"G",
-    "\u{1D4A5}"=>"J",
-    "\u{1D4A6}"=>"K",
-    "\u{1D4A9}"=>"N",
-    "\u{1D4AA}"=>"O",
-    "\u{1D4AB}"=>"P",
-    "\u{1D4AC}"=>"Q",
-    "\u{1D4AE}"=>"S",
-    "\u{1D4AF}"=>"T",
-    "\u{1D4B0}"=>"U",
-    "\u{1D4B1}"=>"V",
-    "\u{1D4B2}"=>"W",
-    "\u{1D4B3}"=>"X",
-    "\u{1D4B4}"=>"Y",
-    "\u{1D4B5}"=>"Z",
-    "\u{1D4B6}"=>"a",
-    "\u{1D4B7}"=>"b",
-    "\u{1D4B8}"=>"c",
-    "\u{1D4B9}"=>"d",
-    "\u{1D4BB}"=>"f",
-    "\u{1D4BD}"=>"h",
-    "\u{1D4BE}"=>"i",
-    "\u{1D4BF}"=>"j",
-    "\u{1D4C0}"=>"k",
-    "\u{1D4C1}"=>"l",
-    "\u{1D4C2}"=>"m",
-    "\u{1D4C3}"=>"n",
-    "\u{1D4C5}"=>"p",
-    "\u{1D4C6}"=>"q",
-    "\u{1D4C7}"=>"r",
-    "\u{1D4C8}"=>"s",
-    "\u{1D4C9}"=>"t",
-    "\u{1D4CA}"=>"u",
-    "\u{1D4CB}"=>"v",
-    "\u{1D4CC}"=>"w",
-    "\u{1D4CD}"=>"x",
-    "\u{1D4CE}"=>"y",
-    "\u{1D4CF}"=>"z",
-    "\u{1D4D0}"=>"A",
-    "\u{1D4D1}"=>"B",
-    "\u{1D4D2}"=>"C",
-    "\u{1D4D3}"=>"D",
-    "\u{1D4D4}"=>"E",
-    "\u{1D4D5}"=>"F",
-    "\u{1D4D6}"=>"G",
-    "\u{1D4D7}"=>"H",
-    "\u{1D4D8}"=>"I",
-    "\u{1D4D9}"=>"J",
-    "\u{1D4DA}"=>"K",
-    "\u{1D4DB}"=>"L",
-    "\u{1D4DC}"=>"M",
-    "\u{1D4DD}"=>"N",
-    "\u{1D4DE}"=>"O",
-    "\u{1D4DF}"=>"P",
-    "\u{1D4E0}"=>"Q",
-    "\u{1D4E1}"=>"R",
-    "\u{1D4E2}"=>"S",
-    "\u{1D4E3}"=>"T",
-    "\u{1D4E4}"=>"U",
-    "\u{1D4E5}"=>"V",
-    "\u{1D4E6}"=>"W",
-    "\u{1D4E7}"=>"X",
-    "\u{1D4E8}"=>"Y",
-    "\u{1D4E9}"=>"Z",
-    "\u{1D4EA}"=>"a",
-    "\u{1D4EB}"=>"b",
-    "\u{1D4EC}"=>"c",
-    "\u{1D4ED}"=>"d",
-    "\u{1D4EE}"=>"e",
-    "\u{1D4EF}"=>"f",
-    "\u{1D4F0}"=>"g",
-    "\u{1D4F1}"=>"h",
-    "\u{1D4F2}"=>"i",
-    "\u{1D4F3}"=>"j",
-    "\u{1D4F4}"=>"k",
-    "\u{1D4F5}"=>"l",
-    "\u{1D4F6}"=>"m",
-    "\u{1D4F7}"=>"n",
-    "\u{1D4F8}"=>"o",
-    "\u{1D4F9}"=>"p",
-    "\u{1D4FA}"=>"q",
-    "\u{1D4FB}"=>"r",
-    "\u{1D4FC}"=>"s",
-    "\u{1D4FD}"=>"t",
-    "\u{1D4FE}"=>"u",
-    "\u{1D4FF}"=>"v",
-    "\u{1D500}"=>"w",
-    "\u{1D501}"=>"x",
-    "\u{1D502}"=>"y",
-    "\u{1D503}"=>"z",
-    "\u{1D504}"=>"A",
-    "\u{1D505}"=>"B",
-    "\u{1D507}"=>"D",
-    "\u{1D508}"=>"E",
-    "\u{1D509}"=>"F",
-    "\u{1D50A}"=>"G",
-    "\u{1D50D}"=>"J",
-    "\u{1D50E}"=>"K",
-    "\u{1D50F}"=>"L",
-    "\u{1D510}"=>"M",
-    "\u{1D511}"=>"N",
-    "\u{1D512}"=>"O",
-    "\u{1D513}"=>"P",
-    "\u{1D514}"=>"Q",
-    "\u{1D516}"=>"S",
-    "\u{1D517}"=>"T",
-    "\u{1D518}"=>"U",
-    "\u{1D519}"=>"V",
-    "\u{1D51A}"=>"W",
-    "\u{1D51B}"=>"X",
-    "\u{1D51C}"=>"Y",
-    "\u{1D51E}"=>"a",
-    "\u{1D51F}"=>"b",
-    "\u{1D520}"=>"c",
-    "\u{1D521}"=>"d",
-    "\u{1D522}"=>"e",
-    "\u{1D523}"=>"f",
-    "\u{1D524}"=>"g",
-    "\u{1D525}"=>"h",
-    "\u{1D526}"=>"i",
-    "\u{1D527}"=>"j",
-    "\u{1D528}"=>"k",
-    "\u{1D529}"=>"l",
-    "\u{1D52A}"=>"m",
-    "\u{1D52B}"=>"n",
-    "\u{1D52C}"=>"o",
-    "\u{1D52D}"=>"p",
-    "\u{1D52E}"=>"q",
-    "\u{1D52F}"=>"r",
-    "\u{1D530}"=>"s",
-    "\u{1D531}"=>"t",
-    "\u{1D532}"=>"u",
-    "\u{1D533}"=>"v",
-    "\u{1D534}"=>"w",
-    "\u{1D535}"=>"x",
-    "\u{1D536}"=>"y",
-    "\u{1D537}"=>"z",
-    "\u{1D538}"=>"A",
-    "\u{1D539}"=>"B",
-    "\u{1D53B}"=>"D",
-    "\u{1D53C}"=>"E",
-    "\u{1D53D}"=>"F",
-    "\u{1D53E}"=>"G",
-    "\u{1D540}"=>"I",
-    "\u{1D541}"=>"J",
-    "\u{1D542}"=>"K",
-    "\u{1D543}"=>"L",
-    "\u{1D544}"=>"M",
-    "\u{1D546}"=>"O",
-    "\u{1D54A}"=>"S",
-    "\u{1D54B}"=>"T",
-    "\u{1D54C}"=>"U",
-    "\u{1D54D}"=>"V",
-    "\u{1D54E}"=>"W",
-    "\u{1D54F}"=>"X",
-    "\u{1D550}"=>"Y",
-    "\u{1D552}"=>"a",
-    "\u{1D553}"=>"b",
-    "\u{1D554}"=>"c",
-    "\u{1D555}"=>"d",
-    "\u{1D556}"=>"e",
-    "\u{1D557}"=>"f",
-    "\u{1D558}"=>"g",
-    "\u{1D559}"=>"h",
-    "\u{1D55A}"=>"i",
-    "\u{1D55B}"=>"j",
-    "\u{1D55C}"=>"k",
-    "\u{1D55D}"=>"l",
-    "\u{1D55E}"=>"m",
-    "\u{1D55F}"=>"n",
-    "\u{1D560}"=>"o",
-    "\u{1D561}"=>"p",
-    "\u{1D562}"=>"q",
-    "\u{1D563}"=>"r",
-    "\u{1D564}"=>"s",
-    "\u{1D565}"=>"t",
-    "\u{1D566}"=>"u",
-    "\u{1D567}"=>"v",
-    "\u{1D568}"=>"w",
-    "\u{1D569}"=>"x",
-    "\u{1D56A}"=>"y",
-    "\u{1D56B}"=>"z",
-    "\u{1D56C}"=>"A",
-    "\u{1D56D}"=>"B",
-    "\u{1D56E}"=>"C",
-    "\u{1D56F}"=>"D",
-    "\u{1D570}"=>"E",
-    "\u{1D571}"=>"F",
-    "\u{1D572}"=>"G",
-    "\u{1D573}"=>"H",
-    "\u{1D574}"=>"I",
-    "\u{1D575}"=>"J",
-    "\u{1D576}"=>"K",
-    "\u{1D577}"=>"L",
-    "\u{1D578}"=>"M",
-    "\u{1D579}"=>"N",
-    "\u{1D57A}"=>"O",
-    "\u{1D57B}"=>"P",
-    "\u{1D57C}"=>"Q",
-    "\u{1D57D}"=>"R",
-    "\u{1D57E}"=>"S",
-    "\u{1D57F}"=>"T",
-    "\u{1D580}"=>"U",
-    "\u{1D581}"=>"V",
-    "\u{1D582}"=>"W",
-    "\u{1D583}"=>"X",
-    "\u{1D584}"=>"Y",
-    "\u{1D585}"=>"Z",
-    "\u{1D586}"=>"a",
-    "\u{1D587}"=>"b",
-    "\u{1D588}"=>"c",
-    "\u{1D589}"=>"d",
-    "\u{1D58A}"=>"e",
-    "\u{1D58B}"=>"f",
-    "\u{1D58C}"=>"g",
-    "\u{1D58D}"=>"h",
-    "\u{1D58E}"=>"i",
-    "\u{1D58F}"=>"j",
-    "\u{1D590}"=>"k",
-    "\u{1D591}"=>"l",
-    "\u{1D592}"=>"m",
-    "\u{1D593}"=>"n",
-    "\u{1D594}"=>"o",
-    "\u{1D595}"=>"p",
-    "\u{1D596}"=>"q",
-    "\u{1D597}"=>"r",
-    "\u{1D598}"=>"s",
-    "\u{1D599}"=>"t",
-    "\u{1D59A}"=>"u",
-    "\u{1D59B}"=>"v",
-    "\u{1D59C}"=>"w",
-    "\u{1D59D}"=>"x",
-    "\u{1D59E}"=>"y",
-    "\u{1D59F}"=>"z",
-    "\u{1D5A0}"=>"A",
-    "\u{1D5A1}"=>"B",
-    "\u{1D5A2}"=>"C",
-    "\u{1D5A3}"=>"D",
-    "\u{1D5A4}"=>"E",
-    "\u{1D5A5}"=>"F",
-    "\u{1D5A6}"=>"G",
-    "\u{1D5A7}"=>"H",
-    "\u{1D5A8}"=>"I",
-    "\u{1D5A9}"=>"J",
-    "\u{1D5AA}"=>"K",
-    "\u{1D5AB}"=>"L",
-    "\u{1D5AC}"=>"M",
-    "\u{1D5AD}"=>"N",
-    "\u{1D5AE}"=>"O",
-    "\u{1D5AF}"=>"P",
-    "\u{1D5B0}"=>"Q",
-    "\u{1D5B1}"=>"R",
-    "\u{1D5B2}"=>"S",
-    "\u{1D5B3}"=>"T",
-    "\u{1D5B4}"=>"U",
-    "\u{1D5B5}"=>"V",
-    "\u{1D5B6}"=>"W",
-    "\u{1D5B7}"=>"X",
-    "\u{1D5B8}"=>"Y",
-    "\u{1D5B9}"=>"Z",
-    "\u{1D5BA}"=>"a",
-    "\u{1D5BB}"=>"b",
-    "\u{1D5BC}"=>"c",
-    "\u{1D5BD}"=>"d",
-    "\u{1D5BE}"=>"e",
-    "\u{1D5BF}"=>"f",
-    "\u{1D5C0}"=>"g",
-    "\u{1D5C1}"=>"h",
-    "\u{1D5C2}"=>"i",
-    "\u{1D5C3}"=>"j",
-    "\u{1D5C4}"=>"k",
-    "\u{1D5C5}"=>"l",
-    "\u{1D5C6}"=>"m",
-    "\u{1D5C7}"=>"n",
-    "\u{1D5C8}"=>"o",
-    "\u{1D5C9}"=>"p",
-    "\u{1D5CA}"=>"q",
-    "\u{1D5CB}"=>"r",
-    "\u{1D5CC}"=>"s",
-    "\u{1D5CD}"=>"t",
-    "\u{1D5CE}"=>"u",
-    "\u{1D5CF}"=>"v",
-    "\u{1D5D0}"=>"w",
-    "\u{1D5D1}"=>"x",
-    "\u{1D5D2}"=>"y",
-    "\u{1D5D3}"=>"z",
-    "\u{1D5D4}"=>"A",
-    "\u{1D5D5}"=>"B",
-    "\u{1D5D6}"=>"C",
-    "\u{1D5D7}"=>"D",
-    "\u{1D5D8}"=>"E",
-    "\u{1D5D9}"=>"F",
-    "\u{1D5DA}"=>"G",
-    "\u{1D5DB}"=>"H",
-    "\u{1D5DC}"=>"I",
-    "\u{1D5DD}"=>"J",
-    "\u{1D5DE}"=>"K",
-    "\u{1D5DF}"=>"L",
-    "\u{1D5E0}"=>"M",
-    "\u{1D5E1}"=>"N",
-    "\u{1D5E2}"=>"O",
-    "\u{1D5E3}"=>"P",
-    "\u{1D5E4}"=>"Q",
-    "\u{1D5E5}"=>"R",
-    "\u{1D5E6}"=>"S",
-    "\u{1D5E7}"=>"T",
-    "\u{1D5E8}"=>"U",
-    "\u{1D5E9}"=>"V",
-    "\u{1D5EA}"=>"W",
-    "\u{1D5EB}"=>"X",
-    "\u{1D5EC}"=>"Y",
-    "\u{1D5ED}"=>"Z",
-    "\u{1D5EE}"=>"a",
-    "\u{1D5EF}"=>"b",
-    "\u{1D5F0}"=>"c",
-    "\u{1D5F1}"=>"d",
-    "\u{1D5F2}"=>"e",
-    "\u{1D5F3}"=>"f",
-    "\u{1D5F4}"=>"g",
-    "\u{1D5F5}"=>"h",
-    "\u{1D5F6}"=>"i",
-    "\u{1D5F7}"=>"j",
-    "\u{1D5F8}"=>"k",
-    "\u{1D5F9}"=>"l",
-    "\u{1D5FA}"=>"m",
-    "\u{1D5FB}"=>"n",
-    "\u{1D5FC}"=>"o",
-    "\u{1D5FD}"=>"p",
-    "\u{1D5FE}"=>"q",
-    "\u{1D5FF}"=>"r",
-    "\u{1D600}"=>"s",
-    "\u{1D601}"=>"t",
-    "\u{1D602}"=>"u",
-    "\u{1D603}"=>"v",
-    "\u{1D604}"=>"w",
-    "\u{1D605}"=>"x",
-    "\u{1D606}"=>"y",
-    "\u{1D607}"=>"z",
-    "\u{1D608}"=>"A",
-    "\u{1D609}"=>"B",
-    "\u{1D60A}"=>"C",
-    "\u{1D60B}"=>"D",
-    "\u{1D60C}"=>"E",
-    "\u{1D60D}"=>"F",
-    "\u{1D60E}"=>"G",
-    "\u{1D60F}"=>"H",
-    "\u{1D610}"=>"I",
-    "\u{1D611}"=>"J",
-    "\u{1D612}"=>"K",
-    "\u{1D613}"=>"L",
-    "\u{1D614}"=>"M",
-    "\u{1D615}"=>"N",
-    "\u{1D616}"=>"O",
-    "\u{1D617}"=>"P",
-    "\u{1D618}"=>"Q",
-    "\u{1D619}"=>"R",
-    "\u{1D61A}"=>"S",
-    "\u{1D61B}"=>"T",
-    "\u{1D61C}"=>"U",
-    "\u{1D61D}"=>"V",
-    "\u{1D61E}"=>"W",
-    "\u{1D61F}"=>"X",
-    "\u{1D620}"=>"Y",
-    "\u{1D621}"=>"Z",
-    "\u{1D622}"=>"a",
-    "\u{1D623}"=>"b",
-    "\u{1D624}"=>"c",
-    "\u{1D625}"=>"d",
-    "\u{1D626}"=>"e",
-    "\u{1D627}"=>"f",
-    "\u{1D628}"=>"g",
-    "\u{1D629}"=>"h",
-    "\u{1D62A}"=>"i",
-    "\u{1D62B}"=>"j",
-    "\u{1D62C}"=>"k",
-    "\u{1D62D}"=>"l",
-    "\u{1D62E}"=>"m",
-    "\u{1D62F}"=>"n",
-    "\u{1D630}"=>"o",
-    "\u{1D631}"=>"p",
-    "\u{1D632}"=>"q",
-    "\u{1D633}"=>"r",
-    "\u{1D634}"=>"s",
-    "\u{1D635}"=>"t",
-    "\u{1D636}"=>"u",
-    "\u{1D637}"=>"v",
-    "\u{1D638}"=>"w",
-    "\u{1D639}"=>"x",
-    "\u{1D63A}"=>"y",
-    "\u{1D63B}"=>"z",
-    "\u{1D63C}"=>"A",
-    "\u{1D63D}"=>"B",
-    "\u{1D63E}"=>"C",
-    "\u{1D63F}"=>"D",
-    "\u{1D640}"=>"E",
-    "\u{1D641}"=>"F",
-    "\u{1D642}"=>"G",
-    "\u{1D643}"=>"H",
-    "\u{1D644}"=>"I",
-    "\u{1D645}"=>"J",
-    "\u{1D646}"=>"K",
-    "\u{1D647}"=>"L",
-    "\u{1D648}"=>"M",
-    "\u{1D649}"=>"N",
-    "\u{1D64A}"=>"O",
-    "\u{1D64B}"=>"P",
-    "\u{1D64C}"=>"Q",
-    "\u{1D64D}"=>"R",
-    "\u{1D64E}"=>"S",
-    "\u{1D64F}"=>"T",
-    "\u{1D650}"=>"U",
-    "\u{1D651}"=>"V",
-    "\u{1D652}"=>"W",
-    "\u{1D653}"=>"X",
-    "\u{1D654}"=>"Y",
-    "\u{1D655}"=>"Z",
-    "\u{1D656}"=>"a",
-    "\u{1D657}"=>"b",
-    "\u{1D658}"=>"c",
-    "\u{1D659}"=>"d",
-    "\u{1D65A}"=>"e",
-    "\u{1D65B}"=>"f",
-    "\u{1D65C}"=>"g",
-    "\u{1D65D}"=>"h",
-    "\u{1D65E}"=>"i",
-    "\u{1D65F}"=>"j",
-    "\u{1D660}"=>"k",
-    "\u{1D661}"=>"l",
-    "\u{1D662}"=>"m",
-    "\u{1D663}"=>"n",
-    "\u{1D664}"=>"o",
-    "\u{1D665}"=>"p",
-    "\u{1D666}"=>"q",
-    "\u{1D667}"=>"r",
-    "\u{1D668}"=>"s",
-    "\u{1D669}"=>"t",
-    "\u{1D66A}"=>"u",
-    "\u{1D66B}"=>"v",
-    "\u{1D66C}"=>"w",
-    "\u{1D66D}"=>"x",
-    "\u{1D66E}"=>"y",
-    "\u{1D66F}"=>"z",
-    "\u{1D670}"=>"A",
-    "\u{1D671}"=>"B",
-    "\u{1D672}"=>"C",
-    "\u{1D673}"=>"D",
-    "\u{1D674}"=>"E",
-    "\u{1D675}"=>"F",
-    "\u{1D676}"=>"G",
-    "\u{1D677}"=>"H",
-    "\u{1D678}"=>"I",
-    "\u{1D679}"=>"J",
-    "\u{1D67A}"=>"K",
-    "\u{1D67B}"=>"L",
-    "\u{1D67C}"=>"M",
-    "\u{1D67D}"=>"N",
-    "\u{1D67E}"=>"O",
-    "\u{1D67F}"=>"P",
-    "\u{1D680}"=>"Q",
-    "\u{1D681}"=>"R",
-    "\u{1D682}"=>"S",
-    "\u{1D683}"=>"T",
-    "\u{1D684}"=>"U",
-    "\u{1D685}"=>"V",
-    "\u{1D686}"=>"W",
-    "\u{1D687}"=>"X",
-    "\u{1D688}"=>"Y",
-    "\u{1D689}"=>"Z",
-    "\u{1D68A}"=>"a",
-    "\u{1D68B}"=>"b",
-    "\u{1D68C}"=>"c",
-    "\u{1D68D}"=>"d",
-    "\u{1D68E}"=>"e",
-    "\u{1D68F}"=>"f",
-    "\u{1D690}"=>"g",
-    "\u{1D691}"=>"h",
-    "\u{1D692}"=>"i",
-    "\u{1D693}"=>"j",
-    "\u{1D694}"=>"k",
-    "\u{1D695}"=>"l",
-    "\u{1D696}"=>"m",
-    "\u{1D697}"=>"n",
-    "\u{1D698}"=>"o",
-    "\u{1D699}"=>"p",
-    "\u{1D69A}"=>"q",
-    "\u{1D69B}"=>"r",
-    "\u{1D69C}"=>"s",
-    "\u{1D69D}"=>"t",
-    "\u{1D69E}"=>"u",
-    "\u{1D69F}"=>"v",
-    "\u{1D6A0}"=>"w",
-    "\u{1D6A1}"=>"x",
-    "\u{1D6A2}"=>"y",
-    "\u{1D6A3}"=>"z",
-    "\u{1D6A4}"=>"\u0131",
-    "\u{1D6A5}"=>"\u0237",
-    "\u{1D6A8}"=>"\u0391",
-    "\u{1D6A9}"=>"\u0392",
-    "\u{1D6AA}"=>"\u0393",
-    "\u{1D6AB}"=>"\u0394",
-    "\u{1D6AC}"=>"\u0395",
-    "\u{1D6AD}"=>"\u0396",
-    "\u{1D6AE}"=>"\u0397",
-    "\u{1D6AF}"=>"\u0398",
-    "\u{1D6B0}"=>"\u0399",
-    "\u{1D6B1}"=>"\u039A",
-    "\u{1D6B2}"=>"\u039B",
-    "\u{1D6B3}"=>"\u039C",
-    "\u{1D6B4}"=>"\u039D",
-    "\u{1D6B5}"=>"\u039E",
-    "\u{1D6B6}"=>"\u039F",
-    "\u{1D6B7}"=>"\u03A0",
-    "\u{1D6B8}"=>"\u03A1",
-    "\u{1D6B9}"=>"\u0398",
-    "\u{1D6BA}"=>"\u03A3",
-    "\u{1D6BB}"=>"\u03A4",
-    "\u{1D6BC}"=>"\u03A5",
-    "\u{1D6BD}"=>"\u03A6",
-    "\u{1D6BE}"=>"\u03A7",
-    "\u{1D6BF}"=>"\u03A8",
-    "\u{1D6C0}"=>"\u03A9",
-    "\u{1D6C1}"=>"\u2207",
-    "\u{1D6C2}"=>"\u03B1",
-    "\u{1D6C3}"=>"\u03B2",
-    "\u{1D6C4}"=>"\u03B3",
-    "\u{1D6C5}"=>"\u03B4",
-    "\u{1D6C6}"=>"\u03B5",
-    "\u{1D6C7}"=>"\u03B6",
-    "\u{1D6C8}"=>"\u03B7",
-    "\u{1D6C9}"=>"\u03B8",
-    "\u{1D6CA}"=>"\u03B9",
-    "\u{1D6CB}"=>"\u03BA",
-    "\u{1D6CC}"=>"\u03BB",
-    "\u{1D6CD}"=>"\u03BC",
-    "\u{1D6CE}"=>"\u03BD",
-    "\u{1D6CF}"=>"\u03BE",
-    "\u{1D6D0}"=>"\u03BF",
-    "\u{1D6D1}"=>"\u03C0",
-    "\u{1D6D2}"=>"\u03C1",
-    "\u{1D6D3}"=>"\u03C2",
-    "\u{1D6D4}"=>"\u03C3",
-    "\u{1D6D5}"=>"\u03C4",
-    "\u{1D6D6}"=>"\u03C5",
-    "\u{1D6D7}"=>"\u03C6",
-    "\u{1D6D8}"=>"\u03C7",
-    "\u{1D6D9}"=>"\u03C8",
-    "\u{1D6DA}"=>"\u03C9",
-    "\u{1D6DB}"=>"\u2202",
-    "\u{1D6DC}"=>"\u03B5",
-    "\u{1D6DD}"=>"\u03B8",
-    "\u{1D6DE}"=>"\u03BA",
-    "\u{1D6DF}"=>"\u03C6",
-    "\u{1D6E0}"=>"\u03C1",
-    "\u{1D6E1}"=>"\u03C0",
-    "\u{1D6E2}"=>"\u0391",
-    "\u{1D6E3}"=>"\u0392",
-    "\u{1D6E4}"=>"\u0393",
-    "\u{1D6E5}"=>"\u0394",
-    "\u{1D6E6}"=>"\u0395",
-    "\u{1D6E7}"=>"\u0396",
-    "\u{1D6E8}"=>"\u0397",
-    "\u{1D6E9}"=>"\u0398",
-    "\u{1D6EA}"=>"\u0399",
-    "\u{1D6EB}"=>"\u039A",
-    "\u{1D6EC}"=>"\u039B",
-    "\u{1D6ED}"=>"\u039C",
-    "\u{1D6EE}"=>"\u039D",
-    "\u{1D6EF}"=>"\u039E",
-    "\u{1D6F0}"=>"\u039F",
-    "\u{1D6F1}"=>"\u03A0",
-    "\u{1D6F2}"=>"\u03A1",
-    "\u{1D6F3}"=>"\u0398",
-    "\u{1D6F4}"=>"\u03A3",
-    "\u{1D6F5}"=>"\u03A4",
-    "\u{1D6F6}"=>"\u03A5",
-    "\u{1D6F7}"=>"\u03A6",
-    "\u{1D6F8}"=>"\u03A7",
-    "\u{1D6F9}"=>"\u03A8",
-    "\u{1D6FA}"=>"\u03A9",
-    "\u{1D6FB}"=>"\u2207",
-    "\u{1D6FC}"=>"\u03B1",
-    "\u{1D6FD}"=>"\u03B2",
-    "\u{1D6FE}"=>"\u03B3",
-    "\u{1D6FF}"=>"\u03B4",
-    "\u{1D700}"=>"\u03B5",
-    "\u{1D701}"=>"\u03B6",
-    "\u{1D702}"=>"\u03B7",
-    "\u{1D703}"=>"\u03B8",
-    "\u{1D704}"=>"\u03B9",
-    "\u{1D705}"=>"\u03BA",
-    "\u{1D706}"=>"\u03BB",
-    "\u{1D707}"=>"\u03BC",
-    "\u{1D708}"=>"\u03BD",
-    "\u{1D709}"=>"\u03BE",
-    "\u{1D70A}"=>"\u03BF",
-    "\u{1D70B}"=>"\u03C0",
-    "\u{1D70C}"=>"\u03C1",
-    "\u{1D70D}"=>"\u03C2",
-    "\u{1D70E}"=>"\u03C3",
-    "\u{1D70F}"=>"\u03C4",
-    "\u{1D710}"=>"\u03C5",
-    "\u{1D711}"=>"\u03C6",
-    "\u{1D712}"=>"\u03C7",
-    "\u{1D713}"=>"\u03C8",
-    "\u{1D714}"=>"\u03C9",
-    "\u{1D715}"=>"\u2202",
-    "\u{1D716}"=>"\u03B5",
-    "\u{1D717}"=>"\u03B8",
-    "\u{1D718}"=>"\u03BA",
-    "\u{1D719}"=>"\u03C6",
-    "\u{1D71A}"=>"\u03C1",
-    "\u{1D71B}"=>"\u03C0",
-    "\u{1D71C}"=>"\u0391",
-    "\u{1D71D}"=>"\u0392",
-    "\u{1D71E}"=>"\u0393",
-    "\u{1D71F}"=>"\u0394",
-    "\u{1D720}"=>"\u0395",
-    "\u{1D721}"=>"\u0396",
-    "\u{1D722}"=>"\u0397",
-    "\u{1D723}"=>"\u0398",
-    "\u{1D724}"=>"\u0399",
-    "\u{1D725}"=>"\u039A",
-    "\u{1D726}"=>"\u039B",
-    "\u{1D727}"=>"\u039C",
-    "\u{1D728}"=>"\u039D",
-    "\u{1D729}"=>"\u039E",
-    "\u{1D72A}"=>"\u039F",
-    "\u{1D72B}"=>"\u03A0",
-    "\u{1D72C}"=>"\u03A1",
-    "\u{1D72D}"=>"\u0398",
-    "\u{1D72E}"=>"\u03A3",
-    "\u{1D72F}"=>"\u03A4",
-    "\u{1D730}"=>"\u03A5",
-    "\u{1D731}"=>"\u03A6",
-    "\u{1D732}"=>"\u03A7",
-    "\u{1D733}"=>"\u03A8",
-    "\u{1D734}"=>"\u03A9",
-    "\u{1D735}"=>"\u2207",
-    "\u{1D736}"=>"\u03B1",
-    "\u{1D737}"=>"\u03B2",
-    "\u{1D738}"=>"\u03B3",
-    "\u{1D739}"=>"\u03B4",
-    "\u{1D73A}"=>"\u03B5",
-    "\u{1D73B}"=>"\u03B6",
-    "\u{1D73C}"=>"\u03B7",
-    "\u{1D73D}"=>"\u03B8",
-    "\u{1D73E}"=>"\u03B9",
-    "\u{1D73F}"=>"\u03BA",
-    "\u{1D740}"=>"\u03BB",
-    "\u{1D741}"=>"\u03BC",
-    "\u{1D742}"=>"\u03BD",
-    "\u{1D743}"=>"\u03BE",
-    "\u{1D744}"=>"\u03BF",
-    "\u{1D745}"=>"\u03C0",
-    "\u{1D746}"=>"\u03C1",
-    "\u{1D747}"=>"\u03C2",
-    "\u{1D748}"=>"\u03C3",
-    "\u{1D749}"=>"\u03C4",
-    "\u{1D74A}"=>"\u03C5",
-    "\u{1D74B}"=>"\u03C6",
-    "\u{1D74C}"=>"\u03C7",
-    "\u{1D74D}"=>"\u03C8",
-    "\u{1D74E}"=>"\u03C9",
-    "\u{1D74F}"=>"\u2202",
-    "\u{1D750}"=>"\u03B5",
-    "\u{1D751}"=>"\u03B8",
-    "\u{1D752}"=>"\u03BA",
-    "\u{1D753}"=>"\u03C6",
-    "\u{1D754}"=>"\u03C1",
-    "\u{1D755}"=>"\u03C0",
-    "\u{1D756}"=>"\u0391",
-    "\u{1D757}"=>"\u0392",
-    "\u{1D758}"=>"\u0393",
-    "\u{1D759}"=>"\u0394",
-    "\u{1D75A}"=>"\u0395",
-    "\u{1D75B}"=>"\u0396",
-    "\u{1D75C}"=>"\u0397",
-    "\u{1D75D}"=>"\u0398",
-    "\u{1D75E}"=>"\u0399",
-    "\u{1D75F}"=>"\u039A",
-    "\u{1D760}"=>"\u039B",
-    "\u{1D761}"=>"\u039C",
-    "\u{1D762}"=>"\u039D",
-    "\u{1D763}"=>"\u039E",
-    "\u{1D764}"=>"\u039F",
-    "\u{1D765}"=>"\u03A0",
-    "\u{1D766}"=>"\u03A1",
-    "\u{1D767}"=>"\u0398",
-    "\u{1D768}"=>"\u03A3",
-    "\u{1D769}"=>"\u03A4",
-    "\u{1D76A}"=>"\u03A5",
-    "\u{1D76B}"=>"\u03A6",
-    "\u{1D76C}"=>"\u03A7",
-    "\u{1D76D}"=>"\u03A8",
-    "\u{1D76E}"=>"\u03A9",
-    "\u{1D76F}"=>"\u2207",
-    "\u{1D770}"=>"\u03B1",
-    "\u{1D771}"=>"\u03B2",
-    "\u{1D772}"=>"\u03B3",
-    "\u{1D773}"=>"\u03B4",
-    "\u{1D774}"=>"\u03B5",
-    "\u{1D775}"=>"\u03B6",
-    "\u{1D776}"=>"\u03B7",
-    "\u{1D777}"=>"\u03B8",
-    "\u{1D778}"=>"\u03B9",
-    "\u{1D779}"=>"\u03BA",
-    "\u{1D77A}"=>"\u03BB",
-    "\u{1D77B}"=>"\u03BC",
-    "\u{1D77C}"=>"\u03BD",
-    "\u{1D77D}"=>"\u03BE",
-    "\u{1D77E}"=>"\u03BF",
-    "\u{1D77F}"=>"\u03C0",
-    "\u{1D780}"=>"\u03C1",
-    "\u{1D781}"=>"\u03C2",
-    "\u{1D782}"=>"\u03C3",
-    "\u{1D783}"=>"\u03C4",
-    "\u{1D784}"=>"\u03C5",
-    "\u{1D785}"=>"\u03C6",
-    "\u{1D786}"=>"\u03C7",
-    "\u{1D787}"=>"\u03C8",
-    "\u{1D788}"=>"\u03C9",
-    "\u{1D789}"=>"\u2202",
-    "\u{1D78A}"=>"\u03B5",
-    "\u{1D78B}"=>"\u03B8",
-    "\u{1D78C}"=>"\u03BA",
-    "\u{1D78D}"=>"\u03C6",
-    "\u{1D78E}"=>"\u03C1",
-    "\u{1D78F}"=>"\u03C0",
-    "\u{1D790}"=>"\u0391",
-    "\u{1D791}"=>"\u0392",
-    "\u{1D792}"=>"\u0393",
-    "\u{1D793}"=>"\u0394",
-    "\u{1D794}"=>"\u0395",
-    "\u{1D795}"=>"\u0396",
-    "\u{1D796}"=>"\u0397",
-    "\u{1D797}"=>"\u0398",
-    "\u{1D798}"=>"\u0399",
-    "\u{1D799}"=>"\u039A",
-    "\u{1D79A}"=>"\u039B",
-    "\u{1D79B}"=>"\u039C",
-    "\u{1D79C}"=>"\u039D",
-    "\u{1D79D}"=>"\u039E",
-    "\u{1D79E}"=>"\u039F",
-    "\u{1D79F}"=>"\u03A0",
-    "\u{1D7A0}"=>"\u03A1",
-    "\u{1D7A1}"=>"\u0398",
-    "\u{1D7A2}"=>"\u03A3",
-    "\u{1D7A3}"=>"\u03A4",
-    "\u{1D7A4}"=>"\u03A5",
-    "\u{1D7A5}"=>"\u03A6",
-    "\u{1D7A6}"=>"\u03A7",
-    "\u{1D7A7}"=>"\u03A8",
-    "\u{1D7A8}"=>"\u03A9",
-    "\u{1D7A9}"=>"\u2207",
-    "\u{1D7AA}"=>"\u03B1",
-    "\u{1D7AB}"=>"\u03B2",
-    "\u{1D7AC}"=>"\u03B3",
-    "\u{1D7AD}"=>"\u03B4",
-    "\u{1D7AE}"=>"\u03B5",
-    "\u{1D7AF}"=>"\u03B6",
-    "\u{1D7B0}"=>"\u03B7",
-    "\u{1D7B1}"=>"\u03B8",
-    "\u{1D7B2}"=>"\u03B9",
-    "\u{1D7B3}"=>"\u03BA",
-    "\u{1D7B4}"=>"\u03BB",
-    "\u{1D7B5}"=>"\u03BC",
-    "\u{1D7B6}"=>"\u03BD",
-    "\u{1D7B7}"=>"\u03BE",
-    "\u{1D7B8}"=>"\u03BF",
-    "\u{1D7B9}"=>"\u03C0",
-    "\u{1D7BA}"=>"\u03C1",
-    "\u{1D7BB}"=>"\u03C2",
-    "\u{1D7BC}"=>"\u03C3",
-    "\u{1D7BD}"=>"\u03C4",
-    "\u{1D7BE}"=>"\u03C5",
-    "\u{1D7BF}"=>"\u03C6",
-    "\u{1D7C0}"=>"\u03C7",
-    "\u{1D7C1}"=>"\u03C8",
-    "\u{1D7C2}"=>"\u03C9",
-    "\u{1D7C3}"=>"\u2202",
-    "\u{1D7C4}"=>"\u03B5",
-    "\u{1D7C5}"=>"\u03B8",
-    "\u{1D7C6}"=>"\u03BA",
-    "\u{1D7C7}"=>"\u03C6",
-    "\u{1D7C8}"=>"\u03C1",
-    "\u{1D7C9}"=>"\u03C0",
-    "\u{1D7CA}"=>"\u03DC",
-    "\u{1D7CB}"=>"\u03DD",
-    "\u{1D7CE}"=>"0",
-    "\u{1D7CF}"=>"1",
-    "\u{1D7D0}"=>"2",
-    "\u{1D7D1}"=>"3",
-    "\u{1D7D2}"=>"4",
-    "\u{1D7D3}"=>"5",
-    "\u{1D7D4}"=>"6",
-    "\u{1D7D5}"=>"7",
-    "\u{1D7D6}"=>"8",
-    "\u{1D7D7}"=>"9",
-    "\u{1D7D8}"=>"0",
-    "\u{1D7D9}"=>"1",
-    "\u{1D7DA}"=>"2",
-    "\u{1D7DB}"=>"3",
-    "\u{1D7DC}"=>"4",
-    "\u{1D7DD}"=>"5",
-    "\u{1D7DE}"=>"6",
-    "\u{1D7DF}"=>"7",
-    "\u{1D7E0}"=>"8",
-    "\u{1D7E1}"=>"9",
-    "\u{1D7E2}"=>"0",
-    "\u{1D7E3}"=>"1",
-    "\u{1D7E4}"=>"2",
-    "\u{1D7E5}"=>"3",
-    "\u{1D7E6}"=>"4",
-    "\u{1D7E7}"=>"5",
-    "\u{1D7E8}"=>"6",
-    "\u{1D7E9}"=>"7",
-    "\u{1D7EA}"=>"8",
-    "\u{1D7EB}"=>"9",
-    "\u{1D7EC}"=>"0",
-    "\u{1D7ED}"=>"1",
-    "\u{1D7EE}"=>"2",
-    "\u{1D7EF}"=>"3",
-    "\u{1D7F0}"=>"4",
-    "\u{1D7F1}"=>"5",
-    "\u{1D7F2}"=>"6",
-    "\u{1D7F3}"=>"7",
-    "\u{1D7F4}"=>"8",
-    "\u{1D7F5}"=>"9",
-    "\u{1D7F6}"=>"0",
-    "\u{1D7F7}"=>"1",
-    "\u{1D7F8}"=>"2",
-    "\u{1D7F9}"=>"3",
-    "\u{1D7FA}"=>"4",
-    "\u{1D7FB}"=>"5",
-    "\u{1D7FC}"=>"6",
-    "\u{1D7FD}"=>"7",
-    "\u{1D7FE}"=>"8",
-    "\u{1D7FF}"=>"9",
-    "\u{1EE00}"=>"\u0627",
-    "\u{1EE01}"=>"\u0628",
-    "\u{1EE02}"=>"\u062C",
-    "\u{1EE03}"=>"\u062F",
-    "\u{1EE05}"=>"\u0648",
-    "\u{1EE06}"=>"\u0632",
-    "\u{1EE07}"=>"\u062D",
-    "\u{1EE08}"=>"\u0637",
-    "\u{1EE09}"=>"\u064A",
-    "\u{1EE0A}"=>"\u0643",
-    "\u{1EE0B}"=>"\u0644",
-    "\u{1EE0C}"=>"\u0645",
-    "\u{1EE0D}"=>"\u0646",
-    "\u{1EE0E}"=>"\u0633",
-    "\u{1EE0F}"=>"\u0639",
-    "\u{1EE10}"=>"\u0641",
-    "\u{1EE11}"=>"\u0635",
-    "\u{1EE12}"=>"\u0642",
-    "\u{1EE13}"=>"\u0631",
-    "\u{1EE14}"=>"\u0634",
-    "\u{1EE15}"=>"\u062A",
-    "\u{1EE16}"=>"\u062B",
-    "\u{1EE17}"=>"\u062E",
-    "\u{1EE18}"=>"\u0630",
-    "\u{1EE19}"=>"\u0636",
-    "\u{1EE1A}"=>"\u0638",
-    "\u{1EE1B}"=>"\u063A",
-    "\u{1EE1C}"=>"\u066E",
-    "\u{1EE1D}"=>"\u06BA",
-    "\u{1EE1E}"=>"\u06A1",
-    "\u{1EE1F}"=>"\u066F",
-    "\u{1EE21}"=>"\u0628",
-    "\u{1EE22}"=>"\u062C",
-    "\u{1EE24}"=>"\u0647",
-    "\u{1EE27}"=>"\u062D",
-    "\u{1EE29}"=>"\u064A",
-    "\u{1EE2A}"=>"\u0643",
-    "\u{1EE2B}"=>"\u0644",
-    "\u{1EE2C}"=>"\u0645",
-    "\u{1EE2D}"=>"\u0646",
-    "\u{1EE2E}"=>"\u0633",
-    "\u{1EE2F}"=>"\u0639",
-    "\u{1EE30}"=>"\u0641",
-    "\u{1EE31}"=>"\u0635",
-    "\u{1EE32}"=>"\u0642",
-    "\u{1EE34}"=>"\u0634",
-    "\u{1EE35}"=>"\u062A",
-    "\u{1EE36}"=>"\u062B",
-    "\u{1EE37}"=>"\u062E",
-    "\u{1EE39}"=>"\u0636",
-    "\u{1EE3B}"=>"\u063A",
-    "\u{1EE42}"=>"\u062C",
-    "\u{1EE47}"=>"\u062D",
-    "\u{1EE49}"=>"\u064A",
-    "\u{1EE4B}"=>"\u0644",
-    "\u{1EE4D}"=>"\u0646",
-    "\u{1EE4E}"=>"\u0633",
-    "\u{1EE4F}"=>"\u0639",
-    "\u{1EE51}"=>"\u0635",
-    "\u{1EE52}"=>"\u0642",
-    "\u{1EE54}"=>"\u0634",
-    "\u{1EE57}"=>"\u062E",
-    "\u{1EE59}"=>"\u0636",
-    "\u{1EE5B}"=>"\u063A",
-    "\u{1EE5D}"=>"\u06BA",
-    "\u{1EE5F}"=>"\u066F",
-    "\u{1EE61}"=>"\u0628",
-    "\u{1EE62}"=>"\u062C",
-    "\u{1EE64}"=>"\u0647",
-    "\u{1EE67}"=>"\u062D",
-    "\u{1EE68}"=>"\u0637",
-    "\u{1EE69}"=>"\u064A",
-    "\u{1EE6A}"=>"\u0643",
-    "\u{1EE6C}"=>"\u0645",
-    "\u{1EE6D}"=>"\u0646",
-    "\u{1EE6E}"=>"\u0633",
-    "\u{1EE6F}"=>"\u0639",
-    "\u{1EE70}"=>"\u0641",
-    "\u{1EE71}"=>"\u0635",
-    "\u{1EE72}"=>"\u0642",
-    "\u{1EE74}"=>"\u0634",
-    "\u{1EE75}"=>"\u062A",
-    "\u{1EE76}"=>"\u062B",
-    "\u{1EE77}"=>"\u062E",
-    "\u{1EE79}"=>"\u0636",
-    "\u{1EE7A}"=>"\u0638",
-    "\u{1EE7B}"=>"\u063A",
-    "\u{1EE7C}"=>"\u066E",
-    "\u{1EE7E}"=>"\u06A1",
-    "\u{1EE80}"=>"\u0627",
-    "\u{1EE81}"=>"\u0628",
-    "\u{1EE82}"=>"\u062C",
-    "\u{1EE83}"=>"\u062F",
-    "\u{1EE84}"=>"\u0647",
-    "\u{1EE85}"=>"\u0648",
-    "\u{1EE86}"=>"\u0632",
-    "\u{1EE87}"=>"\u062D",
-    "\u{1EE88}"=>"\u0637",
-    "\u{1EE89}"=>"\u064A",
-    "\u{1EE8B}"=>"\u0644",
-    "\u{1EE8C}"=>"\u0645",
-    "\u{1EE8D}"=>"\u0646",
-    "\u{1EE8E}"=>"\u0633",
-    "\u{1EE8F}"=>"\u0639",
-    "\u{1EE90}"=>"\u0641",
-    "\u{1EE91}"=>"\u0635",
-    "\u{1EE92}"=>"\u0642",
-    "\u{1EE93}"=>"\u0631",
-    "\u{1EE94}"=>"\u0634",
-    "\u{1EE95}"=>"\u062A",
-    "\u{1EE96}"=>"\u062B",
-    "\u{1EE97}"=>"\u062E",
-    "\u{1EE98}"=>"\u0630",
-    "\u{1EE99}"=>"\u0636",
-    "\u{1EE9A}"=>"\u0638",
-    "\u{1EE9B}"=>"\u063A",
-    "\u{1EEA1}"=>"\u0628",
-    "\u{1EEA2}"=>"\u062C",
-    "\u{1EEA3}"=>"\u062F",
-    "\u{1EEA5}"=>"\u0648",
-    "\u{1EEA6}"=>"\u0632",
-    "\u{1EEA7}"=>"\u062D",
-    "\u{1EEA8}"=>"\u0637",
-    "\u{1EEA9}"=>"\u064A",
-    "\u{1EEAB}"=>"\u0644",
-    "\u{1EEAC}"=>"\u0645",
-    "\u{1EEAD}"=>"\u0646",
-    "\u{1EEAE}"=>"\u0633",
-    "\u{1EEAF}"=>"\u0639",
-    "\u{1EEB0}"=>"\u0641",
-    "\u{1EEB1}"=>"\u0635",
-    "\u{1EEB2}"=>"\u0642",
-    "\u{1EEB3}"=>"\u0631",
-    "\u{1EEB4}"=>"\u0634",
-    "\u{1EEB5}"=>"\u062A",
-    "\u{1EEB6}"=>"\u062B",
-    "\u{1EEB7}"=>"\u062E",
-    "\u{1EEB8}"=>"\u0630",
-    "\u{1EEB9}"=>"\u0636",
-    "\u{1EEBA}"=>"\u0638",
-    "\u{1EEBB}"=>"\u063A",
-    "\u{1F100}"=>"0.",
-    "\u{1F101}"=>"0,",
-    "\u{1F102}"=>"1,",
-    "\u{1F103}"=>"2,",
-    "\u{1F104}"=>"3,",
-    "\u{1F105}"=>"4,",
-    "\u{1F106}"=>"5,",
-    "\u{1F107}"=>"6,",
-    "\u{1F108}"=>"7,",
-    "\u{1F109}"=>"8,",
-    "\u{1F10A}"=>"9,",
-    "\u{1F110}"=>"(A)",
-    "\u{1F111}"=>"(B)",
-    "\u{1F112}"=>"(C)",
-    "\u{1F113}"=>"(D)",
-    "\u{1F114}"=>"(E)",
-    "\u{1F115}"=>"(F)",
-    "\u{1F116}"=>"(G)",
-    "\u{1F117}"=>"(H)",
-    "\u{1F118}"=>"(I)",
-    "\u{1F119}"=>"(J)",
-    "\u{1F11A}"=>"(K)",
-    "\u{1F11B}"=>"(L)",
-    "\u{1F11C}"=>"(M)",
-    "\u{1F11D}"=>"(N)",
-    "\u{1F11E}"=>"(O)",
-    "\u{1F11F}"=>"(P)",
-    "\u{1F120}"=>"(Q)",
-    "\u{1F121}"=>"(R)",
-    "\u{1F122}"=>"(S)",
-    "\u{1F123}"=>"(T)",
-    "\u{1F124}"=>"(U)",
-    "\u{1F125}"=>"(V)",
-    "\u{1F126}"=>"(W)",
-    "\u{1F127}"=>"(X)",
-    "\u{1F128}"=>"(Y)",
-    "\u{1F129}"=>"(Z)",
-    "\u{1F12A}"=>"\u3014S\u3015",
-    "\u{1F12B}"=>"C",
-    "\u{1F12C}"=>"R",
-    "\u{1F12D}"=>"CD",
-    "\u{1F12E}"=>"WZ",
-    "\u{1F130}"=>"A",
-    "\u{1F131}"=>"B",
-    "\u{1F132}"=>"C",
-    "\u{1F133}"=>"D",
-    "\u{1F134}"=>"E",
-    "\u{1F135}"=>"F",
-    "\u{1F136}"=>"G",
-    "\u{1F137}"=>"H",
-    "\u{1F138}"=>"I",
-    "\u{1F139}"=>"J",
-    "\u{1F13A}"=>"K",
-    "\u{1F13B}"=>"L",
-    "\u{1F13C}"=>"M",
-    "\u{1F13D}"=>"N",
-    "\u{1F13E}"=>"O",
-    "\u{1F13F}"=>"P",
-    "\u{1F140}"=>"Q",
-    "\u{1F141}"=>"R",
-    "\u{1F142}"=>"S",
-    "\u{1F143}"=>"T",
-    "\u{1F144}"=>"U",
-    "\u{1F145}"=>"V",
-    "\u{1F146}"=>"W",
-    "\u{1F147}"=>"X",
-    "\u{1F148}"=>"Y",
-    "\u{1F149}"=>"Z",
-    "\u{1F14A}"=>"HV",
-    "\u{1F14B}"=>"MV",
-    "\u{1F14C}"=>"SD",
-    "\u{1F14D}"=>"SS",
-    "\u{1F14E}"=>"PPV",
-    "\u{1F14F}"=>"WC",
-    "\u{1F16A}"=>"MC",
-    "\u{1F16B}"=>"MD",
-    "\u{1F16C}"=>"MR",
-    "\u{1F190}"=>"DJ",
-    "\u{1F200}"=>"\u307B\u304B",
-    "\u{1F201}"=>"\u30B3\u30B3",
-    "\u{1F202}"=>"\u30B5",
-    "\u{1F210}"=>"\u624B",
-    "\u{1F211}"=>"\u5B57",
-    "\u{1F212}"=>"\u53CC",
-    "\u{1F213}"=>"\u30C7",
-    "\u{1F214}"=>"\u4E8C",
-    "\u{1F215}"=>"\u591A",
-    "\u{1F216}"=>"\u89E3",
-    "\u{1F217}"=>"\u5929",
-    "\u{1F218}"=>"\u4EA4",
-    "\u{1F219}"=>"\u6620",
-    "\u{1F21A}"=>"\u7121",
-    "\u{1F21B}"=>"\u6599",
-    "\u{1F21C}"=>"\u524D",
-    "\u{1F21D}"=>"\u5F8C",
-    "\u{1F21E}"=>"\u518D",
-    "\u{1F21F}"=>"\u65B0",
-    "\u{1F220}"=>"\u521D",
-    "\u{1F221}"=>"\u7D42",
-    "\u{1F222}"=>"\u751F",
-    "\u{1F223}"=>"\u8CA9",
-    "\u{1F224}"=>"\u58F0",
-    "\u{1F225}"=>"\u5439",
-    "\u{1F226}"=>"\u6F14",
-    "\u{1F227}"=>"\u6295",
-    "\u{1F228}"=>"\u6355",
-    "\u{1F229}"=>"\u4E00",
-    "\u{1F22A}"=>"\u4E09",
-    "\u{1F22B}"=>"\u904A",
-    "\u{1F22C}"=>"\u5DE6",
-    "\u{1F22D}"=>"\u4E2D",
-    "\u{1F22E}"=>"\u53F3",
-    "\u{1F22F}"=>"\u6307",
-    "\u{1F230}"=>"\u8D70",
-    "\u{1F231}"=>"\u6253",
-    "\u{1F232}"=>"\u7981",
-    "\u{1F233}"=>"\u7A7A",
-    "\u{1F234}"=>"\u5408",
-    "\u{1F235}"=>"\u6E80",
-    "\u{1F236}"=>"\u6709",
-    "\u{1F237}"=>"\u6708",
-    "\u{1F238}"=>"\u7533",
-    "\u{1F239}"=>"\u5272",
-    "\u{1F23A}"=>"\u55B6",
-    "\u{1F23B}"=>"\u914D",
-    "\u{1F240}"=>"\u3014\u672C\u3015",
-    "\u{1F241}"=>"\u3014\u4E09\u3015",
-    "\u{1F242}"=>"\u3014\u4E8C\u3015",
-    "\u{1F243}"=>"\u3014\u5B89\u3015",
-    "\u{1F244}"=>"\u3014\u70B9\u3015",
-    "\u{1F245}"=>"\u3014\u6253\u3015",
-    "\u{1F246}"=>"\u3014\u76D7\u3015",
-    "\u{1F247}"=>"\u3014\u52DD\u3015",
-    "\u{1F248}"=>"\u3014\u6557\u3015",
-    "\u{1F250}"=>"\u5F97",
-    "\u{1F251}"=>"\u53EF",
-    "\u0385"=>" \u0308\u0301",
-    "\u03D3"=>"\u03A5\u0301",
-    "\u03D4"=>"\u03A5\u0308",
-    "\u1E9B"=>"s\u0307",
-    "\u1FC1"=>" \u0308\u0342",
-    "\u1FCD"=>" \u0313\u0300",
-    "\u1FCE"=>" \u0313\u0301",
-    "\u1FCF"=>" \u0313\u0342",
-    "\u1FDD"=>" \u0314\u0300",
-    "\u1FDE"=>" \u0314\u0301",
-    "\u1FDF"=>" \u0314\u0342",
-    "\u1FED"=>" \u0308\u0300",
-    "\u1FEE"=>" \u0308\u0301",
-    "\u1FFD"=>" \u0301",
-    "\u2000"=>" ",
-    "\u2001"=>" ",
+    "\u00A0"=>" ", "\u00A8"=>" \u0308", "\u00AA"=>"a", "\u00AF"=>" \u0304", "\u00B2"=>"2", "\u00B3"=>"3", "\u00B4"=>" \u0301", "\u00B5"=>"\u03BC",
+    "\u00B8"=>" \u0327", "\u00B9"=>"1", "\u00BA"=>"o", "\u00BC"=>"1\u20444", "\u00BD"=>"1\u20442", "\u00BE"=>"3\u20444", "\u0132"=>"IJ", "\u0133"=>"ij",
+    "\u013F"=>"L\u00B7", "\u0140"=>"l\u00B7", "\u0149"=>"\u02BCn", "\u017F"=>"s", "\u01C4"=>"D\u017D", "\u01C5"=>"D\u017E", "\u01C6"=>"d\u017E", "\u01C7"=>"LJ",
+    "\u01C8"=>"Lj", "\u01C9"=>"lj", "\u01CA"=>"NJ", "\u01CB"=>"Nj", "\u01CC"=>"nj", "\u01F1"=>"DZ", "\u01F2"=>"Dz", "\u01F3"=>"dz",
+    "\u02B0"=>"h", "\u02B1"=>"\u0266", "\u02B2"=>"j", "\u02B3"=>"r", "\u02B4"=>"\u0279", "\u02B5"=>"\u027B", "\u02B6"=>"\u0281", "\u02B7"=>"w",
+    "\u02B8"=>"y", "\u02D8"=>" \u0306", "\u02D9"=>" \u0307", "\u02DA"=>" \u030A", "\u02DB"=>" \u0328", "\u02DC"=>" \u0303", "\u02DD"=>" \u030B", "\u02E0"=>"\u0263",
+    "\u02E1"=>"l", "\u02E2"=>"s", "\u02E3"=>"x", "\u02E4"=>"\u0295", "\u037A"=>" \u0345", "\u0384"=>" \u0301", "\u03D0"=>"\u03B2", "\u03D1"=>"\u03B8",
+    "\u03D2"=>"\u03A5", "\u03D5"=>"\u03C6", "\u03D6"=>"\u03C0", "\u03F0"=>"\u03BA", "\u03F1"=>"\u03C1", "\u03F2"=>"\u03C2", "\u03F4"=>"\u0398", "\u03F5"=>"\u03B5",
+    "\u03F9"=>"\u03A3", "\u0587"=>"\u0565\u0582", "\u0675"=>"\u0627\u0674", "\u0676"=>"\u0648\u0674", "\u0677"=>"\u06C7\u0674", "\u0678"=>"\u064A\u0674", "\u0E33"=>"\u0E4D\u0E32", "\u0EB3"=>"\u0ECD\u0EB2",
+    "\u0EDC"=>"\u0EAB\u0E99", "\u0EDD"=>"\u0EAB\u0EA1", "\u0F0C"=>"\u0F0B", "\u0F77"=>"\u0FB2\u0F81", "\u0F79"=>"\u0FB3\u0F81", "\u10FC"=>"\u10DC", "\u1D2C"=>"A", "\u1D2D"=>"\u00C6",
+    "\u1D2E"=>"B", "\u1D30"=>"D", "\u1D31"=>"E", "\u1D32"=>"\u018E", "\u1D33"=>"G", "\u1D34"=>"H", "\u1D35"=>"I", "\u1D36"=>"J",
+    "\u1D37"=>"K", "\u1D38"=>"L", "\u1D39"=>"M", "\u1D3A"=>"N", "\u1D3C"=>"O", "\u1D3D"=>"\u0222", "\u1D3E"=>"P", "\u1D3F"=>"R",
+    "\u1D40"=>"T", "\u1D41"=>"U", "\u1D42"=>"W", "\u1D43"=>"a", "\u1D44"=>"\u0250", "\u1D45"=>"\u0251", "\u1D46"=>"\u1D02", "\u1D47"=>"b",
+    "\u1D48"=>"d", "\u1D49"=>"e", "\u1D4A"=>"\u0259", "\u1D4B"=>"\u025B", "\u1D4C"=>"\u025C", "\u1D4D"=>"g", "\u1D4F"=>"k", "\u1D50"=>"m",
+    "\u1D51"=>"\u014B", "\u1D52"=>"o", "\u1D53"=>"\u0254", "\u1D54"=>"\u1D16", "\u1D55"=>"\u1D17", "\u1D56"=>"p", "\u1D57"=>"t", "\u1D58"=>"u",
+    "\u1D59"=>"\u1D1D", "\u1D5A"=>"\u026F", "\u1D5B"=>"v", "\u1D5C"=>"\u1D25", "\u1D5D"=>"\u03B2", "\u1D5E"=>"\u03B3", "\u1D5F"=>"\u03B4", "\u1D60"=>"\u03C6",
+    "\u1D61"=>"\u03C7", "\u1D62"=>"i", "\u1D63"=>"r", "\u1D64"=>"u", "\u1D65"=>"v", "\u1D66"=>"\u03B2", "\u1D67"=>"\u03B3", "\u1D68"=>"\u03C1",
+    "\u1D69"=>"\u03C6", "\u1D6A"=>"\u03C7", "\u1D78"=>"\u043D", "\u1D9B"=>"\u0252", "\u1D9C"=>"c", "\u1D9D"=>"\u0255", "\u1D9E"=>"\u00F0", "\u1D9F"=>"\u025C",
+    "\u1DA0"=>"f", "\u1DA1"=>"\u025F", "\u1DA2"=>"\u0261", "\u1DA3"=>"\u0265", "\u1DA4"=>"\u0268", "\u1DA5"=>"\u0269", "\u1DA6"=>"\u026A", "\u1DA7"=>"\u1D7B",
+    "\u1DA8"=>"\u029D", "\u1DA9"=>"\u026D", "\u1DAA"=>"\u1D85", "\u1DAB"=>"\u029F", "\u1DAC"=>"\u0271", "\u1DAD"=>"\u0270", "\u1DAE"=>"\u0272", "\u1DAF"=>"\u0273",
+    "\u1DB0"=>"\u0274", "\u1DB1"=>"\u0275", "\u1DB2"=>"\u0278", "\u1DB3"=>"\u0282", "\u1DB4"=>"\u0283", "\u1DB5"=>"\u01AB", "\u1DB6"=>"\u0289", "\u1DB7"=>"\u028A",
+    "\u1DB8"=>"\u1D1C", "\u1DB9"=>"\u028B", "\u1DBA"=>"\u028C", "\u1DBB"=>"z", "\u1DBC"=>"\u0290", "\u1DBD"=>"\u0291", "\u1DBE"=>"\u0292", "\u1DBF"=>"\u03B8",
+    "\u1E9A"=>"a\u02BE", "\u1FBD"=>" \u0313", "\u1FBF"=>" \u0313", "\u1FC0"=>" \u0342", "\u1FFE"=>" \u0314", "\u2002"=>" ", "\u2003"=>" ", "\u2004"=>" ",
+    "\u2005"=>" ", "\u2006"=>" ", "\u2007"=>" ", "\u2008"=>" ", "\u2009"=>" ", "\u200A"=>" ", "\u2011"=>"\u2010", "\u2017"=>" \u0333",
+    "\u2024"=>".", "\u2025"=>"..", "\u2026"=>"...", "\u202F"=>" ", "\u2033"=>"\u2032\u2032", "\u2034"=>"\u2032\u2032\u2032", "\u2036"=>"\u2035\u2035", "\u2037"=>"\u2035\u2035\u2035",
+    "\u203C"=>"!!", "\u203E"=>" \u0305", "\u2047"=>"??", "\u2048"=>"?!", "\u2049"=>"!?", "\u2057"=>"\u2032\u2032\u2032\u2032", "\u205F"=>" ", "\u2070"=>"0",
+    "\u2071"=>"i", "\u2074"=>"4", "\u2075"=>"5", "\u2076"=>"6", "\u2077"=>"7", "\u2078"=>"8", "\u2079"=>"9", "\u207A"=>"+",
+    "\u207B"=>"\u2212", "\u207C"=>"=", "\u207D"=>"(", "\u207E"=>")", "\u207F"=>"n", "\u2080"=>"0", "\u2081"=>"1", "\u2082"=>"2",
+    "\u2083"=>"3", "\u2084"=>"4", "\u2085"=>"5", "\u2086"=>"6", "\u2087"=>"7", "\u2088"=>"8", "\u2089"=>"9", "\u208A"=>"+",
+    "\u208B"=>"\u2212", "\u208C"=>"=", "\u208D"=>"(", "\u208E"=>")", "\u2090"=>"a", "\u2091"=>"e", "\u2092"=>"o", "\u2093"=>"x",
+    "\u2094"=>"\u0259", "\u2095"=>"h", "\u2096"=>"k", "\u2097"=>"l", "\u2098"=>"m", "\u2099"=>"n", "\u209A"=>"p", "\u209B"=>"s",
+    "\u209C"=>"t", "\u20A8"=>"Rs", "\u2100"=>"a/c", "\u2101"=>"a/s", "\u2102"=>"C", "\u2103"=>"\u00B0C", "\u2105"=>"c/o", "\u2106"=>"c/u",
+    "\u2107"=>"\u0190", "\u2109"=>"\u00B0F", "\u210A"=>"g", "\u210B"=>"H", "\u210C"=>"H", "\u210D"=>"H", "\u210E"=>"h", "\u210F"=>"\u0127",
+    "\u2110"=>"I", "\u2111"=>"I", "\u2112"=>"L", "\u2113"=>"l", "\u2115"=>"N", "\u2116"=>"No", "\u2119"=>"P", "\u211A"=>"Q",
+    "\u211B"=>"R", "\u211C"=>"R", "\u211D"=>"R", "\u2120"=>"SM", "\u2121"=>"TEL", "\u2122"=>"TM", "\u2124"=>"Z", "\u2128"=>"Z",
+    "\u212C"=>"B", "\u212D"=>"C", "\u212F"=>"e", "\u2130"=>"E", "\u2131"=>"F", "\u2133"=>"M", "\u2134"=>"o", "\u2135"=>"\u05D0",
+    "\u2136"=>"\u05D1", "\u2137"=>"\u05D2", "\u2138"=>"\u05D3", "\u2139"=>"i", "\u213B"=>"FAX", "\u213C"=>"\u03C0", "\u213D"=>"\u03B3", "\u213E"=>"\u0393",
+    "\u213F"=>"\u03A0", "\u2140"=>"\u2211", "\u2145"=>"D", "\u2146"=>"d", "\u2147"=>"e", "\u2148"=>"i", "\u2149"=>"j", "\u2150"=>"1\u20447",
+    "\u2151"=>"1\u20449", "\u2152"=>"1\u204410", "\u2153"=>"1\u20443", "\u2154"=>"2\u20443", "\u2155"=>"1\u20445", "\u2156"=>"2\u20445", "\u2157"=>"3\u20445", "\u2158"=>"4\u20445",
+    "\u2159"=>"1\u20446", "\u215A"=>"5\u20446", "\u215B"=>"1\u20448", "\u215C"=>"3\u20448", "\u215D"=>"5\u20448", "\u215E"=>"7\u20448", "\u215F"=>"1\u2044", "\u2160"=>"I",
+    "\u2161"=>"II", "\u2162"=>"III", "\u2163"=>"IV", "\u2164"=>"V", "\u2165"=>"VI", "\u2166"=>"VII", "\u2167"=>"VIII", "\u2168"=>"IX",
+    "\u2169"=>"X", "\u216A"=>"XI", "\u216B"=>"XII", "\u216C"=>"L", "\u216D"=>"C", "\u216E"=>"D", "\u216F"=>"M", "\u2170"=>"i",
+    "\u2171"=>"ii", "\u2172"=>"iii", "\u2173"=>"iv", "\u2174"=>"v", "\u2175"=>"vi", "\u2176"=>"vii", "\u2177"=>"viii", "\u2178"=>"ix",
+    "\u2179"=>"x", "\u217A"=>"xi", "\u217B"=>"xii", "\u217C"=>"l", "\u217D"=>"c", "\u217E"=>"d", "\u217F"=>"m", "\u2189"=>"0\u20443",
+    "\u222C"=>"\u222B\u222B", "\u222D"=>"\u222B\u222B\u222B", "\u222F"=>"\u222E\u222E", "\u2230"=>"\u222E\u222E\u222E", "\u2460"=>"1", "\u2461"=>"2", "\u2462"=>"3", "\u2463"=>"4",
+    "\u2464"=>"5", "\u2465"=>"6", "\u2466"=>"7", "\u2467"=>"8", "\u2468"=>"9", "\u2469"=>"10", "\u246A"=>"11", "\u246B"=>"12",
+    "\u246C"=>"13", "\u246D"=>"14", "\u246E"=>"15", "\u246F"=>"16", "\u2470"=>"17", "\u2471"=>"18", "\u2472"=>"19", "\u2473"=>"20",
+    "\u2474"=>"(1)", "\u2475"=>"(2)", "\u2476"=>"(3)", "\u2477"=>"(4)", "\u2478"=>"(5)", "\u2479"=>"(6)", "\u247A"=>"(7)", "\u247B"=>"(8)",
+    "\u247C"=>"(9)", "\u247D"=>"(10)", "\u247E"=>"(11)", "\u247F"=>"(12)", "\u2480"=>"(13)", "\u2481"=>"(14)", "\u2482"=>"(15)", "\u2483"=>"(16)",
+    "\u2484"=>"(17)", "\u2485"=>"(18)", "\u2486"=>"(19)", "\u2487"=>"(20)", "\u2488"=>"1.", "\u2489"=>"2.", "\u248A"=>"3.", "\u248B"=>"4.",
+    "\u248C"=>"5.", "\u248D"=>"6.", "\u248E"=>"7.", "\u248F"=>"8.", "\u2490"=>"9.", "\u2491"=>"10.", "\u2492"=>"11.", "\u2493"=>"12.",
+    "\u2494"=>"13.", "\u2495"=>"14.", "\u2496"=>"15.", "\u2497"=>"16.", "\u2498"=>"17.", "\u2499"=>"18.", "\u249A"=>"19.", "\u249B"=>"20.",
+    "\u249C"=>"(a)", "\u249D"=>"(b)", "\u249E"=>"(c)", "\u249F"=>"(d)", "\u24A0"=>"(e)", "\u24A1"=>"(f)", "\u24A2"=>"(g)", "\u24A3"=>"(h)",
+    "\u24A4"=>"(i)", "\u24A5"=>"(j)", "\u24A6"=>"(k)", "\u24A7"=>"(l)", "\u24A8"=>"(m)", "\u24A9"=>"(n)", "\u24AA"=>"(o)", "\u24AB"=>"(p)",
+    "\u24AC"=>"(q)", "\u24AD"=>"(r)", "\u24AE"=>"(s)", "\u24AF"=>"(t)", "\u24B0"=>"(u)", "\u24B1"=>"(v)", "\u24B2"=>"(w)", "\u24B3"=>"(x)",
+    "\u24B4"=>"(y)", "\u24B5"=>"(z)", "\u24B6"=>"A", "\u24B7"=>"B", "\u24B8"=>"C", "\u24B9"=>"D", "\u24BA"=>"E", "\u24BB"=>"F",
+    "\u24BC"=>"G", "\u24BD"=>"H", "\u24BE"=>"I", "\u24BF"=>"J", "\u24C0"=>"K", "\u24C1"=>"L", "\u24C2"=>"M", "\u24C3"=>"N",
+    "\u24C4"=>"O", "\u24C5"=>"P", "\u24C6"=>"Q", "\u24C7"=>"R", "\u24C8"=>"S", "\u24C9"=>"T", "\u24CA"=>"U", "\u24CB"=>"V",
+    "\u24CC"=>"W", "\u24CD"=>"X", "\u24CE"=>"Y", "\u24CF"=>"Z", "\u24D0"=>"a", "\u24D1"=>"b", "\u24D2"=>"c", "\u24D3"=>"d",
+    "\u24D4"=>"e", "\u24D5"=>"f", "\u24D6"=>"g", "\u24D7"=>"h", "\u24D8"=>"i", "\u24D9"=>"j", "\u24DA"=>"k", "\u24DB"=>"l",
+    "\u24DC"=>"m", "\u24DD"=>"n", "\u24DE"=>"o", "\u24DF"=>"p", "\u24E0"=>"q", "\u24E1"=>"r", "\u24E2"=>"s", "\u24E3"=>"t",
+    "\u24E4"=>"u", "\u24E5"=>"v", "\u24E6"=>"w", "\u24E7"=>"x", "\u24E8"=>"y", "\u24E9"=>"z", "\u24EA"=>"0", "\u2A0C"=>"\u222B\u222B\u222B\u222B",
+    "\u2A74"=>"::=", "\u2A75"=>"==", "\u2A76"=>"===", "\u2C7C"=>"j", "\u2C7D"=>"V", "\u2D6F"=>"\u2D61", "\u2E9F"=>"\u6BCD", "\u2EF3"=>"\u9F9F",
+    "\u2F00"=>"\u4E00", "\u2F01"=>"\u4E28", "\u2F02"=>"\u4E36", "\u2F03"=>"\u4E3F", "\u2F04"=>"\u4E59", "\u2F05"=>"\u4E85", "\u2F06"=>"\u4E8C", "\u2F07"=>"\u4EA0",
+    "\u2F08"=>"\u4EBA", "\u2F09"=>"\u513F", "\u2F0A"=>"\u5165", "\u2F0B"=>"\u516B", "\u2F0C"=>"\u5182", "\u2F0D"=>"\u5196", "\u2F0E"=>"\u51AB", "\u2F0F"=>"\u51E0",
+    "\u2F10"=>"\u51F5", "\u2F11"=>"\u5200", "\u2F12"=>"\u529B", "\u2F13"=>"\u52F9", "\u2F14"=>"\u5315", "\u2F15"=>"\u531A", "\u2F16"=>"\u5338", "\u2F17"=>"\u5341",
+    "\u2F18"=>"\u535C", "\u2F19"=>"\u5369", "\u2F1A"=>"\u5382", "\u2F1B"=>"\u53B6", "\u2F1C"=>"\u53C8", "\u2F1D"=>"\u53E3", "\u2F1E"=>"\u56D7", "\u2F1F"=>"\u571F",
+    "\u2F20"=>"\u58EB", "\u2F21"=>"\u5902", "\u2F22"=>"\u590A", "\u2F23"=>"\u5915", "\u2F24"=>"\u5927", "\u2F25"=>"\u5973", "\u2F26"=>"\u5B50", "\u2F27"=>"\u5B80",
+    "\u2F28"=>"\u5BF8", "\u2F29"=>"\u5C0F", "\u2F2A"=>"\u5C22", "\u2F2B"=>"\u5C38", "\u2F2C"=>"\u5C6E", "\u2F2D"=>"\u5C71", "\u2F2E"=>"\u5DDB", "\u2F2F"=>"\u5DE5",
+    "\u2F30"=>"\u5DF1", "\u2F31"=>"\u5DFE", "\u2F32"=>"\u5E72", "\u2F33"=>"\u5E7A", "\u2F34"=>"\u5E7F", "\u2F35"=>"\u5EF4", "\u2F36"=>"\u5EFE", "\u2F37"=>"\u5F0B",
+    "\u2F38"=>"\u5F13", "\u2F39"=>"\u5F50", "\u2F3A"=>"\u5F61", "\u2F3B"=>"\u5F73", "\u2F3C"=>"\u5FC3", "\u2F3D"=>"\u6208", "\u2F3E"=>"\u6236", "\u2F3F"=>"\u624B",
+    "\u2F40"=>"\u652F", "\u2F41"=>"\u6534", "\u2F42"=>"\u6587", "\u2F43"=>"\u6597", "\u2F44"=>"\u65A4", "\u2F45"=>"\u65B9", "\u2F46"=>"\u65E0", "\u2F47"=>"\u65E5",
+    "\u2F48"=>"\u66F0", "\u2F49"=>"\u6708", "\u2F4A"=>"\u6728", "\u2F4B"=>"\u6B20", "\u2F4C"=>"\u6B62", "\u2F4D"=>"\u6B79", "\u2F4E"=>"\u6BB3", "\u2F4F"=>"\u6BCB",
+    "\u2F50"=>"\u6BD4", "\u2F51"=>"\u6BDB", "\u2F52"=>"\u6C0F", "\u2F53"=>"\u6C14", "\u2F54"=>"\u6C34", "\u2F55"=>"\u706B", "\u2F56"=>"\u722A", "\u2F57"=>"\u7236",
+    "\u2F58"=>"\u723B", "\u2F59"=>"\u723F", "\u2F5A"=>"\u7247", "\u2F5B"=>"\u7259", "\u2F5C"=>"\u725B", "\u2F5D"=>"\u72AC", "\u2F5E"=>"\u7384", "\u2F5F"=>"\u7389",
+    "\u2F60"=>"\u74DC", "\u2F61"=>"\u74E6", "\u2F62"=>"\u7518", "\u2F63"=>"\u751F", "\u2F64"=>"\u7528", "\u2F65"=>"\u7530", "\u2F66"=>"\u758B", "\u2F67"=>"\u7592",
+    "\u2F68"=>"\u7676", "\u2F69"=>"\u767D", "\u2F6A"=>"\u76AE", "\u2F6B"=>"\u76BF", "\u2F6C"=>"\u76EE", "\u2F6D"=>"\u77DB", "\u2F6E"=>"\u77E2", "\u2F6F"=>"\u77F3",
+    "\u2F70"=>"\u793A", "\u2F71"=>"\u79B8", "\u2F72"=>"\u79BE", "\u2F73"=>"\u7A74", "\u2F74"=>"\u7ACB", "\u2F75"=>"\u7AF9", "\u2F76"=>"\u7C73", "\u2F77"=>"\u7CF8",
+    "\u2F78"=>"\u7F36", "\u2F79"=>"\u7F51", "\u2F7A"=>"\u7F8A", "\u2F7B"=>"\u7FBD", "\u2F7C"=>"\u8001", "\u2F7D"=>"\u800C", "\u2F7E"=>"\u8012", "\u2F7F"=>"\u8033",
+    "\u2F80"=>"\u807F", "\u2F81"=>"\u8089", "\u2F82"=>"\u81E3", "\u2F83"=>"\u81EA", "\u2F84"=>"\u81F3", "\u2F85"=>"\u81FC", "\u2F86"=>"\u820C", "\u2F87"=>"\u821B",
+    "\u2F88"=>"\u821F", "\u2F89"=>"\u826E", "\u2F8A"=>"\u8272", "\u2F8B"=>"\u8278", "\u2F8C"=>"\u864D", "\u2F8D"=>"\u866B", "\u2F8E"=>"\u8840", "\u2F8F"=>"\u884C",
+    "\u2F90"=>"\u8863", "\u2F91"=>"\u897E", "\u2F92"=>"\u898B", "\u2F93"=>"\u89D2", "\u2F94"=>"\u8A00", "\u2F95"=>"\u8C37", "\u2F96"=>"\u8C46", "\u2F97"=>"\u8C55",
+    "\u2F98"=>"\u8C78", "\u2F99"=>"\u8C9D", "\u2F9A"=>"\u8D64", "\u2F9B"=>"\u8D70", "\u2F9C"=>"\u8DB3", "\u2F9D"=>"\u8EAB", "\u2F9E"=>"\u8ECA", "\u2F9F"=>"\u8F9B",
+    "\u2FA0"=>"\u8FB0", "\u2FA1"=>"\u8FB5", "\u2FA2"=>"\u9091", "\u2FA3"=>"\u9149", "\u2FA4"=>"\u91C6", "\u2FA5"=>"\u91CC", "\u2FA6"=>"\u91D1", "\u2FA7"=>"\u9577",
+    "\u2FA8"=>"\u9580", "\u2FA9"=>"\u961C", "\u2FAA"=>"\u96B6", "\u2FAB"=>"\u96B9", "\u2FAC"=>"\u96E8", "\u2FAD"=>"\u9751", "\u2FAE"=>"\u975E", "\u2FAF"=>"\u9762",
+    "\u2FB0"=>"\u9769", "\u2FB1"=>"\u97CB", "\u2FB2"=>"\u97ED", "\u2FB3"=>"\u97F3", "\u2FB4"=>"\u9801", "\u2FB5"=>"\u98A8", "\u2FB6"=>"\u98DB", "\u2FB7"=>"\u98DF",
+    "\u2FB8"=>"\u9996", "\u2FB9"=>"\u9999", "\u2FBA"=>"\u99AC", "\u2FBB"=>"\u9AA8", "\u2FBC"=>"\u9AD8", "\u2FBD"=>"\u9ADF", "\u2FBE"=>"\u9B25", "\u2FBF"=>"\u9B2F",
+    "\u2FC0"=>"\u9B32", "\u2FC1"=>"\u9B3C", "\u2FC2"=>"\u9B5A", "\u2FC3"=>"\u9CE5", "\u2FC4"=>"\u9E75", "\u2FC5"=>"\u9E7F", "\u2FC6"=>"\u9EA5", "\u2FC7"=>"\u9EBB",
+    "\u2FC8"=>"\u9EC3", "\u2FC9"=>"\u9ECD", "\u2FCA"=>"\u9ED1", "\u2FCB"=>"\u9EF9", "\u2FCC"=>"\u9EFD", "\u2FCD"=>"\u9F0E", "\u2FCE"=>"\u9F13", "\u2FCF"=>"\u9F20",
+    "\u2FD0"=>"\u9F3B", "\u2FD1"=>"\u9F4A", "\u2FD2"=>"\u9F52", "\u2FD3"=>"\u9F8D", "\u2FD4"=>"\u9F9C", "\u2FD5"=>"\u9FA0", "\u3000"=>" ", "\u3036"=>"\u3012",
+    "\u3038"=>"\u5341", "\u3039"=>"\u5344", "\u303A"=>"\u5345", "\u309B"=>" \u3099", "\u309C"=>" \u309A", "\u309F"=>"\u3088\u308A", "\u30FF"=>"\u30B3\u30C8", "\u3131"=>"\u1100",
+    "\u3132"=>"\u1101", "\u3133"=>"\u11AA", "\u3134"=>"\u1102", "\u3135"=>"\u11AC", "\u3136"=>"\u11AD", "\u3137"=>"\u1103", "\u3138"=>"\u1104", "\u3139"=>"\u1105",
+    "\u313A"=>"\u11B0", "\u313B"=>"\u11B1", "\u313C"=>"\u11B2", "\u313D"=>"\u11B3", "\u313E"=>"\u11B4", "\u313F"=>"\u11B5", "\u3140"=>"\u111A", "\u3141"=>"\u1106",
+    "\u3142"=>"\u1107", "\u3143"=>"\u1108", "\u3144"=>"\u1121", "\u3145"=>"\u1109", "\u3146"=>"\u110A", "\u3147"=>"\u110B", "\u3148"=>"\u110C", "\u3149"=>"\u110D",
+    "\u314A"=>"\u110E", "\u314B"=>"\u110F", "\u314C"=>"\u1110", "\u314D"=>"\u1111", "\u314E"=>"\u1112", "\u314F"=>"\u1161", "\u3150"=>"\u1162", "\u3151"=>"\u1163",
+    "\u3152"=>"\u1164", "\u3153"=>"\u1165", "\u3154"=>"\u1166", "\u3155"=>"\u1167", "\u3156"=>"\u1168", "\u3157"=>"\u1169", "\u3158"=>"\u116A", "\u3159"=>"\u116B",
+    "\u315A"=>"\u116C", "\u315B"=>"\u116D", "\u315C"=>"\u116E", "\u315D"=>"\u116F", "\u315E"=>"\u1170", "\u315F"=>"\u1171", "\u3160"=>"\u1172", "\u3161"=>"\u1173",
+    "\u3162"=>"\u1174", "\u3163"=>"\u1175", "\u3164"=>"\u1160", "\u3165"=>"\u1114", "\u3166"=>"\u1115", "\u3167"=>"\u11C7", "\u3168"=>"\u11C8", "\u3169"=>"\u11CC",
+    "\u316A"=>"\u11CE", "\u316B"=>"\u11D3", "\u316C"=>"\u11D7", "\u316D"=>"\u11D9", "\u316E"=>"\u111C", "\u316F"=>"\u11DD", "\u3170"=>"\u11DF", "\u3171"=>"\u111D",
+    "\u3172"=>"\u111E", "\u3173"=>"\u1120", "\u3174"=>"\u1122", "\u3175"=>"\u1123", "\u3176"=>"\u1127", "\u3177"=>"\u1129", "\u3178"=>"\u112B", "\u3179"=>"\u112C",
+    "\u317A"=>"\u112D", "\u317B"=>"\u112E", "\u317C"=>"\u112F", "\u317D"=>"\u1132", "\u317E"=>"\u1136", "\u317F"=>"\u1140", "\u3180"=>"\u1147", "\u3181"=>"\u114C",
+    "\u3182"=>"\u11F1", "\u3183"=>"\u11F2", "\u3184"=>"\u1157", "\u3185"=>"\u1158", "\u3186"=>"\u1159", "\u3187"=>"\u1184", "\u3188"=>"\u1185", "\u3189"=>"\u1188",
+    "\u318A"=>"\u1191", "\u318B"=>"\u1192", "\u318C"=>"\u1194", "\u318D"=>"\u119E", "\u318E"=>"\u11A1", "\u3192"=>"\u4E00", "\u3193"=>"\u4E8C", "\u3194"=>"\u4E09",
+    "\u3195"=>"\u56DB", "\u3196"=>"\u4E0A", "\u3197"=>"\u4E2D", "\u3198"=>"\u4E0B", "\u3199"=>"\u7532", "\u319A"=>"\u4E59", "\u319B"=>"\u4E19", "\u319C"=>"\u4E01",
+    "\u319D"=>"\u5929", "\u319E"=>"\u5730", "\u319F"=>"\u4EBA", "\u3200"=>"(\u1100)", "\u3201"=>"(\u1102)", "\u3202"=>"(\u1103)", "\u3203"=>"(\u1105)", "\u3204"=>"(\u1106)",
+    "\u3205"=>"(\u1107)", "\u3206"=>"(\u1109)", "\u3207"=>"(\u110B)", "\u3208"=>"(\u110C)", "\u3209"=>"(\u110E)", "\u320A"=>"(\u110F)", "\u320B"=>"(\u1110)", "\u320C"=>"(\u1111)",
+    "\u320D"=>"(\u1112)", "\u320E"=>"(\u1100\u1161)", "\u320F"=>"(\u1102\u1161)", "\u3210"=>"(\u1103\u1161)", "\u3211"=>"(\u1105\u1161)", "\u3212"=>"(\u1106\u1161)", "\u3213"=>"(\u1107\u1161)", "\u3214"=>"(\u1109\u1161)",
+    "\u3215"=>"(\u110B\u1161)", "\u3216"=>"(\u110C\u1161)", "\u3217"=>"(\u110E\u1161)", "\u3218"=>"(\u110F\u1161)", "\u3219"=>"(\u1110\u1161)", "\u321A"=>"(\u1111\u1161)", "\u321B"=>"(\u1112\u1161)", "\u321C"=>"(\u110C\u116E)",
+    "\u321D"=>"(\u110B\u1169\u110C\u1165\u11AB)", "\u321E"=>"(\u110B\u1169\u1112\u116E)", "\u3220"=>"(\u4E00)", "\u3221"=>"(\u4E8C)", "\u3222"=>"(\u4E09)", "\u3223"=>"(\u56DB)", "\u3224"=>"(\u4E94)", "\u3225"=>"(\u516D)",
+    "\u3226"=>"(\u4E03)", "\u3227"=>"(\u516B)", "\u3228"=>"(\u4E5D)", "\u3229"=>"(\u5341)", "\u322A"=>"(\u6708)", "\u322B"=>"(\u706B)", "\u322C"=>"(\u6C34)", "\u322D"=>"(\u6728)",
+    "\u322E"=>"(\u91D1)", "\u322F"=>"(\u571F)", "\u3230"=>"(\u65E5)", "\u3231"=>"(\u682A)", "\u3232"=>"(\u6709)", "\u3233"=>"(\u793E)", "\u3234"=>"(\u540D)", "\u3235"=>"(\u7279)",
+    "\u3236"=>"(\u8CA1)", "\u3237"=>"(\u795D)", "\u3238"=>"(\u52B4)", "\u3239"=>"(\u4EE3)", "\u323A"=>"(\u547C)", "\u323B"=>"(\u5B66)", "\u323C"=>"(\u76E3)", "\u323D"=>"(\u4F01)",
+    "\u323E"=>"(\u8CC7)", "\u323F"=>"(\u5354)", "\u3240"=>"(\u796D)", "\u3241"=>"(\u4F11)", "\u3242"=>"(\u81EA)", "\u3243"=>"(\u81F3)", "\u3244"=>"\u554F", "\u3245"=>"\u5E7C",
+    "\u3246"=>"\u6587", "\u3247"=>"\u7B8F", "\u3250"=>"PTE", "\u3251"=>"21", "\u3252"=>"22", "\u3253"=>"23", "\u3254"=>"24", "\u3255"=>"25",
+    "\u3256"=>"26", "\u3257"=>"27", "\u3258"=>"28", "\u3259"=>"29", "\u325A"=>"30", "\u325B"=>"31", "\u325C"=>"32", "\u325D"=>"33",
+    "\u325E"=>"34", "\u325F"=>"35", "\u3260"=>"\u1100", "\u3261"=>"\u1102", "\u3262"=>"\u1103", "\u3263"=>"\u1105", "\u3264"=>"\u1106", "\u3265"=>"\u1107",
+    "\u3266"=>"\u1109", "\u3267"=>"\u110B", "\u3268"=>"\u110C", "\u3269"=>"\u110E", "\u326A"=>"\u110F", "\u326B"=>"\u1110", "\u326C"=>"\u1111", "\u326D"=>"\u1112",
+    "\u326E"=>"\u1100\u1161", "\u326F"=>"\u1102\u1161", "\u3270"=>"\u1103\u1161", "\u3271"=>"\u1105\u1161", "\u3272"=>"\u1106\u1161", "\u3273"=>"\u1107\u1161", "\u3274"=>"\u1109\u1161", "\u3275"=>"\u110B\u1161",
+    "\u3276"=>"\u110C\u1161", "\u3277"=>"\u110E\u1161", "\u3278"=>"\u110F\u1161", "\u3279"=>"\u1110\u1161", "\u327A"=>"\u1111\u1161", "\u327B"=>"\u1112\u1161", "\u327C"=>"\u110E\u1161\u11B7\u1100\u1169", "\u327D"=>"\u110C\u116E\u110B\u1174",
+    "\u327E"=>"\u110B\u116E", "\u3280"=>"\u4E00", "\u3281"=>"\u4E8C", "\u3282"=>"\u4E09", "\u3283"=>"\u56DB", "\u3284"=>"\u4E94", "\u3285"=>"\u516D", "\u3286"=>"\u4E03",
+    "\u3287"=>"\u516B", "\u3288"=>"\u4E5D", "\u3289"=>"\u5341", "\u328A"=>"\u6708", "\u328B"=>"\u706B", "\u328C"=>"\u6C34", "\u328D"=>"\u6728", "\u328E"=>"\u91D1",
+    "\u328F"=>"\u571F", "\u3290"=>"\u65E5", "\u3291"=>"\u682A", "\u3292"=>"\u6709", "\u3293"=>"\u793E", "\u3294"=>"\u540D", "\u3295"=>"\u7279", "\u3296"=>"\u8CA1",
+    "\u3297"=>"\u795D", "\u3298"=>"\u52B4", "\u3299"=>"\u79D8", "\u329A"=>"\u7537", "\u329B"=>"\u5973", "\u329C"=>"\u9069", "\u329D"=>"\u512A", "\u329E"=>"\u5370",
+    "\u329F"=>"\u6CE8", "\u32A0"=>"\u9805", "\u32A1"=>"\u4F11", "\u32A2"=>"\u5199", "\u32A3"=>"\u6B63", "\u32A4"=>"\u4E0A", "\u32A5"=>"\u4E2D", "\u32A6"=>"\u4E0B",
+    "\u32A7"=>"\u5DE6", "\u32A8"=>"\u53F3", "\u32A9"=>"\u533B", "\u32AA"=>"\u5B97", "\u32AB"=>"\u5B66", "\u32AC"=>"\u76E3", "\u32AD"=>"\u4F01", "\u32AE"=>"\u8CC7",
+    "\u32AF"=>"\u5354", "\u32B0"=>"\u591C", "\u32B1"=>"36", "\u32B2"=>"37", "\u32B3"=>"38", "\u32B4"=>"39", "\u32B5"=>"40", "\u32B6"=>"41",
+    "\u32B7"=>"42", "\u32B8"=>"43", "\u32B9"=>"44", "\u32BA"=>"45", "\u32BB"=>"46", "\u32BC"=>"47", "\u32BD"=>"48", "\u32BE"=>"49",
+    "\u32BF"=>"50", "\u32C0"=>"1\u6708", "\u32C1"=>"2\u6708", "\u32C2"=>"3\u6708", "\u32C3"=>"4\u6708", "\u32C4"=>"5\u6708", "\u32C5"=>"6\u6708", "\u32C6"=>"7\u6708",
+    "\u32C7"=>"8\u6708", "\u32C8"=>"9\u6708", "\u32C9"=>"10\u6708", "\u32CA"=>"11\u6708", "\u32CB"=>"12\u6708", "\u32CC"=>"Hg", "\u32CD"=>"erg", "\u32CE"=>"eV",
+    "\u32CF"=>"LTD", "\u32D0"=>"\u30A2", "\u32D1"=>"\u30A4", "\u32D2"=>"\u30A6", "\u32D3"=>"\u30A8", "\u32D4"=>"\u30AA", "\u32D5"=>"\u30AB", "\u32D6"=>"\u30AD",
+    "\u32D7"=>"\u30AF", "\u32D8"=>"\u30B1", "\u32D9"=>"\u30B3", "\u32DA"=>"\u30B5", "\u32DB"=>"\u30B7", "\u32DC"=>"\u30B9", "\u32DD"=>"\u30BB", "\u32DE"=>"\u30BD",
+    "\u32DF"=>"\u30BF", "\u32E0"=>"\u30C1", "\u32E1"=>"\u30C4", "\u32E2"=>"\u30C6", "\u32E3"=>"\u30C8", "\u32E4"=>"\u30CA", "\u32E5"=>"\u30CB", "\u32E6"=>"\u30CC",
+    "\u32E7"=>"\u30CD", "\u32E8"=>"\u30CE", "\u32E9"=>"\u30CF", "\u32EA"=>"\u30D2", "\u32EB"=>"\u30D5", "\u32EC"=>"\u30D8", "\u32ED"=>"\u30DB", "\u32EE"=>"\u30DE",
+    "\u32EF"=>"\u30DF", "\u32F0"=>"\u30E0", "\u32F1"=>"\u30E1", "\u32F2"=>"\u30E2", "\u32F3"=>"\u30E4", "\u32F4"=>"\u30E6", "\u32F5"=>"\u30E8", "\u32F6"=>"\u30E9",
+    "\u32F7"=>"\u30EA", "\u32F8"=>"\u30EB", "\u32F9"=>"\u30EC", "\u32FA"=>"\u30ED", "\u32FB"=>"\u30EF", "\u32FC"=>"\u30F0", "\u32FD"=>"\u30F1", "\u32FE"=>"\u30F2",
+    "\u3300"=>"\u30A2\u30D1\u30FC\u30C8", "\u3301"=>"\u30A2\u30EB\u30D5\u30A1", "\u3302"=>"\u30A2\u30F3\u30DA\u30A2", "\u3303"=>"\u30A2\u30FC\u30EB", "\u3304"=>"\u30A4\u30CB\u30F3\u30B0", "\u3305"=>"\u30A4\u30F3\u30C1", "\u3306"=>"\u30A6\u30A9\u30F3", "\u3307"=>"\u30A8\u30B9\u30AF\u30FC\u30C9",
+    "\u3308"=>"\u30A8\u30FC\u30AB\u30FC", "\u3309"=>"\u30AA\u30F3\u30B9", "\u330A"=>"\u30AA\u30FC\u30E0", "\u330B"=>"\u30AB\u30A4\u30EA", "\u330C"=>"\u30AB\u30E9\u30C3\u30C8", "\u330D"=>"\u30AB\u30ED\u30EA\u30FC", "\u330E"=>"\u30AC\u30ED\u30F3", "\u330F"=>"\u30AC\u30F3\u30DE",
+    "\u3310"=>"\u30AE\u30AC", "\u3311"=>"\u30AE\u30CB\u30FC", "\u3312"=>"\u30AD\u30E5\u30EA\u30FC", "\u3313"=>"\u30AE\u30EB\u30C0\u30FC", "\u3314"=>"\u30AD\u30ED", "\u3315"=>"\u30AD\u30ED\u30B0\u30E9\u30E0", "\u3316"=>"\u30AD\u30ED\u30E1\u30FC\u30C8\u30EB", "\u3317"=>"\u30AD\u30ED\u30EF\u30C3\u30C8",
+    "\u3318"=>"\u30B0\u30E9\u30E0", "\u3319"=>"\u30B0\u30E9\u30E0\u30C8\u30F3", "\u331A"=>"\u30AF\u30EB\u30BC\u30A4\u30ED", "\u331B"=>"\u30AF\u30ED\u30FC\u30CD", "\u331C"=>"\u30B1\u30FC\u30B9", "\u331D"=>"\u30B3\u30EB\u30CA", "\u331E"=>"\u30B3\u30FC\u30DD", "\u331F"=>"\u30B5\u30A4\u30AF\u30EB",
+    "\u3320"=>"\u30B5\u30F3\u30C1\u30FC\u30E0", "\u3321"=>"\u30B7\u30EA\u30F3\u30B0", "\u3322"=>"\u30BB\u30F3\u30C1", "\u3323"=>"\u30BB\u30F3\u30C8", "\u3324"=>"\u30C0\u30FC\u30B9", "\u3325"=>"\u30C7\u30B7", "\u3326"=>"\u30C9\u30EB", "\u3327"=>"\u30C8\u30F3",
+    "\u3328"=>"\u30CA\u30CE", "\u3329"=>"\u30CE\u30C3\u30C8", "\u332A"=>"\u30CF\u30A4\u30C4", "\u332B"=>"\u30D1\u30FC\u30BB\u30F3\u30C8", "\u332C"=>"\u30D1\u30FC\u30C4", "\u332D"=>"\u30D0\u30FC\u30EC\u30EB", "\u332E"=>"\u30D4\u30A2\u30B9\u30C8\u30EB", "\u332F"=>"\u30D4\u30AF\u30EB",
+    "\u3330"=>"\u30D4\u30B3", "\u3331"=>"\u30D3\u30EB", "\u3332"=>"\u30D5\u30A1\u30E9\u30C3\u30C9", "\u3333"=>"\u30D5\u30A3\u30FC\u30C8", "\u3334"=>"\u30D6\u30C3\u30B7\u30A7\u30EB", "\u3335"=>"\u30D5\u30E9\u30F3", "\u3336"=>"\u30D8\u30AF\u30BF\u30FC\u30EB", "\u3337"=>"\u30DA\u30BD",
+    "\u3338"=>"\u30DA\u30CB\u30D2", "\u3339"=>"\u30D8\u30EB\u30C4", "\u333A"=>"\u30DA\u30F3\u30B9", "\u333B"=>"\u30DA\u30FC\u30B8", "\u333C"=>"\u30D9\u30FC\u30BF", "\u333D"=>"\u30DD\u30A4\u30F3\u30C8", "\u333E"=>"\u30DC\u30EB\u30C8", "\u333F"=>"\u30DB\u30F3",
+    "\u3340"=>"\u30DD\u30F3\u30C9", "\u3341"=>"\u30DB\u30FC\u30EB", "\u3342"=>"\u30DB\u30FC\u30F3", "\u3343"=>"\u30DE\u30A4\u30AF\u30ED", "\u3344"=>"\u30DE\u30A4\u30EB", "\u3345"=>"\u30DE\u30C3\u30CF", "\u3346"=>"\u30DE\u30EB\u30AF", "\u3347"=>"\u30DE\u30F3\u30B7\u30E7\u30F3",
+    "\u3348"=>"\u30DF\u30AF\u30ED\u30F3", "\u3349"=>"\u30DF\u30EA", "\u334A"=>"\u30DF\u30EA\u30D0\u30FC\u30EB", "\u334B"=>"\u30E1\u30AC", "\u334C"=>"\u30E1\u30AC\u30C8\u30F3", "\u334D"=>"\u30E1\u30FC\u30C8\u30EB", "\u334E"=>"\u30E4\u30FC\u30C9", "\u334F"=>"\u30E4\u30FC\u30EB",
+    "\u3350"=>"\u30E6\u30A2\u30F3", "\u3351"=>"\u30EA\u30C3\u30C8\u30EB", "\u3352"=>"\u30EA\u30E9", "\u3353"=>"\u30EB\u30D4\u30FC", "\u3354"=>"\u30EB\u30FC\u30D6\u30EB", "\u3355"=>"\u30EC\u30E0", "\u3356"=>"\u30EC\u30F3\u30C8\u30B2\u30F3", "\u3357"=>"\u30EF\u30C3\u30C8",
+    "\u3358"=>"0\u70B9", "\u3359"=>"1\u70B9", "\u335A"=>"2\u70B9", "\u335B"=>"3\u70B9", "\u335C"=>"4\u70B9", "\u335D"=>"5\u70B9", "\u335E"=>"6\u70B9", "\u335F"=>"7\u70B9",
+    "\u3360"=>"8\u70B9", "\u3361"=>"9\u70B9", "\u3362"=>"10\u70B9", "\u3363"=>"11\u70B9", "\u3364"=>"12\u70B9", "\u3365"=>"13\u70B9", "\u3366"=>"14\u70B9", "\u3367"=>"15\u70B9",
+    "\u3368"=>"16\u70B9", "\u3369"=>"17\u70B9", "\u336A"=>"18\u70B9", "\u336B"=>"19\u70B9", "\u336C"=>"20\u70B9", "\u336D"=>"21\u70B9", "\u336E"=>"22\u70B9", "\u336F"=>"23\u70B9",
+    "\u3370"=>"24\u70B9", "\u3371"=>"hPa", "\u3372"=>"da", "\u3373"=>"AU", "\u3374"=>"bar", "\u3375"=>"oV", "\u3376"=>"pc", "\u3377"=>"dm",
+    "\u3378"=>"dm2", "\u3379"=>"dm3", "\u337A"=>"IU", "\u337B"=>"\u5E73\u6210", "\u337C"=>"\u662D\u548C", "\u337D"=>"\u5927\u6B63", "\u337E"=>"\u660E\u6CBB", "\u337F"=>"\u682A\u5F0F\u4F1A\u793E",
+    "\u3380"=>"pA", "\u3381"=>"nA", "\u3382"=>"\u03BCA", "\u3383"=>"mA", "\u3384"=>"kA", "\u3385"=>"KB", "\u3386"=>"MB", "\u3387"=>"GB",
+    "\u3388"=>"cal", "\u3389"=>"kcal", "\u338A"=>"pF", "\u338B"=>"nF", "\u338C"=>"\u03BCF", "\u338D"=>"\u03BCg", "\u338E"=>"mg", "\u338F"=>"kg",
+    "\u3390"=>"Hz", "\u3391"=>"kHz", "\u3392"=>"MHz", "\u3393"=>"GHz", "\u3394"=>"THz", "\u3395"=>"\u03BCl", "\u3396"=>"ml", "\u3397"=>"dl",
+    "\u3398"=>"kl", "\u3399"=>"fm", "\u339A"=>"nm", "\u339B"=>"\u03BCm", "\u339C"=>"mm", "\u339D"=>"cm", "\u339E"=>"km", "\u339F"=>"mm2",
+    "\u33A0"=>"cm2", "\u33A1"=>"m2", "\u33A2"=>"km2", "\u33A3"=>"mm3", "\u33A4"=>"cm3", "\u33A5"=>"m3", "\u33A6"=>"km3", "\u33A7"=>"m\u2215s",
+    "\u33A8"=>"m\u2215s2", "\u33A9"=>"Pa", "\u33AA"=>"kPa", "\u33AB"=>"MPa", "\u33AC"=>"GPa", "\u33AD"=>"rad", "\u33AE"=>"rad\u2215s", "\u33AF"=>"rad\u2215s2",
+    "\u33B0"=>"ps", "\u33B1"=>"ns", "\u33B2"=>"\u03BCs", "\u33B3"=>"ms", "\u33B4"=>"pV", "\u33B5"=>"nV", "\u33B6"=>"\u03BCV", "\u33B7"=>"mV",
+    "\u33B8"=>"kV", "\u33B9"=>"MV", "\u33BA"=>"pW", "\u33BB"=>"nW", "\u33BC"=>"\u03BCW", "\u33BD"=>"mW", "\u33BE"=>"kW", "\u33BF"=>"MW",
+    "\u33C0"=>"k\u03A9", "\u33C1"=>"M\u03A9", "\u33C2"=>"a.m.", "\u33C3"=>"Bq", "\u33C4"=>"cc", "\u33C5"=>"cd", "\u33C6"=>"C\u2215kg", "\u33C7"=>"Co.",
+    "\u33C8"=>"dB", "\u33C9"=>"Gy", "\u33CA"=>"ha", "\u33CB"=>"HP", "\u33CC"=>"in", "\u33CD"=>"KK", "\u33CE"=>"KM", "\u33CF"=>"kt",
+    "\u33D0"=>"lm", "\u33D1"=>"ln", "\u33D2"=>"log", "\u33D3"=>"lx", "\u33D4"=>"mb", "\u33D5"=>"mil", "\u33D6"=>"mol", "\u33D7"=>"PH",
+    "\u33D8"=>"p.m.", "\u33D9"=>"PPM", "\u33DA"=>"PR", "\u33DB"=>"sr", "\u33DC"=>"Sv", "\u33DD"=>"Wb", "\u33DE"=>"V\u2215m", "\u33DF"=>"A\u2215m",
+    "\u33E0"=>"1\u65E5", "\u33E1"=>"2\u65E5", "\u33E2"=>"3\u65E5", "\u33E3"=>"4\u65E5", "\u33E4"=>"5\u65E5", "\u33E5"=>"6\u65E5", "\u33E6"=>"7\u65E5", "\u33E7"=>"8\u65E5",
+    "\u33E8"=>"9\u65E5", "\u33E9"=>"10\u65E5", "\u33EA"=>"11\u65E5", "\u33EB"=>"12\u65E5", "\u33EC"=>"13\u65E5", "\u33ED"=>"14\u65E5", "\u33EE"=>"15\u65E5", "\u33EF"=>"16\u65E5",
+    "\u33F0"=>"17\u65E5", "\u33F1"=>"18\u65E5", "\u33F2"=>"19\u65E5", "\u33F3"=>"20\u65E5", "\u33F4"=>"21\u65E5", "\u33F5"=>"22\u65E5", "\u33F6"=>"23\u65E5", "\u33F7"=>"24\u65E5",
+    "\u33F8"=>"25\u65E5", "\u33F9"=>"26\u65E5", "\u33FA"=>"27\u65E5", "\u33FB"=>"28\u65E5", "\u33FC"=>"29\u65E5", "\u33FD"=>"30\u65E5", "\u33FE"=>"31\u65E5", "\u33FF"=>"gal",
+    "\uA69C"=>"\u044A", "\uA69D"=>"\u044C", "\uA770"=>"\uA76F", "\uA7F8"=>"\u0126", "\uA7F9"=>"\u0153", "\uAB5C"=>"\uA727", "\uAB5D"=>"\uAB37", "\uAB5E"=>"\u026B",
+    "\uAB5F"=>"\uAB52", "\uFB00"=>"ff", "\uFB01"=>"fi", "\uFB02"=>"fl", "\uFB03"=>"ffi", "\uFB04"=>"ffl", "\uFB05"=>"st", "\uFB06"=>"st",
+    "\uFB13"=>"\u0574\u0576", "\uFB14"=>"\u0574\u0565", "\uFB15"=>"\u0574\u056B", "\uFB16"=>"\u057E\u0576", "\uFB17"=>"\u0574\u056D", "\uFB20"=>"\u05E2", "\uFB21"=>"\u05D0", "\uFB22"=>"\u05D3",
+    "\uFB23"=>"\u05D4", "\uFB24"=>"\u05DB", "\uFB25"=>"\u05DC", "\uFB26"=>"\u05DD", "\uFB27"=>"\u05E8", "\uFB28"=>"\u05EA", "\uFB29"=>"+", "\uFB4F"=>"\u05D0\u05DC",
+    "\uFB50"=>"\u0671", "\uFB51"=>"\u0671", "\uFB52"=>"\u067B", "\uFB53"=>"\u067B", "\uFB54"=>"\u067B", "\uFB55"=>"\u067B", "\uFB56"=>"\u067E", "\uFB57"=>"\u067E",
+    "\uFB58"=>"\u067E", "\uFB59"=>"\u067E", "\uFB5A"=>"\u0680", "\uFB5B"=>"\u0680", "\uFB5C"=>"\u0680", "\uFB5D"=>"\u0680", "\uFB5E"=>"\u067A", "\uFB5F"=>"\u067A",
+    "\uFB60"=>"\u067A", "\uFB61"=>"\u067A", "\uFB62"=>"\u067F", "\uFB63"=>"\u067F", "\uFB64"=>"\u067F", "\uFB65"=>"\u067F", "\uFB66"=>"\u0679", "\uFB67"=>"\u0679",
+    "\uFB68"=>"\u0679", "\uFB69"=>"\u0679", "\uFB6A"=>"\u06A4", "\uFB6B"=>"\u06A4", "\uFB6C"=>"\u06A4", "\uFB6D"=>"\u06A4", "\uFB6E"=>"\u06A6", "\uFB6F"=>"\u06A6",
+    "\uFB70"=>"\u06A6", "\uFB71"=>"\u06A6", "\uFB72"=>"\u0684", "\uFB73"=>"\u0684", "\uFB74"=>"\u0684", "\uFB75"=>"\u0684", "\uFB76"=>"\u0683", "\uFB77"=>"\u0683",
+    "\uFB78"=>"\u0683", "\uFB79"=>"\u0683", "\uFB7A"=>"\u0686", "\uFB7B"=>"\u0686", "\uFB7C"=>"\u0686", "\uFB7D"=>"\u0686", "\uFB7E"=>"\u0687", "\uFB7F"=>"\u0687",
+    "\uFB80"=>"\u0687", "\uFB81"=>"\u0687", "\uFB82"=>"\u068D", "\uFB83"=>"\u068D", "\uFB84"=>"\u068C", "\uFB85"=>"\u068C", "\uFB86"=>"\u068E", "\uFB87"=>"\u068E",
+    "\uFB88"=>"\u0688", "\uFB89"=>"\u0688", "\uFB8A"=>"\u0698", "\uFB8B"=>"\u0698", "\uFB8C"=>"\u0691", "\uFB8D"=>"\u0691", "\uFB8E"=>"\u06A9", "\uFB8F"=>"\u06A9",
+    "\uFB90"=>"\u06A9", "\uFB91"=>"\u06A9", "\uFB92"=>"\u06AF", "\uFB93"=>"\u06AF", "\uFB94"=>"\u06AF", "\uFB95"=>"\u06AF", "\uFB96"=>"\u06B3", "\uFB97"=>"\u06B3",
+    "\uFB98"=>"\u06B3", "\uFB99"=>"\u06B3", "\uFB9A"=>"\u06B1", "\uFB9B"=>"\u06B1", "\uFB9C"=>"\u06B1", "\uFB9D"=>"\u06B1", "\uFB9E"=>"\u06BA", "\uFB9F"=>"\u06BA",
+    "\uFBA0"=>"\u06BB", "\uFBA1"=>"\u06BB", "\uFBA2"=>"\u06BB", "\uFBA3"=>"\u06BB", "\uFBA4"=>"\u06C0", "\uFBA5"=>"\u06C0", "\uFBA6"=>"\u06C1", "\uFBA7"=>"\u06C1",
+    "\uFBA8"=>"\u06C1", "\uFBA9"=>"\u06C1", "\uFBAA"=>"\u06BE", "\uFBAB"=>"\u06BE", "\uFBAC"=>"\u06BE", "\uFBAD"=>"\u06BE", "\uFBAE"=>"\u06D2", "\uFBAF"=>"\u06D2",
+    "\uFBB0"=>"\u06D3", "\uFBB1"=>"\u06D3", "\uFBD3"=>"\u06AD", "\uFBD4"=>"\u06AD", "\uFBD5"=>"\u06AD", "\uFBD6"=>"\u06AD", "\uFBD7"=>"\u06C7", "\uFBD8"=>"\u06C7",
+    "\uFBD9"=>"\u06C6", "\uFBDA"=>"\u06C6", "\uFBDB"=>"\u06C8", "\uFBDC"=>"\u06C8", "\uFBDD"=>"\u06C7\u0674", "\uFBDE"=>"\u06CB", "\uFBDF"=>"\u06CB", "\uFBE0"=>"\u06C5",
+    "\uFBE1"=>"\u06C5", "\uFBE2"=>"\u06C9", "\uFBE3"=>"\u06C9", "\uFBE4"=>"\u06D0", "\uFBE5"=>"\u06D0", "\uFBE6"=>"\u06D0", "\uFBE7"=>"\u06D0", "\uFBE8"=>"\u0649",
+    "\uFBE9"=>"\u0649", "\uFBEA"=>"\u0626\u0627", "\uFBEB"=>"\u0626\u0627", "\uFBEC"=>"\u0626\u06D5", "\uFBED"=>"\u0626\u06D5", "\uFBEE"=>"\u0626\u0648", "\uFBEF"=>"\u0626\u0648", "\uFBF0"=>"\u0626\u06C7",
+    "\uFBF1"=>"\u0626\u06C7", "\uFBF2"=>"\u0626\u06C6", "\uFBF3"=>"\u0626\u06C6", "\uFBF4"=>"\u0626\u06C8", "\uFBF5"=>"\u0626\u06C8", "\uFBF6"=>"\u0626\u06D0", "\uFBF7"=>"\u0626\u06D0", "\uFBF8"=>"\u0626\u06D0",
+    "\uFBF9"=>"\u0626\u0649", "\uFBFA"=>"\u0626\u0649", "\uFBFB"=>"\u0626\u0649", "\uFBFC"=>"\u06CC", "\uFBFD"=>"\u06CC", "\uFBFE"=>"\u06CC", "\uFBFF"=>"\u06CC", "\uFC00"=>"\u0626\u062C",
+    "\uFC01"=>"\u0626\u062D", "\uFC02"=>"\u0626\u0645", "\uFC03"=>"\u0626\u0649", "\uFC04"=>"\u0626\u064A", "\uFC05"=>"\u0628\u062C", "\uFC06"=>"\u0628\u062D", "\uFC07"=>"\u0628\u062E", "\uFC08"=>"\u0628\u0645",
+    "\uFC09"=>"\u0628\u0649", "\uFC0A"=>"\u0628\u064A", "\uFC0B"=>"\u062A\u062C", "\uFC0C"=>"\u062A\u062D", "\uFC0D"=>"\u062A\u062E", "\uFC0E"=>"\u062A\u0645", "\uFC0F"=>"\u062A\u0649", "\uFC10"=>"\u062A\u064A",
+    "\uFC11"=>"\u062B\u062C", "\uFC12"=>"\u062B\u0645", "\uFC13"=>"\u062B\u0649", "\uFC14"=>"\u062B\u064A", "\uFC15"=>"\u062C\u062D", "\uFC16"=>"\u062C\u0645", "\uFC17"=>"\u062D\u062C", "\uFC18"=>"\u062D\u0645",
+    "\uFC19"=>"\u062E\u062C", "\uFC1A"=>"\u062E\u062D", "\uFC1B"=>"\u062E\u0645", "\uFC1C"=>"\u0633\u062C", "\uFC1D"=>"\u0633\u062D", "\uFC1E"=>"\u0633\u062E", "\uFC1F"=>"\u0633\u0645", "\uFC20"=>"\u0635\u062D",
+    "\uFC21"=>"\u0635\u0645", "\uFC22"=>"\u0636\u062C", "\uFC23"=>"\u0636\u062D", "\uFC24"=>"\u0636\u062E", "\uFC25"=>"\u0636\u0645", "\uFC26"=>"\u0637\u062D", "\uFC27"=>"\u0637\u0645", "\uFC28"=>"\u0638\u0645",
+    "\uFC29"=>"\u0639\u062C", "\uFC2A"=>"\u0639\u0645", "\uFC2B"=>"\u063A\u062C", "\uFC2C"=>"\u063A\u0645", "\uFC2D"=>"\u0641\u062C", "\uFC2E"=>"\u0641\u062D", "\uFC2F"=>"\u0641\u062E", "\uFC30"=>"\u0641\u0645",
+    "\uFC31"=>"\u0641\u0649", "\uFC32"=>"\u0641\u064A", "\uFC33"=>"\u0642\u062D", "\uFC34"=>"\u0642\u0645", "\uFC35"=>"\u0642\u0649", "\uFC36"=>"\u0642\u064A", "\uFC37"=>"\u0643\u0627", "\uFC38"=>"\u0643\u062C",
+    "\uFC39"=>"\u0643\u062D", "\uFC3A"=>"\u0643\u062E", "\uFC3B"=>"\u0643\u0644", "\uFC3C"=>"\u0643\u0645", "\uFC3D"=>"\u0643\u0649", "\uFC3E"=>"\u0643\u064A", "\uFC3F"=>"\u0644\u062C", "\uFC40"=>"\u0644\u062D",
+    "\uFC41"=>"\u0644\u062E", "\uFC42"=>"\u0644\u0645", "\uFC43"=>"\u0644\u0649", "\uFC44"=>"\u0644\u064A", "\uFC45"=>"\u0645\u062C", "\uFC46"=>"\u0645\u062D", "\uFC47"=>"\u0645\u062E", "\uFC48"=>"\u0645\u0645",
+    "\uFC49"=>"\u0645\u0649", "\uFC4A"=>"\u0645\u064A", "\uFC4B"=>"\u0646\u062C", "\uFC4C"=>"\u0646\u062D", "\uFC4D"=>"\u0646\u062E", "\uFC4E"=>"\u0646\u0645", "\uFC4F"=>"\u0646\u0649", "\uFC50"=>"\u0646\u064A",
+    "\uFC51"=>"\u0647\u062C", "\uFC52"=>"\u0647\u0645", "\uFC53"=>"\u0647\u0649", "\uFC54"=>"\u0647\u064A", "\uFC55"=>"\u064A\u062C", "\uFC56"=>"\u064A\u062D", "\uFC57"=>"\u064A\u062E", "\uFC58"=>"\u064A\u0645",
+    "\uFC59"=>"\u064A\u0649", "\uFC5A"=>"\u064A\u064A", "\uFC5B"=>"\u0630\u0670", "\uFC5C"=>"\u0631\u0670", "\uFC5D"=>"\u0649\u0670", "\uFC5E"=>" \u064C\u0651", "\uFC5F"=>" \u064D\u0651", "\uFC60"=>" \u064E\u0651",
+    "\uFC61"=>" \u064F\u0651", "\uFC62"=>" \u0650\u0651", "\uFC63"=>" \u0651\u0670", "\uFC64"=>"\u0626\u0631", "\uFC65"=>"\u0626\u0632", "\uFC66"=>"\u0626\u0645", "\uFC67"=>"\u0626\u0646", "\uFC68"=>"\u0626\u0649",
+    "\uFC69"=>"\u0626\u064A", "\uFC6A"=>"\u0628\u0631", "\uFC6B"=>"\u0628\u0632", "\uFC6C"=>"\u0628\u0645", "\uFC6D"=>"\u0628\u0646", "\uFC6E"=>"\u0628\u0649", "\uFC6F"=>"\u0628\u064A", "\uFC70"=>"\u062A\u0631",
+    "\uFC71"=>"\u062A\u0632", "\uFC72"=>"\u062A\u0645", "\uFC73"=>"\u062A\u0646", "\uFC74"=>"\u062A\u0649", "\uFC75"=>"\u062A\u064A", "\uFC76"=>"\u062B\u0631", "\uFC77"=>"\u062B\u0632", "\uFC78"=>"\u062B\u0645",
+    "\uFC79"=>"\u062B\u0646", "\uFC7A"=>"\u062B\u0649", "\uFC7B"=>"\u062B\u064A", "\uFC7C"=>"\u0641\u0649", "\uFC7D"=>"\u0641\u064A", "\uFC7E"=>"\u0642\u0649", "\uFC7F"=>"\u0642\u064A", "\uFC80"=>"\u0643\u0627",
+    "\uFC81"=>"\u0643\u0644", "\uFC82"=>"\u0643\u0645", "\uFC83"=>"\u0643\u0649", "\uFC84"=>"\u0643\u064A", "\uFC85"=>"\u0644\u0645", "\uFC86"=>"\u0644\u0649", "\uFC87"=>"\u0644\u064A", "\uFC88"=>"\u0645\u0627",
+    "\uFC89"=>"\u0645\u0645", "\uFC8A"=>"\u0646\u0631", "\uFC8B"=>"\u0646\u0632", "\uFC8C"=>"\u0646\u0645", "\uFC8D"=>"\u0646\u0646", "\uFC8E"=>"\u0646\u0649", "\uFC8F"=>"\u0646\u064A", "\uFC90"=>"\u0649\u0670",
+    "\uFC91"=>"\u064A\u0631", "\uFC92"=>"\u064A\u0632", "\uFC93"=>"\u064A\u0645", "\uFC94"=>"\u064A\u0646", "\uFC95"=>"\u064A\u0649", "\uFC96"=>"\u064A\u064A", "\uFC97"=>"\u0626\u062C", "\uFC98"=>"\u0626\u062D",
+    "\uFC99"=>"\u0626\u062E", "\uFC9A"=>"\u0626\u0645", "\uFC9B"=>"\u0626\u0647", "\uFC9C"=>"\u0628\u062C", "\uFC9D"=>"\u0628\u062D", "\uFC9E"=>"\u0628\u062E", "\uFC9F"=>"\u0628\u0645", "\uFCA0"=>"\u0628\u0647",
+    "\uFCA1"=>"\u062A\u062C", "\uFCA2"=>"\u062A\u062D", "\uFCA3"=>"\u062A\u062E", "\uFCA4"=>"\u062A\u0645", "\uFCA5"=>"\u062A\u0647", "\uFCA6"=>"\u062B\u0645", "\uFCA7"=>"\u062C\u062D", "\uFCA8"=>"\u062C\u0645",
+    "\uFCA9"=>"\u062D\u062C", "\uFCAA"=>"\u062D\u0645", "\uFCAB"=>"\u062E\u062C", "\uFCAC"=>"\u062E\u0645", "\uFCAD"=>"\u0633\u062C", "\uFCAE"=>"\u0633\u062D", "\uFCAF"=>"\u0633\u062E", "\uFCB0"=>"\u0633\u0645",
+    "\uFCB1"=>"\u0635\u062D", "\uFCB2"=>"\u0635\u062E", "\uFCB3"=>"\u0635\u0645", "\uFCB4"=>"\u0636\u062C", "\uFCB5"=>"\u0636\u062D", "\uFCB6"=>"\u0636\u062E", "\uFCB7"=>"\u0636\u0645", "\uFCB8"=>"\u0637\u062D",
+    "\uFCB9"=>"\u0638\u0645", "\uFCBA"=>"\u0639\u062C", "\uFCBB"=>"\u0639\u0645", "\uFCBC"=>"\u063A\u062C", "\uFCBD"=>"\u063A\u0645", "\uFCBE"=>"\u0641\u062C", "\uFCBF"=>"\u0641\u062D", "\uFCC0"=>"\u0641\u062E",
+    "\uFCC1"=>"\u0641\u0645", "\uFCC2"=>"\u0642\u062D", "\uFCC3"=>"\u0642\u0645", "\uFCC4"=>"\u0643\u062C", "\uFCC5"=>"\u0643\u062D", "\uFCC6"=>"\u0643\u062E", "\uFCC7"=>"\u0643\u0644", "\uFCC8"=>"\u0643\u0645",
+    "\uFCC9"=>"\u0644\u062C", "\uFCCA"=>"\u0644\u062D", "\uFCCB"=>"\u0644\u062E", "\uFCCC"=>"\u0644\u0645", "\uFCCD"=>"\u0644\u0647", "\uFCCE"=>"\u0645\u062C", "\uFCCF"=>"\u0645\u062D", "\uFCD0"=>"\u0645\u062E",
+    "\uFCD1"=>"\u0645\u0645", "\uFCD2"=>"\u0646\u062C", "\uFCD3"=>"\u0646\u062D", "\uFCD4"=>"\u0646\u062E", "\uFCD5"=>"\u0646\u0645", "\uFCD6"=>"\u0646\u0647", "\uFCD7"=>"\u0647\u062C", "\uFCD8"=>"\u0647\u0645",
+    "\uFCD9"=>"\u0647\u0670", "\uFCDA"=>"\u064A\u062C", "\uFCDB"=>"\u064A\u062D", "\uFCDC"=>"\u064A\u062E", "\uFCDD"=>"\u064A\u0645", "\uFCDE"=>"\u064A\u0647", "\uFCDF"=>"\u0626\u0645", "\uFCE0"=>"\u0626\u0647",
+    "\uFCE1"=>"\u0628\u0645", "\uFCE2"=>"\u0628\u0647", "\uFCE3"=>"\u062A\u0645", "\uFCE4"=>"\u062A\u0647", "\uFCE5"=>"\u062B\u0645", "\uFCE6"=>"\u062B\u0647", "\uFCE7"=>"\u0633\u0645", "\uFCE8"=>"\u0633\u0647",
+    "\uFCE9"=>"\u0634\u0645", "\uFCEA"=>"\u0634\u0647", "\uFCEB"=>"\u0643\u0644", "\uFCEC"=>"\u0643\u0645", "\uFCED"=>"\u0644\u0645", "\uFCEE"=>"\u0646\u0645", "\uFCEF"=>"\u0646\u0647", "\uFCF0"=>"\u064A\u0645",
+    "\uFCF1"=>"\u064A\u0647", "\uFCF2"=>"\u0640\u064E\u0651", "\uFCF3"=>"\u0640\u064F\u0651", "\uFCF4"=>"\u0640\u0650\u0651", "\uFCF5"=>"\u0637\u0649", "\uFCF6"=>"\u0637\u064A", "\uFCF7"=>"\u0639\u0649", "\uFCF8"=>"\u0639\u064A",
+    "\uFCF9"=>"\u063A\u0649", "\uFCFA"=>"\u063A\u064A", "\uFCFB"=>"\u0633\u0649", "\uFCFC"=>"\u0633\u064A", "\uFCFD"=>"\u0634\u0649", "\uFCFE"=>"\u0634\u064A", "\uFCFF"=>"\u062D\u0649", "\uFD00"=>"\u062D\u064A",
+    "\uFD01"=>"\u062C\u0649", "\uFD02"=>"\u062C\u064A", "\uFD03"=>"\u062E\u0649", "\uFD04"=>"\u062E\u064A", "\uFD05"=>"\u0635\u0649", "\uFD06"=>"\u0635\u064A", "\uFD07"=>"\u0636\u0649", "\uFD08"=>"\u0636\u064A",
+    "\uFD09"=>"\u0634\u062C", "\uFD0A"=>"\u0634\u062D", "\uFD0B"=>"\u0634\u062E", "\uFD0C"=>"\u0634\u0645", "\uFD0D"=>"\u0634\u0631", "\uFD0E"=>"\u0633\u0631", "\uFD0F"=>"\u0635\u0631", "\uFD10"=>"\u0636\u0631",
+    "\uFD11"=>"\u0637\u0649", "\uFD12"=>"\u0637\u064A", "\uFD13"=>"\u0639\u0649", "\uFD14"=>"\u0639\u064A", "\uFD15"=>"\u063A\u0649", "\uFD16"=>"\u063A\u064A", "\uFD17"=>"\u0633\u0649", "\uFD18"=>"\u0633\u064A",
+    "\uFD19"=>"\u0634\u0649", "\uFD1A"=>"\u0634\u064A", "\uFD1B"=>"\u062D\u0649", "\uFD1C"=>"\u062D\u064A", "\uFD1D"=>"\u062C\u0649", "\uFD1E"=>"\u062C\u064A", "\uFD1F"=>"\u062E\u0649", "\uFD20"=>"\u062E\u064A",
+    "\uFD21"=>"\u0635\u0649", "\uFD22"=>"\u0635\u064A", "\uFD23"=>"\u0636\u0649", "\uFD24"=>"\u0636\u064A", "\uFD25"=>"\u0634\u062C", "\uFD26"=>"\u0634\u062D", "\uFD27"=>"\u0634\u062E", "\uFD28"=>"\u0634\u0645",
+    "\uFD29"=>"\u0634\u0631", "\uFD2A"=>"\u0633\u0631", "\uFD2B"=>"\u0635\u0631", "\uFD2C"=>"\u0636\u0631", "\uFD2D"=>"\u0634\u062C", "\uFD2E"=>"\u0634\u062D", "\uFD2F"=>"\u0634\u062E", "\uFD30"=>"\u0634\u0645",
+    "\uFD31"=>"\u0633\u0647", "\uFD32"=>"\u0634\u0647", "\uFD33"=>"\u0637\u0645", "\uFD34"=>"\u0633\u062C", "\uFD35"=>"\u0633\u062D", "\uFD36"=>"\u0633\u062E", "\uFD37"=>"\u0634\u062C", "\uFD38"=>"\u0634\u062D",
+    "\uFD39"=>"\u0634\u062E", "\uFD3A"=>"\u0637\u0645", "\uFD3B"=>"\u0638\u0645", "\uFD3C"=>"\u0627\u064B", "\uFD3D"=>"\u0627\u064B", "\uFD50"=>"\u062A\u062C\u0645", "\uFD51"=>"\u062A\u062D\u062C", "\uFD52"=>"\u062A\u062D\u062C",
+    "\uFD53"=>"\u062A\u062D\u0645", "\uFD54"=>"\u062A\u062E\u0645", "\uFD55"=>"\u062A\u0645\u062C", "\uFD56"=>"\u062A\u0645\u062D", "\uFD57"=>"\u062A\u0645\u062E", "\uFD58"=>"\u062C\u0645\u062D", "\uFD59"=>"\u062C\u0645\u062D", "\uFD5A"=>"\u062D\u0645\u064A",
+    "\uFD5B"=>"\u062D\u0645\u0649", "\uFD5C"=>"\u0633\u062D\u062C", "\uFD5D"=>"\u0633\u062C\u062D", "\uFD5E"=>"\u0633\u062C\u0649", "\uFD5F"=>"\u0633\u0645\u062D", "\uFD60"=>"\u0633\u0645\u062D", "\uFD61"=>"\u0633\u0645\u062C", "\uFD62"=>"\u0633\u0645\u0645",
+    "\uFD63"=>"\u0633\u0645\u0645", "\uFD64"=>"\u0635\u062D\u062D", "\uFD65"=>"\u0635\u062D\u062D", "\uFD66"=>"\u0635\u0645\u0645", "\uFD67"=>"\u0634\u062D\u0645", "\uFD68"=>"\u0634\u062D\u0645", "\uFD69"=>"\u0634\u062C\u064A", "\uFD6A"=>"\u0634\u0645\u062E",
+    "\uFD6B"=>"\u0634\u0645\u062E", "\uFD6C"=>"\u0634\u0645\u0645", "\uFD6D"=>"\u0634\u0645\u0645", "\uFD6E"=>"\u0636\u062D\u0649", "\uFD6F"=>"\u0636\u062E\u0645", "\uFD70"=>"\u0636\u062E\u0645", "\uFD71"=>"\u0637\u0645\u062D", "\uFD72"=>"\u0637\u0645\u062D",
+    "\uFD73"=>"\u0637\u0645\u0645", "\uFD74"=>"\u0637\u0645\u064A", "\uFD75"=>"\u0639\u062C\u0645", "\uFD76"=>"\u0639\u0645\u0645", "\uFD77"=>"\u0639\u0645\u0645", "\uFD78"=>"\u0639\u0645\u0649", "\uFD79"=>"\u063A\u0645\u0645", "\uFD7A"=>"\u063A\u0645\u064A",
+    "\uFD7B"=>"\u063A\u0645\u0649", "\uFD7C"=>"\u0641\u062E\u0645", "\uFD7D"=>"\u0641\u062E\u0645", "\uFD7E"=>"\u0642\u0645\u062D", "\uFD7F"=>"\u0642\u0645\u0645", "\uFD80"=>"\u0644\u062D\u0645", "\uFD81"=>"\u0644\u062D\u064A", "\uFD82"=>"\u0644\u062D\u0649",
+    "\uFD83"=>"\u0644\u062C\u062C", "\uFD84"=>"\u0644\u062C\u062C", "\uFD85"=>"\u0644\u062E\u0645", "\uFD86"=>"\u0644\u062E\u0645", "\uFD87"=>"\u0644\u0645\u062D", "\uFD88"=>"\u0644\u0645\u062D", "\uFD89"=>"\u0645\u062D\u062C", "\uFD8A"=>"\u0645\u062D\u0645",
+    "\uFD8B"=>"\u0645\u062D\u064A", "\uFD8C"=>"\u0645\u062C\u062D", "\uFD8D"=>"\u0645\u062C\u0645", "\uFD8E"=>"\u0645\u062E\u062C", "\uFD8F"=>"\u0645\u062E\u0645", "\uFD92"=>"\u0645\u062C\u062E", "\uFD93"=>"\u0647\u0645\u062C", "\uFD94"=>"\u0647\u0645\u0645",
+    "\uFD95"=>"\u0646\u062D\u0645", "\uFD96"=>"\u0646\u062D\u0649", "\uFD97"=>"\u0646\u062C\u0645", "\uFD98"=>"\u0646\u062C\u0645", "\uFD99"=>"\u0646\u062C\u0649", "\uFD9A"=>"\u0646\u0645\u064A", "\uFD9B"=>"\u0646\u0645\u0649", "\uFD9C"=>"\u064A\u0645\u0645",
+    "\uFD9D"=>"\u064A\u0645\u0645", "\uFD9E"=>"\u0628\u062E\u064A", "\uFD9F"=>"\u062A\u062C\u064A", "\uFDA0"=>"\u062A\u062C\u0649", "\uFDA1"=>"\u062A\u062E\u064A", "\uFDA2"=>"\u062A\u062E\u0649", "\uFDA3"=>"\u062A\u0645\u064A", "\uFDA4"=>"\u062A\u0645\u0649",
+    "\uFDA5"=>"\u062C\u0645\u064A", "\uFDA6"=>"\u062C\u062D\u0649", "\uFDA7"=>"\u062C\u0645\u0649", "\uFDA8"=>"\u0633\u062E\u0649", "\uFDA9"=>"\u0635\u062D\u064A", "\uFDAA"=>"\u0634\u062D\u064A", "\uFDAB"=>"\u0636\u062D\u064A", "\uFDAC"=>"\u0644\u062C\u064A",
+    "\uFDAD"=>"\u0644\u0645\u064A", "\uFDAE"=>"\u064A\u062D\u064A", "\uFDAF"=>"\u064A\u062C\u064A", "\uFDB0"=>"\u064A\u0645\u064A", "\uFDB1"=>"\u0645\u0645\u064A", "\uFDB2"=>"\u0642\u0645\u064A", "\uFDB3"=>"\u0646\u062D\u064A", "\uFDB4"=>"\u0642\u0645\u062D",
+    "\uFDB5"=>"\u0644\u062D\u0645", "\uFDB6"=>"\u0639\u0645\u064A", "\uFDB7"=>"\u0643\u0645\u064A", "\uFDB8"=>"\u0646\u062C\u062D", "\uFDB9"=>"\u0645\u062E\u064A", "\uFDBA"=>"\u0644\u062C\u0645", "\uFDBB"=>"\u0643\u0645\u0645", "\uFDBC"=>"\u0644\u062C\u0645",
+    "\uFDBD"=>"\u0646\u062C\u062D", "\uFDBE"=>"\u062C\u062D\u064A", "\uFDBF"=>"\u062D\u062C\u064A", "\uFDC0"=>"\u0645\u062C\u064A", "\uFDC1"=>"\u0641\u0645\u064A", "\uFDC2"=>"\u0628\u062D\u064A", "\uFDC3"=>"\u0643\u0645\u0645", "\uFDC4"=>"\u0639\u062C\u0645",
+    "\uFDC5"=>"\u0635\u0645\u0645", "\uFDC6"=>"\u0633\u062E\u064A", "\uFDC7"=>"\u0646\u062C\u064A", "\uFDF0"=>"\u0635\u0644\u06D2", "\uFDF1"=>"\u0642\u0644\u06D2", "\uFDF2"=>"\u0627\u0644\u0644\u0647", "\uFDF3"=>"\u0627\u0643\u0628\u0631", "\uFDF4"=>"\u0645\u062D\u0645\u062F",
+    "\uFDF5"=>"\u0635\u0644\u0639\u0645", "\uFDF6"=>"\u0631\u0633\u0648\u0644", "\uFDF7"=>"\u0639\u0644\u064A\u0647", "\uFDF8"=>"\u0648\u0633\u0644\u0645", "\uFDF9"=>"\u0635\u0644\u0649", "\uFDFA"=>"\u0635\u0644\u0649 \u0627\u0644\u0644\u0647 \u0639\u0644\u064A\u0647 \u0648\u0633\u0644\u0645", "\uFDFB"=>"\u062C\u0644 \u062C\u0644\u0627\u0644\u0647", "\uFDFC"=>"\u0631\u06CC\u0627\u0644",
+    "\uFE10"=>",", "\uFE11"=>"\u3001", "\uFE12"=>"\u3002", "\uFE13"=>":", "\uFE14"=>";", "\uFE15"=>"!", "\uFE16"=>"?", "\uFE17"=>"\u3016",
+    "\uFE18"=>"\u3017", "\uFE19"=>"...", "\uFE30"=>"..", "\uFE31"=>"\u2014", "\uFE32"=>"\u2013", "\uFE33"=>"_", "\uFE34"=>"_", "\uFE35"=>"(",
+    "\uFE36"=>")", "\uFE37"=>"{", "\uFE38"=>"}", "\uFE39"=>"\u3014", "\uFE3A"=>"\u3015", "\uFE3B"=>"\u3010", "\uFE3C"=>"\u3011", "\uFE3D"=>"\u300A",
+    "\uFE3E"=>"\u300B", "\uFE3F"=>"\u3008", "\uFE40"=>"\u3009", "\uFE41"=>"\u300C", "\uFE42"=>"\u300D", "\uFE43"=>"\u300E", "\uFE44"=>"\u300F", "\uFE47"=>"[",
+    "\uFE48"=>"]", "\uFE49"=>" \u0305", "\uFE4A"=>" \u0305", "\uFE4B"=>" \u0305", "\uFE4C"=>" \u0305", "\uFE4D"=>"_", "\uFE4E"=>"_", "\uFE4F"=>"_",
+    "\uFE50"=>",", "\uFE51"=>"\u3001", "\uFE52"=>".", "\uFE54"=>";", "\uFE55"=>":", "\uFE56"=>"?", "\uFE57"=>"!", "\uFE58"=>"\u2014",
+    "\uFE59"=>"(", "\uFE5A"=>")", "\uFE5B"=>"{", "\uFE5C"=>"}", "\uFE5D"=>"\u3014", "\uFE5E"=>"\u3015", "\uFE5F"=>"#", "\uFE60"=>"&",
+    "\uFE61"=>"*", "\uFE62"=>"+", "\uFE63"=>"-", "\uFE64"=>"<", "\uFE65"=>">", "\uFE66"=>"=", "\uFE68"=>"\\", "\uFE69"=>"$",
+    "\uFE6A"=>"%", "\uFE6B"=>"@", "\uFE70"=>" \u064B", "\uFE71"=>"\u0640\u064B", "\uFE72"=>" \u064C", "\uFE74"=>" \u064D", "\uFE76"=>" \u064E", "\uFE77"=>"\u0640\u064E",
+    "\uFE78"=>" \u064F", "\uFE79"=>"\u0640\u064F", "\uFE7A"=>" \u0650", "\uFE7B"=>"\u0640\u0650", "\uFE7C"=>" \u0651", "\uFE7D"=>"\u0640\u0651", "\uFE7E"=>" \u0652", "\uFE7F"=>"\u0640\u0652",
+    "\uFE80"=>"\u0621", "\uFE81"=>"\u0622", "\uFE82"=>"\u0622", "\uFE83"=>"\u0623", "\uFE84"=>"\u0623", "\uFE85"=>"\u0624", "\uFE86"=>"\u0624", "\uFE87"=>"\u0625",
+    "\uFE88"=>"\u0625", "\uFE89"=>"\u0626", "\uFE8A"=>"\u0626", "\uFE8B"=>"\u0626", "\uFE8C"=>"\u0626", "\uFE8D"=>"\u0627", "\uFE8E"=>"\u0627", "\uFE8F"=>"\u0628",
+    "\uFE90"=>"\u0628", "\uFE91"=>"\u0628", "\uFE92"=>"\u0628", "\uFE93"=>"\u0629", "\uFE94"=>"\u0629", "\uFE95"=>"\u062A", "\uFE96"=>"\u062A", "\uFE97"=>"\u062A",
+    "\uFE98"=>"\u062A", "\uFE99"=>"\u062B", "\uFE9A"=>"\u062B", "\uFE9B"=>"\u062B", "\uFE9C"=>"\u062B", "\uFE9D"=>"\u062C", "\uFE9E"=>"\u062C", "\uFE9F"=>"\u062C",
+    "\uFEA0"=>"\u062C", "\uFEA1"=>"\u062D", "\uFEA2"=>"\u062D", "\uFEA3"=>"\u062D", "\uFEA4"=>"\u062D", "\uFEA5"=>"\u062E", "\uFEA6"=>"\u062E", "\uFEA7"=>"\u062E",
+    "\uFEA8"=>"\u062E", "\uFEA9"=>"\u062F", "\uFEAA"=>"\u062F", "\uFEAB"=>"\u0630", "\uFEAC"=>"\u0630", "\uFEAD"=>"\u0631", "\uFEAE"=>"\u0631", "\uFEAF"=>"\u0632",
+    "\uFEB0"=>"\u0632", "\uFEB1"=>"\u0633", "\uFEB2"=>"\u0633", "\uFEB3"=>"\u0633", "\uFEB4"=>"\u0633", "\uFEB5"=>"\u0634", "\uFEB6"=>"\u0634", "\uFEB7"=>"\u0634",
+    "\uFEB8"=>"\u0634", "\uFEB9"=>"\u0635", "\uFEBA"=>"\u0635", "\uFEBB"=>"\u0635", "\uFEBC"=>"\u0635", "\uFEBD"=>"\u0636", "\uFEBE"=>"\u0636", "\uFEBF"=>"\u0636",
+    "\uFEC0"=>"\u0636", "\uFEC1"=>"\u0637", "\uFEC2"=>"\u0637", "\uFEC3"=>"\u0637", "\uFEC4"=>"\u0637", "\uFEC5"=>"\u0638", "\uFEC6"=>"\u0638", "\uFEC7"=>"\u0638",
+    "\uFEC8"=>"\u0638", "\uFEC9"=>"\u0639", "\uFECA"=>"\u0639", "\uFECB"=>"\u0639", "\uFECC"=>"\u0639", "\uFECD"=>"\u063A", "\uFECE"=>"\u063A", "\uFECF"=>"\u063A",
+    "\uFED0"=>"\u063A", "\uFED1"=>"\u0641", "\uFED2"=>"\u0641", "\uFED3"=>"\u0641", "\uFED4"=>"\u0641", "\uFED5"=>"\u0642", "\uFED6"=>"\u0642", "\uFED7"=>"\u0642",
+    "\uFED8"=>"\u0642", "\uFED9"=>"\u0643", "\uFEDA"=>"\u0643", "\uFEDB"=>"\u0643", "\uFEDC"=>"\u0643", "\uFEDD"=>"\u0644", "\uFEDE"=>"\u0644", "\uFEDF"=>"\u0644",
+    "\uFEE0"=>"\u0644", "\uFEE1"=>"\u0645", "\uFEE2"=>"\u0645", "\uFEE3"=>"\u0645", "\uFEE4"=>"\u0645", "\uFEE5"=>"\u0646", "\uFEE6"=>"\u0646", "\uFEE7"=>"\u0646",
+    "\uFEE8"=>"\u0646", "\uFEE9"=>"\u0647", "\uFEEA"=>"\u0647", "\uFEEB"=>"\u0647", "\uFEEC"=>"\u0647", "\uFEED"=>"\u0648", "\uFEEE"=>"\u0648", "\uFEEF"=>"\u0649",
+    "\uFEF0"=>"\u0649", "\uFEF1"=>"\u064A", "\uFEF2"=>"\u064A", "\uFEF3"=>"\u064A", "\uFEF4"=>"\u064A", "\uFEF5"=>"\u0644\u0622", "\uFEF6"=>"\u0644\u0622", "\uFEF7"=>"\u0644\u0623",
+    "\uFEF8"=>"\u0644\u0623", "\uFEF9"=>"\u0644\u0625", "\uFEFA"=>"\u0644\u0625", "\uFEFB"=>"\u0644\u0627", "\uFEFC"=>"\u0644\u0627", "\uFF01"=>"!", "\uFF02"=>"\"", "\uFF03"=>"#",
+    "\uFF04"=>"$", "\uFF05"=>"%", "\uFF06"=>"&", "\uFF07"=>"'", "\uFF08"=>"(", "\uFF09"=>")", "\uFF0A"=>"*", "\uFF0B"=>"+",
+    "\uFF0C"=>",", "\uFF0D"=>"-", "\uFF0E"=>".", "\uFF0F"=>"/", "\uFF10"=>"0", "\uFF11"=>"1", "\uFF12"=>"2", "\uFF13"=>"3",
+    "\uFF14"=>"4", "\uFF15"=>"5", "\uFF16"=>"6", "\uFF17"=>"7", "\uFF18"=>"8", "\uFF19"=>"9", "\uFF1A"=>":", "\uFF1B"=>";",
+    "\uFF1C"=>"<", "\uFF1D"=>"=", "\uFF1E"=>">", "\uFF1F"=>"?", "\uFF20"=>"@", "\uFF21"=>"A", "\uFF22"=>"B", "\uFF23"=>"C",
+    "\uFF24"=>"D", "\uFF25"=>"E", "\uFF26"=>"F", "\uFF27"=>"G", "\uFF28"=>"H", "\uFF29"=>"I", "\uFF2A"=>"J", "\uFF2B"=>"K",
+    "\uFF2C"=>"L", "\uFF2D"=>"M", "\uFF2E"=>"N", "\uFF2F"=>"O", "\uFF30"=>"P", "\uFF31"=>"Q", "\uFF32"=>"R", "\uFF33"=>"S",
+    "\uFF34"=>"T", "\uFF35"=>"U", "\uFF36"=>"V", "\uFF37"=>"W", "\uFF38"=>"X", "\uFF39"=>"Y", "\uFF3A"=>"Z", "\uFF3B"=>"[",
+    "\uFF3C"=>"\\", "\uFF3D"=>"]", "\uFF3E"=>"^", "\uFF3F"=>"_", "\uFF40"=>"`", "\uFF41"=>"a", "\uFF42"=>"b", "\uFF43"=>"c",
+    "\uFF44"=>"d", "\uFF45"=>"e", "\uFF46"=>"f", "\uFF47"=>"g", "\uFF48"=>"h", "\uFF49"=>"i", "\uFF4A"=>"j", "\uFF4B"=>"k",
+    "\uFF4C"=>"l", "\uFF4D"=>"m", "\uFF4E"=>"n", "\uFF4F"=>"o", "\uFF50"=>"p", "\uFF51"=>"q", "\uFF52"=>"r", "\uFF53"=>"s",
+    "\uFF54"=>"t", "\uFF55"=>"u", "\uFF56"=>"v", "\uFF57"=>"w", "\uFF58"=>"x", "\uFF59"=>"y", "\uFF5A"=>"z", "\uFF5B"=>"{",
+    "\uFF5C"=>"|", "\uFF5D"=>"}", "\uFF5E"=>"~", "\uFF5F"=>"\u2985", "\uFF60"=>"\u2986", "\uFF61"=>"\u3002", "\uFF62"=>"\u300C", "\uFF63"=>"\u300D",
+    "\uFF64"=>"\u3001", "\uFF65"=>"\u30FB", "\uFF66"=>"\u30F2", "\uFF67"=>"\u30A1", "\uFF68"=>"\u30A3", "\uFF69"=>"\u30A5", "\uFF6A"=>"\u30A7", "\uFF6B"=>"\u30A9",
+    "\uFF6C"=>"\u30E3", "\uFF6D"=>"\u30E5", "\uFF6E"=>"\u30E7", "\uFF6F"=>"\u30C3", "\uFF70"=>"\u30FC", "\uFF71"=>"\u30A2", "\uFF72"=>"\u30A4", "\uFF73"=>"\u30A6",
+    "\uFF74"=>"\u30A8", "\uFF75"=>"\u30AA", "\uFF76"=>"\u30AB", "\uFF77"=>"\u30AD", "\uFF78"=>"\u30AF", "\uFF79"=>"\u30B1", "\uFF7A"=>"\u30B3", "\uFF7B"=>"\u30B5",
+    "\uFF7C"=>"\u30B7", "\uFF7D"=>"\u30B9", "\uFF7E"=>"\u30BB", "\uFF7F"=>"\u30BD", "\uFF80"=>"\u30BF", "\uFF81"=>"\u30C1", "\uFF82"=>"\u30C4", "\uFF83"=>"\u30C6",
+    "\uFF84"=>"\u30C8", "\uFF85"=>"\u30CA", "\uFF86"=>"\u30CB", "\uFF87"=>"\u30CC", "\uFF88"=>"\u30CD", "\uFF89"=>"\u30CE", "\uFF8A"=>"\u30CF", "\uFF8B"=>"\u30D2",
+    "\uFF8C"=>"\u30D5", "\uFF8D"=>"\u30D8", "\uFF8E"=>"\u30DB", "\uFF8F"=>"\u30DE", "\uFF90"=>"\u30DF", "\uFF91"=>"\u30E0", "\uFF92"=>"\u30E1", "\uFF93"=>"\u30E2",
+    "\uFF94"=>"\u30E4", "\uFF95"=>"\u30E6", "\uFF96"=>"\u30E8", "\uFF97"=>"\u30E9", "\uFF98"=>"\u30EA", "\uFF99"=>"\u30EB", "\uFF9A"=>"\u30EC", "\uFF9B"=>"\u30ED",
+    "\uFF9C"=>"\u30EF", "\uFF9D"=>"\u30F3", "\uFF9E"=>"\u3099", "\uFF9F"=>"\u309A", "\uFFA0"=>"\u1160", "\uFFA1"=>"\u1100", "\uFFA2"=>"\u1101", "\uFFA3"=>"\u11AA",
+    "\uFFA4"=>"\u1102", "\uFFA5"=>"\u11AC", "\uFFA6"=>"\u11AD", "\uFFA7"=>"\u1103", "\uFFA8"=>"\u1104", "\uFFA9"=>"\u1105", "\uFFAA"=>"\u11B0", "\uFFAB"=>"\u11B1",
+    "\uFFAC"=>"\u11B2", "\uFFAD"=>"\u11B3", "\uFFAE"=>"\u11B4", "\uFFAF"=>"\u11B5", "\uFFB0"=>"\u111A", "\uFFB1"=>"\u1106", "\uFFB2"=>"\u1107", "\uFFB3"=>"\u1108",
+    "\uFFB4"=>"\u1121", "\uFFB5"=>"\u1109", "\uFFB6"=>"\u110A", "\uFFB7"=>"\u110B", "\uFFB8"=>"\u110C", "\uFFB9"=>"\u110D", "\uFFBA"=>"\u110E", "\uFFBB"=>"\u110F",
+    "\uFFBC"=>"\u1110", "\uFFBD"=>"\u1111", "\uFFBE"=>"\u1112", "\uFFC2"=>"\u1161", "\uFFC3"=>"\u1162", "\uFFC4"=>"\u1163", "\uFFC5"=>"\u1164", "\uFFC6"=>"\u1165",
+    "\uFFC7"=>"\u1166", "\uFFCA"=>"\u1167", "\uFFCB"=>"\u1168", "\uFFCC"=>"\u1169", "\uFFCD"=>"\u116A", "\uFFCE"=>"\u116B", "\uFFCF"=>"\u116C", "\uFFD2"=>"\u116D",
+    "\uFFD3"=>"\u116E", "\uFFD4"=>"\u116F", "\uFFD5"=>"\u1170", "\uFFD6"=>"\u1171", "\uFFD7"=>"\u1172", "\uFFDA"=>"\u1173", "\uFFDB"=>"\u1174", "\uFFDC"=>"\u1175",
+    "\uFFE0"=>"\u00A2", "\uFFE1"=>"\u00A3", "\uFFE2"=>"\u00AC", "\uFFE3"=>" \u0304", "\uFFE4"=>"\u00A6", "\uFFE5"=>"\u00A5", "\uFFE6"=>"\u20A9", "\uFFE8"=>"\u2502",
+    "\uFFE9"=>"\u2190", "\uFFEA"=>"\u2191", "\uFFEB"=>"\u2192", "\uFFEC"=>"\u2193", "\uFFED"=>"\u25A0", "\uFFEE"=>"\u25CB", "\u{1D400}"=>"A", "\u{1D401}"=>"B",
+    "\u{1D402}"=>"C", "\u{1D403}"=>"D", "\u{1D404}"=>"E", "\u{1D405}"=>"F", "\u{1D406}"=>"G", "\u{1D407}"=>"H", "\u{1D408}"=>"I", "\u{1D409}"=>"J",
+    "\u{1D40A}"=>"K", "\u{1D40B}"=>"L", "\u{1D40C}"=>"M", "\u{1D40D}"=>"N", "\u{1D40E}"=>"O", "\u{1D40F}"=>"P", "\u{1D410}"=>"Q", "\u{1D411}"=>"R",
+    "\u{1D412}"=>"S", "\u{1D413}"=>"T", "\u{1D414}"=>"U", "\u{1D415}"=>"V", "\u{1D416}"=>"W", "\u{1D417}"=>"X", "\u{1D418}"=>"Y", "\u{1D419}"=>"Z",
+    "\u{1D41A}"=>"a", "\u{1D41B}"=>"b", "\u{1D41C}"=>"c", "\u{1D41D}"=>"d", "\u{1D41E}"=>"e", "\u{1D41F}"=>"f", "\u{1D420}"=>"g", "\u{1D421}"=>"h",
+    "\u{1D422}"=>"i", "\u{1D423}"=>"j", "\u{1D424}"=>"k", "\u{1D425}"=>"l", "\u{1D426}"=>"m", "\u{1D427}"=>"n", "\u{1D428}"=>"o", "\u{1D429}"=>"p",
+    "\u{1D42A}"=>"q", "\u{1D42B}"=>"r", "\u{1D42C}"=>"s", "\u{1D42D}"=>"t", "\u{1D42E}"=>"u", "\u{1D42F}"=>"v", "\u{1D430}"=>"w", "\u{1D431}"=>"x",
+    "\u{1D432}"=>"y", "\u{1D433}"=>"z", "\u{1D434}"=>"A", "\u{1D435}"=>"B", "\u{1D436}"=>"C", "\u{1D437}"=>"D", "\u{1D438}"=>"E", "\u{1D439}"=>"F",
+    "\u{1D43A}"=>"G", "\u{1D43B}"=>"H", "\u{1D43C}"=>"I", "\u{1D43D}"=>"J", "\u{1D43E}"=>"K", "\u{1D43F}"=>"L", "\u{1D440}"=>"M", "\u{1D441}"=>"N",
+    "\u{1D442}"=>"O", "\u{1D443}"=>"P", "\u{1D444}"=>"Q", "\u{1D445}"=>"R", "\u{1D446}"=>"S", "\u{1D447}"=>"T", "\u{1D448}"=>"U", "\u{1D449}"=>"V",
+    "\u{1D44A}"=>"W", "\u{1D44B}"=>"X", "\u{1D44C}"=>"Y", "\u{1D44D}"=>"Z", "\u{1D44E}"=>"a", "\u{1D44F}"=>"b", "\u{1D450}"=>"c", "\u{1D451}"=>"d",
+    "\u{1D452}"=>"e", "\u{1D453}"=>"f", "\u{1D454}"=>"g", "\u{1D456}"=>"i", "\u{1D457}"=>"j", "\u{1D458}"=>"k", "\u{1D459}"=>"l", "\u{1D45A}"=>"m",
+    "\u{1D45B}"=>"n", "\u{1D45C}"=>"o", "\u{1D45D}"=>"p", "\u{1D45E}"=>"q", "\u{1D45F}"=>"r", "\u{1D460}"=>"s", "\u{1D461}"=>"t", "\u{1D462}"=>"u",
+    "\u{1D463}"=>"v", "\u{1D464}"=>"w", "\u{1D465}"=>"x", "\u{1D466}"=>"y", "\u{1D467}"=>"z", "\u{1D468}"=>"A", "\u{1D469}"=>"B", "\u{1D46A}"=>"C",
+    "\u{1D46B}"=>"D", "\u{1D46C}"=>"E", "\u{1D46D}"=>"F", "\u{1D46E}"=>"G", "\u{1D46F}"=>"H", "\u{1D470}"=>"I", "\u{1D471}"=>"J", "\u{1D472}"=>"K",
+    "\u{1D473}"=>"L", "\u{1D474}"=>"M", "\u{1D475}"=>"N", "\u{1D476}"=>"O", "\u{1D477}"=>"P", "\u{1D478}"=>"Q", "\u{1D479}"=>"R", "\u{1D47A}"=>"S",
+    "\u{1D47B}"=>"T", "\u{1D47C}"=>"U", "\u{1D47D}"=>"V", "\u{1D47E}"=>"W", "\u{1D47F}"=>"X", "\u{1D480}"=>"Y", "\u{1D481}"=>"Z", "\u{1D482}"=>"a",
+    "\u{1D483}"=>"b", "\u{1D484}"=>"c", "\u{1D485}"=>"d", "\u{1D486}"=>"e", "\u{1D487}"=>"f", "\u{1D488}"=>"g", "\u{1D489}"=>"h", "\u{1D48A}"=>"i",
+    "\u{1D48B}"=>"j", "\u{1D48C}"=>"k", "\u{1D48D}"=>"l", "\u{1D48E}"=>"m", "\u{1D48F}"=>"n", "\u{1D490}"=>"o", "\u{1D491}"=>"p", "\u{1D492}"=>"q",
+    "\u{1D493}"=>"r", "\u{1D494}"=>"s", "\u{1D495}"=>"t", "\u{1D496}"=>"u", "\u{1D497}"=>"v", "\u{1D498}"=>"w", "\u{1D499}"=>"x", "\u{1D49A}"=>"y",
+    "\u{1D49B}"=>"z", "\u{1D49C}"=>"A", "\u{1D49E}"=>"C", "\u{1D49F}"=>"D", "\u{1D4A2}"=>"G", "\u{1D4A5}"=>"J", "\u{1D4A6}"=>"K", "\u{1D4A9}"=>"N",
+    "\u{1D4AA}"=>"O", "\u{1D4AB}"=>"P", "\u{1D4AC}"=>"Q", "\u{1D4AE}"=>"S", "\u{1D4AF}"=>"T", "\u{1D4B0}"=>"U", "\u{1D4B1}"=>"V", "\u{1D4B2}"=>"W",
+    "\u{1D4B3}"=>"X", "\u{1D4B4}"=>"Y", "\u{1D4B5}"=>"Z", "\u{1D4B6}"=>"a", "\u{1D4B7}"=>"b", "\u{1D4B8}"=>"c", "\u{1D4B9}"=>"d", "\u{1D4BB}"=>"f",
+    "\u{1D4BD}"=>"h", "\u{1D4BE}"=>"i", "\u{1D4BF}"=>"j", "\u{1D4C0}"=>"k", "\u{1D4C1}"=>"l", "\u{1D4C2}"=>"m", "\u{1D4C3}"=>"n", "\u{1D4C5}"=>"p",
+    "\u{1D4C6}"=>"q", "\u{1D4C7}"=>"r", "\u{1D4C8}"=>"s", "\u{1D4C9}"=>"t", "\u{1D4CA}"=>"u", "\u{1D4CB}"=>"v", "\u{1D4CC}"=>"w", "\u{1D4CD}"=>"x",
+    "\u{1D4CE}"=>"y", "\u{1D4CF}"=>"z", "\u{1D4D0}"=>"A", "\u{1D4D1}"=>"B", "\u{1D4D2}"=>"C", "\u{1D4D3}"=>"D", "\u{1D4D4}"=>"E", "\u{1D4D5}"=>"F",
+    "\u{1D4D6}"=>"G", "\u{1D4D7}"=>"H", "\u{1D4D8}"=>"I", "\u{1D4D9}"=>"J", "\u{1D4DA}"=>"K", "\u{1D4DB}"=>"L", "\u{1D4DC}"=>"M", "\u{1D4DD}"=>"N",
+    "\u{1D4DE}"=>"O", "\u{1D4DF}"=>"P", "\u{1D4E0}"=>"Q", "\u{1D4E1}"=>"R", "\u{1D4E2}"=>"S", "\u{1D4E3}"=>"T", "\u{1D4E4}"=>"U", "\u{1D4E5}"=>"V",
+    "\u{1D4E6}"=>"W", "\u{1D4E7}"=>"X", "\u{1D4E8}"=>"Y", "\u{1D4E9}"=>"Z", "\u{1D4EA}"=>"a", "\u{1D4EB}"=>"b", "\u{1D4EC}"=>"c", "\u{1D4ED}"=>"d",
+    "\u{1D4EE}"=>"e", "\u{1D4EF}"=>"f", "\u{1D4F0}"=>"g", "\u{1D4F1}"=>"h", "\u{1D4F2}"=>"i", "\u{1D4F3}"=>"j", "\u{1D4F4}"=>"k", "\u{1D4F5}"=>"l",
+    "\u{1D4F6}"=>"m", "\u{1D4F7}"=>"n", "\u{1D4F8}"=>"o", "\u{1D4F9}"=>"p", "\u{1D4FA}"=>"q", "\u{1D4FB}"=>"r", "\u{1D4FC}"=>"s", "\u{1D4FD}"=>"t",
+    "\u{1D4FE}"=>"u", "\u{1D4FF}"=>"v", "\u{1D500}"=>"w", "\u{1D501}"=>"x", "\u{1D502}"=>"y", "\u{1D503}"=>"z", "\u{1D504}"=>"A", "\u{1D505}"=>"B",
+    "\u{1D507}"=>"D", "\u{1D508}"=>"E", "\u{1D509}"=>"F", "\u{1D50A}"=>"G", "\u{1D50D}"=>"J", "\u{1D50E}"=>"K", "\u{1D50F}"=>"L", "\u{1D510}"=>"M",
+    "\u{1D511}"=>"N", "\u{1D512}"=>"O", "\u{1D513}"=>"P", "\u{1D514}"=>"Q", "\u{1D516}"=>"S", "\u{1D517}"=>"T", "\u{1D518}"=>"U", "\u{1D519}"=>"V",
+    "\u{1D51A}"=>"W", "\u{1D51B}"=>"X", "\u{1D51C}"=>"Y", "\u{1D51E}"=>"a", "\u{1D51F}"=>"b", "\u{1D520}"=>"c", "\u{1D521}"=>"d", "\u{1D522}"=>"e",
+    "\u{1D523}"=>"f", "\u{1D524}"=>"g", "\u{1D525}"=>"h", "\u{1D526}"=>"i", "\u{1D527}"=>"j", "\u{1D528}"=>"k", "\u{1D529}"=>"l", "\u{1D52A}"=>"m",
+    "\u{1D52B}"=>"n", "\u{1D52C}"=>"o", "\u{1D52D}"=>"p", "\u{1D52E}"=>"q", "\u{1D52F}"=>"r", "\u{1D530}"=>"s", "\u{1D531}"=>"t", "\u{1D532}"=>"u",
+    "\u{1D533}"=>"v", "\u{1D534}"=>"w", "\u{1D535}"=>"x", "\u{1D536}"=>"y", "\u{1D537}"=>"z", "\u{1D538}"=>"A", "\u{1D539}"=>"B", "\u{1D53B}"=>"D",
+    "\u{1D53C}"=>"E", "\u{1D53D}"=>"F", "\u{1D53E}"=>"G", "\u{1D540}"=>"I", "\u{1D541}"=>"J", "\u{1D542}"=>"K", "\u{1D543}"=>"L", "\u{1D544}"=>"M",
+    "\u{1D546}"=>"O", "\u{1D54A}"=>"S", "\u{1D54B}"=>"T", "\u{1D54C}"=>"U", "\u{1D54D}"=>"V", "\u{1D54E}"=>"W", "\u{1D54F}"=>"X", "\u{1D550}"=>"Y",
+    "\u{1D552}"=>"a", "\u{1D553}"=>"b", "\u{1D554}"=>"c", "\u{1D555}"=>"d", "\u{1D556}"=>"e", "\u{1D557}"=>"f", "\u{1D558}"=>"g", "\u{1D559}"=>"h",
+    "\u{1D55A}"=>"i", "\u{1D55B}"=>"j", "\u{1D55C}"=>"k", "\u{1D55D}"=>"l", "\u{1D55E}"=>"m", "\u{1D55F}"=>"n", "\u{1D560}"=>"o", "\u{1D561}"=>"p",
+    "\u{1D562}"=>"q", "\u{1D563}"=>"r", "\u{1D564}"=>"s", "\u{1D565}"=>"t", "\u{1D566}"=>"u", "\u{1D567}"=>"v", "\u{1D568}"=>"w", "\u{1D569}"=>"x",
+    "\u{1D56A}"=>"y", "\u{1D56B}"=>"z", "\u{1D56C}"=>"A", "\u{1D56D}"=>"B", "\u{1D56E}"=>"C", "\u{1D56F}"=>"D", "\u{1D570}"=>"E", "\u{1D571}"=>"F",
+    "\u{1D572}"=>"G", "\u{1D573}"=>"H", "\u{1D574}"=>"I", "\u{1D575}"=>"J", "\u{1D576}"=>"K", "\u{1D577}"=>"L", "\u{1D578}"=>"M", "\u{1D579}"=>"N",
+    "\u{1D57A}"=>"O", "\u{1D57B}"=>"P", "\u{1D57C}"=>"Q", "\u{1D57D}"=>"R", "\u{1D57E}"=>"S", "\u{1D57F}"=>"T", "\u{1D580}"=>"U", "\u{1D581}"=>"V",
+    "\u{1D582}"=>"W", "\u{1D583}"=>"X", "\u{1D584}"=>"Y", "\u{1D585}"=>"Z", "\u{1D586}"=>"a", "\u{1D587}"=>"b", "\u{1D588}"=>"c", "\u{1D589}"=>"d",
+    "\u{1D58A}"=>"e", "\u{1D58B}"=>"f", "\u{1D58C}"=>"g", "\u{1D58D}"=>"h", "\u{1D58E}"=>"i", "\u{1D58F}"=>"j", "\u{1D590}"=>"k", "\u{1D591}"=>"l",
+    "\u{1D592}"=>"m", "\u{1D593}"=>"n", "\u{1D594}"=>"o", "\u{1D595}"=>"p", "\u{1D596}"=>"q", "\u{1D597}"=>"r", "\u{1D598}"=>"s", "\u{1D599}"=>"t",
+    "\u{1D59A}"=>"u", "\u{1D59B}"=>"v", "\u{1D59C}"=>"w", "\u{1D59D}"=>"x", "\u{1D59E}"=>"y", "\u{1D59F}"=>"z", "\u{1D5A0}"=>"A", "\u{1D5A1}"=>"B",
+    "\u{1D5A2}"=>"C", "\u{1D5A3}"=>"D", "\u{1D5A4}"=>"E", "\u{1D5A5}"=>"F", "\u{1D5A6}"=>"G", "\u{1D5A7}"=>"H", "\u{1D5A8}"=>"I", "\u{1D5A9}"=>"J",
+    "\u{1D5AA}"=>"K", "\u{1D5AB}"=>"L", "\u{1D5AC}"=>"M", "\u{1D5AD}"=>"N", "\u{1D5AE}"=>"O", "\u{1D5AF}"=>"P", "\u{1D5B0}"=>"Q", "\u{1D5B1}"=>"R",
+    "\u{1D5B2}"=>"S", "\u{1D5B3}"=>"T", "\u{1D5B4}"=>"U", "\u{1D5B5}"=>"V", "\u{1D5B6}"=>"W", "\u{1D5B7}"=>"X", "\u{1D5B8}"=>"Y", "\u{1D5B9}"=>"Z",
+    "\u{1D5BA}"=>"a", "\u{1D5BB}"=>"b", "\u{1D5BC}"=>"c", "\u{1D5BD}"=>"d", "\u{1D5BE}"=>"e", "\u{1D5BF}"=>"f", "\u{1D5C0}"=>"g", "\u{1D5C1}"=>"h",
+    "\u{1D5C2}"=>"i", "\u{1D5C3}"=>"j", "\u{1D5C4}"=>"k", "\u{1D5C5}"=>"l", "\u{1D5C6}"=>"m", "\u{1D5C7}"=>"n", "\u{1D5C8}"=>"o", "\u{1D5C9}"=>"p",
+    "\u{1D5CA}"=>"q", "\u{1D5CB}"=>"r", "\u{1D5CC}"=>"s", "\u{1D5CD}"=>"t", "\u{1D5CE}"=>"u", "\u{1D5CF}"=>"v", "\u{1D5D0}"=>"w", "\u{1D5D1}"=>"x",
+    "\u{1D5D2}"=>"y", "\u{1D5D3}"=>"z", "\u{1D5D4}"=>"A", "\u{1D5D5}"=>"B", "\u{1D5D6}"=>"C", "\u{1D5D7}"=>"D", "\u{1D5D8}"=>"E", "\u{1D5D9}"=>"F",
+    "\u{1D5DA}"=>"G", "\u{1D5DB}"=>"H", "\u{1D5DC}"=>"I", "\u{1D5DD}"=>"J", "\u{1D5DE}"=>"K", "\u{1D5DF}"=>"L", "\u{1D5E0}"=>"M", "\u{1D5E1}"=>"N",
+    "\u{1D5E2}"=>"O", "\u{1D5E3}"=>"P", "\u{1D5E4}"=>"Q", "\u{1D5E5}"=>"R", "\u{1D5E6}"=>"S", "\u{1D5E7}"=>"T", "\u{1D5E8}"=>"U", "\u{1D5E9}"=>"V",
+    "\u{1D5EA}"=>"W", "\u{1D5EB}"=>"X", "\u{1D5EC}"=>"Y", "\u{1D5ED}"=>"Z", "\u{1D5EE}"=>"a", "\u{1D5EF}"=>"b", "\u{1D5F0}"=>"c", "\u{1D5F1}"=>"d",
+    "\u{1D5F2}"=>"e", "\u{1D5F3}"=>"f", "\u{1D5F4}"=>"g", "\u{1D5F5}"=>"h", "\u{1D5F6}"=>"i", "\u{1D5F7}"=>"j", "\u{1D5F8}"=>"k", "\u{1D5F9}"=>"l",
+    "\u{1D5FA}"=>"m", "\u{1D5FB}"=>"n", "\u{1D5FC}"=>"o", "\u{1D5FD}"=>"p", "\u{1D5FE}"=>"q", "\u{1D5FF}"=>"r", "\u{1D600}"=>"s", "\u{1D601}"=>"t",
+    "\u{1D602}"=>"u", "\u{1D603}"=>"v", "\u{1D604}"=>"w", "\u{1D605}"=>"x", "\u{1D606}"=>"y", "\u{1D607}"=>"z", "\u{1D608}"=>"A", "\u{1D609}"=>"B",
+    "\u{1D60A}"=>"C", "\u{1D60B}"=>"D", "\u{1D60C}"=>"E", "\u{1D60D}"=>"F", "\u{1D60E}"=>"G", "\u{1D60F}"=>"H", "\u{1D610}"=>"I", "\u{1D611}"=>"J",
+    "\u{1D612}"=>"K", "\u{1D613}"=>"L", "\u{1D614}"=>"M", "\u{1D615}"=>"N", "\u{1D616}"=>"O", "\u{1D617}"=>"P", "\u{1D618}"=>"Q", "\u{1D619}"=>"R",
+    "\u{1D61A}"=>"S", "\u{1D61B}"=>"T", "\u{1D61C}"=>"U", "\u{1D61D}"=>"V", "\u{1D61E}"=>"W", "\u{1D61F}"=>"X", "\u{1D620}"=>"Y", "\u{1D621}"=>"Z",
+    "\u{1D622}"=>"a", "\u{1D623}"=>"b", "\u{1D624}"=>"c", "\u{1D625}"=>"d", "\u{1D626}"=>"e", "\u{1D627}"=>"f", "\u{1D628}"=>"g", "\u{1D629}"=>"h",
+    "\u{1D62A}"=>"i", "\u{1D62B}"=>"j", "\u{1D62C}"=>"k", "\u{1D62D}"=>"l", "\u{1D62E}"=>"m", "\u{1D62F}"=>"n", "\u{1D630}"=>"o", "\u{1D631}"=>"p",
+    "\u{1D632}"=>"q", "\u{1D633}"=>"r", "\u{1D634}"=>"s", "\u{1D635}"=>"t", "\u{1D636}"=>"u", "\u{1D637}"=>"v", "\u{1D638}"=>"w", "\u{1D639}"=>"x",
+    "\u{1D63A}"=>"y", "\u{1D63B}"=>"z", "\u{1D63C}"=>"A", "\u{1D63D}"=>"B", "\u{1D63E}"=>"C", "\u{1D63F}"=>"D", "\u{1D640}"=>"E", "\u{1D641}"=>"F",
+    "\u{1D642}"=>"G", "\u{1D643}"=>"H", "\u{1D644}"=>"I", "\u{1D645}"=>"J", "\u{1D646}"=>"K", "\u{1D647}"=>"L", "\u{1D648}"=>"M", "\u{1D649}"=>"N",
+    "\u{1D64A}"=>"O", "\u{1D64B}"=>"P", "\u{1D64C}"=>"Q", "\u{1D64D}"=>"R", "\u{1D64E}"=>"S", "\u{1D64F}"=>"T", "\u{1D650}"=>"U", "\u{1D651}"=>"V",
+    "\u{1D652}"=>"W", "\u{1D653}"=>"X", "\u{1D654}"=>"Y", "\u{1D655}"=>"Z", "\u{1D656}"=>"a", "\u{1D657}"=>"b", "\u{1D658}"=>"c", "\u{1D659}"=>"d",
+    "\u{1D65A}"=>"e", "\u{1D65B}"=>"f", "\u{1D65C}"=>"g", "\u{1D65D}"=>"h", "\u{1D65E}"=>"i", "\u{1D65F}"=>"j", "\u{1D660}"=>"k", "\u{1D661}"=>"l",
+    "\u{1D662}"=>"m", "\u{1D663}"=>"n", "\u{1D664}"=>"o", "\u{1D665}"=>"p", "\u{1D666}"=>"q", "\u{1D667}"=>"r", "\u{1D668}"=>"s", "\u{1D669}"=>"t",
+    "\u{1D66A}"=>"u", "\u{1D66B}"=>"v", "\u{1D66C}"=>"w", "\u{1D66D}"=>"x", "\u{1D66E}"=>"y", "\u{1D66F}"=>"z", "\u{1D670}"=>"A", "\u{1D671}"=>"B",
+    "\u{1D672}"=>"C", "\u{1D673}"=>"D", "\u{1D674}"=>"E", "\u{1D675}"=>"F", "\u{1D676}"=>"G", "\u{1D677}"=>"H", "\u{1D678}"=>"I", "\u{1D679}"=>"J",
+    "\u{1D67A}"=>"K", "\u{1D67B}"=>"L", "\u{1D67C}"=>"M", "\u{1D67D}"=>"N", "\u{1D67E}"=>"O", "\u{1D67F}"=>"P", "\u{1D680}"=>"Q", "\u{1D681}"=>"R",
+    "\u{1D682}"=>"S", "\u{1D683}"=>"T", "\u{1D684}"=>"U", "\u{1D685}"=>"V", "\u{1D686}"=>"W", "\u{1D687}"=>"X", "\u{1D688}"=>"Y", "\u{1D689}"=>"Z",
+    "\u{1D68A}"=>"a", "\u{1D68B}"=>"b", "\u{1D68C}"=>"c", "\u{1D68D}"=>"d", "\u{1D68E}"=>"e", "\u{1D68F}"=>"f", "\u{1D690}"=>"g", "\u{1D691}"=>"h",
+    "\u{1D692}"=>"i", "\u{1D693}"=>"j", "\u{1D694}"=>"k", "\u{1D695}"=>"l", "\u{1D696}"=>"m", "\u{1D697}"=>"n", "\u{1D698}"=>"o", "\u{1D699}"=>"p",
+    "\u{1D69A}"=>"q", "\u{1D69B}"=>"r", "\u{1D69C}"=>"s", "\u{1D69D}"=>"t", "\u{1D69E}"=>"u", "\u{1D69F}"=>"v", "\u{1D6A0}"=>"w", "\u{1D6A1}"=>"x",
+    "\u{1D6A2}"=>"y", "\u{1D6A3}"=>"z", "\u{1D6A4}"=>"\u0131", "\u{1D6A5}"=>"\u0237", "\u{1D6A8}"=>"\u0391", "\u{1D6A9}"=>"\u0392", "\u{1D6AA}"=>"\u0393", "\u{1D6AB}"=>"\u0394",
+    "\u{1D6AC}"=>"\u0395", "\u{1D6AD}"=>"\u0396", "\u{1D6AE}"=>"\u0397", "\u{1D6AF}"=>"\u0398", "\u{1D6B0}"=>"\u0399", "\u{1D6B1}"=>"\u039A", "\u{1D6B2}"=>"\u039B", "\u{1D6B3}"=>"\u039C",
+    "\u{1D6B4}"=>"\u039D", "\u{1D6B5}"=>"\u039E", "\u{1D6B6}"=>"\u039F", "\u{1D6B7}"=>"\u03A0", "\u{1D6B8}"=>"\u03A1", "\u{1D6B9}"=>"\u0398", "\u{1D6BA}"=>"\u03A3", "\u{1D6BB}"=>"\u03A4",
+    "\u{1D6BC}"=>"\u03A5", "\u{1D6BD}"=>"\u03A6", "\u{1D6BE}"=>"\u03A7", "\u{1D6BF}"=>"\u03A8", "\u{1D6C0}"=>"\u03A9", "\u{1D6C1}"=>"\u2207", "\u{1D6C2}"=>"\u03B1", "\u{1D6C3}"=>"\u03B2",
+    "\u{1D6C4}"=>"\u03B3", "\u{1D6C5}"=>"\u03B4", "\u{1D6C6}"=>"\u03B5", "\u{1D6C7}"=>"\u03B6", "\u{1D6C8}"=>"\u03B7", "\u{1D6C9}"=>"\u03B8", "\u{1D6CA}"=>"\u03B9", "\u{1D6CB}"=>"\u03BA",
+    "\u{1D6CC}"=>"\u03BB", "\u{1D6CD}"=>"\u03BC", "\u{1D6CE}"=>"\u03BD", "\u{1D6CF}"=>"\u03BE", "\u{1D6D0}"=>"\u03BF", "\u{1D6D1}"=>"\u03C0", "\u{1D6D2}"=>"\u03C1", "\u{1D6D3}"=>"\u03C2",
+    "\u{1D6D4}"=>"\u03C3", "\u{1D6D5}"=>"\u03C4", "\u{1D6D6}"=>"\u03C5", "\u{1D6D7}"=>"\u03C6", "\u{1D6D8}"=>"\u03C7", "\u{1D6D9}"=>"\u03C8", "\u{1D6DA}"=>"\u03C9", "\u{1D6DB}"=>"\u2202",
+    "\u{1D6DC}"=>"\u03B5", "\u{1D6DD}"=>"\u03B8", "\u{1D6DE}"=>"\u03BA", "\u{1D6DF}"=>"\u03C6", "\u{1D6E0}"=>"\u03C1", "\u{1D6E1}"=>"\u03C0", "\u{1D6E2}"=>"\u0391", "\u{1D6E3}"=>"\u0392",
+    "\u{1D6E4}"=>"\u0393", "\u{1D6E5}"=>"\u0394", "\u{1D6E6}"=>"\u0395", "\u{1D6E7}"=>"\u0396", "\u{1D6E8}"=>"\u0397", "\u{1D6E9}"=>"\u0398", "\u{1D6EA}"=>"\u0399", "\u{1D6EB}"=>"\u039A",
+    "\u{1D6EC}"=>"\u039B", "\u{1D6ED}"=>"\u039C", "\u{1D6EE}"=>"\u039D", "\u{1D6EF}"=>"\u039E", "\u{1D6F0}"=>"\u039F", "\u{1D6F1}"=>"\u03A0", "\u{1D6F2}"=>"\u03A1", "\u{1D6F3}"=>"\u0398",
+    "\u{1D6F4}"=>"\u03A3", "\u{1D6F5}"=>"\u03A4", "\u{1D6F6}"=>"\u03A5", "\u{1D6F7}"=>"\u03A6", "\u{1D6F8}"=>"\u03A7", "\u{1D6F9}"=>"\u03A8", "\u{1D6FA}"=>"\u03A9", "\u{1D6FB}"=>"\u2207",
+    "\u{1D6FC}"=>"\u03B1", "\u{1D6FD}"=>"\u03B2", "\u{1D6FE}"=>"\u03B3", "\u{1D6FF}"=>"\u03B4", "\u{1D700}"=>"\u03B5", "\u{1D701}"=>"\u03B6", "\u{1D702}"=>"\u03B7", "\u{1D703}"=>"\u03B8",
+    "\u{1D704}"=>"\u03B9", "\u{1D705}"=>"\u03BA", "\u{1D706}"=>"\u03BB", "\u{1D707}"=>"\u03BC", "\u{1D708}"=>"\u03BD", "\u{1D709}"=>"\u03BE", "\u{1D70A}"=>"\u03BF", "\u{1D70B}"=>"\u03C0",
+    "\u{1D70C}"=>"\u03C1", "\u{1D70D}"=>"\u03C2", "\u{1D70E}"=>"\u03C3", "\u{1D70F}"=>"\u03C4", "\u{1D710}"=>"\u03C5", "\u{1D711}"=>"\u03C6", "\u{1D712}"=>"\u03C7", "\u{1D713}"=>"\u03C8",
+    "\u{1D714}"=>"\u03C9", "\u{1D715}"=>"\u2202", "\u{1D716}"=>"\u03B5", "\u{1D717}"=>"\u03B8", "\u{1D718}"=>"\u03BA", "\u{1D719}"=>"\u03C6", "\u{1D71A}"=>"\u03C1", "\u{1D71B}"=>"\u03C0",
+    "\u{1D71C}"=>"\u0391", "\u{1D71D}"=>"\u0392", "\u{1D71E}"=>"\u0393", "\u{1D71F}"=>"\u0394", "\u{1D720}"=>"\u0395", "\u{1D721}"=>"\u0396", "\u{1D722}"=>"\u0397", "\u{1D723}"=>"\u0398",
+    "\u{1D724}"=>"\u0399", "\u{1D725}"=>"\u039A", "\u{1D726}"=>"\u039B", "\u{1D727}"=>"\u039C", "\u{1D728}"=>"\u039D", "\u{1D729}"=>"\u039E", "\u{1D72A}"=>"\u039F", "\u{1D72B}"=>"\u03A0",
+    "\u{1D72C}"=>"\u03A1", "\u{1D72D}"=>"\u0398", "\u{1D72E}"=>"\u03A3", "\u{1D72F}"=>"\u03A4", "\u{1D730}"=>"\u03A5", "\u{1D731}"=>"\u03A6", "\u{1D732}"=>"\u03A7", "\u{1D733}"=>"\u03A8",
+    "\u{1D734}"=>"\u03A9", "\u{1D735}"=>"\u2207", "\u{1D736}"=>"\u03B1", "\u{1D737}"=>"\u03B2", "\u{1D738}"=>"\u03B3", "\u{1D739}"=>"\u03B4", "\u{1D73A}"=>"\u03B5", "\u{1D73B}"=>"\u03B6",
+    "\u{1D73C}"=>"\u03B7", "\u{1D73D}"=>"\u03B8", "\u{1D73E}"=>"\u03B9", "\u{1D73F}"=>"\u03BA", "\u{1D740}"=>"\u03BB", "\u{1D741}"=>"\u03BC", "\u{1D742}"=>"\u03BD", "\u{1D743}"=>"\u03BE",
+    "\u{1D744}"=>"\u03BF", "\u{1D745}"=>"\u03C0", "\u{1D746}"=>"\u03C1", "\u{1D747}"=>"\u03C2", "\u{1D748}"=>"\u03C3", "\u{1D749}"=>"\u03C4", "\u{1D74A}"=>"\u03C5", "\u{1D74B}"=>"\u03C6",
+    "\u{1D74C}"=>"\u03C7", "\u{1D74D}"=>"\u03C8", "\u{1D74E}"=>"\u03C9", "\u{1D74F}"=>"\u2202", "\u{1D750}"=>"\u03B5", "\u{1D751}"=>"\u03B8", "\u{1D752}"=>"\u03BA", "\u{1D753}"=>"\u03C6",
+    "\u{1D754}"=>"\u03C1", "\u{1D755}"=>"\u03C0", "\u{1D756}"=>"\u0391", "\u{1D757}"=>"\u0392", "\u{1D758}"=>"\u0393", "\u{1D759}"=>"\u0394", "\u{1D75A}"=>"\u0395", "\u{1D75B}"=>"\u0396",
+    "\u{1D75C}"=>"\u0397", "\u{1D75D}"=>"\u0398", "\u{1D75E}"=>"\u0399", "\u{1D75F}"=>"\u039A", "\u{1D760}"=>"\u039B", "\u{1D761}"=>"\u039C", "\u{1D762}"=>"\u039D", "\u{1D763}"=>"\u039E",
+    "\u{1D764}"=>"\u039F", "\u{1D765}"=>"\u03A0", "\u{1D766}"=>"\u03A1", "\u{1D767}"=>"\u0398", "\u{1D768}"=>"\u03A3", "\u{1D769}"=>"\u03A4", "\u{1D76A}"=>"\u03A5", "\u{1D76B}"=>"\u03A6",
+    "\u{1D76C}"=>"\u03A7", "\u{1D76D}"=>"\u03A8", "\u{1D76E}"=>"\u03A9", "\u{1D76F}"=>"\u2207", "\u{1D770}"=>"\u03B1", "\u{1D771}"=>"\u03B2", "\u{1D772}"=>"\u03B3", "\u{1D773}"=>"\u03B4",
+    "\u{1D774}"=>"\u03B5", "\u{1D775}"=>"\u03B6", "\u{1D776}"=>"\u03B7", "\u{1D777}"=>"\u03B8", "\u{1D778}"=>"\u03B9", "\u{1D779}"=>"\u03BA", "\u{1D77A}"=>"\u03BB", "\u{1D77B}"=>"\u03BC",
+    "\u{1D77C}"=>"\u03BD", "\u{1D77D}"=>"\u03BE", "\u{1D77E}"=>"\u03BF", "\u{1D77F}"=>"\u03C0", "\u{1D780}"=>"\u03C1", "\u{1D781}"=>"\u03C2", "\u{1D782}"=>"\u03C3", "\u{1D783}"=>"\u03C4",
+    "\u{1D784}"=>"\u03C5", "\u{1D785}"=>"\u03C6", "\u{1D786}"=>"\u03C7", "\u{1D787}"=>"\u03C8", "\u{1D788}"=>"\u03C9", "\u{1D789}"=>"\u2202", "\u{1D78A}"=>"\u03B5", "\u{1D78B}"=>"\u03B8",
+    "\u{1D78C}"=>"\u03BA", "\u{1D78D}"=>"\u03C6", "\u{1D78E}"=>"\u03C1", "\u{1D78F}"=>"\u03C0", "\u{1D790}"=>"\u0391", "\u{1D791}"=>"\u0392", "\u{1D792}"=>"\u0393", "\u{1D793}"=>"\u0394",
+    "\u{1D794}"=>"\u0395", "\u{1D795}"=>"\u0396", "\u{1D796}"=>"\u0397", "\u{1D797}"=>"\u0398", "\u{1D798}"=>"\u0399", "\u{1D799}"=>"\u039A", "\u{1D79A}"=>"\u039B", "\u{1D79B}"=>"\u039C",
+    "\u{1D79C}"=>"\u039D", "\u{1D79D}"=>"\u039E", "\u{1D79E}"=>"\u039F", "\u{1D79F}"=>"\u03A0", "\u{1D7A0}"=>"\u03A1", "\u{1D7A1}"=>"\u0398", "\u{1D7A2}"=>"\u03A3", "\u{1D7A3}"=>"\u03A4",
+    "\u{1D7A4}"=>"\u03A5", "\u{1D7A5}"=>"\u03A6", "\u{1D7A6}"=>"\u03A7", "\u{1D7A7}"=>"\u03A8", "\u{1D7A8}"=>"\u03A9", "\u{1D7A9}"=>"\u2207", "\u{1D7AA}"=>"\u03B1", "\u{1D7AB}"=>"\u03B2",
+    "\u{1D7AC}"=>"\u03B3", "\u{1D7AD}"=>"\u03B4", "\u{1D7AE}"=>"\u03B5", "\u{1D7AF}"=>"\u03B6", "\u{1D7B0}"=>"\u03B7", "\u{1D7B1}"=>"\u03B8", "\u{1D7B2}"=>"\u03B9", "\u{1D7B3}"=>"\u03BA",
+    "\u{1D7B4}"=>"\u03BB", "\u{1D7B5}"=>"\u03BC", "\u{1D7B6}"=>"\u03BD", "\u{1D7B7}"=>"\u03BE", "\u{1D7B8}"=>"\u03BF", "\u{1D7B9}"=>"\u03C0", "\u{1D7BA}"=>"\u03C1", "\u{1D7BB}"=>"\u03C2",
+    "\u{1D7BC}"=>"\u03C3", "\u{1D7BD}"=>"\u03C4", "\u{1D7BE}"=>"\u03C5", "\u{1D7BF}"=>"\u03C6", "\u{1D7C0}"=>"\u03C7", "\u{1D7C1}"=>"\u03C8", "\u{1D7C2}"=>"\u03C9", "\u{1D7C3}"=>"\u2202",
+    "\u{1D7C4}"=>"\u03B5", "\u{1D7C5}"=>"\u03B8", "\u{1D7C6}"=>"\u03BA", "\u{1D7C7}"=>"\u03C6", "\u{1D7C8}"=>"\u03C1", "\u{1D7C9}"=>"\u03C0", "\u{1D7CA}"=>"\u03DC", "\u{1D7CB}"=>"\u03DD",
+    "\u{1D7CE}"=>"0", "\u{1D7CF}"=>"1", "\u{1D7D0}"=>"2", "\u{1D7D1}"=>"3", "\u{1D7D2}"=>"4", "\u{1D7D3}"=>"5", "\u{1D7D4}"=>"6", "\u{1D7D5}"=>"7",
+    "\u{1D7D6}"=>"8", "\u{1D7D7}"=>"9", "\u{1D7D8}"=>"0", "\u{1D7D9}"=>"1", "\u{1D7DA}"=>"2", "\u{1D7DB}"=>"3", "\u{1D7DC}"=>"4", "\u{1D7DD}"=>"5",
+    "\u{1D7DE}"=>"6", "\u{1D7DF}"=>"7", "\u{1D7E0}"=>"8", "\u{1D7E1}"=>"9", "\u{1D7E2}"=>"0", "\u{1D7E3}"=>"1", "\u{1D7E4}"=>"2", "\u{1D7E5}"=>"3",
+    "\u{1D7E6}"=>"4", "\u{1D7E7}"=>"5", "\u{1D7E8}"=>"6", "\u{1D7E9}"=>"7", "\u{1D7EA}"=>"8", "\u{1D7EB}"=>"9", "\u{1D7EC}"=>"0", "\u{1D7ED}"=>"1",
+    "\u{1D7EE}"=>"2", "\u{1D7EF}"=>"3", "\u{1D7F0}"=>"4", "\u{1D7F1}"=>"5", "\u{1D7F2}"=>"6", "\u{1D7F3}"=>"7", "\u{1D7F4}"=>"8", "\u{1D7F5}"=>"9",
+    "\u{1D7F6}"=>"0", "\u{1D7F7}"=>"1", "\u{1D7F8}"=>"2", "\u{1D7F9}"=>"3", "\u{1D7FA}"=>"4", "\u{1D7FB}"=>"5", "\u{1D7FC}"=>"6", "\u{1D7FD}"=>"7",
+    "\u{1D7FE}"=>"8", "\u{1D7FF}"=>"9", "\u{1EE00}"=>"\u0627", "\u{1EE01}"=>"\u0628", "\u{1EE02}"=>"\u062C", "\u{1EE03}"=>"\u062F", "\u{1EE05}"=>"\u0648", "\u{1EE06}"=>"\u0632",
+    "\u{1EE07}"=>"\u062D", "\u{1EE08}"=>"\u0637", "\u{1EE09}"=>"\u064A", "\u{1EE0A}"=>"\u0643", "\u{1EE0B}"=>"\u0644", "\u{1EE0C}"=>"\u0645", "\u{1EE0D}"=>"\u0646", "\u{1EE0E}"=>"\u0633",
+    "\u{1EE0F}"=>"\u0639", "\u{1EE10}"=>"\u0641", "\u{1EE11}"=>"\u0635", "\u{1EE12}"=>"\u0642", "\u{1EE13}"=>"\u0631", "\u{1EE14}"=>"\u0634", "\u{1EE15}"=>"\u062A", "\u{1EE16}"=>"\u062B",
+    "\u{1EE17}"=>"\u062E", "\u{1EE18}"=>"\u0630", "\u{1EE19}"=>"\u0636", "\u{1EE1A}"=>"\u0638", "\u{1EE1B}"=>"\u063A", "\u{1EE1C}"=>"\u066E", "\u{1EE1D}"=>"\u06BA", "\u{1EE1E}"=>"\u06A1",
+    "\u{1EE1F}"=>"\u066F", "\u{1EE21}"=>"\u0628", "\u{1EE22}"=>"\u062C", "\u{1EE24}"=>"\u0647", "\u{1EE27}"=>"\u062D", "\u{1EE29}"=>"\u064A", "\u{1EE2A}"=>"\u0643", "\u{1EE2B}"=>"\u0644",
+    "\u{1EE2C}"=>"\u0645", "\u{1EE2D}"=>"\u0646", "\u{1EE2E}"=>"\u0633", "\u{1EE2F}"=>"\u0639", "\u{1EE30}"=>"\u0641", "\u{1EE31}"=>"\u0635", "\u{1EE32}"=>"\u0642", "\u{1EE34}"=>"\u0634",
+    "\u{1EE35}"=>"\u062A", "\u{1EE36}"=>"\u062B", "\u{1EE37}"=>"\u062E", "\u{1EE39}"=>"\u0636", "\u{1EE3B}"=>"\u063A", "\u{1EE42}"=>"\u062C", "\u{1EE47}"=>"\u062D", "\u{1EE49}"=>"\u064A",
+    "\u{1EE4B}"=>"\u0644", "\u{1EE4D}"=>"\u0646", "\u{1EE4E}"=>"\u0633", "\u{1EE4F}"=>"\u0639", "\u{1EE51}"=>"\u0635", "\u{1EE52}"=>"\u0642", "\u{1EE54}"=>"\u0634", "\u{1EE57}"=>"\u062E",
+    "\u{1EE59}"=>"\u0636", "\u{1EE5B}"=>"\u063A", "\u{1EE5D}"=>"\u06BA", "\u{1EE5F}"=>"\u066F", "\u{1EE61}"=>"\u0628", "\u{1EE62}"=>"\u062C", "\u{1EE64}"=>"\u0647", "\u{1EE67}"=>"\u062D",
+    "\u{1EE68}"=>"\u0637", "\u{1EE69}"=>"\u064A", "\u{1EE6A}"=>"\u0643", "\u{1EE6C}"=>"\u0645", "\u{1EE6D}"=>"\u0646", "\u{1EE6E}"=>"\u0633", "\u{1EE6F}"=>"\u0639", "\u{1EE70}"=>"\u0641",
+    "\u{1EE71}"=>"\u0635", "\u{1EE72}"=>"\u0642", "\u{1EE74}"=>"\u0634", "\u{1EE75}"=>"\u062A", "\u{1EE76}"=>"\u062B", "\u{1EE77}"=>"\u062E", "\u{1EE79}"=>"\u0636", "\u{1EE7A}"=>"\u0638",
+    "\u{1EE7B}"=>"\u063A", "\u{1EE7C}"=>"\u066E", "\u{1EE7E}"=>"\u06A1", "\u{1EE80}"=>"\u0627", "\u{1EE81}"=>"\u0628", "\u{1EE82}"=>"\u062C", "\u{1EE83}"=>"\u062F", "\u{1EE84}"=>"\u0647",
+    "\u{1EE85}"=>"\u0648", "\u{1EE86}"=>"\u0632", "\u{1EE87}"=>"\u062D", "\u{1EE88}"=>"\u0637", "\u{1EE89}"=>"\u064A", "\u{1EE8B}"=>"\u0644", "\u{1EE8C}"=>"\u0645", "\u{1EE8D}"=>"\u0646",
+    "\u{1EE8E}"=>"\u0633", "\u{1EE8F}"=>"\u0639", "\u{1EE90}"=>"\u0641", "\u{1EE91}"=>"\u0635", "\u{1EE92}"=>"\u0642", "\u{1EE93}"=>"\u0631", "\u{1EE94}"=>"\u0634", "\u{1EE95}"=>"\u062A",
+    "\u{1EE96}"=>"\u062B", "\u{1EE97}"=>"\u062E", "\u{1EE98}"=>"\u0630", "\u{1EE99}"=>"\u0636", "\u{1EE9A}"=>"\u0638", "\u{1EE9B}"=>"\u063A", "\u{1EEA1}"=>"\u0628", "\u{1EEA2}"=>"\u062C",
+    "\u{1EEA3}"=>"\u062F", "\u{1EEA5}"=>"\u0648", "\u{1EEA6}"=>"\u0632", "\u{1EEA7}"=>"\u062D", "\u{1EEA8}"=>"\u0637", "\u{1EEA9}"=>"\u064A", "\u{1EEAB}"=>"\u0644", "\u{1EEAC}"=>"\u0645",
+    "\u{1EEAD}"=>"\u0646", "\u{1EEAE}"=>"\u0633", "\u{1EEAF}"=>"\u0639", "\u{1EEB0}"=>"\u0641", "\u{1EEB1}"=>"\u0635", "\u{1EEB2}"=>"\u0642", "\u{1EEB3}"=>"\u0631", "\u{1EEB4}"=>"\u0634",
+    "\u{1EEB5}"=>"\u062A", "\u{1EEB6}"=>"\u062B", "\u{1EEB7}"=>"\u062E", "\u{1EEB8}"=>"\u0630", "\u{1EEB9}"=>"\u0636", "\u{1EEBA}"=>"\u0638", "\u{1EEBB}"=>"\u063A", "\u{1F100}"=>"0.",
+    "\u{1F101}"=>"0,", "\u{1F102}"=>"1,", "\u{1F103}"=>"2,", "\u{1F104}"=>"3,", "\u{1F105}"=>"4,", "\u{1F106}"=>"5,", "\u{1F107}"=>"6,", "\u{1F108}"=>"7,",
+    "\u{1F109}"=>"8,", "\u{1F10A}"=>"9,", "\u{1F110}"=>"(A)", "\u{1F111}"=>"(B)", "\u{1F112}"=>"(C)", "\u{1F113}"=>"(D)", "\u{1F114}"=>"(E)", "\u{1F115}"=>"(F)",
+    "\u{1F116}"=>"(G)", "\u{1F117}"=>"(H)", "\u{1F118}"=>"(I)", "\u{1F119}"=>"(J)", "\u{1F11A}"=>"(K)", "\u{1F11B}"=>"(L)", "\u{1F11C}"=>"(M)", "\u{1F11D}"=>"(N)",
+    "\u{1F11E}"=>"(O)", "\u{1F11F}"=>"(P)", "\u{1F120}"=>"(Q)", "\u{1F121}"=>"(R)", "\u{1F122}"=>"(S)", "\u{1F123}"=>"(T)", "\u{1F124}"=>"(U)", "\u{1F125}"=>"(V)",
+    "\u{1F126}"=>"(W)", "\u{1F127}"=>"(X)", "\u{1F128}"=>"(Y)", "\u{1F129}"=>"(Z)", "\u{1F12A}"=>"\u3014S\u3015", "\u{1F12B}"=>"C", "\u{1F12C}"=>"R", "\u{1F12D}"=>"CD",
+    "\u{1F12E}"=>"WZ", "\u{1F130}"=>"A", "\u{1F131}"=>"B", "\u{1F132}"=>"C", "\u{1F133}"=>"D", "\u{1F134}"=>"E", "\u{1F135}"=>"F", "\u{1F136}"=>"G",
+    "\u{1F137}"=>"H", "\u{1F138}"=>"I", "\u{1F139}"=>"J", "\u{1F13A}"=>"K", "\u{1F13B}"=>"L", "\u{1F13C}"=>"M", "\u{1F13D}"=>"N", "\u{1F13E}"=>"O",
+    "\u{1F13F}"=>"P", "\u{1F140}"=>"Q", "\u{1F141}"=>"R", "\u{1F142}"=>"S", "\u{1F143}"=>"T", "\u{1F144}"=>"U", "\u{1F145}"=>"V", "\u{1F146}"=>"W",
+    "\u{1F147}"=>"X", "\u{1F148}"=>"Y", "\u{1F149}"=>"Z", "\u{1F14A}"=>"HV", "\u{1F14B}"=>"MV", "\u{1F14C}"=>"SD", "\u{1F14D}"=>"SS", "\u{1F14E}"=>"PPV",
+    "\u{1F14F}"=>"WC", "\u{1F16A}"=>"MC", "\u{1F16B}"=>"MD", "\u{1F190}"=>"DJ", "\u{1F200}"=>"\u307B\u304B", "\u{1F201}"=>"\u30B3\u30B3", "\u{1F202}"=>"\u30B5", "\u{1F210}"=>"\u624B",
+    "\u{1F211}"=>"\u5B57", "\u{1F212}"=>"\u53CC", "\u{1F213}"=>"\u30C7", "\u{1F214}"=>"\u4E8C", "\u{1F215}"=>"\u591A", "\u{1F216}"=>"\u89E3", "\u{1F217}"=>"\u5929", "\u{1F218}"=>"\u4EA4",
+    "\u{1F219}"=>"\u6620", "\u{1F21A}"=>"\u7121", "\u{1F21B}"=>"\u6599", "\u{1F21C}"=>"\u524D", "\u{1F21D}"=>"\u5F8C", "\u{1F21E}"=>"\u518D", "\u{1F21F}"=>"\u65B0", "\u{1F220}"=>"\u521D",
+    "\u{1F221}"=>"\u7D42", "\u{1F222}"=>"\u751F", "\u{1F223}"=>"\u8CA9", "\u{1F224}"=>"\u58F0", "\u{1F225}"=>"\u5439", "\u{1F226}"=>"\u6F14", "\u{1F227}"=>"\u6295", "\u{1F228}"=>"\u6355",
+    "\u{1F229}"=>"\u4E00", "\u{1F22A}"=>"\u4E09", "\u{1F22B}"=>"\u904A", "\u{1F22C}"=>"\u5DE6", "\u{1F22D}"=>"\u4E2D", "\u{1F22E}"=>"\u53F3", "\u{1F22F}"=>"\u6307", "\u{1F230}"=>"\u8D70",
+    "\u{1F231}"=>"\u6253", "\u{1F232}"=>"\u7981", "\u{1F233}"=>"\u7A7A", "\u{1F234}"=>"\u5408", "\u{1F235}"=>"\u6E80", "\u{1F236}"=>"\u6709", "\u{1F237}"=>"\u6708", "\u{1F238}"=>"\u7533",
+    "\u{1F239}"=>"\u5272", "\u{1F23A}"=>"\u55B6", "\u{1F23B}"=>"\u914D", "\u{1F240}"=>"\u3014\u672C\u3015", "\u{1F241}"=>"\u3014\u4E09\u3015", "\u{1F242}"=>"\u3014\u4E8C\u3015", "\u{1F243}"=>"\u3014\u5B89\u3015", "\u{1F244}"=>"\u3014\u70B9\u3015",
+    "\u{1F245}"=>"\u3014\u6253\u3015", "\u{1F246}"=>"\u3014\u76D7\u3015", "\u{1F247}"=>"\u3014\u52DD\u3015", "\u{1F248}"=>"\u3014\u6557\u3015", "\u{1F250}"=>"\u5F97", "\u{1F251}"=>"\u53EF", "\u0385"=>" \u0308\u0301", "\u03D3"=>"\u03A5\u0301",
+    "\u03D4"=>"\u03A5\u0308", "\u1E9B"=>"s\u0307", "\u1FC1"=>" \u0308\u0342", "\u1FCD"=>" \u0313\u0300", "\u1FCE"=>" \u0313\u0301", "\u1FCF"=>" \u0313\u0342", "\u1FDD"=>" \u0314\u0300", "\u1FDE"=>" \u0314\u0301",
+    "\u1FDF"=>" \u0314\u0342", "\u1FED"=>" \u0308\u0300", "\u1FEE"=>" \u0308\u0301", "\u1FFD"=>" \u0301", "\u2000"=>" ", "\u2001"=>" ",
   }.freeze
 
   COMPOSITION_TABLE = {
-    "A\u0300"=>"\u00C0",
-    "A\u0301"=>"\u00C1",
-    "A\u0302"=>"\u00C2",
-    "A\u0303"=>"\u00C3",
-    "A\u0308"=>"\u00C4",
-    "A\u030A"=>"\u00C5",
-    "C\u0327"=>"\u00C7",
-    "E\u0300"=>"\u00C8",
-    "E\u0301"=>"\u00C9",
-    "E\u0302"=>"\u00CA",
-    "E\u0308"=>"\u00CB",
-    "I\u0300"=>"\u00CC",
-    "I\u0301"=>"\u00CD",
-    "I\u0302"=>"\u00CE",
-    "I\u0308"=>"\u00CF",
-    "N\u0303"=>"\u00D1",
-    "O\u0300"=>"\u00D2",
-    "O\u0301"=>"\u00D3",
-    "O\u0302"=>"\u00D4",
-    "O\u0303"=>"\u00D5",
-    "O\u0308"=>"\u00D6",
-    "U\u0300"=>"\u00D9",
-    "U\u0301"=>"\u00DA",
-    "U\u0302"=>"\u00DB",
-    "U\u0308"=>"\u00DC",
-    "Y\u0301"=>"\u00DD",
-    "a\u0300"=>"\u00E0",
-    "a\u0301"=>"\u00E1",
-    "a\u0302"=>"\u00E2",
-    "a\u0303"=>"\u00E3",
-    "a\u0308"=>"\u00E4",
-    "a\u030A"=>"\u00E5",
-    "c\u0327"=>"\u00E7",
-    "e\u0300"=>"\u00E8",
-    "e\u0301"=>"\u00E9",
-    "e\u0302"=>"\u00EA",
-    "e\u0308"=>"\u00EB",
-    "i\u0300"=>"\u00EC",
-    "i\u0301"=>"\u00ED",
-    "i\u0302"=>"\u00EE",
-    "i\u0308"=>"\u00EF",
-    "n\u0303"=>"\u00F1",
-    "o\u0300"=>"\u00F2",
-    "o\u0301"=>"\u00F3",
-    "o\u0302"=>"\u00F4",
-    "o\u0303"=>"\u00F5",
-    "o\u0308"=>"\u00F6",
-    "u\u0300"=>"\u00F9",
-    "u\u0301"=>"\u00FA",
-    "u\u0302"=>"\u00FB",
-    "u\u0308"=>"\u00FC",
-    "y\u0301"=>"\u00FD",
-    "y\u0308"=>"\u00FF",
-    "A\u0304"=>"\u0100",
-    "a\u0304"=>"\u0101",
-    "A\u0306"=>"\u0102",
-    "a\u0306"=>"\u0103",
-    "A\u0328"=>"\u0104",
-    "a\u0328"=>"\u0105",
-    "C\u0301"=>"\u0106",
-    "c\u0301"=>"\u0107",
-    "C\u0302"=>"\u0108",
-    "c\u0302"=>"\u0109",
-    "C\u0307"=>"\u010A",
-    "c\u0307"=>"\u010B",
-    "C\u030C"=>"\u010C",
-    "c\u030C"=>"\u010D",
-    "D\u030C"=>"\u010E",
-    "d\u030C"=>"\u010F",
-    "E\u0304"=>"\u0112",
-    "e\u0304"=>"\u0113",
-    "E\u0306"=>"\u0114",
-    "e\u0306"=>"\u0115",
-    "E\u0307"=>"\u0116",
-    "e\u0307"=>"\u0117",
-    "E\u0328"=>"\u0118",
-    "e\u0328"=>"\u0119",
-    "E\u030C"=>"\u011A",
-    "e\u030C"=>"\u011B",
-    "G\u0302"=>"\u011C",
-    "g\u0302"=>"\u011D",
-    "G\u0306"=>"\u011E",
-    "g\u0306"=>"\u011F",
-    "G\u0307"=>"\u0120",
-    "g\u0307"=>"\u0121",
-    "G\u0327"=>"\u0122",
-    "g\u0327"=>"\u0123",
-    "H\u0302"=>"\u0124",
-    "h\u0302"=>"\u0125",
-    "I\u0303"=>"\u0128",
-    "i\u0303"=>"\u0129",
-    "I\u0304"=>"\u012A",
-    "i\u0304"=>"\u012B",
-    "I\u0306"=>"\u012C",
-    "i\u0306"=>"\u012D",
-    "I\u0328"=>"\u012E",
-    "i\u0328"=>"\u012F",
-    "I\u0307"=>"\u0130",
-    "J\u0302"=>"\u0134",
-    "j\u0302"=>"\u0135",
-    "K\u0327"=>"\u0136",
-    "k\u0327"=>"\u0137",
-    "L\u0301"=>"\u0139",
-    "l\u0301"=>"\u013A",
-    "L\u0327"=>"\u013B",
-    "l\u0327"=>"\u013C",
-    "L\u030C"=>"\u013D",
-    "l\u030C"=>"\u013E",
-    "N\u0301"=>"\u0143",
-    "n\u0301"=>"\u0144",
-    "N\u0327"=>"\u0145",
-    "n\u0327"=>"\u0146",
-    "N\u030C"=>"\u0147",
-    "n\u030C"=>"\u0148",
-    "O\u0304"=>"\u014C",
-    "o\u0304"=>"\u014D",
-    "O\u0306"=>"\u014E",
-    "o\u0306"=>"\u014F",
-    "O\u030B"=>"\u0150",
-    "o\u030B"=>"\u0151",
-    "R\u0301"=>"\u0154",
-    "r\u0301"=>"\u0155",
-    "R\u0327"=>"\u0156",
-    "r\u0327"=>"\u0157",
-    "R\u030C"=>"\u0158",
-    "r\u030C"=>"\u0159",
-    "S\u0301"=>"\u015A",
-    "s\u0301"=>"\u015B",
-    "S\u0302"=>"\u015C",
-    "s\u0302"=>"\u015D",
-    "S\u0327"=>"\u015E",
-    "s\u0327"=>"\u015F",
-    "S\u030C"=>"\u0160",
-    "s\u030C"=>"\u0161",
-    "T\u0327"=>"\u0162",
-    "t\u0327"=>"\u0163",
-    "T\u030C"=>"\u0164",
-    "t\u030C"=>"\u0165",
-    "U\u0303"=>"\u0168",
-    "u\u0303"=>"\u0169",
-    "U\u0304"=>"\u016A",
-    "u\u0304"=>"\u016B",
-    "U\u0306"=>"\u016C",
-    "u\u0306"=>"\u016D",
-    "U\u030A"=>"\u016E",
-    "u\u030A"=>"\u016F",
-    "U\u030B"=>"\u0170",
-    "u\u030B"=>"\u0171",
-    "U\u0328"=>"\u0172",
-    "u\u0328"=>"\u0173",
-    "W\u0302"=>"\u0174",
-    "w\u0302"=>"\u0175",
-    "Y\u0302"=>"\u0176",
-    "y\u0302"=>"\u0177",
-    "Y\u0308"=>"\u0178",
-    "Z\u0301"=>"\u0179",
-    "z\u0301"=>"\u017A",
-    "Z\u0307"=>"\u017B",
-    "z\u0307"=>"\u017C",
-    "Z\u030C"=>"\u017D",
-    "z\u030C"=>"\u017E",
-    "O\u031B"=>"\u01A0",
-    "o\u031B"=>"\u01A1",
-    "U\u031B"=>"\u01AF",
-    "u\u031B"=>"\u01B0",
-    "A\u030C"=>"\u01CD",
-    "a\u030C"=>"\u01CE",
-    "I\u030C"=>"\u01CF",
-    "i\u030C"=>"\u01D0",
-    "O\u030C"=>"\u01D1",
-    "o\u030C"=>"\u01D2",
-    "U\u030C"=>"\u01D3",
-    "u\u030C"=>"\u01D4",
-    "\u00DC\u0304"=>"\u01D5",
-    "\u00FC\u0304"=>"\u01D6",
-    "\u00DC\u0301"=>"\u01D7",
-    "\u00FC\u0301"=>"\u01D8",
-    "\u00DC\u030C"=>"\u01D9",
-    "\u00FC\u030C"=>"\u01DA",
-    "\u00DC\u0300"=>"\u01DB",
-    "\u00FC\u0300"=>"\u01DC",
-    "\u00C4\u0304"=>"\u01DE",
-    "\u00E4\u0304"=>"\u01DF",
-    "\u0226\u0304"=>"\u01E0",
-    "\u0227\u0304"=>"\u01E1",
-    "\u00C6\u0304"=>"\u01E2",
-    "\u00E6\u0304"=>"\u01E3",
-    "G\u030C"=>"\u01E6",
-    "g\u030C"=>"\u01E7",
-    "K\u030C"=>"\u01E8",
-    "k\u030C"=>"\u01E9",
-    "O\u0328"=>"\u01EA",
-    "o\u0328"=>"\u01EB",
-    "\u01EA\u0304"=>"\u01EC",
-    "\u01EB\u0304"=>"\u01ED",
-    "\u01B7\u030C"=>"\u01EE",
-    "\u0292\u030C"=>"\u01EF",
-    "j\u030C"=>"\u01F0",
-    "G\u0301"=>"\u01F4",
-    "g\u0301"=>"\u01F5",
-    "N\u0300"=>"\u01F8",
-    "n\u0300"=>"\u01F9",
-    "\u00C5\u0301"=>"\u01FA",
-    "\u00E5\u0301"=>"\u01FB",
-    "\u00C6\u0301"=>"\u01FC",
-    "\u00E6\u0301"=>"\u01FD",
-    "\u00D8\u0301"=>"\u01FE",
-    "\u00F8\u0301"=>"\u01FF",
-    "A\u030F"=>"\u0200",
-    "a\u030F"=>"\u0201",
-    "A\u0311"=>"\u0202",
-    "a\u0311"=>"\u0203",
-    "E\u030F"=>"\u0204",
-    "e\u030F"=>"\u0205",
-    "E\u0311"=>"\u0206",
-    "e\u0311"=>"\u0207",
-    "I\u030F"=>"\u0208",
-    "i\u030F"=>"\u0209",
-    "I\u0311"=>"\u020A",
-    "i\u0311"=>"\u020B",
-    "O\u030F"=>"\u020C",
-    "o\u030F"=>"\u020D",
-    "O\u0311"=>"\u020E",
-    "o\u0311"=>"\u020F",
-    "R\u030F"=>"\u0210",
-    "r\u030F"=>"\u0211",
-    "R\u0311"=>"\u0212",
-    "r\u0311"=>"\u0213",
-    "U\u030F"=>"\u0214",
-    "u\u030F"=>"\u0215",
-    "U\u0311"=>"\u0216",
-    "u\u0311"=>"\u0217",
-    "S\u0326"=>"\u0218",
-    "s\u0326"=>"\u0219",
-    "T\u0326"=>"\u021A",
-    "t\u0326"=>"\u021B",
-    "H\u030C"=>"\u021E",
-    "h\u030C"=>"\u021F",
-    "A\u0307"=>"\u0226",
-    "a\u0307"=>"\u0227",
-    "E\u0327"=>"\u0228",
-    "e\u0327"=>"\u0229",
-    "\u00D6\u0304"=>"\u022A",
-    "\u00F6\u0304"=>"\u022B",
-    "\u00D5\u0304"=>"\u022C",
-    "\u00F5\u0304"=>"\u022D",
-    "O\u0307"=>"\u022E",
-    "o\u0307"=>"\u022F",
-    "\u022E\u0304"=>"\u0230",
-    "\u022F\u0304"=>"\u0231",
-    "Y\u0304"=>"\u0232",
-    "y\u0304"=>"\u0233",
-    "\u00A8\u0301"=>"\u0385",
-    "\u0391\u0301"=>"\u0386",
-    "\u0395\u0301"=>"\u0388",
-    "\u0397\u0301"=>"\u0389",
-    "\u0399\u0301"=>"\u038A",
-    "\u039F\u0301"=>"\u038C",
-    "\u03A5\u0301"=>"\u038E",
-    "\u03A9\u0301"=>"\u038F",
-    "\u03CA\u0301"=>"\u0390",
-    "\u0399\u0308"=>"\u03AA",
-    "\u03A5\u0308"=>"\u03AB",
-    "\u03B1\u0301"=>"\u03AC",
-    "\u03B5\u0301"=>"\u03AD",
-    "\u03B7\u0301"=>"\u03AE",
-    "\u03B9\u0301"=>"\u03AF",
-    "\u03CB\u0301"=>"\u03B0",
-    "\u03B9\u0308"=>"\u03CA",
-    "\u03C5\u0308"=>"\u03CB",
-    "\u03BF\u0301"=>"\u03CC",
-    "\u03C5\u0301"=>"\u03CD",
-    "\u03C9\u0301"=>"\u03CE",
-    "\u03D2\u0301"=>"\u03D3",
-    "\u03D2\u0308"=>"\u03D4",
-    "\u0415\u0300"=>"\u0400",
-    "\u0415\u0308"=>"\u0401",
-    "\u0413\u0301"=>"\u0403",
-    "\u0406\u0308"=>"\u0407",
-    "\u041A\u0301"=>"\u040C",
-    "\u0418\u0300"=>"\u040D",
-    "\u0423\u0306"=>"\u040E",
-    "\u0418\u0306"=>"\u0419",
-    "\u0438\u0306"=>"\u0439",
-    "\u0435\u0300"=>"\u0450",
-    "\u0435\u0308"=>"\u0451",
-    "\u0433\u0301"=>"\u0453",
-    "\u0456\u0308"=>"\u0457",
-    "\u043A\u0301"=>"\u045C",
-    "\u0438\u0300"=>"\u045D",
-    "\u0443\u0306"=>"\u045E",
-    "\u0474\u030F"=>"\u0476",
-    "\u0475\u030F"=>"\u0477",
-    "\u0416\u0306"=>"\u04C1",
-    "\u0436\u0306"=>"\u04C2",
-    "\u0410\u0306"=>"\u04D0",
-    "\u0430\u0306"=>"\u04D1",
-    "\u0410\u0308"=>"\u04D2",
-    "\u0430\u0308"=>"\u04D3",
-    "\u0415\u0306"=>"\u04D6",
-    "\u0435\u0306"=>"\u04D7",
-    "\u04D8\u0308"=>"\u04DA",
-    "\u04D9\u0308"=>"\u04DB",
-    "\u0416\u0308"=>"\u04DC",
-    "\u0436\u0308"=>"\u04DD",
-    "\u0417\u0308"=>"\u04DE",
-    "\u0437\u0308"=>"\u04DF",
-    "\u0418\u0304"=>"\u04E2",
-    "\u0438\u0304"=>"\u04E3",
-    "\u0418\u0308"=>"\u04E4",
-    "\u0438\u0308"=>"\u04E5",
-    "\u041E\u0308"=>"\u04E6",
-    "\u043E\u0308"=>"\u04E7",
-    "\u04E8\u0308"=>"\u04EA",
-    "\u04E9\u0308"=>"\u04EB",
-    "\u042D\u0308"=>"\u04EC",
-    "\u044D\u0308"=>"\u04ED",
-    "\u0423\u0304"=>"\u04EE",
-    "\u0443\u0304"=>"\u04EF",
-    "\u0423\u0308"=>"\u04F0",
-    "\u0443\u0308"=>"\u04F1",
-    "\u0423\u030B"=>"\u04F2",
-    "\u0443\u030B"=>"\u04F3",
-    "\u0427\u0308"=>"\u04F4",
-    "\u0447\u0308"=>"\u04F5",
-    "\u042B\u0308"=>"\u04F8",
-    "\u044B\u0308"=>"\u04F9",
-    "\u0627\u0653"=>"\u0622",
-    "\u0627\u0654"=>"\u0623",
-    "\u0648\u0654"=>"\u0624",
-    "\u0627\u0655"=>"\u0625",
-    "\u064A\u0654"=>"\u0626",
-    "\u06D5\u0654"=>"\u06C0",
-    "\u06C1\u0654"=>"\u06C2",
-    "\u06D2\u0654"=>"\u06D3",
-    "\u0928\u093C"=>"\u0929",
-    "\u0930\u093C"=>"\u0931",
-    "\u0933\u093C"=>"\u0934",
-    "\u09C7\u09BE"=>"\u09CB",
-    "\u09C7\u09D7"=>"\u09CC",
-    "\u0B47\u0B56"=>"\u0B48",
-    "\u0B47\u0B3E"=>"\u0B4B",
-    "\u0B47\u0B57"=>"\u0B4C",
-    "\u0B92\u0BD7"=>"\u0B94",
-    "\u0BC6\u0BBE"=>"\u0BCA",
-    "\u0BC7\u0BBE"=>"\u0BCB",
-    "\u0BC6\u0BD7"=>"\u0BCC",
-    "\u0C46\u0C56"=>"\u0C48",
-    "\u0CBF\u0CD5"=>"\u0CC0",
-    "\u0CC6\u0CD5"=>"\u0CC7",
-    "\u0CC6\u0CD6"=>"\u0CC8",
-    "\u0CC6\u0CC2"=>"\u0CCA",
-    "\u0CCA\u0CD5"=>"\u0CCB",
-    "\u0D46\u0D3E"=>"\u0D4A",
-    "\u0D47\u0D3E"=>"\u0D4B",
-    "\u0D46\u0D57"=>"\u0D4C",
-    "\u0DD9\u0DCA"=>"\u0DDA",
-    "\u0DD9\u0DCF"=>"\u0DDC",
-    "\u0DDC\u0DCA"=>"\u0DDD",
-    "\u0DD9\u0DDF"=>"\u0DDE",
-    "\u1025\u102E"=>"\u1026",
-    "\u1B05\u1B35"=>"\u1B06",
-    "\u1B07\u1B35"=>"\u1B08",
-    "\u1B09\u1B35"=>"\u1B0A",
-    "\u1B0B\u1B35"=>"\u1B0C",
-    "\u1B0D\u1B35"=>"\u1B0E",
-    "\u1B11\u1B35"=>"\u1B12",
-    "\u1B3A\u1B35"=>"\u1B3B",
-    "\u1B3C\u1B35"=>"\u1B3D",
-    "\u1B3E\u1B35"=>"\u1B40",
-    "\u1B3F\u1B35"=>"\u1B41",
-    "\u1B42\u1B35"=>"\u1B43",
-    "A\u0325"=>"\u1E00",
-    "a\u0325"=>"\u1E01",
-    "B\u0307"=>"\u1E02",
-    "b\u0307"=>"\u1E03",
-    "B\u0323"=>"\u1E04",
-    "b\u0323"=>"\u1E05",
-    "B\u0331"=>"\u1E06",
-    "b\u0331"=>"\u1E07",
-    "\u00C7\u0301"=>"\u1E08",
-    "\u00E7\u0301"=>"\u1E09",
-    "D\u0307"=>"\u1E0A",
-    "d\u0307"=>"\u1E0B",
-    "D\u0323"=>"\u1E0C",
-    "d\u0323"=>"\u1E0D",
-    "D\u0331"=>"\u1E0E",
-    "d\u0331"=>"\u1E0F",
-    "D\u0327"=>"\u1E10",
-    "d\u0327"=>"\u1E11",
-    "D\u032D"=>"\u1E12",
-    "d\u032D"=>"\u1E13",
-    "\u0112\u0300"=>"\u1E14",
-    "\u0113\u0300"=>"\u1E15",
-    "\u0112\u0301"=>"\u1E16",
-    "\u0113\u0301"=>"\u1E17",
-    "E\u032D"=>"\u1E18",
-    "e\u032D"=>"\u1E19",
-    "E\u0330"=>"\u1E1A",
-    "e\u0330"=>"\u1E1B",
-    "\u0228\u0306"=>"\u1E1C",
-    "\u0229\u0306"=>"\u1E1D",
-    "F\u0307"=>"\u1E1E",
-    "f\u0307"=>"\u1E1F",
-    "G\u0304"=>"\u1E20",
-    "g\u0304"=>"\u1E21",
-    "H\u0307"=>"\u1E22",
-    "h\u0307"=>"\u1E23",
-    "H\u0323"=>"\u1E24",
-    "h\u0323"=>"\u1E25",
-    "H\u0308"=>"\u1E26",
-    "h\u0308"=>"\u1E27",
-    "H\u0327"=>"\u1E28",
-    "h\u0327"=>"\u1E29",
-    "H\u032E"=>"\u1E2A",
-    "h\u032E"=>"\u1E2B",
-    "I\u0330"=>"\u1E2C",
-    "i\u0330"=>"\u1E2D",
-    "\u00CF\u0301"=>"\u1E2E",
-    "\u00EF\u0301"=>"\u1E2F",
-    "K\u0301"=>"\u1E30",
-    "k\u0301"=>"\u1E31",
-    "K\u0323"=>"\u1E32",
-    "k\u0323"=>"\u1E33",
-    "K\u0331"=>"\u1E34",
-    "k\u0331"=>"\u1E35",
-    "L\u0323"=>"\u1E36",
-    "l\u0323"=>"\u1E37",
-    "\u1E36\u0304"=>"\u1E38",
-    "\u1E37\u0304"=>"\u1E39",
-    "L\u0331"=>"\u1E3A",
-    "l\u0331"=>"\u1E3B",
-    "L\u032D"=>"\u1E3C",
-    "l\u032D"=>"\u1E3D",
-    "M\u0301"=>"\u1E3E",
-    "m\u0301"=>"\u1E3F",
-    "M\u0307"=>"\u1E40",
-    "m\u0307"=>"\u1E41",
-    "M\u0323"=>"\u1E42",
-    "m\u0323"=>"\u1E43",
-    "N\u0307"=>"\u1E44",
-    "n\u0307"=>"\u1E45",
-    "N\u0323"=>"\u1E46",
-    "n\u0323"=>"\u1E47",
-    "N\u0331"=>"\u1E48",
-    "n\u0331"=>"\u1E49",
-    "N\u032D"=>"\u1E4A",
-    "n\u032D"=>"\u1E4B",
-    "\u00D5\u0301"=>"\u1E4C",
-    "\u00F5\u0301"=>"\u1E4D",
-    "\u00D5\u0308"=>"\u1E4E",
-    "\u00F5\u0308"=>"\u1E4F",
-    "\u014C\u0300"=>"\u1E50",
-    "\u014D\u0300"=>"\u1E51",
-    "\u014C\u0301"=>"\u1E52",
-    "\u014D\u0301"=>"\u1E53",
-    "P\u0301"=>"\u1E54",
-    "p\u0301"=>"\u1E55",
-    "P\u0307"=>"\u1E56",
-    "p\u0307"=>"\u1E57",
-    "R\u0307"=>"\u1E58",
-    "r\u0307"=>"\u1E59",
-    "R\u0323"=>"\u1E5A",
-    "r\u0323"=>"\u1E5B",
-    "\u1E5A\u0304"=>"\u1E5C",
-    "\u1E5B\u0304"=>"\u1E5D",
-    "R\u0331"=>"\u1E5E",
-    "r\u0331"=>"\u1E5F",
-    "S\u0307"=>"\u1E60",
-    "s\u0307"=>"\u1E61",
-    "S\u0323"=>"\u1E62",
-    "s\u0323"=>"\u1E63",
-    "\u015A\u0307"=>"\u1E64",
-    "\u015B\u0307"=>"\u1E65",
-    "\u0160\u0307"=>"\u1E66",
-    "\u0161\u0307"=>"\u1E67",
-    "\u1E62\u0307"=>"\u1E68",
-    "\u1E63\u0307"=>"\u1E69",
-    "T\u0307"=>"\u1E6A",
-    "t\u0307"=>"\u1E6B",
-    "T\u0323"=>"\u1E6C",
-    "t\u0323"=>"\u1E6D",
-    "T\u0331"=>"\u1E6E",
-    "t\u0331"=>"\u1E6F",
-    "T\u032D"=>"\u1E70",
-    "t\u032D"=>"\u1E71",
-    "U\u0324"=>"\u1E72",
-    "u\u0324"=>"\u1E73",
-    "U\u0330"=>"\u1E74",
-    "u\u0330"=>"\u1E75",
-    "U\u032D"=>"\u1E76",
-    "u\u032D"=>"\u1E77",
-    "\u0168\u0301"=>"\u1E78",
-    "\u0169\u0301"=>"\u1E79",
-    "\u016A\u0308"=>"\u1E7A",
-    "\u016B\u0308"=>"\u1E7B",
-    "V\u0303"=>"\u1E7C",
-    "v\u0303"=>"\u1E7D",
-    "V\u0323"=>"\u1E7E",
-    "v\u0323"=>"\u1E7F",
-    "W\u0300"=>"\u1E80",
-    "w\u0300"=>"\u1E81",
-    "W\u0301"=>"\u1E82",
-    "w\u0301"=>"\u1E83",
-    "W\u0308"=>"\u1E84",
-    "w\u0308"=>"\u1E85",
-    "W\u0307"=>"\u1E86",
-    "w\u0307"=>"\u1E87",
-    "W\u0323"=>"\u1E88",
-    "w\u0323"=>"\u1E89",
-    "X\u0307"=>"\u1E8A",
-    "x\u0307"=>"\u1E8B",
-    "X\u0308"=>"\u1E8C",
-    "x\u0308"=>"\u1E8D",
-    "Y\u0307"=>"\u1E8E",
-    "y\u0307"=>"\u1E8F",
-    "Z\u0302"=>"\u1E90",
-    "z\u0302"=>"\u1E91",
-    "Z\u0323"=>"\u1E92",
-    "z\u0323"=>"\u1E93",
-    "Z\u0331"=>"\u1E94",
-    "z\u0331"=>"\u1E95",
-    "h\u0331"=>"\u1E96",
-    "t\u0308"=>"\u1E97",
-    "w\u030A"=>"\u1E98",
-    "y\u030A"=>"\u1E99",
-    "\u017F\u0307"=>"\u1E9B",
-    "A\u0323"=>"\u1EA0",
-    "a\u0323"=>"\u1EA1",
-    "A\u0309"=>"\u1EA2",
-    "a\u0309"=>"\u1EA3",
-    "\u00C2\u0301"=>"\u1EA4",
-    "\u00E2\u0301"=>"\u1EA5",
-    "\u00C2\u0300"=>"\u1EA6",
-    "\u00E2\u0300"=>"\u1EA7",
-    "\u00C2\u0309"=>"\u1EA8",
-    "\u00E2\u0309"=>"\u1EA9",
-    "\u00C2\u0303"=>"\u1EAA",
-    "\u00E2\u0303"=>"\u1EAB",
-    "\u1EA0\u0302"=>"\u1EAC",
-    "\u1EA1\u0302"=>"\u1EAD",
-    "\u0102\u0301"=>"\u1EAE",
-    "\u0103\u0301"=>"\u1EAF",
-    "\u0102\u0300"=>"\u1EB0",
-    "\u0103\u0300"=>"\u1EB1",
-    "\u0102\u0309"=>"\u1EB2",
-    "\u0103\u0309"=>"\u1EB3",
-    "\u0102\u0303"=>"\u1EB4",
-    "\u0103\u0303"=>"\u1EB5",
-    "\u1EA0\u0306"=>"\u1EB6",
-    "\u1EA1\u0306"=>"\u1EB7",
-    "E\u0323"=>"\u1EB8",
-    "e\u0323"=>"\u1EB9",
-    "E\u0309"=>"\u1EBA",
-    "e\u0309"=>"\u1EBB",
-    "E\u0303"=>"\u1EBC",
-    "e\u0303"=>"\u1EBD",
-    "\u00CA\u0301"=>"\u1EBE",
-    "\u00EA\u0301"=>"\u1EBF",
-    "\u00CA\u0300"=>"\u1EC0",
-    "\u00EA\u0300"=>"\u1EC1",
-    "\u00CA\u0309"=>"\u1EC2",
-    "\u00EA\u0309"=>"\u1EC3",
-    "\u00CA\u0303"=>"\u1EC4",
-    "\u00EA\u0303"=>"\u1EC5",
-    "\u1EB8\u0302"=>"\u1EC6",
-    "\u1EB9\u0302"=>"\u1EC7",
-    "I\u0309"=>"\u1EC8",
-    "i\u0309"=>"\u1EC9",
-    "I\u0323"=>"\u1ECA",
-    "i\u0323"=>"\u1ECB",
-    "O\u0323"=>"\u1ECC",
-    "o\u0323"=>"\u1ECD",
-    "O\u0309"=>"\u1ECE",
-    "o\u0309"=>"\u1ECF",
-    "\u00D4\u0301"=>"\u1ED0",
-    "\u00F4\u0301"=>"\u1ED1",
-    "\u00D4\u0300"=>"\u1ED2",
-    "\u00F4\u0300"=>"\u1ED3",
-    "\u00D4\u0309"=>"\u1ED4",
-    "\u00F4\u0309"=>"\u1ED5",
-    "\u00D4\u0303"=>"\u1ED6",
-    "\u00F4\u0303"=>"\u1ED7",
-    "\u1ECC\u0302"=>"\u1ED8",
-    "\u1ECD\u0302"=>"\u1ED9",
-    "\u01A0\u0301"=>"\u1EDA",
-    "\u01A1\u0301"=>"\u1EDB",
-    "\u01A0\u0300"=>"\u1EDC",
-    "\u01A1\u0300"=>"\u1EDD",
-    "\u01A0\u0309"=>"\u1EDE",
-    "\u01A1\u0309"=>"\u1EDF",
-    "\u01A0\u0303"=>"\u1EE0",
-    "\u01A1\u0303"=>"\u1EE1",
-    "\u01A0\u0323"=>"\u1EE2",
-    "\u01A1\u0323"=>"\u1EE3",
-    "U\u0323"=>"\u1EE4",
-    "u\u0323"=>"\u1EE5",
-    "U\u0309"=>"\u1EE6",
-    "u\u0309"=>"\u1EE7",
-    "\u01AF\u0301"=>"\u1EE8",
-    "\u01B0\u0301"=>"\u1EE9",
-    "\u01AF\u0300"=>"\u1EEA",
-    "\u01B0\u0300"=>"\u1EEB",
-    "\u01AF\u0309"=>"\u1EEC",
-    "\u01B0\u0309"=>"\u1EED",
-    "\u01AF\u0303"=>"\u1EEE",
-    "\u01B0\u0303"=>"\u1EEF",
-    "\u01AF\u0323"=>"\u1EF0",
-    "\u01B0\u0323"=>"\u1EF1",
-    "Y\u0300"=>"\u1EF2",
-    "y\u0300"=>"\u1EF3",
-    "Y\u0323"=>"\u1EF4",
-    "y\u0323"=>"\u1EF5",
-    "Y\u0309"=>"\u1EF6",
-    "y\u0309"=>"\u1EF7",
-    "Y\u0303"=>"\u1EF8",
-    "y\u0303"=>"\u1EF9",
-    "\u03B1\u0313"=>"\u1F00",
-    "\u03B1\u0314"=>"\u1F01",
-    "\u1F00\u0300"=>"\u1F02",
-    "\u1F01\u0300"=>"\u1F03",
-    "\u1F00\u0301"=>"\u1F04",
-    "\u1F01\u0301"=>"\u1F05",
-    "\u1F00\u0342"=>"\u1F06",
-    "\u1F01\u0342"=>"\u1F07",
-    "\u0391\u0313"=>"\u1F08",
-    "\u0391\u0314"=>"\u1F09",
-    "\u1F08\u0300"=>"\u1F0A",
-    "\u1F09\u0300"=>"\u1F0B",
-    "\u1F08\u0301"=>"\u1F0C",
-    "\u1F09\u0301"=>"\u1F0D",
-    "\u1F08\u0342"=>"\u1F0E",
-    "\u1F09\u0342"=>"\u1F0F",
-    "\u03B5\u0313"=>"\u1F10",
-    "\u03B5\u0314"=>"\u1F11",
-    "\u1F10\u0300"=>"\u1F12",
-    "\u1F11\u0300"=>"\u1F13",
-    "\u1F10\u0301"=>"\u1F14",
-    "\u1F11\u0301"=>"\u1F15",
-    "\u0395\u0313"=>"\u1F18",
-    "\u0395\u0314"=>"\u1F19",
-    "\u1F18\u0300"=>"\u1F1A",
-    "\u1F19\u0300"=>"\u1F1B",
-    "\u1F18\u0301"=>"\u1F1C",
-    "\u1F19\u0301"=>"\u1F1D",
-    "\u03B7\u0313"=>"\u1F20",
-    "\u03B7\u0314"=>"\u1F21",
-    "\u1F20\u0300"=>"\u1F22",
-    "\u1F21\u0300"=>"\u1F23",
-    "\u1F20\u0301"=>"\u1F24",
-    "\u1F21\u0301"=>"\u1F25",
-    "\u1F20\u0342"=>"\u1F26",
-    "\u1F21\u0342"=>"\u1F27",
-    "\u0397\u0313"=>"\u1F28",
-    "\u0397\u0314"=>"\u1F29",
-    "\u1F28\u0300"=>"\u1F2A",
-    "\u1F29\u0300"=>"\u1F2B",
-    "\u1F28\u0301"=>"\u1F2C",
-    "\u1F29\u0301"=>"\u1F2D",
-    "\u1F28\u0342"=>"\u1F2E",
-    "\u1F29\u0342"=>"\u1F2F",
-    "\u03B9\u0313"=>"\u1F30",
-    "\u03B9\u0314"=>"\u1F31",
-    "\u1F30\u0300"=>"\u1F32",
-    "\u1F31\u0300"=>"\u1F33",
-    "\u1F30\u0301"=>"\u1F34",
-    "\u1F31\u0301"=>"\u1F35",
-    "\u1F30\u0342"=>"\u1F36",
-    "\u1F31\u0342"=>"\u1F37",
-    "\u0399\u0313"=>"\u1F38",
-    "\u0399\u0314"=>"\u1F39",
-    "\u1F38\u0300"=>"\u1F3A",
-    "\u1F39\u0300"=>"\u1F3B",
-    "\u1F38\u0301"=>"\u1F3C",
-    "\u1F39\u0301"=>"\u1F3D",
-    "\u1F38\u0342"=>"\u1F3E",
-    "\u1F39\u0342"=>"\u1F3F",
-    "\u03BF\u0313"=>"\u1F40",
-    "\u03BF\u0314"=>"\u1F41",
-    "\u1F40\u0300"=>"\u1F42",
-    "\u1F41\u0300"=>"\u1F43",
-    "\u1F40\u0301"=>"\u1F44",
-    "\u1F41\u0301"=>"\u1F45",
-    "\u039F\u0313"=>"\u1F48",
-    "\u039F\u0314"=>"\u1F49",
-    "\u1F48\u0300"=>"\u1F4A",
-    "\u1F49\u0300"=>"\u1F4B",
-    "\u1F48\u0301"=>"\u1F4C",
-    "\u1F49\u0301"=>"\u1F4D",
-    "\u03C5\u0313"=>"\u1F50",
-    "\u03C5\u0314"=>"\u1F51",
-    "\u1F50\u0300"=>"\u1F52",
-    "\u1F51\u0300"=>"\u1F53",
-    "\u1F50\u0301"=>"\u1F54",
-    "\u1F51\u0301"=>"\u1F55",
-    "\u1F50\u0342"=>"\u1F56",
-    "\u1F51\u0342"=>"\u1F57",
-    "\u03A5\u0314"=>"\u1F59",
-    "\u1F59\u0300"=>"\u1F5B",
-    "\u1F59\u0301"=>"\u1F5D",
-    "\u1F59\u0342"=>"\u1F5F",
-    "\u03C9\u0313"=>"\u1F60",
-    "\u03C9\u0314"=>"\u1F61",
-    "\u1F60\u0300"=>"\u1F62",
-    "\u1F61\u0300"=>"\u1F63",
-    "\u1F60\u0301"=>"\u1F64",
-    "\u1F61\u0301"=>"\u1F65",
-    "\u1F60\u0342"=>"\u1F66",
-    "\u1F61\u0342"=>"\u1F67",
-    "\u03A9\u0313"=>"\u1F68",
-    "\u03A9\u0314"=>"\u1F69",
-    "\u1F68\u0300"=>"\u1F6A",
-    "\u1F69\u0300"=>"\u1F6B",
-    "\u1F68\u0301"=>"\u1F6C",
-    "\u1F69\u0301"=>"\u1F6D",
-    "\u1F68\u0342"=>"\u1F6E",
-    "\u1F69\u0342"=>"\u1F6F",
-    "\u03B1\u0300"=>"\u1F70",
-    "\u03B5\u0300"=>"\u1F72",
-    "\u03B7\u0300"=>"\u1F74",
-    "\u03B9\u0300"=>"\u1F76",
-    "\u03BF\u0300"=>"\u1F78",
-    "\u03C5\u0300"=>"\u1F7A",
-    "\u03C9\u0300"=>"\u1F7C",
-    "\u1F00\u0345"=>"\u1F80",
-    "\u1F01\u0345"=>"\u1F81",
-    "\u1F02\u0345"=>"\u1F82",
-    "\u1F03\u0345"=>"\u1F83",
-    "\u1F04\u0345"=>"\u1F84",
-    "\u1F05\u0345"=>"\u1F85",
-    "\u1F06\u0345"=>"\u1F86",
-    "\u1F07\u0345"=>"\u1F87",
-    "\u1F08\u0345"=>"\u1F88",
-    "\u1F09\u0345"=>"\u1F89",
-    "\u1F0A\u0345"=>"\u1F8A",
-    "\u1F0B\u0345"=>"\u1F8B",
-    "\u1F0C\u0345"=>"\u1F8C",
-    "\u1F0D\u0345"=>"\u1F8D",
-    "\u1F0E\u0345"=>"\u1F8E",
-    "\u1F0F\u0345"=>"\u1F8F",
-    "\u1F20\u0345"=>"\u1F90",
-    "\u1F21\u0345"=>"\u1F91",
-    "\u1F22\u0345"=>"\u1F92",
-    "\u1F23\u0345"=>"\u1F93",
-    "\u1F24\u0345"=>"\u1F94",
-    "\u1F25\u0345"=>"\u1F95",
-    "\u1F26\u0345"=>"\u1F96",
-    "\u1F27\u0345"=>"\u1F97",
-    "\u1F28\u0345"=>"\u1F98",
-    "\u1F29\u0345"=>"\u1F99",
-    "\u1F2A\u0345"=>"\u1F9A",
-    "\u1F2B\u0345"=>"\u1F9B",
-    "\u1F2C\u0345"=>"\u1F9C",
-    "\u1F2D\u0345"=>"\u1F9D",
-    "\u1F2E\u0345"=>"\u1F9E",
-    "\u1F2F\u0345"=>"\u1F9F",
-    "\u1F60\u0345"=>"\u1FA0",
-    "\u1F61\u0345"=>"\u1FA1",
-    "\u1F62\u0345"=>"\u1FA2",
-    "\u1F63\u0345"=>"\u1FA3",
-    "\u1F64\u0345"=>"\u1FA4",
-    "\u1F65\u0345"=>"\u1FA5",
-    "\u1F66\u0345"=>"\u1FA6",
-    "\u1F67\u0345"=>"\u1FA7",
-    "\u1F68\u0345"=>"\u1FA8",
-    "\u1F69\u0345"=>"\u1FA9",
-    "\u1F6A\u0345"=>"\u1FAA",
-    "\u1F6B\u0345"=>"\u1FAB",
-    "\u1F6C\u0345"=>"\u1FAC",
-    "\u1F6D\u0345"=>"\u1FAD",
-    "\u1F6E\u0345"=>"\u1FAE",
-    "\u1F6F\u0345"=>"\u1FAF",
-    "\u03B1\u0306"=>"\u1FB0",
-    "\u03B1\u0304"=>"\u1FB1",
-    "\u1F70\u0345"=>"\u1FB2",
-    "\u03B1\u0345"=>"\u1FB3",
-    "\u03AC\u0345"=>"\u1FB4",
-    "\u03B1\u0342"=>"\u1FB6",
-    "\u1FB6\u0345"=>"\u1FB7",
-    "\u0391\u0306"=>"\u1FB8",
-    "\u0391\u0304"=>"\u1FB9",
-    "\u0391\u0300"=>"\u1FBA",
-    "\u0391\u0345"=>"\u1FBC",
-    "\u00A8\u0342"=>"\u1FC1",
-    "\u1F74\u0345"=>"\u1FC2",
-    "\u03B7\u0345"=>"\u1FC3",
-    "\u03AE\u0345"=>"\u1FC4",
-    "\u03B7\u0342"=>"\u1FC6",
-    "\u1FC6\u0345"=>"\u1FC7",
-    "\u0395\u0300"=>"\u1FC8",
-    "\u0397\u0300"=>"\u1FCA",
-    "\u0397\u0345"=>"\u1FCC",
-    "\u1FBF\u0300"=>"\u1FCD",
-    "\u1FBF\u0301"=>"\u1FCE",
-    "\u1FBF\u0342"=>"\u1FCF",
-    "\u03B9\u0306"=>"\u1FD0",
-    "\u03B9\u0304"=>"\u1FD1",
-    "\u03CA\u0300"=>"\u1FD2",
-    "\u03B9\u0342"=>"\u1FD6",
-    "\u03CA\u0342"=>"\u1FD7",
-    "\u0399\u0306"=>"\u1FD8",
-    "\u0399\u0304"=>"\u1FD9",
-    "\u0399\u0300"=>"\u1FDA",
-    "\u1FFE\u0300"=>"\u1FDD",
-    "\u1FFE\u0301"=>"\u1FDE",
-    "\u1FFE\u0342"=>"\u1FDF",
-    "\u03C5\u0306"=>"\u1FE0",
-    "\u03C5\u0304"=>"\u1FE1",
-    "\u03CB\u0300"=>"\u1FE2",
-    "\u03C1\u0313"=>"\u1FE4",
-    "\u03C1\u0314"=>"\u1FE5",
-    "\u03C5\u0342"=>"\u1FE6",
-    "\u03CB\u0342"=>"\u1FE7",
-    "\u03A5\u0306"=>"\u1FE8",
-    "\u03A5\u0304"=>"\u1FE9",
-    "\u03A5\u0300"=>"\u1FEA",
-    "\u03A1\u0314"=>"\u1FEC",
-    "\u00A8\u0300"=>"\u1FED",
-    "\u1F7C\u0345"=>"\u1FF2",
-    "\u03C9\u0345"=>"\u1FF3",
-    "\u03CE\u0345"=>"\u1FF4",
-    "\u03C9\u0342"=>"\u1FF6",
-    "\u1FF6\u0345"=>"\u1FF7",
-    "\u039F\u0300"=>"\u1FF8",
-    "\u03A9\u0300"=>"\u1FFA",
-    "\u03A9\u0345"=>"\u1FFC",
-    "\u2190\u0338"=>"\u219A",
-    "\u2192\u0338"=>"\u219B",
-    "\u2194\u0338"=>"\u21AE",
-    "\u21D0\u0338"=>"\u21CD",
-    "\u21D4\u0338"=>"\u21CE",
-    "\u21D2\u0338"=>"\u21CF",
-    "\u2203\u0338"=>"\u2204",
-    "\u2208\u0338"=>"\u2209",
-    "\u220B\u0338"=>"\u220C",
-    "\u2223\u0338"=>"\u2224",
-    "\u2225\u0338"=>"\u2226",
-    "\u223C\u0338"=>"\u2241",
-    "\u2243\u0338"=>"\u2244",
-    "\u2245\u0338"=>"\u2247",
-    "\u2248\u0338"=>"\u2249",
-    "=\u0338"=>"\u2260",
-    "\u2261\u0338"=>"\u2262",
-    "\u224D\u0338"=>"\u226D",
-    "<\u0338"=>"\u226E",
-    ">\u0338"=>"\u226F",
-    "\u2264\u0338"=>"\u2270",
-    "\u2265\u0338"=>"\u2271",
-    "\u2272\u0338"=>"\u2274",
-    "\u2273\u0338"=>"\u2275",
-    "\u2276\u0338"=>"\u2278",
-    "\u2277\u0338"=>"\u2279",
-    "\u227A\u0338"=>"\u2280",
-    "\u227B\u0338"=>"\u2281",
-    "\u2282\u0338"=>"\u2284",
-    "\u2283\u0338"=>"\u2285",
-    "\u2286\u0338"=>"\u2288",
-    "\u2287\u0338"=>"\u2289",
-    "\u22A2\u0338"=>"\u22AC",
-    "\u22A8\u0338"=>"\u22AD",
-    "\u22A9\u0338"=>"\u22AE",
-    "\u22AB\u0338"=>"\u22AF",
-    "\u227C\u0338"=>"\u22E0",
-    "\u227D\u0338"=>"\u22E1",
-    "\u2291\u0338"=>"\u22E2",
-    "\u2292\u0338"=>"\u22E3",
-    "\u22B2\u0338"=>"\u22EA",
-    "\u22B3\u0338"=>"\u22EB",
-    "\u22B4\u0338"=>"\u22EC",
-    "\u22B5\u0338"=>"\u22ED",
-    "\u304B\u3099"=>"\u304C",
-    "\u304D\u3099"=>"\u304E",
-    "\u304F\u3099"=>"\u3050",
-    "\u3051\u3099"=>"\u3052",
-    "\u3053\u3099"=>"\u3054",
-    "\u3055\u3099"=>"\u3056",
-    "\u3057\u3099"=>"\u3058",
-    "\u3059\u3099"=>"\u305A",
-    "\u305B\u3099"=>"\u305C",
-    "\u305D\u3099"=>"\u305E",
-    "\u305F\u3099"=>"\u3060",
-    "\u3061\u3099"=>"\u3062",
-    "\u3064\u3099"=>"\u3065",
-    "\u3066\u3099"=>"\u3067",
-    "\u3068\u3099"=>"\u3069",
-    "\u306F\u3099"=>"\u3070",
-    "\u306F\u309A"=>"\u3071",
-    "\u3072\u3099"=>"\u3073",
-    "\u3072\u309A"=>"\u3074",
-    "\u3075\u3099"=>"\u3076",
-    "\u3075\u309A"=>"\u3077",
-    "\u3078\u3099"=>"\u3079",
-    "\u3078\u309A"=>"\u307A",
-    "\u307B\u3099"=>"\u307C",
-    "\u307B\u309A"=>"\u307D",
-    "\u3046\u3099"=>"\u3094",
-    "\u309D\u3099"=>"\u309E",
-    "\u30AB\u3099"=>"\u30AC",
-    "\u30AD\u3099"=>"\u30AE",
-    "\u30AF\u3099"=>"\u30B0",
-    "\u30B1\u3099"=>"\u30B2",
-    "\u30B3\u3099"=>"\u30B4",
-    "\u30B5\u3099"=>"\u30B6",
-    "\u30B7\u3099"=>"\u30B8",
-    "\u30B9\u3099"=>"\u30BA",
-    "\u30BB\u3099"=>"\u30BC",
-    "\u30BD\u3099"=>"\u30BE",
-    "\u30BF\u3099"=>"\u30C0",
-    "\u30C1\u3099"=>"\u30C2",
-    "\u30C4\u3099"=>"\u30C5",
-    "\u30C6\u3099"=>"\u30C7",
-    "\u30C8\u3099"=>"\u30C9",
-    "\u30CF\u3099"=>"\u30D0",
-    "\u30CF\u309A"=>"\u30D1",
-    "\u30D2\u3099"=>"\u30D3",
-    "\u30D2\u309A"=>"\u30D4",
-    "\u30D5\u3099"=>"\u30D6",
-    "\u30D5\u309A"=>"\u30D7",
-    "\u30D8\u3099"=>"\u30D9",
-    "\u30D8\u309A"=>"\u30DA",
-    "\u30DB\u3099"=>"\u30DC",
-    "\u30DB\u309A"=>"\u30DD",
-    "\u30A6\u3099"=>"\u30F4",
-    "\u30EF\u3099"=>"\u30F7",
-    "\u30F0\u3099"=>"\u30F8",
-    "\u30F1\u3099"=>"\u30F9",
-    "\u30F2\u3099"=>"\u30FA",
-    "\u30FD\u3099"=>"\u30FE",
-    "\u{11099}\u{110BA}"=>"\u{1109A}",
-    "\u{1109B}\u{110BA}"=>"\u{1109C}",
-    "\u{110A5}\u{110BA}"=>"\u{110AB}",
-    "\u{11131}\u{11127}"=>"\u{1112E}",
-    "\u{11132}\u{11127}"=>"\u{1112F}",
-    "\u{11347}\u{1133E}"=>"\u{1134B}",
-    "\u{11347}\u{11357}"=>"\u{1134C}",
-    "\u{114B9}\u{114BA}"=>"\u{114BB}",
-    "\u{114B9}\u{114B0}"=>"\u{114BC}",
-    "\u{114B9}\u{114BD}"=>"\u{114BE}",
-    "\u{115B8}\u{115AF}"=>"\u{115BA}",
-    "\u{115B9}\u{115AF}"=>"\u{115BB}",
+    "A\u0300"=>"\u00C0", "A\u0301"=>"\u00C1", "A\u0302"=>"\u00C2", "A\u0303"=>"\u00C3", "A\u0308"=>"\u00C4", "A\u030A"=>"\u00C5", "C\u0327"=>"\u00C7", "E\u0300"=>"\u00C8",
+    "E\u0301"=>"\u00C9", "E\u0302"=>"\u00CA", "E\u0308"=>"\u00CB", "I\u0300"=>"\u00CC", "I\u0301"=>"\u00CD", "I\u0302"=>"\u00CE", "I\u0308"=>"\u00CF", "N\u0303"=>"\u00D1",
+    "O\u0300"=>"\u00D2", "O\u0301"=>"\u00D3", "O\u0302"=>"\u00D4", "O\u0303"=>"\u00D5", "O\u0308"=>"\u00D6", "U\u0300"=>"\u00D9", "U\u0301"=>"\u00DA", "U\u0302"=>"\u00DB",
+    "U\u0308"=>"\u00DC", "Y\u0301"=>"\u00DD", "a\u0300"=>"\u00E0", "a\u0301"=>"\u00E1", "a\u0302"=>"\u00E2", "a\u0303"=>"\u00E3", "a\u0308"=>"\u00E4", "a\u030A"=>"\u00E5",
+    "c\u0327"=>"\u00E7", "e\u0300"=>"\u00E8", "e\u0301"=>"\u00E9", "e\u0302"=>"\u00EA", "e\u0308"=>"\u00EB", "i\u0300"=>"\u00EC", "i\u0301"=>"\u00ED", "i\u0302"=>"\u00EE",
+    "i\u0308"=>"\u00EF", "n\u0303"=>"\u00F1", "o\u0300"=>"\u00F2", "o\u0301"=>"\u00F3", "o\u0302"=>"\u00F4", "o\u0303"=>"\u00F5", "o\u0308"=>"\u00F6", "u\u0300"=>"\u00F9",
+    "u\u0301"=>"\u00FA", "u\u0302"=>"\u00FB", "u\u0308"=>"\u00FC", "y\u0301"=>"\u00FD", "y\u0308"=>"\u00FF", "A\u0304"=>"\u0100", "a\u0304"=>"\u0101", "A\u0306"=>"\u0102",
+    "a\u0306"=>"\u0103", "A\u0328"=>"\u0104", "a\u0328"=>"\u0105", "C\u0301"=>"\u0106", "c\u0301"=>"\u0107", "C\u0302"=>"\u0108", "c\u0302"=>"\u0109", "C\u0307"=>"\u010A",
+    "c\u0307"=>"\u010B", "C\u030C"=>"\u010C", "c\u030C"=>"\u010D", "D\u030C"=>"\u010E", "d\u030C"=>"\u010F", "E\u0304"=>"\u0112", "e\u0304"=>"\u0113", "E\u0306"=>"\u0114",
+    "e\u0306"=>"\u0115", "E\u0307"=>"\u0116", "e\u0307"=>"\u0117", "E\u0328"=>"\u0118", "e\u0328"=>"\u0119", "E\u030C"=>"\u011A", "e\u030C"=>"\u011B", "G\u0302"=>"\u011C",
+    "g\u0302"=>"\u011D", "G\u0306"=>"\u011E", "g\u0306"=>"\u011F", "G\u0307"=>"\u0120", "g\u0307"=>"\u0121", "G\u0327"=>"\u0122", "g\u0327"=>"\u0123", "H\u0302"=>"\u0124",
+    "h\u0302"=>"\u0125", "I\u0303"=>"\u0128", "i\u0303"=>"\u0129", "I\u0304"=>"\u012A", "i\u0304"=>"\u012B", "I\u0306"=>"\u012C", "i\u0306"=>"\u012D", "I\u0328"=>"\u012E",
+    "i\u0328"=>"\u012F", "I\u0307"=>"\u0130", "J\u0302"=>"\u0134", "j\u0302"=>"\u0135", "K\u0327"=>"\u0136", "k\u0327"=>"\u0137", "L\u0301"=>"\u0139", "l\u0301"=>"\u013A",
+    "L\u0327"=>"\u013B", "l\u0327"=>"\u013C", "L\u030C"=>"\u013D", "l\u030C"=>"\u013E", "N\u0301"=>"\u0143", "n\u0301"=>"\u0144", "N\u0327"=>"\u0145", "n\u0327"=>"\u0146",
+    "N\u030C"=>"\u0147", "n\u030C"=>"\u0148", "O\u0304"=>"\u014C", "o\u0304"=>"\u014D", "O\u0306"=>"\u014E", "o\u0306"=>"\u014F", "O\u030B"=>"\u0150", "o\u030B"=>"\u0151",
+    "R\u0301"=>"\u0154", "r\u0301"=>"\u0155", "R\u0327"=>"\u0156", "r\u0327"=>"\u0157", "R\u030C"=>"\u0158", "r\u030C"=>"\u0159", "S\u0301"=>"\u015A", "s\u0301"=>"\u015B",
+    "S\u0302"=>"\u015C", "s\u0302"=>"\u015D", "S\u0327"=>"\u015E", "s\u0327"=>"\u015F", "S\u030C"=>"\u0160", "s\u030C"=>"\u0161", "T\u0327"=>"\u0162", "t\u0327"=>"\u0163",
+    "T\u030C"=>"\u0164", "t\u030C"=>"\u0165", "U\u0303"=>"\u0168", "u\u0303"=>"\u0169", "U\u0304"=>"\u016A", "u\u0304"=>"\u016B", "U\u0306"=>"\u016C", "u\u0306"=>"\u016D",
+    "U\u030A"=>"\u016E", "u\u030A"=>"\u016F", "U\u030B"=>"\u0170", "u\u030B"=>"\u0171", "U\u0328"=>"\u0172", "u\u0328"=>"\u0173", "W\u0302"=>"\u0174", "w\u0302"=>"\u0175",
+    "Y\u0302"=>"\u0176", "y\u0302"=>"\u0177", "Y\u0308"=>"\u0178", "Z\u0301"=>"\u0179", "z\u0301"=>"\u017A", "Z\u0307"=>"\u017B", "z\u0307"=>"\u017C", "Z\u030C"=>"\u017D",
+    "z\u030C"=>"\u017E", "O\u031B"=>"\u01A0", "o\u031B"=>"\u01A1", "U\u031B"=>"\u01AF", "u\u031B"=>"\u01B0", "A\u030C"=>"\u01CD", "a\u030C"=>"\u01CE", "I\u030C"=>"\u01CF",
+    "i\u030C"=>"\u01D0", "O\u030C"=>"\u01D1", "o\u030C"=>"\u01D2", "U\u030C"=>"\u01D3", "u\u030C"=>"\u01D4", "\u00DC\u0304"=>"\u01D5", "\u00FC\u0304"=>"\u01D6", "\u00DC\u0301"=>"\u01D7",
+    "\u00FC\u0301"=>"\u01D8", "\u00DC\u030C"=>"\u01D9", "\u00FC\u030C"=>"\u01DA", "\u00DC\u0300"=>"\u01DB", "\u00FC\u0300"=>"\u01DC", "\u00C4\u0304"=>"\u01DE", "\u00E4\u0304"=>"\u01DF", "\u0226\u0304"=>"\u01E0",
+    "\u0227\u0304"=>"\u01E1", "\u00C6\u0304"=>"\u01E2", "\u00E6\u0304"=>"\u01E3", "G\u030C"=>"\u01E6", "g\u030C"=>"\u01E7", "K\u030C"=>"\u01E8", "k\u030C"=>"\u01E9", "O\u0328"=>"\u01EA",
+    "o\u0328"=>"\u01EB", "\u01EA\u0304"=>"\u01EC", "\u01EB\u0304"=>"\u01ED", "\u01B7\u030C"=>"\u01EE", "\u0292\u030C"=>"\u01EF", "j\u030C"=>"\u01F0", "G\u0301"=>"\u01F4", "g\u0301"=>"\u01F5",
+    "N\u0300"=>"\u01F8", "n\u0300"=>"\u01F9", "\u00C5\u0301"=>"\u01FA", "\u00E5\u0301"=>"\u01FB", "\u00C6\u0301"=>"\u01FC", "\u00E6\u0301"=>"\u01FD", "\u00D8\u0301"=>"\u01FE", "\u00F8\u0301"=>"\u01FF",
+    "A\u030F"=>"\u0200", "a\u030F"=>"\u0201", "A\u0311"=>"\u0202", "a\u0311"=>"\u0203", "E\u030F"=>"\u0204", "e\u030F"=>"\u0205", "E\u0311"=>"\u0206", "e\u0311"=>"\u0207",
+    "I\u030F"=>"\u0208", "i\u030F"=>"\u0209", "I\u0311"=>"\u020A", "i\u0311"=>"\u020B", "O\u030F"=>"\u020C", "o\u030F"=>"\u020D", "O\u0311"=>"\u020E", "o\u0311"=>"\u020F",
+    "R\u030F"=>"\u0210", "r\u030F"=>"\u0211", "R\u0311"=>"\u0212", "r\u0311"=>"\u0213", "U\u030F"=>"\u0214", "u\u030F"=>"\u0215", "U\u0311"=>"\u0216", "u\u0311"=>"\u0217",
+    "S\u0326"=>"\u0218", "s\u0326"=>"\u0219", "T\u0326"=>"\u021A", "t\u0326"=>"\u021B", "H\u030C"=>"\u021E", "h\u030C"=>"\u021F", "A\u0307"=>"\u0226", "a\u0307"=>"\u0227",
+    "E\u0327"=>"\u0228", "e\u0327"=>"\u0229", "\u00D6\u0304"=>"\u022A", "\u00F6\u0304"=>"\u022B", "\u00D5\u0304"=>"\u022C", "\u00F5\u0304"=>"\u022D", "O\u0307"=>"\u022E", "o\u0307"=>"\u022F",
+    "\u022E\u0304"=>"\u0230", "\u022F\u0304"=>"\u0231", "Y\u0304"=>"\u0232", "y\u0304"=>"\u0233", "\u00A8\u0301"=>"\u0385", "\u0391\u0301"=>"\u0386", "\u0395\u0301"=>"\u0388", "\u0397\u0301"=>"\u0389",
+    "\u0399\u0301"=>"\u038A", "\u039F\u0301"=>"\u038C", "\u03A5\u0301"=>"\u038E", "\u03A9\u0301"=>"\u038F", "\u03CA\u0301"=>"\u0390", "\u0399\u0308"=>"\u03AA", "\u03A5\u0308"=>"\u03AB", "\u03B1\u0301"=>"\u03AC",
+    "\u03B5\u0301"=>"\u03AD", "\u03B7\u0301"=>"\u03AE", "\u03B9\u0301"=>"\u03AF", "\u03CB\u0301"=>"\u03B0", "\u03B9\u0308"=>"\u03CA", "\u03C5\u0308"=>"\u03CB", "\u03BF\u0301"=>"\u03CC", "\u03C5\u0301"=>"\u03CD",
+    "\u03C9\u0301"=>"\u03CE", "\u03D2\u0301"=>"\u03D3", "\u03D2\u0308"=>"\u03D4", "\u0415\u0300"=>"\u0400", "\u0415\u0308"=>"\u0401", "\u0413\u0301"=>"\u0403", "\u0406\u0308"=>"\u0407", "\u041A\u0301"=>"\u040C",
+    "\u0418\u0300"=>"\u040D", "\u0423\u0306"=>"\u040E", "\u0418\u0306"=>"\u0419", "\u0438\u0306"=>"\u0439", "\u0435\u0300"=>"\u0450", "\u0435\u0308"=>"\u0451", "\u0433\u0301"=>"\u0453", "\u0456\u0308"=>"\u0457",
+    "\u043A\u0301"=>"\u045C", "\u0438\u0300"=>"\u045D", "\u0443\u0306"=>"\u045E", "\u0474\u030F"=>"\u0476", "\u0475\u030F"=>"\u0477", "\u0416\u0306"=>"\u04C1", "\u0436\u0306"=>"\u04C2", "\u0410\u0306"=>"\u04D0",
+    "\u0430\u0306"=>"\u04D1", "\u0410\u0308"=>"\u04D2", "\u0430\u0308"=>"\u04D3", "\u0415\u0306"=>"\u04D6", "\u0435\u0306"=>"\u04D7", "\u04D8\u0308"=>"\u04DA", "\u04D9\u0308"=>"\u04DB", "\u0416\u0308"=>"\u04DC",
+    "\u0436\u0308"=>"\u04DD", "\u0417\u0308"=>"\u04DE", "\u0437\u0308"=>"\u04DF", "\u0418\u0304"=>"\u04E2", "\u0438\u0304"=>"\u04E3", "\u0418\u0308"=>"\u04E4", "\u0438\u0308"=>"\u04E5", "\u041E\u0308"=>"\u04E6",
+    "\u043E\u0308"=>"\u04E7", "\u04E8\u0308"=>"\u04EA", "\u04E9\u0308"=>"\u04EB", "\u042D\u0308"=>"\u04EC", "\u044D\u0308"=>"\u04ED", "\u0423\u0304"=>"\u04EE", "\u0443\u0304"=>"\u04EF", "\u0423\u0308"=>"\u04F0",
+    "\u0443\u0308"=>"\u04F1", "\u0423\u030B"=>"\u04F2", "\u0443\u030B"=>"\u04F3", "\u0427\u0308"=>"\u04F4", "\u0447\u0308"=>"\u04F5", "\u042B\u0308"=>"\u04F8", "\u044B\u0308"=>"\u04F9", "\u0627\u0653"=>"\u0622",
+    "\u0627\u0654"=>"\u0623", "\u0648\u0654"=>"\u0624", "\u0627\u0655"=>"\u0625", "\u064A\u0654"=>"\u0626", "\u06D5\u0654"=>"\u06C0", "\u06C1\u0654"=>"\u06C2", "\u06D2\u0654"=>"\u06D3", "\u0928\u093C"=>"\u0929",
+    "\u0930\u093C"=>"\u0931", "\u0933\u093C"=>"\u0934", "\u09C7\u09BE"=>"\u09CB", "\u09C7\u09D7"=>"\u09CC", "\u0B47\u0B56"=>"\u0B48", "\u0B47\u0B3E"=>"\u0B4B", "\u0B47\u0B57"=>"\u0B4C", "\u0B92\u0BD7"=>"\u0B94",
+    "\u0BC6\u0BBE"=>"\u0BCA", "\u0BC7\u0BBE"=>"\u0BCB", "\u0BC6\u0BD7"=>"\u0BCC", "\u0C46\u0C56"=>"\u0C48", "\u0CBF\u0CD5"=>"\u0CC0", "\u0CC6\u0CD5"=>"\u0CC7", "\u0CC6\u0CD6"=>"\u0CC8", "\u0CC6\u0CC2"=>"\u0CCA",
+    "\u0CCA\u0CD5"=>"\u0CCB", "\u0D46\u0D3E"=>"\u0D4A", "\u0D47\u0D3E"=>"\u0D4B", "\u0D46\u0D57"=>"\u0D4C", "\u0DD9\u0DCA"=>"\u0DDA", "\u0DD9\u0DCF"=>"\u0DDC", "\u0DDC\u0DCA"=>"\u0DDD", "\u0DD9\u0DDF"=>"\u0DDE",
+    "\u1025\u102E"=>"\u1026", "\u1B05\u1B35"=>"\u1B06", "\u1B07\u1B35"=>"\u1B08", "\u1B09\u1B35"=>"\u1B0A", "\u1B0B\u1B35"=>"\u1B0C", "\u1B0D\u1B35"=>"\u1B0E", "\u1B11\u1B35"=>"\u1B12", "\u1B3A\u1B35"=>"\u1B3B",
+    "\u1B3C\u1B35"=>"\u1B3D", "\u1B3E\u1B35"=>"\u1B40", "\u1B3F\u1B35"=>"\u1B41", "\u1B42\u1B35"=>"\u1B43", "A\u0325"=>"\u1E00", "a\u0325"=>"\u1E01", "B\u0307"=>"\u1E02", "b\u0307"=>"\u1E03",
+    "B\u0323"=>"\u1E04", "b\u0323"=>"\u1E05", "B\u0331"=>"\u1E06", "b\u0331"=>"\u1E07", "\u00C7\u0301"=>"\u1E08", "\u00E7\u0301"=>"\u1E09", "D\u0307"=>"\u1E0A", "d\u0307"=>"\u1E0B",
+    "D\u0323"=>"\u1E0C", "d\u0323"=>"\u1E0D", "D\u0331"=>"\u1E0E", "d\u0331"=>"\u1E0F", "D\u0327"=>"\u1E10", "d\u0327"=>"\u1E11", "D\u032D"=>"\u1E12", "d\u032D"=>"\u1E13",
+    "\u0112\u0300"=>"\u1E14", "\u0113\u0300"=>"\u1E15", "\u0112\u0301"=>"\u1E16", "\u0113\u0301"=>"\u1E17", "E\u032D"=>"\u1E18", "e\u032D"=>"\u1E19", "E\u0330"=>"\u1E1A", "e\u0330"=>"\u1E1B",
+    "\u0228\u0306"=>"\u1E1C", "\u0229\u0306"=>"\u1E1D", "F\u0307"=>"\u1E1E", "f\u0307"=>"\u1E1F", "G\u0304"=>"\u1E20", "g\u0304"=>"\u1E21", "H\u0307"=>"\u1E22", "h\u0307"=>"\u1E23",
+    "H\u0323"=>"\u1E24", "h\u0323"=>"\u1E25", "H\u0308"=>"\u1E26", "h\u0308"=>"\u1E27", "H\u0327"=>"\u1E28", "h\u0327"=>"\u1E29", "H\u032E"=>"\u1E2A", "h\u032E"=>"\u1E2B",
+    "I\u0330"=>"\u1E2C", "i\u0330"=>"\u1E2D", "\u00CF\u0301"=>"\u1E2E", "\u00EF\u0301"=>"\u1E2F", "K\u0301"=>"\u1E30", "k\u0301"=>"\u1E31", "K\u0323"=>"\u1E32", "k\u0323"=>"\u1E33",
+    "K\u0331"=>"\u1E34", "k\u0331"=>"\u1E35", "L\u0323"=>"\u1E36", "l\u0323"=>"\u1E37", "\u1E36\u0304"=>"\u1E38", "\u1E37\u0304"=>"\u1E39", "L\u0331"=>"\u1E3A", "l\u0331"=>"\u1E3B",
+    "L\u032D"=>"\u1E3C", "l\u032D"=>"\u1E3D", "M\u0301"=>"\u1E3E", "m\u0301"=>"\u1E3F", "M\u0307"=>"\u1E40", "m\u0307"=>"\u1E41", "M\u0323"=>"\u1E42", "m\u0323"=>"\u1E43",
+    "N\u0307"=>"\u1E44", "n\u0307"=>"\u1E45", "N\u0323"=>"\u1E46", "n\u0323"=>"\u1E47", "N\u0331"=>"\u1E48", "n\u0331"=>"\u1E49", "N\u032D"=>"\u1E4A", "n\u032D"=>"\u1E4B",
+    "\u00D5\u0301"=>"\u1E4C", "\u00F5\u0301"=>"\u1E4D", "\u00D5\u0308"=>"\u1E4E", "\u00F5\u0308"=>"\u1E4F", "\u014C\u0300"=>"\u1E50", "\u014D\u0300"=>"\u1E51", "\u014C\u0301"=>"\u1E52", "\u014D\u0301"=>"\u1E53",
+    "P\u0301"=>"\u1E54", "p\u0301"=>"\u1E55", "P\u0307"=>"\u1E56", "p\u0307"=>"\u1E57", "R\u0307"=>"\u1E58", "r\u0307"=>"\u1E59", "R\u0323"=>"\u1E5A", "r\u0323"=>"\u1E5B",
+    "\u1E5A\u0304"=>"\u1E5C", "\u1E5B\u0304"=>"\u1E5D", "R\u0331"=>"\u1E5E", "r\u0331"=>"\u1E5F", "S\u0307"=>"\u1E60", "s\u0307"=>"\u1E61", "S\u0323"=>"\u1E62", "s\u0323"=>"\u1E63",
+    "\u015A\u0307"=>"\u1E64", "\u015B\u0307"=>"\u1E65", "\u0160\u0307"=>"\u1E66", "\u0161\u0307"=>"\u1E67", "\u1E62\u0307"=>"\u1E68", "\u1E63\u0307"=>"\u1E69", "T\u0307"=>"\u1E6A", "t\u0307"=>"\u1E6B",
+    "T\u0323"=>"\u1E6C", "t\u0323"=>"\u1E6D", "T\u0331"=>"\u1E6E", "t\u0331"=>"\u1E6F", "T\u032D"=>"\u1E70", "t\u032D"=>"\u1E71", "U\u0324"=>"\u1E72", "u\u0324"=>"\u1E73",
+    "U\u0330"=>"\u1E74", "u\u0330"=>"\u1E75", "U\u032D"=>"\u1E76", "u\u032D"=>"\u1E77", "\u0168\u0301"=>"\u1E78", "\u0169\u0301"=>"\u1E79", "\u016A\u0308"=>"\u1E7A", "\u016B\u0308"=>"\u1E7B",
+    "V\u0303"=>"\u1E7C", "v\u0303"=>"\u1E7D", "V\u0323"=>"\u1E7E", "v\u0323"=>"\u1E7F", "W\u0300"=>"\u1E80", "w\u0300"=>"\u1E81", "W\u0301"=>"\u1E82", "w\u0301"=>"\u1E83",
+    "W\u0308"=>"\u1E84", "w\u0308"=>"\u1E85", "W\u0307"=>"\u1E86", "w\u0307"=>"\u1E87", "W\u0323"=>"\u1E88", "w\u0323"=>"\u1E89", "X\u0307"=>"\u1E8A", "x\u0307"=>"\u1E8B",
+    "X\u0308"=>"\u1E8C", "x\u0308"=>"\u1E8D", "Y\u0307"=>"\u1E8E", "y\u0307"=>"\u1E8F", "Z\u0302"=>"\u1E90", "z\u0302"=>"\u1E91", "Z\u0323"=>"\u1E92", "z\u0323"=>"\u1E93",
+    "Z\u0331"=>"\u1E94", "z\u0331"=>"\u1E95", "h\u0331"=>"\u1E96", "t\u0308"=>"\u1E97", "w\u030A"=>"\u1E98", "y\u030A"=>"\u1E99", "\u017F\u0307"=>"\u1E9B", "A\u0323"=>"\u1EA0",
+    "a\u0323"=>"\u1EA1", "A\u0309"=>"\u1EA2", "a\u0309"=>"\u1EA3", "\u00C2\u0301"=>"\u1EA4", "\u00E2\u0301"=>"\u1EA5", "\u00C2\u0300"=>"\u1EA6", "\u00E2\u0300"=>"\u1EA7", "\u00C2\u0309"=>"\u1EA8",
+    "\u00E2\u0309"=>"\u1EA9", "\u00C2\u0303"=>"\u1EAA", "\u00E2\u0303"=>"\u1EAB", "\u1EA0\u0302"=>"\u1EAC", "\u1EA1\u0302"=>"\u1EAD", "\u0102\u0301"=>"\u1EAE", "\u0103\u0301"=>"\u1EAF", "\u0102\u0300"=>"\u1EB0",
+    "\u0103\u0300"=>"\u1EB1", "\u0102\u0309"=>"\u1EB2", "\u0103\u0309"=>"\u1EB3", "\u0102\u0303"=>"\u1EB4", "\u0103\u0303"=>"\u1EB5", "\u1EA0\u0306"=>"\u1EB6", "\u1EA1\u0306"=>"\u1EB7", "E\u0323"=>"\u1EB8",
+    "e\u0323"=>"\u1EB9", "E\u0309"=>"\u1EBA", "e\u0309"=>"\u1EBB", "E\u0303"=>"\u1EBC", "e\u0303"=>"\u1EBD", "\u00CA\u0301"=>"\u1EBE", "\u00EA\u0301"=>"\u1EBF", "\u00CA\u0300"=>"\u1EC0",
+    "\u00EA\u0300"=>"\u1EC1", "\u00CA\u0309"=>"\u1EC2", "\u00EA\u0309"=>"\u1EC3", "\u00CA\u0303"=>"\u1EC4", "\u00EA\u0303"=>"\u1EC5", "\u1EB8\u0302"=>"\u1EC6", "\u1EB9\u0302"=>"\u1EC7", "I\u0309"=>"\u1EC8",
+    "i\u0309"=>"\u1EC9", "I\u0323"=>"\u1ECA", "i\u0323"=>"\u1ECB", "O\u0323"=>"\u1ECC", "o\u0323"=>"\u1ECD", "O\u0309"=>"\u1ECE", "o\u0309"=>"\u1ECF", "\u00D4\u0301"=>"\u1ED0",
+    "\u00F4\u0301"=>"\u1ED1", "\u00D4\u0300"=>"\u1ED2", "\u00F4\u0300"=>"\u1ED3", "\u00D4\u0309"=>"\u1ED4", "\u00F4\u0309"=>"\u1ED5", "\u00D4\u0303"=>"\u1ED6", "\u00F4\u0303"=>"\u1ED7", "\u1ECC\u0302"=>"\u1ED8",
+    "\u1ECD\u0302"=>"\u1ED9", "\u01A0\u0301"=>"\u1EDA", "\u01A1\u0301"=>"\u1EDB", "\u01A0\u0300"=>"\u1EDC", "\u01A1\u0300"=>"\u1EDD", "\u01A0\u0309"=>"\u1EDE", "\u01A1\u0309"=>"\u1EDF", "\u01A0\u0303"=>"\u1EE0",
+    "\u01A1\u0303"=>"\u1EE1", "\u01A0\u0323"=>"\u1EE2", "\u01A1\u0323"=>"\u1EE3", "U\u0323"=>"\u1EE4", "u\u0323"=>"\u1EE5", "U\u0309"=>"\u1EE6", "u\u0309"=>"\u1EE7", "\u01AF\u0301"=>"\u1EE8",
+    "\u01B0\u0301"=>"\u1EE9", "\u01AF\u0300"=>"\u1EEA", "\u01B0\u0300"=>"\u1EEB", "\u01AF\u0309"=>"\u1EEC", "\u01B0\u0309"=>"\u1EED", "\u01AF\u0303"=>"\u1EEE", "\u01B0\u0303"=>"\u1EEF", "\u01AF\u0323"=>"\u1EF0",
+    "\u01B0\u0323"=>"\u1EF1", "Y\u0300"=>"\u1EF2", "y\u0300"=>"\u1EF3", "Y\u0323"=>"\u1EF4", "y\u0323"=>"\u1EF5", "Y\u0309"=>"\u1EF6", "y\u0309"=>"\u1EF7", "Y\u0303"=>"\u1EF8",
+    "y\u0303"=>"\u1EF9", "\u03B1\u0313"=>"\u1F00", "\u03B1\u0314"=>"\u1F01", "\u1F00\u0300"=>"\u1F02", "\u1F01\u0300"=>"\u1F03", "\u1F00\u0301"=>"\u1F04", "\u1F01\u0301"=>"\u1F05", "\u1F00\u0342"=>"\u1F06",
+    "\u1F01\u0342"=>"\u1F07", "\u0391\u0313"=>"\u1F08", "\u0391\u0314"=>"\u1F09", "\u1F08\u0300"=>"\u1F0A", "\u1F09\u0300"=>"\u1F0B", "\u1F08\u0301"=>"\u1F0C", "\u1F09\u0301"=>"\u1F0D", "\u1F08\u0342"=>"\u1F0E",
+    "\u1F09\u0342"=>"\u1F0F", "\u03B5\u0313"=>"\u1F10", "\u03B5\u0314"=>"\u1F11", "\u1F10\u0300"=>"\u1F12", "\u1F11\u0300"=>"\u1F13", "\u1F10\u0301"=>"\u1F14", "\u1F11\u0301"=>"\u1F15", "\u0395\u0313"=>"\u1F18",
+    "\u0395\u0314"=>"\u1F19", "\u1F18\u0300"=>"\u1F1A", "\u1F19\u0300"=>"\u1F1B", "\u1F18\u0301"=>"\u1F1C", "\u1F19\u0301"=>"\u1F1D", "\u03B7\u0313"=>"\u1F20", "\u03B7\u0314"=>"\u1F21", "\u1F20\u0300"=>"\u1F22",
+    "\u1F21\u0300"=>"\u1F23", "\u1F20\u0301"=>"\u1F24", "\u1F21\u0301"=>"\u1F25", "\u1F20\u0342"=>"\u1F26", "\u1F21\u0342"=>"\u1F27", "\u0397\u0313"=>"\u1F28", "\u0397\u0314"=>"\u1F29", "\u1F28\u0300"=>"\u1F2A",
+    "\u1F29\u0300"=>"\u1F2B", "\u1F28\u0301"=>"\u1F2C", "\u1F29\u0301"=>"\u1F2D", "\u1F28\u0342"=>"\u1F2E", "\u1F29\u0342"=>"\u1F2F", "\u03B9\u0313"=>"\u1F30", "\u03B9\u0314"=>"\u1F31", "\u1F30\u0300"=>"\u1F32",
+    "\u1F31\u0300"=>"\u1F33", "\u1F30\u0301"=>"\u1F34", "\u1F31\u0301"=>"\u1F35", "\u1F30\u0342"=>"\u1F36", "\u1F31\u0342"=>"\u1F37", "\u0399\u0313"=>"\u1F38", "\u0399\u0314"=>"\u1F39", "\u1F38\u0300"=>"\u1F3A",
+    "\u1F39\u0300"=>"\u1F3B", "\u1F38\u0301"=>"\u1F3C", "\u1F39\u0301"=>"\u1F3D", "\u1F38\u0342"=>"\u1F3E", "\u1F39\u0342"=>"\u1F3F", "\u03BF\u0313"=>"\u1F40", "\u03BF\u0314"=>"\u1F41", "\u1F40\u0300"=>"\u1F42",
+    "\u1F41\u0300"=>"\u1F43", "\u1F40\u0301"=>"\u1F44", "\u1F41\u0301"=>"\u1F45", "\u039F\u0313"=>"\u1F48", "\u039F\u0314"=>"\u1F49", "\u1F48\u0300"=>"\u1F4A", "\u1F49\u0300"=>"\u1F4B", "\u1F48\u0301"=>"\u1F4C",
+    "\u1F49\u0301"=>"\u1F4D", "\u03C5\u0313"=>"\u1F50", "\u03C5\u0314"=>"\u1F51", "\u1F50\u0300"=>"\u1F52", "\u1F51\u0300"=>"\u1F53", "\u1F50\u0301"=>"\u1F54", "\u1F51\u0301"=>"\u1F55", "\u1F50\u0342"=>"\u1F56",
+    "\u1F51\u0342"=>"\u1F57", "\u03A5\u0314"=>"\u1F59", "\u1F59\u0300"=>"\u1F5B", "\u1F59\u0301"=>"\u1F5D", "\u1F59\u0342"=>"\u1F5F", "\u03C9\u0313"=>"\u1F60", "\u03C9\u0314"=>"\u1F61", "\u1F60\u0300"=>"\u1F62",
+    "\u1F61\u0300"=>"\u1F63", "\u1F60\u0301"=>"\u1F64", "\u1F61\u0301"=>"\u1F65", "\u1F60\u0342"=>"\u1F66", "\u1F61\u0342"=>"\u1F67", "\u03A9\u0313"=>"\u1F68", "\u03A9\u0314"=>"\u1F69", "\u1F68\u0300"=>"\u1F6A",
+    "\u1F69\u0300"=>"\u1F6B", "\u1F68\u0301"=>"\u1F6C", "\u1F69\u0301"=>"\u1F6D", "\u1F68\u0342"=>"\u1F6E", "\u1F69\u0342"=>"\u1F6F", "\u03B1\u0300"=>"\u1F70", "\u03B5\u0300"=>"\u1F72", "\u03B7\u0300"=>"\u1F74",
+    "\u03B9\u0300"=>"\u1F76", "\u03BF\u0300"=>"\u1F78", "\u03C5\u0300"=>"\u1F7A", "\u03C9\u0300"=>"\u1F7C", "\u1F00\u0345"=>"\u1F80", "\u1F01\u0345"=>"\u1F81", "\u1F02\u0345"=>"\u1F82", "\u1F03\u0345"=>"\u1F83",
+    "\u1F04\u0345"=>"\u1F84", "\u1F05\u0345"=>"\u1F85", "\u1F06\u0345"=>"\u1F86", "\u1F07\u0345"=>"\u1F87", "\u1F08\u0345"=>"\u1F88", "\u1F09\u0345"=>"\u1F89", "\u1F0A\u0345"=>"\u1F8A", "\u1F0B\u0345"=>"\u1F8B",
+    "\u1F0C\u0345"=>"\u1F8C", "\u1F0D\u0345"=>"\u1F8D", "\u1F0E\u0345"=>"\u1F8E", "\u1F0F\u0345"=>"\u1F8F", "\u1F20\u0345"=>"\u1F90", "\u1F21\u0345"=>"\u1F91", "\u1F22\u0345"=>"\u1F92", "\u1F23\u0345"=>"\u1F93",
+    "\u1F24\u0345"=>"\u1F94", "\u1F25\u0345"=>"\u1F95", "\u1F26\u0345"=>"\u1F96", "\u1F27\u0345"=>"\u1F97", "\u1F28\u0345"=>"\u1F98", "\u1F29\u0345"=>"\u1F99", "\u1F2A\u0345"=>"\u1F9A", "\u1F2B\u0345"=>"\u1F9B",
+    "\u1F2C\u0345"=>"\u1F9C", "\u1F2D\u0345"=>"\u1F9D", "\u1F2E\u0345"=>"\u1F9E", "\u1F2F\u0345"=>"\u1F9F", "\u1F60\u0345"=>"\u1FA0", "\u1F61\u0345"=>"\u1FA1", "\u1F62\u0345"=>"\u1FA2", "\u1F63\u0345"=>"\u1FA3",
+    "\u1F64\u0345"=>"\u1FA4", "\u1F65\u0345"=>"\u1FA5", "\u1F66\u0345"=>"\u1FA6", "\u1F67\u0345"=>"\u1FA7", "\u1F68\u0345"=>"\u1FA8", "\u1F69\u0345"=>"\u1FA9", "\u1F6A\u0345"=>"\u1FAA", "\u1F6B\u0345"=>"\u1FAB",
+    "\u1F6C\u0345"=>"\u1FAC", "\u1F6D\u0345"=>"\u1FAD", "\u1F6E\u0345"=>"\u1FAE", "\u1F6F\u0345"=>"\u1FAF", "\u03B1\u0306"=>"\u1FB0", "\u03B1\u0304"=>"\u1FB1", "\u1F70\u0345"=>"\u1FB2", "\u03B1\u0345"=>"\u1FB3",
+    "\u03AC\u0345"=>"\u1FB4", "\u03B1\u0342"=>"\u1FB6", "\u1FB6\u0345"=>"\u1FB7", "\u0391\u0306"=>"\u1FB8", "\u0391\u0304"=>"\u1FB9", "\u0391\u0300"=>"\u1FBA", "\u0391\u0345"=>"\u1FBC", "\u00A8\u0342"=>"\u1FC1",
+    "\u1F74\u0345"=>"\u1FC2", "\u03B7\u0345"=>"\u1FC3", "\u03AE\u0345"=>"\u1FC4", "\u03B7\u0342"=>"\u1FC6", "\u1FC6\u0345"=>"\u1FC7", "\u0395\u0300"=>"\u1FC8", "\u0397\u0300"=>"\u1FCA", "\u0397\u0345"=>"\u1FCC",
+    "\u1FBF\u0300"=>"\u1FCD", "\u1FBF\u0301"=>"\u1FCE", "\u1FBF\u0342"=>"\u1FCF", "\u03B9\u0306"=>"\u1FD0", "\u03B9\u0304"=>"\u1FD1", "\u03CA\u0300"=>"\u1FD2", "\u03B9\u0342"=>"\u1FD6", "\u03CA\u0342"=>"\u1FD7",
+    "\u0399\u0306"=>"\u1FD8", "\u0399\u0304"=>"\u1FD9", "\u0399\u0300"=>"\u1FDA", "\u1FFE\u0300"=>"\u1FDD", "\u1FFE\u0301"=>"\u1FDE", "\u1FFE\u0342"=>"\u1FDF", "\u03C5\u0306"=>"\u1FE0", "\u03C5\u0304"=>"\u1FE1",
+    "\u03CB\u0300"=>"\u1FE2", "\u03C1\u0313"=>"\u1FE4", "\u03C1\u0314"=>"\u1FE5", "\u03C5\u0342"=>"\u1FE6", "\u03CB\u0342"=>"\u1FE7", "\u03A5\u0306"=>"\u1FE8", "\u03A5\u0304"=>"\u1FE9", "\u03A5\u0300"=>"\u1FEA",
+    "\u03A1\u0314"=>"\u1FEC", "\u00A8\u0300"=>"\u1FED", "\u1F7C\u0345"=>"\u1FF2", "\u03C9\u0345"=>"\u1FF3", "\u03CE\u0345"=>"\u1FF4", "\u03C9\u0342"=>"\u1FF6", "\u1FF6\u0345"=>"\u1FF7", "\u039F\u0300"=>"\u1FF8",
+    "\u03A9\u0300"=>"\u1FFA", "\u03A9\u0345"=>"\u1FFC", "\u2190\u0338"=>"\u219A", "\u2192\u0338"=>"\u219B", "\u2194\u0338"=>"\u21AE", "\u21D0\u0338"=>"\u21CD", "\u21D4\u0338"=>"\u21CE", "\u21D2\u0338"=>"\u21CF",
+    "\u2203\u0338"=>"\u2204", "\u2208\u0338"=>"\u2209", "\u220B\u0338"=>"\u220C", "\u2223\u0338"=>"\u2224", "\u2225\u0338"=>"\u2226", "\u223C\u0338"=>"\u2241", "\u2243\u0338"=>"\u2244", "\u2245\u0338"=>"\u2247",
+    "\u2248\u0338"=>"\u2249", "=\u0338"=>"\u2260", "\u2261\u0338"=>"\u2262", "\u224D\u0338"=>"\u226D", "<\u0338"=>"\u226E", ">\u0338"=>"\u226F", "\u2264\u0338"=>"\u2270", "\u2265\u0338"=>"\u2271",
+    "\u2272\u0338"=>"\u2274", "\u2273\u0338"=>"\u2275", "\u2276\u0338"=>"\u2278", "\u2277\u0338"=>"\u2279", "\u227A\u0338"=>"\u2280", "\u227B\u0338"=>"\u2281", "\u2282\u0338"=>"\u2284", "\u2283\u0338"=>"\u2285",
+    "\u2286\u0338"=>"\u2288", "\u2287\u0338"=>"\u2289", "\u22A2\u0338"=>"\u22AC", "\u22A8\u0338"=>"\u22AD", "\u22A9\u0338"=>"\u22AE", "\u22AB\u0338"=>"\u22AF", "\u227C\u0338"=>"\u22E0", "\u227D\u0338"=>"\u22E1",
+    "\u2291\u0338"=>"\u22E2", "\u2292\u0338"=>"\u22E3", "\u22B2\u0338"=>"\u22EA", "\u22B3\u0338"=>"\u22EB", "\u22B4\u0338"=>"\u22EC", "\u22B5\u0338"=>"\u22ED", "\u304B\u3099"=>"\u304C", "\u304D\u3099"=>"\u304E",
+    "\u304F\u3099"=>"\u3050", "\u3051\u3099"=>"\u3052", "\u3053\u3099"=>"\u3054", "\u3055\u3099"=>"\u3056", "\u3057\u3099"=>"\u3058", "\u3059\u3099"=>"\u305A", "\u305B\u3099"=>"\u305C", "\u305D\u3099"=>"\u305E",
+    "\u305F\u3099"=>"\u3060", "\u3061\u3099"=>"\u3062", "\u3064\u3099"=>"\u3065", "\u3066\u3099"=>"\u3067", "\u3068\u3099"=>"\u3069", "\u306F\u3099"=>"\u3070", "\u306F\u309A"=>"\u3071", "\u3072\u3099"=>"\u3073",
+    "\u3072\u309A"=>"\u3074", "\u3075\u3099"=>"\u3076", "\u3075\u309A"=>"\u3077", "\u3078\u3099"=>"\u3079", "\u3078\u309A"=>"\u307A", "\u307B\u3099"=>"\u307C", "\u307B\u309A"=>"\u307D", "\u3046\u3099"=>"\u3094",
+    "\u309D\u3099"=>"\u309E", "\u30AB\u3099"=>"\u30AC", "\u30AD\u3099"=>"\u30AE", "\u30AF\u3099"=>"\u30B0", "\u30B1\u3099"=>"\u30B2", "\u30B3\u3099"=>"\u30B4", "\u30B5\u3099"=>"\u30B6", "\u30B7\u3099"=>"\u30B8",
+    "\u30B9\u3099"=>"\u30BA", "\u30BB\u3099"=>"\u30BC", "\u30BD\u3099"=>"\u30BE", "\u30BF\u3099"=>"\u30C0", "\u30C1\u3099"=>"\u30C2", "\u30C4\u3099"=>"\u30C5", "\u30C6\u3099"=>"\u30C7", "\u30C8\u3099"=>"\u30C9",
+    "\u30CF\u3099"=>"\u30D0", "\u30CF\u309A"=>"\u30D1", "\u30D2\u3099"=>"\u30D3", "\u30D2\u309A"=>"\u30D4", "\u30D5\u3099"=>"\u30D6", "\u30D5\u309A"=>"\u30D7", "\u30D8\u3099"=>"\u30D9", "\u30D8\u309A"=>"\u30DA",
+    "\u30DB\u3099"=>"\u30DC", "\u30DB\u309A"=>"\u30DD", "\u30A6\u3099"=>"\u30F4", "\u30EF\u3099"=>"\u30F7", "\u30F0\u3099"=>"\u30F8", "\u30F1\u3099"=>"\u30F9", "\u30F2\u3099"=>"\u30FA", "\u30FD\u3099"=>"\u30FE",
+    "\u{11099}\u{110BA}"=>"\u{1109A}", "\u{1109B}\u{110BA}"=>"\u{1109C}", "\u{110A5}\u{110BA}"=>"\u{110AB}", "\u{11131}\u{11127}"=>"\u{1112E}", "\u{11132}\u{11127}"=>"\u{1112F}", "\u{11347}\u{1133E}"=>"\u{1134B}", "\u{11347}\u{11357}"=>"\u{1134C}", "\u{114B9}\u{114BA}"=>"\u{114BB}",
+    "\u{114B9}\u{114B0}"=>"\u{114BC}", "\u{114B9}\u{114BD}"=>"\u{114BE}", "\u{115B8}\u{115AF}"=>"\u{115BA}", "\u{115B9}\u{115AF}"=>"\u{115BB}",
   }.freeze
 end
diff --git a/lib/uri.rb b/lib/uri.rb
index 9b6bde91c0..971a97038f 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -1,28 +1,34 @@
 # frozen_string_literal: false
 # URI is a module providing classes to handle Uniform Resource Identifiers
-# (RFC2396[http://tools.ietf.org/html/rfc2396]).
+# (RFC2396[http://tools.ietf.org/html/rfc2396])
 #
 # == Features
 #
-# * Uniform way of handling URIs.
-# * Flexibility to introduce custom URI schemes.
+# * Uniform handling of handling URIs
+# * Flexibility to introduce custom URI schemes
 # * Flexibility to have an alternate URI::Parser (or just different patterns
-#   and regexp's).
+#   and regexp's)
 #
 # == Basic example
 #
 #   require 'uri'
 #
 #   uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
-#   #=> #<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"
+#   #=> #<URI::HTTP:0x00000000b14880
+#         URL: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
 #
@@ -35,18 +41,18 @@
 #   #=> URI::RSYNC
 #
 #   URI.scheme_list
-#   #=> {"FILE"=>URI::File, "FTP"=>URI::FTP, "HTTP"=>URI::HTTP,
-#   #    "HTTPS"=>URI::HTTPS, "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS,
-#   #    "MAILTO"=>URI::MailTo, "RSYNC"=>URI::RSYNC}
+#   #=> {"FTP"=>URI::FTP, "HTTP"=>URI::HTTP, "HTTPS"=>URI::HTTPS,
+#        "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS, "MAILTO"=>URI::MailTo,
+#        "RSYNC"=>URI::RSYNC}
 #
 #   uri = URI("rsync://rsync.foo.com")
-#   #=> #<URI::RSYNC rsync://rsync.foo.com>
+#   #=> #<URI::RSYNC:0x00000000f648c8 URL:rsync://rsync.foo.com>
 #
 # == RFC References
 #
-# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html
 #
-# Here is a list of all related RFC's:
+# 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]
@@ -59,7 +65,6 @@
 # == Class tree
 #
 # - URI::Generic (in uri/generic.rb)
-#   - URI::File - (in uri/file.rb)
 #   - URI::FTP - (in uri/ftp.rb)
 #   - URI::HTTP - (in uri/http.rb)
 #     - URI::HTTPS - (in uri/https.rb)
@@ -99,7 +104,6 @@ end
 
 require 'uri/common'
 require 'uri/generic'
-require 'uri/file'
 require 'uri/ftp'
 require 'uri/http'
 require 'uri/https'
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 17d9ffc28c..4c7d112e61 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 #--
 # = uri/common.rb
 #
@@ -10,8 +10,8 @@
 # See URI for general documentation
 #
 
-require_relative "rfc2396_parser"
-require_relative "rfc3986_parser"
+require "uri/rfc2396_parser"
+require "uri/rfc3986_parser"
 
 module URI
   REGEXP = RFC2396_REGEXP
@@ -61,7 +61,7 @@ module URI
     module_function :make_components_hash
   end
 
-  # Module for escaping unsafe characters with codes.
+  # module for escaping unsafe characters with codes.
   module Escape
     #
     # == Synopsis
@@ -74,32 +74,29 @@ module URI
     #   String to replaces in.
     # +unsafe+::
     #   Regexp that matches all symbols that must be replaced with codes.
-    #   By default uses <tt>UNSAFE</tt>.
+    #   By default uses <tt>REGEXP::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, URI.encode_www_form or URI.encode_www_form_component
-    # depending on your specific use case.
-    #
     # == Usage
     #
     #   require 'uri'
     #
     #   enc_uri = URI.escape("http://example.com/?a=\11\15")
+    #   p enc_uri
     #   # => "http://example.com/?a=%09%0D"
     #
-    #   URI.unescape(enc_uri)
+    #   p URI.unescape(enc_uri)
     #   # => "http://example.com/?a=\t\r"
     #
-    #   URI.escape("@?@!", "!?")
+    #   p URI.escape("@?@!", "!?")
     #   # => "@%3F@%21"
     #
     def escape(*arg)
-      warn "URI.escape is obsolete", uplevel: 1 if $VERBOSE
+      warn "#{caller(1)[0]}: warning: URI.escape is obsolete" if $VERBOSE
       DEFAULT_PARSER.escape(*arg)
     end
     alias encode escape
@@ -111,26 +108,21 @@ module URI
     # == Args
     #
     # +str+::
-    #   String to unescape.
-    #
-    # == Description
-    #
-    # This method is obsolete and should not be used. Instead, use
-    # CGI.unescape, URI.decode_www_form or URI.decode_www_form_component
-    # depending on your specific use case.
+    #   Unescapes the string.
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   enc_uri = URI.escape("http://example.com/?a=\11\15")
+    #   p enc_uri
     #   # => "http://example.com/?a=%09%0D"
     #
-    #   URI.unescape(enc_uri)
+    #   p URI.unescape(enc_uri)
     #   # => "http://example.com/?a=\t\r"
     #
     def unescape(*arg)
-      warn "URI.unescape is obsolete", uplevel: 1 if $VERBOSE
+      warn "#{caller(1)[0]}: warning: URI.unescape is obsolete" if $VERBOSE
       DEFAULT_PARSER.unescape(*arg)
     end
     alias decode unescape
@@ -140,7 +132,7 @@ module URI
   include REGEXP
 
   @@schemes = {}
-  # Returns a Hash of the defined schemes.
+  # Returns a Hash of the defined schemes
   def self.scheme_list
     @@schemes
   end
@@ -176,21 +168,21 @@ module URI
   #
   # Splits the string on following parts and returns array with result:
   #
-  # * Scheme
-  # * Userinfo
-  # * Host
-  # * Port
-  # * Registry
-  # * Path
-  # * Opaque
-  # * Query
-  # * Fragment
+  #   * Scheme
+  #   * Userinfo
+  #   * Host
+  #   * Port
+  #   * Registry
+  #   * Path
+  #   * Opaque
+  #   * Query
+  #   * Fragment
   #
   # == Usage
   #
   #   require 'uri'
   #
-  #   URI.split("http://www.ruby-lang.org/")
+  #   p URI.split("http://www.ruby-lang.org/")
   #   # => ["http", nil, "www.ruby-lang.org", nil, nil, "/", nil, nil, nil]
   #
   def self.split(uri)
@@ -213,7 +205,7 @@ module URI
   #
   # == Raises
   #
-  # URI::InvalidURIError::
+  # URI::InvalidURIError
   #   Raised if URI given is not a correct one.
   #
   # == Usage
@@ -221,10 +213,11 @@ module URI
   #   require 'uri'
   #
   #   uri = URI.parse("http://www.ruby-lang.org/")
-  #   # => #<URI::HTTP http://www.ruby-lang.org/>
-  #   uri.scheme
+  #   p uri
+  #   # => #<URI::HTTP:0x202281be URL:http://www.ruby-lang.org/>
+  #   p uri.scheme
   #   # => "http"
-  #   uri.host
+  #   p uri.host
   #   # => "www.ruby-lang.org"
   #
   # It's recommended to first ::escape the provided +uri_str+ if there are any
@@ -252,20 +245,21 @@ module URI
   #
   #   require 'uri'
   #
-  #   URI.join("http://example.com/","main.rbx")
-  #   # => #<URI::HTTP http://example.com/main.rbx>
+  #   p URI.join("http://example.com/","main.rbx")
+  #   # => #<URI::HTTP:0x2022ac02 URL:http://example.com/main.rbx>
+  #
+  #   p URI.join('http://example.com', 'foo')
+  #   # => #<URI::HTTP:0x01ab80a0 URL:http://example.com/foo>
   #
-  #   URI.join('http://example.com', 'foo')
-  #   # => #<URI::HTTP http://example.com/foo>
+  #   p URI.join('http://example.com', '/foo', '/bar')
+  #   # => #<URI::HTTP:0x01aaf0b0 URL:http://example.com/bar>
   #
-  #   URI.join('http://example.com', '/foo', '/bar')
-  #   # => #<URI::HTTP http://example.com/bar>
+  #   p URI.join('http://example.com', '/foo', 'bar')
+  #   # => #<URI::HTTP:0x801a92af0 URL:http://example.com/bar>
   #
-  #   URI.join('http://example.com', '/foo', 'bar')
-  #   # => #<URI::HTTP http://example.com/bar>
+  #   p URI.join('http://example.com', '/foo/', 'bar')
+  #   # => #<URI::HTTP:0x80135a3a0 URL:http://example.com/foo/bar>
   #
-  #   URI.join('http://example.com', '/foo/', 'bar')
-  #   # => #<URI::HTTP http://example.com/foo/bar>
   #
   def self.join(*str)
     RFC3986_PARSER.join(*str)
@@ -281,7 +275,7 @@ module URI
   # +str+::
   #   String to extract URIs from.
   # +schemes+::
-  #   Limit URI matching to specific schemes.
+  #   Limit URI matching to a specific schemes.
   #
   # == Description
   #
@@ -296,7 +290,7 @@ module URI
   #   # => ["http://foo.example.com/bla", "mailto:test@example.com"]
   #
   def self.extract(str, schemes = nil, &block)
-    warn "URI.extract is obsolete", uplevel: 1 if $VERBOSE
+    warn "#{caller(1)[0]}: warning: URI.extract is obsolete" if $VERBOSE
     DEFAULT_PARSER.extract(str, schemes, &block)
   end
 
@@ -312,7 +306,6 @@ module URI
   #   whose scheme is one of the match_schemes.
   #
   # == Description
-  #
   # Returns a Regexp object which matches to URI-like strings.
   # The Regexp object returned by this method includes arbitrary
   # number of capture group (parentheses).  Never rely on it's number.
@@ -325,7 +318,7 @@ module URI
   #   html_string.slice(URI.regexp)
   #
   #   # remove ftp URIs
-  #   html_string.sub(URI.regexp(['ftp']), '')
+  #   html_string.sub(URI.regexp(['ftp'])
   #
   #   # You should not rely on the number of parentheses
   #   html_string.scan(URI.regexp) do |*matches|
@@ -333,28 +326,31 @@ module URI
   #   end
   #
   def self.regexp(schemes = nil)
-    warn "URI.regexp is obsolete", uplevel: 1 if $VERBOSE
+    warn "#{caller(1)[0]}: warning: URI.regexp is obsolete" if $VERBOSE
     DEFAULT_PARSER.make_regexp(schemes)
   end
 
   TBLENCWWWCOMP_ = {} # :nodoc:
   256.times do |i|
-    TBLENCWWWCOMP_[-i.chr] = -('%%%02X' % 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
+    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.
+  HTML5ASCIIINCOMPAT = defined? Encoding::UTF_7 ? [Encoding::UTF_7, Encoding::UTF_16BE, Encoding::UTF_16LE,
+    Encoding::UTF_32BE, Encoding::UTF_32LE] : [] # :nodoc:
+
+  # Encode 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.
@@ -362,9 +358,9 @@ module URI
   # 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.
+  # http://www.w3.org/TR/2013/CR-html5-20130806/forms.html#url-encoded-form-data
   #
-  # See URI.decode_www_form_component, URI.encode_www_form.
+  # See URI.decode_www_form_component, URI.encode_www_form
   def self.encode_www_form_component(str, enc=nil)
     str = str.to_s.dup
     if str.encoding != Encoding::ASCII_8BIT
@@ -378,17 +374,17 @@ module URI
     str.force_encoding(Encoding::US_ASCII)
   end
 
-  # Decodes given +str+ of URL-encoded form data.
+  # Decode given +str+ of URL-encoded form data.
   #
   # This decodes + to SP.
   #
-  # See URI.encode_www_form_component, URI.decode_www_form.
+  # See URI.encode_www_form_component, 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+.
+  # Generate URL-encoded form data from given +enum+.
   #
   # This generates application/x-www-form-urlencoded data defined in HTML5
   # from given an Enumerable object.
@@ -396,7 +392,7 @@ module URI
   # This internally uses 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
+  # before call 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.)
   #
@@ -414,7 +410,7 @@ module URI
   #    URI.encode_www_form([["q", "ruby"], ["q", "perl"], ["lang", "en"]])
   #    #=> "q=ruby&q=perl&lang=en"
   #
-  # See URI.encode_www_form_component, URI.decode_www_form.
+  # See URI.encode_www_form_component, URI.decode_www_form
   def self.encode_www_form(enum, enc=nil)
     enum.map do |k,v|
       if v.nil?
@@ -435,22 +431,22 @@ module URI
     end.join('&')
   end
 
-  # Decodes URL-encoded form data from given +str+.
+  # Decode URL-encoded form data from given +str+.
   #
   # This decodes application/x-www-form-urlencoded data
-  # and returns an array of key-value arrays.
+  # and returns array of key-value array.
   #
-  # This refers http://url.spec.whatwg.org/#concept-urlencoded-parser,
-  # so this supports only &-separator, and doesn't support ;-separator.
+  # This refers http://url.spec.whatwg.org/#concept-urlencoded-parser ,
+  # so this supports only &-separator, don't support ;-separator.
   #
   #    ary = 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"}
+  #    p ary                  #=> [['a', '1'], ['a', '2'], ['b', '3']]
+  #    p ary.assoc('a').last  #=> '1'
+  #    p ary.assoc('b').last  #=> '3'
+  #    p ary.rassoc('a').last #=> '2'
+  #    p Hash[ary]            # => {"a"=>"2", "b"=>"3"}
   #
-  # See URI.decode_www_form_component, URI.encode_www_form.
+  # See URI.decode_www_form_component, 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 = []
@@ -462,7 +458,7 @@ module URI
       if isindex
         if sep.empty?
           val = key
-          key = +''
+          key = ''
         end
         isindex = false
       end
@@ -476,7 +472,7 @@ module URI
       if val
         val.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
       else
-        val = +''
+        val = ''
       end
 
       ary << [key, val]
@@ -491,24 +487,7 @@ module URI
   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
+  # curl http://encoding.spec.whatwg.org/encodings.json|rb -rpp -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"],n))rescue next;x["labels"].each{|y|H[y]=n}};pp H'
   WEB_ENCODINGS_ = {
     "unicode-1-1-utf-8"=>"utf-8",
     "utf-8"=>"utf-8",
@@ -614,7 +593,6 @@ module URI
     "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",
@@ -695,7 +673,6 @@ module URI
     "csiso2022jp"=>"cp50221",
     "iso-2022-jp"=>"cp50221",
     "csshiftjis"=>"Windows-31J",
-    "ms932"=>"Windows-31J",
     "ms_kanji"=>"Windows-31J",
     "shift-jis"=>"Windows-31J",
     "shift_jis"=>"Windows-31J",
@@ -714,7 +691,7 @@ module URI
     "windows-949"=>"euc-kr",
     "utf-16be"=>"utf-16be",
     "utf-16"=>"utf-16le",
-    "utf-16le"=>"utf-16le",
+    "utf-16le"=>"utf-16le"
   } # :nodoc:
 
   # :nodoc:
@@ -728,7 +705,7 @@ end # module URI
 module Kernel
 
   #
-  # Returns +uri+ converted to an URI object.
+  # Returns +uri+ converted to a URI object.
   #
   def URI(uri)
     if uri.is_a?(URI::Generic)
diff --git a/lib/uri/file.rb b/lib/uri/file.rb
deleted file mode 100644
index 561ec703c4..0000000000
--- a/lib/uri/file.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'generic'
-
-module URI
-
-  #
-  # The "file" URI is defined by RFC8089.
-  #
-  class File < Generic
-    # A Default port of nil for URI::File.
-    DEFAULT_PORT = nil
-
-    #
-    # An Array of the available components for URI::File.
-    #
-    COMPONENT = [
-      :scheme,
-      :host,
-      :path
-    ].freeze
-
-    #
-    # == Description
-    #
-    # Creates a new 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 'uri'
-    #
-    #     uri1 = URI::File.build(['host.example.com', '/path/file.zip'])
-    #     uri1.to_s  # => "file://host.example.com/path/file.zip"
-    #
-    #     uri2 = 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 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 URI::InvalidURIError, "can not set userinfo for file URI"
-    end
-
-    # raise InvalidURIError
-    def check_user(user)
-      raise URI::InvalidURIError, "can not set user for file URI"
-    end
-
-    # raise InvalidURIError
-    def check_password(user)
-      raise URI::InvalidURIError, "can not set password for file 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/uri/ftp.rb b/lib/uri/ftp.rb
index f57b4b7df9..e5c00b34da 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -8,7 +8,7 @@
 # See URI for general documentation
 #
 
-require_relative 'generic'
+require 'uri/generic'
 
 module URI
 
@@ -21,11 +21,11 @@ module URI
   # http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
   #
   class FTP < Generic
-    # A Default port of 21 for URI::FTP.
+    # A Default port of 21 for URI::FTP
     DEFAULT_PORT = 21
 
     #
-    # An Array of the available components for URI::FTP.
+    # An Array of the available components for URI::FTP
     #
     COMPONENT = [
       :scheme,
@@ -34,7 +34,7 @@ module URI
     ].freeze
 
     #
-    # Typecode is "a", "i", or "d".
+    # Typecode is "a", "i" or "d".
     #
     # * "a" indicates a text file (the FTP command was ASCII)
     # * "i" indicates a binary file (FTP command IMAGE)
@@ -42,7 +42,8 @@ module URI
     #
     TYPECODE = ['a', 'i', 'd'].freeze
 
-    # Typecode prefix ";type=".
+    # Typecode prefix
+    #  ';type='
     TYPECODE_PREFIX = ';type='.freeze
 
     def self.new2(user, password, host, port, path,
@@ -70,29 +71,27 @@ module URI
     #
     # Creates a new URI::FTP object from components, with syntax checking.
     #
-    # The components accepted are +userinfo+, +host+, +port+, +path+, and
+    # 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 an Array is used, the components must be passed in the order
+    # [userinfo, host, port, path, typecode]
     #
     # If the path supplied is absolute, it will be escaped in order to
-    # make it absolute in the URI.
-    #
-    # Examples:
+    # make it absolute in the URI. Examples:
     #
     #     require 'uri'
     #
-    #     uri1 = URI::FTP.build(['user:password', 'ftp.example.com', nil,
+    #     uri = 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"
+    #     puts uri.to_s  ->  ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i
     #
     #     uri2 = URI::FTP.build({:host => 'ftp.example.com',
     #       :path => 'ruby/src'})
-    #     uri2.to_s  # => "ftp://ftp.example.com/ruby/src"
+    #     puts uri2.to_s  ->  ftp://ftp.example.com/ruby/src
     #
     def self.build(args)
 
@@ -129,7 +128,7 @@ module URI
     # 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.
+    # +opaque+, +query+ and +fragment+, in that order.
     #
     def initialize(scheme,
                    userinfo, host, port, registry,
@@ -156,13 +155,13 @@ module URI
       end
     end
 
-    # typecode accessor.
+    # typecode accessor
     #
-    # See URI::FTP::COMPONENT.
+    # see URI::FTP::COMPONENT
     attr_reader :typecode
 
-    # Validates typecode +v+,
-    # returns +true+ or +false+.
+    # validates typecode +v+,
+    # returns a +true+ or +false+ boolean
     #
     def check_typecode(v)
       if TYPECODE.include?(v)
@@ -174,9 +173,9 @@ module URI
     end
     private :check_typecode
 
-    # Private setter for the typecode +v+.
+    # Private setter for the typecode +v+
     #
-    # See also URI::FTP.typecode=.
+    # see also URI::FTP.typecode=
     #
     def set_typecode(v)
       @typecode = v
@@ -191,20 +190,21 @@ module URI
     #
     # == Description
     #
-    # Public setter for the typecode +v+
-    # (with validation).
+    # public setter for the typecode +v+.
+    # (with validation)
     #
-    # See also URI::FTP.check_typecode.
+    # see also URI::FTP.check_typecode
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   uri = URI.parse("ftp://john@ftp.example.com/my_file.img")
-    #   #=> #<URI::FTP ftp://john@ftp.example.com/my_file.img>
+    #   #=> #<URI::FTP:0x00000000923650 URL:ftp://john@ftp.example.com/my_file.img>
     #   uri.typecode = "i"
+    #   # =>  "i"
     #   uri
-    #   #=> #<URI::FTP ftp://john@ftp.example.com/my_file.img;type=i>
+    #   #=> #<URI::FTP:0x00000000923650 URL:ftp://john@ftp.example.com/my_file.img;type=i>
     #
     def typecode=(typecode)
       check_typecode(typecode)
@@ -226,29 +226,29 @@ module URI
     # RFC 1738 specifically states that the path for an FTP URI does not
     # include the / which separates the URI path from the URI host. Example:
     #
-    # <code>ftp://ftp.example.com/pub/ruby</code>
+    #     ftp://ftp.example.com/pub/ruby
     #
     # The above URI indicates that the client should connect to
-    # ftp.example.com then cd to pub/ruby from the initial login directory.
+    # ftp.example.com then cd 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>
+    #     ftp://ftp.example.com/%2Fpub/ruby
     #
-    # This method will then return "/pub/ruby".
+    # This method will then return "/pub/ruby"
     #
     def path
       return @path.sub(/^\//,'').sub(/^%2F/,'/')
     end
 
-    # Private setter for the path of the URI::FTP.
+    # Private setter for the path of the URI::FTP
     def set_path(v)
       super("/" + v.sub(/^\//, "%2F"))
     end
     protected :set_path
 
-    # Returns a String representation of the URI::FTP.
+    # Returns a String representation of the URI::FTP
     def to_s
       save_path = nil
       if @typecode
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index ea79e7950a..5e980d699e 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -9,9 +9,7 @@
 # See URI for general documentation
 #
 
-require_relative 'common'
-autoload :IPSocket, 'socket'
-autoload :IPAddr, 'ipaddr'
+require 'uri/common'
 
 module URI
 
@@ -23,26 +21,26 @@ module URI
     include URI
 
     #
-    # A Default port of nil for URI::Generic.
+    # A Default port of nil for URI::Generic
     #
     DEFAULT_PORT = nil
 
     #
-    # Returns default port.
+    # Returns default port
     #
     def self.default_port
       self::DEFAULT_PORT
     end
 
     #
-    # Returns default port.
+    # Returns default port
     #
     def default_port
       self.class.default_port
     end
 
     #
-    # An Array of the available components for URI::Generic.
+    # An Array of the available components for URI::Generic
     #
     COMPONENT = [
       :scheme,
@@ -68,13 +66,14 @@ module URI
     #
     # == Synopsis
     #
-    # See ::new.
+    # See #new
     #
     # == Description
     #
     # At first, tries to create a new URI::Generic instance using
     # URI::Generic::build. But, if exception URI::InvalidComponentError is raised,
-    # then it does URI::Escape.escape all URI components and tries again.
+    # then it URI::Escape.escape all URI components and tries again.
+    #
     #
     def self.build2(args)
       begin
@@ -105,14 +104,14 @@ module URI
     #
     # == Synopsis
     #
-    # See ::new.
+    # See #new
     #
     # == Description
     #
     # Creates a new URI::Generic instance from components of 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.
+    # 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) &&
@@ -136,32 +135,31 @@ module URI
       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'.
+    #   User name and password, i.e. 'sdmitry:bla'
     # +host+::
-    #   Server host name.
+    #   Server host name
     # +port+::
-    #   Server port.
+    #   Server port
     # +registry+::
     #   Registry of naming authorities.
     # +path+::
-    #   Path on server.
+    #   Path on server
     # +opaque+::
-    #   Opaque part.
+    #   Opaque part
     # +query+::
-    #   Query data.
+    #   Query data
     # +fragment+::
-    #   Part of the URI after '#' character.
+    #   A part of URI after '#' sign
     # +parser+::
-    #   Parser for internal use [URI::DEFAULT_PARSER by default].
+    #   Parser for internal use [URI::DEFAULT_PARSER by default]
     # +arg_check+::
-    #   Check arguments [false by default].
+    #   Check arguments [false by default]
     #
     # == Description
     #
@@ -209,44 +207,45 @@ module URI
           "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)"
       end
 
-      @scheme&.freeze
+      @scheme.freeze if @scheme
       self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
       self.set_port(self.default_port) if self.default_port && !@port
     end
 
     #
-    # Returns the scheme component of the URI.
+    # returns the scheme component of the URI.
     #
     #   URI("http://foo/bar/baz").scheme #=> "http"
     #
     attr_reader :scheme
 
-    # Returns the host component of the URI.
+    # returns the host component of the URI.
     #
     #   URI("http://foo/bar/baz").host #=> "foo"
     #
-    # It returns nil if no host component exists.
+    # It returns nil if no host component.
     #
     #   URI("mailto:foo@example.org").host #=> nil
     #
-    # The component does not contain the port number.
+    # The component doesn't contains the port number.
     #
     #   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.
+    # Since IPv6 addresses are wrapped by brackets in URIs,
+    # this method returns IPv6 addresses wrapped by brackets.
+    # This form is not appropriate to pass socket methods such as TCPSocket.open.
+    # If unwrapped host names are required, use "hostname" method.
     #
-    #   URI("http://[::1]/bar/baz").host     #=> "[::1]"
+    #   URI("http://[::1]/bar/baz").host #=> "[::1]"
     #   URI("http://[::1]/bar/baz").hostname #=> "::1"
     #
     attr_reader :host
 
-    # Returns the port component of the URI.
+    # returns the port component of the URI.
     #
-    #   URI("http://foo/bar/baz").port      #=> 80
-    #   URI("http://foo:8080/bar/baz").port #=> 8080
+    #   URI("http://foo/bar/baz").port #=> "80"
+    #
+    #   URI("http://foo:8080/bar/baz").port #=> "8080"
     #
     attr_reader :port
 
@@ -254,38 +253,37 @@ module URI
       nil
     end
 
-    # Returns the path component of the URI.
+    # returns the path component of the URI.
     #
     #   URI("http://foo/bar/baz").path #=> "/bar/baz"
     #
     attr_reader :path
 
-    # Returns the query component of the URI.
+    # returns the query component of the URI.
     #
     #   URI("http://foo/bar/baz?search=FooBar").query #=> "search=FooBar"
     #
     attr_reader :query
 
-    # Returns the opaque part of the URI.
+    # returns the opaque part of the URI.
     #
     #   URI("mailto:foo@example.org").opaque #=> "foo@example.org"
-    #   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.)
+    # Portion of the path that does make use of the slash '/'.
+    # The path typically refers to the absolute path and the opaque part.
+    #  (see RFC2396 Section 3 and 5.2)
     #
     attr_reader :opaque
 
-    # Returns the fragment component of the URI.
+    # returns the fragment component of the URI.
     #
     #   URI("http://foo/bar/baz?search=FooBar#ponies").fragment #=> "ponies"
     #
     attr_reader :fragment
 
-    # Returns the parser to be used.
+    # returns the parser to be used.
     #
-    # Unless a URI::Parser is defined, DEFAULT_PARSER is used.
+    # Unless a URI::Parser is defined, then DEFAULT_PARSER is used.
     #
     def parser
       if !defined?(@parser) || !@parser
@@ -295,8 +293,7 @@ module URI
       end
     end
 
-    # Replaces self by other URI object.
-    #
+    # replace self by other URI object
     def replace!(oth)
       if self.class != oth.class
         raise ArgumentError, "expected #{self.class} object"
@@ -316,7 +313,7 @@ module URI
     end
 
     #
-    # Checks the scheme +v+ component against the URI::Parser Regexp for :SCHEME.
+    # check the scheme +v+ component against the URI::Parser Regexp for :SCHEME
     #
     def check_scheme(v)
       if v && parser.regexp[:SCHEME] !~ v
@@ -328,12 +325,12 @@ module URI
     end
     private :check_scheme
 
-    # Protected setter for the scheme component +v+.
+    # protected setter for the scheme component +v+
     #
-    # See also URI::Generic.scheme=.
+    # see also URI::Generic.scheme=
     #
     def set_scheme(v)
-      @scheme = v&.downcase
+      @scheme = v ? v.downcase : v
     end
     protected :set_scheme
 
@@ -345,10 +342,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the scheme component +v+
-    # (with validation).
+    # public setter for the scheme component +v+.
+    # (with validation)
     #
-    # See also URI::Generic.check_scheme.
+    # see also URI::Generic.check_scheme
     #
     # == Usage
     #
@@ -356,7 +353,9 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com")
     #   uri.scheme = "https"
-    #   uri.to_s  #=> "https://my.example.com"
+    #   # =>  "https"
+    #   uri
+    #   #=> #<URI::HTTP:0x000000008e89e8 URL:https://my.example.com>
     #
     def scheme=(v)
       check_scheme(v)
@@ -365,13 +364,13 @@ module URI
     end
 
     #
-    # Checks the +user+ and +password+.
+    # check the +user+ and +password+.
     #
     # If +password+ is not provided, then +user+ is
     # split, using URI::Generic.split_userinfo, to
     # pull +user+ and +password.
     #
-    # See also URI::Generic.check_user, URI::Generic.check_password.
+    # see also URI::Generic.check_user, URI::Generic.check_password
     #
     def check_userinfo(user, password = nil)
       if !password
@@ -385,8 +384,8 @@ module URI
     private :check_userinfo
 
     #
-    # Checks the user +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :USERINFO.
+    # check the user +v+ component for RFC2396 compliance
+    # and against the URI::Parser Regexp for :USERINFO
     #
     # Can not have a registry or opaque component defined,
     # with a user component defined.
@@ -409,8 +408,8 @@ module URI
     private :check_user
 
     #
-    # Checks the password +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :USERINFO.
+    # check the password +v+ component for RFC2396 compliance
+    # and against the URI::Parser Regexp for :USERINFO
     #
     # Can not have a registry or opaque component defined,
     # with a user component defined.
@@ -429,7 +428,7 @@ module URI
 
       if parser.regexp[:USERINFO] !~ v
         raise InvalidComponentError,
-          "bad password component"
+          "bad component(expected user component): #{v}"
       end
 
       return true
@@ -437,7 +436,7 @@ module URI
     private :check_password
 
     #
-    # Sets userinfo, argument is string like 'name:pass'.
+    # Sets userinfo, argument is string like 'name:pass'
     #
     def userinfo=(userinfo)
       if userinfo.nil?
@@ -456,10 +455,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the +user+ component
-    # (with validation).
+    # public setter for the +user+ component.
+    # (with validation)
     #
-    # See also URI::Generic.check_user.
+    # see also URI::Generic.check_user
     #
     # == Usage
     #
@@ -467,7 +466,9 @@ module URI
     #
     #   uri = URI.parse("http://john:S3nsit1ve@my.example.com")
     #   uri.user = "sam"
-    #   uri.to_s  #=> "http://sam:V3ry_S3nsit1ve@my.example.com"
+    #   # =>  "sam"
+    #   uri
+    #   #=> #<URI::HTTP:0x00000000881d90 URL:http://sam:V3ry_S3nsit1ve@my.example.com>
     #
     def user=(user)
       check_user(user)
@@ -483,10 +484,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the +password+ component
-    # (with validation).
+    # public setter for the +password+ component.
+    # (with validation)
     #
-    # See also URI::Generic.check_password.
+    # see also URI::Generic.check_password
     #
     # == Usage
     #
@@ -494,7 +495,9 @@ module URI
     #
     #   uri = URI.parse("http://john:S3nsit1ve@my.example.com")
     #   uri.password = "V3ry_S3nsit1ve"
-    #   uri.to_s  #=> "http://john:V3ry_S3nsit1ve@my.example.com"
+    #   # =>  "V3ry_S3nsit1ve"
+    #   uri
+    #   #=> #<URI::HTTP:0x00000000881d90 URL:http://john:V3ry_S3nsit1ve@my.example.com>
     #
     def password=(password)
       check_password(password)
@@ -502,10 +505,10 @@ module URI
       # returns password
     end
 
-    # Protected setter for the +user+ component, and +password+ if available
-    # (with validation).
+    # protect setter for the +user+ component, and +password+ if available.
+    # (with validation)
     #
-    # See also URI::Generic.userinfo=.
+    # see also URI::Generic.userinfo=
     #
     def set_userinfo(user, password = nil)
       unless password
@@ -518,9 +521,9 @@ module URI
     end
     protected :set_userinfo
 
-    # Protected setter for the user component +v+.
+    # protected setter for the user component +v+
     #
-    # See also URI::Generic.user=.
+    # see also URI::Generic.user=
     #
     def set_user(v)
       set_userinfo(v, @password)
@@ -528,9 +531,9 @@ module URI
     end
     protected :set_user
 
-    # Protected setter for the password component +v+.
+    # protected setter for the password component +v+
     #
-    # See also URI::Generic.password=.
+    # see also URI::Generic.password=
     #
     def set_password(v)
       @password = v
@@ -538,8 +541,8 @@ module URI
     end
     protected :set_password
 
-    # Returns the userinfo +ui+ as <code>[user, password]</code>
-    # if properly formatted as 'user:password'.
+    # returns the userinfo +ui+ as user, password
+    # if properly formatted as 'user:password'
     def split_userinfo(ui)
       return nil, nil unless ui
       user, password = ui.split(':', 2)
@@ -548,13 +551,13 @@ module URI
     end
     private :split_userinfo
 
-    # Escapes 'user:password' +v+ based on RFC 1738 section 3.1.
+    # 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'.
+    # returns the userinfo, either as 'user' or 'user:password'
     def userinfo
       if @user.nil?
         nil
@@ -565,19 +568,19 @@ module URI
       end
     end
 
-    # Returns the user component.
+    # returns the user component
     def user
       @user
     end
 
-    # Returns the password component.
+    # returns the password component
     def password
       @password
     end
 
     #
-    # Checks the host +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :HOST.
+    # check the host +v+ component for RFC2396 compliance
+    # and against the URI::Parser Regexp for :HOST
     #
     # Can not have a registry or opaque component defined,
     # with a host component defined.
@@ -597,9 +600,9 @@ module URI
     end
     private :check_host
 
-    # Protected setter for the host component +v+.
+    # protected setter for the host component +v+
     #
-    # See also URI::Generic.host=.
+    # see also URI::Generic.host=
     #
     def set_host(v)
       @host = v
@@ -614,10 +617,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the host component +v+
-    # (with validation).
+    # public setter for the host component +v+.
+    # (with validation)
     #
-    # See also URI::Generic.check_host.
+    # see also URI::Generic.check_host
     #
     # == Usage
     #
@@ -625,7 +628,9 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com")
     #   uri.host = "foo.com"
-    #   uri.to_s  #=> "http://foo.com"
+    #   # =>  "foo.com"
+    #   uri
+    #   #=> #<URI::HTTP:0x000000008e89e8 URL:http://foo.com>
     #
     def host=(v)
       check_host(v)
@@ -633,31 +638,32 @@ module URI
       v
     end
 
-    # Extract the host part of the URI and unwrap brackets for IPv6 addresses.
+    # extract the host part of the URI and unwrap brackets for IPv6 addresses.
     #
-    # This method is the same as URI::Generic#host except
+    # This method is same as URI::Generic#host except
     # brackets for IPv6 (and future IP) addresses are removed.
     #
-    #   uri = URI("http://[::1]/bar")
-    #   uri.hostname      #=> "::1"
-    #   uri.host          #=> "[::1]"
+    # u = URI("http://[::1]/bar")
+    # p u.hostname      #=> "::1"
+    # p u.host          #=> "[::1]"
     #
     def hostname
       v = self.host
       /\A\[(.*)\]\z/ =~ v ? $1 : v
     end
 
-    # Sets the host part of the URI as the argument with brackets for IPv6 addresses.
+    # set the host part of the URI as the argument with brackets for IPv6 addresses.
     #
-    # This method is the same as URI::Generic#host= except
-    # the argument can be a bare IPv6 address.
+    # This method is same as URI::Generic#host= except
+    # the argument can be bare IPv6 address.
     #
-    #   uri = URI("http://foo/bar")
-    #   uri.hostname = "::1"
-    #   uri.to_s  #=> "http://[::1]/bar"
+    # u = URI("http://foo/bar")
+    # p u.to_s                  #=> "http://foo/bar"
+    # u.hostname = "::1"
+    # p u.to_s                  #=> "http://[::1]/bar"
     #
-    # If the argument seems to be an IPv6 address,
-    # it is wrapped with brackets.
+    # If the argument seems IPv6 address,
+    # it is wrapped by brackets.
     #
     def hostname=(v)
       v = "[#{v}]" if /\A\[.*\]\z/ !~ v && /:/ =~ v
@@ -665,8 +671,8 @@ module URI
     end
 
     #
-    # Checks the port +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :PORT.
+    # check the port +v+ component for RFC2396 compliance
+    # and against the URI::Parser Regexp for :PORT
     #
     # Can not have a registry or opaque component defined,
     # with a port component defined.
@@ -686,9 +692,9 @@ module URI
     end
     private :check_port
 
-    # Protected setter for the port component +v+.
+    # protected setter for the port component +v+
     #
-    # See also URI::Generic.port=.
+    # see also URI::Generic.port=
     #
     def set_port(v)
       v = v.empty? ? nil : v.to_i unless !v || v.kind_of?(Integer)
@@ -704,10 +710,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the port component +v+
-    # (with validation).
+    # public setter for the port component +v+.
+    # (with validation)
     #
-    # See also URI::Generic.check_port.
+    # see also URI::Generic.check_port
     #
     # == Usage
     #
@@ -715,7 +721,9 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com")
     #   uri.port = 8080
-    #   uri.to_s  #=> "http://my.example.com:8080"
+    #   # =>  8080
+    #   uri
+    #   #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com:8080>
     #
     def port=(v)
       check_port(v)
@@ -738,9 +746,9 @@ module URI
     end
 
     #
-    # Checks the path +v+ component for RFC2396 compliance
+    # check the path +v+ component for RFC2396 compliance
     # and against the URI::Parser Regexp
-    # for :ABS_PATH and :REL_PATH.
+    # for :ABS_PATH and :REL_PATH
     #
     # Can not have a opaque component defined,
     # with a path component defined.
@@ -773,9 +781,9 @@ module URI
     end
     private :check_path
 
-    # Protected setter for the path component +v+.
+    # protected setter for the path component +v+
     #
-    # See also URI::Generic.path=.
+    # see also URI::Generic.path=
     #
     def set_path(v)
       @path = v
@@ -790,10 +798,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the path component +v+
-    # (with validation).
+    # public setter for the path component +v+.
+    # (with validation)
     #
-    # See also URI::Generic.check_path.
+    # see also URI::Generic.check_path
     #
     # == Usage
     #
@@ -801,7 +809,9 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com/pub/files")
     #   uri.path = "/faq/"
-    #   uri.to_s  #=> "http://my.example.com/faq/"
+    #   # =>  "/faq/"
+    #   uri
+    #   #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com/faq/>
     #
     def path=(v)
       check_path(v)
@@ -817,7 +827,7 @@ module URI
     #
     # == Description
     #
-    # Public setter for the query component +v+.
+    # public setter for the query component +v+.
     #
     # == Usage
     #
@@ -825,7 +835,9 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com/?id=25")
     #   uri.query = "id=1"
-    #   uri.to_s  #=> "http://my.example.com/?id=1"
+    #   # =>  "id=1"
+    #   uri
+    #   #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com/?id=1>
     #
     def query=(v)
       return @query = nil unless v
@@ -842,10 +854,10 @@ module URI
     end
 
     #
-    # Checks the opaque +v+ component for RFC2396 compliance and
-    # against the URI::Parser Regexp for :OPAQUE.
+    # check the opaque +v+ component for RFC2396 compliance and
+    # against the URI::Parser Regexp for :OPAQUE
     #
-    # Can not have a host, port, user, or path component defined,
+    # Can not have a host, port, user or path component defined,
     # with an opaque component defined.
     #
     def check_opaque(v)
@@ -866,9 +878,9 @@ module URI
     end
     private :check_opaque
 
-    # Protected setter for the opaque component +v+.
+    # protected setter for the opaque component +v+
     #
-    # See also URI::Generic.opaque=.
+    # see also URI::Generic.opaque=
     #
     def set_opaque(v)
       @opaque = v
@@ -883,10 +895,10 @@ module URI
     #
     # == Description
     #
-    # Public setter for the opaque component +v+
-    # (with validation).
+    # public setter for the opaque component +v+.
+    # (with validation)
     #
-    # See also URI::Generic.check_opaque.
+    # see also URI::Generic.check_opaque
     #
     def opaque=(v)
       check_opaque(v)
@@ -895,7 +907,7 @@ module URI
     end
 
     #
-    # Checks the fragment +v+ component against the URI::Parser Regexp for :FRAGMENT.
+    # check the fragment +v+ component against the URI::Parser Regexp for :FRAGMENT
     #
     #
     # == Args
@@ -905,8 +917,8 @@ module URI
     #
     # == Description
     #
-    # Public setter for the fragment component +v+
-    # (with validation).
+    # public setter for the fragment component +v+.
+    # (with validation)
     #
     # == Usage
     #
@@ -914,7 +926,9 @@ module URI
     #
     #   uri = 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"
+    #   # =>  "time=1305212086"
+    #   uri
+    #   #=> #<URI::HTTP:0x000000007a81f8 URL:http://my.example.com/?id=25#time=1305212086>
     #
     def fragment=(v)
       return @fragment = nil unless v
@@ -930,23 +944,7 @@ module URI
     end
 
     #
-    # Returns true if URI is hierarchical.
-    #
-    # == Description
-    #
-    # 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 'uri'
-    #
-    #   uri = URI.parse("http://my.example.com/")
-    #   uri.hierarchical?
-    #   #=> true
-    #   uri = URI.parse("mailto:joe@example.com")
-    #   uri.hierarchical?
-    #   #=> false
+    # Checks if URI has a path
     #
     def hierarchical?
       if @path
@@ -957,7 +955,7 @@ module URI
     end
 
     #
-    # Returns true if URI has a scheme (e.g. http:// or https://) specified.
+    # Checks if URI is an absolute one
     #
     def absolute?
       if @scheme
@@ -969,17 +967,17 @@ module URI
     alias absolute absolute?
 
     #
-    # Returns true if URI does not have a scheme (e.g. http:// or https://) specified.
+    # Checks if URI is relative
     #
     def relative?
       !absolute?
     end
 
     #
-    # Returns an Array of the path split on '/'.
+    # returns an Array of the path split on '/'
     #
     def split_path(path)
-      path.split("/", -1)
+      path.split(%r{/+}, -1)
     end
     private :split_path
 
@@ -1058,7 +1056,7 @@ module URI
     #
     # == Description
     #
-    # Destructive form of #merge.
+    # Destructive form of #merge
     #
     # == Usage
     #
@@ -1066,7 +1064,8 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com")
     #   uri.merge!("/main.rbx?page=1")
-    #   uri.to_s  # => "http://my.example.com/main.rbx?page=1"
+    #   p uri
+    #   # =>  #<URI::HTTP:0x2021f3b0 URL:http://my.example.com/main.rbx?page=1>
     #
     def merge!(oth)
       t = merge(oth)
@@ -1086,31 +1085,27 @@ module URI
     #
     # == Description
     #
-    # Merges two URIs.
+    # Merges two URI's.
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   uri = URI.parse("http://my.example.com")
-    #   uri.merge("/main.rbx?page=1")
-    #   # => "http://my.example.com/main.rbx?page=1"
+    #   p uri.merge("/main.rbx?page=1")
+    #   # =>  #<URI::HTTP:0x2021f3b0 URL:http://my.example.com/main.rbx?page=1>
     #
     def merge(oth)
-      rel = parser.send(:convert_to_uri, oth)
-
-      if rel.absolute?
-        #raise BadURIError, "both URI are absolute" if absolute?
-        # hmm... should return oth for usability?
-        return rel
+      begin
+        base, rel = merge0(oth)
+      rescue
+        raise $!.class, $!.message
       end
 
-      unless self.absolute?
-        raise BadURIError, "both URI are relative"
+      if base == rel
+        return base
       end
 
-      base = self.dup
-
       authority = rel.userinfo || rel.host || rel.port
 
       # RFC2396, Section 5.2, 2)
@@ -1141,6 +1136,31 @@ module URI
     end # merge
     alias + merge
 
+    # return base and rel.
+    # you can modify `base', but can not `rel'.
+    def merge0(oth)
+      oth = parser.send(:convert_to_uri, oth)
+
+      if self.relative? && oth.relative?
+        raise BadURIError,
+          "both URI are relative"
+      end
+
+      if self.absolute? && oth.absolute?
+        #raise BadURIError,
+        #  "both URI are absolute"
+        # hmm... should return oth for usability?
+        return oth, oth
+      end
+
+      if self.absolute?
+        return self.dup, oth
+      else
+        return oth, oth
+      end
+    end
+    private :merge0
+
     # :stopdoc:
     def route_from_path(src, dst)
       case dst
@@ -1153,8 +1173,8 @@ module URI
         return dst.dup
       end
 
-      src_path = src.scan(%r{[^/]*/})
-      dst_path = dst.scan(%r{[^/]*/?})
+      src_path = src.scan(%r{(?:\A|[^/]+)/})
+      dst_path = dst.scan(%r{(?:\A|[^/]+)/?})
 
       # discard same parts
       while !dst_path.empty? && dst_path.first == src_path.first
@@ -1239,15 +1259,15 @@ module URI
     #
     # == Description
     #
-    # Calculates relative path from oth to self.
+    # Calculates relative path from oth to self
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   uri = URI.parse('http://my.example.com/main.rbx?page=1')
-    #   uri.route_from('http://my.example.com')
-    #   #=> #<URI::Generic /main.rbx?page=1>
+    #   p uri.route_from('http://my.example.com')
+    #   #=> #<URI::Generic:0x20218858 URL:/main.rbx?page=1>
     #
     def route_from(oth)
       # you can modify `rel', but can not `oth'.
@@ -1279,32 +1299,22 @@ module URI
     #
     # == Description
     #
-    # Calculates relative path to oth from self.
+    # Calculates relative path to oth from self
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   uri = URI.parse('http://my.example.com')
-    #   uri.route_to('http://my.example.com/main.rbx?page=1')
-    #   #=> #<URI::Generic /main.rbx?page=1>
+    #   p uri.route_to('http://my.example.com/main.rbx?page=1')
+    #   #=> #<URI::Generic:0x2020c2f6 URL:/main.rbx?page=1>
     #
     def route_to(oth)
       parser.send(:convert_to_uri, oth).route_from(self)
     end
 
     #
-    # Returns normalized URI.
-    #
-    #   require 'uri'
-    #
-    #   URI("HTTP://my.EXAMPLE.com").normalize
-    #   #=> #<URI::HTTP http://my.example.com/>
-    #
-    # Normalization here means:
-    #
-    # * scheme and host are converted to lowercase,
-    # * an empty path component is set to "/".
+    # Returns normalized URI
     #
     def normalize
       uri = dup
@@ -1313,7 +1323,7 @@ module URI
     end
 
     #
-    # Destructive version of #normalize.
+    # Destructive version of #normalize
     #
     def normalize!
       if path&.empty?
@@ -1328,7 +1338,7 @@ module URI
     end
 
     #
-    # Constructs String from URI.
+    # Constructs String from URI
     #
     def to_s
       str = ''.dup
@@ -1340,7 +1350,7 @@ module URI
       if @opaque
         str << @opaque
       else
-        if @host || %w[file postgres].include?(@scheme)
+        if @host
           str << '//'
         end
         if self.userinfo
@@ -1368,7 +1378,7 @@ module URI
     end
 
     #
-    # Compares two URIs.
+    # Compares to URI's
     #
     def ==(oth)
       if self.class == oth.class
@@ -1401,7 +1411,7 @@ module URI
 =end
 
 
-    # Returns an Array of the components defined from the COMPONENT Array.
+    # returns an Array of the components defined from the COMPONENT Array
     def component_ary
       component.collect do |x|
         self.send(x)
@@ -1412,18 +1422,18 @@ module URI
     # == Args
     #
     # +components+::
-    #    Multiple Symbol arguments defined in URI::HTTP.
+    #    Multiple Symbol arguments defined in URI::HTTP
     #
     # == Description
     #
-    # Selects specified components from URI.
+    # Selects specified components from URI
     #
     # == Usage
     #
     #   require 'uri'
     #
     #   uri = URI.parse('http://myuser:mypass@my.example.com/test.rbx')
-    #   uri.select(:userinfo, :host, :path)
+    #   p uri.select(:userinfo, :host, :path)
     #   # => ["myuser:mypass", "my.example.com", "/test.rbx"]
     #
     def select(*components)
@@ -1449,8 +1459,8 @@ module URI
     #
     # == Description
     #
-    # Attempts to parse other URI +oth+,
-    # returns [parsed_oth, self].
+    #  attempt to parse other URI +oth+
+    #  return [parsed_oth, self]
     #
     # == Usage
     #
@@ -1458,7 +1468,7 @@ module URI
     #
     #   uri = URI.parse("http://my.example.com")
     #   uri.coerce("http://foo.com")
-    #   #=> [#<URI::HTTP http://foo.com>, #<URI::HTTP http://my.example.com>]
+    #   #=> [#<URI::HTTP:0x00000000bcb028 URL:http://foo.com/>, #<URI::HTTP:0x00000000d92178 URL:http://my.example.com>]
     #
     def coerce(oth)
       case oth
@@ -1471,56 +1481,54 @@ module URI
       return oth, self
     end
 
-    # Returns a proxy URI.
+    # returns a proxy URI.
     # The proxy URI is obtained from environment variables such as http_proxy,
     # ftp_proxy, no_proxy, etc.
     # If there is no proper proxy, nil is returned.
     #
-    # 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.
+    # 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)
+    def find_proxy
       raise BadURIError, "relative URI: #{self}" if self.relative?
       name = self.scheme.downcase + '_proxy'
       proxy_uri = nil
-      if name == 'http_proxy' && env.include?('REQUEST_METHOD') # CGI?
+      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 }
+        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
+          if k == 'http_proxy' && ENV[k.upcase] == nil
             # http_proxy is safe to use because ENV is case sensitive.
-            proxy_uri = env[name]
+            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]
+          proxy_uri = ENV.to_hash[name]
         end
         if !proxy_uri
           # Use CGI_HTTP_PROXY.  cf. libwww-perl.
-          proxy_uri = env["CGI_#{name.upcase}"]
+          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
+        unless proxy_uri = ENV[name]
+          if proxy_uri = ENV[name.upcase]
+            warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.'
           end
         end
       else
-        proxy_uri = env[name] || env[name.upcase]
+        proxy_uri = ENV[name] || ENV[name.upcase]
       end
 
       if proxy_uri.nil? || proxy_uri.empty?
@@ -1528,6 +1536,7 @@ module URI
       end
 
       if self.hostname
+        require 'socket'
         begin
           addr = IPSocket.getaddress(self.hostname)
           return nil if /\A127\.|\A::1\z/ =~ addr
@@ -1536,32 +1545,24 @@ module URI
       end
 
       name = 'no_proxy'
-      if no_proxy = env[name] || env[name.upcase]
-        return nil unless URI::Generic.use_proxy?(self.hostname, addr, self.port, no_proxy)
-      end
-      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
+      if no_proxy = ENV[name] || ENV[name.upcase]
+        no_proxy.scan(/(?!\.)([^:,\s]+)(?::(\d+))?/) {|host, port|
+          if (!port || self.port == port.to_i)
+            if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host
+              return nil
+            else
+              require 'ipaddr'
+              return nil if
+                begin
+                  IPAddr.new(host)
+                rescue IPAddr::InvalidAddressError
+                  next
+                end.include?(self.host)
             end
           end
-        end
-      }
-      true
+        }
+      end
+      URI.parse(proxy_uri)
     end
   end
 end
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index 2e2ebcc1d3..81ae846fd9 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -8,7 +8,7 @@
 # See URI for general documentation
 #
 
-require_relative 'generic'
+require 'uri/generic'
 
 module URI
 
@@ -21,68 +21,89 @@ module URI
   # update. See <URL:http://support.microsoft.com/kb/834489>.
   #
   class HTTP < Generic
-    # A Default port of 80 for URI::HTTP.
+    # A Default port of 80 for URI::HTTP
     DEFAULT_PORT = 80
 
-    # An Array of the available components for URI::HTTP.
-    COMPONENT = %i[
-      scheme
-      userinfo host port
-      path
-      query
-      fragment
+    # An Array of the available components for URI::HTTP
+    COMPONENT = [
+      :scheme,
+      :userinfo, :host, :port,
+      :path,
+      :query,
+      :fragment
     ].freeze
 
     #
     # == Description
     #
-    # Creates a new URI::HTTP object from components, with syntax checking.
+    # Create a new URI::HTTP object from components, with syntax checking.
     #
-    # The components accepted are userinfo, host, port, path, query, and
+    # 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>.
+    # If an Array is used, the components must be passed in the order
+    # [userinfo, host, port, path, query, fragment].
     #
     # Example:
     #
-    #     uri = URI::HTTP.build(host: 'www.example.com', path: '/foo/bar')
+    #     newuri = URI::HTTP.build({:host => 'www.example.com',
+    #       :path => '/foo/bar'})
     #
-    #     uri = URI::HTTP.build([nil, "www.example.com", nil, "/path",
+    #     newuri = 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)
+      tmp = Util::make_components_hash(self, args)
+      return super(tmp)
     end
 
+=begin
     #
     # == Description
     #
-    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    # Create a new URI::HTTP object from generic URI components as per
+    # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is
+    # performed.
     #
-    # If the URI contains a query, the full path is URI#path + '?' + URI#query.
-    # Otherwise, the path is simply URI#path.
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+ and +fragment+, in that order.
     #
     # Example:
     #
-    #     uri = URI::HTTP.build(path: '/foo/bar', query: 'test=true')
-    #     uri.request_uri #  => "/foo/bar?test=true"
+    #     uri = URI::HTTP.new("http", nil, "www.example.com", nil, nil,
+    #                         "/path", nil, "query", "fragment")
     #
-    def request_uri
-      return unless @path
+    #
+    # See also URI::Generic.new
+    #
+    def initialize(*arg)
+      super(*arg)
+    end
+=end
 
-      url = @query ? "#@path?#@query" : @path.dup
-      url.start_with?(?/.freeze) ? url : ?/ + url
+    #
+    # == Description
+    #
+    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    #
+    # If the URI contains a query, the full path is URI#path + '?' + URI#query.
+    # Otherwise, the path is simply URI#path.
+    #
+    def request_uri
+      return nil unless @path
+      if @path.start_with?(?/.freeze)
+        @query ? "#@path?#@query" : @path.dup
+      else
+        @query ? "/#@path?#@query" : "/#@path"
+      end
     end
   end
 
   @@schemes['HTTP'] = HTTP
-
 end
diff --git a/lib/uri/https.rb b/lib/uri/https.rb
index 4780ee0a44..3c8c905cc3 100644
--- a/lib/uri/https.rb
+++ b/lib/uri/https.rb
@@ -8,7 +8,7 @@
 # See URI for general documentation
 #
 
-require_relative 'http'
+require 'uri/http'
 
 module URI
 
diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb
index 228c793cbd..4345875e28 100644
--- a/lib/uri/ldap.rb
+++ b/lib/uri/ldap.rb
@@ -12,21 +12,20 @@
 # See URI for general documentation
 #
 
-require_relative 'generic'
+require 'uri/generic'
 
 module URI
 
   #
-  # LDAP URI SCHEMA (described in RFC2255).
-  #--
+  # LDAP URI SCHEMA (described in RFC2255)
   # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
-  #++
+  #
   class LDAP < Generic
 
-    # A Default port of 389 for URI::LDAP.
+    # A Default port of 389 for URI::LDAP
     DEFAULT_PORT = 389
 
-    # An Array of the available components for URI::LDAP.
+    # An Array of the available components for URI::LDAP
     COMPONENT = [
       :scheme,
       :host, :port,
@@ -41,8 +40,8 @@ module URI
     #
     # * 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
+    #                not including any entries under this.
+    # * SCOPE_SUB  - subtress, all entries at all levels
     #
     SCOPE = [
       SCOPE_ONE = 'one',
@@ -53,7 +52,7 @@ module URI
     #
     # == Description
     #
-    # Creates a new URI::LDAP object from components, with syntax checking.
+    # Create a new URI::LDAP object from components, with syntax checking.
     #
     # The components accepted are host, port, dn, attributes,
     # scope, filter, and extensions.
@@ -61,15 +60,15 @@ module URI
     # 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>.
+    # If an Array is used, the components must be passed in the order
+    # [host, port, dn, attributes, scope, filter, extensions].
     #
     # Example:
     #
-    #     uri = URI::LDAP.build({:host => 'ldap.example.com',
-    #       :dn => '/dc=example'})
+    #     newuri = URI::LDAP.build({:host => 'ldap.example.com',
+    #       :dn> => '/dc=example'})
     #
-    #     uri = URI::LDAP.build(["ldap.example.com", nil,
+    #     newuri = URI::LDAP.build(["ldap.example.com", nil,
     #       "/dc=example;dc=com", "query", nil, nil, nil])
     #
     def self.build(args)
@@ -93,18 +92,19 @@ module URI
     #
     # == Description
     #
-    # Creates a new URI::LDAP object from generic URI components as per
+    # Create a new URI::LDAP object from generic 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.
+    # +opaque+, +query+ and +fragment+, in that order.
     #
     # Example:
     #
-    #     uri = URI::LDAP.new("ldap", nil, "ldap.example.com", nil, nil,
-    #       "/dc=example;dc=com", nil, "query", nil)
+    #     uri = URI::LDAP.new("ldap", nil, "ldap.example.com", nil,
+    #       "/dc=example;dc=com", "query", nil, nil, nil, nil)
+    #
     #
-    # See also URI::Generic.new.
+    # See also URI::Generic.new
     #
     def initialize(*arg)
       super(*arg)
@@ -117,14 +117,14 @@ module URI
       parse_query
     end
 
-    # Private method to cleanup +dn+ from using the +path+ component attribute.
+    # 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.
+    # private method to cleanup +attributes+, +scope+, +filter+ and +extensions+,
+    # from using the +query+ component attribute
     def parse_query
       @attributes = nil
       @scope      = nil
@@ -142,7 +142,7 @@ module URI
     end
     private :parse_query
 
-    # Private method to assemble +query+ from +attributes+, +scope+, +filter+, and +extensions+.
+    # private method to assemble +query+ from +attributes+, +scope+, +filter+ and +extensions+.
     def build_path_query
       @path = '/' + @dn
 
@@ -155,12 +155,12 @@ module URI
     end
     private :build_path_query
 
-    # Returns dn.
+    # returns dn.
     def dn
       @dn
     end
 
-    # Private setter for dn +val+.
+    # private setter for dn +val+
     def set_dn(val)
       @dn = val
       build_path_query
@@ -168,18 +168,18 @@ module URI
     end
     protected :set_dn
 
-    # Setter for dn +val+.
+    # setter for dn +val+
     def dn=(val)
       set_dn(val)
       val
     end
 
-    # Returns attributes.
+    # returns attributes.
     def attributes
       @attributes
     end
 
-    # Private setter for attributes +val+.
+    # private setter for attributes +val+
     def set_attributes(val)
       @attributes = val
       build_path_query
@@ -187,18 +187,18 @@ module URI
     end
     protected :set_attributes
 
-    # Setter for attributes +val+.
+    # setter for attributes +val+
     def attributes=(val)
       set_attributes(val)
       val
     end
 
-    # Returns scope.
+    # returns scope.
     def scope
       @scope
     end
 
-    # Private setter for scope +val+.
+    # private setter for scope +val+
     def set_scope(val)
       @scope = val
       build_path_query
@@ -206,18 +206,18 @@ module URI
     end
     protected :set_scope
 
-    # Setter for scope +val+.
+    # setter for scope +val+
     def scope=(val)
       set_scope(val)
       val
     end
 
-    # Returns filter.
+    # returns filter.
     def filter
       @filter
     end
 
-    # Private setter for filter +val+.
+    # private setter for filter +val+
     def set_filter(val)
       @filter = val
       build_path_query
@@ -225,18 +225,18 @@ module URI
     end
     protected :set_filter
 
-    # Setter for filter +val+.
+    # setter for filter +val+
     def filter=(val)
       set_filter(val)
       val
     end
 
-    # Returns extensions.
+    # returns extensions.
     def extensions
       @extensions
     end
 
-    # Private setter for extensions +val+.
+    # private setter for extensions +val+
     def set_extensions(val)
       @extensions = val
       build_path_query
@@ -244,14 +244,14 @@ module URI
     end
     protected :set_extensions
 
-    # Setter for extensions +val+.
+    # setter for extensions +val+
     def extensions=(val)
       set_extensions(val)
       val
     end
 
-    # Checks if URI has a path.
-    # For URI::LDAP this will return +false+.
+    # Checks if URI has a path
+    # For URI::LDAP this will return +false+
     def hierarchical?
       false
     end
diff --git a/lib/uri/ldaps.rb b/lib/uri/ldaps.rb
index 227e7fab35..d03f8efa2d 100644
--- a/lib/uri/ldaps.rb
+++ b/lib/uri/ldaps.rb
@@ -6,7 +6,7 @@
 # See URI for general documentation
 #
 
-require_relative 'ldap'
+require 'uri/ldap'
 
 module URI
 
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 9c06871c7a..7299550d3f 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -8,20 +8,20 @@
 # See URI for general documentation
 #
 
-require_relative 'generic'
+require 'uri/generic'
 
 module URI
 
   #
-  # RFC6068, the mailto URL scheme.
+  # RFC6068, The mailto URL scheme
   #
   class MailTo < Generic
     include REGEXP
 
-    # A Default port of nil for URI::MailTo.
+    # A Default port of nil for URI::MailTo
     DEFAULT_PORT = nil
 
-    # An Array of the available components for URI::MailTo.
+    # An Array of the available components for URI::MailTo
     COMPONENT = [ :scheme, :to, :headers ].freeze
 
     # :stopdoc:
@@ -52,7 +52,7 @@ module URI
     # 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
+    # http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.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:
 
@@ -62,29 +62,29 @@ module URI
     # Creates a new 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>.
+    # the components must be supplied as [to, headers].
     #
     # 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>.
+    # "subject=subscribe&cc=address", or as an Array of Arrays like
+    # [['subject', 'subscribe'], ['cc', 'address']]
     #
     # Examples:
     #
     #    require 'uri'
     #
     #    m1 = URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
-    #    m1.to_s  # => "mailto:joe@example.com?subject=Ruby"
+    #    puts m1.to_s  ->  mailto:joe@example.com?subject=Ruby
     #
     #    m2 = 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"
+    #    puts m2.to_s  ->  mailto:john@example.com?Subject=Ruby&Cc=jack@example.com
     #
     #    m3 = URI::MailTo.build({:to => 'listman@example.com', :headers => [['subject', 'subscribe']]})
-    #    m3.to_s  # => "mailto:listman@example.com?subject=subscribe"
+    #    puts m3.to_s  ->  mailto:listman@example.com?subject=subscribe
     #
     def self.build(args)
-      tmp = Util.make_components_hash(self, args)
+      tmp = Util::make_components_hash(self, args)
 
       case tmp[:to]
       when Array
@@ -118,7 +118,7 @@ module URI
         end
       end
 
-      super(tmp)
+      return super(tmp)
     end
 
     #
@@ -160,13 +160,13 @@ module URI
       end
     end
 
-    # The primary e-mail address of the URL, as a String.
+    # 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.
+    # E-mail headers set by the URL, as an Array of Arrays
     attr_reader :headers
 
-    # Checks the to +v+ component.
+    # check the to +v+ component
     def check_to(v)
       return true unless v
       return true if v.size == 0
@@ -187,24 +187,24 @@ module URI
         end
       end
 
-      true
+      return true
     end
     private :check_to
 
-    # Private setter for to +v+.
+    # private setter for to +v+
     def set_to(v)
       @to = v
     end
     protected :set_to
 
-    # Setter for to +v+.
+    # setter for to +v+
     def to=(v)
       check_to(v)
       set_to(v)
       v
     end
 
-    # Checks the headers +v+ component against either
+    # check the headers +v+ component against either
     # * HEADER_REGEXP
     def check_headers(v)
       return true unless v
@@ -214,11 +214,11 @@ module URI
           "bad component(expected opaque component): #{v}"
       end
 
-      true
+      return true
     end
     private :check_headers
 
-    # Private setter for headers +v+.
+    # private setter for headers +v+
     def set_headers(v)
       @headers = []
       if v
@@ -229,14 +229,14 @@ module URI
     end
     protected :set_headers
 
-    # Setter for headers +v+.
+    # setter for headers +v+
     def headers=(v)
       check_headers(v)
       set_headers(v)
       v
     end
 
-    # Constructs String from URI.
+    # Constructs String from URI
     def to_s
       @scheme + ':' +
         if @to
@@ -267,22 +267,22 @@ module URI
     #   # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
     #
     def to_mailtext
-      to = URI.decode_www_form_component(@to)
+      to = parser.unescape(@to)
       head = ''
       body = ''
       @headers.each do |x|
         case x[0]
         when 'body'
-          body = URI.decode_www_form_component(x[1])
+          body = parser.unescape(x[1])
         when 'to'
-          to << ', ' + URI.decode_www_form_component(x[1])
+          to << ', ' + parser.unescape(x[1])
         else
-          head << URI.decode_www_form_component(x[0]).capitalize + ': ' +
-            URI.decode_www_form_component(x[1])  + "\n"
+          head << parser.unescape(x[0]).capitalize + ': ' +
+            parser.unescape(x[1])  + "\n"
         end
       end
 
-      "To: #{to}
+      return "To: #{to}
 #{head}
 #{body}
 "
diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb
index 843fe124ee..b9e7b2b26e 100644
--- a/lib/uri/rfc2396_parser.rb
+++ b/lib/uri/rfc2396_parser.rb
@@ -58,7 +58,7 @@ module URI
     # :startdoc:
   end # REGEXP
 
-  # Class that parses String's into URI's.
+  # class that Parses String's into URI's
   #
   # It contains a Hash set of patterns and Regexp's that match and validate.
   #
@@ -88,12 +88,12 @@ module URI
     # == Examples
     #
     #   p = URI::Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
-    #   u = p.parse("http://example.jp/%uABCD") #=> #<URI::HTTP http://example.jp/%uABCD>
+    #   u = p.parse("http://example.jp/%uABCD") #=> #<URI::HTTP:0xb78cf4f8 URL:http://example.jp/%uABCD>
     #   URI.parse(u.to_s) #=> raises URI::InvalidURIError
     #
     #   s = "http://example.com/ABCD"
-    #   u1 = p.parse(s) #=> #<URI::HTTP http://example.com/ABCD>
-    #   u2 = URI.parse(s) #=> #<URI::HTTP http://example.com/ABCD>
+    #   u1 = p.parse(s) #=> #<URI::HTTP:0xb78c3220 URL:http://example.com/ABCD>
+    #   u2 = URI.parse(s) #=> #<URI::HTTP:0xb78b6d54 URL:http://example.com/ABCD>
     #   u1 == u2 #=> true
     #   u1.eql?(u2) #=> false
     #
@@ -109,15 +109,15 @@ module URI
 
     # The Hash of patterns.
     #
-    # See also URI::Parser.initialize_pattern.
+    # see also URI::Parser.initialize_pattern
     attr_reader :pattern
 
-    # The Hash of Regexp.
+    # The Hash of Regexp
     #
-    # See also URI::Parser.initialize_regexp.
+    # see also URI::Parser.initialize_regexp
     attr_reader :regexp
 
-    # Returns a split URI against regexp[:ABS_URI].
+    # Returns a split URI against regexp[:ABS_URI]
     def split(uri)
       case uri
       when ''
@@ -198,14 +198,14 @@ module URI
     #
     # == Description
     #
-    # Parses +uri+ and constructs either matching URI scheme object
-    # (File, FTP, HTTP, HTTPS, LDAP, LDAPS, or MailTo) or URI::Generic.
+    # parses +uri+ and constructs either matching URI scheme object
+    # (FTP, HTTP, HTTPS, LDAP, LDAPS, or MailTo) or URI::Generic
     #
     # == Usage
     #
     #   p = URI::Parser.new
     #   p.parse("ldap://ldap.example.com/dc=example?user=john")
-    #   #=> #<URI::LDAP ldap://ldap.example.com/dc=example?user=john>
+    #   #=> #<URI::LDAP:0x00000000b9e7e8 URL:ldap://ldap.example.com/dc=example?user=john>
     #
     def parse(uri)
       scheme, userinfo, host, port,
@@ -231,7 +231,7 @@ module URI
     #
     # == Description
     #
-    # Attempts to parse and merge a set of URIs.
+    # Attempts to parse and merge a set of URIs
     #
     def join(*uris)
       uris[0] = convert_to_uri(uris[0])
@@ -253,11 +253,11 @@ module URI
     #
     # == Description
     #
-    # Attempts to parse and merge a set of URIs.
-    # If no +block+ given, then returns the result,
+    # 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 URI::Parser.make_regexp.
+    # see also URI::Parser.make_regexp
     #
     def extract(str, schemes = nil)
       if block_given?
@@ -270,8 +270,8 @@ module URI
       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].
+    # 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]
@@ -294,7 +294,7 @@ module URI
     #
     # == Description
     #
-    # Constructs a safe String from +str+, removing unsafe characters,
+    # constructs a safe String from +str+, removing unsafe characters,
     # replacing them with codes.
     #
     def escape(str, unsafe = @regexp[:UNSAFE])
@@ -315,23 +315,21 @@ module URI
     #
     # :call-seq:
     #   unescape( str )
-    #   unescape( str, escaped )
+    #   unescape( str, unsafe )
     #
     # == Args
     #
     # +str+::
     #    String to remove escapes from
-    # +escaped+::
+    # +unsafe+::
     #    Regexp to apply. Defaults to self.regexp[:ESCAPED]
     #
     # == Description
     #
-    # Removes escapes from +str+.
+    # 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) }
+      str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
     end
 
     @@to_s = Kernel.instance_method(:to_s)
@@ -341,7 +339,7 @@ module URI
 
     private
 
-    # Constructs the default Hash of patterns.
+    # Constructs the default Hash of patterns
     def initialize_pattern(opts = {})
       ret = {}
       ret[:ESCAPED] = escaped = (opts.delete(:ESCAPED) || PATTERN::ESCAPED)
@@ -499,7 +497,7 @@ module URI
       ret
     end
 
-    # Constructs the default Hash of Regexp's.
+    # Constructs the default Hash of Regexp's
     def initialize_regexp(pattern)
       ret = {}
 
diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
index 135e847e88..871280044a 100644
--- a/lib/uri/rfc3986_parser.rb
+++ b/lib/uri/rfc3986_parser.rb
@@ -15,7 +15,7 @@ module URI
       begin
         uri = uri.to_str
       rescue NoMethodError
-        raise InvalidURIError, "bad URI(is not URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad URI(is not URI?): #{uri}"
       end
       uri.ascii_only? or
         raise InvalidURIError, "URI must be ascii only #{uri.dump}"
@@ -64,7 +64,7 @@ module URI
           m["fragment".freeze]
         ]
       else
-        raise InvalidURIError, "bad URI(is not URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad URI(is not URI?): #{uri}"
       end
     end
 
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 824d4016e1..cdfbe4a679 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require "delegate"
 
 # Weak Reference class that allows a referenced object to be
@@ -15,6 +15,53 @@ require "delegate"
 #   GC.start                    # start the garbage collector
 #   p foo.to_s                  # should raise exception (recycled)
 #
+# == Example
+#
+# With help from WeakRef, we can implement our own rudimentary WeakHash class.
+#
+# We will call it WeakHash, since it's really just a Hash except all of it's
+# keys and values can be garbage collected.
+#
+#     require 'weakref'
+#
+#     class WeakHash < Hash
+#       def []= key, obj
+#         super WeakRef.new(key), WeakRef.new(obj)
+#       end
+#     end
+#
+# This is just a simple implementation, we've opened the Hash class and changed
+# Hash#store to create a new WeakRef object with +key+ and +obj+ parameters
+# before passing them as our key-value pair to the hash.
+#
+# With this you will have to limit your self to String keys, otherwise you
+# will get an ArgumentError because WeakRef cannot create a finalizer for a
+# Symbol. Symbols are immutable and cannot be garbage collected.
+#
+# Let's see it in action:
+#
+#   omg = "lol"
+#   c = WeakHash.new
+#   c['foo'] = "bar"
+#   c['baz'] = Object.new
+#   c['qux'] = omg
+#   puts c.inspect
+#   #=> {"foo"=>"bar", "baz"=>#<Object:0x007f4ddfc6cb48>, "qux"=>"lol"}
+#
+#   # Now run the garbage collector
+#   GC.start
+#   c['foo'] #=> nil
+#   c['baz'] #=> nil
+#   c['qux'] #=> nil
+#   omg      #=> "lol"
+#
+#   puts c.inspect
+#   #=> WeakRef::RefError: Invalid Reference - probably recycled
+#
+# You can see the local variable +omg+ stayed, although its reference in our
+# hash object was garbage collected, along with the rest of the keys and
+# values. Also, when we tried to inspect our hash, we got a WeakRef::RefError.
+# This is because these objects were also garbage collected.
 
 class WeakRef < Delegator
 
@@ -31,7 +78,7 @@ class WeakRef < Delegator
   # Creates a weak reference to +orig+
   #
   # Raises an ArgumentError if the given +orig+ is immutable, such as Symbol,
-  # Integer, or Float.
+  # Fixnum, or Float.
 
   def initialize(orig)
     case orig
diff --git a/lib/webrick/.document b/lib/webrick/.document
deleted file mode 100644
index c62f89083b..0000000000
--- a/lib/webrick/.document
+++ /dev/null
@@ -1,6 +0,0 @@
-# Add files to this as they become documented
-
-*.rb
-
-httpauth
-httpservlet
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index bb0ae2fc84..94f385f1dd 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -8,9 +8,9 @@
 #
 # $Id$
 
-require_relative "httprequest"
-require_relative "httpresponse"
-require_relative "config"
+require "webrick/httprequest"
+require "webrick/httpresponse"
+require "webrick/config"
 require "stringio"
 
 module WEBrick
@@ -265,10 +265,6 @@ module WEBrick
         @out_port << data
       end
 
-      def write(data)
-        @out_port.write(data)
-      end
-
       def cert
         return nil unless defined?(OpenSSL)
         if pem = @env["SSL_SERVER_CERT"]
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 9f2ab44f49..98c9701633 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -9,25 +9,19 @@
 #
 # $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $
 
-require_relative 'version'
-require_relative 'httpversion'
-require_relative 'httputils'
-require_relative 'utils'
-require_relative 'log'
+require 'webrick/version'
+require 'webrick/httpversion'
+require 'webrick/httputils'
+require 'webrick/utils'
+require 'webrick/log'
 
 module WEBrick
   module Config
     LIBDIR = File::dirname(__FILE__) # :nodoc:
 
     # for GenericServer
-    General = Hash.new { |hash, key|
-      case key
-      when :ServerName
-        hash[key] = Utils.getservername
-      else
-        nil
-      end
-    }.update(
+    General = {
+      :ServerName     => Utils::getservername,
       :BindAddress    => nil,   # "0.0.0.0" or "::" or nil
       :Port           => nil,   # users MUST specify this!!
       :MaxClients     => 100,   # maximum number of the concurrent connections
@@ -42,7 +36,7 @@ module WEBrick
       :AcceptCallback => nil,
       :DoNotReverseLookup => true,
       :ShutdownSocketWithoutClose => false,
-    )
+    }
 
     # for HTTPServer, HTTPRequest, HTTPResponse ...
     HTTP = General.dup.update(
diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb
index 5fd3bfb228..16f8d21827 100644
--- a/lib/webrick/cookie.rb
+++ b/lib/webrick/cookie.rb
@@ -10,7 +10,7 @@
 # $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $
 
 require 'time'
-require_relative 'httputils'
+require 'webrick/httputils'
 
 module WEBrick
 
@@ -113,7 +113,7 @@ module WEBrick
         ret = []
         cookie = nil
         ver = 0
-        str.split(/;\s+/).each{|x|
+        str.split(/[;,]\s+/).each{|x|
           key, val = x.split(/=/,2)
           val = val ? HTTPUtils::dequote(val) : ""
           case key
diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb
index f8bf09a6f1..bbb6776528 100644
--- a/lib/webrick/httpauth.rb
+++ b/lib/webrick/httpauth.rb
@@ -9,11 +9,11 @@
 #
 # $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $
 
-require_relative 'httpauth/basicauth'
-require_relative 'httpauth/digestauth'
-require_relative 'httpauth/htpasswd'
-require_relative 'httpauth/htdigest'
-require_relative 'httpauth/htgroup'
+require 'webrick/httpauth/basicauth'
+require 'webrick/httpauth/digestauth'
+require 'webrick/httpauth/htpasswd'
+require 'webrick/httpauth/htdigest'
+require 'webrick/httpauth/htgroup'
 
 module WEBrick
 
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
index 7d0a9cfc8f..e23420fdfa 100644
--- a/lib/webrick/httpauth/basicauth.rb
+++ b/lib/webrick/httpauth/basicauth.rb
@@ -8,9 +8,9 @@
 #
 # $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
 
-require_relative '../config'
-require_relative '../httpstatus'
-require_relative 'authenticator'
+require 'webrick/config'
+require 'webrick/httpstatus'
+require 'webrick/httpauth/authenticator'
 
 module WEBrick
   module HTTPAuth
@@ -24,7 +24,7 @@ module WEBrick
     #
     #   config = { :Realm => 'BasicAuth example realm' }
     #
-    #   htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file', password_hash: :bcrypt
+    #   htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
     #   htpasswd.set_passwd config[:Realm], 'username', 'password'
     #   htpasswd.flush
     #
@@ -81,15 +81,7 @@ module WEBrick
           error("%s: the user is not allowed.", userid)
           challenge(req, res)
         end
-
-        case encpass
-        when /\A\$2[aby]\$/
-          password_matches = BCrypt::Password.new(encpass.sub(/\A\$2[aby]\$/, '$2a$')) == password
-        else
-          password_matches = password.crypt(encpass) == encpass
-        end
-
-        unless password_matches
+        if password.crypt(encpass) != encpass
           error("%s: password unmatch.", userid)
           challenge(req, res)
         end
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
index 3cf12899d2..375ec20154 100644
--- a/lib/webrick/httpauth/digestauth.rb
+++ b/lib/webrick/httpauth/digestauth.rb
@@ -12,9 +12,9 @@
 #
 # $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
 
-require_relative '../config'
-require_relative '../httpstatus'
-require_relative 'authenticator'
+require 'webrick/config'
+require 'webrick/httpstatus'
+require 'webrick/httpauth/authenticator'
 require 'digest/md5'
 require 'digest/sha1'
 
@@ -235,11 +235,9 @@ module WEBrick
           ha2 = hexdigest(req.request_method, auth_req['uri'])
           ha2_res = hexdigest("", auth_req['uri'])
         elsif auth_req['qop'] == "auth-int"
-          body_digest = @h.new
-          req.body { |chunk| body_digest.update(chunk) }
-          body_digest = body_digest.hexdigest
-          ha2 = hexdigest(req.request_method, auth_req['uri'], body_digest)
-          ha2_res = hexdigest("", auth_req['uri'], body_digest)
+          ha2 = hexdigest(req.request_method, auth_req['uri'],
+                          hexdigest(req.body))
+          ha2_res = hexdigest("", auth_req['uri'], hexdigest(res.body))
         end
 
         if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
@@ -290,8 +288,23 @@ module WEBrick
 
       def split_param_value(string)
         ret = {}
-        string.scan(/\G\s*([\w\-.*%!]+)=\s*(?:\"((?>\\.|[^\"])*)\"|([^,\"]*))\s*,?/) do
-          ret[$1] = $3 || $2.gsub(/\\(.)/, "\\1")
+        while string.bytesize != 0
+          case string
+          when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
+            key = $1
+            matched = $2
+            string = $'
+            ret[key] = matched.gsub(/\\(.)/, "\\1")
+          when /^\s*([\w\-\.\*\%\!]+)=\s*([^,\"]*),?/
+            key = $1
+            matched = $2
+            string = $'
+            ret[key] = matched.clone
+          when /^s*^,/
+            string = $'
+          else
+            break
+          end
         end
         ret
       end
diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb
index 93b18e2c75..1ef4fdb4aa 100644
--- a/lib/webrick/httpauth/htdigest.rb
+++ b/lib/webrick/httpauth/htdigest.rb
@@ -8,8 +8,8 @@
 #
 # $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
 
-require_relative 'userdb'
-require_relative 'digestauth'
+require 'webrick/httpauth/userdb'
+require 'webrick/httpauth/digestauth'
 require 'tempfile'
 
 module WEBrick
@@ -40,7 +40,7 @@ module WEBrick
         @digest = Hash.new
         @mutex = Thread::Mutex::new
         @auth_type = DigestAuth
-        File.open(@path,"a").close unless File.exist?(@path)
+        open(@path,"a").close unless File::exist?(@path)
         reload
       end
 
@@ -51,7 +51,7 @@ module WEBrick
         mtime = File::mtime(@path)
         if mtime > @mtime
           @digest.clear
-          File.open(@path){|io|
+          open(@path){|io|
             while line = io.gets
               line.chomp!
               user, realm, pass = line.split(/:/, 3)
@@ -79,7 +79,7 @@ module WEBrick
           File::rename(tmp.path, output)
           renamed = true
         ensure
-          tmp.close
+          tmp.close if !tmp.closed?
           File.unlink(tmp.path) if !renamed
         end
       end
diff --git a/lib/webrick/httpauth/htgroup.rb b/lib/webrick/httpauth/htgroup.rb
index e06c441b18..832ae8bd04 100644
--- a/lib/webrick/httpauth/htgroup.rb
+++ b/lib/webrick/httpauth/htgroup.rb
@@ -36,7 +36,7 @@ module WEBrick
         @path = path
         @mtime = Time.at(0)
         @group = Hash.new
-        File.open(@path,"a").close unless File.exist?(@path)
+        open(@path,"a").close unless File::exist?(@path)
         reload
       end
 
@@ -46,7 +46,7 @@ module WEBrick
       def reload
         if (mtime = File::mtime(@path)) > @mtime
           @group.clear
-          File.open(@path){|io|
+          open(@path){|io|
             while line = io.gets
               line.chomp!
               group, members = line.split(/:\s*/)
@@ -63,18 +63,15 @@ module WEBrick
 
       def flush(output=nil)
         output ||= @path
-        tmp = Tempfile.create("htgroup", File::dirname(output))
+        tmp = Tempfile.new("htgroup", File::dirname(output))
         begin
           @group.keys.sort.each{|group|
             tmp.puts(format("%s: %s", group, self.members(group).join(" ")))
           }
-        ensure
           tmp.close
-          if $!
-            File.unlink(tmp.path)
-          else
-            return File.rename(tmp.path, output)
-          end
+          File::rename(tmp.path, output)
+        rescue
+          tmp.close(true)
         end
       end
 
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
index abca30532e..f43fc2c548 100644
--- a/lib/webrick/httpauth/htpasswd.rb
+++ b/lib/webrick/httpauth/htpasswd.rb
@@ -8,8 +8,8 @@
 #
 # $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
 
-require_relative 'userdb'
-require_relative 'basicauth'
+require 'webrick/httpauth/userdb'
+require 'webrick/httpauth/basicauth'
 require 'tempfile'
 
 module WEBrick
@@ -35,30 +35,12 @@ module WEBrick
       ##
       # Open a password database at +path+
 
-      def initialize(path, password_hash: nil)
+      def initialize(path)
         @path = path
         @mtime = Time.at(0)
         @passwd = Hash.new
         @auth_type = BasicAuth
-        @password_hash = password_hash
-
-        case @password_hash
-        when nil
-          # begin
-          #   require "string/crypt"
-          # rescue LoadError
-          #   warn("Unable to load string/crypt, proceeding with deprecated use of String#crypt, consider using password_hash: :bcrypt")
-          # end
-          @password_hash = :crypt
-        when :crypt
-          # require "string/crypt"
-        when :bcrypt
-          require "bcrypt"
-        else
-          raise ArgumentError, "only :crypt and :bcrypt are supported for password_hash keyword argument"
-        end
-
-        File.open(@path,"a").close unless File.exist?(@path)
+        open(@path,"a").close unless File::exist?(@path)
         reload
       end
 
@@ -69,19 +51,11 @@ module WEBrick
         mtime = File::mtime(@path)
         if mtime > @mtime
           @passwd.clear
-          File.open(@path){|io|
+          open(@path){|io|
             while line = io.gets
               line.chomp!
               case line
               when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
-                if @password_hash == :bcrypt
-                  raise StandardError, ".htpasswd file contains crypt password, only bcrypt passwords supported"
-                end
-                user, pass = line.split(":")
-              when %r!\A[^:]+:\$2[aby]\$\d{2}\$.{53}\z!
-                if @password_hash == :crypt
-                  raise StandardError, ".htpasswd file contains bcrypt password, only crypt passwords supported"
-                end
                 user, pass = line.split(":")
               when /:\$/, /:{SHA}/
                 raise NotImplementedError,
@@ -110,7 +84,7 @@ module WEBrick
           File::rename(tmp.path, output)
           renamed = true
         ensure
-          tmp.close
+          tmp.close if !tmp.closed?
           File.unlink(tmp.path) if !renamed
         end
       end
@@ -128,14 +102,7 @@ module WEBrick
       # Sets a password in the database for +user+ in +realm+ to +pass+.
 
       def set_passwd(realm, user, pass)
-        if @password_hash == :bcrypt
-          # Cost of 5 to match Apache default, and because the
-          # bcrypt default of 10 will introduce significant delays
-          # for every request.
-          @passwd[user] = BCrypt::Password.create(pass, :cost=>5)
-        else
-          @passwd[user] = make_passwd(realm, user, pass)
-        end
+        @passwd[user] = make_passwd(realm, user, pass)
       end
 
       ##
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index d05d59514c..083720f298 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -10,7 +10,7 @@
 # $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $
 # $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $
 
-require_relative "httpserver"
+require "webrick/httpserver"
 require "net/http"
 
 module WEBrick
@@ -193,13 +193,13 @@ module WEBrick
       begin
         while fds = IO::select([ua, os])
           if fds[0].member?(ua)
-            buf = ua.readpartial(1024);
+            buf = ua.sysread(1024);
             @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
-            os.write(buf)
+            os.syswrite(buf)
           elsif fds[0].member?(os)
-            buf = os.readpartial(1024);
+            buf = os.sysread(1024);
             @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
-            ua.write(buf)
+            ua.syswrite(buf)
           end
         end
       rescue
@@ -211,15 +211,21 @@ module WEBrick
     end
 
     def do_GET(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Get)
+      perform_proxy_request(req, res) do |http, path, header|
+        http.get(path, header)
+      end
     end
 
     def do_HEAD(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Head)
+      perform_proxy_request(req, res) do |http, path, header|
+        http.head(path, header)
+      end
     end
 
     def do_POST(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Post, req.body_reader)
+      perform_proxy_request(req, res) do |http, path, header|
+        http.post(path, req.body || "", header)
+      end
     end
 
     def do_OPTIONS(req, res)
@@ -295,56 +301,38 @@ module WEBrick
       return FakeProxyURI
     end
 
-    def perform_proxy_request(req, res, req_class, body_stream = nil)
+    def perform_proxy_request(req, res)
       uri = req.request_uri
       path = uri.path.dup
       path << "?" << uri.query if uri.query
       header = setup_proxy_header(req, res)
       upstream = setup_upstream_proxy_authentication(req, res, header)
+      response = nil
 
-      body_tmp = []
       http = Net::HTTP.new(uri.host, uri.port, upstream.host, upstream.port)
-      req_fib = Fiber.new do
-        http.start do
-          if @config[:ProxyTimeout]
-            ##################################   these issues are
-            http.open_timeout = 30   # secs  #   necessary (maybe because
-            http.read_timeout = 60   # secs  #   Ruby's bug, but why?)
-            ##################################
-          end
-          if body_stream && req['transfer-encoding'] =~ /\bchunked\b/i
-            header['Transfer-Encoding'] = 'chunked'
-          end
-          http_req = req_class.new(path, header)
-          http_req.body_stream = body_stream if body_stream
-          http.request(http_req) do |response|
-            # Persistent connection requirements are mysterious for me.
-            # So I will close the connection in every response.
-            res['proxy-connection'] = "close"
-            res['connection'] = "close"
-
-            # stream Net::HTTP::HTTPResponse to WEBrick::HTTPResponse
-            res.status = response.code.to_i
-            res.chunked = response.chunked?
-            choose_header(response, res)
-            set_cookie(response, res)
-            set_via(res)
-            response.read_body do |buf|
-              body_tmp << buf
-              Fiber.yield # wait for res.body Proc#call
-            end
-          end # http.request
-        end
-      end
-      req_fib.resume # read HTTP response headers and first chunk of the body
-      res.body = ->(socket) do
-        while buf = body_tmp.shift
-          socket.write(buf)
-          buf.clear
-          req_fib.resume # continue response.read_body
+      http.start do
+        if @config[:ProxyTimeout]
+          ##################################   these issues are
+          http.open_timeout = 30   # secs  #   necessary (maybe because
+          http.read_timeout = 60   # secs  #   Ruby's bug, but why?)
+          ##################################
         end
+        response = yield(http, path, header)
       end
+
+      # Persistent connection requirements are mysterious for me.
+      # So I will close the connection in every response.
+      res['proxy-connection'] = "close"
+      res['connection'] = "close"
+
+      # Convert Net::HTTP::HTTPResponse to WEBrick::HTTPResponse
+      res.status = response.code.to_i
+      choose_header(response, res)
+      set_cookie(response, res)
+      set_via(res)
+      res.body = response.body
     end
+
     # :stopdoc:
   end
 end
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index e402099a30..10cf72d288 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -10,10 +10,10 @@
 # $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
 
 require 'uri'
-require_relative 'httpversion'
-require_relative 'httpstatus'
-require_relative 'httputils'
-require_relative 'cookie'
+require 'webrick/httpversion'
+require 'webrick/httpstatus'
+require 'webrick/httputils'
+require 'webrick/cookie'
 
 module WEBrick
 
@@ -258,32 +258,6 @@ module WEBrick
     end
 
     ##
-    # Prepares the HTTPRequest object for use as the
-    # source for IO.copy_stream
-
-    def body_reader
-      @body_tmp = []
-      @body_rd = Fiber.new do
-        body do |buf|
-          @body_tmp << buf
-          Fiber.yield
-        end
-      end
-      @body_rd.resume # grab the first chunk and yield
-      self
-    end
-
-    # for IO.copy_stream.  Note: we may return a larger string than +size+
-    # here; but IO.copy_stream does not care.
-    def readpartial(size, buf = ''.b) # :nodoc
-      res = @body_tmp.shift or raise EOFError, 'end of file reached'
-      buf.replace(res)
-      res.clear
-      @body_rd.resume # get more chunks
-      buf
-    end
-
-    ##
     # Request query as a Hash
 
     def query
@@ -440,19 +414,13 @@ module WEBrick
 
     MAX_URI_LENGTH = 2083 # :nodoc:
 
-    # same as Mongrel, Thin and Puma
-    MAX_HEADER_LENGTH = (112 * 1024) # :nodoc:
-
     def read_request_line(socket)
       @request_line = read_line(socket, MAX_URI_LENGTH) if socket
-      raise HTTPStatus::EOFError unless @request_line
-
-      @request_bytes = @request_line.bytesize
-      if @request_bytes >= MAX_URI_LENGTH and @request_line[-1, 1] != LF
+      if @request_line.bytesize >= MAX_URI_LENGTH and @request_line[-1, 1] != LF
         raise HTTPStatus::RequestURITooLarge
       end
-
       @request_time = Time.now
+      raise HTTPStatus::EOFError unless @request_line
       if /^(\S+)\s+(\S++)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
         @request_method = $1
         @unparsed_uri   = $2
@@ -467,9 +435,6 @@ module WEBrick
       if socket
         while line = read_line(socket)
           break if /\A(#{CRLF}|#{LF})\z/om =~ line
-          if (@request_bytes += line.bytesize) > MAX_HEADER_LENGTH
-            raise HTTPStatus::RequestEntityTooLarge, 'headers too large'
-          end
           @raw_header << line
         end
       end
@@ -537,16 +502,12 @@ module WEBrick
     def read_chunked(socket, block)
       chunk_size, = read_chunk_size(socket)
       while chunk_size > 0
-        begin
-          sz = [ chunk_size, @buffer_size ].min
-          data = read_data(socket, sz) # read chunk-data
-          if data.nil? || data.bytesize != sz
-            raise HTTPStatus::BadRequest, "bad chunk data size."
-          end
-          block.call(data)
-        end while (chunk_size -= sz) > 0
-
+        data = read_data(socket, chunk_size) # read chunk-data
+        if data.nil? || data.bytesize != chunk_size
+          raise BadRequest, "bad chunk data size."
+        end
         read_line(socket)                    # skip CRLF
+        block.call(data)
         chunk_size, = read_chunk_size(socket)
       end
       read_header(socket)                    # trailer + CRLF
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 08f7797c4f..eae14d6597 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -10,11 +10,10 @@
 # $IPR: httpresponse.rb,v 1.45 2003/07/11 11:02:25 gotoyuzo Exp $
 
 require 'time'
-require 'uri'
-require_relative 'httpversion'
-require_relative 'htmlutils'
-require_relative 'httputils'
-require_relative 'httpstatus'
+require 'webrick/httpversion'
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
 
 module WEBrick
   ##
@@ -22,8 +21,6 @@ module WEBrick
   # WEBrick HTTP Servlet.
 
   class HTTPResponse
-    class InvalidHeader < StandardError
-    end
 
     ##
     # HTTP Response version
@@ -254,7 +251,7 @@ module WEBrick
         @header.delete('content-length')
       elsif @header['content-length'].nil?
         unless @body.is_a?(IO)
-          @header['content-length'] = (@body ? @body.bytesize : 0).to_s
+          @header['content-length'] = @body ? @body.bytesize : 0
         end
       end
 
@@ -277,7 +274,7 @@ module WEBrick
       # Location is a single absoluteURI.
       if location = @header['location']
         if @request_uri
-          @header['location'] = @request_uri.merge(location).to_s
+          @header['location'] = @request_uri.merge(location)
         end
       end
     end
@@ -290,19 +287,14 @@ module WEBrick
         data = status_line()
         @header.each{|key, value|
           tmp = key.gsub(/\bwww|^te$|\b\w/){ $&.upcase }
-          data << "#{tmp}: #{check_header(value)}" << CRLF
+          data << "#{tmp}: #{value}" << CRLF
         }
         @cookies.each{|cookie|
-          data << "Set-Cookie: " << check_header(cookie.to_s) << CRLF
+          data << "Set-Cookie: " << cookie.to_s << CRLF
         }
         data << CRLF
-        socket.write(data)
+        _write_data(socket, data)
       end
-    rescue InvalidHeader => e
-      @header.clear
-      @cookies.clear
-      set_error e
-      retry
     end
 
     ##
@@ -311,8 +303,6 @@ module WEBrick
     def send_body(socket) # :nodoc:
       if @body.respond_to? :readpartial then
         send_body_io(socket)
-      elsif @body.respond_to?(:call) then
-        send_body_proc(socket)
       else
         send_body_string(socket)
       end
@@ -332,9 +322,8 @@ module WEBrick
     #   res.set_redirect WEBrick::HTTPStatus::TemporaryRedirect
 
     def set_redirect(status, url)
-      url = URI(url).to_s
       @body = "<HTML><A HREF=\"#{url}\">#{url}</A>.</HTML>\n"
-      @header['location'] = url
+      @header['location'] = url.to_s
       raise status
     end
 
@@ -368,15 +357,6 @@ module WEBrick
 
     private
 
-    def check_header(header_value)
-      header_value = header_value.to_s
-      if /[\r\n]/ =~ header_value
-        raise InvalidHeader
-      else
-        header_value
-      end
-    end
-
     # :stopdoc:
 
     def error_body(backtrace, ex, host, port)
@@ -414,34 +394,24 @@ module WEBrick
         if @request_method == "HEAD"
           # do nothing
         elsif chunked?
-          buf  = ''
           begin
-            @body.readpartial(@buffer_size, buf)
-            size = buf.bytesize
-            data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-            socket.write(data)
-            data.clear
-            @sent_size += size
-          rescue EOFError
-            break
-          end while true
-          buf.clear
-          socket.write("0#{CRLF}#{CRLF}")
-        else
-          if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ @header['content-range']
-            offset = $1.to_i
-            size = $2.to_i - offset + 1
-          else
-            offset = nil
-            size = @header['content-length']
-            size = size.to_i if size
-          end
-          begin
-            @sent_size = IO.copy_stream(@body, socket, size, offset)
-          rescue NotImplementedError
-            @body.seek(offset, IO::SEEK_SET)
-            @sent_size = IO.copy_stream(@body, socket, size)
+            buf  = ''
+            data = ''
+            while true
+              @body.readpartial( @buffer_size, buf ) # there is no need to clear buf?
+              data << format("%x", buf.bytesize) << CRLF
+              data << buf << CRLF
+              _write_data(socket, data)
+              data.clear
+              @sent_size += buf.bytesize
+            end
+          rescue EOFError # do nothing
           end
+          _write_data(socket, "0#{CRLF}#{CRLF}")
+        else
+          size = @header['content-length'].to_i
+          _send_file(socket, @body, 0, size)
+          @sent_size = size
         end
       ensure
         @body.close
@@ -455,60 +425,42 @@ module WEBrick
         body ? @body.bytesize : 0
         while buf = @body[@sent_size, @buffer_size]
           break if buf.empty?
-          size = buf.bytesize
-          data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-          buf.clear
-          socket.write(data)
-          @sent_size += size
+          data = ""
+          data << format("%x", buf.bytesize) << CRLF
+          data << buf << CRLF
+          _write_data(socket, data)
+          @sent_size += buf.bytesize
         end
-        socket.write("0#{CRLF}#{CRLF}")
+        _write_data(socket, "0#{CRLF}#{CRLF}")
       else
         if @body && @body.bytesize > 0
-          socket.write(@body)
+          _write_data(socket, @body)
           @sent_size = @body.bytesize
         end
       end
     end
 
-    def send_body_proc(socket)
-      if @request_method == "HEAD"
-        # do nothing
-      elsif chunked?
-        @body.call(ChunkedWrapper.new(socket, self))
-        socket.write("0#{CRLF}#{CRLF}")
-      else
-        size = @header['content-length'].to_i
-        @body.call(socket)
-        @sent_size = size
-      end
-    end
-
-    class ChunkedWrapper
-      def initialize(socket, resp)
-        @socket = socket
-        @resp = resp
+    def _send_file(output, input, offset, size)
+      while offset > 0
+        sz = @buffer_size < size ? @buffer_size : size
+        buf = input.read(sz)
+        offset -= buf.bytesize
       end
 
-      def write(buf)
-        return 0 if buf.empty?
-        socket = @socket
-        @resp.instance_eval {
-          size = buf.bytesize
-          data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-          socket.write(data)
-          data.clear
-          @sent_size += size
-          size
-        }
-      end
-
-      def <<(*buf)
-        write(buf)
-        self
+      if size == 0
+        while buf = input.read(@buffer_size)
+          _write_data(output, buf)
+        end
+      else
+        while size > 0
+          sz = @buffer_size < size ? @buffer_size : size
+          buf = input.read(sz)
+          _write_data(output, buf)
+          size -= buf.bytesize
+        end
       end
     end
 
-    # preserved for compatibility with some 3rd-party handlers
     def _write_data(socket, data)
       socket << data
     end
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index b0a49bc40b..73875d7326 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -9,8 +9,7 @@
 #
 # $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $
 
-require_relative 'ssl'
-require_relative 'httpserver'
+require 'webrick/ssl'
 
 module WEBrick
   module Config
@@ -85,68 +84,4 @@ module WEBrick
 
     # :startdoc:
   end
-
-  ##
-  #--
-  # Fake WEBrick::HTTPRequest for lookup_server
-
-  class SNIRequest
-
-    ##
-    # The SNI hostname
-
-    attr_reader :host
-
-    ##
-    # The socket address of the server
-
-    attr_reader :addr
-
-    ##
-    # The port this request is for
-
-    attr_reader :port
-
-    ##
-    # Creates a new SNIRequest.
-
-    def initialize(sslsocket, hostname)
-      @host = hostname
-      @addr = sslsocket.addr
-      @port = @addr[1]
-    end
-  end
-
-
-  ##
-  #--
-  # Adds SSL functionality to WEBrick::HTTPServer
-
-  class HTTPServer < ::WEBrick::GenericServer
-    ##
-    # ServerNameIndication callback
-
-    def ssl_servername_callback(sslsocket, hostname = nil)
-      req = SNIRequest.new(sslsocket, hostname)
-      server = lookup_server(req)
-      server ? server.ssl_context : nil
-    end
-
-    # :stopdoc:
-
-    ##
-    # Check whether +server+ is also SSL server.
-    # Also +server+'s SSL context will be created.
-
-    alias orig_virtual_host virtual_host
-
-    def virtual_host(server)
-      if @config[:SSLEnable] && !server.ssl_context
-        raise ArgumentError, "virtual host must set SSLEnable to true"
-      end
-      orig_virtual_host(server)
-    end
-
-    # :startdoc:
-  end
 end
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index e85d059319..b27f2311bd 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -10,13 +10,13 @@
 # $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $
 
 require 'io/wait'
-require_relative 'server'
-require_relative 'httputils'
-require_relative 'httpstatus'
-require_relative 'httprequest'
-require_relative 'httpresponse'
-require_relative 'httpservlet'
-require_relative 'accesslog'
+require 'webrick/server'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
+require 'webrick/httprequest'
+require 'webrick/httpresponse'
+require 'webrick/httpservlet'
+require 'webrick/accesslog'
 
 module WEBrick
   class HTTPServerError < ServerError; end
@@ -68,8 +68,8 @@ module WEBrick
 
     def run(sock)
       while true
-        req = create_request(@config)
-        res = create_response(@config)
+        res = HTTPResponse.new(@config)
+        req = HTTPRequest.new(@config)
         server = self
         begin
           timeout = @config[:RequestTimeout]
@@ -225,20 +225,6 @@ module WEBrick
     end
 
     ##
-    # Creates the HTTPRequest used when handling the HTTP
-    # request. Can be overridden by subclasses.
-    def create_request(with_webrick_config)
-      HTTPRequest.new(with_webrick_config)
-    end
-
-    ##
-    # Creates the HTTPResponse used when handling the HTTP
-    # request. Can be overridden by subclasses.
-    def create_response(with_webrick_config)
-      HTTPResponse.new(with_webrick_config)
-    end
-
-    ##
     # Mount table for the path a servlet is mounted on in the directory space
     # of the server.  Users of WEBrick can only access this indirectly via
     # WEBrick::HTTPServer#mount, WEBrick::HTTPServer#unmount and
@@ -281,12 +267,12 @@ module WEBrick
         k.sort!
         k.reverse!
         k.collect!{|path| Regexp.escape(path) }
-        @scanner = Regexp.new("\\A(" + k.join("|") +")(?=/|\\z)")
+        @scanner = Regexp.new("^(" + k.join("|") +")(?=/|$)")
       end
 
       def normalize(dir)
         ret = dir ? dir.dup : ""
-        ret.sub!(%r|/+\z|, "")
+        ret.sub!(%r|/+$|, "")
         ret
       end
     end
diff --git a/lib/webrick/httpservlet.rb b/lib/webrick/httpservlet.rb
index da49a1405b..1ee04ec86f 100644
--- a/lib/webrick/httpservlet.rb
+++ b/lib/webrick/httpservlet.rb
@@ -9,11 +9,11 @@
 #
 # $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $
 
-require_relative 'httpservlet/abstract'
-require_relative 'httpservlet/filehandler'
-require_relative 'httpservlet/cgihandler'
-require_relative 'httpservlet/erbhandler'
-require_relative 'httpservlet/prochandler'
+require 'webrick/httpservlet/abstract'
+require 'webrick/httpservlet/filehandler'
+require 'webrick/httpservlet/cgihandler'
+require 'webrick/httpservlet/erbhandler'
+require 'webrick/httpservlet/prochandler'
 
 module WEBrick
   module HTTPServlet
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index bccb091861..ee558eb026 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -9,9 +9,11 @@
 #
 # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
 
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
+require 'thread'
+
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
 
 module WEBrick
   module HTTPServlet
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb
index 0398c16749..597f48936b 100644
--- a/lib/webrick/httpservlet/cgi_runner.rb
+++ b/lib/webrick/httpservlet/cgi_runner.rb
@@ -23,11 +23,11 @@ STDIN.binmode
 
 len = sysread(STDIN, 8).to_i
 out = sysread(STDIN, len)
-STDOUT.reopen(File.open(out, "w"))
+STDOUT.reopen(open(out, "w"))
 
 len = sysread(STDIN, 8).to_i
 err = sysread(STDIN, len)
-STDERR.reopen(File.open(err, "w"))
+STDERR.reopen(open(err, "w"))
 
 len  = sysread(STDIN, 8).to_i
 dump = sysread(STDIN, len)
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index 981f649750..ba6b0b6032 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -11,8 +11,8 @@
 
 require 'rbconfig'
 require 'tempfile'
-require_relative '../config'
-require_relative 'abstract'
+require 'webrick/config'
+require 'webrick/httpservlet/abstract'
 
 module WEBrick
   module HTTPServlet
@@ -65,7 +65,9 @@ module WEBrick
           cgi_in.write("%8d" % dump.bytesize)
           cgi_in.write(dump)
 
-          req.body { |chunk| cgi_in.write(chunk) }
+          if req.body and req.body.bytesize > 0
+            cgi_in.write(req.body)
+          end
         ensure
           cgi_in.close
           status = $?.exitstatus
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index cd09e5f216..9bcec69883 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
 
-require_relative 'abstract'
+require 'webrick/httpservlet/abstract.rb'
 
 require 'erb'
 
@@ -53,7 +53,7 @@ module WEBrick
           raise HTTPStatus::Forbidden, "ERBHandler cannot work."
         end
         begin
-          data = File.open(@script_filename, &:read)
+          data = open(@script_filename){|io| io.read }
           res.body = evaluate(ERB.new(data), req, res)
           res['content-type'] ||=
             HTTPUtils::mime_type(@script_filename, @config[:MimeTypes])
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 601882ef4c..cf37dd6ca5 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -9,11 +9,12 @@
 #
 # $IPR: filehandler.rb,v 1.44 2003/06/07 01:34:51 gotoyuzo Exp $
 
+require 'thread'
 require 'time'
 
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
 
 module WEBrick
   module HTTPServlet
@@ -55,9 +56,9 @@ module WEBrick
         else
           mtype = HTTPUtils::mime_type(@local_path, @config[:MimeTypes])
           res['content-type'] = mtype
-          res['content-length'] = st.size.to_s
+          res['content-length'] = st.size
           res['last-modified'] = mtime.httpdate
-          res.body = File.open(@local_path, "rb")
+          res.body = open(@local_path, "rb")
         end
       end
 
@@ -86,66 +87,47 @@ module WEBrick
         return false
       end
 
-      # returns a lambda for webrick/httpresponse.rb send_body_proc
-      def multipart_body(body, parts, boundary, mtype, filesize)
-        lambda do |socket|
-          begin
-            begin
-              first = parts.shift
-              last = parts.shift
-              socket.write(
-                "--#{boundary}#{CRLF}" \
-                "Content-Type: #{mtype}#{CRLF}" \
-                "Content-Range: bytes #{first}-#{last}/#{filesize}#{CRLF}" \
-                "#{CRLF}"
-              )
-
-              begin
-                IO.copy_stream(body, socket, last - first + 1, first)
-              rescue NotImplementedError
-                body.seek(first, IO::SEEK_SET)
-                IO.copy_stream(body, socket, last - first + 1)
-              end
-              socket.write(CRLF)
-            end while parts[0]
-            socket.write("--#{boundary}--#{CRLF}")
-          ensure
-            body.close
-          end
-        end
-      end
-
       def make_partial_content(req, res, filename, filesize)
         mtype = HTTPUtils::mime_type(filename, @config[:MimeTypes])
         unless ranges = HTTPUtils::parse_range_header(req['range'])
           raise HTTPStatus::BadRequest,
             "Unrecognized range-spec: \"#{req['range']}\""
         end
-        File.open(filename, "rb"){|io|
+        open(filename, "rb"){|io|
           if ranges.size > 1
             time = Time.now
             boundary = "#{time.sec}_#{time.usec}_#{Process::pid}"
-            parts = []
-            ranges.each {|range|
-              prange = prepare_range(range, filesize)
-              next if prange[0] < 0
-              parts.concat(prange)
+            body = ''
+            ranges.each{|range|
+              first, last = prepare_range(range, filesize)
+              next if first < 0
+              io.pos = first
+              content = io.read(last-first+1)
+              body << "--" << boundary << CRLF
+              body << "Content-Type: #{mtype}" << CRLF
+              body << "Content-Range: bytes #{first}-#{last}/#{filesize}" << CRLF
+              body << CRLF
+              body << content
+              body << CRLF
             }
-            raise HTTPStatus::RequestRangeNotSatisfiable if parts.empty?
+            raise HTTPStatus::RequestRangeNotSatisfiable if body.empty?
+            body << "--" << boundary << "--" << CRLF
             res["content-type"] = "multipart/byteranges; boundary=#{boundary}"
-            if req.http_version < '1.1'
-              res['connection'] = 'close'
-            else
-              res.chunked = true
-            end
-            res.body = multipart_body(io.dup, parts, boundary, mtype, filesize)
+            res.body = body
           elsif range = ranges[0]
             first, last = prepare_range(range, filesize)
             raise HTTPStatus::RequestRangeNotSatisfiable if first < 0
+            if last == filesize - 1
+              content = io.dup
+              content.pos = first
+            else
+              io.pos = first
+              content = io.read(last-first+1)
+            end
             res['content-type'] = mtype
             res['content-range'] = "bytes #{first}-#{last}/#{filesize}"
-            res['content-length'] = (last - first + 1).to_s
-            res.body = io.dup
+            res['content-length'] = last - first + 1
+            res.body = content
           else
             raise HTTPStatus::BadRequest
           end
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
index 599ffc4340..c1f454e2f6 100644
--- a/lib/webrick/httpservlet/prochandler.rb
+++ b/lib/webrick/httpservlet/prochandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
 
-require_relative 'abstract'
+require 'webrick/httpservlet/abstract.rb'
 
 module WEBrick
   module HTTPServlet
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index c811f21964..ded5aa2e60 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $
 
-require_relative 'accesslog'
+require 'webrick/accesslog'
 
 module WEBrick
 
@@ -23,6 +23,10 @@ module WEBrick
     ##
     # Root of the HTTP status class hierarchy
     class Status < StandardError
+      def initialize(*args) # :nodoc:
+        args[0] = AccessLog.escape(args[0]) unless args.empty?
+        super(*args)
+      end
       class << self
         attr_reader :code, :reason_phrase # :nodoc:
       end
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index a4cd3b48ee..28f906ef4d 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -69,7 +69,6 @@ module WEBrick
       "jpeg"  => "image/jpeg",
       "jpg"   => "image/jpeg",
       "js"    => "application/javascript",
-      "json"  => "application/json",
       "lha"   => "application/octet-stream",
       "lzh"   => "application/octet-stream",
       "mov"   => "video/quicktime",
@@ -108,8 +107,6 @@ module WEBrick
     # Loads Apache-compatible mime.types in +file+.
 
     def load_mime_types(file)
-      # note: +file+ may be a "| command" for now; some people may
-      # rely on this, but currently we do not use this method by default.
       open(file){ |io|
         hash = Hash.new
         io.each{ |line|
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 2c1fdfe602..7542d8f79a 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -51,7 +51,7 @@ module WEBrick
       @level = level || INFO
       case log_file
       when String
-        @log = File.open(log_file, "a+")
+        @log = open(log_file, "a+")
         @log.sync = true
         @opened = true
       when NilClass
@@ -118,10 +118,10 @@ module WEBrick
     # * Otherwise it will return +arg+.inspect.
     def format(arg)
       if arg.is_a?(Exception)
-        "#{arg.class}: #{AccessLog.escape(arg.message)}\n\t" <<
+        "#{arg.class}: #{arg.message}\n\t" <<
         arg.backtrace.join("\n\t") << "\n"
       elsif arg.respond_to?(:to_str)
-        AccessLog.escape(arg.to_str)
+        arg.to_str
       else
         arg.inspect
       end
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 4a6e74c4f9..45bd9706d3 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -9,9 +9,10 @@
 #
 # $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $
 
+require 'thread'
 require 'socket'
-require_relative 'config'
-require_relative 'log'
+require 'webrick/config'
+require 'webrick/log'
 
 module WEBrick
 
@@ -43,8 +44,14 @@ module WEBrick
     # block, if given.
 
     def Daemon.start
-      Process.daemon
-      File.umask(0)
+      exit!(0) if fork
+      Process::setsid
+      exit!(0) if fork
+      Dir::chdir("/")
+      File::umask(0)
+      STDIN.reopen(IO::NULL)
+      STDOUT.reopen(IO::NULL, "w")
+      STDERR.reopen(IO::NULL, "w")
       yield if block_given?
     end
   end
@@ -103,7 +110,7 @@ module WEBrick
       @shutdown_pipe = nil
       unless @config[:DoNotListen]
         if @config[:Listen]
-          warn(":Listen option is deprecated; use GenericServer#listen", uplevel: 1)
+          warn(":Listen option is deprecated; use GenericServer#listen")
         end
         listen(@config[:BindAddress], @config[:Port])
         if @config[:Port] == 0
@@ -157,17 +164,17 @@ module WEBrick
       server_type.start{
         @logger.info \
           "#{self.class}#start: pid=#{$$} port=#{@config[:Port]}"
-        @status = :Running
         call_callback(:StartCallback)
 
         shutdown_pipe = @shutdown_pipe
 
         thgroup = ThreadGroup.new
+        @status = :Running
         begin
           while @status == :Running
             begin
               sp = shutdown_pipe[0]
-              if svrs = IO.select([sp, *@listeners])
+              if svrs = IO.select([sp, *@listeners], nil, nil, 2.0)
                 if svrs[0].include? sp
                   # swallow shutdown pipe
                   buf = String.new
@@ -231,7 +238,7 @@ module WEBrick
     def shutdown
       stop
 
-      alarm_shutdown_pipe(&:close)
+      alarm_shutdown_pipe {|f| f.close}
     end
 
     ##
@@ -251,26 +258,18 @@ module WEBrick
     # the client socket.
 
     def accept_client(svr)
-      case sock = svr.to_io.accept_nonblock(exception: false)
-      when :wait_readable
-        nil
-      else
-        if svr.respond_to?(:start_immediately)
-          sock = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
-          sock.sync_close = true
-          # we cannot do OpenSSL::SSL::SSLSocket#accept here because
-          # a slow client can prevent us from accepting connections
-          # from other clients
-        end
-        sock
+      sock = nil
+      begin
+        sock = svr.accept
+        sock.sync = true
+        Utils::set_non_blocking(sock)
+      rescue Errno::ECONNRESET, Errno::ECONNABORTED,
+             Errno::EPROTO, Errno::EINVAL
+      rescue StandardError => ex
+        msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
+        @logger.error msg
       end
-    rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-           Errno::EPROTO, Errno::EINVAL
-      nil
-    rescue StandardError => ex
-      msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-      @logger.error msg
-      nil
+      return sock
     end
 
     ##
@@ -293,16 +292,6 @@ module WEBrick
             @logger.debug "accept: <address unknown>"
             raise
           end
-          if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately]
-            WEBrick::Utils.timeout(@config[:RequestTimeout]) do
-              begin
-                sock.accept # OpenSSL::SSL::SSLSocket#accept
-              rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-                     Errno::EPROTO, Errno::EINVAL
-                Thread.exit
-              end
-            end
-          end
           call_callback(:AcceptCallback, sock)
           block ? block.call(sock) : run(sock)
         rescue Errno::ENOTCONN
@@ -320,7 +309,7 @@ module WEBrick
           else
             @logger.debug "close: <address unknown>"
           end
-          sock.close
+          sock.close unless sock.closed?
         end
       }
     end
@@ -329,16 +318,29 @@ module WEBrick
     # Calls the callback +callback_name+ from the configuration with +args+
 
     def call_callback(callback_name, *args)
-      @config[callback_name]&.call(*args)
+      if cb = @config[callback_name]
+        cb.call(*args)
+      end
     end
 
     def setup_shutdown_pipe
-      return @shutdown_pipe ||= IO.pipe
+      if !@shutdown_pipe
+        @shutdown_pipe = IO.pipe
+      end
+      @shutdown_pipe
     end
 
     def cleanup_shutdown_pipe(shutdown_pipe)
       @shutdown_pipe = nil
-      shutdown_pipe&.each(&:close)
+      return if !shutdown_pipe
+      shutdown_pipe.each {|io|
+        if !io.closed?
+          begin
+            io.close
+          rescue IOError # another thread closed io.
+          end
+        end
+      }
     end
 
     def alarm_shutdown_pipe
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index d125083528..d626e149ec 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -48,8 +48,6 @@ module WEBrick
     #   Number of CA certificates to walk when verifying a certificate chain
     # :SSLVerifyCallback    ::
     #   Custom certificate verification callback
-    # :SSLServerNameCallback::
-    #   Custom servername indication callback
     # :SSLTimeout           ::
     #   Maximum session lifetime
     # :SSLOptions           ::
@@ -130,7 +128,7 @@ module WEBrick
       aki = ef.create_extension("authorityKeyIdentifier",
                                 "keyid:always,issuer:always")
       cert.add_extension(aki)
-      cert.sign(rsa, OpenSSL::Digest::SHA256.new)
+      cert.sign(rsa, OpenSSL::Digest::SHA1.new)
 
       return [ cert, rsa ]
     end
@@ -147,13 +145,7 @@ module WEBrick
     # SSL context for the server when run in SSL mode
 
     def ssl_context # :nodoc:
-      @ssl_context ||= begin
-        if @config[:SSLEnable]
-          ssl_context = setup_ssl_context(@config)
-          @logger.info("\n" + @config[:SSLCertificate].to_text)
-          ssl_context
-        end
-      end
+      @ssl_context ||= nil
     end
 
     undef listen
@@ -164,6 +156,10 @@ module WEBrick
     def listen(address, port) # :nodoc:
       listeners = Utils::create_listeners(address, port)
       if @config[:SSLEnable]
+        unless ssl_context
+          @ssl_context = setup_ssl_context(@config)
+          @logger.info("\n" + @config[:SSLCertificate].to_text)
+        end
         listeners.collect!{|svr|
           ssvr = ::OpenSSL::SSL::SSLServer.new(svr, ssl_context)
           ssvr.start_immediately = @config[:SSLStartImmediately]
@@ -181,7 +177,7 @@ module WEBrick
       unless config[:SSLCertificate]
         cn = config[:SSLCertName]
         comment = config[:SSLCertComment]
-        cert, key = Utils::create_self_signed_cert(2048, cn, comment)
+        cert, key = Utils::create_self_signed_cert(1024, cn, comment)
         config[:SSLCertificate] = cert
         config[:SSLPrivateKey] = key
       end
@@ -197,19 +193,10 @@ module WEBrick
       ctx.verify_mode = config[:SSLVerifyClient]
       ctx.verify_depth = config[:SSLVerifyDepth]
       ctx.verify_callback = config[:SSLVerifyCallback]
-      ctx.servername_cb = config[:SSLServerNameCallback] || proc { |args| ssl_servername_callback(*args) }
       ctx.timeout = config[:SSLTimeout]
       ctx.options = config[:SSLOptions]
       ctx.ciphers = config[:SSLCiphers]
       ctx
     end
-
-    ##
-    # ServerNameIndication callback
-
-    def ssl_servername_callback(sslsocket, hostname = nil)
-      # default
-    end
-
   end
 end
diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
index 07044876b9..eb3b907ecf 100644
--- a/lib/webrick/utils.rb
+++ b/lib/webrick/utils.rb
@@ -37,7 +37,7 @@ module WEBrick
         Process::Sys::setgid(pw.gid)
         Process::Sys::setuid(pw.uid)
       else
-        warn("WEBrick::Utils::su doesn't work on this platform", uplevel: 1)
+        warn("WEBrick::Utils::su doesn't work on this platform")
       end
     end
     module_function :su
@@ -91,6 +91,7 @@ module WEBrick
 
     ###########
 
+    require "thread"
     require "timeout"
     require "singleton"
 
@@ -133,8 +134,7 @@ module WEBrick
       # +time+:: Timeout in seconds
       # +exception+:: Exception to raise when timeout elapsed
       def TimeoutHandler.register(seconds, exception)
-        at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + seconds
-        instance.register(Thread.current, at, exception)
+        instance.register(Thread.current, Time.now + seconds, exception)
       end
 
       ##
@@ -163,7 +163,7 @@ module WEBrick
         def watch
           to_interrupt = []
           while true
-            now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            now = Time.now
             wakeup = nil
             to_interrupt.clear
             TimeoutMutex.synchronize{
diff --git a/lib/webrick/version.rb b/lib/webrick/version.rb
index ee6b415eef..da5dac94a9 100644
--- a/lib/webrick/version.rb
+++ b/lib/webrick/version.rb
@@ -14,5 +14,5 @@ module WEBrick
   ##
   # The WEBrick version
 
-  VERSION      = "1.4.2"
+  VERSION      = "1.3.1"
 end
diff --git a/lib/webrick/webrick.gemspec b/lib/webrick/webrick.gemspec
deleted file mode 100644
index 611ec138ce..0000000000
--- a/lib/webrick/webrick.gemspec
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'lib/webrick/version'
-rescue LoadError
-  # for Ruby core repository
-  require_relative 'version'
-end
-
-Gem::Specification.new do |s|
-  s.name = "webrick"
-  s.version = WEBrick::VERSION
-  s.summary = "HTTP server toolkit"
-  s.description = "WEBrick is an HTTP server toolkit that can be configured as an HTTPS server, a proxy server, and a virtual-host server."
-
-  s.require_path = %w{lib}
-  s.files =  ["lib/webrick.rb", "lib/webrick/accesslog.rb", "lib/webrick/cgi.rb", "lib/webrick/compat.rb", "lib/webrick/config.rb", "lib/webrick/cookie.rb", "lib/webrick/htmlutils.rb", "lib/webrick/httpauth.rb", "lib/webrick/httpauth/authenticator.rb", "lib/webrick/httpauth/basicauth.rb", "lib/webrick/httpauth/digestauth.rb", "lib/webrick/httpauth/htdigest.rb", "lib/webrick/httpauth/htgroup.rb", "lib/webrick/httpauth/htpasswd.rb", "lib/webrick/httpauth/userdb.rb", "lib/webrick/httpauth.rb", "lib/webrick/httpproxy.rb", "lib/webrick/httprequest.rb", "lib/webrick/httpresponse.rb", "lib/webrick/https.rb", "lib/webrick/httpserver.rb", "lib/webrick/httpservlet.rb", "lib/webrick/httpservlet/abstract.rb", "lib/webrick/httpservlet/cgi_runner.rb", "lib/webrick/httpservlet/cgihandler.rb", "lib/webrick/httpservlet/erbhandler.rb", "lib/webrick/httpservlet/filehandler.rb", "lib/webrick/httpservlet/prochandler.rb", "lib/webrick/httpservlet.rb", "lib/webrick/httpstatus.rb", "lib/webrick/httputils.rb", "lib/webrick/httpversion.rb", "lib/webrick/log.rb", "lib/webrick/server.rb", "lib/webrick/ssl.rb", "lib/webrick/utils.rb", "lib/webrick/version.rb"]
-  s.required_ruby_version = ">= 2.3.0"
-
-  s.authors = ["TAKAHASHI Masayoshi", "GOTOU YUUZOU", "Eric Wong"]
-  s.email = [nil, nil, 'normal@ruby-lang.org']
-  s.homepage = "https://www.ruby-lang.org"
-  s.license = "BSD-2-Clause"
-
-  if s.respond_to?(:metadata=)
-    s.metadata = {
-      "bug_tracker_uri" => "https://bugs.ruby-lang.org/projects/ruby-trunk/issues",
-      "homepage_uri" => "https://www.ruby-lang.org",
-      "source_code_uri" => "https://svn.ruby-lang.org/repos/ruby"
-    }
-  end
-
-  s.add_development_dependency "rake"
-end
diff --git a/lib/yaml.rb b/lib/yaml.rb
index e47e0a7f9b..0c33305e1d 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: false
+##
+# The YAML module is an alias of Psych, the YAML engine for Ruby.
 
 begin
   require 'psych'
 rescue LoadError
-  warn "It seems your ruby installation is missing psych (for YAML output).\n" \
-    "To eliminate this warning, please install libyaml and reinstall your ruby.\n",
-    uplevel: 1
+  warn "#{caller[0]}:"
+  warn "It seems your ruby installation is missing psych (for YAML output)."
+  warn "To eliminate this warning, please install libyaml and reinstall your ruby."
   raise
 end
 
@@ -15,7 +17,7 @@ YAML = Psych # :nodoc:
 #
 # This module provides a Ruby interface for data serialization in YAML format.
 #
-# The YAML module is an alias of Psych, the YAML engine for Ruby.
+# The underlying implementation is the libyaml wrapper Psych.
 #
 # == Usage
 #
@@ -29,9 +31,6 @@ YAML = Psych # :nodoc:
 #     YAML.dump("foo")     # => "--- foo\n...\n"
 #     { :a => 'b'}.to_yaml  # => "---\n:a: b\n"
 #
-# As the implementation is provided by the Psych library, detailed documentation
-# can be found in that library's docs (also part of standard library).
-#
 # == Security
 #
 # Do not use YAML to load untrusted data. Doing so is unsafe and could allow
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index 3c9b8817e4..57ef0ba500 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -40,28 +40,22 @@ class YAML::Store < PStore
 
   # :call-seq:
   #   initialize( file_name, yaml_opts = {} )
-  #   initialize( file_name, thread_safe = false, yaml_opts = {} )
   #
   # Creates a new YAML::Store object, which will store data in +file_name+.
   # If the file does not already exist, it will be created.
   #
-  # YAML::Store objects are always reentrant. But if _thread_safe_ is set to true,
-  # then it will become thread-safe at the cost of a minor performance hit.
   #
   # Options passed in through +yaml_opts+ will be used when converting the
   # store to YAML via Hash#to_yaml().
-  def initialize( *o )
-    @opt = {}
-    if o.last.is_a? Hash
-      @opt.update(o.pop)
-    end
-    super(*o)
+  def initialize file_name, yaml_opts = {}
+    @opt = yaml_opts
+    super
   end
 
   # :stopdoc:
 
   def dump(table)
-    table.to_yaml(@opt)
+    YAML.dump @table
   end
 
   def load(content)
@@ -77,10 +71,12 @@ class YAML::Store < PStore
     false
   end
 
+  EMPTY_MARSHAL_DATA = YAML.dump({})
+  EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
   def empty_marshal_data
-    {}.to_yaml(@opt)
+    EMPTY_MARSHAL_DATA
   end
   def empty_marshal_checksum
-    CHECKSUM_ALGO.digest(empty_marshal_data)
+    EMPTY_MARSHAL_CHECKSUM
   end
 end
diff --git a/libexec/bundle b/libexec/bundle
deleted file mode 100755
index aaf773745d..0000000000
--- a/libexec/bundle
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# Exit cleanly from an early interrupt
-Signal.trap("INT") do
-  Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
-  exit 1
-end
-
-require "bundler"
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
-end
-
-require "bundler/friendly_errors"
-Bundler.with_friendly_errors do
-  require "bundler/cli"
-
-  # Allow any command to use --help flag to show help for that command
-  help_flags = %w[--help -h]
-  help_flag_used = ARGV.any? {|a| help_flags.include? a }
-  args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
-
-  Bundler::CLI.start(args, :debug => true)
-end
diff --git a/libexec/bundle_ruby b/libexec/bundle_ruby
deleted file mode 100755
index df6f8cc8a1..0000000000
--- a/libexec/bundle_ruby
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/shared_helpers"
-
-Bundler::SharedHelpers.major_deprecation(2, "the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
-
-Signal.trap("INT") { exit 1 }
-
-require "bundler/errors"
-require "bundler/ruby_version"
-require "bundler/ruby_dsl"
-
-module Bundler
-  class Dsl
-    include RubyDsl
-
-    attr_accessor :ruby_version
-
-    def initialize
-      @ruby_version = nil
-    end
-
-    def eval_gemfile(gemfile, contents = nil)
-      contents ||= File.open(gemfile, "rb", &:read)
-      instance_eval(contents, gemfile.to_s, 1)
-    rescue SyntaxError => e
-      bt = e.message.split("\n")[1..-1]
-      raise GemfileError, ["Gemfile syntax error:", *bt].join("\n")
-    rescue ScriptError, RegexpError, NameError, ArgumentError => e
-      e.backtrace[0] = "#{e.backtrace[0]}: #{e.message} (#{e.class})"
-      STDERR.puts e.backtrace.join("\n       ")
-      raise GemfileError, "There was an error in your Gemfile," \
-        " and Bundler cannot continue."
-    end
-
-    def source(source, options = {})
-    end
-
-    def gem(name, *args)
-    end
-
-    def group(*args)
-    end
-  end
-end
-
-dsl = Bundler::Dsl.new
-begin
-  dsl.eval_gemfile(Bundler::SharedHelpers.default_gemfile)
-  ruby_version = dsl.ruby_version
-  if ruby_version
-    puts ruby_version
-  else
-    puts "No ruby version specified"
-  end
-rescue Bundler::GemfileError => e
-  puts e.message
-  exit(-1)
-end
diff --git a/libexec/bundler b/libexec/bundler
deleted file mode 100755
index d9131fe834..0000000000
--- a/libexec/bundler
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-load File.expand_path("../bundle", __FILE__)
diff --git a/libexec/irb b/libexec/irb
deleted file mode 100755
index c64ee85fbd..0000000000
--- a/libexec/irb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-#
-#   irb.rb - interactive ruby
-#   	$Release Version: 0.9.6 $
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "irb"
-
-IRB.start(__FILE__)
diff --git a/libexec/rdoc b/libexec/rdoc
deleted file mode 100755
index aaa23292df..0000000000
--- a/libexec/rdoc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
-
-require 'rdoc/rdoc'
-
-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"
-  end
-
-  exit 1
-end
-
diff --git a/libexec/ri b/libexec/ri
deleted file mode 100755
index 7fbed0c099..0000000000
--- a/libexec/ri
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
-
-require 'rdoc/ri/driver'
-
-RDoc::RI::Driver.run ARGV
diff --git a/load.c b/load.c
index 57a9c9c287..1ccd23878c 100644
--- a/load.c
+++ b/load.c
@@ -2,13 +2,11 @@
  * load methods from eval.c
  */
 
-#include "ruby/encoding.h"
-#include "ruby/util.h"
 #include "internal.h"
+#include "ruby/util.h"
 #include "dln.h"
 #include "eval_intern.h"
 #include "probes.h"
-#include "iseq.h"
 
 static VALUE ruby_dln_librefs;
 
@@ -87,8 +85,8 @@ rb_construct_expanded_load_path(enum expand_type type, int *has_relative, int *h
 	if (is_string)
 	    rb_str_freeze(path);
 	as_str = rb_get_path_check_convert(path, as_str, level);
-	expanded_path = rb_check_realpath(Qnil, as_str);
-	if (NIL_P(expanded_path)) expanded_path = as_str;
+	expanded_path = rb_file_expand_path_fast(as_str, Qnil);
+	rb_str_freeze(expanded_path);
 	rb_ary_push(ary, rb_fstring(expanded_path));
     }
     rb_obj_freeze(ary);
@@ -96,6 +94,15 @@ rb_construct_expanded_load_path(enum expand_type type, int *has_relative, int *h
     rb_ary_replace(vm->load_path_snapshot, vm->load_path);
 }
 
+static VALUE
+load_path_getcwd(void)
+{
+    char *cwd = my_getcwd();
+    VALUE cwd_str = rb_filesystem_str_new_cstr(cwd);
+    xfree(cwd);
+    return cwd_str;
+}
+
 VALUE
 rb_get_expanded_load_path(void)
 {
@@ -107,7 +114,7 @@ rb_get_expanded_load_path(void)
 	int has_relative = 0, has_non_cache = 0;
 	rb_construct_expanded_load_path(EXPAND_ALL, &has_relative, &has_non_cache);
 	if (has_relative) {
-	    vm->load_path_check_cache = rb_dir_getwd_ospath();
+	    vm->load_path_check_cache = load_path_getcwd();
 	}
 	else if (has_non_cache) {
 	    /* Non string object. */
@@ -125,7 +132,7 @@ rb_get_expanded_load_path(void)
     }
     else if (vm->load_path_check_cache) {
 	int has_relative = 1, has_non_cache = 1;
-	VALUE cwd = rb_dir_getwd_ospath();
+	VALUE cwd = load_path_getcwd();
 	if (!rb_str_equal(vm->load_path_check_cache, cwd)) {
 	    /* Current working directory or filesystem encoding was changed.
 	       Expand relative load path and non-cacheable objects again. */
@@ -173,27 +180,22 @@ get_loading_table(void)
     return GET_VM()->loading_table;
 }
 
-static st_data_t
-feature_key(const char *str, size_t len)
-{
-    return st_hash(str, len, 0xfea7009e);
-}
-
 static void
-features_index_add_single(const char* str, size_t len, VALUE offset)
+features_index_add_single(VALUE short_feature, VALUE offset)
 {
     struct st_table *features_index;
     VALUE this_feature_index = Qnil;
-    st_data_t short_feature_key;
+    char *short_feature_cstr;
 
     Check_Type(offset, T_FIXNUM);
-    short_feature_key = feature_key(str, len);
+    Check_Type(short_feature, T_STRING);
+    short_feature_cstr = StringValueCStr(short_feature);
 
     features_index = get_loaded_features_index_raw();
-    st_lookup(features_index, short_feature_key, (st_data_t *)&this_feature_index);
+    st_lookup(features_index, (st_data_t)short_feature_cstr, (st_data_t *)&this_feature_index);
 
     if (NIL_P(this_feature_index)) {
-	st_insert(features_index, short_feature_key, (st_data_t)offset);
+	st_insert(features_index, (st_data_t)ruby_strdup(short_feature_cstr), (st_data_t)offset);
     }
     else if (RB_TYPE_P(this_feature_index, T_FIXNUM)) {
 	VALUE feature_indexes[2];
@@ -202,7 +204,7 @@ features_index_add_single(const char* str, size_t len, VALUE offset)
 	this_feature_index = (VALUE)xcalloc(1, sizeof(struct RArray));
 	RBASIC(this_feature_index)->flags = T_ARRAY; /* fake VALUE, do not mark/sweep */
 	rb_ary_cat(this_feature_index, feature_indexes, numberof(feature_indexes));
-	st_insert(features_index, short_feature_key, (st_data_t)this_feature_index);
+	st_insert(features_index, (st_data_t)short_feature_cstr, (st_data_t)this_feature_index);
     }
     else {
 	Check_Type(this_feature_index, T_ARRAY);
@@ -221,35 +223,42 @@ features_index_add_single(const char* str, size_t len, VALUE offset)
 static void
 features_index_add(VALUE feature, VALUE offset)
 {
+    VALUE short_feature;
     const char *feature_str, *feature_end, *ext, *p;
 
     feature_str = StringValuePtr(feature);
     feature_end = feature_str + RSTRING_LEN(feature);
 
     for (ext = feature_end; ext > feature_str; ext--)
-	if (*ext == '.' || *ext == '/')
-	    break;
+      if (*ext == '.' || *ext == '/')
+	break;
     if (*ext != '.')
-	ext = NULL;
+      ext = NULL;
     /* Now `ext` points to the only string matching %r{^\.[^./]*$} that is
        at the end of `feature`, or is NULL if there is no such string. */
 
     p = ext ? ext : feature_end;
     while (1) {
+	long beg;
+
 	p--;
 	while (p >= feature_str && *p != '/')
 	    p--;
 	if (p < feature_str)
 	    break;
 	/* Now *p == '/'.  We reach this point for every '/' in `feature`. */
-	features_index_add_single(p + 1, feature_end - p - 1, offset);
+	beg = p + 1 - feature_str;
+	short_feature = rb_str_subseq(feature, beg, feature_end - p - 1);
+	features_index_add_single(short_feature, offset);
 	if (ext) {
-	    features_index_add_single(p + 1, ext - p - 1, offset);
+	    short_feature = rb_str_subseq(feature, beg, ext - p - 1);
+	    features_index_add_single(short_feature, offset);
 	}
     }
-    features_index_add_single(feature_str, feature_end - feature_str, offset);
+    features_index_add_single(feature, offset);
     if (ext) {
-	features_index_add_single(feature_str, ext - feature_str, offset);
+	short_feature = rb_str_subseq(feature, 0, ext - feature_str);
+	features_index_add_single(short_feature, offset);
     }
 }
 
@@ -259,8 +268,9 @@ loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg)
     VALUE obj = (VALUE)val;
     if (!SPECIAL_CONST_P(obj)) {
 	rb_ary_free(obj);
-	ruby_sized_xfree((void *)obj, sizeof(struct RArray));
+	xfree((void *)obj);
     }
+    xfree((char *)key);
     return ST_DELETE;
 }
 
@@ -373,7 +383,6 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
     long i, len, elen, n;
     st_table *loading_tbl, *features_index;
     st_data_t data;
-    st_data_t key;
     int type;
 
     if (fn) *fn = 0;
@@ -390,8 +399,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
     features = get_loaded_features();
     features_index = get_loaded_features_index();
 
-    key = feature_key(feature, strlen(feature));
-    st_lookup(features_index, key, (st_data_t *)&this_feature_index);
+    st_lookup(features_index, (st_data_t)feature, (st_data_t *)&this_feature_index);
     /* We search `features` for an entry such that either
          "#{features[i]}" == "#{load_path[j]}/#{feature}#{e}"
        for some j, or
@@ -563,23 +571,23 @@ rb_provide_feature(VALUE feature)
 void
 rb_provide(const char *feature)
 {
-    rb_provide_feature(rb_fstring_cstr(feature));
+    rb_provide_feature(rb_usascii_str_new2(feature));
 }
 
 NORETURN(static void load_failed(VALUE));
+const rb_iseq_t *rb_iseq_load_iseq(VALUE fname);
 
 static int
-rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
+rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap)
 {
-    enum ruby_tag_type state;
-    rb_thread_t *th = rb_ec_thread_ptr(ec);
+    int state;
     volatile VALUE wrapper = th->top_wrapper;
     volatile VALUE self = th->top_self;
 #if !defined __GNUC__
     rb_thread_t *volatile th0 = th;
 #endif
 
-    th->ec->errinfo = Qnil; /* ensure */
+    th->errinfo = Qnil; /* ensure */
 
     if (!wrap) {
 	th->top_wrapper = 0;
@@ -591,10 +599,10 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
 	rb_extend_object(th->top_self, th->top_wrapper);
     }
 
-    EC_PUSH_TAG(th->ec);
-    state = EC_EXEC_TAG();
-    if (state == TAG_NONE) {
-	rb_ast_t *ast;
+    TH_PUSH_TAG(th);
+    state = EXEC_TAG();
+    if (state == 0) {
+	NODE *node;
 	const rb_iseq_t *iseq;
 
 	if ((iseq = rb_iseq_load_iseq(fname)) != NULL) {
@@ -602,16 +610,13 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
 	}
 	else {
 	    VALUE parser = rb_parser_new();
-	    rb_parser_set_context(parser, NULL, FALSE);
-	    ast = (rb_ast_t *)rb_parser_load_file(parser, fname);
-	    iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"),
-			    fname, rb_realpath_internal(Qnil, fname, 1), NULL);
-	    rb_ast_dispose(ast);
+	    rb_parser_set_context(parser, NULL, TRUE);
+	    node = (NODE *)rb_parser_load_file(parser, fname);
+	    iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, rb_realpath_internal(Qnil, fname, 1), NULL);
 	}
-        rb_exec_event_hook_script_compiled(ec, iseq, Qnil);
-        rb_iseq_eval(iseq);
+	rb_iseq_eval(iseq);
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
 
 #if !defined __GNUC__
     th = th0;
@@ -621,15 +626,13 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
     th->top_wrapper = wrapper;
 
     if (state) {
-	/* usually state == TAG_RAISE only, except for
-	 * rb_iseq_load_iseq case */
 	VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef);
 	if (NIL_P(exc)) return state;
-	th->ec->errinfo = exc;
+	th->errinfo = exc;
 	return TAG_RAISE;
     }
 
-    if (!NIL_P(th->ec->errinfo)) {
+    if (!NIL_P(th->errinfo)) {
 	/* exception during load */
 	return TAG_RAISE;
     }
@@ -639,11 +642,11 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
 static void
 rb_load_internal(VALUE fname, int wrap)
 {
-    rb_execution_context_t *ec = GET_EC();
-    int state = rb_load_internal0(ec, fname, wrap);
+    rb_thread_t *curr_th = GET_THREAD();
+    int state = rb_load_internal0(curr_th, fname, wrap);
     if (state) {
-	if (state == TAG_RAISE) rb_exc_raise(ec->errinfo);
-	EC_JUMP_TAG(ec, state);
+	if (state == TAG_RAISE) rb_exc_raise(curr_th->errinfo);
+	TH_JUMP_TAG(curr_th, state);
     }
 }
 
@@ -662,19 +665,19 @@ rb_load(VALUE fname, int wrap)
 }
 
 void
-rb_load_protect(VALUE fname, int wrap, int *pstate)
+rb_load_protect(VALUE fname, int wrap, int *state)
 {
-    enum ruby_tag_type state;
+    int status;
     volatile VALUE path = 0;
 
-    EC_PUSH_TAG(GET_EC());
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    PUSH_TAG();
+    if ((status = EXEC_TAG()) == 0) {
 	path = file_to_load(fname);
     }
-    EC_POP_TAG();
-
-    if (state == TAG_NONE) state = rb_load_internal0(GET_EC(), path, wrap);
-    if (state != TAG_NONE) *pstate = state;
+    POP_TAG();
+    if (!status) status = rb_load_internal0(GET_THREAD(), path, wrap);
+    if (state)
+	*state = status;
 }
 
 /*
@@ -698,10 +701,10 @@ rb_f_load(int argc, VALUE *argv)
 
     rb_scan_args(argc, argv, "11", &fname, &wrap);
 
+    RUBY_DTRACE_HOOK(LOAD_ENTRY, StringValuePtr(fname));
+
     orig_fname = rb_get_path_check_to_string(fname, rb_safe_level());
     fname = rb_str_encode_ospath(orig_fname);
-    RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname));
-
     path = rb_find_file(fname);
     if (!path) {
 	if (!rb_file_load_ok(RSTRING_PTR(fname)))
@@ -710,7 +713,7 @@ rb_f_load(int argc, VALUE *argv)
     }
     rb_load_internal(path, RTEST(wrap));
 
-    RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname));
+    RUBY_DTRACE_HOOK(LOAD_RETURN, StringValuePtr(fname));
 
     return Qtrue;
 }
@@ -728,7 +731,7 @@ load_lock(const char *ftptr)
 	st_insert(loading_tbl, (st_data_t)ftptr, data);
 	return (char *)ftptr;
     }
-    else if (imemo_type_p(data, imemo_memo)) {
+    else if (RB_TYPE_P((VALUE)data, T_IMEMO) && imemo_type((VALUE)data) == imemo_memo) {
 	struct MEMO *memo = MEMO_CAST(data);
 	void (*init)(void) = (void (*)(void))memo->u3.func;
 	data = (st_data_t)rb_thread_shield_new();
@@ -737,12 +740,14 @@ load_lock(const char *ftptr)
 	return (char *)"";
     }
     if (RTEST(ruby_verbose)) {
-	VALUE warning = rb_warning_string("loading in progress, circular require considered harmful - %s", ftptr);
-	rb_backtrace_each(rb_str_append, warning);
-	rb_warning("%"PRIsVALUE, warning);
+	rb_warning("loading in progress, circular require considered harmful - %s", ftptr);
+	rb_backtrace_print_to(rb_stderr);
     }
     switch (rb_thread_shield_wait((VALUE)data)) {
       case Qfalse:
+	data = (st_data_t)ftptr;
+	st_insert(loading_tbl, data, (st_data_t)rb_thread_shield_new());
+	return 0;
       case Qnil:
 	return 0;
     }
@@ -754,12 +759,7 @@ release_thread_shield(st_data_t *key, st_data_t *value, st_data_t done, int exis
 {
     VALUE thread_shield = (VALUE)*value;
     if (!existing) return ST_STOP;
-    if (done) {
-	rb_thread_shield_destroy(thread_shield);
-	/* Delete the entry even if there are waiting threads, because they
-	 * won't load the file and won't delete the entry. */
-    }
-    else if (rb_thread_shield_release(thread_shield)) {
+    if (done ? rb_thread_shield_destroy(thread_shield) : rb_thread_shield_release(thread_shield)) {
 	/* still in-use */
 	return ST_CONTINUE;
     }
@@ -944,42 +944,6 @@ load_ext(VALUE path)
 }
 
 /*
- *  call-seq:
- *     RubyVM.resolve_feature_path(feature) -> [:rb or :so, path]
- *
- *  Identifies the file that will be loaded by "require(feature)".
- *  This API is experimental and just for internal.
- *
- *     RubyVM.resolve_feature_path("set")
- *       #=> [:rb, "/path/to/feature.rb"]
- */
-
-VALUE
-rb_resolve_feature_path(VALUE klass, VALUE fname)
-{
-    VALUE path;
-    int found;
-    VALUE sym;
-
-    fname = rb_get_path_check(fname, 0);
-    path = rb_str_encode_ospath(fname);
-    found = search_required(path, &path, 0);
-
-    switch (found) {
-      case 'r':
-        sym = ID2SYM(rb_intern("rb"));
-        break;
-      case 's':
-        sym = ID2SYM(rb_intern("so"));
-        break;
-      default:
-        load_failed(fname);
-    }
-
-    return rb_ary_new_from_args(2, sym, path);
-}
-
-/*
  * returns
  *  0: if already loaded (false)
  *  1: successfully loaded (true)
@@ -990,33 +954,35 @@ int
 rb_require_internal(VALUE fname, int safe)
 {
     volatile int result = -1;
-    rb_execution_context_t *ec = GET_EC();
-    volatile VALUE errinfo = ec->errinfo;
-    enum ruby_tag_type state;
+    rb_thread_t *th = GET_THREAD();
+    volatile VALUE errinfo = th->errinfo;
+    int state;
     struct {
 	int safe;
     } volatile saved;
     char *volatile ftptr = 0;
-    VALUE path;
 
-    fname = rb_get_path_check(fname, safe);
-    path = rb_str_encode_ospath(fname);
-    RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname));
+    RUBY_DTRACE_HOOK(REQUIRE_ENTRY, StringValuePtr(fname));
 
-    EC_PUSH_TAG(ec);
+    TH_PUSH_TAG(th);
     saved.safe = rb_safe_level();
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    if ((state = EXEC_TAG()) == 0) {
+	VALUE path;
 	long handle;
 	int found;
 
+	rb_set_safe_level_force(safe);
+	FilePathValue(fname);
 	rb_set_safe_level_force(0);
 
-	RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname));
+	RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, StringValuePtr(fname));
+
+	path = rb_str_encode_ospath(fname);
 	found = search_required(path, &path, safe);
-	RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname));
 
+	RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, StringValuePtr(fname));
 	if (found) {
-	    if (!path || !(path = rb_fstring(path), ftptr = load_lock(RSTRING_PTR(path)))) {
+	    if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
 		result = 0;
 	    }
 	    else if (!*ftptr) {
@@ -1026,7 +992,7 @@ rb_require_internal(VALUE fname, int safe)
 	    else {
 		switch (found) {
 		  case 'r':
-		    state = rb_load_internal0(ec, path, 0);
+		    state = rb_load_internal0(th, path, 0);
 		    break;
 
 		  case 's':
@@ -1042,19 +1008,18 @@ rb_require_internal(VALUE fname, int safe)
 	    }
 	}
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
     load_unlock(ftptr, !state);
 
     rb_set_safe_level_force(saved.safe);
     if (state) {
-	RB_GC_GUARD(fname);
 	/* never TAG_RETURN */
 	return state;
     }
 
-    ec->errinfo = errinfo;
+    th->errinfo = errinfo;
 
-    RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname));
+    RUBY_DTRACE_HOOK(REQUIRE_RETURN, StringValuePtr(fname));
 
     return result;
 }
@@ -1075,8 +1040,7 @@ rb_require_safe(VALUE fname, int safe)
     int result = rb_require_internal(fname, safe);
 
     if (result > TAG_RETURN) {
-	if (result == TAG_RAISE) rb_exc_raise(rb_errinfo());
-	EC_JUMP_TAG(GET_EC(), result);
+	JUMP_TAG(result);
     }
     if (result < 0) {
 	load_failed(fname);
@@ -1088,7 +1052,8 @@ rb_require_safe(VALUE fname, int safe)
 VALUE
 rb_require(const char *fname)
 {
-    VALUE fn = rb_str_new_cstr(fname);
+    VALUE fn = rb_str_new2(fname);
+    OBJ_FREEZE(fn);
     return rb_require_safe(fn, rb_safe_level());
 }
 
@@ -1228,7 +1193,7 @@ Init_load(void)
     rb_define_virtual_variable("$LOADED_FEATURES", get_loaded_features, 0);
     vm->loaded_features = rb_ary_new();
     vm->loaded_features_snapshot = rb_ary_tmp_new(0);
-    vm->loaded_features_index = st_init_numtable();
+    vm->loaded_features_index = st_init_strtable();
 
     rb_define_global_function("load", rb_f_load, -1);
     rb_define_global_function("require", rb_f_require, 1);
diff --git a/loadpath.c b/loadpath.c
index b8969e6998..9160031971 100644
--- a/loadpath.c
+++ b/loadpath.c
@@ -89,3 +89,4 @@ const char ruby_initial_load_paths[] =
     RUBY_ARCH_LIB_FOR(RUBY_ARCH) "\0"
 #endif
     "";
+
diff --git a/localeinit.c b/localeinit.c
index bec29a6d46..eeec9adac6 100644
--- a/localeinit.c
+++ b/localeinit.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
 #include "internal.h"
 #include "encindex.h"
 #ifdef __CYGWIN__
@@ -22,45 +21,35 @@
 #if defined _WIN32 || defined __CYGWIN__
 #define SIZEOF_CP_NAME ((sizeof(UINT) * 8 / 3) + 4)
 #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage))
-
-extern UINT ruby_w32_codepage[2];
-#endif
-
-#ifndef NO_LOCALE_CHARMAP
-# if defined _WIN32 || defined __CYGWIN__ || defined HAVE_LANGINFO_H
-#   define NO_LOCALE_CHARMAP 0
-# else
-#   define NO_LOCALE_CHARMAP 1
-# endif
 #endif
 
-#if !NO_LOCALE_CHARMAP
 static VALUE
 locale_charmap(VALUE (*conv)(const char *))
 {
+#if defined NO_LOCALE_CHARMAP
+# error NO_LOCALE_CHARMAP defined
+#elif defined _WIN32 || defined __CYGWIN__
     const char *codeset = 0;
-#if defined _WIN32 || defined __CYGWIN__
     char cp[SIZEOF_CP_NAME];
 # ifdef __CYGWIN__
     const char *nl_langinfo_codeset(void);
     codeset = nl_langinfo_codeset();
 # endif
     if (!codeset) {
-	UINT codepage = ruby_w32_codepage[0];
-	if (!codepage) codepage = GetConsoleCP();
+	UINT codepage = GetConsoleCP();
 	if (!codepage) codepage = GetACP();
 	CP_FORMAT(cp, codepage);
 	codeset = cp;
     }
+    return (*conv)(codeset);
 #elif defined HAVE_LANGINFO_H
+    char *codeset;
     codeset = nl_langinfo(CODESET);
-    ASSUME(codeset);
+    return (*conv)(codeset);
 #else
-# error locale_charmap() is not implemented
+    return ENCINDEX_US_ASCII;
 #endif
-    return (*conv)(codeset);
 }
-#endif
 
 /*
  * call-seq:
@@ -90,42 +79,30 @@ locale_charmap(VALUE (*conv)(const char *))
 VALUE
 rb_locale_charmap(VALUE klass)
 {
-#if NO_LOCALE_CHARMAP
-    return rb_usascii_str_new_cstr("US-ASCII");
-#else
     return locale_charmap(rb_usascii_str_new_cstr);
-#endif
 }
 
-#if !NO_LOCALE_CHARMAP
 static VALUE
 enc_find_index(const char *name)
 {
     return (VALUE)rb_enc_find_index(name);
 }
-#endif
 
 int
 rb_locale_charmap_index(void)
 {
-#if NO_LOCALE_CHARMAP
-    return ENCINDEX_US_ASCII;
-#else
     return (int)locale_charmap(enc_find_index);
-#endif
 }
 
 int
 Init_enc_set_filesystem_encoding(void)
 {
     int idx;
-#if NO_LOCALE_CHARMAP
-    idx = ENCINDEX_US_ASCII;
+#if defined NO_LOCALE_CHARMAP
+# error NO_LOCALE_CHARMAP defined
 #elif defined _WIN32
     char cp[SIZEOF_CP_NAME];
-    const UINT codepage = ruby_w32_codepage[1] ? ruby_w32_codepage[1] :
-	AreFileApisANSI() ? GetACP() : GetOEMCP();
-    CP_FORMAT(cp, codepage);
+    CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP());
     idx = rb_enc_find_index(cp);
     if (idx < 0) idx = ENCINDEX_ASCII;
 #elif defined __CYGWIN__
diff --git a/main.c b/main.c
index 6e8ab7b9fe..16da117732 100644
--- a/main.c
+++ b/main.c
@@ -15,12 +15,6 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
-#if RUBY_DEVEL && !defined RUBY_DEBUG_ENV
-# define RUBY_DEBUG_ENV 1
-#endif
-#if defined RUBY_DEBUG_ENV && !RUBY_DEBUG_ENV
-# undef RUBY_DEBUG_ENV
-#endif
 #ifdef RUBY_DEBUG_ENV
 #include <stdlib.h>
 #endif
diff --git a/man/bundle-add.1 b/man/bundle-add.1
deleted file mode 100644
index 3adf3e8163..0000000000
--- a/man/bundle-add.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-ADD" "1" "November 2018" "" ""
-.
-.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] [\-\-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\-\-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/man/bundle-add.1.txt b/man/bundle-add.1.txt
deleted file mode 100644
index 653a166044..0000000000
--- a/man/bundle-add.1.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-BUNDLE-ADD(1)							 BUNDLE-ADD(1)
-
-
-
-1mNAME0m
-       1mbundle-add 22m- Add gem to the Gemfile and run bundle install
-
-1mSYNOPSIS0m
-       1mbundle     add     4m22mGEM_NAME24m	 [--group=GROUP]     [--version=VERSION]
-       [--source=SOURCE] [--skip-install] [--strict] [--optimistic]
-
-1mDESCRIPTION0m
-       Adds the named gem to  the  Gemfile  and  run  1mbundle	install22m.  1mbundle0m
-       1minstall 22mcan be avoided by using the flag 1m--skip-install22m.
-
-       Example:
-
-       bundle add rails
-
-       bundle add rails --version "< 3.0, > 1.1"
-
-       bundle  add  rails  --version  "~>  5.0.0" --source "https://gems.exam-
-       ple.com" --group "development"
-
-       bundle add rails --skip-install
-
-       bundle add rails --group "development, test"
-
-1mOPTIONS0m
-       1m--version22m, 1m-v0m
-	      Specify version requirements(s) for the added gem.
-
-       1m--group22m, 1m-g0m
-	      Specify the group(s) for the added gem. Multiple	groups	should
-	      be separated by commas.
-
-       1m--source22m, , 1m-s0m
-	      Specify the source for the added gem.
-
-       1m--skip-install0m
-	      Adds the gem to the Gemfile but does not install it.
-
-       1m--optimistic0m
-	      Adds optimistic declaration of version
-
-       1m--strict0m
-	      Adds strict declaration of version
-
-
-
-
-				 November 2018			 BUNDLE-ADD(1)
diff --git a/man/bundle-add.ronn b/man/bundle-add.ronn
deleted file mode 100644
index 1e2d732ec6..0000000000
--- a/man/bundle-add.ronn
+++ /dev/null
@@ -1,40 +0,0 @@
-bundle-add(1) -- Add gem to the Gemfile and run bundle install
-================================================================
-
-## SYNOPSIS
-
-`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--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.
-
-* `--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/man/bundle-binstubs.1 b/man/bundle-binstubs.1
deleted file mode 100644
index 583ab83abc..0000000000
--- a/man/bundle-binstubs.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-BINSTUBS" "1" "November 2018" "" ""
-.
-.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 by 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\')
-.
-.SH "BUNDLE INSTALL \-\-BINSTUBS"
-To create binstubs for all the gems in the bundle you can use the \fB\-\-binstubs\fR flag in bundle install(1) \fIbundle\-install\.1\.html\fR\.
diff --git a/man/bundle-binstubs.1.txt b/man/bundle-binstubs.1.txt
deleted file mode 100644
index f15a875e2d..0000000000
--- a/man/bundle-binstubs.1.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-BUNDLE-BINSTUBS(1)					    BUNDLE-BINSTUBS(1)
-
-
-
-1mNAME0m
-       1mbundle-binstubs 22m- Install the binstubs of the listed gems
-
-1mSYNOPSIS0m
-       1mbundle binstubs 4m22mGEM_NAME24m [--force] [--path PATH] [--standalone]
-
-1mDESCRIPTION0m
-       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  1mbin/22m. Binstubs are a shortcut-or alternative- to always
-       using 1mbundle exec22m. This gives you a file that can by run directly,	and
-       one  that  will always run the correct gem version used by the applica-
-       tion.
-
-       For example, if you run 1mbundle binstubs rspec-core22m, Bundler will create
-       the file 1mbin/rspec22m. 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  1mGEM_NAME22m.  Binstubs
-       are  put into 1mbin22m, or the 1m--path 22mdirectory if one has been set. Calling
-       binstubs with [GEM [GEM]] will create binstubs for all given gems.
-
-1mOPTIONS0m
-       1m--force0m
-	      Overwrite existing binstubs if they exist.
-
-       1m--path 22mThe location to install the specified binstubs to. This defaults
-	      to 1mbin22m.
-
-       1m--standalone0m
-	      Makes  binstubs  that  can work without depending on Rubygems or
-	      Bundler at runtime.
-
-       1m--shebang0m
-	      Specify a different shebang executable  name  than  the  default
-	      (default 'ruby')
-
-1mBUNDLE INSTALL --BINSTUBS0m
-       To  create  binstubs  for  all  the  gems in the bundle you can use the
-       1m--binstubs 22mflag in bundle install(1) 4mbundle-install.1.html24m.
-
-
-
-				 November 2018		    BUNDLE-BINSTUBS(1)
diff --git a/man/bundle-binstubs.ronn b/man/bundle-binstubs.ronn
deleted file mode 100644
index c1ae0988cd..0000000000
--- a/man/bundle-binstubs.ronn
+++ /dev/null
@@ -1,43 +0,0 @@
-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 by 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')
-
-## BUNDLE INSTALL --BINSTUBS
-
-To create binstubs for all the gems in the bundle you can use the `--binstubs`
-flag in [bundle install(1)](bundle-install.1.html).
diff --git a/man/bundle-check.1 b/man/bundle-check.1
deleted file mode 100644
index 35431972d5..0000000000
--- a/man/bundle-check.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CHECK" "1" "November 2018" "" ""
-.
-.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/man/bundle-check.1.txt b/man/bundle-check.1.txt
deleted file mode 100644
index 20cfe26446..0000000000
--- a/man/bundle-check.1.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-BUNDLE-CHECK(1) 					       BUNDLE-CHECK(1)
-
-
-
-1mNAME0m
-       1mbundle-check 22m- Verifies if dependencies are satisfied by installed gems
-
-1mSYNOPSIS0m
-       1mbundle check 22m[--dry-run] [--gemfile=FILE] [--path=PATH]
-
-1mDESCRIPTION0m
-       1mcheck	22msearches 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.
-
-1mOPTIONS0m
-       1m--dry-run0m
-	      Locks the [1mGemfile(5)22m][Gemfile(5)] before running the command.
-
-       1m--gemfile0m
-	      Use  the	specified  gemfile  instead  of  the [1mGemfile(5)22m][Gem-
-	      file(5)].
-
-       1m--path 22mSpecify a different path than the system  default  (1m$BUNDLE_PATH0m
-	      or  1m$GEM_HOME22m).  Bundler  will  remember  this  value for future
-	      installs on this machine.
-
-
-
-
-				 November 2018		       BUNDLE-CHECK(1)
diff --git a/man/bundle-check.ronn b/man/bundle-check.ronn
deleted file mode 100644
index f2846b8ff2..0000000000
--- a/man/bundle-check.ronn
+++ /dev/null
@@ -1,26 +0,0 @@
-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/man/bundle-clean.1 b/man/bundle-clean.1
deleted file mode 100644
index 681f41effc..0000000000
--- a/man/bundle-clean.1
+++ /dev/null
@@ -1,24 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CLEAN" "1" "November 2018" "" ""
-.
-.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/man/bundle-clean.1.txt b/man/bundle-clean.1.txt
deleted file mode 100644
index f4b507db65..0000000000
--- a/man/bundle-clean.1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-BUNDLE-CLEAN(1) 					       BUNDLE-CLEAN(1)
-
-
-
-1mNAME0m
-       1mbundle-clean 22m- Cleans up unused gems in your bundler directory
-
-1mSYNOPSIS0m
-       1mbundle clean 22m[--dry-run] [--force]
-
-1mDESCRIPTION0m
-       This  command  will  remove  all unused gems in your bundler directory.
-       This is useful when you have made many changes to  your	gem  dependen-
-       cies.
-
-1mOPTIONS0m
-       1m--dry-run0m
-	      Print the changes, but do not clean the unused gems.
-
-       1m--force0m
-	      Force a clean even if 1m--path 22mis not set.
-
-
-
-
-				 November 2018		       BUNDLE-CLEAN(1)
diff --git a/man/bundle-clean.ronn b/man/bundle-clean.ronn
deleted file mode 100644
index de23991782..0000000000
--- a/man/bundle-clean.ronn
+++ /dev/null
@@ -1,18 +0,0 @@
-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/man/bundle-config.1 b/man/bundle-config.1
deleted file mode 100644
index 80ef0c0715..0000000000
--- a/man/bundle-config.1
+++ /dev/null
@@ -1,497 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CONFIG" "1" "December 2018" "" ""
-.
-.SH "NAME"
-\fBbundle\-config\fR \- Set bundler configuration options
-.
-.SH "SYNOPSIS"
-\fBbundle config\fR [\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 (\fBapp/\.bundle/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\fR with no parameters will print a list of all bundler configuration for the current bundle, and where that configuration was set\.
-.
-.P
-Executing \fBbundle config <name>\fR will print the value of that configuration setting, and where it was set\.
-.
-.P
-Executing \fBbundle config <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 \-\-global <name> <value>\fR works the same as above\.
-.
-.P
-Executing \fBbundle config \-\-local <name> <value>\fR will set that configuration to the local application\. The configuration will be stored in \fBapp/\.bundle/config\fR\.
-.
-.P
-Executing \fBbundle config \-\-delete <name>\fR will delete the configuration in both local and global sources\. Not compatible with \-\-global or \-\-local flag\.
-.
-.P
-Executing bundle with the \fBBUNDLE_IGNORE_CONFIG\fR environment variable set will cause it to ignore all configuration\.
-.
-.P
-Executing \fBbundle config disable_multisource true\fR upgrades the warning about the Gemfile containing multiple primary sources to an error\. Executing \fBbundle config \-\-delete disable_multisource\fR downgrades this error to a warning\.
-.
-.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 not remembered between commands\. If these options must be remembered,they must be set using \fBbundle config\fR (e\.g\., \fBbundle config 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 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_bundler_dependency_conflicts\fR (\fBBUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS\fR): Allow resolving to specifications that have dependencies on \fBbundler\fR that are incompatible with the running Bundler version\.
-.
-.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\.
-.
-.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/bundle\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_multisource\fR (\fBBUNDLE_DISABLE_MULTISOURCE\fR): When set, Gemfiles containing multiple sources will produce errors instead of warnings\. Use \fBbundle config \-\-delete disable_multisource\fR to unset\.
-.
-.IP "\(bu" 4
-\fBdisable_platform_warnings\fR (\fBBUNDLE_DISABLE_PLATFORM_WARNINGS\fR): Disable warnings during bundle install when a dependency is unused on the current platform\.
-.
-.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
-\fBerror_on_stderr\fR (\fBBUNDLE_ERROR_ON_STDERR\fR): Print Bundler errors to stderr\.
-.
-.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\.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
-\fBglobal_path_appends_ruby_scope\fR (\fBBUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE\fR): Whether Bundler should append the Ruby scope (e\.g\. engine and ABI version) to a globally\-configured path\.
-.
-.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\.
-.
-.IP "\(bu" 4
-\fBlist_command\fR (\fBBUNDLE_LIST_COMMAND\fR) Enable new list command feature
-.
-.IP "\(bu" 4
-\fBmajor_deprecations\fR (\fBBUNDLE_MAJOR_DEPRECATIONS\fR): Whether Bundler should print deprecation warnings for behavior that will be changed in the next major version\.
-.
-.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
-\fBonly_update_to_newer_versions\fR (\fBBUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS\fR): During \fBbundle update\fR, only resolve to newer versions of the gems in the lockfile\.
-.
-.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 (\fBPATH_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_gems_rb\fR (\fBBUNDLE_PREFER_GEMS_RB\fR) Prefer \fBgems\.rb\fR to \fBGemfile\fR when Bundler is searching for a Gemfile\.
-.
-.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_root_warning\fR (\fBBUNDLE_SILENCE_ROOT_WARNING\fR): Silence the warning Bundler prints when installing gems as root\.
-.
-.IP "\(bu" 4
-\fBskip_default_git_sources\fR (\fBBUNDLE_SKIP_DEFAULT_GIT_SOURCES\fR): Whether Bundler should skip adding default git source shortcuts to the Gemfile DSL\.
-.
-.IP "\(bu" 4
-\fBspecific_platform\fR (\fBBUNDLE_SPECIFIC_PLATFORM\fR): Allow bundler to resolve for the specific running platform and store it in the lockfile, instead of only using a generic platform\. A specific platform is the exact platform triple reported by \fBGem::Platform\.local\fR, such as \fBx86_64\-darwin\-16\fR or \fBuniversal\-java\-1\.8\fR\. On the other hand, generic platforms are those such as \fBruby\fR, \fBmswin\fR, or \fBjava\fR\. In this example, \fBx86_64\-darwin\-16\fR would map to \fBruby\fR and \fBuniversal\-java\-1\.8\fR to \fBjava\fR\.
-.
-.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
-\fBunlock_source_unlocks_spec\fR (\fBBUNDLE_UNLOCK_SOURCE_UNLOCKS_SPEC\fR): Whether running \fBbundle update \-\-source NAME\fR unlocks a gem with the given name\. Defaults to \fBtrue\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 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 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 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 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 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 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 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 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 https://github\.com/bundler/bundler\.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
-.
-.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/man/bundle-config.1.txt b/man/bundle-config.1.txt
deleted file mode 100644
index f8f421c3db..0000000000
--- a/man/bundle-config.1.txt
+++ /dev/null
@@ -1,529 +0,0 @@
-BUNDLE-CONFIG(1)					      BUNDLE-CONFIG(1)
-
-
-
-1mNAME0m
-       1mbundle-config 22m- Set bundler configuration options
-
-1mSYNOPSIS0m
-       1mbundle config 22m[4mname24m [4mvalue24m]]
-
-1mDESCRIPTION0m
-       This  command  allows you to interact with Bundler's configuration sys-
-       tem.
-
-       Bundler loads configuration settings in this order:
-
-       1.  Local config (1mapp/.bundle/config22m)
-
-       2.  Environmental variables (1mENV22m)
-
-       3.  Global config (1m~/.bundle/config22m)
-
-       4.  Bundler default config
-
-
-
-       Executing 1mbundle config 22mwith no parameters will print  a  list  of	all
-       bundler configuration for the current bundle, and where that configura-
-       tion was set.
-
-       Executing 1mbundle config <name> 22mwill print the value of that  configura-
-       tion setting, and where it was set.
-
-       Executing  1mbundle  config <name> <value> 22mwill set that configuration to
-       the value specified for all bundles executed as the current  user.  The
-       configuration  will  be	stored in 1m~/.bundle/config22m. If 4mname24m already is
-       set, 4mname24m will be overridden and user will be warned.
-
-       Executing 1mbundle config --global  <name>  <value>  22mworks  the  same  as
-       above.
-
-       Executing 1mbundle config --local <name> <value> 22mwill set that configura-
-       tion to the local application. The  configuration  will	be  stored  in
-       1mapp/.bundle/config22m.
-
-       Executing  1mbundle  config --delete <name> 22mwill delete the configuration
-       in both local and global  sources.  Not	compatible  with  --global  or
-       --local flag.
-
-       Executing bundle with the 1mBUNDLE_IGNORE_CONFIG 22menvironment variable set
-       will cause it to ignore all configuration.
-
-       Executing 1mbundle config disable_multisource true 22mupgrades  the  warning
-       about the Gemfile containing multiple primary sources to an error. Exe-
-       cuting 1mbundle config --delete disable_multisource 22mdowngrades this error
-       to a warning.
-
-1mREMEMBERING OPTIONS0m
-       Flags  passed  to 1mbundle install 22mor the Bundler runtime, such as 1m--path0m
-       1mfoo 22mor 1m--without production22m, are not remembered  between  commands.  If
-       these  options  must be remembered,they must be set using 1mbundle config0m
-       (e.g., 1mbundle config path foo22m).
-
-       The options that can be configured are:
-
-       1mbin	22mCreates a directory (defaults to 1m~/bin22m) and place  any	executa-
-	      bles from the gem there. These executables run in Bundler's con-
-	      text. If used, you might add this  directory  to	your  environ-
-	      ment's  1mPATH 22mvariable. For instance, if the 1mrails 22mgem comes with
-	      a 1mrails 22mexecutable, this flag will create a 1mbin/rails 22mexecutable
-	      that  ensures  that  all	referred dependencies will be resolved
-	      using the bundled gems.
-
-       1mdeployment0m
-	      In deployment mode, Bundler will 'roll-out' the bundle for  1mpro-0m
-	      1mduction  22muse.  Please  check  carefully if you want to have this
-	      option enabled in 1mdevelopment 22mor 1mtest 22menvironments.
-
-       1mpath	22mThe location to install the specified gems to. This defaults  to
-	      Rubygems'  setting.  Bundler shares this location with Rubygems,
-	      1mgem install ... 22mwill have gem installed there,  too.  Therefore,
-	      gems  installed  without	a  1m--path  ... 22msetting will show up by
-	      calling 1mgem list22m. Accordingly, gems installed to other locations
-	      will not get listed.
-
-       1mwithout0m
-	      A space-separated list of groups referencing gems to skip during
-	      installation.
-
-       1mwith	22mA space-separated list of groups  referencing  gems	to  include
-	      during installation.
-
-1mBUILD OPTIONS0m
-       You  can use 1mbundle config 22mto give Bundler the flags to pass to the gem
-       installer every time bundler tries to install a particular gem.
-
-       A very common example, the 1mmysql 22mgem, requires Snow  Leopard  users  to
-       pass  configuration  flags  to 1mgem install 22mto specify where to find the
-       1mmysql_config 22mexecutable.
-
-
-
-	   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 build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
-
-
-
-       After  running  this  command,  every time bundler needs to install the
-       1mmysql 22mgem, it will pass along the flags you specified.
-
-1mCONFIGURATION KEYS0m
-       Configuration keys in bundler have two forms: the  canonical  form  and
-       the environment variable form.
-
-       For  instance,  passing	the  1m--without  22mflag to bundle install(1) 4mbun-0m
-       4mdle-install.1.html24m prevents  Bundler  from	installing  certain  groups
-       specified  in  the Gemfile(5). Bundler persists this value in 1mapp/.bun-0m
-       1mdle/config 22mso that calls to 1mBundler.setup 22mdo not try to find gems  from
-       the  1mGemfile 22mthat you didn't install. Additionally, subsequent calls to
-       bundle install(1) 4mbundle-install.1.html24m remember this setting and  skip
-       those groups.
-
-       The  canonical  form of this configuration is 1m"without"22m. To convert the
-       canonical form to the environment variable  form,  capitalize  it,  and
-       prepend	1mBUNDLE_22m.  The  environment  variable form of 1m"without" 22mis 1mBUN-0m
-       1mDLE_WITHOUT22m.
-
-       Any periods in the configuration keys must be replaced with two	under-
-       scores when setting it via environment variables. The configuration key
-       1mlocal.rack 22mbecomes the environment variable 1mBUNDLE_LOCAL__RACK22m.
-
-1mLIST OF AVAILABLE KEYS0m
-       The following is a list of all configuration keys  and  their  purpose.
-       You  can  learn	more  about  their operation in bundle install(1) 4mbun-0m
-       4mdle-install.1.html24m.
-
-       o   1mallow_bundler_dependency_conflicts     22m(1mBUNDLE_ALLOW_BUNDLER_DEPEN-0m
-	   1mDENCY_CONFLICTS22m):  Allow  resolving  to  specifications  that  have
-	   dependencies on 1mbundler 22mthat  are  incompatible  with  the  running
-	   Bundler version.
-
-       o   1mallow_deployment_source_credential_changes    22m(1mBUNDLE_ALLOW_DEPLOY-0m
-	   1mMENT_SOURCE_CREDENTIAL_CHANGES22m): When  in  deployment  mode,  allow
-	   changing    the    credentials    to    a	gem's	 source.   Ex:
-	   1mhttps://some.host.com/gems/path/	  22m->     1mhttps://user_name:pass-0m
-	   1mword@some.host.com/gems/path0m
-
-       o   1mallow_offline_install 22m(1mBUNDLE_ALLOW_OFFLINE_INSTALL22m): Allow Bundler
-	   to use cached data when installing without network access.
-
-       o   1mauto_clean_without_path 22m(1mBUNDLE_AUTO_CLEAN_WITHOUT_PATH22m): Automati-
-	   cally  run  1mbundle clean 22mafter installing when an explicit 1mpath 22mhas
-	   not been set and Bundler is not installing into the system gems.
-
-       o   1mauto_install  22m(1mBUNDLE_AUTO_INSTALL22m):   Automatically   run   1mbundle0m
-	   1minstall 22mwhen gems are missing.
-
-       o   1mbin  22m(1mBUNDLE_BIN22m):  Install  executables from gems in the bundle to
-	   the specified directory. Defaults to 1mfalse22m.
-
-       o   1mcache_all 22m(1mBUNDLE_CACHE_ALL22m): Cache all gems,  including  path  and
-	   git gems.
-
-       o   1mcache_all_platforms  22m(1mBUNDLE_CACHE_ALL_PLATFORMS22m):  Cache	gems for
-	   all platforms.
-
-       o   1mcache_path 22m(1mBUNDLE_CACHE_PATH22m): The  directory  that  bundler  will
-	   place  cached gems in when running 1mbundle package22m, and that bundler
-	   will look in when installing gems. Defaults to 1mvendor/bundle22m.
-
-       o   1mclean 22m(1mBUNDLE_CLEAN22m): Whether Bundler should run 1mbundle clean 22mauto-
-	   matically after 1mbundle install22m.
-
-       o   1mconsole  22m(1mBUNDLE_CONSOLE22m):  The console that 1mbundle console 22mstarts.
-	   Defaults to 1mirb22m.
-
-       o   1mdefault_install_uses_path	     22m(1mBUNDLE_DEFAULT_INSTALL_USES_PATH22m):
-	   Whether  a  1mbundle  install  22mwithout  an  explicit  1m--path 22margument
-	   defaults to installing gems in 1m.bundle22m.
-
-       o   1mdeployment 22m(1mBUNDLE_DEPLOYMENT22m): Disallow changes  to  the	1mGemfile22m.
-	   When  the 1mGemfile 22mis changed and the lockfile has not been updated,
-	   running Bundler commands will be blocked.
-
-       o   1mdisable_checksum_validation   22m(1mBUNDLE_DISABLE_CHECKSUM_VALIDATION22m):
-	   Allow  installing  gems even if they do not match the checksum pro-
-	   vided by RubyGems.
-
-       o   1mdisable_exec_load	22m(1mBUNDLE_DISABLE_EXEC_LOAD22m):  Stop  Bundler  from
-	   using 1mload 22mto launch an executable in-process in 1mbundle exec22m.
-
-       o   1mdisable_local_branch_check     22m(1mBUNDLE_DISABLE_LOCAL_BRANCH_CHECK22m):
-	   Allow Bundler to use a local git override without a	branch	speci-
-	   fied in the Gemfile.
-
-       o   1mdisable_multisource  22m(1mBUNDLE_DISABLE_MULTISOURCE22m):  When  set, Gem-
-	   files containing multiple sources will produce  errors  instead  of
-	   warnings. Use 1mbundle config --delete disable_multisource 22mto unset.
-
-       o   1mdisable_platform_warnings	22m(1mBUNDLE_DISABLE_PLATFORM_WARNINGS22m): Dis-
-	   able warnings during bundle install when a dependency is unused  on
-	   the current platform.
-
-       o   1mdisable_shared_gems 22m(1mBUNDLE_DISABLE_SHARED_GEMS22m): Stop Bundler from
-	   accessing gems installed to RubyGems' normal location.
-
-       o   1mdisable_version_check 22m(1mBUNDLE_DISABLE_VERSION_CHECK22m): Stop  Bundler
-	   from   checking   if  a  newer  Bundler  version  is  available  on
-	   rubygems.org.
-
-       o   1merror_on_stderr 22m(1mBUNDLE_ERROR_ON_STDERR22m): Print Bundler  errors  to
-	   stderr.
-
-       o   1mforce_ruby_platform  22m(1mBUNDLE_FORCE_RUBY_PLATFORM22m):  Ignore the cur-
-	   rent machine's platform and install only 1mruby 22mplatform gems.  As  a
-	   result, gems with native extensions will be compiled from source.
-
-       o   1mfrozen  22m(1mBUNDLE_FROZEN22m):  Disallow changes to the 1mGemfile22m. When the
-	   1mGemfile 22mis changed and the lockfile has not been  updated,  running
-	   Bundler  commands  will be blocked. Defaults to 1mtrue 22mwhen 1m--deploy-0m
-	   1mment 22mis used.
-
-       o   1mgem.push_key 22m(1mBUNDLE_GEM__PUSH_KEY22m): Sets the 1m--key  22mparameter  for
-	   1mgem  push	22mwhen  using the 1mrake release 22mcommand with a private gem-
-	   stash server.
-
-       o   1mgemfile 22m(1mBUNDLE_GEMFILE22m): The name of the file that bundler  should
-	   use	as  the 1mGemfile22m. This location of this file also sets the root
-	   of the project, which is used to resolve relative paths in the 1mGem-0m
-	   1mfile22m,  among  other things. By default, bundler will search up from
-	   the current working directory until it finds a 1mGemfile22m.
-
-       o   1mglobal_gem_cache 22m(1mBUNDLE_GLOBAL_GEM_CACHE22m): Whether Bundler  should
-	   cache all gems globally, rather than locally to the installing Ruby
-	   installation.
-
-       o   1mglobal_path_appends_ruby_scope				   22m(1mBUN-0m
-	   1mDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE22m):  Whether Bundler should append
-	   the Ruby scope (e.g. engine and ABI version) to a  globally-config-
-	   ured path.
-
-       o   1mignore_messages 22m(1mBUNDLE_IGNORE_MESSAGES22m): When set, no post install
-	   messages will be printed. To silence a single gem, use dot notation
-	   like 1mignore_messages.httparty true22m.
-
-       o   1minit_gems_rb  22m(1mBUNDLE_INIT_GEMS_RB22m) Generate a 1mgems.rb 22minstead of a
-	   1mGemfile 22mwhen running 1mbundle init22m.
-
-       o   1mjobs 22m(1mBUNDLE_JOBS22m): The number of gems Bundler can install in  par-
-	   allel. Defaults to 1.
-
-       o   1mlist_command 22m(1mBUNDLE_LIST_COMMAND22m) Enable new list command feature
-
-       o   1mmajor_deprecations   22m(1mBUNDLE_MAJOR_DEPRECATIONS22m):	Whether  Bundler
-	   should print deprecation warnings for behavior that will be changed
-	   in the next major version.
-
-       o   1mno_install  22m(1mBUNDLE_NO_INSTALL22m): Whether 1mbundle package 22mshould skip
-	   installing gems.
-
-       o   1mno_prune 22m(1mBUNDLE_NO_PRUNE22m): Whether Bundler should  leave	outdated
-	   gems unpruned when caching.
-
-       o   1monly_update_to_newer_versions     22m(1mBUNDLE_ONLY_UPDATE_TO_NEWER_VER-0m
-	   1mSIONS22m): During 1mbundle update22m, only resolve to newer versions of the
-	   gems in the lockfile.
-
-       o   1mpath  22m(1mBUNDLE_PATH22m):  The	location  on disk where all gems in your
-	   bundle will be located regardless of 1m$GEM_HOME 22mor 1m$GEM_PATH 22mvalues.
-	   Bundle  gems not found in this location will be installed by 1mbundle0m
-	   1minstall22m. Defaults to 1mGem.dir22m. When --deployment is  used,	defaults
-	   to vendor/bundle.
-
-       o   1mpath.system  22m(1mBUNDLE_PATH__SYSTEM22m):  Whether  Bundler  will install
-	   gems into the default system path (1mGem.dir22m).
-
-       o   1mpath_relative_to_cwd 22m(1mPATH_RELATIVE_TO_CWD22m) Makes	1m--path  22mrelative
-	   to the CWD instead of the 1mGemfile22m.
-
-       o   1mplugins 22m(1mBUNDLE_PLUGINS22m): Enable Bundler's experimental plugin sys-
-	   tem.
-
-       o   1mprefer_gems_rb 22m(1mBUNDLE_PREFER_GEMS_RB22m) Prefer  1mgems.rb  22mto  1mGemfile0m
-	   when Bundler is searching for a Gemfile.
-
-       o   1mprint_only_version_number	22m(1mBUNDLE_PRINT_ONLY_VERSION_NUMBER22m) Print
-	   only version number from 1mbundler --version22m.
-
-       o   1mredirect 22m(1mBUNDLE_REDIRECT22m): The number  of  redirects  allowed  for
-	   network requests. Defaults to 1m522m.
-
-       o   1mretry  22m(1mBUNDLE_RETRY22m):  The number of times to retry failed network
-	   requests. Defaults to 1m322m.
-
-       o   1msetup_makes_kernel_gem_public   22m(1mBUNDLE_SETUP_MAKES_KERNEL_GEM_PUB-0m
-	   1mLIC22m):  Have  1mBundler.setup  22mmake the 1mKernel#gem 22mmethod public, even
-	   though RubyGems declares it as private.
-
-       o   1mshebang 22m(1mBUNDLE_SHEBANG22m): The program name that should  be  invoked
-	   for	generated  binstubs. Defaults to the ruby install name used to
-	   generate the binstub.
-
-       o   1msilence_root_warning  22m(1mBUNDLE_SILENCE_ROOT_WARNING22m):  Silence   the
-	   warning Bundler prints when installing gems as root.
-
-       o   1mskip_default_git_sources 22m(1mBUNDLE_SKIP_DEFAULT_GIT_SOURCES22m): Whether
-	   Bundler should skip adding default git source shortcuts to the Gem-
-	   file DSL.
-
-       o   1mspecific_platform	 22m(1mBUNDLE_SPECIFIC_PLATFORM22m):  Allow  bundler  to
-	   resolve for the specific running platform and store it in the lock-
-	   file, instead of only using a generic platform. A specific platform
-	   is the exact platform triple reported by 1mGem::Platform.local22m,  such
-	   as  1mx86_64-darwin-16  22mor  1muniversal-java-1.822m.  On	the  other hand,
-	   generic platforms are those such as 1mruby22m, 1mmswin22m, or 1mjava22m.  In  this
-	   example,  1mx86_64-darwin-16 22mwould map to 1mruby 22mand 1muniversal-java-1.80m
-	   to 1mjava22m.
-
-       o   1mssl_ca_cert 22m(1mBUNDLE_SSL_CA_CERT22m): Path to a designated CA	certifi-
-	   cate  file  or  folder containing multiple certificates for trusted
-	   CAs in PEM format.
-
-       o   1mssl_client_cert 22m(1mBUNDLE_SSL_CLIENT_CERT22m): Path to a designated file
-	   containing a X.509 client certificate and key in PEM format.
-
-       o   1mssl_verify_mode 22m(1mBUNDLE_SSL_VERIFY_MODE22m): The SSL verification mode
-	   Bundler uses when making HTTPS requests. Defaults to verify peer.
-
-       o   1msuppress_install_using_messages 22m(1mBUNDLE_SUPPRESS_INSTALL_USING_MES-0m
-	   1mSAGES22m):  Avoid printing 1mUsing ... 22mmessages during installation when
-	   the version of a gem has not changed.
-
-       o   1msystem_bindir 22m(1mBUNDLE_SYSTEM_BINDIR22m): The location  where	RubyGems
-	   installs binstubs. Defaults to 1mGem.bindir22m.
-
-       o   1mtimeout 22m(1mBUNDLE_TIMEOUT22m): The seconds allowed before timing out for
-	   network requests. Defaults to 1m1022m.
-
-       o   1munlock_source_unlocks_spec     22m(1mBUNDLE_UNLOCK_SOURCE_UNLOCKS_SPEC22m):
-	   Whether  running 1mbundle update --source NAME 22munlocks a gem with the
-	   given name. Defaults to 1mtrue22m.
-
-       o   1mupdate_requires_all_flag 22m(1mBUNDLE_UPDATE_REQUIRES_ALL_FLAG22m)  Require
-	   passing  1m--all  22mto 1mbundle update 22mwhen everything should be updated,
-	   and disallow passing no options to 1mbundle update22m.
-
-       o   1muser_agent 22m(1mBUNDLE_USER_AGENT22m):  The  custom  user  agent	fragment
-	   Bundler includes in API requests.
-
-       o   1mwith 22m(1mBUNDLE_WITH22m): A 1m:22m-separated list of groups whose gems bundler
-	   should install.
-
-       o   1mwithout 22m(1mBUNDLE_WITHOUT22m): A 1m:22m-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) 4mbundle-install.1.html24m or  bun-
-       dle package(1) 4mbundle-package.1.html24m command.
-
-       You  can  set  them globally either via environment variables or 1mbundle0m
-       1mconfig22m, whichever is preferable for your setup. If you use both,  envi-
-       ronment variables will take preference over global settings.
-
-1mLOCAL GIT REPOS0m
-       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 local.GEM_NAME /path/to/local/git/repository
-
-
-
-       For example, in order to use a local Rack repository, a developer could
-       call:
-
-
-
-	   bundle config local.rack ~/Work/git/rack
-
-
-
-       Now instead of checking out the remote git repository, the local  over-
-       ride  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 1mGemfile.lock 22mto 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 com-
-       mit  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 1mGemfile 22min order to use this feature. If the  branch  specified  in
-       the  1mGemfile  22mand 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  1mGem-0m
-       1mfile.lock  22mexists  in  the local git repository. By doing this, Bundler
-       forces you to fetch the latest changes in the remotes.
-
-1mMIRRORS OF GEM SOURCES0m
-       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 mirror.SOURCE_URL MIRROR_URL
-
-
-
-       For example, to use a mirror of rubygems.org  hosted  at  rubygems-mir-
-       ror.org:
-
-
-
-	   bundle config 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 mirror.SOURCE_URL.fallback_timeout TIMEOUT
-
-
-
-       For example, to fall back to rubygems.org after 3 seconds:
-
-
-
-	   bundle config mirror.https://rubygems.org.fallback_timeout 3
-
-
-
-       The  default  fallback timeout is 0.1 seconds, but the setting can cur-
-       rently only accept whole seconds (for example, 1, 15, or 30).
-
-1mCREDENTIALS FOR GEM SOURCES0m
-       Bundler allows you to configure credentials for any gem	source,  which
-       allows you to avoid putting secrets into your Gemfile.
-
-
-
-	   bundle config SOURCE_HOSTNAME USERNAME:PASSWORD
-
-
-
-       For  example,  to  save	the  credentials of user 1mclaudette 22mfor the gem
-       source at 1mgems.longerous.com22m, you would run:
-
-
-
-	   bundle config 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 https://github.com/bundler/bundler.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
-
-
-
-1mCONFIGURE BUNDLER DIRECTORIES0m
-       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 1m~/.bundle22m, which  all  directories  inherit
-       from by default. The following outlines the available environment vari-
-       ables 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
-
-
-
-
-
-
-				 December 2018		      BUNDLE-CONFIG(1)
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
deleted file mode 100644
index b5c97ae82d..0000000000
--- a/man/bundle-config.ronn
+++ /dev/null
@@ -1,397 +0,0 @@
-bundle-config(1) -- Set bundler configuration options
-=====================================================
-
-## SYNOPSIS
-
-`bundle config` [<name> [<value>]]
-
-## DESCRIPTION
-
-This command allows you to interact with Bundler's configuration system.
-
-Bundler loads configuration settings in this order:
-
-1. Local config (`app/.bundle/config`)
-2. Environmental variables (`ENV`)
-3. Global config (`~/.bundle/config`)
-4. Bundler default config
-
-Executing `bundle config` with no parameters will print a list of all
-bundler configuration for the current bundle, and where that configuration
-was set.
-
-Executing `bundle config <name>` will print the value of that configuration
-setting, and where it was set.
-
-Executing `bundle config <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 --global <name> <value>` works the same as above.
-
-Executing `bundle config --local <name> <value>` will set that configuration to
-the local application. The configuration will be stored in `app/.bundle/config`.
-
-Executing `bundle config --delete <name>` will delete the configuration in both
-local and global sources. Not compatible with --global or --local flag.
-
-Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
-cause it to ignore all configuration.
-
-Executing `bundle config disable_multisource true` upgrades the warning about
-the Gemfile containing multiple primary sources to an error. Executing `bundle
-config --delete disable_multisource` downgrades this error to a warning.
-
-## REMEMBERING OPTIONS
-
-Flags passed to `bundle install` or the Bundler runtime,
-such as `--path foo` or `--without production`, are not remembered between commands.
-If these options must be remembered,they must be set using `bundle config`
-(e.g., `bundle config 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 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_bundler_dependency_conflicts` (`BUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS`):
-   Allow resolving to specifications that have dependencies on `bundler` that
-   are incompatible with the running Bundler version.
-* `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.
-* `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/bundle`.
-* `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_multisource` (`BUNDLE_DISABLE_MULTISOURCE`):
-   When set, Gemfiles containing multiple sources will produce errors
-   instead of warnings.
-   Use `bundle config --delete disable_multisource` to unset.
-* `disable_platform_warnings` (`BUNDLE_DISABLE_PLATFORM_WARNINGS`):
-   Disable warnings during bundle install when a dependency is unused on the current platform.
-* `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.
-* `error_on_stderr` (`BUNDLE_ERROR_ON_STDERR`):
-   Print Bundler errors to stderr.
-* `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.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.
-* `global_path_appends_ruby_scope` (`BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE`):
-   Whether Bundler should append the Ruby scope (e.g. engine and ABI version)
-   to a globally-configured path.
-* `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.
-* `list_command` (`BUNDLE_LIST_COMMAND`)
-   Enable new list command feature
-* `major_deprecations` (`BUNDLE_MAJOR_DEPRECATIONS`):
-   Whether Bundler should print deprecation warnings for behavior that will
-   be changed in the next major version.
-* `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.
-* `only_update_to_newer_versions` (`BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS`):
-   During `bundle update`, only resolve to newer versions of the gems in the
-   lockfile.
-* `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` (`PATH_RELATIVE_TO_CWD`)
-   Makes `--path` relative to the CWD instead of the `Gemfile`.
-* `plugins` (`BUNDLE_PLUGINS`):
-   Enable Bundler's experimental plugin system.
-* `prefer_gems_rb` (`BUNDLE_PREFER_GEMS_RB`)
-   Prefer `gems.rb` to `Gemfile` when Bundler is searching for a Gemfile.
-* `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_root_warning` (`BUNDLE_SILENCE_ROOT_WARNING`):
-   Silence the warning Bundler prints when installing gems as root.
-* `skip_default_git_sources` (`BUNDLE_SKIP_DEFAULT_GIT_SOURCES`):
-   Whether Bundler should skip adding default git source shortcuts to the
-   Gemfile DSL.
-* `specific_platform` (`BUNDLE_SPECIFIC_PLATFORM`):
-   Allow bundler to resolve for the specific running platform and store it in
-   the lockfile, instead of only using a generic platform.
-   A specific platform is the exact platform triple reported by
-   `Gem::Platform.local`, such as `x86_64-darwin-16` or `universal-java-1.8`.
-   On the other hand, generic platforms are those such as `ruby`, `mswin`, or
-   `java`. In this example, `x86_64-darwin-16` would map to `ruby` and
-   `universal-java-1.8` to `java`.
-* `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`.
-* `unlock_source_unlocks_spec` (`BUNDLE_UNLOCK_SOURCE_UNLOCKS_SPEC`):
-   Whether running `bundle update --source NAME` unlocks a gem with the given
-   name. Defaults to `true`.
-* `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 local.GEM_NAME /path/to/local/git/repository
-
-For example, in order to use a local Rack repository, a developer could call:
-
-    bundle config 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 mirror.SOURCE_URL MIRROR_URL
-
-For example, to use a mirror of rubygems.org hosted at rubygems-mirror.org:
-
-    bundle config 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 mirror.SOURCE_URL.fallback_timeout TIMEOUT
-
-For example, to fall back to rubygems.org after 3 seconds:
-
-    bundle config 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 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 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 https://github.com/bundler/bundler.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
-
-
-## 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/man/bundle-doctor.1 b/man/bundle-doctor.1
deleted file mode 100644
index 53291ba7b9..0000000000
--- a/man/bundle-doctor.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-DOCTOR" "1" "November 2018" "" ""
-.
-.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/man/bundle-doctor.1.txt b/man/bundle-doctor.1.txt
deleted file mode 100644
index b21291ac0f..0000000000
--- a/man/bundle-doctor.1.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-BUNDLE-DOCTOR(1)					      BUNDLE-DOCTOR(1)
-
-
-
-1mNAME0m
-       1mbundle-doctor 22m- Checks the bundle for common problems
-
-1mSYNOPSIS0m
-       1mbundle doctor 22m[--quiet] [--gemfile=GEMFILE]
-
-1mDESCRIPTION0m
-       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:
-
-       o   Invalid Bundler settings
-
-       o   Mismatched Ruby versions
-
-       o   Mismatched platforms
-
-       o   Uninstalled gems
-
-       o   Missing dependencies
-
-
-
-1mOPTIONS0m
-       1m--quiet0m
-	      Only output warnings and errors.
-
-       1m--gemfile=<gemfile>0m
-	      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 1mGemfile.lock 22mand
-	      1mvendor/cache 22mrelative to this location.
-
-
-
-
-				 November 2018		      BUNDLE-DOCTOR(1)
diff --git a/man/bundle-doctor.ronn b/man/bundle-doctor.ronn
deleted file mode 100644
index 271ee800ad..0000000000
--- a/man/bundle-doctor.ronn
+++ /dev/null
@@ -1,33 +0,0 @@
-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/man/bundle-exec.1 b/man/bundle-exec.1
deleted file mode 100644
index e742141769..0000000000
--- a/man/bundle-exec.1
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-EXEC" "1" "November 2018" "" ""
-.
-.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 \-rubygems \-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/man/bundle-exec.1.txt b/man/bundle-exec.1.txt
deleted file mode 100644
index fa55d2a0c2..0000000000
--- a/man/bundle-exec.1.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-BUNDLE-EXEC(1)							BUNDLE-EXEC(1)
-
-
-
-1mNAME0m
-       1mbundle-exec 22m- Execute a command in the context of the bundle
-
-1mSYNOPSIS0m
-       1mbundle exec 22m[--keep-file-descriptors] 4mcommand0m
-
-1mDESCRIPTION0m
-       This  command  executes	the  command, making all gems specified in the
-       [1mGemfile(5)22m][Gemfile(5)] available to 1mrequire 22min Ruby programs.
-
-       Essentially, if you  would  normally  have  run	something  like  1mrspec0m
-       1mspec/my_spec.rb22m,  and  you	want to use the gems specified in the [1mGem-0m
-       1mfile(5)22m][Gemfile(5)]  and  installed   via	 bundle   install(1)   4mbun-0m
-       4mdle-install.1.html24m, you should run 1mbundle exec rspec spec/my_spec.rb22m.
-
-       Note  that 1mbundle exec 22mdoes not require that an executable is available
-       on your shell's 1m$PATH22m.
-
-1mOPTIONS0m
-       1m--keep-file-descriptors0m
-	      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.
-
-1mBUNDLE INSTALL --BINSTUBS0m
-       If  you	use  the   1m--binstubs   22mflag   in	 bundle   install(1)   4mbun-0m
-       4mdle-install.1.html24m,  Bundler  will	automatically  create  a  directory
-       (which defaults to 1mapp_root/bin22m)  containing  all  of  the	executables
-       available from gems in the bundle.
-
-       After  using 1m--binstubs22m, 1mbin/rspec spec/my_spec.rb 22mis identical to 1mbun-0m
-       1mdle exec rspec spec/my_spec.rb22m.
-
-1mENVIRONMENT MODIFICATIONS0m
-       1mbundle exec 22mmakes a number of changes to the  shell  environment,  then
-       executes the command you specify in full.
-
-       o   make  sure  that  it's  still  possible to shell out to 1mbundle 22mfrom
-	   inside a command invoked by 1mbundle exec 22m(using 1m$BUNDLE_BIN_PATH22m)
-
-       o   put	the  directory	containing  executables  (like	1mrails22m,  1mrspec22m,
-	   1mrackup22m) for your bundle on 1m$PATH0m
-
-       o   make  sure  that if bundler is invoked in the subshell, it uses the
-	   same 1mGemfile 22m(by setting 1mBUNDLE_GEMFILE22m)
-
-       o   add 1m-rbundler/setup 22mto 1m$RUBYOPT22m, which makes sure	that  Ruby  pro-
-	   grams invoked in the subshell can see the gems in the bundle
-
-
-
-       It also modifies Rubygems:
-
-       o   disallow loading additional gems not in the bundle
-
-       o   modify  the 1mgem 22mmethod to be a no-op if a gem matching the require-
-	   ments is in the bundle, and to raise a 1mGem::LoadError 22mif it's not
-
-       o   Define 1mGem.refresh 22mto 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
-
-       o   Override 1mGem.bin_path 22mto use the gems in the bundle, making  system
-	   executables work
-
-       o   Add all gems in the bundle into Gem.loaded_specs
-
-
-
-       Finally, 1mbundle exec 22malso implicitly modifies 1mGemfile.lock 22mif the lock-
-       file and the Gemfile do not match. Bundler needs the Gemfile to	deter-
-       mine  things  such as a gem's groups, 1mautorequire22m, and platforms, etc.,
-       and that information isn't stored in  the  lockfile.  The  Gemfile  and
-       lockfile must be synced in order to 1mbundle exec 22msuccessfully, so 1mbundle0m
-       1mexec 22mupdates the lockfile beforehand.
-
-   1mLoading0m
-       By default, when attempting to 1mbundle exec 22mto a file with a  ruby  she-
-       bang,  Bundler will 1mKernel.load 22mthat file instead of using 1mKernel.exec22m.
-       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 1m$0 22mor 1m__FILE__22m) and  the  optimiza-
-       tion can be disabled by enabling the 1mdisable_exec_load 22msetting.
-
-   1mShelling out0m
-       Any  Ruby  code that opens a subshell (like 1msystem22m, backticks, or 1m%x{}22m)
-       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 1mwith_clean_env 22mmethod  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  1mwith_clean_env	22mis  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 1mwith_clean_env22m.
-
-
-
-	   Bundler.with_clean_env do
-	     Dir.chdir "/other/bundler/project" do
-	       `bundle exec ./script`
-	     end
-	   end
-
-
-
-       Bundler provides convenience helpers that wrap  1msystem  22mand  1mexec22m,  and
-       they can be used like this:
-
-
-
-	   Bundler.clean_system('brew install wget')
-	   Bundler.clean_exec('brew install wget')
-
-
-
-1mRUBYGEMS PLUGINS0m
-       At  present,  the  Rubygems  plugin  system  requires  all  files named
-       1mrubygems_plugin.rb 22mon the load path of 4many24m installed gem when any  Ruby
-       code requires 1mrubygems.rb22m. This includes executables installed into the
-       system, like 1mrails22m, 1mrackup22m, and 1mrspec22m.
-
-       Since Rubygems plugins can contain arbitrary Ruby code,	they  commonly
-       end up activating themselves or their dependencies.
-
-       For  instance,  the 1mgemcutter 0.5 22mgem depended on 1mjson_pure22m. If you had
-       that version of gemcutter installed (even if you 4malso24m had a newer  ver-
-       sion  without  this problem), Rubygems would activate 1mgemcutter 0.5 22mand
-       1mjson_pure <latest>22m.
-
-       If your Gemfile(5) also contained 1mjson_pure 22m(or a gem with a dependency
-       on  1mjson_pure22m),  the  latest version on your system might conflict with
-       the version in your Gemfile(5), or the snapshot version	in  your  1mGem-0m
-       1mfile.lock22m.
-
-       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 1mgemcutter 22mgem) 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 -rubygems -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 (1mgem0m
-       1muninstall gem_name22m).
-
-
-
-				 November 2018			BUNDLE-EXEC(1)
diff --git a/man/bundle-exec.ronn b/man/bundle-exec.ronn
deleted file mode 100644
index aa680f4c5d..0000000000
--- a/man/bundle-exec.ronn
+++ /dev/null
@@ -1,152 +0,0 @@
-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 -rubygems -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/man/bundle-gem.1 b/man/bundle-gem.1
deleted file mode 100644
index 1087a0888c..0000000000
--- a/man/bundle-gem.1
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-GEM" "1" "November 2018" "" ""
-.
-.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
-Specify the test framework that Bundler should use when generating the project\. Acceptable values are \fBminitest\fR and \fBrspec\fR\. The \fBGEM_NAME\.gemspec\fR will be configured and a skeleton test/spec directory will be created based on this option\. 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\. If no option is specified, the default testing framework is RSpec\.
-.
-.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/man/bundle-gem.1.txt b/man/bundle-gem.1.txt
deleted file mode 100644
index 59e5e0ddcc..0000000000
--- a/man/bundle-gem.1.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-BUNDLE-GEM(1)							 BUNDLE-GEM(1)
-
-
-
-1mNAME0m
-       1mbundle-gem 22m- Generate a project skeleton for creating a rubygem
-
-1mSYNOPSIS0m
-       1mbundle gem 4m22mGEM_NAME24m 4mOPTIONS0m
-
-1mDESCRIPTION0m
-       Generates a directory named 1mGEM_NAME 22mwith a 1mRakefile22m, 1mGEM_NAME.gemspec22m,
-       and other supporting files and directories that can be used to  develop
-       a rubygem with that name.
-
-       Run  1mrake -T 22min 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:
-
-       o   1mgem.coc0m
-
-       o   1mgem.mit0m
-
-       o   1mgem.test0m
-
-
-
-1mOPTIONS0m
-       1m--exe 22mor 1m-b 22mor 1m--bin0m
-	      Specify that Bundler  should  create  a  binary  executable  (as
-	      1mexe/GEM_NAME22m) in the generated rubygem project. This binary will
-	      also be added to the 1mGEM_NAME.gemspec 22mmanifest. This behavior is
-	      disabled by default.
-
-       1m--no-exe0m
-	      Do  not create a binary (overrides 1m--exe 22mspecified in the global
-	      config).
-
-       1m--coc	22mAdd a 1mCODE_OF_CONDUCT.md 22mfile  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 1mbundle gem 22muse.
-
-       1m--no-coc0m
-	      Do not create a 1mCODE_OF_CONDUCT.md 22m(overrides 1m--coc 22mspecified in
-	      the global config).
-
-       1m--ext	22mAdd boilerplate for C extension code to the	generated  project.
-	      This behavior is disabled by default.
-
-       1m--no-ext0m
-	      Do  not  add  C extension code (overrides 1m--ext 22mspecified in the
-	      global config).
-
-       1m--mit	22mAdd an MIT license to a 1mLICENSE.txt 22mfile in the root of the gen-
-	      erated 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 1mbundle gem 22muse.
-
-       1m--no-mit0m
-	      Do not create a 1mLICENSE.txt 22m(overrides 1m--mit  22mspecified  in  the
-	      global config).
-
-       1m-t22m, 1m--test=minitest22m, 1m--test=rspec0m
-	      Specify the test framework that Bundler should use when generat-
-	      ing the project. Acceptable values are 1mminitest 22mand	1mrspec22m.  The
-	      1mGEM_NAME.gemspec  22mwill  be  configured  and a skeleton test/spec
-	      directory will be created based on this option. If  this	option
-	      is  unspecified, an interactive prompt will be displayed and the
-	      answer will be saved in Bundler's global config for future  1mbun-0m
-	      1mdle  gem  22muse.  If  no  option is specified, the default testing
-	      framework is RSpec.
-
-       1m-e22m, 1m--edit[=EDITOR]0m
-	      Open the resulting GEM_NAME.gemspec in EDITOR,  or  the  default
-	      editor  if  not specified. The default is 1m$BUNDLER_EDITOR22m, 1m$VIS-0m
-	      1mUAL22m, or 1m$EDITOR22m.
-
-1mSEE ALSO0m
-       o   bundle config(1) 4mbundle-config.1.html0m
-
-
-
-
-
-
-				 November 2018			 BUNDLE-GEM(1)
diff --git a/man/bundle-gem.ronn b/man/bundle-gem.ronn
deleted file mode 100644
index cf3d037df2..0000000000
--- a/man/bundle-gem.ronn
+++ /dev/null
@@ -1,78 +0,0 @@
-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`:
-  Specify the test framework that Bundler should use when generating the
-  project. Acceptable values are `minitest` and `rspec`. The `GEM_NAME.gemspec`
-  will be configured and a skeleton test/spec directory will be created based
-  on this option. 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.
-  If no option is specified, the default testing framework is RSpec.
-
-* `-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/man/bundle-info.1 b/man/bundle-info.1
deleted file mode 100644
index 9140d27c73..0000000000
--- a/man/bundle-info.1
+++ /dev/null
@@ -1,20 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INFO" "1" "November 2018" "" ""
-.
-.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/man/bundle-info.1.txt b/man/bundle-info.1.txt
deleted file mode 100644
index 4d328416e7..0000000000
--- a/man/bundle-info.1.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-BUNDLE-INFO(1)							BUNDLE-INFO(1)
-
-
-
-1mNAME0m
-       1mbundle-info 22m- Show information for the given gem in your bundle
-
-1mSYNOPSIS0m
-       1mbundle info 22m[GEM] [--path]
-
-1mDESCRIPTION0m
-       Print  the  basic  information about the provided GEM such as homepage,
-       version, path and summary.
-
-1mOPTIONS0m
-       1m--path 22mPrint the path of the given gem
-
-
-
-
-				 November 2018			BUNDLE-INFO(1)
diff --git a/man/bundle-info.ronn b/man/bundle-info.ronn
deleted file mode 100644
index 47e457aa3c..0000000000
--- a/man/bundle-info.ronn
+++ /dev/null
@@ -1,17 +0,0 @@
-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/man/bundle-init.1 b/man/bundle-init.1
deleted file mode 100644
index 70519fda39..0000000000
--- a/man/bundle-init.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INIT" "1" "November 2018" "" ""
-.
-.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) \fIhttp://bundler\.io/man/gemfile\.5\.html\fR
diff --git a/man/bundle-init.1.txt b/man/bundle-init.1.txt
deleted file mode 100644
index eb6091bab2..0000000000
--- a/man/bundle-init.1.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-BUNDLE-INIT(1)							BUNDLE-INIT(1)
-
-
-
-1mNAME0m
-       1mbundle-init 22m- Generates a Gemfile into the current working directory
-
-1mSYNOPSIS0m
-       1mbundle init 22m[--gemspec=FILE]
-
-1mDESCRIPTION0m
-       Init  generates a default [1mGemfile(5)22m][Gemfile(5)] in the current work-
-       ing directory. When adding a [1mGemfile(5)22m][Gemfile(5)] to a gem  with  a
-       gemspec,  the  1m--gemspec  22moption will automatically add each dependency
-       listed in the gemspec  file  to	the  newly  created  [1mGemfile(5)22m][Gem-
-       file(5)].
-
-1mOPTIONS0m
-       1m--gemspec0m
-	      Use  the	specified  .gemspec  to  create  the [1mGemfile(5)22m][Gem-
-	      file(5)]
-
-1mFILES0m
-       Included in the default [1mGemfile(5)22m][Gemfile(5)] generated is the  line
-       1m#  frozen_string_literal:  true22m.  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.
-
-1mSEE ALSO0m
-       Gemfile(5) 4mhttp://bundler.io/man/gemfile.5.html0m
-
-
-
-				 November 2018			BUNDLE-INIT(1)
diff --git a/man/bundle-init.ronn b/man/bundle-init.ronn
deleted file mode 100644
index 7504af7bab..0000000000
--- a/man/bundle-init.ronn
+++ /dev/null
@@ -1,29 +0,0 @@
-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)](http://bundler.io/man/gemfile.5.html)
diff --git a/man/bundle-inject.1 b/man/bundle-inject.1
deleted file mode 100644
index 4f663e1a85..0000000000
--- a/man/bundle-inject.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INJECT" "1" "November 2018" "" ""
-.
-.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/man/bundle-inject.1.txt b/man/bundle-inject.1.txt
deleted file mode 100644
index 0011dea0c1..0000000000
--- a/man/bundle-inject.1.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-BUNDLE-INJECT(1)					      BUNDLE-INJECT(1)
-
-
-
-1mNAME0m
-       1mbundle-inject 22m- Add named gem(s) with version requirements to Gemfile
-
-1mSYNOPSIS0m
-       1mbundle inject 22m[GEM] [VERSION]
-
-1mDESCRIPTION0m
-       Adds  the  named gem(s) with their version requirements to the resolved
-       [1mGemfile(5)22m][Gemfile(5)].
-
-       This command will add the gem to both your [1mGemfile(5)22m][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
-       [1mGemfile(5)22m][Gemfile(5)] and Gemfile.lock
-
-
-
-				 November 2018		      BUNDLE-INJECT(1)
diff --git a/man/bundle-inject.ronn b/man/bundle-inject.ronn
deleted file mode 100644
index f454341896..0000000000
--- a/man/bundle-inject.ronn
+++ /dev/null
@@ -1,22 +0,0 @@
-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/man/bundle-install.1 b/man/bundle-install.1
deleted file mode 100644
index c70f92eb25..0000000000
--- a/man/bundle-install.1
+++ /dev/null
@@ -1,308 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INSTALL" "1" "December 2018" "" ""
-.
-.SH "NAME"
-\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
-.
-.SH "SYNOPSIS"
-\fBbundle install\fR [\-\-binstubs[=DIRECTORY]] [\-\-clean] [\-\-deployment] [\-\-force] [\-\-frozen] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-local] [\-\-no\-cache] [\-\-no\-prune] [\-\-path PATH] [\-\-quiet] [\-\-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"
-To apply any of \fB\-\-binstubs\fR, \fB\-\-deployment\fR, \fB\-\-path\fR, or \fB\-\-without\fR every time \fBbundle install\fR is run, use \fBbundle config\fR (see bundle\-config(1))\.
-.
-.TP
-\fB\-\-binstubs[=<directory>]\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
-\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\.
-.
-.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\.
-.
-.TP
-\fB\-\-force\fR
-Force download every gem, even if the required versions are already available locally\. \fB\-\-redownload\fR is an alias of this option\.
-.
-.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\.
-.
-.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 a 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\.
-.
-.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\.
-.
-.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\.
-.
-.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\.
-.
-.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\.
-.
-.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\.
-.
-.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/man/bundle-install.1.txt b/man/bundle-install.1.txt
deleted file mode 100644
index 93118629c7..0000000000
--- a/man/bundle-install.1.txt
+++ /dev/null
@@ -1,396 +0,0 @@
-BUNDLE-INSTALL(1)					     BUNDLE-INSTALL(1)
-
-
-
-1mNAME0m
-       1mbundle-install 22m- Install the dependencies specified in your Gemfile
-
-1mSYNOPSIS0m
-       1mbundle   install   22m[--binstubs[=DIRECTORY]]   [--clean]  [--deployment]
-       [--force] [--frozen] [--full-index] [--gemfile=GEMFILE] [--jobs=NUMBER]
-       [--local]    [--no-cache]    [--no-prune]   [--path   PATH]   [--quiet]
-       [--retry=NUMBER] [--shebang] [--standalone[=GROUP[ GROUP...]]]  [--sys-
-       tem]   [--trust-policy=POLICY]	[--with=GROUP[	 GROUP...]]   [--with-
-       out=GROUP[ GROUP...]]
-
-1mDESCRIPTION0m
-       Install the gems specified in your Gemfile(5). If  this	is  the  first
-       time  you  run  bundle  install	(and  a  1mGemfile.lock 22mdoes not exist),
-       Bundler will fetch all remote sources, resolve dependencies and install
-       all needed gems.
-
-       If a 1mGemfile.lock 22mdoes exist, and you have not updated your Gemfile(5),
-       Bundler will fetch all remote sources, but use the dependencies	speci-
-       fied in the 1mGemfile.lock 22minstead of resolving dependencies.
-
-       If  a  1mGemfile.lock  22mdoes  exist, and you have updated your Gemfile(5),
-       Bundler will use the dependencies in the 1mGemfile.lock 22mfor 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 4mCONSERVATIVE24m 4mUPDATING24m.
-
-1mOPTIONS0m
-       To  apply  any  of 1m--binstubs22m, 1m--deployment22m, 1m--path22m, or 1m--without 22mevery
-       time 1mbundle install 22mis run, use 1mbundle config 22m(see bundle-config(1)).
-
-       1m--binstubs[=<directory>]0m
-	      Creates a directory (defaults to 1m~/bin22m) and place  any  executa-
-	      bles from the gem there. These executables run in Bundler's con-
-	      text. If used, you might add this  directory  to	your  environ-
-	      ment's  1mPATH 22mvariable. For instance, if the 1mrails 22mgem comes with
-	      a 1mrails 22mexecutable, this flag will create a 1mbin/rails 22mexecutable
-	      that  ensures  that  all	referred dependencies will be resolved
-	      using the bundled gems.
-
-       1m--clean0m
-	      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.
-
-       1m--deployment0m
-	      In 4mdeployment24m 4mmode24m, Bundler will 'roll-out' the bundle for  pro-
-	      duction  or  CI  use. Please check carefully if you want to have
-	      this option enabled in your development environment.
-
-       1m--force0m
-	      Force download every gem, even  if  the  required  versions  are
-	      already  available  locally.  1m--redownload  22mis  an alias of this
-	      option.
-
-       1m--frozen0m
-	      Do not allow the Gemfile.lock to be updated after this  install.
-	      Exits  non-zero  if  there  are  going to be changes to the Gem-
-	      file.lock.
-
-       1m--full-index0m
-	      Bundler will not call Rubygems' API endpoint (default) but down-
-	      load and cache a (currently big) index file of all gems. Perfor-
-	      mance can be improved for large bundles that  seldom  change  by
-	      enabling this option.
-
-       1m--gemfile=<gemfile>0m
-	      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 1mGemfile.lock 22mand
-	      1mvendor/cache 22mrelative to this location.
-
-       1m--jobs=[<number>]22m, 1m-j[<number>]0m
-	      The  maximum  number  of parallel download and install jobs. The
-	      default is 1m122m.
-
-       1m--local0m
-	      Do not attempt to connect to 1mrubygems.org22m. Instead, Bundler will
-	      use  the	gems  already  present	in  Rubygems' cache or in 1mven-0m
-	      1mdor/cache22m. Note that  if  a	appropriate  platform-specific	gem
-	      exists on 1mrubygems.org 22mit will not be found.
-
-       1m--no-cache0m
-	      Do  not  update the cache in 1mvendor/cache 22mwith 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.
-
-       1m--no-prune0m
-	      Don't  remove  stale  gems  from the cache when the installation
-	      finishes.
-
-       1m--path=<path>0m
-	      The location to install the specified gems to. This defaults  to
-	      Rubygems'  setting.  Bundler shares this location with Rubygems,
-	      1mgem install ... 22mwill have gem installed there,  too.  Therefore,
-	      gems  installed  without	a  1m--path  ... 22msetting will show up by
-	      calling 1mgem list22m. Accordingly, gems installed to other locations
-	      will not get listed.
-
-       1m--quiet0m
-	      Do  not  print  progress	information  to  the  standard output.
-	      Instead, Bundler will exit using a status code (1m$?22m).
-
-       1m--retry=[<number>]0m
-	      Retry failed network or git requests for 4mnumber24m times.
-
-       1m--shebang=<ruby-executable>0m
-	      Uses the specified ruby executable (usually 1mruby22m) to execute the
-	      scripts  created with 1m--binstubs22m. In addition, if you use 1m--bin-0m
-	      1mstubs 22mtogether with 1m--shebang jruby 22mthese  executables	will  be
-	      changed to execute 1mjruby 22minstead.
-
-       1m--standalone[=<list>]0m
-	      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 1mbundle0m
-	      and  installs  the  bundle  there.  It  also  generates  a  1mbun-0m
-	      1mdle/bundler/setup.rb  22mfile to replace Bundler's own setup in the
-	      manner required. Using this option implicitly sets  1mpath22m,  which
-	      is a [remembered option][REMEMBERED OPTIONS].
-
-       1m--system0m
-	      Installs	the  gems  specified  in  the  bundle  to the system's
-	      Rubygems location. This overrides any previous configuration  of
-	      1m--path22m.
-
-       1m--trust-policy=[<policy>]0m
-	      Apply  the  Rubygems security policy 4mpolicy24m, where policy is one
-	      of 1mHighSecurity22m, 1mMediumSecurity22m, 1mLowSecurity22m,  1mAlmostNoSecurity22m,
-	      or 1mNoSecurity22m. For more details, please see the Rubygems signing
-	      documentation linked below in 4mSEE24m 4mALSO24m.
-
-       1m--with=<list>0m
-	      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.
-
-       1m--without=<list>0m
-	      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.
-
-1mDEPLOYMENT MODE0m
-       Bundler's defaults are optimized for development. To switch to defaults
-       optimized for deployment and for CI, use the 1m--deployment 22mflag. Do	not
-       activate  deployment  mode on development machines, as it will cause an
-       error when the Gemfile(5) is modified.
-
-       1.  A 1mGemfile.lock 22mis required.
-
-	   To ensure that the same versions of the gems you developed with and
-	   tested  with  are  also  used  in  deployments,  a  1mGemfile.lock 22mis
-	   required.
-
-	   This is mainly to ensure that  you  remember  to  check  your  1mGem-0m
-	   1mfile.lock 22minto version control.
-
-       2.  The 1mGemfile.lock 22mmust be up to date
-
-	   In  development,  you  can modify your Gemfile(5) and re-run 1mbundle0m
-	   1minstall 22mto 4mconservatively24m 4mupdate24m your 1mGemfile.lock 22msnapshot.
-
-	   In deployment, your 1mGemfile.lock 22mshould be up-to-date with  changes
-	   made in your Gemfile(5).
-
-       3.  Gems  are  installed to 1mvendor/bundle 22mnot your default system loca-
-	   tion
-
-	   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  permis-
-	   sion to read them.
-
-	   As  a result, 1mbundle install --deployment 22minstalls gems to the 1mven-0m
-	   1mdor/bundle 22mdirectory in the application.  This	may  be  overridden
-	   using the 1m--path 22moption.
-
-
-
-1mSUDO USAGE0m
-       By default, Bundler installs gems to the same location as 1mgem install22m.
-
-       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  1msudo 22mpassword 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 1msudo bundle install22m. This is because several other
-       steps in 1mbundle install 22mmust be performed as the current user:
-
-       o   Updating your 1mGemfile.lock0m
-
-       o   Updating your 1mvendor/cache22m, if necessary
-
-       o   Checking out private git repositories using your user's SSH keys
-
-
-
-       Of these three, the first  two  could  theoretically  be  performed  by
-       1mchown22ming  the  resulting  files  to 1m$SUDO_USER22m. The third, however, can
-       only be performed by invoking the 1mgit	22mcommand  as	the  current  user.
-       Therefore,  git gems are downloaded and installed into 1m~/.bundle 22mrather
-       than $GEM_HOME or $BUNDLE_PATH.
-
-       As a result, you should run 1mbundle install 22mas  the	current  user,	and
-       Bundler will ask for your password if it is needed to put the gems into
-       their final location.
-
-1mINSTALLING GROUPS0m
-       By default, 1mbundle install 22mwill 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 1m--without 22moption. This option takes  a  space-separated
-       list of groups.
-
-       While  the 1m--without 22moption will skip 4minstalling24m the gems in the speci-
-       fied groups, it will still 4mdownload24m 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.
-
-       1mBundler offers a rock-solid guarantee that the third-party code you are0m
-       1mrunning in development and testing is also the third-party code you are0m
-       1mrunning  in  production. You can choose to exclude some of that code in0m
-       1mdifferent environments, but you will never  be  caught  flat-footed  by0m
-       1mdifferent versions of third-party code being used in different environ-0m
-       1mments.0m
-
-       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, 1msinatra 22mdepends on any version of Rack  (1m>=  1.022m),  while
-       1mrack-perftools-profiler 22mdepends on 1.x (1m~> 1.022m).
-
-       When  you  run  1mbundle  install --without production 22min development, we
-       look at the dependencies of 1mrack-perftools-profiler 22mas 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 1mproduction 22mgroup 4mis24m used.
-
-       This  should  not  cause  any  problems	in practice, because we do not
-       attempt to 1minstall 22mthe 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.
-
-1mTHE GEMFILE.LOCK0m
-       When you run 1mbundle install22m, 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 1mGemfile.lock22m.
-
-       Bundler uses this file in all subsequent calls to 1mbundle install22m, which
-       guarantees that you always use the same exact code, even as your appli-
-       cation 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 1mSHOULD 22mcheck your 1mGemfile.lock 22minto 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 1many 22mof the gems in the Gemfile(5) or any
-       of their dependencies have been updated.
-
-       When Bundler first shipped, the 1mGemfile.lock 22mwas included in the  1m.git-0m
-       1mignore 22mfile 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 1mbundle install 22mis usually the first  step
-       towards	a contribution, the pain of broken dependencies would discour-
-       age new contributors from contributing. As a result,  we  have  revised
-       our  guidance for gem authors to now recommend checking in the lock for
-       gems.
-
-1mCONSERVATIVE UPDATING0m
-       When you make a change to the Gemfile(5) and then run  1mbundle	install22m,
-       Bundler will update only the gems that you modified.
-
-       In  other  words,  if  a  gem that you 1mdid not modify 22mworked before you
-       called 1mbundle install22m, 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 1mactionpack 22mand 1mactivemerchant 22mdepend on 1mactivesup-0m
-       1mport22m. The 1mactionpack 22mgem depends on 1mactivesupport  2.3.8  22mand  1mrack  ~>0m
-       1m1.1.022m,  while the 1mactivemerchant 22mgem depends on 1mactivesupport >= 2.3.222m,
-       1mbraintree >= 2.0.022m, and 1mbuilder >= 2.0.022m.
-
-       When  the  dependencies	are  first  resolved,  Bundler	 will	select
-       1mactivesupport	2.3.822m,  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 1mactionpack 3.0.0.rc 22mgem has  a	number	of  new  dependencies,	and
-       updates	the 1mactivesupport 22mdependency to 1m= 3.0.0.rc 22mand the 1mrack 22mdepen-
-       dency to 1m~> 1.2.122m.
-
-       When you run 1mbundle install22m,  Bundler  notices  that  you  changed	the
-       1mactionpack  22mgem,  but not the 1mactivemerchant 22mgem. It evaluates the gems
-       currently being used to satisfy its requirements:
-
-       1mactivesupport 2.3.80m
-	      also used to satisfy a dependency in  1mactivemerchant22m,  which  is
-	      not being updated
-
-       1mrack ~> 1.1.00m
-	      not currently being used to satisfy another dependency
-
-       Because	you did not explicitly ask to update 1mactivemerchant22m, you would
-       not expect it to suddenly stop working after updating 1mactionpack22m.  How-
-       ever,  satisfying  the new 1mactivesupport 3.0.0.rc 22mdependency of action-
-       pack requires updating one of its dependencies.
-
-       Even though 1mactivemerchant 22mdeclares a very loose dependency that  theo-
-       retically  matches  1mactivesupport 3.0.0.rc22m, Bundler treats gems in your
-       Gemfile(5) that have not changed as an atomic unit together with  their
-       dependencies. In this case, the 1mactivemerchant 22mdependency is treated as
-       1mactivemerchant 1.7.1 + activesupport  2.3.822m,  so  1mbundle	install  22mwill
-       report that it cannot update 1mactionpack22m.
-
-       To explicitly update 1mactionpack22m, including its dependencies which other
-       gems in the Gemfile(5) still depend on, run  1mbundle  update  actionpack0m
-       (see 1mbundle update(1)22m).
-
-       1mSummary22m:  In  general,  after  making  a change to the Gemfile(5) , you
-       should first try to run 1mbundle install22m, 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) 4mbundle-update.1.html24m.
-
-1mSEE ALSO0m
-       o   Gem				install 			  docs
-	   4mhttp://guides.rubygems.org/rubygems-basics/#installing-gems0m
-
-       o   Rubygems signing docs 4mhttp://guides.rubygems.org/security/0m
-
-
-
-
-
-
-				 December 2018		     BUNDLE-INSTALL(1)
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
deleted file mode 100644
index a9e375c87c..0000000000
--- a/man/bundle-install.ronn
+++ /dev/null
@@ -1,378 +0,0 @@
-bundle-install(1) -- Install the dependencies specified in your Gemfile
-=======================================================================
-
-## SYNOPSIS
-
-`bundle install` [--binstubs[=DIRECTORY]]
-                 [--clean]
-                 [--deployment]
-                 [--force]
-                 [--frozen]
-                 [--full-index]
-                 [--gemfile=GEMFILE]
-                 [--jobs=NUMBER]
-                 [--local]
-                 [--no-cache]
-                 [--no-prune]
-                 [--path PATH]
-                 [--quiet]
-                 [--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
-
-To apply any of `--binstubs`, `--deployment`, `--path`, or `--without` every
-time `bundle install` is run, use `bundle config` (see bundle-config(1)).
-
-* `--binstubs[=<directory>]`:
-  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.
-
-* `--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.
-
-* `--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.
-
-* `--force`:
-  Force download every gem, even if the required versions are already available
-  locally. `--redownload` is an alias of this option.
-
-* `--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.
-
-* `--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 a
-  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.
-
-* `--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.
-
-* `--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.
-
-* `--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`.
-
-* `--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.
-
-* `--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.
-
-## 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/man/bundle-list.1 b/man/bundle-list.1
deleted file mode 100644
index c41948f1b5..0000000000
--- a/man/bundle-list.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-LIST" "1" "November 2018" "" ""
-.
-.SH "NAME"
-\fBbundle\-list\fR \- List all the gems in the bundle
-.
-.SH "SYNOPSIS"
-\fBbundle list\fR [\-\-name\-only] [\-\-paths] [\-\-without\-group=GROUP] [\-\-only\-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 \-\-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\fR
-Print all gems expect from a group\.
-.
-.TP
-\fB\-\-only\-group\fR
-Print gems from a particular group\.
-
diff --git a/man/bundle-list.1.txt b/man/bundle-list.1.txt
deleted file mode 100644
index aa20d4ebea..0000000000
--- a/man/bundle-list.1.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-BUNDLE-LIST(1)							BUNDLE-LIST(1)
-
-
-
-1mNAME0m
-       1mbundle-list 22m- List all the gems in the bundle
-
-1mSYNOPSIS0m
-       1mbundle    list    22m[--name-only]    [--paths]    [--without-group=GROUP]
-       [--only-group=GROUP]
-
-1mDESCRIPTION0m
-       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 --paths
-
-1mOPTIONS0m
-       1m--name-only0m
-	      Print only the name of each gem.
-
-       1m--paths0m
-	      Print the path to each gem in the bundle.
-
-       1m--without-group0m
-	      Print all gems expect from a group.
-
-       1m--only-group0m
-	      Print gems from a particular group.
-
-
-
-
-				 November 2018			BUNDLE-LIST(1)
diff --git a/man/bundle-list.ronn b/man/bundle-list.ronn
deleted file mode 100644
index 120cf5e307..0000000000
--- a/man/bundle-list.ronn
+++ /dev/null
@@ -1,33 +0,0 @@
-bundle-list(1) -- List all the gems in the bundle
-=========================================================================
-
-## SYNOPSIS
-
-`bundle list` [--name-only] [--paths] [--without-group=GROUP] [--only-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 --paths
-
-## OPTIONS
-
-* `--name-only`:
-  Print only the name of each gem.
-* `--paths`:
-  Print the path to each gem in the bundle.
-* `--without-group`:
-  Print all gems expect from a group.
-* `--only-group`:
-  Print gems from a particular group.
diff --git a/man/bundle-lock.1 b/man/bundle-lock.1
deleted file mode 100644
index 03b7e8f9cc..0000000000
--- a/man/bundle-lock.1
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-LOCK" "1" "November 2018" "" ""
-.
-.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/man/bundle-lock.1.txt b/man/bundle-lock.1.txt
deleted file mode 100644
index 2c757f0201..0000000000
--- a/man/bundle-lock.1.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-BUNDLE-LOCK(1)							BUNDLE-LOCK(1)
-
-
-
-1mNAME0m
-       1mbundle-lock 22m- Creates / Updates a lockfile without installing
-
-1mSYNOPSIS0m
-       1mbundle    lock   22m[--update]   [--local]   [--print]   [--lockfile=PATH]
-       [--full-index] [--add-platform] [--remove-platform] [--patch] [--minor]
-       [--major] [--strict] [--conservative]
-
-1mDESCRIPTION0m
-       Lock the gems specified in Gemfile.
-
-1mOPTIONS0m
-       1m--update=<*gems>0m
-	      Ignores  the  existing  lockfile. Resolve then updates lockfile.
-	      Taking a list of gems or updating all gems if no list is given.
-
-       1m--local0m
-	      Do not attempt to connect to 1mrubygems.org22m. Instead, Bundler will
-	      use  the	gems  already  present	in  Rubygems' cache or in 1mven-0m
-	      1mdor/cache22m. Note that  if  a	appropriate  platform-specific	gem
-	      exists on 1mrubygems.org 22mit will not be found.
-
-       1m--print0m
-	      Prints  the  lockfile  to  STDOUT instead of writing to the file
-	      system.
-
-       1m--lockfile=<path>0m
-	      The path where the lockfile should be written to.
-
-       1m--full-index0m
-	      Fall back to using the single-file index of all gems.
-
-       1m--add-platform0m
-	      Add a new platform to the lockfile, re-resolving for  the  addi-
-	      tion of that platform.
-
-       1m--remove-platform0m
-	      Remove a platform from the lockfile.
-
-       1m--patch0m
-	      If updating, prefer updating only to next patch version.
-
-       1m--minor0m
-	      If updating, prefer updating only to next minor version.
-
-       1m--major0m
-	      If updating, prefer updating to next major version (default).
-
-       1m--strict0m
-	      If  updating,  do  not  allow  any gem to be updated past latest
-	      --patch | --minor | --major.
-
-       1m--conservative0m
-	      If updating, use bundle install conservative update behavior and
-	      do not allow shared dependencies to be updated.
-
-1mUPDATING ALL GEMS0m
-       If  you	run  1mbundle  lock  22mwith  1m--update 22moption 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.
-
-1mUPDATING A LIST OF GEMS0m
-       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
-       1mGemfile.lock22m.
-
-       For instance, you  only	want  to  update  1mnokogiri22m,  run  1mbundle  lock0m
-       1m--update nokogiri22m.
-
-       Bundler will update 1mnokogiri 22mand any of its dependencies, but leave the
-       rest of the gems that you specified locked to the versions in the  1mGem-0m
-       1mfile.lock22m.
-
-1mSUPPORTING OTHER PLATFORMS0m
-       If  you want your bundle to support platforms other than the one you're
-       running locally, you can run 1mbundle lock --add-platform PLATFORM 22mto 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 1mgem help platform22m.
-
-1mPATCH LEVEL OPTIONS0m
-       See bundle update(1) 4mbundle-update.1.html24m for details.
-
-
-
-				 November 2018			BUNDLE-LOCK(1)
diff --git a/man/bundle-lock.ronn b/man/bundle-lock.ronn
deleted file mode 100644
index 3aa5920f5a..0000000000
--- a/man/bundle-lock.ronn
+++ /dev/null
@@ -1,94 +0,0 @@
-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/man/bundle-open.1 b/man/bundle-open.1
deleted file mode 100644
index 6301cb1fbc..0000000000
--- a/man/bundle-open.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-OPEN" "1" "November 2018" "" ""
-.
-.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/man/bundle-open.1.txt b/man/bundle-open.1.txt
deleted file mode 100644
index 833744ae5e..0000000000
--- a/man/bundle-open.1.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-BUNDLE-OPEN(1)							BUNDLE-OPEN(1)
-
-
-
-1mNAME0m
-       1mbundle-open 22m- Opens the source directory for a gem in your bundle
-
-1mSYNOPSIS0m
-       1mbundle open 22m[GEM]
-
-1mDESCRIPTION0m
-       Opens the source directory of the provided GEM in your editor.
-
-       For  this to work the 1mEDITOR 22mor 1mBUNDLER_EDITOR 22menvironment variable has
-       to be set.
-
-       Example:
-
-
-
-	   bundle open 'rack'
-
-
-
-       Will open the source directory for the 'rack' gem in your bundle.
-
-
-
-				 November 2018			BUNDLE-OPEN(1)
diff --git a/man/bundle-open.ronn b/man/bundle-open.ronn
deleted file mode 100644
index 497beac93f..0000000000
--- a/man/bundle-open.ronn
+++ /dev/null
@@ -1,19 +0,0 @@
-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/man/bundle-outdated.1 b/man/bundle-outdated.1
deleted file mode 100644
index cde4bb09a1..0000000000
--- a/man/bundle-outdated.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-OUTDATED" "1" "November 2018" "" ""
-.
-.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/man/bundle-outdated.1.txt b/man/bundle-outdated.1.txt
deleted file mode 100644
index 00779962fc..0000000000
--- a/man/bundle-outdated.1.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-BUNDLE-OUTDATED(1)					    BUNDLE-OUTDATED(1)
-
-
-
-1mNAME0m
-       1mbundle-outdated 22m- List installed gems with newer versions available
-
-1mSYNOPSIS0m
-       1mbundle   outdated   22m[GEM]	[--local]   [--pre]  [--source]  [--strict]
-       [--parseable	|     --porcelain]     [--group=GROUP]	    [--groups]
-       [--update-strict]  [--patch|--minor|--major]  [--filter-major]  [--fil-
-       ter-minor] [--filter-patch] [--only-explicit]
-
-1mDESCRIPTION0m
-       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.
-
-1mOPTIONS0m
-       1m--local0m
-	      Do not attempt to fetch gems remotely  and  use  the  gem  cache
-	      instead.
-
-       1m--pre	22mCheck for newer pre-release gems.
-
-       1m--source0m
-	      Check against a specific source.
-
-       1m--strict0m
-	      Only list newer versions allowed by your Gemfile requirements.
-
-       1m--parseable22m, 1m--porcelain0m
-	      Use minimal formatting for more parseable output.
-
-       1m--group0m
-	      List gems from a specific group.
-
-       1m--groups0m
-	      List gems organized by groups.
-
-       1m--update-strict0m
-	      Strict  conservative  resolution,  do  not  allow  any gem to be
-	      updated past latest --patch | --minor| --major.
-
-       1m--minor0m
-	      Prefer updating only to next minor version.
-
-       1m--major0m
-	      Prefer updating to next major version (default).
-
-       1m--patch0m
-	      Prefer updating only to next patch version.
-
-       1m--filter-major0m
-	      Only list major newer versions.
-
-       1m--filter-minor0m
-	      Only list minor newer versions.
-
-       1m--filter-patch0m
-	      Only list patch newer versions.
-
-       1m--only-explicit0m
-	      Only list gems specified in your Gemfile,  not  their  dependen-
-	      cies.
-
-1mPATCH LEVEL OPTIONS0m
-       See bundle update(1) 4mbundle-update.1.html24m for details.
-
-       One  difference	between  the  patch level options in 1mbundle update 22mand
-       here is the 1m--strict 22moption. 1m--strict 22mwas already an option on outdated
-       before the patch level options were added. 1m--strict 22mwasn't altered, and
-       the 1m--update-strict 22moption on 1moutdated 22mreflects what 1m--strict  22mdoes  on
-       1mbundle update22m.
-
-1mFILTERING OUTPUT0m
-       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"
-
-
-
-       1m--filter-major 22mwould only show:
-
-
-
-	   * hashie (newest 3.4.6, installed 1.2.0, requested = 1.2.0) in groups "default"
-
-
-
-       1m--filter-minor 22mwould only show:
-
-
-
-	   * headless (newest 2.3.1, installed 2.2.3) in groups "test"
-
-
-
-       1m--filter-patch 22mwould only show:
-
-
-
-	   * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
-
-
-
-       Filter options can be combined. 1m--filter-minor 22mand 1m--filter-patch 22mwould
-       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 1mfilter 22moptions would be the same result as provid-
-       ing none of them.
-
-
-
-				 November 2018		    BUNDLE-OUTDATED(1)
diff --git a/man/bundle-outdated.ronn b/man/bundle-outdated.ronn
deleted file mode 100644
index a991d23789..0000000000
--- a/man/bundle-outdated.ronn
+++ /dev/null
@@ -1,111 +0,0 @@
-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/man/bundle-package.1 b/man/bundle-package.1
deleted file mode 100644
index db0447be83..0000000000
--- a/man/bundle-package.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PACKAGE" "1" "November 2018" "" ""
-.
-.SH "NAME"
-\fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application
-.
-.SH "SYNOPSIS"
-\fBbundle package\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"
-Since Bundler 1\.2, the \fBbundle package\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 1\.8 and newer support 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 package(1) \fIbundle\-package\.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 package\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 package\fR on an identical machine and check in the gems\. For instance, you can run \fBbundle package\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 package(1) \fIbundle\-package\.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 package \-\-no\-install\fR\.
diff --git a/man/bundle-package.1.txt b/man/bundle-package.1.txt
deleted file mode 100644
index e581e94507..0000000000
--- a/man/bundle-package.1.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-BUNDLE-PACKAGE(1)					     BUNDLE-PACKAGE(1)
-
-
-
-1mNAME0m
-       1mbundle-package 22m- Package your needed 1m.gem 22mfiles into your application
-
-1mSYNOPSIS0m
-       1mbundle package0m
-
-1mDESCRIPTION0m
-       Copy  all of the 1m.gem 22mfiles needed to run the application into the 1mven-0m
-       1mdor/cache   22mdirectory.   In   the	future,   when	 running    [bundle
-       install(1)][bundle-install], use the gems in the cache in preference to
-       the ones on 1mrubygems.org22m.
-
-1mGIT AND PATH GEMS0m
-       Since Bundler 1.2, the 1mbundle package 22mcommand can also package 1m:git 22mand
-       1m:path	22mdependencies  besides  .gem	files.	This needs to be explicitly
-       enabled via the 1m--all 22moption. Once	used,  the  1m--all  22moption	will  be
-       remembered.
-
-1mSUPPORT FOR MULTIPLE PLATFORMS0m
-       When  using  gems that have different packages for different platforms,
-       Bundler 1.8 and newer support caching of gems for other platforms where
-       the  Gemfile  has  been resolved (i.e. present in the lockfile) in 1mven-0m
-       1mdor/cache22m. This needs to be enabled  via  the  1m--all-platforms  22moption.
-       This setting will be remembered in your local bundler configuration.
-
-1mREMOTE FETCHING0m
-       By  default, if you run 1mbundle install(1)22m](bundle-install.1.html) after
-       running bundle package(1)  4mbundle-package.1.html24m,  bundler	will  still
-       connect to 1mrubygems.org 22mto check whether a platform-specific gem exists
-       for any of the gems in 1mvendor/cache22m.
-
-       For instance, consider this Gemfile(5):
-
-
-
-	   source "https://rubygems.org"
-
-	   gem "nokogiri"
-
-
-
-       If you run 1mbundle package 22munder C Ruby, bundler will retrieve the  ver-
-       sion  of  1mnokogiri  22mfor the 1m"ruby" 22mplatform. If you deploy to JRuby and
-       run 1mbundle install22m, bundler is forced to check to see whether a  1m"java"0m
-       platformed 1mnokogiri 22mexists.
-
-       Even  though  the  1mnokogiri  22mgem  for  the Ruby platform is 4mtechnically0m
-       acceptable on JRuby, it has a C extension that does not run  on	JRuby.
-       As a result, bundler will, by default, still connect to 1mrubygems.org 22mto
-       check whether it has a version of one of your  gems  more  specific  to
-       your platform.
-
-       This  problem  is  also	not  limited to the 1m"java" 22mplatform. 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 1mvendor/cache 22mare appro-
-       priate for the platform you are on, you can run 1mbundle install  --local0m
-       to  skip  checking  for more appropriate gems, and use the ones in 1mven-0m
-       1mdor/cache22m.
-
-       One way to be sure that you have the right platformed versions  of  all
-       your gems is to run 1mbundle package 22mon an identical machine and check in
-       the gems. For instance, you can run  1mbundle  package  22mon  an  identical
-       staging	box during your staging process, and check in the 1mvendor/cache0m
-       before deploying to production.
-
-       By default, bundle package(1) 4mbundle-package.1.html24m  fetches  and  also
-       installs  the gems to the default location. To package the dependencies
-       to 1mvendor/cache 22mwithout installing them to the local install  location,
-       you can run 1mbundle package --no-install22m.
-
-
-
-				 November 2018		     BUNDLE-PACKAGE(1)
diff --git a/man/bundle-package.ronn b/man/bundle-package.ronn
deleted file mode 100644
index bc137374da..0000000000
--- a/man/bundle-package.ronn
+++ /dev/null
@@ -1,72 +0,0 @@
-bundle-package(1) -- Package your needed `.gem` files into your application
-===========================================================================
-
-## SYNOPSIS
-
-`bundle package`
-
-## 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
-
-Since Bundler 1.2, the `bundle package` 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
-1.8 and newer support 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 package(1)](bundle-package.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 package` 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 package` on an identical
-machine and check in the gems. For instance, you can run
-`bundle package` on an identical staging box during your
-staging process, and check in the `vendor/cache` before
-deploying to production.
-
-By default, [bundle package(1)](bundle-package.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 package --no-install`.
diff --git a/man/bundle-platform.1 b/man/bundle-platform.1
deleted file mode 100644
index 94b5e13cc1..0000000000
--- a/man/bundle-platform.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PLATFORM" "1" "November 2018" "" ""
-.
-.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/man/bundle-platform.1.txt b/man/bundle-platform.1.txt
deleted file mode 100644
index 26079cc3d5..0000000000
--- a/man/bundle-platform.1.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-BUNDLE-PLATFORM(1)					    BUNDLE-PLATFORM(1)
-
-
-
-1mNAME0m
-       1mbundle-platform 22m- Displays platform compatibility information
-
-1mSYNOPSIS0m
-       1mbundle platform 22m[--ruby]
-
-1mDESCRIPTION0m
-       1mplatform  22mwill 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 1mbundle platform 22mon 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.
-
-
-
-       1mplatform  22mwill  list  all the platforms in your 1mGemfile.lock 22mas well as
-       the 1mruby 22mdirective if applicable from your Gemfile(5). It will also let
-       you know if the 1mruby 22mdirective requirement has been met. If 1mruby 22mdirec-
-       tive doesn't match the running Ruby VM, it will tell you what part does
-       not.
-
-1mOPTIONS0m
-       1m--ruby 22mIt  will  display  the  ruby directive information, so you don't
-	      have to parse it from the Gemfile(5).
-
-
-
-
-				 November 2018		    BUNDLE-PLATFORM(1)
diff --git a/man/bundle-platform.ronn b/man/bundle-platform.ronn
deleted file mode 100644
index b5d3283fb6..0000000000
--- a/man/bundle-platform.ronn
+++ /dev/null
@@ -1,42 +0,0 @@
-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/man/bundle-pristine.1 b/man/bundle-pristine.1
deleted file mode 100644
index d3881ade3d..0000000000
--- a/man/bundle-pristine.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PRISTINE" "1" "November 2018" "" ""
-.
-.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/man/bundle-pristine.1.txt b/man/bundle-pristine.1.txt
deleted file mode 100644
index a46f3c830c..0000000000
--- a/man/bundle-pristine.1.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-BUNDLE-PRISTINE(1)					    BUNDLE-PRISTINE(1)
-
-
-
-1mNAME0m
-       1mbundle-pristine 22m- Restores installed gems to their pristine condition
-
-1mSYNOPSIS0m
-       1mbundle pristine0m
-
-1mDESCRIPTION0m
-       1mpristine  22mrestores	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,  1mbundle  pristine  22mignores unpacked files on
-       disk. In other words, this command utilizes the local 1m.gem 22mcache 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
-       1mpristine22m. One also cannot use 1mbundle pristine 22mon  gems  with  a  'path'
-       option  in  the	Gemfile,  because  bundler has no original copy it can
-       restore from.
-
-       When is it practical to use 1mbundle pristine22m?
-
-       It comes in handy when a developer is debugging a gem. 1mbundle	pristine0m
-       is a great way to get rid of experimental changes to a gem that one may
-       not want.
-
-       Why use 1mbundle pristine 22mover 1mgem pristine --all22m?
-
-       Both commands are very similar. For context: 1mbundle  pristine22m,  without
-       arguments,  cleans  all gems from the lockfile. Meanwhile, 1mgem pristine0m
-       1m--all 22mcleans all installed gems for that Ruby version.
-
-       If a developer forgets which gems in their project they might have been
-       debugging,  the Rubygems 1mgem pristine [GEMNAME] 22mcommand may be inconve-
-       nient. One can avoid waiting for 1mgem pristine --all22m,  and  instead	run
-       1mbundle pristine22m.
-
-
-
-				 November 2018		    BUNDLE-PRISTINE(1)
diff --git a/man/bundle-pristine.ronn b/man/bundle-pristine.ronn
deleted file mode 100644
index e2d6b6a348..0000000000
--- a/man/bundle-pristine.ronn
+++ /dev/null
@@ -1,34 +0,0 @@
-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/man/bundle-remove.1 b/man/bundle-remove.1
deleted file mode 100644
index 8232ab2887..0000000000
--- a/man/bundle-remove.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-REMOVE" "1" "November 2018" "" ""
-.
-.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/man/bundle-remove.1.txt b/man/bundle-remove.1.txt
deleted file mode 100644
index 2cf2ba6010..0000000000
--- a/man/bundle-remove.1.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-BUNDLE-REMOVE(1)					      BUNDLE-REMOVE(1)
-
-
-
-1mNAME0m
-       1mbundle-remove 22m- Removes gems from the Gemfile
-
-1mSYNOPSIS0m
-       1mbundle remove [GEM [GEM ...]] [--install]0m
-
-1mDESCRIPTION0m
-       Removes the given gems from the Gemfile while ensuring that the result-
-       ing 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.
-
-1mOPTIONS0m
-       1m--install0m
-	      Runs 1mbundle install 22mafter 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
-
-
-
-				 November 2018		      BUNDLE-REMOVE(1)
diff --git a/man/bundle-remove.ronn b/man/bundle-remove.ronn
deleted file mode 100644
index 40a239b4a2..0000000000
--- a/man/bundle-remove.ronn
+++ /dev/null
@@ -1,23 +0,0 @@
-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/man/bundle-show.1 b/man/bundle-show.1
deleted file mode 100644
index 72ce37aedd..0000000000
--- a/man/bundle-show.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-SHOW" "1" "November 2018" "" ""
-.
-.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/man/bundle-show.1.txt b/man/bundle-show.1.txt
deleted file mode 100644
index 542ee55f78..0000000000
--- a/man/bundle-show.1.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-BUNDLE-SHOW(1)							BUNDLE-SHOW(1)
-
-
-
-1mNAME0m
-       1mbundle-show 22m- Shows all the gems in your bundle, or the path to a gem
-
-1mSYNOPSIS0m
-       1mbundle show 22m[GEM] [--paths]
-
-1mDESCRIPTION0m
-       Without	the [GEM] option, 1mshow 22mwill print a list of the names and ver-
-       sions of all gems that are required by  your  [1mGemfile(5)22m][Gemfile(5)],
-       sorted by name.
-
-       Calling	show  with  [GEM]  will list the exact location of that gem on
-       your machine.
-
-1mOPTIONS0m
-       1m--paths0m
-	      List the paths of all gems  that	are  required  by  your  [1mGem-0m
-	      1mfile(5)22m][Gemfile(5)], sorted by gem name.
-
-
-
-
-				 November 2018			BUNDLE-SHOW(1)
diff --git a/man/bundle-show.ronn b/man/bundle-show.ronn
deleted file mode 100644
index a6a59a1445..0000000000
--- a/man/bundle-show.ronn
+++ /dev/null
@@ -1,21 +0,0 @@
-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/man/bundle-update.1 b/man/bundle-update.1
deleted file mode 100644
index 1fe205cff0..0000000000
--- a/man/bundle-update.1
+++ /dev/null
@@ -1,394 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-UPDATE" "1" "December 2018" "" ""
-.
-.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] [\-\-force] [\-\-patch|\-\-minor|\-\-major] [\-\-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\-\-force\fR
-Force downloading every gem\. \fB\-\-redownload\fR is an alias of this option\.
-.
-.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 shared 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 shared 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 shared 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/man/bundle-update.1.txt b/man/bundle-update.1.txt
deleted file mode 100644
index 1a206e2c49..0000000000
--- a/man/bundle-update.1.txt
+++ /dev/null
@@ -1,391 +0,0 @@
-BUNDLE-UPDATE(1)					      BUNDLE-UPDATE(1)
-
-
-
-1mNAME0m
-       1mbundle-update 22m- Update your gems to the latest available versions
-
-1mSYNOPSIS0m
-       1mbundle  update  4m22m*gems24m	[--all] [--group=NAME] [--source=NAME] [--local]
-       [--ruby] [--bundler[=VERSION]] [--full-index]  [--jobs=JOBS]  [--quiet]
-       [--force] [--patch|--minor|--major] [--strict] [--conservative]
-
-1mDESCRIPTION0m
-       Update  the  gems specified (all gems, if 1m--all 22mflag is used), ignoring
-       the previously installed gems specified in the  1mGemfile.lock22m.  In  gen-
-       eral, you should use bundle install(1) 4mbundle-install.1.html24m to install
-       the same exact gems and versions across machines.
-
-       You would use 1mbundle update 22mto explicitly update the version of a gem.
-
-1mOPTIONS0m
-       1m--all	22mUpdate all gems specified in Gemfile.
-
-       1m--group=<name>22m, 1m-g=[<name>]0m
-	      Only update the gems in the specified group. For	instance,  you
-	      can  update all gems in the development group with 1mbundle update0m
-	      1m--group development22m. You  can  also	call  1mbundle	update	rails0m
-	      1m--group  test  22mto  update the rails gem and all gems in the test
-	      group, for example.
-
-       1m--source=<name>0m
-	      The name of a 1m:git 22mor 1m:path 22msource used in the	Gemfile(5).  For
-	      instance,        with	   a	    1m:git	 22msource	 of
-	      1mhttp://github.com/rails/rails.git22m, you would call 1mbundle  update0m
-	      1m--source rails0m
-
-       1m--local0m
-	      Do  not  attempt	to  fetch  gems remotely and use the gem cache
-	      instead.
-
-       1m--ruby 22mUpdate the locked version of Ruby  to  the  current	version  of
-	      Ruby.
-
-       1m--bundler0m
-	      Update the locked version of bundler to the invoked bundler ver-
-	      sion.
-
-       1m--full-index0m
-	      Fall back to using the single-file index of all gems.
-
-       1m--jobs=[<number>]22m, 1m-j[<number>]0m
-	      Specify the number of jobs to run in parallel. The default is 1m122m.
-
-       1m--retry=[<number>]0m
-	      Retry failed network or git requests for 4mnumber24m times.
-
-       1m--quiet0m
-	      Only output warnings and errors.
-
-       1m--force0m
-	      Force downloading every gem. 1m--redownload 22mis an  alias  of  this
-	      option.
-
-       1m--patch0m
-	      Prefer updating only to next patch version.
-
-       1m--minor0m
-	      Prefer updating only to next minor version.
-
-       1m--major0m
-	      Prefer updating to next major version (default).
-
-       1m--strict0m
-	      Do not allow any gem to be updated past latest 1m--patch 22m| 1m--minor0m
-	      | 1m--major22m.
-
-       1m--conservative0m
-	      Use bundle install conservative update behavior and do not allow
-	      shared dependencies to be updated.
-
-1mUPDATING ALL GEMS0m
-       If  you	run  1mbundle  update  --all22m, 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) 4mbundle-install.1.html24m 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 1mGemfile.lock22m. The next time you run
-       bundle install(1) 4mbundle-install.1.html24m, bundler skips  the  dependency
-       resolution and installs the same gems as it installed last time.
-
-       After  checking in the 1mGemfile.lock 22minto version control and cloning it
-       on another machine,  running  bundle  install(1)  4mbundle-install.1.html0m
-       will  4mstill24m  install  the  gems that you installed last time. You don't
-       need to worry that a new release of 1merubis 22mor 1mmail 22mchanges 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  Gem-
-       file(5).
-
-       To  do  this,  run  1mbundle  update  --all22m,	which  will ignore the 1mGem-0m
-       1mfile.lock22m, 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 1mbundle update --all22m.
-
-1mUPDATING A LIST OF GEMS0m
-       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
-       1mGemfile.lock22m.
-
-       For  instance,  in  the	scenario above, imagine that 1mnokogiri 22mreleases
-       version 1m1.4.422m, and you want to update it 4mwithout24m updating Rails and all
-       of its dependencies. To do this, run 1mbundle update nokogiri22m.
-
-       Bundler	will  update  1mnokogiri  22mand any of its dependencies, but leave
-       alone Rails and its dependencies.
-
-1mOVERLAPPING DEPENDENCIES0m
-       Sometimes, multiple gems declared in your Gemfile(5) are  satisfied  by
-       the  same  second-level	dependency. For instance, consider the case of
-       1mthin 22mand 1mrack-perftools-profiler22m.
-
-
-
-	   source "https://rubygems.org"
-
-	   gem "thin"
-	   gem "rack-perftools-profiler"
-
-
-
-       The 1mthin 22mgem depends on  1mrack  >=  1.022m,  while  1mrack-perftools-profiler0m
-       depends on 1mrack ~> 1.022m. 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 1mrack 22min common. If you  run  1mbundle  update  thin22m,  bundler  will
-       update  1mdaemons22m, 1meventmachine 22mand 1mrack22m, which are dependencies of 1mthin22m,
-       but  not   1mopen4   22mor   1mperftools.rb22m,	 which	 are   dependencies   of
-       1mrack-perftools_profiler22m.  Note that 1mbundle update thin 22mwill update 1mrack0m
-       even though it's 4malso24m a dependency of 1mrack-perftools_profiler22m.
-
-       In short, by default, when  you	update	a  gem	using  1mbundle  update22m,
-       bundler	will update all dependencies of that gem, including those that
-       are also dependencies of another gem.
-
-       To prevent updating shared dependencies, prior to version 1.14 the only
-       option was the 1mCONSERVATIVE UPDATING 22mbehavior in bundle install(1) 4mbun-0m
-       4mdle-install.1.html24m:
-
-       In this scenario, updating the 1mthin 22mversion manually in the Gemfile(5),
-       and  then  running  bundle  install(1)  4mbundle-install.1.html24m will only
-       update 1mdaemons 22mand 1meventmachine22m, but not 1mrack22m.  For  more  information,
-       see  the  1mCONSERVATIVE  UPDATING  22msection  of  bundle  install(1)  4mbun-0m
-       4mdle-install.1.html24m.
-
-       Starting with 1.14, specifying the 1m--conservative 22moption will also pre-
-       vent shared dependencies from being updated.
-
-1mPATCH LEVEL OPTIONS0m
-       Version	1.14  introduced 4 patch-level options that will influence how
-       gem versions are resolved. One of the following options	can  be  used:
-       1m--patch22m, 1m--minor 22mor 1m--major22m. 1m--strict 22mcan be added to further influence
-       resolution.
-
-       1m--patch0m
-	      Prefer updating only to next patch version.
-
-       1m--minor0m
-	      Prefer updating only to next minor version.
-
-       1m--major0m
-	      Prefer updating to next major version (default).
-
-       1m--strict0m
-	      Do not allow any gem to be updated past latest 1m--patch 22m| 1m--minor0m
-	      | 1m--major22m.
-
-       When  Bundler  is  resolving  what  versions to use to satisfy declared
-       requirements in the Gemfile or in parent gems, it looks up  all	avail-
-       able versions, filters out any versions that don't satisfy the require-
-       ment, and then, by default, sorts them from newest to oldest, consider-
-       ing them in that order.
-
-       Providing  one  of  the	patch level options (e.g. 1m--patch22m) changes the
-       sort order of the satisfying versions, causing Bundler to consider  the
-       latest 1m--patch 22mor 1m--minor 22mversion 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 (1m--major22m) will be
-       "2.0.0, 1.1.1, 1.1.0, 1.0.4, 1.0.3, 1.0.2".
-
-       If the 1m--patch 22moption 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	1m--minor 22moption 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 1m--strict 22moption 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 1m--patch 22mand 1m--strict  22moptions
-       are used, the available versions for resolution would be "1.0.4, 1.0.3,
-       1.0.2". If 1m--minor 22mand 1m--strict 22mare 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 require-
-       ment  for 1mfoo 22min the Gemfile is '~> 1.0', that will accomplish the same
-       thing as providing the 1m--minor 22mand 1m--strict 22moptions.
-
-1mPATCH LEVEL EXAMPLES0m
-       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.
-
-1mRECOMMENDED WORKFLOW0m
-       In general, when working with an application managed with bundler,  you
-       should use the following workflow:
-
-       o   After you create your Gemfile(5) for the first time, run
-
-	   $ bundle install
-
-       o   Check the resulting 1mGemfile.lock 22minto version control
-
-	   $ git add Gemfile.lock
-
-       o   When  checking  out this repository on another development machine,
-	   run
-
-	   $ bundle install
-
-       o   When checking out this repository on a deployment machine, run
-
-	   $ bundle install --deployment
-
-       o   After changing the Gemfile(5) to reflect a  new  or	update	depen-
-	   dency, run
-
-	   $ bundle install
-
-       o   Make sure to check the updated 1mGemfile.lock 22minto version control
-
-	   $ git add Gemfile.lock
-
-       o   If bundle install(1) 4mbundle-install.1.html24m reports a conflict, man-
-	   ually update the specific gems that you changed in the Gemfile(5)
-
-	   $ bundle update rails thin
-
-       o   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
-
-
-
-
-
-
-				 December 2018		      BUNDLE-UPDATE(1)
diff --git a/man/bundle-update.ronn b/man/bundle-update.ronn
deleted file mode 100644
index 481bb5b14e..0000000000
--- a/man/bundle-update.ronn
+++ /dev/null
@@ -1,350 +0,0 @@
-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]
-                        [--force]
-                        [--patch|--minor|--major]
-                        [--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.
-
-* `--force`:
-  Force downloading every gem. `--redownload` is an alias of this option.
-
-* `--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 shared 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 shared 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 shared
-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/man/bundle-viz.1 b/man/bundle-viz.1
deleted file mode 100644
index 70ad6835ee..0000000000
--- a/man/bundle-viz.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-VIZ" "1" "November 2018" "" ""
-.
-.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/man/bundle-viz.1.txt b/man/bundle-viz.1.txt
deleted file mode 100644
index ada88d89c6..0000000000
--- a/man/bundle-viz.1.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-BUNDLE-VIZ(1)							 BUNDLE-VIZ(1)
-
-
-
-1mNAME0m
-       1mbundle-viz 22m- Generates a visual dependency graph for your Gemfile
-
-1mSYNOPSIS0m
-       1mbundle viz 22m[--file=FILE] [--format=FORMAT] [--requirements] [--version]
-       [--without=GROUP GROUP]
-
-1mDESCRIPTION0m
-       1mviz 22mgenerates a PNG file of the  current  1mGemfile(5)  22mas  a  dependency
-       graph. 1mviz 22mrequires the ruby-graphviz gem (and its dependencies).
-
-       The  associated	gems must also be installed via 1mbundle install(1) 4m22mbun-0m
-       4mdle-install.1.html24m.
-
-1mOPTIONS0m
-       1m--file22m, 1m-f0m
-	      The name to use for the generated file. See 1m--format 22moption
-
-       1m--format22m, 1m-F0m
-	      This is output format option. Supported format is png, jpg, svg,
-	      dot ...
-
-       1m--requirements22m, 1m-R0m
-	      Set to show the version of each required dependency.
-
-       1m--version22m, 1m-v0m
-	      Set to show each gem version.
-
-       1m--without22m, 1m-W0m
-	      Exclude gems that are part of the specified named group.
-
-
-
-
-				 November 2018			 BUNDLE-VIZ(1)
diff --git a/man/bundle-viz.ronn b/man/bundle-viz.ronn
deleted file mode 100644
index 701df5415e..0000000000
--- a/man/bundle-viz.ronn
+++ /dev/null
@@ -1,30 +0,0 @@
-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/man/bundle.1 b/man/bundle.1
deleted file mode 100644
index abb90154d9..0000000000
--- a/man/bundle.1
+++ /dev/null
@@ -1,132 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE" "1" "November 2018" "" ""
-.
-.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 \fIhttp://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\.hmtl\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
-.
-.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/man/bundle.1.txt b/man/bundle.1.txt
deleted file mode 100644
index 0f38628621..0000000000
--- a/man/bundle.1.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-BUNDLE(1)							     BUNDLE(1)
-
-
-
-1mNAME0m
-       1mbundle 22m- Ruby Dependency Management
-
-1mSYNOPSIS0m
-       1mbundle 22mCOMMAND [--no-color] [--verbose] [ARGS]
-
-1mDESCRIPTION0m
-       Bundler	manages  an 1mapplication's dependencies 22mthrough its entire life
-       across many machines systematically and repeatably.
-
-       See the bundler website 4mhttp://bundler.io24m for  information	on  getting
-       started, and Gemfile(5) for more information on the 1mGemfile 22mformat.
-
-1mOPTIONS0m
-       1m--no-color0m
-	      Print all output without color
-
-       1m--retry22m, 1m-r0m
-	      Specify the number of times you wish to attempt network commands
-
-       1m--verbose22m, 1m-V0m
-	      Print out additional logging information
-
-1mBUNDLE COMMANDS0m
-       We divide 1mbundle 22msubcommands into primary commands and utilities:
-
-1mPRIMARY COMMANDS0m
-       1mbundle install(1) 4m22mbundle-install.1.html0m
-	      Install the gems specified by the 1mGemfile 22mor 1mGemfile.lock0m
-
-       1mbundle update(1) 4m22mbundle-update.1.html0m
-	      Update dependencies to their latest versions
-
-       1mbundle package(1) 4m22mbundle-package.1.html0m
-	      Package  the  .gem  files  required by your application into the
-	      1mvendor/cache 22mdirectory
-
-       1mbundle exec(1) 4m22mbundle-exec.1.html0m
-	      Execute a script in the current bundle
-
-       1mbundle config(1) 4m22mbundle-config.1.html0m
-	      Specify and read configuration options for Bundler
-
-       1mbundle help(1)0m
-	      Display detailed help for each subcommand
-
-1mUTILITIES0m
-       1mbundle add(1) 4m22mbundle-add.1.html0m
-	      Add the named gem to the Gemfile and run 1mbundle install0m
-
-       1mbundle binstubs(1) 4m22mbundle-binstubs.1.html0m
-	      Generate binstubs for executables in a gem
-
-       1mbundle check(1) 4m22mbundle-check.1.html0m
-	      Determine whether the  requirements  for	your  application  are
-	      installed and available to Bundler
-
-       1mbundle show(1) 4m22mbundle-show.1.html0m
-	      Show the source location of a particular gem in the bundle
-
-       1mbundle outdated(1) 4m22mbundle-outdated.1.html0m
-	      Show all of the outdated gems in the current bundle
-
-       1mbundle console(1)0m
-	      Start an IRB session in the current bundle
-
-       1mbundle open(1) 4m22mbundle-open.1.html0m
-	      Open an installed gem in the editor
-
-       1mbundle lock(1) 4m22mbundle-lock.1.hmtl0m
-	      Generate a lockfile for your dependencies
-
-       1mbundle viz(1) 4m22mbundle-viz.1.html0m
-	      Generate a visual representation of your dependencies
-
-       1mbundle init(1) 4m22mbundle-init.1.html0m
-	      Generate a simple 1mGemfile22m, placed in the current directory
-
-       1mbundle gem(1) 4m22mbundle-gem.1.html0m
-	      Create a simple gem, suitable for development with Bundler
-
-       1mbundle platform(1) 4m22mbundle-platform.1.html0m
-	      Display platform compatibility information
-
-       1mbundle clean(1) 4m22mbundle-clean.1.html0m
-	      Clean up unused gems in your Bundler directory
-
-       1mbundle doctor(1) 4m22mbundle-doctor.1.html0m
-	      Display warnings about common problems
-
-1mPLUGINS0m
-       When  running a command that isn't listed in PRIMARY COMMANDS or UTILI-
-       TIES, Bundler will try  to  find  an  executable  on  your  path  named
-       1mbundler-<command>  22mand  execute it, passing down any extra arguments to
-       it.
-
-1mOBSOLETE0m
-       These commands are obsolete and should no longer be used:
-
-       o   1mbundle cache(1)0m
-
-       o   1mbundle show(1)0m
-
-
-
-
-
-
-				 November 2018			     BUNDLE(1)
diff --git a/man/bundle.ronn b/man/bundle.ronn
deleted file mode 100644
index c03201a30c..0000000000
--- a/man/bundle.ronn
+++ /dev/null
@@ -1,108 +0,0 @@
-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](http://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.hmtl):
-  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
-
-## 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/man/erb.1 b/man/erb.1
index d8739a7639..05d8f5634b 100644
--- a/man/erb.1
+++ b/man/erb.1
@@ -1,6 +1,6 @@
 .\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd December 16, 2018
-.Dt ERB \&1 "Ruby Programmer's Reference Guide"
+.Dd November 15, 2012
+.Dt ERB(1) "" "Ruby Programmers Reference Guide"
 .Os UNIX
 .Sh NAME
 .Nm erb
@@ -45,8 +45,9 @@ You can omit the one for internal encodings, then the value
 .Pf ( Li "Encoding.default_internal" ) will be nil.
 .Pp
 .It Fl P
-Disables ruby code evaluation for lines beginning with
-.Li "%" .
+Evaluates lines starting with
+.Li "%"
+as Ruby code and removes the tailing EOLs.
 .Pp
 .It Fl S Ar level
 Specifies the safe level in which eRuby script will run.
@@ -76,8 +77,6 @@ And leading whitespaces are removed if the erb directive starts with
 .Li "<%-" .
 .Pp
 .El
-.It Fl r
-Load a library
 .Pp
 .It Fl U
 can be one of
@@ -144,17 +143,15 @@ class.
 .Pp
 .Sh REPORTING BUGS
 .Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
+.Li Security vulnerabilities should be reported via an email to
+.Aq security@ruby-lang.org Ns
+.Li .
 Reported problems will be published after being fixed.
 .Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
+.Li And you can report other bugs and feature requests via the
+Ruby Issue Tracking System (http://bugs.ruby-lang.org).
 Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immediately.
 .El
 .Sh AUTHORS
 Written by Masatoshi SEKI.
diff --git a/man/gemfile.5 b/man/gemfile.5
deleted file mode 100644
index ccb258f50f..0000000000
--- a/man/gemfile.5
+++ /dev/null
@@ -1,689 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GEMFILE" "5" "November 2018" "" ""
-.
-.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 file you want \fBrequired\fR has 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 "debugger", :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 \fB\-\-without\fR option\. To specify multiple groups to ignore, specify a list of groups separated by spaces\.
-.
-.IP "" 4
-.
-.nf
-
-bundle install \-\-without test
-bundle install \-\-without development test
-.
-.fi
-.
-.IP "" 0
-.
-.P
-After running \fBbundle install \-\-without test\fR, bundler will remember that you excluded the test group in the last installation\. The next time you run \fBbundle install\fR, without any \fB\-\-without option\fR, bundler will recall it\.
-.
-.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 \fIhttp://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
-.
-.TP
-\fBmri\fR
-1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
-.
-.TP
-\fBmingw\fR
-1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
-.
-.TP
-\fBx64_mingw\fR
-2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5
-.
-.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
-.
-.TP
-For example:
-.
-.IP
-git "https://github\.com/rails/rails\.git", :branch => "5\-0\-stable" do
-.
-.IP
-git "https://github\.com/rails/rails\.git", :tag => "v5\.0\.0" do
-.
-.IP
-git "https://github\.com/rails/rails\.git", :ref => "4aded" do
-.
-.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\.
-.
-.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/man/gemfile.5.ronn b/man/gemfile.5.ronn
deleted file mode 100644
index f4772f6d8d..0000000000
--- a/man/gemfile.5.ronn
+++ /dev/null
@@ -1,521 +0,0 @@
-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 file
-you want `required` has 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 "debugger", :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` option. To specify multiple groups to ignore, specify a
-list of groups separated by spaces.
-
-    bundle install --without test
-    bundle install --without development test
-
-After running `bundle install --without test`, bundler will remember that you excluded
-the test group in the last installation. The next time you run `bundle install`,
-without any `--without option`, bundler will recall it.
-
-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](http://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
-  * `mri`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-  * `mingw`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-  * `x64_mingw`:
-    2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-
-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:
-
-      git "https://github.com/rails/rails.git", :branch => "5-0-stable" do
-
-      git "https://github.com/rails/rails.git", :tag => "v5.0.0" do
-
-      git "https://github.com/rails/rails.git", :ref => "4aded" do
-
-  * `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.
-
-### 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/man/gemfile.5.txt b/man/gemfile.5.txt
deleted file mode 100644
index 85ef7135d9..0000000000
--- a/man/gemfile.5.txt
+++ /dev/null
@@ -1,653 +0,0 @@
-GEMFILE(5)							    GEMFILE(5)
-
-
-
-1mNAME0m
-       1mGemfile 22m- A format for describing gem dependencies for Ruby programs
-
-1mSYNOPSIS0m
-       A 1mGemfile 22mdescribes the gem dependencies required to execute associated
-       Ruby code.
-
-       Place the 1mGemfile 22min the root of the directory containing  the  associ-
-       ated  code.  For instance, in a Rails application, place the 1mGemfile 22min
-       the same directory as the 1mRakefile22m.
-
-1mSYNTAX0m
-       A 1mGemfile 22mis evaluated as Ruby code, in a context which makes available
-       a number of methods used to describe the gem requirements.
-
-1mGLOBAL SOURCES0m
-       At the top of the 1mGemfile22m, add a line for the 1mRubygems 22msource that con-
-       tains the gems listed in the 1mGemfile22m.
-
-
-
-	   source "https://rubygems.org"
-
-
-
-       It is possible, but not recommended as of Bundler 1.7, to add  multiple
-       global  1msource  22mlines.  Each  of these 1msource22ms 1mMUST 22mbe a valid Rubygems
-       repository.
-
-       Sources are checked for gems  following	the  heuristics  described  in
-       4mSOURCE24m  4mPRIORITY24m.  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 avail-
-       able. A specific source can be selected for gems that  need  to	use  a
-       non-standard repository, suppressing this warning, by using the 1m:source0m
-       option or a 1msource 22mblock.
-
-   1mCREDENTIALS0m
-       Some gem sources require a username and password. Use bundle  config(1)
-       4mbundle-config.1.html24m  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 1mconfig22m.
-
-1mRUBY0m
-       If your application requires a specific Ruby version or engine, specify
-       your  requirements using the 1mruby 22mmethod, with the following arguments.
-       All parameters are 1mOPTIONAL 22munless otherwise specified.
-
-   1mVERSION (required)0m
-       The version of Ruby that your application requires. If your application
-       requires  an  alternate	Ruby  engine, such as JRuby, Rubinius or Truf-
-       fleRuby, this should be the Ruby version that the engine is  compatible
-       with.
-
-
-
-	   ruby "1.9.3"
-
-
-
-   1mENGINE0m
-       Each  application 4mmay24m specify a Ruby engine. If an engine is specified,
-       an engine version 4mmust24m also be specified.
-
-       What exactly is an Engine? - A Ruby engine is an implementation of  the
-       Ruby language.
-
-       o   For	background:  the  reference  or original implementation of the
-	   Ruby  programming  language	is  called  Matz's  Ruby   Interpreter
-	   4mhttps://en.wikipedia.org/wiki/Ruby_MRI24m,  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.
-
-       o   Other implementations 4mhttps://www.ruby-lang.org/en/about/24m  of  Ruby
-	   exist. Some of the more well-known implementations include Rubinius
-	   4mhttps://rubinius.com/24m, and JRuby 4mhttp://jruby.org/24m. Rubinius is  an
-	   alternative	implementation	of  Ruby  written in Ruby. JRuby is an
-	   implementation of Ruby on the JVM, short for Java Virtual Machine.
-
-
-
-   1mENGINE VERSION0m
-       Each application 4mmay24m specify a Ruby engine version. If an  engine  ver-
-       sion  is  specified, an engine 4mmust24m also be specified. If the engine is
-       "ruby" the engine version specified 4mmust24m match the Ruby version.
-
-
-
-	   ruby "1.8.7", :engine => "jruby", :engine_version => "1.6.7"
-
-
-
-   1mPATCHLEVEL0m
-       Each application 4mmay24m specify a Ruby patchlevel.
-
-
-
-	   ruby "2.0.0", :patchlevel => "247"
-
-
-
-1mGEMS0m
-       Specify gem requirements using the 1mgem 22mmethod, with the following argu-
-       ments. All parameters are 1mOPTIONAL 22munless otherwise specified.
-
-   1mNAME (required)0m
-       For each gem requirement, list a single 4mgem24m line.
-
-
-
-	   gem "nokogiri"
-
-
-
-   1mVERSION0m
-       Each 4mgem24m 1mMAY 22mhave one or more version specifiers.
-
-
-
-	   gem "nokogiri", ">= 1.4.2"
-	   gem "RedCloth", ">= 4.1.0", "< 4.2.0"
-
-
-
-   1mREQUIRE AS0m
-       Each  4mgem24m  1mMAY 22mspecify files that should be used when autorequiring via
-       1mBundler.require22m. You may pass an array with multiple files or  1mtrue  22mif
-       file  you  want	1mrequired  22mhas same name as 4mgem24m or 1mfalse 22mto prevent any
-       file from being autorequired.
-
-
-
-	   gem "redis", :require => ["redis/connection/hiredis", "redis"]
-	   gem "webmock", :require => false
-	   gem "debugger", :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
-
-
-
-   1mGROUPS0m
-       Each  4mgem24m  1mMAY  22mspecify  membership in one or more groups. Any 4mgem24m that
-       does not specify membership in any  group  is  placed  in  the  1mdefault0m
-       group.
-
-
-
-	   gem "rspec", :group => :test
-	   gem "wirble", :groups => [:development, :test]
-
-
-
-       The  Bundler  runtime  allows  its  two main methods, 1mBundler.setup 22mand
-       1mBundler.require22m, 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  1mbun-0m
-       1mdle  install  22mshould  not install with the 1m--without 22moption. To specify
-       multiple groups to ignore, specify a list of groups separated  by  spa-
-       ces.
-
-
-
-	   bundle install --without test
-	   bundle install --without development test
-
-
-
-       After running 1mbundle install --without test22m, bundler will remember that
-       you excluded the test group in the last installation. The next time you
-       run  1mbundle  install22m, without any 1m--without option22m, bundler will recall
-       it.
-
-       Also, calling 1mBundler.setup 22mwith  no  parameters,  or  calling  1mrequire0m
-       1m"bundler/setup"  22mwill setup all groups except for the ones you excluded
-       via 1m--without 22m(since they are not available).
-
-       Note that on 1mbundle install22m, 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  ver-
-       sions  of  the  same  gems  in  different groups. For more details, see
-       Understanding Bundler 4mhttp://bundler.io/rationale.html24m.
-
-   1mPLATFORMS0m
-       If a gem should only be used in a particular platform or set  of  plat-
-       forms,  you  can  specify  them. Platforms are essentially identical to
-       groups, except that you do not need to use the  1m--without  22minstall-time
-       flag to exclude groups of gems for other platforms.
-
-       There are a number of 1mGemfile 22mplatforms:
-
-       1mruby	22mC Ruby (MRI), Rubinius or TruffleRuby, but 1mNOT 22mWindows
-
-       1mmri	22mSame as 4mruby24m, but only C Ruby (MRI)
-
-       1mmingw	22mWindows 32 bit 'mingw32' platform (aka RubyInstaller)
-
-       1mx64_mingw0m
-	      Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
-
-       1mrbx	22mRubinius
-
-       1mjruby	22mJRuby
-
-       1mtruffleruby0m
-	      TruffleRuby
-
-       1mmswin	22mWindows
-
-       You  can  restrict  further  by	platform and version for all platforms
-       4mexcept24m for 1mrbx22m, 1mjruby22m, 1mtruffleruby 22mand 1mmswin22m.
-
-       To specify a version in addition to a platform, append the version num-
-       ber 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:
-
-       1mruby	22m1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-
-       1mmri	22m1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-
-       1mmingw	22m1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-
-       1mx64_mingw0m
-	      2.0, 2.1, 2.2, 2.3, 2.4, 2.5
-
-       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 (1mbundle install  4m22mbundle-install.1.html24m,
-       1mBundler.setup22m,  1mBundler.require22m)  behave  exactly  the  same  as if any
-       groups not matching the current platform were explicitly excluded.
-
-   1mSOURCE0m
-       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
-       4mSOURCE24m 4mPRIORITY24m.
-
-       Selecting a specific source repository this  way  also  suppresses  the
-       ambiguous gem warning described above in 4mGLOBAL24m 4mSOURCES24m 4m(#source)24m.
-
-       Using  the  1m:source  22moption  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.
-
-   1mGIT0m
-       If necessary, you can specify that a gem is located at a particular git
-       repository using the 1m:git 22mparameter. The repository can be accessed via
-       several protocols:
-
-       1mHTTP(S)0m
-	      gem "rails", :git => "https://github.com/rails/rails.git"
-
-       1mSSH	22mgem "rails", :git => "git@github.com:rails/rails.git"
-
-       1mgit	22mgem "rails", :git => "git://github.com/rails/rails.git"
-
-       If using SSH, the user that you use to run 1mbundle install MUST 22mhave the
-       appropriate keys available in their 1m$HOME/.ssh22m.
-
-       1mNOTE22m: 1mhttp:// 22mand 1mgit:// 22mURLs 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  1mgroup22m,  1mplatforms22m,  and  1mrequire  22moptions are available and behave
-       exactly the same as they would for a normal gem.
-
-       A git repository 1mSHOULD 22mhave at least one file,  at  the  root  of	the
-       directory  containing  the  gem, with the extension 1m.gemspec22m. This file
-       1mMUST 22mcontain a valid gem specification, as expected by  the  1mgem	build0m
-       command.
-
-       If  a  git repository does not have a 1m.gemspec22m, 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 prop-
-       erly integrate into your application.
-
-       If a git repository does have a 1m.gemspec 22mfor the gem  you  attached  it
-       to,  a version specifier, if provided, means that the git repository is
-       only valid if the 1m.gemspec 22mspecifies 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 1mnot 22mhave a 1m.gemspec 22mfor the gem you attached
-       it to, a version specifier 1mMUST 22mbe provided. Bundler will use this ver-
-       sion in the simple 1m.gemspec 22mit creates.
-
-       Git repositories support a number of additional options.
-
-       1mbranch22m, 1mtag22m, and 1mref0m
-	      You  1mMUST 22monly specify at most one of these options. The default
-	      is 1m:branch => "master"0m
-
-       For example:
-
-	      git "https://github.com/rails/rails.git", :branch  =>  "5-0-sta-
-	      ble" do
-
-	      git "https://github.com/rails/rails.git", :tag => "v5.0.0" do
-
-	      git "https://github.com/rails/rails.git", :ref => "4aded" do
-
-       1msubmodules0m
-	      For	   reference,	       a	 git	     submodule
-	      4mhttps://git-scm.com/book/en/v2/Git-Tools-Submodules24m	 lets	you
-	      have  another  git repository within a subfolder of your reposi-
-	      tory. Specify 1m:submodules => true 22mto cause bundler to expand any
-	      submodules included in the git repository
-
-       If  a  git repository contains multiple 1m.gemspecs22m, each 1m.gemspec 22mrepre-
-       sents a gem located at the same place in the file system as  the  1m.gem-0m
-       1mspec22m.
-
-
-
-	   |~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 1mgem build name.gemspec 22mand  then
-       installs the resulting gem. The 1mgem build 22mcommand, which comes standard
-       with Rubygems, evaluates the 1m.gemspec 22min the context of  the  directory
-       in which it is located.
-
-   1mGIT SOURCE0m
-       A  custom  git source can be defined via the 1mgit_source 22mmethod. 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"
-
-
-
-   1mGITHUB0m
-       1mNOTE22m: This shorthand should be avoided until Bundler 2.0, since it cur-
-       rently expands to an insecure 1mgit:// 22mURL. This allows a man-in-the-mid-
-       dle attacker to compromise your system.
-
-       If the git repository you want to use is hosted on GitHub and  is  pub-
-       lic,  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 1mgithub 22mmethod is a specialization of 1mgit_source22m, it accepts a
-       1m:branch 22mnamed argument.
-
-   1mGIST0m
-       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  1mgist 22mmethod is a specialization of 1mgit_source22m, it accepts a
-       1m:branch 22mnamed argument.
-
-   1mBITBUCKET0m
-       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 1mbitbucket  22mmethod  is  a	specialization	of  1mgit_source22m,  it
-       accepts a 1m:branch 22mnamed argument.
-
-   1mPATH0m
-       You  can  specify that a gem is located in a particular location on the
-       file system. Relative paths are resolved relative to the directory con-
-       taining the 1mGemfile22m.
-
-       Similar	to the semantics of the 1m:git 22moption, the 1m:path 22moption requires
-       that the directory in question either contains a 1m.gemspec 22mfor the  gem,
-       or that you specify an explicit version that bundler should use.
-
-       Unlike  1m:git22m,  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 filesys-
-       tem,  you can set a global 1mpath 22moption 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
-
-
-
-1mBLOCK FORM OF SOURCE, GIT, PATH, GROUP and PLATFORMS0m
-       The 1m:source22m, 1m:git22m, 1m:path22m, 1m:group22m, and 1m:platforms 22moptions 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	1m--with0m
-       option given to the 1mbundle install 22mcommand.
-
-       In  the	case of the 1mgit 22mblock form, the 1m:ref22m, 1m:branch22m, 1m:tag22m, and 1m:sub-0m
-       1mmodules 22moptions may be passed to the 1mgit 22mmethod, and all  gems  in  the
-       block will inherit those options.
-
-       The  presence  of  a  1msource  22mblock 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 rec-
-       ommended that you also ensure all other gems in the Gemfile  are  using
-       explicit  sources,  either  via	source blocks or 1m:source 22mdirectives on
-       individual gems.
-
-1mINSTALL_IF0m
-       The 1minstall_if 22mmethod 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
-
-
-
-1mGEMSPEC0m
-       The 1m.gemspec  4m22mhttp://guides.rubygems.org/specification-reference/24m  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 1mgemspec 22mmethod to pull in the dependen-
-       cies listed in the 1m.gemspec 22mfile.
-
-       The 1mgemspec 22mmethod adds any runtime dependencies as gem requirements in
-       the  default  group.  It  also  adds  development  dependencies	as gem
-       requirements in the 1mdevelopment 22mgroup. Finally, it adds a gem  require-
-       ment on your project (1m:path => '.'22m). In conjunction with 1mBundler.setup22m,
-       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 1mgemspec 22mmethod supports optional 1m:path22m, 1m:glob22m, 1m:name22m, and 1m:develop-0m
-       1mment_group 22moptions, which control where bundler looks for the 1m.gemspec22m,
-       the glob it uses to look for the  gemspec  (defaults  to:  "{,4m,24m/*}.gem-
-       spec"),	what named 1m.gemspec 22mit uses (if more than one is present), and
-       which group development dependencies are included in.
-
-       When a 1mgemspec 22mdependency encounters version conflicts  during  resolu-
-       tion,  the  local  version under development will always be selected --
-       even if there are remote versions that better match other  requirements
-       for the 1mgemspec 22mgem.
-
-1mSOURCE PRIORITY0m
-       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 1m:source22m, 1m:path22m, or
-	   1m:git22m)
-
-       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 1mrubygems.org0m
-
-       3.  The sources specified  via  global  1msource  22mlines,  searching  each
-	   source in your 1mGemfile 22mfrom last added to first added.
-
-
-
-
-
-
-				 November 2018			    GEMFILE(5)
diff --git a/man/goruby.1 b/man/goruby.1
index a305a5afce..857874f070 100644
--- a/man/goruby.1
+++ b/man/goruby.1
@@ -1,6 +1,6 @@
 .\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd April 20, 2017
-.Dt GORUBY \&1 "Ruby Programmer's Reference Guide"
+.Dd November 15, 2012
+.Dt GORUBY(1) "" "Ruby Programmers Reference Guide"
 .Os UNIX
 .Sh NAME
 .Nm goruby
diff --git a/man/irb.1 b/man/irb.1
index 3e7ec6ff9d..62bd714ddc 100644
--- a/man/irb.1
+++ b/man/irb.1
@@ -1,6 +1,6 @@
 .\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd April 20, 2017
-.Dt IRB \&1 "Ruby Programmer's Reference Guide"
+.Dd November 15, 2012
+.Dt IRB(1) "" "Ruby Programmers Reference Guide"
 .Os UNIX
 .Sh NAME
 .Nm irb
@@ -69,6 +69,9 @@ Suppresses read of
 .It Fl -help
 Prints a summary of the options.
 .Pp
+.It Fl m
+Bc mode (load mathn, fraction or matrix are available)
+.Pp
 .It Fl r Ar library
 Same as `ruby -r'.
 Causes irb to load the library using require.
@@ -156,17 +159,15 @@ Personal irb initialization.
 .Pp
 .Sh REPORTING BUGS
 .Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
+.Li Security vulnerabilities should be reported via an email to
+.Aq security@ruby-lang.org Ns
+.Li .
 Reported problems will be published after being fixed.
 .Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
+.Li And you can report other bugs and feature requests via the
+Ruby Issue Tracking System (http://bugs.ruby-lang.org).
 Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immediately.
 .El
 .Sh AUTHORS
 Written by Keiju ISHITSUKA.
diff --git a/man/ri.1 b/man/ri.1
index 85a6dfcd53..bf4efb1ac3 100644
--- a/man/ri.1
+++ b/man/ri.1
@@ -1,56 +1,47 @@
 .\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd April 20, 2017
-.Dt RI \&1 "Ruby Programmer's Reference Guide"
+.Dd July 10, 2013
+.Dt RI(1) "" "Ruby Programmers Reference Guide"
 .Os UNIX
 .Sh NAME
 .Nm ri
 .Nd Ruby API reference front end
 .Sh SYNOPSIS
 .Nm
-.Op Fl ahilTv
-.Op Fl d Ar DIRNAME
-.Op Fl f Ar FORMAT
-.Op Fl w Ar WIDTH
-.Op Fl - Ns Oo Cm no- Oc Ns Cm pager
-.Op Fl -server Ns Oo = Ns Ar PORT Oc
-.Op Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
+.Op Fl Ti
+.Op Fl d Ar directory
+.Op Fl f Ar format
+.Op Fl -list-doc-dirs
 .Op Fl -no-standard-docs
 .Op Fl - Ns Oo Cm no- Oc Ns Bro Cm system Ns | Ns Cm site Ns | Ns Cm gems Ns | Ns Cm home Brc
-.Op Fl - Ns Oo Cm no- Oc Ns Cm profile
-.Op Fl -dump Ns = Ns Ar CACHE
-.Op Ar name ...
+.Op Fl - Ns Oo Cm no- Oc Ns Cm use-cache
+.Op Fl -width Ns = Ns Ar width
+.Op Ar target ...
 .Sh DESCRIPTION
 .Nm
-is a command-line front end for the Ruby API reference.
-You can search and read the API reference for classes and methods with
+is a CLI front end for the Ruby API reference.
+You can search and read API reference for classes and methods with
 .Nm .
 .Pp
 .Nm
 is a part of Ruby.
 .Pp
-.Ar name
-can be:
+.Ar target
+can be one of the following forms:
 .Bl -diag -offset indent
-.It Class | Module | Module::Class
-.Pp
-.It Class::method | Class#method | Class.method | method
-.Pp
-.It gem_name: | gem_name:README | gem_name:History
+.It Class
+for classes
+.It Class::method
+for class methods
+.It Class#method
+for instance methods
+.It Class.method
+for both class and instance methods
+.It method
+for both class and instance methods
 .El
 .Pp
-All class names may be abbreviated to their minimum unambiguous form.
-If a name is ambiguous, all valid options will be listed.
-.Pp
-A
-.Ql \&.
-matches either class or instance methods, while #method
-matches only instance and ::method matches only class methods.
-.Pp
-README and other files may be displayed by prefixing them with the gem name
-they're contained in.  If the gem name is followed by a
-.Ql \&:
-all files in the gem will be shown.
-The file name extension may be omitted where it is unambiguous.
+All class names may be abbreviated to their minimum unambiguous form. If a name
+is ambiguous, all valid options will be listed.
 .Pp
 For example:
 .Bd -literal -offset indent
@@ -58,190 +49,133 @@ ri Fil
 ri File
 ri File.new
 ri zip
-ri rdoc:README
 .Ed
 .Pp
-Note that shell quoting or escaping may be required for method names
-containing punctuation:
+Note that shell quoting may be required for method names containing
+punctuation:
 .Bd -literal -offset indent
 ri 'Array.[]'
-ri compact\e!
-.Ed
-.Pp
-To see the default directories
-.Nm
-will search, run:
-.Bd -literal -offset indent
-ri --list-doc-dirs
+ri compact\!
 .Ed
-.Pp
-Specifying the
-.Fl -system , Fl -site , Fl -home , Fl -gems ,
-or
-.Fl -doc-dir
-options will limit
-.Nm
-to searching only the specified directories.
-.Pp
-.Nm
-options may be set in the
-.Ev RI
-environment variable.
-.Pp
-The
-.Nm
-pager can be set with the
-.Ev RI_PAGER
-environment variable or the
-.Ev PAGER
-environment variable.
-.Pp
 .Sh OPTIONS
 .Bl -tag -width "1234567890123" -compact
 .Pp
-.It Fl i
-.It Fl - Ns Oo Cm no- Oc Ns Cm interactive
-In interactive mode you can repeatedly
-look up methods with autocomplete.
-.Pp
-.It Fl a
-.It Fl - Ns Oo Cm no- Oc Ns Cm all
-Show all documentation for a class or module.
-.Pp
-.It Fl l
-.It Fl - Ns Oo Cm no- Oc Ns Cm list
-List classes
-.Nm
-knows about.
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm pager
-Send output to a pager,
-rather than directly to stdout.
+.It Fl -version
+Prints the version of
+.Nm .
 .Pp
 .It Fl T
-Synonym for
-.Fl -no-pager .
+.It Fl -no-pager
+Send output directly to stdout, rather than to a pager.
 .Pp
-.It Fl w Ar WIDTH
-.It Fl -width Ns = Ns Ar WIDTH
-Set the width of the output.
-.Pp
-.It Fl -server Ns Oo = Ns Ar PORT Oc
-Run RDoc server on the given port.
-The default port is\~8214.
+.It Fl d Ar directory
+.It Fl -doc-dir Ns = Ns Ar directory
+List of directories from which to source documentation in addition to the standard
+directories.  May be repeated.
 .Pp
 .It Fl f Ar FORMAT
-.It Fl -format Ns = Ns Ar FORMAT
-Use the selected formatter.
-The default formatter is
-.Li bs
-for paged output and
-.Li ansi
-otherwise.
-Valid formatters are:
-.Li ansi , Li bs , Li markdown , Li rdoc .
-.Pp
-.It Fl h
-.It Fl -help
-Show help and exit.
-.Pp
-.It Fl v
-.It Fl -version
-Output version information and exit.
-.El
+.It Fl -fmt Ar FORMAT
+.It Fl -format Ns = Ns FORMAT
+Format to use when displaying output:
 .Pp
-Data source options:
-.Bl -tag -width "1234567890123" -compact
+ansi, bs, html, plain, simple
 .Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
-List the directories from which
+Use 'bs' (backspace) with most pager programs. To use ANSI, either disable the
+pager or tell the pager to allow control characters.
+.Pp
+.It Fl i
+.It Fl -interactive
+This makes
 .Nm
-will source documentation on stdout and exit.
+go into interactive mode.
 .Pp
-.It Fl d Ar DIRNAME
-.It Fl -doc-dir Ns = Ns Ar DIRNAME
-List of directories from which to source
-documentation in addition to the standard
-directories.  May be repeated.
+When
+.Nm
+is in interactive mode it will allow the user to disambiguate lists of
+methods in case multiple methods match against a method search string.  It also
+will allow the user to enter in a method name (with auto-completion, if readline
+is supported) when viewing a class.
+.Pp
+.It Fl -list-doc-dirs
+List the directories from which ri will source documentation on stdout and exit.
 .Pp
 .It Fl -no-standard-docs
 Do not include documentation from the Ruby standard library,
 .Pa site_lib ,
 installed gems, or
 .Pa ~/.rdoc .
-Use with
-.Fl -doc-dir .
+.Pp
+Equivalent to specifying the options
+.Fl -no-system , Fl -no-site , Fl -no-gems ,
+and
+.Fl -no-home .
 .Pp
 .It Fl - Ns Oo Cm no- Oc Ns Cm system
 Include documentation from Ruby's standard library.  Defaults to true.
 .Pp
 .It Fl - Ns Oo Cm no- Oc Ns Cm site
-Include documentation from libraries installed in
-.Pa site_lib .
-Defaults to true.
+ Include documentation from libraries installed in site_lib. Defaults to true.
 .Pp
 .It Fl - Ns Oo Cm no- Oc Ns Cm gems
-Include documentation from RubyGems.  Defaults to true.
+Include documentation from RubyGems. Defaults to true.
 .Pp
 .It Fl - Ns Oo Cm no- Oc Ns Cm home
-Include documentation stored in
-.Pa ~/.rdoc .
-Defaults to true.
-.El
+Include documentation stored in ~/.rdoc.  Defaults to true.
 .Pp
-Debug options:
-.Bl -tag -width "1234567890123" -compact
+.It Fl - Ns Oo Cm no- Oc Ns Cm use-cache
+Whether or not to use
+.Nm Ns
+.Ns 's cache. True by default.
 .Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm profile
-Run with the Ruby profiler.
+.It Fl w Ar width
+.It Fl -width Ns = Ns Ar width
+Set the width of the output.
 .Pp
-.It Fl -dump Ns = Ns Ar CACHE
-Dump data from an ri cache or data file.
 .El
 .Pp
 .Sh ENVIRONMENT
 .Bl -tag -width "USERPROFILE" -compact
 .Pp
 .It Ev RI
-Options to prepend to those specified on the command-line.
+Additional options.
 .Pp
-.It Ev RI_PAGER
 .It Ev PAGER
-Pager program to use for displaying.
+Used as the name of pager program for displaying.
 .Pp
 .It Ev HOME
 .It Ev USERPROFILE
 .It Ev HOMEPATH
-Path to the user's home directory.
+Path to user's home directory.
 .El
 .Pp
 .Sh FILES
 .Bl -tag -width "USERPROFILE" -compact
 .Pp
+.It Pa ~/.ri
+Caches recently referenced documents here.
+.Pp
 .It Pa ~/.rdoc
-Path for ri data in the user's home directory.
+Searches user-wide documents here.
 .Pp
 .El
 .Pp
 .Sh SEE ALSO
-.Xr ruby 1 ,
-.Xr rdoc 1 ,
+.Xr ruby 1
+.Xr rdoc 1
 .Xr gem 1
 .Pp
 .Sh REPORTING BUGS
 .Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
+.Li Security vulnerabilities should be reported via an email to
+.Aq security@ruby-lang.org Ns
+.Li .
 Reported problems will be published after being fixed.
 .Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
+.Li And you can report other bugs and feature requests via the
+Ruby Issue Tracking System (http://bugs.ruby-lang.org).
 Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immediately.
 .El
 .Sh AUTHORS
-Written by
-.An Dave Thomas Aq dave@pragmaticprogrammer.com .
+Written by Dave Thomas
+.Aq dave@pragmaticprogrammer.com
diff --git a/man/ruby.1 b/man/ruby.1
index 4dd19054d3..36039fecce 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -1,6 +1,7 @@
 .\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd April 14, 2018
-.Dt RUBY \&1 "Ruby Programmer's Reference Guide"
+.Dd October 31, 2015
+.Dt RUBY(1) "" "Ruby Programmers Reference Guide"
+.\".Dt RUBY 1
 .Os UNIX
 .Sh NAME
 .Nm ruby
@@ -119,36 +120,24 @@ On most
 systems, you can load object files into the Ruby interpreter
 on-the-fly.
 .It Sy "Rich libraries"
-In addition to the
-.Dq builtin libraries
-and
-.Dq standard libraries
-that are bundled with Ruby, a vast amount of third-party libraries
-.Pq Dq gems
-are available via the package management system called
-.Sq RubyGems ,
-namely the
-.Xr gem 1
-command.  Visit RubyGems.org
-.Pq Lk https://rubygems.org/
-to find the gems you need, and explore GitHub
-.Pq Lk https://github.com/
-to see how they are being developed and used.
+Libraries called "builtin libraries" and "standard libraries" are bundled with Ruby.
+And you can obtain more libraries via the package management system called `RubyGems'.
+.Pp
+Moreover there are thousands of Ruby projects on GitHub
+.Aq Pa https://github.com/languages/Ruby .
 .El
 .Pp
 .Sh OPTIONS
-The Ruby interpreter accepts the following command-line options (switches).
+Ruby interpreter accepts following command-line options (switches).
 They are quite similar to those of
 .Xr perl 1 .
 .Bl -tag -width "1234567890123" -compact
 .Pp
 .It Fl -copyright
-Prints the copyright notice, and quits immediately without running any
-script.
+Prints the copyright notice.
 .Pp
 .It Fl -version
-Prints the version of the Ruby interpreter, and quits immediately without
-running any script.
+Prints the version of Ruby interpreter.
 .Pp
 .It Fl 0 Ns Op Ar octal
 (The digit
@@ -219,18 +208,6 @@ on machines that don't support it, in the following manner:
   exec /usr/local/bin/ruby -S $0 $*
 .Ed
 .Pp
-On some systems
-.Li "$0"
-does not always contain the full pathname, so you need the
-.Fl S
-switch to tell Ruby to search for the script if necessary (to handle embedded
-spaces and such).  A better construct than
-.Li "$*"
-would be
-.Li ${1+"$@"} ,
-but it does not work if the script is being interpreted by
-.Xr csh 1 .
-.Pp
 .It Fl T Ns Op Ar level=1
 Turns on taint checks at the specified level (default 1).
 .Pp
@@ -356,6 +333,18 @@ and set the corresponding variable in the script.  For example:
 print "true\en" if $xyz
 .Ed
 .Pp
+On some systems
+.Li "$0"
+does not always contain the full pathname, so you need the
+.Fl S
+switch to tell Ruby to search for the script if necessary (to handle embedded
+spaces and such).  A better construct than
+.Li "$*"
+would be
+.Li ${1+"$@"} ,
+but it does not work if the script is being interpreted by
+.Xr csh 1 .
+.Pp
 .It Fl v
 Enables verbose mode.  Ruby will print its version at the beginning
 and set the variable
@@ -397,7 +386,8 @@ debug the Ruby interpreter.
 .It Fl -disable- Ns Ar FEATURE
 .It Fl -enable- Ns Ar FEATURE
 Disables (or enables) the specified
-.Ar FEATURE .
+.Ar FEATURE Ns
+\&.
 .Bl -tag -width "--disable-rubyopt" -compact
 .It Fl -disable-gems
 .It Fl -enable-gems
@@ -459,9 +449,8 @@ Enables verbose mode without printing version message at the
 beginning.  It sets the
 .Li "$VERBOSE"
 variable to true.
-If this switch is given, and no script arguments (script file or
-.Fl e
-options) are present, Ruby quits immediately.
+If this switch is given, and no other switches are present, Ruby quits
+after printing its version.
 .El
 .Pp
 .Sh ENVIRONMENT
@@ -634,31 +623,29 @@ default: 262144 or 524288
 .Pp
 .El
 .Sh SEE ALSO
-.Bl -hang -compact -width "https://www.ruby-toolbox.com/"
-.It Lk https://www.ruby-lang.org/
+.Bl -hang -compact -width "http://www.ruby-lang.org/123"
+.It https://www.ruby-lang.org/
 The official web site.
-.It Lk https://www.ruby-toolbox.com/
+.It https://www.ruby-toolbox.com/
 Comprehensive catalog of Ruby libraries.
 .El
 .Pp
 .Sh REPORTING BUGS
 .Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
-Reported problems will be published after being fixed.
-.Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
+.Li Security vulnerabilities should be reported via an email to
+.Aq security@ruby-lang.org Ns
+.Li .
+Reported problems will be published after they've been fixed.
+.Pp
+.Li And you can report other bugs and feature requests via the
+Ruby Issue Tracking System (https://bugs.ruby-lang.org/).
 Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immediately.
 .El
 .Sh AUTHORS
 Ruby is designed and implemented by
 .An Yukihiro Matsumoto Aq matz@netlab.jp .
 .Pp
 See
-.Aq Lk https://bugs.ruby-lang.org/projects/ruby/wiki/Contributors
+.Aq Pa https://bugs.ruby-lang.org/projects/ruby/wiki/Contributors
 for contributors to Ruby.
diff --git a/marshal.c b/marshal.c
index bb5b1a95da..3560cb5d80 100644
--- a/marshal.c
+++ b/marshal.c
@@ -9,9 +9,12 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
+#if defined __GNUC__ && __GNUC__ < 3
+# error too old GCC
+#endif
+
 #include "internal.h"
+#include "ruby/io.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "encindex.h"
@@ -175,22 +178,8 @@ check_dump_arg(VALUE ret, struct dump_arg *arg, const char *name)
     }
     return ret;
 }
-
-static VALUE
-check_userdump_arg(VALUE obj, ID sym, int argc, const VALUE *argv,
-		   struct dump_arg *arg, const char *name)
-{
-    VALUE ret = rb_funcallv(obj, sym, argc, argv);
-    VALUE klass = CLASS_OF(obj);
-    if (CLASS_OF(ret) == klass) {
-        rb_raise(rb_eRuntimeError, "%"PRIsVALUE"#%s returned same class instance",
-		 klass, name);
-    }
-    return check_dump_arg(ret, arg, name);
-}
-
 #define dump_funcall(arg, obj, sym, argc, argv) \
-    check_userdump_arg(obj, sym, argc, argv, arg, name_##sym)
+    check_dump_arg(rb_funcallv(obj, sym, argc, argv), arg, name_##sym)
 #define dump_check_funcall(arg, obj, sym, argc, argv) \
     check_dump_arg(rb_check_funcall(obj, sym, argc, argv), arg, name_##sym)
 
@@ -257,7 +246,7 @@ class2path(VALUE klass)
 }
 
 static void w_long(long, struct dump_arg*);
-static int w_encoding(VALUE encname, struct dump_call_arg *arg);
+static void w_encoding(VALUE encname, struct dump_call_arg *arg);
 static VALUE encoding_name(VALUE obj, struct dump_arg *arg);
 
 static void
@@ -401,8 +390,8 @@ w_float(double d, struct dump_arg *arg)
 	w_cstr("nan", arg);
     }
     else if (d == 0.0) {
-        if (signbit(d)) w_cstr("-0", arg);
-        else            w_cstr("0", arg);
+	if (1.0/d < 0) w_cstr("-0", arg);
+	else           w_cstr("0", arg);
     }
     else {
 	int decpt, sign, digs, len = 0;
@@ -550,25 +539,14 @@ w_uclass(VALUE obj, VALUE super, struct dump_arg *arg)
 
 #define to_be_skipped_id(id) (id == rb_id_encoding() || id == rb_intern("E") || !rb_id2str(id))
 
-struct w_ivar_arg {
-    struct dump_call_arg *dump;
-    st_data_t num_ivar;
-};
-
 static int
 w_obj_each(st_data_t key, st_data_t val, st_data_t a)
 {
     ID id = (ID)key;
     VALUE value = (VALUE)val;
-    struct w_ivar_arg *ivarg = (struct w_ivar_arg *)a;
-    struct dump_call_arg *arg = ivarg->dump;
+    struct dump_call_arg *arg = (struct dump_call_arg *)a;
 
     if (to_be_skipped_id(id)) return ST_CONTINUE;
-    if (!ivarg->num_ivar) {
-        rb_raise(rb_eRuntimeError, "instance variable added to %"PRIsVALUE" instance",
-                 CLASS_OF(arg->obj));
-    }
-    --ivarg->num_ivar;
     w_symbol(ID2SYM(id), arg->arg);
     w_object(value, arg->arg, arg->limit);
     return ST_CONTINUE;
@@ -585,53 +563,44 @@ obj_count_ivars(st_data_t key, st_data_t val, st_data_t a)
 static VALUE
 encoding_name(VALUE obj, struct dump_arg *arg)
 {
-    if (rb_enc_capable(obj)) {
-        int encidx = rb_enc_get_index(obj);
-        rb_encoding *enc = 0;
-        st_data_t name;
+    int encidx = rb_enc_get_index(obj);
+    rb_encoding *enc = 0;
+    st_data_t name;
 
-        if (encidx <= 0 || !(enc = rb_enc_from_index(encidx))) {
-            return Qnil;
-        }
-
-        /* special treatment for US-ASCII and UTF-8 */
-        if (encidx == rb_usascii_encindex()) {
-            return Qfalse;
-        }
-        else if (encidx == rb_utf8_encindex()) {
-            return Qtrue;
-        }
+    if (encidx <= 0 || !(enc = rb_enc_from_index(encidx))) {
+	return Qnil;
+    }
 
-        if (arg->encodings ?
-            !st_lookup(arg->encodings, (st_data_t)rb_enc_name(enc), &name) :
-            (arg->encodings = st_init_strcasetable(), 1)) {
-            name = (st_data_t)rb_str_new_cstr(rb_enc_name(enc));
-            st_insert(arg->encodings, (st_data_t)rb_enc_name(enc), name);
-        }
-        return (VALUE)name;
+    /* special treatment for US-ASCII and UTF-8 */
+    if (encidx == rb_usascii_encindex()) {
+	return Qfalse;
     }
-    else {
-        return Qnil;
+    else if (encidx == rb_utf8_encindex()) {
+	return Qtrue;
+    }
+
+    if (arg->encodings ?
+	!st_lookup(arg->encodings, (st_data_t)rb_enc_name(enc), &name) :
+	(arg->encodings = st_init_strcasetable(), 1)) {
+	name = (st_data_t)rb_str_new_cstr(rb_enc_name(enc));
+	st_insert(arg->encodings, (st_data_t)rb_enc_name(enc), name);
     }
+    return (VALUE)name;
 }
 
-static int
+static void
 w_encoding(VALUE encname, struct dump_call_arg *arg)
 {
-    int limit = arg->limit;
-    if (limit >= 0) ++limit;
     switch (encname) {
       case Qfalse:
       case Qtrue:
 	w_symbol(ID2SYM(rb_intern("E")), arg->arg);
-	w_object(encname, arg->arg, limit);
-        return 1;
+	w_object(encname, arg->arg, arg->limit + 1);
       case Qnil:
-	return 0;
+	return;
     }
     w_symbol(ID2SYM(rb_id_encoding()), arg->arg);
-    w_object(encname, arg->arg, limit);
-    return 1;
+    w_object(encname, arg->arg, arg->limit + 1);
 }
 
 static st_index_t
@@ -656,24 +625,12 @@ has_ivars(VALUE obj, VALUE encname, VALUE *ivobj)
 }
 
 static void
-w_ivar_each(VALUE obj, st_index_t num, struct dump_call_arg *arg)
-{
-    struct w_ivar_arg ivarg = {arg, num};
-    if (!num) return;
-    rb_ivar_foreach(obj, w_obj_each, (st_data_t)&ivarg);
-    if (ivarg.num_ivar) {
-        rb_raise(rb_eRuntimeError, "instance variable removed from %"PRIsVALUE" instance",
-                 CLASS_OF(arg->obj));
-    }
-}
-
-static void
 w_ivar(st_index_t num, VALUE ivobj, VALUE encname, struct dump_call_arg *arg)
 {
     w_long(num, arg->arg);
-    num -= w_encoding(encname, arg);
+    w_encoding(encname, arg);
     if (ivobj != Qundef) {
-        w_ivar_each(ivobj, num, arg);
+	rb_ivar_foreach(ivobj, w_obj_each, (st_data_t)arg);
     }
 }
 
@@ -684,7 +641,9 @@ w_objivar(VALUE obj, struct dump_call_arg *arg)
 
     rb_ivar_foreach(obj, obj_count_ivars, (st_data_t)&num);
     w_long(num, arg->arg);
-    w_ivar_each(obj, num, arg);
+    if (num != 0) {
+        rb_ivar_foreach(obj, w_obj_each, (st_data_t)arg);
+    }
 }
 
 static void
@@ -700,10 +659,9 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 	rb_raise(rb_eArgError, "exceed depth limit");
     }
 
-    if (limit > 0) limit--;
+    limit--;
     c_arg.limit = limit;
     c_arg.arg = arg;
-    c_arg.obj = obj;
 
     if (st_lookup(arg->data, obj, &num)) {
 	w_byte(TYPE_LINK, arg);
@@ -841,7 +799,6 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 		char sign = BIGNUM_SIGN(obj) ? '+' : '-';
 		size_t len = BIGNUM_LEN(obj);
 		size_t slen;
-                size_t j;
 		BDIGIT *d = BIGNUM_DIGITS(obj);
 
                 slen = SHORTLEN(len);
@@ -851,7 +808,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 
 		w_byte(sign, arg);
 		w_long((long)slen, arg);
-                for (j = 0; j < len; j++) {
+		while (len--) {
 #if SIZEOF_BDIGIT > SIZEOF_SHORT
 		    BDIGIT num = *d;
 		    int i;
@@ -859,7 +816,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 		    for (i=0; i<SIZEOF_BDIGIT; i+=SIZEOF_SHORT) {
 			w_short(num & SHORTMASK, arg);
 			num = SHORTDN(num);
-                        if (j == len - 1 && num == 0) break;
+			if (len == 0 && num == 0) break;
 		    }
 #else
 		    w_short(*d, arg);
@@ -912,7 +869,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 	    else {
 		w_byte(TYPE_HASH_DEF, arg);
 	    }
-            w_long(rb_hash_size_num(obj), arg);
+	    w_long(RHASH_SIZE(obj), arg);
 	    rb_hash_foreach(obj, hash_each, (st_data_t)&c_arg);
 	    if (!NIL_P(RHASH_IFNONE(obj))) {
 		w_object(RHASH_IFNONE(obj), arg, limit);
@@ -1053,7 +1010,7 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit)
     struct dump_arg *arg;
     VALUE wrapper; /* used to avoid memory leak in case of exception */
 
-    wrapper = TypedData_Make_Struct(0, struct dump_arg, &dump_arg_data, arg);
+    wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg);
     arg->dest = 0;
     arg->symbols = st_init_numtable();
     arg->data    = rb_init_identtable();
@@ -1210,8 +1167,6 @@ r_byte(struct load_arg *arg)
     return c;
 }
 
-NORETURN(static void long_toobig(int size));
-
 static void
 long_toobig(int size)
 {
@@ -1512,12 +1467,7 @@ r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
 	    VALUE val = r_object(arg);
 	    int idx = sym2encidx(sym, val);
 	    if (idx >= 0) {
-                if (rb_enc_capable(obj)) {
-                    rb_enc_associate_index(obj, idx);
-                }
-                else {
-                    rb_raise(rb_eArgError, "%"PRIsVALUE" is not enc_capable", obj);
-                }
+		rb_enc_associate_index(obj, idx);
 		if (has_encoding) *has_encoding = TRUE;
 	    }
 	    else {
@@ -1709,13 +1659,13 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    const char *ptr = RSTRING_PTR(str);
 
 	    if (strcmp(ptr, "nan") == 0) {
-		d = nan("");
+		d = NAN;
 	    }
 	    else if (strcmp(ptr, "inf") == 0) {
-		d = HUGE_VAL;
+		d = INFINITY;
 	    }
 	    else if (strcmp(ptr, "-inf") == 0) {
-		d = -HUGE_VAL;
+		d = -INFINITY;
 	    }
 	    else {
 		char *e;
@@ -1806,7 +1756,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	{
 	    long len = r_long(arg);
 
-	    v = rb_hash_new_with_size(len);
+	    v = rb_hash_new();
 	    v = r_entry(v, arg);
 	    arg->readable += (len - 1) * 2;
 	    while (len--) {
@@ -1845,30 +1795,17 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    arg->readable += (len - 1) * 2;
 	    v = r_entry0(v, idx, arg);
 	    values = rb_ary_new2(len);
-	    {
-		VALUE keywords = Qfalse;
-		if (RTEST(rb_struct_s_keyword_init(klass))) {
-		    keywords = rb_hash_new();
-		    rb_ary_push(values, keywords);
-		}
-
-		for (i=0; i<len; i++) {
-		    VALUE n = rb_sym2str(RARRAY_AREF(mem, i));
-		    slot = r_symbol(arg);
-
-		    if (!rb_str_equal(n, slot)) {
-			rb_raise(rb_eTypeError, "struct %"PRIsVALUE" not compatible (:%"PRIsVALUE" for :%"PRIsVALUE")",
-				 rb_class_name(klass),
-				 slot, n);
-		    }
-		    if (keywords) {
-			rb_hash_aset(keywords, RARRAY_AREF(mem, i), r_object(arg));
-		    }
-		    else {
-			rb_ary_push(values, r_object(arg));
-		    }
-		    arg->readable -= 2;
+	    for (i=0; i<len; i++) {
+		VALUE n = rb_sym2str(RARRAY_AREF(mem, i));
+		slot = r_symbol(arg);
+
+		if (!rb_str_equal(n, slot)) {
+		    rb_raise(rb_eTypeError, "struct %"PRIsVALUE" not compatible (:%"PRIsVALUE" for :%"PRIsVALUE")",
+			     rb_class_name(klass),
+			     slot, n);
 		}
+                rb_ary_push(values, r_object(arg));
+		arg->readable -= 2;
 	    }
             rb_struct_initialize(v, values);
             v = r_leave(v, arg);
@@ -2100,7 +2037,7 @@ rb_marshal_load_with_proc(VALUE port, VALUE proc)
     else {
 	io_needed();
     }
-    wrapper = TypedData_Make_Struct(0, struct load_arg, &load_arg_data, arg);
+    wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg);
     arg->infection = infection;
     arg->src = port;
     arg->offset = 0;
@@ -2287,7 +2224,7 @@ compat_allocator_table(void)
 #undef RUBY_UNTYPED_DATA_WARNING
 #define RUBY_UNTYPED_DATA_WARNING 0
     compat_allocator_tbl_wrapper =
-	Data_Wrap_Struct(0, mark_marshal_compat_t, 0, compat_allocator_tbl);
+	Data_Wrap_Struct(rb_cData, mark_marshal_compat_t, 0, compat_allocator_tbl);
     rb_gc_register_mark_object(compat_allocator_tbl_wrapper);
     return compat_allocator_tbl;
 }
diff --git a/math.c b/math.c
index 509cd46ef2..b15e87113c 100644
--- a/math.c
+++ b/math.c
@@ -63,7 +63,7 @@ VALUE rb_eMathDomainError;
  */
 
 static VALUE
-math_atan2(VALUE unused_obj, VALUE y, VALUE x)
+math_atan2(VALUE obj, VALUE y, VALUE x)
 {
     double dx, dy;
     dx = Get_Double(x);
@@ -108,7 +108,7 @@ math_atan2(VALUE unused_obj, VALUE y, VALUE x)
  */
 
 static VALUE
-math_cos(VALUE unused_obj, VALUE x)
+math_cos(VALUE obj, VALUE x)
 {
     return DBL2NUM(cos(Get_Double(x)));
 }
@@ -129,7 +129,7 @@ math_cos(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_sin(VALUE unused_obj, VALUE x)
+math_sin(VALUE obj, VALUE x)
 {
     return DBL2NUM(sin(Get_Double(x)));
 }
@@ -150,7 +150,7 @@ math_sin(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_tan(VALUE unused_obj, VALUE x)
+math_tan(VALUE obj, VALUE x)
 {
     return DBL2NUM(tan(Get_Double(x)));
 }
@@ -170,7 +170,7 @@ math_tan(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_acos(VALUE unused_obj, VALUE x)
+math_acos(VALUE obj, VALUE x)
 {
     double d;
 
@@ -194,7 +194,7 @@ math_acos(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_asin(VALUE unused_obj, VALUE x)
+math_asin(VALUE obj, VALUE x)
 {
     double d;
 
@@ -218,7 +218,7 @@ math_asin(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_atan(VALUE unused_obj, VALUE x)
+math_atan(VALUE obj, VALUE x)
 {
     return DBL2NUM(atan(Get_Double(x)));
 }
@@ -246,7 +246,7 @@ cosh(double x)
  */
 
 static VALUE
-math_cosh(VALUE unused_obj, VALUE x)
+math_cosh(VALUE obj, VALUE x)
 {
     return DBL2NUM(cosh(Get_Double(x)));
 }
@@ -274,7 +274,7 @@ sinh(double x)
  */
 
 static VALUE
-math_sinh(VALUE unused_obj, VALUE x)
+math_sinh(VALUE obj, VALUE x)
 {
     return DBL2NUM(sinh(Get_Double(x)));
 }
@@ -309,7 +309,7 @@ tanh(double x)
  */
 
 static VALUE
-math_tanh(VALUE unused_obj, VALUE x)
+math_tanh(VALUE obj, VALUE x)
 {
     return DBL2NUM(tanh(Get_Double(x)));
 }
@@ -329,7 +329,7 @@ math_tanh(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_acosh(VALUE unused_obj, VALUE x)
+math_acosh(VALUE obj, VALUE x)
 {
     double d;
 
@@ -354,7 +354,7 @@ math_acosh(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_asinh(VALUE unused_obj, VALUE x)
+math_asinh(VALUE obj, VALUE x)
 {
     return DBL2NUM(asinh(Get_Double(x)));
 }
@@ -374,7 +374,7 @@ math_asinh(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_atanh(VALUE unused_obj, VALUE x)
+math_atanh(VALUE obj, VALUE x)
 {
     double d;
 
@@ -382,8 +382,8 @@ math_atanh(VALUE unused_obj, VALUE x)
     /* check for domain error */
     if (d <  -1.0 || +1.0 <  d) domain_error("atanh");
     /* check for pole error */
-    if (d == -1.0) return DBL2NUM(-HUGE_VAL);
-    if (d == +1.0) return DBL2NUM(+HUGE_VAL);
+    if (d == -1.0) return DBL2NUM(-INFINITY);
+    if (d == +1.0) return DBL2NUM(+INFINITY);
     return DBL2NUM(atanh(d));
 }
 
@@ -404,7 +404,7 @@ math_atanh(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_exp(VALUE unused_obj, VALUE x)
+math_exp(VALUE obj, VALUE x)
 {
     return DBL2NUM(exp(Get_Double(x)));
 }
@@ -426,7 +426,6 @@ math_exp(VALUE unused_obj, VALUE x)
 #endif
 
 static double math_log1(VALUE x);
-FUNC_MINIMIZED(static VALUE math_log(int, const VALUE *, VALUE));
 
 /*
  *  call-seq:
@@ -450,13 +449,7 @@ FUNC_MINIMIZED(static VALUE math_log(int, const VALUE *, VALUE));
  */
 
 static VALUE
-math_log(int argc, const VALUE *argv, VALUE unused_obj)
-{
-    return rb_math_log(argc, argv);
-}
-
-VALUE
-rb_math_log(int argc, const VALUE *argv)
+math_log(int argc, const VALUE *argv, VALUE obj)
 {
     VALUE x, base;
     double d;
@@ -495,7 +488,7 @@ math_log1(VALUE x)
     /* check for domain error */
     if (d < 0.0) domain_error("log");
     /* check for pole error */
-    if (d == 0.0) return -HUGE_VAL;
+    if (d == 0.0) return -INFINITY;
 
     return log(d) + numbits * M_LN2; /* log(d * 2 ** numbits) */
 }
@@ -530,7 +523,7 @@ extern double log2(double);
  */
 
 static VALUE
-math_log2(VALUE unused_obj, VALUE x)
+math_log2(VALUE obj, VALUE x)
 {
     size_t numbits;
     double d = get_double_rshift(x, &numbits);
@@ -538,7 +531,7 @@ math_log2(VALUE unused_obj, VALUE x)
     /* check for domain error */
     if (d < 0.0) domain_error("log2");
     /* check for pole error */
-    if (d == 0.0) return DBL2NUM(-HUGE_VAL);
+    if (d == 0.0) return DBL2NUM(-INFINITY);
 
     return DBL2NUM(log2(d) + numbits); /* log2(d * 2 ** numbits) */
 }
@@ -560,7 +553,7 @@ math_log2(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_log10(VALUE unused_obj, VALUE x)
+math_log10(VALUE obj, VALUE x)
 {
     size_t numbits;
     double d = get_double_rshift(x, &numbits);
@@ -568,9 +561,9 @@ math_log10(VALUE unused_obj, VALUE x)
     /* check for domain error */
     if (d < 0.0) domain_error("log10");
     /* check for pole error */
-    if (d == 0.0) return DBL2NUM(-HUGE_VAL);
+    if (d == 0.0) return DBL2NUM(-INFINITY);
 
-    return DBL2NUM(log10(d) + numbits * log10(2)); /* log10(d * 2 ** numbits) */
+    return DBL2NUM(log10(d) + numbits * M_LN2/M_LN10); /* log10(d * 2 ** numbits) */
 }
 
 /*
@@ -597,17 +590,10 @@ math_log10(VALUE unused_obj, VALUE x)
  *    #   [8, 2.82842712474619, 8.0]
  *    #   [9, 3.0, 9.0]
  *    #   [10, 3.16227766016838, 10.0]
- *
- *  Note that the limited precision of floating point arithmetic
- *  might lead to surprising results:
- *
- *    Math.sqrt(10**46).to_i  #=> 99999999999999991611392 (!)
- *
- *  See also BigDecimal#sqrt and Integer.sqrt.
  */
 
 static VALUE
-math_sqrt(VALUE unused_obj, VALUE x)
+math_sqrt(VALUE obj, VALUE x)
 {
     return rb_math_sqrt(x);
 }
@@ -687,16 +673,9 @@ rb_math_sqrt(VALUE x)
  */
 
 static VALUE
-math_cbrt(VALUE unused_obj, VALUE x)
+math_cbrt(VALUE obj, VALUE x)
 {
-    double f = Get_Double(x);
-    double r = cbrt(f);
-#if defined __GLIBC__
-    if (isfinite(r)) {
-	r = (2.0 * r + (f / r / r)) / 3.0;
-    }
-#endif
-    return DBL2NUM(r);
+    return DBL2NUM(cbrt(Get_Double(x)));
 }
 
 /*
@@ -704,14 +683,14 @@ math_cbrt(VALUE unused_obj, VALUE x)
  *     Math.frexp(x)    -> [fraction, exponent]
  *
  *  Returns a two-element array containing the normalized fraction (a Float)
- *  and exponent (an Integer) of +x+.
+ *  and exponent (a Fixnum) of +x+.
  *
  *     fraction, exponent = Math.frexp(1234)   #=> [0.6025390625, 11]
  *     fraction * 2**exponent                  #=> 1234.0
  */
 
 static VALUE
-math_frexp(VALUE unused_obj, VALUE x)
+math_frexp(VALUE obj, VALUE x)
 {
     double d;
     int exp;
@@ -731,7 +710,7 @@ math_frexp(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_ldexp(VALUE unused_obj, VALUE x, VALUE n)
+math_ldexp(VALUE obj, VALUE x, VALUE n)
 {
     return DBL2NUM(ldexp(Get_Double(x), NUM2INT(n)));
 }
@@ -747,7 +726,7 @@ math_ldexp(VALUE unused_obj, VALUE x, VALUE n)
  */
 
 static VALUE
-math_hypot(VALUE unused_obj, VALUE x, VALUE y)
+math_hypot(VALUE obj, VALUE x, VALUE y)
 {
     return DBL2NUM(hypot(Get_Double(x), Get_Double(y)));
 }
@@ -767,7 +746,7 @@ math_hypot(VALUE unused_obj, VALUE x, VALUE y)
  */
 
 static VALUE
-math_erf(VALUE unused_obj, VALUE x)
+math_erf(VALUE obj, VALUE x)
 {
     return DBL2NUM(erf(Get_Double(x)));
 }
@@ -787,11 +766,46 @@ math_erf(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_erfc(VALUE unused_obj, VALUE x)
+math_erfc(VALUE obj, VALUE x)
 {
     return DBL2NUM(erfc(Get_Double(x)));
 }
 
+#if defined __MINGW32__
+static inline double
+ruby_tgamma(const double d)
+{
+    const double g = tgamma(d);
+    if (isinf(g)) {
+	if (d == 0.0 && signbit(d)) return -INFINITY;
+    }
+    if (isnan(g)) {
+	if (!signbit(d)) return INFINITY;
+    }
+    return g;
+}
+#define tgamma(d) ruby_tgamma(d)
+#endif
+
+#if defined LGAMMA_R_PM0_FIX
+static inline double
+ruby_lgamma_r(const double d, int *sign)
+{
+    const double g = lgamma_r(d, sign);
+    if (isinf(g)) {
+	if (d == 0.0 && signbit(d)) {
+	    *sign = -1;
+	    return INFINITY;
+	} else if (d == 0.0 && !signbit(d)) {
+	    *sign = 1;
+	    return INFINITY;
+	}
+    }
+    return g;
+}
+#define lgamma_r(d, sign) ruby_lgamma_r(d, sign)
+#endif
+
 /*
  * call-seq:
  *    Math.gamma(x)  -> Float
@@ -833,7 +847,7 @@ math_erfc(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_gamma(VALUE unused_obj, VALUE x)
+math_gamma(VALUE obj, VALUE x)
 {
     static const double fact_table[] = {
         /* fact(0) */ 1.0,
@@ -867,13 +881,7 @@ math_gamma(VALUE unused_obj, VALUE x)
     double d;
     d = Get_Double(x);
     /* check for domain error */
-    if (isinf(d)) {
-	if (signbit(d)) domain_error("gamma");
-	return DBL2NUM(HUGE_VAL);
-    }
-    if (d == 0.0) {
-	return signbit(d) ? DBL2NUM(-HUGE_VAL) : DBL2NUM(HUGE_VAL);
-    }
+    if (isinf(d) && signbit(d)) domain_error("gamma");
     if (d == floor(d)) {
 	if (d < 0.0) domain_error("gamma");
 	if (1.0 <= d && d <= (double)NFACT_TABLE) {
@@ -898,7 +906,7 @@ math_gamma(VALUE unused_obj, VALUE x)
  */
 
 static VALUE
-math_lgamma(VALUE unused_obj, VALUE x)
+math_lgamma(VALUE obj, VALUE x)
 {
     double d;
     int sign=1;
@@ -907,11 +915,7 @@ math_lgamma(VALUE unused_obj, VALUE x)
     /* check for domain error */
     if (isinf(d)) {
 	if (signbit(d)) domain_error("lgamma");
-	return rb_assoc_new(DBL2NUM(HUGE_VAL), INT2FIX(1));
-    }
-    if (d == 0.0) {
-	VALUE vsign = signbit(d) ? INT2FIX(-1) : INT2FIX(+1);
-	return rb_assoc_new(DBL2NUM(HUGE_VAL), vsign);
+	return rb_assoc_new(DBL2NUM(INFINITY), INT2FIX(1));
     }
     v = DBL2NUM(lgamma_r(d, &sign));
     return rb_assoc_new(v, INT2FIX(sign));
@@ -922,14 +926,14 @@ math_lgamma(VALUE unused_obj, VALUE x)
 VALUE \
 rb_math_##n(VALUE x)\
 {\
-    return math_##n(0, x);\
+    return math_##n(rb_mMath, x);\
 }
 
 #define exp2(n) \
 VALUE \
 rb_math_##n(VALUE x, VALUE y)\
 {\
-    return math_##n(0, x, y);\
+    return math_##n(rb_mMath, x, y);\
 }
 
 exp2(atan2)
@@ -937,6 +941,13 @@ exp1(cos)
 exp1(cosh)
 exp1(exp)
 exp2(hypot)
+
+VALUE
+rb_math_log(int argc, const VALUE *argv)
+{
+    return math_log(argc, argv, rb_mMath);
+}
+
 exp1(sin)
 exp1(sinh)
 #if 0
@@ -978,8 +989,12 @@ InitVM_Math(void)
     rb_mMath = rb_define_module("Math");
     rb_eMathDomainError = rb_define_class_under(rb_mMath, "DomainError", rb_eStandardError);
 
+#ifdef M_PI
     /*  Definition of the mathematical constant PI as a Float number. */
     rb_define_const(rb_mMath, "PI", DBL2NUM(M_PI));
+#else
+    rb_define_const(rb_mMath, "PI", DBL2NUM(atan(1.0)*4.0));
+#endif
 
 #ifdef M_E
     /*  Definition of the mathematical constant E (e) as a Float number. */
diff --git a/method.h b/method.h
index 771e77e889..315915beb8 100644
--- a/method.h
+++ b/method.h
@@ -33,11 +33,10 @@ typedef enum {
 } rb_method_visibility_t;
 
 typedef struct rb_scope_visi_struct {
-    BITFIELD(rb_method_visibility_t, method_visi, 3);
+    rb_method_visibility_t method_visi : 3;
     unsigned int module_func : 1;
 } rb_scope_visibility_t;
 
-/*! CREF (Class REFerence) */
 typedef struct rb_cref_struct {
     VALUE flags;
     const VALUE refinements;
@@ -99,23 +98,21 @@ METHOD_ENTRY_FLAGS_COPY(rb_method_entry_t *dst, const rb_method_entry_t *src)
 }
 
 typedef enum {
-    VM_METHOD_TYPE_ISEQ,      /*!< Ruby method */
-    VM_METHOD_TYPE_CFUNC,     /*!< C method */
-    VM_METHOD_TYPE_ATTRSET,   /*!< attr_writer or attr_accessor */
-    VM_METHOD_TYPE_IVAR,      /*!< attr_reader or attr_accessor */
+    VM_METHOD_TYPE_ISEQ,
+    VM_METHOD_TYPE_CFUNC,
+    VM_METHOD_TYPE_ATTRSET,
+    VM_METHOD_TYPE_IVAR,
     VM_METHOD_TYPE_BMETHOD,
     VM_METHOD_TYPE_ZSUPER,
     VM_METHOD_TYPE_ALIAS,
     VM_METHOD_TYPE_UNDEF,
     VM_METHOD_TYPE_NOTIMPLEMENTED,
-    VM_METHOD_TYPE_OPTIMIZED, /*!< Kernel#send, Proc#call, etc */
-    VM_METHOD_TYPE_MISSING,   /*!< wrapper for method_missing(id) */
-    VM_METHOD_TYPE_REFINED,   /*!< refinement */
+    VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
+    VM_METHOD_TYPE_MISSING,   /* wrapper for method_missing(id) */
+    VM_METHOD_TYPE_REFINED,
 
     END_OF_ENUMERATION(VM_METHOD_TYPE)
 } rb_method_type_t;
-#define VM_METHOD_TYPE_MINIMUM_BITS 4
-/* TODO: STATIC_ASSERT for VM_METHOD_TYPE_MINIMUM_BITS */
 
 #ifndef rb_iseq_t
 typedef struct rb_iseq_struct rb_iseq_t;
@@ -123,8 +120,8 @@ typedef struct rb_iseq_struct rb_iseq_t;
 #endif
 
 typedef struct rb_method_iseq_struct {
-    const rb_iseq_t * const iseqptr; /*!< iseq pointer, should be separated from iseqval */
-    rb_cref_t * const cref;          /*!< class reference, should be marked */
+    const rb_iseq_t * const iseqptr;              /* should be separated from iseqval */
+    rb_cref_t * const cref;                       /* should be marked */
 } rb_method_iseq_t; /* check rb_add_method_iseq() when modify the fields */
 
 typedef struct rb_method_cfunc_struct {
@@ -147,22 +144,10 @@ typedef struct rb_method_refined_struct {
     const VALUE owner;
 } rb_method_refined_t;
 
-typedef struct rb_method_bmethod_struct {
-    const VALUE proc; /* should be marked */
-    struct rb_hook_list_struct *hooks;
-} rb_method_bmethod_t;
-
-enum method_optimized_type {
-    OPTIMIZED_METHOD_TYPE_SEND,
-    OPTIMIZED_METHOD_TYPE_CALL,
-    OPTIMIZED_METHOD_TYPE_BLOCK_CALL,
-    OPTIMIZED_METHOD_TYPE__MAX
-};
-
-PACKED_STRUCT_UNALIGNED(struct rb_method_definition_struct {
-    BITFIELD(rb_method_type_t, type, VM_METHOD_TYPE_MINIMUM_BITS);
-    int alias_count : 28;
-    int complemented_count : 28;
+typedef struct rb_method_definition_struct {
+    rb_method_type_t type :  8; /* method type */
+    int alias_count       : 28;
+    int complemented_count: 28;
 
     union {
 	rb_method_iseq_t iseq;
@@ -170,15 +155,18 @@ PACKED_STRUCT_UNALIGNED(struct rb_method_definition_struct {
 	rb_method_attr_t attr;
 	rb_method_alias_t alias;
 	rb_method_refined_t refined;
-        rb_method_bmethod_t bmethod;
 
-        enum method_optimized_type optimize_type;
+	const VALUE proc;                 /* should be marked */
+	enum method_optimized_type {
+	    OPTIMIZED_METHOD_TYPE_SEND,
+	    OPTIMIZED_METHOD_TYPE_CALL,
+
+	    OPTIMIZED_METHOD_TYPE__MAX
+	} optimize_type;
     } body;
 
     ID original_id;
-});
-
-typedef struct rb_method_definition_struct rb_method_definition_t;
+} rb_method_definition_t;
 
 #define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
 #define UNDEFINED_REFINED_METHOD_P(def) \
@@ -196,16 +184,14 @@ rb_method_entry_t *rb_method_entry_create(ID called_id, VALUE klass, rb_method_v
 const rb_method_entry_t *rb_method_entry_at(VALUE obj, ID id);
 
 const rb_method_entry_t *rb_method_entry(VALUE klass, ID id);
-const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class);
+const rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id);
+const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id);
 const rb_method_entry_t *rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me);
-RUBY_SYMBOL_EXPORT_BEGIN
-const rb_callable_method_entry_t *rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me);
-const rb_method_entry_t *rb_resolve_me_location(const rb_method_entry_t *, VALUE[5]);
-RUBY_SYMBOL_EXPORT_END
 
 const rb_callable_method_entry_t *rb_callable_method_entry(VALUE klass, ID id);
-const rb_callable_method_entry_t *rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class);
-const rb_callable_method_entry_t *rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class);
+const rb_callable_method_entry_t *rb_callable_method_entry_with_refinements(VALUE klass, ID id);
+const rb_callable_method_entry_t *rb_callable_method_entry_without_refinements(VALUE klass, ID id);
+const rb_callable_method_entry_t *rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me);
 
 int rb_method_entry_arity(const rb_method_entry_t *me);
 int rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2);
@@ -219,11 +205,9 @@ void rb_free_method_entry(const rb_method_entry_t *me);
 void rb_sweep_method_entry(void *vm);
 
 const rb_method_entry_t *rb_method_entry_clone(const rb_method_entry_t *me);
-const rb_callable_method_entry_t *rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID called_id, VALUE defined_class);
+const rb_callable_method_entry_t *rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, VALUE defined_class);
 void rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src);
 
 void rb_scope_visibility_set(rb_method_visibility_t);
 
-VALUE rb_unnamed_parameters(int arity);
-
 #endif /* RUBY_METHOD_H */
diff --git a/misc/README b/misc/README
index 1728b42700..08a9010f58 100644
--- a/misc/README
+++ b/misc/README
@@ -1,6 +1,12 @@
-README             this file
-rb_optparse.bash   bash completion script
-rb_optparse.zsh    zsh completion script
-ruby-style.el      Ruby's C/C++ mode style for emacs
-lldb_cruby.py      LLDB port of debug utility
-test_lldb_cruby.rb test file for LLDB port
+README            this file
+inf-ruby.el       program to run ruby under emacs
+rb_optparse.bash  bash completion script
+rb_optparse.zsh   zsh completion script
+rdoc-mode.el      RDoc mode for emacs
+ruby-mode.el      ruby mode for emacs
+ruby-style.el     Ruby's C/C++ mode style for emacs
+rubydb2x.el       ruby debugger support for emacs 19.2x or before
+rubydb3x.el       ruby debugger support for emacs 19.3x or later
+ruby-electric.el  emacs minor mode providing electric commands
+
+Check out https://github.com/ruby-debug/ also.
diff --git a/misc/inf-ruby.el b/misc/inf-ruby.el
new file mode 100644
index 0000000000..b3f4f10267
--- /dev/null
+++ b/misc/inf-ruby.el
@@ -0,0 +1,418 @@
+;;; -*-Emacs-Lisp-*-
+;;;
+;;;  $Id$
+;;;  $Author$
+;;;
+;;; Inferior Ruby Mode - ruby process in a buffer.
+;;;                      adapted from cmuscheme.el
+;;;
+;;; Usage:
+;;;
+;;; (0) check ruby-program-name variable that can run your environment.
+;;;
+;;; (1) modify .emacs to use ruby-mode
+;;;     for example :
+;;;
+;;;    (autoload 'ruby-mode "ruby-mode"
+;;;      "Mode for editing ruby source files" t)
+;;;    (setq auto-mode-alist
+;;;          (append '(("\\.rb$" . ruby-mode)) auto-mode-alist))
+;;;    (setq interpreter-mode-alist (append '(("ruby" . ruby-mode))
+;;;                                  interpreter-mode-alist))
+;;;
+;;; (2) set to load inf-ruby and set inf-ruby key definition in ruby-mode.
+;;;
+;;;    (autoload 'run-ruby "inf-ruby"
+;;;      "Run an inferior Ruby process")
+;;;    (autoload 'inf-ruby-keys "inf-ruby"
+;;;      "Set local key defs for inf-ruby in ruby-mode")
+;;;    (add-hook 'ruby-mode-hook
+;;;          '(lambda ()
+;;;             (inf-ruby-keys)
+;;;    ))
+;;;
+;;; HISTORY
+;;; senda -  8 Apr 1998: Created.
+;;;      $Log$
+;;;      Revision 1.7  2004/07/27 08:11:36  matz
+;;;      * eval.c (rb_eval): copy on write for argument local variable
+;;;        assignment.
+;;;
+;;;      * eval.c (assign): ditto.
+;;;
+;;;      * eval.c (rb_call0): update ruby_frame->argv with the default
+;;;        value used for the optional arguments.
+;;;
+;;;      * object.c (Init_Object): "===" calls rb_obj_equal() directly.
+;;;        [ruby-list:39937]
+;;;
+;;;      Revision 1.6  2002/09/07 14:35:46  nobu
+;;;      * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
+;;;        alist for error message from ruby.
+;;;
+;;;      * misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
+;;;
+;;;      * misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
+;;;        doesn't parse first line, so insert separators before each
+;;;        evaluations.
+;;;
+;;;      Revision 1.5  2002/08/19 10:05:47  nobu
+;;;      * misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
+;;;        conflicted with ruby-insert-end.
+;;;
+;;;      * misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
+;;;
+;;;      * misc/inf-ruby.el (ruby-send-region): send as here document to
+;;;        adjust source file/line.  [ruby-talk:47113], [ruby-dev:17965]
+;;;
+;;;      * misc/inf-ruby.el (ruby-send-terminator): added to make unique
+;;;        terminator.
+;;;
+;;;      Revision 1.4  2002/01/29 07:16:09  matz
+;;;      * file.c (rb_stat_rdev_major): added. [new]
+;;;
+;;;      * file.c (rb_stat_rdev_minor): added. [new]
+;;;
+;;;      * file.c (rb_stat_inspect): print mode in octal.
+;;;
+;;;      Revision 1.3  1999/12/01 09:24:18  matz
+;;;      19991201
+;;;
+;;;      Revision 1.2  1999/08/13 05:45:18  matz
+;;;      1.4.0
+;;;
+;;;      Revision 1.1.1.1.2.1  1999/07/15 07:59:59  matz
+;;;      990715
+;;;
+;;;      Revision 1.1.1.1  1999/01/20 04:59:36  matz
+;;;      ruby 1.3 cycle
+;;;
+;;;      Revision 1.1.2.1  1998/12/16 07:30:36  matz
+;;;      first public release of 1.1d (pre1.2) series
+;;;
+;;;      Revision 1.4  1998/05/20 02:45:58  senda
+;;;      default program to irb
+;;;
+;;;      Revision 1.3  1998/04/10 04:11:30  senda
+;;;      modification by Matsumoto san (1.1b9_09)
+;;;      remove-in-string defined
+;;;      global variable :
+;;;              inferior-ruby-first-prompt-pattern
+;;;            inferior-ruby-prompt-pattern
+;;;      defined
+;;;
+;;;      Revision 1.2  1998/04/09 07:53:42  senda
+;;;      remove M-C-x in inferior-ruby-mode
+;;;
+;;;      Revision 1.1  1998/04/09 07:28:36  senda
+;;;      Initial revision
+;;;
+;;;
+
+(require 'comint)
+(require 'compile)
+(require 'ruby-mode)
+
+;;
+;; you may change these variables
+;;
+;(defvar ruby-program-name "rbc --noreadline"
+;  "*Program invoked by the run-ruby command")
+;
+;(defvar inferior-ruby-first-prompt-pattern "^rbc0> *"
+;  "first prompt regex pattern of ruby interpreter.")
+;
+;(defvar inferior-ruby-prompt-pattern "^\\(rbc.[>*\"'] *\\)+"
+;  "prompt regex pattern of ruby interpreter.")
+
+;;;; for irb
+(defvar ruby-program-name "irb --inf-ruby-mode"
+  "*Program invoked by the run-ruby command")
+
+(defvar inferior-ruby-first-prompt-pattern "^irb(.*)[0-9:]+0> *"
+  "first prompt regex pattern of ruby interpreter.")
+
+(defvar inferior-ruby-prompt-pattern "^\\(irb(.*)[0-9:]+[>*\"'] *\\)+"
+  "prompt regex pattern of ruby interpreter.")
+
+;;
+;; mode variables
+;;
+(defvar inferior-ruby-mode-hook nil
+  "*Hook for customising inferior-ruby mode.")
+(defvar inferior-ruby-mode-map nil
+  "*Mode map for inferior-ruby-mode")
+
+(defconst inferior-ruby-error-regexp-alist
+       '(("SyntaxError: compile error\n^\\([^\(].*\\):\\([1-9][0-9]*\\):" 1 2)
+         ("^\tfrom \\([^\(].*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?$" 1 2)))
+
+(cond ((not inferior-ruby-mode-map)
+       (setq inferior-ruby-mode-map
+             (copy-keymap comint-mode-map))
+;       (define-key inferior-ruby-mode-map "\M-\C-x" ;gnu convention
+;                  'ruby-send-definition)
+;       (define-key inferior-ruby-mode-map "\C-x\C-e" 'ruby-send-last-sexp)
+       (define-key inferior-ruby-mode-map "\C-c\C-l" 'ruby-load-file)
+))
+
+;;;###autoload
+(defun inf-ruby-keys ()
+  "Set local key defs for inf-ruby in ruby-mode"
+  (define-key ruby-mode-map "\M-\C-x" 'ruby-send-definition)
+;  (define-key ruby-mode-map "\C-x\C-e" 'ruby-send-last-sexp)
+  (define-key ruby-mode-map "\C-c\C-b" 'ruby-send-block)
+  (define-key ruby-mode-map "\C-c\M-b" 'ruby-send-block-and-go)
+  (define-key ruby-mode-map "\C-c\C-x" 'ruby-send-definition)
+  (define-key ruby-mode-map "\C-c\M-x" 'ruby-send-definition-and-go)
+  (define-key ruby-mode-map "\C-c\C-r" 'ruby-send-region)
+  (define-key ruby-mode-map "\C-c\M-r" 'ruby-send-region-and-go)
+  (define-key ruby-mode-map "\C-c\C-z" 'switch-to-ruby)
+  (define-key ruby-mode-map "\C-c\C-l" 'ruby-load-file)
+  (define-key ruby-mode-map "\C-c\C-s" 'run-ruby)
+)
+
+(defvar ruby-buffer nil "current ruby (actually irb) process buffer.")
+
+(defun inferior-ruby-mode ()
+  "Major mode for interacting with an inferior ruby (irb) process.
+
+The following commands are available:
+\\{inferior-ruby-mode-map}
+
+A ruby process can be fired up with M-x run-ruby.
+
+Customisation: Entry to this mode runs the hooks on comint-mode-hook and
+inferior-ruby-mode-hook (in that order).
+
+You can send text to the inferior ruby process from other buffers containing
+Ruby source.
+    switch-to-ruby switches the current buffer to the ruby process buffer.
+    ruby-send-definition sends the current definition to the ruby process.
+    ruby-send-region sends the current region to the ruby process.
+
+    ruby-send-definition-and-go, ruby-send-region-and-go,
+        switch to the ruby process buffer after sending their text.
+For information on running multiple processes in multiple buffers, see
+documentation for variable ruby-buffer.
+
+Commands:
+Return after the end of the process' output sends the text from the
+    end of process to point.
+Return before the end of the process' output copies the sexp ending at point
+    to the end of the process' output, and sends it.
+Delete converts tabs to spaces as it moves back.
+Tab indents for ruby; with argument, shifts rest
+    of expression rigidly with the current line.
+C-M-q does Tab on each line starting within following expression.
+Paragraphs are separated only by blank lines.  # start comments.
+If you accidentally suspend your process, use \\[comint-continue-subjob]
+to continue it."
+  (interactive)
+  (comint-mode)
+  ;; Customise in inferior-ruby-mode-hook
+  ;(setq comint-prompt-regexp "^[^>\n]*>+ *")
+  (setq comint-prompt-regexp inferior-ruby-prompt-pattern)
+  ;;(scheme-mode-variables)
+  (ruby-mode-variables)
+  (setq major-mode 'inferior-ruby-mode)
+  (setq mode-name "Inferior Ruby")
+  (setq mode-line-process '(":%s"))
+  (use-local-map inferior-ruby-mode-map)
+  (setq comint-input-filter (function ruby-input-filter))
+  (setq comint-get-old-input (function ruby-get-old-input))
+  (make-local-variable 'compilation-error-regexp-alist)
+  (setq compilation-error-regexp-alist inferior-ruby-error-regexp-alist)
+  (compilation-shell-minor-mode t)
+  (run-hooks 'inferior-ruby-mode-hook))
+
+(defvar inferior-ruby-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'"
+  "*Input matching this regexp are not saved on the history list.
+Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters.")
+
+(defun ruby-input-filter (str)
+  "Don't save anything matching inferior-ruby-filter-regexp"
+  (not (string-match inferior-ruby-filter-regexp str)))
+
+;; adapted from replace-in-string in XEmacs (subr.el)
+(defun remove-in-string (str regexp)
+  "Remove all matches in STR for REGEXP and returns the new string."
+  (let ((rtn-str "") (start 0) match prev-start)
+    (while (setq match (string-match regexp str start))
+      (setq prev-start start
+            start (match-end 0)
+            rtn-str (concat rtn-str (substring str prev-start match))))
+    (concat rtn-str (substring str start))))
+
+(defun ruby-get-old-input ()
+  "Snarf the sexp ending at point"
+  (save-excursion
+    (let ((end (point)))
+      (re-search-backward inferior-ruby-first-prompt-pattern)
+      (remove-in-string (buffer-substring (point) end)
+                        inferior-ruby-prompt-pattern)
+      )))
+
+(defun ruby-args-to-list (string)
+  (let ((where (string-match "[ \t]" string)))
+    (cond ((null where) (list string))
+          ((not (= where 0))
+           (cons (substring string 0 where)
+                 (ruby-args-to-list (substring string (+ 1 where)
+                                                 (length string)))))
+          (t (let ((pos (string-match "[^ \t]" string)))
+               (if (null pos)
+                   nil
+                 (ruby-args-to-list (substring string pos
+                                                 (length string)))))))))
+
+;;;###autoload
+(defun run-ruby (cmd)
+  "Run an inferior Ruby process, input and output via buffer *ruby*.
+If there is a process already running in `*ruby*', switch to that buffer.
+With argument, allows you to edit the command line (default is value
+of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
+\(after the `comint-mode-hook' is run).
+\(Type \\[describe-mode] in the process buffer for a list of commands.)"
+
+  (interactive (list (if current-prefix-arg
+                         (read-string "Run Ruby: " ruby-program-name)
+                         ruby-program-name)))
+  (if (not (comint-check-proc "*ruby*"))
+      (let ((cmdlist (ruby-args-to-list cmd)))
+        (set-buffer (apply 'make-comint "ruby" (car cmdlist)
+                           nil (cdr cmdlist)))
+        (inferior-ruby-mode)))
+  (setq ruby-program-name cmd)
+  (setq ruby-buffer "*ruby*")
+  (pop-to-buffer "*ruby*"))
+
+(defconst ruby-send-terminator "--inf-ruby-%x-%d-%d-%d--"
+  "Template for irb here document terminator.
+Must not contain ruby meta characters.")
+
+(defconst ruby-eval-separator "")
+
+(defun ruby-send-region (start end)
+  "Send the current region to the inferior Ruby process."
+  (interactive "r")
+  (let (term (file (buffer-file-name)) line)
+    (save-excursion
+      (save-restriction
+        (widen)
+        (goto-char start)
+        (setq line (+ start (forward-line (- start)) 1))
+        (goto-char start)
+        (while (progn
+                 (setq term (apply 'format ruby-send-terminator (random) (current-time)))
+                 (re-search-forward (concat "^" (regexp-quote term) "$") end t)))))
+    ;; compilation-parse-errors parses from second line.
+    (save-excursion
+      (let ((m (process-mark (ruby-proc))))
+        (set-buffer (marker-buffer m))
+        (goto-char m)
+        (insert ruby-eval-separator "\n")
+        (set-marker m (point))))
+    (comint-send-string (ruby-proc) (format "eval <<'%s', nil, %S, %d\n" term file line))
+    (comint-send-region (ruby-proc) start end)
+    (comint-send-string (ruby-proc) (concat "\n" term "\n"))))
+
+(defun ruby-send-definition ()
+  "Send the current definition to the inferior Ruby process."
+  (interactive)
+  (save-excursion
+    (ruby-end-of-defun)
+    (let ((end (point)))
+      (ruby-beginning-of-defun)
+      (ruby-send-region (point) end))))
+
+;(defun ruby-send-last-sexp ()
+;  "Send the previous sexp to the inferior Ruby process."
+;  (interactive)
+;  (ruby-send-region (save-excursion (backward-sexp) (point)) (point)))
+
+(defun ruby-send-block ()
+  "Send the current block to the inferior Ruby process."
+  (interactive)
+  (save-excursion
+    (ruby-end-of-block)
+    (end-of-line)
+    (let ((end (point)))
+      (ruby-beginning-of-block)
+      (ruby-send-region (point) end))))
+
+(defun switch-to-ruby (eob-p)
+  "Switch to the ruby process buffer.
+With argument, positions cursor at end of buffer."
+  (interactive "P")
+  (if (get-buffer ruby-buffer)
+      (pop-to-buffer ruby-buffer)
+      (error "No current process buffer. See variable ruby-buffer."))
+  (cond (eob-p
+         (push-mark)
+         (goto-char (point-max)))))
+
+(defun ruby-send-region-and-go (start end)
+  "Send the current region to the inferior Ruby process.
+Then switch to the process buffer."
+  (interactive "r")
+  (ruby-send-region start end)
+  (switch-to-ruby t))
+
+(defun ruby-send-definition-and-go ()
+  "Send the current definition to the inferior Ruby.
+Then switch to the process buffer."
+  (interactive)
+  (ruby-send-definition)
+  (switch-to-ruby t))
+
+(defun ruby-send-block-and-go ()
+  "Send the current block to the inferior Ruby.
+Then switch to the process buffer."
+  (interactive)
+  (ruby-send-block)
+  (switch-to-ruby t))
+
+(defvar ruby-source-modes '(ruby-mode)
+  "*Used to determine if a buffer contains Ruby source code.
+If it's loaded into a buffer that is in one of these major modes, it's
+considered a ruby source file by ruby-load-file.
+Used by these commands to determine defaults.")
+
+(defvar ruby-prev-l/c-dir/file nil
+  "Caches the last (directory . file) pair.
+Caches the last pair used in the last ruby-load-file command.
+Used for determining the default in the
+next one.")
+
+(defun ruby-load-file (file-name)
+  "Load a Ruby file into the inferior Ruby process."
+  (interactive (comint-get-source "Load Ruby file: " ruby-prev-l/c-dir/file
+                                  ruby-source-modes t)) ; T because LOAD
+                                                          ; needs an exact name
+  (comint-check-source file-name) ; Check to see if buffer needs saved.
+  (setq ruby-prev-l/c-dir/file (cons (file-name-directory    file-name)
+                                       (file-name-nondirectory file-name)))
+  (comint-send-string (ruby-proc) (concat "(load \""
+                                            file-name
+                                            "\"\)\n")))
+
+(defun ruby-proc ()
+  "Returns the current ruby process. See variable ruby-buffer."
+  (let ((proc (get-buffer-process (if (eq major-mode 'inferior-ruby-mode)
+                                      (current-buffer)
+                                    ruby-buffer))))
+    (or proc
+        (error "No current process. See variable ruby-buffer"))))
+
+;;; Do the user's customisation...
+
+(defvar inf-ruby-load-hook nil
+  "This hook is run when inf-ruby is loaded in.
+This is a good place to put keybindings.")
+
+(run-hooks 'inf-ruby-load-hook)
+
+(provide 'inf-ruby)
+
+;;; inf-ruby.el ends here
diff --git a/misc/lldb_cruby.py b/misc/lldb_cruby.py
deleted file mode 100755
index 0c4b9fc0d1..0000000000
--- a/misc/lldb_cruby.py
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/env python
-#coding: utf-8
-#
-# Usage: run `command script import -r misc/lldb_cruby.py` on LLDB
-#
-# Test: misc/test_lldb_cruby.rb
-#
-
-import lldb
-import commands
-import os
-import shlex
-
-def lldb_init(debugger):
-    target = debugger.GetSelectedTarget()
-    global SIZEOF_VALUE
-    SIZEOF_VALUE = target.FindFirstType("VALUE").GetByteSize()
-
-    value_types = []
-    g = globals()
-    for enum in target.FindFirstGlobalVariable('ruby_dummy_gdb_enums'):
-        enum = enum.GetType()
-        members = enum.GetEnumMembers()
-        for i in xrange(0, members.GetSize()):
-            member = members.GetTypeEnumMemberAtIndex(i)
-            name = member.GetName()
-            value = member.GetValueAsUnsigned()
-            g[name] = value
-
-            if name.startswith('RUBY_T_'):
-                value_types.append(name)
-    g['value_types'] = value_types
-
-def string2cstr(rstring):
-    """Returns the pointer to the C-string in the given String object"""
-    flags = rstring.GetValueForExpressionPath(".basic->flags").unsigned
-    if flags & RUBY_T_MASK != RUBY_T_STRING:
-        raise TypeError("not a string")
-    if flags & RUBY_FL_USER1:
-        cptr = int(rstring.GetValueForExpressionPath(".as.heap.ptr").value, 0)
-        clen = int(rstring.GetValueForExpressionPath(".as.heap.len").value, 0)
-    else:
-        cptr = int(rstring.GetValueForExpressionPath(".as.ary").value, 0)
-        clen = (flags & RSTRING_EMBED_LEN_MASK) >> RSTRING_EMBED_LEN_SHIFT
-    return cptr, clen
-
-def output_string(ctx, rstring):
-    cptr, clen = string2cstr(rstring)
-    expr = 'printf("%%.*s", (size_t)%d, (const char*)%d)' % (clen, cptr)
-    ctx.frame.EvaluateExpression(expr)
-
-def fixnum_p(x):
-    return x & RUBY_FIXNUM_FLAG != 0
-
-def flonum_p(x):
-    return (x&RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG
-
-def static_sym_p(x):
-    return (x&~(~0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
-
-def append_command_output(debugger, command, result):
-    output1 = result.GetOutput()
-    debugger.GetCommandInterpreter().HandleCommand(command, result)
-    output2 = result.GetOutput()
-    result.Clear()
-    result.write(output1)
-    result.write(output2)
-
-def lldb_rp(debugger, command, result, internal_dict):
-    if not ('RUBY_Qfalse' in globals()):
-        lldb_init(debugger)
-
-    target = debugger.GetSelectedTarget()
-    process = target.GetProcess()
-    thread = process.GetSelectedThread()
-    frame = thread.GetSelectedFrame()
-    if frame.IsValid():
-        val = frame.EvaluateExpression(command)
-    else:
-        val = target.EvaluateExpression(command)
-    error = val.GetError()
-    if error.Fail():
-        print >> result, error
-        return
-    lldb_inspect(debugger, target, result, val)
-
-def lldb_inspect(debugger, target, result, val):
-    num = val.GetValueAsSigned()
-    if num == RUBY_Qfalse:
-        print >> result, 'false'
-    elif num == RUBY_Qtrue:
-        print >> result, 'true'
-    elif num == RUBY_Qnil:
-        print >> result, 'nil'
-    elif num == RUBY_Qundef:
-        print >> result, 'undef'
-    elif fixnum_p(num):
-        print >> result, num >> 1
-    elif flonum_p(num):
-        append_command_output(debugger, "print rb_float_value(%0#x)" % val.GetValueAsUnsigned(), result)
-    elif static_sym_p(num):
-        if num < 128:
-            print >> result, "T_SYMBOL: %c" % num
-        else:
-            print >> result, "T_SYMBOL: (%x)" % num
-    elif num & RUBY_IMMEDIATE_MASK:
-        print >> result, 'immediate(%x)' % num
-    else:
-        tRBasic = target.FindFirstType("struct RBasic").GetPointerType()
-        val = val.Cast(tRBasic)
-        flags = val.GetValueForExpressionPath("->flags").GetValueAsUnsigned()
-        if (flags & RUBY_FL_PROMOTED) == RUBY_FL_PROMOTED:
-            print >> result, "[PROMOTED] "
-        flType = flags & RUBY_T_MASK
-        if flType == RUBY_T_NONE:
-            print >> result, 'T_NONE: %s' % val.Dereference()
-        elif flType == RUBY_T_NIL:
-            print >> result, 'T_NIL: %s' % val.Dereference()
-        elif flType == RUBY_T_OBJECT:
-            tRObject = target.FindFirstType("struct RObject").GetPointerType()
-            val = val.Cast(tRObject)
-            print >> result, 'T_OBJECT: %s' % val.Dereference()
-        elif flType == RUBY_T_CLASS or flType == RUBY_T_MODULE or flType == RUBY_T_ICLASS:
-            tRClass = target.FindFirstType("struct RClass").GetPointerType()
-            val = val.Cast(tRClass)
-            print >> result, 'T_%s: %s' % ('CLASS' if flType == RUBY_T_CLASS else 'MODULE' if flType == RUBY_T_MODULE else 'ICLASS', val.Dereference())
-        elif flType == RUBY_T_STRING:
-            tRString = target.FindFirstType("struct RString").GetPointerType()
-            val = val.Cast(tRString)
-            if flags & RSTRING_NOEMBED:
-                print >> result, val.GetValueForExpressionPath("->as.heap")
-            else:
-                print >> result, val.GetValueForExpressionPath("->as.ary")
-        elif flType == RUBY_T_SYMBOL:
-            tRSymbol = target.FindFirstType("struct RSymbol").GetPointerType()
-            print >> result, val.Cast(tRSymbol).Dereference()
-        elif flType == RUBY_T_ARRAY:
-            tRArray = target.FindFirstType("struct RArray").GetPointerType()
-            val = val.Cast(tRArray)
-            if flags & RUBY_FL_USER1:
-                len = ((flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
-                ptr = val.GetValueForExpressionPath("->as.ary")
-            else:
-                len = val.GetValueForExpressionPath("->as.heap.len").GetValueAsSigned()
-                ptr = val.GetValueForExpressionPath("->as.heap.ptr")
-                #print >> result, val.GetValueForExpressionPath("->as.heap")
-            result.write("T_ARRAY: len=%d" % len)
-            if flags & RUBY_FL_USER1:
-                result.write(" (embed)")
-            elif flags & RUBY_FL_USER2:
-                shared = val.GetValueForExpressionPath("->as.heap.aux.shared").GetValueAsUnsigned()
-                result.write(" (shared) shared=%016x")
-            else:
-                capa = val.GetValueForExpressionPath("->as.heap.aux.capa").GetValueAsSigned()
-                result.write(" (ownership) capa=%d" % capa)
-            if len == 0:
-                result.write(" {(empty)}")
-            else:
-                result.write("\n")
-                append_command_output(debugger, "expression -Z %d -fx -- (const VALUE*)%0#x" % (len, ptr.GetValueAsUnsigned()), result)
-        elif flType == RUBY_T_HASH:
-            append_command_output(debugger, "p *(struct RHash *) %0#x" % val.GetValueAsUnsigned(), result)
-        elif flType == RUBY_T_BIGNUM:
-            tRBignum = target.FindFirstType("struct RBignum").GetPointerType()
-            val = val.Cast(tRBignum)
-            if flags & RUBY_FL_USER2:
-                len = ((flags & (RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5)) >> (RUBY_FL_USHIFT+3))
-                print >> result, "T_BIGNUM: len=%d (embed)" % len
-                append_command_output(debugger, "print ((struct RBignum *) %0#x)->as.ary" % val.GetValueAsUnsigned(), result)
-            else:
-                len = val.GetValueForExpressionPath("->as.heap.len").GetValueAsSigned()
-                print >> result, "T_BIGNUM: len=%d" % len
-                print >> result, val.Dereference()
-                append_command_output(debugger, "expression -Z %x -fx -- (const BDIGIT*)((struct RBignum*)%d)->as.heap.digits" % (len, val.GetValueAsUnsigned()), result)
-                # append_command_output(debugger, "x ((struct RBignum *) %0#x)->as.heap.digits / %d" % (val.GetValueAsUnsigned(), len), result)
-        elif flType == RUBY_T_FLOAT:
-            tRFloat = target.FindFirstType("struct RFloat").GetPointerType()
-            val = val.Cast(tRFloat)
-            append_command_output(debugger, "p *(double *)%0#x" % val.GetValueForExpressionPath("->float_value").GetAddress(), result)
-        elif flType == RUBY_T_RATIONAL:
-            tRRational = target.FindFirstType("struct RRational").GetPointerType()
-            val = val.Cast(tRRational)
-            lldb_inspect(debugger, target, result, val.GetValueForExpressionPath("->num"))
-            output = result.GetOutput()
-            result.Clear()
-            result.write("(Rational) " + output.rstrip() + " / ")
-            lldb_inspect(debugger, target, result, val.GetValueForExpressionPath("->den"))
-        elif flType == RUBY_T_COMPLEX:
-            tRComplex = target.FindFirstType("struct RComplex").GetPointerType()
-            val = val.Cast(tRComplex)
-            lldb_inspect(debugger, target, result, val.GetValueForExpressionPath("->real"))
-            real = result.GetOutput().rstrip()
-            result.Clear()
-            lldb_inspect(debugger, target, result, val.GetValueForExpressionPath("->imag"))
-            imag = result.GetOutput().rstrip()
-            result.Clear()
-            if not imag.startswith("-"):
-                imag = "+" + imag
-            print >> result, "(Complex) " + real + imag + "i"
-        elif flType == RUBY_T_DATA:
-            tRTypedData = target.FindFirstType("struct RTypedData").GetPointerType()
-            val = val.Cast(tRTypedData)
-            flag = val.GetValueForExpressionPath("->typed_flag")
-            if flag.GetValueAsUnsigned() == 1:
-                print >> result, "T_DATA: %s" % val.GetValueForExpressionPath("->type->wrap_struct_name")
-                append_command_output(debugger, "p *(struct RTypedData *) %0#x" % val.GetValueAsUnsigned(), result)
-            else:
-                print >> result, "T_DATA:"
-                append_command_output(debugger, "p *(struct RData *) %0#x" % val.GetValueAsUnsigned(), result)
-        else:
-            print >> result, "Not-handled type %0#x" % flType
-            print >> result, val
-
-def count_objects(debugger, command, ctx, result, internal_dict):
-    objspace = ctx.frame.EvaluateExpression("ruby_current_vm->objspace")
-    num_pages = objspace.GetValueForExpressionPath(".heap_pages.allocated_pages").unsigned
-
-    counts = {}
-    total = 0
-    for t in range(0x00, RUBY_T_MASK+1):
-        counts[t] = 0
-
-    for i in range(0, num_pages):
-        print "\rcounting... %d/%d" % (i, num_pages),
-        page = objspace.GetValueForExpressionPath('.heap_pages.sorted[%d]' % i)
-        p = page.GetChildMemberWithName('start')
-        num_slots = page.GetChildMemberWithName('total_slots').unsigned
-        for j in range(0, num_slots):
-            obj = p.GetValueForExpressionPath('[%d]' % j)
-            flags = obj.GetValueForExpressionPath('.as.basic.flags').unsigned
-            obj_type = flags & RUBY_T_MASK
-            counts[obj_type] += 1
-        total += num_slots
-
-    print "\rTOTAL: %d, FREE: %d" % (total, counts[0x00])
-    for sym in value_types:
-        print "%s: %d" % (sym, counts[globals()[sym]])
-
-def stack_dump_raw(debugger, command, ctx, result, internal_dict):
-    ctx.frame.EvaluateExpression("rb_vmdebug_stack_dump_raw_current()")
-
-def dump_node(debugger, command, ctx, result, internal_dict):
-    args = shlex.split(command)
-    if not args:
-        return
-    node = args[0]
-
-    dump = ctx.frame.EvaluateExpression("(struct RString*)rb_parser_dump_tree((NODE*)(%s), 0)" % node)
-    output_string(ctx, dump)
-
-def __lldb_init_module(debugger, internal_dict):
-    debugger.HandleCommand("command script add -f lldb_cruby.lldb_rp rp")
-    debugger.HandleCommand("command script add -f lldb_cruby.count_objects rb_count_objects")
-    debugger.HandleCommand("command script add -f lldb_cruby.stack_dump_raw SDR")
-    debugger.HandleCommand("command script add -f lldb_cruby.dump_node dump_node")
-    lldb_init(debugger)
-    print "lldb scripts for ruby has been installed."
diff --git a/misc/rdoc-mode.el b/misc/rdoc-mode.el
new file mode 100644
index 0000000000..c26c2ee564
--- /dev/null
+++ b/misc/rdoc-mode.el
@@ -0,0 +1,166 @@
+;;
+;; rdoc-mode.el
+;; Major mode for RDoc editing
+;;
+
+;; Created: Fri Sep 18 09:04:49 JST 2009
+
+;; License: Ruby's
+
+(require 'derived)
+
+;;;###autoload
+(define-derived-mode rdoc-mode text-mode "RDoc"
+  "Major mode for RD editing.
+\\{rdoc-mode-map}"
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate "^\\(=+\\|\\*+\\)[ \t\v\f]*\\|^\\s *$")
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start paragraph-separate)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '((rdoc-font-lock-keywords) t nil))
+  (make-local-variable 'font-lock-keywords)
+  (setq font-lock-keywords rdoc-font-lock-keywords)
+  (make-local-variable 'outline-regexp)
+  (setq outline-regexp "^\\(=+\\)[ \t\v\f]*")
+  (outline-minor-mode t)
+  (setq show-trailing-whitespace t)
+  (rdoc-setup-keys)
+  (setq indent-tabs-mode nil)
+  (run-hooks 'rdoc-mode-hook)
+  )
+
+(defun rdoc-fill-paragraph (&optional justify region)
+  "Fills paragraph, except for cited region"
+  (interactive (progn
+		 (barf-if-buffer-read-only)
+		 (list (if current-prefix-arg 'full))))
+  (save-excursion
+    (beginning-of-line)
+    (save-restriction
+      (let ((pos (point)) beg end indent hanging)
+	(cond
+	 ((looking-at "^ +\\(\\*\\s *\\)")
+	  (setq indent (- (match-end 0) (match-beginning 0))
+		hanging (- (match-end 1) (match-beginning 1))))
+	 ((looking-at "^ +")
+	  (setq indent (- (match-end 0) (match-beginning 0)))
+	  (when (and (re-search-backward "^[^ ]\\|^\\( *\\(\\* *\\)\\)" nil t)
+		     (match-beginning 1)
+		     (= indent (- (match-end 1) (match-beginning 1))))
+	    (setq hanging (- (match-end 2) (match-beginning 2)))
+	    (setq beg (match-beginning 1))))
+	 ((setq beg t)))
+	(when beg
+	  (when indent
+	    (goto-char pos)
+	    (while (progn (beginning-of-line 2)
+			  (and (looking-at "^\\( +\\)\\S ")
+			       (= indent (- (match-end 1) (match-beginning 1))))))
+	    (setq end (point))
+	    (when (and beg (not region))
+	      (setq region (list beg end))
+	      (narrow-to-region beg end)
+	      ))
+	  (goto-char pos)
+	  (fill-paragraph justify region)
+	  (when (and indent
+		     (or (goto-char beg) t)
+		     (or (beginning-of-line 2) t)
+		     (looking-at "^\\( +\\)")
+		     (= (- indent hanging) (- (match-end 0) (match-beginning 0))))
+	    (insert-char ?\s hanging)
+	    (beginning-of-line)
+	    (narrow-to-region (point) end)
+	    (fill-paragraph justify (list (point) end))))))))
+
+(defun rdoc-setup-keys ()
+  (interactive)
+  (define-key rdoc-mode-map "\M-q" 'rdoc-fill-paragraph)
+  )
+
+(defvar rdoc-heading1-face 'font-lock-keywordoc-face)
+(defvar rdoc-heading2-face 'font-lock-type-face)
+(defvar rdoc-heading3-face 'font-lock-variable-name-face)
+(defvar rdoc-heading4-face 'font-lock-comment-face)
+(defvar rdoc-bold-face 'font-lock-function-name-face)
+(defvar rdoc-emphasis-face 'font-lock-function-name-face)
+(defvar rdoc-code-face 'font-lock-keyword-face)
+(defvar rdoc-description-face 'font-lock-constant-face)
+
+(defvar rdoc-font-lock-keywords
+  (list
+   (list "^=([^=\r\n].*)?$"
+	 0 rdoc-heading1-face)
+   (list "^==([^=\r\n].*)?$"
+	 0 rdoc-heading2-face)
+   (list "^===([^=\r\n].*)?$"
+	 0 rdoc-heading3-face)
+   (list "^====+.*$"
+	 0 rdoc-heading4-face)
+   (list "\\(^\\|[ \t\v\f]\\)\\(\\*\\(\\sw\\|[-_:]\\)+\\*\\)\\($\\|[ \t\v\f]\\)"
+	 2 rdoc-bold-face)		; *bold*
+   (list "\\(^\\|[ \t\v\f]\\)\\(_\\(\\sw\\|[-_:]\\)+_\\)\\($\\|[ \t\v\f]\\)"
+	 2 rdoc-emphasis-face)		; _emphasis_
+   (list "\\(^\\|[ \t\v\f]\\)\\(\\+\\(\\sw\\|[-_:]\\)+\\+\\)\\($\\|[ \t\v\f]\\)"
+	 2 rdoc-code-face)		; +code+
+   (list "<em>[^<>]*</em>" 0 rdoc-emphasis-face)
+   (list "<i>[^<>]*</i>" 0 rdoc-emphasis-face)
+   (list "<b>[^<>]*</b>" 0 rdoc-bold-face)
+   (list "<tt>[^<>]*</tt>" 0 rdoc-code-face)
+   (list "<code>[^<>]*</code>" 0 rdoc-code-face)
+   (list "^\\([-*]\\|[0-9]+\\.\\|[A-Za-z]\\.\\)\\s "
+	 1 rdoc-description-face) ; bullet | numbered | alphabetically numbered
+   (list "^\\[[^\]]*\\]\\|\\S .*::\\)\\([ \t\v\f]\\|$\\)"
+	 1 rdoc-description-face)	; labeled | node
+   ;(list "^[ \t\v\f]+\\(.*\\)" 1 rdoc-verbatim-face)
+   ))
+
+(defun rdoc-imenu-create-index ()
+  (let ((root '(nil . nil))
+        cur-alist
+        (cur-level 0)
+        (pattern (concat outline-regexp "\\(.*?\\)[ \t\v\f]*$"))
+        (empty-heading "-")
+        (self-heading ".")
+        pos level heading alist)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward pattern (point-max) t)
+        (setq heading (match-string-no-properties 2)
+              level (min 6 (length (match-string-no-properties 1)))
+              pos (match-beginning 1))
+        (if (= (length heading) 0)
+            (setq heading empty-heading))
+        (setq alist (list (cons heading pos)))
+        (cond
+         ((= cur-level level)		; new sibling
+          (setcdr cur-alist alist)
+          (setq cur-alist alist))
+         ((< cur-level level)		; first child
+          (dotimes (i (- level cur-level 1))
+            (setq alist (list (cons empty-heading alist))))
+          (if cur-alist
+              (let* ((parent (car cur-alist))
+                     (self-pos (cdr parent)))
+                (setcdr parent (cons (cons self-heading self-pos) alist)))
+            (setcdr root alist))	; primogenitor
+          (setq cur-alist alist
+                cur-level level))
+         (t				; new sibling of an ancestor
+          (let ((sibling-alist (last (cdr root))))
+            (dotimes (i (1- level))
+              (setq sibling-alist (last (cdar sibling-alist))))
+            (setcdr sibling-alist alist)
+            (setq cur-alist alist
+                  cur-level level))))))
+    (cdr root)))
+
+(defun rdoc-set-imenu-create-index-function ()
+  (setq imenu-create-index-function 'rdoc-imenu-create-index))
+
+(add-hook 'rdoc-mode-hook 'rdoc-set-imenu-create-index-function)
+
+(provide 'rdoc-mode)
diff --git a/misc/ruby-additional.el b/misc/ruby-additional.el
new file mode 100644
index 0000000000..07f7199226
--- /dev/null
+++ b/misc/ruby-additional.el
@@ -0,0 +1,181 @@
+;;; ruby-additional.el --- ruby-mode extensions yet to be merged into Emacs
+
+;; Authors: Yukihiro Matsumoto, Nobuyoshi Nakada, Akinori MUSHA
+;; URL: http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/misc/
+;; Created: 3 Sep 2012
+;; Package-Requires: ((emacs "24.3") (ruby-mode "1.2"))
+;; Keywords: ruby, languages
+
+;;; Commentary:
+;;
+;; This package contains ruby-mode extensions yet to be merged into
+;; the latest released version of Emacs distribution.  For older
+;; versions of Emacs, use ruby-mode.el bundled with CRuby.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'ruby-mode))
+
+(eval-after-load 'ruby-mode
+  '(progn
+     (define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
+
+     (defun ruby-insert-end ()
+       (interactive)
+       (if (eq (char-syntax (preceding-char)) ?w)
+           (insert " "))
+       (insert "end")
+       (save-excursion
+         (if (eq (char-syntax (following-char)) ?w)
+             (insert " "))
+         (ruby-indent-line t)
+         (end-of-line)))
+
+     (defconst ruby-default-encoding-map
+       '((us-ascii       . nil)       ;; Do not put coding: us-ascii
+         (utf-8          . nil)       ;; Do not put coding: utf-8
+         (shift-jis      . cp932)     ;; Emacs charset name of Shift_JIS
+         (shift_jis      . cp932)     ;; MIME charset name of Shift_JIS
+         (japanese-cp932 . cp932))    ;; Emacs charset name of CP932
+       )
+
+     (custom-set-default 'ruby-encoding-map ruby-default-encoding-map)
+
+     (defcustom ruby-encoding-map ruby-default-encoding-map
+       "Alist to map encoding name from Emacs to Ruby.
+Associating an encoding name with nil means it needs not be
+explicitly declared in magic comment."
+       :type '(repeat (cons (symbol :tag "From") (symbol :tag "To")))
+       :group 'ruby)
+
+     (defun ruby-mode-set-encoding ()
+       "Insert or update a magic comment header with the proper encoding.
+`ruby-encoding-map' is looked up to convert an encoding name from
+Emacs to Ruby."
+       (let* ((nonascii
+               (save-excursion
+                 (widen)
+                 (goto-char (point-min))
+                 (re-search-forward "[^\0-\177]" nil t)))
+              (coding-system
+               (or coding-system-for-write
+                   buffer-file-coding-system))
+              (coding-system
+               (and coding-system
+                    (coding-system-change-eol-conversion coding-system nil)))
+              (coding-system
+               (and coding-system
+                    (or
+                     (coding-system-get coding-system :mime-charset)
+                     (let ((coding-type (coding-system-get coding-system :coding-type)))
+                       (cond ((eq coding-type 'undecided)
+                              (if nonascii
+                                  (or (and (coding-system-get coding-system :prefer-utf-8)
+                                           'utf-8)
+                                      (coding-system-get default-buffer-file-coding-system :coding-type)
+                                      'ascii-8bit)))
+                             ((memq coding-type '(utf-8 shift-jis))
+                              coding-type)
+                             (t coding-system))))))
+              (coding-system
+               (or coding-system
+                   'us-ascii))
+              (coding-system
+               (let ((cons (assq coding-system ruby-encoding-map)))
+                 (if cons (cdr cons) coding-system)))
+              (coding-system
+               (and coding-system
+                    (symbol-name coding-system))))
+         (if coding-system
+             (save-excursion
+               (widen)
+               (goto-char (point-min))
+               (if (looking-at "^#!") (beginning-of-line 2))
+               (cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
+                      (unless (string= (match-string 2) coding-system)
+                        (goto-char (match-beginning 2))
+                        (delete-region (point) (match-end 2))
+                        (and (looking-at "-\*-")
+                             (let ((n (skip-chars-backward " ")))
+                               (cond ((= n 0) (insert "  ") (backward-char))
+                                     ((= n -1) (insert " "))
+                                     ((forward-char)))))
+                        (insert coding-system)))
+                     ((looking-at "\\s *#.*coding\\s *[:=]"))
+                     (t (when ruby-insert-encoding-magic-comment
+                          (insert "# -*- coding: " coding-system " -*-\n"))))))))
+
+     (define-key ruby-mode-map "\C-cU" 'ruby-encode-decode-unicode)
+
+     (defun ruby-encode-unicode (beg end)
+       "Convert non-ascii string in the given region to \\u{} form."
+       (interactive "r")
+       (setq end (set-marker (make-marker) end))
+       (goto-char beg)
+       (while (and (< (point) end)
+		   (re-search-forward "\\([\C-@-\C-I\C-K\C-_\C-?]+\\)\\|[^\C-@-\C-?]+" end t))
+	 (let ((str (match-string-no-properties 0)) sep b e f)
+	   (if (match-beginning 1)
+	       (setq b "" e "" sep ""
+		     f (lambda (c)
+			 (cond ((= c ?\t) "\\t")
+			       ((= c ?\r) "\\r")
+			       ((= c ?\e) "\\e")
+			       ((= c ?\f) "\\f")
+			       ((= c ?\b) "\\b")
+			       ((= c ?\v) "\\v")
+			       ((= c ?\C-?) "\\c?")
+			       ((concat "\\c" (char-to-string (logior c #x40)))))))
+	     (setq b "\\u{" e "}" sep " " f (lambda (c) (format "%x" c))))
+	   (setq str (mapconcat f str sep))
+	   (delete-region (match-beginning 0) (match-end 0))
+	   (insert b str e))))
+
+     (defun ruby-decode-unicode (beg end)
+       "Convert escaped Unicode in the given region to raw string."
+       (interactive "r")
+       (setq end (set-marker (make-marker) end))
+       (goto-char beg)
+       (while (and (< (point) end)
+		   (re-search-forward "\\\\u\\([0-9a-fA-F]\\{4\\}\\)\\|\\\\u{\\([0-9a-fA-F \t]+\\)}" end t))
+	 (let ((b (match-beginning 0)) (e (match-end 0))
+	       (s (match-string-no-properties 1)))
+	   (if s
+	       (setq s (cons s nil))
+	     (goto-char (match-beginning 2))
+	     (while (looking-at "[ \t]*\\([0-9a-fA-F]+\\)")
+	       (setq s (cons (match-string-no-properties 1) s))
+	       (goto-char (match-end 0))))
+	   (setq s (mapconcat (lambda (c) (format "%c" (string-to-int c 16)))
+			      (nreverse s) ""))
+	   (delete-region b e)
+	   (insert s))
+	 ))
+
+     (defun ruby-encode-decode-unicode (dec beg end)
+       "Convert Unicode <-> \\u{} in the given region."
+       (interactive "P\nr")
+       (if dec (ruby-decode-unicode beg end) (ruby-encode-unicode beg end)))
+
+     (defun ruby-insert-heredoc-code-block (arg)
+       "Insert indented here document code block"
+       (interactive "P")
+       (let ((c (if arg "~" "-")))
+	 (insert "\"#{<<" c "\"begin\;\"}\\n#{<<" c "\"end;\"}\""))
+       (end-of-line)
+       (if (eobp) (insert "\n") (forward-char))
+       (indent-region (point)
+		      (progn (insert "begin;\n" "end;\n") (point)))
+       (beginning-of-line 0))
+     (define-key ruby-mode-map "\C-cH" 'ruby-insert-heredoc-code-block)
+     ))
+
+;; monkey-patching ruby-mode.el in Emacs 24, as r49872.
+(when (and (boundp 'ruby-syntax-before-regexp-re)
+	   (not (string-match ruby-syntax-before-regexp-re "foo {|" 1)))
+  (replace-regexp-in-string "\\[\\[" "\\&{|" ruby-syntax-before-regexp-re))
+
+(provide 'ruby-additional)
+
+;;; ruby-additional.el ends here
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
new file mode 100644
index 0000000000..f54e91ccbc
--- /dev/null
+++ b/misc/ruby-electric.el
@@ -0,0 +1,569 @@
+;;; ruby-electric.el --- Minor mode for electrically editing ruby code
+;;
+;; Authors: Dee Zsombor <dee dot zsombor at gmail dot com>
+;;          Yukihiro Matsumoto
+;;          Nobuyoshi Nakada
+;;          Akinori MUSHA <knu@iDaemons.org>
+;;          Jakub Kuźma <qoobaa@gmail.com>
+;; Maintainer: Akinori MUSHA <knu@iDaemons.org>
+;; Created: 6 Mar 2005
+;; URL: https://github.com/knu/ruby-electric.el
+;; Keywords: languages ruby
+;; License: The same license terms as Ruby
+;; Version: 2.2.3
+
+;;; Commentary:
+;;
+;; `ruby-electric-mode' accelerates code writing in ruby by making
+;; some keys "electric" and automatically supplying with closing
+;; parentheses and "end" as appropriate.
+;;
+;; This work was originally inspired by a code snippet posted by
+;; [Frederick Ros](https://github.com/sleeper).
+;;
+;; Add the following line to enable ruby-electric-mode under
+;; ruby-mode.
+;;
+;;     (eval-after-load "ruby-mode"
+;;       '(add-hook 'ruby-mode-hook 'ruby-electric-mode))
+;;
+;; Type M-x customize-group ruby-electric for configuration.
+
+;;; Code:
+
+(require 'ruby-mode)
+
+(eval-when-compile
+  (require 'cl))
+
+(defgroup ruby-electric nil
+  "Minor mode providing electric editing commands for ruby files"
+  :group 'ruby)
+
+(defconst ruby-electric-expandable-bar-re
+  "\\s-\\(do\\|{\\)\\s-*|")
+
+(defconst ruby-electric-delimiters-alist
+  '((?\{ :name "Curly brace"  :handler ruby-electric-curlies       :closing ?\})
+    (?\[ :name "Square brace" :handler ruby-electric-matching-char :closing ?\])
+    (?\( :name "Round brace"  :handler ruby-electric-matching-char :closing ?\))
+    (?\' :name "Quote"        :handler ruby-electric-matching-char)
+    (?\" :name "Double quote" :handler ruby-electric-matching-char)
+    (?\` :name "Back quote"   :handler ruby-electric-matching-char)
+    (?\| :name "Vertical bar" :handler ruby-electric-bar)
+    (?\# :name "Hash"         :handler ruby-electric-hash)))
+
+(defvar ruby-electric-matching-delimeter-alist
+  (apply 'nconc
+         (mapcar #'(lambda (x)
+                     (let ((delim (car x))
+                           (plist (cdr x)))
+                       (if (eq (plist-get plist :handler) 'ruby-electric-matching-char)
+                           (list (cons delim (or (plist-get plist :closing)
+                                                 delim))))))
+                 ruby-electric-delimiters-alist)))
+
+(defvar ruby-electric-expandable-keyword-re)
+
+(defmacro ruby-electric--try-insert-and-do (string &rest body)
+  (declare (indent 1))
+  `(let ((before (point))
+         (after (progn
+                  (insert ,string)
+                  (point))))
+     (unwind-protect
+         (progn ,@body)
+       (delete-region before after)
+       (goto-char before))))
+
+(defconst ruby-modifier-beg-symbol-re
+  (regexp-opt ruby-modifier-beg-keywords 'symbols))
+
+(defun ruby-electric--modifier-keyword-at-point-p ()
+  "Test if there is a modifier keyword at point."
+  (and (looking-at ruby-modifier-beg-symbol-re)
+       (let ((end (match-end 1)))
+         (not (looking-back "\\."))
+         (save-excursion
+           (let ((indent1 (ruby-electric--try-insert-and-do "\n"
+                            (ruby-calculate-indent)))
+                 (indent2 (save-excursion
+                            (goto-char end)
+                            (ruby-electric--try-insert-and-do " x\n"
+                              (ruby-calculate-indent)))))
+             (= indent1 indent2))))))
+
+(defconst ruby-block-mid-symbol-re
+  (regexp-opt ruby-block-mid-keywords 'symbols))
+
+(defun ruby-electric--block-mid-keyword-at-point-p ()
+  "Test if there is a block mid keyword at point."
+  (and (looking-at ruby-block-mid-symbol-re)
+       (looking-back "^\\s-*")))
+
+(defconst ruby-block-beg-symbol-re
+  (regexp-opt ruby-block-beg-keywords 'symbols))
+
+(defun ruby-electric--block-beg-keyword-at-point-p ()
+  "Test if there is a block beginning keyword at point."
+  (and (looking-at ruby-block-beg-symbol-re)
+       (if (string= (match-string 1) "do")
+           (looking-back "\\s-")
+         (not (looking-back "\\.")))
+       ;; (not (ruby-electric--modifier-keyword-at-point-p)) ;; implicit assumption
+       ))
+
+(defcustom ruby-electric-keywords-alist
+  '(("begin" . end)
+    ("case" . end)
+    ("class" . end)
+    ("def" . end)
+    ("do" . end)
+    ("else" . reindent)
+    ("elsif" . reindent)
+    ("end" . reindent)
+    ("ensure" . reindent)
+    ("for" . end)
+    ("if" . end)
+    ("module" . end)
+    ("rescue" . reindent)
+    ("unless" . end)
+    ("until" . end)
+    ("when" . reindent)
+    ("while" . end))
+  "Alist of keywords and actions to define how to react to space
+or return right after each keyword.  In each (KEYWORD . ACTION)
+cons, ACTION can be set to one of the following values:
+
+    `reindent'  Reindent the line.
+
+    `end'       Reindent the line and auto-close the keyword with
+                end if applicable.
+
+    `nil'       Do nothing.
+"
+  :type '(repeat (cons (string :tag "Keyword")
+                       (choice :tag "Action"
+                               :menu-tag "Action"
+                               (const :tag "Auto-close with end"
+                                      :value end)
+                               (const :tag "Auto-reindent"
+                                      :value reindent)
+                               (const :tag "None"
+                                      :value nil))))
+  :set (lambda (sym val)
+         (set sym val)
+         (let (keywords)
+           (dolist (x val)
+             (let ((keyword (car x))
+                   (action (cdr x)))
+               (if action
+                   (setq keywords (cons keyword keywords)))))
+           (setq ruby-electric-expandable-keyword-re
+                 (concat (regexp-opt keywords 'symbols)
+                         "$"))))
+  :group 'ruby-electric)
+
+(defvar ruby-electric-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map " " 'ruby-electric-space/return)
+    (define-key map [remap delete-backward-char] 'ruby-electric-delete-backward-char)
+    (define-key map [remap newline] 'ruby-electric-space/return)
+    (define-key map [remap newline-and-indent] 'ruby-electric-space/return)
+    (define-key map [remap electric-newline-and-maybe-indent] 'ruby-electric-space/return)
+    (dolist (x ruby-electric-delimiters-alist)
+      (let* ((delim   (car x))
+             (plist   (cdr x))
+             (name    (plist-get plist :name))
+             (func    (plist-get plist :handler))
+             (closing (plist-get plist :closing)))
+        (define-key map (char-to-string delim) func)
+        (if closing
+            (define-key map (char-to-string closing) 'ruby-electric-closing-char))))
+    map)
+  "Keymap used in ruby-electric-mode")
+
+(defcustom ruby-electric-expand-delimiters-list '(all)
+  "*List of contexts where matching delimiter should be inserted.
+The word 'all' will do all insertions."
+  :type `(set :extra-offset 8
+              (const :tag "Everything" all)
+              ,@(apply 'list
+                       (mapcar #'(lambda (x)
+                                   `(const :tag ,(plist-get (cdr x) :name)
+                                           ,(car x)))
+                               ruby-electric-delimiters-alist)))
+  :group 'ruby-electric)
+
+(defcustom ruby-electric-newline-before-closing-bracket nil
+  "*Non-nil means a newline should be inserted before an
+automatically inserted closing bracket."
+  :type 'boolean :group 'ruby-electric)
+
+(defcustom ruby-electric-autoindent-on-closing-char nil
+  "*Non-nil means the current line should be automatically
+indented when a closing character is manually typed in."
+  :type 'boolean :group 'ruby-electric)
+
+(defvar ruby-electric-mode-hook nil
+  "Called after `ruby-electric-mode' is turned on.")
+
+;;;###autoload
+(define-minor-mode ruby-electric-mode
+  "Toggle Ruby Electric minor mode.
+With no argument, this command toggles the mode.  Non-null prefix
+argument turns on the mode.  Null prefix argument turns off the
+mode.
+
+When Ruby Electric mode is enabled, an indented 'end' is
+heuristicaly inserted whenever typing a word like 'module',
+'class', 'def', 'if', 'unless', 'case', 'until', 'for', 'begin',
+'do' followed by a space.  Single, double and back quotes as well
+as braces are paired auto-magically.  Expansion does not occur
+inside comments and strings. Note that you must have Font Lock
+enabled."
+  ;; initial value.
+  nil
+  ;;indicator for the mode line.
+  " REl"
+  ;;keymap
+  ruby-electric-mode-map
+  (if ruby-electric-mode
+      (run-hooks 'ruby-electric-mode-hook)))
+
+(defun ruby-electric-space/return-fallback ()
+  (if (or (eq this-original-command 'ruby-electric-space/return)
+          (null (ignore-errors
+                  ;; ac-complete may fail if there is nothing left to complete
+                  (call-interactively this-original-command)
+                  (setq this-command this-original-command))))
+      ;; fall back to a globally bound command
+      (let ((command (global-key-binding (char-to-string last-command-event) t)))
+        (and command
+             (call-interactively (setq this-command command))))))
+
+(defun ruby-electric-space/return (arg)
+  (interactive "*P")
+  (and (boundp 'sp-last-operation)
+       (setq sp-delayed-pair nil))
+  (cond ((or arg
+             (region-active-p))
+         (or (= last-command-event ?\s)
+             (setq last-command-event ?\n))
+         (ruby-electric-replace-region-or-insert))
+        ((ruby-electric-space/return-can-be-expanded-p)
+         (let (action)
+           (save-excursion
+             (goto-char (match-beginning 0))
+             (let* ((keyword (match-string 1))
+                    (allowed-actions
+                     (cond ((ruby-electric--modifier-keyword-at-point-p)
+                            '(reindent)) ;; no end necessary
+                           ((ruby-electric--block-mid-keyword-at-point-p)
+                            '(reindent)) ;; ditto
+                           ((ruby-electric--block-beg-keyword-at-point-p)
+                            '(end reindent)))))
+               (if allowed-actions
+                   (setq action
+                         (let ((action (cdr (assoc keyword ruby-electric-keywords-alist))))
+                           (and (memq action allowed-actions)
+                                action))))))
+           (cond ((eq action 'end)
+                  (ruby-indent-line)
+                  (save-excursion
+                    (newline)
+                    (ruby-electric-end)))
+                 ((eq action 'reindent)
+                  (ruby-indent-line)))
+           (ruby-electric-space/return-fallback)))
+        ((and (eq this-original-command 'newline-and-indent)
+              (ruby-electric-comment-at-point-p))
+         (call-interactively (setq this-command 'comment-indent-new-line)))
+        (t
+         (ruby-electric-space/return-fallback))))
+
+(defun ruby-electric--get-faces-at-point ()
+  (let* ((point (point))
+         (value (or
+                 (get-text-property point 'read-face-name)
+                 (get-text-property point 'face))))
+    (if (listp value) value (list value))))
+
+(defun ruby-electric--faces-at-point-include-p (&rest faces)
+  (and ruby-electric-mode
+       (loop for face in faces
+             with pfaces = (ruby-electric--get-faces-at-point)
+             thereis (memq face pfaces))))
+
+(defun ruby-electric-code-at-point-p()
+  (not (ruby-electric--faces-at-point-include-p
+        'font-lock-string-face
+        'font-lock-comment-face)))
+
+(defun ruby-electric-string-at-point-p()
+  (ruby-electric--faces-at-point-include-p
+   'font-lock-string-face))
+
+(defun ruby-electric-comment-at-point-p()
+  (ruby-electric--faces-at-point-include-p
+   'font-lock-comment-face))
+
+(defun ruby-electric-escaped-p()
+  (let ((f nil))
+    (save-excursion
+      (while (char-equal ?\\ (preceding-char))
+        (backward-char 1)
+        (setq f (not f))))
+    f))
+
+(defun ruby-electric-command-char-expandable-punct-p(char)
+  (or (memq 'all ruby-electric-expand-delimiters-list)
+      (memq char ruby-electric-expand-delimiters-list)))
+
+(defun ruby-electric-space/return-can-be-expanded-p()
+  (and (ruby-electric-code-at-point-p)
+       (looking-back ruby-electric-expandable-keyword-re)))
+
+(defun ruby-electric-replace-region-or-insert ()
+  (and (region-active-p)
+       (bound-and-true-p delete-selection-mode)
+       (fboundp 'delete-selection-helper)
+       (delete-selection-helper (get 'self-insert-command 'delete-selection)))
+  (insert (make-string (prefix-numeric-value current-prefix-arg)
+                       last-command-event))
+  (setq this-command 'self-insert-command))
+
+(defmacro ruby-electric-insert (arg &rest body)
+  `(cond ((and
+           (null ,arg)
+           (ruby-electric-command-char-expandable-punct-p last-command-event))
+          (let ((region-beginning
+                 (cond ((region-active-p)
+                        (prog1
+                            (save-excursion
+                              (goto-char (region-beginning))
+                              (insert last-command-event)
+                              (point))
+                          (goto-char (region-end))))
+                       (t
+                        (insert last-command-event)
+                        nil))))
+            ,@body
+            (and region-beginning
+                 ;; If no extra character is inserted, go back to the
+                 ;; region beginning.
+                 (eq this-command 'self-insert-command)
+                 (goto-char region-beginning))))
+         ((ruby-electric-replace-region-or-insert))))
+
+(defun ruby-electric-curlies (arg)
+  (interactive "*P")
+  (ruby-electric-insert
+   arg
+   (cond
+    ((ruby-electric-code-at-point-p)
+     (save-excursion
+       (insert "}")
+       (font-lock-fontify-region (line-beginning-position) (point)))
+     (cond
+      ((ruby-electric-string-at-point-p) ;; %w{}, %r{}, etc.
+       (if region-beginning
+           (forward-char 1)))
+      (ruby-electric-newline-before-closing-bracket
+       (cond (region-beginning
+              (save-excursion
+                (goto-char region-beginning)
+                (newline))
+              (newline)
+              (forward-char 1)
+              (indent-region region-beginning (line-end-position)))
+             (t
+              (insert " ")
+              (save-excursion
+                (newline)
+                (ruby-indent-line t)))))
+      (t
+       (if region-beginning
+           (save-excursion
+             (goto-char region-beginning)
+             (insert " "))
+         (insert " "))
+       (insert " ")
+       (and region-beginning
+            (forward-char 1)))))
+    ((ruby-electric-string-at-point-p)
+     (let ((start-position (1- (or region-beginning (point)))))
+       (cond
+        ((char-equal ?\# (char-before start-position))
+         (unless (save-excursion
+                   (goto-char (1- start-position))
+                   (ruby-electric-escaped-p))
+           (insert "}")
+           (or region-beginning
+               (backward-char 1))))
+        ((or
+          (ruby-electric-command-char-expandable-punct-p ?\#)
+          (save-excursion
+            (goto-char start-position)
+            (ruby-electric-escaped-p)))
+         (if region-beginning
+             (goto-char region-beginning))
+         (setq this-command 'self-insert-command))
+        (t
+         (save-excursion
+           (goto-char start-position)
+           (insert "#"))
+         (insert "}")
+         (or region-beginning
+             (backward-char 1))))))
+    (t
+     (delete-char -1)
+     (ruby-electric-replace-region-or-insert)))))
+
+(defun ruby-electric-hash (arg)
+  (interactive "*P")
+  (ruby-electric-insert
+   arg
+   (if (ruby-electric-string-at-point-p)
+       (let ((start-position (1- (or region-beginning (point)))))
+         (cond
+          ((char-equal (following-char) ?')) ;; likely to be in ''
+          ((save-excursion
+             (goto-char start-position)
+             (ruby-electric-escaped-p)))
+          (region-beginning
+           (save-excursion
+             (goto-char (1+ start-position))
+             (insert "{"))
+           (insert "}"))
+          (t
+           (insert "{")
+           (save-excursion
+             (insert "}")))))
+     (delete-char -1)
+     (ruby-electric-replace-region-or-insert))))
+
+(defun ruby-electric-matching-char (arg)
+  (interactive "*P")
+  (ruby-electric-insert
+   arg
+   (let ((closing (cdr (assoc last-command-event
+                              ruby-electric-matching-delimeter-alist))))
+     (cond
+      ;; quotes
+      ((char-equal closing last-command-event)
+       (cond ((let ((start-position (or region-beginning (point))))
+                ;; check if this quote has just started a string
+                (and
+                 (unwind-protect
+                     (save-excursion
+                       (subst-char-in-region (1- start-position) start-position
+                                             last-command-event ?\s)
+                       (goto-char (1- start-position))
+                       (save-excursion
+                         (font-lock-fontify-region (line-beginning-position) (1+ (point))))
+                       (not (ruby-electric-string-at-point-p)))
+                     (subst-char-in-region (1- start-position) start-position
+                                           ?\s last-command-event))
+                 (save-excursion
+                   (goto-char (1- start-position))
+                   (save-excursion
+                     (font-lock-fontify-region (line-beginning-position) (1+ (point))))
+                   (ruby-electric-string-at-point-p))))
+              (if region-beginning
+                  ;; escape quotes of the same kind, backslash and hash
+                  (let ((re (format "[%c\\%s]"
+                                    last-command-event
+                                    (if (char-equal last-command-event ?\")
+                                        "#" "")))
+                        (bound (point)))
+                    (save-excursion
+                      (goto-char region-beginning)
+                      (while (re-search-forward re bound t)
+                        (let ((end (point)))
+                          (replace-match "\\\\\\&")
+                          (setq bound (+ bound (- (point) end))))))))
+              (insert closing)
+              (or region-beginning
+                  (backward-char 1)))
+             (t
+              (and (eq last-command 'ruby-electric-matching-char)
+                   (char-equal (following-char) closing) ;; repeated quotes
+                   (delete-char 1))
+              (setq this-command 'self-insert-command))))
+      ((ruby-electric-code-at-point-p)
+       (insert closing)
+       (or region-beginning
+           (backward-char 1)))))))
+
+(defun ruby-electric-closing-char(arg)
+  (interactive "*P")
+  (cond
+   (arg
+    (ruby-electric-replace-region-or-insert))
+   ((and
+     (eq last-command 'ruby-electric-curlies)
+     (= last-command-event ?})
+     (not (char-equal (preceding-char) last-command-event))) ;; {}
+    (if (char-equal (following-char) ?\n) (delete-char 1))
+    (delete-horizontal-space)
+    (forward-char))
+   ((and
+     (= last-command-event (following-char))
+     (not (char-equal (preceding-char) last-command-event))
+     (memq last-command '(ruby-electric-matching-char
+                          ruby-electric-closing-char))) ;; ()/[] and (())/[[]]
+    (forward-char))
+   (t
+    (ruby-electric-replace-region-or-insert)
+    (if ruby-electric-autoindent-on-closing-char
+        (ruby-indent-line)))))
+
+(defun ruby-electric-bar(arg)
+  (interactive "*P")
+  (ruby-electric-insert
+   arg
+   (cond ((and (ruby-electric-code-at-point-p)
+               (looking-back ruby-electric-expandable-bar-re))
+          (save-excursion (insert "|")))
+         (t
+          (delete-char -1)
+          (ruby-electric-replace-region-or-insert)))))
+
+(defun ruby-electric-delete-backward-char(arg)
+  (interactive "*p")
+  (cond ((memq last-command '(ruby-electric-matching-char
+                              ruby-electric-bar))
+         (delete-char 1))
+        ((eq last-command 'ruby-electric-curlies)
+         (cond ((eolp)
+                (cond ((char-equal (preceding-char) ?\s)
+                       (setq this-command last-command))
+                      ((char-equal (preceding-char) ?{)
+                       (and (looking-at "[ \t\n]*}")
+                            (delete-char (- (match-end 0) (match-beginning 0)))))))
+               ((char-equal (following-char) ?\s)
+                (setq this-command last-command)
+                (delete-char 1))
+               ((char-equal (following-char) ?})
+                (delete-char 1))))
+        ((eq last-command 'ruby-electric-hash)
+         (and (char-equal (preceding-char) ?{)
+              (delete-char 1))))
+  (delete-char (- arg)))
+
+(put 'ruby-electric-delete-backward-char 'delete-selection 'supersede)
+
+(defun ruby-electric-end ()
+  (interactive)
+  (if (eq (char-syntax (preceding-char)) ?w)
+      (insert " "))
+  (insert "end")
+  (save-excursion
+    (if (eq (char-syntax (following-char)) ?w)
+        (insert " "))
+    (ruby-indent-line t)))
+
+(provide 'ruby-electric)
+
+;;; ruby-electric.el ends here
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
new file mode 100644
index 0000000000..b1abd18a9e
--- /dev/null
+++ b/misc/ruby-mode.el
@@ -0,0 +1,1584 @@
+;;; ruby-mode.el --- Major mode for editing Ruby files
+
+;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001,
+;;   2002,2003, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
+
+;; Authors: Yukihiro Matsumoto, Nobuyoshi Nakada
+;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode
+;; Created: Fri Feb  4 14:49:13 JST 1994
+;; Keywords: languages ruby
+;; Version: 0.9
+
+;; This file is not part of GNU Emacs. However, a newer version of
+;; ruby-mode is included in recent releases of GNU Emacs (version 23
+;; and up), but the new version is not guaranteed to be compatible
+;; with older versions of Emacs or XEmacs. This file is the last
+;; version that aims to keep this compatibility.
+
+;; You can also get the latest version from the Emacs Lisp Package
+;; Archive: http://tromey.com/elpa
+
+;; 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 3 of the License, or
+;; (at your option) any later version.
+
+;; It 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 it.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Provides font-locking, indentation support, and navigation for Ruby code.
+;;
+;; If you're installing manually, you should add this to your .emacs
+;; file after putting it on your load path:
+;;
+;;    (autoload 'ruby-mode "ruby-mode" "Major mode for ruby files" t)
+;;    (add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
+;;    (add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+;;
+
+;;; Code:
+
+(defconst ruby-mode-revision "$Revision$"
+  "Ruby mode revision string.")
+
+(defconst ruby-mode-version
+  (and (string-match "[0-9.]+" ruby-mode-revision)
+       (substring ruby-mode-revision (match-beginning 0) (match-end 0)))
+  "Ruby mode version number.")
+
+(defconst ruby-keyword-end-re
+  (if (string-match "\\_>" "ruby")
+      "\\_>"
+    "\\>"))
+
+(defconst ruby-block-beg-keywords
+  '("class" "module" "def" "if" "unless" "case" "while" "until" "for" "begin" "do")
+  "Keywords at the beginning of blocks.")
+
+(defconst ruby-block-beg-re
+  (regexp-opt ruby-block-beg-keywords)
+  "Regexp to match the beginning of blocks.")
+
+(defconst ruby-non-block-do-re
+  (concat (regexp-opt '("while" "until" "for" "rescue") t) ruby-keyword-end-re)
+  "Regexp to match")
+
+(defconst ruby-indent-beg-re
+  (concat "\\(\\s *" (regexp-opt '("class" "module" "def") t) "\\)\\|"
+          (regexp-opt '("if" "unless" "case" "while" "until" "for" "begin")))
+  "Regexp to match where the indentation gets deeper.")
+
+(defconst ruby-modifier-beg-keywords
+  '("if" "unless" "while" "until")
+  "Modifiers that are the same as the beginning of blocks.")
+
+(defconst ruby-modifier-beg-re
+  (regexp-opt ruby-modifier-beg-keywords)
+  "Regexp to match modifiers same as the beginning of blocks.")
+
+(defconst ruby-modifier-re
+  (regexp-opt (cons "rescue" ruby-modifier-beg-keywords))
+  "Regexp to match modifiers.")
+
+(defconst ruby-block-mid-keywords
+  '("then" "else" "elsif" "when" "rescue" "ensure")
+  "Keywords where the indentation gets shallower in middle of block statements.")
+
+(defconst ruby-block-mid-re
+  (regexp-opt ruby-block-mid-keywords)
+  "Regexp to match where the indentation gets shallower in middle of block statements.")
+
+(defconst ruby-block-op-keywords
+  '("and" "or" "not")
+  "Block operators.")
+
+(defconst ruby-block-hanging-re
+  (regexp-opt (append ruby-modifier-beg-keywords ruby-block-op-keywords))
+  "Regexp to match hanging block modifiers.")
+
+(defconst ruby-block-end-re "\\_<end\\_>")
+
+(defconst ruby-here-doc-beg-re
+  "\\(<\\)<\\([-~]\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)")
+
+(defconst ruby-here-doc-end-re
+  "^\\([ \t]+\\)?\\(.*\\)\\(.\\)$")
+
+(defun ruby-here-doc-end-match ()
+  (concat "^"
+          (if (match-string 2) "[ \t]*" nil)
+          (regexp-quote
+           (or (match-string 4)
+               (match-string 5)
+               (match-string 6)))))
+
+(defun ruby-here-doc-beg-match ()
+  (let ((contents (concat
+		   (regexp-quote (concat (match-string 2) (match-string 3)))
+		   (if (string= (match-string 3) "_") "\\B" "\\b"))))
+    (concat "<<"
+            (let ((match (match-string 1)))
+              (if (and match (> (length match) 0))
+                  (concat "\\(?:[-~]\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)"
+                          contents "\\(\\1\\|\\2\\)")
+                (concat "[-~]?\\([\"']\\|\\)" contents "\\1"))))))
+
+(defconst ruby-delimiter
+  (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\_<\\("
+          ruby-block-beg-re
+          "\\)\\_>\\|" ruby-block-end-re
+          "\\|^=begin\\|" ruby-here-doc-beg-re)
+  )
+
+(defconst ruby-negative
+  (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
+          ruby-block-end-re "\\|}\\|\\]\\)")
+  "Regexp to match where the indentation gets shallower.")
+
+(defconst ruby-operator-chars "-,.+*/%&|^~=<>:")
+(defconst ruby-operator-re (concat "[" ruby-operator-chars "]"))
+
+(defconst ruby-symbol-chars "a-zA-Z0-9_")
+(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]"))
+
+(defvar ruby-mode-abbrev-table nil
+  "Abbrev table in use in ruby-mode buffers.")
+
+(define-abbrev-table 'ruby-mode-abbrev-table ())
+
+(defvar ruby-mode-map nil "Keymap used in ruby mode.")
+
+(if ruby-mode-map
+    nil
+  (setq ruby-mode-map (make-sparse-keymap))
+  (define-key ruby-mode-map "{" 'ruby-electric-brace)
+  (define-key ruby-mode-map "}" 'ruby-electric-brace)
+  (define-key ruby-mode-map "\e\C-a" 'ruby-beginning-of-defun)
+  (define-key ruby-mode-map "\e\C-e" 'ruby-end-of-defun)
+  (define-key ruby-mode-map "\e\C-b" 'ruby-backward-sexp)
+  (define-key ruby-mode-map "\e\C-f" 'ruby-forward-sexp)
+  (define-key ruby-mode-map "\e\C-p" 'ruby-beginning-of-block)
+  (define-key ruby-mode-map "\e\C-n" 'ruby-end-of-block)
+  (define-key ruby-mode-map "\e\C-h" 'ruby-mark-defun)
+  (define-key ruby-mode-map "\e\C-q" 'ruby-indent-exp)
+  (define-key ruby-mode-map "\t" 'ruby-indent-command)
+  (define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
+  (define-key ruby-mode-map "\C-j" 'ruby-reindent-then-newline-and-indent)
+  (define-key ruby-mode-map "\C-c{" 'ruby-toggle-block)
+  (define-key ruby-mode-map "\C-c\C-u" 'uncomment-region))
+
+(defvar ruby-mode-syntax-table nil
+  "Syntax table in use in ruby-mode buffers.")
+
+(if ruby-mode-syntax-table
+    ()
+  (setq ruby-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\' "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\" "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\` "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?# "<" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\n ">" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" ruby-mode-syntax-table)
+  (modify-syntax-entry ?$ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?? "_" ruby-mode-syntax-table)
+  (modify-syntax-entry ?_ "_" ruby-mode-syntax-table)
+  (modify-syntax-entry ?: "_" ruby-mode-syntax-table)
+  (modify-syntax-entry ?< "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?> "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?& "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?| "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?% "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?= "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?/ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?+ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?* "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?- "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?\; "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?\( "()" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\) ")(" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\{ "(}" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\} "){" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\[ "(]" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\] ")[" ruby-mode-syntax-table)
+  )
+
+(defcustom ruby-indent-tabs-mode nil
+  "*Indentation can insert tabs in ruby mode if this is non-nil."
+  :type 'boolean :group 'ruby)
+(put 'ruby-indent-tabs-mode 'safe-local-variable 'booleanp)
+
+(defcustom ruby-indent-level 2
+  "*Indentation of ruby statements."
+  :type 'integer :group 'ruby)
+(put 'ruby-indent-level 'safe-local-variable 'integerp)
+
+(defcustom ruby-comment-column 32
+  "*Indentation column of comments."
+  :type 'integer :group 'ruby)
+(put 'ruby-comment-column 'safe-local-variable 'integerp)
+
+(defcustom ruby-deep-arglist t
+  "*Deep indent lists in parenthesis when non-nil.
+Also ignores spaces after parenthesis when 'space."
+  :group 'ruby)
+(put 'ruby-deep-arglist 'safe-local-variable 'booleanp)
+
+(defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t)
+  "*Deep indent lists in parenthesis when non-nil. t means continuous line.
+Also ignores spaces after parenthesis when 'space."
+  :group 'ruby)
+
+(defcustom ruby-deep-indent-paren-style 'space
+  "Default deep indent style."
+  :options '(t nil space) :group 'ruby)
+
+(defcustom ruby-encoding-map
+  '((us-ascii       . nil)       ;; Do not put coding: us-ascii
+    (utf-8          . nil)       ;; Do not put coding: utf-8
+    (shift-jis      . cp932)     ;; Emacs charset name of Shift_JIS
+    (shift_jis      . cp932)     ;; MIME charset name of Shift_JIS
+    (japanese-cp932 . cp932))    ;; Emacs charset name of CP932
+  "Alist to map encoding name from Emacs to Ruby.
+Associating an encoding name with nil means it needs not be
+explicitly declared in magic comment."
+  :type '(repeat (cons (symbol :tag "From") (symbol :tag "To")))
+  :group 'ruby)
+
+(defcustom ruby-use-encoding-map t
+  "*Use `ruby-encoding-map' to set encoding magic comment if this is non-nil."
+  :type 'boolean :group 'ruby)
+
+(defvar ruby-indent-point nil "internal variable")
+
+(eval-when-compile (require 'cl))
+(defun ruby-imenu-create-index-in-block (prefix beg end)
+  (let ((index-alist '()) (case-fold-search nil)
+        name next pos decl sing)
+    (goto-char beg)
+    (while (re-search-forward "^\\s *\\(\\(class\\s +\\|\\(class\\s *<<\\s *\\)\\|module\\s +\\)\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\s +\\([^\(\n ]+\\)\\)" end t)
+      (setq sing (match-beginning 3))
+      (setq decl (match-string 5))
+      (setq next (match-end 0))
+      (setq name (or (match-string 4) (match-string 6)))
+      (setq pos (match-beginning 0))
+      (cond
+       ((string= "alias" decl)
+        (if prefix (setq name (concat prefix name)))
+        (push (cons name pos) index-alist))
+       ((string= "def" decl)
+        (if prefix
+            (setq name
+                  (cond
+                   ((string-match "^self\." name)
+                    (concat (substring prefix 0 -1) (substring name 4)))
+                  (t (concat prefix name)))))
+        (push (cons name pos) index-alist)
+        (ruby-accurate-end-of-block end))
+       (t
+        (if (string= "self" name)
+            (if prefix (setq name (substring prefix 0 -1)))
+          (if prefix (setq name (concat (substring prefix 0 -1) "::" name)))
+          (push (cons name pos) index-alist))
+        (ruby-accurate-end-of-block end)
+        (setq beg (point))
+        (setq index-alist
+              (nconc (ruby-imenu-create-index-in-block
+                      (concat name (if sing "." "#"))
+                      next beg) index-alist))
+        (goto-char beg))))
+    index-alist))
+
+(defun ruby-imenu-create-index ()
+  (nreverse (ruby-imenu-create-index-in-block nil (point-min) nil)))
+
+(defun ruby-accurate-end-of-block (&optional end)
+  (let (state)
+    (or end (setq end (point-max)))
+    (while (and (setq state (apply 'ruby-parse-partial end state))
+                (>= (nth 2 state) 0) (< (point) end)))))
+
+(defun ruby-mode-variables ()
+  (set-syntax-table ruby-mode-syntax-table)
+  (setq show-trailing-whitespace t)
+  (setq local-abbrev-table ruby-mode-abbrev-table)
+  (make-local-variable 'indent-line-function)
+  (setq indent-line-function 'ruby-indent-line)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-local-variable 'comment-start)
+  (setq comment-start "# ")
+  (make-local-variable 'comment-end)
+  (setq comment-end "")
+  (make-local-variable 'comment-column)
+  (setq comment-column ruby-comment-column)
+  (make-local-variable 'comment-start-skip)
+  (setq comment-start-skip "#+ *")
+  (setq indent-tabs-mode ruby-indent-tabs-mode)
+  (make-local-variable 'parse-sexp-ignore-comments)
+  (setq parse-sexp-ignore-comments t)
+  (make-local-variable 'parse-sexp-lookup-properties)
+  (setq parse-sexp-lookup-properties t)
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start (concat "$\\|" page-delimiter))
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate paragraph-start)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (setq paragraph-ignore-fill-prefix t))
+
+(defun ruby-mode-set-encoding ()
+  "Insert or update a magic comment header with the proper encoding.
+`ruby-encoding-map' is looked up to convert an encoding name from
+Emacs to Ruby."
+  (let* ((nonascii
+          (save-excursion
+            (widen)
+            (goto-char (point-min))
+            (re-search-forward "[^\0-\177]" nil t)))
+         (coding-system
+          (or coding-system-for-write
+              buffer-file-coding-system))
+         (coding-system
+          (and coding-system
+               (coding-system-change-eol-conversion coding-system nil)))
+         (coding-system
+          (and coding-system
+               (or
+                (coding-system-get coding-system :mime-charset)
+                (let ((coding-type (coding-system-get coding-system :coding-type)))
+                  (cond ((eq coding-type 'undecided)
+                         (if nonascii
+                             (or (and (coding-system-get coding-system :prefer-utf-8)
+                                      'utf-8)
+                                 (coding-system-get default-buffer-file-coding-system :coding-type)
+                                 'ascii-8bit)))
+                        ((memq coding-type '(utf-8 shift-jis))
+                         coding-type)
+                        (t coding-system))))))
+         (coding-system
+          (or coding-system
+              'us-ascii))
+         (coding-system
+          (let ((cons (assq coding-system ruby-encoding-map)))
+            (if cons (cdr cons) coding-system)))
+         (coding-system
+          (and coding-system
+               (symbol-name coding-system))))
+    (if coding-system
+        (save-excursion
+          (widen)
+          (goto-char (point-min))
+          (if (looking-at "^#!") (beginning-of-line 2))
+          (cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
+                 (unless (string= (match-string 2) coding-system)
+                   (goto-char (match-beginning 2))
+                   (delete-region (point) (match-end 2))
+                   (and (looking-at "-\*-")
+                        (let ((n (skip-chars-backward " ")))
+                          (cond ((= n 0) (insert "  ") (backward-char))
+                                ((= n -1) (insert " "))
+                                ((forward-char)))))
+                   (insert coding-system)))
+                ((looking-at "\\s *#.*coding\\s *[:=]"))
+                (t (when ruby-insert-encoding-magic-comment
+                     (insert "# -*- coding: " coding-system " -*-\n"))))))))
+
+(defun ruby-current-indentation ()
+  (save-excursion
+    (beginning-of-line)
+    (back-to-indentation)
+    (current-column)))
+
+(defun ruby-indent-line (&optional flag)
+  "Correct indentation of the current ruby line."
+  (ruby-indent-to (ruby-calculate-indent)))
+
+(defun ruby-indent-command ()
+  (interactive)
+  (ruby-indent-line t))
+
+(defun ruby-indent-to (x)
+  (if x
+      (let (shift top beg)
+        (and (< x 0) (error "invalid nest"))
+        (setq shift (current-column))
+        (beginning-of-line)
+        (setq beg (point))
+        (back-to-indentation)
+        (setq top (current-column))
+        (skip-chars-backward " \t")
+        (if (>= shift top) (setq shift (- shift top))
+          (setq shift 0))
+        (if (and (bolp)
+                 (= x top))
+            (move-to-column (+ x shift))
+          (move-to-column top)
+          (delete-region beg (point))
+          (beginning-of-line)
+          (indent-to x)
+          (move-to-column (+ x shift))))))
+
+(defun ruby-special-char-p (&optional pnt)
+  (setq pnt (or pnt (point)))
+  (let ((c (char-before pnt)) (b (and (< (point-min) pnt) (char-before (1- pnt)))))
+    (cond ((or (eq c ??) (eq c ?$)))
+          ((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
+          ((eq c ?\\) (eq b ??)))))
+
+(defun ruby-singleton-class-p ()
+  (save-excursion
+    (forward-word -1)
+    (and (or (bolp) (not (eq (char-before (point)) ?_)))
+	      (looking-at "class\\s *<<"))))
+
+(defun ruby-expr-beg (&optional option)
+  (save-excursion
+    (store-match-data nil)
+    (let ((space (skip-chars-backward " \t"))
+          (start (point)))
+      (cond
+       ((bolp) t)
+       ((progn
+          (forward-char -1)
+          (and (looking-at "\\?")
+               (or (eq (char-syntax (preceding-char)) ?w)
+                   (ruby-special-char-p))))
+        nil)
+       ((and (eq option 'heredoc) (< space 0))
+	(not (progn (goto-char start) (ruby-singleton-class-p))))
+       ((or (looking-at ruby-operator-re)
+            (looking-at "[\\[({,;]")
+            (and (looking-at "[!?]")
+                 (or (not (eq option 'modifier))
+                     (bolp)
+                     (save-excursion (forward-char -1) (looking-at "\\Sw$"))))
+            (and (looking-at ruby-symbol-re)
+                 (skip-chars-backward ruby-symbol-chars)
+                 (cond
+                  ((looking-at (regexp-opt
+                                (append ruby-block-beg-keywords
+                                        ruby-block-op-keywords
+                                        ruby-block-mid-keywords)
+                                'words))
+                   (goto-char (match-end 0))
+                   (not (looking-at "\\s_\\|[!?:]")))
+                  ((eq option 'expr-qstr)
+                   (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
+                  ((eq option 'expr-re)
+                   (looking-at "[a-zA-Z][a-zA-z0-9_]* +/[^ \t]"))
+                  (t nil)))))))))
+
+(defun ruby-forward-string (term &optional end no-error expand)
+  (let ((n 1) (c (string-to-char term))
+        (re (if expand
+                (concat "[^\\]\\(\\\\\\\\\\)*\\([" term "]\\|\\(#{\\)\\)")
+              (concat "[^\\]\\(\\\\\\\\\\)*[" term "]"))))
+    (while (and (re-search-forward re end no-error)
+                (if (match-beginning 3)
+                    (ruby-forward-string "}{" end no-error nil)
+                  (> (setq n (if (eq (char-before (point)) c)
+                                     (1- n) (1+ n))) 0)))
+      (forward-char -1))
+    (cond ((zerop n))
+          (no-error nil)
+          ((error "unterminated string")))))
+
+(defun ruby-deep-indent-paren-p (c &optional pos)
+  (cond ((save-excursion
+	   (if pos (goto-char pos))
+	   (ruby-expr-beg))
+	 nil)
+	((listp ruby-deep-indent-paren)
+         (let ((deep (assoc c ruby-deep-indent-paren)))
+           (cond (deep
+                  (or (cdr deep) ruby-deep-indent-paren-style))
+                 ((memq c ruby-deep-indent-paren)
+                  ruby-deep-indent-paren-style))))
+        ((eq c ruby-deep-indent-paren) ruby-deep-indent-paren-style)
+        ((eq c ?\( ) ruby-deep-arglist)))
+
+(defun ruby-parse-partial (&optional end in-string nest depth pcol indent)
+  (or depth (setq depth 0))
+  (or indent (setq indent 0))
+  (when (re-search-forward ruby-delimiter end 'move)
+    (let ((pnt (point)) w re expand)
+      (goto-char (match-beginning 0))
+      (cond
+       ((and (memq (char-before) '(?@ ?$)) (looking-at "\\sw"))
+        (goto-char pnt))
+       ((looking-at "[\"`]")            ;skip string
+        (cond
+         ((and (not (eobp))
+               (ruby-forward-string (buffer-substring (point) (1+ (point))) end t t))
+          nil)
+         (t
+          (setq in-string (point))
+          (goto-char end))))
+       ((looking-at "'")
+        (cond
+         ((and (not (eobp))
+               (re-search-forward "[^\\]\\(\\\\\\\\\\)*'" end t))
+          nil)
+         (t
+          (setq in-string (point))
+          (goto-char end))))
+       ((looking-at "/=")
+        (goto-char pnt))
+       ((looking-at "/")
+        (cond
+         ((and (not (eobp)) (ruby-expr-beg 'expr-re))
+          (if (ruby-forward-string "/" end t t)
+              nil
+            (setq in-string (point))
+            (goto-char end)))
+         (t
+          (goto-char pnt))))
+       ((looking-at "%")
+        (cond
+         ((and (not (eobp))
+               (ruby-expr-beg 'expr-qstr)
+               (not (looking-at "%="))
+               (looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
+          (goto-char (match-beginning 1))
+          (setq expand (not (memq (char-before) '(?q ?w))))
+          (setq w (match-string 1))
+          (cond
+           ((string= w "[") (setq re "]["))
+           ((string= w "{") (setq re "}{"))
+           ((string= w "(") (setq re ")("))
+           ((string= w "<") (setq re "><"))
+           ((and expand (string= w "\\"))
+            (setq w (concat "\\" w))))
+          (unless (cond (re (ruby-forward-string re end t expand))
+                        (expand (ruby-forward-string w end t t))
+                        (t (re-search-forward
+                            (if (string= w "\\")
+                                "\\\\[^\\]*\\\\"
+                              (concat "[^\\]\\(\\\\\\\\\\)*" w))
+                            end t)))
+            (setq in-string (point))
+            (goto-char end)))
+         (t
+          (goto-char pnt))))
+       ((looking-at "\\?")              ;skip ?char
+        (cond
+         ((and (ruby-expr-beg)
+               (looking-at "?\\(\\\\C-\\|\\\\M-\\)*\\\\?."))
+          (goto-char (match-end 0)))
+         (t
+          (goto-char pnt))))
+       ((looking-at "\\$")              ;skip $char
+        (goto-char pnt)
+        (forward-char 1))
+       ((looking-at "#")                ;skip comment
+        (forward-line 1)
+        (goto-char (point))
+        )
+       ((looking-at "[\\[{(]")
+        (let ((deep (ruby-deep-indent-paren-p (char-after))))
+          (if (and deep (or (not (eq (char-after) ?\{)) (ruby-expr-beg)))
+              (progn
+                (and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
+                     (setq pnt (1- (match-end 0))))
+                (setq nest (cons (cons (char-after (point)) (point)) nest))
+                (setq pcol (cons (cons pnt depth) pcol))
+                (setq depth 0))
+            (setq nest (cons (cons (char-after (point)) pnt) nest))
+            (setq depth (1+ depth))))
+        (goto-char pnt)
+        )
+       ((looking-at "[])}]")
+        (if (ruby-deep-indent-paren-p (matching-paren (char-after))
+				      (if nest
+					  (cdr (nth 0 nest))
+					(save-excursion
+					  (forward-char)
+					  (ruby-backward-sexp)
+					  (point))))
+            (setq depth (cdr (car pcol)) pcol (cdr pcol))
+          (setq depth (1- depth)))
+        (setq nest (cdr nest))
+        (goto-char pnt))
+       ((looking-at ruby-block-end-re)
+        (if (or (and (not (bolp))
+                     (progn
+                       (forward-char -1)
+                       (setq w (char-after (point)))
+                       (or (eq ?_ w)
+                           (eq ?. w))))
+                (progn
+                  (goto-char pnt)
+                  (setq w (char-after (point)))
+                  (or (eq ?_ w)
+                      (eq ?! w)
+                      (eq ?? w))))
+            nil
+          (setq nest (cdr nest))
+          (setq depth (1- depth)))
+        (goto-char pnt))
+       ((looking-at "def\\s +[^(\n;]*")
+        (if (or (bolp)
+                (progn
+                  (forward-char -1)
+                  (not (eq ?_ (char-after (point))))))
+            (progn
+              (setq nest (cons (cons nil pnt) nest))
+              (setq depth (1+ depth))))
+        (goto-char (match-end 0)))
+       ((looking-at (concat "\\_<\\(" ruby-block-beg-re "\\)\\_>"))
+        (and
+         (save-match-data
+           (or (not (looking-at (concat "do" ruby-keyword-end-re)))
+               (save-excursion
+                 (back-to-indentation)
+                 (not (looking-at ruby-non-block-do-re)))))
+         (or (bolp)
+             (progn
+               (forward-char -1)
+               (setq w (char-after (point)))
+               (not (or (eq ?_ w)
+                        (eq ?. w)))))
+         (goto-char pnt)
+         (setq w (char-after (point)))
+         (not (eq ?_ w))
+         (not (eq ?! w))
+         (not (eq ?? w))
+         (not (eq ?: w))
+         (skip-chars-forward " \t")
+         (goto-char (match-beginning 0))
+         (or (not (looking-at ruby-modifier-re))
+             (ruby-expr-beg 'modifier))
+         (goto-char pnt)
+         (setq nest (cons (cons nil pnt) nest))
+         (setq depth (1+ depth)))
+        (goto-char pnt))
+       ((looking-at ":\\(['\"]\\)")
+        (goto-char (match-beginning 1))
+        (ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end))
+       ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\|![~=]?\\)")
+        (goto-char (match-end 0)))
+       ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
+        (goto-char (match-end 0)))
+       ((or (looking-at "\\.\\.\\.?")
+            (looking-at "\\.[0-9]+")
+            (looking-at "\\.[a-zA-Z_0-9]+")
+            (looking-at "\\."))
+        (goto-char (match-end 0)))
+       ((looking-at "^=begin")
+        (if (re-search-forward "^=end" end t)
+            (forward-line 1)
+          (setq in-string (match-end 0))
+          (goto-char end)))
+       ((looking-at "<<")
+        (cond
+         ((and (ruby-expr-beg 'heredoc)
+               (looking-at "<<\\([-~]\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
+          (setq re (regexp-quote (or (match-string 4) (match-string 2))))
+          (if (match-beginning 1) (setq re (concat "\\s *" re)))
+          (let* ((id-end (goto-char (match-end 0)))
+                 (line-end-position (save-excursion (end-of-line) (point)))
+                 (state (list in-string nest depth pcol indent)))
+            ;; parse the rest of the line
+            (while (and (> line-end-position (point))
+                        (setq state (apply 'ruby-parse-partial
+                                           line-end-position state))))
+            (setq in-string (car state)
+                  nest (nth 1 state)
+                  depth (nth 2 state)
+                  pcol (nth 3 state)
+                  indent (nth 4 state))
+            ;; skip heredoc section
+            (if (re-search-forward (concat "^" re "$") end 'move)
+                (forward-line 1)
+              (setq in-string id-end)
+              (goto-char end))))
+         (t
+          (goto-char pnt))))
+       ((looking-at "^__END__$")
+        (goto-char pnt))
+       ((looking-at ruby-here-doc-beg-re)
+        (if (re-search-forward (ruby-here-doc-end-match)
+                               ruby-indent-point t)
+            (forward-line 1)
+          (setq in-string (match-end 0))
+          (goto-char ruby-indent-point)))
+       (t
+        (error (format "bad string %s"
+                       (buffer-substring (point) pnt)
+                       ))))))
+  (list in-string nest depth pcol))
+
+(defun ruby-parse-region (start end)
+  (let (state)
+    (save-excursion
+      (if start
+          (goto-char start)
+        (ruby-beginning-of-indent))
+      (save-restriction
+        (narrow-to-region (point) end)
+        (while (and (> end (point))
+                    (setq state (apply 'ruby-parse-partial end state))))))
+    (list (nth 0 state)                 ; in-string
+          (car (nth 1 state))           ; nest
+          (nth 2 state)                 ; depth
+          (car (car (nth 3 state)))     ; pcol
+          ;(car (nth 5 state))          ; indent
+          )))
+
+(defun ruby-indent-size (pos nest)
+  (+ pos (* (or nest 1) ruby-indent-level)))
+
+(defun ruby-calculate-indent (&optional parse-start)
+  (save-excursion
+    (beginning-of-line)
+    (let ((ruby-indent-point (point))
+          (case-fold-search nil)
+          state bol eol begin op-end
+          (paren (progn (skip-syntax-forward " ")
+                        (and (char-after) (matching-paren (char-after)))))
+          (indent 0))
+      (if parse-start
+          (goto-char parse-start)
+        (ruby-beginning-of-indent)
+        (setq parse-start (point)))
+      (back-to-indentation)
+      (setq indent (current-column))
+      (setq state (ruby-parse-region parse-start ruby-indent-point))
+      (cond
+       ((nth 0 state)                   ; within string
+        (setq indent nil))              ;  do nothing
+       ((car (nth 1 state))             ; in paren
+        (goto-char (setq begin (cdr (nth 1 state))))
+        (let ((deep (ruby-deep-indent-paren-p (car (nth 1 state))
+					      (1- (cdr (nth 1 state))))))
+          (if deep
+              (cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
+                     (skip-syntax-backward " ")
+                     (setq indent (1- (current-column))))
+		    ((eq deep 'space)
+		     (goto-char (cdr (nth 1 state)))
+		     (setq indent (1+ (current-column))))
+                    ((let ((s (ruby-parse-region (point) ruby-indent-point)))
+                       (and (nth 2 s) (> (nth 2 s) 0)
+                            (or (goto-char (cdr (nth 1 s))) t)))
+                     (forward-word -1)
+                     (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+                    (t
+                     (setq indent (current-column))
+                     (cond ((eq deep 'space))
+                           (paren (setq indent (1- indent)))
+                           (t (setq indent (ruby-indent-size (1- indent) 1))))))
+            (if (nth 3 state) (goto-char (nth 3 state))
+              (goto-char parse-start) (back-to-indentation))
+            (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+          (and (eq (car (nth 1 state)) paren)
+               (ruby-deep-indent-paren-p (matching-paren paren)
+					 (1- (cdr (nth 1 state))))
+               (search-backward (char-to-string paren))
+               (setq indent (current-column)))))
+       ((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
+        (if (null (cdr (nth 1 state)))
+            (error "invalid nest"))
+        (goto-char (cdr (nth 1 state)))
+        (forward-word -1)               ; skip back a keyword
+        (setq begin (point))
+        (cond
+         ((looking-at "do\\>[^_]")      ; iter block is a special case
+          (if (nth 3 state) (goto-char (nth 3 state))
+            (goto-char parse-start) (back-to-indentation))
+          (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+         (t
+          (setq indent (+ (current-column) ruby-indent-level)))))
+
+       ((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
+        (setq indent (ruby-indent-size (current-column) (nth 2 state)))))
+      (when indent
+        (goto-char ruby-indent-point)
+        (end-of-line)
+        (setq eol (point))
+        (beginning-of-line)
+        (cond
+         ((and (not (ruby-deep-indent-paren-p paren
+					      (and (cdr (nth 1 state))
+						   (1- (cdr (nth 1 state))))))
+               (re-search-forward ruby-negative eol t))
+          (and (not (eq ?_ (char-after (match-end 0))))
+               (setq indent (- indent ruby-indent-level))))
+         ((and
+           (save-excursion
+             (beginning-of-line)
+             (not (bobp)))
+           (or (ruby-deep-indent-paren-p t)
+               (null (car (nth 1 state)))))
+          ;; goto beginning of non-empty no-comment line
+          (let (end done)
+            (while (not done)
+              (skip-chars-backward " \t\n")
+              (setq end (point))
+              (beginning-of-line)
+              (if (re-search-forward "^\\s *#" end t)
+                  (beginning-of-line)
+                (setq done t))))
+          (setq bol (point))
+          (end-of-line)
+          ;; skip the comment at the end
+          (skip-chars-backward " \t")
+          (let (end (pos (point)))
+            (beginning-of-line)
+            (while (and (re-search-forward "#" pos t)
+                        (setq end (1- (point)))
+                        (or (ruby-special-char-p end)
+                            (and (setq state (ruby-parse-region parse-start end))
+                                 (nth 0 state))))
+              (setq end nil))
+            (goto-char (or end pos))
+            (skip-chars-backward " \t")
+            (setq begin (if (and end (nth 0 state)) pos (cdr (nth 1 state))))
+            (setq state (ruby-parse-region parse-start (point))))
+          (or (bobp) (forward-char -1))
+          (and
+           (or (and (looking-at ruby-symbol-re)
+                    (skip-chars-backward ruby-symbol-chars)
+                    (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
+                    (not (eq (point) (nth 3 state)))
+                    (save-excursion
+                      (goto-char (match-end 0))
+                      (not (looking-at "[a-z_]"))))
+               (and (looking-at ruby-operator-re)
+                    (not (ruby-special-char-p))
+                    ;; operator at the end of line
+                    (let ((c (char-after (point))))
+                      (and
+;;                     (or (null begin)
+;;                         (save-excursion
+;;                           (goto-char begin)
+;;                           (skip-chars-forward " \t")
+;;                           (not (or (eolp) (looking-at "#")
+;;                                    (and (eq (car (nth 1 state)) ?{)
+;;                                         (looking-at "|"))))))
+                       (or (not (eq ?/ c))
+                           (null (nth 0 (ruby-parse-region (or begin parse-start) (point)))))
+                       (or (not (eq ?| (char-after (point))))
+                           (save-excursion
+                             (or (eolp) (forward-char -1))
+                             (cond
+                              ((search-backward "|" nil t)
+                               (skip-chars-backward " \t\n")
+                               (and (not (eolp))
+                                    (progn
+                                      (forward-char -1)
+                                      (not (looking-at "{")))
+                                    (progn
+                                      (forward-word -1)
+                                      (not (looking-at "do\\>[^_]")))))
+                              (t t))))
+                       (not (eq ?, c))
+                       (setq op-end t)))))
+           (setq indent
+                 (cond
+                  ((and
+                    (null op-end)
+                    (not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
+                    (eq (ruby-deep-indent-paren-p t) 'space)
+                    (not (bobp)))
+                   (widen)
+                   (goto-char (or begin parse-start))
+                   (skip-syntax-forward " ")
+                   (current-column))
+                  ((car (nth 1 state)) indent)
+                  (t
+                   (+ indent ruby-indent-level))))))))
+      (goto-char ruby-indent-point)
+      (beginning-of-line)
+      (skip-syntax-forward " ")
+      (if (looking-at "\\.[^.]\\|&\\.")
+          (+ indent ruby-indent-level)
+        indent))))
+
+(defun ruby-electric-brace (arg)
+  (interactive "P")
+  (insert-char last-command-event 1)
+  (ruby-indent-line t)
+  (delete-char -1)
+  (self-insert-command (prefix-numeric-value arg)))
+
+(eval-when-compile
+  (defmacro defun-region-command (func args &rest body)
+    (let ((intr (car body)))
+      (when (featurep 'xemacs)
+        (if (stringp intr) (setq intr (cadr body)))
+        (and (eq (car intr) 'interactive)
+             (setq intr (cdr intr))
+             (setcar intr (concat "_" (car intr)))))
+      (cons 'defun (cons func (cons args body))))))
+
+(defun-region-command ruby-beginning-of-defun (&optional arg)
+  "Move backward to next beginning-of-defun.
+With argument, do this that many times.
+Returns t unless search stops due to end of buffer."
+  (interactive "p")
+  (and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\_>")
+                           nil 'move (or arg 1))
+       (progn (beginning-of-line) t)))
+
+(defun ruby-beginning-of-indent ()
+  (and (re-search-backward (concat "^\\(" ruby-indent-beg-re "\\)\\_>")
+                           nil 'move)
+       (progn
+         (beginning-of-line)
+         t)))
+
+(defun-region-command ruby-end-of-defun (&optional arg)
+  "Move forward to next end of defun.
+An end of a defun is found by moving forward from the beginning of one."
+  (interactive "p")
+  (and (re-search-forward (concat "^\\(" ruby-block-end-re "\\)\\($\\|\\b[^_]\\)")
+                          nil 'move (or arg 1))
+       (progn (beginning-of-line) t))
+  (forward-line 1))
+
+(defun ruby-move-to-block (n)
+  (let (start pos done down (orig (point)))
+    (setq start (ruby-calculate-indent))
+    (setq down (looking-at (if (< n 0) ruby-block-end-re
+                             (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
+    (while (and (not done) (not (if (< n 0) (bobp) (eobp))))
+      (forward-line n)
+      (cond
+       ((looking-at "^\\s *$"))
+       ((looking-at "^\\s *#"))
+       ((and (> n 0) (looking-at "^=begin\\>"))
+        (re-search-forward "^=end\\>"))
+       ((and (< n 0) (looking-at "^=end\\>"))
+        (re-search-backward "^=begin\\>"))
+       (t
+        (setq pos (current-indentation))
+        (cond
+         ((< start pos)
+          (setq down t))
+         ((and down (= pos start))
+          (setq done t))
+         ((> start pos)
+          (setq done t)))))
+      (if done
+          (save-excursion
+            (back-to-indentation)
+            (if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
+                (setq done nil)))))
+    (back-to-indentation)
+    (when (< n 0)
+      (let ((eol (point-at-eol)) state next)
+	(if (< orig eol) (setq eol orig))
+	(setq orig (point))
+	(while (and (setq next (apply 'ruby-parse-partial eol state))
+		    (< (point) eol))
+	  (setq state next))
+	(when (cdaadr state)
+	  (goto-char (cdaadr state)))
+	(backward-word)))))
+
+(defun-region-command ruby-beginning-of-block (&optional arg)
+  "Move backward to next beginning-of-block"
+  (interactive "p")
+  (ruby-move-to-block (- (or arg 1))))
+
+(defun-region-command ruby-end-of-block (&optional arg)
+  "Move forward to next beginning-of-block"
+  (interactive "p")
+  (ruby-move-to-block (or arg 1)))
+
+(defun-region-command ruby-forward-sexp (&optional cnt)
+  (interactive "p")
+  (if (and (numberp cnt) (< cnt 0))
+      (ruby-backward-sexp (- cnt))
+    (let ((i (or cnt 1)))
+      (condition-case nil
+          (while (> i 0)
+            (skip-syntax-forward " ")
+            (if (looking-at ",\\s *") (goto-char (match-end 0)))
+            (cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ")
+                   (goto-char (match-end 0)))
+                  ((progn
+                     (skip-chars-forward ",.:;|&^~=!?\\+\\-\\*")
+                     (looking-at "\\s("))
+                   (goto-char (scan-sexps (point) 1)))
+                  ((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
+                        (not (eq (char-before (point)) ?.))
+                        (not (eq (char-before (point)) ?:)))
+                   (ruby-end-of-block)
+                   (forward-word 1))
+                  ((looking-at "\\(\\$\\|@@?\\)?\\sw")
+                   (while (progn
+                            (while (progn (forward-word 1) (looking-at "_")))
+                            (cond ((looking-at "::") (forward-char 2) t)
+                                  ((> (skip-chars-forward ".") 0))
+                                  ((looking-at "\\?\\|!\\(=[~=>]\\|[^~=]\\)")
+                                   (forward-char 1) nil)))))
+                  ((let (state expr)
+                     (while
+                         (progn
+                           (setq expr (or expr (ruby-expr-beg)
+                                          (looking-at "%\\sw?\\Sw\\|[\"'`/]")))
+                           (nth 1 (setq state (apply 'ruby-parse-partial nil state))))
+                       (setq expr t)
+                       (skip-chars-forward "<"))
+                     (not expr))))
+            (setq i (1- i)))
+        ((error) (forward-word 1)))
+      i)))
+
+(defun-region-command ruby-backward-sexp (&optional cnt)
+  (interactive "p")
+  (if (and (numberp cnt) (< cnt 0))
+      (ruby-forward-sexp (- cnt))
+    (let ((i (or cnt 1)))
+      (condition-case nil
+          (while (> i 0)
+            (skip-chars-backward " \t\n,.:;|&^~=!?\\+\\-\\*")
+            (forward-char -1)
+            (cond ((looking-at "\\s)")
+                   (goto-char (scan-sexps (1+ (point)) -1))
+                   (case (char-before)
+                     (?% (forward-char -1))
+                     ('(?q ?Q ?w ?W ?r ?x)
+                      (if (eq (char-before (1- (point))) ?%) (forward-char -2))))
+                   nil)
+                  ((looking-at "\\s\"\\|\\\\\\S_")
+                   (let ((c (char-to-string (char-before (match-end 0)))))
+                     (while (and (search-backward c)
+                                 (oddp (skip-chars-backward "\\")))))
+                   nil)
+                  ((looking-at "\\s.\\|\\s\\")
+                   (if (ruby-special-char-p) (forward-char -1)))
+                  ((looking-at "\\s(") nil)
+                  (t
+                   (forward-char 1)
+                   (while (progn (forward-word -1)
+                                 (case (char-before)
+                                   (?_ t)
+                                   (?. (forward-char -1) t)
+                                   ((?$ ?@)
+                                    (forward-char -1)
+                                    (and (eq (char-before) (char-after)) (forward-char -1)))
+                                   (?:
+                                    (forward-char -1)
+                                    (eq (char-before) :)))))
+                   (if (looking-at ruby-block-end-re)
+                       (ruby-beginning-of-block))
+                   nil))
+            (setq i (1- i)))
+        ((error)))
+      i)))
+
+(defun ruby-reindent-then-newline-and-indent ()
+  (interactive "*")
+  (newline)
+  (save-excursion
+    (end-of-line 0)
+    (indent-according-to-mode)
+    (delete-region (point) (progn (skip-chars-backward " \t") (point))))
+  (indent-according-to-mode))
+
+(fset 'ruby-encomment-region (symbol-function 'comment-region))
+
+(defun ruby-decomment-region (beg end)
+  (interactive "r")
+  (save-excursion
+    (goto-char beg)
+    (while (re-search-forward "^\\([ \t]*\\)#" end t)
+      (replace-match "\\1" nil nil)
+      (save-excursion
+        (ruby-indent-line)))))
+
+(defun ruby-insert-end ()
+  (interactive)
+  (insert "end")
+  (ruby-indent-line t)
+  (end-of-line))
+
+(defun ruby-mark-defun ()
+  "Put mark at end of this Ruby function, point at beginning."
+  (interactive)
+  (push-mark (point))
+  (ruby-end-of-defun)
+  (push-mark (point) nil t)
+  (ruby-beginning-of-defun)
+  (re-search-backward "^\n" (- (point) 1) t))
+
+(defun ruby-indent-exp (&optional shutup-p)
+  "Indent each line in the balanced expression following point syntactically.
+If optional SHUTUP-P is non-nil, no errors are signalled if no
+balanced expression is found."
+  (interactive "*P")
+  (let ((here (point-marker)) start top column (nest t))
+    (set-marker-insertion-type here t)
+    (unwind-protect
+        (progn
+          (beginning-of-line)
+          (setq start (point) top (current-indentation))
+          (while (and (not (eobp))
+                      (progn
+                        (setq column (ruby-calculate-indent start))
+                        (cond ((> column top)
+                               (setq nest t))
+                              ((and (= column top) nest)
+                               (setq nest nil) t))))
+            (ruby-indent-to column)
+            (beginning-of-line 2)))
+      (goto-char here)
+      (set-marker here nil))))
+
+(defun ruby-add-log-current-method ()
+  "Return current method string."
+  (condition-case nil
+      (save-excursion
+        (let (mname mlist (indent 0))
+          ;; get current method (or class/module)
+          (if (re-search-backward
+               (concat "^[ \t]*\\(def\\|class\\|module\\)[ \t]+"
+                       "\\("
+                       ;; \\. and :: for class method
+                        "\\([A-Za-z_]" ruby-symbol-re "*\\|\\.\\|::" "\\)"
+                        "+\\)")
+               nil t)
+              (progn
+                (setq mname (match-string 2))
+                (unless (string-equal "def" (match-string 1))
+                  (setq mlist (list mname) mname nil))
+                (goto-char (match-beginning 1))
+                (setq indent (current-column))
+                (beginning-of-line)))
+          ;; nest class/module
+          (while (and (> indent 0)
+                      (re-search-backward
+                       (concat
+                        "^[ \t]*\\(class\\|module\\)[ \t]+"
+                        "\\([A-Z]" ruby-symbol-re "*\\)")
+                       nil t))
+            (goto-char (match-beginning 1))
+            (if (< (current-column) indent)
+                (progn
+                  (setq mlist (cons (match-string 2) mlist))
+                  (setq indent (current-column))
+                  (beginning-of-line))))
+          (when mname
+            (let ((mn (split-string mname "\\.\\|::")))
+              (if (cdr mn)
+                  (progn
+                    (cond
+                     ((string-equal "" (car mn))
+                      (setq mn (cdr mn) mlist nil))
+                     ((string-equal "self" (car mn))
+                      (setq mn (cdr mn)))
+                     ((let ((ml (nreverse mlist)))
+                        (while ml
+                          (if (string-equal (car ml) (car mn))
+                              (setq mlist (nreverse (cdr ml)) ml nil))
+                          (or (setq ml (cdr ml)) (nreverse mlist))))))
+                    (if mlist
+                        (setcdr (last mlist) mn)
+                      (setq mlist mn))
+                    (setq mn (last mn 2))
+                    (setq mname (concat "." (cadr mn)))
+                    (setcdr mn nil))
+                (setq mname (concat "#" mname)))))
+          ;; generate string
+          (if (consp mlist)
+              (setq mlist (mapconcat (function identity) mlist "::")))
+          (if mname
+              (if mlist (concat mlist mname) mname)
+            mlist)))))
+
+(defun ruby-brace-to-do-end ()
+  (when (looking-at "{")
+    (let ((orig (point)) (end (progn (ruby-forward-sexp) (point)))
+	  oneline (end (make-marker)))
+      (setq oneline (and (eolp) (<= (point-at-bol) orig)))
+      (when (eq (char-before) ?\})
+	(delete-char -1)
+	(cond
+	 (oneline
+	  (insert "\n")
+	  (set-marker end (point)))
+	 ((eq (char-syntax (preceding-char)) ?w)
+	  (insert " ")))
+	(insert "end")
+	(if (eq (char-syntax (following-char)) ?w)
+	    (insert " "))
+	(goto-char orig)
+	(delete-char 1)
+	(if (eq (char-syntax (preceding-char)) ?w)
+	    (insert " "))
+	(insert "do")
+	(when (looking-at "\\sw\\||")
+	  (insert " ")
+	  (backward-char))
+	(when oneline
+	  (setq orig (point))
+	  (when (cond
+		 ((looking-at "\\s *|")
+		  (goto-char (match-end 0))
+		  (and (search-forward "|" (point-at-eol) 'move)
+		       (not (eolp))))
+		 (t))
+	    (while (progn
+		     (insert "\n")
+		     (ruby-forward-sexp)
+		     (looking-at "\\s *;\\s *"))
+	      (delete-char (- (match-end 0) (match-beginning 0))))
+	    (goto-char orig)
+	    (beginning-of-line 2)
+	    (indent-region (point) end))
+	  (goto-char orig))
+	t))))
+
+(defun ruby-do-end-to-brace ()
+  (when (and (or (bolp)
+		 (not (memq (char-syntax (preceding-char)) '(?w ?_))))
+	     (looking-at "\\<do\\(\\s \\|$\\)"))
+    (let ((orig (point)) (end (progn (ruby-forward-sexp) (point)))
+	  first last)
+      (backward-char 3)
+      (when (looking-at ruby-block-end-re)
+	(delete-char 3)
+	(insert "}")
+	(setq last (and (eolp)
+			(progn (backward-char 1)
+			       (skip-syntax-backward " ")
+			       (bolp))
+			(1- (point-at-eol -1))))
+	(goto-char orig)
+	(delete-char 2)
+	(insert "{")
+	(setq orig (point))
+	(when (and last (<= last (point))
+		   (not (search-forward "#" (setq first (point-at-eol)) t)))
+	  (goto-char (- end 4))
+	  (end-of-line 0)
+	  (if (looking-at "\n\\s *")
+	      (delete-char (- (match-end 0) (match-beginning 0))) t)
+	  (goto-char first)
+	  (if (looking-at "\n\\s *")
+	      (delete-char (- (match-end 0) (match-beginning 0))) t))
+	(goto-char orig)
+	(if (looking-at "\\s +|")
+	    (delete-char (- (match-end 0) (match-beginning 0) 1)))
+	t))))
+
+(defun ruby-toggle-block ()
+  (interactive)
+  (or (ruby-brace-to-do-end)
+      (ruby-do-end-to-brace)))
+
+(eval-when-compile
+  (if (featurep 'font-lock)
+      (defmacro eval-when-font-lock-available (&rest args) (cons 'progn args))
+    (defmacro eval-when-font-lock-available (&rest args))))
+
+(eval-when-compile
+  (if (featurep 'hilit19)
+      (defmacro eval-when-hilit19-available (&rest args) (cons 'progn args))
+    (defmacro eval-when-hilit19-available (&rest args))))
+
+(eval-when-font-lock-available
+  (or (boundp 'font-lock-variable-name-face)
+      (setq font-lock-variable-name-face font-lock-type-face))
+
+  (defconst ruby-font-lock-syntactic-keywords
+        `(
+          ;; #{ }, #$hoge, #@foo are not comments
+          ("\\(#\\)[{$@]" 1 (1 . nil))
+          ;; the last $', $", $` in the respective string is not variable
+          ;; the last ?', ?", ?` in the respective string is not ascii code
+          ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
+           (2 (7 . nil))
+           (4 (7 . nil)))
+          ;; $' $" $` .... are variables
+          ;; ?' ?" ?` are ascii codes
+          ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
+          ;; regexps
+          ("\\(^\\|[[{|=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+           (4 (7 . ?/))
+           (6 (7 . ?/)))
+          ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
+          ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))
+          (,(concat ruby-here-doc-beg-re ".*\\(\n\\)")
+           ,(+ 1 (regexp-opt-depth ruby-here-doc-beg-re))
+           (ruby-here-doc-beg-syntax))
+          (,ruby-here-doc-end-re 3 (ruby-here-doc-end-syntax))))
+
+  (unless (functionp 'syntax-ppss)
+    (defun syntax-ppss (&optional pos)
+      (parse-partial-sexp (point-min) (or pos (point)))))
+
+  (defun ruby-in-ppss-context-p (context &optional ppss)
+    (let ((ppss (or ppss (syntax-ppss (point)))))
+      (if (cond
+           ((eq context 'anything)
+            (or (nth 3 ppss)
+                (nth 4 ppss)))
+           ((eq context 'string)
+            (nth 3 ppss))
+           ((eq context 'heredoc)
+            (and (nth 3 ppss)
+                 ;; If it's generic string, it's a heredoc and we don't care
+                 ;; See `parse-partial-sexp'
+                 (not (numberp (nth 3 ppss)))))
+           ((eq context 'non-heredoc)
+            (and (ruby-in-ppss-context-p 'anything)
+                 (not (ruby-in-ppss-context-p 'heredoc))))
+           ((eq context 'comment)
+            (nth 4 ppss))
+           (t
+            (error (concat
+                    "Internal error on `ruby-in-ppss-context-p': "
+                    "context name `" (symbol-name context) "' is unknown"))))
+          t)))
+
+  (defun ruby-in-here-doc-p ()
+    (save-excursion
+      (let ((old-point (point)) (case-fold-search nil))
+        (beginning-of-line)
+        (catch 'found-beg
+          (while (and (re-search-backward ruby-here-doc-beg-re nil t)
+		      (not (ruby-singleton-class-p)))
+            (if (not (or (ruby-in-ppss-context-p 'anything)
+                         (ruby-here-doc-find-end old-point)))
+                (throw 'found-beg t)))))))
+
+  (defun ruby-here-doc-find-end (&optional limit)
+    "Expects the point to be on a line with one or more heredoc
+openers. Returns the buffer position at which all heredocs on the
+line are terminated, or nil if they aren't terminated before the
+buffer position `limit' or the end of the buffer."
+    (save-excursion
+      (beginning-of-line)
+      (catch 'done
+        (let ((eol (save-excursion (end-of-line) (point)))
+              (case-fold-search nil)
+              ;; Fake match data such that (match-end 0) is at eol
+              (end-match-data (progn (looking-at ".*$") (match-data)))
+              beg-match-data end-re)
+          (while (re-search-forward ruby-here-doc-beg-re eol t)
+            (setq beg-match-data (match-data))
+            (setq end-re (ruby-here-doc-end-match))
+
+            (set-match-data end-match-data)
+            (goto-char (match-end 0))
+            (unless (re-search-forward end-re limit t) (throw 'done nil))
+            (setq end-match-data (match-data))
+
+            (set-match-data beg-match-data)
+            (goto-char (match-end 0)))
+          (set-match-data end-match-data)
+          (goto-char (match-end 0))
+          (point)))))
+
+  (defun ruby-here-doc-beg-syntax ()
+    (save-excursion
+      (goto-char (match-beginning 0))
+      (unless (or (ruby-in-ppss-context-p 'non-heredoc)
+                  (ruby-in-here-doc-p))
+        (string-to-syntax "|"))))
+
+  (defun ruby-here-doc-end-syntax ()
+    (let ((pss (syntax-ppss)) (case-fold-search nil))
+      (when (ruby-in-ppss-context-p 'heredoc pss)
+        (save-excursion
+          (goto-char (nth 8 pss))     ; Go to the beginning of heredoc.
+          (let ((eol (point)))
+            (beginning-of-line)
+            (if (and (re-search-forward (ruby-here-doc-beg-match) eol t) ; If there is a heredoc that matches this line...
+                     (not (ruby-in-ppss-context-p 'anything)) ; And that's not inside a heredoc/string/comment...
+                     (progn (goto-char (match-end 0)) ; And it's the last heredoc on its line...
+                            (not (re-search-forward ruby-here-doc-beg-re eol t))))
+                (string-to-syntax "|")))))))
+
+  (eval-when-compile
+      (put 'ruby-mode 'font-lock-defaults
+           '((ruby-font-lock-keywords)
+             nil nil nil
+             beginning-of-line
+             (font-lock-syntactic-keywords
+              . ruby-font-lock-syntactic-keywords))))
+
+  (defun ruby-font-lock-docs (limit)
+    (if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)
+        (let (beg)
+          (beginning-of-line)
+          (setq beg (point))
+          (forward-line 1)
+          (if (re-search-forward "^=end\\(\\s \\|$\\)" limit t)
+              (progn
+                (set-match-data (list beg (point)))
+                t)))))
+
+  (defun ruby-font-lock-maybe-docs (limit)
+    (let (beg)
+      (save-excursion
+        (if (and (re-search-backward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
+                 (string= (match-string 1) "begin"))
+            (progn
+              (beginning-of-line)
+              (setq beg (point)))))
+      (if (and beg (and (re-search-forward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
+                        (string= (match-string 1) "end")))
+          (progn
+            (set-match-data (list beg (point)))
+            t)
+        nil)))
+
+  (defvar ruby-font-lock-syntax-table
+    (let* ((tbl (copy-syntax-table ruby-mode-syntax-table)))
+      (modify-syntax-entry ?_ "w" tbl)
+      tbl))
+
+  (defconst ruby-font-lock-keywords
+    (list
+     ;; functions
+     '("^\\s *def\\s +\\([^( \t\n]+\\)"
+       1 font-lock-function-name-face)
+     ;; keywords
+     (cons (concat
+            "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\_<\\(defined\\?\\|"
+            (regexp-opt
+             '("alias"
+               "and"
+               "begin"
+               "break"
+               "case"
+               "catch"
+               "class"
+               "def"
+               "do"
+               "elsif"
+               "else"
+               "fail"
+               "ensure"
+               "for"
+               "end"
+               "if"
+               "in"
+               "module"
+               "next"
+               "not"
+               "or"
+               "raise"
+               "redo"
+               "rescue"
+               "retry"
+               "return"
+               "then"
+               "throw"
+               "super"
+               "unless"
+               "undef"
+               "until"
+               "when"
+               "while"
+               "yield"
+               )
+             t)
+            "\\)"
+            ruby-keyword-end-re)
+           2)
+     ;; here-doc beginnings
+     (list ruby-here-doc-beg-re 0 'font-lock-string-face)
+     ;; variables
+     '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\_<\\(nil\\|self\\|true\\|false\\)\\>"
+       2 font-lock-variable-name-face)
+     ;; variables
+     '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
+       1 font-lock-variable-name-face)
+     '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
+       0 font-lock-variable-name-face)
+     ;; embedded document
+     '(ruby-font-lock-docs
+       0 font-lock-comment-face t)
+     '(ruby-font-lock-maybe-docs
+       0 font-lock-comment-face t)
+     ;; general delimited string
+     '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
+       (2 font-lock-string-face))
+     ;; constants
+     '("\\(^\\|[^_]\\)\\_<\\([A-Z]+\\(\\w\\|_\\)*\\)"
+       2 font-lock-type-face)
+     ;; symbols
+     '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
+       2 font-lock-reference-face)
+     '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-reference-face)
+     ;; expression expansion
+     '("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)"
+       0 font-lock-variable-name-face t)
+     ;; warn lower camel case
+     ;'("\\<[a-z]+[a-z0-9]*[A-Z][A-Za-z0-9]*\\([!?]?\\|\\>\\)"
+     ;  0 font-lock-warning-face)
+     )
+    "*Additional expressions to highlight in ruby mode."))
+
+(eval-when-hilit19-available
+  (hilit-set-mode-patterns
+   'ruby-mode
+   '(("[^$\\?]\\(\"[^\\\"]*\\(\\\\\\(.\\|\n\\)[^\\\"]*\\)*\"\\)" 1 string)
+     ("[^$\\?]\\('[^\\']*\\(\\\\\\(.\\|\n\\)[^\\']*\\)*'\\)" 1 string)
+     ("[^$\\?]\\(`[^\\`]*\\(\\\\\\(.\\|\n\\)[^\\`]*\\)*`\\)" 1 string)
+     ("^\\s *#.*$" nil comment)
+     ("[^$@?\\]\\(#[^$@{\n].*$\\)" 1 comment)
+     ("[^a-zA-Z_]\\(\\?\\(\\\\[CM]-\\)*.\\)" 1 string)
+     ("^\\s *\\(require\\|load\\).*$" nil include)
+     ("^\\s *\\(include\\|alias\\|undef\\).*$" nil decl)
+     ("^\\s *\\<\\(class\\|def\\|module\\)\\>" "[)\n;]" defun)
+     ("[^_]\\<\\(begin\\|case\\|else\\|elsif\\|end\\|ensure\\|for\\|if\\|unless\\|rescue\\|then\\|when\\|while\\|until\\|do\\|yield\\)\\>\\([^_]\\|$\\)" 1 defun)
+     ("[^_]\\<\\(and\\|break\\|next\\|raise\\|fail\\|in\\|not\\|or\\|redo\\|retry\\|return\\|super\\|yield\\|catch\\|throw\\|self\\|nil\\)\\>\\([^_]\\|$\\)" 1 keyword)
+     ("\\$\\(.\\|\\sw+\\)" nil type)
+     ("[$@].[a-zA-Z_0-9]*" nil struct)
+     ("^__END__" nil label))))
+
+
+;;;###autoload
+(defun ruby-mode ()
+  "Major mode for editing ruby scripts.
+\\[ruby-indent-command] properly indents subexpressions of multi-line
+class, module, def, if, while, for, do, and case statements, taking
+nesting into account.
+
+The variable ruby-indent-level controls the amount of indentation.
+\\{ruby-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map ruby-mode-map)
+  (setq mode-name "Ruby")
+  (setq major-mode 'ruby-mode)
+  (ruby-mode-variables)
+
+  (make-local-variable 'imenu-create-index-function)
+  (setq imenu-create-index-function 'ruby-imenu-create-index)
+
+  (make-local-variable 'add-log-current-defun-function)
+  (setq add-log-current-defun-function 'ruby-add-log-current-method)
+
+  (add-hook
+   (cond ((boundp 'before-save-hook)
+          (make-local-variable 'before-save-hook)
+          'before-save-hook)
+         ((boundp 'write-contents-functions) 'write-contents-functions)
+         ((boundp 'write-contents-hooks) 'write-contents-hooks))
+   'ruby-mode-set-encoding)
+
+  (set (make-local-variable 'font-lock-defaults) '((ruby-font-lock-keywords) nil nil))
+  (set (make-local-variable 'font-lock-keywords) ruby-font-lock-keywords)
+  (set (make-local-variable 'font-lock-syntax-table) ruby-font-lock-syntax-table)
+  (set (make-local-variable 'font-lock-syntactic-keywords) ruby-font-lock-syntactic-keywords)
+
+  (if (fboundp 'run-mode-hooks)
+      (run-mode-hooks 'ruby-mode-hook)
+    (run-hooks 'ruby-mode-hook)))
+
+(provide 'ruby-mode)
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 13aad77b3d..b8593b202a 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -55,7 +55,7 @@
  '("bsd"
    (c-basic-offset . 4)
    (tab-width . 8)
-   (indent-tabs-mode . nil)
+   (indent-tabs-mode . t)
    (setq show-trailing-whitespace t)
    (c-offsets-alist
     (case-label . *)
@@ -75,20 +75,7 @@
             (let ((head (progn (forward-line 100) (point)))
                   (case-fold-search nil))
               (goto-char (point-min))
-              (re-search-forward "Copyright (C) .* Yukihiro Matsumoto" head t)))
-	  (condition-case ()
-	      (with-temp-buffer
-		(when (= 0 (call-process "git" nil t nil "remote" "get-url" "origin"))
-		  (goto-char (point-min))
-		  (looking-at ".*/ruby\\(\\.git\\)?$")))
-	    (error))
-	  (condition-case ()
-	      (with-temp-buffer
-		(when (= 0 (call-process "svn" nil t nil "info" "--xml"))
-		  (goto-char (point-min))
-		  (search-forward-regexp "<root>.*/ruby</root>" nil)))
-	    (error))
-	  nil)
+              (re-search-forward "Copyright (C) .* Yukihiro Matsumoto" head t))))
       (c-set-style "ruby")))
 
 (provide 'ruby-style)
diff --git a/misc/rubydb2x.el b/misc/rubydb2x.el
new file mode 100644
index 0000000000..a74265fb0e
--- /dev/null
+++ b/misc/rubydb2x.el
@@ -0,0 +1,104 @@
+(require 'gud)
+(provide 'rubydb)
+
+;; ======================================================================
+;; rubydb functions
+
+;;; History of argument lists passed to rubydb.
+(defvar gud-rubydb-history nil)
+
+(defun gud-rubydb-massage-args (file args)
+  (cons "-I" (cons "." (cons "-r" (cons "debug" (cons file args))))))
+
+;; There's no guarantee that Emacs will hand the filter the entire
+;; marker at once; it could be broken up across several strings.  We
+;; might even receive a big chunk with several markers in it.  If we
+;; receive a chunk of text which looks like it might contain the
+;; beginning of a marker, we save it here between calls to the
+;; filter.
+(defvar gud-rubydb-marker-acc "")
+
+(defun gud-rubydb-marker-filter (string)
+  (save-match-data
+    (setq gud-marker-acc (concat gud-marker-acc string))
+    (let ((output ""))
+      
+      ;; Process all the complete markers in this chunk.
+      (while (string-match "\032\032\\([^:\n]*\\):\\([0-9]*\\):.*\n"
+                           gud-marker-acc)
+        (setq
+         
+         ;; Extract the frame position from the marker.
+         gud-last-frame
+         (cons (substring gud-marker-acc (match-beginning 1) (match-end 1))
+               (string-to-int (substring gud-marker-acc
+                                         (match-beginning 2)
+                                         (match-end 2))))
+         
+         ;; Append any text before the marker to the output we're going
+         ;; to return - we don't include the marker in this text.
+         output (concat output
+                        (substring gud-marker-acc 0 (match-beginning 0)))
+         
+         ;; Set the accumulator to the remaining text.
+         gud-marker-acc (substring gud-marker-acc (match-end 0))))
+      
+      ;; Does the remaining text look like it might end with the
+      ;; beginning of another marker?  If it does, then keep it in
+      ;; gud-marker-acc until we receive the rest of it.  Since we
+      ;; know the full marker regexp above failed, it's pretty simple to
+      ;; test for marker starts.
+      (if (string-match "\032.*\\'" gud-marker-acc)
+          (progn
+            ;; Everything before the potential marker start can be output.
+            (setq output (concat output (substring gud-marker-acc
+                                                   0 (match-beginning 0))))
+            
+            ;; Everything after, we save, to combine with later input.
+            (setq gud-marker-acc
+                  (substring gud-marker-acc (match-beginning 0))))
+        
+        (setq output (concat output gud-marker-acc)
+              gud-marker-acc ""))
+      
+      output)))
+  
+(defun gud-rubydb-find-file (f)
+  (find-file-noselect f))
+
+(defvar rubydb-command-name "ruby"
+  "File name for executing ruby.")
+
+;;;###autoload
+(defun rubydb (command-line)
+  "Run rubydb on program FILE in buffer *gud-FILE*.
+The directory containing FILE becomes the initial working directory
+and source-file directory for your debugger."
+  (interactive
+   (list (read-from-minibuffer "Run rubydb (like this): "
+                               (if (consp gud-rubydb-history)
+                                   (car gud-rubydb-history)
+                                 (concat rubydb-command-name " "))
+                               nil nil
+                               '(gud-rubydb-history . 1))))
+
+  (gud-overload-functions '((gud-massage-args . gud-rubydb-massage-args)
+                            (gud-marker-filter . gud-rubydb-marker-filter)
+                            (gud-find-file . gud-rubydb-find-file)
+                            ))
+  (gud-common-init command-line)
+
+  (gud-def gud-break  "b %l"         "\C-b" "Set breakpoint at current line.")
+;  (gud-def gud-remove "clear %l"     "\C-d" "Remove breakpoint at current line")
+  (gud-def gud-step   "s"            "\C-s" "Step one source line with display.")
+  (gud-def gud-next   "n"            "\C-n" "Step one line (skip functions).")
+  (gud-def gud-cont   "c"            "\C-r" "Continue with display.")
+  (gud-def gud-finish "finish"       "\C-f" "Finish executing current function.")
+  (gud-def gud-up     "up %p"        "<" "Up N stack frames (numeric arg).")
+  (gud-def gud-down   "down %p"      ">" "Down N stack frames (numeric arg).")
+  (gud-def gud-print  "p %e"         "\C-p" "Evaluate ruby expression at point.")
+
+  (setq comint-prompt-regexp "^(rdb:-) ")
+  (setq paragraph-start comint-prompt-regexp)
+  (run-hooks 'rubydb-mode-hook)
+  )
diff --git a/misc/rubydb3x.el b/misc/rubydb3x.el
new file mode 100644
index 0000000000..9d6bc57d5a
--- /dev/null
+++ b/misc/rubydb3x.el
@@ -0,0 +1,115 @@
+(require 'gud)
+(provide 'rubydb)
+
+;; ======================================================================
+;; rubydb functions
+
+;;; History of argument lists passed to rubydb.
+(defvar gud-rubydb-history nil)
+
+(if (fboundp 'gud-overload-functions)
+    (defun gud-rubydb-massage-args (file args)
+      (cons "-r" (cons "debug" (cons file args))))
+  (defun gud-rubydb-massage-args (file args)
+      (cons "-r" (cons "debug" args))))
+
+;; There's no guarantee that Emacs will hand the filter the entire
+;; marker at once; it could be broken up across several strings.  We
+;; might even receive a big chunk with several markers in it.  If we
+;; receive a chunk of text which looks like it might contain the
+;; beginning of a marker, we save it here between calls to the
+;; filter.
+(defvar gud-rubydb-marker-acc "")
+(make-variable-buffer-local 'gud-rubydb-marker-acc)
+
+(defun gud-rubydb-marker-filter (string)
+  (setq gud-rubydb-marker-acc (concat gud-rubydb-marker-acc string))
+  (let ((output ""))
+
+    ;; Process all the complete markers in this chunk.
+    (while (string-match "\032\032\\([^:\n]*\\):\\([0-9]*\\):.*\n"
+                         gud-rubydb-marker-acc)
+      (setq
+
+       ;; Extract the frame position from the marker.
+       gud-last-frame
+       (cons (substring gud-rubydb-marker-acc (match-beginning 1) (match-end 1))
+             (string-to-int (substring gud-rubydb-marker-acc
+                                       (match-beginning 2)
+                                       (match-end 2))))
+
+       ;; Append any text before the marker to the output we're going
+       ;; to return - we don't include the marker in this text.
+       output (concat output
+                      (substring gud-rubydb-marker-acc 0 (match-beginning 0)))
+
+       ;; Set the accumulator to the remaining text.
+       gud-rubydb-marker-acc (substring gud-rubydb-marker-acc (match-end 0))))
+
+    ;; Does the remaining text look like it might end with the
+    ;; beginning of another marker?  If it does, then keep it in
+    ;; gud-rubydb-marker-acc until we receive the rest of it.  Since we
+    ;; know the full marker regexp above failed, it's pretty simple to
+    ;; test for marker starts.
+    (if (string-match "\032.*\\'" gud-rubydb-marker-acc)
+        (progn
+          ;; Everything before the potential marker start can be output.
+          (setq output (concat output (substring gud-rubydb-marker-acc
+                                                 0 (match-beginning 0))))
+
+          ;; Everything after, we save, to combine with later input.
+          (setq gud-rubydb-marker-acc
+                (substring gud-rubydb-marker-acc (match-beginning 0))))
+
+      (setq output (concat output gud-rubydb-marker-acc)
+            gud-rubydb-marker-acc ""))
+
+    output))
+
+(defun gud-rubydb-find-file (f)
+  (save-excursion
+    (let ((buf (find-file-noselect f)))
+      (set-buffer buf)
+;;      (gud-make-debug-menu)
+      buf)))
+
+(defvar rubydb-command-name "ruby"
+  "File name for executing ruby.")
+
+;;;###autoload
+(defun rubydb (command-line)
+  "Run rubydb on program FILE in buffer *gud-FILE*.
+The directory containing FILE becomes the initial working directory
+and source-file directory for your debugger."
+  (interactive
+   (list (read-from-minibuffer "Run rubydb (like this): "
+                               (if (consp gud-rubydb-history)
+                                   (car gud-rubydb-history)
+                                 (concat rubydb-command-name " "))
+                               nil nil
+                               '(gud-rubydb-history . 1))))
+
+  (if (not (fboundp 'gud-overload-functions))
+      (gud-common-init command-line 'gud-rubydb-massage-args
+                       'gud-rubydb-marker-filter 'gud-rubydb-find-file)
+    (gud-overload-functions '((gud-massage-args . gud-rubydb-massage-args)
+                              (gud-marker-filter . gud-rubydb-marker-filter)
+                              (gud-find-file . gud-rubydb-find-file)))
+    (gud-common-init command-line rubydb-command-name))
+
+  (gud-def gud-break  "b %l"         "\C-b" "Set breakpoint at current line.")
+;  (gud-def gud-remove "clear %l"     "\C-d" "Remove breakpoint at current line")
+  (gud-def gud-step   "s"            "\C-s" "Step one source line with display.")
+  (gud-def gud-next   "n"            "\C-n" "Step one line (skip functions).")
+  (gud-def gud-cont   "c"            "\C-r" "Continue with display.")
+  (gud-def gud-finish "finish"       "\C-f" "Finish executing current function.")
+  (gud-def gud-up     "up %p"        "<" "Up N stack frames (numeric arg).")
+  (gud-def gud-down   "down %p"      ">" "Down N stack frames (numeric arg).")
+  (gud-def gud-print  "p %e"         "\C-p" "Evaluate ruby expression at point.")
+
+  (setq comint-prompt-regexp "^(rdb:-) ")
+  (if (boundp 'comint-last-output-start)
+      (set-marker comint-last-output-start (point)))
+  (set (make-local-variable 'paragraph-start) comint-prompt-regexp)
+  (run-hooks 'rubydb-mode-hook)
+  )
diff --git a/misc/test_lldb_cruby.rb b/misc/test_lldb_cruby.rb
deleted file mode 100644
index 4d1cc499f5..0000000000
--- a/misc/test_lldb_cruby.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-require 'open3'
-require 'tempfile'
-require 'test/unit'
-
-class TestLLDBInit < Test::Unit::TestCase
-  def assert_rp(expr, pattern, message=nil)
-    Tempfile.create('lldb') do |tf|
-      tf.puts <<eom
-target create ./miniruby
-command script import -r misc/lldb_cruby.py
-b rb_p
-run -e'p #{expr}'
-rp obj
-eom
-      tf.flush
-      o, s = Open3.capture2('lldb', '-b', '-s', tf.path)
-      assert_true s.success?, message
-      assert_match /^\(lldb\) rp obj\n#{pattern}/, o, message
-    end
-  end
-
-  def test_rp_object
-    assert_rp 'Object.new', 'T_OBJECT'
-  end
-
-  def test_rp_symbol
-    assert_rp ':abcde', /immediate\(\h+\)/
-  end
-
-  def test_rp_string
-    assert_rp '"abc"', /\(char \[\d+\]\) ary = "abc"/
-    assert_rp "\"\u3042\"", /\(char \[\d+\]\) ary = "\u3042"/
-    assert_rp '"' + "\u3042"*10 + '"', /\(RString::\(anonymous struct\)\) heap = \{/
-  end
-end
diff --git a/missing/flock.c b/missing/flock.c
index 71c5e74210..829f431ddc 100644
--- a/missing/flock.c
+++ b/missing/flock.c
@@ -2,7 +2,7 @@
 #include "ruby/ruby.h"
 
 #if defined _WIN32
-#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H
+#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H && !defined(__native_client__)
 
 /* These are the flock() constants.  Since this systems doesn't have
    flock(), the values of the constants are probably not available.
diff --git a/missing/nan.c b/missing/nan.c
deleted file mode 100644
index 686c48a336..0000000000
--- a/missing/nan.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "ruby/missing.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-double
-nan(const char *spec)
-{
-#if 0
-    /* FIXME: we have not yet seen any situation this is
-     * necessary. Please write a proper implementation that
-     * covers this branch.  */
-    if (spec && spec[0]) {
-	double generated_nan;
-	int len = snprintf(NULL, 0, "NAN(%s)", spec);
-	char *buf = malloc(len + 1); /* +1 for NUL */
-	sprintf(buf, "NAN(%s)", spec);
-	generated_nan = strtod(buf, NULL);
-	free(buf);
-	return generated_nan;
-    }
-    else
-#endif
-    {
-	assert(!spec || !spec[0]);
-	return (double)NAN;
-    }
-}
diff --git a/missing/stdbool.h b/missing/stdbool.h
deleted file mode 100644
index 68c2f3d254..0000000000
--- a/missing/stdbool.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * missing/stdbool.h: Quick alternative of C99 stdbool.h
- */
-
-#ifndef _MISSING_STDBOOL_H_
-#define _MISSING_STDBOOL_H_
-
-#ifndef __cplusplus
-
-#define bool _Bool
-#define true 1
-#define false 0
-
-#ifndef HAVE__BOOL /* AC_HEADER_STDBOOL in configure.ac */
-typedef int _Bool;
-#endif /* HAVE__BOOL */
-
-#endif /* __cplusplus */
-
-#endif /* _MISSING_STDBOOL_H_ */
diff --git a/missing/strerror.c b/missing/strerror.c
index d3b61c3f12..907b5aee0d 100644
--- a/missing/strerror.c
+++ b/missing/strerror.c
@@ -13,6 +13,6 @@ strerror(int error)
     if (error <= sys_nerr && error > 0) {
 	return sys_errlist[error];
     }
-    snprintf(msg, sizeof(msg), "Unknown error (%d)", error);
+    sprintf(msg, "Unknown error (%d)", error);
     return msg;
 }
diff --git a/missing/strtol.c b/missing/strtol.c
new file mode 100644
index 0000000000..87bd73124c
--- /dev/null
+++ b/missing/strtol.c
@@ -0,0 +1,27 @@
+/* public domain rewrite of strtol(3) */
+
+#include "ruby/missing.h"
+#include <ctype.h>
+
+long
+strtol(const char *nptr, char **endptr, int base)
+{
+    long result;
+    const char *p = nptr;
+
+    while (isspace(*p)) {
+	p++;
+    }
+    if (*p == '-') {
+	p++;
+	result = -strtoul(p, endptr, base);
+    }
+    else {
+	if (*p == '+') p++;
+	result = strtoul(p, endptr, base);
+    }
+    if (endptr != 0 && *endptr == p) {
+	*endptr = (char *)nptr;
+    }
+    return result;
+}
diff --git a/missing/tgamma.c b/missing/tgamma.c
index 6260e4f519..5e306fbb43 100644
--- a/missing/tgamma.c
+++ b/missing/tgamma.c
@@ -10,26 +10,33 @@ reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
     gamma.c -- Gamma function
 ***********************************************************/
 #include "ruby/config.h"
-#include "ruby/missing.h"
 #include <math.h>
 #include <errno.h>
 
-#ifdef _WIN32
-# include <float.h>
-# if !defined __MINGW32__ || defined __NO_ISOCEXT
-#  ifndef isnan
-#   define isnan(x) _isnan(x)
-#  endif
-#  ifndef isinf
-#   define isinf(x) (!_finite(x) && !_isnan(x))
-#  endif
-#  ifndef finite
-#   define finite(x) _finite(x)
-#  endif
-# endif
-#endif
+#ifdef HAVE_LGAMMA_R
+
+double tgamma(double x)
+{
+    int sign;
+    double d;
+    if (x == 0.0) { /* Pole Error */
+        errno = ERANGE;
+        return 1/x < 0 ? -HUGE_VAL : HUGE_VAL;
+    }
+    if (x < 0) {
+        static double zero = 0.0;
+        double i, f;
+        f = modf(-x, &i);
+        if (f == 0.0) { /* Domain Error */
+            errno = EDOM;
+            return zero/zero;
+        }
+    }
+    d = lgamma_r(x, &sign);
+    return sign * exp(d);
+}
 
-#ifndef HAVE_LGAMMA_R
+#else
 
 #include <errno.h>
 #define PI      3.14159265358979324  /* $\pi$ */
@@ -61,37 +68,25 @@ loggamma(double x)  /* the natural logarithm of the Gamma function. */
                 + (B4  / ( 4 *  3))) * w + (B2  / ( 2 *  1))) / x
                 + 0.5 * LOG_2PI - log(v) - x + (x - 0.5) * log(x);
 }
-#endif
 
 double tgamma(double x)  /* Gamma function */
 {
-    int sign;
     if (x == 0.0) { /* Pole Error */
         errno = ERANGE;
         return 1/x < 0 ? -HUGE_VAL : HUGE_VAL;
     }
-    if (isinf(x)) {
-        if (x < 0) goto domain_error;
-        return x;
-    }
     if (x < 0) {
+        int sign;
         static double zero = 0.0;
         double i, f;
         f = modf(-x, &i);
         if (f == 0.0) { /* Domain Error */
-          domain_error:
             errno = EDOM;
             return zero/zero;
         }
-#ifndef HAVE_LGAMMA_R
         sign = (fmod(i, 2.0) != 0.0) ? 1 : -1;
         return sign * PI / (sin(PI * f) * exp(loggamma(1 - x)));
-#endif
     }
-#ifndef HAVE_LGAMMA_R
     return exp(loggamma(x));
-#else
-    x = lgamma_r(x, &sign);
-    return sign * exp(x);
-#endif
 }
+#endif
diff --git a/mjit.c b/mjit.c
deleted file mode 100644
index b547277126..0000000000
--- a/mjit.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/**********************************************************************
-
-  mjit.c - MRI method JIT compiler functions for Ruby's main thread
-
-  Copyright (C) 2017 Vladimir Makarov <vmakarov@redhat.com>.
-
-**********************************************************************/
-
-/* Functions in this file are never executed on MJIT worker thread.
-   So you can safely use Ruby methods and GC in this file. */
-
-/* To share variables privately, include mjit_worker.c instead of linking. */
-
-#include "internal.h"
-
-#if USE_MJIT
-
-#include "mjit_worker.c"
-
-#include "constant.h"
-#include "id_table.h"
-
-/* Copy ISeq's states so that race condition does not happen on compilation. */
-static void
-mjit_copy_job_handler(void *data)
-{
-    mjit_copy_job_t *job = data;
-    const struct rb_iseq_constant_body *body;
-    if (stop_worker_p) { /* check if mutex is still alive, before calling CRITICAL_SECTION_START. */
-        return;
-    }
-
-    CRITICAL_SECTION_START(3, "in mjit_copy_job_handler");
-    /* Make sure that this job is never executed when:
-       1. job is being modified
-       2. alloca memory inside job is expired
-       3. ISeq is GC-ed */
-    if (job->finish_p || job->unit->iseq == NULL) {
-        CRITICAL_SECTION_FINISH(3, "in mjit_copy_job_handler");
-        return;
-    }
-
-    body = job->unit->iseq->body;
-    if (job->cc_entries) {
-        memcpy(job->cc_entries, body->cc_entries, sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size));
-    }
-    if (job->is_entries) {
-        memcpy(job->is_entries, body->is_entries, sizeof(union iseq_inline_storage_entry) * body->is_size);
-    }
-
-    job->finish_p = TRUE;
-    rb_native_cond_broadcast(&mjit_worker_wakeup);
-    CRITICAL_SECTION_FINISH(3, "in mjit_copy_job_handler");
-}
-
-extern int rb_thread_create_mjit_thread(void (*worker_func)(void));
-
-/* Return an unique file name in /tmp with PREFIX and SUFFIX and
-   number ID.  Use getpid if ID == 0.  The return file name exists
-   until the next function call.  */
-static char *
-get_uniq_filename(unsigned long id, const char *prefix, const char *suffix)
-{
-    char buff[70], *str = buff;
-    int size = sprint_uniq_filename(buff, sizeof(buff), id, prefix, suffix);
-    str = 0;
-    ++size;
-    str = xmalloc(size);
-    if (size <= (int)sizeof(buff)) {
-        memcpy(str, buff, size);
-    }
-    else {
-        sprint_uniq_filename(str, size, id, prefix, suffix);
-    }
-    return str;
-}
-
-/* Wait until workers don't compile any iseq.  It is called at the
-   start of GC.  */
-void
-mjit_gc_start_hook(void)
-{
-    if (!mjit_enabled)
-        return;
-    CRITICAL_SECTION_START(4, "mjit_gc_start_hook");
-    while (in_jit) {
-        verbose(4, "Waiting wakeup from a worker for GC");
-        rb_native_cond_wait(&mjit_client_wakeup, &mjit_engine_mutex);
-        verbose(4, "Getting wakeup from a worker for GC");
-    }
-    in_gc = TRUE;
-    CRITICAL_SECTION_FINISH(4, "mjit_gc_start_hook");
-}
-
-/* Send a signal to workers to continue iseq compilations.  It is
-   called at the end of GC.  */
-void
-mjit_gc_finish_hook(void)
-{
-    if (!mjit_enabled)
-        return;
-    CRITICAL_SECTION_START(4, "mjit_gc_finish_hook");
-    in_gc = FALSE;
-    verbose(4, "Sending wakeup signal to workers after GC");
-    rb_native_cond_broadcast(&mjit_gc_wakeup);
-    CRITICAL_SECTION_FINISH(4, "mjit_gc_finish_hook");
-}
-
-/* Iseqs can be garbage collected.  This function should call when it
-   happens.  It removes iseq from the unit.  */
-void
-mjit_free_iseq(const rb_iseq_t *iseq)
-{
-    if (!mjit_enabled)
-        return;
-    CRITICAL_SECTION_START(4, "mjit_free_iseq");
-    if (iseq->body->jit_unit) {
-        /* jit_unit is not freed here because it may be referred by multiple
-           lists of units. `get_from_list` and `mjit_finish` do the job. */
-        iseq->body->jit_unit->iseq = NULL;
-    }
-    CRITICAL_SECTION_FINISH(4, "mjit_free_iseq");
-}
-
-/* Free unit list. This should be called only when worker is finished
-   because node of unit_queue and one of active_units may have the same unit
-   during proceeding unit. */
-static void
-free_list(struct rb_mjit_unit_list *list, int close_handle_p)
-{
-    struct rb_mjit_unit *unit = 0, *next;
-
-    list_for_each_safe(&list->head, unit, next, unode) {
-        list_del(&unit->unode);
-        if (!close_handle_p) unit->handle = NULL; /* Skip dlclose in free_unit() */
-        free_unit(unit);
-    }
-    list->length = 0;
-}
-
-/* MJIT info related to an existing continutaion.  */
-struct mjit_cont {
-    rb_execution_context_t *ec; /* continuation ec */
-    struct mjit_cont *prev, *next; /* used to form lists */
-};
-
-/* Double linked list of registered continuations. This is used to detect
-   units which are in use in unload_units. */
-static struct mjit_cont *first_cont;
-
-/* Register a new continuation with thread TH.  Return MJIT info about
-   the continuation.  */
-struct mjit_cont *
-mjit_cont_new(rb_execution_context_t *ec)
-{
-    struct mjit_cont *cont;
-
-    cont = ZALLOC(struct mjit_cont);
-    cont->ec = ec;
-
-    CRITICAL_SECTION_START(3, "in mjit_cont_new");
-    if (first_cont == NULL) {
-        cont->next = cont->prev = NULL;
-    }
-    else {
-        cont->prev = NULL;
-        cont->next = first_cont;
-        first_cont->prev = cont;
-    }
-    first_cont = cont;
-    CRITICAL_SECTION_FINISH(3, "in mjit_cont_new");
-
-    return cont;
-}
-
-/* Unregister continuation CONT.  */
-void
-mjit_cont_free(struct mjit_cont *cont)
-{
-    CRITICAL_SECTION_START(3, "in mjit_cont_new");
-    if (cont == first_cont) {
-        first_cont = cont->next;
-        if (first_cont != NULL)
-            first_cont->prev = NULL;
-    }
-    else {
-        cont->prev->next = cont->next;
-        if (cont->next != NULL)
-            cont->next->prev = cont->prev;
-    }
-    CRITICAL_SECTION_FINISH(3, "in mjit_cont_new");
-
-    xfree(cont);
-}
-
-/* Finish work with continuation info. */
-static void
-finish_conts(void)
-{
-    struct mjit_cont *cont, *next;
-
-    for (cont = first_cont; cont != NULL; cont = next) {
-        next = cont->next;
-        xfree(cont);
-    }
-}
-
-/* Create unit for ISEQ. */
-static void
-create_unit(const rb_iseq_t *iseq)
-{
-    struct rb_mjit_unit *unit;
-
-    unit = ZALLOC(struct rb_mjit_unit);
-    if (unit == NULL)
-        return;
-
-    unit->id = current_unit_num++;
-    unit->iseq = iseq;
-    iseq->body->jit_unit = unit;
-}
-
-/* Set up field used_code_p for unit iseqs whose iseq on the stack of ec. */
-static void
-mark_ec_units(rb_execution_context_t *ec)
-{
-    const rb_control_frame_t *cfp;
-
-    if (ec->vm_stack == NULL)
-        return;
-    for (cfp = RUBY_VM_END_CONTROL_FRAME(ec) - 1; ; cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
-        const rb_iseq_t *iseq;
-        if (cfp->pc && (iseq = cfp->iseq) != NULL
-            && imemo_type((VALUE) iseq) == imemo_iseq
-            && (iseq->body->jit_unit) != NULL) {
-            iseq->body->jit_unit->used_code_p = TRUE;
-        }
-
-        if (cfp == ec->cfp)
-            break; /* reached the most recent cfp */
-    }
-}
-
-/* Unload JIT code of some units to satisfy the maximum permitted
-   number of units with a loaded code.  */
-static void
-unload_units(void)
-{
-    rb_vm_t *vm = GET_THREAD()->vm;
-    rb_thread_t *th = NULL;
-    struct rb_mjit_unit *unit = 0, *next, *worst;
-    struct mjit_cont *cont;
-    int delete_num, units_num = active_units.length;
-
-    /* For now, we don't unload units when ISeq is GCed. We should
-       unload such ISeqs first here. */
-    list_for_each_safe(&active_units.head, unit, next, unode) {
-        if (unit->iseq == NULL) { /* ISeq is GCed. */
-            remove_from_list(unit, &active_units);
-            free_unit(unit);
-        }
-    }
-
-    /* Detect units which are in use and can't be unloaded. */
-    list_for_each(&active_units.head, unit, unode) {
-        assert(unit->iseq != NULL && unit->handle != NULL);
-        unit->used_code_p = FALSE;
-    }
-    list_for_each(&vm->living_threads, th, vmlt_node) {
-        mark_ec_units(th->ec);
-    }
-    for (cont = first_cont; cont != NULL; cont = cont->next) {
-        mark_ec_units(cont->ec);
-    }
-
-    /* Remove 1/10 units more to decrease unloading calls.  */
-    /* TODO: Calculate max total_calls in unit_queue and don't unload units
-       whose total_calls are larger than the max. */
-    delete_num = active_units.length / 10;
-    for (; active_units.length > mjit_opts.max_cache_size - delete_num;) {
-        /* Find one unit that has the minimum total_calls. */
-        worst = NULL;
-        list_for_each(&active_units.head, unit, unode) {
-            if (unit->used_code_p) /* We can't unload code on stack. */
-                continue;
-
-            if (worst == NULL || worst->iseq->body->total_calls > unit->iseq->body->total_calls) {
-                worst = unit;
-            }
-        }
-        if (worst == NULL)
-            break;
-
-        /* Unload the worst node. */
-        verbose(2, "Unloading unit %d (calls=%lu)", worst->id, worst->iseq->body->total_calls);
-        assert(worst->handle != NULL);
-        remove_from_list(worst, &active_units);
-        free_unit(worst);
-    }
-
-    if (units_num == active_units.length && mjit_opts.wait) {
-        mjit_opts.max_cache_size++; // avoid infinite loop on `rb_mjit_wait_call`. Note that --jit-wait is just for testing.
-        verbose(1, "No units can be unloaded -- incremented max-cache-size to %d for --jit-wait", mjit_opts.max_cache_size);
-    }
-    else {
-        verbose(1, "Too many JIT code -- %d units unloaded", units_num - active_units.length);
-    }
-}
-
-/* Add ISEQ to be JITed in parallel with the current thread.
-   Unload some JIT codes if there are too many of them.  */
-void
-mjit_add_iseq_to_process(const rb_iseq_t *iseq)
-{
-    if (!mjit_enabled || pch_status == PCH_FAILED)
-        return;
-
-    iseq->body->jit_func = (mjit_func_t)NOT_READY_JIT_ISEQ_FUNC;
-    create_unit(iseq);
-    if (iseq->body->jit_unit == NULL)
-        /* Failure in creating the unit.  */
-        return;
-
-    CRITICAL_SECTION_START(3, "in add_iseq_to_process");
-    add_to_list(iseq->body->jit_unit, &unit_queue);
-    if (active_units.length >= mjit_opts.max_cache_size) {
-        unload_units();
-    }
-    verbose(3, "Sending wakeup signal to workers in mjit_add_iseq_to_process");
-    rb_native_cond_broadcast(&mjit_worker_wakeup);
-    CRITICAL_SECTION_FINISH(3, "in add_iseq_to_process");
-}
-
-/* For this timeout seconds, --jit-wait will wait for JIT compilation finish. */
-#define MJIT_WAIT_TIMEOUT_SECONDS 60
-
-/* Wait for JIT compilation finish for --jit-wait, and call the function pointer
-   if the compiled result is not NOT_COMPILED_JIT_ISEQ_FUNC. */
-VALUE
-mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body)
-{
-    struct timeval tv;
-    int tries = 0;
-    tv.tv_sec = 0;
-    tv.tv_usec = 1000;
-    while (body->jit_func == (mjit_func_t)NOT_READY_JIT_ISEQ_FUNC) {
-        tries++;
-        if (tries / 1000 > MJIT_WAIT_TIMEOUT_SECONDS || pch_status == PCH_FAILED) {
-            CRITICAL_SECTION_START(3, "in mjit_wait_call to set jit_func");
-            body->jit_func = (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC; /* JIT worker seems dead. Give up. */
-            CRITICAL_SECTION_FINISH(3, "in mjit_wait_call to set jit_func");
-            mjit_warning("timed out to wait for JIT finish");
-            break;
-        }
-
-        CRITICAL_SECTION_START(3, "in mjit_wait_call for a client wakeup");
-        rb_native_cond_broadcast(&mjit_worker_wakeup);
-        CRITICAL_SECTION_FINISH(3, "in mjit_wait_call for a client wakeup");
-        rb_thread_wait_for(tv);
-    }
-
-    if ((uintptr_t)body->jit_func <= (uintptr_t)LAST_JIT_ISEQ_FUNC) {
-        return Qundef;
-    }
-    return body->jit_func(ec, ec->cfp);
-}
-
-extern VALUE ruby_archlibdir_path, ruby_prefix_path;
-
-/* Initialize header_file, pch_file, libruby_pathflag. Return TRUE on success. */
-static int
-init_header_filename(void)
-{
-    int fd;
-#ifdef LOAD_RELATIVE
-    /* Root path of the running ruby process. Equal to RbConfig::TOPDIR.  */
-    VALUE basedir_val;
-#endif
-    const char *basedir = NULL;
-    size_t baselen = 0;
-    char *p;
-#ifdef _WIN32
-    static const char libpathflag[] =
-# ifdef _MSC_VER
-        "-LIBPATH:"
-# else
-        "-L"
-# endif
-        ;
-    const size_t libpathflag_len = sizeof(libpathflag) - 1;
-#endif
-
-#ifdef LOAD_RELATIVE
-    basedir_val = ruby_prefix_path;
-    basedir = StringValuePtr(basedir_val);
-    baselen = RSTRING_LEN(basedir_val);
-#else
-    if (getenv("MJIT_SEARCH_BUILD_DIR")) {
-        /* This path is not intended to be used on production, but using build directory's
-           header file here because people want to run `make test-all` without running
-           `make install`. Don't use $MJIT_SEARCH_BUILD_DIR except for test-all. */
-
-        struct stat st;
-        const char *hdr = dlsym(RTLD_DEFAULT, "MJIT_HEADER");
-        if (!hdr) {
-            verbose(1, "No MJIT_HEADER");
-        }
-        else if (hdr[0] != '/') {
-            verbose(1, "Non-absolute header file path: %s", hdr);
-        }
-        else if (stat(hdr, &st) || !S_ISREG(st.st_mode)) {
-            verbose(1, "Non-file header file path: %s", hdr);
-        }
-        else if ((st.st_uid != getuid()) || (st.st_mode & 022) ||
-                 !rb_path_check(hdr)) {
-            verbose(1, "Unsafe header file: uid=%ld mode=%#o %s",
-                    (long)st.st_uid, (unsigned)st.st_mode, hdr);
-            return FALSE;
-        }
-        else {
-            /* Do not pass PRELOADENV to child processes, on
-             * multi-arch environment */
-            verbose(3, "PRELOADENV("PRELOADENV")=%s", getenv(PRELOADENV));
-            /* assume no other PRELOADENV in test-all */
-            unsetenv(PRELOADENV);
-            verbose(3, "MJIT_HEADER: %s", hdr);
-            header_file = ruby_strdup(hdr);
-            if (!header_file) return FALSE;
-        }
-    }
-    else
-#endif
-#ifndef _MSC_VER
-    {
-        /* A name of the header file included in any C file generated by MJIT for iseqs. */
-        static const char header_name[] = MJIT_HEADER_INSTALL_DIR "/" MJIT_MIN_HEADER_NAME;
-        const size_t header_name_len = sizeof(header_name) - 1;
-
-        header_file = xmalloc(baselen + header_name_len + 1);
-        p = append_str2(header_file, basedir, baselen);
-        p = append_str2(p, header_name, header_name_len + 1);
-
-        if ((fd = rb_cloexec_open(header_file, O_RDONLY, 0)) < 0) {
-            verbose(1, "Cannot access header file: %s", header_file);
-            xfree(header_file);
-            header_file = NULL;
-            return FALSE;
-        }
-        (void)close(fd);
-    }
-
-    pch_file = get_uniq_filename(0, MJIT_TMP_PREFIX "h", ".h.gch");
-#else
-    {
-        static const char pch_name[] = MJIT_HEADER_INSTALL_DIR "/" MJIT_PRECOMPILED_HEADER_NAME;
-        const size_t pch_name_len = sizeof(pch_name) - 1;
-
-        pch_file = xmalloc(baselen + pch_name_len + 1);
-        p = append_str2(pch_file, basedir, baselen);
-        p = append_str2(p, pch_name, pch_name_len + 1);
-        if ((fd = rb_cloexec_open(pch_file, O_RDONLY, 0)) < 0) {
-            verbose(1, "Cannot access precompiled header file: %s", pch_file);
-            xfree(pch_file);
-            pch_file = NULL;
-            return FALSE;
-        }
-        (void)close(fd);
-    }
-#endif
-
-#ifdef _WIN32
-    basedir_val = ruby_archlibdir_path;
-    basedir = StringValuePtr(basedir_val);
-    baselen = RSTRING_LEN(basedir_val);
-    libruby_pathflag = p = xmalloc(libpathflag_len + baselen + 1);
-    p = append_str(p, libpathflag);
-    p = append_str2(p, basedir, baselen);
-    *p = '\0';
-#endif
-
-    return TRUE;
-}
-
-static enum rb_id_table_iterator_result
-valid_class_serials_add_i(ID key, VALUE v, void *unused)
-{
-    rb_const_entry_t *ce = (rb_const_entry_t *)v;
-    VALUE value = ce->value;
-
-    if (!rb_is_const_id(key)) return ID_TABLE_CONTINUE;
-    if (RB_TYPE_P(value, T_MODULE) || RB_TYPE_P(value, T_CLASS)) {
-        mjit_add_class_serial(RCLASS_SERIAL(value));
-    }
-    return ID_TABLE_CONTINUE;
-}
-
-#ifdef _WIN32
-UINT rb_w32_system_tmpdir(WCHAR *path, UINT len);
-#endif
-
-static char *
-system_default_tmpdir(void)
-{
-    /* c.f. ext/etc/etc.c:etc_systmpdir() */
-#ifdef _WIN32
-    WCHAR tmppath[_MAX_PATH];
-    UINT len = rb_w32_system_tmpdir(tmppath, numberof(tmppath));
-    if (len) {
-        int blen = WideCharToMultiByte(CP_UTF8, 0, tmppath, len, NULL, 0, NULL, NULL);
-        char *tmpdir = xmalloc(blen + 1);
-        WideCharToMultiByte(CP_UTF8, 0, tmppath, len, tmpdir, blen, NULL, NULL);
-        tmpdir[blen] = '\0';
-        return tmpdir;
-    }
-#elif defined _CS_DARWIN_USER_TEMP_DIR
-    char path[MAXPATHLEN];
-    size_t len = confstr(_CS_DARWIN_USER_TEMP_DIR, path, sizeof(path));
-    if (len > 0) {
-        char *tmpdir = xmalloc(len);
-        if (len > sizeof(path)) {
-            confstr(_CS_DARWIN_USER_TEMP_DIR, tmpdir, len);
-        }
-        else {
-            memcpy(tmpdir, path, len);
-        }
-        return tmpdir;
-    }
-#endif
-    return 0;
-}
-
-static int
-check_tmpdir(const char *dir)
-{
-    struct stat st;
-
-    if (!dir) return FALSE;
-    if (stat(dir, &st)) return FALSE;
-#ifndef S_ISDIR
-#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-    if (!S_ISDIR(st.st_mode)) return FALSE;
-#ifndef _WIN32
-# ifndef S_IWOTH
-#   define S_IWOTH 002
-# endif
-    if (st.st_mode & S_IWOTH) {
-# ifdef S_ISVTX
-        if (!(st.st_mode & S_ISVTX)) return FALSE;
-# else
-        return FALSE;
-# endif
-    }
-    if (access(dir, W_OK)) return FALSE;
-#endif
-    return TRUE;
-}
-
-static char *
-system_tmpdir(void)
-{
-    char *tmpdir;
-# define RETURN_ENV(name) \
-    if (check_tmpdir(tmpdir = getenv(name))) return ruby_strdup(tmpdir)
-    RETURN_ENV("TMPDIR");
-    RETURN_ENV("TMP");
-    tmpdir = system_default_tmpdir();
-    if (check_tmpdir(tmpdir)) return tmpdir;
-    return ruby_strdup("/tmp");
-# undef RETURN_ENV
-}
-
-/* Default permitted number of units with a JIT code kept in
-   memory.  */
-#define DEFAULT_CACHE_SIZE 1000
-/* A default threshold used to add iseq to JIT. */
-#define DEFAULT_MIN_CALLS_TO_ADD 5
-/* Minimum value for JIT cache size.  */
-#define MIN_CACHE_SIZE 10
-
-/* Start MJIT worker. Return TRUE if worker is sucessfully started. */
-static int
-start_worker(void)
-{
-    stop_worker_p = FALSE;
-    worker_stopped = FALSE;
-
-    if (!rb_thread_create_mjit_thread(mjit_worker)) {
-        mjit_enabled = FALSE;
-        rb_native_mutex_destroy(&mjit_engine_mutex);
-        rb_native_cond_destroy(&mjit_pch_wakeup);
-        rb_native_cond_destroy(&mjit_client_wakeup);
-        rb_native_cond_destroy(&mjit_worker_wakeup);
-        rb_native_cond_destroy(&mjit_gc_wakeup);
-        verbose(1, "Failure in MJIT thread initialization\n");
-        return FALSE;
-    }
-    return TRUE;
-}
-
-/* Initialize MJIT.  Start a thread creating the precompiled header and
-   processing ISeqs.  The function should be called first for using MJIT.
-   If everything is successfull, MJIT_INIT_P will be TRUE.  */
-void
-mjit_init(struct mjit_options *opts)
-{
-    mjit_opts = *opts;
-    mjit_enabled = TRUE;
-    mjit_call_p = TRUE;
-
-    /* Normalize options */
-    if (mjit_opts.min_calls == 0)
-        mjit_opts.min_calls = DEFAULT_MIN_CALLS_TO_ADD;
-    if (mjit_opts.max_cache_size <= 0)
-        mjit_opts.max_cache_size = DEFAULT_CACHE_SIZE;
-    if (mjit_opts.max_cache_size < MIN_CACHE_SIZE)
-        mjit_opts.max_cache_size = MIN_CACHE_SIZE;
-
-    /* Initialize variables for compilation */
-#ifdef _MSC_VER
-    pch_status = PCH_SUCCESS; /* has prebuilt precompiled header */
-#else
-    pch_status = PCH_NOT_READY;
-#endif
-    cc_path = CC_COMMON_ARGS[0];
-    verbose(2, "MJIT: CC defaults to %s", cc_path);
-    cc_common_args = xmalloc(sizeof(CC_COMMON_ARGS));
-    memcpy((void *)cc_common_args, CC_COMMON_ARGS, sizeof(CC_COMMON_ARGS));
-#if MJIT_CFLAGS_PIPE
-    { /* eliminate a flag incompatible with `-pipe` */
-        size_t i, j;
-        for (i = 0, j = 0; i < sizeof(CC_COMMON_ARGS) / sizeof(char *); i++) {
-            if (CC_COMMON_ARGS[i] && strncmp("-save-temps", CC_COMMON_ARGS[i], strlen("-save-temps")) == 0)
-                continue; /* skip -save-temps flag */
-            cc_common_args[j] = CC_COMMON_ARGS[i];
-            j++;
-        }
-    }
-#endif
-
-    tmp_dir = system_tmpdir();
-    verbose(2, "MJIT: tmp_dir is %s", tmp_dir);
-
-    if (!init_header_filename()) {
-        mjit_enabled = FALSE;
-        verbose(1, "Failure in MJIT header file name initialization\n");
-        return;
-    }
-    pch_owner_pid = getpid();
-
-    /* Initialize mutex */
-    rb_native_mutex_initialize(&mjit_engine_mutex);
-    rb_native_cond_initialize(&mjit_pch_wakeup);
-    rb_native_cond_initialize(&mjit_client_wakeup);
-    rb_native_cond_initialize(&mjit_worker_wakeup);
-    rb_native_cond_initialize(&mjit_gc_wakeup);
-
-    /* Make sure root_fiber's saved_ec is scanned by mark_ec_units */
-    rb_fiber_init_mjit_cont(GET_EC()->fiber_ptr);
-
-    /* Initialize class_serials cache for compilation */
-    valid_class_serials = rb_hash_new();
-    rb_obj_hide(valid_class_serials);
-    rb_gc_register_mark_object(valid_class_serials);
-    mjit_add_class_serial(RCLASS_SERIAL(rb_cObject));
-    mjit_add_class_serial(RCLASS_SERIAL(CLASS_OF(rb_vm_top_self())));
-    if (RCLASS_CONST_TBL(rb_cObject)) {
-        rb_id_table_foreach(RCLASS_CONST_TBL(rb_cObject), valid_class_serials_add_i, NULL);
-    }
-
-    /* Initialize worker thread */
-    start_worker();
-}
-
-static void
-stop_worker(void)
-{
-    rb_execution_context_t *ec = GET_EC();
-
-    while (!worker_stopped) {
-        verbose(3, "Sending cancel signal to worker");
-        CRITICAL_SECTION_START(3, "in stop_worker");
-        stop_worker_p = TRUE; /* Setting this inside loop because RUBY_VM_CHECK_INTS may make this FALSE. */
-        rb_native_cond_broadcast(&mjit_worker_wakeup);
-        CRITICAL_SECTION_FINISH(3, "in stop_worker");
-        RUBY_VM_CHECK_INTS(ec);
-    }
-}
-
-/* Stop JIT-compiling methods but compiled code is kept available. */
-VALUE
-mjit_pause(int wait_p)
-{
-    if (!mjit_enabled) {
-        rb_raise(rb_eRuntimeError, "MJIT is not enabled");
-    }
-    if (worker_stopped) {
-        return Qfalse;
-    }
-
-    /* Flush all queued units with no option or `wait: true` */
-    if (wait_p) {
-        struct timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 1000;
-
-        while (unit_queue.length > 0 && active_units.length < mjit_opts.max_cache_size) { /* inverse of condition that waits for mjit_worker_wakeup */
-            CRITICAL_SECTION_START(3, "in mjit_pause for a worker wakeup");
-            rb_native_cond_broadcast(&mjit_worker_wakeup);
-            CRITICAL_SECTION_FINISH(3, "in mjit_pause for a worker wakeup");
-            rb_thread_wait_for(tv);
-        }
-    }
-
-    stop_worker();
-    return Qtrue;
-}
-
-/* Restart JIT-compiling methods after mjit_pause. */
-VALUE
-mjit_resume(void)
-{
-    if (!mjit_enabled) {
-        rb_raise(rb_eRuntimeError, "MJIT is not enabled");
-    }
-    if (!worker_stopped) {
-        return Qfalse;
-    }
-
-    if (!start_worker()) {
-        rb_raise(rb_eRuntimeError, "Failed to resume MJIT worker");
-    }
-    return Qtrue;
-}
-
-/* Skip calling `clean_object_files` for units which currently exist in the list. */
-static void
-skip_cleaning_object_files(struct rb_mjit_unit_list *list)
-{
-    struct rb_mjit_unit *unit = NULL, *next;
-
-    /* No mutex for list, assuming MJIT worker does not exist yet since it's immediately after fork. */
-    list_for_each_safe(&list->head, unit, next, unode) {
-#ifndef _MSC_VER /* Actually mswin does not reach here since it doesn't have fork */
-        if (unit->o_file) unit->o_file_inherited_p = TRUE;
-#endif
-
-#if defined(_WIN32) /* mswin doesn't reach here either. This is for MinGW. */
-        if (unit->so_file) unit->so_file = NULL;
-#endif
-    }
-}
-
-/* This is called after fork initiated by Ruby's method to launch MJIT worker thread
-   for child Ruby process.
-
-   In multi-process Ruby applications, child Ruby processes do most of the jobs.
-   Thus we want child Ruby processes to enqueue ISeqs to MJIT worker's queue and
-   call the JIT-ed code.
-
-   But unfortunately current MJIT-generated code is process-specific. After the fork,
-   JIT-ed code created by parent Ruby process cannot be used in child Ruby process
-   because the code could rely on inline cache values (ivar's IC, send's CC) which
-   may vary between processes after fork or embed some process-specific addresses.
-
-   So child Ruby process can't request parent process to JIT an ISeq and use the code.
-   Instead of that, MJIT worker thread is created for all child Ruby processes, even
-   while child processes would end up with compiling the same ISeqs.
- */
-void
-mjit_child_after_fork(void)
-{
-    if (!mjit_enabled)
-        return;
-
-    /* Let parent process delete the already-compiled object files.
-       This must be done before starting MJIT worker on child process. */
-    skip_cleaning_object_files(&active_units);
-
-    /* MJIT worker thread is not inherited on fork. Start it for this child process. */
-    start_worker();
-}
-
-/* Finish the threads processing units and creating PCH, finalize
-   and free MJIT data.  It should be called last during MJIT
-   life.
-
-   If close_handle_p is TRUE, it calls dlclose() for JIT-ed code. So it should be FALSE
-   if the code can still be on stack. ...But it means to leak JIT-ed handle forever (FIXME). */
-void
-mjit_finish(int close_handle_p)
-{
-    if (!mjit_enabled)
-        return;
-
-    /* Wait for pch finish */
-    verbose(2, "Stopping worker thread");
-    CRITICAL_SECTION_START(3, "in mjit_finish to wakeup from pch");
-    /* As our threads are detached, we could just cancel them.  But it
-       is a bad idea because OS processes (C compiler) started by
-       threads can produce temp files.  And even if the temp files are
-       removed, the used C compiler still complaint about their
-       absence.  So wait for a clean finish of the threads.  */
-    while (pch_status == PCH_NOT_READY) {
-        verbose(3, "Waiting wakeup from make_pch");
-        rb_native_cond_wait(&mjit_pch_wakeup, &mjit_engine_mutex);
-    }
-    CRITICAL_SECTION_FINISH(3, "in mjit_finish to wakeup from pch");
-
-    /* Stop worker */
-    stop_worker();
-
-    rb_native_mutex_destroy(&mjit_engine_mutex);
-    rb_native_cond_destroy(&mjit_pch_wakeup);
-    rb_native_cond_destroy(&mjit_client_wakeup);
-    rb_native_cond_destroy(&mjit_worker_wakeup);
-    rb_native_cond_destroy(&mjit_gc_wakeup);
-
-#ifndef _MSC_VER /* mswin has prebuilt precompiled header */
-    if (!mjit_opts.save_temps && getpid() == pch_owner_pid)
-        remove_file(pch_file);
-
-    xfree(header_file); header_file = NULL;
-#endif
-    xfree((void *)cc_common_args); cc_common_args = NULL;
-    xfree(tmp_dir); tmp_dir = NULL;
-    xfree(pch_file); pch_file = NULL;
-
-    mjit_call_p = FALSE;
-    free_list(&unit_queue, close_handle_p);
-    free_list(&active_units, close_handle_p);
-    free_list(&compact_units, close_handle_p);
-    finish_conts();
-
-    mjit_enabled = FALSE;
-    verbose(1, "Successful MJIT finish");
-}
-
-void
-mjit_mark(void)
-{
-    struct rb_mjit_unit *unit = 0;
-    if (!mjit_enabled)
-        return;
-    RUBY_MARK_ENTER("mjit");
-    CRITICAL_SECTION_START(4, "mjit_mark");
-    list_for_each(&unit_queue.head, unit, unode) {
-        if (unit->iseq) { /* ISeq is still not GCed */
-            VALUE iseq = (VALUE)unit->iseq;
-            CRITICAL_SECTION_FINISH(4, "mjit_mark rb_gc_mark");
-
-            /* Don't wrap critical section with this. This may trigger GC,
-               and in that case mjit_gc_start_hook causes deadlock. */
-            rb_gc_mark(iseq);
-
-            CRITICAL_SECTION_START(4, "mjit_mark rb_gc_mark");
-        }
-    }
-    CRITICAL_SECTION_FINISH(4, "mjit_mark");
-    RUBY_MARK_LEAVE("mjit");
-}
-
-/* A hook to update valid_class_serials. */
-void
-mjit_add_class_serial(rb_serial_t class_serial)
-{
-    if (!mjit_enabled)
-        return;
-
-    /* Do not wrap CRITICAL_SECTION here. This function is only called in main thread
-       and guarded by GVL, and `rb_hash_aset` may cause GC and deadlock in it. */
-    rb_hash_aset(valid_class_serials, LONG2FIX(class_serial), Qtrue);
-}
-
-/* A hook to update valid_class_serials. */
-void
-mjit_remove_class_serial(rb_serial_t class_serial)
-{
-    if (!mjit_enabled)
-        return;
-
-    CRITICAL_SECTION_START(3, "in mjit_remove_class_serial");
-    rb_hash_delete_entry(valid_class_serials, LONG2FIX(class_serial));
-    CRITICAL_SECTION_FINISH(3, "in mjit_remove_class_serial");
-}
-
-#endif
diff --git a/mjit.h b/mjit.h
deleted file mode 100644
index 3aabf514ac..0000000000
--- a/mjit.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/**********************************************************************
-
-  mjit.h - Interface to MRI method JIT compiler for Ruby's main thread
-
-  Copyright (C) 2017 Vladimir Makarov <vmakarov@redhat.com>.
-
-**********************************************************************/
-
-#ifndef RUBY_MJIT_H
-#define RUBY_MJIT_H 1
-
-#include "ruby.h"
-
-#if USE_MJIT
-
-/* Special address values of a function generated from the
-   corresponding iseq by MJIT: */
-enum rb_mjit_iseq_func {
-    /* ISEQ was not queued yet for the machine code generation */
-    NOT_ADDED_JIT_ISEQ_FUNC = 0,
-    /* ISEQ is already queued for the machine code generation but the
-       code is not ready yet for the execution */
-    NOT_READY_JIT_ISEQ_FUNC = 1,
-    /* ISEQ included not compilable insn, some internal assertion failed
-       or the unit is unloaded */
-    NOT_COMPILED_JIT_ISEQ_FUNC = 2,
-    /* End mark */
-    LAST_JIT_ISEQ_FUNC = 3
-};
-
-/* MJIT options which can be defined on the MRI command line.  */
-struct mjit_options {
-    /* Converted from "jit" feature flag to tell the enablement
-       information to ruby_show_version().  */
-    char on;
-    /* Save temporary files after MRI finish.  The temporary files
-       include the pre-compiled header, C code file generated for ISEQ,
-       and the corresponding object file.  */
-    char save_temps;
-    /* Print MJIT warnings to stderr.  */
-    char warnings;
-    /* Disable compiler optimization and add debug symbols. It can be
-       very slow.  */
-    char debug;
-    /* If not 0, all ISeqs are synchronously compiled. For testing. */
-    unsigned int wait;
-    /* Number of calls to trigger JIT compilation. For testing. */
-    unsigned int min_calls;
-    /* Force printing info about MJIT work of level VERBOSE or
-       less. 0=silence, 1=medium, 2=verbose.  */
-    int verbose;
-    /* Maximal permitted number of iseq JIT codes in a MJIT memory
-       cache.  */
-    int max_cache_size;
-};
-
-typedef VALUE (*mjit_func_t)(rb_execution_context_t *, rb_control_frame_t *);
-
-RUBY_SYMBOL_EXPORT_BEGIN
-RUBY_EXTERN struct mjit_options mjit_opts;
-RUBY_EXTERN int mjit_call_p;
-
-extern void mjit_add_iseq_to_process(const rb_iseq_t *iseq);
-extern VALUE mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body);
-RUBY_SYMBOL_EXPORT_END
-
-extern int mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries);
-extern void mjit_init(struct mjit_options *opts);
-extern void mjit_postponed_job_register_start_hook(void);
-extern void mjit_postponed_job_register_finish_hook(void);
-extern void mjit_gc_start_hook(void);
-extern void mjit_gc_finish_hook(void);
-extern void mjit_free_iseq(const rb_iseq_t *iseq);
-extern void mjit_mark(void);
-extern struct mjit_cont *mjit_cont_new(rb_execution_context_t *ec);
-extern void mjit_cont_free(struct mjit_cont *cont);
-extern void mjit_add_class_serial(rb_serial_t class_serial);
-extern void mjit_remove_class_serial(rb_serial_t class_serial);
-
-/* A threshold used to reject long iseqs from JITting as such iseqs
-   takes too much time to be compiled.  */
-#define JIT_ISEQ_SIZE_THRESHOLD 1000
-
-/* Return TRUE if given ISeq body should be compiled by MJIT */
-static inline int
-mjit_target_iseq_p(struct rb_iseq_constant_body *body)
-{
-    return (body->type == ISEQ_TYPE_METHOD || body->type == ISEQ_TYPE_BLOCK)
-        && body->iseq_size < JIT_ISEQ_SIZE_THRESHOLD;
-}
-
-/* Try to execute the current iseq in ec.  Use JIT code if it is ready.
-   If it is not, add ISEQ to the compilation queue and return Qundef.  */
-static inline VALUE
-mjit_exec(rb_execution_context_t *ec)
-{
-    const rb_iseq_t *iseq;
-    struct rb_iseq_constant_body *body;
-    long unsigned total_calls;
-    mjit_func_t func;
-
-    if (!mjit_call_p)
-        return Qundef;
-
-    iseq = ec->cfp->iseq;
-    body = iseq->body;
-    total_calls = ++body->total_calls;
-
-    func = body->jit_func;
-    if (UNLIKELY((uintptr_t)func <= (uintptr_t)LAST_JIT_ISEQ_FUNC)) {
-        switch ((enum rb_mjit_iseq_func)func) {
-          case NOT_ADDED_JIT_ISEQ_FUNC:
-            if (total_calls == mjit_opts.min_calls && mjit_target_iseq_p(body)) {
-                mjit_add_iseq_to_process(iseq);
-                if (UNLIKELY(mjit_opts.wait)) {
-                    return mjit_wait_call(ec, body);
-                }
-            }
-            return Qundef;
-          case NOT_READY_JIT_ISEQ_FUNC:
-          case NOT_COMPILED_JIT_ISEQ_FUNC:
-            return Qundef;
-          default: /* to avoid warning with LAST_JIT_ISEQ_FUNC */
-            break;
-        }
-    }
-
-    return func(ec, ec->cfp);
-}
-
-void mjit_child_after_fork(void);
-
-#else /* USE_MJIT */
-static inline struct mjit_cont *mjit_cont_new(rb_execution_context_t *ec){return NULL;}
-static inline void mjit_cont_free(struct mjit_cont *cont){}
-static inline void mjit_postponed_job_register_start_hook(void){}
-static inline void mjit_postponed_job_register_finish_hook(void){}
-static inline void mjit_gc_start_hook(void){}
-static inline void mjit_gc_finish_hook(void){}
-static inline void mjit_free_iseq(const rb_iseq_t *iseq){}
-static inline void mjit_mark(void){}
-static inline void mjit_add_class_serial(rb_serial_t class_serial){}
-static inline void mjit_remove_class_serial(rb_serial_t class_serial){}
-static inline VALUE mjit_exec(rb_execution_context_t *ec) { return Qundef; /* unreachable */ }
-static inline void mjit_child_after_fork(void){}
-
-#endif /* USE_MJIT */
-#endif /* RUBY_MJIT_H */
diff --git a/mjit_compile.c b/mjit_compile.c
deleted file mode 100644
index 07e417e75b..0000000000
--- a/mjit_compile.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/**********************************************************************
-
-  mjit_compile.c - MRI method JIT compiler
-
-  Copyright (C) 2017 Takashi Kokubun <takashikkbn@gmail.com>.
-
-**********************************************************************/
-
-/* NOTE: All functions in this file are executed on MJIT worker. So don't
-   call Ruby methods (C functions that may call rb_funcall) or trigger
-   GC (using ZALLOC, xmalloc, xfree, etc.) in this file. */
-
-#include "internal.h"
-
-#if USE_MJIT
-
-#include "vm_core.h"
-#include "vm_exec.h"
-#include "mjit.h"
-#include "insns.inc"
-#include "insns_info.inc"
-#include "vm_insnhelper.h"
-
-/* Macros to check if a position is already compiled using compile_status.stack_size_for_pos */
-#define NOT_COMPILED_STACK_SIZE -1
-#define ALREADY_COMPILED_P(status, pos) (status->stack_size_for_pos[pos] != NOT_COMPILED_STACK_SIZE)
-
-/* Storage to keep compiler's status.  This should have information
-   which is global during one `mjit_compile` call.  Ones conditional
-   in each branch should be stored in `compile_branch`.  */
-struct compile_status {
-    int success; /* has TRUE if compilation has had no issue */
-    int *stack_size_for_pos; /* stack_size_for_pos[pos] has stack size for the position (otherwise -1) */
-    /* If TRUE, JIT-ed code will use local variables to store pushed values instead of
-       using VM's stack and moving stack pointer. */
-    int local_stack_p;
-    /* Safely-accessible cache entries copied from main thread. */
-    union iseq_inline_storage_entry *is_entries;
-    struct rb_call_cache *cc_entries;
-};
-
-/* Storage to keep data which is consistent in each conditional branch.
-   This is created and used for one `compile_insns` call and its values
-   should be copied for extra `compile_insns` call. */
-struct compile_branch {
-    unsigned int stack_size; /* this simulates sp (stack pointer) of YARV */
-    int finish_p; /* if TRUE, compilation in this branch should stop and let another branch to be compiled */
-};
-
-struct case_dispatch_var {
-    FILE *f;
-    unsigned int base_pos;
-    VALUE last_value;
-};
-
-/* Returns TRUE if call cache is still not obsoleted and cc->me->def->type is available. */
-static int
-has_valid_method_type(CALL_CACHE cc)
-{
-    extern int mjit_valid_class_serial_p(rb_serial_t class_serial);
-    return GET_GLOBAL_METHOD_STATE() == cc->method_state
-        && mjit_valid_class_serial_p(cc->class_serial) && cc->me;
-}
-
-/* Returns TRUE if iseq is inlinable, otherwise NULL. This becomes TRUE in the same condition
-   as CC_SET_FASTPATH (in vm_callee_setup_arg) is called from vm_call_iseq_setup. */
-static int
-inlinable_iseq_p(CALL_INFO ci, CALL_CACHE cc, const rb_iseq_t *iseq)
-{
-    extern int rb_simple_iseq_p(const rb_iseq_t *iseq);
-    return iseq != NULL
-        && rb_simple_iseq_p(iseq) && !(ci->flag & VM_CALL_KW_SPLAT) /* Top of vm_callee_setup_arg. In this case, opt_pc is 0. */
-        && (!IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); /* CC_SET_FASTPATH */
-}
-
-static int
-compile_case_dispatch_each(VALUE key, VALUE value, VALUE arg)
-{
-    struct case_dispatch_var *var = (struct case_dispatch_var *)arg;
-    unsigned int offset;
-
-    if (var->last_value != value) {
-        offset = FIX2INT(value);
-        var->last_value = value;
-        fprintf(var->f, "      case %d:\n", offset);
-        fprintf(var->f, "        goto label_%d;\n", var->base_pos + offset);
-        fprintf(var->f, "        break;\n");
-    }
-    return ST_CONTINUE;
-}
-
-/* Calling rb_id2str in MJIT worker causes random SEGV. So this is disabled by default. */
-static void
-comment_id(FILE *f, ID id)
-{
-#ifdef MJIT_COMMENT_ID
-    VALUE name = rb_id2str(id);
-    const char *p, *e;
-    char c, prev = '\0';
-
-    if (!name) return;
-    p = RSTRING_PTR(name);
-    e = RSTRING_END(name);
-    fputs("/* :\"", f);
-    for (; p < e; ++p) {
-        switch (c = *p) {
-          case '*': case '/': if (prev != (c ^ ('/' ^ '*'))) break;
-          case '\\': case '"': fputc('\\', f);
-        }
-        fputc(c, f);
-        prev = c;
-    }
-    fputs("\" */", f);
-#endif
-}
-
-static void compile_insns(FILE *f, const struct rb_iseq_constant_body *body, unsigned int stack_size,
-                          unsigned int pos, struct compile_status *status);
-
-/* Main function of JIT compilation, vm_exec_core counterpart for JIT. Compile one insn to `f`, may modify
-   b->stack_size and return next position.
-
-   When you add a new instruction to insns.def, it would be nice to have JIT compilation support here but
-   it's optional. This JIT compiler just ignores ISeq which includes unknown instruction, and ISeq which
-   does not have it can be compiled as usual. */
-static unsigned int
-compile_insn(FILE *f, const struct rb_iseq_constant_body *body, const int insn, const VALUE *operands,
-             const unsigned int pos, struct compile_status *status, struct compile_branch *b)
-{
-    unsigned int next_pos = pos + insn_len(insn);
-
-/*****************/
- #include "mjit_compile.inc"
-/*****************/
-
-    /* If next_pos is already compiled and this branch is not finished yet,
-       next instruction won't be compiled in C code next and will need `goto`. */
-    if (!b->finish_p && next_pos < body->iseq_size && ALREADY_COMPILED_P(status, next_pos)) {
-        fprintf(f, "goto label_%d;\n", next_pos);
-
-        /* Verify stack size assumption is the same among multiple branches */
-        if ((unsigned int)status->stack_size_for_pos[next_pos] != b->stack_size) {
-            if (mjit_opts.warnings || mjit_opts.verbose)
-                fprintf(stderr, "MJIT warning: JIT stack assumption is not the same between branches (%d != %u)\n",
-                        status->stack_size_for_pos[next_pos], b->stack_size);
-            status->success = FALSE;
-        }
-    }
-
-    return next_pos;
-}
-
-/* Compile one conditional branch.  If it has branchXXX insn, this should be
-   called multiple times for each branch.  */
-static void
-compile_insns(FILE *f, const struct rb_iseq_constant_body *body, unsigned int stack_size,
-              unsigned int pos, struct compile_status *status)
-{
-    int insn;
-    struct compile_branch branch;
-
-    branch.stack_size = stack_size;
-    branch.finish_p = FALSE;
-
-    while (pos < body->iseq_size && !ALREADY_COMPILED_P(status, pos) && !branch.finish_p) {
-#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
-        status->stack_size_for_pos[pos] = (int)branch.stack_size;
-
-        fprintf(f, "\nlabel_%d: /* %s */\n", pos, insn_name(insn));
-        pos = compile_insn(f, body, insn, body->iseq_encoded + (pos+1), pos, status, &branch);
-        if (status->success && branch.stack_size > body->stack_max) {
-            if (mjit_opts.warnings || mjit_opts.verbose)
-                fprintf(stderr, "MJIT warning: JIT stack size (%d) exceeded its max size (%d)\n", branch.stack_size, body->stack_max);
-            status->success = FALSE;
-        }
-        if (!status->success)
-            break;
-    }
-}
-
-/* Print the block to cancel JIT execution. */
-static void
-compile_cancel_handler(FILE *f, const struct rb_iseq_constant_body *body, struct compile_status *status)
-{
-    unsigned int i;
-    fprintf(f, "\ncancel:\n");
-    if (status->local_stack_p) {
-        for (i = 0; i < body->stack_max; i++) {
-            fprintf(f, "    *((VALUE *)reg_cfp->bp + %d) = stack[%d];\n", i + 1, i);
-        }
-    }
-    fprintf(f, "    return Qundef;\n");
-}
-
-/* Compile ISeq to C code in F.  It returns 1 if it succeeds to compile. */
-int
-mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries)
-{
-    struct compile_status status;
-    status.success = TRUE;
-    status.local_stack_p = !body->catch_except_p;
-    status.stack_size_for_pos = (int *)malloc(sizeof(int) * body->iseq_size);
-    if (status.stack_size_for_pos == NULL)
-        return FALSE;
-    memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
-    status.cc_entries = cc_entries;
-    status.is_entries = is_entries;
-
-    /* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */
-    if (!mjit_opts.debug) {
-        fprintf(f, "#undef OPT_CHECKED_RUN\n");
-        fprintf(f, "#define OPT_CHECKED_RUN 0\n\n");
-    }
-
-#ifdef _WIN32
-    fprintf(f, "__declspec(dllexport)\n");
-#endif
-    fprintf(f, "VALUE\n%s(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp)\n{\n", funcname);
-    if (status.local_stack_p) {
-        fprintf(f, "    VALUE stack[%d];\n", body->stack_max);
-    }
-    else {
-        fprintf(f, "    VALUE *stack = reg_cfp->sp;\n");
-    }
-    fprintf(f, "    static const VALUE *const original_body_iseq = (VALUE *)0x%"PRIxVALUE";\n",
-            (VALUE)body->iseq_encoded);
-
-    /* Simulate `opt_pc` in setup_parameters_complex. Other PCs which may be passed by catch tables
-       are not considered since vm_exec doesn't call mjit_exec for catch tables. */
-    if (body->param.flags.has_opt) {
-        int i;
-        fprintf(f, "\n");
-        fprintf(f, "    switch (reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded) {\n");
-        for (i = 0; i <= body->param.opt_num; i++) {
-            VALUE pc_offset = body->param.opt_table[i];
-            fprintf(f, "      case %"PRIdVALUE":\n", pc_offset);
-            fprintf(f, "        goto label_%"PRIdVALUE";\n", pc_offset);
-        }
-        fprintf(f, "    }\n");
-    }
-
-    compile_insns(f, body, 0, 0, &status);
-    compile_cancel_handler(f, body, &status);
-    fprintf(f, "\n} /* end of %s */\n", funcname);
-
-    free(status.stack_size_for_pos);
-    return status.success;
-}
-
-#endif /* USE_MJIT */
diff --git a/mjit_worker.c b/mjit_worker.c
deleted file mode 100644
index d4ff92ed29..0000000000
--- a/mjit_worker.c
+++ /dev/null
@@ -1,1261 +0,0 @@
-/**********************************************************************
-
-  mjit_worker.c - Worker for MRI method JIT compiler
-
-  Copyright (C) 2017 Vladimir Makarov <vmakarov@redhat.com>.
-
-**********************************************************************/
-
-/* NOTE: All functions in this file are executed on MJIT worker. So don't
-   call Ruby methods (C functions that may call rb_funcall) or trigger
-   GC (using ZALLOC, xmalloc, xfree, etc.) in this file. */
-
-/* We utilize widely used C compilers (GCC and LLVM Clang) to
-   implement MJIT.  We feed them a C code generated from ISEQ.  The
-   industrial C compilers are slower than regular JIT engines.
-   Generated code performance of the used C compilers has a higher
-   priority over the compilation speed.
-
-   So our major goal is to minimize the ISEQ compilation time when we
-   use widely optimization level (-O2).  It is achieved by
-
-   o Using a precompiled version of the header
-   o Keeping all files in `/tmp`.  On modern Linux `/tmp` is a file
-     system in memory. So it is pretty fast
-   o Implementing MJIT as a multi-threaded code because we want to
-     compile ISEQs in parallel with iseq execution to speed up Ruby
-     code execution.  MJIT has one thread (*worker*) to do
-     parallel compilations:
-      o It prepares a precompiled code of the minimized header.
-        It starts at the MRI execution start
-      o It generates PIC object files of ISEQs
-      o It takes one JIT unit from a priority queue unless it is empty.
-      o It translates the JIT unit ISEQ into C-code using the precompiled
-        header, calls CC and load PIC code when it is ready
-      o Currently MJIT put ISEQ in the queue when ISEQ is called
-      o MJIT can reorder ISEQs in the queue if some ISEQ has been called
-        many times and its compilation did not start yet
-      o MRI reuses the machine code if it already exists for ISEQ
-      o The machine code we generate can stop and switch to the ISEQ
-        interpretation if some condition is not satisfied as the machine
-        code can be speculative or some exception raises
-      o Speculative machine code can be canceled.
-
-   Here is a diagram showing the MJIT organization:
-
-                 _______
-                |header |
-                |_______|
-                    |                         MRI building
-      --------------|----------------------------------------
-                    |                         MRI execution
-                    |
-       _____________|_____
-      |             |     |
-      |          ___V__   |  CC      ____________________
-      |         |      |----------->| precompiled header |
-      |         |      |  |         |____________________|
-      |         |      |  |              |
-      |         | MJIT |  |              |
-      |         |      |  |              |
-      |         |      |  |          ____V___  CC  __________
-      |         |______|----------->| C code |--->| .so file |
-      |                   |         |________|    |__________|
-      |                   |                              |
-      |                   |                              |
-      | MRI machine code  |<-----------------------------
-      |___________________|             loading
-
-*/
-
-#ifdef __sun
-#define __EXTENSIONS__ 1
-#endif
-
-#include "vm_core.h"
-#include "mjit.h"
-#include "gc.h"
-#include "ruby_assert.h"
-#include "ruby/debug.h"
-#include "ruby/thread.h"
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <windows.h>
-#else
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <dlfcn.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#include "dln.h"
-
-#include "ruby/util.h"
-#undef strdup /* ruby_strdup may trigger GC */
-
-#ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
-#endif
-
-#ifdef _WIN32
-#define dlopen(name,flag) ((void*)LoadLibrary(name))
-#define dlerror() strerror(rb_w32_map_errno(GetLastError()))
-#define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
-#define dlclose(handle) (!FreeLibrary(handle))
-#define RTLD_NOW  -1
-
-#define waitpid(pid,stat_loc,options) (WaitForSingleObject((HANDLE)(pid), INFINITE), GetExitCodeProcess((HANDLE)(pid), (LPDWORD)(stat_loc)), CloseHandle((HANDLE)pid), (pid))
-#define WIFEXITED(S) ((S) != STILL_ACTIVE)
-#define WEXITSTATUS(S) (S)
-#define WIFSIGNALED(S) (0)
-typedef intptr_t pid_t;
-#endif
-
-/* Atomically set function pointer if possible. */
-#define MJIT_ATOMIC_SET(var, val) (void)ATOMIC_PTR_EXCHANGE(var, val)
-
-#define MJIT_TMP_PREFIX "_ruby_mjit_"
-
-/* The unit structure that holds metadata of ISeq for MJIT.  */
-struct rb_mjit_unit {
-    /* Unique order number of unit.  */
-    int id;
-    /* Dlopen handle of the loaded object file.  */
-    void *handle;
-    const rb_iseq_t *iseq;
-#ifndef _MSC_VER
-    /* This value is always set for `compact_all_jit_code`. Also used for lazy deletion. */
-    char *o_file;
-    /* TRUE if it's inherited from parent Ruby process and lazy deletion should be skipped.
-       `o_file = NULL` can't be used to skip lazy deletion because `o_file` could be used
-       by child for `compact_all_jit_code`. */
-    int o_file_inherited_p;
-#endif
-#if defined(_WIN32)
-    /* DLL cannot be removed while loaded on Windows. If this is set, it'll be lazily deleted. */
-    char *so_file;
-#endif
-    /* Only used by unload_units. Flag to check this unit is currently on stack or not. */
-    char used_code_p;
-    struct list_node unode;
-};
-
-/* Linked list of struct rb_mjit_unit.  */
-struct rb_mjit_unit_list {
-    struct list_head head;
-    int length; /* the list length */
-};
-
-extern void rb_native_mutex_lock(rb_nativethread_lock_t *lock);
-extern void rb_native_mutex_unlock(rb_nativethread_lock_t *lock);
-extern void rb_native_mutex_initialize(rb_nativethread_lock_t *lock);
-extern void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
-
-extern void rb_native_cond_initialize(rb_nativethread_cond_t *cond);
-extern void rb_native_cond_destroy(rb_nativethread_cond_t *cond);
-extern void rb_native_cond_signal(rb_nativethread_cond_t *cond);
-extern void rb_native_cond_broadcast(rb_nativethread_cond_t *cond);
-extern void rb_native_cond_wait(rb_nativethread_cond_t *cond, rb_nativethread_lock_t *mutex);
-
-/* process.c */
-extern rb_pid_t ruby_waitpid_locked(rb_vm_t *, rb_pid_t, int *status, int options, rb_nativethread_cond_t *cond);
-
-/* A copy of MJIT portion of MRI options since MJIT initialization.  We
-   need them as MJIT threads still can work when the most MRI data were
-   freed. */
-struct mjit_options mjit_opts;
-
-/* TRUE if MJIT is enabled.  */
-int mjit_enabled = FALSE;
-/* TRUE if JIT-ed code should be called. When `ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS`
-   and `mjit_call_p == FALSE`, any JIT-ed code execution is cancelled as soon as possible. */
-int mjit_call_p = FALSE;
-
-/* Priority queue of iseqs waiting for JIT compilation.
-   This variable is a pointer to head unit of the queue. */
-static struct rb_mjit_unit_list unit_queue = { LIST_HEAD_INIT(unit_queue.head) };
-/* List of units which are successfully compiled. */
-static struct rb_mjit_unit_list active_units = { LIST_HEAD_INIT(active_units.head) };
-/* List of compacted so files which will be cleaned up by `free_list()` in `mjit_finish()`. */
-static struct rb_mjit_unit_list compact_units = { LIST_HEAD_INIT(compact_units.head) };
-/* The number of so far processed ISEQs, used to generate unique id.  */
-static int current_unit_num;
-/* A mutex for conitionals and critical sections.  */
-static rb_nativethread_lock_t mjit_engine_mutex;
-/* A thread conditional to wake up `mjit_finish` at the end of PCH thread.  */
-static rb_nativethread_cond_t mjit_pch_wakeup;
-/* A thread conditional to wake up the client if there is a change in
-   executed unit status.  */
-static rb_nativethread_cond_t mjit_client_wakeup;
-/* A thread conditional to wake up a worker if there we have something
-   to add or we need to stop MJIT engine.  */
-static rb_nativethread_cond_t mjit_worker_wakeup;
-/* A thread conditional to wake up workers if at the end of GC.  */
-static rb_nativethread_cond_t mjit_gc_wakeup;
-/* True when GC is working.  */
-static int in_gc;
-/* True when JIT is working.  */
-static int in_jit;
-/* Set to TRUE to stop worker.  */
-static int stop_worker_p;
-/* Set to TRUE if worker is stopped.  */
-static int worker_stopped;
-
-/* Path of "/tmp", which can be changed to $TMP in MinGW. */
-static char *tmp_dir;
-/* Hash like { 1 => true, 2 => true, ... } whose keys are valid `class_serial`s.
-   This is used to invalidate obsoleted CALL_CACHE. */
-static VALUE valid_class_serials;
-
-/* Used C compiler path.  */
-static const char *cc_path;
-/* Used C compiler flags. */
-static const char **cc_common_args;
-/* Name of the precompiled header file.  */
-static char *pch_file;
-/* The process id which should delete the pch_file on mjit_finish. */
-static rb_pid_t pch_owner_pid;
-/* Status of the precompiled header creation.  The status is
-   shared by the workers and the pch thread.  */
-static enum {PCH_NOT_READY, PCH_FAILED, PCH_SUCCESS} pch_status;
-
-#ifndef _MSC_VER
-/* Name of the header file.  */
-static char *header_file;
-#endif
-
-#ifdef _WIN32
-/* Linker option to enable libruby. */
-static char *libruby_pathflag;
-#endif
-
-#include "mjit_config.h"
-
-#if defined(__GNUC__) && \
-     (!defined(__clang__) || \
-      (defined(__clang__) && (defined(__FreeBSD__) || defined(__GLIBC__))))
-# define GCC_PIC_FLAGS "-Wfatal-errors", "-fPIC", "-shared", "-w", "-pipe",
-# define MJIT_CFLAGS_PIPE 1
-#else
-# define GCC_PIC_FLAGS /* empty */
-# define MJIT_CFLAGS_PIPE 0
-#endif
-
-// Use `-nodefaultlibs -nostdlib` for GCC where possible, which does not work on mingw, cygwin, AIX, and OpenBSD.
-// This seems to improve MJIT performance on GCC.
-#if defined __GNUC__ && !defined __clang__ && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(_AIX) && !defined(__OpenBSD__)
-# define GCC_NOSTDLIB_FLAGS "-nodefaultlibs", "-nostdlib",
-#else
-# define GCC_NOSTDLIB_FLAGS /* empty */
-#endif
-
-static const char *const CC_COMMON_ARGS[] = {
-    MJIT_CC_COMMON MJIT_CFLAGS GCC_PIC_FLAGS
-    NULL
-};
-
-static const char *const CC_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL};
-static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL};
-
-static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL};
-static const char *const CC_DLDFLAGS_ARGS[] = {
-    MJIT_DLDFLAGS
-#if defined __GNUC__ && !defined __clang__ && !defined(__OpenBSD__)
-    "-nostartfiles",
-#endif
-    GCC_NOSTDLIB_FLAGS NULL
-};
-
-static const char *const CC_LIBS[] = {
-#if defined(_WIN32) || defined(__CYGWIN__)
-    MJIT_LIBS // mswin, mingw, cygwin
-#endif
-#if defined __GNUC__ && !defined __clang__
-# if defined(_WIN32)
-    "-lmsvcrt", // mingw
-# endif
-    "-lgcc", // mingw, cygwin, and GCC platforms using `-nodefaultlibs -nostdlib`
-#endif
-    NULL
-};
-
-#define CC_CODEFLAG_ARGS (mjit_opts.debug ? CC_DEBUG_ARGS : CC_OPTIMIZE_ARGS)
-
-/* Print the arguments according to FORMAT to stderr only if MJIT
-   verbose option value is more or equal to LEVEL.  */
-PRINTF_ARGS(static void, 2, 3)
-verbose(int level, const char *format, ...)
-{
-    if (mjit_opts.verbose >= level) {
-        va_list args;
-        size_t len = strlen(format);
-        char *full_format = alloca(sizeof(char) * (len + 2));
-
-        /* Creating `format + '\n'` to atomically print format and '\n'. */
-        memcpy(full_format, format, len);
-        full_format[len] = '\n';
-        full_format[len+1] = '\0';
-
-        va_start(args, format);
-        vfprintf(stderr, full_format, args);
-        va_end(args);
-    }
-}
-
-PRINTF_ARGS(static void, 1, 2)
-mjit_warning(const char *format, ...)
-{
-    if (mjit_opts.warnings || mjit_opts.verbose) {
-        va_list args;
-
-        fprintf(stderr, "MJIT warning: ");
-        va_start(args, format);
-        vfprintf(stderr, format, args);
-        va_end(args);
-        fprintf(stderr, "\n");
-    }
-}
-
-/* Add unit node to the tail of doubly linked LIST.  It should be not in
-   the list before.  */
-static void
-add_to_list(struct rb_mjit_unit *unit, struct rb_mjit_unit_list *list)
-{
-    list_add_tail(&list->head, &unit->unode);
-    list->length++;
-}
-
-static void
-remove_from_list(struct rb_mjit_unit *unit, struct rb_mjit_unit_list *list)
-{
-    list_del(&unit->unode);
-    list->length--;
-}
-
-static void
-remove_file(const char *filename)
-{
-    if (remove(filename)) {
-        mjit_warning("failed to remove \"%s\": %s", filename, strerror(errno));
-    }
-}
-
-/* Lazily delete .o and/or .so files. */
-static void
-clean_object_files(struct rb_mjit_unit *unit)
-{
-#ifndef _MSC_VER
-    if (unit->o_file) {
-        char *o_file = unit->o_file;
-
-        unit->o_file = NULL;
-        /* For compaction, unit->o_file is always set when compilation succeeds.
-           So save_temps needs to be checked here. */
-        if (!mjit_opts.save_temps && !unit->o_file_inherited_p)
-            remove_file(o_file);
-        free(o_file);
-    }
-#endif
-
-#if defined(_WIN32)
-    if (unit->so_file) {
-        char *so_file = unit->so_file;
-
-        unit->so_file = NULL;
-        /* unit->so_file is set only when mjit_opts.save_temps is FALSE. */
-        remove_file(so_file);
-        free(so_file);
-    }
-#endif
-}
-
-/* This is called in the following situations:
-   1) On dequeue or `unload_units()`, associated ISeq is already GCed.
-   2) The unit is not called often and unloaded by `unload_units()`.
-   3) Freeing lists on `mjit_finish()`.
-
-   `jit_func` value does not matter for 1 and 3 since the unit won't be used anymore.
-   For the situation 2, this sets the ISeq's JIT state to NOT_COMPILED_JIT_ISEQ_FUNC
-   to prevent the situation that the same methods are continously compiled.  */
-static void
-free_unit(struct rb_mjit_unit *unit)
-{
-    if (unit->iseq) { /* ISeq is not GCed */
-        unit->iseq->body->jit_func = (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
-        unit->iseq->body->jit_unit = NULL;
-    }
-    if (unit->handle && dlclose(unit->handle)) { /* handle is NULL if it's in queue */
-        mjit_warning("failed to close handle for u%d: %s", unit->id, dlerror());
-    }
-    clean_object_files(unit);
-    free(unit);
-}
-
-/* Start a critical section.  Use message MSG to print debug info at
-   LEVEL.  */
-static inline void
-CRITICAL_SECTION_START(int level, const char *msg)
-{
-    verbose(level, "Locking %s", msg);
-    rb_native_mutex_lock(&mjit_engine_mutex);
-    verbose(level, "Locked %s", msg);
-}
-
-/* Finish the current critical section.  Use message MSG to print
-   debug info at LEVEL. */
-static inline void
-CRITICAL_SECTION_FINISH(int level, const char *msg)
-{
-    verbose(level, "Unlocked %s", msg);
-    rb_native_mutex_unlock(&mjit_engine_mutex);
-}
-
-static int
-sprint_uniq_filename(char *str, size_t size, unsigned long id, const char *prefix, const char *suffix)
-{
-    return snprintf(str, size, "%s/%sp%"PRI_PIDT_PREFIX"uu%lu%s", tmp_dir, prefix, getpid(), id, suffix);
-}
-
-/* Return time in milliseconds as a double.  */
-#ifdef __APPLE__
-double ruby_real_ms_time(void);
-# define real_ms_time() ruby_real_ms_time()
-#else
-static double
-real_ms_time(void)
-{
-# ifdef HAVE_CLOCK_GETTIME
-    struct timespec  tv;
-#  ifdef CLOCK_MONOTONIC
-    const clockid_t c = CLOCK_MONOTONIC;
-#  else
-    const clockid_t c = CLOCK_REALTIME;
-#  endif
-
-    clock_gettime(c, &tv);
-    return tv.tv_nsec / 1000000.0 + tv.tv_sec * 1000.0;
-# else
-    struct timeval  tv;
-
-    gettimeofday(&tv, NULL);
-    return tv.tv_usec / 1000.0 + tv.tv_sec * 1000.0;
-# endif
-}
-#endif
-
-/* Return TRUE if class_serial is not obsoleted. This is used by mjit_compile.c. */
-int
-mjit_valid_class_serial_p(rb_serial_t class_serial)
-{
-    int found_p;
-
-    CRITICAL_SECTION_START(3, "in valid_class_serial_p");
-    found_p = rb_hash_stlike_lookup(valid_class_serials, LONG2FIX(class_serial), NULL);
-    CRITICAL_SECTION_FINISH(3, "in valid_class_serial_p");
-    return found_p;
-}
-
-/* Return the best unit from list.  The best is the first
-   high priority unit or the unit whose iseq has the biggest number
-   of calls so far.  */
-static struct rb_mjit_unit *
-get_from_list(struct rb_mjit_unit_list *list)
-{
-    struct rb_mjit_unit *unit = NULL, *next, *best = NULL;
-
-    /* Find iseq with max total_calls */
-    list_for_each_safe(&list->head, unit, next, unode) {
-        if (unit->iseq == NULL) { /* ISeq is GCed. */
-            remove_from_list(unit, list);
-            free_unit(unit);
-            continue;
-        }
-
-        if (best == NULL || best->iseq->body->total_calls < unit->iseq->body->total_calls) {
-            best = unit;
-        }
-    }
-    if (best) {
-        remove_from_list(best, list);
-    }
-    return best;
-}
-
-/* Return length of NULL-terminated array ARGS excluding the NULL
-   marker.  */
-static size_t
-args_len(char *const *args)
-{
-    size_t i;
-
-    for (i = 0; (args[i]) != NULL;i++)
-        ;
-    return i;
-}
-
-/* Concatenate NUM passed NULL-terminated arrays of strings, put the
-   result (with NULL end marker) into the heap, and return the
-   result.  */
-static char **
-form_args(int num, ...)
-{
-    va_list argp;
-    size_t len, n;
-    int i;
-    char **args, **res, **tmp;
-
-    va_start(argp, num);
-    res = NULL;
-    for (i = len = 0; i < num; i++) {
-        args = va_arg(argp, char **);
-        n = args_len(args);
-        if ((tmp = (char **)realloc(res, sizeof(char *) * (len + n + 1))) == NULL) {
-            free(res);
-            return NULL;
-        }
-        res = tmp;
-        MEMCPY(res + len, args, char *, n + 1);
-        len += n;
-    }
-    va_end(argp);
-    return res;
-}
-
-COMPILER_WARNING_PUSH
-#ifdef __GNUC__
-COMPILER_WARNING_IGNORED(-Wdeprecated-declarations)
-#endif
-/* Start an OS process of absolute executable path with arguments ARGV.
-   Return PID of the process. */
-static pid_t
-start_process(const char *abspath, char *const *argv)
-{
-    pid_t pid;
-    /*
-     * Not calling non-async-signal-safe functions between vfork
-     * and execv for safety
-     */
-    int dev_null = rb_cloexec_open(ruby_null_device, O_WRONLY, 0);
-
-    if (mjit_opts.verbose >= 2) {
-        int i;
-        const char *arg;
-
-        fprintf(stderr, "Starting process: %s", abspath);
-        for (i = 0; (arg = argv[i]) != NULL; i++)
-            fprintf(stderr, " %s", arg);
-        fprintf(stderr, "\n");
-    }
-#ifdef _WIN32
-    {
-        extern HANDLE rb_w32_start_process(const char *abspath, char *const *argv, int out_fd);
-        int out_fd = 0;
-        if (mjit_opts.verbose <= 1) {
-            /* Discard cl.exe's outputs like:
-                 _ruby_mjit_p12u3.c
-                   Creating library C:.../_ruby_mjit_p12u3.lib and object C:.../_ruby_mjit_p12u3.exp */
-            out_fd = dev_null;
-        }
-
-        pid = (pid_t)rb_w32_start_process(abspath, argv, out_fd);
-        if (pid == 0) {
-            verbose(1, "MJIT: Failed to create process: %s", dlerror());
-            return -1;
-        }
-    }
-#else
-    if ((pid = vfork()) == 0) { /* TODO: reuse some function in process.c */
-        umask(0077);
-        if (mjit_opts.verbose == 0) {
-            /* CC can be started in a thread using a file which has been
-               already removed while MJIT is finishing.  Discard the
-               messages about missing files.  */
-            dup2(dev_null, STDERR_FILENO);
-            dup2(dev_null, STDOUT_FILENO);
-        }
-        (void)close(dev_null);
-        pid = execv(abspath, argv); /* Pid will be negative on an error */
-        /* Even if we successfully found CC to compile PCH we still can
-         fail with loading the CC in very rare cases for some reasons.
-         Stop the forked process in this case.  */
-        verbose(1, "MJIT: Error in execv: %s", abspath);
-        _exit(1);
-    }
-#endif
-    (void)close(dev_null);
-    return pid;
-}
-COMPILER_WARNING_POP
-
-/* Execute an OS process of executable PATH with arguments ARGV.
-   Return -1 or -2 if failed to execute, otherwise exit code of the process.
-   TODO: Use a similar function in process.c */
-static int
-exec_process(const char *path, char *const argv[])
-{
-    int stat, exit_code = -2;
-    pid_t pid;
-    rb_vm_t *vm = WAITPID_USE_SIGCHLD ? GET_VM() : 0;
-    rb_nativethread_cond_t cond;
-
-    if (vm) {
-        rb_native_cond_initialize(&cond);
-        rb_native_mutex_lock(&vm->waitpid_lock);
-    }
-
-    pid = start_process(path, argv);
-    for (;pid > 0;) {
-        pid_t r = vm ? ruby_waitpid_locked(vm, pid, &stat, 0, &cond)
-                     : waitpid(pid, &stat, 0);
-        if (r == -1) {
-            if (errno == EINTR) continue;
-            fprintf(stderr, "[%"PRI_PIDT_PREFIX"d] waitpid(%lu): %s (SIGCHLD=%d,%u)\n",
-                    getpid(), (unsigned long)pid, strerror(errno),
-                    RUBY_SIGCHLD, SIGCHLD_LOSSY);
-            break;
-        }
-        else if (r == pid) {
-            if (WIFEXITED(stat)) {
-                exit_code = WEXITSTATUS(stat);
-                break;
-            } else if (WIFSIGNALED(stat)) {
-                exit_code = -1;
-                break;
-            }
-        }
-    }
-
-    if (vm) {
-        rb_native_mutex_unlock(&vm->waitpid_lock);
-        rb_native_cond_destroy(&cond);
-    }
-    return exit_code;
-}
-
-static void
-remove_so_file(const char *so_file, struct rb_mjit_unit *unit)
-{
-#if defined(_WIN32)
-    /* Windows can't remove files while it's used. */
-    unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */
-    if (unit->so_file == NULL)
-        mjit_warning("failed to allocate memory to lazily remove '%s': %s", so_file, strerror(errno));
-#else
-    remove_file(so_file);
-#endif
-}
-
-#define append_str2(p, str, len) ((char *)memcpy((p), str, (len))+(len))
-#define append_str(p, str) append_str2(p, str, sizeof(str)-1)
-#define append_lit(p, str) append_str2(p, str, rb_strlen_lit(str))
-
-#ifdef _MSC_VER
-/* Compile C file to so. It returns 1 if it succeeds. (mswin) */
-static int
-compile_c_to_so(const char *c_file, const char *so_file)
-{
-    int exit_code;
-    const char *files[] = { NULL, NULL, NULL, NULL, NULL, NULL, "-link", libruby_pathflag, NULL };
-    char **args;
-    char *p, *obj_file;
-
-    /* files[0] = "-Fe*.dll" */
-    files[0] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fe") + strlen(so_file) + 1));
-    p = append_lit(p, "-Fe");
-    p = append_str2(p, so_file, strlen(so_file));
-    *p = '\0';
-
-    /* files[1] = "-Fo*.obj" */
-    /* We don't need .obj file, but it's somehow created to cwd without -Fo and we want to control the output directory. */
-    files[1] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fo") + strlen(so_file) - rb_strlen_lit(DLEXT) + rb_strlen_lit(".obj") + 1));
-    obj_file = p = append_lit(p, "-Fo");
-    p = append_str2(p, so_file, strlen(so_file) - rb_strlen_lit(DLEXT));
-    p = append_lit(p, ".obj");
-    *p = '\0';
-
-    /* files[2] = "-Yu*.pch" */
-    files[2] = p = alloca(sizeof(char) * (rb_strlen_lit("-Yu") + strlen(pch_file) + 1));
-    p = append_lit(p, "-Yu");
-    p = append_str2(p, pch_file, strlen(pch_file));
-    *p = '\0';
-
-    /* files[3] = "C:/.../rb_mjit_header-*.obj" */
-    files[3] = p = alloca(sizeof(char) * (strlen(pch_file) + 1));
-    p = append_str2(p, pch_file, strlen(pch_file) - strlen(".pch"));
-    p = append_lit(p, ".obj");
-    *p = '\0';
-
-    /* files[4] = "-Tc*.c" */
-    files[4] = p = alloca(sizeof(char) * (rb_strlen_lit("-Tc") + strlen(c_file) + 1));
-    p = append_lit(p, "-Tc");
-    p = append_str2(p, c_file, strlen(c_file));
-    *p = '\0';
-
-    /* files[5] = "-Fd*.pdb" */
-    files[5] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fd") + strlen(pch_file) + 1));
-    p = append_lit(p, "-Fd");
-    p = append_str2(p, pch_file, strlen(pch_file) - rb_strlen_lit(".pch"));
-    p = append_lit(p, ".pdb");
-    *p = '\0';
-
-    args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
-                     files, CC_LIBS, CC_DLDFLAGS_ARGS);
-    if (args == NULL)
-        return FALSE;
-
-    exit_code = exec_process(cc_path, args);
-    free(args);
-
-    if (exit_code == 0) {
-        /* remove never-used files (.obj, .lib, .exp, .pdb). XXX: Is there any way not to generate this? */
-        if (!mjit_opts.save_temps) {
-            char *before_dot;
-            remove_file(obj_file);
-
-            before_dot = obj_file + strlen(obj_file) - rb_strlen_lit(".obj");
-            append_lit(before_dot, ".lib"); remove_file(obj_file);
-            append_lit(before_dot, ".exp"); remove_file(obj_file);
-            append_lit(before_dot, ".pdb"); remove_file(obj_file);
-        }
-    }
-    else {
-        verbose(2, "compile_c_to_so: compile error: %d", exit_code);
-    }
-    return exit_code == 0;
-}
-#else /* _MSC_VER */
-
-/* The function producing the pre-compiled header. */
-static void
-make_pch(void)
-{
-    int exit_code;
-    const char *rest_args[] = {
-# ifdef __clang__
-        "-emit-pch",
-# endif
-        // -nodefaultlibs is a linker flag, but it may affect cc1 behavior on Gentoo, which should NOT be changed on pch:
-        // https://gitweb.gentoo.org/proj/gcc-patches.git/tree/7.3.0/gentoo/13_all_default-ssp-fix.patch
-        GCC_NOSTDLIB_FLAGS
-        "-o", NULL, NULL,
-        NULL,
-    };
-    char **args;
-    int len = sizeof(rest_args) / sizeof(const char *);
-
-    rest_args[len - 2] = header_file;
-    rest_args[len - 3] = pch_file;
-    verbose(2, "Creating precompiled header");
-    args = form_args(3, cc_common_args, CC_CODEFLAG_ARGS, rest_args);
-    if (args == NULL) {
-        mjit_warning("making precompiled header failed on forming args");
-        CRITICAL_SECTION_START(3, "in make_pch");
-        pch_status = PCH_FAILED;
-        CRITICAL_SECTION_FINISH(3, "in make_pch");
-        return;
-    }
-
-    exit_code = exec_process(cc_path, args);
-    free(args);
-
-    CRITICAL_SECTION_START(3, "in make_pch");
-    if (exit_code == 0) {
-        pch_status = PCH_SUCCESS;
-    }
-    else {
-        mjit_warning("Making precompiled header failed on compilation. Stopping MJIT worker...");
-        pch_status = PCH_FAILED;
-    }
-    /* wakeup `mjit_finish` */
-    rb_native_cond_broadcast(&mjit_pch_wakeup);
-    CRITICAL_SECTION_FINISH(3, "in make_pch");
-}
-
-/* Compile .c file to .o file. It returns 1 if it succeeds. (non-mswin) */
-static int
-compile_c_to_o(const char *c_file, const char *o_file)
-{
-    int exit_code;
-    const char *files[] = {
-        "-o", NULL, NULL,
-# ifdef __clang__
-        "-include-pch", NULL,
-# endif
-        "-c", NULL
-    };
-    char **args;
-
-    files[1] = o_file;
-    files[2] = c_file;
-# ifdef __clang__
-    files[4] = pch_file;
-# endif
-    args = form_args(5, cc_common_args, CC_CODEFLAG_ARGS, files, CC_LIBS, CC_DLDFLAGS_ARGS);
-    if (args == NULL)
-        return FALSE;
-
-    exit_code = exec_process(cc_path, args);
-    free(args);
-
-    if (exit_code != 0)
-        verbose(2, "compile_c_to_o: compile error: %d", exit_code);
-    return exit_code == 0;
-}
-
-/* Link .o files to .so file. It returns 1 if it succeeds. (non-mswin) */
-static int
-link_o_to_so(const char **o_files, const char *so_file)
-{
-    int exit_code;
-    const char *options[] = {
-        "-o", NULL,
-# ifdef _WIN32
-        libruby_pathflag,
-# endif
-        NULL
-    };
-    char **args;
-
-    options[1] = so_file;
-    args = form_args(6, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
-                     options, o_files, CC_LIBS, CC_DLDFLAGS_ARGS);
-    if (args == NULL)
-        return FALSE;
-
-    exit_code = exec_process(cc_path, args);
-    free(args);
-
-    if (exit_code != 0)
-        verbose(2, "link_o_to_so: link error: %d", exit_code);
-    return exit_code == 0;
-}
-
-/* Link all cached .o files and build a .so file. Reload all JIT func from it. This
-   allows to avoid JIT code fragmentation and improve performance to call JIT-ed code.  */
-static void
-compact_all_jit_code(void)
-{
-# ifndef _WIN32 /* This requires header transformation but we don't transform header on Windows for now */
-    struct rb_mjit_unit *unit, *cur = 0;
-    double start_time, end_time;
-    static const char so_ext[] = DLEXT;
-    char so_file[MAXPATHLEN];
-    const char **o_files;
-    int i = 0, success;
-
-    /* Abnormal use case of rb_mjit_unit that doesn't have ISeq */
-    unit = calloc(1, sizeof(struct rb_mjit_unit)); /* To prevent GC, don't use ZALLOC */
-    if (unit == NULL) return;
-    unit->id = current_unit_num++;
-    sprint_uniq_filename(so_file, (int)sizeof(so_file), unit->id, MJIT_TMP_PREFIX, so_ext);
-
-    /* NULL-ending for form_args */
-    o_files = alloca(sizeof(char *) * (active_units.length + 1));
-    o_files[active_units.length] = NULL;
-    CRITICAL_SECTION_START(3, "in compact_all_jit_code to keep .o files");
-    list_for_each(&active_units.head, cur, unode) {
-        o_files[i] = cur->o_file;
-        i++;
-    }
-
-    start_time = real_ms_time();
-    success = link_o_to_so(o_files, so_file);
-    end_time = real_ms_time();
-
-    /* TODO: Shrink this big critical section. For now, this is needed to prevent failure by missing .o files.
-       This assumes that o -> so link doesn't take long time because the bottleneck, which is compiler optimization,
-       is already done. But actually it takes about 500ms for 5,000 methods on my Linux machine, so it's better to
-       finish this critical section before link_o_to_so by disabling unload_units. */
-    CRITICAL_SECTION_FINISH(3, "in compact_all_jit_code to keep .o files");
-
-    if (success) {
-        void *handle = dlopen(so_file, RTLD_NOW);
-        if (handle == NULL) {
-            mjit_warning("failure in loading code from compacted '%s': %s", so_file, dlerror());
-            free(unit);
-            return;
-        }
-        unit->handle = handle;
-
-        /* lazily dlclose handle (and .so file for win32) on `mjit_finish()`. */
-        add_to_list(unit, &compact_units);
-
-        if (!mjit_opts.save_temps)
-            remove_so_file(so_file, unit);
-
-        CRITICAL_SECTION_START(3, "in compact_all_jit_code to read list");
-        list_for_each(&active_units.head, cur, unode) {
-            void *func;
-            char funcname[35]; /* TODO: reconsider `35` */
-            sprintf(funcname, "_mjit%d", cur->id);
-
-            if ((func = dlsym(handle, funcname)) == NULL) {
-                mjit_warning("skipping to reload '%s' from '%s': %s", funcname, so_file, dlerror());
-                continue;
-            }
-
-            if (cur->iseq) { /* Check whether GCed or not */
-                /* Usage of jit_code might be not in a critical section.  */
-                MJIT_ATOMIC_SET(cur->iseq->body->jit_func, (mjit_func_t)func);
-            }
-        }
-        CRITICAL_SECTION_FINISH(3, "in compact_all_jit_code to read list");
-        verbose(1, "JIT compaction (%.1fms): Compacted %d methods -> %s", end_time - start_time, active_units.length, so_file);
-    }
-    else {
-        free(unit);
-        verbose(1, "JIT compaction failure (%.1fms): Failed to compact methods", end_time - start_time);
-    }
-# endif /* _WIN32 */
-}
-
-#endif /* _MSC_VER */
-
-static void *
-load_func_from_so(const char *so_file, const char *funcname, struct rb_mjit_unit *unit)
-{
-    void *handle, *func;
-
-    handle = dlopen(so_file, RTLD_NOW);
-    if (handle == NULL) {
-        mjit_warning("failure in loading code from '%s': %s", so_file, dlerror());
-        return (void *)NOT_ADDED_JIT_ISEQ_FUNC;
-    }
-
-    func = dlsym(handle, funcname);
-    unit->handle = handle;
-    return func;
-}
-
-static void
-print_jit_result(const char *result, const struct rb_mjit_unit *unit, const double duration, const char *c_file)
-{
-    verbose(1, "JIT %s (%.1fms): %s@%s:%d -> %s", result,
-            duration, RSTRING_PTR(unit->iseq->body->location.label),
-            RSTRING_PTR(rb_iseq_path(unit->iseq)), FIX2INT(unit->iseq->body->location.first_lineno), c_file);
-}
-
-#ifndef __clang__
-static const char *
-header_name_end(const char *s)
-{
-    const char *e = s + strlen(s);
-# ifdef __GNUC__ /* don't chomp .pch for mswin */
-    static const char suffix[] = ".gch";
-
-    /* chomp .gch suffix */
-    if (e > s+sizeof(suffix)-1 && strcmp(e-sizeof(suffix)+1, suffix) == 0) {
-        e -= sizeof(suffix)-1;
-    }
-# endif
-    return e;
-}
-#endif
-
-/* Print platform-specific prerequisites in generated code. */
-static void
-compile_prelude(FILE *f)
-{
-#ifndef __clang__ /* -include-pch is used for Clang */
-    const char *s = pch_file;
-    const char *e = header_name_end(s);
-
-    fprintf(f, "#include \"");
-    /* print pch_file except .gch for gcc, but keep .pch for mswin */
-    for (; s < e; s++) {
-        switch(*s) {
-          case '\\': case '"':
-            fputc('\\', f);
-        }
-        fputc(*s, f);
-    }
-    fprintf(f, "\"\n");
-#endif
-
-#ifdef _WIN32
-    fprintf(f, "void _pei386_runtime_relocator(void){}\n");
-    fprintf(f, "int __stdcall DllMainCRTStartup(void* hinstDLL, unsigned int fdwReason, void* lpvReserved) { return 1; }\n");
-#endif
-}
-
-/* Compile ISeq in UNIT and return function pointer of JIT-ed code.
-   It may return NOT_COMPILED_JIT_ISEQ_FUNC if something went wrong. */
-static mjit_func_t
-convert_unit_to_func(struct rb_mjit_unit *unit, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries)
-{
-    char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35]; /* TODO: reconsider `35` */
-    int success;
-    int fd;
-    FILE *f;
-    void *func;
-    double start_time, end_time;
-    int c_file_len = (int)sizeof(c_file_buff);
-    static const char c_ext[] = ".c";
-    static const char so_ext[] = DLEXT;
-    const int access_mode =
-#ifdef O_BINARY
-        O_BINARY|
-#endif
-        O_WRONLY|O_EXCL|O_CREAT;
-#ifndef _MSC_VER
-    static const char o_ext[] = ".o";
-    char *o_file;
-#endif
-
-    c_file_len = sprint_uniq_filename(c_file_buff, c_file_len, unit->id, MJIT_TMP_PREFIX, c_ext);
-    if (c_file_len >= (int)sizeof(c_file_buff)) {
-        ++c_file_len;
-        c_file = alloca(c_file_len);
-        c_file_len = sprint_uniq_filename(c_file, c_file_len, unit->id, MJIT_TMP_PREFIX, c_ext);
-    }
-    ++c_file_len;
-
-#ifndef _MSC_VER
-    o_file = alloca(c_file_len - sizeof(c_ext) + sizeof(o_ext));
-    memcpy(o_file, c_file, c_file_len - sizeof(c_ext));
-    memcpy(&o_file[c_file_len - sizeof(c_ext)], o_ext, sizeof(o_ext));
-#endif
-    so_file = alloca(c_file_len - sizeof(c_ext) + sizeof(so_ext));
-    memcpy(so_file, c_file, c_file_len - sizeof(c_ext));
-    memcpy(&so_file[c_file_len - sizeof(c_ext)], so_ext, sizeof(so_ext));
-
-    sprintf(funcname, "_mjit%d", unit->id);
-
-    fd = rb_cloexec_open(c_file, access_mode, 0600);
-    if (fd < 0 || (f = fdopen(fd, "w")) == NULL) {
-        int e = errno;
-        if (fd >= 0) (void)close(fd);
-        verbose(1, "Failed to fopen '%s', giving up JIT for it (%s)", c_file, strerror(e));
-        return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
-    }
-
-    /* print #include of MJIT header, etc. */
-    compile_prelude(f);
-
-    /* wait until mjit_gc_finish_hook is called */
-    CRITICAL_SECTION_START(3, "before mjit_compile to wait GC finish");
-    while (in_gc) {
-        verbose(3, "Waiting wakeup from GC");
-        rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex);
-    }
-
-    /* We need to check again here because we could've waited on GC above */
-    if (unit->iseq == NULL) {
-        fclose(f);
-        if (!mjit_opts.save_temps)
-            remove_file(c_file);
-        free_unit(unit);
-        in_jit = FALSE; /* just being explicit for return */
-    }
-    else {
-        in_jit = TRUE;
-    }
-    CRITICAL_SECTION_FINISH(3, "before mjit_compile to wait GC finish");
-    if (!in_jit) {
-        return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
-    }
-
-    {
-        VALUE s = rb_iseq_path(unit->iseq);
-        const char *label = RSTRING_PTR(unit->iseq->body->location.label);
-        const char *path = RSTRING_PTR(s);
-        int lineno = FIX2INT(unit->iseq->body->location.first_lineno);
-        verbose(2, "start compilation: %s@%s:%d -> %s", label, path, lineno, c_file);
-        fprintf(f, "/* %s@%s:%d */\n\n", label, path, lineno);
-    }
-    success = mjit_compile(f, unit->iseq->body, funcname, cc_entries, is_entries);
-
-    /* release blocking mjit_gc_start_hook */
-    CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC");
-    in_jit = FALSE;
-    verbose(3, "Sending wakeup signal to client in a mjit-worker for GC");
-    rb_native_cond_signal(&mjit_client_wakeup);
-    CRITICAL_SECTION_FINISH(3, "in worker to wakeup client for GC");
-
-    fclose(f);
-    if (!success) {
-        if (!mjit_opts.save_temps)
-            remove_file(c_file);
-        print_jit_result("failure", unit, 0, c_file);
-        return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
-    }
-
-    start_time = real_ms_time();
-#ifdef _MSC_VER
-    success = compile_c_to_so(c_file, so_file);
-#else
-    /* splitting .c -> .o step and .o -> .so step, to cache .o files in the future */
-    if ((success = compile_c_to_o(c_file, o_file)) != 0) {
-        const char *o_files[2] = { NULL, NULL };
-        o_files[0] = o_file;
-        success = link_o_to_so(o_files, so_file);
-
-        /* Always set o_file for compaction. The value is also used for lazy deletion. */
-        unit->o_file = strdup(o_file);
-        if (unit->o_file == NULL) {
-            mjit_warning("failed to allocate memory to remember '%s' (%s), removing it...", o_file, strerror(errno));
-            remove_file(o_file);
-        }
-    }
-#endif
-    end_time = real_ms_time();
-
-    if (!mjit_opts.save_temps)
-        remove_file(c_file);
-    if (!success) {
-        verbose(2, "Failed to generate so: %s", so_file);
-        return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
-    }
-
-    func = load_func_from_so(so_file, funcname, unit);
-    if (!mjit_opts.save_temps)
-        remove_so_file(so_file, unit);
-
-    if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) {
-        CRITICAL_SECTION_START(3, "end of jit");
-        add_to_list(unit, &active_units);
-        if (unit->iseq)
-            print_jit_result("success", unit, end_time - start_time, c_file);
-        CRITICAL_SECTION_FINISH(3, "end of jit");
-    }
-    return (mjit_func_t)func;
-}
-
-typedef struct {
-    struct rb_mjit_unit *unit;
-    struct rb_call_cache *cc_entries;
-    union iseq_inline_storage_entry *is_entries;
-    int finish_p;
-} mjit_copy_job_t;
-
-/* Singleton MJIT copy job. This is made global since it needs to be durable even when MJIT worker thread is stopped.
-   (ex: register job -> MJIT pause -> MJIT resume -> dispatch job. Actually this should be just cancelled by finish_p check) */
-static mjit_copy_job_t mjit_copy_job;
-
-static void mjit_copy_job_handler(void *data);
-
-/* vm_trace.c */
-int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t , void *);
-
-/* We're lazily copying cache values from main thread because these cache values
-   could be different between ones on enqueue timing and ones on dequeue timing.
-   Return TRUE if copy succeeds. */
-static int
-copy_cache_from_main_thread(mjit_copy_job_t *job)
-{
-    CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread");
-    job->finish_p = FALSE; /* allow dispatching this job in mjit_copy_job_handler */
-    CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread");
-
-    if (UNLIKELY(mjit_opts.wait)) {
-        mjit_copy_job_handler((void *)job);
-        return job->finish_p;
-    }
-
-    if (!rb_workqueue_register(0, mjit_copy_job_handler, (void *)job))
-        return FALSE;
-    CRITICAL_SECTION_START(3, "in MJIT copy job wait");
-    /* checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not
-       lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then
-       `stop_worker()` could dead lock with this function. */
-    while (!job->finish_p && !stop_worker_p) {
-        rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex);
-        verbose(3, "Getting wakeup from client");
-    }
-    CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait");
-    return job->finish_p;
-}
-
-/* The function implementing a worker. It is executed in a separate
-   thread by rb_thread_create_mjit_thread. It compiles precompiled header
-   and then compiles requested ISeqs. */
-void
-mjit_worker(void)
-{
-    mjit_copy_job_t *job = &mjit_copy_job; /* just a shorthand */
-
-#ifndef _MSC_VER
-    if (pch_status == PCH_NOT_READY) {
-        make_pch();
-    }
-#endif
-    if (pch_status == PCH_FAILED) {
-        mjit_enabled = FALSE;
-        CRITICAL_SECTION_START(3, "in worker to update worker_stopped");
-        worker_stopped = TRUE;
-        verbose(3, "Sending wakeup signal to client in a mjit-worker");
-        rb_native_cond_signal(&mjit_client_wakeup);
-        CRITICAL_SECTION_FINISH(3, "in worker to update worker_stopped");
-        return; /* TODO: do the same thing in the latter half of mjit_finish */
-    }
-
-    /* main worker loop */
-    while (!stop_worker_p) {
-        struct rb_mjit_unit *unit;
-
-        /* wait until unit is available */
-        CRITICAL_SECTION_START(3, "in worker dequeue");
-        while ((list_empty(&unit_queue.head) || active_units.length >= mjit_opts.max_cache_size) && !stop_worker_p) {
-            rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex);
-            verbose(3, "Getting wakeup from client");
-        }
-        unit = get_from_list(&unit_queue);
-        job->finish_p = TRUE; /* disable dispatching this job in mjit_copy_job_handler while it's being modified */
-        CRITICAL_SECTION_FINISH(3, "in worker dequeue");
-
-        if (unit) {
-            mjit_func_t func;
-            const struct rb_iseq_constant_body *body = unit->iseq->body;
-
-            job->unit = unit;
-            job->cc_entries = NULL;
-            if (body->ci_size > 0 || body->ci_kw_size > 0)
-                job->cc_entries = alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size));
-            job->is_entries = NULL;
-            if (body->is_size > 0)
-                job->is_entries = alloca(sizeof(union iseq_inline_storage_entry) * body->is_size);
-
-            /* Copy ISeq's inline caches values to avoid race condition. */
-            if (job->cc_entries != NULL || job->is_entries != NULL) {
-                if (copy_cache_from_main_thread(job) == FALSE) {
-                    continue; /* retry postponed_job failure, or stop worker */
-                }
-            }
-
-            /* JIT compile */
-            func = convert_unit_to_func(unit, job->cc_entries, job->is_entries);
-
-            CRITICAL_SECTION_START(3, "in jit func replace");
-            while (in_gc) { /* Make sure we're not GC-ing when touching ISeq */
-                verbose(3, "Waiting wakeup from GC");
-                rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex);
-            }
-            if (unit->iseq) { /* Check whether GCed or not */
-                /* Usage of jit_code might be not in a critical section.  */
-                MJIT_ATOMIC_SET(unit->iseq->body->jit_func, func);
-            }
-            CRITICAL_SECTION_FINISH(3, "in jit func replace");
-
-#ifndef _MSC_VER
-            /* Combine .o files to one .so and reload all jit_func to improve memory locality */
-            if ((!mjit_opts.wait && unit_queue.length == 0 && active_units.length > 1)
-                || active_units.length == mjit_opts.max_cache_size) {
-                compact_all_jit_code();
-            }
-#endif
-        }
-    }
-
-    /* Disable dispatching this job in mjit_copy_job_handler while memory allocated by alloca
-       could be expired after finishing this function. */
-    job->finish_p = TRUE;
-
-    /* To keep mutex unlocked when it is destroyed by mjit_finish, don't wrap CRITICAL_SECTION here. */
-    worker_stopped = TRUE;
-}
diff --git a/nacl/GNUmakefile.in b/nacl/GNUmakefile.in
new file mode 100644
index 0000000000..1fffcee898
--- /dev/null
+++ b/nacl/GNUmakefile.in
@@ -0,0 +1,100 @@
+# Copyright 2012 Google Inc. All Rights Reserved.
+# Author: yugui@google.com (Yugui Sonoda)
+
+include Makefile
+-include uncommon.mk
+
+NACL_SDK_ROOT=@NACL_SDK_ROOT@
+NACL_TOOLCHAIN=@NACL_TOOLCHAIN@
+NACL_TOOLCHAIN_DIR=$(NACL_SDK_ROOT)/toolchain/$(NACL_TOOLCHAIN)
+CXX=@CXX@
+
+# Don't override CC/LD/etc if they are already set to absolute
+# paths (this is the case when building in the naclports tree).
+ifeq ($(dir $(CC)),./)
+CC:=$(NACL_TOOLCHAIN_DIR)/bin/$(CC)
+endif
+ifeq ($(dir $(CXX)),./)
+CXX:=$(NACL_TOOLCHAIN_DIR)/bin/$(CXX)
+endif
+ifeq ($(dir $(LD)),./)
+LD:=$(NACL_TOOLCHAIN_DIR)/bin/$(LD)
+endif
+ifeq ($(dir $(NM)),./)
+NM:=$(NACL_TOOLCHAIN_DIR)/bin/$(NM)
+endif
+ifeq ($(dir $(AR)),./)
+AR:=$(NACL_TOOLCHAIN_DIR)/bin/$(AR)
+endif
+ifeq ($(dir $(AS)),./)
+AS:=$(NACL_TOOLCHAIN_DIR)/bin/$(AS)
+endif
+ifeq ($(dir $(RANLIB)),./)
+RANLIB:=$(NACL_TOOLCHAIN_DIR)/bin/$(RANLIB)
+endif
+ifeq ($(dir $(OBJDUMP)),./)
+OBJDUMP:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJDUMP)
+endif
+ifeq ($(dir $(OBJCOPY)),./)
+OBJCOPY:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJCOPY)
+endif
+PYTHON=@PYTHON@
+
+PPROGRAM=pepper-$(PROGRAM)
+PEPPER_LIBS=-lppapi -lnacl_io
+PROGRAM_NMF=$(PROGRAM:$(EXEEXT)=.nmf)
+PPROGRAM_NMF=$(PPROGRAM:$(EXEEXT)=.nmf)
+
+GNUmakefile: $(srcdir)/nacl/GNUmakefile.in
+$(PPROGRAM): $(PROGRAM) pepper_main.$(OBJEXT)
+	$(Q)$(MAKE) $(MFLAGS) PROGRAM=$(PPROGRAM) MAINOBJ="pepper_main.$(OBJEXT)" LIBS="$(LIBS) $(PEPPER_LIBS)" CC="$(CXX)" program
+$(PROGRAM_NMF) $(PPROGRAM_NMF): $(@:.nmf=$(EXEEXT)) nacl/create_nmf.rb
+
+.PHONY: pprogram package show_naclflags
+.SUFFIXES: $(EXEEXT) .nmf
+$(EXEEXT).nmf:
+	$(ECHO) generating manifest $@
+	$(Q)$(MINIRUBY) $(srcdir)/nacl/create_nmf.rb --verbose=$(V) $(@:.nmf=$(EXEEXT)) $@
+
+pepper_main.$(OBJEXT): $(srcdir)/nacl/pepper_main.c
+	@$(ECHO) compiling nacl/pepper_main.c
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(srcdir)/nacl/pepper_main.c
+
+.rbconfig.time:
+	@$(MAKE) .rbconfig.raw.time RBCONFIG=.rbconfig.raw.time
+	@sed \
+	  -e 's!CONFIG\["CC"\] = .*!CONFIG\["CC"\] = "$(CC)"!' \
+	  -e 's!CONFIG\["LD"\] = .*!CONFIG\["LD"\] = "$(LD)"!' \
+	  -e 's!CONFIG\["NM"\] = .*!CONFIG\["NM"\] = "$(NM)"!' \
+	  -e 's!CONFIG\["AR"\] = .*!CONFIG\["AR"\] = "$(AR)"!' \
+	  -e 's!CONFIG\["AS"\] = .*!CONFIG\["AS"\] = "$(AS)"!' \
+	  -e 's!CONFIG\["RANLIB"\] = .*!CONFIG\["RANLIB"\] = "$(RANLIB)"!' \
+	  -e 's!CONFIG\["OBJDUMP"\] = .*!CONFIG\["OBJDUMP"\] = "$(OBJDUMP)"!' \
+	  -e 's!CONFIG\["OBJCOPY"\] = .*!CONFIG\["OBJCOPY"\] = "$(OBJCOPY)"!' \
+	-i.bak rbconfig.rb
+	@touch .rbconfig.time
+
+all: pprogram
+main: $(PROGRAM_NMF)
+pprogram: showflags $(PPROGRAM) $(PPROGRAM_NMF)
+program: $(PROGRAM_NMF)
+prog: pprogram
+
+package: pprogram install-lib install-ext-comm install-ext-arch
+	$(INSTALL_DATA) $(srcdir)/nacl/example.html $(prefix)
+	$(ECHO) generating manifest $@
+	$(Q)$(MINIRUBY) $(srcdir)/nacl/package.rb $(prefix)
+
+showflags: show_naclflags
+
+show_naclflags:
+	@echo "        NACL_SDK_ROOT = $(NACL_SDK_ROOT)"
+	@echo "        NM = $(NM)"
+	@echo "        AR = $(AR)"
+	@echo "        AS = $(AS)"
+	@echo "        RANLIB = $(RANLIB)"
+	@echo "        OBJDUMP = $(OBJDUMP)"
+	@echo "        OBJCOPY = $(OBJCOPY)"
+
+clean-local::
+	-$(RM) $(PPROGRAM) pepper_main.$(OBJEXT) $(PROGRAM_NMF) $(PPRGORAM_NMF)
diff --git a/nacl/README.nacl b/nacl/README.nacl
new file mode 100644
index 0000000000..77140e0f75
--- /dev/null
+++ b/nacl/README.nacl
@@ -0,0 +1,51 @@
+=begin
+= Native Client port of Ruby
+
+= How to build
+== Prerequisites
+You need to install the following things before building NaCl port of Ruby.
+* Ruby 1.9.3 or later
+* Python 2.6 or later
+* NativeClient SDK pepper 37 or later
+* GNU make
+
+== Steps
+(1) Extract all files from the tarball:
+     $ tar xzf ruby-X.Y.Z.tar.gz
+(2) Set NACL_SDK_ROOT environment variable to the path to the Native Client SDK you installed:
+     $ export NACL_SDK_ROOT=/home/yugui/src/nacl_sdk/pepper_37
+(3) Configure
+     $ ./configure --prefix=/tmp/nacl-ruby --host=x86_64-nacl --with-baseruby=/path/to/ruby-1.9.3-or-later
+(4) Make
+     $ make
+     $ make package
+
+Now you have ruby.nexe. You can run it by sel_ldr in NaCl SDK.
+
+"make package" installs "pepper-ruby.nexe", an example Pepper application that
+embeds Ruby", and libraries to $prefix. You can run it by the following steps:
+(5) Publish the $prefix directory on a web server
+(6) Visit the example.html on the web server by a browser that implements Pepper 18 or later.
+   -- e.g., Chrome 18 implements Pepper 18, Chrome 19 implements Pepper 19, ...
+
+=== Example Configurations
+* x86_32 Native Client
+   $ ./configure --prefix=/tmp/nacl-ruby \
+     --host=i686-nacl \
+     --with-baseruby=/path/to/ruby-1.9.3-or-later
+* arm Native Client
+   $ ./configure --prefix=/tmp/nacl-ruby \
+     --host=arm-nacl \
+     --with-newlib \
+     --with-baseruby=/path/to/ruby-1.9.3-or-later
+* Portable Native Client
+   $ ./configure --prefix=/tmp/nacl-ruby \
+     --host=le32-nacl \
+     --with-newlib \
+     --with-static-linked-ext \
+     --with-baseruby=/path/to/ruby-1.9.3-or-later
+
+= Copyright
+* Copyright 2012 Google Inc. All Rights Reserved.
+* Author: yugui@google.com (Yugui Sonoda)
+=end
diff --git a/nacl/create_nmf.rb b/nacl/create_nmf.rb
new file mode 100644
index 0000000000..cdfe7ad239
--- /dev/null
+++ b/nacl/create_nmf.rb
@@ -0,0 +1,70 @@
+#!/usr/bin/ruby
+# Copyright:: Copyright 2012 Google Inc.
+# License:: All Rights Reserved.
+# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
+#
+# Wrapper for create_nmf.py / generate_nmf.py
+
+require File.join(File.dirname(__FILE__), 'nacl-config')
+
+include NaClConfig
+$verbosity = 0
+
+def usage_and_exit
+  $stderr.puts "Usage: #{$PROGRAM_NAME} [--verbose=N] path/to/input.nexe path/to/output.nmf"
+  exit false
+end
+
+def create_dynamically_linked(nmf, exe)
+  cmd = [
+    PYTHON, CREATE_NMF,
+    '-o', nmf,
+    '-D', OBJDUMP,
+    '-L', HOST_LIB,
+    exe
+  ]
+  puts cmd.join(' ') if $verbosity > 0
+  exec(*cmd)
+end
+
+def create_statically_linked(nmf, exe)
+  File.open(nmf, "w") {|f|
+    f.write <<-EOS.gsub(/^ {6}/, '')
+      {
+        "program": {
+          "#{ARCH}": {
+            "url": "#{exe}"
+          }
+        }
+      }
+    EOS
+  }
+end
+
+def main
+  while m = ARGV.first.match(/--([a-z-]+)(?:=(\S+))?/)
+    case m[1]
+    when 'verbose'
+      usage_and_exit unless m[2][/\A[0-9]+\z/]
+      $verbosity = m[2].to_i
+    when 'help'
+      usage_end_exit
+    end
+    ARGV.shift
+  end
+
+  usage_and_exit if ARGV.size < 2
+
+  exe, nmf = ARGV[0], ARGV[1]
+  if newlib?
+    create_statically_linked(nmf, exe)
+  else
+    create_dynamically_linked(nmf, exe)
+  end
+end
+
+if __FILE__ == $0
+   main()
+end
+
+
diff --git a/nacl/dirent.h b/nacl/dirent.h
new file mode 100644
index 0000000000..31bdad31b7
--- /dev/null
+++ b/nacl/dirent.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ * Author: yugui@google.com (Yugui Sonoda)
+ */
+#ifndef RUBY_NACL_DIRENT_H
+#define RUBY_NACL_DIRENT_H
+
+/* NaCl SDK 0.3 has implementations of dir functions but no declaration in
+ * dirent.h */
+int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
+void rewinddir(DIR *dirp);
+long telldir(DIR *dirp);
+void seekdir(DIR *dirp, long offset);
+
+#endif
diff --git a/nacl/example.html b/nacl/example.html
new file mode 100644
index 0000000000..3cc33298dd
--- /dev/null
+++ b/nacl/example.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Ruby Example</title>
+
+  <script type="text/javascript">
+    RubyModule = null;  // Global application object.
+    statusText = 'NO-STATUS';
+    rubyReady = false;
+
+    // Indicate load success.
+    function moduleDidLoad() {
+      RubyModule = document.getElementById('ruby');
+      form = document.getElementById('source-form');
+      form.style.display = "block";
+      updateStatus('SUCCESS');
+    }
+
+    function evalSource() {
+      if (rubyReady) {
+        RubyModule.postMessage('eval:' + document.getElementById("source").value);
+      } else {
+        throw "Not yet ready";
+      }
+      return false;
+    }
+
+    function RubyError(message) {
+      this.message = message;
+      this.toString = function() {
+        return message;
+      }
+    }
+
+    function FatalError(message) {
+      this.message = message;
+    }
+
+    // The 'message' event handler.  This handler is fired when the NaCl module
+    // posts a message to the browser by calling PPB_Messaging.PostMessage()
+    // (in C) or pp::Instance.PostMessage() (in C++).  This implementation
+    // simply displays the content of the message in an alert panel.
+    function handleMessage(message_event) {
+      var raw = message_event.data;
+      var components;
+      if (raw.indexOf("error") == 0) {
+        components = raw.split(":", 2);
+        throw new RubyError(components[1]);
+      } else if (raw.indexOf("return") == 0) {
+        components = raw.split(":", 2);
+        document.getElementById("result").value = components[1];
+      } else if (raw == "rubyReady") {
+        rubyReady = true;
+      } else {
+        throw new FatalError(raw);
+      }
+    }
+
+    // If the page loads before the Native Client module loads, then set the
+    // status message indicating that the module is still loading.  Otherwise,
+    // do not change the status message.
+    function pageDidLoad() {
+      if (RubyModule == null) {
+        updateStatus('LOADING...');
+      } else {
+        // It's possible that the Native Client module onload event fired
+        // before the page's onload event.  In this case, the status message
+        // will reflect 'SUCCESS', but won't be displayed.  This call will
+        // display the current message.
+        updateStatus();
+      }
+    }
+
+    // Set the global status message.  If the element with id 'statusField'
+    // exists, then set its HTML to the status message as well.
+    // opt_message The message test.  If this is null or undefined, then
+    // attempt to set the element with id 'statusField' to the value of
+    // |statusText|.
+    function updateStatus(opt_message) {
+      if (opt_message)
+        statusText = opt_message;
+      var statusField = document.getElementById('status_field');
+      if (statusField) {
+        statusField.innerHTML = statusText;
+      }
+    }
+  </script>
+</head>
+<body onload="pageDidLoad()">
+
+<h1>Native Client Module Ruby</h1>
+<p>
+  <!-- Load the published .nexe.  This includes the 'nacl' attribute which
+  shows how to load multi-architecture modules.  Each entry in the "nexes"
+  object in the .nmf manifest file is a key-value pair: the key is the
+  instruction set architecture ('x86-32', 'x86-64', etc.); the value is a URL
+  for the desired NaCl module.
+  To load the debug versions of your .nexes, set the 'nacl' attribute to the
+  _dbg.nmf version of the manifest file.
+
+  Note: Since this NaCl module does not use any real-estate in the browser,
+  it's width and height are set to 0.
+
+  Note: The <EMBED> element is wrapped inside a <DIV>, which has both a 'load'
+  and a 'message' event listener attached.  This wrapping method is used
+  instead of attaching the event listeners directly to the <EMBED> element to
+  ensure that the listeners are active before the NaCl module 'load' event
+  fires.  This also allows you to use PPB_Messaging.PostMessage() (in C) or
+  pp::Instance.PostMessage() (in C++) from within the initialization code in
+  your NaCl module.
+  -->
+  <div id="listener">
+    <script type="text/javascript">
+      var listener = document.getElementById('listener');
+      listener.addEventListener('load', moduleDidLoad, true);
+      listener.addEventListener('message', handleMessage, true);
+    </script>
+
+    <embed name="nacl_module"
+       id="ruby"
+       width="0" height="0"
+       src="ruby.nmf"
+       type="application/x-nacl" />
+    <form id="source-form" action="#" method="post" style="display:none"
+      onsubmit="evalSource(); return false">
+      <table>
+        <tbody>
+          <tr>
+            <th>Source</th>
+            <td>
+              <textarea rows="10" cols="80" id="source"></textarea>
+              <input type="submit" />
+            </td>
+          </tr>
+          <tr>
+            <th>Result</th>
+            <td>
+              <textarea rows="10" cols="80" id="result"></textarea>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </form>
+  </div>
+</p>
+
+<h2>Status</h2>
+<div id="status_field">NO-STATUS</div>
+</body>
+</html>
diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb
new file mode 100755
index 0000000000..66481301f5
--- /dev/null
+++ b/nacl/nacl-config.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+#
+# Copyright:: Copyright 2012 Google Inc.
+# License:: All Rights Reserved.
+# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
+#
+# Convenient functions/constants for native client specific configurations.
+require 'rbconfig'
+
+module NaClConfig
+  config = RbConfig::CONFIG
+
+  cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '').sub(/i.86/, 'x86_32')
+  ARCH = cpu_nick.sub('x86_64', 'x86-64').sub('x86_32', 'x86-32')
+  HOST = ARCH.sub(/x86-../, 'x86_64') + '-nacl'
+
+  lib_suffix = config['host_cpu'][/i.86/] ? '32' : ''
+  PYTHON = config['PYTHON']
+  OBJDUMP = config['OBJDUMP']
+  SDK_ROOT = config['NACL_SDK_ROOT']
+  CREATE_NMF = [
+    File.join(SDK_ROOT, 'build_tools', 'nacl_sdk_scons', 'site_tools', 'create_nmf.py'),
+    File.join(SDK_ROOT, 'tools', 'create_nmf.py')
+  ].find{|path| File.exist?(path) } or raise "No create_nmf found"
+  HOST_LIB = File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], HOST, "lib#{lib_suffix}")
+
+  NACL_LIB = File.join(SDK_ROOT, 'lib', config['NACL_LIB_PATH'], 'Release')
+
+  INSTALL_PROGRAM = config['INSTALL_PROGRAM']
+  INSTALL_LIBRARY = config['INSTALL_DATA']
+
+  if cpu_nick == 'x86_64' or cpu_nick == 'x86_32'
+    SEL_LDR = File.join(SDK_ROOT, 'tools', "sel_ldr_#{cpu_nick}")
+    IRT_CORE = File.join(SDK_ROOT, 'tools', "irt_core_#{cpu_nick}.nexe")
+    raise "No sel_ldr found" if not File.executable?(SEL_LDR)
+    raise "No irt_core found" if not File.exists?(IRT_CORE)
+  end
+  RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so')
+
+  module_function
+
+  def newlib?
+    RbConfig::CONFIG['NACL_SDK_VARIANT'] == 'newlib'
+  end
+
+  def self.config(name)
+    if NaClConfig::const_defined?(name.upcase)
+      NaClConfig::const_get(name.upcase)
+    elsif NaClConfig::respond_to?(name) and NaClConfig::method(name).arity == 0
+      NaClConfig::send(name)
+    else
+      raise ArgumentError, "No such config: #{name}"
+    end
+  end
+end
+
+if $0 == __FILE__
+  ARGV.each do |arg|
+    puts NaClConfig::config(arg)
+  end
+end
diff --git a/nacl/package.rb b/nacl/package.rb
new file mode 100644
index 0000000000..9ba95888c4
--- /dev/null
+++ b/nacl/package.rb
@@ -0,0 +1,113 @@
+#!/usr/bin/ruby
+# Copyright:: Copyright 2012 Google Inc.
+# License:: All Rights Reserved.
+# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
+#
+# Generates a runnable package of the pepper API example.
+
+require File.join(File.dirname(__FILE__), 'nacl-config')
+require 'json'
+require 'find'
+require 'fileutils'
+
+include NaClConfig
+
+class Installation
+  include NaClConfig
+
+  SRC_DIRS = [
+    Dir.pwd,
+    HOST_LIB,
+    NACL_LIB,
+  ]
+
+  def initialize(destdir)
+    @destdir = destdir
+    @manifest = {
+      "files" => {}
+    }
+    ruby_libs.each do |path|
+      raise "Collision of #{path}" if @manifest['files'].key? path
+      @manifest['files'][path] = {
+        ARCH => {
+          "url" => path
+        }
+      }
+      if path[/\.so$/]
+        alternate_path = path.gsub('/', "_")
+        raise "Collision of #{alternate_path}" if @manifest['files'].key? alternate_path
+        @manifest['files'][alternate_path] = {
+          ARCH => {
+            "url" => path
+          }
+        }
+      end
+    end
+  end
+
+  def manifest
+    @manifest.dup
+  end
+
+  def install_program(basename)
+    do_install_binary(basename, File.join(@destdir, "bin", ARCH))
+    @manifest["program"] = {
+      ARCH => {
+        "url" => File.join("bin", ARCH, basename)
+      }
+    }
+  end
+
+  def install_library(name, basename)
+    do_install_binary(basename, File.join(@destdir, "lib", ARCH))
+    @manifest["files"][name] = {
+      ARCH => {
+        "url" => File.join("lib", ARCH, basename)
+      }
+    }
+  end
+
+  private
+  def do_install_binary(basename, dest_dir)
+    full_path = nil
+    catch(:found) {
+      SRC_DIRS.each do |path|
+        full_path = File.join(path, basename)
+        if File.exist? full_path
+          throw :found
+        end
+      end
+      raise Errno::ENOENT, "No such file to install: %s" % basename
+    }
+    FileUtils.mkdir_p dest_dir
+    system("#{INSTALL_PROGRAM} #{full_path} #{dest_dir}")
+  end
+
+  def ruby_libs
+    Find.find(RbConfig::CONFIG['rubylibdir']).select{|path| File.file?(path) }.map{|path| path.sub("#{@destdir}/", "") }
+  end
+end
+
+def install(destdir)
+  inst = Installation.new(destdir)
+  manifest = JSON.parse(File.read("pepper-ruby.nmf"))
+
+  program = File.basename(manifest['program'][ARCH]['url'])
+  inst.install_program(program)
+
+  manifest['files'].each do |name, attr|
+    inst.install_library(name, File.basename(attr[ARCH]["url"]))
+  end
+
+  File.open(File.join(destdir, "ruby.nmf"), "w") {|f|
+    f.puts JSON.pretty_generate(inst.manifest)
+  }
+end
+
+def main
+  install(ARGV[0])
+end
+
+if __FILE__ == $0
+  main()
+end
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c
new file mode 100644
index 0000000000..168e8f9fd4
--- /dev/null
+++ b/nacl/pepper_main.c
@@ -0,0 +1,732 @@
+/******************************************************************************
+ Copyright 2012 Google Inc. All Rights Reserved.
+ Author: yugui@google.com (Yugui Sonoda)
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <pthread.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_messaging.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/ppb_url_request_info.h"
+#include "ppapi/c/ppb_url_response_info.h"
+#include "ppapi/c/ppb_var.h"
+#include "ppapi/c/ppp.h"
+#include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/ppp_messaging.h"
+#include "nacl_io/nacl_io.h"
+
+#include "verconf.h"
+#include "ruby/ruby.h"
+#include "version.h"
+#include "gc.h"
+
+#ifdef HAVE_STRUCT_PPB_CORE
+typedef struct PPB_Core PPB_Core;
+#endif
+#ifdef HAVE_STRUCT_PPB_MESSAGING
+typedef struct PPB_Messaging PPB_Messaging;
+#endif
+#ifdef HAVE_STRUCT_PPB_VAR
+typedef struct PPB_Var PPB_Var;
+#endif
+#ifdef HAVE_STRUCT_PPB_URLLOADER
+typedef struct PPB_URLLoader PPB_URLLoader;
+#endif
+#ifdef HAVE_STRUCT_PPB_URLREQUESTINFO
+typedef struct PPB_URLRequestInfo PPB_URLRequestInfo;
+#endif
+#ifdef HAVE_STRUCT_PPB_URLRESPONSEINFO
+typedef struct PPB_URLResponseInfo PPB_URLResponseInfo;
+#endif
+#ifdef HAVE_STRUCT_PPP_INSTANCE
+typedef struct PPP_Instance PPP_Instance;
+#endif
+
+static PP_Module module_id = 0;
+static PPB_GetInterface get_browser_interface = NULL;
+static PPB_Core* core_interface = NULL;
+static PPB_Messaging* messaging_interface = NULL;
+static PPB_Var* var_interface = NULL;
+static PPB_URLLoader* loader_interface = NULL;
+static PPB_URLRequestInfo* request_interface = NULL;
+static PPB_URLResponseInfo* response_interface = NULL;
+static PPB_FileRef* fileref_interface = NULL;
+static struct st_table* instance_data = NULL;
+
+static VALUE instance_table = Qundef;
+
+static PP_Instance current_instance = 0;
+
+/******************************************************************************
+ * State of instance
+ ******************************************************************************/
+
+static void inst_mark(void *const ptr);
+static void inst_free(void *const ptr);
+static size_t inst_memsize(void *const ptr);
+static const rb_data_type_t pepper_instance_data_type = {
+  "PepperInstance",
+  { inst_mark, inst_free, inst_memsize }
+};
+
+struct PepperInstance {
+  PP_Instance instance;
+  PP_Resource url_loader;
+  VALUE self;
+  void* async_call_args;
+  union {
+    int32_t as_int;
+    const char* as_str;
+    VALUE as_value;
+  } async_call_result;
+  char buf[1000];
+
+  pthread_t th;
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+};
+
+struct PepperInstance*
+pruby_get_instance(PP_Instance instance)
+{
+  VALUE self = rb_hash_aref(instance_table, INT2FIX(instance));
+  if (RTEST(self)) {
+    struct PepperInstance *inst;
+    TypedData_Get_Struct(self, struct PepperInstance, &pepper_instance_data_type, inst);
+    return inst;
+  }
+  else {
+    return NULL;
+  }
+}
+
+#define GET_PEPPER_INSTANCE() (pruby_get_instance(current_instance))
+
+struct PepperInstance*
+pruby_register_instance(PP_Instance instance)
+{
+  VALUE obj;
+  struct PepperInstance *data;
+  obj = TypedData_Make_Struct(rb_cData, struct PepperInstance, &pepper_instance_data_type, data);
+  data->self = obj;
+  data->instance = instance;
+  data->url_loader = 0;
+
+  pthread_mutex_init(&data->mutex, NULL);
+  pthread_cond_init(&data->cond, NULL);
+
+  rb_hash_aset(instance_table, INT2FIX(instance), obj);
+  return data;
+}
+
+int
+pruby_unregister_instance(PP_Instance instance)
+{
+  VALUE inst = rb_hash_delete(instance_table, INT2FIX(instance));
+  return RTEST(inst);
+}
+
+static void
+inst_mark(void *const ptr)
+{
+  RUBY_MARK_ENTER("PepperInstance"0);
+  if (ptr) {
+    const struct PepperInstance* inst = (struct PepperInstance*)ptr;
+    RUBY_MARK_UNLESS_NULL(inst->async_call_result.as_value);
+  }
+  RUBY_MARK_LEAVE("PepperInstance"0);
+}
+
+static void
+inst_free(void *const ptr)
+{
+  ruby_xfree(ptr);
+}
+
+static size_t
+inst_memsize(void *const ptr)
+{
+  if (ptr) {
+    const struct PepperInstance* inst = (struct PepperInstance*)ptr;
+    return sizeof(*inst);
+  } else {
+    return 0;
+  }
+}
+
+void
+pruby_async_return_int(void* data, int32_t result)
+{
+  /* PPAPI main thread */
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  instance->async_call_result.as_int = result;
+  if (pthread_cond_signal(&instance->cond)) {
+    perror("pepper-ruby:pthread_cond_signal");
+  }
+}
+
+void
+pruby_async_return_str(void* data, const char *result)
+{
+  /* PPAPI main thread */
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  instance->async_call_result.as_str = result;
+  if (pthread_cond_signal(&instance->cond)) {
+    perror("pepper-ruby:pthread_cond_signal");
+  }
+}
+
+void
+pruby_async_return_value(void* data, VALUE value)
+{
+  /* PPAPI main thread */
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  instance->async_call_result.as_value = value;
+  if (pthread_cond_signal(&instance->cond)) {
+    perror("pepper-ruby:pthread_cond_signal");
+  }
+}
+/******************************************************************************
+ * Conversion between Ruby's VALUE, Pepper's Var and C string
+ ******************************************************************************/
+
+/**
+ * Creates a new string PP_Var from C string. The resulting object will be a
+ * refcounted string object. It will be AddRef()ed for the caller. When the
+ * caller is done with it, it should be Release()d.
+ * @param[in] str C string to be converted to PP_Var
+ * @return PP_Var containing string.
+ */
+static struct PP_Var
+pruby_cstr_to_var(const char* str)
+{
+#ifndef PPB_VAR_INTERFACE_1_1
+  if (var_interface != NULL)
+    return var_interface->VarFromUtf8(module_id, str, strlen(str));
+  return PP_MakeUndefined();
+#else
+  return var_interface->VarFromUtf8(str, strlen(str));
+#endif
+}
+
+/**
+ * Returns a mutable C string contained in the @a var or NULL if @a var is not
+ * string.  This makes a copy of the string in the @a var and adds a NULL
+ * terminator.  Note that VarToUtf8() does not guarantee the NULL terminator on
+ * the returned string.  See the comments for VarToUtf8() in ppapi/c/ppb_var.h
+ * for more info.  The caller is responsible for freeing the returned memory.
+ * @param[in] var PP_Var containing string.
+ * @return a mutable C string representation of @a var.
+ * @note The caller is responsible for freeing the returned string.
+ */
+static char*
+pruby_var_to_cstr(struct PP_Var var)
+{
+  uint32_t len = 0;
+  if (var_interface != NULL) {
+    const char* var_c_str = var_interface->VarToUtf8(var, &len);
+    if (len > 0) {
+      char* c_str = (char*)malloc(len + 1);
+      memcpy(c_str, var_c_str, len);
+      c_str[len] = '\0';
+      return c_str;
+    }
+  }
+  return NULL;
+}
+
+static struct PP_Var
+pruby_str_to_var(volatile VALUE str)
+{
+  if (!RB_TYPE_P(str, T_STRING)) {
+    fprintf(stderr, "[BUG] Unexpected object type: %x\n", TYPE(str));
+    exit(EXIT_FAILURE);
+  }
+#ifndef PPB_VAR_INTERFACE_1_1
+  if (var_interface != NULL) {
+    return var_interface->VarFromUtf8(module_id, RSTRING_PTR(str), RSTRING_LEN(str));
+  }
+#else
+  return var_interface->VarFromUtf8(RSTRING_PTR(str), RSTRING_LEN(str));
+#endif
+  return PP_MakeUndefined();
+}
+
+static struct PP_Var
+pruby_obj_to_var(volatile VALUE obj)
+{
+  static const char* const error =
+      "throw 'Failed to convert the result to a JavaScript object';";
+  int state;
+  obj = rb_protect(&rb_obj_as_string, obj, &state);
+  if (!state) {
+      return pruby_str_to_var(obj);
+  }
+  else {
+      return pruby_cstr_to_var(error);
+  }
+}
+
+int
+pruby_var_equal_to_cstr_p(struct PP_Var lhs, const char* rhs)
+{
+  uint32_t len = 0;
+  if (var_interface == NULL) {
+    return 0;
+  }
+  else {
+    const char* const cstr = var_interface->VarToUtf8(lhs, &len);
+    return strncmp(cstr, rhs, len) == 0;
+  }
+}
+
+int
+pruby_var_prefixed_p(struct PP_Var var, const char* prefix)
+{
+  uint32_t len = 0;
+  if (var_interface == NULL) {
+    return 0;
+  }
+  else {
+    const char* const cstr = var_interface->VarToUtf8(var, &len);
+    const size_t prefix_len = strlen(prefix);
+    return len >= prefix_len && memcmp(cstr, prefix, len) == 0;
+  }
+}
+
+
+/******************************************************************************
+ * Messaging
+ ******************************************************************************/
+
+/* Posts the given C string as a message.
+ * @param data pointer to a NULL-terminated string */
+void
+pruby_post_cstr(void* data)
+{
+  /* PPAPI main thread */
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  const char* const msg = (const char*)instance->async_call_args;
+  messaging_interface->PostMessage(instance->instance,
+                                   pruby_cstr_to_var(msg));
+}
+
+/* Posts the given Ruby VALUE as a message.
+ * @param data a VALUE casted to void* */
+void
+pruby_post_value(void* data)
+{
+  /* PPAPI main thread */
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  volatile VALUE value = (VALUE)instance->async_call_args;
+  messaging_interface->PostMessage(instance->instance, pruby_obj_to_var(value));
+}
+
+
+
+/******************************************************************************
+ * Ruby initialization
+ ******************************************************************************/
+
+static void
+init_loadpath(void)
+{
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION);
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION"/"RUBY_PLATFORM);
+  ruby_incpush(".");
+}
+
+static VALUE
+init_libraries_internal(VALUE unused)
+{
+  extern void Init_enc();
+  extern void Init_ext();
+
+  init_loadpath();
+  Init_enc();
+  Init_ext();
+  return Qnil;
+}
+
+static void*
+init_libraries(void* data)
+{
+  int state;
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  current_instance = instance->instance;
+
+  if (pthread_mutex_lock(&instance->mutex)) {
+    perror("pepper-ruby:pthread_mutex_lock");
+    return 0;
+  }
+  rb_protect(&init_libraries_internal, Qnil, &state);
+  pthread_mutex_unlock(&instance->mutex);
+
+  if (state) {
+    volatile VALUE err = rb_errinfo();
+    err = rb_obj_as_string(err);
+  } else {
+    instance->async_call_args = (void*)"rubyReady";
+    core_interface->CallOnMainThread(
+        0, PP_MakeCompletionCallback(pruby_post_cstr, instance), 0);
+  }
+  return NULL;
+}
+
+static int
+init_libraries_if_necessary(void)
+{
+  static int initialized = 0;
+  if (!initialized) {
+    struct PepperInstance* const instance = GET_PEPPER_INSTANCE();
+    int err;
+    initialized = 1;
+    err = pthread_create(&instance->th, NULL, &init_libraries, instance);
+    if (err) {
+      fprintf(stderr, "pepper_ruby:pthread_create: %s\n", strerror(err));
+      exit(EXIT_FAILURE);
+    }
+    pthread_detach(instance->th);
+  }
+  return 0;
+}
+
+static int
+reopen_fd(int fd, const char* path, int flags) {
+  int fd2 = open(path, flags);
+  if (fd2 < 0) {
+    perror("open fd");
+    return -1;
+  }
+  if (dup2(fd2, fd) < 0) {
+    perror("dup2 fd");
+    return -1;
+  }
+  if (close(fd2)) {
+    perror("close old fd");
+    return -1;
+  }
+  return fd;
+}
+
+static int
+pruby_init(void)
+{
+  RUBY_INIT_STACK;
+  ruby_init();
+
+  instance_table = rb_hash_new();
+  rb_gc_register_mark_object(instance_table);
+
+  return 0;
+}
+
+
+/******************************************************************************
+ * Ruby evaluation
+ ******************************************************************************/
+
+static void*
+pruby_eval(void* data)
+{
+  extern VALUE ruby_eval_string_from_file_protect(const char* src, const char* path, int* state);
+  struct PepperInstance* const instance = (struct PepperInstance*)data;
+  volatile VALUE src = (VALUE)instance->async_call_args;
+  volatile VALUE result = Qnil;
+  volatile int state;
+
+  RUBY_INIT_STACK;
+
+  if (pthread_mutex_lock(&instance->mutex)) {
+    perror("pepper-ruby:pthread_mutex_lock");
+    return 0;
+  }
+  result = ruby_eval_string_from_file_protect(
+      RSTRING_PTR(src), "(pepper-ruby)", &state);
+  pthread_mutex_unlock(&instance->mutex);
+
+  if (!state) {
+      instance->async_call_args =
+          rb_str_concat(rb_usascii_str_new_cstr("return:"),
+                        rb_obj_as_string(result));
+      core_interface->CallOnMainThread(
+          0, PP_MakeCompletionCallback(pruby_post_value, instance), 0);
+      return NULL;
+  }
+  else {
+      rb_set_errinfo(Qnil);
+      instance->async_call_args =
+          rb_str_concat(rb_usascii_str_new_cstr("error:"),
+                        rb_obj_as_string(result));
+      core_interface->CallOnMainThread(
+          0, PP_MakeCompletionCallback(pruby_post_value, instance), 0);
+      return NULL;
+  }
+}
+
+
+/******************************************************************************
+ * Pepper Module callbacks
+ ******************************************************************************/
+
+/**
+ * Called when the NaCl module is instantiated on the web page. The identifier
+ * of the new instance will be passed in as the first argument (this value is
+ * generated by the browser and is an opaque handle).  This is called for each
+ * instantiation of the NaCl module, which is each time the <embed> tag for
+ * this module is encountered.
+ *
+ * If this function reports a failure (by returning @a PP_FALSE), the NaCl
+ * module will be deleted and DidDestroy will be called.
+ * @param[in] instance The identifier of the new instance representing this
+ *     NaCl module.
+ * @param[in] argc The number of arguments contained in @a argn and @a argv.
+ * @param[in] argn An array of argument names.  These argument names are
+ *     supplied in the <embed> tag, for example:
+ *       <embed id="nacl_module" dimensions="2">
+ *     will produce two arguments, one named "id" and one named "dimensions".
+ * @param[in] argv An array of argument values.  These are the values of the
+ *     arguments listed in the <embed> tag.  In the above example, there will
+ *     be two elements in this array, "nacl_module" and "2".  The indices of
+ *     these values match the indices of the corresponding names in @a argn.
+ * @return @a PP_TRUE on success.
+ */
+static PP_Bool
+Instance_DidCreate(PP_Instance instance,
+                   uint32_t argc, const char* argn[], const char* argv[])
+{
+  struct PepperInstance* data = pruby_register_instance(instance);
+  current_instance = instance;
+
+  nacl_io_init_ppapi(instance, get_browser_interface);
+
+  if (mount("", "/dev2", "dev", 0, "")) {
+    perror("mount dev");
+    return PP_FALSE;
+  }
+  if (reopen_fd(0, "/dev2/stdin", O_RDONLY) < 0) {
+    perror("reopen stdin");
+    return PP_FALSE;
+  }
+  if (reopen_fd(1, "/dev2/stdout", O_WRONLY) < 0) {
+    perror("reopen stdout");
+    return PP_FALSE;
+  }
+  if (reopen_fd(2, "/dev2/console1", O_WRONLY) < 0) {
+    perror("reopen stderr");
+    return PP_FALSE;
+  }
+
+  /* TODO(yugui) Unmount original /dev */
+
+  if (mount("/lib", "/lib", "httpfs",
+        0, "allow_cross_origin_requests=false")) {
+    perror("mount httpfs");
+    return PP_FALSE;
+  }
+
+  return init_libraries_if_necessary() ? PP_FALSE : PP_TRUE;
+}
+
+/**
+ * Called when the NaCl module is destroyed. This will always be called,
+ * even if DidCreate returned failure. This routine should deallocate any data
+ * associated with the instance.
+ * @param[in] instance The identifier of the instance representing this NaCl
+ *     module.
+ */
+static void Instance_DidDestroy(PP_Instance instance) {
+  struct PepperInstance* data = pruby_get_instance(instance);
+  core_interface->ReleaseResource(data->url_loader);
+  pruby_unregister_instance(instance);
+}
+
+/**
+ * Called when the position, the size, or the clip rect of the element in the
+ * browser that corresponds to this NaCl module has changed.
+ * @param[in] instance The identifier of the instance representing this NaCl
+ *     module.
+ * @param[in] position The location on the page of this NaCl module. This is
+ *     relative to the top left corner of the viewport, which changes as the
+ *     page is scrolled.
+ * @param[in] clip The visible region of the NaCl module. This is relative to
+ *     the top left of the plugin's coordinate system (not the page).  If the
+ *     plugin is invisible, @a clip will be (0, 0, 0, 0).
+ */
+#ifndef PPP_INSTANCE_INTERFACE_1_1
+static void
+Instance_DidChangeView(PP_Instance instance,
+                       const struct PP_Rect* position,
+                       const struct PP_Rect* clip)
+{
+}
+#else
+static void
+Instance_DidChangeView(PP_Instance instance, PP_Resource view_resource)
+{
+}
+#endif
+
+/**
+ * Notification that the given NaCl module has gained or lost focus.
+ * Having focus means that keyboard events will be sent to the NaCl module
+ * represented by @a instance. A NaCl module's default condition is that it
+ * will not have focus.
+ *
+ * Note: clicks on NaCl modules will give focus only if you handle the
+ * click event. You signal if you handled it by returning @a true from
+ * HandleInputEvent. Otherwise the browser will bubble the event and give
+ * focus to the element on the page that actually did end up consuming it.
+ * If you're not getting focus, check to make sure you're returning true from
+ * the mouse click in HandleInputEvent.
+ * @param[in] instance The identifier of the instance representing this NaCl
+ *     module.
+ * @param[in] has_focus Indicates whether this NaCl module gained or lost
+ *     event focus.
+ */
+static void
+Instance_DidChangeFocus(PP_Instance instance, PP_Bool has_focus)
+{
+}
+
+/**
+ * Handler that gets called after a full-frame module is instantiated based on
+ * registered MIME types.  This function is not called on NaCl modules.  This
+ * function is essentially a place-holder for the required function pointer in
+ * the PPP_Instance structure.
+ * @param[in] instance The identifier of the instance representing this NaCl
+ *     module.
+ * @param[in] url_loader A PP_Resource an open PPB_URLLoader instance.
+ * @return PP_FALSE.
+ */
+static PP_Bool
+Instance_HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader)
+{
+  /* NaCl modules do not need to handle the document load function. */
+  return PP_FALSE;
+}
+
+
+/**
+ * Handler for messages coming in from the browser via postMessage.  The
+ * @a var_message can contain anything: a JSON string; a string that encodes
+ * method names and arguments; etc.  For example, you could use JSON.stringify
+ * in the browser to create a message that contains a method name and some
+ * parameters, something like this:
+ *   var json_message = JSON.stringify({ "myMethod" : "3.14159" });
+ *   nacl_module.postMessage(json_message);
+ * On receipt of this message in @a var_message, you could parse the JSON to
+ * retrieve the method name, match it to a function call, and then call it with
+ * the parameter.
+ * @param[in] instance The instance ID.
+ * @param[in] message The contents, copied by value, of the message sent from
+ *     browser via postMessage.
+ */
+void
+Messaging_HandleMessage(PP_Instance instance, struct PP_Var var_message)
+{
+  char* const message = pruby_var_to_cstr(var_message);
+  size_t message_len = strlen(message);
+  current_instance = instance;
+
+  if (strstr(message, "eval:") != NULL) {
+    volatile VALUE src;
+    struct PepperInstance* const instance_data = GET_PEPPER_INSTANCE();
+    int err;
+#define EVAL_PREFIX_LEN 5
+    src = rb_str_new(message + EVAL_PREFIX_LEN, message_len - EVAL_PREFIX_LEN);
+    instance_data->async_call_args = (void*)src;
+    err = pthread_create(&instance_data->th, NULL, &pruby_eval, instance_data);
+    if (err) {
+      fprintf(stderr, "pepper_ruby:pthread_create: %s\n", strerror(err));
+      exit(EXIT_FAILURE);
+    }
+    pthread_detach(instance_data->th);
+  }
+  free(message);
+}
+
+/**
+ * Entry points for the module.
+ * Initialize instance interface and scriptable object class.
+ * @param[in] a_module_id Module ID
+ * @param[in] get_browser_interface Pointer to PPB_GetInterface
+ * @return PP_OK on success, any other value on failure.
+ */
+PP_EXPORT int32_t
+PPP_InitializeModule(PP_Module a_module_id, PPB_GetInterface a_get_browser_interface)
+{
+  module_id = a_module_id;
+  get_browser_interface = a_get_browser_interface;
+  core_interface = (PPB_Core*)(get_browser_interface(PPB_CORE_INTERFACE));
+  if (core_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  var_interface = (PPB_Var*)(get_browser_interface(PPB_VAR_INTERFACE));
+  if (var_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  messaging_interface = (PPB_Messaging*)(get_browser_interface(PPB_MESSAGING_INTERFACE));
+  if (messaging_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  loader_interface = (PPB_URLLoader*)(get_browser_interface(PPB_URLLOADER_INTERFACE));
+  if (loader_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  request_interface = (PPB_URLRequestInfo*)(get_browser_interface(PPB_URLREQUESTINFO_INTERFACE));
+  if (request_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  response_interface = (PPB_URLResponseInfo*)(get_browser_interface(PPB_URLRESPONSEINFO_INTERFACE));
+  if (response_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  fileref_interface = (PPB_FileRef*)(get_browser_interface(PPB_FILEREF_INTERFACE));
+  if (fileref_interface == NULL) return PP_ERROR_NOINTERFACE;
+
+  return pruby_init() ? PP_ERROR_FAILED : PP_OK;
+}
+
+/**
+ * Returns an interface pointer for the interface of the given name, or NULL
+ * if the interface is not supported.
+ * @param[in] interface_name name of the interface
+ * @return pointer to the interface
+ */
+PP_EXPORT const void*
+PPP_GetInterface(const char* interface_name)
+{
+  if (strcmp(interface_name, PPP_INSTANCE_INTERFACE) == 0) {
+    static PPP_Instance instance_interface = {
+      &Instance_DidCreate,
+      &Instance_DidDestroy,
+      &Instance_DidChangeView,
+      &Instance_DidChangeFocus,
+      &Instance_HandleDocumentLoad
+    };
+    return &instance_interface;
+  } else if (strcmp(interface_name, PPP_MESSAGING_INTERFACE) == 0) {
+    static PPP_Messaging messaging_interface = {
+      &Messaging_HandleMessage
+    };
+    return &messaging_interface;
+  }
+  return NULL;
+}
+
+/**
+ * Called before the plugin module is unloaded.
+ */
+PP_EXPORT void
+PPP_ShutdownModule(void)
+{
+  ruby_cleanup(0);
+}
diff --git a/nacl/resource.h b/nacl/resource.h
new file mode 100644
index 0000000000..57ca53b093
--- /dev/null
+++ b/nacl/resource.h
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ * Author: yugui@google.com (Yugui Sonoda)
+ * */
+#ifndef RUBY_NACL_RESOURCE_H
+#define RUBY_NACL_RESOURCE_H
+int getrusage(int who, struct rusage *usage);
+#endif
diff --git a/nacl/select.h b/nacl/select.h
new file mode 100644
index 0000000000..921721a2fd
--- /dev/null
+++ b/nacl/select.h
@@ -0,0 +1,7 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+// Author: yugui@google.com (Yugui Sonoda)
+#ifndef RUBY_NACL_SELECT_H
+#define RUBY_NACL_SELECT_H
+int select(int num_fds, fd_set *in_fds, fd_set *out_fds,
+           fd_set *ex_fds, struct timeval *timeout);
+#endif
diff --git a/nacl/signal.h b/nacl/signal.h
new file mode 100644
index 0000000000..54832de1fe
--- /dev/null
+++ b/nacl/signal.h
@@ -0,0 +1,6 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+// Author: yugui@google.com (Yugui Sonoda)
+#ifndef RUBY_NACL_SIGNAL_H
+#define RUBY_NACL_SIGNAL_H
+int kill(pid_t pid, int signal);
+#endif
diff --git a/nacl/stat.h b/nacl/stat.h
new file mode 100644
index 0000000000..7be40ada7c
--- /dev/null
+++ b/nacl/stat.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ * Author: yugui@google.com (Yugui Sonoda)
+ * */
+#ifndef RUBY_NACL_STAT_H
+#define RUBY_NACL_STAT_H
+mode_t umask(mode_t mask);
+struct stat;
+int lstat(const char* path, struct stat* result);
+#endif
diff --git a/nacl/unistd.h b/nacl/unistd.h
new file mode 100644
index 0000000000..1c97390c63
--- /dev/null
+++ b/nacl/unistd.h
@@ -0,0 +1,9 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+// Author: yugui@google.com (Yugui Sonoda)
+#ifndef RUBY_NACL_UNISTD_H
+#define RUBY_NACL_UNISTD_H
+int seteuid(pid_t pid);
+int setegid(pid_t pid);
+int truncate(const char* path, off_t new_size);
+int ftruncate(int fd, off_t new_size);
+#endif
diff --git a/nacl/utime.h b/nacl/utime.h
new file mode 100644
index 0000000000..96910051e4
--- /dev/null
+++ b/nacl/utime.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ * Author: yugui@google.com (Yugui Sonoda)
+ */
+
+#ifndef RUBY_NACL_UTIME_H
+#define RUBY_NACL_UTIME_H
+#include <utime.h>
+int utime(const char *filename, const struct utimbuf *times);
+int utimes(const char *filename, const struct timeval times[2]);
+#endif
diff --git a/node.c b/node.c
index d81a7319d3..14f9856ba5 100644
--- a/node.c
+++ b/node.c
@@ -16,18 +16,12 @@
 #define AR(str) rb_str_concat(buf, (str))
 
 #define A_INDENT add_indent(buf, indent)
-#define D_INDENT rb_str_cat2(indent, next_indent)
-#define D_DEDENT rb_str_resize(indent, RSTRING_LEN(indent) - 4)
 #define A_ID(id) add_id(buf, (id))
 #define A_INT(val) rb_str_catf(buf, "%d", (val))
 #define A_LONG(val) rb_str_catf(buf, "%ld", (val))
 #define A_LIT(lit) AR(rb_inspect(lit))
 #define A_NODE_HEADER(node, term) \
-    rb_str_catf(buf, "@ %s (line: %d, location: (%d,%d)-(%d,%d))%s"term, \
-		ruby_node_name(nd_type(node)), nd_line(node), \
-		nd_first_lineno(node), nd_first_column(node), \
-		nd_last_lineno(node), nd_last_column(node), \
-		(node->flags & NODE_FL_NEWLINE ? "*" : ""))
+    rb_str_catf(buf, "@ %s (line: %d)"term, ruby_node_name(nd_type(node)), nd_line(node))
 #define A_FIELD_HEADER(len, name, term) \
     rb_str_catf(buf, "+- %.*s:"term, (len), (name))
 #define D_FIELD_HEADER(len, name, term) (A_INDENT, A_FIELD_HEADER(len, name, term))
@@ -35,12 +29,18 @@
 #define D_NULL_NODE (A_INDENT, A("(null node)\n"))
 #define D_NODE_HEADER(node) (A_INDENT, A_NODE_HEADER(node, "\n"))
 
-#define COMPOUND_FIELD(len, name) \
-    FIELD_BLOCK((D_FIELD_HEADER((len), (name), "\n"), D_INDENT), D_DEDENT)
+#define COMPOUND_FIELD(len, name, block) \
+    do { \
+	D_FIELD_HEADER((len), (name), "\n");	\
+	rb_str_cat2(indent, next_indent); \
+	block; \
+	rb_str_resize(indent, RSTRING_LEN(indent) - 4); \
+    } while (0)
 
-#define COMPOUND_FIELD1(name, ann) \
+#define COMPOUND_FIELD1(name, ann, block) \
     COMPOUND_FIELD(FIELD_NAME_LEN(name, ann), \
-		   FIELD_NAME_DESC(name, ann))
+		   FIELD_NAME_DESC(name, ann), \
+		   block)
 
 #define FIELD_NAME_DESC(name, ann) name " (" ann ")"
 #define FIELD_NAME_LEN(name, ann) (int)( \
@@ -48,12 +48,9 @@
 	rb_strlen_lit(FIELD_NAME_DESC(name, ann)) : \
 	rb_strlen_lit(name))
 #define SIMPLE_FIELD(len, name) \
-    FIELD_BLOCK(D_FIELD_HEADER((len), (name), " "), A("\n"))
-
-#define FIELD_BLOCK(init, reset) \
-    for (init, field_flag = 1; \
+    for (D_FIELD_HEADER((len), (name), " "), field_flag = 1; \
 	 field_flag; /* should be optimized away */ \
-	 reset, field_flag = 0)
+	 A("\n"), field_flag = 0)
 
 #define SIMPLE_FIELD1(name, ann)    SIMPLE_FIELD(FIELD_NAME_LEN(name, ann), FIELD_NAME_DESC(name, ann))
 #define F_CUSTOM1(name, ann)	    SIMPLE_FIELD1(#name, ann)
@@ -65,7 +62,9 @@
 #define F_MSG(name, ann, desc)	    SIMPLE_FIELD1(#name, ann) A(desc)
 
 #define F_NODE(name, ann) \
-    COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, node->name);}
+    COMPOUND_FIELD1(#name, ann, dump_node(buf, indent, comment, node->name))
+#define F_OPTION(name, ann) \
+    COMPOUND_FIELD1(#name, ann, dump_option(buf, indent, node->name))
 
 #define ANN(ann) \
     if (comment) { \
@@ -102,14 +101,46 @@ struct add_option_arg {
     st_index_t count;
 };
 
-static void dump_node(VALUE, VALUE, int, const NODE *);
+static int
+add_option_i(VALUE key, VALUE val, VALUE args)
+{
+    struct add_option_arg *argp = (void *)args;
+    VALUE buf = argp->buf;
+    VALUE indent = argp->indent;
+
+    A_INDENT;
+    A("+- ");
+    AR(rb_sym2str(key));
+    A(": ");
+    A_LIT(val);
+    A("\n");
+    return ST_CONTINUE;
+}
+
+static void
+dump_option(VALUE buf, VALUE indent, VALUE opt)
+{
+    struct add_option_arg arg;
+
+    if (!RB_TYPE_P(opt, T_HASH)) {
+	A_LIT(opt);
+	return;
+    }
+    arg.buf = buf;
+    arg.indent = indent;
+    arg.count = 0;
+    rb_hash_foreach(opt, add_option_i, (VALUE)&arg);
+}
+
+static void dump_node(VALUE, VALUE, int, NODE *);
 static const char default_indent[] = "|   ";
 
 static void
-dump_array(VALUE buf, VALUE indent, int comment, const NODE *node)
+dump_array(VALUE buf, VALUE indent, int comment, NODE *node)
 {
     int field_flag;
     const char *next_indent = default_indent;
+    D_NODE_HEADER(node);
     F_LONG(nd_alen, "length");
     F_NODE(nd_head, "element");
     while (node->nd_next && nd_type(node->nd_next) == NODE_ARRAY) {
@@ -121,12 +152,10 @@ dump_array(VALUE buf, VALUE indent, int comment, const NODE *node)
 }
 
 static void
-dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
+dump_node(VALUE buf, VALUE indent, int comment, NODE *node)
 {
     int field_flag;
-    int i;
     const char *next_indent = default_indent;
-    enum node_type type;
 
     if (!node) {
 	D_NULL_NODE;
@@ -135,29 +164,15 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 
     D_NODE_HEADER(node);
 
-    type = nd_type(node);
-    switch (type) {
+    switch (nd_type(node)) {
       case NODE_BLOCK:
 	ANN("statement sequence");
-	ANN("format: [nd_head]; ...; [nd_next]");
+	ANN("format: [nd_head]; [nd_next]");
 	ANN("example: foo; bar");
-	i = 0;
-	do {
-	    A_INDENT;
-	    rb_str_catf(buf, "+- nd_head (%s%d):\n",
-			comment ? "statement #" : "", ++i);
-	    if (!node->nd_next) LAST_NODE;
-	    D_INDENT;
-	    dump_node(buf, indent, comment, node->nd_head);
-	    D_DEDENT;
-	} while (node->nd_next &&
-		 nd_type(node->nd_next) == NODE_BLOCK &&
-		 (node = node->nd_next, 1));
-	if (node->nd_next) {
-	    LAST_NODE;
-	    F_NODE(nd_next, "next block");
-	}
-	return;
+	F_NODE(nd_head, "current statement");
+	LAST_NODE;
+	F_NODE(nd_next, "next block");
+	break;
 
       case NODE_IF:
 	ANN("if statement");
@@ -167,17 +182,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_body, "then clause");
 	LAST_NODE;
 	F_NODE(nd_else, "else clause");
-	return;
-
-      case NODE_UNLESS:
-	ANN("unless statement");
-	ANN("format: unless [nd_cond] then [nd_body] else [nd_else] end");
-	ANN("example: unless x == 1 then foo else bar end");
-	F_NODE(nd_cond, "condition expr");
-	F_NODE(nd_body, "then clause");
-	LAST_NODE;
-	F_NODE(nd_else, "else clause");
-	return;
+	break;
 
       case NODE_CASE:
 	ANN("case statement");
@@ -186,26 +191,23 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "case expr");
 	LAST_NODE;
 	F_NODE(nd_body, "when clauses");
-	return;
-      case NODE_CASE2:
-	ANN("case statement with no head");
-	ANN("format: case; [nd_body]; end");
-	ANN("example: case; when 1; foo; when 2; bar; else baz; end");
-	F_NODE(nd_head, "case expr");
-	LAST_NODE;
-	F_NODE(nd_body, "when clauses");
-	return;
+	break;
 
       case NODE_WHEN:
-	ANN("when clause");
+	ANN("if statement");
 	ANN("format: when [nd_head]; [nd_body]; (when or else) [nd_next]");
 	ANN("example: case x; when 1; foo; when 2; bar; else baz; end");
 	F_NODE(nd_head, "when value");
-	F_NODE(nd_body, "when body");
+	F_NODE(nd_body, "when clause");
 	LAST_NODE;
 	F_NODE(nd_next, "next when clause");
-	return;
+	break;
 
+      case NODE_OPT_N:
+	ANN("wrapper for -n option");
+	ANN("format: ruby -ne '[nd_body]' (nd_cond is `gets')");
+	ANN("example: ruby -ne 'p $_'");
+	goto loop;
       case NODE_WHILE:
 	ANN("while statement");
 	ANN("format: while [nd_cond]; [nd_body]; end");
@@ -223,7 +225,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_cond, "condition");
 	LAST_NODE;
 	F_NODE(nd_body, "body");
-	return;
+	break;
 
       case NODE_ITER:
 	ANN("method call with block");
@@ -238,18 +240,10 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_iter, "iteration receiver");
 	LAST_NODE;
 	F_NODE(nd_body, "body");
-	return;
-
-      case NODE_FOR_MASGN:
-	ANN("vars of for statement with masgn");
-	ANN("format: for [nd_var] in ... do ... end");
-	ANN("example: for x, y in 1..3 do foo end");
-	LAST_NODE;
-	F_NODE(nd_var, "var");
-	return;
+	break;
 
       case NODE_BREAK:
-	ANN("break statement");
+	ANN("for statement");
 	ANN("format: break [nd_stts]");
 	ANN("example: break 1");
 	goto jump;
@@ -265,19 +259,19 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
       jump:
 	LAST_NODE;
 	F_NODE(nd_stts, "value");
-	return;
+	break;
 
       case NODE_REDO:
 	ANN("redo statement");
 	ANN("format: redo");
 	ANN("example: redo");
-	return;
+	break;
 
       case NODE_RETRY:
 	ANN("retry statement");
 	ANN("format: retry");
 	ANN("example: retry");
-	return;
+	break;
 
       case NODE_BEGIN:
 	ANN("begin statement");
@@ -285,7 +279,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: begin; 1; end");
 	LAST_NODE;
 	F_NODE(nd_body, "body");
-	return;
+	break;
 
       case NODE_RESCUE:
 	ANN("rescue clause");
@@ -295,7 +289,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_resq, "rescue clause list");
 	LAST_NODE;
 	F_NODE(nd_else, "rescue else clause");
-	return;
+	break;
 
       case NODE_RESBODY:
 	ANN("rescue clause (cont'd)");
@@ -305,7 +299,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_body, "rescue clause");
 	LAST_NODE;
 	F_NODE(nd_head, "next rescue clause");
-	return;
+	break;
 
       case NODE_ENSURE:
 	ANN("ensure clause");
@@ -314,7 +308,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "body");
 	LAST_NODE;
 	F_NODE(nd_ensr, "ensure clause");
-	return;
+	break;
 
       case NODE_AND:
 	ANN("&& operator");
@@ -324,17 +318,12 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
       case NODE_OR:
 	ANN("|| operator");
 	ANN("format: [nd_1st] || [nd_2nd]");
-	ANN("example: foo || bar");
+	ANN("example: foo && bar");
       andor:
-	while (1) {
-	    F_NODE(nd_1st, "left expr");
-	    if (!node->nd_2nd || nd_type(node->nd_2nd) != (int)type)
-		break;
-	    node = node->nd_2nd;
-	}
+	F_NODE(nd_1st, "left expr");
 	LAST_NODE;
 	F_NODE(nd_2nd, "right expr");
-	return;
+	break;
 
       case NODE_MASGN:
 	ANN("multiple assignment");
@@ -342,65 +331,50 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: a, b = foo");
 	F_NODE(nd_value, "rhsn");
 	F_NODE(nd_head, "lhsn");
-	if (NODE_NAMED_REST_P(node->nd_args)) {
+	if ((VALUE)node->nd_args != (VALUE)-1) {
 	    LAST_NODE;
 	    F_NODE(nd_args, "splatn");
 	}
 	else {
-	    F_MSG(nd_args, "splatn", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
+	    F_MSG(nd_args, "splatn", "-1 (rest argument without name)");
 	}
-	return;
+	break;
 
       case NODE_LASGN:
 	ANN("local variable assignment");
 	ANN("format: [nd_vid](lvar) = [nd_value]");
 	ANN("example: x = foo");
-	F_ID(nd_vid, "local variable");
-	if (NODE_REQUIRED_KEYWORD_P(node)) {
-	    F_MSG(nd_value, "rvalue", "NODE_SPECIAL_REQUIRED_KEYWORD (required keyword argument)");
-	}
-	else {
-	    LAST_NODE;
-	    F_NODE(nd_value, "rvalue");
-	}
-	return;
+	goto asgn;
       case NODE_DASGN:
 	ANN("dynamic variable assignment (out of current scope)");
 	ANN("format: [nd_vid](dvar) = [nd_value]");
 	ANN("example: x = nil; 1.times { x = foo }");
-	F_ID(nd_vid, "local variable");
-	LAST_NODE;
-	F_NODE(nd_value, "rvalue");
-	return;
+	goto asgn;
       case NODE_DASGN_CURR:
 	ANN("dynamic variable assignment (in current scope)");
 	ANN("format: [nd_vid](current dvar) = [nd_value]");
 	ANN("example: 1.times { x = foo }");
-	F_ID(nd_vid, "local variable");
-	if (NODE_REQUIRED_KEYWORD_P(node)) {
-	    F_MSG(nd_value, "rvalue", "NODE_SPECIAL_REQUIRED_KEYWORD (required keyword argument)");
-	}
-	else {
-	    LAST_NODE;
-	    F_NODE(nd_value, "rvalue");
-	}
-	return;
+	goto asgn;
       case NODE_IASGN:
 	ANN("instance variable assignment");
 	ANN("format: [nd_vid](ivar) = [nd_value]");
 	ANN("example: @x = foo");
-	F_ID(nd_vid, "instance variable");
-	LAST_NODE;
-	F_NODE(nd_value, "rvalue");
-	return;
+	goto asgn;
       case NODE_CVASGN:
 	ANN("class variable assignment");
 	ANN("format: [nd_vid](cvar) = [nd_value]");
 	ANN("example: @@x = foo");
-	F_ID(nd_vid, "class variable");
+      asgn:
+	F_ID(nd_vid, "variable");
 	LAST_NODE;
-	F_NODE(nd_value, "rvalue");
-	return;
+	if (node->nd_value == (NODE *)-1) {
+	    F_MSG(nd_value, "rvalue", "(required keyword argument)");
+	}
+	else {
+	    F_NODE(nd_value, "rvalue");
+	}
+	break;
+
       case NODE_GASGN:
 	ANN("global variable assignment");
 	ANN("format: [nd_entry](gvar) = [nd_value]");
@@ -408,38 +382,38 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_GENTRY(nd_entry, "global variable");
 	LAST_NODE;
 	F_NODE(nd_value, "rvalue");
-	return;
+	break;
 
       case NODE_CDECL:
 	ANN("constant declaration");
 	ANN("format: [nd_else]::[nd_vid](constant) = [nd_value]");
 	ANN("example: X = foo");
 	if (node->nd_vid) {
-	    F_ID(nd_vid, "constant");
-	    F_MSG(nd_else, "extension", "not used");
+	   F_ID(nd_vid, "variable");
+	   F_MSG(nd_else, "extension", "not used");
 	}
 	else {
-	    F_MSG(nd_vid, "constant", "0 (see extension field)");
-	    F_NODE(nd_else, "extension");
+	   F_MSG(nd_vid, "variable", "0 (see extension field)");
+	   F_NODE(nd_else, "extension");
 	}
 	LAST_NODE;
 	F_NODE(nd_value, "rvalue");
-	return;
+	break;
 
       case NODE_OP_ASGN1:
 	ANN("array assignment with operator");
-	ANN("format: [nd_recv] [ [nd_args->nd_head] ] [nd_mid]= [nd_args->nd_body]");
+	ANN("format: [nd_value] [ [nd_args->nd_body] ] [nd_vid]= [nd_args->nd_head]");
 	ANN("example: ary[1] += foo");
 	F_NODE(nd_recv, "receiver");
-	F_ID(nd_mid, "operator");
-	F_NODE(nd_args->nd_head, "index");
+	F_ID(nd_vid, "operator");
+	F_NODE(nd_args->nd_body, "index");
 	LAST_NODE;
-	F_NODE(nd_args->nd_body, "rvalue");
-	return;
+	F_NODE(nd_args->nd_head, "rvalue");
+	break;
 
       case NODE_OP_ASGN2:
 	ANN("attr assignment with operator");
-	ANN("format: [nd_recv].[attr] [nd_next->nd_mid]= [nd_value]");
+	ANN("format: [nd_value].[attr] [nd_next->nd_mid]= [nd_value]");
 	ANN("          where [attr]: [nd_next->nd_vid]");
 	ANN("example: struct.field += foo");
 	F_NODE(nd_recv, "receiver");
@@ -447,10 +421,16 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	    if (node->nd_next->nd_aid) A("? ");
 	    A_ID(node->nd_next->nd_vid);
 	}
-	F_ID(nd_next->nd_mid, "operator");
+	F_CUSTOM1(nd_next->nd_mid, "operator") {
+	    switch (node->nd_next->nd_mid) {
+	      case 0: A("0 (||)"); break;
+	      case 1: A("1 (&&)"); break;
+	      default: A_ID(node->nd_next->nd_mid);
+	    }
+	}
 	LAST_NODE;
 	F_NODE(nd_value, "rvalue");
-	return;
+	break;
 
       case NODE_OP_ASGN_AND:
 	ANN("assignment with && operator");
@@ -465,17 +445,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "variable");
 	LAST_NODE;
 	F_NODE(nd_value, "rvalue");
-	return;
-
-      case NODE_OP_CDECL:
-	ANN("constant declaration with operator");
-	ANN("format: [nd_head](constant) [nd_aid]= [nd_value]");
-	ANN("example: A::B ||= 1");
-	F_NODE(nd_head, "constant");
-	F_ID(nd_aid, "operator");
-	LAST_NODE;
-	F_NODE(nd_value, "rvalue");
-	return;
+	break;
 
       case NODE_CALL:
 	ANN("method invocation");
@@ -485,17 +455,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_recv, "receiver");
 	LAST_NODE;
 	F_NODE(nd_args, "arguments");
-	return;
-
-      case NODE_OPCALL:
-        ANN("method invocation");
-        ANN("format: [nd_recv] [nd_mid] [nd_args]");
-        ANN("example: foo + bar");
-        F_ID(nd_mid, "method id");
-        F_NODE(nd_recv, "receiver");
-        LAST_NODE;
-        F_NODE(nd_args, "arguments");
-        return;
+	break;
 
       case NODE_FCALL:
 	ANN("function call");
@@ -504,14 +464,14 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_ID(nd_mid, "method id");
 	LAST_NODE;
 	F_NODE(nd_args, "arguments");
-	return;
+	break;
 
       case NODE_VCALL:
 	ANN("function call with no argument");
 	ANN("format: [nd_mid]");
 	ANN("example: foo");
 	F_ID(nd_mid, "method id");
-	return;
+	break;
 
       case NODE_QCALL:
 	ANN("safe method invocation");
@@ -521,7 +481,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_recv, "receiver");
 	LAST_NODE;
 	F_NODE(nd_args, "arguments");
-	return;
+	break;
 
       case NODE_SUPER:
 	ANN("super invocation");
@@ -529,13 +489,13 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: super 1");
 	LAST_NODE;
 	F_NODE(nd_args, "arguments");
-	return;
+	break;
 
       case NODE_ZSUPER:
 	ANN("super invocation with no argument");
 	ANN("format: super");
 	ANN("example: super");
-	return;
+	break;
 
       case NODE_ARRAY:
 	ANN("array constructor");
@@ -548,34 +508,21 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: return 1, 2, 3");
       ary:
 	dump_array(buf, indent, comment, node);
-	return;
+	break;
 
       case NODE_ZARRAY:
 	ANN("empty array constructor");
 	ANN("format: []");
 	ANN("example: []");
-	return;
+	break;
 
       case NODE_HASH:
-	if (!node->nd_alen) {
-	    ANN("keyword arguments");
-	    ANN("format: nd_head");
-	    ANN("example: a: 1, b: 2");
-	}
-	else {
-	    ANN("hash constructor");
-	    ANN("format: { [nd_head] }");
-	    ANN("example: { 1 => 2, 3 => 4 }");
-	}
-	F_CUSTOM1(nd_alen, "keyword arguments or hash literal") {
-	    switch (node->nd_alen) {
-	      case 0: A("0 (keyword argument)"); break;
-	      case 1: A("1 (hash literal)"); break;
-	    }
-	}
+	ANN("hash constructor");
+	ANN("format: { [nd_head] }");
+	ANN("example: { 1 => 2, 3 => 4 }");
 	LAST_NODE;
 	F_NODE(nd_head, "contents");
-	return;
+	break;
 
       case NODE_YIELD:
 	ANN("yield invocation");
@@ -583,52 +530,49 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: yield 1");
 	LAST_NODE;
 	F_NODE(nd_head, "arguments");
-	return;
+	break;
 
       case NODE_LVAR:
 	ANN("local variable reference");
 	ANN("format: [nd_vid](lvar)");
 	ANN("example: x");
-	F_ID(nd_vid, "local variable");
-	return;
+	goto var;
       case NODE_DVAR:
 	ANN("dynamic variable reference");
 	ANN("format: [nd_vid](dvar)");
 	ANN("example: 1.times { x = 1; x }");
-	F_ID(nd_vid, "local variable");
-	return;
+	goto var;
       case NODE_IVAR:
 	ANN("instance variable reference");
 	ANN("format: [nd_vid](ivar)");
 	ANN("example: @x");
-	F_ID(nd_vid, "instance variable");
-	return;
+	goto var;
       case NODE_CONST:
 	ANN("constant reference");
 	ANN("format: [nd_vid](constant)");
 	ANN("example: X");
-	F_ID(nd_vid, "constant");
-	return;
+	goto var;
       case NODE_CVAR:
 	ANN("class variable reference");
 	ANN("format: [nd_vid](cvar)");
 	ANN("example: @@x");
-	F_ID(nd_vid, "class variable");
-	return;
+      var:
+	F_ID(nd_vid, "local variable");
+	break;
 
       case NODE_GVAR:
 	ANN("global variable reference");
 	ANN("format: [nd_entry](gvar)");
 	ANN("example: $x");
 	F_GENTRY(nd_entry, "global variable");
-	return;
+	break;
 
       case NODE_NTH_REF:
 	ANN("nth special variable reference");
 	ANN("format: $[nd_nth]");
 	ANN("example: $1, $2, ..");
 	F_CUSTOM1(nd_nth, "variable") { A("$"); A_LONG(node->nd_nth); }
-	return;
+	break;
 
       case NODE_BACK_REF:
 	ANN("back special variable reference");
@@ -641,14 +585,14 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	    name[2] = '\0';
 	    A(name);
 	}
-	return;
+	break;
 
       case NODE_MATCH:
 	ANN("match expression (against $_ implicitly)");
         ANN("format: [nd_lit] (in condition)");
 	ANN("example: if /foo/; foo; end");
 	F_LIT(nd_lit, "regexp");
-	return;
+	break;
 
       case NODE_MATCH2:
 	ANN("match expression (regexp first)");
@@ -661,7 +605,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	    LAST_NODE;
 	    F_NODE(nd_args, "named captures");
 	}
-	return;
+	break;
 
       case NODE_MATCH3:
 	ANN("match expression (regexp second)");
@@ -670,7 +614,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_recv, "string (receiver)");
 	LAST_NODE;
 	F_NODE(nd_value, "regexp (argument)");
-	return;
+	break;
 
       case NODE_LIT:
 	ANN("literal");
@@ -688,15 +632,8 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: `foo`");
       lit:
 	F_LIT(nd_lit, "literal");
-	return;
+	break;
 
-      case NODE_ONCE:
-	ANN("once evaluation");
-	ANN("format: [nd_body]");
-	ANN("example: /foo#{ bar }baz/o");
-	LAST_NODE;
-	F_NODE(nd_body, "body");
-	return;
       case NODE_DSTR:
 	ANN("string literal with interpolation");
 	ANN("format: [nd_lit]");
@@ -712,6 +649,11 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("format: [nd_lit]");
 	ANN("example: /foo#{ bar }baz/");
 	goto dlit;
+      case NODE_DREGX_ONCE:
+	ANN("regexp literal with interpolation and once flag");
+	ANN("format: [nd_lit]");
+	ANN("example: /foo#{ bar }baz/o");
+	goto dlit;
       case NODE_DSYM:
 	ANN("symbol literal with interpolation");
 	ANN("format: [nd_lit]");
@@ -721,7 +663,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_next->nd_head, "interpolation");
 	LAST_NODE;
 	F_NODE(nd_next->nd_next, "tailing strings");
-	return;
+	break;
 
       case NODE_EVSTR:
 	ANN("interpolation expression");
@@ -729,7 +671,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: \"foo#{ bar }baz\"");
 	LAST_NODE;
 	F_NODE(nd_body, "body");
-	return;
+	break;
 
       case NODE_ARGSCAT:
 	ANN("splat argument following arguments");
@@ -738,7 +680,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "preceding array");
 	LAST_NODE;
 	F_NODE(nd_body, "following array");
-	return;
+	break;
 
       case NODE_ARGSPUSH:
 	ANN("splat argument following one argument");
@@ -747,7 +689,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "preceding array");
 	LAST_NODE;
 	F_NODE(nd_body, "following element");
-	return;
+	break;
 
       case NODE_SPLAT:
 	ANN("splat argument");
@@ -755,7 +697,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: foo(*ary)");
 	LAST_NODE;
 	F_NODE(nd_head, "splat'ed array");
-	return;
+	break;
 
       case NODE_BLOCK_PASS:
 	ANN("arguments with block argument");
@@ -764,51 +706,51 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_head, "other arguments");
 	LAST_NODE;
 	F_NODE(nd_body, "block argument");
-	return;
+	break;
 
       case NODE_DEFN:
 	ANN("method definition");
 	ANN("format: def [nd_mid] [nd_defn]; end");
-	ANN("example: def foo; bar; end");
+	ANN("example; def foo; bar; end");
 	F_ID(nd_mid, "method name");
 	LAST_NODE;
 	F_NODE(nd_defn, "method definition");
-	return;
+	break;
 
       case NODE_DEFS:
 	ANN("singleton method definition");
 	ANN("format: def [nd_recv].[nd_mid] [nd_defn]; end");
-	ANN("example: def obj.foo; bar; end");
+	ANN("example; def obj.foo; bar; end");
 	F_NODE(nd_recv, "receiver");
 	F_ID(nd_mid, "method name");
 	LAST_NODE;
 	F_NODE(nd_defn, "method definition");
-	return;
+	break;
 
       case NODE_ALIAS:
 	ANN("method alias statement");
-	ANN("format: alias [nd_1st] [nd_2nd]");
+	ANN("format: alias [u1.node] [u2.node]");
 	ANN("example: alias bar foo");
-	F_NODE(nd_1st, "new name");
+	F_NODE(u1.node, "new name");
 	LAST_NODE;
-	F_NODE(nd_2nd, "old name");
-	return;
+	F_NODE(u2.node, "old name");
+	break;
 
       case NODE_VALIAS:
 	ANN("global variable alias statement");
-	ANN("format: alias [nd_alias](gvar) [nd_orig](gvar)");
+	ANN("format: alias [u1.id](gvar) [u2.id](gvar)");
 	ANN("example: alias $y $x");
-	F_ID(nd_alias, "new name");
-	F_ID(nd_orig, "old name");
-	return;
+	F_ID(u1.id, "new name");
+	F_ID(u2.id, "old name");
+	break;
 
       case NODE_UNDEF:
-	ANN("method undef statement");
-	ANN("format: undef [nd_undef]");
+	ANN("method alias statement");
+	ANN("format: undef [u2.node]");
 	ANN("example: undef foo");
 	LAST_NODE;
-	F_NODE(nd_undef, "old name");
-	return;
+	F_NODE(u2.node, "old name");
+	break;
 
       case NODE_CLASS:
 	ANN("class definition");
@@ -818,7 +760,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_super, "superclass");
 	LAST_NODE;
 	F_NODE(nd_body, "class definition");
-	return;
+	break;
 
       case NODE_MODULE:
 	ANN("module definition");
@@ -827,7 +769,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_cpath, "module path");
 	LAST_NODE;
 	F_NODE(nd_body, "module definition");
-	return;
+	break;
 
       case NODE_SCLASS:
 	ANN("singleton class definition");
@@ -836,7 +778,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_recv, "receiver");
 	LAST_NODE;
 	F_NODE(nd_body, "singleton class definition");
-	return;
+	break;
 
       case NODE_COLON2:
 	ANN("scoped constant reference");
@@ -845,14 +787,14 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_ID(nd_mid, "constant name");
 	LAST_NODE;
 	F_NODE(nd_head, "receiver");
-	return;
+	break;
 
       case NODE_COLON3:
 	ANN("top-level constant reference");
 	ANN("format: ::[nd_mid]");
 	ANN("example: ::Object");
 	F_ID(nd_mid, "constant name");
-	return;
+	break;
 
       case NODE_DOT2:
 	ANN("range constructor (incl.)");
@@ -877,44 +819,44 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_beg, "begin");
 	LAST_NODE;
 	F_NODE(nd_end, "end");
-	return;
+	break;
 
       case NODE_SELF:
 	ANN("self");
 	ANN("format: self");
 	ANN("example: self");
-	return;
+	break;
 
       case NODE_NIL:
 	ANN("nil");
 	ANN("format: nil");
 	ANN("example: nil");
-	return;
+	break;
 
       case NODE_TRUE:
 	ANN("true");
 	ANN("format: true");
 	ANN("example: true");
-	return;
+	break;
 
       case NODE_FALSE:
 	ANN("false");
 	ANN("format: false");
 	ANN("example: false");
-	return;
+	break;
 
       case NODE_ERRINFO:
 	ANN("virtual reference to $!");
 	ANN("format: rescue => id");
 	ANN("example: rescue => id");
-	return;
+	break;
 
       case NODE_DEFINED:
 	ANN("defined? expression");
 	ANN("format: defined?([nd_head])");
 	ANN("example: defined?(foo)");
 	F_NODE(nd_head, "expr");
-	return;
+	break;
 
       case NODE_POSTEXE:
 	ANN("post-execution");
@@ -922,17 +864,36 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: END { foo }");
 	LAST_NODE;
 	F_NODE(nd_body, "END clause");
-	return;
+	break;
 
       case NODE_ATTRASGN:
 	ANN("attr assignment");
 	ANN("format: [nd_recv].[nd_mid] = [nd_args]");
 	ANN("example: struct.field = foo");
-	F_NODE(nd_recv, "receiver");
+	if (node->nd_recv == (NODE *) 1) {
+	    F_MSG(nd_recv, "receiver", "1 (self)");
+	}
+	else {
+	    F_NODE(nd_recv, "receiver");
+	}
 	F_ID(nd_mid, "method name");
 	LAST_NODE;
 	F_NODE(nd_args, "arguments");
-	return;
+	break;
+
+      case NODE_PRELUDE:
+	ANN("pre-execution");
+	ANN("format: BEGIN { [nd_head] }; [nd_body]");
+	ANN("example: bar; BEGIN { foo }");
+#define nd_compile_option u3.value
+	F_NODE(nd_head, "prelude");
+	if (!node->nd_compile_option) LAST_NODE;
+	F_NODE(nd_body, "body");
+	if (node->nd_compile_option) {
+	    LAST_NODE;
+	    F_OPTION(nd_compile_option, "compile_option");
+	}
+	break;
 
       case NODE_LAMBDA:
 	ANN("lambda expression");
@@ -940,7 +901,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	ANN("example: -> { foo }");
 	LAST_NODE;
 	F_NODE(nd_body, "lambda clause");
-	return;
+	break;
 
       case NODE_OPT_ARG:
 	ANN("optional arguments");
@@ -949,7 +910,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_body, "body");
 	LAST_NODE;
 	F_NODE(nd_next, "next");
-	return;
+	break;
 
       case NODE_KW_ARG:
 	ANN("keyword arguments");
@@ -958,21 +919,21 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_body, "body");
 	LAST_NODE;
 	F_NODE(nd_next, "next");
-	return;
+	break;
 
       case NODE_POSTARG:
 	ANN("post arguments");
 	ANN("format: *[nd_1st], [nd_2nd..] = ..");
 	ANN("example: a, *rest, z = foo");
-	if (NODE_NAMED_REST_P(node->nd_1st)) {
+	if ((VALUE)node->nd_1st != (VALUE)-1) {
 	    F_NODE(nd_1st, "rest argument");
 	}
 	else {
-	    F_MSG(nd_1st, "rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
+	    F_MSG(nd_1st, "rest argument", "-1 (rest argument without name)");
 	}
 	LAST_NODE;
 	F_NODE(nd_2nd, "post arguments");
-	return;
+	break;
 
       case NODE_ARGS:
 	ANN("method parameters");
@@ -986,10 +947,10 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_ID(nd_ainfo->rest_arg, "rest argument");
 	F_ID(nd_ainfo->block_arg, "block argument");
 	F_NODE(nd_ainfo->opt_args, "optional arguments");
-	F_NODE(nd_ainfo->kw_args, "keyword arguments");
 	LAST_NODE;
+	F_NODE(nd_ainfo->kw_args, "keyword arguments");
 	F_NODE(nd_ainfo->kw_rest_arg, "keyword rest argument");
-	return;
+	break;
 
       case NODE_SCOPE:
 	ANN("new scope");
@@ -1006,18 +967,15 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
 	F_NODE(nd_args, "arguments");
 	LAST_NODE;
 	F_NODE(nd_body, "body");
-	return;
-
-      case NODE_ARGS_AUX:
-      case NODE_LAST:
 	break;
-    }
 
-    rb_bug("dump_node: unknown node: %s", ruby_node_name(nd_type(node)));
+      default:
+	rb_bug("dump_node: unknown node: %s", ruby_node_name(nd_type(node)));
+    }
 }
 
 VALUE
-rb_parser_dump_tree(const NODE *node, int comment)
+rb_parser_dump_tree(NODE *node, int comment)
 {
     VALUE buf = rb_str_new_cstr(
 	"###########################################################\n"
@@ -1029,120 +987,178 @@ rb_parser_dump_tree(const NODE *node, int comment)
     return buf;
 }
 
-/* Setup NODE structure.
- * NODE is not an object managed by GC, but it imitates an object
- * so that it can work with `RB_TYPE_P(obj, T_NODE)`.
- * This dirty hack is needed because Ripper jumbles NODEs and other type
- * objects.
- */
 void
-rb_node_init(NODE *n, enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+rb_gc_free_node(VALUE obj)
 {
-    n->flags = T_NODE;
-    nd_set_type(n, type);
-    n->u1.value = a0;
-    n->u2.value = a1;
-    n->u3.value = a2;
-    n->nd_loc.beg_pos.lineno = 0;
-    n->nd_loc.beg_pos.column = 0;
-    n->nd_loc.end_pos.lineno = 0;
-    n->nd_loc.end_pos.column = 0;
-}
-
-typedef struct node_buffer_elem_struct {
-    struct node_buffer_elem_struct *next;
-    NODE buf[FLEX_ARY_LEN];
-} node_buffer_elem_t;
-
-struct node_buffer_struct {
-    long idx, len;
-    node_buffer_elem_t *head;
-    node_buffer_elem_t *last;
-    VALUE mark_ary;
-};
-
-static node_buffer_t *
-rb_node_buffer_new(void)
-{
-    node_buffer_t *nb = xmalloc(sizeof(node_buffer_t) + offsetof(node_buffer_elem_t, buf) + 16 * sizeof(NODE));
-    nb->idx = 0;
-    nb->len = 16;
-    nb->head = nb->last = (node_buffer_elem_t*) &nb[1];
-    nb->head->next = NULL;
-    nb->mark_ary = rb_ary_tmp_new(0);
-    return nb;
-}
-
-static void
-rb_node_buffer_free(node_buffer_t *nb)
-{
-    node_buffer_elem_t *nbe = nb->head;
-
-    while (nbe != nb->last) {
-	void *buf = nbe;
-	nbe = nbe->next;
-	xfree(buf);
+    switch (nd_type(obj)) {
+      case NODE_SCOPE:
+	if (RNODE(obj)->nd_tbl) {
+	    xfree(RNODE(obj)->nd_tbl);
+	}
+	break;
+      case NODE_ARGS:
+	if (RNODE(obj)->nd_ainfo) {
+	    xfree(RNODE(obj)->nd_ainfo);
+	}
+	break;
+      case NODE_ALLOCA:
+	xfree(RNODE(obj)->u1.node);
+	break;
     }
-    xfree(nb);
 }
 
-NODE *
-rb_ast_newnode(rb_ast_t *ast)
+size_t
+rb_node_memsize(VALUE obj)
 {
-    node_buffer_t *nb = ast->node_buffer;
-    if (nb->idx >= nb->len) {
-	long n = nb->len * 2;
-	node_buffer_elem_t *nbe;
-	nbe = xmalloc(offsetof(node_buffer_elem_t, buf) + n * sizeof(NODE));
-	nb->idx = 0;
-	nb->len = n;
-	nbe->next = nb->head;
-	nb->head = nbe;
+    size_t size = 0;
+    switch (nd_type(obj)) {
+      case NODE_SCOPE:
+	if (RNODE(obj)->nd_tbl) {
+	    size += (RNODE(obj)->nd_tbl[0]+1) * sizeof(*RNODE(obj)->nd_tbl);
+	}
+	break;
+      case NODE_ARGS:
+	if (RNODE(obj)->nd_ainfo) {
+	    size += sizeof(*RNODE(obj)->nd_ainfo);
+	}
+	break;
+      case NODE_ALLOCA:
+	size += RNODE(obj)->nd_cnt * sizeof(VALUE);
+	break;
     }
-    return &nb->head->buf[nb->idx++];
+    return size;
 }
 
-void
-rb_ast_delete_node(rb_ast_t *ast, NODE *n)
+VALUE
+rb_gc_mark_node(NODE *obj)
 {
-    (void)ast;
-    (void)n;
-    /* should we implement freelist? */
-}
+    switch (nd_type(obj)) {
+      case NODE_IF:		/* 1,2,3 */
+      case NODE_FOR:
+      case NODE_ITER:
+      case NODE_WHEN:
+      case NODE_MASGN:
+      case NODE_RESCUE:
+      case NODE_RESBODY:
+      case NODE_CLASS:
+      case NODE_BLOCK_PASS:
+      case NODE_MATCH2:
+	rb_gc_mark(RNODE(obj)->u2.value);
+	/* fall through */
+      case NODE_BLOCK:	/* 1,3 */
+      case NODE_ARRAY:
+      case NODE_DSTR:
+      case NODE_DXSTR:
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+      case NODE_ENSURE:
+      case NODE_CALL:
+      case NODE_DEFS:
+      case NODE_OP_ASGN1:
+	rb_gc_mark(RNODE(obj)->u1.value);
+	/* fall through */
+      case NODE_SUPER:	/* 3 */
+      case NODE_FCALL:
+      case NODE_DEFN:
+      case NODE_ARGS_AUX:
+	return RNODE(obj)->u3.value;
 
-rb_ast_t *
-rb_ast_new(void)
-{
-    node_buffer_t *nb = rb_node_buffer_new();
-    VALUE mark_ary = nb->mark_ary;
-    rb_ast_t *ast = (rb_ast_t *)rb_imemo_new(imemo_ast, 0, 0, 0, (VALUE)nb);
-    RB_OBJ_WRITTEN(ast, Qnil, mark_ary);
-    return ast;
-}
+      case NODE_WHILE:	/* 1,2 */
+      case NODE_UNTIL:
+      case NODE_AND:
+      case NODE_OR:
+      case NODE_CASE:
+      case NODE_SCLASS:
+      case NODE_DOT2:
+      case NODE_DOT3:
+      case NODE_FLIP2:
+      case NODE_FLIP3:
+      case NODE_MATCH3:
+      case NODE_OP_ASGN_OR:
+      case NODE_OP_ASGN_AND:
+      case NODE_MODULE:
+      case NODE_ALIAS:
+      case NODE_VALIAS:
+      case NODE_ARGSCAT:
+	rb_gc_mark(RNODE(obj)->u1.value);
+	/* fall through */
+      case NODE_GASGN:	/* 2 */
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_IASGN:
+      case NODE_IASGN2:
+      case NODE_CVASGN:
+      case NODE_COLON3:
+      case NODE_OPT_N:
+      case NODE_EVSTR:
+      case NODE_UNDEF:
+      case NODE_POSTEXE:
+	return RNODE(obj)->u2.value;
 
-void
-rb_ast_mark(rb_ast_t *ast)
-{
-    if (ast->node_buffer) rb_gc_mark(ast->node_buffer->mark_ary);
-}
+      case NODE_HASH:	/* 1 */
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_XSTR:
+      case NODE_DEFINED:
+      case NODE_MATCH:
+      case NODE_RETURN:
+      case NODE_BREAK:
+      case NODE_NEXT:
+      case NODE_YIELD:
+      case NODE_COLON2:
+      case NODE_SPLAT:
+      case NODE_TO_ARY:
+	return RNODE(obj)->u1.value;
 
-void
-rb_ast_free(rb_ast_t *ast)
-{
-    if (ast->node_buffer) {
-	rb_node_buffer_free(ast->node_buffer);
-	ast->node_buffer = 0;
-    }
-}
+      case NODE_SCOPE:	/* 2,3 */
+      case NODE_CDECL:
+      case NODE_OPT_ARG:
+	rb_gc_mark(RNODE(obj)->u3.value);
+	return RNODE(obj)->u2.value;
+
+      case NODE_ARGS:	/* custom */
+	{
+	    struct rb_args_info *args = obj->u3.args;
+	    if (args) {
+		if (args->pre_init)    rb_gc_mark((VALUE)args->pre_init);
+		if (args->post_init)   rb_gc_mark((VALUE)args->post_init);
+		if (args->opt_args)    rb_gc_mark((VALUE)args->opt_args);
+		if (args->kw_args)     rb_gc_mark((VALUE)args->kw_args);
+		if (args->kw_rest_arg) rb_gc_mark((VALUE)args->kw_rest_arg);
+	    }
+	}
+	return RNODE(obj)->u2.value;
 
-void
-rb_ast_dispose(rb_ast_t *ast)
-{
-    rb_ast_free(ast);
-}
+      case NODE_ZARRAY:	/* - */
+      case NODE_ZSUPER:
+      case NODE_VCALL:
+      case NODE_GVAR:
+      case NODE_LVAR:
+      case NODE_DVAR:
+      case NODE_IVAR:
+      case NODE_CVAR:
+      case NODE_NTH_REF:
+      case NODE_BACK_REF:
+      case NODE_REDO:
+      case NODE_RETRY:
+      case NODE_SELF:
+      case NODE_NIL:
+      case NODE_TRUE:
+      case NODE_FALSE:
+      case NODE_ERRINFO:
+      case NODE_BLOCK_ARG:
+	break;
+      case NODE_ALLOCA:
+	rb_gc_mark_locations((VALUE*)RNODE(obj)->u1.value,
+			     (VALUE*)RNODE(obj)->u1.value + RNODE(obj)->u3.cnt);
+	rb_gc_mark(RNODE(obj)->u2.value);
+	break;
 
-void
-rb_ast_add_mark_object(rb_ast_t *ast, VALUE obj)
-{
-    rb_ary_push(ast->node_buffer->mark_ary, obj);
+      default:		/* unlisted NODE */
+	rb_gc_mark_maybe(RNODE(obj)->u1.value);
+	rb_gc_mark_maybe(RNODE(obj)->u2.value);
+	rb_gc_mark_maybe(RNODE(obj)->u3.value);
+    }
+    return 0;
 }
diff --git a/node.h b/node.h
index 0f5a2a923a..8d2ea53c73 100644
--- a/node.h
+++ b/node.h
@@ -21,132 +21,225 @@ extern "C" {
 
 enum node_type {
     NODE_SCOPE,
+#define NODE_SCOPE       NODE_SCOPE
     NODE_BLOCK,
+#define NODE_BLOCK       NODE_BLOCK
     NODE_IF,
-    NODE_UNLESS,
+#define NODE_IF          NODE_IF
     NODE_CASE,
-    NODE_CASE2,
+#define NODE_CASE        NODE_CASE
     NODE_WHEN,
+#define NODE_WHEN        NODE_WHEN
+    NODE_OPT_N,
+#define NODE_OPT_N       NODE_OPT_N
     NODE_WHILE,
+#define NODE_WHILE       NODE_WHILE
     NODE_UNTIL,
+#define NODE_UNTIL       NODE_UNTIL
     NODE_ITER,
+#define NODE_ITER        NODE_ITER
     NODE_FOR,
-    NODE_FOR_MASGN,
+#define NODE_FOR         NODE_FOR
     NODE_BREAK,
+#define NODE_BREAK       NODE_BREAK
     NODE_NEXT,
+#define NODE_NEXT        NODE_NEXT
     NODE_REDO,
+#define NODE_REDO        NODE_REDO
     NODE_RETRY,
+#define NODE_RETRY       NODE_RETRY
     NODE_BEGIN,
+#define NODE_BEGIN       NODE_BEGIN
     NODE_RESCUE,
+#define NODE_RESCUE      NODE_RESCUE
     NODE_RESBODY,
+#define NODE_RESBODY     NODE_RESBODY
     NODE_ENSURE,
+#define NODE_ENSURE      NODE_ENSURE
     NODE_AND,
+#define NODE_AND         NODE_AND
     NODE_OR,
+#define NODE_OR          NODE_OR
     NODE_MASGN,
+#define NODE_MASGN       NODE_MASGN
     NODE_LASGN,
+#define NODE_LASGN       NODE_LASGN
     NODE_DASGN,
+#define NODE_DASGN       NODE_DASGN
     NODE_DASGN_CURR,
+#define NODE_DASGN_CURR  NODE_DASGN_CURR
     NODE_GASGN,
+#define NODE_GASGN       NODE_GASGN
     NODE_IASGN,
+#define NODE_IASGN       NODE_IASGN
+    NODE_IASGN2,
+#define NODE_IASGN2      NODE_IASGN2
     NODE_CDECL,
+#define NODE_CDECL       NODE_CDECL
     NODE_CVASGN,
+#define NODE_CVASGN      NODE_CVASGN
+    NODE_CVDECL,
+#define NODE_CVDECL      NODE_CVDECL
     NODE_OP_ASGN1,
+#define NODE_OP_ASGN1    NODE_OP_ASGN1
     NODE_OP_ASGN2,
+#define NODE_OP_ASGN2    NODE_OP_ASGN2
     NODE_OP_ASGN_AND,
+#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
     NODE_OP_ASGN_OR,
+#define NODE_OP_ASGN_OR  NODE_OP_ASGN_OR
     NODE_OP_CDECL,
+#define NODE_OP_CDECL    NODE_OP_CDECL
     NODE_CALL,
-    NODE_OPCALL,
+#define NODE_CALL        NODE_CALL
     NODE_FCALL,
+#define NODE_FCALL       NODE_FCALL
     NODE_VCALL,
+#define NODE_VCALL       NODE_VCALL
     NODE_QCALL,
+#define NODE_QCALL       NODE_QCALL
     NODE_SUPER,
+#define NODE_SUPER       NODE_SUPER
     NODE_ZSUPER,
+#define NODE_ZSUPER      NODE_ZSUPER
     NODE_ARRAY,
+#define NODE_ARRAY       NODE_ARRAY
     NODE_ZARRAY,
+#define NODE_ZARRAY      NODE_ZARRAY
     NODE_VALUES,
+#define NODE_VALUES      NODE_VALUES
     NODE_HASH,
+#define NODE_HASH        NODE_HASH
     NODE_RETURN,
+#define NODE_RETURN      NODE_RETURN
     NODE_YIELD,
+#define NODE_YIELD       NODE_YIELD
     NODE_LVAR,
+#define NODE_LVAR        NODE_LVAR
     NODE_DVAR,
+#define NODE_DVAR        NODE_DVAR
     NODE_GVAR,
+#define NODE_GVAR        NODE_GVAR
     NODE_IVAR,
+#define NODE_IVAR        NODE_IVAR
     NODE_CONST,
+#define NODE_CONST       NODE_CONST
     NODE_CVAR,
+#define NODE_CVAR        NODE_CVAR
     NODE_NTH_REF,
+#define NODE_NTH_REF     NODE_NTH_REF
     NODE_BACK_REF,
+#define NODE_BACK_REF    NODE_BACK_REF
     NODE_MATCH,
+#define NODE_MATCH       NODE_MATCH
     NODE_MATCH2,
+#define NODE_MATCH2      NODE_MATCH2
     NODE_MATCH3,
+#define NODE_MATCH3      NODE_MATCH3
     NODE_LIT,
+#define NODE_LIT         NODE_LIT
     NODE_STR,
+#define NODE_STR         NODE_STR
     NODE_DSTR,
+#define NODE_DSTR        NODE_DSTR
     NODE_XSTR,
+#define NODE_XSTR        NODE_XSTR
     NODE_DXSTR,
+#define NODE_DXSTR       NODE_DXSTR
     NODE_EVSTR,
+#define NODE_EVSTR       NODE_EVSTR
     NODE_DREGX,
-    NODE_ONCE,
+#define NODE_DREGX       NODE_DREGX
+    NODE_DREGX_ONCE,
+#define NODE_DREGX_ONCE  NODE_DREGX_ONCE
     NODE_ARGS,
+#define NODE_ARGS        NODE_ARGS
     NODE_ARGS_AUX,
+#define NODE_ARGS_AUX    NODE_ARGS_AUX
     NODE_OPT_ARG,
+#define NODE_OPT_ARG     NODE_OPT_ARG
     NODE_KW_ARG,
+#define NODE_KW_ARG	 NODE_KW_ARG
     NODE_POSTARG,
+#define NODE_POSTARG     NODE_POSTARG
     NODE_ARGSCAT,
+#define NODE_ARGSCAT     NODE_ARGSCAT
     NODE_ARGSPUSH,
+#define NODE_ARGSPUSH    NODE_ARGSPUSH
     NODE_SPLAT,
+#define NODE_SPLAT       NODE_SPLAT
+    NODE_TO_ARY,
+#define NODE_TO_ARY      NODE_TO_ARY
+    NODE_BLOCK_ARG,
+#define NODE_BLOCK_ARG   NODE_BLOCK_ARG
     NODE_BLOCK_PASS,
+#define NODE_BLOCK_PASS  NODE_BLOCK_PASS
     NODE_DEFN,
+#define NODE_DEFN        NODE_DEFN
     NODE_DEFS,
+#define NODE_DEFS        NODE_DEFS
     NODE_ALIAS,
+#define NODE_ALIAS       NODE_ALIAS
     NODE_VALIAS,
+#define NODE_VALIAS      NODE_VALIAS
     NODE_UNDEF,
+#define NODE_UNDEF       NODE_UNDEF
     NODE_CLASS,
+#define NODE_CLASS       NODE_CLASS
     NODE_MODULE,
+#define NODE_MODULE      NODE_MODULE
     NODE_SCLASS,
+#define NODE_SCLASS      NODE_SCLASS
     NODE_COLON2,
+#define NODE_COLON2      NODE_COLON2
     NODE_COLON3,
+#define NODE_COLON3      NODE_COLON3
     NODE_DOT2,
+#define NODE_DOT2        NODE_DOT2
     NODE_DOT3,
+#define NODE_DOT3        NODE_DOT3
     NODE_FLIP2,
+#define NODE_FLIP2       NODE_FLIP2
     NODE_FLIP3,
+#define NODE_FLIP3       NODE_FLIP3
     NODE_SELF,
+#define NODE_SELF        NODE_SELF
     NODE_NIL,
+#define NODE_NIL         NODE_NIL
     NODE_TRUE,
+#define NODE_TRUE        NODE_TRUE
     NODE_FALSE,
+#define NODE_FALSE       NODE_FALSE
     NODE_ERRINFO,
+#define NODE_ERRINFO     NODE_ERRINFO
     NODE_DEFINED,
+#define NODE_DEFINED     NODE_DEFINED
     NODE_POSTEXE,
+#define NODE_POSTEXE     NODE_POSTEXE
+    NODE_ALLOCA,
+#define NODE_ALLOCA      NODE_ALLOCA
+    NODE_BMETHOD,
+#define NODE_BMETHOD     NODE_BMETHOD
     NODE_DSYM,
+#define NODE_DSYM        NODE_DSYM
     NODE_ATTRASGN,
+#define NODE_ATTRASGN    NODE_ATTRASGN
+    NODE_PRELUDE,
+#define NODE_PRELUDE     NODE_PRELUDE
     NODE_LAMBDA,
+#define NODE_LAMBDA      NODE_LAMBDA
     NODE_LAST
+#define NODE_LAST        NODE_LAST
 };
 
-typedef struct rb_code_position_struct {
-    int lineno;
-    int column;
-} rb_code_position_t;
-
-typedef struct rb_code_location_struct {
-    rb_code_position_t beg_pos;
-    rb_code_position_t end_pos;
-} rb_code_location_t;
-
-static inline rb_code_location_t code_loc_gen(rb_code_location_t *loc1, rb_code_location_t *loc2)
-{
-    rb_code_location_t loc;
-    loc.beg_pos = loc1->beg_pos;
-    loc.end_pos = loc2->end_pos;
-    return loc;
-}
-
 typedef struct RNode {
     VALUE flags;
+    VALUE nd_reserved;		/* ex nd_file */
     union {
 	struct RNode *node;
 	ID id;
 	VALUE value;
+	VALUE (*cfunc)(ANYARGS);
 	ID *tbl;
     } u1;
     union {
@@ -161,16 +254,15 @@ typedef struct RNode {
 	long state;
 	struct rb_global_entry *entry;
 	struct rb_args_info *args;
+	long cnt;
 	VALUE value;
     } u3;
-    rb_code_location_t nd_loc;
-    int node_id;
 } NODE;
 
 #define RNODE(obj)  (R_CAST(RNode)(obj))
 
 /* FL     : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8: TAINT, 9: UNTRUSTED, 10: EXIVAR, 11: FREEZE */
-/* NODE_FL: 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: NODE_FL_NEWLINE,
+/* NODE_FL: 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: NODE_FL_NEWLINE|NODE_FL_CREF_PUSHED_BY_EVAL,
  *          8..14: nd_type,
  *          15..: nd_line
  */
@@ -179,31 +271,17 @@ typedef struct RNode {
 #define NODE_TYPESHIFT 8
 #define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
 
-#define nd_type(n) ((int) (((n)->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
+#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
 #define nd_set_type(n,t) \
-    (n)->flags=(((n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
+    RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
 
 #define NODE_LSHIFT (NODE_TYPESHIFT+7)
 #define NODE_LMASK  (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) (int)(((SIGNED_VALUE)(n)->flags)>>NODE_LSHIFT)
+#define nd_line(n) (int)(RNODE(n)->flags>>NODE_LSHIFT)
 #define nd_set_line(n,l) \
-    (n)->flags=(((n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))
-
-#define nd_first_column(n) ((int)((n)->nd_loc.beg_pos.column))
-#define nd_set_first_column(n, v) ((n)->nd_loc.beg_pos.column = (v))
-#define nd_first_lineno(n) ((int)((n)->nd_loc.beg_pos.lineno))
-#define nd_set_first_lineno(n, v) ((n)->nd_loc.beg_pos.lineno = (v))
-#define nd_first_loc(n) ((n)->nd_loc.beg_pos)
-#define nd_set_first_loc(n, v) (nd_first_loc(n) = (v))
-
-#define nd_last_column(n) ((int)((n)->nd_loc.end_pos.column))
-#define nd_set_last_column(n, v) ((n)->nd_loc.end_pos.column = (v))
-#define nd_last_lineno(n) ((int)((n)->nd_loc.end_pos.lineno))
-#define nd_set_last_lineno(n, v) ((n)->nd_loc.end_pos.lineno = (v))
-#define nd_last_loc(n) ((n)->nd_loc.end_pos)
-#define nd_set_last_loc(n, v) (nd_last_loc(n) = (v))
-#define nd_node_id(n) ((n)->node_id)
-#define nd_set_node_id(n,id) ((n)->node_id = (id))
+    RNODE(n)->flags=((RNODE(n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))
+
+#define nd_refinements_  nd_reserved
 
 #define nd_head  u1.node
 #define nd_alen  u2.argc
@@ -213,6 +291,8 @@ typedef struct RNode {
 #define nd_body  u2.node
 #define nd_else  u3.node
 
+#define nd_orig  u3.value
+
 #define nd_resq  u2.node
 #define nd_ensr  u3.node
 
@@ -227,6 +307,7 @@ typedef struct RNode {
 #define nd_cval  u3.value
 
 #define nd_oid   u1.id
+#define nd_cnt   u3.cnt
 #define nd_tbl   u1.tbl
 
 #define nd_var   u1.node
@@ -237,6 +318,7 @@ typedef struct RNode {
 
 #define nd_lit   u1.value
 
+#define nd_frml  u2.argc
 #define nd_rest  u1.id
 #define nd_opt   u1.node
 #define nd_pid   u1.id
@@ -247,11 +329,18 @@ typedef struct RNode {
 #define nd_args  u3.node
 #define nd_ainfo u3.args
 
+#define nd_noex  u3.id
 #define nd_defn  u3.node
 
+#define nd_cfnc  u1.cfunc
+#define nd_argc  u2.argc
+
 #define nd_cpath u1.node
 #define nd_super u3.node
 
+#define nd_modl  u1.id
+#define nd_clss_  u1.value
+
 #define nd_beg   u1.node
 #define nd_end   u2.node
 #define nd_state u3.state
@@ -260,155 +349,137 @@ typedef struct RNode {
 #define nd_nth   u2.argc
 
 #define nd_tag   u1.id
-
-#define nd_alias  u1.id
-#define nd_orig   u2.id
-#define nd_undef  u2.node
-
-#define NEW_NODE(t,a0,a1,a2,loc) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2),loc)
-
-#define NEW_DEFN(i,a,d,loc) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d,loc),loc)
-#define NEW_DEFS(r,i,a,d,loc) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d,loc),loc)
-#define NEW_SCOPE(a,b,loc) NEW_NODE(NODE_SCOPE,local_tbl(p),b,a,loc)
-#define NEW_BLOCK(a,loc) NEW_NODE(NODE_BLOCK,a,0,0,loc)
-#define NEW_IF(c,t,e,loc) NEW_NODE(NODE_IF,c,t,e,loc)
-#define NEW_UNLESS(c,t,e,loc) NEW_NODE(NODE_UNLESS,c,t,e,loc)
-#define NEW_CASE(h,b,loc) NEW_NODE(NODE_CASE,h,b,0,loc)
-#define NEW_CASE2(b,loc) NEW_NODE(NODE_CASE2,0,b,0,loc)
-#define NEW_WHEN(c,t,e,loc) NEW_NODE(NODE_WHEN,c,t,e,loc)
-#define NEW_WHILE(c,b,n,loc) NEW_NODE(NODE_WHILE,c,b,n,loc)
-#define NEW_UNTIL(c,b,n,loc) NEW_NODE(NODE_UNTIL,c,b,n,loc)
-#define NEW_FOR(i,b,loc) NEW_NODE(NODE_FOR,0,b,i,loc)
-#define NEW_FOR_MASGN(v,loc) NEW_NODE(NODE_FOR_MASGN,v,0,0,loc)
-#define NEW_ITER(a,b,loc) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b,loc),0,loc)
-#define NEW_LAMBDA(a,b,loc) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b,loc),0,loc)
-#define NEW_BREAK(s,loc) NEW_NODE(NODE_BREAK,s,0,0,loc)
-#define NEW_NEXT(s,loc) NEW_NODE(NODE_NEXT,s,0,0,loc)
-#define NEW_REDO(loc) NEW_NODE(NODE_REDO,0,0,0,loc)
-#define NEW_RETRY(loc) NEW_NODE(NODE_RETRY,0,0,0,loc)
-#define NEW_BEGIN(b,loc) NEW_NODE(NODE_BEGIN,0,b,0,loc)
-#define NEW_RESCUE(b,res,e,loc) NEW_NODE(NODE_RESCUE,b,res,e,loc)
-#define NEW_RESBODY(a,ex,n,loc) NEW_NODE(NODE_RESBODY,n,ex,a,loc)
-#define NEW_ENSURE(b,en,loc) NEW_NODE(NODE_ENSURE,b,0,en,loc)
-#define NEW_RETURN(s,loc) NEW_NODE(NODE_RETURN,s,0,0,loc)
-#define NEW_YIELD(a,loc) NEW_NODE(NODE_YIELD,a,0,0,loc)
-#define NEW_LIST(a,loc)  NEW_ARRAY(a,loc)
-#define NEW_ARRAY(a,loc) NEW_NODE(NODE_ARRAY,a,1,0,loc)
-#define NEW_ZARRAY(loc) NEW_NODE(NODE_ZARRAY,0,0,0,loc)
-#define NEW_HASH(a,loc)  NEW_NODE(NODE_HASH,a,0,0,loc)
-#define NEW_MASGN(l,r,loc)   NEW_NODE(NODE_MASGN,l,0,r,loc)
-#define NEW_GASGN(v,val,loc) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v),loc)
-#define NEW_LASGN(v,val,loc) NEW_NODE(NODE_LASGN,v,val,0,loc)
-#define NEW_DASGN(v,val,loc) NEW_NODE(NODE_DASGN,v,val,0,loc)
-#define NEW_DASGN_CURR(v,val,loc) NEW_NODE(NODE_DASGN_CURR,v,val,0,loc)
-#define NEW_IASGN(v,val,loc) NEW_NODE(NODE_IASGN,v,val,0,loc)
-#define NEW_CDECL(v,val,path,loc) NEW_NODE(NODE_CDECL,v,val,path,loc)
-#define NEW_CVASGN(v,val,loc) NEW_NODE(NODE_CVASGN,v,val,0,loc)
-#define NEW_OP_ASGN1(p,id,a,loc) NEW_NODE(NODE_OP_ASGN1,p,id,a,loc)
-#define NEW_OP_ASGN2(r,t,i,o,val,loc) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o,t,loc),loc)
-#define NEW_OP_ASGN22(i,o,t,loc) NEW_NODE(NODE_OP_ASGN2,i,o,t,loc)
-#define NEW_OP_ASGN_OR(i,val,loc) NEW_NODE(NODE_OP_ASGN_OR,i,val,0,loc)
-#define NEW_OP_ASGN_AND(i,val,loc) NEW_NODE(NODE_OP_ASGN_AND,i,val,0,loc)
-#define NEW_OP_CDECL(v,op,val,loc) NEW_NODE(NODE_OP_CDECL,v,val,op,loc)
-#define NEW_GVAR(v,loc) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v),loc)
-#define NEW_LVAR(v,loc) NEW_NODE(NODE_LVAR,v,0,0,loc)
-#define NEW_DVAR(v,loc) NEW_NODE(NODE_DVAR,v,0,0,loc)
-#define NEW_IVAR(v,loc) NEW_NODE(NODE_IVAR,v,0,0,loc)
-#define NEW_CONST(v,loc) NEW_NODE(NODE_CONST,v,0,0,loc)
-#define NEW_CVAR(v,loc) NEW_NODE(NODE_CVAR,v,0,0,loc)
-#define NEW_NTH_REF(n,loc)  NEW_NODE(NODE_NTH_REF,0,n,0,loc)
-#define NEW_BACK_REF(n,loc) NEW_NODE(NODE_BACK_REF,0,n,0,loc)
-#define NEW_MATCH(c,loc) NEW_NODE(NODE_MATCH,c,0,0,loc)
-#define NEW_MATCH2(n1,n2,loc) NEW_NODE(NODE_MATCH2,n1,n2,0,loc)
-#define NEW_MATCH3(r,n2,loc) NEW_NODE(NODE_MATCH3,r,n2,0,loc)
-#define NEW_LIT(l,loc) NEW_NODE(NODE_LIT,l,0,0,loc)
-#define NEW_STR(s,loc) NEW_NODE(NODE_STR,s,0,0,loc)
-#define NEW_DSTR(s,loc) NEW_NODE(NODE_DSTR,s,1,0,loc)
-#define NEW_XSTR(s,loc) NEW_NODE(NODE_XSTR,s,0,0,loc)
-#define NEW_DXSTR(s,loc) NEW_NODE(NODE_DXSTR,s,0,0,loc)
-#define NEW_DSYM(s,loc) NEW_NODE(NODE_DSYM,s,0,0,loc)
-#define NEW_EVSTR(n,loc) NEW_NODE(NODE_EVSTR,0,(n),0,loc)
-#define NEW_CALL(r,m,a,loc) NEW_NODE(NODE_CALL,r,m,a,loc)
-#define NEW_OPCALL(r,m,a,loc) NEW_NODE(NODE_OPCALL,r,m,a,loc)
-#define NEW_FCALL(m,a,loc) NEW_NODE(NODE_FCALL,0,m,a,loc)
-#define NEW_VCALL(m,loc) NEW_NODE(NODE_VCALL,0,m,0,loc)
-#define NEW_SUPER(a,loc) NEW_NODE(NODE_SUPER,0,0,a,loc)
-#define NEW_ZSUPER(loc) NEW_NODE(NODE_ZSUPER,0,0,0,loc)
-#define NEW_ARGS_AUX(r,b,loc) NEW_NODE(NODE_ARGS_AUX,r,b,0,loc)
-#define NEW_OPT_ARG(i,v,loc) NEW_NODE(NODE_OPT_ARG,i,v,0,loc)
-#define NEW_KW_ARG(i,v,loc) NEW_NODE(NODE_KW_ARG,i,v,0,loc)
-#define NEW_POSTARG(i,v,loc) NEW_NODE(NODE_POSTARG,i,v,0,loc)
-#define NEW_ARGSCAT(a,b,loc) NEW_NODE(NODE_ARGSCAT,a,b,0,loc)
-#define NEW_ARGSPUSH(a,b,loc) NEW_NODE(NODE_ARGSPUSH,a,b,0,loc)
-#define NEW_SPLAT(a,loc) NEW_NODE(NODE_SPLAT,a,0,0,loc)
-#define NEW_BLOCK_PASS(b,loc) NEW_NODE(NODE_BLOCK_PASS,0,b,0,loc)
-#define NEW_ALIAS(n,o,loc) NEW_NODE(NODE_ALIAS,n,o,0,loc)
-#define NEW_VALIAS(n,o,loc) NEW_NODE(NODE_VALIAS,n,o,0,loc)
-#define NEW_UNDEF(i,loc) NEW_NODE(NODE_UNDEF,0,i,0,loc)
-#define NEW_CLASS(n,b,s,loc) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b,loc),(s),loc)
-#define NEW_SCLASS(r,b,loc) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b,loc),0,loc)
-#define NEW_MODULE(n,b,loc) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b,loc),0,loc)
-#define NEW_COLON2(c,i,loc) NEW_NODE(NODE_COLON2,c,i,0,loc)
-#define NEW_COLON3(i,loc) NEW_NODE(NODE_COLON3,0,i,0,loc)
-#define NEW_DOT2(b,e,loc) NEW_NODE(NODE_DOT2,b,e,0,loc)
-#define NEW_DOT3(b,e,loc) NEW_NODE(NODE_DOT3,b,e,0,loc)
-#define NEW_SELF(loc) NEW_NODE(NODE_SELF,0,0,0,loc)
-#define NEW_NIL(loc) NEW_NODE(NODE_NIL,0,0,0,loc)
-#define NEW_TRUE(loc) NEW_NODE(NODE_TRUE,0,0,0,loc)
-#define NEW_FALSE(loc) NEW_NODE(NODE_FALSE,0,0,0,loc)
-#define NEW_ERRINFO(loc) NEW_NODE(NODE_ERRINFO,0,0,0,loc)
-#define NEW_DEFINED(e,loc) NEW_NODE(NODE_DEFINED,e,0,0,loc)
-#define NEW_PREEXE(b,loc) NEW_SCOPE(b,loc)
-#define NEW_POSTEXE(b,loc) NEW_NODE(NODE_POSTEXE,0,b,0,loc)
-#define NEW_ATTRASGN(r,m,a,loc) NEW_NODE(NODE_ATTRASGN,r,m,a,loc)
-
-#define NODE_SPECIAL_REQUIRED_KEYWORD ((NODE *)-1)
-#define NODE_REQUIRED_KEYWORD_P(node) ((node)->nd_value == NODE_SPECIAL_REQUIRED_KEYWORD)
-#define NODE_SPECIAL_NO_NAME_REST     ((NODE *)-1)
-#define NODE_NAMED_REST_P(node) ((node) != NODE_SPECIAL_NO_NAME_REST)
+#define nd_tval  u2.value
+
+#define nd_visi_  u2.argc
+
+#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
+
+#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d))
+#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d))
+#define NEW_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a)
+#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
+#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
+#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
+#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
+#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
+#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
+#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
+#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
+#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
+#define NEW_ITER(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
+#define NEW_LAMBDA(a,b) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b),0)
+#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
+#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
+#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
+#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
+#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
+#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
+#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
+#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
+#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
+#define NEW_YIELD(a) NEW_NODE(NODE_YIELD,a,0,0)
+#define NEW_LIST(a)  NEW_ARRAY(a)
+#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
+#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
+#define NEW_HASH(a)  NEW_NODE(NODE_HASH,a,0,0)
+#define NEW_MASGN(l,r)   NEW_NODE(NODE_MASGN,l,0,r)
+#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
+#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,0)
+#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
+#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
+#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
+#define NEW_IASGN2(v,val) NEW_NODE(NODE_IASGN2,v,val,0)
+#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
+#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
+#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
+#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
+#define NEW_OP_ASGN2(r,t,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o,t))
+#define NEW_OP_ASGN22(i,o,t) NEW_NODE(NODE_OP_ASGN2,i,o,t)
+#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
+#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
+#define NEW_OP_CDECL(v,op,val) NEW_NODE(NODE_OP_CDECL,v,val,op)
+#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
+#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,0)
+#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
+#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
+#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
+#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
+#define NEW_NTH_REF(n)  NEW_NODE(NODE_NTH_REF,0,n,0)
+#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0)
+#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
+#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
+#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
+#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
+#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
+#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
+#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
+#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
+#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
+#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
+#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
+#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
+#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
+#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
+#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
+#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0)
+#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0)
+#define NEW_KW_ARG(i,v) NEW_NODE(NODE_KW_ARG,i,v,0)
+#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0)
+#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
+#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
+#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
+#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
+#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
+#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
+#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0)
+#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0)
+#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
+#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b),(s))
+#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0)
+#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
+#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
+#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
+#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
+#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
+#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
+#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
+#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
+#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
+#define NEW_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0)
+#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
+#define NEW_PREEXE(b) NEW_SCOPE(b)
+#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0)
+#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
+#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
+#define NEW_PRELUDE(p,b,o) NEW_NODE(NODE_PRELUDE,p,b,o)
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
-typedef struct node_buffer_struct node_buffer_t;
-/* T_IMEMO/ast */
-typedef struct rb_ast_body_struct {
-    const NODE *root;
-    VALUE compile_option;
-    int line_count;
-} rb_ast_body_t;
-typedef struct rb_ast_struct {
-    VALUE flags;
-    node_buffer_t *node_buffer;
-    rb_ast_body_t body;
-} rb_ast_t;
-rb_ast_t *rb_ast_new(void);
-void rb_ast_mark(rb_ast_t*);
-void rb_ast_dispose(rb_ast_t*);
-void rb_ast_free(rb_ast_t*);
-void rb_ast_add_mark_object(rb_ast_t*, VALUE);
-NODE *rb_ast_newnode(rb_ast_t*);
-void rb_ast_delete_node(rb_ast_t*, NODE *n);
-
 VALUE rb_parser_new(void);
 VALUE rb_parser_end_seen_p(VALUE);
 VALUE rb_parser_encoding(VALUE);
 VALUE rb_parser_get_yydebug(VALUE);
 VALUE rb_parser_set_yydebug(VALUE, VALUE);
-VALUE rb_parser_dump_tree(const NODE *node, int comment);
-void rb_parser_set_options(VALUE, int, int, int, int);
-
-rb_ast_t *rb_parser_compile_cstr(VALUE, const char*, const char*, int, int);
-rb_ast_t *rb_parser_compile_string(VALUE, const char*, VALUE, int);
-rb_ast_t *rb_parser_compile_file(VALUE, const char*, VALUE, int);
-rb_ast_t *rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line);
-rb_ast_t *rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line);
-rb_ast_t *rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int line);
-
-rb_ast_t *rb_compile_cstr(const char*, const char*, int, int);
-rb_ast_t *rb_compile_string(const char*, VALUE, int);
-rb_ast_t *rb_compile_file(const char*, VALUE, int);
-
-void rb_node_init(NODE *n, enum node_type type, VALUE a0, VALUE a1, VALUE a2);
+VALUE rb_parser_dump_tree(NODE *node, int comment);
+NODE *rb_parser_append_print(VALUE, NODE *);
+NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
+
+NODE *rb_parser_compile_cstr(VALUE, const char*, const char*, int, int);
+NODE *rb_parser_compile_string(VALUE, const char*, VALUE, int);
+NODE *rb_parser_compile_file(VALUE, const char*, VALUE, int);
+NODE *rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line);
+NODE *rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line);
+
+NODE *rb_compile_cstr(const char*, const char*, int, int);
+NODE *rb_compile_string(const char*, VALUE, int);
+NODE *rb_compile_file(const char*, VALUE, int);
+
+NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE);
+NODE *rb_node_newnode_longlife(enum node_type,VALUE,VALUE,VALUE);
+void rb_gc_free_node(VALUE obj);
+size_t rb_node_memsize(VALUE obj);
+VALUE rb_gc_mark_node(NODE *obj);
 
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 
@@ -435,7 +506,7 @@ void *rb_parser_malloc(struct parser_params *, size_t);
 void *rb_parser_realloc(struct parser_params *, void *, size_t);
 void *rb_parser_calloc(struct parser_params *, size_t, size_t);
 void rb_parser_free(struct parser_params *, void *);
-PRINTF_ARGS(void rb_parser_printf(struct parser_params *parser, const char *fmt, ...), 2, 3);
+void rb_parser_printf(struct parser_params *parser, const char *fmt, ...);
 
 RUBY_SYMBOL_EXPORT_END
 
diff --git a/numeric.c b/numeric.c
index d602d0afde..ffa576149e 100644
--- a/numeric.c
+++ b/numeric.c
@@ -9,9 +9,8 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
-#include "ruby/util.h"
 #include "internal.h"
+#include "ruby/util.h"
 #include "id.h"
 #include <assert.h>
 #include <ctype.h>
@@ -61,14 +60,14 @@
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 
-#ifndef USE_RB_INFINITY
+#ifdef HAVE_INFINITY
 #elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
 const union bytesequence4_or_float rb_infinity = {{0x00, 0x00, 0x80, 0x7f}};
 #else
 const union bytesequence4_or_float rb_infinity = {{0x7f, 0x80, 0x00, 0x00}};
 #endif
 
-#ifndef USE_RB_NAN
+#ifdef HAVE_NAN
 #elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
 const union bytesequence4_or_float rb_nan = {{0x00, 0x00, 0xc0, 0x7f}};
 #else
@@ -94,82 +93,41 @@ round(double x)
 #endif
 
 static double
-round_half_up(double x, double s)
+round_to_nearest(double x, double s)
 {
     double f, xs = x * s;
 
+#ifdef HAVE_ROUND
     f = round(xs);
-    if (s == 1.0) return f;
+#endif
     if (x > 0) {
+#ifndef HAVE_ROUND
+	f = floor(xs);
+#endif
 	if ((double)((f + 0.5) / s) <= x) f += 1;
 	x = f;
     }
     else {
+#ifndef HAVE_ROUND
+	f = ceil(xs);
+#endif
 	if ((double)((f - 0.5) / s) >= x) f -= 1;
 	x = f;
     }
     return x;
 }
 
-static double
-round_half_down(double x, double s)
-{
-    double f, xs = x * s;
-
-    f = round(xs);
-    if (x > 0) {
-	if ((double)((f - 0.5) / s) >= x) f -= 1;
-	x = f;
-    }
-    else {
-	if ((double)((f + 0.5) / s) <= x) f += 1;
-	x = f;
-    }
-    return x;
-}
-
-static double
-round_half_even(double x, double s)
-{
-    double f, d, xs = x * s;
-
-    if (x > 0.0) {
-	f = floor(xs);
-	d = xs - f;
-	if (d > 0.5)
-	    d = 1.0;
-	else if (d == 0.5 || ((double)((f + 0.5) / s) <= x))
-	    d = fmod(f, 2.0);
-	else
-	    d = 0.0;
-	x = f + d;
-    }
-    else if (x < 0.0) {
-	f = ceil(xs);
-	d = f - xs;
-	if (d > 0.5)
-	    d = 1.0;
-	else if (d == 0.5 || ((double)((f - 0.5) / s) >= x))
-	    d = fmod(-f, 2.0);
-	else
-	    d = 0.0;
-	x = f - d;
-    }
-    return x;
-}
-
 static VALUE fix_uminus(VALUE num);
 static VALUE fix_mul(VALUE x, VALUE y);
 static VALUE fix_lshift(long, unsigned long);
 static VALUE fix_rshift(long, unsigned long);
 static VALUE int_pow(long x, unsigned long y);
-static VALUE int_even_p(VALUE x);
+static VALUE int_cmp(VALUE x, VALUE y);
 static int int_round_zero_p(VALUE num, int ndigits);
 VALUE rb_int_floor(VALUE num, int ndigits);
 VALUE rb_int_ceil(VALUE num, int ndigits);
 static VALUE flo_to_i(VALUE num);
-static int float_round_overflow(int ndigits, int binexp);
-static int float_round_underflow(int ndigits, int binexp);
+static int float_invariant_round(double number, int ndigits, VALUE *num);
 
 static ID id_coerce, id_div, id_divmod;
 #define id_to_i idTo_i
@@ -194,49 +152,6 @@ rb_num_zerodiv(void)
     rb_raise(rb_eZeroDivError, "divided by 0");
 }
 
-enum ruby_num_rounding_mode
-rb_num_get_rounding_option(VALUE opts)
-{
-    static ID round_kwds[1];
-    VALUE rounding;
-    VALUE str;
-    const char *s;
-
-    if (!NIL_P(opts)) {
-	if (!round_kwds[0]) {
-	    round_kwds[0] = rb_intern_const("half");
-	}
-	if (!rb_get_kwargs(opts, round_kwds, 0, 1, &rounding)) goto noopt;
-	if (SYMBOL_P(rounding)) {
-	    str = rb_sym2str(rounding);
-	}
-	else if (NIL_P(rounding)) {
-	    goto noopt;
-	}
-	else if (!RB_TYPE_P(str = rounding, T_STRING)) {
-	    str = rb_check_string_type(rounding);
-	    if (NIL_P(str)) goto invalid;
-	}
-	s = RSTRING_PTR(str);
-	switch (RSTRING_LEN(str)) {
-	  case 2:
-	    if (rb_memcicmp(s, "up", 2) == 0)
-		return RUBY_NUM_ROUND_HALF_UP;
-	    break;
-	  case 4:
-	    if (rb_memcicmp(s, "even", 4) == 0)
-		return RUBY_NUM_ROUND_HALF_EVEN;
-	    if (strncasecmp(s, "down", 4) == 0)
-		return RUBY_NUM_ROUND_HALF_DOWN;
-	    break;
-	}
-      invalid:
-	rb_raise(rb_eArgError, "invalid rounding mode: % "PRIsVALUE, rounding);
-    }
-  noopt:
-    return RUBY_NUM_ROUND_DEFAULT;
-}
-
 /* experimental API */
 int
 rb_num_to_uint(VALUE val, unsigned int *ret)
@@ -271,6 +186,22 @@ rb_num_to_uint(VALUE val, unsigned int *ret)
 
 #define method_basic_p(klass) rb_method_basic_definition_p(klass, mid)
 
+static VALUE
+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;
+}
+
+#define FIXNUM_POSITIVE_P(num) ((SIGNED_VALUE)(num) > (SIGNED_VALUE)INT2FIX(0))
+#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0)
+#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0))
+
+#if 0
 static inline int
 int_pos_p(VALUE num)
 {
@@ -280,8 +211,9 @@ int_pos_p(VALUE num)
     else if (RB_TYPE_P(num, T_BIGNUM)) {
 	return BIGNUM_POSITIVE_P(num);
     }
-    rb_raise(rb_eTypeError, "not an Integer");
+    return Qnil;
 }
+#endif
 
 static inline int
 int_neg_p(VALUE num)
@@ -292,25 +224,45 @@ int_neg_p(VALUE num)
     else if (RB_TYPE_P(num, T_BIGNUM)) {
 	return BIGNUM_NEGATIVE_P(num);
     }
-    rb_raise(rb_eTypeError, "not an Integer");
+    return Qnil;
 }
 
-int
-rb_int_positive_p(VALUE num)
+static inline int
+positive_int_p(VALUE num)
 {
-    return int_pos_p(num);
+    const ID mid = '>';
+
+    if (FIXNUM_P(num)) {
+	if (method_basic_p(rb_cInteger))
+	    return FIXNUM_POSITIVE_P(num);
+    }
+    else if (RB_TYPE_P(num, T_BIGNUM)) {
+	if (method_basic_p(rb_cInteger))
+	    return BIGNUM_POSITIVE_P(num);
+    }
+    return RTEST(compare_with_zero(num, mid));
 }
 
-int
-rb_int_negative_p(VALUE num)
+static inline int
+negative_int_p(VALUE num)
 {
-    return int_neg_p(num);
+    const ID mid = '<';
+
+    if (FIXNUM_P(num)) {
+	if (method_basic_p(rb_cInteger))
+	    return FIXNUM_NEGATIVE_P(num);
+    }
+    else if (RB_TYPE_P(num, T_BIGNUM)) {
+	if (method_basic_p(rb_cInteger))
+	    return BIGNUM_NEGATIVE_P(num);
+    }
+    return RTEST(compare_with_zero(num, mid));
 }
 
 int
 rb_num_negative_p(VALUE num)
 {
-    return rb_num_negative_int_p(num);
+    return negative_int_p(num);
 }
 
 static VALUE
@@ -332,7 +284,7 @@ num_funcall_op_0(VALUE x, VALUE arg, int recursive)
 			  ID2SYM(func), x);
 	}
     }
-    return rb_funcallv(x, func, 0, 0);
+    return rb_funcall(x, func, 0, 0);
 }
 
 static VALUE
@@ -341,29 +293,21 @@ num_funcall0(VALUE x, ID func)
     return rb_exec_recursive(num_funcall_op_0, x, (VALUE)func);
 }
 
-NORETURN(static void num_funcall_op_1_recursion(VALUE x, ID func, VALUE y));
-
-static void
-num_funcall_op_1_recursion(VALUE x, ID func, VALUE y)
-{
-    const char *name = rb_id2name(func);
-    if (ISALNUM(name[0])) {
-	rb_name_error(func, "%"PRIsVALUE".%"PRIsVALUE"(%"PRIsVALUE")",
-		      x, ID2SYM(func), y);
-    }
-    else {
-	rb_name_error(func, "%"PRIsVALUE"%"PRIsVALUE"%"PRIsVALUE,
-		      x, ID2SYM(func), y);
-    }
-}
-
 static VALUE
-num_funcall_op_1(VALUE y, VALUE arg, int recursive)
+num_funcall_op_1(VALUE x, VALUE arg, int recursive)
 {
     ID func = (ID)((VALUE *)arg)[0];
-    VALUE x = ((VALUE *)arg)[1];
+    VALUE y = ((VALUE *)arg)[1];
     if (recursive) {
-	num_funcall_op_1_recursion(x, func, y);
+	const char *name = rb_id2name(func);
+	if (ISALNUM(name[0])) {
+	    rb_name_error(func, "%"PRIsVALUE".%"PRIsVALUE"(%"PRIsVALUE")",
+			  x, ID2SYM(func), y);
+	}
+	else {
+	    rb_name_error(func, "%"PRIsVALUE"%"PRIsVALUE"%"PRIsVALUE,
+			  x, ID2SYM(func), y);
+	}
     }
     return rb_funcall(x, func, 1, y);
 }
@@ -373,17 +317,17 @@ num_funcall1(VALUE x, ID func, VALUE y)
 {
     VALUE args[2];
     args[0] = (VALUE)func;
-    args[1] = x;
-    return rb_exec_recursive_paired(num_funcall_op_1, y, x, (VALUE)args);
+    args[1] = y;
+    return rb_exec_recursive_paired(num_funcall_op_1, x, y, (VALUE)args);
 }
 
 /*
  *  call-seq:
  *     num.coerce(numeric)  ->  array
  *
- *  If +numeric+ is the same type as +num+, returns an array
- *  <code>[numeric, num]</code>. Otherwise, returns an array with both
- *  +numeric+ and +num+ represented as Float objects.
+ *  If a +numeric+ is the same type as +num+, returns an array containing
+ *  +numeric+ and +num+. Otherwise, returns an array with both a +numeric+ and
+ *  +num+ represented as Float objects.
  *
  *  This coercion mechanism is used by Ruby to handle mixed-type numeric
  *  operations: it is intended to find a compatible common type between the two
@@ -404,6 +348,13 @@ num_coerce(VALUE x, VALUE y)
     return rb_assoc_new(y, x);
 }
 
+static VALUE
+coerce_body(VALUE arg)
+{
+    VALUE *x = (VALUE *)arg;
+    return rb_funcall(x[1], id_coerce, 1, x[0]);
+}
+
 NORETURN(static void coerce_failed(VALUE x, VALUE y));
 static void
 coerce_failed(VALUE x, VALUE y)
@@ -418,21 +369,50 @@ coerce_failed(VALUE x, VALUE y)
 	     y, rb_obj_class(x));
 }
 
+static VALUE
+coerce_rescue(VALUE arg, VALUE errinfo)
+{
+    VALUE *x = (VALUE *)arg;
+    coerce_failed(x[0], x[1]);
+    return Qnil;		/* dummy */
+}
+
+static VALUE
+coerce_rescue_quiet(VALUE arg, VALUE errinfo)
+{
+    return Qundef;
+}
+
 static int
 do_coerce(VALUE *x, VALUE *y, int err)
 {
-    VALUE ary = rb_check_funcall(*y, id_coerce, 1, x);
-    if (ary == Qundef) {
+    VALUE ary;
+    VALUE a[2];
+
+    a[0] = *x; a[1] = *y;
+
+    if (!rb_respond_to(*y, id_coerce)) {
 	if (err) {
 	    coerce_failed(*x, *y);
 	}
 	return FALSE;
     }
-    if (!err && NIL_P(ary)) {
+
+    ary = rb_rescue(coerce_body, (VALUE)a, err ? coerce_rescue : coerce_rescue_quiet, (VALUE)a);
+    if (ary == Qundef) {
+	rb_warn("Numerical comparison operators will no more rescue exceptions of #coerce");
+	rb_warn("in the next release. Return nil in #coerce if the coercion is impossible.");
 	return FALSE;
     }
     if (!RB_TYPE_P(ary, T_ARRAY) || RARRAY_LEN(ary) != 2) {
-	rb_raise(rb_eTypeError, "coerce must return [x, y]");
+	if (err) {
+	    rb_raise(rb_eTypeError, "coerce must return [x, y]");
+	}
+	else if (!NIL_P(ary)) {
+	    rb_warn("Bad return value for #coerce, called by numerical comparison operators.");
+	    rb_warn("#coerce must return [x, y]. The next release will raise an error for this.");
+	}
+	return FALSE;
     }
 
     *x = RARRAY_AREF(ary, 0);
@@ -469,8 +449,6 @@ rb_num_coerce_relop(VALUE x, VALUE y, ID func)
 }
 
 /*
- * :nodoc:
- *
  * Trap attempts to add methods to Numeric objects. Always raises a TypeError.
  *
  * Numerics should be values; singleton_methods should not be added to them.
@@ -487,46 +465,27 @@ num_sadded(VALUE x, VALUE name)
 	     rb_id2str(mid),
 	     rb_obj_class(x));
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
-#if 0
 /*
- *  call-seq:
- *     num.clone(freeze: true)  ->  num
+ * Numerics are immutable values, which should not be copied.
  *
- *  Returns the receiver.  +freeze+ cannot be +false+.
+ * Any attempt to use this method on a Numeric will raise a TypeError.
  */
 static VALUE
-num_clone(int argc, VALUE *argv, VALUE x)
+num_init_copy(VALUE x, VALUE y)
 {
-    return rb_immutable_obj_clone(argc, argv, x);
-}
-#else
-# define num_clone rb_immutable_obj_clone
-#endif
+    rb_raise(rb_eTypeError, "can't copy %"PRIsVALUE, rb_obj_class(x));
 
-#if 0
-/*
- *  call-seq:
- *     num.dup  ->  num
- *
- *  Returns the receiver.
- */
-static VALUE
-num_dup(VALUE x)
-{
-    return x;
+    UNREACHABLE;
 }
-#else
-# define num_dup num_uplus
-#endif
 
 /*
  *  call-seq:
  *     +num  ->  num
  *
- *  Unary Plus---Returns the receiver.
+ *  Unary Plus---Returns the receiver's value.
  */
 
 static VALUE
@@ -537,13 +496,10 @@ num_uplus(VALUE num)
 
 /*
  *  call-seq:
- *     num.i  ->  Complex(0, num)
+ *     num.i  ->  Complex(0,num)
  *
  *  Returns the corresponding imaginary number.
  *  Not available for complex numbers.
- *
- *     -42.i  #=> (0-42i)
- *     2.0.i  #=> (0+2.0i)
  */
 
 static VALUE
@@ -552,11 +508,12 @@ num_imaginary(VALUE num)
     return rb_complex_new(INT2FIX(0), num);
 }
 
+
 /*
  *  call-seq:
  *     -num  ->  numeric
  *
- *  Unary Minus---Returns the receiver, negated.
+ *  Unary Minus---Returns the receiver's value, negated.
  */
 
 static VALUE
@@ -583,12 +540,13 @@ num_fdiv(VALUE x, VALUE y)
     return rb_funcall(rb_Float(x), '/', 1, y);
 }
 
+
 /*
  *  call-seq:
  *     num.div(numeric)  ->  integer
  *
  *  Uses +/+ to perform division, then converts the result to an integer.
- *  Numeric does not define the +/+ operator; this is left to subclasses.
+ *  +numeric+ does not define the +/+ operator; this is left to subclasses.
  *
  *  Equivalent to <code>num.divmod(numeric)[0]</code>.
  *
@@ -602,11 +560,12 @@ num_div(VALUE x, VALUE y)
     return rb_funcall(num_funcall1(x, '/', y), rb_intern("floor"), 0);
 }
 
+
 /*
  *  call-seq:
  *     num.modulo(numeric)  ->  real
  *
- *  <code>x.modulo(y)</code> means <code>x-y*(x/y).floor</code>.
+ *     x.modulo(y) means x-y*(x/y).floor
  *
  *  Equivalent to <code>num.divmod(numeric)[1]</code>.
  *
@@ -625,7 +584,7 @@ num_modulo(VALUE x, VALUE y)
  *  call-seq:
  *     num.remainder(numeric)  ->  real
  *
- *  <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ *     x.remainder(y) means x-y*(x/y).truncate
  *
  *  See Numeric#divmod.
  */
@@ -636,10 +595,10 @@ num_remainder(VALUE x, VALUE y)
     VALUE z = num_funcall1(x, '%', y);
 
     if ((!rb_equal(z, INT2FIX(0))) &&
-	((rb_num_negative_int_p(x) &&
-	  rb_num_positive_int_p(y)) ||
-	 (rb_num_positive_int_p(x) &&
-	  rb_num_negative_int_p(y)))) {
+	((negative_int_p(x) &&
+	  positive_int_p(y)) ||
+	 (positive_int_p(x) &&
+	  negative_int_p(y)))) {
 	return rb_funcall(z, '-', 1, y);
     }
     return z;
@@ -652,13 +611,12 @@ num_remainder(VALUE x, VALUE y)
  *  Returns an array containing the quotient and modulus obtained by dividing
  *  +num+ by +numeric+.
  *
- *  If <code>q, r = x.divmod(y)</code>, then
+ *  If <code>q, r = * x.divmod(y)</code>, then
  *
  *      q = floor(x/y)
- *      x = q*y + r
+ *      x = q*y+r
  *
- *  The quotient is rounded toward negative infinity, as shown in the
- *  following table:
+ *  The quotient is rounded toward -infinity, as shown in the following table:
  *
  *     a    |  b  |  a.divmod(b)  |   a/b   | a.modulo(b) | a.remainder(b)
  *    ------+-----+---------------+---------+-------------+---------------
@@ -681,11 +639,11 @@ num_remainder(VALUE x, VALUE y)
  *
  *  Examples
  *
- *     11.divmod(3)        #=> [3, 2]
- *     11.divmod(-3)       #=> [-4, -1]
- *     11.divmod(3.5)      #=> [3, 0.5]
- *     (-11).divmod(3.5)   #=> [-4, 3.0]
- *     11.5.divmod(3.5)    #=> [3, 1.0]
+ *     11.divmod(3)         #=> [3, 2]
+ *     11.divmod(-3)        #=> [-4, -1]
+ *     11.divmod(3.5)       #=> [3, 0.5]
+ *     (-11).divmod(3.5)    #=> [-4, 3.0]
+ *     (11.5).divmod(3.5)   #=> [3, 1.0]
  */
 
 static VALUE
@@ -698,7 +656,7 @@ num_divmod(VALUE x, VALUE y)
  *  call-seq:
  *     num.real?  ->  true or false
  *
- *  Returns +true+ if +num+ is a real number (i.e. not Complex).
+ *  Returns +true+ if +num+ is a Real number. (i.e. not Complex).
  */
 
 static VALUE
@@ -711,10 +669,10 @@ num_real_p(VALUE num)
  *  call-seq:
  *     num.integer?  ->  true or false
  *
- *  Returns +true+ if +num+ is an Integer.
+ *  Returns +true+ if +num+ is an Integer (including Fixnum and Bignum).
  *
- *      1.0.integer?   #=> false
- *      1.integer?     #=> true
+ *      (1.0).integer? #=> false
+ *      (1).integer?   #=> true
  */
 
 static VALUE
@@ -734,18 +692,19 @@ num_int_p(VALUE num)
  *     (-34.56).abs   #=> 34.56
  *     -34.56.abs     #=> 34.56
  *
- *  Numeric#magnitude is an alias for Numeric#abs.
+ *  Numeric#magnitude is an alias of Numeric#abs.
  */
 
 static VALUE
 num_abs(VALUE num)
 {
-    if (rb_num_negative_int_p(num)) {
+    if (negative_int_p(num)) {
 	return num_funcall0(num, idUMinus);
     }
     return num;
 }
 
+
 /*
  *  call-seq:
  *     num.zero?  ->  true or false
@@ -757,15 +716,12 @@ static VALUE
 num_zero_p(VALUE num)
 {
     if (FIXNUM_P(num)) {
-	if (FIXNUM_ZERO_P(num)) {
+	if (FIX2LONG(num) == 0) {
 	    return Qtrue;
 	}
     }
     else if (RB_TYPE_P(num, T_BIGNUM)) {
-	if (rb_bigzero_p(num)) {
-	    /* this should not happen usually */
-	    return Qtrue;
-	}
+	return rb_bigzero_p(num);
     }
     else if (rb_equal(num, INT2FIX(0))) {
 	return Qtrue;
@@ -773,6 +729,7 @@ num_zero_p(VALUE num)
     return Qfalse;
 }
 
+
 /*
  *  call-seq:
  *     num.nonzero?  ->  self or nil
@@ -799,7 +756,7 @@ num_nonzero_p(VALUE num)
  *  call-seq:
  *     num.finite?  ->  true or false
  *
- *  Returns +true+ if +num+ is a finite number, otherwise returns +false+.
+ *  Return true if +num+ is finite number, oterwise returns false.
  */
 static VALUE
 num_finite_p(VALUE num)
@@ -809,10 +766,13 @@ num_finite_p(VALUE num)
 
 /*
  *  call-seq:
- *     num.infinite?  ->  -1, 1, or nil
+ *     num.infinite?  ->  nil or 1 or -1
+ *
+ *  Returns values corresponding to the value of +num+'s magnitude:
  *
- *  Returns +nil+, -1, or 1 depending on whether the value is
- *  finite, <code>-Infinity</code>, or <code>+Infinity</code>.
+ *  +finite+::    +nil+
+ *  +-Infinity+:: +-1+
+ *  ++Infinity+:: ++1+
  */
 static VALUE
 num_infinite_p(VALUE num)
@@ -826,9 +786,9 @@ num_infinite_p(VALUE num)
  *
  *  Invokes the child class's +to_i+ method to convert +num+ to an integer.
  *
- *      1.0.class          #=> Float
- *      1.0.to_int.class   #=> Integer
- *      1.0.to_i.class     #=> Integer
+ *      1.0.class => Float
+ *      1.0.to_int.class => Fixnum
+ *      1.0.to_i.class => Fixnum
  */
 
 static VALUE
@@ -839,7 +799,7 @@ num_to_int(VALUE num)
 
 /*
  *  call-seq:
- *     num.positive?  ->  true or false
+ *     num.positive? ->  true or false
  *
  *  Returns +true+ if +num+ is greater than 0.
  */
@@ -857,12 +817,12 @@ num_positive_p(VALUE num)
 	if (method_basic_p(rb_cInteger))
 	    return BIGNUM_POSITIVE_P(num) && !rb_bigzero_p(num) ? Qtrue : Qfalse;
     }
-    return rb_num_compare_with_zero(num, mid);
+    return compare_with_zero(num, mid);
 }
 
 /*
  *  call-seq:
- *     num.negative?  ->  true or false
+ *     num.negative? ->  true or false
  *
  *  Returns +true+ if +num+ is less than 0.
  */
@@ -870,7 +830,7 @@ num_positive_p(VALUE num)
 static VALUE
 num_negative_p(VALUE num)
 {
-    return rb_num_negative_int_p(num) ? Qtrue : Qfalse;
+    return negative_int_p(num) ? Qtrue : Qfalse;
 }
 
 
@@ -882,10 +842,10 @@ num_negative_p(VALUE num)
  *  architecture's double-precision floating point representation.
  *
  *  Floating point has a different arithmetic and is an inexact number.
- *  So you should know its esoteric system. See following:
+ *  So you should know its esoteric system. see following:
  *
  *  - http://docs.sun.com/source/806-3568/ncg_goldberg.html
- *  - https://github.com/rdp/ruby_tutorials_core/wiki/Ruby-Talk-FAQ#floats_imprecise
+ *  - http://wiki.github.com/rdp/ruby_tutorials_core/ruby-talk-faq#wiki-floats_imprecise
  *  - http://en.wikipedia.org/wiki/Floating_point#Accuracy_problems
  */
 
@@ -903,9 +863,9 @@ rb_float_new_in_heap(double d)
  *  call-seq:
  *     float.to_s  ->  string
  *
- *  Returns a string containing a representation of +self+.
- *  As well as a fixed or exponential form of the +float+,
- *  the call may return +NaN+, +Infinity+, and +-Infinity+.
+ *  Returns a string containing a representation of self. As well as a fixed or
+ *  exponential form of the +float+, the call may return +NaN+, +Infinity+, and
+ *  +-Infinity+.
  */
 
 static VALUE
@@ -983,10 +943,10 @@ flo_to_s(VALUE flt)
  *  call-seq:
  *     float.coerce(numeric)  ->  array
  *
- *  Returns an array with both +numeric+ and +float+ represented as Float
+ *  Returns an array with both a +numeric+ and a +float+ represented as Float
  *  objects.
  *
- *  This is achieved by converting +numeric+ to a Float.
+ *  This is achieved by converting a +numeric+ to a Float.
  *
  *     1.2.coerce(3)       #=> [3.0, 1.2]
  *     2.5.coerce(1.1)     #=> [1.1, 2.5]
@@ -1002,11 +962,11 @@ flo_coerce(VALUE x, VALUE y)
  * call-seq:
  *    -float  ->  float
  *
- * Returns +float+, negated.
+ * Returns float, negated.
  */
 
-VALUE
-rb_float_uminus(VALUE flt)
+static VALUE
+flo_uminus(VALUE flt)
 {
     return DBL2NUM(-RFLOAT_VALUE(flt));
 }
@@ -1015,11 +975,11 @@ rb_float_uminus(VALUE flt)
  * call-seq:
  *   float + other  ->  float
  *
- * Returns a new Float which is the sum of +float+ and +other+.
+ * Returns a new float which is the sum of +float+ and +other+.
  */
 
-VALUE
-rb_float_plus(VALUE x, VALUE y)
+static VALUE
+flo_plus(VALUE x, VALUE y)
 {
     if (RB_TYPE_P(y, T_FIXNUM)) {
 	return DBL2NUM(RFLOAT_VALUE(x) + (double)FIX2LONG(y));
@@ -1039,7 +999,7 @@ rb_float_plus(VALUE x, VALUE y)
  * call-seq:
  *   float - other  ->  float
  *
- * Returns a new Float which is the difference of +float+ and +other+.
+ * Returns a new float which is the difference of +float+ and +other+.
  */
 
 static VALUE
@@ -1063,11 +1023,11 @@ flo_minus(VALUE x, VALUE y)
  * call-seq:
  *   float * other  ->  float
  *
- * Returns a new Float which is the product of +float+ and +other+.
+ * Returns a new float which is the product of +float+ and +other+.
  */
 
-VALUE
-rb_float_mul(VALUE x, VALUE y)
+static VALUE
+flo_mul(VALUE x, VALUE y)
 {
     if (RB_TYPE_P(y, T_FIXNUM)) {
 	return DBL2NUM(RFLOAT_VALUE(x) * (double)FIX2LONG(y));
@@ -1083,71 +1043,39 @@ rb_float_mul(VALUE x, VALUE y)
     }
 }
 
-static bool
-flo_iszero(VALUE f)
-{
-    return RFLOAT_VALUE(f) == 0.0;
-}
-
-static double
-double_div_double(double x, double y)
-{
-    if (LIKELY(y != 0.0)) {
-        return x / y;
-    }
-    else if (x == 0.0) {
-        return nan("");
-    }
-    else {
-        double z = signbit(y) ? -1.0 : 1.0;
-        return x * z * HUGE_VAL;
-    }
-}
-
-MJIT_FUNC_EXPORTED VALUE
-rb_flo_div_flo(VALUE x, VALUE y)
-{
-    double num = RFLOAT_VALUE(x);
-    double den = RFLOAT_VALUE(y);
-    double ret = double_div_double(num, den);
-    return DBL2NUM(ret);
-}
-
 /*
  * call-seq:
  *   float / other  ->  float
  *
- * Returns a new Float which is the result of dividing +float+ by +other+.
+ * Returns a new float which is the result of dividing +float+ by +other+.
  */
 
 static VALUE
 flo_div(VALUE x, VALUE y)
 {
-    double num = RFLOAT_VALUE(x);
-    double den;
-    double ret;
+    long f_y;
+    double d;
 
     if (RB_TYPE_P(y, T_FIXNUM)) {
-        den = FIX2LONG(y);
+	f_y = FIX2LONG(y);
+	return DBL2NUM(RFLOAT_VALUE(x) / (double)f_y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
-        den = rb_big2dbl(y);
+	d = rb_big2dbl(y);
+	return DBL2NUM(RFLOAT_VALUE(x) / d);
     }
     else if (RB_TYPE_P(y, T_FLOAT)) {
-        den = RFLOAT_VALUE(y);
+	return DBL2NUM(RFLOAT_VALUE(x) / RFLOAT_VALUE(y));
     }
     else {
 	return rb_num_coerce_bin(x, y, '/');
     }
-
-    ret = double_div_double(num, den);
-    return DBL2NUM(ret);
 }
 
 /*
  *  call-seq:
  *     float.fdiv(numeric)  ->  float
- *     float.quo(numeric)   ->  float
+ *     float.quo(numeric)  ->  float
  *
  *  Returns <code>float / numeric</code>, same as Float#/.
  */
@@ -1201,7 +1129,7 @@ flodivmod(double x, double y, double *divp, double *modp)
  * An error will be raised if y == 0.
  */
 
-MJIT_FUNC_EXPORTED double
+double
 ruby_float_mod(double x, double y)
 {
     double mod;
@@ -1209,15 +1137,16 @@ ruby_float_mod(double x, double y)
     return mod;
 }
 
+
 /*
  *  call-seq:
  *     float % other        ->  float
  *     float.modulo(other)  ->  float
  *
- *  Returns the modulo after division of +float+ by +other+.
+ *  Return the modulo after division of +float+ by +other+.
  *
- *     6543.21.modulo(137)      #=> 104.21000000000004
- *     6543.21.modulo(137.24)   #=> 92.92999999999961
+ *     6543.21.modulo(137)      #=> 104.21
+ *     6543.21.modulo(137.24)   #=> 92.9299999999996
  */
 
 static VALUE
@@ -1255,8 +1184,8 @@ dbl2ival(double d)
  *
  *  See Numeric#divmod.
  *
- *     42.0.divmod(6)   #=> [7, 0.0]
- *     42.0.divmod(5)   #=> [8, 2.0]
+ *      42.0.divmod 6 #=> [7, 0.0]
+ *      42.0.divmod 5 #=> [8, 2.0]
  */
 
 static VALUE
@@ -1285,15 +1214,16 @@ flo_divmod(VALUE x, VALUE y)
 
 /*
  * call-seq:
- *    float ** other  ->  float
+ *
+ *  float ** other  ->  float
  *
  * Raises +float+ to the power of +other+.
  *
- *    2.0**3   #=> 8.0
+ *    2.0**3      #=> 8.0
  */
 
-VALUE
-rb_float_pow(VALUE x, VALUE y)
+static VALUE
+flo_pow(VALUE x, VALUE y)
 {
     double dx, dy;
     if (RB_TYPE_P(y, T_FIXNUM)) {
@@ -1308,7 +1238,7 @@ rb_float_pow(VALUE x, VALUE y)
 	dx = RFLOAT_VALUE(x);
 	dy = RFLOAT_VALUE(y);
 	if (dx < 0 && dy != round(dy))
-            return rb_dbl_complex_new_polar_pi(pow(-dx, dy), dy);
+	    return num_funcall1(rb_complex_raw1(x), idPow, y);
     }
     else {
 	return rb_num_coerce_bin(x, y, idPow);
@@ -1321,11 +1251,13 @@ rb_float_pow(VALUE x, VALUE y)
  *     num.eql?(numeric)  ->  true or false
  *
  *  Returns +true+ if +num+ and +numeric+ are the same type and have equal
- *  values.  Contrast this with Numeric#==, which performs type conversions.
+ *  values.  Contrast this with <code>Numeric#==</code>, which performs
+ *  type conversions.
  *
- *     1 == 1.0        #=> true
- *     1.eql?(1.0)     #=> false
- *     1.0.eql?(1.0)   #=> true
+ *     1 == 1.0          #=> true
+ *     1.eql?(1.0)       #=> false
+ *     (1.0).eql?(1.0)   #=> true
+ *     68719476736.eql?(68719476736.0)   #=> false
  */
 
 static VALUE
@@ -1344,7 +1276,8 @@ num_eql(VALUE x, VALUE y)
  *  call-seq:
  *     number <=> other  ->  0 or nil
  *
- *  Returns zero if +number+ equals +other+, otherwise returns +nil+.
+ *  Returns zero if +number+ equals +other+, otherwise +nil+ is returned if the
+ *  two values are incomparable.
  */
 
 static VALUE
@@ -1357,28 +1290,26 @@ num_cmp(VALUE x, VALUE y)
 static VALUE
 num_equal(VALUE x, VALUE y)
 {
-    VALUE result;
     if (x == y) return Qtrue;
-    result = num_funcall1(y, id_eq, x);
-    if (RTEST(result)) return Qtrue;
-    return Qfalse;
+    return num_funcall1(y, id_eq, x);
 }
 
 /*
  *  call-seq:
  *     float == obj  ->  true or false
  *
- *  Returns +true+ only if +obj+ has the same value as +float+.
- *  Contrast this with Float#eql?, which requires +obj+ to be a Float.
+ *  Returns +true+ only if +obj+ has the same value as +float+. Contrast this
+ *  with Float#eql?, which requires obj to be a Float.
+ *
+ *  The result of <code>NaN == NaN</code> is undefined, so the
+ *  implementation-dependent value is returned.
  *
  *     1.0 == 1   #=> true
  *
- *  The result of <code>NaN == NaN</code> is undefined,
- *  so an implementation-dependent value is returned.
  */
 
-MJIT_FUNC_EXPORTED VALUE
-rb_float_equal(VALUE x, VALUE y)
+static VALUE
+flo_eq(VALUE x, VALUE y)
 {
     volatile double a, b;
 
@@ -1401,11 +1332,9 @@ rb_float_equal(VALUE x, VALUE y)
     return (a == b)?Qtrue:Qfalse;
 }
 
-#define flo_eq rb_float_equal
-
 /*
  * call-seq:
- *    float.hash  ->  integer
+ *   float.hash  ->  integer
  *
  * Returns a hash code for this float.
  *
@@ -1421,7 +1350,12 @@ flo_hash(VALUE num)
 VALUE
 rb_dbl_hash(double d)
 {
-    return LONG2FIX(rb_dbl_long_hash(d));
+    st_index_t hash;
+
+    /* normalize -0.0 to 0.0 */
+    if (d == 0.0) d = 0.0;
+    hash = rb_memhash(&d, sizeof(d));
+    return LONG2FIX(hash);
 }
 
 VALUE
@@ -1436,14 +1370,13 @@ rb_dbl_cmp(double a, double b)
 
 /*
  *  call-seq:
- *     float <=> real  ->  -1, 0, +1, or nil
+ *     float <=> real  ->  -1, 0, +1 or nil
  *
- *  Returns -1, 0, or +1 depending on whether +float+ is
- *  less than, equal to, or greater than +real+.
- *  This is the basis for the tests in the Comparable module.
+ *  Returns -1, 0, +1 or nil depending on whether +float+ is less than, equal
+ *  to, or greater than +real+. This is the basis for the tests in Comparable.
  *
- *  The result of <code>NaN <=> NaN</code> is undefined,
- *  so an implementation-dependent value is returned.
+ *  The result of <code>NaN <=> NaN</code> is undefined, so the
+ *  implementation-dependent value is returned.
  *
  *  +nil+ is returned if the two values are incomparable.
  */
@@ -1480,24 +1413,18 @@ flo_cmp(VALUE x, VALUE y)
     return rb_dbl_cmp(a, b);
 }
 
-MJIT_FUNC_EXPORTED int
-rb_float_cmp(VALUE x, VALUE y)
-{
-    return NUM2INT(flo_cmp(x, y));
-}
-
 /*
  * call-seq:
  *   float > real  ->  true or false
  *
  * Returns +true+ if +float+ is greater than +real+.
  *
- * The result of <code>NaN > NaN</code> is undefined,
- * so an implementation-dependent value is returned.
+ * The result of <code>NaN > NaN</code> is undefined, so the
+ * implementation-dependent value is returned.
  */
 
-VALUE
-rb_float_gt(VALUE x, VALUE y)
+static VALUE
+flo_gt(VALUE x, VALUE y)
 {
     double a, b;
 
@@ -1529,8 +1456,8 @@ rb_float_gt(VALUE x, VALUE y)
  *
  * Returns +true+ if +float+ is greater than or equal to +real+.
  *
- * The result of <code>NaN >= NaN</code> is undefined,
- * so an implementation-dependent value is returned.
+ * The result of <code>NaN >= NaN</code> is undefined, so the
+ * implementation-dependent value is returned.
  */
 
 static VALUE
@@ -1566,8 +1493,8 @@ flo_ge(VALUE x, VALUE y)
  *
  * Returns +true+ if +float+ is less than +real+.
  *
- * The result of <code>NaN < NaN</code> is undefined,
- * so an implementation-dependent value is returned.
+ * The result of <code>NaN < NaN</code> is undefined, so the
+ * implementation-dependent value is returned.
  */
 
 static VALUE
@@ -1603,8 +1530,8 @@ flo_lt(VALUE x, VALUE y)
  *
  * Returns +true+ if +float+ is less than or equal to +real+.
  *
- * The result of <code>NaN <= NaN</code> is undefined,
- * so an implementation-dependent value is returned.
+ * The result of <code>NaN <= NaN</code> is undefined, so the
+ * implementation-dependent value is returned.
  */
 
 static VALUE
@@ -1641,14 +1568,14 @@ flo_le(VALUE x, VALUE y)
  *  Returns +true+ only if +obj+ is a Float with the same value as +float+.
  *  Contrast this with Float#==, which performs type conversions.
  *
- *     1.0.eql?(1)   #=> false
+ *  The result of <code>NaN.eql?(NaN)</code> is undefined, so the
+ *  implementation-dependent value is returned.
  *
- *  The result of <code>NaN.eql?(NaN)</code> is undefined,
- *  so an implementation-dependent value is returned.
+ *     1.0.eql?(1)   #=> false
  */
 
-MJIT_FUNC_EXPORTED VALUE
-rb_float_eql(VALUE x, VALUE y)
+static VALUE
+flo_eql(VALUE x, VALUE y)
 {
     if (RB_TYPE_P(y, T_FLOAT)) {
 	double a = RFLOAT_VALUE(x);
@@ -1662,13 +1589,11 @@ rb_float_eql(VALUE x, VALUE y)
     return Qfalse;
 }
 
-#define flo_eql rb_float_eql
-
 /*
  * call-seq:
- *    float.to_f  ->  self
+ *   float.to_f  ->  self
  *
- * Since +float+ is already a Float, returns +self+.
+ * Since +float+ is already a float, returns +self+.
  */
 
 static VALUE
@@ -1686,13 +1611,11 @@ flo_to_f(VALUE num)
  *
  *     (-34.56).abs   #=> 34.56
  *     -34.56.abs     #=> 34.56
- *     34.56.abs      #=> 34.56
  *
- *  Float#magnitude is an alias for Float#abs.
  */
 
-VALUE
-rb_float_abs(VALUE flt)
+static VALUE
+flo_abs(VALUE flt)
 {
     double val = fabs(RFLOAT_VALUE(flt));
     return DBL2NUM(val);
@@ -1703,12 +1626,16 @@ rb_float_abs(VALUE flt)
  *     float.zero?  ->  true or false
  *
  *  Returns +true+ if +float+ is 0.0.
+ *
  */
 
 static VALUE
 flo_zero_p(VALUE num)
 {
-    return flo_iszero(num) ? Qtrue : Qfalse;
+    if (RFLOAT_VALUE(num) == 0.0) {
+	return Qtrue;
+    }
+    return Qfalse;
 }
 
 /*
@@ -1733,18 +1660,23 @@ flo_is_nan_p(VALUE num)
 
 /*
  *  call-seq:
- *     float.infinite?  ->  -1, 1, or nil
+ *     float.infinite?  ->  nil, -1, +1
+ *
+ *  Return values corresponding to the value of +float+:
+ *
+ *  +finite+::	    +nil+
+ *  +-Infinity+::   +-1+
+ *  ++Infinity+::   +1+
  *
- *  Returns +nil+, -1, or 1 depending on whether the value is
- *  finite, <code>-Infinity</code>, or <code>+Infinity</code>.
+ *  For example:
  *
  *     (0.0).infinite?        #=> nil
  *     (-1.0/0.0).infinite?   #=> -1
  *     (+1.0/0.0).infinite?   #=> 1
  */
 
-VALUE
-rb_flo_is_infinite_p(VALUE num)
+static VALUE
+flo_is_infinite_p(VALUE num)
 {
     double value = RFLOAT_VALUE(num);
 
@@ -1759,12 +1691,13 @@ rb_flo_is_infinite_p(VALUE num)
  *  call-seq:
  *     float.finite?  ->  true or false
  *
- *  Returns +true+ if +float+ is a valid IEEE floating point number,
- *  i.e. it is not infinite and Float#nan? is +false+.
+ *  Returns +true+ if +float+ is a valid IEEE floating point number (it is not
+ *  infinite, and Float#nan? is +false+).
+ *
  */
 
-VALUE
-rb_flo_is_finite_p(VALUE num)
+static VALUE
+flo_is_finite_p(VALUE num)
 {
     double value = RFLOAT_VALUE(num);
 
@@ -1783,7 +1716,7 @@ rb_flo_is_finite_p(VALUE num)
  *  call-seq:
  *     float.next_float  ->  float
  *
- *  Returns the next representable floating point number.
+ *  Returns the next representable floating-point number.
  *
  *  Float::MAX.next_float and Float::INFINITY.next_float is Float::INFINITY.
  *
@@ -1791,13 +1724,13 @@ rb_flo_is_finite_p(VALUE num)
  *
  *  For example:
  *
- *    0.01.next_float    #=> 0.010000000000000002
- *    1.0.next_float     #=> 1.0000000000000002
- *    100.0.next_float   #=> 100.00000000000001
+ *    p 0.01.next_float  #=> 0.010000000000000002
+ *    p 1.0.next_float   #=> 1.0000000000000002
+ *    p 100.0.next_float #=> 100.00000000000001
  *
- *    0.01.next_float - 0.01     #=> 1.734723475976807e-18
- *    1.0.next_float - 1.0       #=> 2.220446049250313e-16
- *    100.0.next_float - 100.0   #=> 1.4210854715202004e-14
+ *    p 0.01.next_float - 0.01   #=> 1.734723475976807e-18
+ *    p 1.0.next_float - 1.0     #=> 2.220446049250313e-16
+ *    p 100.0.next_float - 100.0 #=> 1.4210854715202004e-14
  *
  *    f = 0.01; 20.times { printf "%-20a %s\n", f, f.to_s; f = f.next_float }
  *    #=> 0x1.47ae147ae147bp-7 0.01
@@ -1823,20 +1756,20 @@ rb_flo_is_finite_p(VALUE num)
  *
  *    f = 0.0
  *    100.times { f += 0.1 }
- *    f                           #=> 9.99999999999998       # should be 10.0 in the ideal world.
- *    10-f                        #=> 1.9539925233402755e-14 # the floating point error.
- *    10.0.next_float-10          #=> 1.7763568394002505e-15 # 1 ulp (unit in the last place).
- *    (10-f)/(10.0.next_float-10) #=> 11.0                   # the error is 11 ulp.
- *    (10-f)/(10*Float::EPSILON)  #=> 8.8                    # approximation of the above.
- *    "%a" % 10                   #=> "0x1.4p+3"
- *    "%a" % f                    #=> "0x1.3fffffffffff5p+3" # the last hex digit is 5.  16 - 5 = 11 ulp.
+ *    p f                            #=> 9.99999999999998       # should be 10.0 in the ideal world.
+ *    p 10-f                         #=> 1.9539925233402755e-14 # the floating-point error.
+ *    p(10.0.next_float-10)          #=> 1.7763568394002505e-15 # 1 ulp (units in the last place).
+ *    p((10-f)/(10.0.next_float-10)) #=> 11.0                   # the error is 11 ulp.
+ *    p((10-f)/(10*Float::EPSILON))  #=> 8.8                    # approximation of the above.
+ *    p "%a" % f                     #=> "0x1.3fffffffffff5p+3" # the last hex digit is 5.  16 - 5 = 11 ulp.
+ *
  */
 static VALUE
 flo_next_float(VALUE vx)
 {
     double x, y;
     x = NUM2DBL(vx);
-    y = nextafter(x, HUGE_VAL);
+    y = nextafter(x, INFINITY);
     return DBL2NUM(y);
 }
 
@@ -1844,7 +1777,7 @@ flo_next_float(VALUE vx)
  *  call-seq:
  *     float.prev_float  ->  float
  *
- *  Returns the previous representable floating point number.
+ *  Returns the previous representable floating-point number.
  *
  *  (-Float::MAX).prev_float and (-Float::INFINITY).prev_float is -Float::INFINITY.
  *
@@ -1852,13 +1785,13 @@ flo_next_float(VALUE vx)
  *
  *  For example:
  *
- *    0.01.prev_float    #=> 0.009999999999999998
- *    1.0.prev_float     #=> 0.9999999999999999
- *    100.0.prev_float   #=> 99.99999999999999
+ *    p 0.01.prev_float  #=> 0.009999999999999998
+ *    p 1.0.prev_float   #=> 0.9999999999999999
+ *    p 100.0.prev_float #=> 99.99999999999999
  *
- *    0.01 - 0.01.prev_float     #=> 1.734723475976807e-18
- *    1.0 - 1.0.prev_float       #=> 1.1102230246251565e-16
- *    100.0 - 100.0.prev_float   #=> 1.4210854715202004e-14
+ *    p 0.01 - 0.01.prev_float   #=> 1.734723475976807e-18
+ *    p 1.0 - 1.0.prev_float     #=> 1.1102230246251565e-16
+ *    p 100.0 - 100.0.prev_float #=> 1.4210854715202004e-14
  *
  *    f = 0.01; 20.times { printf "%-20a %s\n", f, f.to_s; f = f.prev_float }
  *    #=> 0x1.47ae147ae147bp-7 0.01
@@ -1881,13 +1814,14 @@ flo_next_float(VALUE vx)
  *    #   0x1.47ae147ae146ap-7 0.00999999999999997
  *    #   0x1.47ae147ae1469p-7 0.009999999999999969
  *    #   0x1.47ae147ae1468p-7 0.009999999999999967
+ *
  */
 static VALUE
 flo_prev_float(VALUE vx)
 {
     double x, y;
     x = NUM2DBL(vx);
-    y = nextafter(x, -HUGE_VAL);
+    y = nextafter(x, -INFINITY);
     return DBL2NUM(y);
 }
 
@@ -1895,108 +1829,89 @@ flo_prev_float(VALUE vx)
  *  call-seq:
  *     float.floor([ndigits])  ->  integer or float
  *
- *  Returns the largest number less than or equal to +float+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Returns the largest number less than or equal to +float+ in
+ *  decimal digits (default 0 digits).
  *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
- *
- *  Returns a floating point number when +ndigits+ is positive,
- *  otherwise returns an integer.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and floor down for negative.
  *
  *     1.2.floor      #=> 1
  *     2.0.floor      #=> 2
  *     (-1.2).floor   #=> -2
  *     (-2.0).floor   #=> -2
  *
- *     1.234567.floor(2)   #=> 1.23
- *     1.234567.floor(3)   #=> 1.234
- *     1.234567.floor(4)   #=> 1.2345
- *     1.234567.floor(5)   #=> 1.23456
- *
- *     34567.89.floor(-5)  #=> 0
- *     34567.89.floor(-4)  #=> 30000
- *     34567.89.floor(-3)  #=> 34000
- *     34567.89.floor(-2)  #=> 34500
- *     34567.89.floor(-1)  #=> 34560
- *     34567.89.floor(0)   #=> 34567
- *     34567.89.floor(1)   #=> 34567.8
- *     34567.89.floor(2)   #=> 34567.89
- *     34567.89.floor(3)   #=> 34567.89
- *
- *  Note that the limited precision of floating point arithmetic
- *  might lead to surprising results:
- *
- *     (0.3 / 0.1).floor  #=> 2 (!)
+ *     1.234567.floor(2)  #=> 1.23
+ *     1.234567.floor(3)  #=> 1.234
+ *     1.234567.floor(4)  #=> 1.2345
+ *     1.234567.floor(5)  #=> 1.23456
+ *
+ *     34567.89.floor(-5) #=> 0
+ *     34567.89.floor(-4) #=> 30000
+ *     34567.89.floor(-3) #=> 34000
+ *     34567.89.floor(-2) #=> 34500
+ *     34567.89.floor(-1) #=> 34560
+ *     34567.89.floor(0)  #=> 34567
+ *     34567.89.floor(1)  #=> 34567.8
+ *     34567.89.floor(2)  #=> 34567.89
+ *     34567.89.floor(3)  #=> 34567.89
  */
 
 static VALUE
 flo_floor(int argc, VALUE *argv, VALUE num)
 {
     double number, f;
+    long val;
     int ndigits = 0;
 
     if (rb_check_arity(argc, 0, 1)) {
 	ndigits = NUM2INT(argv[0]);
     }
-    number = RFLOAT_VALUE(num);
-    if (number == 0.0) {
-	return ndigits > 0 ? DBL2NUM(number) : INT2FIX(0);
+    if (ndigits < 0) {
+	return rb_int_floor(flo_to_i(num), ndigits);
     }
+    number = RFLOAT_VALUE(num);
     if (ndigits > 0) {
-	int binexp;
-	frexp(number, &binexp);
-	if (float_round_overflow(ndigits, binexp)) return num;
-	if (number > 0.0 && float_round_underflow(ndigits, binexp))
-	    return DBL2NUM(0.0);
+	if (float_invariant_round(number, ndigits, &num)) return num;
 	f = pow(10, ndigits);
 	f = floor(number * f) / f;
 	return DBL2NUM(f);
     }
-    else {
-	num = dbl2ival(floor(number));
-	if (ndigits < 0) num = rb_int_floor(num, ndigits);
-	return num;
+    f = floor(number);
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
     }
+    val = (long)f;
+    return LONG2FIX(val);
 }
 
 /*
  *  call-seq:
  *     float.ceil([ndigits])  ->  integer or float
  *
- *  Returns the smallest number greater than or equal to +float+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
- *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
+ *  Returns the smallest number greater than or equal to +float+ in decimal
+ *  digits (default 0 digits).
  *
- *  Returns a floating point number when +ndigits+ is positive,
- *  otherwise returns an integer.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and ceil up for negative.
  *
  *     1.2.ceil      #=> 2
  *     2.0.ceil      #=> 2
  *     (-1.2).ceil   #=> -1
  *     (-2.0).ceil   #=> -2
- *
- *     1.234567.ceil(2)   #=> 1.24
- *     1.234567.ceil(3)   #=> 1.235
- *     1.234567.ceil(4)   #=> 1.2346
- *     1.234567.ceil(5)   #=> 1.23457
- *
- *     34567.89.ceil(-5)  #=> 100000
- *     34567.89.ceil(-4)  #=> 40000
- *     34567.89.ceil(-3)  #=> 35000
- *     34567.89.ceil(-2)  #=> 34600
- *     34567.89.ceil(-1)  #=> 34570
- *     34567.89.ceil(0)   #=> 34568
- *     34567.89.ceil(1)   #=> 34567.9
- *     34567.89.ceil(2)   #=> 34567.89
- *     34567.89.ceil(3)   #=> 34567.89
- *
- *  Note that the limited precision of floating point arithmetic
- *  might lead to surprising results:
- *
- *     (2.1 / 0.7).ceil  #=> 4 (!)
+ *     1.234567.ceil(2)  #=> 1.24
+ *     1.234567.ceil(3)  #=> 1.235
+ *     1.234567.ceil(4)  #=> 1.2346
+ *     1.234567.ceil(5)  #=> 1.23457
+ *
+ *     34567.89.ceil(-5) #=> 100000
+ *     34567.89.ceil(-4) #=> 40000
+ *     34567.89.ceil(-3) #=> 35000
+ *     34567.89.ceil(-2) #=> 34600
+ *     34567.89.ceil(-1) #=> 34570
+ *     34567.89.ceil(0)  #=> 34568
+ *     34567.89.ceil(1)  #=> 34567.9
+ *     34567.89.ceil(2)  #=> 34567.89
+ *     34567.89.ceil(3)  #=> 34567.89
  */
 
 static VALUE
@@ -2006,27 +1921,18 @@ flo_ceil(int argc, VALUE *argv, VALUE num)
     int ndigits = 0;
 
     if (rb_check_arity(argc, 0, 1)) {
-	ndigits = NUM2INT(argv[0]);
+       ndigits = NUM2INT(argv[0]);
     }
     number = RFLOAT_VALUE(num);
-    if (number == 0.0) {
-	return ndigits > 0 ? DBL2NUM(number) : INT2FIX(0);
-    }
-    if (ndigits > 0) {
-	int binexp;
-	frexp(number, &binexp);
-	if (float_round_overflow(ndigits, binexp)) return num;
-	if (number < 0.0 && float_round_underflow(ndigits, binexp))
-	    return DBL2NUM(0.0);
-	f = pow(10, ndigits);
-	f = ceil(number * f) / f;
-	return DBL2NUM(f);
+    if (ndigits < 0) {
+	return rb_int_ceil(dbl2ival(ceil(number)), ndigits);
     }
-    else {
-	num = dbl2ival(ceil(number));
-	if (ndigits < 0) num = rb_int_ceil(num, ndigits);
-	return num;
+    if (ndigits == 0) {
+	return dbl2ival(ceil(number));
     }
+    if (float_invariant_round(number, ndigits, &num)) return num;
+    f = pow(10, ndigits);
+    return DBL2NUM(ceil(number * f) / f);
 }
 
 static int
@@ -2047,51 +1953,11 @@ int_round_zero_p(VALUE num, int ndigits)
     return (-0.415241 * ndigits - 0.125 > bytes);
 }
 
-static SIGNED_VALUE
-int_round_half_even(SIGNED_VALUE x, SIGNED_VALUE y)
-{
-    SIGNED_VALUE z = +(x + y / 2) / y;
-    if ((z * y - x) * 2 == y) {
-	z &= ~1;
-    }
-    return z * y;
-}
-
-static SIGNED_VALUE
-int_round_half_up(SIGNED_VALUE x, SIGNED_VALUE y)
-{
-    return (x + y / 2) / y * y;
-}
-
-static SIGNED_VALUE
-int_round_half_down(SIGNED_VALUE x, SIGNED_VALUE y)
-{
-    return (x + y / 2 - 1) / y * y;
-}
-
-static int
-int_half_p_half_even(VALUE num, VALUE n, VALUE f)
-{
-    return (int)rb_int_odd_p(rb_int_idiv(n, f));
-}
-
-static int
-int_half_p_half_up(VALUE num, VALUE n, VALUE f)
-{
-    return int_pos_p(num);
-}
-
-static int
-int_half_p_half_down(VALUE num, VALUE n, VALUE f)
-{
-    return int_neg_p(num);
-}
-
 /*
  * Assumes num is an Integer, ndigits <= 0
  */
 VALUE
-rb_int_round(VALUE num, int ndigits, enum ruby_num_rounding_mode mode)
+rb_int_round(VALUE num, int ndigits)
 {
     VALUE n, f, h, r;
 
@@ -2104,7 +1970,7 @@ rb_int_round(VALUE num, int ndigits, enum ruby_num_rounding_mode mode)
 	SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
 	int neg = x < 0;
 	if (neg) x = -x;
-	x = ROUND_CALL(mode, int_round, (x, y));
+	x = (x + y / 2) / y * y;
 	if (neg) x = -x;
 	return LONG2NUM(x);
     }
@@ -2115,9 +1981,8 @@ rb_int_round(VALUE num, int ndigits, enum ruby_num_rounding_mode mode)
     h = rb_int_idiv(f, INT2FIX(2));
     r = rb_int_modulo(num, f);
     n = rb_int_minus(num, r);
-    r = rb_int_cmp(r, h);
-    if (FIXNUM_POSITIVE_P(r) ||
-	(FIXNUM_ZERO_P(r) && ROUND_CALL(mode, int_half_p, (num, n, f)))) {
+    r = int_cmp(r, h);
+    if (FIXNUM_POSITIVE_P(r) || (FIXNUM_ZERO_P(r) && !int_neg_p(num))) {
 	n = rb_int_plus(n, f);
     }
     return n;
@@ -2202,95 +2067,64 @@ rb_int_truncate(VALUE num, int ndigits)
 
 /*
  *  call-seq:
- *     float.round([ndigits] [, half: mode])  ->  integer or float
+ *     float.round([ndigits])  ->  integer or float
  *
- *  Returns +float+ rounded to the nearest value with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Rounds +float+ to a given precision in decimal digits (default 0 digits).
  *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
- *
- *  Returns a floating point number when +ndigits+ is positive,
- *  otherwise returns an integer.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is more than zero.
  *
  *     1.4.round      #=> 1
  *     1.5.round      #=> 2
  *     1.6.round      #=> 2
  *     (-1.5).round   #=> -2
  *
- *     1.234567.round(2)   #=> 1.23
- *     1.234567.round(3)   #=> 1.235
- *     1.234567.round(4)   #=> 1.2346
- *     1.234567.round(5)   #=> 1.23457
- *
- *     34567.89.round(-5)  #=> 0
- *     34567.89.round(-4)  #=> 30000
- *     34567.89.round(-3)  #=> 35000
- *     34567.89.round(-2)  #=> 34600
- *     34567.89.round(-1)  #=> 34570
- *     34567.89.round(0)   #=> 34568
- *     34567.89.round(1)   #=> 34567.9
- *     34567.89.round(2)   #=> 34567.89
- *     34567.89.round(3)   #=> 34567.89
- *
- *  If the optional +half+ keyword argument is given,
- *  numbers that are half-way between two possible rounded values
- *  will be rounded according to the specified tie-breaking +mode+:
- *
- *  * <code>:up</code> or +nil+: round half away from zero (default)
- *  * <code>:down</code>: round half toward zero
- *  * <code>:even</code>: round half toward the nearest even number
- *
- *     2.5.round(half: :up)      #=> 3
- *     2.5.round(half: :down)    #=> 2
- *     2.5.round(half: :even)    #=> 2
- *     3.5.round(half: :up)      #=> 4
- *     3.5.round(half: :down)    #=> 3
- *     3.5.round(half: :even)    #=> 4
- *     (-2.5).round(half: :up)   #=> -3
- *     (-2.5).round(half: :down) #=> -2
- *     (-2.5).round(half: :even) #=> -2
+ *     1.234567.round(2)  #=> 1.23
+ *     1.234567.round(3)  #=> 1.235
+ *     1.234567.round(4)  #=> 1.2346
+ *     1.234567.round(5)  #=> 1.23457
+ *
+ *     34567.89.round(-5) #=> 0
+ *     34567.89.round(-4) #=> 30000
+ *     34567.89.round(-3) #=> 35000
+ *     34567.89.round(-2) #=> 34600
+ *     34567.89.round(-1) #=> 34570
+ *     34567.89.round(0)  #=> 34568
+ *     34567.89.round(1)  #=> 34567.9
+ *     34567.89.round(2)  #=> 34567.89
+ *     34567.89.round(3)  #=> 34567.89
+ *
  */
 
 static VALUE
 flo_round(int argc, VALUE *argv, VALUE num)
 {
     double number, f, x;
-    VALUE nd, opt;
     int ndigits = 0;
-    enum ruby_num_rounding_mode mode;
 
-    if (rb_scan_args(argc, argv, "01:", &nd, &opt)) {
-	ndigits = NUM2INT(nd);
-    }
-    mode = rb_num_get_rounding_option(opt);
-    number = RFLOAT_VALUE(num);
-    if (number == 0.0) {
-	return ndigits > 0 ? DBL2NUM(number) : INT2FIX(0);
+    if (rb_check_arity(argc, 0, 1)) {
+	ndigits = NUM2INT(argv[0]);
     }
     if (ndigits < 0) {
-	return rb_int_round(flo_to_i(num), ndigits, mode);
+	return rb_int_round(flo_to_i(num), ndigits);
     }
+    number  = RFLOAT_VALUE(num);
     if (ndigits == 0) {
-	x = ROUND_CALL(mode, round, (number, 1.0));
-	return dbl2ival(x);
-    }
-    if (isfinite(number)) {
-	int binexp;
-	frexp(number, &binexp);
-	if (float_round_overflow(ndigits, binexp)) return num;
-	if (float_round_underflow(ndigits, binexp)) return DBL2NUM(0);
-	f = pow(10, ndigits);
-	x = ROUND_CALL(mode, round, (number, f));
-	return DBL2NUM(x / f);
+	return dbl2ival(round(number));
     }
-    return num;
+    if (float_invariant_round(number, ndigits, &num)) return num;
+    f = pow(10, ndigits);
+    x = round_to_nearest(number, f);
+    return DBL2NUM(x / f);
 }
 
 static int
-float_round_overflow(int ndigits, int binexp)
+float_invariant_round(double number, int ndigits, VALUE *num)
 {
     enum {float_dig = DBL_DIG+2};
+    int binexp;
+
+    frexp(number, &binexp);
 
 /* Let `exp` be such that `number` is written as:"0.#{digits}e#{exp}",
    i.e. such that  10 ** (exp - 1) <= |number| < 10 ** exp
@@ -2309,16 +2143,12 @@ float_round_overflow(int ndigits, int binexp)
 	So if ndigits + floor(binexp/(4 or 3)) >= float_dig, the result is number
 	If ndigits + ceil(binexp/(3 or 4)) < 0 the result is 0
 */
-    if (ndigits >= float_dig - (binexp > 0 ? binexp / 4 : binexp / 3 - 1)) {
+    if (isinf(number) || isnan(number) ||
+	(ndigits >= float_dig - (binexp > 0 ? binexp / 4 : binexp / 3 - 1))) {
 	return TRUE;
     }
-    return FALSE;
-}
-
-static int
-float_round_underflow(int ndigits, int binexp)
-{
     if (ndigits < - (binexp > 0 ? binexp / 3 + 1 : binexp / 4)) {
+	*num = DBL2NUM(0);
 	return TRUE;
     }
     return FALSE;
@@ -2326,55 +2156,38 @@ float_round_underflow(int ndigits, int binexp)
 
 /*
  *  call-seq:
- *     float.to_i    ->  integer
- *     float.to_int  ->  integer
+ *     float.to_i      ->  integer
+ *     float.to_int    ->  integer
  *
  *  Returns the +float+ truncated to an Integer.
  *
- *     1.2.to_i      #=> 1
- *     (-1.2).to_i   #=> -1
- *
- *  Note that the limited precision of floating point arithmetic
- *  might lead to surprising results:
- *
- *    (0.3 / 0.1).to_i  #=> 2 (!)
- *
- *  #to_int is an alias for #to_i.
+ *  Synonyms are #to_i and #to_int
  */
 
 static VALUE
 flo_to_i(VALUE num)
 {
     double f = RFLOAT_VALUE(num);
+    long val;
 
     if (f > 0.0) f = floor(f);
     if (f < 0.0) f = ceil(f);
 
-    return dbl2ival(f);
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
+    }
+    val = (long)f;
+    return LONG2FIX(val);
 }
 
 /*
  *  call-seq:
  *     float.truncate([ndigits])  ->  integer or float
  *
- *  Returns +float+ truncated (toward zero) to
- *  a precision of +ndigits+ decimal digits (default: 0).
- *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
- *
- *  Returns a floating point number when +ndigits+ is positive,
- *  otherwise returns an integer.
+ *  Truncates +float+ to a given precision in decimal digits (default 0 digits).
  *
- *     2.8.truncate           #=> 2
- *     (-2.8).truncate        #=> -2
- *     1.234567.truncate(2)   #=> 1.23
- *     34567.89.truncate(-2)  #=> 34500
- *
- *  Note that the limited precision of floating point arithmetic
- *  might lead to surprising results:
- *
- *     (0.3 / 0.1).truncate  #=> 2 (!)
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is more than zero.
  */
 static VALUE
 flo_truncate(int argc, VALUE *argv, VALUE num)
@@ -2387,7 +2200,7 @@ flo_truncate(int argc, VALUE *argv, VALUE num)
 
 /*
  *  call-seq:
- *     float.positive?  ->  true or false
+ *     float.positive? ->  true or false
  *
  *  Returns +true+ if +float+ is greater than 0.
  */
@@ -2401,7 +2214,7 @@ flo_positive_p(VALUE num)
 
 /*
  *  call-seq:
- *     float.negative?  ->  true or false
+ *     float.negative? ->  true or false
  *
  *  Returns +true+ if +float+ is less than 0.
  */
@@ -2417,11 +2230,13 @@ flo_negative_p(VALUE num)
  *  call-seq:
  *     num.floor([ndigits])  ->  integer or float
  *
- *  Returns the largest number less than or equal to +num+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Returns the largest integer less than or equal to +num+.
  *
- *  Numeric implements this by converting its value to a Float and
- *  invoking Float#floor.
+ *  Numeric implements this by converting an Integer to a Float and invoking
+ *  Float#floor.
+ *
+ *     1.floor      #=> 1
+ *     (-1).floor   #=> -1
  */
 
 static VALUE
@@ -2430,15 +2245,21 @@ num_floor(int argc, VALUE *argv, VALUE num)
     return flo_floor(argc, argv, rb_Float(num));
 }
 
+
 /*
  *  call-seq:
  *     num.ceil([ndigits])  ->  integer or float
  *
- *  Returns the smallest number greater than or equal to +num+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Returns the smallest possible Integer that is greater than or equal to
+ *  +num+.
  *
- *  Numeric implements this by converting its value to a Float and
- *  invoking Float#ceil.
+ *  Numeric achieves this by converting itself to a Float then invoking
+ *  Float#ceil.
+ *
+ *     1.ceil        #=> 1
+ *     1.2.ceil      #=> 2
+ *     (-1.2).ceil   #=> -1
+ *     (-1.0).ceil   #=> -1
  */
 
 static VALUE
@@ -2451,11 +2272,13 @@ num_ceil(int argc, VALUE *argv, VALUE num)
  *  call-seq:
  *     num.round([ndigits])  ->  integer or float
  *
- *  Returns +num+ rounded to the nearest value with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Rounds +num+ to a given precision in decimal digits (default 0 digits).
+ *
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is more than zero.
  *
- *  Numeric implements this by converting its value to a Float and
- *  invoking Float#round.
+ *  Numeric implements this by converting itself to a Float and invoking
+ *  Float#round.
  */
 
 static VALUE
@@ -2468,11 +2291,10 @@ num_round(int argc, VALUE* argv, VALUE num)
  *  call-seq:
  *     num.truncate([ndigits])  ->  integer or float
  *
- *  Returns +num+ truncated (toward zero) to
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *  Returns +num+ truncated to an Integer.
  *
- *  Numeric implements this by converting its value to a Float and
- *  invoking Float#truncate.
+ *  Numeric implements this by converting its value to a Float and invoking
+ *  Float#truncate.
  */
 
 static VALUE
@@ -2481,20 +2303,19 @@ num_truncate(int argc, VALUE *argv, VALUE num)
     return flo_truncate(argc, argv, rb_Float(num));
 }
 
-double
+static double
 ruby_float_step_size(double beg, double end, double unit, int excl)
 {
     const double epsilon = DBL_EPSILON;
-    double n, err;
+    double n = (end - beg)/unit;
+    double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
 
-    if (unit == 0) {
-        return HUGE_VAL;
-    }
-    n= (end - beg)/unit;
-    err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
     if (isinf(unit)) {
 	return unit > 0 ? beg <= end : beg >= end;
     }
+    if (unit == 0) {
+	return INFINITY;
+    }
     if (err>0.5) err=0.5;
     if (excl) {
 	if (n<=0) return 0;
@@ -2511,11 +2332,11 @@ 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)
+ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 {
     if (RB_TYPE_P(from, T_FLOAT) || RB_TYPE_P(to, T_FLOAT) || RB_TYPE_P(step, T_FLOAT)) {
 	double beg = NUM2DBL(from);
-	double end = (allow_endless && NIL_P(to)) ? HUGE_VAL : NUM2DBL(to);
+	double end = NUM2DBL(to);
 	double unit = NUM2DBL(step);
 	double n = ruby_float_step_size(beg, end, unit, excl);
 	long i;
@@ -2549,7 +2370,7 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
 
 	diff = FIX2LONG(step);
 	if (diff == 0) {
-	    return DBL2NUM(HUGE_VAL);
+	    return DBL2NUM(INFINITY);
 	}
 	delta = FIX2LONG(to) - FIX2LONG(from);
 	if (diff < 0) {
@@ -2575,7 +2396,7 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
 	VALUE result;
 	ID cmp = '>';
 	switch (rb_cmpint(rb_num_coerce_cmp(step, INT2FIX(0), id_cmp), step, INT2FIX(0))) {
-	  case 0: return DBL2NUM(HUGE_VAL);
+	  case 0: return DBL2NUM(INFINITY);
 	  case -1: cmp = '<'; break;
 	}
 	if (RTEST(rb_funcall(from, cmp, 1, to))) return INT2FIX(0);
@@ -2587,11 +2408,17 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
     }
 }
 
+static VALUE
+num_step_compare_with_zero(VALUE num)
+{
+    VALUE zero = INT2FIX(0);
+    return rb_check_funcall(num, '>', 1, &zero);
+}
+
 static int
 num_step_negative_p(VALUE num)
 {
     const ID mid = '<';
-    VALUE zero = INT2FIX(0);
     VALUE r;
 
     if (FIXNUM_P(num)) {
@@ -2602,8 +2429,7 @@ num_step_negative_p(VALUE num)
 	if (method_basic_p(rb_cInteger))
 	    return BIGNUM_NEGATIVE_P(num);
     }
-
-    r = rb_check_funcall(num, '>', 1, &zero);
+    r = rb_rescue(num_step_compare_with_zero, num, coerce_rescue_quiet, Qnil);
     if (r == Qundef) {
 	coerce_failed(num, INT2FIX(0));
     }
@@ -2611,9 +2437,10 @@ num_step_negative_p(VALUE num)
 }
 
 static int
-num_step_extract_args(int argc, const VALUE *argv, VALUE *to, VALUE *step, VALUE *by)
+num_step_scan_args(int argc, const VALUE *argv, VALUE *to, VALUE *step)
 {
     VALUE hash;
+    int desc;
 
     argc = rb_scan_args(argc, argv, "02:", to, step, &hash);
     if (!NIL_P(hash)) {
@@ -2628,47 +2455,28 @@ num_step_extract_args(int argc, const VALUE *argv, VALUE *to, VALUE *step, VALUE
 	}
 	if (values[1] != Qundef) {
 	    if (argc > 1) rb_raise(rb_eArgError, "step is given twice");
-	    *by = values[1];
+	    *step = values[1];
 	}
     }
-
-    return argc;
-}
-
-static int
-num_step_check_fix_args(int argc, VALUE *to, VALUE *step, VALUE by, int fix_nil, int allow_zero_step)
-{
-    int desc;
-    if (by != Qundef) {
-        *step = by;
-    }
     else {
-        /* compatibility */
-        if (argc > 1 && NIL_P(*step)) {
-            rb_raise(rb_eTypeError, "step must be numeric");
-        }
-        if (!allow_zero_step && rb_equal(*step, INT2FIX(0))) {
-            rb_raise(rb_eArgError, "step can't be 0");
-        }
+	/* compatibility */
+	if (argc > 1 && NIL_P(*step)) {
+	    rb_raise(rb_eTypeError, "step must be numeric");
+	}
+	if (rb_equal(*step, INT2FIX(0))) {
+	    rb_raise(rb_eArgError, "step can't be 0");
+	}
     }
     if (NIL_P(*step)) {
 	*step = INT2FIX(1);
     }
     desc = num_step_negative_p(*step);
-    if (fix_nil && NIL_P(*to)) {
-        *to = desc ? DBL2NUM(-HUGE_VAL) : DBL2NUM(HUGE_VAL);
+    if (NIL_P(*to)) {
+	*to = desc ? DBL2NUM(-INFINITY) : DBL2NUM(INFINITY);
     }
     return desc;
 }
 
-static int
-num_step_scan_args(int argc, const VALUE *argv, VALUE *to, VALUE *step, int fix_nil, int allow_zero_step)
-{
-    VALUE by = Qundef;
-    argc = num_step_extract_args(argc, argv, to, step, &by);
-    return num_step_check_fix_args(argc, to, step, by, fix_nil, allow_zero_step);
-}
-
 static VALUE
 num_step_size(VALUE from, VALUE args, VALUE eobj)
 {
@@ -2676,57 +2484,54 @@ num_step_size(VALUE from, VALUE args, VALUE eobj)
     int argc = args ? RARRAY_LENINT(args) : 0;
     const VALUE *argv = args ? RARRAY_CONST_PTR(args) : 0;
 
-    num_step_scan_args(argc, argv, &to, &step, TRUE, FALSE);
+    num_step_scan_args(argc, argv, &to, &step);
 
     return ruby_num_interval_step_size(from, to, step, FALSE);
 }
-
 /*
  *  call-seq:
  *     num.step(by: step, to: limit) {|i| block }   ->  self
- *     num.step(by: step, to: limit)                ->  an_enumerator
- *     num.step(by: step, to: limit)                ->  an_arithmetic_sequence
+ *     num.step(by: step, to: limit)		    ->  an_enumerator
  *     num.step(limit=nil, step=1) {|i| block }     ->  self
  *     num.step(limit=nil, step=1)                  ->  an_enumerator
- *     num.step(limit=nil, step=1)                  ->  an_arithmetic_sequence
  *
  *  Invokes the given block with the sequence of numbers starting at +num+,
  *  incremented by +step+ (defaulted to +1+) on each call.
  *
  *  The loop finishes when the value to be passed to the block is greater than
  *  +limit+ (if +step+ is positive) or less than +limit+ (if +step+ is
- *  negative), where +limit+ is defaulted to infinity.
+ *  negative), where <i>limit</i> is defaulted to infinity.
  *
  *  In the recommended keyword argument style, either or both of
  *  +step+ and +limit+ (default infinity) can be omitted.  In the
  *  fixed position argument style, zero as a step
- *  (i.e. <code>num.step(limit, 0)</code>) is not allowed for historical
+ *  (i.e. num.step(limit, 0)) is not allowed for historical
  *  compatibility reasons.
  *
  *  If all the arguments are integers, the loop operates using an integer
  *  counter.
  *
- *  If any of the arguments are floating point numbers, all are converted
- *  to floats, and the loop is executed
- *  <i>floor(n + n*Float::EPSILON) + 1</i> times,
- *  where <i>n = (limit - num)/step</i>.
+ *  If any of the arguments are floating point numbers, all are converted to floats, and the loop is executed the following expression:
  *
- *  Otherwise, the loop starts at +num+, uses either the
- *  less-than (<code><</code>) or greater-than (<code>></code>) operator
- *  to compare the counter against +limit+,
- *  and increments itself using the <code>+</code> operator.
+ *	floor(n + n*epsilon)+ 1
+ *
+ *  Where the +n+ is the following:
+ *
+ *	n = (limit - num)/step
+ *
+ *  Otherwise, the loop starts at +num+, uses either the less-than (<) or
+ *  greater-than (>) operator to compare the counter against +limit+, and
+ *  increments itself using the <code>+</code> operator.
  *
  *  If no block is given, an Enumerator is returned instead.
- *  Especially, the enumerator is an Enumerator::ArithmeticSequence
- *  if both +limit+ and +step+ are kind of Numeric or <code>nil</code>.
  *
  *  For example:
  *
  *     p 1.step.take(4)
  *     p 10.step(by: -1).take(4)
- *     3.step(to: 5) {|i| print i, " " }
- *     1.step(10, 2) {|i| print i, " " }
- *     Math::E.step(to: Math::PI, by: 0.2) {|f| print f, " " }
+ *     3.step(to: 5) { |i| print i, " " }
+ *     1.step(10, 2) { |i| print i, " " }
+ *     Math::E.step(to: Math::PI, by: 0.2) { |f| print f, " " }
  *
  *  Will produce:
  *
@@ -2734,7 +2539,7 @@ num_step_size(VALUE from, VALUE args, VALUE eobj)
  *     [10, 9, 8, 7]
  *     3 4 5
  *     1 3 5 7 9
- *     2.718281828459045 2.9182818284590453 3.118281828459045
+ *     2.71828182845905 2.91828182845905 3.11828182845905
  */
 
 static VALUE
@@ -2743,26 +2548,9 @@ num_step(int argc, VALUE *argv, VALUE from)
     VALUE to, step;
     int desc, inf;
 
-    if (!rb_block_given_p()) {
-        VALUE by = Qundef;
-
-        num_step_extract_args(argc, argv, &to, &step, &by);
-        if (by != Qundef) {
-            step = by;
-        }
-        if (NIL_P(step)) {
-            step = INT2FIX(1);
-        }
-        if ((NIL_P(to) || rb_obj_is_kind_of(to, rb_cNumeric)) &&
-            rb_obj_is_kind_of(step, rb_cNumeric)) {
-            return rb_arith_seq_new(from, ID2SYM(rb_frame_this_func()), argc, argv,
-                                    num_step_size, from, to, step, FALSE);
-        }
-
-        RETURN_SIZED_ENUMERATOR(from, argc, argv, num_step_size);
-    }
+    RETURN_SIZED_ENUMERATOR(from, argc, argv, num_step_size);
 
-    desc = num_step_scan_args(argc, argv, &to, &step, TRUE, FALSE);
+    desc = num_step_scan_args(argc, argv, &to, &step);
     if (rb_equal(step, INT2FIX(0))) {
 	inf = 1;
     }
@@ -2793,7 +2581,7 @@ num_step(int argc, VALUE *argv, VALUE from)
 	    }
 	}
     }
-    else if (!ruby_float_step(from, to, step, FALSE, FALSE)) {
+    else if (!ruby_float_step(from, to, step, FALSE)) {
 	VALUE i = from;
 
 	if (inf) {
@@ -2872,23 +2660,24 @@ rb_num2ulong_internal(VALUE val, int *wrap_p)
     }
 
     if (FIXNUM_P(val)) {
-        long l = FIX2LONG(val); /* this is FIX2LONG, intended */
+        long l = FIX2LONG(val); /* this is FIX2LONG, inteneded */
         if (wrap_p)
             *wrap_p = l < 0;
         return (unsigned long)l;
     }
     else if (RB_TYPE_P(val, T_FLOAT)) {
-	double d = RFLOAT_VALUE(val);
-	if (d < ULONG_MAX_PLUS_ONE && LONG_MIN_MINUS_ONE_IS_LESS_THAN(d)) {
-	    if (wrap_p)
-		*wrap_p = d <= -1.0; /* NUM2ULONG(v) uses v.to_int conceptually.  */
-	    if (0 <= d)
-		return (unsigned long)d;
-	    return (unsigned long)(long)d;
-	}
-	else {
-	    FLOAT_OUT_OF_RANGE(val, "integer");
-	}
+       if (RFLOAT_VALUE(val) < ULONG_MAX_PLUS_ONE
+           && LONG_MIN_MINUS_ONE_IS_LESS_THAN(RFLOAT_VALUE(val))) {
+           double d = RFLOAT_VALUE(val);
+           if (wrap_p)
+               *wrap_p = d <= -1.0; /* NUM2ULONG(v) uses v.to_int conceptually.  */
+           if (0 <= d)
+               return (unsigned long)d;
+           return (unsigned long)(long)d;
+       }
+       else {
+	   FLOAT_OUT_OF_RANGE(val, "integer");
+       }
     }
     else if (RB_TYPE_P(val, T_BIGNUM)) {
         {
@@ -2979,7 +2768,7 @@ rb_fix2uint(VALUE val)
     }
     num = FIX2ULONG(val);
 
-    check_uint(num, rb_num_negative_int_p(val));
+    check_uint(num, negative_int_p(val));
     return num;
 }
 #else
@@ -3065,7 +2854,7 @@ rb_fix2ushort(VALUE val)
     }
     num = FIX2ULONG(val);
 
-    check_ushort(num, rb_num_negative_int_p(val));
+    check_ushort(num, negative_int_p(val));
     return num;
 }
 
@@ -3105,9 +2894,9 @@ rb_num2ll(VALUE val)
     if (FIXNUM_P(val)) return (LONG_LONG)FIX2LONG(val);
 
     else if (RB_TYPE_P(val, T_FLOAT)) {
-	double d = RFLOAT_VALUE(val);
-	if (d < LLONG_MAX_PLUS_ONE && (LLONG_MIN_MINUS_ONE_IS_LESS_THAN(d))) {
-	    return (LONG_LONG)d;
+	if (RFLOAT_VALUE(val) < LLONG_MAX_PLUS_ONE
+            && (LLONG_MIN_MINUS_ONE_IS_LESS_THAN(RFLOAT_VALUE(val)))) {
+	    return (LONG_LONG)(RFLOAT_VALUE(val));
 	}
 	else {
 	    FLOAT_OUT_OF_RANGE(val, "long long");
@@ -3134,14 +2923,14 @@ rb_num2ull(VALUE val)
 	rb_raise(rb_eTypeError, "no implicit conversion from nil");
     }
     else if (RB_TYPE_P(val, T_FIXNUM)) {
-	return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, intended */
+	return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, inteneded */
     }
     else if (RB_TYPE_P(val, T_FLOAT)) {
-	double d = RFLOAT_VALUE(val);
-	if (d < ULLONG_MAX_PLUS_ONE && LLONG_MIN_MINUS_ONE_IS_LESS_THAN(d)) {
-	    if (0 <= d)
-		return (unsigned LONG_LONG)d;
-	    return (unsigned LONG_LONG)(LONG_LONG)d;
+	if (RFLOAT_VALUE(val) < ULLONG_MAX_PLUS_ONE
+            && LLONG_MIN_MINUS_ONE_IS_LESS_THAN(RFLOAT_VALUE(val))) {
+            if (0 <= RFLOAT_VALUE(val))
+                return (unsigned LONG_LONG)(RFLOAT_VALUE(val));
+	    return (unsigned LONG_LONG)(LONG_LONG)(RFLOAT_VALUE(val));
 	}
 	else {
 	    FLOAT_OUT_OF_RANGE(val, "unsigned long long");
@@ -3163,23 +2952,21 @@ rb_num2ull(VALUE val)
 
 #endif  /* HAVE_LONG_LONG */
 
-/********************************************************************
- *
+/*
  * Document-class: Integer
  *
- *  Holds Integer values.  You cannot add a singleton method to an
- *  Integer object, any attempt to do so will raise a TypeError.
+ *  This class is the basis for the two concrete classes that hold whole
+ *  numbers, Bignum and Fixnum.
  *
  */
 
 /*
  *  call-seq:
- *     int.to_i    ->  integer
- *     int.to_int  ->  integer
+ *     int.to_i      ->  integer
  *
- *  Since +int+ is already an Integer, returns +self+.
+ *  As +int+ is already an Integer, all these methods simply return the receiver.
  *
- *  #to_int is an alias for #to_i.
+ *  Synonyms is #to_int
  */
 
 static VALUE
@@ -3208,8 +2995,8 @@ int_int_p(VALUE num)
  *  Returns +true+ if +int+ is an odd number.
  */
 
-VALUE
-rb_int_odd_p(VALUE num)
+static VALUE
+int_odd_p(VALUE num)
 {
     if (FIXNUM_P(num)) {
 	if (num & 2) {
@@ -3250,56 +3037,15 @@ int_even_p(VALUE num)
 }
 
 /*
- *  call-seq:
- *     int.allbits?(mask)  ->  true or false
- *
- *  Returns +true+ if all bits of <code>+int+ & +mask+</code> are 1.
- */
-
-static VALUE
-int_allbits_p(VALUE num, VALUE mask)
-{
-    mask = rb_to_int(mask);
-    return rb_int_equal(rb_int_and(num, mask), mask);
-}
-
-/*
- *  call-seq:
- *     int.anybits?(mask)  ->  true or false
- *
- *  Returns +true+ if any bits of <code>+int+ & +mask+</code> are 1.
- */
-
-static VALUE
-int_anybits_p(VALUE num, VALUE mask)
-{
-    mask = rb_to_int(mask);
-    return num_zero_p(rb_int_and(num, mask)) ? Qfalse : Qtrue;
-}
-
-/*
- *  call-seq:
- *     int.nobits?(mask)  ->  true or false
- *
- *  Returns +true+ if no bits of <code>+int+ & +mask+</code> are 1.
- */
-
-static VALUE
-int_nobits_p(VALUE num, VALUE mask)
-{
-    mask = rb_to_int(mask);
-    return num_zero_p(rb_int_and(num, mask));
-}
-
-/*
  *  Document-method: Integer#succ
  *  Document-method: Integer#next
+ *  Document-method: Fixnum#succ
+ *  Document-method: Fixnum#next
  *  call-seq:
  *     int.next  ->  integer
  *     int.succ  ->  integer
  *
- *  Returns the successor of +int+,
- *  i.e. the Integer equal to <code>int+1</code>.
+ *  Returns the Integer equal to +int+ + 1.
  *
  *     1.next      #=> 2
  *     (-1).next   #=> 0
@@ -3326,8 +3072,7 @@ rb_int_succ(VALUE num)
  *  call-seq:
  *     int.pred  ->  integer
  *
- *  Returns the predecessor of +int+,
- *  i.e. the Integer equal to <code>int-1</code>.
+ *  Returns the Integer equal to +int+ - 1.
  *
  *     1.pred      #=> 0
  *     (-1).pred   #=> -2
@@ -3357,8 +3102,8 @@ rb_int_pred(VALUE num)
  *  according to +encoding+.
  *
  *     65.chr    #=> "A"
- *     230.chr   #=> "\xE6"
- *     255.chr(Encoding::UTF_8)   #=> "\u00FF"
+ *     230.chr   #=> "\346"
+ *     255.chr(Encoding::UTF_8)   #=> "\303\277"
  */
 
 VALUE
@@ -3433,12 +3178,12 @@ int_chr(int argc, VALUE *argv, VALUE num)
  *
  *  Returns the +int+ itself.
  *
- *     97.ord   #=> 97
+ *     ?a.ord    #=> 97
  *
- *  This method is intended for compatibility to character literals
- *  in Ruby 1.9.
+ *  This method is intended for compatibility to character constant in Ruby
+ *  1.9.
  *
- *  For example, <code>?a.ord</code> returns 97 both in 1.8 and 1.9.
+ *  For example, ?a.ord returns 97 both in 1.8 and 1.9.
  */
 
 static VALUE
@@ -3447,17 +3192,32 @@ int_ord(VALUE num)
     return num;
 }
 
-/*
- * Fixnum
+/********************************************************************
+ *
+ * Document-class: Fixnum
+ *
+ *  Holds Integer values that can be represented in a native machine word
+ *  (minus 1 bit).  If any operation on a Fixnum exceeds this range, the value
+ *  is automatically converted to a Bignum.
+ *
+ *  Fixnum objects have immediate value. This means that when they are assigned
+ *  or passed as parameters, the actual object is passed, rather than a
+ *  reference to that object.
+ *
+ *  Assignment does not alias Fixnum objects. There is effectively only one
+ *  Fixnum object instance for any given integer value, so, for example, you
+ *  cannot add a singleton method to a Fixnum. Any attempt to add a singleton
+ *  method to a Fixnum object will raise a TypeError.
  */
 
 
 /*
  * Document-method: Integer#-@
  * call-seq:
- *    -int  ->  integer
+ *   -int  ->  integer
  *
- * Returns +int+, negated.
+ * Negates +int+.
+ * (returns an integer whose value is 0-int)
  */
 
 static VALUE
@@ -3483,8 +3243,8 @@ rb_int_uminus(VALUE num)
  *  call-seq:
  *     int.to_s(base=10)  ->  string
  *
- *  Returns a string containing the place-value representation of +int+
- *  with radix +base+ (between 2 and 36).
+ *  Returns a string containing the representation of +int+ radix +base+
+ *  (between 2 and 36).
  *
  *     12345.to_s       #=> "12345"
  *     12345.to_s(2)    #=> "11000000111001"
@@ -3493,6 +3253,7 @@ rb_int_uminus(VALUE num)
  *     12345.to_s(16)   #=> "3039"
  *     12345.to_s(36)   #=> "9ix"
  *     78546939656932.to_s(36)  #=> "rubyrules"
+ *
  */
 
 VALUE
@@ -3506,17 +3267,6 @@ rb_fix2str(VALUE x, int base)
     if (base < 2 || 36 < base) {
 	rb_raise(rb_eArgError, "invalid radix %d", base);
     }
-#if SIZEOF_LONG < SIZEOF_VOIDP
-# if SIZEOF_VOIDP == SIZEOF_LONG_LONG
-    if ((val >= 0 && (x & 0xFFFFFFFF00000000ull)) ||
-	(val < 0 && (x & 0xFFFFFFFF00000000ull) != 0xFFFFFFFF00000000ull)) {
-	rb_bug("Unnormalized Fixnum value %p", (void *)x);
-    }
-# else
-    /* should do something like above code, but currently ruby does not know */
-    /* such platforms */
-# endif
-#endif
     if (val == 0) {
 	return rb_usascii_str_new2("0");
     }
@@ -3564,18 +3314,27 @@ rb_int2str(VALUE x, int base)
 
 /*
  * Document-method: Integer#+
+ * Document-method: Fixnum#+
  * call-seq:
- *    int + numeric  ->  numeric_result
+ *   int + numeric  ->  numeric_result
  *
- * Performs addition: the class of the resulting object depends on
- * the class of +numeric+.
+ * Performs addition: the class of the resulting object depends on the class of
+ * +numeric+ and on the magnitude of the result. It may return a Bignum.
  */
 
 static VALUE
 fix_plus(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	return rb_fix_plus_fix(x, y);
+	long a, b, c;
+	VALUE r;
+
+	a = FIX2LONG(x);
+	b = FIX2LONG(y);
+	c = a + b;
+	r = LONG2NUM(c);
+
+	return r;
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
 	return rb_big_plus(y, x);
@@ -3611,18 +3370,27 @@ rb_int_plus(VALUE x, VALUE y)
 
 /*
  * Document-method: Integer#-
+ * Document-method: Fixnum#-
  * call-seq:
- *    int - numeric  ->  numeric_result
+ *   int - numeric  ->  numeric_result
  *
- * Performs subtraction: the class of the resulting object depends on
- * the class of +numeric+.
+ * Performs subtraction: the class of the resulting object depends on the class
+ * of +numeric+ and on the magnitude of the result. It may return a Bignum.
  */
 
 static VALUE
 fix_minus(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	return rb_fix_minus_fix(x, y);
+	long a, b, c;
+	VALUE r;
+
+	a = FIX2LONG(x);
+	b = FIX2LONG(y);
+	c = a - b;
+	r = LONG2NUM(c);
+
+	return r;
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
 	x = rb_int2big(FIX2LONG(x));
@@ -3649,17 +3417,19 @@ rb_int_minus(VALUE x, VALUE y)
 }
 
 
-#define SQRT_LONG_MAX HALF_LONG_MSB
+#define SQRT_LONG_MAX ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2))
 /*tests if N*N would overflow*/
 #define FIT_SQRT_LONG(n) (((n)<SQRT_LONG_MAX)&&((n)>=-SQRT_LONG_MAX))
 
 /*
  * Document-method: Integer#*
+ * Document-method: Fixnum#*
  * call-seq:
- *    int * numeric  ->  numeric_result
+ *   int * numeric  ->  numeric_result
  *
- * Performs multiplication: the class of the resulting object depends on
- * the class of +numeric+.
+ * Performs multiplication: the class of the resulting object depends on the
+ * class of +numeric+ and on the magnitude of the result. It may return a
+ * Bignum.
  */
 
 static VALUE
@@ -3669,10 +3439,6 @@ fix_mul(VALUE x, VALUE y)
 	return rb_fix_mul_fix(x, y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
-	switch (x) {
-	  case INT2FIX(0): return x;
-	  case INT2FIX(1): return y;
-	}
 	return rb_big_mul(y, x);
     }
     else if (RB_TYPE_P(y, T_FLOAT)) {
@@ -3698,79 +3464,65 @@ rb_int_mul(VALUE x, VALUE y)
     return rb_num_coerce_bin(x, y, '*');
 }
 
-static double
-fix_fdiv_double(VALUE x, VALUE y)
+/*
+ *  Document-method: Integer#fdiv
+ *  call-seq:
+ *     integer.fdiv(numeric)  ->  float
+ *
+ *  Returns the floating point result of dividing +fix+ by +numeric+.
+ *
+ *     654321.fdiv(13731)      #=> 47.6528293642124
+ *     654321.fdiv(13731.24)   #=> 47.6519964693647
+ *
+ *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
+ *
+ */
+
+static VALUE
+fix_fdiv(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-        return double_div_double(FIX2LONG(x), FIX2LONG(y));
+	return DBL2NUM((double)FIX2LONG(x) / (double)FIX2LONG(y));
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
-        return rb_big_fdiv_double(rb_int2big(FIX2LONG(x)), y);
+	return rb_big_fdiv(rb_int2big(FIX2LONG(x)), y);
     }
     else if (RB_TYPE_P(y, T_FLOAT)) {
-        return double_div_double(FIX2LONG(x), RFLOAT_VALUE(y));
+	return DBL2NUM((double)FIX2LONG(x) / RFLOAT_VALUE(y));
     }
     else {
-        return NUM2DBL(rb_num_coerce_bin(x, y, rb_intern("fdiv")));
+	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
 }
 
-double
-rb_int_fdiv_double(VALUE x, VALUE y)
+static VALUE
+int_fdiv(VALUE x, VALUE y)
 {
-    if (RB_INTEGER_TYPE_P(y) && !FIXNUM_ZERO_P(y)) {
-	VALUE gcd = rb_gcd(x, y);
-	if (!FIXNUM_ZERO_P(gcd)) {
-	    x = rb_int_idiv(x, gcd);
-	    y = rb_int_idiv(y, gcd);
-	}
-    }
     if (FIXNUM_P(x)) {
-        return fix_fdiv_double(x, y);
+	return fix_fdiv(x, y);
     }
     else if (RB_TYPE_P(x, T_BIGNUM)) {
-        return rb_big_fdiv_double(x, y);
-    }
-    else {
-        return nan("");
-    }
-}
-
-/*
- *  Document-method: Integer#fdiv
- *  call-seq:
- *     int.fdiv(numeric)  ->  float
- *
- *  Returns the floating point result of dividing +int+ by +numeric+.
- *
- *     654321.fdiv(13731)      #=> 47.652829364212366
- *     654321.fdiv(13731.24)   #=> 47.65199646936475
- *     -654321.fdiv(13731)     #=> -47.652829364212366
- */
-
-VALUE
-rb_int_fdiv(VALUE x, VALUE y)
-{
-    if (RB_INTEGER_TYPE_P(x)) {
-        return DBL2NUM(rb_int_fdiv_double(x, y));
+	return rb_big_fdiv(x, y);
     }
     return Qnil;
 }
 
 /*
  * Document-method: Integer#/
+ * Document-method: Fixnum#/
  * call-seq:
- *    int / numeric  ->  numeric_result
+ *   int / numeric  ->  numeric_result
  *
- * Performs division: the class of the resulting object depends on
- * the class of +numeric+.
+ * Performs division: the class of the resulting object depends on the class of
+ * +numeric+ and on the magnitude of the result. It may return a Bignum.
  */
 
 static VALUE
 fix_divide(VALUE x, VALUE y, ID op)
 {
     if (FIXNUM_P(y)) {
-	if (FIXNUM_ZERO_P(y)) rb_num_zerodiv();
+	if (FIX2LONG(y) == 0) rb_num_zerodiv();
 	return rb_fix_div_fix(x, y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
@@ -3778,16 +3530,19 @@ fix_divide(VALUE x, VALUE y, ID op)
 	return rb_big_div(x, y);
     }
     else if (RB_TYPE_P(y, T_FLOAT)) {
+	{
+	    double div;
+
 	    if (op == '/') {
-                double d = FIX2LONG(x);
-                return rb_flo_div_flo(DBL2NUM(d), y);
+		div = (double)FIX2LONG(x) / RFLOAT_VALUE(y);
+		return DBL2NUM(div);
 	    }
 	    else {
-                VALUE v;
 		if (RFLOAT_VALUE(y) == 0) rb_num_zerodiv();
-                v = fix_divide(x, y, '/');
-                return flo_floor(0, 0, v);
+		div = (double)FIX2LONG(x) / RFLOAT_VALUE(y);
+		return rb_dbl2big(floor(div));
 	    }
+	}
     }
     else {
 	if (RB_TYPE_P(y, T_RATIONAL) &&
@@ -3818,10 +3573,10 @@ rb_int_div(VALUE x, VALUE y)
 /*
  * Document-method: Integer#div
  * call-seq:
- *    int.div(numeric)  ->  integer
+ *   int.div(numeric)  ->  integer
  *
- * Performs integer division: returns the integer result of dividing +int+
- * by +numeric+.
+ * Performs integer division: returns integer result of dividing +int+ by
+ * +numeric+.
  */
 
 static VALUE
@@ -3843,11 +3598,12 @@ rb_int_idiv(VALUE x, VALUE y)
 }
 
 /*
+ *  Document-method: Fixnum#%
  *  Document-method: Integer#%
  *  Document-method: Integer#modulo
  *  call-seq:
- *     int % other        ->  real
- *     int.modulo(other)  ->  real
+ *    int % other        ->  real
+ *    int.modulo(other)  ->  real
  *
  *  Returns +int+ modulo +other+.
  *
@@ -3858,7 +3614,7 @@ static VALUE
 fix_mod(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	if (FIXNUM_ZERO_P(y)) rb_num_zerodiv();
+	if (FIX2LONG(y) == 0) rb_num_zerodiv();
 	return rb_fix_mod_fix(x, y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
@@ -3889,20 +3645,25 @@ rb_int_modulo(VALUE x, VALUE y)
  *  call-seq:
  *     int.remainder(numeric)  ->  real
  *
- *  Returns the remainder after dividing +int+ by +numeric+.
  *
- *  <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ *  Returns the remainder after dividing <i>big</i> by <i>numeric</i> as:
  *
- *     5.remainder(3)     #=> 2
- *     -5.remainder(3)    #=> -2
- *     5.remainder(-3)    #=> 2
- *     -5.remainder(-3)   #=> -2
- *     5.remainder(1.5)   #=> 0.5
+ *    x.remainder(y) means x-y*(x/y).truncate
+ *
+ *  Examples
+ *
+ *    5.remainder(3)    #=> 2
+ *    -5.remainder(3)   #=> -2
+ *    5.remainder(-3)   #=> 2
+ *    -5.remainder(-3)  #=> -2
+ *
+ *    -1234567890987654321.remainder(13731)      #=> -6966
+ *    -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
  *
  *  See Numeric#divmod.
  */
 
-static VALUE
+VALUE
 int_remainder(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
@@ -3917,16 +3678,16 @@ int_remainder(VALUE x, VALUE y)
 /*
  *  Document-method: Integer#divmod
  *  call-seq:
- *     int.divmod(numeric)  ->  array
+ *     integer.divmod(numeric)  ->  array
  *
- *  See Numeric#divmod.
+ *  See <code>Numeric#divmod</code>.
  */
 static VALUE
 fix_divmod(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
 	VALUE div, mod;
-	if (FIXNUM_ZERO_P(y)) rb_num_zerodiv();
+	if (FIX2LONG(y) == 0) rb_num_zerodiv();
 	rb_fix_divmod_fix(x, y, &div, &mod);
 	return rb_assoc_new(div, mod);
     }
@@ -3950,8 +3711,8 @@ fix_divmod(VALUE x, VALUE y)
     }
 }
 
-VALUE
-rb_int_divmod(VALUE x, VALUE y)
+static VALUE
+int_divmod(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
 	return fix_divmod(x, y);
@@ -3965,20 +3726,20 @@ rb_int_divmod(VALUE x, VALUE y)
 /*
  *  Document-method: Integer#**
  *  call-seq:
- *     int ** numeric  ->  numeric_result
+ *    integer ** numeric  ->  numeric_result
  *
- *  Raises +int+ to the power of +numeric+, which may be negative or
+ *  Raises +integer+ to the power of +numeric+, which may be negative or
  *  fractional.
- *  The result may be an Integer, a Float, a Rational, or a complex number.
+ *  The result may be a Fixnum, Bignum, or Float
+ *
+ *    2 ** 3      #=> 8
+ *    2 ** -1     #=> (1/2)
+ *    2 ** 0.5    #=> 1.4142135623731
  *
- *     2 ** 3        #=> 8
- *     2 ** -1       #=> (1/2)
- *     2 ** 0.5      #=> 1.4142135623730951
- *     (-1) ** 0.5   #=> (0.0+1.0i)
+ *    123456789 ** 2      #=> 15241578750190521
+ *    123456789 ** 1.2    #=> 5126464716.09932
+ *    123456789 ** -2     #=> (1/15241578750190521)
  *
- *     123456789 ** 2     #=> 15241578750190521
- *     123456789 ** 1.2   #=> 5126464716.0993185
- *     123456789 ** -2    #=> (1/15241578750190521)
  */
 
 static VALUE
@@ -3987,8 +3748,6 @@ int_pow(long x, unsigned long y)
     int neg = x < 0;
     long z = 1;
 
-    if (y == 0) return INT2FIX(1);
-    if (y == 1) return LONG2NUM(x);
     if (neg) x = -x;
     if (y & 1)
 	z = x;
@@ -4001,8 +3760,6 @@ int_pow(long x, unsigned long y)
 		VALUE v;
 	      bignum:
 		v = rb_big_pow(rb_int2big(x), LONG2NUM(y));
-		if (RB_FLOAT_TYPE_P(v)) /* infinity due to overflow */
-		    return v;
 		if (z != 1) v = rb_big_mul(rb_int2big(neg ? -z : z), v);
 		return v;
 	    }
@@ -4041,17 +3798,14 @@ fix_pow(VALUE x, VALUE y)
 	    else
 		return INT2FIX(-1);
 	}
-	if (b < 0) {
-	    if (a == 0) rb_num_zerodiv();
-            y = rb_int_pow(x, LONG2NUM(-b));
-            goto inverted;
-	}
+	if (b < 0)
+	    return num_funcall1(rb_rational_raw1(x), idPow, y);
 
 	if (b == 0) return INT2FIX(1);
 	if (b == 1) return x;
 	if (a == 0) {
 	    if (b > 0) return INT2FIX(0);
-	    return DBL2NUM(HUGE_VAL);
+	    return DBL2NUM(INFINITY);
 	}
 	return int_pow(a, b);
     }
@@ -4061,30 +3815,22 @@ fix_pow(VALUE x, VALUE y)
 	    if (int_even_p(y)) return INT2FIX(1);
 	    else return INT2FIX(-1);
 	}
-	if (BIGNUM_NEGATIVE_P(y)) {
-	    if (a == 0) rb_num_zerodiv();
-            y = rb_int_pow(x, rb_big_uminus(y));
-          inverted:
-            if (RB_FLOAT_TYPE_P(y)) {
-                double d = pow((double)a, RFLOAT_VALUE(y));
-                return DBL2NUM(1.0 / d);
-            }
-            return rb_rational_raw(INT2FIX(1), y);
-	}
+	if (negative_int_p(y))
+	    return num_funcall1(rb_rational_raw1(x), idPow, y);
 	if (a == 0) return INT2FIX(0);
 	x = rb_int2big(FIX2LONG(x));
 	return rb_big_pow(x, y);
     }
     else if (RB_TYPE_P(y, T_FLOAT)) {
-	double dy = RFLOAT_VALUE(y);
-	if (dy == 0.0) return DBL2NUM(1.0);
+	if (RFLOAT_VALUE(y) == 0.0) return DBL2NUM(1.0);
 	if (a == 0) {
-	    return DBL2NUM(dy < 0 ? HUGE_VAL : 0.0);
+	    return DBL2NUM(RFLOAT_VALUE(y) < 0 ? INFINITY : 0.0);
 	}
 	if (a == 1) return DBL2NUM(1.0);
 	{
+	    double dy = RFLOAT_VALUE(y);
 	    if (a < 0 && dy != round(dy))
-                return rb_dbl_complex_new_polar_pi(pow(-(double)a, dy), dy);
+		return num_funcall1(rb_complex_raw1(x), idPow, y);
 	    return DBL2NUM(pow((double)a, dy));
 	}
     }
@@ -4093,7 +3839,7 @@ fix_pow(VALUE x, VALUE y)
     }
 }
 
-VALUE
+static VALUE
 rb_int_pow(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
@@ -4105,33 +3851,18 @@ rb_int_pow(VALUE x, VALUE y)
     return Qnil;
 }
 
-VALUE
-rb_num_pow(VALUE x, VALUE y)
-{
-    VALUE z = rb_int_pow(x, y);
-    if (!NIL_P(z)) return z;
-    if (RB_FLOAT_TYPE_P(x)) return rb_float_pow(x, y);
-    if (SPECIAL_CONST_P(x)) return Qnil;
-    switch (BUILTIN_TYPE(x)) {
-      case T_COMPLEX:
-        return rb_complex_pow(x, y);
-      case T_RATIONAL:
-        return rb_rational_pow(x, y);
-    }
-    return Qnil;
-}
-
 /*
  * Document-method: Integer#==
- * Document-method: Integer#===
+ * Document-method: Fixnum#==
  * call-seq:
- *    int == other  ->  true or false
+ *   int == other  ->  true or false
  *
- * Returns +true+ if +int+ equals +other+ numerically.
- * Contrast this with Integer#eql?, which requires +other+ to be an Integer.
+ * Return +true+ if +int+ equals +other+ numerically.
+ * Contrast this with <code>Integer#eql?</code>, which
+ * requires <i>other</i> to be a <code>Integer</code>.
  *
- *    1 == 2     #=> false
- *    1 == 1.0   #=> true
+ *   1 == 2      #=> false
+ *   1 == 1.0    #=> true
  */
 
 static VALUE
@@ -4150,8 +3881,8 @@ fix_equal(VALUE x, VALUE y)
     }
 }
 
-VALUE
-rb_int_equal(VALUE x, VALUE y)
+static VALUE
+int_equal(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
 	return fix_equal(x, y);
@@ -4165,9 +3896,9 @@ rb_int_equal(VALUE x, VALUE y)
 /*
  *  Document-method: Integer#<=>
  *  call-seq:
- *     int <=> numeric  ->  -1, 0, +1, or nil
+ *     int <=> numeric  ->  -1, 0, +1 or nil
  *
- *  Comparison---Returns -1, 0, or +1 depending on whether +int+ is
+ *  Comparison---Returns +-1+, +0+, ++1+ or +nil+ depending on whether +int+ is
  *  less than, equal to, or greater than +numeric+.
  *
  *  This is the basis for the tests in the Comparable module.
@@ -4200,8 +3931,8 @@ fix_cmp(VALUE x, VALUE y)
     return rb_num_coerce_cmp(x, y, id_cmp);
 }
 
-VALUE
-rb_int_cmp(VALUE x, VALUE y)
+static VALUE
+int_cmp(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
 	return fix_cmp(x, y);
@@ -4216,8 +3947,9 @@ rb_int_cmp(VALUE x, VALUE y)
 
 /*
  * Document-method: Integer#>
+ * Document-method: Fixnum#>
  * call-seq:
- *    int > real  ->  true or false
+ *   int > real  ->  true or false
  *
  * Returns +true+ if the value of +int+ is greater than that of +real+.
  */
@@ -4240,8 +3972,8 @@ fix_gt(VALUE x, VALUE y)
     }
 }
 
-VALUE
-rb_int_gt(VALUE x, VALUE y)
+static VALUE
+int_gt(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
 	return fix_gt(x, y);
@@ -4254,8 +3986,9 @@ rb_int_gt(VALUE x, VALUE y)
 
 /*
  * Document-method: Integer#>=
+ * Document-method: Fixnum#>=
  * call-seq:
- *    int >= real  ->  true or false
+ *   int >= real  ->  true or false
  *
  * Returns +true+ if the value of +int+ is greater than or equal to that of
  * +real+.
@@ -4294,8 +4027,9 @@ rb_int_ge(VALUE x, VALUE y)
 
 /*
  * Document-method: Integer#<
+ * Document-method: Fixnum#<
  * call-seq:
- *    int < real  ->  true or false
+ *   int < real  ->  true or false
  *
  * Returns +true+ if the value of +int+ is less than that of +real+.
  */
@@ -4332,8 +4066,9 @@ int_lt(VALUE x, VALUE y)
 
 /*
  * Document-method: Integer#<=
+ * Document-method: Fixnum#<=
  * call-seq:
- *    int <= real  ->  true or false
+ *   int <= real  ->  true or false
  *
  * Returns +true+ if the value of +int+ is less than or equal to that of
  * +real+.
@@ -4373,16 +4108,17 @@ int_le(VALUE x, VALUE y)
 /*
  * Document-method: Integer#~
  * call-seq:
- *   ~int  ->  integer
+ *   ~integer  ->  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
+ * Inverts the bits in a integer. As Integers are conceptually infinite
+ * length, the result acts as if it had an infinite number of one
+ * bits to the left. In hex representations, this is displayed
  * as two periods to the left of the digits.
  *
  *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
+ *
  */
 
 static VALUE
@@ -4403,39 +4139,30 @@ int_comp(VALUE num)
     return Qnil;
 }
 
-static VALUE
-num_funcall_bit_1(VALUE y, VALUE arg, int recursive)
+static int
+bit_coerce(VALUE *x, VALUE *y)
 {
-    ID func = (ID)((VALUE *)arg)[0];
-    VALUE x = ((VALUE *)arg)[1];
-    if (recursive) {
-	num_funcall_op_1_recursion(x, func, y);
+    if (!RB_INTEGER_TYPE_P(*y)) {
+	VALUE orig = *x;
+	do_coerce(x, y, TRUE);
+	if (!RB_INTEGER_TYPE_P(*x) && !RB_INTEGER_TYPE_P(*y)) {
+	    coerce_failed(orig, *y);
+	}
     }
-    return rb_check_funcall(x, func, 1, &y);
+    return TRUE;
 }
 
 VALUE
 rb_num_coerce_bit(VALUE x, VALUE y, ID func)
 {
-    VALUE ret, args[3];
-
-    args[0] = (VALUE)func;
-    args[1] = x;
-    args[2] = y;
-    do_coerce(&args[1], &args[2], TRUE);
-    ret = rb_exec_recursive_paired(num_funcall_bit_1,
-				   args[2], args[1], (VALUE)args);
-    if (ret == Qundef) {
-	/* show the original object, not coerced object */
-	coerce_failed(x, y);
-    }
-    return ret;
+    bit_coerce(&x, &y);
+    return num_funcall1(x, func, y);
 }
 
 /*
  * Document-method: Integer#&
  * call-seq:
- *   int & other_int  ->  integer
+ *   integer & integer  ->  integer_result
  *
  * Bitwise AND.
  */
@@ -4452,11 +4179,12 @@ fix_and(VALUE x, VALUE y)
 	return rb_big_and(y, x);
     }
 
-    return rb_num_coerce_bit(x, y, '&');
+    bit_coerce(&x, &y);
+    return num_funcall1(x, '&', y);
 }
 
-VALUE
-rb_int_and(VALUE x, VALUE y)
+static VALUE
+int_and(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
 	return fix_and(x, y);
@@ -4470,7 +4198,7 @@ rb_int_and(VALUE x, VALUE y)
 /*
  * Document-method: Integer#|
  * call-seq:
- *   int | other_int  ->  integer
+ *   integer | integer  ->  integer_result
  *
  * Bitwise OR.
  */
@@ -4487,7 +4215,8 @@ fix_or(VALUE x, VALUE y)
 	return rb_big_or(y, x);
     }
 
-    return rb_num_coerce_bit(x, y, '|');
+    bit_coerce(&x, &y);
+    return num_funcall1(x, '|', y);
 }
 
 static VALUE
@@ -4505,7 +4234,7 @@ int_or(VALUE x, VALUE y)
 /*
  * Document-method: Integer#^
  * call-seq:
- *   int ^ other_int  ->  integer
+ *   integer ^ integer  ->  integer_result
  *
  * Bitwise EXCLUSIVE OR.
  */
@@ -4522,7 +4251,8 @@ fix_xor(VALUE x, VALUE y)
 	return rb_big_xor(y, x);
     }
 
-    return rb_num_coerce_bit(x, y, '^');
+    bit_coerce(&x, &y);
+    return num_funcall1(x, '^', y);
 }
 
 static VALUE
@@ -4542,8 +4272,7 @@ int_xor(VALUE x, VALUE y)
  * call-seq:
  *   int << count  ->  integer
  *
- * Returns +int+ shifted left +count+ positions, or right if +count+
- * is negative.
+ * Shifts +int+ left +count+ positions, or right if +count+ is negative.
  */
 
 static VALUE
@@ -4571,7 +4300,7 @@ fix_lshift(long val, unsigned long width)
     return LONG2NUM(val);
 }
 
-VALUE
+static VALUE
 rb_int_lshift(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
@@ -4588,8 +4317,7 @@ rb_int_lshift(VALUE x, VALUE y)
  * call-seq:
  *   int >> count  ->  integer
  *
- * Returns +int+ shifted right +count+ positions, or left if +count+
- * is negative.
+ * Shifts +int+ right +count+ positions, or left if +count+ is negative.
  */
 
 static VALUE
@@ -4635,16 +4363,19 @@ rb_int_rshift(VALUE x, VALUE y)
  *  call-seq:
  *     int[n]  ->  0, 1
  *
- *  Bit Reference---Returns the <code>n</code>th bit in the
- *  binary representation of +int+, where <code>int[0]</code>
- *  is the least significant bit.
+ *  Bit Reference---Returns the +n+th bit in the binary representation of
+ *  +int+, where <code>int[0]</code> is the least significant bit.
+ *
+ *  For example:
  *
  *     a = 0b11001100101010
- *     30.downto(0) {|n| print a[n] }
+ *     30.downto(0) do |n| print a[n] end
  *     #=> 0000000000000000011001100101010
  *
  *     a = 9**15
- *     50.downto(0) {|n| print a[n] }
+ *     50.downto(0) do |n|
+ *       print a[n]
+ *     end
  *     #=> 000101110110100000111000011110010100111100010111001
  */
 
@@ -4692,8 +4423,9 @@ int_aref(VALUE num, VALUE idx)
  *  call-seq:
  *     int.to_f  ->  float
  *
- *  Converts +int+ to a Float.  If +int+ doesn't fit in a Float,
+ *  Converts +int+ to a +Float+.  If +int+ doesn't fit in a +Float+,
  *  the result is infinity.
+ *
  */
 
 static VALUE
@@ -4723,11 +4455,10 @@ int_to_f(VALUE num)
  *
  *  Returns the absolute value of +int+.
  *
- *     (-12345).abs   #=> 12345
- *     -12345.abs     #=> 12345
- *     12345.abs      #=> 12345
+ *     -12345.abs   #=> 12345
+ *     12345.abs    #=> 12345
+ *     -1234567890987654321.abs   #=> 1234567890987654321
  *
- *  Integer#magnitude is an alias for Integer#abs.
  */
 
 static VALUE
@@ -4740,8 +4471,8 @@ fix_abs(VALUE fix)
     return LONG2NUM(i);
 }
 
-VALUE
-rb_int_abs(VALUE num)
+static VALUE
+int_abs(VALUE num)
 {
     if (FIXNUM_P(num)) {
 	return fix_abs(num);
@@ -4757,13 +4488,12 @@ rb_int_abs(VALUE num)
  *  call-seq:
  *     int.size  ->  int
  *
- *  Returns the number of bytes in the machine representation of +int+
- *  (machine dependent).
+ *  Returns the number of bytes in the machine representation of +fix+.
  *
- *     1.size               #=> 8
- *     -1.size              #=> 8
- *     2147483647.size      #=> 8
- *     (256**10 - 1).size   #=> 10
+ *     1.size            #=> 4
+ *     -1.size           #=> 4
+ *     2147483647.size   #=> 4
+ *     (256**10 - 1).size   #=> 12
  *     (256**20 - 1).size   #=> 20
  *     (256**40 - 1).size   #=> 40
  */
@@ -4789,17 +4519,20 @@ int_size(VALUE num)
 /*
  *  Document-method: Integer#bit_length
  *  call-seq:
- *     int.bit_length  ->  integer
+ *     int.bit_length -> integer
  *
- *  Returns the number of bits of the value of +int+.
+ *  Returns the number of bits of the value of <i>int</i>.
  *
- *  "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).
+ *  "the number of bits" means that
+ *  the bit position of the highest bit which is different to the sign bit.
+ *  (The bit position of the bit 2**n is n+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>.
+ *  I.e. This method returns ceil(log2(int < 0 ? -int : int+1)).
  *
+ *     (-2**10000-1).bit_length  #=> 10001
+ *     (-2**10000).bit_length    #=> 10000
+ *     (-2**10000+1).bit_length  #=> 10000
  *     (-2**1000-1).bit_length   #=> 1001
  *     (-2**1000).bit_length     #=> 1000
  *     (-2**1000+1).bit_length   #=> 1000
@@ -4821,8 +4554,11 @@ int_size(VALUE num)
  *     (2**1000-1).bit_length    #=> 1000
  *     (2**1000).bit_length      #=> 1001
  *     (2**1000+1).bit_length    #=> 1001
+ *     (2**10000-1).bit_length   #=> 10000
+ *     (2**10000).bit_length     #=> 10001
+ *     (2**10000+1).bit_length   #=> 10001
  *
- *  This method can be used to detect overflow in Array#pack as follows:
+ *  This method can be used to detect overflow in Array#pack as follows.
  *
  *     if n.bit_length < 32
  *       [n].pack("l") # no overflow
@@ -4855,15 +4591,13 @@ rb_int_bit_length(VALUE num)
 /*
  *  Document-method: Integer#digits
  *  call-seq:
- *     int.digits        ->  array
- *     int.digits(base)  ->  array
+ *     int.digits       -> [int]
+ *     int.digits(base) -> [int]
  *
- *  Returns the digits of +int+'s place-value representation
- *  with radix +base+ (default: 10).
- *  The digits are returned as an array with the least significant digit
- *  as the first array element.
+ *  Returns the array including the digits extracted by place-value notation
+ *  with radix +base+ of +int+.
  *
- *  +base+ must be greater than or equal to 2.
+ *  +base+ should be greater than or equal to 2.
  *
  *     12345.digits      #=> [5, 4, 3, 2, 1]
  *     12345.digits(7)   #=> [4, 6, 6, 0, 5]
@@ -4919,7 +4653,7 @@ rb_int_digits_bigbase(VALUE num, VALUE base)
 
     digits = rb_ary_new();
     while (!FIXNUM_P(num) || FIX2LONG(num) > 0) {
-        VALUE qr = rb_int_divmod(num, base);
+        VALUE qr = int_divmod(num, base);
         rb_ary_push(digits, RARRAY_AREF(qr, 1));
         num = RARRAY_AREF(qr, 0);
     }
@@ -4945,9 +4679,7 @@ rb_int_digits(int argc, VALUE *argv, VALUE num)
             return rb_int_digits_bigbase(num, base_value);
 
         base = FIX2LONG(base_value);
-        if (base < 0)
-            rb_raise(rb_eArgError, "negative radix");
-        else if (base < 2)
+        if (base < 2)
             rb_raise(rb_eArgError, "invalid radix %ld", base);
     }
     else
@@ -4972,7 +4704,10 @@ rb_int_digits(int argc, VALUE *argv, VALUE num)
  *
  *  If no block is given, an Enumerator is returned instead.
  *
- *     5.upto(10) {|i| print i, " " }   #=> 5 6 7 8 9 10
+ *  For example:
+ *
+ *     5.upto(10) { |i| print i, " " }
+ *     #=> 5 6 7 8 9 10
  */
 
 static VALUE
@@ -5011,14 +4746,14 @@ int_upto(VALUE from, VALUE to)
  *     int.downto(limit) {|i| block }  ->  self
  *     int.downto(limit)               ->  an_enumerator
  *
- *  Iterates the given block, passing in decreasing values from +int+ down to
- *  and including +limit+.
+ *  Iterates the given block, passing decreasing values from +int+ down to and
+ *  including +limit+.
  *
  *  If no block is given, an Enumerator is returned instead.
  *
  *     5.downto(1) { |n| print n, ".. " }
- *     puts "Liftoff!"
- *     #=> "5.. 4.. 3.. 2.. 1.. Liftoff!"
+ *     print "  Liftoff!\n"
+ *     #=> "5.. 4.. 3.. 2.. 1..   Liftoff!"
  */
 
 static VALUE
@@ -5062,7 +4797,10 @@ int_downto(VALUE from, VALUE to)
  *
  *  If no block is given, an Enumerator is returned instead.
  *
- *     5.times {|i| print i, " " }   #=> 0 1 2 3 4
+ *     5.times do |i|
+ *       print i, " "
+ *     end
+ *     #=> 0 1 2 3 4
  */
 
 static VALUE
@@ -5105,49 +4843,32 @@ int_dotimes(VALUE num)
 /*
  *  Document-method: Integer#round
  *  call-seq:
- *     int.round([ndigits] [, half: mode])  ->  integer or float
- *
- *  Returns +int+ rounded to the nearest value with
- *  a precision of +ndigits+ decimal digits (default: 0).
+ *     int.round([ndigits])  ->  integer or float
  *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
+ *  Rounds +int+ to a given precision in decimal digits (default 0 digits).
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and round down for negative.
  *
- *     1.round           #=> 1
- *     1.round(2)        #=> 1
- *     15.round(-1)      #=> 20
- *     (-15).round(-1)   #=> -20
- *
- *  The optional +half+ keyword argument is available
- *  similar to Float#round.
- *
- *     25.round(-1, half: :up)      #=> 30
- *     25.round(-1, half: :down)    #=> 20
- *     25.round(-1, half: :even)    #=> 20
- *     35.round(-1, half: :up)      #=> 40
- *     35.round(-1, half: :down)    #=> 30
- *     35.round(-1, half: :even)    #=> 40
- *     (-25).round(-1, half: :up)   #=> -30
- *     (-25).round(-1, half: :down) #=> -20
- *     (-25).round(-1, half: :even) #=> -20
+ *     1.round        #=> 1
+ *     1.round(2)     #=> 1.0
+ *     15.round(-1)   #=> 20
  */
 
 static VALUE
 int_round(int argc, VALUE* argv, VALUE num)
 {
     int ndigits;
-    int mode;
-    VALUE nd, opt;
 
-    if (!rb_scan_args(argc, argv, "01:", &nd, &opt)) return num;
-    ndigits = NUM2INT(nd);
-    mode = rb_num_get_rounding_option(opt);
-    if (ndigits >= 0) {
+    if (!rb_check_arity(argc, 0, 1)) return num;
+    ndigits = NUM2INT(argv[0]);
+    if (ndigits > 0) {
+	return rb_Float(num);
+    }
+    if (ndigits == 0) {
 	return num;
     }
-    return rb_int_round(num, ndigits, mode);
+    return rb_int_round(num, ndigits);
 }
 
 /*
@@ -5155,18 +4876,15 @@ int_round(int argc, VALUE* argv, VALUE num)
  *  call-seq:
  *     int.floor([ndigits])  ->  integer or float
  *
- *  Returns the largest number less than or equal to +int+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
- *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
+ *  Returns the largest number less than or equal to +int+ in decimal
+ *  digits (default 0 digits).
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and floor down for negative.
  *
- *     1.floor           #=> 1
- *     1.floor(2)        #=> 1
- *     18.floor(-1)      #=> 10
- *     (-18).floor(-1)   #=> -20
+ *     1.floor        #=> 1
+ *     1.floor(2)     #=> 1.0
+ *     15.floor(-1)   #=> 10
  */
 
 static VALUE
@@ -5176,7 +4894,10 @@ int_floor(int argc, VALUE* argv, VALUE num)
 
     if (!rb_check_arity(argc, 0, 1)) return num;
     ndigits = NUM2INT(argv[0]);
-    if (ndigits >= 0) {
+    if (ndigits > 0) {
+	return rb_Float(num);
+    }
+    if (ndigits == 0) {
 	return num;
     }
     return rb_int_floor(num, ndigits);
@@ -5187,18 +4908,15 @@ int_floor(int argc, VALUE* argv, VALUE num)
  *  call-seq:
  *     int.ceil([ndigits])  ->  integer or float
  *
- *  Returns the smallest number greater than or equal to +int+ with
- *  a precision of +ndigits+ decimal digits (default: 0).
- *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
+ *  Returns the smallest number than or equal to +int+ in decimal
+ *  digits (default 0 digits).
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and ceil up for negative.
  *
- *     1.ceil           #=> 1
- *     1.ceil(2)        #=> 1
- *     18.ceil(-1)      #=> 20
- *     (-18).ceil(-1)   #=> -10
+ *     1.ceil        #=> 1
+ *     1.ceil(2)     #=> 1.0
+ *     15.ceil(-1)   #=> 20
  */
 
 static VALUE
@@ -5208,7 +4926,10 @@ int_ceil(int argc, VALUE* argv, VALUE num)
 
     if (!rb_check_arity(argc, 0, 1)) return num;
     ndigits = NUM2INT(argv[0]);
-    if (ndigits >= 0) {
+    if (ndigits > 0) {
+	return rb_Float(num);
+    }
+    if (ndigits == 0) {
 	return num;
     }
     return rb_int_ceil(num, ndigits);
@@ -5219,18 +4940,15 @@ int_ceil(int argc, VALUE* argv, VALUE num)
  *  call-seq:
  *     int.truncate([ndigits])  ->  integer or float
  *
- *  Returns +int+ truncated (toward zero) to
- *  a precision of +ndigits+ decimal digits (default: 0).
- *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros.
+ *  Returns the smallest number than or equal to +int+ in decimal
+ *  digits (default 0 digits).
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  Precision may be negative.  Returns a floating point number when +ndigits+
+ *  is positive, +self+ for zero, and truncate up for negative.
  *
- *     1.truncate           #=> 1
- *     1.truncate(2)        #=> 1
- *     18.truncate(-1)      #=> 10
- *     (-18).truncate(-1)   #=> -10
+ *     1.truncate        #=> 1
+ *     1.truncate(2)     #=> 1.0
+ *     15.truncate(-1)   #=> 10
  */
 
 static VALUE
@@ -5240,134 +4958,38 @@ int_truncate(int argc, VALUE* argv, VALUE num)
 
     if (!rb_check_arity(argc, 0, 1)) return num;
     ndigits = NUM2INT(argv[0]);
-    if (ndigits >= 0) {
+    if (ndigits > 0) {
+	return rb_Float(num);
+    }
+    if (ndigits == 0) {
 	return num;
     }
     return rb_int_truncate(num, ndigits);
 }
 
-#define DEFINE_INT_SQRT(rettype, prefix, argtype) \
-rettype \
-prefix##_isqrt(argtype n) \
-{ \
-    if (!argtype##_IN_DOUBLE_P(n)) { \
-	unsigned int b = bit_length(n); \
-	argtype t; \
-	rettype x = (rettype)(n >> (b/2+1)); \
-	x |= ((rettype)1LU << (b-1)/2); \
-	while ((t = n/x) < (argtype)x) x = (rettype)((x + t) >> 1); \
-	return x; \
-    } \
-    return (rettype)sqrt(argtype##_TO_DOUBLE(n)); \
-}
-
-#if SIZEOF_LONG*CHAR_BIT > DBL_MANT_DIG
-# define RB_ULONG_IN_DOUBLE_P(n) ((n) < (1UL << DBL_MANT_DIG))
-#else
-# define RB_ULONG_IN_DOUBLE_P(n) 1
-#endif
-#define RB_ULONG_TO_DOUBLE(n) (double)(n)
-#define RB_ULONG unsigned long
-DEFINE_INT_SQRT(unsigned long, rb_ulong, RB_ULONG)
-
-#if 2*SIZEOF_BDIGIT > SIZEOF_LONG
-# if 2*SIZEOF_BDIGIT*CHAR_BIT > DBL_MANT_DIG
-#   define BDIGIT_DBL_IN_DOUBLE_P(n) ((n) < ((BDIGIT_DBL)1UL << DBL_MANT_DIG))
-# else
-#   define BDIGIT_DBL_IN_DOUBLE_P(n) 1
-# endif
-# ifdef ULL_TO_DOUBLE
-#   define BDIGIT_DBL_TO_DOUBLE(n) ULL_TO_DOUBLE(n)
-# else
-#   define BDIGIT_DBL_TO_DOUBLE(n) (double)(n)
-# endif
-DEFINE_INT_SQRT(BDIGIT, rb_bdigit_dbl, BDIGIT_DBL)
-#endif
-
-#define domain_error(msg) \
-    rb_raise(rb_eMathDomainError, "Numerical argument is out of domain - " #msg)
-
-VALUE rb_big_isqrt(VALUE);
-
-/*
- *  Document-method: Integer::sqrt
- *  call-seq:
- *     Integer.sqrt(n)  ->  integer
- *
- *  Returns the integer square root of the non-negative integer +n+,
- *  i.e. the largest non-negative integer less than or equal to the
- *  square root of +n+.
- *
- *    Integer.sqrt(0)        #=> 0
- *    Integer.sqrt(1)        #=> 1
- *    Integer.sqrt(24)       #=> 4
- *    Integer.sqrt(25)       #=> 5
- *    Integer.sqrt(10**400)  #=> 10**200
- *
- *  Equivalent to <code>Math.sqrt(n).floor</code>, except that
- *  the result of the latter code may differ from the true value
- *  due to the limited precision of floating point arithmetic.
- *
- *    Integer.sqrt(10**46)     #=> 100000000000000000000000
- *    Math.sqrt(10**46).floor  #=>  99999999999999991611392 (!)
- *
- *  If +n+ is not an Integer, it is converted to an Integer first.
- *  If +n+ is negative, a Math::DomainError is raised.
- */
-
-static VALUE
-rb_int_s_isqrt(VALUE self, VALUE num)
-{
-    unsigned long n, sq;
-    num = rb_to_int(num);
-    if (FIXNUM_P(num)) {
-	if (FIXNUM_NEGATIVE_P(num)) {
-	    domain_error("isqrt");
-	}
-	n = FIX2ULONG(num);
-	sq = rb_ulong_isqrt(n);
-	return LONG2FIX(sq);
-    }
-    else {
-	size_t biglen;
-	if (RBIGNUM_NEGATIVE_P(num)) {
-	    domain_error("isqrt");
-	}
-	biglen = BIGNUM_LEN(num);
-	if (biglen == 0) return INT2FIX(0);
-#if SIZEOF_BDIGIT <= SIZEOF_LONG
-	/* short-circuit */
-	if (biglen == 1) {
-	    n = BIGNUM_DIGITS(num)[0];
-	    sq = rb_ulong_isqrt(n);
-	    return ULONG2NUM(sq);
-	}
-#endif
-	return rb_big_isqrt(num);
-    }
-}
-
 /*
  *  Document-class: ZeroDivisionError
  *
  *  Raised when attempting to divide an integer by 0.
  *
- *     42 / 0   #=> ZeroDivisionError: divided by 0
+ *     42 / 0
+ *     #=> ZeroDivisionError: divided by 0
  *
  *  Note that only division by an exact 0 will raise the exception:
  *
- *     42 /  0.0   #=> Float::INFINITY
- *     42 / -0.0   #=> -Float::INFINITY
- *     0  /  0.0   #=> NaN
+ *     42 /  0.0 #=> Float::INFINITY
+ *     42 / -0.0 #=> -Float::INFINITY
+ *     0  /  0.0 #=> NaN
  */
 
 /*
  *  Document-class: FloatDomainError
  *
  *  Raised when attempting to convert special float values (in particular
- *  +Infinity+ or +NaN+) to numerical classes which don't support them.
+ *  +infinite+ or +NaN+) to numerical classes which don't support them.
  *
- *     Float::INFINITY.to_r   #=> FloatDomainError: Infinity
+ *     Float::INFINITY.to_r
+ *     #=> FloatDomainError: Infinity
  */
 
 /*
@@ -5380,14 +5002,13 @@ rb_int_s_isqrt(VALUE self, VALUE num)
  * object which is always passed by value.
  *
  *   a = 1
- *   1.object_id == a.object_id   #=> true
+ *   puts 1.object_id == a.object_id   #=> true
  *
  * There can only ever be one instance of the integer +1+, for example. Ruby ensures this
- * by preventing instantiation. If duplication is attempted, the same instance is returned.
+ * by preventing instantiation and duplication.
  *
- *   Integer.new(1)                   #=> NoMethodError: undefined method `new' for Integer:Class
- *   1.dup                            #=> 1
- *   1.object_id == 1.dup.object_id   #=> true
+ *   Integer.new(1)   #=> NoMethodError: undefined method `new' for Integer:Class
+ *   1.dup            #=> TypeError: can't dup Fixnum
  *
  * For this reason, Numeric should be used when defining other numeric classes.
  *
@@ -5462,9 +5083,8 @@ Init_Numeric(void)
 
     rb_define_method(rb_cNumeric, "singleton_method_added", num_sadded, 1);
     rb_include_module(rb_cNumeric, rb_mComparable);
+    rb_define_method(rb_cNumeric, "initialize_copy", num_init_copy, 1);
     rb_define_method(rb_cNumeric, "coerce", num_coerce, 1);
-    rb_define_method(rb_cNumeric, "clone", num_clone, -1);
-    rb_define_method(rb_cNumeric, "dup", num_dup, 0);
 
     rb_define_method(rb_cNumeric, "i", num_imaginary, 0);
     rb_define_method(rb_cNumeric, "+@", num_uplus, 0);
@@ -5499,16 +5119,12 @@ Init_Numeric(void)
     rb_cInteger = rb_define_class("Integer", rb_cNumeric);
     rb_undef_alloc_func(rb_cInteger);
     rb_undef_method(CLASS_OF(rb_cInteger), "new");
-    rb_define_singleton_method(rb_cInteger, "sqrt", rb_int_s_isqrt, 1);
 
     rb_define_method(rb_cInteger, "to_s", int_to_s, -1);
     rb_define_alias(rb_cInteger, "inspect", "to_s");
     rb_define_method(rb_cInteger, "integer?", int_int_p, 0);
-    rb_define_method(rb_cInteger, "odd?", rb_int_odd_p, 0);
+    rb_define_method(rb_cInteger, "odd?", int_odd_p, 0);
     rb_define_method(rb_cInteger, "even?", int_even_p, 0);
-    rb_define_method(rb_cInteger, "allbits?", int_allbits_p, 1);
-    rb_define_method(rb_cInteger, "anybits?", int_anybits_p, 1);
-    rb_define_method(rb_cInteger, "nobits?", int_nobits_p, 1);
     rb_define_method(rb_cInteger, "upto", int_upto, 1);
     rb_define_method(rb_cInteger, "downto", int_downto, 1);
     rb_define_method(rb_cInteger, "times", int_dotimes, 0);
@@ -5524,7 +5140,7 @@ Init_Numeric(void)
     rb_define_method(rb_cInteger, "ceil", int_ceil, -1);
     rb_define_method(rb_cInteger, "truncate", int_truncate, -1);
     rb_define_method(rb_cInteger, "round", int_round, -1);
-    rb_define_method(rb_cInteger, "<=>", rb_int_cmp, 1);
+    rb_define_method(rb_cInteger, "<=>", int_cmp, 1);
 
     rb_define_method(rb_cInteger, "-@", rb_int_uminus, 0);
     rb_define_method(rb_cInteger, "+", rb_int_plus, 1);
@@ -5535,24 +5151,22 @@ Init_Numeric(void)
     rb_define_method(rb_cInteger, "%", rb_int_modulo, 1);
     rb_define_method(rb_cInteger, "modulo", rb_int_modulo, 1);
     rb_define_method(rb_cInteger, "remainder", int_remainder, 1);
-    rb_define_method(rb_cInteger, "divmod", rb_int_divmod, 1);
-    rb_define_method(rb_cInteger, "fdiv", rb_int_fdiv, 1);
+    rb_define_method(rb_cInteger, "divmod", int_divmod, 1);
+    rb_define_method(rb_cInteger, "fdiv", int_fdiv, 1);
     rb_define_method(rb_cInteger, "**", rb_int_pow, 1);
 
-    rb_define_method(rb_cInteger, "pow", rb_int_powm, -1); /* in bignum.c */
-
-    rb_define_method(rb_cInteger, "abs", rb_int_abs, 0);
-    rb_define_method(rb_cInteger, "magnitude", rb_int_abs, 0);
+    rb_define_method(rb_cInteger, "abs", int_abs, 0);
+    rb_define_method(rb_cInteger, "magnitude", int_abs, 0);
 
-    rb_define_method(rb_cInteger, "===", rb_int_equal, 1);
-    rb_define_method(rb_cInteger, "==", rb_int_equal, 1);
-    rb_define_method(rb_cInteger, ">", rb_int_gt, 1);
+    rb_define_method(rb_cInteger, "===", int_equal, 1);
+    rb_define_method(rb_cInteger, "==", int_equal, 1);
+    rb_define_method(rb_cInteger, ">", int_gt, 1);
     rb_define_method(rb_cInteger, ">=", rb_int_ge, 1);
     rb_define_method(rb_cInteger, "<", int_lt, 1);
     rb_define_method(rb_cInteger, "<=", int_le, 1);
 
     rb_define_method(rb_cInteger, "~", int_comp, 0);
-    rb_define_method(rb_cInteger, "&", rb_int_and, 1);
+    rb_define_method(rb_cInteger, "&", int_and, 1);
     rb_define_method(rb_cInteger, "|", int_or,  1);
     rb_define_method(rb_cInteger, "^", int_xor, 1);
     rb_define_method(rb_cInteger, "[]", int_aref, 1);
@@ -5567,9 +5181,7 @@ Init_Numeric(void)
 #ifndef RUBY_INTEGER_UNIFICATION
     rb_cFixnum = rb_cInteger;
 #endif
-    /* An obsolete class, use Integer */
     rb_define_const(rb_cObject, "Fixnum", rb_cInteger);
-    rb_deprecate_constant(rb_cObject, "Fixnum");
 
     rb_cFloat  = rb_define_class("Float", rb_cNumeric);
 
@@ -5611,7 +5223,7 @@ Init_Numeric(void)
      */
     rb_define_const(rb_cFloat, "DIG", INT2FIX(DBL_DIG));
     /*
-     *	The smallest possible exponent value in a double-precision floating
+     *	The smallest posable exponent value in a double-precision floating
      *	point.
      *
      *	Usually defaults to -1021.
@@ -5665,38 +5277,38 @@ Init_Numeric(void)
     /*
      *	An expression representing positive infinity.
      */
-    rb_define_const(rb_cFloat, "INFINITY", DBL2NUM(HUGE_VAL));
+    rb_define_const(rb_cFloat, "INFINITY", DBL2NUM(INFINITY));
     /*
      *	An expression representing a value which is "not a number".
      */
-    rb_define_const(rb_cFloat, "NAN", DBL2NUM(nan("")));
+    rb_define_const(rb_cFloat, "NAN", DBL2NUM(NAN));
 
     rb_define_method(rb_cFloat, "to_s", flo_to_s, 0);
     rb_define_alias(rb_cFloat, "inspect", "to_s");
     rb_define_method(rb_cFloat, "coerce", flo_coerce, 1);
-    rb_define_method(rb_cFloat, "-@", rb_float_uminus, 0);
-    rb_define_method(rb_cFloat, "+", rb_float_plus, 1);
+    rb_define_method(rb_cFloat, "-@", flo_uminus, 0);
+    rb_define_method(rb_cFloat, "+", flo_plus, 1);
     rb_define_method(rb_cFloat, "-", flo_minus, 1);
-    rb_define_method(rb_cFloat, "*", rb_float_mul, 1);
+    rb_define_method(rb_cFloat, "*", flo_mul, 1);
     rb_define_method(rb_cFloat, "/", flo_div, 1);
     rb_define_method(rb_cFloat, "quo", flo_quo, 1);
     rb_define_method(rb_cFloat, "fdiv", flo_quo, 1);
     rb_define_method(rb_cFloat, "%", flo_mod, 1);
     rb_define_method(rb_cFloat, "modulo", flo_mod, 1);
     rb_define_method(rb_cFloat, "divmod", flo_divmod, 1);
-    rb_define_method(rb_cFloat, "**", rb_float_pow, 1);
+    rb_define_method(rb_cFloat, "**", flo_pow, 1);
     rb_define_method(rb_cFloat, "==", flo_eq, 1);
     rb_define_method(rb_cFloat, "===", flo_eq, 1);
     rb_define_method(rb_cFloat, "<=>", flo_cmp, 1);
-    rb_define_method(rb_cFloat, ">",  rb_float_gt, 1);
+    rb_define_method(rb_cFloat, ">",  flo_gt, 1);
     rb_define_method(rb_cFloat, ">=", flo_ge, 1);
     rb_define_method(rb_cFloat, "<",  flo_lt, 1);
     rb_define_method(rb_cFloat, "<=", flo_le, 1);
     rb_define_method(rb_cFloat, "eql?", flo_eql, 1);
     rb_define_method(rb_cFloat, "hash", flo_hash, 0);
     rb_define_method(rb_cFloat, "to_f", flo_to_f, 0);
-    rb_define_method(rb_cFloat, "abs", rb_float_abs, 0);
-    rb_define_method(rb_cFloat, "magnitude", rb_float_abs, 0);
+    rb_define_method(rb_cFloat, "abs", flo_abs, 0);
+    rb_define_method(rb_cFloat, "magnitude", flo_abs, 0);
     rb_define_method(rb_cFloat, "zero?", flo_zero_p, 0);
 
     rb_define_method(rb_cFloat, "to_i", flo_to_i, 0);
@@ -5707,8 +5319,8 @@ Init_Numeric(void)
     rb_define_method(rb_cFloat, "truncate", flo_truncate, -1);
 
     rb_define_method(rb_cFloat, "nan?",      flo_is_nan_p, 0);
-    rb_define_method(rb_cFloat, "infinite?", rb_flo_is_infinite_p, 0);
-    rb_define_method(rb_cFloat, "finite?",   rb_flo_is_finite_p, 0);
+    rb_define_method(rb_cFloat, "infinite?", flo_is_infinite_p, 0);
+    rb_define_method(rb_cFloat, "finite?",   flo_is_finite_p, 0);
     rb_define_method(rb_cFloat, "next_float", flo_next_float, 0);
     rb_define_method(rb_cFloat, "prev_float", flo_prev_float, 0);
     rb_define_method(rb_cFloat, "positive?", flo_positive_p, 0);
diff --git a/object.c b/object.c
index 454d35790f..42a3f770ed 100644
--- a/object.c
+++ b/object.c
@@ -11,10 +11,9 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
-#include "internal.h"
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
@@ -24,23 +23,16 @@
 #include "id.h"
 #include "probes.h"
 
-/*!
- * \defgroup object Core objects and their operations
- * \{
- */
-
-VALUE rb_cBasicObject; /*!< BasicObject class */
-VALUE rb_mKernel; /*!< Kernel module */
-VALUE rb_cObject; /*!< Object class */
-VALUE rb_cModule; /*!< Module class */
-VALUE rb_cClass; /*!< Class class */
-VALUE rb_cData; /*!< Data class */
-
-VALUE rb_cNilClass; /*!< NilClass class */
-VALUE rb_cTrueClass; /*!< TrueClass class */
-VALUE rb_cFalseClass; /*!< FalseClass class */
+VALUE rb_cBasicObject;
+VALUE rb_mKernel;
+VALUE rb_cObject;
+VALUE rb_cModule;
+VALUE rb_cClass;
+VALUE rb_cData;
 
-/*! \cond INTERNAL_MACRO */
+VALUE rb_cNilClass;
+VALUE rb_cTrueClass;
+VALUE rb_cFalseClass;
 
 #define id_eq               idEq
 #define id_eql              idEqlP
@@ -50,26 +42,11 @@ VALUE rb_cFalseClass; /*!< FalseClass class */
 #define id_init_clone       idInitialize_clone
 #define id_init_dup         idInitialize_dup
 #define id_const_missing    idConst_missing
-#define id_to_f             idTo_f
 
 #define CLASS_OR_MODULE_P(obj) \
     (!SPECIAL_CONST_P(obj) && \
      (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE))
 
-/*! \endcond */
-
-/*!
- * Make the object invisible from Ruby code.
- *
- * It is useful to let Ruby's GC manage your internal data structure --
- * The object keeps being managed by GC, but \c ObjectSpace.each_object
- * never yields the object.
- *
- * Note that the object also lose a way to call a method on it.
- *
- * \param[in] obj a Ruby object
- * \sa rb_obj_reveal
- */
 VALUE
 rb_obj_hide(VALUE obj)
 {
@@ -79,14 +56,6 @@ rb_obj_hide(VALUE obj)
     return obj;
 }
 
-/*!
- * Make a hidden object visible again.
- *
- * It is the caller's responsibility to pass the right \a klass
- * which \a obj originally used to belong to.
- *
- * \sa rb_obj_hide
- */
 VALUE
 rb_obj_reveal(VALUE obj, VALUE klass)
 {
@@ -96,14 +65,6 @@ rb_obj_reveal(VALUE obj, VALUE klass)
     return obj;
 }
 
-/*!
- * Fills common (\c RBasic) fields in \a obj.
- *
- * \note Prefer rb_newobj_of() to this function.
- * \param[in,out] obj a Ruby object to be set up.
- * \param[in] klass \c obj will belong to this class.
- * \param[in] type one of \c ruby_value_type
- */
 VALUE
 rb_obj_setup(VALUE obj, VALUE klass, VALUE type)
 {
@@ -112,16 +73,13 @@ rb_obj_setup(VALUE obj, VALUE klass, VALUE type)
     return obj;
 }
 
-/**
+/*
  *  call-seq:
  *     obj === other   -> true or false
  *
  *  Case Equality -- For class Object, effectively the same as calling
  *  <code>#==</code>, but typically overridden by descendants to provide
  *  meaningful semantics in +case+ statements.
- *--
- * Same as \c Object#===, case equality.
- *++
  */
 
 VALUE
@@ -130,38 +88,18 @@ rb_equal(VALUE obj1, VALUE obj2)
     VALUE result;
 
     if (obj1 == obj2) return Qtrue;
-    result = rb_equal_opt(obj1, obj2);
-    if (result == Qundef) {
-	result = rb_funcall(obj1, id_eq, 1, obj2);
-    }
+    result = rb_funcall(obj1, id_eq, 1, obj2);
     if (RTEST(result)) return Qtrue;
     return Qfalse;
 }
 
-/**
- * Determines if \a obj1 and \a obj2 are equal in terms of
- * \c Object#eql?.
- *
- * \note It actually calls \c #eql? when necessary.
- *   So you cannot implement \c #eql? with this function.
- * \retval non-zero if they are eql?
- * \retval zero if they are not eql?.
- */
 int
 rb_eql(VALUE obj1, VALUE obj2)
 {
-    VALUE result;
-
-    if (obj1 == obj2) return Qtrue;
-    result = rb_eql_opt(obj1, obj2);
-    if (result == Qundef) {
-	result = rb_funcall(obj1, id_eql, 1, obj2);
-    }
-    if (RTEST(result)) return Qtrue;
-    return Qfalse;
+    return RTEST(rb_funcall(obj1, id_eql, 1, obj2));
 }
 
-/**
+/*
  *  call-seq:
  *     obj == other        -> true or false
  *     obj.equal?(other)   -> true or false
@@ -195,60 +133,76 @@ rb_eql(VALUE obj1, VALUE obj2)
  *
  *     1 == 1.0     #=> true
  *     1.eql? 1.0   #=> false
- *--
- * \private
- *++
  */
-MJIT_FUNC_EXPORTED VALUE
+
+VALUE
 rb_obj_equal(VALUE obj1, VALUE obj2)
 {
     if (obj1 == obj2) return Qtrue;
     return Qfalse;
 }
 
+#if 0
+/*
+ * call-seq:
+ *    obj.hash    -> integer
+ *
+ * Generates a Fixnum 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 a Fixnum 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.
+ */
+VALUE
+rb_obj_hash(VALUE obj)
+{
+    VALUE oid = rb_obj_id(obj);
+#if SIZEOF_LONG == SIZEOF_VOIDP
+    st_index_t index = NUM2LONG(oid);
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+    st_index_t index = NUM2LL(oid);
+#else
+# error not supported
+#endif
+    return LONG2FIX(rb_objid_hash(index));
+}
+#else
 VALUE rb_obj_hash(VALUE obj);
+#endif
 
-/**
+/*
  *  call-seq:
  *     !obj    -> true or false
  *
  *  Boolean negate.
- *--
- * \private
- *++
  */
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_obj_not(VALUE obj)
 {
     return RTEST(obj) ? Qfalse : Qtrue;
 }
 
-/**
+/*
  *  call-seq:
  *     obj != other        -> true or false
  *
  *  Returns true if two objects are not-equal, otherwise false.
- *--
- * \private
- *++
  */
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_obj_not_equal(VALUE obj1, VALUE obj2)
 {
     VALUE result = rb_funcall(obj1, id_eq, 1, obj2);
     return RTEST(result) ? Qfalse : Qtrue;
 }
 
-/*!
- * Looks up the nearest ancestor of \a cl, skipping singleton classes or
- * module inclusions.
- * It returns the \a cl itself if it is neither a singleton class or a module.
- *
- * \param[in] cl a Class object.
- * \return the ancestor class found, or a falsey value if nothing found.
- */
 VALUE
 rb_class_real(VALUE cl)
 {
@@ -259,7 +213,7 @@ rb_class_real(VALUE cl)
     return cl;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.class    -> class
  *
@@ -267,14 +221,10 @@ rb_class_real(VALUE cl)
  *  called with an explicit receiver, as <code>class</code> is also a
  *  reserved word in Ruby.
  *
- *     1.class      #=> Integer
+ *     1.class      #=> Fixnum
  *     self.class   #=> Object
- *--
- * Equivalent to \c Object\#class in Ruby.
- *
- * Returns the class of \c obj, skipping singleton classes or module inclusions.
- *++
  */
+
 VALUE
 rb_obj_class(VALUE obj)
 {
@@ -291,7 +241,7 @@ rb_obj_class(VALUE obj)
  *  If <i>obj</i> is <code>nil</code>, <code>true</code>, or
  *  <code>false</code>, it returns NilClass, TrueClass, or FalseClass,
  *  respectively.
- *  If <i>obj</i> is an Integer, a Float or a Symbol, it raises a TypeError.
+ *  If <i>obj</i> is a Fixnum or a Symbol, it raises a TypeError.
  *
  *     Object.new.singleton_class  #=> #<Class:#<Object:0xb7ce1e24>>
  *     String.singleton_class      #=> #<Class:String>
@@ -304,8 +254,7 @@ rb_obj_singleton_class(VALUE obj)
     return rb_singleton_class(obj);
 }
 
-/*! \private */
-MJIT_FUNC_EXPORTED void
+void
 rb_obj_copy_ivar(VALUE dest, VALUE obj)
 {
     if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_IVPTR(dest)) {
@@ -348,27 +297,6 @@ init_copy(VALUE dest, VALUE obj)
     }
 }
 
-static int freeze_opt(int argc, VALUE *argv);
-static VALUE immutable_obj_clone(VALUE obj, int kwfreeze);
-static VALUE mutable_obj_clone(VALUE obj, int kwfreeze);
-PUREFUNC(static inline int special_object_p(VALUE obj)); /*!< \private */
-static inline int
-special_object_p(VALUE obj)
-{
-    if (SPECIAL_CONST_P(obj)) return TRUE;
-    switch (BUILTIN_TYPE(obj)) {
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_SYMBOL:
-      case T_RATIONAL:
-      case T_COMPLEX:
-	/* not a comprehensive list */
-	return TRUE;
-      default:
-	return FALSE;
-    }
-}
-
 /*
  *  call-seq:
  *     obj.clone(freeze: true) -> an_object
@@ -397,57 +325,32 @@ special_object_p(VALUE obj)
 static VALUE
 rb_obj_clone2(int argc, VALUE *argv, VALUE obj)
 {
-    int kwfreeze = freeze_opt(argc, argv);
-    if (!special_object_p(obj))
-	return mutable_obj_clone(obj, kwfreeze);
-    return immutable_obj_clone(obj, kwfreeze);
-}
-
-/*! \private */
-VALUE
-rb_immutable_obj_clone(int argc, VALUE *argv, VALUE obj)
-{
-    int kwfreeze = freeze_opt(argc, argv);
-    return immutable_obj_clone(obj, kwfreeze);
-}
-
-static int
-freeze_opt(int argc, VALUE *argv)
-{
     static ID keyword_ids[1];
     VALUE opt;
-    VALUE kwfreeze;
+    VALUE kwargs[1];
+    VALUE clone;
+    VALUE singleton;
+    VALUE kwfreeze = Qtrue;
 
     if (!keyword_ids[0]) {
 	CONST_ID(keyword_ids[0], "freeze");
     }
     rb_scan_args(argc, argv, "0:", &opt);
     if (!NIL_P(opt)) {
-	rb_get_kwargs(opt, keyword_ids, 0, 1, &kwfreeze);
-	if (kwfreeze == Qfalse) return FALSE;
-	if (kwfreeze != Qundef && kwfreeze != Qtrue) {
-	    rb_raise(rb_eArgError, "unexpected value for freeze: %"PRIsVALUE,
-		     rb_obj_class(kwfreeze));
+	rb_get_kwargs(opt, keyword_ids, 0, 1, kwargs);
+	kwfreeze = kwargs[0];
+	if (kwfreeze != Qundef && kwfreeze != Qtrue && kwfreeze != Qfalse) {
+	    rb_raise(rb_eArgError, "unexpected value for freeze: %s",
+		     rb_builtin_class_name(kwfreeze));
 	}
     }
-    return TRUE;
-}
-
-static VALUE
-immutable_obj_clone(VALUE obj, int kwfreeze)
-{
-    if (!kwfreeze)
-	rb_raise(rb_eArgError, "can't unfreeze %"PRIsVALUE,
-		 rb_obj_class(obj));
-    return obj;
-}
-
-static VALUE
-mutable_obj_clone(VALUE obj, int kwfreeze)
-{
-    VALUE clone, singleton;
 
+    if (rb_special_const_p(obj)) {
+        rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj));
+    }
     clone = rb_obj_alloc(rb_obj_class(obj));
+    RBASIC(clone)->flags &= (FL_TAINT|FL_PROMOTED0|FL_PROMOTED1);
+    RBASIC(clone)->flags |= RBASIC(obj)->flags & ~(FL_PROMOTED0|FL_PROMOTED1|FL_FREEZE|FL_FINALIZE);
 
     singleton = rb_singleton_class_clone_and_attach(obj, clone);
     RBASIC_SET_CLASS(clone, singleton);
@@ -458,27 +361,20 @@ mutable_obj_clone(VALUE obj, int kwfreeze)
     init_copy(clone, obj);
     rb_funcall(clone, id_init_clone, 1, obj);
 
-    if (kwfreeze) {
+    if (Qfalse != kwfreeze) {
 	RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;
     }
 
     return clone;
 }
 
-/**
- * :nodoc
- *--
- * Almost same as \c Object#clone
- *++
- */
 VALUE
 rb_obj_clone(VALUE obj)
 {
-    if (special_object_p(obj)) return obj;
-    return mutable_obj_clone(obj, Qtrue);
+    return rb_obj_clone2(0, NULL, obj);
 }
 
-/**
+/*
  *  call-seq:
  *     obj.dup -> an_object
  *
@@ -518,17 +414,16 @@ rb_obj_clone(VALUE obj)
  *
  *	s3 = s1.dup #=> #<Klass:0x401b3a38>
  *	s3.foo #=> NoMethodError: undefined method `foo' for #<Klass:0x401b3a38>
- *--
- * Equivalent to \c Object\#dup in Ruby
- *++
+ *
  */
+
 VALUE
 rb_obj_dup(VALUE obj)
 {
     VALUE dup;
 
-    if (special_object_p(obj)) {
-	return obj;
+    if (rb_special_const_p(obj)) {
+        rb_raise(rb_eTypeError, "can't dup %s", rb_obj_classname(obj));
     }
     dup = rb_obj_alloc(rb_obj_class(obj));
     init_copy(dup, obj);
@@ -539,12 +434,12 @@ rb_obj_dup(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.itself    -> obj
+ *     obj.itself -> an_object
  *
- *  Returns the receiver.
+ *  Returns <i>obj</i>.
  *
- *     string = "my string"
- *     string.itself.object_id == string.object_id   #=> true
+ *	string = 'my string' #=> "my string"
+ *	string.itself.object_id == string.object_id #=> true
  *
  */
 
@@ -554,57 +449,7 @@ rb_obj_itself(VALUE obj)
     return obj;
 }
 
-static VALUE
-rb_obj_size(VALUE self, VALUE args, VALUE obj)
-{
-    return LONG2FIX(1);
-}
-
-/*
- *  call-seq:
- *     obj.then {|x| block }          -> an_object
- *     obj.yield_self {|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"
- *     "my string".yield_self {|s| s.upcase }   #=> "MY STRING"
- *
- *  Good usage for +yield_self+ is value piping in method chains:
- *
- *     require 'open-uri'
- *     require 'json'
- *
- *     construct_url(arguments).
- *       yield_self {|url| open(url).read }.
- *       yield_self {|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.yield_self.detect(&:odd?)            # => 1
- *     # does not meet condition, drop value
- *     2.yield_self.detect(&:odd?)            # => nil
- *
- */
-
-static VALUE
-rb_obj_yield_self(VALUE obj)
-{
-    RETURN_SIZED_ENUMERATOR(obj, 0, 0, rb_obj_size);
-    return rb_yield_values2(1, &obj);
-}
-
-/**
- * :nodoc:
- *--
- * Default implementation of \c #initialize_copy
- * \param[in,out] obj the receiver being initialized
- * \param[in] orig    the object to be copied from.
- *++
- */
+/* :nodoc: */
 VALUE
 rb_obj_init_copy(VALUE obj, VALUE orig)
 {
@@ -617,15 +462,7 @@ rb_obj_init_copy(VALUE obj, VALUE orig)
     return obj;
 }
 
-/*!
- * :nodoc:
- *--
- * Default implementation of \c #initialize_dup and \c #initialize_clone
- *
- * \param[in,out] obj the receiver being initialized
- * \param[in] orig    the object to be dup or cloned from.
- *++
- **/
+/* :nodoc: */
 VALUE
 rb_obj_init_dup_clone(VALUE obj, VALUE orig)
 {
@@ -633,7 +470,7 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig)
     return obj;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.to_s    -> string
  *
@@ -641,11 +478,8 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig)
  *  <code>to_s</code> prints the object's class and an encoding of the
  *  object id. As a special case, the top-level object that is the
  *  initial execution context of Ruby programs returns ``main''.
- *
- *--
- * Default implementation of \c #to_s.
- *++
  */
+
 VALUE
 rb_any_to_s(VALUE obj)
 {
@@ -659,13 +493,7 @@ rb_any_to_s(VALUE obj)
 }
 
 VALUE rb_str_escape(VALUE str);
-/*!
- * Convenient wrapper of \c Object#inspect.
- * Returns a human-readable string representation of \a obj,
- * similarly to \c Object#inspect.
- *
- * Unlike Ruby-level \c #inspect, it escapes characters to keep the
- * result compatible to the default internal or external encoding.
+/*
  * If the default internal or external encoding is ASCII compatible,
  * the encoding of the inspected result must be compatible with it.
  * If the default internal or external encoding is ASCII incompatible,
@@ -675,7 +503,6 @@ VALUE
 rb_inspect(VALUE obj)
 {
     VALUE str = rb_obj_as_string(rb_funcallv(obj, id_inspect, 0, 0));
-
     rb_encoding *enc = rb_default_internal_encoding();
     if (enc == NULL) enc = rb_default_external_encoding();
     if (!rb_enc_asciicompat(enc)) {
@@ -789,7 +616,7 @@ class_or_module_required(VALUE c)
 
 static VALUE class_search_ancestor(VALUE cl, VALUE c);
 
-/**
+/*
  *  call-seq:
  *     obj.instance_of?(class)    -> true or false
  *
@@ -804,13 +631,6 @@ static VALUE class_search_ancestor(VALUE cl, VALUE c);
  *     b.instance_of? A   #=> false
  *     b.instance_of? B   #=> true
  *     b.instance_of? C   #=> false
- *--
- * Determines if \a obj is an instance of \a c.
- *
- * Equivalent to \c Object\#is_instance_of in Ruby.
- * \param[in] obj the object to be determined.
- * \param[in] c a Class object
- *++
  */
 
 VALUE
@@ -822,7 +642,7 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
 }
 
 
-/**
+/*
  *  call-seq:
  *     obj.is_a?(class)       -> true or false
  *     obj.kind_of?(class)    -> true or false
@@ -848,13 +668,6 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
  *     b.kind_of? B       #=> true
  *     b.kind_of? C       #=> false
  *     b.kind_of? M       #=> true
- *--
- * Determines if \a obj is a kind of \a c.
- *
- * Equivalent to \c Object\#kind_of? in Ruby.
- * \param[in] obj the object to be determined
- * \param[in] c a Module object.
- *++
  */
 
 VALUE
@@ -877,7 +690,6 @@ class_search_ancestor(VALUE cl, VALUE c)
     return 0;
 }
 
-/*! \private */
 VALUE
 rb_class_search_ancestor(VALUE cl, VALUE c)
 {
@@ -886,22 +698,19 @@ rb_class_search_ancestor(VALUE cl, VALUE c)
     return class_search_ancestor(cl, RCLASS_ORIGIN(c));
 }
 
-/**
+/*
  *  call-seq:
- *     obj.tap {|x| block }    -> obj
+ *     obj.tap{|x|...}    -> 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}" }
+ *	(1..10)                .tap {|x| puts "original: #{x.inspect}"}
+ *	  .to_a                .tap {|x| puts "array: #{x.inspect}"}
+ *	  .select {|x| x%2==0} .tap {|x| puts "evens: #{x.inspect}"}
+ *	  .map {|x| x*x}       .tap {|x| puts "squares: #{x.inspect}"}
  *
- *--
- * \private
- *++
  */
 
 VALUE
@@ -1145,21 +954,13 @@ rb_obj_dummy(void)
     return Qnil;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.tainted?    -> true or false
  *
  *  Returns true if the object is tainted.
  *
  *  See #taint for more information.
- *--
- * Determines if \a obj is tainted. Equivalent to \c Object\#tainted? in Ruby.
- * \param[in] obj  the object to be determined
- * \retval Qtrue if the object is tainted
- * \retval Qfalse if the object is not tainted
- * \sa rb_obj_taint
- * \sa rb_obj_untaint
- *++
  */
 
 VALUE
@@ -1170,7 +971,7 @@ rb_obj_tainted(VALUE obj)
     return Qfalse;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.taint -> obj
  *
@@ -1185,13 +986,6 @@ rb_obj_tainted(VALUE obj)
  *
  *  You should only untaint a tainted object if your code has inspected it and
  *  determined that it is safe. To do so use #untaint.
- *--
- * Marks the object as tainted. Equivalent to \c Object\#taint in Ruby
- * \param[in] obj  the object to be tainted
- * \return the object itself
- * \sa rb_obj_untaint
- * \sa rb_obj_tainted
- *++
  */
 
 VALUE
@@ -1205,22 +999,13 @@ rb_obj_taint(VALUE obj)
 }
 
 
-/**
+/*
  *  call-seq:
  *     obj.untaint    -> obj
  *
  *  Removes the tainted mark from the object.
  *
  *  See #taint for more information.
- *--
- * Removes the tainted mark from the object.
- * Equivalent to \c Object\#untaint in Ruby.
- *
- * \param[in] obj  the object to be tainted
- * \return the object itself
- * \sa rb_obj_taint
- * \sa rb_obj_tainted
- *++
  */
 
 VALUE
@@ -1233,20 +1018,11 @@ rb_obj_untaint(VALUE obj)
     return obj;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.untrusted?    -> true or false
  *
  *  Deprecated method that is equivalent to #tainted?.
- *--
- * \deprecated Use rb_obj_tainted.
- *
- * Trustiness used to have independent semantics from taintedness.
- * But now trustiness of objects is obsolete and this function behaves
- * the same as rb_obj_tainted.
- *
- * \sa rb_obj_tainted
- *++
  */
 
 VALUE
@@ -1256,20 +1032,11 @@ rb_obj_untrusted(VALUE obj)
     return rb_obj_tainted(obj);
 }
 
-/**
+/*
  *  call-seq:
  *     obj.untrust -> obj
  *
  *  Deprecated method that is equivalent to #taint.
- *--
- * \deprecated Use rb_obj_taint(obj)
- *
- * Trustiness used to have independent semantics from taintedness.
- * But now trustiness of objects is obsolete and this function behaves
- * the same as rb_obj_taint.
- *
- * \sa rb_obj_taint
- *++
  */
 
 VALUE
@@ -1280,20 +1047,11 @@ rb_obj_untrust(VALUE obj)
 }
 
 
-/**
+/*
  *  call-seq:
  *     obj.trust    -> obj
  *
  *  Deprecated method that is equivalent to #untaint.
- *--
- * \deprecated Use rb_obj_untaint(obj)
- *
- * Trustiness used to have independent semantics from taintedness.
- * But now trustiness of objects is obsolete and this function behaves
- * the same as rb_obj_untaint.
- *
- * \sa rb_obj_untaint
- *++
  */
 
 VALUE
@@ -1303,21 +1061,13 @@ rb_obj_trust(VALUE obj)
     return rb_obj_untaint(obj);
 }
 
-/**
- * Convenient function to infect \a victim with the taintedness of \a carrier.
- *
- * It just keeps the taintedness of \a victim if \a carrier is not tainted.
- * \param[in,out] victim the object being infected with the taintness of \a carrier
- * \param[in] carrier a possibly tainted object
- */
-
 void
-rb_obj_infect(VALUE victim, VALUE carrier)
+rb_obj_infect(VALUE obj1, VALUE obj2)
 {
-    OBJ_INFECT(victim, carrier);
+    OBJ_INFECT(obj1, obj2);
 }
 
-/**
+/*
  *  call-seq:
  *     obj.freeze    -> obj
  *
@@ -1334,16 +1084,11 @@ rb_obj_infect(VALUE victim, VALUE carrier)
  *
  *  <em>produces:</em>
  *
- *     prog.rb:3:in `<<': can't modify frozen Array (FrozenError)
+ *     prog.rb:3:in `<<': can't modify frozen Array (RuntimeError)
  *     	from prog.rb:3
  *
- *  Objects of the following classes are always frozen: Integer,
- *  Float, Symbol.
- *--
- * Make the object unmodifiable. Equivalent to \c Object\#freeze in Ruby.
- * \param[in,out] obj  the object to be frozen
- * \return the frozen object
- *++
+ *  Objects of the following classes are always frozen: Fixnum,
+ *  Bignum, Float, Symbol.
  */
 
 VALUE
@@ -1358,7 +1103,7 @@ rb_obj_freeze(VALUE obj)
     return obj;
 }
 
-/**
+/*
  *  call-seq:
  *     obj.frozen?    -> true or false
  *
@@ -1367,12 +1112,6 @@ rb_obj_freeze(VALUE obj)
  *     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
- *++
  */
 
 VALUE
@@ -1479,19 +1218,6 @@ nil_inspect(VALUE obj)
     return rb_usascii_str_new2("nil");
 }
 
-/*
- *  call-seq:
- *     nil =~ other  -> nil
- *
- *  Dummy pattern matching -- always returns nil.
- */
-
-static VALUE
-nil_match(VALUE obj1, VALUE obj2)
-{
-    return Qnil;
-}
-
 /***********************************************************************
  *  Document-class: TrueClass
  *
@@ -1583,7 +1309,7 @@ true_xor(VALUE obj, VALUE obj2)
  * call-seq:
  *   false.to_s   ->  "false"
  *
- * The string representation of <code>false</code> is "false".
+ * 'nuf said...
  */
 
 static VALUE
@@ -1678,17 +1404,14 @@ rb_false(VALUE obj)
  *  call-seq:
  *     obj =~ other  -> nil
  *
- * This method is deprecated.
- *
- * This is not only unuseful but also troublesome because it
- * may hide a type error.
+ *  Pattern Match---Overridden by descendants (notably
+ *  <code>Regexp</code> and <code>String</code>) to provide meaningful
+ *  pattern-match semantics.
  */
 
 static VALUE
 rb_obj_match(VALUE obj1, VALUE obj2)
 {
-    rb_warning("deprecated Object#=~ is called on %"PRIsVALUE
-               "; it always returns nil", rb_obj_class(obj1));
     return Qnil;
 }
 
@@ -1838,7 +1561,7 @@ rb_mod_eqq(VALUE mod, VALUE arg)
     return rb_obj_is_kind_of(arg, mod);
 }
 
-/**
+/*
  * call-seq:
  *   mod <= other   ->  true, false, or nil
  *
@@ -1846,16 +1569,8 @@ rb_mod_eqq(VALUE mod, VALUE arg)
  * is the same as <i>other</i>. Returns
  * <code>nil</code> if there's no relationship between the two.
  * (Think of the relationship in terms of the class definition:
- * "class A < B" implies "A < B".)
- *--
- * Determines if \a mod inherits \a arg. Equivalent to \c Module\#<= in Ruby
- *
- * \param[in] mod a Module object
- * \param[in] arg another Module object or an iclass of a module
- * \retval Qtrue if \a mod inherits \a arg, or \a mod equals \a arg
- * \retval Qfalse if \a arg inherits \a mod
- * \retval Qnil if otherwise
- *++
+ * "class A<B" implies "A<B".)
+ *
  */
 
 VALUE
@@ -1882,7 +1597,7 @@ rb_class_inherited_p(VALUE mod, VALUE arg)
  * Returns true if <i>mod</i> is a subclass of <i>other</i>. Returns
  * <code>nil</code> if there's no relationship between the two.
  * (Think of the relationship in terms of the class definition:
- * "class A < B" implies "A < B".)
+ * "class A<B" implies "A<B".)
  *
  */
 
@@ -1902,7 +1617,7 @@ rb_mod_lt(VALUE mod, VALUE arg)
  * two modules are the same. Returns
  * <code>nil</code> if there's no relationship between the two.
  * (Think of the relationship in terms of the class definition:
- * "class A < B" implies "B > A".)
+ * "class A<B" implies "B>A".)
  *
  */
 
@@ -1923,7 +1638,7 @@ rb_mod_ge(VALUE mod, VALUE arg)
  * Returns true if <i>mod</i> is an ancestor of <i>other</i>. Returns
  * <code>nil</code> if there's no relationship between the two.
  * (Think of the relationship in terms of the class definition:
- * "class A < B" implies "B > A".)
+ * "class A<B" implies "B>A".)
  *
  */
 
@@ -2063,11 +1778,11 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
     if (RCLASS_SUPER(klass) != 0 || klass == rb_cBasicObject) {
 	rb_raise(rb_eTypeError, "already initialized class");
     }
-    if (rb_check_arity(argc, 0, 1) == 0) {
+    if (argc == 0) {
 	super = rb_cObject;
     }
     else {
-        super = argv[0];
+	rb_scan_args(argc, argv, "01", &super);
 	rb_check_inheritable(super);
 	if (super != rb_cBasicObject && !RCLASS_SUPER(super)) {
 	    rb_raise(rb_eTypeError, "can't inherit uninitialized class");
@@ -2081,7 +1796,6 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
     return klass;
 }
 
-/*! \private */
 void
 rb_undefined_alloc(VALUE klass)
 {
@@ -2111,8 +1825,8 @@ rb_undefined_alloc(VALUE klass)
  *
  */
 
-static VALUE
-rb_class_alloc(VALUE klass)
+VALUE
+rb_obj_alloc(VALUE klass)
 {
     VALUE obj;
     rb_alloc_func_t allocator;
@@ -2138,27 +1852,6 @@ rb_class_alloc(VALUE klass)
     return obj;
 }
 
-/**
- * Allocates an instance of \a klass
- *
- * \note It calls the allocator defined by {rb_define_alloc_func}.
- *   So you cannot use this function to define an allocator.
- *   Use {rb_newobj_of}, {TypedData_Make_Struct} or others, instead.
- * \note Usually prefer rb_class_new_instance to rb_obj_alloc and rb_obj_call_init
- * \param[in] klass a Class object
- * \sa rb_class_new_instance
- * \sa rb_obj_call_init
- * \sa rb_define_alloc_func
- * \sa rb_newobj_of
- * \sa TypedData_Make_Struct
- */
-VALUE
-rb_obj_alloc(VALUE klass)
-{
-    Check_Type(klass, T_CLASS);
-    return rb_class_alloc(klass);
-}
-
 static VALUE
 rb_class_allocate_instance(VALUE klass)
 {
@@ -2178,37 +1871,18 @@ rb_class_allocate_instance(VALUE klass)
  *
  */
 
-static VALUE
-rb_class_s_new(int argc, const VALUE *argv, VALUE klass)
+VALUE
+rb_class_new_instance(int argc, const VALUE *argv, VALUE klass)
 {
     VALUE obj;
 
-    obj = rb_class_alloc(klass);
+    obj = rb_obj_alloc(klass);
     rb_obj_call_init(obj, argc, argv);
 
     return obj;
 }
 
-/**
- * Allocates and initializes an instance of \a klass.
- *
- * Equivalent to \c Class\#new in Ruby
- *
- * \param[in] argc  the number of arguments to \c #initialize
- * \param[in] argv  a pointer to an array of arguments to \c #initialize
- * \param[in] klass a Class object
- * \return the new instance of \a klass
- * \sa rb_obj_call_init
- * \sa rb_obj_alloc
- */
-VALUE
-rb_class_new_instance(int argc, const VALUE *argv, VALUE klass)
-{
-    Check_Type(klass, T_CLASS);
-    return rb_class_s_new(argc, argv, klass);
-}
-
-/**
+/*
  *  call-seq:
  *     class.superclass -> a_super_class or nil
  *
@@ -2225,14 +1899,6 @@ rb_class_new_instance(int argc, const VALUE *argv, VALUE klass)
  *
  *     BasicObject.superclass   #=> nil
  *
- *--
- * Returns the superclass of \a klass. Equivalent to \c Class\#superclass in Ruby.
- *
- * It skips modules.
- * \param[in] klass a Class object
- * \return the superclass, or \c Qnil if \a klass does not have a parent class.
- * \sa rb_class_get_superclass
- *++
  */
 
 VALUE
@@ -2253,23 +1919,14 @@ rb_class_superclass(VALUE klass)
     return super;
 }
 
-/**
- * Returns the superclass of \a klass
- * The return value might be an iclass of a module, unlike rb_class_superclass.
- *
- * Also it returns Qfalse when \a klass does not have a parent class.
- * \sa rb_class_superclass
- */
 VALUE
 rb_class_get_superclass(VALUE klass)
 {
     return RCLASS(klass)->super;
 }
 
-/*! \private */
 #define id_for_var(obj, name, part, type) \
     id_for_setter(obj, name, type, "`%1$s' is not allowed as "#part" "#type" variable name")
-/*! \private */
 #define id_for_setter(obj, name, type, message) \
     check_setter_id(obj, &(name), rb_is_##type##_id, rb_is_##type##_name, message, strlen(message))
 static ID
@@ -2334,20 +1991,6 @@ rb_mod_attr_reader(int argc, VALUE *argv, VALUE klass)
     return Qnil;
 }
 
-/**
- *  call-seq:
- *    attr(name, ...) -> nil
- *    attr(name, true) -> nil
- *    attr(name, false) -> nil
- *
- *  The first form is equivalent to <code>attr_reader</code>.
- *  The second form is equivalent to <code>attr_accessor(name)</code> but deprecated.
- *  The last form is equivalent to <code>attr_reader(name)</code> but deprecated.
- *--
- * \private
- * \todo can be static?
- *++
- */
 VALUE
 rb_mod_attr(int argc, VALUE *argv, VALUE klass)
 {
@@ -2513,7 +2156,7 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
 	if (!id) {
 	    part = rb_str_subseq(name, beglen, len);
 	    OBJ_FREEZE(part);
-	    if (!rb_is_const_name(part)) {
+	    if (!ISUPPER(*pbeg) || !rb_is_const_name(part)) {
 		name = part;
 		goto wrong_name;
 	    }
@@ -2530,19 +2173,7 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
 	    name = ID2SYM(id);
 	    goto wrong_name;
 	}
-#if 0
-        mod = rb_const_get_0(mod, id, beglen > 0 || !RTEST(recur), RTEST(recur), FALSE);
-#else
-        if (!RTEST(recur)) {
-            mod = rb_const_get_at(mod, id);
-        }
-        else if (beglen == 0) {
-            mod = rb_const_get(mod, id);
-        }
-        else {
-            mod = rb_const_get_from(mod, id);
-        }
-#endif
+	mod = RTEST(recur) ? rb_const_get(mod, id) : rb_const_get_at(mod, id);
     }
 
     return mod;
@@ -2678,7 +2309,7 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
 	if (!id) {
 	    part = rb_str_subseq(name, beglen, len);
 	    OBJ_FREEZE(part);
-	    if (!rb_is_const_name(part)) {
+	    if (!ISUPPER(*pbeg) || !rb_is_const_name(part)) {
 		name = part;
 		goto wrong_name;
 	    }
@@ -2690,30 +2321,17 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
 	    name = ID2SYM(id);
 	    goto wrong_name;
 	}
-
-#if 0
-        mod = rb_const_search(mod, id, beglen > 0 || !RTEST(recur), RTEST(recur), FALSE);
-        if (mod == Qundef) return Qfalse;
-#else
-        if (!RTEST(recur)) {
+	if (RTEST(recur)) {
+	    if (!rb_const_defined(mod, id))
+		return Qfalse;
+	    mod = rb_const_get(mod, id);
+	}
+	else {
 	    if (!rb_const_defined_at(mod, id))
 		return Qfalse;
-            if (p == pend) return Qtrue;
 	    mod = rb_const_get_at(mod, id);
 	}
-        else if (beglen == 0) {
-            if (!rb_const_defined(mod, id))
-                return Qfalse;
-            if (p == pend) return Qtrue;
-            mod = rb_const_get(mod, id);
-        }
-        else {
-            if (!rb_const_defined_from(mod, id))
-                return Qfalse;
-            if (p == pend) return Qtrue;
-            mod = rb_const_get_from(mod, id);
-        }
-#endif
+	recur = Qfalse;
 
 	if (p < pend && !RB_TYPE_P(mod, T_MODULE) && !RB_TYPE_P(mod, T_CLASS)) {
 	    rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module",
@@ -2924,7 +2542,6 @@ rb_mod_singleton_p(VALUE klass)
     return Qfalse;
 }
 
-/*! \private */
 static const struct conv_method_tbl {
     const char method[6];
     unsigned short id;
@@ -2940,38 +2557,33 @@ static const struct conv_method_tbl {
     M(a),
     M(s),
     M(i),
-    M(r),
 #undef M
 };
 #define IMPLICIT_CONVERSIONS 7
 
-static int
-conv_method_index(const char *method)
+static VALUE
+convert_type(VALUE val, const char *tname, const char *method, int raise)
 {
+    ID m = 0;
+    int i = numberof(conv_method_names);
+    VALUE r;
     static const char prefix[] = "to_";
 
     if (strncmp(prefix, method, sizeof(prefix)-1) == 0) {
 	const char *const meth = &method[sizeof(prefix)-1];
-	int i;
 	for (i=0; i < numberof(conv_method_names); i++) {
 	    if (conv_method_names[i].method[0] == meth[0] &&
 		strcmp(conv_method_names[i].method, meth) == 0) {
-		return i;
+		m = conv_method_names[i].id;
+		break;
 	    }
 	}
     }
-    return numberof(conv_method_names);
-}
-
-static VALUE
-convert_type_with_id(VALUE val, const char *tname, ID method, int raise, int index)
-{
-    VALUE r = rb_check_funcall(val, method, 0, 0);
+    if (!m) m = rb_intern(method);
+    r = rb_check_funcall(val, m, 0, 0);
     if (r == Qundef) {
 	if (raise) {
-	    const char *msg =
-		((index < 0 ? conv_method_index(rb_id2name(method)) : index)
-		 < IMPLICIT_CONVERSIONS) ?
+	    const char *msg = i < IMPLICIT_CONVERSIONS ?
 		"no implicit conversion of" : "can't convert";
 	    const char *cname = NIL_P(val) ? "nil" :
 		val == Qtrue ? "true" :
@@ -2988,16 +2600,6 @@ convert_type_with_id(VALUE val, const char *tname, ID method, int raise, int ind
     return r;
 }
 
-static VALUE
-convert_type(VALUE val, const char *tname, const char *method, int raise)
-{
-    int i = conv_method_index(method);
-    ID m = i < numberof(conv_method_names) ?
-	conv_method_names[i].id : rb_intern(method);
-    return convert_type_with_id(val, tname, m, raise, i);
-}
-
-/*! \private */
 NORETURN(static void conversion_mismatch(VALUE, const char *, const char *, VALUE));
 static void
 conversion_mismatch(VALUE val, const char *tname, const char *method, VALUE result)
@@ -3008,19 +2610,6 @@ conversion_mismatch(VALUE val, const char *tname, const char *method, VALUE resu
 	     cname, tname, cname, method, rb_obj_class(result));
 }
 
-/*!
- * Converts an object into another type.
- * Calls the specified conversion method if necessary.
- *
- * \param[in] val    the object to be converted
- * \param[in] type   a value of \c ruby_value_type
- * \param[in] tname  name of the target type.
- *   only used for error messages.
- * \param[in] method name of the method
- * \return an object of the specified type
- * \throw TypeError on failure
- * \sa rb_check_convert_type
- */
 VALUE
 rb_convert_type(VALUE val, int type, const char *tname, const char *method)
 {
@@ -3034,34 +2623,6 @@ rb_convert_type(VALUE val, int type, const char *tname, const char *method)
     return v;
 }
 
-/*! \private */
-VALUE
-rb_convert_type_with_id(VALUE val, int type, const char *tname, ID method)
-{
-    VALUE v;
-
-    if (TYPE(val) == type) return val;
-    v = convert_type_with_id(val, tname, method, TRUE, -1);
-    if (TYPE(v) != type) {
-	conversion_mismatch(val, tname, RSTRING_PTR(rb_id2str(method)), v);
-    }
-    return v;
-}
-
-/*!
- * Tries to convert an object into another type.
- * Calls the specified conversion method if necessary.
- *
- * \param[in] val    the object to be converted
- * \param[in] type   a value of \c ruby_value_type
- * \param[in] tname  name of the target type.
- *   only used for error messages.
- * \param[in] method name of the method
- * \return an object of the specified type, or Qnil if no such conversion method defined.
- * \throw TypeError if the conversion method returns an unexpected type of value.
- * \sa rb_convert_type
- * \sa rb_check_convert_type_with_id
- */
 VALUE
 rb_check_convert_type(VALUE val, int type, const char *tname, const char *method)
 {
@@ -3077,49 +2638,21 @@ rb_check_convert_type(VALUE val, int type, const char *tname, const char *method
     return v;
 }
 
-/*! \private */
-MJIT_FUNC_EXPORTED VALUE
-rb_check_convert_type_with_id(VALUE val, int type, const char *tname, ID method)
-{
-    VALUE v;
-
-    /* always convert T_DATA */
-    if (TYPE(val) == type && type != T_DATA) return val;
-    v = convert_type_with_id(val, tname, method, FALSE, -1);
-    if (NIL_P(v)) return Qnil;
-    if (TYPE(v) != type) {
-	conversion_mismatch(val, tname, RSTRING_PTR(rb_id2str(method)), v);
-    }
-    return v;
-}
-
-#define try_to_int(val, mid, raise) \
-    convert_type_with_id(val, "Integer", mid, raise, -1)
 
-ALWAYS_INLINE(static VALUE rb_to_integer(VALUE val, const char *method, ID mid));
-static inline VALUE
-rb_to_integer(VALUE val, const char *method, ID mid)
+static VALUE
+rb_to_integer(VALUE val, const char *method)
 {
     VALUE v;
 
-    if (RB_INTEGER_TYPE_P(val)) return val;
-    v = try_to_int(val, mid, TRUE);
-    if (!RB_INTEGER_TYPE_P(v)) {
-        conversion_mismatch(val, "Integer", method, v);
+    if (FIXNUM_P(val)) return val;
+    if (RB_TYPE_P(val, T_BIGNUM)) return val;
+    v = convert_type(val, "Integer", method, TRUE);
+    if (!rb_obj_is_kind_of(v, rb_cInteger)) {
+	conversion_mismatch(val, "Integer", method, v);
     }
     return v;
 }
 
-/**
- * Tries to convert \a val into \c Integer.
- * It calls the specified conversion method if necessary.
- *
- * \param[in] val     a Ruby object
- * \param[in] method  a name of a method
- * \return an \c Integer object on success,
- *   or \c Qnil if no such conversion method defined.
- * \exception TypeError if the conversion method returns a non-Integer object.
- */
 VALUE
 rb_check_to_integer(VALUE val, const char *method)
 {
@@ -3128,128 +2661,80 @@ rb_check_to_integer(VALUE val, const char *method)
     if (FIXNUM_P(val)) return val;
     if (RB_TYPE_P(val, T_BIGNUM)) return val;
     v = convert_type(val, "Integer", method, FALSE);
-    if (!RB_INTEGER_TYPE_P(v)) {
-        return Qnil;
+    if (!rb_obj_is_kind_of(v, rb_cInteger)) {
+	return Qnil;
     }
     return v;
 }
 
-/**
- * Converts \a val into \c Integer.
- * It calls \a #to_int method if necessary.
- *
- * \param[in] val a Ruby object
- * \return an \c Integer object
- * \exception TypeError on failure
- */
 VALUE
 rb_to_int(VALUE val)
 {
-    return rb_to_integer(val, "to_int", idTo_int);
+    return rb_to_integer(val, "to_int");
 }
 
-/**
- * Tries to convert \a val into Integer.
- * It calls \c #to_int method if necessary.
- *
- * \param[in] val a Ruby object
- * \return an Integer object on success,
- *   or \c Qnil if \c #to_int is not defined.
- * \exception TypeError if \c #to_int returns a non-Integer object.
- */
 VALUE
 rb_check_to_int(VALUE val)
 {
-    if (RB_INTEGER_TYPE_P(val)) return val;
-    val = try_to_int(val, idTo_int, FALSE);
-    if (RB_INTEGER_TYPE_P(val)) return val;
-    return Qnil;
-}
-
-static VALUE
-rb_check_to_i(VALUE val)
-{
-    if (RB_INTEGER_TYPE_P(val)) return val;
-    val = try_to_int(val, idTo_i, FALSE);
-    if (RB_INTEGER_TYPE_P(val)) return val;
-    return Qnil;
+    return rb_check_to_integer(val, "to_int");
 }
 
 static VALUE
-rb_convert_to_integer(VALUE val, int base, int raise_exception)
+rb_convert_to_integer(VALUE val, int base)
 {
     VALUE tmp;
 
-    if (RB_FLOAT_TYPE_P(val)) {
-        double f;
-        if (base != 0) goto arg_error;
-        f = RFLOAT_VALUE(val);
-        if (!raise_exception && !isfinite(f)) return Qnil;
-        if (FIXABLE(f)) return LONG2FIX((long)f);
-        return rb_dbl2big(f);
-    }
-    else if (RB_INTEGER_TYPE_P(val)) {
-        if (base != 0) goto arg_error;
-        return val;
-    }
-    else if (RB_TYPE_P(val, T_STRING)) {
-        return rb_str_convert_to_inum(val, base, TRUE, raise_exception);
-    }
-    else if (NIL_P(val)) {
-        if (base != 0) goto arg_error;
-        if (!raise_exception) return Qnil;
-        rb_raise(rb_eTypeError, "can't convert nil into Integer");
+    switch (TYPE(val)) {
+      case T_FLOAT:
+	if (base != 0) goto arg_error;
+	if (RFLOAT_VALUE(val) <= (double)FIXNUM_MAX
+	    && RFLOAT_VALUE(val) >= (double)FIXNUM_MIN) {
+	    break;
+	}
+	return rb_dbl2big(RFLOAT_VALUE(val));
+
+      case T_FIXNUM:
+      case T_BIGNUM:
+	if (base != 0) goto arg_error;
+	return val;
+
+      case T_STRING:
+      string_conv:
+	return rb_str_to_inum(val, base, TRUE);
+
+      case T_NIL:
+	if (base != 0) goto arg_error;
+	rb_raise(rb_eTypeError, "can't convert nil into Integer");
+	break;
+
+      default:
+	break;
     }
     if (base != 0) {
-        tmp = rb_check_string_type(val);
-        if (!NIL_P(tmp)) return rb_str_convert_to_inum(tmp, base, TRUE, raise_exception);
+	tmp = rb_check_string_type(val);
+	if (!NIL_P(tmp)) goto string_conv;
       arg_error:
-        if (!raise_exception) return Qnil;
-        rb_raise(rb_eArgError, "base specified for non string value");
+	rb_raise(rb_eArgError, "base specified for non string value");
     }
-
-    tmp = rb_protect(rb_check_to_int, val, NULL);
-    if (RB_INTEGER_TYPE_P(tmp)) return tmp;
-    rb_set_errinfo(Qnil);
-
-    if (!raise_exception) {
-        VALUE result = rb_protect(rb_check_to_i, val, NULL);
-        rb_set_errinfo(Qnil);
-        return result;
+    tmp = convert_type(val, "Integer", "to_int", FALSE);
+    if (NIL_P(tmp)) {
+	return rb_to_integer(val, "to_i");
     }
+    return tmp;
 
-    return rb_to_integer(val, "to_i", idTo_i);
 }
 
-/**
- * Equivalent to \c Kernel\#Integer in Ruby.
- *
- * Converts \a val into \c Integer in a slightly more strict manner
- * than \c #to_i.
- */
 VALUE
 rb_Integer(VALUE val)
 {
-    return rb_convert_to_integer(val, 0, TRUE);
-}
-
-static int
-opts_exception_p(VALUE opts)
-{
-    static ID kwds[1];
-    VALUE exception;
-    if (!kwds[0]) {
-        kwds[0] = idException;
-    }
-    rb_get_kwargs(opts, kwds, 0, 1, &exception);
-    return exception != Qfalse;
+    return rb_convert_to_integer(val, 0);
 }
 
 /*
  *  call-seq:
- *     Integer(arg, base=0, exception: true)    -> integer
+ *     Integer(arg, base=0)    -> integer
  *
- *  Converts <i>arg</i> to an <code>Integer</code>.
+ *  Converts <i>arg</i> to a <code>Fixnum</code> or <code>Bignum</code>.
  *  Numeric types are converted directly (with floating point numbers
  *  being truncated).  <i>base</i> (0, or between 2 and 36) is a base for
  *  integer string representation.  If <i>arg</i> is a <code>String</code>,
@@ -3258,54 +2743,38 @@ opts_exception_p(VALUE opts)
  *  In any case, strings should be strictly conformed to numeric
  *  representation. This behavior is different from that of
  *  <code>String#to_i</code>.  Non string values will be converted by first
- *  trying <code>to_int</code>, then <code>to_i</code>.
- *
- *  Passing <code>nil</code> raises a TypeError, while passing a String that
- *  does not conform with numeric representation raises an ArgumentError.
- *  This behavior can be altered by passing <code>exception: false</code>,
- *  in this case a not convertible value will return <code>nil</code>.
+ *  trying <code>to_int</code>, then <code>to_i</code>. Passing <code>nil</code>
+ *  raises a TypeError.
  *
  *     Integer(123.999)    #=> 123
  *     Integer("0x1a")     #=> 26
  *     Integer(Time.new)   #=> 1204973019
  *     Integer("0930", 10) #=> 930
  *     Integer("111", 2)   #=> 7
- *     Integer(nil)        #=> TypeError: can't convert nil into Integer
- *     Integer("x")        #=> ArgumentError: invalid value for Integer(): "x"
- *
- *     Integer("x", exception: false)        #=> nil
- *
+ *     Integer(nil)        #=> TypeError
  */
 
 static VALUE
 rb_f_integer(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE arg = Qnil, opts = Qnil;
+    VALUE arg = Qnil;
     int base = 0;
 
-    if (argc > 1) {
-        int narg = 1;
-        VALUE vbase = rb_check_to_int(argv[1]);
-        if (!NIL_P(vbase)) {
-            base = NUM2INT(vbase);
-            narg = 2;
-        }
-        if (argc > narg) {
-            VALUE hash = rb_check_hash_type(argv[argc-1]);
-            if (!NIL_P(hash)) {
-                opts = rb_extract_keywords(&hash);
-                if (!hash) --argc;
-            }
-        }
+    switch (argc) {
+      case 2:
+	base = NUM2INT(argv[1]);
+      case 1:
+	arg = argv[0];
+	break;
+      default:
+	/* should cause ArgumentError */
+	rb_scan_args(argc, argv, "11", NULL, NULL);
     }
-    rb_check_arity(argc, 1, 2);
-    arg = argv[0];
-
-    return rb_convert_to_integer(arg, base, opts_exception_p(opts));
+    return rb_convert_to_integer(arg, base);
 }
 
-static double
-rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
+double
+rb_cstr_to_dbl(const char *p, int badcheck)
 {
     const char *q;
     char *end;
@@ -3314,127 +2783,82 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
     int w;
     enum {max_width = 20};
 #define OutOfRange() ((end - p > max_width) ? \
-                      (w = max_width, ellipsis = "...") : \
-                      (w = (int)(end - p), ellipsis = ""))
+		      (w = max_width, ellipsis = "...") : \
+		      (w = (int)(end - p), ellipsis = ""))
 
     if (!p) return 0.0;
     q = p;
     while (ISSPACE(*p)) p++;
 
     if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-        return 0.0;
+	return 0.0;
     }
 
     d = strtod(p, &end);
     if (errno == ERANGE) {
-        OutOfRange();
-        rb_warning("Float %.*s%s out of range", w, p, ellipsis);
-        errno = 0;
+	OutOfRange();
+	rb_warning("Float %.*s%s out of range", w, p, ellipsis);
+	errno = 0;
     }
     if (p == end) {
-        if (badcheck) {
-          bad:
-            if (raise)
-                rb_invalid_str(q, "Float()");
-            else {
-                if (error) *error = 1;
-                return 0.0;
-            }
-        }
-        return d;
+	if (badcheck) {
+	  bad:
+	    rb_invalid_str(q, "Float()");
+	}
+	return d;
     }
     if (*end) {
-        char buf[DBL_DIG * 4 + 10];
-        char *n = buf;
-        char *const init_e = buf + DBL_DIG * 4;
-        char *e = init_e;
-        char prev = 0;
-        int dot_seen = FALSE;
-
-        switch (*p) {case '+': case '-': prev = *n++ = *p++;}
-        if (*p == '0') {
-            prev = *n++ = '0';
-            while (*++p == '0');
-        }
-        while (p < end && n < e) prev = *n++ = *p++;
-        while (*p) {
-            if (*p == '_') {
-                /* remove an underscore between digits */
-                if (n == buf || !ISDIGIT(prev) || (++p, !ISDIGIT(*p))) {
-                    if (badcheck) goto bad;
-                    break;
-                }
-            }
-            prev = *p++;
-            if (e == init_e && (prev == 'e' || prev == 'E' || prev == 'p' || prev == 'P')) {
-                e = buf + sizeof(buf) - 1;
-                *n++ = prev;
-                switch (*p) {case '+': case '-': prev = *n++ = *p++;}
-                if (*p == '0') {
-                    prev = *n++ = '0';
-                    while (*++p == '0');
-                }
-                continue;
-            }
-            else if (ISSPACE(prev)) {
-                while (ISSPACE(*p)) ++p;
-                if (*p) {
-                    if (badcheck) goto bad;
-                    break;
-                }
-            }
-            else if (prev == '.' ? dot_seen++ : !ISDIGIT(prev)) {
-                if (badcheck) goto bad;
-                break;
-            }
-            if (n < e) *n++ = prev;
-        }
-        *n = '\0';
-        p = buf;
-
-        if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-            return 0.0;
-        }
-
-        d = strtod(p, &end);
-        if (errno == ERANGE) {
-            OutOfRange();
-            rb_warning("Float %.*s%s out of range", w, p, ellipsis);
-            errno = 0;
-        }
-        if (badcheck) {
-            if (!end || p == end) goto bad;
-            while (*end && ISSPACE(*end)) end++;
-            if (*end) goto bad;
-        }
+	char buf[DBL_DIG * 4 + 10];
+	char *n = buf;
+	char *e = buf + sizeof(buf) - 1;
+	char prev = 0;
+
+	while (p < end && n < e) prev = *n++ = *p++;
+	while (*p) {
+	    if (*p == '_') {
+		/* remove underscores between digits */
+		if (badcheck) {
+		    if (n == buf || !ISDIGIT(prev)) goto bad;
+		    ++p;
+		    if (!ISDIGIT(*p)) goto bad;
+		}
+		else {
+		    while (*++p == '_');
+		    continue;
+		}
+	    }
+	    prev = *p++;
+	    if (n < e) *n++ = prev;
+	}
+	*n = '\0';
+	p = buf;
+
+	if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
+	    return 0.0;
+	}
+
+	d = strtod(p, &end);
+	if (errno == ERANGE) {
+	    OutOfRange();
+	    rb_warning("Float %.*s%s out of range", w, p, ellipsis);
+	    errno = 0;
+	}
+	if (badcheck) {
+	    if (!end || p == end) goto bad;
+	    while (*end && ISSPACE(*end)) end++;
+	    if (*end) goto bad;
+	}
     }
     if (errno == ERANGE) {
-        errno = 0;
-        OutOfRange();
-        rb_raise(rb_eArgError, "Float %.*s%s out of range", w, q, ellipsis);
+	errno = 0;
+	OutOfRange();
+	rb_raise(rb_eArgError, "Float %.*s%s out of range", w, q, ellipsis);
     }
     return d;
 }
 
-/*!
- * Parses a string representation of a floating point number.
- *
- * \param[in] p  a string representation of a floating number
- * \param[in] badcheck raises an exception on parse error if \a badcheck is non-zero.
- * \return the floating point number in the string on success,
- *   0.0 on parse error and \a badcheck is zero.
- * \note it always fails to parse a hexadecimal representation like "0xAB.CDp+1" when
- *   \a badcheck is zero, even though it would success if \a badcheck was non-zero.
- *   This inconsistency is coming from a historical compatibility reason. [ruby-dev:40822]
- */
 double
-rb_cstr_to_dbl(const char *p, int badcheck)
-{
-    return rb_cstr_to_dbl_raise(p, badcheck, TRUE, NULL);
-}
-
-static double
-rb_str_to_dbl_raise(VALUE str, int badcheck, int raise, int *error)
+rb_str_to_dbl(VALUE str, int badcheck)
 {
     char *s;
     long len;
@@ -3446,72 +2870,38 @@ rb_str_to_dbl_raise(VALUE str, int badcheck, int raise, int *error)
     len = RSTRING_LEN(str);
     if (s) {
 	if (badcheck && memchr(s, '\0', len)) {
-            if (raise)
-                rb_raise(rb_eArgError, "string for Float contains null byte");
-            else {
-                if (error) *error = 1;
-                return 0.0;
-            }
+	    rb_raise(rb_eArgError, "string for Float contains null byte");
 	}
 	if (s[len]) {		/* no sentinel somehow */
-	    char *p = ALLOCV(v, (size_t)len + 1);
+	    char *p =  ALLOCV(v, len);
 	    MEMCPY(p, s, char, len);
 	    p[len] = '\0';
 	    s = p;
 	}
     }
-    ret = rb_cstr_to_dbl_raise(s, badcheck, raise, error);
+    ret = rb_cstr_to_dbl(s, badcheck);
     if (v)
 	ALLOCV_END(v);
     return ret;
 }
 
-FUNC_MINIMIZED(double rb_str_to_dbl(VALUE str, int badcheck));
-
-/*!
- * Parses a string representation of a floating point number.
- *
- * \param[in] str  a \c String object representation of a floating number
- * \param[in] badcheck raises an exception on parse error if \a badcheck is non-zero.
- * \return the floating point number in the string on success,
- *   0.0 on parse error and \a badcheck is zero.
- * \note it always fails to parse a hexadecimal representation like "0xAB.CDp+1" when
- *   \a badcheck is zero, even though it would success if \a badcheck was non-zero.
- *   This inconsistency is coming from a historical compatibility reason. [ruby-dev:40822]
- */
-double
-rb_str_to_dbl(VALUE str, int badcheck)
-{
-    return rb_str_to_dbl_raise(str, badcheck, TRUE, NULL);
-}
-
-/*! \cond INTERNAL_MACRO */
 #define fix2dbl_without_to_f(x) (double)FIX2LONG(x)
 #define big2dbl_without_to_f(x) rb_big2dbl(x)
 #define int2dbl_without_to_f(x) \
     (FIXNUM_P(x) ? fix2dbl_without_to_f(x) : big2dbl_without_to_f(x))
-#define num2dbl_without_to_f(x) \
-    (FIXNUM_P(x) ? fix2dbl_without_to_f(x) : \
-     RB_TYPE_P(x, T_BIGNUM) ? big2dbl_without_to_f(x) : \
-     (Check_Type(x, T_FLOAT), RFLOAT_VALUE(x)))
-static inline double
-rat2dbl_without_to_f(VALUE x)
-{
-    VALUE num = rb_rational_num(x);
-    VALUE den = rb_rational_den(x);
-    return num2dbl_without_to_f(num) / num2dbl_without_to_f(den);
-}
+#define rat2dbl_without_to_f(x) \
+    (int2dbl_without_to_f(rb_rational_num(x)) / \
+     int2dbl_without_to_f(rb_rational_den(x)))
 
 #define special_const_to_float(val, pre, post) \
     switch (val) { \
       case Qnil: \
-	rb_raise_static(rb_eTypeError, pre "nil" post); \
+	rb_raise(rb_eTypeError, pre "nil" post); \
       case Qtrue: \
-	rb_raise_static(rb_eTypeError, pre "true" post); \
+	rb_raise(rb_eTypeError, pre "true" post); \
       case Qfalse: \
-	rb_raise_static(rb_eTypeError, pre "false" post); \
+	rb_raise(rb_eTypeError, pre "false" post); \
     }
-/*! \endcond */
 
 static inline void
 conversion_to_float(VALUE val)
@@ -3526,7 +2916,7 @@ implicit_conversion_to_float(VALUE val)
 }
 
 static int
-to_float(VALUE *valp, int raise_exception)
+to_float(VALUE *valp)
 {
     VALUE val = *valp;
     if (SPECIAL_CONST_P(val)) {
@@ -3537,7 +2927,7 @@ to_float(VALUE *valp, int raise_exception)
 	else if (FLONUM_P(val)) {
 	    return T_FLOAT;
 	}
-	else if (raise_exception) {
+	else {
 	    conversion_to_float(val);
 	}
     }
@@ -3559,78 +2949,36 @@ to_float(VALUE *valp, int raise_exception)
     return T_NONE;
 }
 
-static VALUE
-convert_type_to_float_protected(VALUE val)
-{
-    return rb_convert_type_with_id(val, T_FLOAT, "Float", id_to_f);
-}
-
-static VALUE
-rb_convert_to_float(VALUE val, int raise_exception)
+VALUE
+rb_Float(VALUE val)
 {
-    switch (to_float(&val, raise_exception)) {
+    switch (to_float(&val)) {
       case T_FLOAT:
 	return val;
       case T_STRING:
-        if (!raise_exception) {
-            int e = 0;
-            double x = rb_str_to_dbl_raise(val, TRUE, raise_exception, &e);
-            return e ? Qnil : DBL2NUM(x);
-        }
-        return DBL2NUM(rb_str_to_dbl(val, TRUE));
-      case T_NONE:
-        if (SPECIAL_CONST_P(val) && !raise_exception)
-            return Qnil;
-    }
-
-    if (!raise_exception) {
-        int state;
-        VALUE result = rb_protect(convert_type_to_float_protected, val, &state);
-        if (state) rb_set_errinfo(Qnil);
-        return result;
+	return DBL2NUM(rb_str_to_dbl(val, TRUE));
     }
-
-    return rb_convert_type_with_id(val, T_FLOAT, "Float", id_to_f);
+    return rb_convert_type(val, T_FLOAT, "Float", "to_f");
 }
 
-FUNC_MINIMIZED(VALUE rb_Float(VALUE val));
-
-/*!
- * Equivalent to \c Kernel\#Float in Ruby.
- *
- * Converts \a val into \c Float in a slightly more strict manner
- * than \c #to_f.
- */
-VALUE
-rb_Float(VALUE val)
-{
-    return rb_convert_to_float(val, TRUE);
-}
+FUNC_MINIMIZED(static VALUE rb_f_float(VALUE obj, VALUE arg));
 
 /*
  *  call-seq:
- *     Float(arg, exception: true)    -> float
+ *     Float(arg)    -> float
  *
  *  Returns <i>arg</i> converted to a float. Numeric types are converted
- *  directly, and with exception to string and nil the rest are converted using <i>arg</i>.to_f.
- *  Converting a <code>string</code> with invalid characters will result in a <code>ArgumentError</code>.
+ *  directly, the rest are converted using <i>arg</i>.to_f.
  *  Converting <code>nil</code> generates a <code>TypeError</code>.
- *  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
+ *     Float(1)           #=> 1.0
+ *     Float("123.456")   #=> 123.456
  */
 
 static VALUE
-rb_f_float(int argc, VALUE *argv, VALUE obj)
+rb_f_float(VALUE obj, VALUE arg)
 {
-    VALUE arg = Qnil, opts = Qnil;
-
-    rb_scan_args(argc, argv, "1:", &arg, &opts);
-    return rb_convert_to_float(arg, opts_exception_p(opts));
+    return rb_Float(arg);
 }
 
 static VALUE
@@ -3640,31 +2988,19 @@ numeric_to_float(VALUE val)
 	rb_raise(rb_eTypeError, "can't convert %"PRIsVALUE" into Float",
 		 rb_obj_class(val));
     }
-    return rb_convert_type_with_id(val, T_FLOAT, "Float", id_to_f);
+    return rb_convert_type(val, T_FLOAT, "Float", "to_f");
 }
 
-/*!
- * Converts a \c Numeric object into \c Float.
- * \param[in] val a \c Numeric object
- * \exception TypeError if \a val is not a \c Numeric or other conversion failures.
- */
 VALUE
 rb_to_float(VALUE val)
 {
-    switch (to_float(&val, TRUE)) {
+    switch (to_float(&val)) {
       case T_FLOAT:
 	return val;
     }
     return numeric_to_float(val);
 }
 
-/*!
- * Tries to convert an object into \c Float.
- * It calls \c #to_f if necessary.
- *
- * It returns \c Qnil if the object is not a \c Numeric
- * or \c #to_f is not defined on the object.
- */
 VALUE
 rb_check_to_float(VALUE val)
 {
@@ -3672,16 +3008,17 @@ rb_check_to_float(VALUE val)
     if (!rb_obj_is_kind_of(val, rb_cNumeric)) {
 	return Qnil;
     }
-    return rb_check_convert_type_with_id(val, T_FLOAT, "Float", id_to_f);
+    return rb_check_convert_type(val, T_FLOAT, "Float", "to_f");
 }
 
+static ID id_to_f;
+
 static inline int
 basic_to_f_p(VALUE klass)
 {
     return rb_method_basic_definition_p(klass, id_to_f);
 }
 
-/*! \private */
 double
 rb_num_to_dbl(VALUE val)
 {
@@ -3715,13 +3052,6 @@ rb_num_to_dbl(VALUE val)
     return RFLOAT_VALUE(val);
 }
 
-/*!
- * Converts a \c Numeric object to \c double.
- * \param[in] val a \c Numeric object
- * \return the converted value
- * \exception TypeError if \a val is not a \c Numeric or
- *   it does not support conversion to a floating point number.
- */
 double
 rb_num2dbl(VALUE val)
 {
@@ -3748,22 +3078,16 @@ rb_num2dbl(VALUE val)
 	    rb_raise(rb_eTypeError, "no implicit conversion to float from string");
 	}
     }
-    val = rb_convert_type_with_id(val, T_FLOAT, "Float", id_to_f);
+    val = rb_convert_type(val, T_FLOAT, "Float", "to_f");
     return RFLOAT_VALUE(val);
 }
 
-/*!
- * Equivalent to \c Kernel\#String in Ruby.
- *
- * Converts \a val into \c String by trying \c #to_str at first and
- * then trying \c #to_s.
- */
 VALUE
 rb_String(VALUE val)
 {
     VALUE tmp = rb_check_string_type(val);
     if (NIL_P(tmp))
-	tmp = rb_convert_type_with_id(val, T_STRING, "String", idTo_s);
+	tmp = rb_convert_type(val, T_STRING, "String", "to_s");
     return tmp;
 }
 
@@ -3787,16 +3111,13 @@ rb_f_string(VALUE obj, VALUE arg)
     return rb_String(arg);
 }
 
-/*!
- * Equivalent to \c Kernel\#Array in Ruby.
- */
 VALUE
 rb_Array(VALUE val)
 {
     VALUE tmp = rb_check_array_type(val);
 
     if (NIL_P(tmp)) {
-	tmp = rb_check_to_array(val);
+	tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
 	if (NIL_P(tmp)) {
 	    return rb_ary_new3(1, val);
 	}
@@ -3811,17 +3132,8 @@ rb_Array(VALUE val)
  *  Returns +arg+ as an Array.
  *
  *  First tries to call <code>to_ary</code> on +arg+, then <code>to_a</code>.
- *  If +arg+ does not respond to <code>to_ary</code> or <code>to_a</code>,
- *  returns an Array of length 1 containing +arg+.
  *
- *  If <code>to_ary</code> or <code>to_a</code> returns something other than
- *  an Array, raises a <code>TypeError</code>.
- *
- *     Array(["a", "b"])  #=> ["a", "b"]
- *     Array(1..5)        #=> [1, 2, 3, 4, 5]
- *     Array(key: :value) #=> [[:key, :value]]
- *     Array(nil)         #=> []
- *     Array(1)           #=> [1]
+ *     Array(1..5)   #=> [1, 2, 3, 4, 5]
  */
 
 static VALUE
@@ -3830,9 +3142,6 @@ rb_f_array(VALUE obj, VALUE arg)
     return rb_Array(arg);
 }
 
-/**
- * Equivalent to \c Kernel\#Hash in Ruby
- */
 VALUE
 rb_Hash(VALUE val)
 {
@@ -3868,7 +3177,6 @@ rb_f_hash(VALUE obj, VALUE arg)
     return rb_Hash(arg);
 }
 
-/*! \private */
 struct dig_method {
     VALUE klass;
     int basic;
@@ -3896,7 +3204,6 @@ no_dig_method(int found, VALUE recv, ID mid, int argc, const VALUE *argv, VALUE
     }
 }
 
-/*! \private */
 VALUE
 rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound)
 {
@@ -3995,6 +3302,24 @@ rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound)
  */
 
 
+/*!
+ * Initializes the world of objects and classes.
+ *
+ * At first, the function bootstraps the class hierarchy.
+ * It initializes the most fundamental classes and their metaclasses.
+ * - \c BasicObject
+ * - \c Object
+ * - \c Module
+ * - \c Class
+ * After the bootstrap step, the class hierarchy becomes as the following
+ * diagram.
+ *
+ * \image html boottime-classes.png
+ *
+ * Then, the function defines classes, modules and methods as usual.
+ * \ingroup class
+ */
+
 /*  Document-class: BasicObject
  *
  *  BasicObject is the parent class of all classes in Ruby.  It's an explicit
@@ -4067,27 +3392,6 @@ rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound)
  *  <code>:name</code>).
  */
 
-/*!
- *--
- * \private
- * Initializes the world of objects and classes.
- *
- * At first, the function bootstraps the class hierarchy.
- * It initializes the most fundamental classes and their metaclasses.
- * - \c BasicObject
- * - \c Object
- * - \c Module
- * - \c Class
- * After the bootstrap step, the class hierarchy becomes as the following
- * diagram.
- *
- * \image html boottime-classes.png
- *
- * Then, the function defines classes, modules and methods as usual.
- * \ingroup class
- *++
- */
-
 void
 InitVM_Object(void)
 {
@@ -4150,8 +3454,6 @@ InitVM_Object(void)
     rb_define_method(rb_mKernel, "clone", rb_obj_clone2, -1);
     rb_define_method(rb_mKernel, "dup", rb_obj_dup, 0);
     rb_define_method(rb_mKernel, "itself", rb_obj_itself, 0);
-    rb_define_method(rb_mKernel, "yield_self", rb_obj_yield_self, 0);
-    rb_define_method(rb_mKernel, "then", rb_obj_yield_self, 0);
     rb_define_method(rb_mKernel, "initialize_copy", rb_obj_init_copy, 1);
     rb_define_method(rb_mKernel, "initialize_dup", rb_obj_init_dup_clone, 1);
     rb_define_method(rb_mKernel, "initialize_clone", rb_obj_init_dup_clone, 1);
@@ -4188,7 +3490,7 @@ InitVM_Object(void)
     rb_define_global_function("format", rb_f_sprintf, -1);  /* in sprintf.c */
 
     rb_define_global_function("Integer", rb_f_integer, -1);
-    rb_define_global_function("Float", rb_f_float, -1);
+    rb_define_global_function("Float", rb_f_float, 1);
 
     rb_define_global_function("String", rb_f_string, 1);
     rb_define_global_function("Array", rb_f_array, 1);
@@ -4201,7 +3503,6 @@ InitVM_Object(void)
     rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0);
     rb_define_method(rb_cNilClass, "to_h", nil_to_h, 0);
     rb_define_method(rb_cNilClass, "inspect", nil_inspect, 0);
-    rb_define_method(rb_cNilClass, "=~", nil_match, 1);
     rb_define_method(rb_cNilClass, "&", false_and, 1);
     rb_define_method(rb_cNilClass, "|", false_or, 1);
     rb_define_method(rb_cNilClass, "^", false_xor, 1);
@@ -4232,10 +3533,10 @@ InitVM_Object(void)
     rb_define_method(rb_cModule, "name", rb_mod_name, 0);  /* in variable.c */
     rb_define_method(rb_cModule, "ancestors", rb_mod_ancestors, 0); /* in class.c */
 
-    rb_define_method(rb_cModule, "attr", rb_mod_attr, -1);
-    rb_define_method(rb_cModule, "attr_reader", rb_mod_attr_reader, -1);
-    rb_define_method(rb_cModule, "attr_writer", rb_mod_attr_writer, -1);
-    rb_define_method(rb_cModule, "attr_accessor", rb_mod_attr_accessor, -1);
+    rb_define_private_method(rb_cModule, "attr", rb_mod_attr, -1);
+    rb_define_private_method(rb_cModule, "attr_reader", rb_mod_attr_reader, -1);
+    rb_define_private_method(rb_cModule, "attr_writer", rb_mod_attr_writer, -1);
+    rb_define_private_method(rb_cModule, "attr_accessor", rb_mod_attr_accessor, -1);
 
     rb_define_alloc_func(rb_cModule, rb_module_s_alloc);
     rb_define_method(rb_cModule, "initialize", rb_mod_initialize, 0);
@@ -4268,8 +3569,8 @@ InitVM_Object(void)
     rb_define_method(rb_cModule, "deprecate_constant", rb_mod_deprecate_constant, -1); /* in variable.c */
     rb_define_method(rb_cModule, "singleton_class?", rb_mod_singleton_p, 0);
 
-    rb_define_method(rb_cClass, "allocate", rb_class_alloc, 0);
-    rb_define_method(rb_cClass, "new", rb_class_s_new, -1);
+    rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0);
+    rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);
     rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
     rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);
     rb_define_alloc_func(rb_cClass, rb_class_s_alloc);
@@ -4280,12 +3581,11 @@ InitVM_Object(void)
     /*
      * Document-class: Data
      *
-     * This is a deprecated class, base class for C extensions using
-     * Data_Make_Struct or Data_Wrap_Struct.
+     * This is a recommended base class for C extensions using Data_Make_Struct
+     * or Data_Wrap_Struct, see doc/extension.rdoc for details.
      */
     rb_cData = rb_define_class("Data", rb_cObject);
     rb_undef_alloc_func(rb_cData);
-    rb_deprecate_constant(rb_cObject, "Data");
 
     rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
     rb_define_method(rb_cTrueClass, "to_s", true_to_s, 0);
@@ -4321,10 +3621,7 @@ InitVM_Object(void)
 void
 Init_Object(void)
 {
+    id_to_f = rb_intern_const("to_f");
     id_dig = rb_intern_const("dig");
     InitVM(Object);
 }
-
-/*!
- * \}
- */
diff --git a/pack.c b/pack.c
index b1efef54f1..3fff3e65df 100644
--- a/pack.c
+++ b/pack.c
@@ -9,12 +9,10 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
 #include "internal.h"
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
-#include <float.h>
 
 /*
  * It is intentional that the condition for natstr is HAVE_TRUE_LONG_LONG
@@ -43,20 +41,20 @@ static const char endstr[] = "sSiIlLqQjJ";
 #endif
 
 #ifdef DYNAMIC_ENDIAN
-/* for universal binary of NEXTSTEP and MacOS X */
-/* useless since autoconf 2.63? */
-static int
-is_bigendian(void)
-{
-    static int init = 0;
-    static int endian_value;
-    char *p;
-
-    if (init) return endian_value;
-    init = 1;
-    p = (char*)&init;
-    return endian_value = p[0]?0:1;
-}
+ /* for universal binary of NEXTSTEP and MacOS X */
+ /* useless since autoconf 2.63? */
+ static int
+ is_bigendian(void)
+ {
+     static int init = 0;
+     static int endian_value;
+     char *p;
+
+     if (init) return endian_value;
+     init = 1;
+     p = (char*)&init;
+     return endian_value = p[0]?0:1;
+ }
 # define BIGENDIAN_P() (is_bigendian())
 #elif defined(WORDS_BIGENDIAN)
 # define BIGENDIAN_P() 1
@@ -118,61 +116,41 @@ static ID id_associated;
 static void
 str_associate(VALUE str, VALUE add)
 {
-    /* assert(NIL_P(rb_attr_get(str, id_associated))); */
-    rb_ivar_set(str, id_associated, add);
+    VALUE assoc;
+
+    assoc = rb_attr_get(str, id_associated);
+    if (RB_TYPE_P(assoc, T_ARRAY)) {
+	/* already associated */
+	rb_ary_concat(assoc, add);
+    }
+    else {
+	rb_ivar_set(str, id_associated, add);
+    }
 }
 
 static VALUE
 str_associated(VALUE str)
 {
-    return rb_ivar_lookup(str, id_associated, Qfalse);
+    VALUE assoc = rb_attr_get(str, id_associated);
+    if (NIL_P(assoc)) assoc = Qfalse;
+    return assoc;
 }
 
-static void
-unknown_directive(const char *mode, char type, VALUE fmt)
+void
+rb_str_associate(VALUE str, VALUE add)
 {
-    VALUE f;
-    char unknown[5];
-
-    if (ISPRINT(type)) {
-        unknown[0] = type;
-        unknown[1] = '\0';
-    }
-    else {
-        snprintf(unknown, sizeof(unknown), "\\x%.2x", type & 0xff);
-    }
-    f = rb_str_quote_unprintable(fmt);
-    if (f != fmt) {
-        fmt = rb_str_subseq(f, 1, RSTRING_LEN(f) - 2);
-    }
-    rb_warning("unknown %s directive '%s' in '%"PRIsVALUE"'",
-               mode, unknown, fmt);
+    ONLY_FOR_INTERNAL_USE("rb_str_associate()");
 }
 
-static float
-VALUE_to_float(VALUE obj)
+VALUE
+rb_str_associated(VALUE str)
 {
-    VALUE v = rb_to_float(obj);
-    double d = RFLOAT_VALUE(v);
-
-    if (isnan(d)) {
-        return NAN;
-    }
-    else if (d < -FLT_MAX) {
-        return -INFINITY;
-    }
-    else if (d <= FLT_MAX) {
-        return d;
-    }
-    else {
-        return INFINITY;
-    }
+    ONLY_FOR_INTERNAL_USE("rb_str_associated()");
 }
 
 /*
  *  call-seq:
- *     arr.pack( aTemplateString ) -> aBinaryString
- *     arr.pack( aTemplateString, buffer: aBufferString ) -> aBufferString
+ *     arr.pack ( aTemplateString ) -> aBinaryString
  *
  *  Packs the contents of <i>arr</i> into a binary sequence according to
  *  the directives in <i>aTemplateString</i> (see the table below)
@@ -194,118 +172,111 @@ VALUE_to_float(VALUE obj)
  *     a.pack("a3a3a3")   #=> "a\000\000b\000\000c\000\000"
  *     n.pack("ccc")      #=> "ABC"
  *
- *  If <i>aBufferString</i> is specified and its capacity is enough,
- *  +pack+ uses it as the buffer and returns it.
- *  When the offset is specified by the beginning of <i>aTemplateString</i>,
- *  the result is filled after the offset.
- *  If original contents of <i>aBufferString</i> exists and it's longer than
- *  the offset, the rest of <i>offsetOfBuffer</i> are overwritten by the result.
- *  If it's shorter, the gap is filled with ``<code>\0</code>''.
- *
- *  Note that ``buffer:'' option does not guarantee not to allocate memory
- *  in +pack+.  If the capacity of <i>aBufferString</i> is not enough,
- *  +pack+ allocates memory.
- *
  *  Directives for +pack+.
  *
- *   Integer       | Array   |
- *   Directive     | Element | Meaning
- *   ----------------------------------------------------------------------------
- *   C             | Integer | 8-bit unsigned (unsigned char)
- *   S             | Integer | 16-bit unsigned, native endian (uint16_t)
- *   L             | Integer | 32-bit unsigned, native endian (uint32_t)
- *   Q             | Integer | 64-bit unsigned, native endian (uint64_t)
- *   J             | Integer | pointer width unsigned, native endian (uintptr_t)
- *                 |         | (J is available since Ruby 2.3.)
- *                 |         |
- *   c             | Integer | 8-bit signed (signed char)
- *   s             | Integer | 16-bit signed, native endian (int16_t)
- *   l             | Integer | 32-bit signed, native endian (int32_t)
- *   q             | Integer | 64-bit signed, native endian (int64_t)
- *   j             | Integer | pointer width signed, native endian (intptr_t)
- *                 |         | (j is available since Ruby 2.3.)
- *                 |         |
- *   S_ S!         | Integer | unsigned short, native endian
- *   I I_ I!       | Integer | unsigned int, native endian
- *   L_ L!         | Integer | unsigned long, native endian
- *   Q_ Q!         | Integer | unsigned long long, native endian (ArgumentError
- *                 |         | if the platform has no long long type.)
- *                 |         | (Q_ and Q! is available since Ruby 2.1.)
- *   J!            | Integer | uintptr_t, native endian (same with J)
- *                 |         | (J! is available since Ruby 2.3.)
- *                 |         |
- *   s_ s!         | Integer | signed short, native endian
- *   i i_ i!       | Integer | signed int, native endian
- *   l_ l!         | Integer | signed long, native endian
- *   q_ q!         | Integer | signed long long, native endian (ArgumentError
- *                 |         | if the platform has no long long type.)
- *                 |         | (q_ and q! is available since Ruby 2.1.)
- *   j!            | Integer | intptr_t, native endian (same with j)
- *                 |         | (j! is available since Ruby 2.3.)
- *                 |         |
- *   S> s> S!> s!> | Integer | same as the directives without ">" except
- *   L> l> L!> l!> |         | big endian
- *   I!> i!>       |         | (available since Ruby 1.9.3)
- *   Q> q> Q!> q!> |         | "S>" is same as "n"
- *   J> j> J!> j!> |         | "L>" is same as "N"
- *                 |         |
- *   S< s< S!< s!< | Integer | same as the directives without "<" except
- *   L< l< L!< l!< |         | little endian
- *   I!< i!<       |         | (available since Ruby 1.9.3)
- *   Q< q< Q!< q!< |         | "S<" is same as "v"
- *   J< j< J!< j!< |         | "L<" is same as "V"
- *                 |         |
- *   n             | Integer | 16-bit unsigned, network (big-endian) byte order
- *   N             | Integer | 32-bit unsigned, network (big-endian) byte order
- *   v             | Integer | 16-bit unsigned, VAX (little-endian) byte order
- *   V             | Integer | 32-bit unsigned, VAX (little-endian) byte order
- *                 |         |
- *   U             | Integer | UTF-8 character
- *   w             | Integer | BER-compressed integer
- *
- *   Float        | Array   |
+ *   Integer      | Array   |
  *   Directive    | Element | Meaning
  *   ---------------------------------------------------------------------------
- *   D d          | Float   | double-precision, native format
- *   F f          | Float   | single-precision, native format
- *   E            | Float   | double-precision, little-endian byte order
- *   e            | Float   | single-precision, little-endian byte order
- *   G            | Float   | double-precision, network (big-endian) byte order
- *   g            | Float   | single-precision, network (big-endian) byte order
+ *      C         | Integer | 8-bit unsigned (unsigned char)
+ *      S         | Integer | 16-bit unsigned, native endian (uint16_t)
+ *      L         | Integer | 32-bit unsigned, native endian (uint32_t)
+ *      Q         | Integer | 64-bit unsigned, native endian (uint64_t)
+ *      J         | Integer | pointer width unsigned, native endian (uintptr_t)
+ *                |         | (J is available since Ruby 2.3.)
+ *                |         |
+ *      c         | Integer | 8-bit signed (signed char)
+ *      s         | Integer | 16-bit signed, native endian (int16_t)
+ *      l         | Integer | 32-bit signed, native endian (int32_t)
+ *      q         | Integer | 64-bit signed, native endian (int64_t)
+ *      j         | Integer | pointer width signed, native endian (intptr_t)
+ *                |         | (j is available since Ruby 2.3.)
+ *                |         |
+ *      S_, S!    | Integer | unsigned short, native endian
+ *      I, I_, I! | Integer | unsigned int, native endian
+ *      L_, L!    | Integer | unsigned long, native endian
+ *      Q_, Q!    | Integer | unsigned long long, native endian (ArgumentError
+ *                |         | if the platform has no long long type.)
+ *                |         | (Q_ and Q! is available since Ruby 2.1.)
+ *      J!        | Integer | uintptr_t, native endian (same with J)
+ *                |         | (J! is available since Ruby 2.3.)
+ *                |         |
+ *      s_, s!    | Integer | signed short, native endian
+ *      i, i_, i! | Integer | signed int, native endian
+ *      l_, l!    | Integer | signed long, native endian
+ *      q_, q!    | Integer | signed long long, native endian (ArgumentError
+ *                |         | if the platform has no long long type.)
+ *                |         | (q_ and q! is available since Ruby 2.1.)
+ *      j!        | Integer | intptr_t, native endian (same with j)
+ *                |         | (j! is available since Ruby 2.3.)
+ *                |         |
+ *      S> L> Q>  | Integer | same as the directives without ">" except
+ *      J> s> l>  |         | big endian
+ *      q> j>     |         | (available since Ruby 1.9.3)
+ *      S!> I!>   |         | "S>" is same as "n"
+ *      L!> Q!>   |         | "L>" is same as "N"
+ *      J!> s!>   |         |
+ *      i!> l!>   |         |
+ *      q!> j!>   |         |
+ *                |         |
+ *      S< L< Q<  | Integer | same as the directives without "<" except
+ *      J< s< l<  |         | little endian
+ *      q< j<     |         | (available since Ruby 1.9.3)
+ *      S!< I!<   |         | "S<" is same as "v"
+ *      L!< Q!<   |         | "L<" is same as "V"
+ *      J!< s!<   |         |
+ *      i!< l!<   |         |
+ *      q!< j!<   |         |
+ *                |         |
+ *      n         | Integer | 16-bit unsigned, network (big-endian) byte order
+ *      N         | Integer | 32-bit unsigned, network (big-endian) byte order
+ *      v         | Integer | 16-bit unsigned, VAX (little-endian) byte order
+ *      V         | Integer | 32-bit unsigned, VAX (little-endian) byte order
+ *                |         |
+ *      U         | Integer | UTF-8 character
+ *      w         | Integer | BER-compressed integer
  *
- *   String       | Array   |
- *   Directive    | Element | Meaning
+ *   Float        |         |
+ *   Directive    |         | Meaning
  *   ---------------------------------------------------------------------------
- *   A            | String  | arbitrary binary string (space padded, count is width)
- *   a            | String  | arbitrary binary string (null padded, count is width)
- *   Z            | String  | same as ``a'', except that null is added with *
- *   B            | String  | bit string (MSB first)
- *   b            | String  | bit string (LSB first)
- *   H            | String  | hex string (high nibble first)
- *   h            | String  | hex string (low nibble first)
- *   u            | String  | UU-encoded string
- *   M            | String  | quoted printable, MIME encoding (see also RFC2045)
- *                |         | (text mode but input must use LF and output LF)
- *   m            | String  | base64 encoded string (see RFC 2045, count is width)
+ *      D, d      | Float   | double-precision, native format
+ *      F, f      | Float   | single-precision, native format
+ *      E         | Float   | double-precision, little-endian byte order
+ *      e         | Float   | single-precision, little-endian byte order
+ *      G         | Float   | double-precision, network (big-endian) byte order
+ *      g         | Float   | single-precision, network (big-endian) byte order
+ *
+ *   String       |         |
+ *   Directive    |         | Meaning
+ *   ---------------------------------------------------------------------------
+ *      A         | String  | arbitrary binary string (space padded, count is width)
+ *      a         | String  | arbitrary binary string (null padded, count is width)
+ *      Z         | String  | same as ``a'', except that null is added with *
+ *      B         | String  | bit string (MSB first)
+ *      b         | String  | bit string (LSB first)
+ *      H         | String  | hex string (high nibble first)
+ *      h         | String  | hex string (low nibble first)
+ *      u         | String  | UU-encoded string
+ *      M         | String  | quoted printable, MIME encoding (see RFC2045)
+ *      m         | String  | base64 encoded string (see RFC 2045, count is width)
  *                |         | (if count is 0, no line feed are added, see RFC 4648)
- *   P            | String  | pointer to a structure (fixed-length string)
- *   p            | String  | pointer to a null-terminated string
+ *      P         | String  | pointer to a structure (fixed-length string)
+ *      p         | String  | pointer to a null-terminated string
  *
- *   Misc.        | Array   |
- *   Directive    | Element | Meaning
+ *   Misc.        |         |
+ *   Directive    |         | Meaning
  *   ---------------------------------------------------------------------------
- *   @            | ---     | moves to absolute position
- *   X            | ---     | back up a byte
- *   x            | ---     | null byte
+ *      @         | ---     | moves to absolute position
+ *      X         | ---     | back up a byte
+ *      x         | ---     | null byte
  */
 
 static VALUE
-pack_pack(int argc, VALUE *argv, VALUE ary)
+pack_pack(VALUE ary, VALUE fmt)
 {
     static const char nul10[] = "\0\0\0\0\0\0\0\0\0\0";
     static const char spc10[] = "          ";
     const char *p, *pend;
-    VALUE fmt, opt = Qnil, res, from, associates = 0, buffer = 0;
+    VALUE res, from, associates = 0;
     char type;
     long len, idx, plen;
     const char *ptr;
@@ -315,25 +286,10 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 #endif
     int integer_size, bigendian_p;
 
-    rb_scan_args(argc, argv, "10:", &fmt, &opt);
-
     StringValue(fmt);
     p = RSTRING_PTR(fmt);
     pend = p + RSTRING_LEN(fmt);
-    if (!NIL_P(opt)) {
-	static ID keyword_ids[1];
-	if (!keyword_ids[0])
-	    CONST_ID(keyword_ids[0], "buffer");
-
-	rb_get_kwargs(opt, keyword_ids, 0, 1, &buffer);
-
-	if (buffer != Qundef && !RB_TYPE_P(buffer, T_STRING))
-	    rb_raise(rb_eTypeError, "buffer must be String, not %s", rb_obj_classname(buffer));
-    }
-    if (buffer)
-	res = buffer;
-    else
-	res = rb_str_buf_new(0);
+    res = rb_str_buf_new(0);
 
     idx = 0;
 
@@ -684,7 +640,7 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 		float f;
 
 		from = NEXTFROM;
-                f = VALUE_to_float(from);
+		f = (float)RFLOAT_VALUE(rb_to_float(from));
 		rb_str_buf_cat(res, (char*)&f, sizeof(float));
 	    }
 	    break;
@@ -694,7 +650,7 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 		FLOAT_CONVWITH(tmp);
 
 		from = NEXTFROM;
-                tmp.f = VALUE_to_float(from);
+		tmp.f = (float)RFLOAT_VALUE(rb_to_float(from));
 		HTOVF(tmp);
 		rb_str_buf_cat(res, tmp.buf, sizeof(float));
 	    }
@@ -725,7 +681,7 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 	    while (len-- > 0) {
 		FLOAT_CONVWITH(tmp);
 		from = NEXTFROM;
-                tmp.f = VALUE_to_float(from);
+		tmp.f = (float)RFLOAT_VALUE(rb_to_float(from));
 		HTONF(tmp);
 		rb_str_buf_cat(res, tmp.buf, sizeof(float));
 	    }
@@ -793,7 +749,6 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 	    StringValue(from);
 	    ptr = RSTRING_PTR(from);
 	    plen = RSTRING_LEN(from);
-            OBJ_INFECT(res, from);
 
 	    if (len == 0 && type == 'm') {
 		encodes(res, ptr, plen, type, 0);
@@ -821,7 +776,6 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 
 	  case 'M':		/* quoted-printable encoded string */
 	    from = rb_obj_as_string(NEXTFROM);
-            OBJ_INFECT(res, from);
 	    if (len <= 1)
 		len = 72;
 	    qpencode(res, from, len);
@@ -847,7 +801,6 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 		}
 		else {
 		    t = StringValuePtr(from);
-                    OBJ_INFECT(res, from);
 		    rb_obj_taint(from);
 		}
 		if (!associates) {
@@ -881,9 +834,9 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 
                 cp = RSTRING_PTR(buf);
                 while (1 < numbytes) {
-                    *cp |= 0x80;
-                    cp++;
-                    numbytes--;
+                  *cp |= 0x80;
+                  cp++;
+                  numbytes--;
                 }
 
                 rb_str_buf_cat(res, RSTRING_PTR(buf), RSTRING_LEN(buf));
@@ -891,7 +844,16 @@ pack_pack(int argc, VALUE *argv, VALUE ary)
 	    break;
 
 	  default: {
-            unknown_directive("pack", type, fmt);
+	    char unknown[5];
+	    if (ISPRINT(type)) {
+		unknown[0] = type;
+		unknown[1] = '\0';
+	    }
+	    else {
+		snprintf(unknown, sizeof(unknown), "\\x%.2x", type & 0xff);
+	    }
+	    rb_warning("unknown pack directive '%s' in '% "PRIsVALUE"'",
+		       unknown, fmt);
 	    break;
 	  }
 	}
@@ -1038,22 +1000,21 @@ hex2num(char c)
     tmp_len = 0;				\
     if (len > (long)((send-s)/(sz))) {		\
         if (!star) {				\
-	    tmp_len = len-(send-s)/(sz);	\
+	    tmp_len = len-(send-s)/(sz);		\
         }					\
 	len = (send-s)/(sz);			\
     }						\
 } while (0)
 
 #define PACK_ITEM_ADJUST() do { \
-    if (tmp_len > 0 && mode == UNPACK_ARRAY) \
+    if (tmp_len > 0 && !block_p) \
 	rb_ary_store(ary, RARRAY_LEN(ary)+tmp_len-1, Qnil); \
 } while (0)
 
-/* Workaround for Oracle Developer Studio (Oracle Solaris Studio)
- * 12.4/12.5/12.6 C compiler optimization bug
+/* Workaround for Oracle Solaris Studio 12.4 C compiler optimization bug
  * with "-xO4" optimization option.
  */
-#if defined(__SUNPRO_C) && 0x5130 <= __SUNPRO_C && __SUNPRO_C <= 0x5150
+#if defined(__SUNPRO_C) && __SUNPRO_C == 0x5130
 # define AVOID_CC_BUG volatile
 #else
 # define AVOID_CC_BUG
@@ -1068,13 +1029,122 @@ infected_str_new(const char *ptr, long len, VALUE str)
     return s;
 }
 
-/* unpack mode */
-#define UNPACK_ARRAY 0
-#define UNPACK_BLOCK 1
-#define UNPACK_1 2
+/*
+ *  call-seq:
+ *     str.unpack(format)    ->  anArray
+ *
+ *  Decodes <i>str</i> (which may contain binary data) according to the
+ *  format string, returning an array of each value extracted. The
+ *  format string consists of a sequence of single-character directives,
+ *  summarized in the table at the end of this entry.
+ *  Each directive may be followed
+ *  by a number, indicating the number of times to repeat with this
+ *  directive. An asterisk (``<code>*</code>'') will use up all
+ *  remaining elements. The directives <code>sSiIlL</code> may each be
+ *  followed by an underscore (``<code>_</code>'') or
+ *  exclamation mark (``<code>!</code>'') to use the underlying
+ *  platform's native size for the specified type; otherwise, it uses a
+ *  platform-independent consistent size. Spaces are ignored in the
+ *  format string. See also <code>Array#pack</code>.
+ *
+ *     "abc \0\0abc \0\0".unpack('A6Z6')   #=> ["abc", "abc "]
+ *     "abc \0\0".unpack('a3a3')           #=> ["abc", " \000\000"]
+ *     "abc \0abc \0".unpack('Z*Z*')       #=> ["abc ", "abc "]
+ *     "aa".unpack('b8B8')                 #=> ["10000110", "01100001"]
+ *     "aaa".unpack('h2H2c')               #=> ["16", "61", 97]
+ *     "\xfe\xff\xfe\xff".unpack('sS')     #=> [-2, 65534]
+ *     "now=20is".unpack('M*')             #=> ["now is"]
+ *     "whole".unpack('xax2aX2aX1aX2a')    #=> ["h", "e", "l", "l", "o"]
+ *
+ *  This table summarizes the various formats and the Ruby classes
+ *  returned by each.
+ *
+ *   Integer      |         |
+ *   Directive    | Returns | Meaning
+ *   -----------------------------------------------------------------
+ *      C         | Integer | 8-bit unsigned (unsigned char)
+ *      S         | Integer | 16-bit unsigned, native endian (uint16_t)
+ *      L         | Integer | 32-bit unsigned, native endian (uint32_t)
+ *      Q         | Integer | 64-bit unsigned, native endian (uint64_t)
+ *                |         |
+ *      c         | Integer | 8-bit signed (signed char)
+ *      s         | Integer | 16-bit signed, native endian (int16_t)
+ *      l         | Integer | 32-bit signed, native endian (int32_t)
+ *      q         | Integer | 64-bit signed, native endian (int64_t)
+ *                |         |
+ *      S_, S!    | Integer | unsigned short, native endian
+ *      I, I_, I! | Integer | unsigned int, native endian
+ *      L_, L!    | Integer | unsigned long, native endian
+ *      Q_, Q!    | Integer | unsigned long long, native endian (ArgumentError
+ *                |         | if the platform has no long long type.)
+ *                |         | (Q_ and Q! is available since Ruby 2.1.)
+ *                |         |
+ *      s_, s!    | Integer | signed short, native endian
+ *      i, i_, i! | Integer | signed int, native endian
+ *      l_, l!    | Integer | signed long, native endian
+ *      q_, q!    | Integer | signed long long, native endian (ArgumentError
+ *                |         | if the platform has no long long type.)
+ *                |         | (q_ and q! is available since Ruby 2.1.)
+ *                |         |
+ *      S> L> Q>  | Integer | same as the directives without ">" except
+ *      s> l> q>  |         | big endian
+ *      S!> I!>   |         | (available since Ruby 1.9.3)
+ *      L!> Q!>   |         | "S>" is same as "n"
+ *      s!> i!>   |         | "L>" is same as "N"
+ *      l!> q!>   |         |
+ *                |         |
+ *      S< L< Q<  | Integer | same as the directives without "<" except
+ *      s< l< q<  |         | little endian
+ *      S!< I!<   |         | (available since Ruby 1.9.3)
+ *      L!< Q!<   |         | "S<" is same as "v"
+ *      s!< i!<   |         | "L<" is same as "V"
+ *      l!< q!<   |         |
+ *                |         |
+ *      n         | Integer | 16-bit unsigned, network (big-endian) byte order
+ *      N         | Integer | 32-bit unsigned, network (big-endian) byte order
+ *      v         | Integer | 16-bit unsigned, VAX (little-endian) byte order
+ *      V         | Integer | 32-bit unsigned, VAX (little-endian) byte order
+ *                |         |
+ *      U         | Integer | UTF-8 character
+ *      w         | Integer | BER-compressed integer (see Array.pack)
+ *
+ *   Float        |         |
+ *   Directive    | Returns | Meaning
+ *   -----------------------------------------------------------------
+ *      D, d      | Float   | double-precision, native format
+ *      F, f      | Float   | single-precision, native format
+ *      E         | Float   | double-precision, little-endian byte order
+ *      e         | Float   | single-precision, little-endian byte order
+ *      G         | Float   | double-precision, network (big-endian) byte order
+ *      g         | Float   | single-precision, network (big-endian) byte order
+ *
+ *   String       |         |
+ *   Directive    | Returns | Meaning
+ *   -----------------------------------------------------------------
+ *      A         | String  | arbitrary binary string (remove trailing nulls and ASCII spaces)
+ *      a         | String  | arbitrary binary string
+ *      Z         | String  | null-terminated string
+ *      B         | String  | bit string (MSB first)
+ *      b         | String  | bit string (LSB first)
+ *      H         | String  | hex string (high nibble first)
+ *      h         | String  | hex string (low nibble first)
+ *      u         | String  | UU-encoded string
+ *      M         | String  | quoted-printable, MIME encoding (see RFC2045)
+ *      m         | String  | base64 encoded string (RFC 2045) (default)
+ *                |         | base64 encoded string (RFC 4648) if followed by 0
+ *      P         | String  | pointer to a structure (fixed-length string)
+ *      p         | String  | pointer to a null-terminated string
+ *
+ *   Misc.        |         |
+ *   Directive    | Returns | Meaning
+ *   -----------------------------------------------------------------
+ *      @         | ---     | skip to the offset given by the length argument
+ *      X         | ---     | skip backward one byte
+ *      x         | ---     | skip forward one byte
+ */
 
 static VALUE
-pack_unpack_internal(VALUE str, VALUE fmt, int mode)
+pack_unpack(VALUE str, VALUE fmt)
 {
 #define hexdigits ruby_hexdigits
     char *s, *send;
@@ -1087,18 +1157,16 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 #ifdef NATINT_PACK
     int natint;			/* native integer */
 #endif
+    int block_p = rb_block_given_p();
     int signed_p, integer_size, bigendian_p;
 #define UNPACK_PUSH(item) do {\
 	VALUE item_val = (item);\
-	if ((mode) == UNPACK_BLOCK) {\
+	if (block_p) {\
 	    rb_yield(item_val);\
 	}\
-	else if ((mode) == UNPACK_ARRAY) {\
+	else {\
 	    rb_ary_push(ary, item_val);\
 	}\
-	else /* if ((mode) == UNPACK_1) { */ {\
-	    return item_val; \
-	}\
     } while (0)
 
     StringValue(str);
@@ -1108,7 +1176,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
     p = RSTRING_PTR(fmt);
     pend = p + RSTRING_LEN(fmt);
 
-    ary = mode == UNPACK_ARRAY ? rb_ary_new() : Qnil;
+    ary = block_p ? Qnil : rb_ary_new();
     while (p < pend) {
 	int explicit_endian = 0;
 	type = *p++;
@@ -1165,7 +1233,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 	else if (ISDIGIT(*p)) {
 	    errno = 0;
 	    len = STRTOUL(p, (char**)&p, 10);
-	    if (len < 0 || errno) {
+	    if (errno) {
 		rb_raise(rb_eRangeError, "pack length too big");
 	    }
 	}
@@ -1221,15 +1289,13 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 		if (p[-1] == '*' || len > (send - s) * 8)
 		    len = (send - s) * 8;
 		bits = 0;
-		bitstr = rb_usascii_str_new(0, len);
-                OBJ_INFECT(bitstr, str);
+		UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
 		t = RSTRING_PTR(bitstr);
 		for (i=0; i<len; i++) {
 		    if (i & 7) bits >>= 1;
 		    else bits = (unsigned char)*s++;
 		    *t++ = (bits & 1) ? '1' : '0';
 		}
-		UNPACK_PUSH(bitstr);
 	    }
 	    break;
 
@@ -1243,15 +1309,13 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 		if (p[-1] == '*' || len > (send - s) * 8)
 		    len = (send - s) * 8;
 		bits = 0;
-		bitstr = rb_usascii_str_new(0, len);
-                OBJ_INFECT(bitstr, str);
+		UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
 		t = RSTRING_PTR(bitstr);
 		for (i=0; i<len; i++) {
 		    if (i & 7) bits <<= 1;
 		    else bits = (unsigned char)*s++;
 		    *t++ = (bits & 128) ? '1' : '0';
 		}
-		UNPACK_PUSH(bitstr);
 	    }
 	    break;
 
@@ -1265,8 +1329,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 		if (p[-1] == '*' || len > (send - s) * 2)
 		    len = (send - s) * 2;
 		bits = 0;
-		bitstr = rb_usascii_str_new(0, len);
-                OBJ_INFECT(bitstr, str);
+		UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
 		t = RSTRING_PTR(bitstr);
 		for (i=0; i<len; i++) {
 		    if (i & 1)
@@ -1275,7 +1338,6 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 			bits = (unsigned char)*s++;
 		    *t++ = hexdigits[bits & 15];
 		}
-		UNPACK_PUSH(bitstr);
 	    }
 	    break;
 
@@ -1289,8 +1351,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 		if (p[-1] == '*' || len > (send - s) * 2)
 		    len = (send - s) * 2;
 		bits = 0;
-		bitstr = rb_usascii_str_new(0, len);
-                OBJ_INFECT(bitstr, str);
+		UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
 		t = RSTRING_PTR(bitstr);
 		for (i=0; i<len; i++) {
 		    if (i & 1)
@@ -1299,7 +1360,6 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 			bits = (unsigned char)*s++;
 		    *t++ = hexdigits[(bits >> 4) & 15];
 		}
-		UNPACK_PUSH(bitstr);
 	    }
 	    break;
 
@@ -1640,7 +1700,6 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 	    {
 		VALUE buf = infected_str_new(0, send - s, str);
 		char *ptr = RSTRING_PTR(buf), *ss = s;
-		int csum = 0;
 		int c1, c2;
 
 		while (s < send) {
@@ -1652,19 +1711,18 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 			    if ((c1 = hex2num(*s)) == -1) break;
 			    if (++s == send) break;
 			    if ((c2 = hex2num(*s)) == -1) break;
-			    csum |= *ptr++ = castchar(c1 << 4 | c2);
+			    *ptr++ = castchar(c1 << 4 | c2);
 			}
 		    }
 		    else {
-			csum |= *ptr++ = *s;
+			*ptr++ = *s;
 		    }
 		    s++;
 		    ss = s;
 		}
 		rb_str_set_len(buf, ptr - RSTRING_PTR(buf));
 		rb_str_buf_cat(buf, ss, send-ss);
-		csum = ISASCII(csum) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
-		ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), csum);
+		ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), ENC_CODERANGE_VALID);
 		UNPACK_PUSH(buf);
 	    }
 	    break;
@@ -1781,7 +1839,8 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
 	    break;
 
 	  default:
-            unknown_directive("unpack", type, fmt);
+	    rb_warning("unknown unpack directive '%c' in '%s'",
+		type, RSTRING_PTR(fmt));
 	    break;
 	}
     }
@@ -1789,148 +1848,6 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
     return ary;
 }
 
-/*
- *  call-seq:
- *     str.unpack(format)    ->  anArray
- *
- *  Decodes <i>str</i> (which may contain binary data) according to the
- *  format string, returning an array of each value extracted. The
- *  format string consists of a sequence of single-character directives,
- *  summarized in the table at the end of this entry.
- *  Each directive may be followed
- *  by a number, indicating the number of times to repeat with this
- *  directive. An asterisk (``<code>*</code>'') will use up all
- *  remaining elements. The directives <code>sSiIlL</code> may each be
- *  followed by an underscore (``<code>_</code>'') or
- *  exclamation mark (``<code>!</code>'') to use the underlying
- *  platform's native size for the specified type; otherwise, it uses a
- *  platform-independent consistent size. Spaces are ignored in the
- *  format string. See also <code>String#unpack1</code>,  <code>Array#pack</code>.
- *
- *     "abc \0\0abc \0\0".unpack('A6Z6')   #=> ["abc", "abc "]
- *     "abc \0\0".unpack('a3a3')           #=> ["abc", " \000\000"]
- *     "abc \0abc \0".unpack('Z*Z*')       #=> ["abc ", "abc "]
- *     "aa".unpack('b8B8')                 #=> ["10000110", "01100001"]
- *     "aaa".unpack('h2H2c')               #=> ["16", "61", 97]
- *     "\xfe\xff\xfe\xff".unpack('sS')     #=> [-2, 65534]
- *     "now=20is".unpack('M*')             #=> ["now is"]
- *     "whole".unpack('xax2aX2aX1aX2a')    #=> ["h", "e", "l", "l", "o"]
- *
- *  This table summarizes the various formats and the Ruby classes
- *  returned by each.
- *
- *   Integer       |         |
- *   Directive     | Returns | Meaning
- *   ------------------------------------------------------------------
- *   C             | Integer | 8-bit unsigned (unsigned char)
- *   S             | Integer | 16-bit unsigned, native endian (uint16_t)
- *   L             | Integer | 32-bit unsigned, native endian (uint32_t)
- *   Q             | Integer | 64-bit unsigned, native endian (uint64_t)
- *   J             | Integer | pointer width unsigned, native endian (uintptr_t)
- *                 |         |
- *   c             | Integer | 8-bit signed (signed char)
- *   s             | Integer | 16-bit signed, native endian (int16_t)
- *   l             | Integer | 32-bit signed, native endian (int32_t)
- *   q             | Integer | 64-bit signed, native endian (int64_t)
- *   j             | Integer | pointer width signed, native endian (intptr_t)
- *                 |         |
- *   S_ S!         | Integer | unsigned short, native endian
- *   I I_ I!       | Integer | unsigned int, native endian
- *   L_ L!         | Integer | unsigned long, native endian
- *   Q_ Q!         | Integer | unsigned long long, native endian (ArgumentError
- *                 |         | if the platform has no long long type.)
- *   J!            | Integer | uintptr_t, native endian (same with J)
- *                 |         |
- *   s_ s!         | Integer | signed short, native endian
- *   i i_ i!       | Integer | signed int, native endian
- *   l_ l!         | Integer | signed long, native endian
- *   q_ q!         | Integer | signed long long, native endian (ArgumentError
- *                 |         | if the platform has no long long type.)
- *   j!            | Integer | intptr_t, native endian (same with j)
- *                 |         |
- *   S> s> S!> s!> | Integer | same as the directives without ">" except
- *   L> l> L!> l!> |         | big endian
- *   I!> i!>       |         |
- *   Q> q> Q!> q!> |         | "S>" is same as "n"
- *   J> j> J!> j!> |         | "L>" is same as "N"
- *                 |         |
- *   S< s< S!< s!< | Integer | same as the directives without "<" except
- *   L< l< L!< l!< |         | little endian
- *   I!< i!<       |         |
- *   Q< q< Q!< q!< |         | "S<" is same as "v"
- *   J< j< J!< j!< |         | "L<" is same as "V"
- *                 |         |
- *   n             | Integer | 16-bit unsigned, network (big-endian) byte order
- *   N             | Integer | 32-bit unsigned, network (big-endian) byte order
- *   v             | Integer | 16-bit unsigned, VAX (little-endian) byte order
- *   V             | Integer | 32-bit unsigned, VAX (little-endian) byte order
- *                 |         |
- *   U             | Integer | UTF-8 character
- *   w             | Integer | BER-compressed integer (see Array.pack)
- *
- *   Float        |         |
- *   Directive    | Returns | Meaning
- *   -----------------------------------------------------------------
- *   D d          | Float   | double-precision, native format
- *   F f          | Float   | single-precision, native format
- *   E            | Float   | double-precision, little-endian byte order
- *   e            | Float   | single-precision, little-endian byte order
- *   G            | Float   | double-precision, network (big-endian) byte order
- *   g            | Float   | single-precision, network (big-endian) byte order
- *
- *   String       |         |
- *   Directive    | Returns | Meaning
- *   -----------------------------------------------------------------
- *   A            | String  | arbitrary binary string (remove trailing nulls and ASCII spaces)
- *   a            | String  | arbitrary binary string
- *   Z            | String  | null-terminated string
- *   B            | String  | bit string (MSB first)
- *   b            | String  | bit string (LSB first)
- *   H            | String  | hex string (high nibble first)
- *   h            | String  | hex string (low nibble first)
- *   u            | String  | UU-encoded string
- *   M            | String  | quoted-printable, MIME encoding (see RFC2045)
- *   m            | String  | base64 encoded string (RFC 2045) (default)
- *                |         | base64 encoded string (RFC 4648) if followed by 0
- *   P            | String  | pointer to a structure (fixed-length string)
- *   p            | String  | pointer to a null-terminated string
- *
- *   Misc.        |         |
- *   Directive    | Returns | Meaning
- *   -----------------------------------------------------------------
- *   @            | ---     | skip to the offset given by the length argument
- *   X            | ---     | skip backward one byte
- *   x            | ---     | skip forward one byte
- *
- *  HISTORY
- *
- *  * J, J! j, and j! are available since Ruby 2.3.
- *  * Q_, Q!, q_, and q! are available since Ruby 2.1.
- *  * I!<, i!<, I!>, and i!> are available since Ruby 1.9.3.
- */
-
-static VALUE
-pack_unpack(VALUE str, VALUE fmt)
-{
-    int mode = rb_block_given_p() ? UNPACK_BLOCK : UNPACK_ARRAY;
-    return pack_unpack_internal(str, fmt, mode);
-}
-
-/*
- *  call-seq:
- *     str.unpack1(format)    ->  obj
- *
- *  Decodes <i>str</i> (which may contain binary data) according to the
- *  format string, returning the first value extracted.
- *  See also <code>String#unpack</code>, <code>Array#pack</code>.
- */
-
-static VALUE
-pack_unpack1(VALUE str, VALUE fmt)
-{
-    return pack_unpack_internal(str, fmt, UNPACK_1);
-}
-
 int
 rb_uv_to_utf8(char buf[6], unsigned long uv)
 {
@@ -1975,7 +1892,7 @@ rb_uv_to_utf8(char buf[6], unsigned long uv)
     }
     rb_raise(rb_eRangeError, "pack(U): value out of range");
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 static const unsigned long utf8_limits[] = {
@@ -2041,9 +1958,8 @@ utf8_to_uv(const char *p, long *lenp)
 void
 Init_pack(void)
 {
-    rb_define_method(rb_cArray, "pack", pack_pack, -1);
+    rb_define_method(rb_cArray, "pack", pack_pack, 1);
     rb_define_method(rb_cString, "unpack", pack_unpack, 1);
-    rb_define_method(rb_cString, "unpack1", pack_unpack1, 1);
 
     id_associated = rb_make_internal_id();
 }
diff --git a/parse.y b/parse.y
index 16bde4db02..d7d15456d2 100644
--- a/parse.y
+++ b/parse.y
@@ -14,11 +14,12 @@
 #if !YYPURE
 # error needs pure parser
 #endif
+#ifndef PARSER_DEBUG
+#define PARSER_DEBUG 0
+#endif
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
 #define YYSTACK_USE_ALLOCA 0
-#define YYLTYPE rb_code_location_t
-#define YYLTYPE_IS_DECLARED 1
 
 #include "ruby/ruby.h"
 #include "ruby/st.h"
@@ -39,38 +40,25 @@
 
 #define TAB_WIDTH 8
 
-#define yydebug (p->debug)	/* disable the global variable definition */
-
-#define YYMALLOC(size)		rb_parser_malloc(p, (size))
-#define YYREALLOC(ptr, size)	rb_parser_realloc(p, (ptr), (size))
-#define YYCALLOC(nelem, size)	rb_parser_calloc(p, (nelem), (size))
-#define YYFREE(ptr)		rb_parser_free(p, (ptr))
+#define YYMALLOC(size)		rb_parser_malloc(parser, (size))
+#define YYREALLOC(ptr, size)	rb_parser_realloc(parser, (ptr), (size))
+#define YYCALLOC(nelem, size)	rb_parser_calloc(parser, (nelem), (size))
+#define YYFREE(ptr)		rb_parser_free(parser, (ptr))
 #define YYFPRINTF		rb_parser_printf
-#define YYPRINT(out, tok, val)	parser_token_value_print(p, (tok), &(val))
-#define YY_LOCATION_PRINT(File, loc) \
-     rb_parser_printf(p, "%d.%d-%d.%d", \
-		      (loc).beg_pos.lineno, (loc).beg_pos.column,\
-		      (loc).end_pos.lineno, (loc).end_pos.column)
-#define YYLLOC_DEFAULT(Current, Rhs, N)					\
-    do									\
-      if (N)								\
-	{								\
-	  (Current).beg_pos = YYRHSLOC(Rhs, 1).beg_pos;			\
-	  (Current).end_pos = YYRHSLOC(Rhs, N).end_pos;			\
-	}								\
-      else								\
-        {                                                               \
-          (Current).beg_pos = YYRHSLOC(Rhs, 0).end_pos;                 \
-          (Current).end_pos = YYRHSLOC(Rhs, 0).end_pos;                 \
-        }                                                               \
-    while (0)
-
-#define RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(Current)			\
-    rb_parser_set_location_from_strterm_heredoc(p, &p->lex.strterm->u.heredoc, &(Current))
-#define RUBY_SET_YYLLOC_OF_NONE(Current)					\
-    rb_parser_set_location_of_none(p, &(Current))
-#define RUBY_SET_YYLLOC(Current)					\
-    rb_parser_set_location(p, &(Current))
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) \
+     rb_parser_printf(parser, "%d.%d-%d.%d", \
+		      (Loc).first_line, (Loc).first_column, \
+		      (Loc).last_line,  (Loc).last_column)
+#endif
+#undef malloc
+#undef realloc
+#undef calloc
+#undef free
+#define malloc	YYMALLOC
+#define realloc	YYREALLOC
+#define calloc	YYCALLOC
+#define free	YYFREE
 
 enum lex_state_bits {
     EXPR_BEG_bit,		/* ignore newline, +/- is a sign. */
@@ -107,41 +95,37 @@ enum lex_state_e {
     EXPR_VALUE = EXPR_BEG,
     EXPR_BEG_ANY  =  (EXPR_BEG | EXPR_MID | EXPR_CLASS),
     EXPR_ARG_ANY  =  (EXPR_ARG | EXPR_CMDARG),
-    EXPR_END_ANY  =  (EXPR_END | EXPR_ENDARG | EXPR_ENDFN),
-    EXPR_NONE = 0
+    EXPR_END_ANY  =  (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
 };
 #define IS_lex_state_for(x, ls)	((x) & (ls))
 #define IS_lex_state_all_for(x, ls) (((x) & (ls)) == (ls))
-#define IS_lex_state(ls)	IS_lex_state_for(p->lex.state, (ls))
-#define IS_lex_state_all(ls)	IS_lex_state_all_for(p->lex.state, (ls))
+#define IS_lex_state(ls)	IS_lex_state_for(lex_state, (ls))
+#define IS_lex_state_all(ls)	IS_lex_state_all_for(lex_state, (ls))
 
 # define SET_LEX_STATE(ls) \
-    (p->lex.state = \
-     (p->debug ? \
-      rb_parser_trace_lex_state(p, p->lex.state, (ls), __LINE__) : \
-      (enum lex_state_e)(ls)))
+    (lex_state = (yydebug ? trace_lex_state(lex_state, (ls), __LINE__) : \
+		  (enum lex_state_e)(ls)))
+static enum lex_state_e trace_lex_state(enum lex_state_e from, enum lex_state_e to, int line);
 
 typedef VALUE stack_type;
 
-static const rb_code_location_t NULL_LOC = { {0, -1}, {0, -1} };
+static void show_bitstack(stack_type, const char *, int);
+# define SHOW_BITSTACK(stack, name) (yydebug ? show_bitstack(stack, name, __LINE__) : (void)0)
+# define BITSTACK_PUSH(stack, n) (((stack) = ((stack)<<1)|((n)&1)), SHOW_BITSTACK(stack, #stack"(push)"))
+# define BITSTACK_POP(stack)	 (((stack) = (stack) >> 1), SHOW_BITSTACK(stack, #stack"(pop)"))
+# define BITSTACK_LEXPOP(stack)	 (((stack) = ((stack) >> 1) | ((stack) & 1)), SHOW_BITSTACK(stack, #stack"(lexpop)"))
+# define BITSTACK_SET_P(stack)	 (SHOW_BITSTACK(stack, #stack), (stack)&1)
+# define BITSTACK_SET(stack, n)	 ((stack)=(n), SHOW_BITSTACK(stack, #stack"(set)"))
 
-# define SHOW_BITSTACK(stack, name) (p->debug ? rb_parser_show_bitstack(p, stack, name, __LINE__) : (void)0)
-# define BITSTACK_PUSH(stack, n) (((p->stack) = ((p->stack)<<1)|((n)&1)), SHOW_BITSTACK(p->stack, #stack"(push)"))
-# define BITSTACK_POP(stack)	 (((p->stack) = (p->stack) >> 1), SHOW_BITSTACK(p->stack, #stack"(pop)"))
-# define BITSTACK_SET_P(stack)	 (SHOW_BITSTACK(p->stack, #stack), (p->stack)&1)
-# define BITSTACK_SET(stack, n)	 ((p->stack)=(n), SHOW_BITSTACK(p->stack, #stack"(set)"))
-
-/* A flag to identify keyword_do_cond, "do" keyword after condition expression.
-   Examples: `while ... do`, `until ... do`, and `for ... in ... do` */
 #define COND_PUSH(n)	BITSTACK_PUSH(cond_stack, (n))
 #define COND_POP()	BITSTACK_POP(cond_stack)
+#define COND_LEXPOP()	BITSTACK_LEXPOP(cond_stack)
 #define COND_P()	BITSTACK_SET_P(cond_stack)
 #define COND_SET(n)	BITSTACK_SET(cond_stack, (n))
 
-/* A flag to identify keyword_do_block; "do" keyword after command_call.
-   Example: `foo 1, 2 do`. */
 #define CMDARG_PUSH(n)	BITSTACK_PUSH(cmdarg_stack, (n))
 #define CMDARG_POP()	BITSTACK_POP(cmdarg_stack)
+#define CMDARG_LEXPOP()	BITSTACK_LEXPOP(cmdarg_stack)
 #define CMDARG_P()	BITSTACK_SET_P(cmdarg_stack)
 #define CMDARG_SET(n)	BITSTACK_SET(cmdarg_stack, (n))
 
@@ -160,11 +144,89 @@ struct local_vars {
     struct vtable *past;
 # endif
     struct local_vars *prev;
+    stack_type cmdargs;
 };
 
 #define DVARS_INHERIT ((void*)1)
 #define DVARS_TOPSCOPE NULL
-#define DVARS_TERMINAL_P(tbl) ((tbl) == DVARS_INHERIT || (tbl) == DVARS_TOPSCOPE)
+#define DVARS_SPECIAL_P(tbl) (!POINTER_P(tbl))
+#define POINTER_P(val) ((VALUE)(val) & ~(VALUE)3)
+
+static int
+vtable_size(const struct vtable *tbl)
+{
+    if (POINTER_P(tbl)) {
+        return tbl->pos;
+    }
+    else {
+        return 0;
+    }
+}
+
+#define VTBL_DEBUG 0
+
+static struct vtable *
+vtable_alloc(struct vtable *prev)
+{
+    struct vtable *tbl = ALLOC(struct vtable);
+    tbl->pos = 0;
+    tbl->capa = 8;
+    tbl->tbl = ALLOC_N(ID, tbl->capa);
+    tbl->prev = prev;
+    if (VTBL_DEBUG) printf("vtable_alloc: %p\n", (void *)tbl);
+    return tbl;
+}
+
+static void
+vtable_free(struct vtable *tbl)
+{
+    if (VTBL_DEBUG)printf("vtable_free: %p\n", (void *)tbl);
+    if (POINTER_P(tbl)) {
+        if (tbl->tbl) {
+            xfree(tbl->tbl);
+        }
+        xfree(tbl);
+    }
+}
+
+static void
+vtable_add(struct vtable *tbl, ID id)
+{
+    if (!POINTER_P(tbl)) {
+        rb_bug("vtable_add: vtable is not allocated (%p)", (void *)tbl);
+    }
+    if (VTBL_DEBUG) printf("vtable_add: %p, %"PRIsVALUE"\n", (void *)tbl, rb_id2str(id));
+
+    if (tbl->pos == tbl->capa) {
+        tbl->capa = tbl->capa * 2;
+        REALLOC_N(tbl->tbl, ID, tbl->capa);
+    }
+    tbl->tbl[tbl->pos++] = id;
+}
+
+#ifndef RIPPER
+static void
+vtable_pop(struct vtable *tbl, int n)
+{
+    if (tbl->pos < n) rb_bug("vtable_pop: unreachable");
+    tbl->pos -= n;
+}
+#endif
+
+static int
+vtable_included(const struct vtable * tbl, ID id)
+{
+    int i;
+
+    if (POINTER_P(tbl)) {
+        for (i = 0; i < tbl->pos; i++) {
+            if (tbl->tbl[i] == id) {
+                return i+1;
+            }
+        }
+    }
+    return 0;
+}
 
 typedef struct token_info {
     const char *token;
@@ -174,43 +236,33 @@ typedef struct token_info {
     struct token_info *next;
 } token_info;
 
-typedef struct rb_strterm_struct rb_strterm_t;
-
 /*
     Structure of Lexer Buffer:
 
- lex.pbeg     lex.ptok     lex.pcur     lex.pend
-    |            |            |            |
-    |------------+------------+------------|
-                 |<---------->|
+ lex_pbeg      tokp         lex_p        lex_pend
+    |           |              |            |
+    |-----------+--------------+------------|
+                |<------------>|
                      token
 */
 struct parser_params {
-    rb_imemo_tmpbuf_t *heap;
+    NODE *heap;
 
     YYSTYPE *lval;
 
     struct {
-	rb_strterm_t *strterm;
+	NODE *strterm;
 	VALUE (*gets)(struct parser_params*,VALUE);
 	VALUE input;
-	VALUE prevline;
 	VALUE lastline;
 	VALUE nextline;
 	const char *pbeg;
 	const char *pcur;
 	const char *pend;
-	const char *ptok;
-	union {
-	    long ptr;
-	    VALUE (*call)(VALUE, int);
-	} gets_;
+	long gets_ptr;
 	enum lex_state_e state;
-	/* track the nest level of any parens "()[]{}" */
 	int paren_nest;
-	/* keep p->lex.paren_nest at the beginning of lambda "->" to detect tLAMBEG and keyword_do_LAMBDA */
 	int lpar_beg;
-	/* track the nest level of only braces "{}" */
 	int brace_nest;
     } lex;
     stack_type cond_stack;
@@ -222,33 +274,30 @@ struct parser_params {
     int heredoc_indent;
     int heredoc_line_indent;
     char *tokenbuf;
+    NODE *deferred_nodes;
     struct local_vars *lvtbl;
     int line_count;
     int ruby_sourceline;	/* current line no. */
-    const char *ruby_sourcefile; /* current source file */
+    char *ruby_sourcefile; /* current source file */
     VALUE ruby_sourcefile_string;
     rb_encoding *enc;
     token_info *token_info;
     VALUE compile_option;
 
     VALUE debug_buffer;
-    VALUE debug_output;
 
     ID cur_arg;
 
-    rb_ast_t *ast;
-    int node_id;
-
     unsigned int command_start:1;
     unsigned int eofp: 1;
     unsigned int ruby__end__seen: 1;
-    unsigned int debug: 1;
+    unsigned int yydebug: 1;
     unsigned int has_shebang: 1;
     unsigned int in_defined: 1;
     unsigned int in_main: 1;
     unsigned int in_kwarg: 1;
+    unsigned int in_single: 1;
     unsigned int in_def: 1;
-    unsigned int in_class: 1;
     unsigned int token_seen: 1;
     unsigned int token_info_enabled: 1;
 # if WARN_PAST_SCOPE
@@ -260,20 +309,16 @@ struct parser_params {
 #ifndef RIPPER
     /* Ruby core only */
 
-    unsigned int do_print: 1;
-    unsigned int do_loop: 1;
-    unsigned int do_chomp: 1;
-    unsigned int do_split: 1;
-    unsigned int warn_location: 1;
-
     NODE *eval_tree_begin;
     NODE *eval_tree;
     VALUE error_buffer;
     VALUE debug_lines;
+    VALUE coverage;
     const struct rb_block *base_block;
 #else
     /* Ripper only */
 
+    const char *tokp;
     VALUE delayed;
     int delayed_line;
     int delayed_col;
@@ -284,187 +329,214 @@ struct parser_params {
 #endif
 };
 
-#define new_tmpbuf() \
-    (rb_imemo_tmpbuf_t *)add_mark_object(p, rb_imemo_tmpbuf_auto_free_pointer(NULL))
-
+#ifdef RIPPER
 #define intern_cstr(n,l,en) rb_intern3(n,l,en)
+#else
+#define intern_cstr(n,l,en) rb_intern3(n,l,en)
+#endif
 
-#define STR_NEW(ptr,len) rb_enc_str_new((ptr),(len),p->enc)
-#define STR_NEW0() rb_enc_str_new(0,0,p->enc)
-#define STR_NEW2(ptr) rb_enc_str_new((ptr),strlen(ptr),p->enc)
-#define STR_NEW3(ptr,len,e,func) parser_str_new((ptr),(len),(e),(func),p->enc)
-#define TOK_INTERN() intern_cstr(tok(p), toklen(p), p->enc)
-
-static int parser_yyerror(struct parser_params*, const YYLTYPE *yylloc, const char*);
-#define yyerror0(msg) parser_yyerror(p, NULL, (msg))
-#define yyerror1(loc, msg) parser_yyerror(p, (loc), (msg))
-#define yyerror(yylloc, p, msg) parser_yyerror(p, yylloc, msg)
-#define token_flush(ptr) ((ptr)->lex.ptok = (ptr)->lex.pcur)
-
+#define STR_NEW(p,n) rb_enc_str_new((p),(n),current_enc)
+#define STR_NEW0() rb_enc_str_new(0,0,current_enc)
+#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),current_enc)
+#define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),current_enc)
+#define TOK_INTERN() intern_cstr(tok(), toklen(), current_enc)
+
+static int parser_yyerror(struct parser_params*, const char*);
+#define yyerror(msg) parser_yyerror(parser, (msg))
+
+#define lex_strterm		(parser->lex.strterm)
+#define lex_state		(parser->lex.state)
+#define cond_stack		(parser->cond_stack)
+#define cmdarg_stack		(parser->cmdarg_stack)
+#define paren_nest		(parser->lex.paren_nest)
+#define lpar_beg		(parser->lex.lpar_beg)
+#define brace_nest		(parser->lex.brace_nest)
+#define in_single		(parser->in_single)
+#define in_def			(parser->in_def)
+#define in_main 		(parser->in_main)
+#define in_defined		(parser->in_defined)
+#define tokenbuf		(parser->tokenbuf)
+#define tokidx			(parser->tokidx)
+#define toksiz			(parser->toksiz)
+#define tokline 		(parser->tokline)
+#define lex_input		(parser->lex.input)
+#define lex_lastline		(parser->lex.lastline)
+#define lex_nextline		(parser->lex.nextline)
+#define lex_pbeg		(parser->lex.pbeg)
+#define lex_p			(parser->lex.pcur)
+#define lex_pend		(parser->lex.pend)
+#define heredoc_end		(parser->heredoc_end)
+#define heredoc_indent		(parser->heredoc_indent)
+#define heredoc_line_indent	(parser->heredoc_line_indent)
+#define command_start		(parser->command_start)
+#define deferred_nodes		(parser->deferred_nodes)
+#define lex_gets_ptr		(parser->lex.gets_ptr)
+#define lex_gets		(parser->lex.gets)
+#define lvtbl			(parser->lvtbl)
+#define ruby__end__seen 	(parser->ruby__end__seen)
+#define ruby_sourceline 	(parser->ruby_sourceline)
+#define ruby_sourcefile 	(parser->ruby_sourcefile)
+#define ruby_sourcefile_string	(parser->ruby_sourcefile_string)
+#define current_enc		(parser->enc)
+#define current_arg		(parser->cur_arg)
+#define yydebug 		(parser->yydebug)
 #ifdef RIPPER
 #define compile_for_eval	(0)
 #else
-#define compile_for_eval	(p->base_block != 0 && !p->in_main)
+#define compile_for_eval	(parser->base_block != 0 && !in_main)
+#define ruby_eval_tree		(parser->eval_tree)
+#define ruby_eval_tree_begin	(parser->eval_tree_begin)
+#define ruby_debug_lines	(parser->debug_lines)
+#define ruby_coverage		(parser->coverage)
 #endif
 
-#define token_column		((int)(p->lex.ptok - p->lex.pbeg))
-
-#define CALL_Q_P(q) ((q) == TOKEN2VAL(tANDDOT))
+#define CALL_Q_P(q) ((q) == tANDDOT)
 #define NODE_CALL_Q(q) (CALL_Q_P(q) ? NODE_QCALL : NODE_CALL)
-#define NEW_QCALL(q,r,m,a,loc) NEW_NODE(NODE_CALL_Q(q),r,m,a,loc)
+#define NEW_QCALL(q,r,m,a) NEW_NODE(NODE_CALL_Q(q),r,m,a)
 
-#define lambda_beginning_p() (p->lex.lpar_beg == p->lex.paren_nest)
-
-static enum yytokentype yylex(YYSTYPE*, YYLTYPE*, struct parser_params*);
+static int yylex(YYSTYPE*, struct parser_params*);
 
 #ifndef RIPPER
-static inline void
-rb_discard_node(struct parser_params *p, NODE *n)
-{
-    rb_ast_delete_node(p->ast, n);
-}
-#endif
-
-static inline VALUE
-add_mark_object(struct parser_params *p, VALUE obj)
-{
-    if (!SPECIAL_CONST_P(obj)
-#ifdef RIPPER
-	&& !RB_TYPE_P(obj, T_NODE) /* Ripper jumbles NODE objects and other objects... */
-#endif
-    ) {
-	rb_ast_add_mark_object(p->ast, obj);
-    }
-    return obj;
-}
-
-static NODE* node_newnode(struct parser_params *, enum node_type, VALUE, VALUE, VALUE, const rb_code_location_t*);
-#define rb_node_newnode(type, a1, a2, a3, loc) node_newnode(p, (type), (a1), (a2), (a3), (loc))
-
-static NODE *nd_set_loc(NODE *nd, const YYLTYPE *loc);
-
-static int
-parser_get_node_id(struct parser_params *p)
-{
-    int node_id = p->node_id;
-    p->node_id++;
-    return node_id;
-}
-
-#ifndef RIPPER
-static inline void
-set_line_body(NODE *body, int line)
-{
-    if (!body) return;
-    switch (nd_type(body)) {
-      case NODE_RESCUE:
-      case NODE_ENSURE:
-	nd_set_line(body, line);
-    }
-}
-
 #define yyparse ruby_yyparse
 
-static NODE* cond(struct parser_params *p, NODE *node, const YYLTYPE *loc);
-static NODE* method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc);
-#define new_nil(loc) NEW_NIL(loc)
-static NODE *new_if(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_unless(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*);
-static NODE *logop(struct parser_params*,ID,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*);
+static NODE* node_newnode(struct parser_params *, enum node_type, VALUE, VALUE, VALUE);
+#define rb_node_newnode(type, a1, a2, a3) node_newnode(parser, (type), (a1), (a2), (a3))
+
+static NODE *cond_gen(struct parser_params*,NODE*);
+#define cond(node) cond_gen(parser, (node))
+static NODE *new_if_gen(struct parser_params*,NODE*,NODE*,NODE*);
+#define new_if(cc,left,right) new_if_gen(parser, (cc), (left), (right))
+#define new_unless(cc,left,right) new_if_gen(parser, (cc), (right), (left))
+static NODE *logop_gen(struct parser_params*,enum node_type,NODE*,NODE*);
+#define logop(type,node1,node2) logop_gen(parser, (type), (node1), (node2))
 
 static NODE *newline_node(NODE*);
 static void fixpos(NODE*,NODE*);
 
 static int value_expr_gen(struct parser_params*,NODE*);
-static void void_expr(struct parser_params*,NODE*);
+static void void_expr_gen(struct parser_params*,NODE*);
 static NODE *remove_begin(NODE*);
 static NODE *remove_begin_all(NODE*);
-#define value_expr(node) value_expr_gen(p, (node) = remove_begin(node))
-static NODE *void_stmts(struct parser_params*,NODE*);
-static void reduce_nodes(struct parser_params*,NODE**);
-static void block_dup_check(struct parser_params*,NODE*,NODE*);
-
-static NODE *block_append(struct parser_params*,NODE*,NODE*);
-static NODE *list_append(struct parser_params*,NODE*,NODE*);
+#define value_expr(node) value_expr_gen(parser, (node) = remove_begin(node))
+#define void_expr0(node) void_expr_gen(parser, (node))
+#define void_expr(node) void_expr0((node) = remove_begin(node))
+static void void_stmts_gen(struct parser_params*,NODE*);
+#define void_stmts(node) void_stmts_gen(parser, (node))
+static void reduce_nodes_gen(struct parser_params*,NODE**);
+#define reduce_nodes(n) reduce_nodes_gen(parser,(n))
+static void block_dup_check_gen(struct parser_params*,NODE*,NODE*);
+#define block_dup_check(n1,n2) block_dup_check_gen(parser,(n1),(n2))
+
+static NODE *block_append_gen(struct parser_params*,NODE*,NODE*);
+#define block_append(h,t) block_append_gen(parser,(h),(t))
+static NODE *list_append_gen(struct parser_params*,NODE*,NODE*);
+#define list_append(l,i) list_append_gen(parser,(l),(i))
 static NODE *list_concat(NODE*,NODE*);
-static NODE *arg_append(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
-static NODE *last_arg_append(struct parser_params *p, NODE *args, NODE *last_arg, const YYLTYPE *loc);
-static NODE *rest_arg_append(struct parser_params *p, NODE *args, NODE *rest_arg, const YYLTYPE *loc);
-static NODE *literal_concat(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_evstr(struct parser_params*,NODE*,const YYLTYPE*);
-static NODE *evstr2dstr(struct parser_params*,NODE*);
+static NODE *arg_append_gen(struct parser_params*,NODE*,NODE*);
+#define arg_append(h,t) arg_append_gen(parser,(h),(t))
+static NODE *arg_concat_gen(struct parser_params*,NODE*,NODE*);
+#define arg_concat(h,t) arg_concat_gen(parser,(h),(t))
+static NODE *literal_concat_gen(struct parser_params*,NODE*,NODE*);
+#define literal_concat(h,t) literal_concat_gen(parser,(h),(t))
+static int literal_concat0(struct parser_params *, VALUE, VALUE);
+static NODE *new_evstr_gen(struct parser_params*,NODE*);
+#define new_evstr(n) new_evstr_gen(parser,(n))
+static NODE *evstr2dstr_gen(struct parser_params*,NODE*);
+#define evstr2dstr(n) evstr2dstr_gen(parser,(n))
 static NODE *splat_array(NODE*);
 
-static NODE *call_bin_op(struct parser_params*,NODE*,ID,NODE*,const YYLTYPE*,const YYLTYPE*);
-static NODE *call_uni_op(struct parser_params*,NODE*,ID,const YYLTYPE*,const YYLTYPE*);
-static NODE *new_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, const YYLTYPE *op_loc, const YYLTYPE *loc);
-static NODE *new_command_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, NODE *block, const YYLTYPE *op_loc, const YYLTYPE *loc);
-static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YYLTYPE *loc) {b->nd_iter = m; b->nd_loc = *loc; return b;}
+static NODE *call_bin_op_gen(struct parser_params*,NODE*,ID,NODE*);
+#define call_bin_op(recv,id,arg1) call_bin_op_gen(parser, (recv),(id),(arg1))
+static NODE *call_uni_op_gen(struct parser_params*,NODE*,ID);
+#define call_uni_op(recv,id) call_uni_op_gen(parser, (recv),(id))
 
-static NODE *new_args(struct parser_params*,NODE*,NODE*,ID,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_args_tail(struct parser_params*,NODE*,ID,ID,const YYLTYPE*);
-static NODE *new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc);
+static NODE *new_args_gen(struct parser_params*,NODE*,NODE*,ID,NODE*,NODE*);
+#define new_args(f,o,r,p,t) new_args_gen(parser, (f),(o),(r),(p),(t))
+static NODE *new_args_tail_gen(struct parser_params*,NODE*,ID,ID);
+#define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b))
+#define new_kw_arg(k) ((k) ? NEW_KW_ARG(0, (k)) : 0)
 
-static VALUE negate_lit(struct parser_params*, VALUE);
-static NODE *ret_args(struct parser_params*,NODE*);
+static VALUE negate_lit(VALUE);
+static NODE *ret_args_gen(struct parser_params*,NODE*);
+#define ret_args(node) ret_args_gen(parser, (node))
 static NODE *arg_blk_pass(NODE*,NODE*);
-static NODE *new_yield(struct parser_params*,NODE*,const YYLTYPE*);
-static NODE *dsym_node(struct parser_params*,NODE*,const YYLTYPE*);
+static NODE *new_yield_gen(struct parser_params*,NODE*);
+#define new_yield(node) new_yield_gen(parser, (node))
+static NODE *dsym_node_gen(struct parser_params*,NODE*);
+#define dsym_node(node) dsym_node_gen(parser, (node))
+
+static NODE *gettable_gen(struct parser_params*,ID);
+#define gettable(id) gettable_gen(parser,(id))
+static NODE *assignable_gen(struct parser_params*,ID,NODE*);
+#define assignable(id,node) assignable_gen(parser, (id), (node))
+
+static NODE *aryset_gen(struct parser_params*,NODE*,NODE*);
+#define aryset(node1,node2) aryset_gen(parser, (node1), (node2))
+static NODE *attrset_gen(struct parser_params*,NODE*,ID,ID);
+#define attrset(node,q,id) attrset_gen(parser, (node), (q), (id))
+
+static void rb_backref_error_gen(struct parser_params*,NODE*);
+#define rb_backref_error(n) rb_backref_error_gen(parser,(n))
+static NODE *node_assign_gen(struct parser_params*,NODE*,NODE*);
+#define node_assign(node1, node2) node_assign_gen(parser, (node1), (node2))
+
+static NODE *new_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs);
+static NODE *new_attr_op_assign_gen(struct parser_params *parser, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs);
+#define new_attr_op_assign(lhs, type, attr, op, rhs) new_attr_op_assign_gen(parser, (lhs), (type), (attr), (op), (rhs))
+static NODE *new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs);
+#define new_const_op_assign(lhs, op, rhs) new_const_op_assign_gen(parser, (lhs), (op), (rhs))
+
+#define const_path_field(w, n) NEW_COLON2(w, n)
+#define top_const_field(n) NEW_COLON3(n)
+static NODE *const_decl_gen(struct parser_params *parser, NODE* path);
+#define const_decl(path) const_decl_gen(parser, path)
+
+#define var_field(n) (n)
+#define backref_assign_error(n, a) (rb_backref_error(n), NEW_BEGIN(0))
 
-static NODE *gettable(struct parser_params*,ID,const YYLTYPE*);
-static NODE *assignable(struct parser_params*,ID,NODE*,const YYLTYPE*);
-
-static NODE *aryset(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
-static NODE *attrset(struct parser_params*,NODE*,ID,ID,const YYLTYPE*);
-
-static void rb_backref_error(struct parser_params*,NODE*);
-static NODE *node_assign(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
-
-static NODE *new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc);
-static NODE *new_ary_op_assign(struct parser_params *p, NODE *ary, NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc);
-static NODE *new_attr_op_assign(struct parser_params *p, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc);
-static NODE *new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc);
-static NODE *new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc);
-
-static NODE *const_decl(struct parser_params *p, NODE* path, const YYLTYPE *loc);
-
-static NODE *opt_arg_append(NODE*, NODE*);
 static NODE *kwd_append(NODE*, NODE*);
 
-static NODE *new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc);
+static NODE *new_hash_gen(struct parser_params *parser, NODE *hash);
+#define new_hash(hash) new_hash_gen(parser, (hash))
 
-static NODE *new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc);
+#define new_defined(expr) NEW_DEFINED(remove_begin_all(expr))
 
-static NODE *new_regexp(struct parser_params *, NODE *, int, const YYLTYPE *);
+static NODE *new_regexp_gen(struct parser_params *, NODE *, int);
+#define new_regexp(node, opt) new_regexp_gen(parser, node, opt)
 
-#define make_array(ary, loc) ((ary) ? (nd_set_loc(ary, loc), ary) : NEW_ZARRAY(loc))
+static NODE *new_xstring_gen(struct parser_params *, NODE *);
+#define new_xstring(node) new_xstring_gen(parser, node)
+#define new_string1(str) (str)
 
-static NODE *new_xstring(struct parser_params *, NODE *, const YYLTYPE *loc);
+static NODE *match_op_gen(struct parser_params*,NODE*,NODE*);
+#define match_op(node1,node2) match_op_gen(parser, (node1), (node2))
 
-static NODE *symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol);
+static ID  *local_tbl_gen(struct parser_params*);
+#define local_tbl() local_tbl_gen(parser)
 
-static NODE *match_op(struct parser_params*,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*);
+static void fixup_nodes(NODE **);
 
-static ID  *local_tbl(struct parser_params*);
+static VALUE reg_compile_gen(struct parser_params*, VALUE, int);
+#define reg_compile(str,options) reg_compile_gen(parser, (str), (options))
+static void reg_fragment_setenc_gen(struct parser_params*, VALUE, int);
+#define reg_fragment_setenc(str,options) reg_fragment_setenc_gen(parser, (str), (options))
+static int reg_fragment_check_gen(struct parser_params*, VALUE, int);
+#define reg_fragment_check(str,options) reg_fragment_check_gen(parser, (str), (options))
+static NODE *reg_named_capture_assign_gen(struct parser_params* parser, VALUE regexp);
+#define reg_named_capture_assign(regexp) reg_named_capture_assign_gen(parser,(regexp))
 
-static VALUE reg_compile(struct parser_params*, VALUE, int);
-static void reg_fragment_setenc(struct parser_params*, VALUE, int);
-static int reg_fragment_check(struct parser_params*, VALUE, int);
-static NODE *reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc);
+static NODE *parser_heredoc_dedent(struct parser_params*,NODE*);
+# define heredoc_dedent(str) parser_heredoc_dedent(parser, (str))
 
-static int literal_concat0(struct parser_params *p, VALUE head, VALUE tail);
-static NODE *heredoc_dedent(struct parser_params*,NODE*);
 #define get_id(id) (id)
 #define get_value(val) (val)
 #else  /* RIPPER */
 #define NODE_RIPPER NODE_CDECL
 
 static inline VALUE
-ripper_new_yylval(struct parser_params *p, ID a, VALUE b, VALUE c)
+ripper_new_yylval(ID a, VALUE b, VALUE c)
 {
-    add_mark_object(p, b);
-    add_mark_object(p, c);
-    return (VALUE)NEW_CDECL(a, b, c, &NULL_LOC);
+    return (VALUE)NEW_CDECL(a, b, c);
 }
 
 static inline int
@@ -475,78 +547,86 @@ ripper_is_node_yylval(VALUE n)
 
 #define value_expr(node) ((void)(node))
 #define remove_begin(node) (node)
-#define void_stmts(p,x) (x)
 #define rb_dvar_defined(id, base) 0
 #define rb_local_defined(id, base) 0
 static ID ripper_get_id(VALUE);
 #define get_id(id) ripper_get_id(id)
 static VALUE ripper_get_value(VALUE);
 #define get_value(val) ripper_get_value(val)
-static VALUE assignable(struct parser_params*,VALUE);
-static int id_is_var(struct parser_params *p, ID id);
+static VALUE assignable_gen(struct parser_params*,VALUE);
+#define assignable(lhs,node) assignable_gen(parser, (lhs))
+static int id_is_var_gen(struct parser_params *parser, ID id);
+#define id_is_var(id) id_is_var_gen(parser, (id))
+
+#define node_assign(node1, node2) dispatch2(assign, (node1), (node2))
 
-#define method_cond(p,node,loc) (node)
-#define call_bin_op(p, recv,id,arg1,op_loc,loc) dispatch3(binary, (recv), STATIC_ID2SYM(id), (arg1))
-#define match_op(p,node1,node2,op_loc,loc) call_bin_op(0, (node1), idEqTilde, (node2), op_loc, loc)
-#define call_uni_op(p, recv,id,op_loc,loc) dispatch2(unary, STATIC_ID2SYM(id), (recv))
-#define logop(p,id,node1,node2,op_loc,loc) call_bin_op(0, (node1), (id), (node2), op_loc, loc)
+static VALUE new_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE op, VALUE rhs);
+static VALUE new_attr_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs);
+#define new_attr_op_assign(lhs, type, attr, op, rhs) new_attr_op_assign_gen(parser, (lhs), (type), (attr), (op), (rhs))
+#define new_const_op_assign(lhs, op, rhs) new_op_assign(lhs, op, rhs)
 
-#define new_nil(loc) Qnil
+static VALUE new_regexp_gen(struct parser_params *, VALUE, VALUE);
+#define new_regexp(node, opt) new_regexp_gen(parser, node, opt)
 
-static VALUE new_regexp(struct parser_params *, VALUE, VALUE, const YYLTYPE *);
+static VALUE new_xstring_gen(struct parser_params *, VALUE);
+#define new_xstring(str) new_xstring_gen(parser, str)
+#define new_string1(str) dispatch1(string_literal, str)
 
-static VALUE const_decl(struct parser_params *p, VALUE path);
+#define const_path_field(w, n) dispatch2(const_path_field, (w), (n))
+#define top_const_field(n) dispatch1(top_const_field, (n))
+static VALUE const_decl_gen(struct parser_params *parser, VALUE path);
+#define const_decl(path) const_decl_gen(parser, path)
 
-static VALUE var_field(struct parser_params *p, VALUE a);
-static VALUE assign_error(struct parser_params *p, VALUE a);
+#define var_field(n) dispatch1(var_field, (n))
+static VALUE assign_error_gen(struct parser_params *parser, VALUE a);
+#define assign_error(a) assign_error_gen(parser, (a))
+#define backref_assign_error(n, a) assign_error(a)
 
 static VALUE parser_reg_compile(struct parser_params*, VALUE, int, VALUE *);
 
 #endif /* !RIPPER */
 
-/* forward declaration */
-typedef struct rb_strterm_heredoc_struct rb_strterm_heredoc_t;
-
-RUBY_SYMBOL_EXPORT_BEGIN
-VALUE rb_parser_reg_compile(struct parser_params* p, VALUE str, int options);
-int rb_reg_fragment_setenc(struct parser_params*, VALUE, int);
-enum lex_state_e rb_parser_trace_lex_state(struct parser_params *, enum lex_state_e, enum lex_state_e, int);
-VALUE rb_parser_lex_state_name(enum lex_state_e state);
-void rb_parser_show_bitstack(struct parser_params *, stack_type, const char *, int);
-PRINTF_ARGS(void rb_parser_fatal(struct parser_params *p, const char *fmt, ...), 2, 3);
-void rb_parser_set_location_from_strterm_heredoc(struct parser_params *p, rb_strterm_heredoc_t *here, YYLTYPE *yylloc);
-void rb_parser_set_location_of_none(struct parser_params *p, YYLTYPE *yylloc);
-void rb_parser_set_location(struct parser_params *p, YYLTYPE *yylloc);
-RUBY_SYMBOL_EXPORT_END
-
-static void parser_token_value_print(struct parser_params *p, enum yytokentype type, const YYSTYPE *valp);
-static ID formal_argument(struct parser_params*, ID);
-static ID shadowing_lvar(struct parser_params*,ID);
-static void new_bv(struct parser_params*,ID);
-
-static void local_push(struct parser_params*,int);
-static void local_pop(struct parser_params*);
-static void local_var(struct parser_params*, ID);
-static void arg_var(struct parser_params*, ID);
-static int  local_id(struct parser_params *p, ID id);
-static int  local_id_ref(struct parser_params*, ID, ID **);
-static ID   internal_id(struct parser_params*);
-
-static const struct vtable *dyna_push(struct parser_params *);
-static void dyna_pop(struct parser_params*, const struct vtable *);
-static int dyna_in_block(struct parser_params*);
-#define dyna_var(p, id) local_var(p, id)
-static int dvar_defined(struct parser_params*, ID);
-static int dvar_defined_ref(struct parser_params*, ID, ID**);
-static int dvar_curr(struct parser_params*,ID);
-
-static int lvar_defined(struct parser_params*, ID);
-
-#ifdef RIPPER
-# define METHOD_NOT idNOT
-#else
-# define METHOD_NOT '!'
-#endif
+#define new_op_assign(lhs, op, rhs) new_op_assign_gen(parser, (lhs), (op), (rhs))
+
+RUBY_FUNC_EXPORTED VALUE rb_parser_reg_compile(struct parser_params* parser, VALUE str, int options);
+RUBY_FUNC_EXPORTED int rb_reg_fragment_setenc(struct parser_params*, VALUE, int);
+
+
+static ID formal_argument_gen(struct parser_params*, ID);
+#define formal_argument(id) formal_argument_gen(parser, (id))
+static ID shadowing_lvar_gen(struct parser_params*,ID);
+#define shadowing_lvar(name) shadowing_lvar_gen(parser, (name))
+static void new_bv_gen(struct parser_params*,ID);
+#define new_bv(id) new_bv_gen(parser, (id))
+
+static void local_push_gen(struct parser_params*,int);
+#define local_push(top) local_push_gen(parser,(top))
+static void local_pop_gen(struct parser_params*);
+#define local_pop() local_pop_gen(parser)
+static void local_var_gen(struct parser_params*, ID);
+#define local_var(id) local_var_gen(parser, (id))
+static void arg_var_gen(struct parser_params*, ID);
+#define arg_var(id) arg_var_gen(parser, (id))
+static int  local_id_gen(struct parser_params*, ID);
+#define local_id(id) local_id_gen(parser, (id))
+static ID   internal_id_gen(struct parser_params*);
+#define internal_id() internal_id_gen(parser)
+
+static const struct vtable *dyna_push_gen(struct parser_params *);
+#define dyna_push() dyna_push_gen(parser)
+static void dyna_pop_gen(struct parser_params*, const struct vtable *);
+#define dyna_pop(node) dyna_pop_gen(parser, (node))
+static int dyna_in_block_gen(struct parser_params*);
+#define dyna_in_block() dyna_in_block_gen(parser)
+#define dyna_var(id) local_var(id)
+static int dvar_defined_gen(struct parser_params*,ID,int);
+#define dvar_defined(id) dvar_defined_gen(parser, (id), 0)
+#define dvar_defined_get(id) dvar_defined_gen(parser, (id), 1)
+static int dvar_curr_gen(struct parser_params*,ID);
+#define dvar_curr(id) dvar_curr_gen(parser, (id))
+
+static int lvar_defined_gen(struct parser_params*, ID);
+#define lvar_defined(id) lvar_defined_gen(parser, (id))
 
 #define RE_OPTION_ONCE (1<<16)
 #define RE_OPTION_ENCODING_SHIFT 8
@@ -556,67 +636,17 @@ static int lvar_defined(struct parser_params*, ID);
 #define RE_OPTION_MASK  0xff
 #define RE_OPTION_ARG_ENCODING_NONE 32
 
-/* structs for managing terminator of string literal and heredocment */
-typedef struct rb_strterm_literal_struct {
-    union {
-	VALUE dummy;
-	long nest;
-    } u0;
-    union {
-	VALUE dummy;
-	long func;	    /* STR_FUNC_* (e.g., STR_FUNC_ESCAPE and STR_FUNC_EXPAND) */
-    } u1;
-    union {
-	VALUE dummy;
-	long paren;	    /* '(' of `%q(...)` */
-    } u2;
-    union {
-	VALUE dummy;
-	long term;	    /* ')' of `%q(...)` */
-    } u3;
-} rb_strterm_literal_t;
-
-struct rb_strterm_heredoc_struct {
-    SIGNED_VALUE sourceline; /* lineno of the line that contains `<<"END"` */
-    VALUE term;		/* `"END"` of `<<"END"` */
-    VALUE lastline;	/* the string of line that contains `<<"END"` */
-    union {
-	VALUE dummy;
-	long lastidx;	/* the column of `<<"END"` */
-    } u3;
-};
-
-#define STRTERM_HEREDOC IMEMO_FL_USER0
-
-struct rb_strterm_struct {
-    VALUE flags;
-    union {
-	rb_strterm_literal_t literal;
-	rb_strterm_heredoc_t heredoc;
-    } u;
-};
-
-#ifndef RIPPER
-void
-rb_strterm_mark(VALUE obj)
-{
-    rb_strterm_t *strterm = (rb_strterm_t*)obj;
-    if (RBASIC(obj)->flags & STRTERM_HEREDOC) {
-	rb_strterm_heredoc_t *heredoc = &strterm->u.heredoc;
-	rb_gc_mark(heredoc->term);
-	rb_gc_mark(heredoc->lastline);
-    }
-}
+#define NODE_STRTERM NODE_ZARRAY	/* nothing to gc */
+#define NODE_HEREDOC NODE_ARRAY 	/* 1, 3 to gc */
+#define SIGN_EXTEND(x,n) (((1<<(n)-1)^((x)&~(~0<<(n))))-(1<<(n)-1))
+#define nd_func u1.id
+#if SIZEOF_SHORT == 2
+#define nd_term(node) ((signed short)(node)->u2.id)
+#else
+#define nd_term(node) SIGN_EXTEND((node)->u2.id, CHAR_BIT*2)
 #endif
-
-#define TOKEN2ID(tok) ( \
-    tTOKEN_LOCAL_BEGIN<(tok)&&(tok)<tTOKEN_LOCAL_END ? TOKEN2LOCALID(tok) : \
-    tTOKEN_INSTANCE_BEGIN<(tok)&&(tok)<tTOKEN_INSTANCE_END ? TOKEN2INSTANCEID(tok) : \
-    tTOKEN_GLOBAL_BEGIN<(tok)&&(tok)<tTOKEN_GLOBAL_END ? TOKEN2GLOBALID(tok) : \
-    tTOKEN_CONST_BEGIN<(tok)&&(tok)<tTOKEN_CONST_END ? TOKEN2CONSTID(tok) : \
-    tTOKEN_CLASS_BEGIN<(tok)&&(tok)<tTOKEN_CLASS_END ? TOKEN2CLASSID(tok) : \
-    tTOKEN_ATTRSET_BEGIN<(tok)&&(tok)<tTOKEN_ATTRSET_END ? TOKEN2ATTRSETID(tok) : \
-    ((tok) / ((tok)<tPRESERVED_ID_END && ((tok)>=128 || rb_ispunct(tok)))))
+#define nd_paren(node) (char)((node)->u2.id >> CHAR_BIT*2)
+#define nd_nest u3.cnt
 
 /****** Ripper *******/
 
@@ -635,62 +665,86 @@ static VALUE ripper_dispatch3(struct parser_params*,ID,VALUE,VALUE,VALUE);
 static VALUE ripper_dispatch4(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE);
 static VALUE ripper_dispatch5(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,VALUE);
 static VALUE ripper_dispatch7(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE);
-static void ripper_error(struct parser_params *p);
+static void ripper_error_gen(struct parser_params *parser);
+#define ripper_error() ripper_error_gen(parser)
 
-#define dispatch0(n)            ripper_dispatch0(p, TOKEN_PASTE(ripper_id_, n))
-#define dispatch1(n,a)          ripper_dispatch1(p, TOKEN_PASTE(ripper_id_, n), (a))
-#define dispatch2(n,a,b)        ripper_dispatch2(p, TOKEN_PASTE(ripper_id_, n), (a), (b))
-#define dispatch3(n,a,b,c)      ripper_dispatch3(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c))
-#define dispatch4(n,a,b,c,d)    ripper_dispatch4(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d))
-#define dispatch5(n,a,b,c,d,e)  ripper_dispatch5(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e))
-#define dispatch7(n,a,b,c,d,e,f,g) ripper_dispatch7(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e), (f), (g))
+#define dispatch0(n)            ripper_dispatch0(parser, TOKEN_PASTE(ripper_id_, n))
+#define dispatch1(n,a)          ripper_dispatch1(parser, TOKEN_PASTE(ripper_id_, n), (a))
+#define dispatch2(n,a,b)        ripper_dispatch2(parser, TOKEN_PASTE(ripper_id_, n), (a), (b))
+#define dispatch3(n,a,b,c)      ripper_dispatch3(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c))
+#define dispatch4(n,a,b,c,d)    ripper_dispatch4(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d))
+#define dispatch5(n,a,b,c,d,e)  ripper_dispatch5(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e))
+#define dispatch7(n,a,b,c,d,e,f,g) ripper_dispatch7(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e), (f), (g))
 
 #define yyparse ripper_yyparse
 
-#define ID2VAL(id) STATIC_ID2SYM(id)
-#define TOKEN2VAL(t) ID2VAL(TOKEN2ID(t))
-#define KWD2EID(t, v) ripper_new_yylval(p, keyword_##t, get_value(v), 0)
+#define ripper_intern(s) ID2SYM(rb_intern(s))
+static VALUE ripper_id2sym(ID);
+#ifdef __GNUC__
+#define ripper_id2sym(id) (rb_ispunct((int)(id)) ? \
+			   ID2SYM(id) : ripper_id2sym(id))
+#endif
+
+#define arg_new() dispatch0(args_new)
+#define arg_add(l,a) dispatch2(args_add, (l), (a))
+#define arg_add_star(l,a) dispatch2(args_add_star, (l), (a))
+#define arg_add_block(l,b) dispatch2(args_add_block, (l), (b))
+#define arg_add_optblock(l,b) ((b)==Qundef? (l) : dispatch2(args_add_block, (l), (b)))
+#define bare_assoc(v) dispatch1(bare_assoc_hash, (v))
+#define arg_add_assocs(l,b) arg_add((l), bare_assoc(b))
+
+#define args2mrhs(a) dispatch1(mrhs_new_from_args, (a))
+#define mrhs_new() dispatch0(mrhs_new)
+#define mrhs_add(l,a) dispatch2(mrhs_add, (l), (a))
+#define mrhs_add_star(l,a) dispatch2(mrhs_add_star, (l), (a))
+
+#define mlhs_new() dispatch0(mlhs_new)
+#define mlhs_add(l,a) dispatch2(mlhs_add, (l), (a))
+#define mlhs_add_star(l,a) dispatch2(mlhs_add_star, (l), (a))
 
 #define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \
         dispatch7(params, (pars), (opts), (rest), (pars2), (kws), (kwrest), (blk))
 
+#define blockvar_new(p,v) dispatch2(block_var, (p), (v))
+#define blockvar_add_star(l,a) dispatch2(block_var_add_star, (l), (a))
+#define blockvar_add_block(l,a) dispatch2(block_var_add_block, (l), (a))
+
+#define method_optarg(m,a) ((a)==Qundef ? (m) : dispatch2(method_add_arg,(m),(a)))
+#define method_arg(m,a) dispatch2(method_add_arg,(m),(a))
+#define method_add_block(m,b) dispatch2(method_add_block, (m), (b))
+
 #define escape_Qundef(x) ((x)==Qundef ? Qnil : (x))
 
 static inline VALUE
-new_args(struct parser_params *p, VALUE pre_args, VALUE opt_args, VALUE rest_arg, VALUE post_args, VALUE tail, YYLTYPE *loc)
+new_args_gen(struct parser_params *parser, VALUE f, VALUE o, VALUE r, VALUE p, VALUE tail)
 {
     NODE *t = (NODE *)tail;
-    VALUE kw_args = t->u1.value, kw_rest_arg = t->u2.value, block = t->u3.value;
-    return params_new(pre_args, opt_args, rest_arg, post_args, kw_args, kw_rest_arg, escape_Qundef(block));
+    VALUE k = t->u1.value, kr = t->u2.value, b = t->u3.value;
+    return params_new(f, o, r, p, k, kr, escape_Qundef(b));
 }
+#define new_args(f,o,r,p,t) new_args_gen(parser, (f),(o),(r),(p),(t))
 
 static inline VALUE
-new_args_tail(struct parser_params *p, VALUE kw_args, VALUE kw_rest_arg, VALUE block, YYLTYPE *loc)
+new_args_tail_gen(struct parser_params *parser, VALUE k, VALUE kr, VALUE b)
 {
-    NODE *t = rb_node_newnode(NODE_ARGS_AUX, kw_args, kw_rest_arg, block, &NULL_LOC);
-    add_mark_object(p, kw_args);
-    add_mark_object(p, kw_rest_arg);
-    add_mark_object(p, block);
-    return (VALUE)t;
+    return (VALUE)MEMO_NEW(k, kr, b);
 }
+#define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b))
 
-#define new_defined(p,expr,loc) dispatch1(defined, (expr))
+#define new_defined(expr) dispatch1(defined, (expr))
 
-static VALUE heredoc_dedent(struct parser_params*,VALUE);
+static VALUE parser_heredoc_dedent(struct parser_params*,VALUE);
+# define heredoc_dedent(str) parser_heredoc_dedent(parser, (str))
+
+#define FIXME 0
 
-#else
-#define ID2VAL(id) ((VALUE)(id))
-#define TOKEN2VAL(t) ID2VAL(t)
-#define KWD2EID(t, v) keyword_##t
 #endif /* RIPPER */
 
 #ifndef RIPPER
 # define Qnone 0
-# define Qnull 0
 # define ifndef_ripper(x) (x)
 #else
 # define Qnone Qnil
-# define Qnull Qundef
 # define ifndef_ripper(x)
 #endif
 
@@ -715,56 +769,52 @@ static VALUE heredoc_dedent(struct parser_params*,VALUE);
 # define rb_warning3L(l,fmt,a,b,c)   WARNING_CALL(WARNING_ARGS_L(l, fmt, 4), (a), (b), (c))
 # define rb_warning4L(l,fmt,a,b,c,d) WARNING_CALL(WARNING_ARGS_L(l, fmt, 5), (a), (b), (c), (d))
 #ifdef RIPPER
-static ID id_warn, id_warning, id_gets;
-# define WARN_S_L(s,l) STR_NEW(s,l)
+static ID id_warn, id_warning;
 # define WARN_S(s) STR_NEW2(s)
 # define WARN_I(i) INT2NUM(i)
-# define WARN_ID(i) rb_id2str(i)
 # define PRIsWARN "s"
-# define WARN_ARGS(fmt,n) p->value, id_warn, n, rb_usascii_str_new_lit(fmt)
+# define WARN_ARGS(fmt,n) parser->value, id_warn, n, rb_usascii_str_new_lit(fmt)
 # define WARN_ARGS_L(l,fmt,n) WARN_ARGS(fmt,n)
-# ifdef HAVE_VA_ARGS_MACRO
-# define WARN_CALL(...) rb_funcall(__VA_ARGS__)
-# else
 # define WARN_CALL rb_funcall
-# endif
-# define WARNING_ARGS(fmt,n) p->value, id_warning, n, rb_usascii_str_new_lit(fmt)
+# define WARNING_ARGS(fmt,n) parser->value, id_warning, n, rb_usascii_str_new_lit(fmt)
 # define WARNING_ARGS_L(l, fmt,n) WARNING_ARGS(fmt,n)
-# ifdef HAVE_VA_ARGS_MACRO
-# define WARNING_CALL(...) rb_funcall(__VA_ARGS__)
-# else
 # define WARNING_CALL rb_funcall
-# endif
-PRINTF_ARGS(static void ripper_compile_error(struct parser_params*, const char *fmt, ...), 2, 3);
+static void ripper_compile_error(struct parser_params*, const char *fmt, ...);
 # define compile_error ripper_compile_error
+# define PARSER_ARG parser,
 #else
-# define WARN_S_L(s,l) s
 # define WARN_S(s) s
 # define WARN_I(i) i
-# define WARN_ID(i) rb_id2name(i)
 # define PRIsWARN PRIsVALUE
-# define WARN_ARGS(fmt,n) WARN_ARGS_L(p->ruby_sourceline,fmt,n)
-# define WARN_ARGS_L(l,fmt,n) p->ruby_sourcefile, (l), (fmt)
+# define WARN_ARGS(fmt,n) WARN_ARGS_L(ruby_sourceline,fmt,n)
+# define WARN_ARGS_L(l,fmt,n) ruby_sourcefile, (l), (fmt)
 # define WARN_CALL rb_compile_warn
 # define WARNING_ARGS(fmt,n) WARN_ARGS(fmt,n)
 # define WARNING_ARGS_L(l,fmt,n) WARN_ARGS_L(l,fmt,n)
 # define WARNING_CALL rb_compile_warning
-PRINTF_ARGS(static void parser_compile_error(struct parser_params*, const char *fmt, ...), 2, 3);
+static void parser_compile_error(struct parser_params*, const char *fmt, ...);
 # define compile_error parser_compile_error
+# define PARSER_ARG parser,
+#endif
+
+/* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150,
+   for instance).  This is too low for Ruby to parse some files, such as
+   date/format.rb, therefore bump the value up to at least Bison's default. */
+#ifdef OLD_YACC
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
 #endif
 
-static void token_info_push(struct parser_params*, const char *token, const rb_code_location_t *loc);
-static void token_info_pop(struct parser_params*, const char *token, const rb_code_location_t *loc);
-static void token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc);
+static void token_info_push_gen(struct parser_params*, const char *token, size_t len);
+static void token_info_pop_gen(struct parser_params*, const char *token, size_t len);
+#define token_info_push(token) token_info_push_gen(parser, (token), rb_strlen_lit(token))
+#define token_info_pop(token) token_info_pop_gen(parser, (token), rb_strlen_lit(token))
 %}
 
 %pure-parser
-%lex-param {struct parser_params *p}
-%parse-param {struct parser_params *p}
-%initial-action
-{
-    RUBY_SET_YYLLOC_OF_NONE(@$);
-};
+%lex-param {struct parser_params *parser}
+%parse-param {struct parser_params *parser}
 
 %union {
     VALUE val;
@@ -772,59 +822,62 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
     ID id;
     int num;
     const struct vtable *vars;
-    struct rb_strterm_struct *strterm;
-}
-
-%token <id>
-        keyword_class        "class"
-        keyword_module       "module"
-        keyword_def          "def"
-        keyword_undef        "undef"
-        keyword_begin        "begin"
-        keyword_rescue       "rescue"
-        keyword_ensure       "ensure"
-        keyword_end          "end"
-        keyword_if           "if"
-        keyword_unless       "unless"
-        keyword_then         "then"
-        keyword_elsif        "elsif"
-        keyword_else         "else"
-        keyword_case         "case"
-        keyword_when         "when"
-        keyword_while        "while"
-        keyword_until        "until"
-        keyword_for          "for"
-        keyword_break        "break"
-        keyword_next         "next"
-        keyword_redo         "redo"
-        keyword_retry        "retry"
-        keyword_in           "in"
-        keyword_do           "do"
-        keyword_do_cond      "do (for condition)"
-        keyword_do_block     "do (for block)"
-        keyword_do_LAMBDA    "do (for lambda)"
-        keyword_return       "return"
-        keyword_yield        "yield"
-        keyword_super        "super"
-        keyword_self         "self"
-        keyword_nil          "nil"
-        keyword_true         "true"
-        keyword_false        "false"
-        keyword_and          "and"
-        keyword_or           "or"
-        keyword_not          "not"
-        modifier_if          "if (modifier)"
-        modifier_unless      "unless (modifier)"
-        modifier_while       "while (modifier)"
-        modifier_until       "until (modifier)"
-        modifier_rescue      "rescue (modifier)"
-        keyword_alias        "alias"
-        keyword_defined      "defined?"
-        keyword_BEGIN        "BEGIN"
-        keyword_END          "END"
-        keyword__LINE__      "__LINE__"
-        keyword__FILE__      "__FILE__"
-        keyword__ENCODING__  "__ENCODING__"
+}
+
+/*%%%*/
+%token
+/*%
+%token <val>
+%*/
+	keyword_class
+	keyword_module
+	keyword_def
+	keyword_undef
+	keyword_begin
+	keyword_rescue
+	keyword_ensure
+	keyword_end
+	keyword_if
+	keyword_unless
+	keyword_then
+	keyword_elsif
+	keyword_else
+	keyword_case
+	keyword_when
+	keyword_while
+	keyword_until
+	keyword_for
+	keyword_break
+	keyword_next
+	keyword_redo
+	keyword_retry
+	keyword_in
+	keyword_do
+	keyword_do_cond
+	keyword_do_block
+	keyword_do_LAMBDA
+	keyword_return
+	keyword_yield
+	keyword_super
+	keyword_self
+	keyword_nil
+	keyword_true
+	keyword_false
+	keyword_and
+	keyword_or
+	keyword_not
+	modifier_if
+	modifier_unless
+	modifier_while
+	modifier_until
+	modifier_rescue
+	keyword_alias
+	keyword_defined
+	keyword_BEGIN
+	keyword_END
+	keyword__LINE__
+	keyword__FILE__
+	keyword__ENCODING__
 
 %token <id>   tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL
 %token <node> tINTEGER tFLOAT tRATIONAL tIMAGINARY tSTRING_CONTENT tCHAR
@@ -835,9 +888,9 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
 %type <node> string_contents xstring_contents regexp_contents string_content
 %type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
 %type <node> literal numeric simple_numeric dsym cpath
-%type <node> top_compstmt top_stmts top_stmt begin_block
+%type <node> top_compstmt top_stmts top_stmt
 %type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
-%type <node> expr_value expr_value_do arg_value primary_value fcall rel_expr
+%type <node> expr_value arg_value primary_value fcall
 %type <node> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure
 %type <node> args call_args opt_call_args
 %type <node> paren_args opt_paren_args args_tail opt_args_tail block_args_tail opt_block_args_tail
@@ -850,21 +903,17 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
 %type <node> block_param opt_block_param block_param_def f_opt
 %type <node> f_kwarg f_kw f_block_kwarg f_block_kw
 %type <node> bv_decls opt_bv_decl bvar
-%type <node> lambda f_larglist lambda_body brace_body do_body
+%type <node> lambda f_larglist lambda_body
 %type <node> brace_block cmd_brace_block do_block lhs none fitem
 %type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
 %type <id>   fsym keyword_variable user_variable sym symbol operation operation2 operation3
 %type <id>   cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
-%type <id>   f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
+%type <id>   f_kwrest f_label f_arg_asgn call_op call_op2
+/*%%%*/
+/*%
+%type <val> program reswords then do dot_or_colon
+%*/
 %token END_OF_INPUT 0	"end-of-input"
-%token <id> '.'
-/* escaped chars, should be ignored otherwise */
-%token <id> '\\'	"backslash"
-%token tSP		"escaped space"
-%token <id> '\t' 	"escaped horizontal tab"
-%token <id> '\f'	"escaped form feed"
-%token <id> '\r'	"escaped carriage return"
-%token <id> '\13'	"escaped vertical tab"
 %token tUPLUS		RUBY_TOKEN(UPLUS)  "unary+"
 %token tUMINUS		RUBY_TOKEN(UMINUS) "unary-"
 %token tPOW		RUBY_TOKEN(POW)    "**"
@@ -884,8 +933,8 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
 %token tASET		RUBY_TOKEN(ASET)   "[]="
 %token tLSHFT		RUBY_TOKEN(LSHFT)  "<<"
 %token tRSHFT		RUBY_TOKEN(RSHFT)  ">>"
-%token <id> tANDDOT	RUBY_TOKEN(ANDDOT) "&."
-%token <id> tCOLON2	RUBY_TOKEN(COLON2) "::"
+%token tANDDOT		RUBY_TOKEN(ANDDOT) "&."
+%token tCOLON2		"::"
 %token tCOLON3		":: at EXPR_BEG"
 %token <id> tOP_ASGN	/* +=, -=  etc. */
 %token tASSOC		"=>"
@@ -935,56 +984,70 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
 %%
 program		:  {
 			SET_LEX_STATE(EXPR_BEG);
-			local_push(p, ifndef_ripper(1)+0);
+		    /*%%%*/
+			local_push(compile_for_eval || in_main);
+		    /*%
+			local_push(0);
+		    %*/
 		    }
 		  top_compstmt
 		    {
 		    /*%%%*/
 			if ($2 && !compile_for_eval) {
-			    NODE *node = $2;
 			    /* last expression should not be void */
-			    if (nd_type(node) == NODE_BLOCK) {
+			    if (nd_type($2) != NODE_BLOCK) void_expr($2);
+			    else {
+				NODE *node = $2;
 				while (node->nd_next) {
 				    node = node->nd_next;
 				}
-				node = node->nd_head;
+				void_expr(node->nd_head);
 			    }
-			    node = remove_begin(node);
-			    void_expr(p, node);
 			}
-			p->eval_tree = NEW_SCOPE(0, block_append(p, p->eval_tree, $2), &@$);
-		    /*% %*/
-		    /*% ripper[final]: program!($2) %*/
-			local_pop(p);
+			ruby_eval_tree = NEW_SCOPE(0, block_append(ruby_eval_tree, $2));
+		    /*%
+			$$ = $2;
+			parser->result = dispatch1(program, $$);
+		    %*/
+			local_pop();
 		    }
 		;
 
 top_compstmt	: top_stmts opt_terms
 		    {
-			$$ = void_stmts(p, $1);
+		    /*%%%*/
+			void_stmts($1);
+			fixup_nodes(&deferred_nodes);
+		    /*%
+		    %*/
+			$$ = $1;
 		    }
 		;
 
 top_stmts	: none
                     {
 		    /*%%%*/
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
+			$$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch2(stmts_add, dispatch0(stmts_new),
+						  dispatch0(void_stmt));
+		    %*/
 		    }
 		| top_stmt
 		    {
 		    /*%%%*/
 			$$ = newline_node($1);
-		    /*% %*/
-		    /*% ripper: stmts_add!(stmts_new!, $1) %*/
+		    /*%
+			$$ = dispatch2(stmts_add, dispatch0(stmts_new), $1);
+		    %*/
 		    }
 		| top_stmts terms top_stmt
 		    {
 		    /*%%%*/
-			$$ = block_append(p, $1, newline_node($3));
-		    /*% %*/
-		    /*% ripper: stmts_add!($1, $3) %*/
+			$$ = block_append($1, newline_node($3));
+		    /*%
+			$$ = dispatch2(stmts_add, $1, $3);
+		    %*/
 		    }
 		| error top_stmt
 		    {
@@ -993,71 +1056,95 @@ top_stmts	: none
 		;
 
 top_stmt	: stmt
-		| keyword_BEGIN begin_block
+		| keyword_BEGIN
 		    {
-			$$ = $2;
+		    /*%%%*/
+			/* local_push(0); */
+		    /*%
+		    %*/
 		    }
-		;
-
-begin_block	: '{' top_compstmt '}'
+		  '{' top_compstmt '}'
 		    {
 		    /*%%%*/
-			p->eval_tree_begin = block_append(p, p->eval_tree_begin,
-							  NEW_BEGIN($2, &@$));
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper: BEGIN!($2) %*/
+			ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
+							    $4);
+			/* NEW_PREEXE($4)); */
+			/* local_pop(); */
+			$$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch1(BEGIN, $4);
+		    %*/
 		    }
 		;
 
 bodystmt	: compstmt
 		  opt_rescue
-		  k_else {if (!$2) {yyerror1(&@3, "else without rescue is useless");}}
-		  compstmt
-		  opt_ensure
-		    {
-		    /*%%%*/
-			$$ = new_bodystmt(p, $1, $2, $5, $6, &@$);
-		    /*% %*/
-		    /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($5), escape_Qundef($6)) %*/
-		    }
-		| compstmt
-		  opt_rescue
+		  opt_else
 		  opt_ensure
 		    {
 		    /*%%%*/
-			$$ = new_bodystmt(p, $1, $2, 0, $3, &@$);
-		    /*% %*/
-		    /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), Qnil, escape_Qundef($3)) %*/
+			$$ = $1;
+			if ($2) {
+			    $$ = NEW_RESCUE($1, $2, $3);
+			}
+			else if ($3) {
+			    rb_warn0("else without rescue is useless");
+			    $$ = block_append($$, $3);
+			}
+			if ($4) {
+			    if ($$) {
+				$$ = NEW_ENSURE($$, $4);
+			    }
+			    else {
+				$$ = block_append($4, NEW_NIL());
+			    }
+			}
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(bodystmt,
+				       escape_Qundef($1),
+				       escape_Qundef($2),
+				       escape_Qundef($3),
+				       escape_Qundef($4));
+		    %*/
 		    }
 		;
 
 compstmt	: stmts opt_terms
 		    {
-			$$ = void_stmts(p, $1);
+		    /*%%%*/
+			void_stmts($1);
+			fixup_nodes(&deferred_nodes);
+		    /*%
+		    %*/
+			$$ = $1;
 		    }
 		;
 
 stmts		: none
                     {
 		    /*%%%*/
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
+			$$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch2(stmts_add, dispatch0(stmts_new),
+						  dispatch0(void_stmt));
+		    %*/
 		    }
 		| stmt_or_begin
 		    {
 		    /*%%%*/
 			$$ = newline_node($1);
-		    /*% %*/
-		    /*% ripper: stmts_add!(stmts_new!, $1) %*/
+		    /*%
+			$$ = dispatch2(stmts_add, dispatch0(stmts_new), $1);
+		    %*/
 		    }
 		| stmts terms stmt_or_begin
 		    {
 		    /*%%%*/
-			$$ = block_append(p, $1, newline_node($3));
-		    /*% %*/
-		    /*% ripper: stmts_add!($1, $3) %*/
+			$$ = block_append($1, newline_node($3));
+		    /*%
+			$$ = dispatch2(stmts_add, $1, $3);
+		    %*/
 		    }
 		| error stmt
 		    {
@@ -1071,26 +1158,40 @@ stmt_or_begin	: stmt
 		    }
                 | keyword_BEGIN
 		    {
-			yyerror1(&@1, "BEGIN is permitted only at toplevel");
+			yyerror("BEGIN is permitted only at toplevel");
+		    /*%%%*/
+			/* local_push(0); */
+		    /*%
+		    %*/
 		    }
-		  begin_block
+		  '{' top_compstmt '}'
 		    {
-			$$ = $3;
+		    /*%%%*/
+			ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
+							    $4);
+			/* NEW_PREEXE($4)); */
+			/* local_pop(); */
+			$$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch1(BEGIN, $4);
+		    %*/
 		    }
 
 stmt		: keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
 		    {
 		    /*%%%*/
-			$$ = NEW_ALIAS($2, $4, &@$);
-		    /*% %*/
-		    /*% ripper: alias!($2, $4) %*/
+			$$ = NEW_ALIAS($2, $4);
+		    /*%
+			$$ = dispatch2(alias, $2, $4);
+		    %*/
 		    }
 		| keyword_alias tGVAR tGVAR
 		    {
 		    /*%%%*/
-			$$ = NEW_VALIAS($2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: var_alias!($2, $3) %*/
+			$$ = NEW_VALIAS($2, $3);
+		    /*%
+			$$ = dispatch2(var_alias, $2, $3);
+		    %*/
 		    }
 		| keyword_alias tGVAR tBACK_REF
 		    {
@@ -1098,190 +1199,197 @@ stmt		: keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
 			char buf[2];
 			buf[0] = '$';
 			buf[1] = (char)$3->nd_nth;
-			$$ = NEW_VALIAS($2, rb_intern2(buf, 2), &@$);
-		    /*% %*/
-		    /*% ripper: var_alias!($2, $3) %*/
+			$$ = NEW_VALIAS($2, rb_intern2(buf, 2));
+		    /*%
+			$$ = dispatch2(var_alias, $2, $3);
+		    %*/
 		    }
 		| keyword_alias tGVAR tNTH_REF
 		    {
 		    /*%%%*/
-			yyerror1(&@3, "can't make alias for the number variables");
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper[error]: alias_error!(var_alias!($2, $3)) %*/
+			yyerror("can't make alias for the number variables");
+			$$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch2(var_alias, $2, $3);
+			$$ = dispatch1(alias_error, $$);
+			ripper_error();
+		    %*/
 		    }
 		| keyword_undef undef_list
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: undef!($2) %*/
+		    /*%
+			$$ = dispatch1(undef, $2);
+		    %*/
 		    }
 		| stmt modifier_if expr_value
 		    {
 		    /*%%%*/
-			$$ = new_if(p, $3, remove_begin($1), 0, &@$);
+			$$ = new_if($3, remove_begin($1), 0);
 			fixpos($$, $3);
-		    /*% %*/
-		    /*% ripper: if_mod!($3, $1) %*/
+		    /*%
+			$$ = dispatch2(if_mod, $3, $1);
+		    %*/
 		    }
 		| stmt modifier_unless expr_value
 		    {
 		    /*%%%*/
-			$$ = new_unless(p, $3, remove_begin($1), 0, &@$);
+			$$ = new_unless($3, remove_begin($1), 0);
 			fixpos($$, $3);
-		    /*% %*/
-		    /*% ripper: unless_mod!($3, $1) %*/
+		    /*%
+			$$ = dispatch2(unless_mod, $3, $1);
+		    %*/
 		    }
 		| stmt modifier_while expr_value
 		    {
 		    /*%%%*/
 			if ($1 && nd_type($1) == NODE_BEGIN) {
-			    $$ = NEW_WHILE(cond(p, $3, &@3), $1->nd_body, 0, &@$);
+			    $$ = NEW_WHILE(cond($3), $1->nd_body, 0);
 			}
 			else {
-			    $$ = NEW_WHILE(cond(p, $3, &@3), $1, 1, &@$);
+			    $$ = NEW_WHILE(cond($3), $1, 1);
 			}
-		    /*% %*/
-		    /*% ripper: while_mod!($3, $1) %*/
+		    /*%
+			$$ = dispatch2(while_mod, $3, $1);
+		    %*/
 		    }
 		| stmt modifier_until expr_value
 		    {
 		    /*%%%*/
 			if ($1 && nd_type($1) == NODE_BEGIN) {
-			    $$ = NEW_UNTIL(cond(p, $3, &@3), $1->nd_body, 0, &@$);
+			    $$ = NEW_UNTIL(cond($3), $1->nd_body, 0);
 			}
 			else {
-			    $$ = NEW_UNTIL(cond(p, $3, &@3), $1, 1, &@$);
+			    $$ = NEW_UNTIL(cond($3), $1, 1);
 			}
-		    /*% %*/
-		    /*% ripper: until_mod!($3, $1) %*/
+		    /*%
+			$$ = dispatch2(until_mod, $3, $1);
+		    %*/
 		    }
 		| stmt modifier_rescue stmt
 		    {
 		    /*%%%*/
-			NODE *resq;
-			YYLTYPE loc = code_loc_gen(&@2, &@3);
-			resq = NEW_RESBODY(0, remove_begin($3), 0, &loc);
-			$$ = NEW_RESCUE(remove_begin($1), resq, 0, &@$);
-		    /*% %*/
-		    /*% ripper: rescue_mod!($1, $3) %*/
+			NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);
+			$$ = NEW_RESCUE(remove_begin($1), resq, 0);
+		    /*%
+			$$ = dispatch2(rescue_mod, $1, $3);
+		    %*/
 		    }
 		| keyword_END '{' compstmt '}'
 		    {
-			if (p->in_def) {
+			if (in_def || in_single) {
 			    rb_warn0("END in method; use at_exit");
 			}
 		    /*%%%*/
-			{
-			    NODE *scope = NEW_NODE(
-				NODE_SCOPE, 0 /* tbl */, $3 /* body */, 0 /* args */, &@$);
-			    $$ = NEW_POSTEXE(scope, &@$);
-			}
-		    /*% %*/
-		    /*% ripper: END!($3) %*/
+			$$ = NEW_POSTEXE(NEW_NODE(
+			    NODE_SCOPE, 0 /* tbl */, $3 /* body */, 0 /* args */));
+		    /*%
+			$$ = dispatch1(END, $3);
+		    %*/
 		    }
 		| command_asgn
 		| mlhs '=' command_call
 		    {
 		    /*%%%*/
 			value_expr($3);
-			$$ = node_assign(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: massign!($1, $3) %*/
+			$1->nd_value = $3;
+			$$ = $1;
+		    /*%
+			$$ = dispatch2(massign, $1, $3);
+		    %*/
 		    }
 		| lhs '=' mrhs
 		    {
-		    /*%%%*/
 			value_expr($3);
-			$$ = node_assign(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: assign!($1, $3) %*/
+			$$ = node_assign($1, $3);
 		    }
 		| mlhs '=' mrhs_arg
 		    {
 		    /*%%%*/
-			$$ = node_assign(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: massign!($1, $3) %*/
+			$1->nd_value = $3;
+			$$ = $1;
+		    /*%
+			$$ = dispatch2(massign, $1, $3);
+		    %*/
 		    }
 		| expr
 		;
 
 command_asgn	: lhs '=' command_rhs
 		    {
-		    /*%%%*/
-			$$ = node_assign(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: assign!($1, $3) %*/
+			value_expr($3);
+			$$ = node_assign($1, $3);
 		    }
 		| var_lhs tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			$$ = new_op_assign(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!($1, $2, $3) %*/
+			value_expr($3);
+			$$ = new_op_assign($1, $2, $3);
 		    }
 		| primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs
 		    {
 		    /*%%%*/
-			$$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $6) %*/
+			NODE *args;
 
+			value_expr($6);
+			if (!$3) $3 = NEW_ZARRAY();
+			args = arg_concat($3, $6);
+			if ($5 == tOROP) {
+			    $5 = 0;
+			}
+			else if ($5 == tANDOP) {
+			    $5 = 1;
+			}
+			$$ = NEW_OP_ASGN1($1, $5, args);
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch2(aref_field, $1, escape_Qundef($3));
+			$$ = dispatch3(opassign, $$, $5, $6);
+		    %*/
 		    }
 		| primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
+			value_expr($5);
+			$$ = new_attr_op_assign($1, $2, $3, $4, $5);
 		    }
 		| primary_value call_op tCONSTANT tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
+			value_expr($5);
+			$$ = new_attr_op_assign($1, $2, $3, $4, $5);
 		    }
 		| primary_value tCOLON2 tCONSTANT tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			YYLTYPE loc = code_loc_gen(&@1, &@3);
-			$$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(const_path_field!($1, $3), $4, $5) %*/
+			$$ = const_path_field($1, $3);
+			$$ = new_const_op_assign($$, $4, $5);
 		    }
 		| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			$$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $5) %*/
+			value_expr($5);
+			$$ = new_attr_op_assign($1, idCOLON2, $3, $4, $5);
 		    }
 		| backref tOP_ASGN command_rhs
 		    {
-		    /*%%%*/
-			rb_backref_error(p, $1);
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper[error]: assign_error!(assign!(var_field(p, $1), $3)) %*/
+			$1 = var_field($1);
+			$$ = backref_assign_error($1, node_assign($1, $3));
 		    }
 		;
 
 command_rhs	: command_call   %prec tOP_ASGN
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+		    /*%
+		    %*/
 		    }
 		| command_call modifier_rescue stmt
 		    {
 		    /*%%%*/
-			YYLTYPE loc = code_loc_gen(&@2, &@3);
 			value_expr($1);
-			$$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0, &loc), 0, &@$);
-		    /*% %*/
-		    /*% ripper: rescue_mod!($1, $3) %*/
+			$$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0), 0);
+		    /*%
+			$$ = dispatch2(rescue_mod, $1, $3);
+		    %*/
 		    }
 		| command_asgn
 		;
@@ -1289,36 +1397,51 @@ command_rhs	: command_call   %prec tOP_ASGN
 expr		: command_call
 		| expr keyword_and expr
 		    {
-			$$ = logop(p, idAND, $1, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = logop(NODE_AND, $1, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ripper_intern("and"), $3);
+		    %*/
 		    }
 		| expr keyword_or expr
 		    {
-			$$ = logop(p, idOR, $1, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = logop(NODE_OR, $1, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ripper_intern("or"), $3);
+		    %*/
 		    }
 		| keyword_not opt_nl expr
 		    {
-			$$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op(cond($3), '!');
+		    /*%
+			$$ = dispatch2(unary, ripper_intern("not"), $3);
+		    %*/
 		    }
 		| '!' command_call
 		    {
-			$$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op(cond($2), '!');
+		    /*%
+			$$ = dispatch2(unary, ripper_id2sym('!'), $2);
+		    %*/
 		    }
 		| arg
 		;
 
 expr_value	: expr
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+			if (!$$) $$ = NEW_NIL();
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		;
 
-expr_value_do	: {COND_PUSH(1);} expr_value do {COND_POP();}
-		    {
-			$$ = $2;
-		    }
-
-
 command_call	: command
 		| block_command
 		;
@@ -1327,116 +1450,151 @@ block_command	: block_call
 		| block_call call_op2 operation2 command_args
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/
+			$$ = NEW_QCALL($2, $1, $3, $4);
+		    /*%
+			$$ = dispatch3(call, $1, $2, $3);
+			$$ = method_arg($$, $4);
+		    %*/
 		    }
 		;
 
-cmd_brace_block	: tLBRACE_ARG brace_body '}'
+cmd_brace_block	: tLBRACE_ARG
 		    {
-			$$ = $2;
+			$<vars>1 = dyna_push();
 		    /*%%%*/
-			$$->nd_body->nd_loc = code_loc_gen(&@1, &@3);
-			nd_set_line($$, @1.end_pos.lineno);
-		    /*% %*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+		    %*/
+		    }
+		  opt_block_param
+		  compstmt
+		  '}'
+		    {
+		    /*%%%*/
+			$$ = NEW_ITER($3,$4);
+			nd_set_line($$, $<num>2);
+		    /*%
+			$$ = dispatch2(brace_block, escape_Qundef($3), $4);
+		    %*/
+			dyna_pop($<vars>1);
 		    }
 		;
 
 fcall		: operation
 		    {
 		    /*%%%*/
-			$$ = NEW_FCALL($1, 0, &@$);
-			nd_set_line($$, p->tokline);
-		    /*% %*/
-		    /*% ripper: $1 %*/
+			$$ = NEW_FCALL($1, 0);
+			nd_set_line($$, tokline);
+		    /*%
+		    %*/
 		    }
 		;
 
 command		: fcall command_args       %prec tLOWEST
 		    {
 		    /*%%%*/
-			$1->nd_args = $2;
-			nd_set_last_loc($1, @2.end_pos);
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: command!($1, $2) %*/
+			$$->nd_args = $2;
+		    /*%
+			$$ = dispatch2(command, $1, $2);
+		    %*/
 		    }
 		| fcall command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			block_dup_check(p, $2, $3);
+			block_dup_check($2,$3);
 			$1->nd_args = $2;
-			$$ = method_add_block(p, $1, $3, &@$);
+			$3->nd_iter = $1;
+			$$ = $3;
 			fixpos($$, $1);
-			nd_set_last_loc($1, @2.end_pos);
-		    /*% %*/
-		    /*% ripper: method_add_block!(command!($1, $2), $3) %*/
+		    /*%
+			$$ = dispatch2(command, $1, $2);
+			$$ = method_add_block($$, $3);
+		    %*/
 		    }
 		| primary_value call_op operation2 command_args	%prec tLOWEST
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, $2, $1, $3, $4, Qnull, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: command_call!($1, $2, $3, $4) %*/
+			$$ = NEW_QCALL($2, $1, $3, $4);
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, $2, $3, $4);
+		    %*/
 		    }
 		| primary_value call_op operation2 command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
-		    }
+			block_dup_check($4,$5);
+			$5->nd_iter = NEW_QCALL($2, $1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, $2, $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
+		   }
 		| primary_value tCOLON2 operation2 command_args	%prec tLOWEST
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %*/
+			$$ = NEW_CALL($1, $3, $4);
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, ID2SYM(idCOLON2), $3, $4);
+		    %*/
 		    }
 		| primary_value tCOLON2 operation2 command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %*/
+			block_dup_check($4,$5);
+			$5->nd_iter = NEW_CALL($1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, ID2SYM(idCOLON2), $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
 		   }
 		| keyword_super command_args
 		    {
 		    /*%%%*/
-			$$ = NEW_SUPER($2, &@$);
+			$$ = NEW_SUPER($2);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: super!($2) %*/
+		    /*%
+			$$ = dispatch1(super, $2);
+		    %*/
 		    }
 		| keyword_yield command_args
 		    {
 		    /*%%%*/
-			$$ = new_yield(p, $2, &@$);
+			$$ = new_yield($2);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: yield!($2) %*/
+		    /*%
+			$$ = dispatch1(yield, $2);
+		    %*/
 		    }
-		| k_return call_args
+		| keyword_return call_args
 		    {
 		    /*%%%*/
-			$$ = NEW_RETURN(ret_args(p, $2), &@$);
-		    /*% %*/
-		    /*% ripper: return!($2) %*/
+			$$ = NEW_RETURN(ret_args($2));
+		    /*%
+			$$ = dispatch1(return, $2);
+		    %*/
 		    }
 		| keyword_break call_args
 		    {
 		    /*%%%*/
-			$$ = NEW_BREAK(ret_args(p, $2), &@$);
-		    /*% %*/
-		    /*% ripper: break!($2) %*/
+			$$ = NEW_BREAK(ret_args($2));
+		    /*%
+			$$ = dispatch1(break, $2);
+		    %*/
 		    }
 		| keyword_next call_args
 		    {
 		    /*%%%*/
-			$$ = NEW_NEXT(ret_args(p, $2), &@$);
-		    /*% %*/
-		    /*% ripper: next!($2) %*/
+			$$ = NEW_NEXT(ret_args($2));
+		    /*%
+			$$ = dispatch1(next, $2);
+		    %*/
 		    }
 		;
 
@@ -1445,8 +1603,9 @@ mlhs		: mlhs_basic
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: mlhs_paren!($2) %*/
+		    /*%
+			$$ = dispatch1(mlhs_paren, $2);
+		    %*/
 		    }
 		;
 
@@ -1454,81 +1613,96 @@ mlhs_inner	: mlhs_basic
 		| tLPAREN mlhs_inner rparen
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(NEW_LIST($2, &@$), 0, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_paren!($2) %*/
+			$$ = NEW_MASGN(NEW_LIST($2), 0);
+		    /*%
+			$$ = dispatch1(mlhs_paren, $2);
+		    %*/
 		    }
 		;
 
 mlhs_basic	: mlhs_head
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: $1 %*/
+			$$ = NEW_MASGN($1, 0);
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		| mlhs_head mlhs_item
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(list_append(p, $1,$2), 0, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add!($1, $2) %*/
+			$$ = NEW_MASGN(list_append($1,$2), 0);
+		    /*%
+			$$ = mlhs_add($1, $2);
+		    %*/
 		    }
 		| mlhs_head tSTAR mlhs_node
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!($1, $3) %*/
+			$$ = NEW_MASGN($1, $3);
+		    /*%
+			$$ = mlhs_add_star($1, $3);
+		    %*/
 		    }
 		| mlhs_head tSTAR mlhs_node ',' mlhs_post
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NEW_POSTARG($3,$5,&@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/
+			$$ = NEW_MASGN($1, NEW_POSTARG($3,$5));
+		    /*%
+			$1 = mlhs_add_star($1, $3);
+			$$ = mlhs_add($1, $5);
+		    %*/
 		    }
 		| mlhs_head tSTAR
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!($1, Qnil) %*/
+			$$ = NEW_MASGN($1, -1);
+		    /*%
+			$$ = mlhs_add_star($1, Qnil);
+		    %*/
 		    }
 		| mlhs_head tSTAR ',' mlhs_post
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $4, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $4) %*/
+			$$ = NEW_MASGN($1, NEW_POSTARG(-1, $4));
+		    /*%
+			$1 = mlhs_add_star($1, Qnil);
+			$$ = mlhs_add($1, $4);
+		    %*/
 		    }
 		| tSTAR mlhs_node
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, $2, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!(mlhs_new!, $2) %*/
+			$$ = NEW_MASGN(0, $2);
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), $2);
+		    %*/
 		    }
 		| tSTAR mlhs_node ',' mlhs_post
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NEW_POSTARG($2,$4,&@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $2), $4) %*/
+			$$ = NEW_MASGN(0, NEW_POSTARG($2,$4));
+		    /*%
+			$2 = mlhs_add_star(mlhs_new(), $2);
+			$$ = mlhs_add($2, $4);
+		    %*/
 		    }
 		| tSTAR
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/
+			$$ = NEW_MASGN(0, -1);
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), Qnil);
+		    %*/
 		    }
 		| tSTAR ',' mlhs_post
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/
+			$$ = NEW_MASGN(0, NEW_POSTARG(-1, $3));
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), Qnil);
+			$$ = mlhs_add($$, $3);
+		    %*/
 		    }
 		;
 
@@ -1537,181 +1711,176 @@ mlhs_item	: mlhs_node
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: mlhs_paren!($2) %*/
+		    /*%
+			$$ = dispatch1(mlhs_paren, $2);
+		    %*/
 		    }
 		;
 
 mlhs_head	: mlhs_item ','
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1, &@1);
-		    /*% %*/
-		    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = mlhs_add(mlhs_new(), $1);
+		    %*/
 		    }
 		| mlhs_head mlhs_item ','
 		    {
 		    /*%%%*/
-			$$ = list_append(p, $1, $2);
-		    /*% %*/
-		    /*% ripper: mlhs_add!($1, $2) %*/
+			$$ = list_append($1, $2);
+		    /*%
+			$$ = mlhs_add($1, $2);
+		    %*/
 		    }
 		;
 
 mlhs_post	: mlhs_item
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = mlhs_add(mlhs_new(), $1);
+		    %*/
 		    }
 		| mlhs_post ',' mlhs_item
 		    {
 		    /*%%%*/
-			$$ = list_append(p, $1, $3);
-		    /*% %*/
-		    /*% ripper: mlhs_add!($1, $3) %*/
+			$$ = list_append($1, $3);
+		    /*%
+			$$ = mlhs_add($1, $3);
+		    %*/
 		    }
 		;
 
 mlhs_node	: user_variable
 		    {
-		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+			$$ = assignable($1, 0);
 		    }
 		| keyword_variable
 		    {
-		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+			$$ = assignable($1, 0);
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
 		    /*%%%*/
-			$$ = aryset(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
+			$$ = aryset($1, $3);
+		    /*%
+			$$ = dispatch2(aref_field, $1, escape_Qundef($3));
+		    %*/
 		    }
 		| primary_value call_op tIDENTIFIER
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: field!($1, $2, $3) %*/
+			$$ = attrset($1, $2, $3);
+		    /*%
+			$$ = dispatch3(field, $1, $2, $3);
+		    %*/
 		    }
 		| primary_value tCOLON2 tIDENTIFIER
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, idCOLON2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: const_path_field!($1, $3) %*/
+			$$ = attrset($1, idCOLON2, $3);
+		    /*%
+			$$ = dispatch2(const_path_field, $1, $3);
+		    %*/
 		    }
 		| primary_value call_op tCONSTANT
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: field!($1, $2, $3) %*/
+			$$ = attrset($1, $2, $3);
+		    /*%
+			$$ = dispatch3(field, $1, $2, $3);
+		    %*/
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
-		    /*%%%*/
-			$$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
+			$$ = const_decl(const_path_field($1, $3));
 		    }
 		| tCOLON3 tCONSTANT
 		    {
-		    /*%%%*/
-			$$ = const_decl(p, NEW_COLON3($2, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: const_decl(p, top_const_field!($2)) %*/
+			$$ = const_decl(top_const_field($2));
 		    }
 		| backref
 		    {
-		    /*%%%*/
-			rb_backref_error(p, $1);
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper[error]: assign_error!(var_field(p, $1)) %*/
+			$1 = var_field($1);
+			$$ = backref_assign_error($1, $1);
 		    }
 		;
 
 lhs		: user_variable
 		    {
+			$$ = assignable($1, 0);
 		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+			if (!$$) $$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch1(var_field, $$);
+		    %*/
 		    }
 		| keyword_variable
 		    {
+			$$ = assignable($1, 0);
 		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+			if (!$$) $$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch1(var_field, $$);
+		    %*/
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
 		    /*%%%*/
-			$$ = aryset(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
+			$$ = aryset($1, $3);
+		    /*%
+			$$ = dispatch2(aref_field, $1, escape_Qundef($3));
+		    %*/
 		    }
 		| primary_value call_op tIDENTIFIER
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: field!($1, $2, $3) %*/
+			$$ = attrset($1, $2, $3);
+		    /*%
+			$$ = dispatch3(field, $1, $2, $3);
+		    %*/
 		    }
 		| primary_value tCOLON2 tIDENTIFIER
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, idCOLON2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: field!($1, ID2VAL(idCOLON2), $3) %*/
+			$$ = attrset($1, idCOLON2, $3);
+		    /*%
+			$$ = dispatch3(field, $1, ID2SYM(idCOLON2), $3);
+		    %*/
 		    }
 		| primary_value call_op tCONSTANT
 		    {
 		    /*%%%*/
-			$$ = attrset(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: field!($1, $2, $3) %*/
+			$$ = attrset($1, $2, $3);
+		    /*%
+			$$ = dispatch3(field, $1, $2, $3);
+		    %*/
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
-		    /*%%%*/
-			$$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
+			$$ = const_decl(const_path_field($1, $3));
 		    }
 		| tCOLON3 tCONSTANT
 		    {
-		    /*%%%*/
-			$$ = const_decl(p, NEW_COLON3($2, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: const_decl(p, top_const_field!($2)) %*/
+			$$ = const_decl(top_const_field($2));
 		    }
 		| backref
 		    {
-		    /*%%%*/
-			rb_backref_error(p, $1);
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper[error]: assign_error!(var_field(p, $1)) %*/
+			$1 = var_field($1);
+			$$ = backref_assign_error($1, $1);
 		    }
 		;
 
 cname		: tIDENTIFIER
 		    {
 		    /*%%%*/
-			yyerror1(&@1, "class/module name must be CONSTANT");
-		    /*% %*/
-		    /*% ripper[error]: class_name_error!($1) %*/
+			yyerror("class/module name must be CONSTANT");
+		    /*%
+			$$ = dispatch1(class_name_error, $1);
+			ripper_error();
+		    %*/
 		    }
 		| tCONSTANT
 		;
@@ -1719,23 +1888,26 @@ cname		: tIDENTIFIER
 cpath		: tCOLON3 cname
 		    {
 		    /*%%%*/
-			$$ = NEW_COLON3($2, &@$);
-		    /*% %*/
-		    /*% ripper: top_const_ref!($2) %*/
+			$$ = NEW_COLON3($2);
+		    /*%
+			$$ = dispatch1(top_const_ref, $2);
+		    %*/
 		    }
 		| cname
 		    {
 		    /*%%%*/
-			$$ = NEW_COLON2(0, $$, &@$);
-		    /*% %*/
-		    /*% ripper: const_ref!($1) %*/
+			$$ = NEW_COLON2(0, $$);
+		    /*%
+			$$ = dispatch1(const_ref, $1);
+		    %*/
 		    }
 		| primary_value tCOLON2 cname
 		    {
 		    /*%%%*/
-			$$ = NEW_COLON2($1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: const_path_ref!($1, $3) %*/
+			$$ = NEW_COLON2($1, $3);
+		    /*%
+			$$ = dispatch2(const_path_ref, $1, $3);
+		    %*/
 		    }
 		;
 
@@ -1750,7 +1922,11 @@ fname		: tIDENTIFIER
 		| reswords
 		    {
 			SET_LEX_STATE(EXPR_ENDFN);
+		    /*%%%*/
+			$$ = $<id>1;
+		    /*%
 			$$ = $1;
+		    %*/
 		    }
 		;
 
@@ -1761,9 +1937,10 @@ fsym		: fname
 fitem		: fsym
 		    {
 		    /*%%%*/
-			$$ = NEW_LIT(ID2SYM($1), &@$);
-		    /*% %*/
-		    /*% ripper: symbol_literal!($1) %*/
+			$$ = NEW_LIT(ID2SYM($1));
+		    /*%
+			$$ = dispatch1(symbol_literal, $1);
+		    %*/
 		    }
 		| dsym
 		;
@@ -1771,17 +1948,18 @@ fitem		: fsym
 undef_list	: fitem
 		    {
 		    /*%%%*/
-			$$ = NEW_UNDEF($1, &@$);
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+			$$ = NEW_UNDEF($1);
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
 		    {
 		    /*%%%*/
-			NODE *undef = NEW_UNDEF($4, &@4);
-			$$ = block_append(p, $1, undef);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($4)) %*/
+			$$ = block_append($1, NEW_UNDEF($4));
+		    /*%
+			rb_ary_push($1, $4);
+		    %*/
 		    }
 		;
 
@@ -1833,225 +2011,345 @@ reswords	: keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
 
 arg		: lhs '=' arg_rhs
 		    {
-		    /*%%%*/
-			$$ = node_assign(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: assign!($1, $3) %*/
+			$$ = node_assign($1, $3);
 		    }
 		| var_lhs tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
-			$$ = new_op_assign(p, $1, $2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!($1, $2, $3) %*/
+			$$ = new_op_assign($1, $2, $3);
 		    }
 		| primary_value '[' opt_call_args rbracket tOP_ASGN arg_rhs
 		    {
 		    /*%%%*/
+			NODE *args;
+
 			value_expr($6);
-			$$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $6) %*/
+			if (!$3) $3 = NEW_ZARRAY();
+			if (nd_type($3) == NODE_BLOCK_PASS) {
+			    args = NEW_ARGSCAT($3, $6);
+			}
+			else {
+			    args = arg_concat($3, $6);
+			}
+			if ($5 == tOROP) {
+			    $5 = 0;
+			}
+			else if ($5 == tANDOP) {
+			    $5 = 1;
+			}
+			$$ = NEW_OP_ASGN1($1, $5, args);
+			fixpos($$, $1);
+		    /*%
+			$1 = dispatch2(aref_field, $1, escape_Qundef($3));
+			$$ = dispatch3(opassign, $1, $5, $6);
+		    %*/
 		    }
 		| primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
 			value_expr($5);
-			$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
+			$$ = new_attr_op_assign($1, $2, $3, $4, $5);
 		    }
 		| primary_value call_op tCONSTANT tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
 			value_expr($5);
-			$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
+			$$ = new_attr_op_assign($1, $2, $3, $4, $5);
 		    }
 		| primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
 			value_expr($5);
-			$$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $5) %*/
+			$$ = new_attr_op_assign($1, idCOLON2, $3, $4, $5);
 		    }
 		| primary_value tCOLON2 tCONSTANT tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
-			YYLTYPE loc = code_loc_gen(&@1, &@3);
-			$$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $5, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(const_path_field!($1, $3), $4, $5) %*/
+			$$ = const_path_field($1, $3);
+			$$ = new_const_op_assign($$, $4, $5);
 		    }
 		| tCOLON3 tCONSTANT tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
-			$$ = new_const_op_assign(p, NEW_COLON3($2, &@$), $3, $4, &@$);
-		    /*% %*/
-		    /*% ripper: opassign!(top_const_field!($2), $3, $4) %*/
+			$$ = top_const_field($2);
+			$$ = new_const_op_assign($$, $3, $4);
 		    }
 		| backref tOP_ASGN arg_rhs
 		    {
-		    /*%%%*/
-			rb_backref_error(p, $1);
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper[error]: assign_error!(opassign!(var_field(p, $1), $2, $3)) %*/
+			$1 = var_field($1);
+			$$ = backref_assign_error($1, new_op_assign($1, $2, $3));
 		    }
 		| arg tDOT2 arg
 		    {
 		    /*%%%*/
 			value_expr($1);
 			value_expr($3);
-			$$ = NEW_DOT2($1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: dot2!($1, $3) %*/
+			$$ = NEW_DOT2($1, $3);
+			if ($1 && nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    $3 && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    deferred_nodes = list_append(deferred_nodes, $$);
+			}
+		    /*%
+			$$ = dispatch2(dot2, $1, $3);
+		    %*/
 		    }
 		| arg tDOT3 arg
 		    {
 		    /*%%%*/
 			value_expr($1);
 			value_expr($3);
-			$$ = NEW_DOT3($1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: dot3!($1, $3) %*/
-		    }
-		| arg tDOT2
-		    {
-		    /*%%%*/
-                        YYLTYPE loc;
-                        loc.beg_pos = @2.end_pos;
-                        loc.end_pos = @2.end_pos;
-
-			value_expr($1);
-			$$ = NEW_DOT2($1, new_nil(&loc), &@$);
-		    /*% %*/
-		    /*% ripper: dot2!($1, Qnil) %*/
-		    }
-		| arg tDOT3
-		    {
-		    /*%%%*/
-                        YYLTYPE loc;
-                        loc.beg_pos = @2.end_pos;
-                        loc.end_pos = @2.end_pos;
-
-			value_expr($1);
-			$$ = NEW_DOT3($1, new_nil(&loc), &@$);
-		    /*% %*/
-		    /*% ripper: dot3!($1, Qnil) %*/
+			$$ = NEW_DOT3($1, $3);
+			if ($1 && nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    $3 && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    deferred_nodes = list_append(deferred_nodes, $$);
+			}
+		    /*%
+			$$ = dispatch2(dot3, $1, $3);
+		    %*/
 		    }
 		| arg '+' arg
 		    {
-			$$ = call_bin_op(p, $1, '+', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '+', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('+'), $3);
+		    %*/
 		    }
 		| arg '-' arg
 		    {
-			$$ = call_bin_op(p, $1, '-', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '-', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('-'), $3);
+		    %*/
 		    }
 		| arg '*' arg
 		    {
-			$$ = call_bin_op(p, $1, '*', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '*', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('*'), $3);
+		    %*/
 		    }
 		| arg '/' arg
 		    {
-			$$ = call_bin_op(p, $1, '/', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '/', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('/'), $3);
+		    %*/
 		    }
 		| arg '%' arg
 		    {
-			$$ = call_bin_op(p, $1, '%', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '%', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('%'), $3);
+		    %*/
 		    }
 		| arg tPOW arg
 		    {
-			$$ = call_bin_op(p, $1, idPow, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tPOW, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idPow), $3);
+		    %*/
 		    }
 		| tUMINUS_NUM simple_numeric tPOW arg
 		    {
-			$$ = call_uni_op(p, call_bin_op(p, $2, idPow, $4, &@2, &@$), idUMinus, &@1, &@$);
+		    /*%%%*/
+			$$ = NEW_CALL(call_bin_op($2, tPOW, $4), tUMINUS, 0);
+		    /*%
+			$$ = dispatch3(binary, $2, ID2SYM(idPow), $4);
+			$$ = dispatch2(unary, ID2SYM(idUMinus), $$);
+		    %*/
 		    }
 		| tUPLUS arg
 		    {
-			$$ = call_uni_op(p, $2, idUPlus, &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op($2, tUPLUS);
+		    /*%
+			$$ = dispatch2(unary, ID2SYM(idUPlus), $2);
+		    %*/
 		    }
 		| tUMINUS arg
 		    {
-			$$ = call_uni_op(p, $2, idUMinus, &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op($2, tUMINUS);
+		    /*%
+			$$ = dispatch2(unary, ID2SYM(idUMinus), $2);
+		    %*/
 		    }
 		| arg '|' arg
 		    {
-			$$ = call_bin_op(p, $1, '|', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '|', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('|'), $3);
+		    %*/
 		    }
 		| arg '^' arg
 		    {
-			$$ = call_bin_op(p, $1, '^', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '^', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('^'), $3);
+		    %*/
 		    }
 		| arg '&' arg
 		    {
-			$$ = call_bin_op(p, $1, '&', $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, '&', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('&'), $3);
+		    %*/
 		    }
 		| arg tCMP arg
 		    {
-			$$ = call_bin_op(p, $1, idCmp, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tCMP, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idCmp), $3);
+		    %*/
+		    }
+		| arg '>' arg
+		    {
+		    /*%%%*/
+			$$ = call_bin_op($1, '>', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('>'), $3);
+		    %*/
+		    }
+		| arg tGEQ arg
+		    {
+		    /*%%%*/
+			$$ = call_bin_op($1, tGEQ, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idGE), $3);
+		    %*/
+		    }
+		| arg '<' arg
+		    {
+		    /*%%%*/
+			$$ = call_bin_op($1, '<', $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM('<'), $3);
+		    %*/
+		    }
+		| arg tLEQ arg
+		    {
+		    /*%%%*/
+			$$ = call_bin_op($1, tLEQ, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idLE), $3);
+		    %*/
 		    }
-		| rel_expr   %prec tCMP
 		| arg tEQ arg
 		    {
-			$$ = call_bin_op(p, $1, idEq, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tEQ, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idEq), $3);
+		    %*/
 		    }
 		| arg tEQQ arg
 		    {
-			$$ = call_bin_op(p, $1, idEqq, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tEQQ, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idEqq), $3);
+		    %*/
 		    }
 		| arg tNEQ arg
 		    {
-			$$ = call_bin_op(p, $1, idNeq, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tNEQ, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idNeq), $3);
+		    %*/
 		    }
 		| arg tMATCH arg
 		    {
-			$$ = match_op(p, $1, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = match_op($1, $3);
+			if (nd_type($1) == NODE_LIT) {
+			    VALUE lit = $1->nd_lit;
+			    if (RB_TYPE_P(lit, T_REGEXP)) {
+				$$->nd_args = reg_named_capture_assign(lit);
+			    }
+			}
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idEqTilde), $3);
+		    %*/
 		    }
 		| arg tNMATCH arg
 		    {
-			$$ = call_bin_op(p, $1, idNeqTilde, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tNMATCH, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idNeqTilde), $3);
+		    %*/
 		    }
 		| '!' arg
 		    {
-			$$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op(cond($2), '!');
+		    /*%
+			$$ = dispatch2(unary, ID2SYM('!'), $2);
+		    %*/
 		    }
 		| '~' arg
 		    {
-			$$ = call_uni_op(p, $2, '~', &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op($2, '~');
+		    /*%
+			$$ = dispatch2(unary, ID2SYM('~'), $2);
+		    %*/
 		    }
 		| arg tLSHFT arg
 		    {
-			$$ = call_bin_op(p, $1, idLTLT, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tLSHFT, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idLTLT), $3);
+		    %*/
 		    }
 		| arg tRSHFT arg
 		    {
-			$$ = call_bin_op(p, $1, idGTGT, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = call_bin_op($1, tRSHFT, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idGTGT), $3);
+		    %*/
 		    }
 		| arg tANDOP arg
 		    {
-			$$ = logop(p, idANDOP, $1, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = logop(NODE_AND, $1, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idANDOP), $3);
+		    %*/
 		    }
 		| arg tOROP arg
 		    {
-			$$ = logop(p, idOROP, $1, $3, &@2, &@$);
+		    /*%%%*/
+			$$ = logop(NODE_OR, $1, $3);
+		    /*%
+			$$ = dispatch3(binary, $1, ID2SYM(idOROP), $3);
+		    %*/
 		    }
-		| keyword_defined opt_nl {p->in_defined = 1;} arg
+		| keyword_defined opt_nl {in_defined = 1;} arg
 		    {
-			p->in_defined = 0;
-			$$ = new_defined(p, $4, &@$);
+			in_defined = 0;
+		    /*%%%*/
+			$$ = new_defined($4);
+		    /*%
+			$$ = dispatch1(defined, $4);
+		    %*/
 		    }
 		| arg '?' arg opt_nl ':' arg
 		    {
 		    /*%%%*/
 			value_expr($1);
-			$$ = new_if(p, $1, $3, $6, &@$);
+			$$ = new_if($1, $3, $6);
 			fixpos($$, $1);
-		    /*% %*/
-		    /*% ripper: ifop!($1, $3, $6) %*/
+		    /*%
+			$$ = dispatch3(ifop, $1, $3, $6);
+		    %*/
 		    }
 		| primary
 		    {
@@ -2059,27 +2357,15 @@ arg		: lhs '=' arg_rhs
 		    }
 		;
 
-relop		: '>'  {$$ = '>';}
-		| '<'  {$$ = '<';}
-		| tGEQ {$$ = idGE;}
-		| tLEQ {$$ = idLE;}
-		;
-
-rel_expr	: arg relop arg   %prec '>'
-		    {
-			$$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
-		    }
-		| rel_expr relop arg   %prec '>'
-		    {
-			rb_warning1("comparison '%s' after comparison", WARN_ID($2));
-			$$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
-		    }
-		;
-
 arg_value	: arg
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+			if (!$$) $$ = NEW_NIL();
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		;
 
@@ -2091,32 +2377,37 @@ aref_args	: none
 		| args ',' assocs trailer
 		    {
 		    /*%%%*/
-			$$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
-		    /*% %*/
-		    /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
+			$$ = $3 ? arg_append($1, new_hash($3)) : $1;
+		    /*%
+			$$ = arg_add_assocs($1, $3);
+		    %*/
 		    }
 		| assocs trailer
 		    {
 		    /*%%%*/
-			$$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@$) : 0;
-		    /*% %*/
-		    /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
+			$$ = $1 ? NEW_LIST(new_hash($1)) : 0;
+		    /*%
+			$$ = arg_add_assocs(arg_new(), $1);
+		    %*/
 		    }
 		;
 
 arg_rhs 	: arg   %prec tOP_ASGN
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+		    /*%
+		    %*/
 		    }
 		| arg modifier_rescue arg
 		    {
 		    /*%%%*/
-			YYLTYPE loc = code_loc_gen(&@2, &@3);
 			value_expr($1);
-			$$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0, &loc), 0, &@$);
-		    /*% %*/
-		    /*% ripper: rescue_mod!($1, $3) %*/
+			$$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0), 0);
+		    /*%
+			$$ = dispatch2(rescue_mod, $1, $3);
+		    %*/
 		    }
 		;
 
@@ -2124,8 +2415,9 @@ paren_args	: '(' opt_call_args rparen
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: arg_paren!(escape_Qundef($2)) %*/
+		    /*%
+			$$ = dispatch1(arg_paren, escape_Qundef($2));
+		    %*/
 		    }
 		;
 
@@ -2142,16 +2434,18 @@ opt_call_args	: none
 		| args ',' assocs ','
 		    {
 		    /*%%%*/
-			$$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
-		    /*% %*/
-		    /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
+			$$ = $3 ? arg_append($1, new_hash($3)) : $1;
+		    /*%
+			$$ = arg_add_assocs($1, $3);
+		    %*/
 		    }
 		| assocs ','
 		    {
 		    /*%%%*/
-			$$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
-		    /*% %*/
-		    /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
+			$$ = $1 ? NEW_LIST(new_hash($1)) : 0;
+		    /*%
+			$$ = arg_add_assocs(arg_new(), $1);
+		    %*/
 		    }
 		;
 
@@ -2159,70 +2453,55 @@ call_args	: command
 		    {
 		    /*%%%*/
 			value_expr($1);
-			$$ = NEW_LIST($1, &@$);
-		    /*% %*/
-		    /*% ripper: args_add!(args_new!, $1) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = arg_add(arg_new(), $1);
+		    %*/
 		    }
 		| args opt_block_arg
 		    {
 		    /*%%%*/
 			$$ = arg_blk_pass($1, $2);
-		    /*% %*/
-		    /*% ripper: args_add_block!($1, $2) %*/
+		    /*%
+			$$ = arg_add_optblock($1, $2);
+		    %*/
 		    }
 		| assocs opt_block_arg
 		    {
 		    /*%%%*/
-			$$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
+			$$ = NEW_LIST($1 ? new_hash($1) : 0);
 			$$ = arg_blk_pass($$, $2);
-		    /*% %*/
-		    /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($1)), $2) %*/
+		    /*%
+			$$ = arg_add_assocs(arg_new(), $1);
+			$$ = arg_add_optblock($$, $2);
+		    %*/
 		    }
 		| args ',' assocs opt_block_arg
 		    {
 		    /*%%%*/
-			$$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
+			$$ = $3 ? arg_append($1, new_hash($3)) : $1;
 			$$ = arg_blk_pass($$, $4);
-		    /*% %*/
-		    /*% ripper: args_add_block!(args_add!($1, bare_assoc_hash!($3)), $4) %*/
+		    /*%
+			$$ = arg_add_optblock(arg_add_assocs($1, $3), $4);
+		    %*/
 		    }
 		| block_arg
-		    /*% ripper[brace]: args_add_block!(args_new!, $1) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			$$ = arg_add_block(arg_new(), $1);
+		    }
+		    %*/
 		;
 
 command_args	:   {
-			/* If call_args starts with a open paren '(' or '[',
-			 * look-ahead reading of the letters calls CMDARG_PUSH(0),
-			 * but the push must be done after CMDARG_PUSH(1).
-			 * So this code makes them consistent by first cancelling
-			 * the premature CMDARG_PUSH(0), doing CMDARG_PUSH(1),
-			 * and finally redoing CMDARG_PUSH(0).
-			 */
-			int lookahead = 0;
-			switch (yychar) {
-			  case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK:
-			    lookahead = 1;
-			}
-			if (lookahead) CMDARG_POP();
+			$<val>$ = cmdarg_stack;
 			CMDARG_PUSH(1);
-			if (lookahead) CMDARG_PUSH(0);
 		    }
 		  call_args
 		    {
-			/* call_args can be followed by tLBRACE_ARG (that does CMDARG_PUSH(0) in the lexer)
-			 * but the push must be done after CMDARG_POP() in the parser.
-			 * So this code does CMDARG_POP() to pop 0 pushed by tLBRACE_ARG,
-			 * CMDARG_POP() to pop 1 pushed by command_args,
-			 * and CMDARG_PUSH(0) to restore back the flag set by tLBRACE_ARG.
-			 */
-			int lookahead = 0;
-			switch (yychar) {
-			  case tLBRACE_ARG:
-			    lookahead = 1;
-			}
-			if (lookahead) CMDARG_POP();
-			CMDARG_POP();
-			if (lookahead) CMDARG_PUSH(0);
+			/* CMDARG_POP() */
+			CMDARG_SET($<val>1);
 			$$ = $2;
 		    }
 		;
@@ -2230,9 +2509,10 @@ command_args	:   {
 block_arg	: tAMPER arg_value
 		    {
 		    /*%%%*/
-			$$ = NEW_BLOCK_PASS($2, &@$);
-		    /*% %*/
-		    /*% ripper: $2 %*/
+			$$ = NEW_BLOCK_PASS($2);
+		    /*%
+			$$ = $2;
+		    %*/
 		    }
 		;
 
@@ -2249,30 +2529,46 @@ opt_block_arg	: ',' block_arg
 args		: arg_value
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1, &@$);
-		    /*% %*/
-		    /*% ripper: args_add!(args_new!, $1) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = arg_add(arg_new(), $1);
+		    %*/
 		    }
 		| tSTAR arg_value
 		    {
 		    /*%%%*/
-			$$ = NEW_SPLAT($2, &@$);
-		    /*% %*/
-		    /*% ripper: args_add_star!(args_new!, $2) %*/
+			$$ = NEW_SPLAT($2);
+		    /*%
+			$$ = arg_add_star(arg_new(), $2);
+		    %*/
 		    }
 		| args ',' arg_value
 		    {
 		    /*%%%*/
-			$$ = last_arg_append(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: args_add!($1, $3) %*/
+			NODE *n1;
+			if ((n1 = splat_array($1)) != 0) {
+			    $$ = list_append(n1, $3);
+			}
+			else {
+			    $$ = arg_append($1, $3);
+			}
+		    /*%
+			$$ = arg_add($1, $3);
+		    %*/
 		    }
 		| args ',' tSTAR arg_value
 		    {
 		    /*%%%*/
-			$$ = rest_arg_append(p, $1, $4, &@$);
-		    /*% %*/
-		    /*% ripper: args_add_star!($1, $4) %*/
+			NODE *n1;
+			if ((nd_type($4) == NODE_ARRAY) && (n1 = splat_array($1)) != 0) {
+			    $$ = list_concat(n1, $4);
+			}
+			else {
+			    $$ = arg_concat($1, $4);
+			}
+		    /*%
+			$$ = arg_add_star($1, $4);
+		    %*/
 		    }
 		;
 
@@ -2283,23 +2579,39 @@ mrhs_arg	: mrhs
 mrhs		: args ',' arg_value
 		    {
 		    /*%%%*/
-			$$ = last_arg_append(p, $1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: mrhs_add!(mrhs_new_from_args!($1), $3) %*/
+			NODE *n1;
+			if ((n1 = splat_array($1)) != 0) {
+			    $$ = list_append(n1, $3);
+			}
+			else {
+			    $$ = arg_append($1, $3);
+			}
+		    /*%
+			$$ = mrhs_add(args2mrhs($1), $3);
+		    %*/
 		    }
 		| args ',' tSTAR arg_value
 		    {
 		    /*%%%*/
-			$$ = rest_arg_append(p, $1, $4, &@$);
-		    /*% %*/
-		    /*% ripper: mrhs_add_star!(mrhs_new_from_args!($1), $4) %*/
+			NODE *n1;
+			if (nd_type($4) == NODE_ARRAY &&
+			    (n1 = splat_array($1)) != 0) {
+			    $$ = list_concat(n1, $4);
+			}
+			else {
+			    $$ = arg_concat($1, $4);
+			}
+		    /*%
+			$$ = mrhs_add_star(args2mrhs($1), $4);
+		    %*/
 		    }
 		| tSTAR arg_value
 		    {
 		    /*%%%*/
-			$$ = NEW_SPLAT($2, &@$);
-		    /*% %*/
-		    /*% ripper: mrhs_add_star!(mrhs_new!, $2) %*/
+			$$ = NEW_SPLAT($2);
+		    /*%
+			$$ = mrhs_add_star(mrhs_new(), $2);
+		    %*/
 		    }
 		;
 
@@ -2316,142 +2628,187 @@ primary		: literal
 		| tFID
 		    {
 		    /*%%%*/
-			$$ = NEW_FCALL($1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_arg!(fcall!($1), args_new!) %*/
+			$$ = NEW_FCALL($1, 0);
+		    /*%
+			$$ = method_arg(dispatch1(fcall, $1), arg_new());
+		    %*/
 		    }
 		| k_begin
 		    {
-			CMDARG_PUSH(0);
+			$<val>1 = cmdarg_stack;
+			CMDARG_SET(0);
+		    /*%%%*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+		    %*/
 		    }
 		  bodystmt
 		  k_end
 		    {
-			CMDARG_POP();
+			CMDARG_SET($<val>1);
 		    /*%%%*/
-			set_line_body($3, @1.end_pos.lineno);
-			$$ = NEW_BEGIN($3, &@$);
-			nd_set_line($$, @1.end_pos.lineno);
-		    /*% %*/
-		    /*% ripper: begin!($3) %*/
+			if ($3 == NULL) {
+			    $$ = NEW_NIL();
+			}
+			else {
+			    if (nd_type($3) == NODE_RESCUE ||
+				nd_type($3) == NODE_ENSURE)
+				nd_set_line($3, $<num>2);
+			    $$ = NEW_BEGIN($3);
+			}
+			nd_set_line($$, $<num>2);
+		    /*%
+			$$ = dispatch1(begin, $3);
+		    %*/
 		    }
 		| tLPAREN_ARG {SET_LEX_STATE(EXPR_ENDARG);} rparen
 		    {
 		    /*%%%*/
-			$$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper: paren!(0) %*/
+			$$ = 0;
+		    /*%
+			$$ = dispatch1(paren, 0);
+		    %*/
+		    }
+		| tLPAREN_ARG
+		    {
+			$<val>1 = cmdarg_stack;
+			CMDARG_SET(0);
 		    }
-		| tLPAREN_ARG stmt {SET_LEX_STATE(EXPR_ENDARG);} rparen
+		  stmt {SET_LEX_STATE(EXPR_ENDARG);} rparen
 		    {
+			CMDARG_SET($<val>1);
 		    /*%%%*/
-			$$ = $2;
-		    /*% %*/
-		    /*% ripper: paren!($2) %*/
+			$$ = $3;
+		    /*%
+			$$ = dispatch1(paren, $3);
+		    %*/
 		    }
 		| tLPAREN compstmt ')'
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: paren!($2) %*/
+		    /*%
+			$$ = dispatch1(paren, $2);
+		    %*/
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
 		    /*%%%*/
-			$$ = NEW_COLON2($1, $3, &@$);
-		    /*% %*/
-		    /*% ripper: const_path_ref!($1, $3) %*/
+			$$ = NEW_COLON2($1, $3);
+		    /*%
+			$$ = dispatch2(const_path_ref, $1, $3);
+		    %*/
 		    }
 		| tCOLON3 tCONSTANT
 		    {
 		    /*%%%*/
-			$$ = NEW_COLON3($2, &@$);
-		    /*% %*/
-		    /*% ripper: top_const_ref!($2) %*/
+			$$ = NEW_COLON3($2);
+		    /*%
+			$$ = dispatch1(top_const_ref, $2);
+		    %*/
 		    }
 		| tLBRACK aref_args ']'
 		    {
 		    /*%%%*/
-			$$ = make_array($2, &@$);
-		    /*% %*/
-		    /*% ripper: array!(escape_Qundef($2)) %*/
+			if ($2 == 0) {
+			    $$ = NEW_ZARRAY(); /* zero length array*/
+			}
+			else {
+			    $$ = $2;
+			}
+		    /*%
+			$$ = dispatch1(array, escape_Qundef($2));
+		    %*/
 		    }
 		| tLBRACE assoc_list '}'
 		    {
 		    /*%%%*/
-			$$ = new_hash(p, $2, &@$);
-			$$->nd_alen = TRUE;
-		    /*% %*/
-		    /*% ripper: hash!(escape_Qundef($2)) %*/
+			$$ = new_hash($2);
+		    /*%
+			$$ = dispatch1(hash, escape_Qundef($2));
+		    %*/
 		    }
-		| k_return
+		| keyword_return
 		    {
 		    /*%%%*/
-			$$ = NEW_RETURN(0, &@$);
-		    /*% %*/
-		    /*% ripper: return0! %*/
+			$$ = NEW_RETURN(0);
+		    /*%
+			$$ = dispatch0(return0);
+		    %*/
 		    }
 		| keyword_yield '(' call_args rparen
 		    {
 		    /*%%%*/
-			$$ = new_yield(p, $3, &@$);
-		    /*% %*/
-		    /*% ripper: yield!(paren!($3)) %*/
+			$$ = new_yield($3);
+		    /*%
+			$$ = dispatch1(yield, dispatch1(paren, $3));
+		    %*/
 		    }
 		| keyword_yield '(' rparen
 		    {
 		    /*%%%*/
-			$$ = NEW_YIELD(0, &@$);
-		    /*% %*/
-		    /*% ripper: yield!(paren!(args_new!)) %*/
+			$$ = NEW_YIELD(0);
+		    /*%
+			$$ = dispatch1(yield, dispatch1(paren, arg_new()));
+		    %*/
 		    }
 		| keyword_yield
 		    {
 		    /*%%%*/
-			$$ = NEW_YIELD(0, &@$);
-		    /*% %*/
-		    /*% ripper: yield0! %*/
+			$$ = NEW_YIELD(0);
+		    /*%
+			$$ = dispatch0(yield0);
+		    %*/
 		    }
-		| keyword_defined opt_nl '(' {p->in_defined = 1;} expr rparen
+		| keyword_defined opt_nl '(' {in_defined = 1;} expr rparen
 		    {
-			p->in_defined = 0;
-			$$ = new_defined(p, $5, &@$);
+			in_defined = 0;
+		    /*%%%*/
+			$$ = new_defined($5);
+		    /*%
+			$$ = dispatch1(defined, $5);
+		    %*/
 		    }
 		| keyword_not '(' expr rparen
 		    {
-			$$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op(cond($3), '!');
+		    /*%
+			$$ = dispatch2(unary, ripper_intern("not"), $3);
+		    %*/
 		    }
 		| keyword_not '(' rparen
 		    {
-			$$ = call_uni_op(p, method_cond(p, new_nil(&@2), &@2), METHOD_NOT, &@1, &@$);
+		    /*%%%*/
+			$$ = call_uni_op(cond(NEW_NIL()), '!');
+		    /*%
+			$$ = dispatch2(unary, ripper_intern("not"), Qnil);
+		    %*/
 		    }
 		| fcall brace_block
 		    {
 		    /*%%%*/
-			$$ = method_add_block(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_block!(method_add_arg!(fcall!($1), args_new!), $2) %*/
+			$2->nd_iter = $1;
+			$$ = $2;
+		    /*%
+			$$ = method_arg(dispatch1(fcall, $1), arg_new());
+			$$ = method_add_block($$, $2);
+		    %*/
 		    }
 		| method_call
 		| method_call brace_block
 		    {
 		    /*%%%*/
-			block_dup_check(p, $1->nd_args, $2);
-			$$ = method_add_block(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_block!($1, $2) %*/
-		    }
-		| tLAMBDA
-		    {
-			token_info_push(p, "->", &@1);
+			block_dup_check($1->nd_args, $2);
+			$2->nd_iter = $1;
+			$$ = $2;
+		    /*%
+			$$ = method_add_block($1, $2);
+		    %*/
 		    }
-		  lambda
+		| tLAMBDA lambda
 		    {
-			$$ = $3;
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*% %*/
+			$$ = $2;
 		    }
 		| k_if expr_value then
 		  compstmt
@@ -2459,10 +2816,11 @@ primary		: literal
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = new_if(p, $2, $4, $5, &@$);
+			$$ = new_if($2, $4, $5);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: if!($2, $4, escape_Qundef($5)) %*/
+		    /*%
+			$$ = dispatch3(if, $2, $4, escape_Qundef($5));
+		    %*/
 		    }
 		| k_unless expr_value then
 		  compstmt
@@ -2470,49 +2828,57 @@ primary		: literal
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = new_unless(p, $2, $4, $5, &@$);
+			$$ = new_unless($2, $4, $5);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: unless!($2, $4, escape_Qundef($5)) %*/
+		    /*%
+			$$ = dispatch3(unless, $2, $4, escape_Qundef($5));
+		    %*/
 		    }
-		| k_while expr_value_do
+		| k_while {COND_PUSH(1);} expr_value do {COND_POP();}
 		  compstmt
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_WHILE(cond(p, $2, &@2), $3, 1, &@$);
-			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: while!($2, $3) %*/
+			$$ = NEW_WHILE(cond($3), $6, 1);
+			fixpos($$, $3);
+		    /*%
+			$$ = dispatch2(while, $3, $6);
+		    %*/
 		    }
-		| k_until expr_value_do
+		| k_until {COND_PUSH(1);} expr_value do {COND_POP();}
 		  compstmt
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_UNTIL(cond(p, $2, &@2), $3, 1, &@$);
-			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: until!($2, $3) %*/
+			$$ = NEW_UNTIL(cond($3), $6, 1);
+			fixpos($$, $3);
+		    /*%
+			$$ = dispatch2(until, $3, $6);
+		    %*/
 		    }
 		| k_case expr_value opt_terms
 		  case_body
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_CASE($2, $4, &@$);
+			$$ = NEW_CASE($2, $4);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: case!($2, $4) %*/
+		    /*%
+			$$ = dispatch2(case, $2, $4);
+		    %*/
 		    }
 		| k_case opt_terms case_body k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_CASE2($3, &@$);
-		    /*% %*/
-		    /*% ripper: case!(Qnil, $3) %*/
+			$$ = NEW_CASE(0, $3);
+		    /*%
+			$$ = dispatch2(case, Qnil, $3);
+		    %*/
 		    }
-		| k_for for_var keyword_in expr_value_do
+		| k_for for_var keyword_in
+		  {COND_PUSH(1);}
+		  expr_value do
+		  {COND_POP();}
 		  compstmt
 		  k_end
 		    {
@@ -2526,114 +2892,109 @@ primary		: literal
 			 *  #=>
 			 *  e.each{|x| a, = x}
 			 */
-			ID id = internal_id(p);
-			NODE *m = NEW_ARGS_AUX(0, 0, &NULL_LOC);
-			NODE *args, *scope, *internal_var = NEW_DVAR(id, &@2);
-			rb_imemo_tmpbuf_t *tmpbuf = new_tmpbuf();
+			ID id = internal_id();
 			ID *tbl = ALLOC_N(ID, 2);
-			tbl[0] = 1 /* length of local var table */; tbl[1] = id /* internal id */;
-			tmpbuf->ptr = (VALUE *)tbl;
+			NODE *m = NEW_ARGS_AUX(0, 0);
+			NODE *args, *scope;
 
 			switch (nd_type($2)) {
+			  case NODE_MASGN:
+			    m->nd_next = node_assign($2, NEW_FOR(NEW_DVAR(id), 0, 0));
+			    args = new_args(m, 0, id, 0, new_args_tail(0, 0, 0));
+			    break;
 			  case NODE_LASGN:
 			  case NODE_DASGN:
-			  case NODE_DASGN_CURR: /* e.each {|internal_var| a = internal_var; ... } */
-			    $2->nd_value = internal_var;
-			    id = 0;
+			  case NODE_DASGN_CURR:
+			    $2->nd_value = NEW_DVAR(id);
 			    m->nd_plen = 1;
 			    m->nd_next = $2;
+			    args = new_args(m, 0, 0, 0, new_args_tail(0, 0, 0));
 			    break;
-			  case NODE_MASGN: /* e.each {|*internal_var| a, b, c = (internal_var.length == 1 && Array === (tmp = internal_var[0]) ? tmp : internal_var); ... } */
-			    m->nd_next = node_assign(p, $2, NEW_FOR_MASGN(internal_var, &@2), &@2);
+			  default:
+			    m->nd_next = node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id));
+			    args = new_args(m, 0, id, 0, new_args_tail(0, 0, 0));
 			    break;
-			  default: /* e.each {|*internal_var| @a, B, c[1], d.attr = internal_val; ... } */
-			    m->nd_next = node_assign(p, NEW_MASGN(NEW_LIST($2, &@2), 0, &@2), internal_var, &@2);
 			}
-			/* {|*internal_id| <m> = internal_id; ... } */
-			args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@2), &@2);
-			scope = NEW_NODE(NODE_SCOPE, tbl, $5, args, &@$);
-			$$ = NEW_FOR($4, scope, &@$);
+			scope = NEW_NODE(NODE_SCOPE, tbl, $8, args);
+			tbl[0] = 1; tbl[1] = id;
+			$$ = NEW_FOR(0, $5, scope);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: for!($2, $4, $5) %*/
+		    /*%
+			$$ = dispatch3(for, $2, $5, $8);
+		    %*/
 		    }
 		| k_class cpath superclass
 		    {
-			if (p->in_def) {
-			    YYLTYPE loc = code_loc_gen(&@1, &@2);
-			    yyerror1(&loc, "class definition in method body");
-			}
-			$<num>1 = p->in_class;
-			p->in_class = 1;
-			local_push(p, 0);
+			if (in_def || in_single)
+			    yyerror("class definition in method body");
+			local_push(0);
+		    /*%%%*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+		    %*/
 		    }
 		  bodystmt
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_CLASS($2, $5, $3, &@$);
-			nd_set_line($$->nd_body, @6.end_pos.lineno);
-			set_line_body($5, @3.end_pos.lineno);
-			nd_set_line($$, @3.end_pos.lineno);
-		    /*% %*/
-		    /*% ripper: class!($2, $3, $5) %*/
-			local_pop(p);
-			p->in_class = $<num>1 & 1;
+			$$ = NEW_CLASS($2, $5, $3);
+			nd_set_line($$, $<num>4);
+		    /*%
+			$$ = dispatch3(class, $2, $3, $5);
+		    %*/
+			local_pop();
 		    }
 		| k_class tLSHFT expr
 		    {
-			$<num>$ = (p->in_class << 1) | p->in_def;
-			p->in_def = 0;
-			p->in_class = 0;
-			local_push(p, 0);
+			$<num>$ = (in_def << 1) | in_single;
+			in_def = 0;
+			in_single = 0;
+			local_push(0);
 		    }
 		  term
 		  bodystmt
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_SCLASS($3, $6, &@$);
-			nd_set_line($$->nd_body, @7.end_pos.lineno);
-			set_line_body($6, nd_line($3));
+			$$ = NEW_SCLASS($3, $6);
 			fixpos($$, $3);
-		    /*% %*/
-		    /*% ripper: sclass!($3, $6) %*/
-			local_pop(p);
-			p->in_def = $<num>4 & 1;
-			p->in_class = ($<num>4 >> 1) & 1;
+		    /*%
+			$$ = dispatch2(sclass, $3, $6);
+		    %*/
+			local_pop();
+			in_def = ($<num>4 >> 1) & 1;
+			in_single = $<num>4 & 1;
 		    }
 		| k_module cpath
 		    {
-			if (p->in_def) {
-			    YYLTYPE loc = code_loc_gen(&@1, &@2);
-			    yyerror1(&loc, "module definition in method body");
-			}
-			$<num>1 = p->in_class;
-			p->in_class = 1;
-			local_push(p, 0);
+			if (in_def || in_single)
+			    yyerror("module definition in method body");
+			local_push(0);
+		    /*%%%*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+		    %*/
 		    }
 		  bodystmt
 		  k_end
 		    {
 		    /*%%%*/
-			$$ = NEW_MODULE($2, $4, &@$);
-			nd_set_line($$->nd_body, @5.end_pos.lineno);
-			set_line_body($4, @2.end_pos.lineno);
-			nd_set_line($$, @2.end_pos.lineno);
-		    /*% %*/
-		    /*% ripper: module!($2, $4) %*/
-			local_pop(p);
-			p->in_class = $<num>1 & 1;
+			$$ = NEW_MODULE($2, $4);
+			nd_set_line($$, $<num>3);
+		    /*%
+			$$ = dispatch2(module, $2, $4);
+		    %*/
+			local_pop();
 		    }
 		| k_def fname
 		    {
-			local_push(p, 0);
-			$<id>$ = p->cur_arg;
-			p->cur_arg = 0;
+			local_push(0);
+			$<id>$ = current_arg;
+			current_arg = 0;
 		    }
 		    {
-			$<num>$ = p->in_def;
-			p->in_def = 1;
+			$<num>$ = in_def;
+			in_def = 1;
 		    }
 		  f_arglist
 		  bodystmt
@@ -2641,24 +3002,24 @@ primary		: literal
 		    {
 		    /*%%%*/
 			NODE *body = remove_begin($6);
-			reduce_nodes(p, &body);
-			$$ = NEW_DEFN($2, $5, body, &@$);
-			nd_set_line($$->nd_defn, @7.end_pos.lineno);
-			set_line_body(body, @1.beg_pos.lineno);
-		    /*% %*/
-		    /*% ripper: def!($2, $5, $6) %*/
-			local_pop(p);
-			p->in_def = $<num>4 & 1;
-			p->cur_arg = $<id>3;
+			reduce_nodes(&body);
+			$$ = NEW_DEFN($2, $5, body, METHOD_VISI_PRIVATE);
+			nd_set_line($$, $<num>1);
+		    /*%
+			$$ = dispatch3(def, $2, $5, $6);
+		    %*/
+			local_pop();
+			in_def = $<num>4 & 1;
+			current_arg = $<id>3;
 		    }
 		| k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname
 		    {
-			$<num>4 = p->in_def;
-			p->in_def = 1;
+			$<num>4 = in_single;
+			in_single = 1;
 			SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */
-			local_push(p, 0);
-			$<id>$ = p->cur_arg;
-			p->cur_arg = 0;
+			local_push(0);
+			$<id>$ = current_arg;
+			current_arg = 0;
 		    }
 		  f_arglist
 		  bodystmt
@@ -2666,199 +3027,175 @@ primary		: literal
 		    {
 		    /*%%%*/
 			NODE *body = remove_begin($8);
-			reduce_nodes(p, &body);
-			$$ = NEW_DEFS($2, $5, $7, body, &@$);
-			nd_set_line($$->nd_defn, @9.end_pos.lineno);
-			set_line_body(body, @1.beg_pos.lineno);
-		    /*% %*/
-		    /*% ripper: defs!($2, $3, $5, $7, $8) %*/
-			local_pop(p);
-			p->in_def = $<num>4 & 1;
-			p->cur_arg = $<id>6;
+			reduce_nodes(&body);
+			$$ = NEW_DEFS($2, $5, $7, body);
+			nd_set_line($$, $<num>1);
+		    /*%
+			$$ = dispatch5(defs, $2, $3, $5, $7, $8);
+		    %*/
+			local_pop();
+			in_single = $<num>4 & 1;
+			current_arg = $<id>6;
 		    }
 		| keyword_break
 		    {
 		    /*%%%*/
-			$$ = NEW_BREAK(0, &@$);
-		    /*% %*/
-		    /*% ripper: break!(args_new!) %*/
+			$$ = NEW_BREAK(0);
+		    /*%
+			$$ = dispatch1(break, arg_new());
+		    %*/
 		    }
 		| keyword_next
 		    {
 		    /*%%%*/
-			$$ = NEW_NEXT(0, &@$);
-		    /*% %*/
-		    /*% ripper: next!(args_new!) %*/
+			$$ = NEW_NEXT(0);
+		    /*%
+			$$ = dispatch1(next, arg_new());
+		    %*/
 		    }
 		| keyword_redo
 		    {
 		    /*%%%*/
-			$$ = NEW_REDO(&@$);
-		    /*% %*/
-		    /*% ripper: redo! %*/
+			$$ = NEW_REDO();
+		    /*%
+			$$ = dispatch0(redo);
+		    %*/
 		    }
 		| keyword_retry
 		    {
 		    /*%%%*/
-			$$ = NEW_RETRY(&@$);
-		    /*% %*/
-		    /*% ripper: retry! %*/
+			$$ = NEW_RETRY();
+		    /*%
+			$$ = dispatch0(retry);
+		    %*/
 		    }
 		;
 
 primary_value	: primary
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+			if (!$$) $$ = NEW_NIL();
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		;
 
 k_begin		: keyword_begin
 		    {
-			token_info_push(p, "begin", &@$);
+			token_info_push("begin");
 		    }
 		;
 
 k_if		: keyword_if
 		    {
-			token_info_push(p, "if", &@$);
+			token_info_push("if");
 		    }
 		;
 
 k_unless	: keyword_unless
 		    {
-			token_info_push(p, "unless", &@$);
+			token_info_push("unless");
 		    }
 		;
 
 k_while		: keyword_while
 		    {
-			token_info_push(p, "while", &@$);
+			token_info_push("while");
 		    }
 		;
 
 k_until		: keyword_until
 		    {
-			token_info_push(p, "until", &@$);
+			token_info_push("until");
 		    }
 		;
 
 k_case		: keyword_case
 		    {
-			token_info_push(p, "case", &@$);
+			token_info_push("case");
 		    }
 		;
 
 k_for		: keyword_for
 		    {
-			token_info_push(p, "for", &@$);
+			token_info_push("for");
 		    }
 		;
 
 k_class		: keyword_class
 		    {
-			token_info_push(p, "class", &@$);
+			token_info_push("class");
 		    }
 		;
 
 k_module	: keyword_module
 		    {
-			token_info_push(p, "module", &@$);
+			token_info_push("module");
 		    }
 		;
 
 k_def		: keyword_def
 		    {
-			token_info_push(p, "def", &@$);
-		    }
-		;
-
-k_do		: keyword_do
-		    {
-			token_info_push(p, "do", &@$);
-		    }
-		;
-
-k_do_block	: keyword_do_block
-		    {
-			token_info_push(p, "do", &@$);
-		    }
-		;
-
-k_rescue	: keyword_rescue
-		    {
-			token_info_warn(p, "rescue", p->token_info, 1, &@$);
-		    }
-		;
-
-k_ensure	: keyword_ensure
-		    {
-			token_info_warn(p, "ensure", p->token_info, 1, &@$);
-		    }
-		;
-
-k_when		: keyword_when
-		    {
-			token_info_warn(p, "when", p->token_info, 0, &@$);
-		    }
-		;
-
-k_else		: keyword_else
-		    {
-			token_info *ptinfo_beg = p->token_info;
-			int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0;
-			token_info_warn(p, "else", p->token_info, same, &@$);
-		    }
-		;
-
-k_elsif 	: keyword_elsif
-		    {
-			token_info_warn(p, "elsif", p->token_info, 1, &@$);
+			token_info_push("def");
+		    /*%%%*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+		    %*/
 		    }
 		;
 
 k_end		: keyword_end
 		    {
-			token_info_pop(p, "end", &@$);
-		    }
-		;
-
-k_return	: keyword_return
-		    {
-			if (p->in_class && !p->in_def && !dyna_in_block(p))
-			    yyerror1(&@1, "Invalid return in class/module body");
+			token_info_pop("end");
 		    }
 		;
 
 then		: term
+		    /*%c%*/
+		    /*%c
+		    { $$ = Qnil; }
+		    %*/
 		| keyword_then
 		| term keyword_then
+		    /*%c%*/
+		    /*%c
+		    { $$ = $2; }
+		    %*/
 		;
 
 do		: term
+		    /*%c%*/
+		    /*%c
+		    { $$ = Qnil; }
+		    %*/
 		| keyword_do_cond
 		;
 
 if_tail		: opt_else
-		| k_elsif expr_value then
+		| keyword_elsif expr_value then
 		  compstmt
 		  if_tail
 		    {
 		    /*%%%*/
-			$$ = new_if(p, $2, $4, $5, &@$);
+			$$ = new_if($2, $4, $5);
 			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: elsif!($2, $4, escape_Qundef($5)) %*/
+		    /*%
+			$$ = dispatch3(elsif, $2, $4, escape_Qundef($5));
+		    %*/
 		    }
 		;
 
 opt_else	: none
-		| k_else compstmt
+		| keyword_else compstmt
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: else!($2) %*/
+		    /*%
+			$$ = dispatch1(else, $2);
+		    %*/
 		    }
 		;
 
@@ -2868,117 +3205,137 @@ for_var		: lhs
 
 f_marg		: f_norm_arg
 		    {
+			$$ = assignable($1, 0);
 		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, $1) %*/
+		    /*%
+			$$ = dispatch1(mlhs_paren, $$);
+		    %*/
 		    }
 		| tLPAREN f_margs rparen
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: mlhs_paren!($2) %*/
+		    /*%
+			$$ = dispatch1(mlhs_paren, $2);
+		    %*/
 		    }
 		;
 
 f_marg_list	: f_marg
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = mlhs_add(mlhs_new(), $1);
+		    %*/
 		    }
 		| f_marg_list ',' f_marg
 		    {
 		    /*%%%*/
-			$$ = list_append(p, $1, $3);
-		    /*% %*/
-		    /*% ripper: mlhs_add!($1, $3) %*/
+			$$ = list_append($1, $3);
+		    /*%
+			$$ = mlhs_add($1, $3);
+		    %*/
 		    }
 		;
 
 f_margs		: f_marg_list
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: $1 %*/
+			$$ = NEW_MASGN($1, 0);
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		| f_marg_list ',' tSTAR f_norm_arg
 		    {
+			$$ = assignable($4, 0);
 		    /*%%%*/
-			$$ = NEW_MASGN($1, assignable(p, $4, 0, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!($1, assignable(p, $4)) %*/
+			$$ = NEW_MASGN($1, $$);
+		    /*%
+			$$ = mlhs_add_star($1, $$);
+		    %*/
 		    }
 		| f_marg_list ',' tSTAR f_norm_arg ',' f_marg_list
 		    {
+			$$ = assignable($4, 0);
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NEW_POSTARG(assignable(p, $4, 0, &@$), $6, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, assignable(p, $4)), $6) %*/
+			$$ = NEW_MASGN($1, NEW_POSTARG($$, $6));
+		    /*%
+			$$ = mlhs_add_star($1, $$);
+		    %*/
 		    }
 		| f_marg_list ',' tSTAR
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!($1, Qnil) %*/
+			$$ = NEW_MASGN($1, -1);
+		    /*%
+			$$ = mlhs_add_star($1, Qnil);
+		    %*/
 		    }
 		| f_marg_list ',' tSTAR ',' f_marg_list
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $5, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $5) %*/
+			$$ = NEW_MASGN($1, NEW_POSTARG(-1, $5));
+		    /*%
+			$$ = mlhs_add_star($1, $5);
+		    %*/
 		    }
 		| tSTAR f_norm_arg
 		    {
+			$$ = assignable($2, 0);
 		    /*%%%*/
-			$$ = NEW_MASGN(0, assignable(p, $2, 0, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!(mlhs_new!, assignable(p, $2)) %*/
+			$$ = NEW_MASGN(0, $$);
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), $$);
+		    %*/
 		    }
 		| tSTAR f_norm_arg ',' f_marg_list
 		    {
+			$$ = assignable($2, 0);
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NEW_POSTARG(assignable(p, $2, 0, &@$), $4, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, assignable(p, $2)), $4) %*/
+			$$ = NEW_MASGN(0, NEW_POSTARG($$, $4));
+		    /*%
+		      #if 0
+		      TODO: Check me
+		      #endif
+			$$ = mlhs_add_star($$, $4);
+		    %*/
 		    }
 		| tSTAR
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/
+			$$ = NEW_MASGN(0, -1);
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), Qnil);
+		    %*/
 		    }
 		| tSTAR ',' f_marg_list
 		    {
 		    /*%%%*/
-			$$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/
+			$$ = NEW_MASGN(0, NEW_POSTARG(-1, $3));
+		    /*%
+			$$ = mlhs_add_star(mlhs_new(), Qnil);
+		    %*/
 		    }
 		;
 
 
 block_args_tail	: f_block_kwarg ',' f_kwrest opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, $1, $3, $4, &@3);
+			$$ = new_args_tail($1, $3, $4);
 		    }
 		| f_block_kwarg opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, $1, Qnone, $2, &@1);
+			$$ = new_args_tail($1, Qnone, $2);
 		    }
 		| f_kwrest opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, Qnone, $1, $2, &@1);
+			$$ = new_args_tail(Qnone, $1, $2);
 		    }
 		| f_block_arg
 		    {
-			$$ = new_args_tail(p, Qnone, Qnone, $1, &@1);
+			$$ = new_args_tail(Qnone, Qnone, $1);
 		    }
 		;
 
@@ -2988,106 +3345,110 @@ opt_block_args_tail : ',' block_args_tail
 		    }
 		| /* none */
 		    {
-			$$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
+			$$ = new_args_tail(Qnone, Qnone, Qnone);
 		    }
 		;
 
 block_param	: f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, $3, $5, Qnone, $6, &@$);
+			$$ = new_args($1, $3, $5, Qnone, $6);
 		    }
 		| f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, $3, $5, $7, $8, &@$);
+			$$ = new_args($1, $3, $5, $7, $8);
 		    }
 		| f_arg ',' f_block_optarg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$);
+			$$ = new_args($1, $3, Qnone, Qnone, $4);
 		    }
 		| f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, $3, Qnone, $5, $6, &@$);
+			$$ = new_args($1, $3, Qnone, $5, $6);
 		    }
                 | f_arg ',' f_rest_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$);
+			$$ = new_args($1, Qnone, $3, Qnone, $4);
 		    }
 		| f_arg ','
 		    {
+			$$ = new_args($1, Qnone, 1, Qnone, new_args_tail(Qnone, Qnone, Qnone));
 		    /*%%%*/
-			/* magic number for rest_id in iseq_set_arguments() */
-			const ID excessed_comma = 1;
-			$$ = new_args(p, $1, Qnone, excessed_comma, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, &@1), &@$);
-		    /*% %*/
-		    /*% ripper: new_args(p, $1, Qnone, excessed_comma!, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, NULL), NULL) %*/
+		    /*%
+                        dispatch1(excessed_comma, $$);
+		    %*/
 		    }
 		| f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, $3, $5, $6, &@$);
+			$$ = new_args($1, Qnone, $3, $5, $6);
 		    }
 		| f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$);
+			$$ = new_args($1, Qnone, Qnone, Qnone, $2);
 		    }
 		| f_block_optarg ',' f_rest_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$);
+			$$ = new_args(Qnone, $1, $3, Qnone, $4);
 		    }
 		| f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, $3, $5, $6, &@$);
+			$$ = new_args(Qnone, $1, $3, $5, $6);
 		    }
 		| f_block_optarg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$);
+			$$ = new_args(Qnone, $1, Qnone, Qnone, $2);
 		    }
 		| f_block_optarg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$);
+			$$ = new_args(Qnone, $1, Qnone, $3, $4);
 		    }
 		| f_rest_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$);
+			$$ = new_args(Qnone, Qnone, $1, Qnone, $2);
 		    }
 		| f_rest_arg ',' f_arg opt_block_args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$);
+			$$ = new_args(Qnone, Qnone, $1, $3, $4);
 		    }
 		| block_args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$);
+			$$ = new_args(Qnone, Qnone, Qnone, Qnone, $1);
 		    }
 		;
 
 opt_block_param	: none
 		| block_param_def
 		    {
-			p->command_start = TRUE;
+			command_start = TRUE;
 		    }
 		;
 
 block_param_def	: '|' opt_bv_decl '|'
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: block_var!(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), escape_Qundef($2)) %*/
+		    /*%
+			$$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil),
+                                          escape_Qundef($2));
+		    %*/
 		    }
 		| tOROP
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: block_var!(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), Qnil) %*/
+		    /*%
+			$$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil),
+                                          Qnil);
+		    %*/
 		    }
 		| '|' block_param opt_bv_decl '|'
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: block_var!(escape_Qundef($2), escape_Qundef($3)) %*/
+		    /*%
+			$$ = blockvar_new(escape_Qundef($2), escape_Qundef($3));
+		    %*/
 		    }
 		;
 
@@ -3100,21 +3461,35 @@ opt_bv_decl	: opt_nl
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: $3 %*/
+		    /*%
+			$$ = $3;
+		    %*/
 		    }
 		;
 
 bv_decls	: bvar
-		    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			$$ = rb_ary_new3(1, $1);
+		    }
+		    %*/
 		| bv_decls ',' bvar
-		    /*% ripper[brace]: rb_ary_push($1, get_value($3)) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			rb_ary_push($1, $3);
+		    }
+		    %*/
 		;
 
 bvar		: tIDENTIFIER
 		    {
-			new_bv(p, get_id($1));
-		    /*% ripper: get_value($1) %*/
+			new_bv(get_id($1));
+		    /*%%%*/
+		    /*%
+			$$ = get_value($1);
+		    %*/
 		    }
 		| f_bad_arg
 		    {
@@ -3123,30 +3498,32 @@ bvar		: tIDENTIFIER
 		;
 
 lambda		:   {
-			$<vars>$ = dyna_push(p);
+			$<vars>$ = dyna_push();
 		    }
 		    {
-			$<num>$ = p->lex.lpar_beg;
-			p->lex.lpar_beg = p->lex.paren_nest;
+			$<num>$ = lpar_beg;
+			lpar_beg = ++paren_nest;
 		    }
 		  f_larglist
 		    {
-			CMDARG_PUSH(0);
+			$<num>$ = ruby_sourceline;
+		    }
+		    {
+			$<val>$ = cmdarg_stack;
+			CMDARG_SET(0);
 		    }
 		  lambda_body
 		    {
-			p->lex.lpar_beg = $<num>2;
-			CMDARG_POP();
+			lpar_beg = $<num>2;
+			CMDARG_SET($<val>5);
+			CMDARG_LEXPOP();
 		    /*%%%*/
-                        {
-                            YYLTYPE loc = code_loc_gen(&@3, &@5);
-                            $$ = NEW_LAMBDA($3, $5, &loc);
-                            nd_set_line($$->nd_body, @5.end_pos.lineno);
-                            nd_set_line($$, @3.end_pos.lineno);
-                        }
-		    /*% %*/
-		    /*% ripper: lambda!($3, $5) %*/
-			dyna_pop(p, $<vars>1);
+			$$ = NEW_LAMBDA($3, $6);
+			nd_set_line($$, $<num>4);
+		    /*%
+			$$ = dispatch2(lambda, $3, $6);
+		    %*/
+			dyna_pop($<vars>1);
 		    }
 		;
 
@@ -3154,8 +3531,9 @@ f_larglist	: '(' f_args opt_bv_decl ')'
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: paren!($2) %*/
+		    /*%
+			$$ = dispatch1(paren, $2);
+		    %*/
 		    }
 		| f_args
 		    {
@@ -3165,59 +3543,84 @@ f_larglist	: '(' f_args opt_bv_decl ')'
 
 lambda_body	: tLAMBEG compstmt '}'
 		    {
-			token_info_pop(p, "}", &@3);
+			token_info_pop("}");
 			$$ = $2;
 		    }
-		| keyword_do_LAMBDA bodystmt k_end
+		| keyword_do_LAMBDA compstmt k_end
 		    {
 			$$ = $2;
 		    }
 		;
 
-do_block	: k_do_block do_body k_end
+do_block	: keyword_do_block
 		    {
-			$$ = $2;
+			$<vars>1 = dyna_push();
 		    /*%%%*/
-			$$->nd_body->nd_loc = code_loc_gen(&@1, &@3);
-			nd_set_line($$, @1.end_pos.lineno);
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
 		    }
+		  opt_block_param
+		  compstmt
+		  keyword_end
+		    {
+		    /*%%%*/
+			$$ = NEW_ITER($3,$4);
+			nd_set_line($$, $<num>2);
+		    /*%
+			$$ = dispatch2(do_block, escape_Qundef($3), $4);
+		    %*/
+			dyna_pop($<vars>1);
+		    }
 		;
 
 block_call	: command do_block
 		    {
 		    /*%%%*/
 			if (nd_type($1) == NODE_YIELD) {
-			    compile_error(p, "block given to yield");
+			    compile_error(PARSER_ARG "block given to yield");
 			}
 			else {
-			    block_dup_check(p, $1->nd_args, $2);
+			    block_dup_check($1->nd_args, $2);
 			}
-			$$ = method_add_block(p, $1, $2, &@$);
+			$2->nd_iter = $1;
+			$$ = $2;
 			fixpos($$, $1);
-		    /*% %*/
-		    /*% ripper: method_add_block!($1, $2) %*/
+		    /*%
+			$$ = method_add_block($1, $2);
+		    %*/
 		    }
 		| block_call call_op2 operation2 opt_paren_args
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
+			$$ = NEW_QCALL($2, $1, $3, $4);
+		    /*%
+			$$ = dispatch3(call, $1, $2, $3);
+			$$ = method_optarg($$, $4);
+		    %*/
 		    }
 		| block_call call_op2 operation2 opt_paren_args brace_block
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: opt_event(:method_add_block!, command_call!($1, $2, $3, $4), $5) %*/
+			block_dup_check($4, $5);
+			$5->nd_iter = NEW_QCALL($2, $1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, $2, $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
 		    }
 		| block_call call_op2 operation2 command_args do_block
 		    {
 		    /*%%%*/
-			$$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
+			block_dup_check($4, $5);
+			$5->nd_iter = NEW_QCALL($2, $1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, $2, $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
 		    }
 		;
 
@@ -3226,127 +3629,162 @@ method_call	: fcall paren_args
 		    /*%%%*/
 			$$ = $1;
 			$$->nd_args = $2;
-			nd_set_last_loc($1, @2.end_pos);
-		    /*% %*/
-		    /*% ripper: method_add_arg!(fcall!($1), $2) %*/
+		    /*%
+			$$ = method_arg(dispatch1(fcall, $1), $2);
+		    %*/
 		    }
-		| primary_value call_op operation2 opt_paren_args
+		| primary_value call_op operation2
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-			nd_set_line($$, @3.end_pos.lineno);
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
-		    /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
 		    }
-		| primary_value tCOLON2 operation2 paren_args
+		  opt_paren_args
+		    {
+		    /*%%%*/
+			$$ = NEW_QCALL($2, $1, $3, $5);
+			nd_set_line($$, $<num>4);
+		    /*%
+			$$ = dispatch3(call, $1, $2, $3);
+			$$ = method_optarg($$, $5);
+		    %*/
+		    }
+		| primary_value tCOLON2 operation2
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$);
-			nd_set_line($$, @3.end_pos.lineno);
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
-		    /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %*/
+		    }
+		  paren_args
+		    {
+		    /*%%%*/
+			$$ = NEW_CALL($1, $3, $5);
+			nd_set_line($$, $<num>4);
+		    /*%
+			$$ = dispatch3(call, $1, ripper_id2sym(idCOLON2), $3);
+			$$ = method_optarg($$, $5);
+		    %*/
 		    }
 		| primary_value tCOLON2 operation3
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$);
-		    /*% %*/
-		    /*% ripper: call!($1, ID2VAL(idCOLON2), $3) %*/
+			$$ = NEW_CALL($1, $3, 0);
+		    /*%
+			$$ = dispatch3(call, $1, ID2SYM(idCOLON2), $3);
+		    %*/
 		    }
-		| primary_value call_op paren_args
+		| primary_value call_op
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, $2, $1, ID2VAL(idCall), $3, &@2, &@$);
-			nd_set_line($$, @2.end_pos.lineno);
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
-		    /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/
 		    }
-		| primary_value tCOLON2 paren_args
+		  paren_args
+		    {
+		    /*%%%*/
+			$$ = NEW_QCALL($2, $1, idCall, $4);
+			nd_set_line($$, $<num>3);
+		    /*%
+			$$ = dispatch3(call, $1, $2, ID2SYM(idCall));
+			$$ = method_optarg($$, $4);
+		    %*/
+		    }
+		| primary_value tCOLON2
 		    {
 		    /*%%%*/
-			$$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$);
-			nd_set_line($$, @2.end_pos.lineno);
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
-		    /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %*/
+		    }
+		  paren_args
+		    {
+		    /*%%%*/
+			$$ = NEW_CALL($1, idCall, $4);
+			nd_set_line($$, $<num>3);
+		    /*%
+			$$ = dispatch3(call, $1, ID2SYM(idCOLON2),
+				       ID2SYM(idCall));
+			$$ = method_optarg($$, $4);
+		    %*/
 		    }
 		| keyword_super paren_args
 		    {
 		    /*%%%*/
-			$$ = NEW_SUPER($2, &@$);
-		    /*% %*/
-		    /*% ripper: super!($2) %*/
+			$$ = NEW_SUPER($2);
+		    /*%
+			$$ = dispatch1(super, $2);
+		    %*/
 		    }
 		| keyword_super
 		    {
 		    /*%%%*/
-			$$ = NEW_ZSUPER(&@$);
-		    /*% %*/
-		    /*% ripper: zsuper! %*/
+			$$ = NEW_ZSUPER();
+		    /*%
+			$$ = dispatch0(zsuper);
+		    %*/
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
 		    /*%%%*/
 			if ($1 && nd_type($1) == NODE_SELF)
-			    $$ = NEW_FCALL(tAREF, $3, &@$);
+			    $$ = NEW_FCALL(tAREF, $3);
 			else
-			    $$ = NEW_CALL($1, tAREF, $3, &@$);
+			    $$ = NEW_CALL($1, tAREF, $3);
 			fixpos($$, $1);
-		    /*% %*/
-		    /*% ripper: aref!($1, escape_Qundef($3)) %*/
+		    /*%
+			$$ = dispatch2(aref, $1, escape_Qundef($3));
+		    %*/
 		    }
 		;
 
-brace_block	: '{' brace_body '}'
+brace_block	: '{'
 		    {
-			$$ = $2;
+			$<vars>1 = dyna_push();
 		    /*%%%*/
-			$$->nd_body->nd_loc = code_loc_gen(&@1, &@3);
-			nd_set_line($$, @1.end_pos.lineno);
-		    /*% %*/
+			$<num>$ = ruby_sourceline;
+		    /*%
+                    %*/
 		    }
-		| k_do do_body k_end
+		  opt_block_param
+		  compstmt '}'
 		    {
-			$$ = $2;
 		    /*%%%*/
-			$$->nd_body->nd_loc = code_loc_gen(&@1, &@3);
-			nd_set_line($$, @1.end_pos.lineno);
-		    /*% %*/
+			$$ = NEW_ITER($3,$4);
+			nd_set_line($$, $<num>2);
+		    /*%
+			$$ = dispatch2(brace_block, escape_Qundef($3), $4);
+		    %*/
+			dyna_pop($<vars>1);
 		    }
-		;
-
-brace_body	: {$<vars>$ = dyna_push(p);}
-		  opt_block_param compstmt
+		| keyword_do
 		    {
+			$<vars>1 = dyna_push();
 		    /*%%%*/
-			$$ = NEW_ITER($2, $3, &@$);
-		    /*% %*/
-		    /*% ripper: brace_block!(escape_Qundef($2), $3) %*/
-			dyna_pop(p, $<vars>1);
+			$<num>$ = ruby_sourceline;
+		    /*%
+                    %*/
 		    }
-		;
-
-do_body 	: {$<vars>$ = dyna_push(p);}
-		  {CMDARG_PUSH(0);}
-		  opt_block_param bodystmt
+		  opt_block_param
+		  compstmt keyword_end
 		    {
 		    /*%%%*/
-			$$ = NEW_ITER($3, $4, &@$);
-		    /*% %*/
-		    /*% ripper: do_block!(escape_Qundef($3), $4) %*/
-			CMDARG_POP();
-			dyna_pop(p, $<vars>1);
+			$$ = NEW_ITER($3,$4);
+			nd_set_line($$, $<num>2);
+		    /*%
+			$$ = dispatch2(do_block, escape_Qundef($3), $4);
+		    %*/
+			dyna_pop($<vars>1);
 		    }
 		;
 
-case_body	: k_when args then
+case_body	: keyword_when args then
 		  compstmt
 		  cases
 		    {
 		    /*%%%*/
-			$$ = NEW_WHEN($2, $4, $5, &@$);
-			fixpos($$, $2);
-		    /*% %*/
-		    /*% ripper: when!($2, $4, escape_Qundef($5)) %*/
+			$$ = NEW_WHEN($2, $4, $5);
+		    /*%
+			$$ = dispatch3(when, $2, $4, escape_Qundef($5));
+		    %*/
 		    }
 		;
 
@@ -3354,17 +3792,24 @@ cases		: opt_else
 		| case_body
 		;
 
-opt_rescue	: k_rescue exc_list exc_var then
+opt_rescue	: keyword_rescue exc_list exc_var then
 		  compstmt
 		  opt_rescue
 		    {
 		    /*%%%*/
-			$$ = NEW_RESBODY($2,
-					 $3 ? block_append(p, node_assign(p, $3, NEW_ERRINFO(&@3), &@3), $5) : $5,
-					 $6, &@$);
+			if ($3) {
+			    $3 = node_assign($3, NEW_ERRINFO());
+			    $5 = block_append($3, $5);
+			}
+			$$ = NEW_RESBODY($2, $5, $6);
 			fixpos($$, $2?$2:$5);
-		    /*% %*/
-		    /*% ripper: rescue!(escape_Qundef($2), escape_Qundef($3), escape_Qundef($5), escape_Qundef($6)) %*/
+		    /*%
+			$$ = dispatch4(rescue,
+				       escape_Qundef($2),
+				       escape_Qundef($3),
+				       escape_Qundef($5),
+				       escape_Qundef($6));
+		    %*/
 		    }
 		| none
 		;
@@ -3372,16 +3817,18 @@ opt_rescue	: k_rescue exc_list exc_var then
 exc_list	: arg_value
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1, &@$);
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+			$$ = NEW_LIST($1);
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| mrhs
 		    {
 		    /*%%%*/
 			if (!($$ = splat_array($1))) $$ = $1;
-		    /*% %*/
-		    /*% ripper: $1 %*/
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		| none
 		;
@@ -3393,12 +3840,13 @@ exc_var		: tASSOC lhs
 		| none
 		;
 
-opt_ensure	: k_ensure compstmt
+opt_ensure	: keyword_ensure compstmt
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: ensure!($2) %*/
+		    /*%
+			$$ = dispatch1(ensure, $2);
+		    %*/
 		    }
 		| none
 		;
@@ -3407,9 +3855,10 @@ literal		: numeric
 		| symbol
 		    {
 		    /*%%%*/
-			$$ = NEW_LIT(ID2SYM($1), &@$);
-		    /*% %*/
-		    /*% ripper: symbol_literal!($1) %*/
+			$$ = NEW_LIT(ID2SYM($1));
+		    /*%
+			$$ = dispatch1(symbol_literal, $1);
+		    %*/
 		    }
 		| dsym
 		;
@@ -3419,14 +3868,15 @@ strings		: string
 		    /*%%%*/
 			NODE *node = $1;
 			if (!node) {
-			    node = NEW_STR(add_mark_object(p, STR_NEW0()), &@$);
+			    node = NEW_STR(STR_NEW0());
 			}
 			else {
-			    node = evstr2dstr(p, node);
+			    node = evstr2dstr(node);
 			}
 			$$ = node;
-		    /*% %*/
-		    /*% ripper: $1 %*/
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		;
 
@@ -3435,43 +3885,47 @@ string		: tCHAR
 		| string string1
 		    {
 		    /*%%%*/
-			$$ = literal_concat(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: string_concat!($1, $2) %*/
+			$$ = literal_concat($1, $2);
+		    /*%
+			$$ = dispatch2(string_concat, $1, $2);
+		    %*/
 		    }
 		;
 
 string1		: tSTRING_BEG string_contents tSTRING_END
 		    {
-		    /*%%%*/
-			$$ = heredoc_dedent(p, $2);
-			if ($$) nd_set_loc($$, &@$);
-		    /*% %*/
-		    /*% ripper: string_literal!(heredoc_dedent(p, $2)) %*/
+			$$ = new_string1(heredoc_dedent($2));
 		    }
 		;
 
 xstring		: tXSTRING_BEG xstring_contents tSTRING_END
 		    {
-		    /*%%%*/
-			$$ = new_xstring(p, heredoc_dedent(p, $2), &@$);
-		    /*% %*/
-		    /*% ripper: xstring_literal!(heredoc_dedent(p, $2)) %*/
+			$$ = new_xstring(heredoc_dedent($2));
 		    }
 		;
 
 regexp		: tREGEXP_BEG regexp_contents tREGEXP_END
 		    {
-			$$ = new_regexp(p, $2, $3, &@$);
+			$$ = new_regexp($2, $3);
 		    }
 		;
 
-words		: tWORDS_BEG ' ' word_list tSTRING_END
+words		: tWORDS_BEG ' ' tSTRING_END
 		    {
 		    /*%%%*/
-			$$ = make_array($3, &@$);
-		    /*% %*/
-		    /*% ripper: array!($3) %*/
+			$$ = NEW_ZARRAY();
+		    /*%
+			$$ = dispatch0(words_new);
+			$$ = dispatch1(array, $$);
+		    %*/
+		    }
+		| tWORDS_BEG word_list tSTRING_END
+		    {
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(array, $2);
+		    %*/
 		    }
 		;
 
@@ -3479,35 +3933,54 @@ word_list	: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: words_new! %*/
+		    /*%
+			$$ = dispatch0(words_new);
+		    %*/
 		    }
 		| word_list word ' '
 		    {
 		    /*%%%*/
-			$$ = list_append(p, $1, evstr2dstr(p, $2));
-		    /*% %*/
-		    /*% ripper: words_add!($1, $2) %*/
+			$$ = list_append($1, evstr2dstr($2));
+		    /*%
+			$$ = dispatch2(words_add, $1, $2);
+		    %*/
 		    }
 		;
 
 word		: string_content
-		    /*% ripper[brace]: word_add!(word_new!, $1) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			$$ = dispatch0(word_new);
+			$$ = dispatch2(word_add, $$, $1);
+		    }
+		    %*/
 		| word string_content
 		    {
 		    /*%%%*/
-			$$ = literal_concat(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: word_add!($1, $2) %*/
+			$$ = literal_concat($1, $2);
+		    /*%
+			$$ = dispatch2(word_add, $1, $2);
+		    %*/
 		    }
 		;
 
-symbols 	: tSYMBOLS_BEG ' ' symbol_list tSTRING_END
+symbols 	: tSYMBOLS_BEG ' ' tSTRING_END
 		    {
 		    /*%%%*/
-			$$ = make_array($3, &@$);
-		    /*% %*/
-		    /*% ripper: array!($3) %*/
+			$$ = NEW_ZARRAY();
+		    /*%
+			$$ = dispatch0(symbols_new);
+			$$ = dispatch1(array, $$);
+		    %*/
+		    }
+		| tSYMBOLS_BEG symbol_list tSTRING_END
+		    {
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(array, $2);
+		    %*/
 		    }
 		;
 
@@ -3515,33 +3988,63 @@ symbol_list	: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: symbols_new! %*/
+		    /*%
+			$$ = dispatch0(symbols_new);
+		    %*/
 		    }
 		| symbol_list word ' '
 		    {
 		    /*%%%*/
-			$$ = symbol_append(p, $1, evstr2dstr(p, $2));
-		    /*% %*/
-		    /*% ripper: symbols_add!($1, $2) %*/
+			$2 = evstr2dstr($2);
+			if (nd_type($2) == NODE_DSTR) {
+			    nd_set_type($2, NODE_DSYM);
+			}
+			else {
+			    nd_set_type($2, NODE_LIT);
+			    $2->nd_lit = rb_str_intern($2->nd_lit);
+			}
+			$$ = list_append($1, $2);
+		    /*%
+			$$ = dispatch2(symbols_add, $1, $2);
+		    %*/
 		    }
 		;
 
-qwords		: tQWORDS_BEG ' ' qword_list tSTRING_END
+qwords		: tQWORDS_BEG ' ' tSTRING_END
 		    {
 		    /*%%%*/
-			$$ = make_array($3, &@$);
-		    /*% %*/
-		    /*% ripper: array!($3) %*/
+			$$ = NEW_ZARRAY();
+		    /*%
+			$$ = dispatch0(qwords_new);
+			$$ = dispatch1(array, $$);
+		    %*/
+		    }
+		| tQWORDS_BEG qword_list tSTRING_END
+		    {
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(array, $2);
+		    %*/
 		    }
 		;
 
-qsymbols	: tQSYMBOLS_BEG ' ' qsym_list tSTRING_END
+qsymbols	: tQSYMBOLS_BEG ' ' tSTRING_END
 		    {
 		    /*%%%*/
-			$$ = make_array($3, &@$);
-		    /*% %*/
-		    /*% ripper: array!($3) %*/
+			$$ = NEW_ZARRAY();
+		    /*%
+			$$ = dispatch0(qsymbols_new);
+			$$ = dispatch1(array, $$);
+		    %*/
+		    }
+		| tQSYMBOLS_BEG qsym_list tSTRING_END
+		    {
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(array, $2);
+		    %*/
 		    }
 		;
 
@@ -3549,15 +4052,17 @@ qword_list	: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: qwords_new! %*/
+		    /*%
+			$$ = dispatch0(qwords_new);
+		    %*/
 		    }
 		| qword_list tSTRING_CONTENT ' '
 		    {
 		    /*%%%*/
-			$$ = list_append(p, $1, $2);
-		    /*% %*/
-		    /*% ripper: qwords_add!($1, $2) %*/
+			$$ = list_append($1, $2);
+		    /*%
+			$$ = dispatch2(qwords_add, $1, $2);
+		    %*/
 		    }
 		;
 
@@ -3565,15 +4070,21 @@ qsym_list	: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: qsymbols_new! %*/
+		    /*%
+			$$ = dispatch0(qsymbols_new);
+		    %*/
 		    }
 		| qsym_list tSTRING_CONTENT ' '
 		    {
 		    /*%%%*/
-			$$ = symbol_append(p, $1, $2);
-		    /*% %*/
-		    /*% ripper: qsymbols_add!($1, $2) %*/
+			VALUE lit;
+			lit = $2->nd_lit;
+			$2->nd_lit = ID2SYM(rb_intern_str(lit));
+			nd_set_type($2, NODE_LIT);
+			$$ = list_append($1, $2);
+		    /*%
+			$$ = dispatch2(qsymbols_add, $1, $2);
+		    %*/
 		    }
 		;
 
@@ -3581,15 +4092,17 @@ string_contents : /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: string_content! %*/
+		    /*%
+			$$ = dispatch0(string_content);
+		    %*/
 		    }
 		| string_contents string_content
 		    {
 		    /*%%%*/
-			$$ = literal_concat(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: string_add!($1, $2) %*/
+			$$ = literal_concat($1, $2);
+		    /*%
+			$$ = dispatch2(string_add, $1, $2);
+		    %*/
 		    }
 		;
 
@@ -3597,15 +4110,17 @@ xstring_contents: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: xstring_new! %*/
+		    /*%
+			$$ = dispatch0(xstring_new);
+		    %*/
 		    }
 		| xstring_contents string_content
 		    {
 		    /*%%%*/
-			$$ = literal_concat(p, $1, $2, &@$);
-		    /*% %*/
-		    /*% ripper: xstring_add!($1, $2) %*/
+			$$ = literal_concat($1, $2);
+		    /*%
+			$$ = dispatch2(xstring_add, $1, $2);
+		    %*/
 		    }
 		;
 
@@ -3613,11 +4128,8 @@ regexp_contents: /* none */
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: regexp_new! %*/
-		    /*%%%*/
 		    /*%
-			$$ = ripper_new_yylval(p, 0, $$, 0);
+			$$ = ripper_new_yylval(0, dispatch0(regexp_new), 0);
 		    %*/
 		    }
 		| regexp_contents string_content
@@ -3638,10 +4150,10 @@ regexp_contents: /* none */
 			      case NODE_DSTR:
 				break;
 			      default:
-				head = list_append(p, NEW_DSTR(Qnil, &@$), head);
+				head = list_append(NEW_DSTR(Qnil), head);
 				break;
 			    }
-			    $$ = list_append(p, head, tail);
+			    $$ = list_append(head, tail);
 			}
 		    /*%
 			VALUE s1 = 1, s2 = 0, n1 = $1, n2 = $2;
@@ -3655,7 +4167,7 @@ regexp_contents: /* none */
 			}
 			$$ = dispatch2(regexp_add, n1, n2);
 			if (!s1 && s2) {
-			    $$ = ripper_new_yylval(p, 0, $$, s2);
+			    $$ = ripper_new_yylval(0, $$, s2);
 			}
 		    %*/
 		    }
@@ -3664,79 +4176,83 @@ regexp_contents: /* none */
 string_content	: tSTRING_CONTENT
 		| tSTRING_DVAR
 		    {
-			/* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */
-			$<strterm>$ = p->lex.strterm;
-			p->lex.strterm = 0;
+			$<node>$ = lex_strterm;
+			lex_strterm = 0;
 			SET_LEX_STATE(EXPR_BEG);
 		    }
 		  string_dvar
 		    {
-			p->lex.strterm = $<strterm>2;
+			lex_strterm = $<node>2;
 		    /*%%%*/
-			$$ = NEW_EVSTR($3, &@$);
-			nd_set_line($$, @3.end_pos.lineno);
-		    /*% %*/
-		    /*% ripper: string_dvar!($3) %*/
+			$$ = NEW_EVSTR($3);
+		    /*%
+			$$ = dispatch1(string_dvar, $3);
+		    %*/
 		    }
 		| tSTRING_DBEG
 		    {
-			CMDARG_PUSH(0);
-			COND_PUSH(0);
+			$<val>1 = cond_stack;
+			$<val>$ = cmdarg_stack;
+			COND_SET(0);
+			CMDARG_SET(0);
 		    }
 		    {
-			/* need to backup p->lex.strterm so that a string literal `%!foo,#{ !0 },bar!` can be parsed */
-			$<strterm>$ = p->lex.strterm;
-			p->lex.strterm = 0;
+			$<node>$ = lex_strterm;
+			lex_strterm = 0;
 		    }
 		    {
-			$<num>$ = p->lex.state;
+			$<num>$ = lex_state;
 			SET_LEX_STATE(EXPR_BEG);
 		    }
 		    {
-			$<num>$ = p->lex.brace_nest;
-			p->lex.brace_nest = 0;
+			$<num>$ = brace_nest;
+			brace_nest = 0;
 		    }
 		    {
-			$<num>$ = p->heredoc_indent;
-			p->heredoc_indent = 0;
+			$<num>$ = heredoc_indent;
+			heredoc_indent = 0;
 		    }
 		  compstmt tSTRING_DEND
 		    {
-			COND_POP();
-			CMDARG_POP();
-			p->lex.strterm = $<strterm>3;
+			COND_SET($<val>1);
+			CMDARG_SET($<val>2);
+			lex_strterm = $<node>3;
 			SET_LEX_STATE($<num>4);
-			p->lex.brace_nest = $<num>5;
-			p->heredoc_indent = $<num>6;
-			p->heredoc_line_indent = -1;
+			brace_nest = $<num>5;
+			heredoc_indent = $<num>6;
+			heredoc_line_indent = -1;
 		    /*%%%*/
 			if ($7) $7->flags &= ~NODE_FL_NEWLINE;
-			$$ = new_evstr(p, $7, &@$);
-		    /*% %*/
-		    /*% ripper: string_embexpr!($7) %*/
+			$$ = new_evstr($7);
+		    /*%
+			$$ = dispatch1(string_embexpr, $7);
+		    %*/
 		    }
 		;
 
 string_dvar	: tGVAR
 		    {
 		    /*%%%*/
-			$$ = NEW_GVAR($1, &@$);
-		    /*% %*/
-		    /*% ripper: var_ref!($1) %*/
+			$$ = NEW_GVAR($1);
+		    /*%
+			$$ = dispatch1(var_ref, $1);
+		    %*/
 		    }
 		| tIVAR
 		    {
 		    /*%%%*/
-			$$ = NEW_IVAR($1, &@$);
-		    /*% %*/
-		    /*% ripper: var_ref!($1) %*/
+			$$ = NEW_IVAR($1);
+		    /*%
+			$$ = dispatch1(var_ref, $1);
+		    %*/
 		    }
 		| tCVAR
 		    {
 		    /*%%%*/
-			$$ = NEW_CVAR($1, &@$);
-		    /*% %*/
-		    /*% ripper: var_ref!($1) %*/
+			$$ = NEW_CVAR($1);
+		    /*%
+			$$ = dispatch1(var_ref, $1);
+		    %*/
 		    }
 		| backref
 		;
@@ -3746,8 +4262,9 @@ symbol		: tSYMBEG sym
 			SET_LEX_STATE(EXPR_END);
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: symbol!($2) %*/
+		    /*%
+			$$ = dispatch1(symbol, $2);
+		    %*/
 		    }
 		;
 
@@ -3757,13 +4274,14 @@ sym		: fname
 		| tCVAR
 		;
 
-dsym		: tSYMBEG string_contents tSTRING_END
+dsym		: tSYMBEG xstring_contents tSTRING_END
 		    {
 			SET_LEX_STATE(EXPR_END);
 		    /*%%%*/
-			$$ = dsym_node(p, $2, &@$);
-		    /*% %*/
-		    /*% ripper: dyna_symbol!($2) %*/
+			$$ = dsym_node($2);
+		    /*%
+			$$ = dispatch1(dyna_symbol, $2);
+		    %*/
 		    }
 		;
 
@@ -3772,9 +4290,10 @@ numeric 	: simple_numeric
 		    {
 		    /*%%%*/
 			$$ = $2;
-			add_mark_object(p, $$->nd_lit = negate_lit(p, $$->nd_lit));
-		    /*% %*/
-		    /*% ripper: unary!(ID2VAL(idUMinus), $2) %*/
+			$$->nd_lit = negate_lit($$->nd_lit);
+		    /*%
+			$$ = dispatch2(unary, ID2SYM(idUMinus), $2);
+		    %*/
 		    }
 		;
 
@@ -3791,21 +4310,21 @@ user_variable	: tIDENTIFIER
 		| tCVAR
 		;
 
-keyword_variable: keyword_nil {$$ = KWD2EID(nil, $1);}
-		| keyword_self {$$ = KWD2EID(self, $1);}
-		| keyword_true {$$ = KWD2EID(true, $1);}
-		| keyword_false {$$ = KWD2EID(false, $1);}
-		| keyword__FILE__ {$$ = KWD2EID(_FILE__, $1);}
-		| keyword__LINE__ {$$ = KWD2EID(_LINE__, $1);}
-		| keyword__ENCODING__ {$$ = KWD2EID(_ENCODING__, $1);}
+keyword_variable: keyword_nil {ifndef_ripper($$ = keyword_nil);}
+		| keyword_self {ifndef_ripper($$ = keyword_self);}
+		| keyword_true {ifndef_ripper($$ = keyword_true);}
+		| keyword_false {ifndef_ripper($$ = keyword_false);}
+		| keyword__FILE__ {ifndef_ripper($$ = keyword__FILE__);}
+		| keyword__LINE__ {ifndef_ripper($$ = keyword__LINE__);}
+		| keyword__ENCODING__ {ifndef_ripper($$ = keyword__ENCODING__);}
 		;
 
 var_ref		: user_variable
 		    {
 		    /*%%%*/
-			if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
+			if (!($$ = gettable($1))) $$ = NEW_BEGIN(0);
 		    /*%
-			if (id_is_var(p, get_id($1))) {
+			if (id_is_var(get_id($1))) {
 			    $$ = dispatch1(var_ref, $1);
 			}
 			else {
@@ -3816,25 +4335,28 @@ var_ref		: user_variable
 		| keyword_variable
 		    {
 		    /*%%%*/
-			if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
-		    /*% %*/
-		    /*% ripper: var_ref!($1) %*/
+			if (!($$ = gettable($1))) $$ = NEW_BEGIN(0);
+		    /*%
+			$$ = dispatch1(var_ref, $1);
+		    %*/
 		    }
 		;
 
 var_lhs		: user_variable
 		    {
+			$$ = assignable($1, 0);
 		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+		    /*%
+			$$ = dispatch1(var_field, $$);
+		    %*/
 		    }
 		| keyword_variable
 		    {
+			$$ = assignable($1, 0);
 		    /*%%%*/
-			$$ = assignable(p, $1, 0, &@$);
-		    /*% %*/
-		    /*% ripper: assignable(p, var_field(p, $1)) %*/
+		    /*%
+			$$ = dispatch1(var_field, $$);
+		    %*/
 		    }
 		;
 
@@ -3845,7 +4367,7 @@ backref		: tNTH_REF
 superclass	: '<'
 		    {
 			SET_LEX_STATE(EXPR_BEG);
-			p->command_start = TRUE;
+			command_start = TRUE;
 		    }
 		  expr_value term
 		    {
@@ -3855,8 +4377,9 @@ superclass	: '<'
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: Qnil %*/
+		    /*%
+			$$ = Qnil;
+		    %*/
 		    }
 		;
 
@@ -3864,40 +4387,41 @@ f_arglist	: '(' f_args rparen
 		    {
 		    /*%%%*/
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: paren!($2) %*/
+		    /*%
+			$$ = dispatch1(paren, $2);
+		    %*/
 			SET_LEX_STATE(EXPR_BEG);
-			p->command_start = TRUE;
+			command_start = TRUE;
 		    }
 		|   {
-			$<num>$ = p->in_kwarg;
-			p->in_kwarg = 1;
-			SET_LEX_STATE(p->lex.state|EXPR_LABEL); /* force for args */
+			$<num>$ = parser->in_kwarg;
+			parser->in_kwarg = 1;
+			lex_state |= EXPR_LABEL; /* force for args */
 		    }
 		    f_args term
 		    {
-			p->in_kwarg = !!$<num>1;
+			parser->in_kwarg = !!$<num>1;
 			$$ = $2;
 			SET_LEX_STATE(EXPR_BEG);
-			p->command_start = TRUE;
+			command_start = TRUE;
 		    }
 		;
 
 args_tail	: f_kwarg ',' f_kwrest opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, $1, $3, $4, &@3);
+			$$ = new_args_tail($1, $3, $4);
 		    }
 		| f_kwarg opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, $1, Qnone, $2, &@1);
+			$$ = new_args_tail($1, Qnone, $2);
 		    }
 		| f_kwrest opt_f_block_arg
 		    {
-			$$ = new_args_tail(p, Qnone, $1, $2, &@1);
+			$$ = new_args_tail(Qnone, $1, $2);
 		    }
 		| f_block_arg
 		    {
-			$$ = new_args_tail(p, Qnone, Qnone, $1, &@1);
+			$$ = new_args_tail(Qnone, Qnone, $1);
 		    }
 		;
 
@@ -3907,111 +4431,119 @@ opt_args_tail	: ',' args_tail
 		    }
 		| /* none */
 		    {
-			$$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
+			$$ = new_args_tail(Qnone, Qnone, Qnone);
 		    }
 		;
 
 f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, $3, $5, Qnone, $6, &@$);
+			$$ = new_args($1, $3, $5, Qnone, $6);
 		    }
 		| f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, $3, $5, $7, $8, &@$);
+			$$ = new_args($1, $3, $5, $7, $8);
 		    }
 		| f_arg ',' f_optarg opt_args_tail
 		    {
-			$$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$);
+			$$ = new_args($1, $3, Qnone, Qnone, $4);
 		    }
 		| f_arg ',' f_optarg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, $3, Qnone, $5, $6, &@$);
+			$$ = new_args($1, $3, Qnone, $5, $6);
 		    }
 		| f_arg ',' f_rest_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$);
+			$$ = new_args($1, Qnone, $3, Qnone, $4);
 		    }
 		| f_arg ',' f_rest_arg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, $3, $5, $6, &@$);
+			$$ = new_args($1, Qnone, $3, $5, $6);
 		    }
 		| f_arg opt_args_tail
 		    {
-			$$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$);
+			$$ = new_args($1, Qnone, Qnone, Qnone, $2);
 		    }
 		| f_optarg ',' f_rest_arg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$);
+			$$ = new_args(Qnone, $1, $3, Qnone, $4);
 		    }
 		| f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, $3, $5, $6, &@$);
+			$$ = new_args(Qnone, $1, $3, $5, $6);
 		    }
 		| f_optarg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$);
+			$$ = new_args(Qnone, $1, Qnone, Qnone, $2);
 		    }
 		| f_optarg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$);
+			$$ = new_args(Qnone, $1, Qnone, $3, $4);
 		    }
 		| f_rest_arg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$);
+			$$ = new_args(Qnone, Qnone, $1, Qnone, $2);
 		    }
 		| f_rest_arg ',' f_arg opt_args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$);
+			$$ = new_args(Qnone, Qnone, $1, $3, $4);
 		    }
 		| args_tail
 		    {
-			$$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$);
+			$$ = new_args(Qnone, Qnone, Qnone, Qnone, $1);
 		    }
 		| /* none */
 		    {
-			$$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
-			$$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0);
+			$$ = new_args_tail(Qnone, Qnone, Qnone);
+			$$ = new_args(Qnone, Qnone, Qnone, Qnone, $$);
 		    }
 		;
 
 f_bad_arg	: tCONSTANT
 		    {
 		    /*%%%*/
-			yyerror1(&@1, "formal argument cannot be a constant");
+			yyerror("formal argument cannot be a constant");
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper[error]: param_error!($1) %*/
+		    /*%
+			$$ = dispatch1(param_error, $1);
+			ripper_error();
+		    %*/
 		    }
 		| tIVAR
 		    {
 		    /*%%%*/
-			yyerror1(&@1, "formal argument cannot be an instance variable");
+			yyerror("formal argument cannot be an instance variable");
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper[error]: param_error!($1) %*/
+		    /*%
+			$$ = dispatch1(param_error, $1);
+			ripper_error();
+		    %*/
 		    }
 		| tGVAR
 		    {
 		    /*%%%*/
-			yyerror1(&@1, "formal argument cannot be a global variable");
+			yyerror("formal argument cannot be a global variable");
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper[error]: param_error!($1) %*/
+		    /*%
+			$$ = dispatch1(param_error, $1);
+			ripper_error();
+		    %*/
 		    }
 		| tCVAR
 		    {
 		    /*%%%*/
-			yyerror1(&@1, "formal argument cannot be a class variable");
+			yyerror("formal argument cannot be a class variable");
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper[error]: param_error!($1) %*/
+		    /*%
+			$$ = dispatch1(param_error, $1);
+			ripper_error();
+		    %*/
 		    }
 		;
 
 f_norm_arg	: f_bad_arg
 		| tIDENTIFIER
 		    {
-			formal_argument(p, get_id($1));
+			formal_argument(get_id($1));
 			$$ = $1;
 		    }
 		;
@@ -4019,54 +4551,57 @@ f_norm_arg	: f_bad_arg
 f_arg_asgn	: f_norm_arg
 		    {
 			ID id = get_id($1);
-			arg_var(p, id);
-			p->cur_arg = id;
+			arg_var(id);
+			current_arg = id;
 			$$ = $1;
 		    }
 		;
 
 f_arg_item	: f_arg_asgn
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
 		    /*%%%*/
-			$$ = NEW_ARGS_AUX($1, 1, &NULL_LOC);
-		    /*% %*/
-		    /*% ripper: get_value($1) %*/
+			$$ = NEW_ARGS_AUX($1, 1);
+		    /*%
+			$$ = get_value($1);
+		    %*/
 		    }
 		| tLPAREN f_margs rparen
 		    {
-			ID tid = internal_id(p);
+			ID tid = internal_id();
+			arg_var(tid);
 		    /*%%%*/
-			YYLTYPE loc;
-			loc.beg_pos = @2.beg_pos;
-			loc.end_pos = @2.beg_pos;
-		    /*% %*/
-			arg_var(p, tid);
-		    /*%%%*/
-			if (dyna_in_block(p)) {
-			    $2->nd_value = NEW_DVAR(tid, &loc);
+			if (dyna_in_block()) {
+			    $2->nd_value = NEW_DVAR(tid);
 			}
 			else {
-			    $2->nd_value = NEW_LVAR(tid, &loc);
+			    $2->nd_value = NEW_LVAR(tid);
 			}
-			$$ = NEW_ARGS_AUX(tid, 1, &NULL_LOC);
+			$$ = NEW_ARGS_AUX(tid, 1);
 			$$->nd_next = $2;
-		    /*% %*/
-		    /*% ripper: mlhs_paren!($2) %*/
+		    /*%
+			$$ = dispatch1(mlhs_paren, $2);
+		    %*/
 		    }
 		;
 
 f_arg		: f_arg_item
-		    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			$$ = rb_ary_new3(1, $1);
+		    }
+		    c%*/
 		| f_arg ',' f_arg_item
 		    {
 		    /*%%%*/
 			$$ = $1;
 			$$->nd_plen++;
-			$$->nd_next = block_append(p, $$->nd_next, $3->nd_next);
-			rb_discard_node(p, $3);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+			$$->nd_next = block_append($$->nd_next, $3->nd_next);
+			rb_gc_force_recycle((VALUE)$3);
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4074,43 +4609,51 @@ f_arg		: f_arg_item
 f_label 	: tLABEL
 		    {
 			ID id = get_id($1);
-			arg_var(p, formal_argument(p, id));
-			p->cur_arg = id;
+			arg_var(formal_argument(id));
+			current_arg = id;
 			$$ = $1;
 		    }
 		;
 
 f_kw		: f_label arg_value
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
+			$$ = assignable($1, $2);
 		    /*%%%*/
-			$$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/
+			$$ = new_kw_arg($$);
+		    /*%
+			$$ = rb_assoc_new($$, $2);
+		    %*/
 		    }
 		| f_label
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
+			$$ = assignable($1, (NODE *)-1);
 		    /*%%%*/
-			$$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/
+			$$ = new_kw_arg($$);
+		    /*%
+			$$ = rb_assoc_new($$, 0);
+		    %*/
 		    }
 		;
 
 f_block_kw	: f_label primary_value
 		    {
+			$$ = assignable($1, $2);
 		    /*%%%*/
-			$$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/
+			$$ = new_kw_arg($$);
+		    /*%
+			$$ = rb_assoc_new($$, $2);
+		    %*/
 		    }
 		| f_label
 		    {
+			$$ = assignable($1, (NODE *)-1);
 		    /*%%%*/
-			$$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/
+			$$ = new_kw_arg($$);
+		    /*%
+			$$ = rb_assoc_new($$, 0);
+		    %*/
 		    }
 		;
 
@@ -4118,15 +4661,17 @@ f_block_kwarg	: f_block_kw
 		    {
 		    /*%%%*/
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| f_block_kwarg ',' f_block_kw
 		    {
 		    /*%%%*/
 			$$ = kwd_append($1, $3);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4135,15 +4680,17 @@ f_kwarg		: f_kw
 		    {
 		    /*%%%*/
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| f_kwarg ',' f_kw
 		    {
 		    /*%%%*/
 			$$ = kwd_append($1, $3);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4153,39 +4700,37 @@ kwrest_mark	: tPOW
 
 f_kwrest	: kwrest_mark tIDENTIFIER
 		    {
-			arg_var(p, shadowing_lvar(p, get_id($2)));
-		    /*%%%*/
+			shadowing_lvar(get_id($2));
 			$$ = $2;
-		    /*% %*/
-		    /*% ripper: kwrest_param!($2) %*/
 		    }
 		| kwrest_mark
 		    {
-		    /*%%%*/
-			$$ = internal_id(p);
-			arg_var(p, $$);
-		    /*% %*/
-		    /*% ripper: kwrest_param!(Qnil) %*/
+			$$ = internal_id();
+			arg_var($$);
 		    }
 		;
 
 f_opt		: f_arg_asgn '=' arg_value
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
+			$$ = assignable($1, $3);
 		    /*%%%*/
-			$$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/
+			$$ = NEW_OPT_ARG(0, $$);
+		    /*%
+			$$ = rb_assoc_new($$, $3);
+		    %*/
 		    }
 		;
 
 f_block_opt	: f_arg_asgn '=' primary_value
 		    {
-			p->cur_arg = 0;
+			current_arg = 0;
+			$$ = assignable($1, $3);
 		    /*%%%*/
-			$$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$);
-		    /*% %*/
-		    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/
+			$$ = NEW_OPT_ARG(0, $$);
+		    /*%
+			$$ = rb_assoc_new($$, $3);
+		    %*/
 		    }
 		;
 
@@ -4193,15 +4738,23 @@ f_block_optarg	: f_block_opt
 		    {
 		    /*%%%*/
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| f_block_optarg ',' f_block_opt
 		    {
 		    /*%%%*/
-			$$ = opt_arg_append($1, $3);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+			NODE *opts = $1;
+
+			while (opts->nd_next) {
+			    opts = opts->nd_next;
+			}
+			opts->nd_next = $3;
+			$$ = $1;
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4209,15 +4762,23 @@ f_optarg	: f_opt
 		    {
 		    /*%%%*/
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+		    /*%
+			$$ = rb_ary_new3(1, $1);
+		    %*/
 		    }
 		| f_optarg ',' f_opt
 		    {
 		    /*%%%*/
-			$$ = opt_arg_append($1, $3);
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+			NODE *opts = $1;
+
+			while (opts->nd_next) {
+			    opts = opts->nd_next;
+			}
+			opts->nd_next = $3;
+			$$ = $1;
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4227,19 +4788,25 @@ restarg_mark	: '*'
 
 f_rest_arg	: restarg_mark tIDENTIFIER
 		    {
-			arg_var(p, shadowing_lvar(p, get_id($2)));
 		    /*%%%*/
-			$$ = $2;
+			if (!is_local_id($2))
+			    yyerror("rest argument must be local variable");
 		    /*% %*/
-		    /*% ripper: rest_param!($2) %*/
+			arg_var(shadowing_lvar(get_id($2)));
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(rest_param, $2);
+		    %*/
 		    }
 		| restarg_mark
 		    {
 		    /*%%%*/
-			$$ = internal_id(p);
-			arg_var(p, $$);
-		    /*% %*/
-		    /*% ripper: rest_param!(Qnil) %*/
+			$$ = internal_id();
+			arg_var($$);
+		    /*%
+			$$ = dispatch1(rest_param, Qnil);
+		    %*/
 		    }
 		;
 
@@ -4249,11 +4816,18 @@ blkarg_mark	: '&'
 
 f_block_arg	: blkarg_mark tIDENTIFIER
 		    {
-			arg_var(p, shadowing_lvar(p, get_id($2)));
 		    /*%%%*/
-			$$ = $2;
+			if (!is_local_id($2))
+			    yyerror("block argument must be local variable");
+			else if (!dyna_in_block() && local_id($2))
+			    yyerror("duplicated block argument name");
 		    /*% %*/
-		    /*% ripper: blockarg!($2) %*/
+			arg_var(shadowing_lvar(get_id($2)));
+		    /*%%%*/
+			$$ = $2;
+		    /*%
+			$$ = dispatch1(blockarg, $2);
+		    %*/
 		    }
 		;
 
@@ -4265,37 +4839,48 @@ opt_f_block_arg	: ',' f_block_arg
 		    {
 		    /*%%%*/
 			$$ = 0;
-		    /*% %*/
-		    /*% ripper: Qundef %*/
+		    /*%
+			$$ = Qundef;
+		    %*/
 		    }
 		;
 
 singleton	: var_ref
 		    {
+		    /*%%%*/
 			value_expr($1);
 			$$ = $1;
+			if (!$$) $$ = NEW_NIL();
+		    /*%
+			$$ = $1;
+		    %*/
 		    }
 		| '(' {SET_LEX_STATE(EXPR_BEG);} expr rparen
 		    {
 		    /*%%%*/
-			switch (nd_type($3)) {
-			  case NODE_STR:
-			  case NODE_DSTR:
-			  case NODE_XSTR:
-			  case NODE_DXSTR:
-			  case NODE_DREGX:
-			  case NODE_LIT:
-			  case NODE_ARRAY:
-			  case NODE_ZARRAY:
-			    yyerror1(&@3, "can't define singleton method for literals");
-			    break;
-			  default:
-			    value_expr($3);
-			    break;
+			if ($3 == 0) {
+			    yyerror("can't define singleton method for ().");
+			}
+			else {
+			    switch (nd_type($3)) {
+			      case NODE_STR:
+			      case NODE_DSTR:
+			      case NODE_XSTR:
+			      case NODE_DXSTR:
+			      case NODE_DREGX:
+			      case NODE_LIT:
+			      case NODE_ARRAY:
+			      case NODE_ZARRAY:
+				yyerror("can't define singleton method for literals");
+			      default:
+				value_expr($3);
+				break;
+			    }
 			}
 			$$ = $3;
-		    /*% %*/
-		    /*% ripper: paren!($3) %*/
+		    /*%
+			$$ = dispatch1(paren, $3);
+		    %*/
 		    }
 		;
 
@@ -4304,13 +4889,19 @@ assoc_list	: none
 		    {
 		    /*%%%*/
 			$$ = $1;
-		    /*% %*/
-		    /*% ripper: assoclist_from_args!($1) %*/
+		    /*%
+			$$ = dispatch1(assoclist_from_args, $1);
+		    %*/
 		    }
 		;
 
 assocs		: assoc
-		    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
+		    /*%c%*/
+		    /*%c
+		    {
+			$$ = rb_ary_new3(1, $1);
+		    }
+		    %*/
 		| assocs ',' assoc
 		    {
 		    /*%%%*/
@@ -4329,8 +4920,9 @@ assocs		: assoc
 			    assocs = list_concat(assocs, tail);
 			}
 			$$ = assocs;
-		    /*% %*/
-		    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+		    /*%
+			$$ = rb_ary_push($1, $3);
+		    %*/
 		    }
 		;
 
@@ -4339,26 +4931,28 @@ assoc		: arg_value tASSOC arg_value
 		    /*%%%*/
 			if (nd_type($1) == NODE_STR) {
 			    nd_set_type($1, NODE_LIT);
-			    add_mark_object(p, $1->nd_lit = rb_fstring($1->nd_lit));
+			    $1->nd_lit = rb_fstring($1->nd_lit);
 			}
-			$$ = list_append(p, NEW_LIST($1, &@$), $3);
-		    /*% %*/
-		    /*% ripper: assoc_new!($1, $3) %*/
+			$$ = list_append(NEW_LIST($1), $3);
+		    /*%
+			$$ = dispatch2(assoc_new, $1, $3);
+		    %*/
 		    }
 		| tLABEL arg_value
 		    {
 		    /*%%%*/
-			$$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2);
-		    /*% %*/
-		    /*% ripper: assoc_new!($1, $2) %*/
+			$$ = list_append(NEW_LIST(NEW_LIT(ID2SYM($1))), $2);
+		    /*%
+			$$ = dispatch2(assoc_new, $1, $2);
+		    %*/
 		    }
 		| tSTRING_BEG string_contents tLABEL_END arg_value
 		    {
 		    /*%%%*/
-			YYLTYPE loc = code_loc_gen(&@1, &@3);
-			$$ = list_append(p, NEW_LIST(dsym_node(p, $2, &loc), &loc), $4);
-		    /*% %*/
-		    /*% ripper: assoc_new!(dyna_symbol!($2), $4) %*/
+			$$ = list_append(NEW_LIST(dsym_node($2)), $4);
+		    /*%
+			$$ = dispatch2(assoc_new, dispatch1(dyna_symbol, $2), $4);
+		    %*/
 		    }
 		| tDSTAR arg_value
 		    {
@@ -4367,9 +4961,10 @@ assoc		: arg_value tASSOC arg_value
 			    !($2->nd_head && $2->nd_head->nd_alen))
 			    $$ = 0;
 			else
-			    $$ = list_append(p, NEW_LIST(0, &@$), $2);
-		    /*% %*/
-		    /*% ripper: assoc_splat!($2) %*/
+			    $$ = list_append(NEW_LIST(0), $2);
+		    /*%
+			$$ = dispatch1(assoc_splat, $2);
+		    %*/
 		    }
 		;
 
@@ -4390,15 +4985,44 @@ operation3	: tIDENTIFIER
 		;
 
 dot_or_colon	: '.'
+		    /*%c%*/
+		    /*%c
+		    { $$ = $<val>1; }
+		    %*/
 		| tCOLON2
+		    /*%c%*/
+		    /*%c
+		    { $$ = $<val>1; }
+		    %*/
 		;
 
 call_op 	: '.'
+		    {
+		    /*%%%*/
+			$$ = '.';
+		    /*%
+			$$ = ripper_id2sym('.');
+		    %*/
+		    }
 		| tANDDOT
+		    {
+		    /*%%%*/
+			$$ = tANDDOT;
+		    /*%
+			$$ = ripper_id2sym(idANDDOT);
+		    %*/
+		    }
 		;
 
 call_op2	: call_op
 		| tCOLON2
+		    {
+		    /*%%%*/
+			$$ = tCOLON2;
+		    /*%
+			$$ = ripper_id2sym(idCOLON2);
+		    %*/
+		    }
 		;
 
 opt_terms	: /* none */
@@ -4420,8 +5044,8 @@ trailer		: /* none */
 		| ','
 		;
 
-term		: ';' {yyerrok;token_flush(p);}
-		| '\n' {token_flush(p);}
+term		: ';' {yyerrok;}
+		| '\n'
 		;
 
 terms		: term
@@ -4430,56 +5054,76 @@ terms		: term
 
 none		: /* none */
 		    {
-			$$ = Qnull;
+		    /*%%%*/
+			$$ = 0;
+		    /*%
+			$$ = Qundef;
+		    %*/
 		    }
 		;
 %%
-# undef p
+# undef parser
 # undef yylex
 # undef yylval
-# define yylval  (*p->lval)
-
-static int regx_options(struct parser_params*);
-static int tokadd_string(struct parser_params*,int,int,int,long*,rb_encoding**,rb_encoding**);
-static void tokaddmbc(struct parser_params *p, int c, rb_encoding *enc);
-static enum yytokentype parse_string(struct parser_params*,rb_strterm_literal_t*);
-static enum yytokentype here_document(struct parser_params*,rb_strterm_heredoc_t*);
+# define yylval  (*parser->lval)
+
+static int parser_regx_options(struct parser_params*);
+static int parser_tokadd_string(struct parser_params*,int,int,int,long*,rb_encoding**);
+static void parser_tokaddmbc(struct parser_params *parser, int c, rb_encoding *enc);
+static int parser_parse_string(struct parser_params*,NODE*);
+static int parser_here_document(struct parser_params*,NODE*);
+
+
+# define nextc()                      parser_nextc(parser)
+# define pushback(c)                  parser_pushback(parser, (c))
+# define newtok()                     parser_newtok(parser)
+# define tokspace(n)                  parser_tokspace(parser, (n))
+# define tokadd(c)                    parser_tokadd(parser, (c))
+# define tok_hex(numlen)              parser_tok_hex(parser, (numlen))
+# define read_escape(flags,e)         parser_read_escape(parser, (flags), (e))
+# define tokadd_escape(e)             parser_tokadd_escape(parser, (e))
+# define regx_options()               parser_regx_options(parser)
+# define tokadd_string(f,t,p,n,e)     parser_tokadd_string(parser,(f),(t),(p),(n),(e))
+# define parse_string(n)              parser_parse_string(parser,(n))
+# define tokaddmbc(c, enc)            parser_tokaddmbc(parser, (c), (enc))
+# define here_document(n)             parser_here_document(parser,(n))
+# define heredoc_identifier()         parser_heredoc_identifier(parser)
+# define heredoc_restore(n)           parser_heredoc_restore(parser,(n))
+# define whole_match_p(e,l,i)         parser_whole_match_p(parser,(e),(l),(i))
+# define number_literal_suffix(f)     parser_number_literal_suffix(parser, (f))
+# define set_number_literal(v, t, f)  parser_set_number_literal(parser, (v), (t), (f))
+# define set_integer_literal(v, f)    parser_set_integer_literal(parser, (v), (f))
 
 #ifndef RIPPER
-# define set_yylval_node(x) {				\
-  YYLTYPE _cur_loc;					\
-  rb_parser_set_location(p, &_cur_loc);			\
-  yylval.node = (x);					\
-}
-# define set_yylval_str(x) set_yylval_node(NEW_STR(x, &_cur_loc))
-# define set_yylval_literal(x) set_yylval_node(NEW_LIT(x, &_cur_loc))
+# define set_yylval_str(x) (yylval.node = NEW_STR(x))
 # define set_yylval_num(x) (yylval.num = (x))
 # define set_yylval_id(x)  (yylval.id = (x))
 # define set_yylval_name(x)  (yylval.id = (x))
+# define set_yylval_literal(x) (yylval.node = NEW_LIT(x))
+# define set_yylval_node(x) (yylval.node = (x))
 # define yylval_id() (yylval.id)
 #else
 static inline VALUE
-ripper_yylval_id(struct parser_params *p, ID x)
+ripper_yylval_id(ID x)
 {
-    return ripper_new_yylval(p, x, ID2SYM(x), 0);
+    return ripper_new_yylval(x, ID2SYM(x), 0);
 }
 # define set_yylval_str(x) (yylval.val = (x))
-# define set_yylval_num(x) (yylval.val = ripper_new_yylval(p, (x), 0, 0))
+# define set_yylval_num(x) (yylval.val = ripper_new_yylval((x), 0, 0))
 # define set_yylval_id(x)  (void)(x)
-# define set_yylval_name(x) (void)(yylval.val = ripper_yylval_id(p, x))
+# define set_yylval_name(x) (void)(yylval.val = ripper_yylval_id(x))
 # define set_yylval_literal(x) (void)(x)
 # define set_yylval_node(x) (void)(x)
 # define yylval_id() yylval.id
-# define _cur_loc NULL_LOC /* dummy */
 #endif
 
 #ifndef RIPPER
-#define literal_flush(p, ptr) ((p)->lex.ptok = (ptr))
-#define dispatch_scan_event(p, t) ((void)0)
-#define dispatch_delayed_token(p, t) ((void)0)
-#define has_delayed_token(p) (0)
+#define ripper_flush(p) (void)(p)
+#define dispatch_scan_event(t) ((void)0)
+#define dispatch_delayed_token(t) ((void)0)
+#define has_delayed_token() (0)
 #else
-#define literal_flush(p, ptr) ((void)(ptr))
+#define ripper_flush(p) ((p)->tokp = (p)->lex.pcur)
 
 #define yylval_rval (*(RB_TYPE_P(yylval.val, T_NODE) ? &yylval.node->nd_rval : &yylval.val))
 
@@ -4491,355 +5135,191 @@ intern_sym(const char *name)
 }
 
 static int
-ripper_has_scan_event(struct parser_params *p)
+ripper_has_scan_event(struct parser_params *parser)
 {
-    if (p->lex.pcur < p->lex.ptok) rb_raise(rb_eRuntimeError, "lex.pcur < lex.ptok");
-    return p->lex.pcur > p->lex.ptok;
+
+    if (lex_p < parser->tokp) rb_raise(rb_eRuntimeError, "lex_p < tokp");
+    return lex_p > parser->tokp;
 }
 
 static VALUE
-ripper_scan_event_val(struct parser_params *p, int t)
+ripper_scan_event_val(struct parser_params *parser, int t)
 {
-    VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok);
-    VALUE rval = ripper_dispatch1(p, ripper_token2eventid(t), str);
-    token_flush(p);
+    VALUE str = STR_NEW(parser->tokp, lex_p - parser->tokp);
+    VALUE rval = ripper_dispatch1(parser, ripper_token2eventid(t), str);
+    ripper_flush(parser);
     return rval;
 }
 
 static void
-ripper_dispatch_scan_event(struct parser_params *p, int t)
+ripper_dispatch_scan_event(struct parser_params *parser, int t)
 {
-    if (!ripper_has_scan_event(p)) return;
-    add_mark_object(p, yylval_rval = ripper_scan_event_val(p, t));
+    if (!ripper_has_scan_event(parser)) return;
+    yylval_rval = ripper_scan_event_val(parser, t);
 }
-#define dispatch_scan_event(p, t) ripper_dispatch_scan_event(p, t)
+#define dispatch_scan_event(t) ripper_dispatch_scan_event(parser, t)
 
 static void
-ripper_dispatch_delayed_token(struct parser_params *p, int t)
+ripper_dispatch_delayed_token(struct parser_params *parser, int t)
 {
-    int saved_line = p->ruby_sourceline;
-    const char *saved_tokp = p->lex.ptok;
+    int saved_line = ruby_sourceline;
+    const char *saved_tokp = parser->tokp;
 
-    p->ruby_sourceline = p->delayed_line;
-    p->lex.ptok = p->lex.pbeg + p->delayed_col;
-    add_mark_object(p, yylval_rval = ripper_dispatch1(p, ripper_token2eventid(t), p->delayed));
-    p->delayed = Qnil;
-    p->ruby_sourceline = saved_line;
-    p->lex.ptok = saved_tokp;
+    ruby_sourceline = parser->delayed_line;
+    parser->tokp = lex_pbeg + parser->delayed_col;
+    yylval_rval = ripper_dispatch1(parser, ripper_token2eventid(t), parser->delayed);
+    parser->delayed = Qnil;
+    ruby_sourceline = saved_line;
+    parser->tokp = saved_tokp;
 }
-#define dispatch_delayed_token(p, t) ripper_dispatch_delayed_token(p, t)
-#define has_delayed_token(p) (!NIL_P(p->delayed))
+#define dispatch_delayed_token(t) ripper_dispatch_delayed_token(parser, t)
+#define has_delayed_token() (!NIL_P(parser->delayed))
 #endif /* RIPPER */
 
 #include "ruby/regex.h"
 #include "ruby/util.h"
 
-static inline int
-is_identchar(const char *ptr, const char *MAYBE_UNUSED(ptr_end), rb_encoding *enc)
-{
-    return rb_enc_isalnum((unsigned char)*ptr, enc) || *ptr == '_' || !ISASCII(*ptr);
-}
+#define parser_encoding_name()  (current_enc->name)
+#define parser_mbclen()  mbclen((lex_p-1),lex_pend,current_enc)
+#define parser_precise_mbclen()  rb_enc_precise_mbclen((lex_p-1),lex_pend,current_enc)
+#define is_identchar(p,e,enc) (rb_enc_isalnum((unsigned char)(*(p)),(enc)) || (*(p)) == '_' || !ISASCII(*(p)))
+#define parser_is_identchar() (!parser->eofp && is_identchar((lex_p-1),lex_pend,current_enc))
 
-static inline int
-parser_is_identchar(struct parser_params *p)
-{
-    return !(p)->eofp && is_identchar(p->lex.pcur-1, p->lex.pend, p->enc);
-}
+#define parser_isascii() ISASCII(*(lex_p-1))
 
-static inline int
-parser_isascii(struct parser_params *p)
-{
-    return ISASCII(*(p->lex.pcur-1));
-}
-
-static void
-setup_token_info(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc)
+static int
+token_info_get_column(struct parser_params *parser, const char *pend)
 {
-    int column = 1, nonspc = 0, i;
-    for (i = 0; i < loc->beg_pos.column; i++, ptr++) {
-	if (*ptr == '\t') {
+    int column = 1;
+    const char *p;
+    for (p = lex_pbeg; p < pend; p++) {
+	if (*p == '\t') {
 	    column = (((column - 1) / TAB_WIDTH) + 1) * TAB_WIDTH;
 	}
 	column++;
-	if (*ptr != ' ' && *ptr != '\t') {
-	    nonspc = 1;
-	}
     }
+    return column;
+}
 
-    ptinfo->linenum = loc->beg_pos.lineno;
-    ptinfo->column = column;
-    ptinfo->nonspc = nonspc;
+static int
+token_info_has_nonspaces(struct parser_params *parser, const char *pend)
+{
+    const char *p;
+    for (p = lex_pbeg; p < pend; p++) {
+	if (*p != ' ' && *p != '\t') {
+	    return 1;
+	}
+    }
+    return 0;
 }
 
 static void
-token_info_push(struct parser_params *p, const char *token, const rb_code_location_t *loc)
+token_info_push_gen(struct parser_params *parser, const char *token, size_t len)
 {
     token_info *ptinfo;
+    const char *t = lex_p - len;
 
-    if (!p->token_info_enabled) return;
+    if (!parser->token_info_enabled) return;
     ptinfo = ALLOC(token_info);
     ptinfo->token = token;
-    ptinfo->next = p->token_info;
-    setup_token_info(ptinfo, p->lex.pbeg, loc);
-
-    p->token_info = ptinfo;
-}
-
-static void
-token_info_pop(struct parser_params *p, const char *token, const rb_code_location_t *loc)
-{
-    token_info *ptinfo_beg = p->token_info;
-
-    if (!ptinfo_beg) return;
-    p->token_info = ptinfo_beg->next;
+    ptinfo->linenum = ruby_sourceline;
+    ptinfo->column = token_info_get_column(parser, t);
+    ptinfo->nonspc = token_info_has_nonspaces(parser, t);
+    ptinfo->next = parser->token_info;
 
-    /* indentation check of matched keywords (begin..end, if..end, etc.) */
-    token_info_warn(p, token, ptinfo_beg, 1, loc);
-    ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg));
+    parser->token_info = ptinfo;
 }
 
 static void
-token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc)
+token_info_pop_gen(struct parser_params *parser, const char *token, size_t len)
 {
-    token_info ptinfo_end_body, *ptinfo_end = &ptinfo_end_body;
-    if (!p->token_info_enabled) return;
-    if (!ptinfo_beg) return;
-    setup_token_info(ptinfo_end, p->lex.pbeg, loc);
-    if (ptinfo_beg->linenum == ptinfo_end->linenum) return; /* ignore one-line block */
-    if (ptinfo_beg->nonspc || ptinfo_end->nonspc) return; /* ignore keyword in the middle of a line */
-    if (ptinfo_beg->column == ptinfo_end->column) return; /* the indents are matched */
-    if (!same && ptinfo_beg->column < ptinfo_end->column) return;
-    rb_warn3L(ptinfo_end->linenum,
-	      "mismatched indentations at '%s' with '%s' at %d",
-	      WARN_S(token), WARN_S(ptinfo_beg->token), WARN_I(ptinfo_beg->linenum));
-}
+    int linenum;
+    token_info *ptinfo = parser->token_info;
+    const char *t = lex_p - len;
 
-static int
-parser_precise_mbclen(struct parser_params *p, const char *ptr)
-{
-    int len = rb_enc_precise_mbclen(ptr, p->lex.pend, p->enc);
-    if (!MBCLEN_CHARFOUND_P(len)) {
-	compile_error(p, "invalid multibyte char (%s)", rb_enc_name(p->enc));
-	return -1;
+    if (!ptinfo) return;
+    parser->token_info = ptinfo->next;
+    linenum = ruby_sourceline;
+    if (parser->token_info_enabled &&
+	linenum != ptinfo->linenum && !ptinfo->nonspc &&
+	!token_info_has_nonspaces(parser, t) &&
+	token_info_get_column(parser, t) != ptinfo->column) {
+	rb_warn3L(linenum,
+		  "mismatched indentations at '%s' with '%s' at %d",
+		  WARN_S(token), WARN_S(ptinfo->token), WARN_I(ptinfo->linenum));
     }
-    return len;
+
+    xfree(ptinfo);
 }
 
 static int
-parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg)
+parser_yyerror(struct parser_params *parser, const char *msg)
 {
 #ifndef RIPPER
     const int max_line_margin = 30;
-    const char *ptr, *ptr_end, *pt, *pb;
-    const char *pre = "", *post = "", *pend;
+    const char *p, *pe;
+    const char *pre = "", *post = "";
     const char *code = "", *caret = "", *newline = "";
-    const char *lim;
     char *buf;
     long len;
     int i;
-    YYLTYPE current;
 
-    if (!yylloc) {
-	RUBY_SET_YYLLOC(current);
-	yylloc = &current;
-    }
-    else if ((p->ruby_sourceline != yylloc->beg_pos.lineno &&
-	      p->ruby_sourceline != yylloc->end_pos.lineno) ||
-	     (yylloc->beg_pos.lineno == yylloc->end_pos.lineno &&
-	      yylloc->beg_pos.column == yylloc->end_pos.column)) {
-	compile_error(p, "%s", msg);
-	return 0;
+    p = lex_p;
+    while (lex_pbeg <= p) {
+	if (*p == '\n') break;
+	p--;
     }
+    p++;
 
-    pend = p->lex.pend;
-    if (pend > p->lex.pbeg && pend[-1] == '\n') {
-	if (--pend > p->lex.pbeg && pend[-1] == '\r') --pend;
+    pe = lex_p;
+    while (pe < lex_pend) {
+	if (*pe == '\n') break;
+	pe++;
     }
 
-    pt = (p->ruby_sourceline == yylloc->end_pos.lineno) ?
-	    p->lex.pbeg + yylloc->end_pos.column : p->lex.pend;
-    ptr = ptr_end = pt < pend ? pt : pend;
-    lim = ptr - p->lex.pbeg > max_line_margin ? ptr - max_line_margin : p->lex.pbeg;
-    while ((lim < ptr) && (*(ptr-1) != '\n')) ptr--;
-
-    lim = pend - ptr_end > max_line_margin ? ptr_end + max_line_margin : pend;
-    while ((ptr_end < lim) && (*ptr_end != '\n')) ptr_end++;
-
-    len = ptr_end - ptr;
+    len = pe - p;
     if (len > 4) {
-	if (ptr > p->lex.pbeg) {
-	    ptr = rb_enc_prev_char(p->lex.pbeg, ptr, pt, rb_enc_get(p->lex.lastline));
-	    if (ptr > p->lex.pbeg) pre = "...";
-	}
-	if (ptr_end < pend) {
-	    ptr_end = rb_enc_prev_char(pt, ptr_end, pend, rb_enc_get(p->lex.lastline));
-	    if (ptr_end < pend) post = "...";
-	}
-    }
-    pb = p->lex.pbeg;
-    if (p->ruby_sourceline == yylloc->beg_pos.lineno) {
-	pb += yylloc->beg_pos.column;
-	if (pb > pt) pb = pt;
-    }
-    if (pb < ptr) pb = ptr;
-    if (len <= 4 && yylloc->beg_pos.lineno == yylloc->end_pos.lineno) {
-	compile_error(p, "%s", msg);
-    }
-    else if (!p->error_buffer && rb_stderr_tty_p()) {
-#define CSI_BEGIN "\033["
-#define CSI_SGR "m"
-	compile_error(p, "%s\n"
-		      CSI_BEGIN""CSI_SGR"%s" /* pre */
-		      CSI_BEGIN"1"CSI_SGR"%.*s"
-		      CSI_BEGIN"1;4"CSI_SGR"%.*s"
-		      CSI_BEGIN";1"CSI_SGR"%.*s"
-		      CSI_BEGIN""CSI_SGR"%s" /* post */,
-		      msg, pre,
-		      (int)(pb - ptr), ptr,
-		      (int)(pt - pb), pb,
-		      (int)(ptr_end - pt), pt,
-		      post);
-    }
-    else {
 	char *p2;
 
-	len = ptr_end - ptr;
-	lim = pt < pend ? pt : pend;
-	i = (int)(lim - ptr);
-	buf = ALLOCA_N(char, i+2);
-	code = ptr;
-	caret = p2 = buf;
-	if (ptr <= pb) {
-	    while (ptr < pb) {
-		*p2++ = *ptr++ == '\t' ? '\t' : ' ';
+	if (len > max_line_margin * 2 + 10) {
+	    if (lex_p - p > max_line_margin) {
+		p = rb_enc_prev_char(p, lex_p - max_line_margin, pe, rb_enc_get(lex_lastline));
+		pre = "...";
 	    }
-	    *p2++ = '^';
-	    ptr++;
+	    if (pe - lex_p > max_line_margin) {
+		pe = rb_enc_prev_char(lex_p, lex_p + max_line_margin, pe, rb_enc_get(lex_lastline));
+		post = "...";
+	    }
+	    len = pe - p;
 	}
-	if (lim > ptr) {
-	    memset(p2, '~', (lim - ptr));
-	    p2 += (lim - ptr);
+	i = (int)(lex_p - p);
+	buf = ALLOCA_N(char, i+2);
+	code = p;
+	caret = p2 = buf;
+	while (i-- > 0) {
+	    *p2++ = *p++ == '\t' ? '\t' : ' ';
 	}
+	*p2++ = '^';
 	*p2 = '\0';
 	newline = "\n";
-	compile_error(p, "%s%s""%s%.*s%s%s""%s%s",
-		      msg, newline,
-		      pre, (int)len, code, post, newline,
-		      pre, caret);
     }
+    else {
+	len = 0;
+    }
+    compile_error(PARSER_ARG "%s%s""%s%.*s%s%s""%s%s",
+		  msg, newline,
+		  pre, (int)len, code, post, newline,
+		  pre, caret);
 #else
     dispatch1(parse_error, STR_NEW2(msg));
-    ripper_error(p);
+    ripper_error();
 #endif /* !RIPPER */
     return 0;
 }
 
-static int
-vtable_size(const struct vtable *tbl)
-{
-    if (!DVARS_TERMINAL_P(tbl)) {
-	return tbl->pos;
-    }
-    else {
-	return 0;
-    }
-}
-
-static struct vtable *
-vtable_alloc_gen(struct parser_params *p, int line, struct vtable *prev)
-{
-    struct vtable *tbl = ALLOC(struct vtable);
-    tbl->pos = 0;
-    tbl->capa = 8;
-    tbl->tbl = ALLOC_N(ID, tbl->capa);
-    tbl->prev = prev;
-#ifndef RIPPER
-    if (p->debug) {
-	rb_parser_printf(p, "vtable_alloc:%d: %p\n", line, (void *)tbl);
-    }
-#endif
-    return tbl;
-}
-#define vtable_alloc(prev) vtable_alloc_gen(p, __LINE__, prev)
-
-static void
-vtable_free_gen(struct parser_params *p, int line, const char *name,
-		struct vtable *tbl)
-{
-#ifndef RIPPER
-    if (p->debug) {
-	rb_parser_printf(p, "vtable_free:%d: %s(%p)\n", line, name, (void *)tbl);
-    }
-#endif
-    if (!DVARS_TERMINAL_P(tbl)) {
-	if (tbl->tbl) {
-	    ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID));
-	}
-	ruby_sized_xfree(tbl, sizeof(tbl));
-    }
-}
-#define vtable_free(tbl) vtable_free_gen(p, __LINE__, #tbl, tbl)
-
-static void
-vtable_add_gen(struct parser_params *p, int line, const char *name,
-	       struct vtable *tbl, ID id)
-{
-#ifndef RIPPER
-    if (p->debug) {
-	rb_parser_printf(p, "vtable_add:%d: %s(%p), %s\n",
-			 line, name, (void *)tbl, rb_id2name(id));
-    }
-#endif
-    if (DVARS_TERMINAL_P(tbl)) {
-	rb_parser_fatal(p, "vtable_add: vtable is not allocated (%p)", (void *)tbl);
-	return;
-    }
-    if (tbl->pos == tbl->capa) {
-	tbl->capa = tbl->capa * 2;
-	SIZED_REALLOC_N(tbl->tbl, ID, tbl->capa, tbl->pos);
-    }
-    tbl->tbl[tbl->pos++] = id;
-}
-#define vtable_add(tbl, id) vtable_add_gen(p, __LINE__, #tbl, tbl, id)
+static void parser_prepare(struct parser_params *parser);
 
 #ifndef RIPPER
-static void
-vtable_pop_gen(struct parser_params *p, int line, const char *name,
-	       struct vtable *tbl, int n)
-{
-    if (p->debug) {
-	rb_parser_printf(p, "vtable_pop:%d: %s(%p), %d\n",
-			 line, name, (void *)tbl, n);
-    }
-    if (tbl->pos < n) {
-	rb_parser_fatal(p, "vtable_pop: unreachable (%d < %d)", tbl->pos, n);
-	return;
-    }
-    tbl->pos -= n;
-}
-#define vtable_pop(tbl, n) vtable_pop_gen(p, __LINE__, #tbl, tbl, n)
-#endif
-
-static int
-vtable_included(const struct vtable * tbl, ID id)
-{
-    int i;
-
-    if (!DVARS_TERMINAL_P(tbl)) {
-	for (i = 0; i < tbl->pos; i++) {
-	    if (tbl->tbl[i] == id) {
-		return i+1;
-	    }
-	}
-    }
-    return 0;
-}
-
-static void parser_prepare(struct parser_params *p);
-
-#ifndef RIPPER
-static NODE *parser_append_options(struct parser_params *p, NODE *node);
-
 static VALUE
 debug_lines(VALUE fname)
 {
@@ -4856,10 +5336,22 @@ debug_lines(VALUE fname)
     return 0;
 }
 
+static VALUE
+coverage(VALUE fname, int n)
+{
+    VALUE coverages = rb_get_coverages();
+    if (RTEST(coverages) && RBASIC(coverages)->klass == 0) {
+	VALUE lines = n > 0 ? rb_ary_tmp_new_fill(n) : rb_ary_tmp_new(0);
+	rb_hash_aset(coverages, fname, lines);
+	return lines;
+    }
+    return 0;
+}
+
 static int
-e_option_supplied(struct parser_params *p)
+e_option_supplied(struct parser_params *parser)
 {
-    return strcmp(p->ruby_sourcefile, "-e") == 0;
+    return strcmp(ruby_sourcefile, "-e") == 0;
 }
 
 static VALUE
@@ -4867,85 +5359,71 @@ yycompile0(VALUE arg)
 {
     int n;
     NODE *tree;
-    struct parser_params *p = (struct parser_params *)arg;
+    struct parser_params *parser = (struct parser_params *)arg;
     VALUE cov = Qfalse;
 
-    if (!compile_for_eval && rb_safe_level() == 0 && !NIL_P(p->ruby_sourcefile_string)) {
-	p->debug_lines = debug_lines(p->ruby_sourcefile_string);
-	if (p->debug_lines && p->ruby_sourceline > 0) {
+    if (!compile_for_eval && rb_safe_level() == 0) {
+	ruby_debug_lines = debug_lines(ruby_sourcefile_string);
+	if (ruby_debug_lines && ruby_sourceline > 0) {
 	    VALUE str = STR_NEW0();
-	    n = p->ruby_sourceline;
+	    n = ruby_sourceline;
 	    do {
-		rb_ary_push(p->debug_lines, str);
+		rb_ary_push(ruby_debug_lines, str);
 	    } while (--n);
 	}
 
-	if (!e_option_supplied(p)) {
+	if (!e_option_supplied(parser)) {
+	    ruby_coverage = coverage(ruby_sourcefile_string, ruby_sourceline);
 	    cov = Qtrue;
 	}
     }
 
-    parser_prepare(p);
+    parser_prepare(parser);
+#ifndef RIPPER
 #define RUBY_DTRACE_PARSE_HOOK(name) \
     if (RUBY_DTRACE_PARSE_##name##_ENABLED()) { \
-	RUBY_DTRACE_PARSE_##name(p->ruby_sourcefile, p->ruby_sourceline); \
+	RUBY_DTRACE_PARSE_##name(ruby_sourcefile, ruby_sourceline); \
     }
     RUBY_DTRACE_PARSE_HOOK(BEGIN);
-    n = yyparse(p);
+#endif
+    n = yyparse((void*)parser);
+#ifndef RIPPER
     RUBY_DTRACE_PARSE_HOOK(END);
-    p->debug_lines = 0;
-
-    p->lex.strterm = 0;
-    p->lex.pcur = p->lex.pbeg = p->lex.pend = 0;
-    p->lex.prevline = p->lex.lastline = p->lex.nextline = 0;
-    if (n || p->error_p) {
-	VALUE mesg = p->error_buffer;
+#endif
+    ruby_debug_lines = 0;
+    ruby_coverage = 0;
+
+    lex_strterm = 0;
+    lex_p = lex_pbeg = lex_pend = 0;
+    lex_lastline = lex_nextline = 0;
+    if (parser->error_p) {
+	VALUE mesg = parser->error_buffer;
 	if (!mesg) {
 	    mesg = rb_class_new_instance(0, 0, rb_eSyntaxError);
 	}
 	rb_set_errinfo(mesg);
-	return FALSE;
+	return 0;
     }
-    tree = p->eval_tree;
+    tree = ruby_eval_tree;
     if (!tree) {
-	tree = NEW_NIL(&NULL_LOC);
+	tree = NEW_NIL();
     }
     else {
-	VALUE opt = p->compile_option;
-	NODE *prelude;
-	NODE *body = parser_append_options(p, tree->nd_body);
+	VALUE opt = parser->compile_option;
 	if (!opt) opt = rb_obj_hide(rb_ident_hash_new());
 	rb_hash_aset(opt, rb_sym_intern_ascii_cstr("coverage_enabled"), cov);
-	prelude = block_append(p, p->eval_tree_begin, body);
-	add_mark_object(p, opt);
-	tree->nd_body = prelude;
-	p->ast->body.compile_option = opt;
+	tree->nd_body = NEW_PRELUDE(ruby_eval_tree_begin, tree->nd_body, opt);
     }
-    p->ast->body.root = tree;
-    p->ast->body.line_count = p->line_count;
-    return TRUE;
+    return (VALUE)tree;
 }
 
-static rb_ast_t *
-yycompile(VALUE vparser, struct parser_params *p, VALUE fname, int line)
+static NODE*
+yycompile(struct parser_params *parser, VALUE fname, int line)
 {
-    rb_ast_t *ast;
-    if (NIL_P(fname)) {
-	p->ruby_sourcefile_string = Qnil;
-	p->ruby_sourcefile = "(none)";
-    }
-    else {
-	p->ruby_sourcefile_string = rb_fstring(fname);
-	p->ruby_sourcefile = StringValueCStr(fname);
-    }
-    p->ruby_sourceline = line - 1;
-
-    p->ast = ast = rb_ast_new();
-    rb_suppress_tracing(yycompile0, (VALUE)p);
-    p->ast = 0;
-    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
-
-    return ast;
+    ruby_sourcefile_string = rb_str_new_frozen(fname);
+    ruby_sourcefile = RSTRING_PTR(fname);
+    ruby_sourceline = line - 1;
+    return (NODE *)rb_suppress_tracing(yycompile0, (VALUE)parser);
 }
 #endif /* !RIPPER */
 
@@ -4960,7 +5438,7 @@ must_be_ascii_compatible(VALUE s)
 }
 
 static VALUE
-lex_get_str(struct parser_params *p, VALUE s)
+lex_get_str(struct parser_params *parser, VALUE s)
 {
     char *beg, *end, *start;
     long len;
@@ -4968,79 +5446,84 @@ lex_get_str(struct parser_params *p, VALUE s)
     beg = RSTRING_PTR(s);
     len = RSTRING_LEN(s);
     start = beg;
-    if (p->lex.gets_.ptr) {
-	if (len == p->lex.gets_.ptr) return Qnil;
-	beg += p->lex.gets_.ptr;
-	len -= p->lex.gets_.ptr;
+    if (lex_gets_ptr) {
+	if (len == lex_gets_ptr) return Qnil;
+	beg += lex_gets_ptr;
+	len -= lex_gets_ptr;
     }
     end = memchr(beg, '\n', len);
     if (end) len = ++end - beg;
-    p->lex.gets_.ptr += len;
+    lex_gets_ptr += len;
     return rb_str_subseq(s, beg - start, len);
 }
 
 static VALUE
-lex_getline(struct parser_params *p)
+lex_getline(struct parser_params *parser)
 {
-    VALUE line = (*p->lex.gets)(p, p->lex.input);
+    VALUE line = (*lex_gets)(parser, lex_input);
     if (NIL_P(line)) return line;
     must_be_ascii_compatible(line);
 #ifndef RIPPER
-    if (p->debug_lines) {
-	rb_enc_associate(line, p->enc);
-	rb_ary_push(p->debug_lines, line);
+    if (ruby_debug_lines) {
+	rb_enc_associate(line, current_enc);
+	rb_ary_push(ruby_debug_lines, line);
+    }
+    if (ruby_coverage) {
+	rb_ary_push(ruby_coverage, Qnil);
     }
 #endif
-    p->line_count++;
     return line;
 }
 
 static const rb_data_type_t parser_data_type;
 
 #ifndef RIPPER
-static rb_ast_t*
+static NODE*
 parser_compile_string(VALUE vparser, VALUE fname, VALUE s, int line)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
+    NODE *node;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    lex_gets = lex_get_str;
+    lex_gets_ptr = 0;
+    lex_input = rb_str_new_frozen(s);
+    lex_pbeg = lex_p = lex_pend = 0;
 
-    p->lex.gets = lex_get_str;
-    p->lex.gets_.ptr = 0;
-    p->lex.input = rb_str_new_frozen(s);
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
+    node = yycompile(parser, fname, line);
+    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
 
-    return yycompile(vparser, p, fname, line);
+    return node;
 }
 
-rb_ast_t*
+NODE*
 rb_compile_string(const char *f, VALUE s, int line)
 {
     must_be_ascii_compatible(s);
     return parser_compile_string(rb_parser_new(), rb_filesystem_str_new_cstr(f), s, line);
 }
 
-rb_ast_t*
+NODE*
 rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line)
 {
     return rb_parser_compile_string_path(vparser, rb_filesystem_str_new_cstr(f), s, line);
 }
 
-rb_ast_t*
+NODE*
 rb_parser_compile_string_path(VALUE vparser, VALUE f, VALUE s, int line)
 {
     must_be_ascii_compatible(s);
     return parser_compile_string(vparser, f, s, line);
 }
 
-rb_ast_t*
+NODE*
 rb_compile_cstr(const char *f, const char *s, int len, int line)
 {
     VALUE str = rb_str_new(s, len);
     return parser_compile_string(rb_parser_new(), rb_filesystem_str_new_cstr(f), str, line);
 }
 
-rb_ast_t*
+NODE*
 rb_parser_compile_cstr(VALUE vparser, const char *f, const char *s, int len, int line)
 {
     VALUE str = rb_str_new(s, len);
@@ -5050,12 +5533,12 @@ rb_parser_compile_cstr(VALUE vparser, const char *f, const char *s, int len, int
 VALUE rb_io_gets_internal(VALUE io);
 
 static VALUE
-lex_io_gets(struct parser_params *p, VALUE io)
+lex_io_gets(struct parser_params *parser, VALUE io)
 {
     return rb_io_gets_internal(io);
 }
 
-rb_ast_t*
+NODE*
 rb_compile_file(const char *f, VALUE file, int start)
 {
     VALUE vparser = rb_parser_new();
@@ -5063,45 +5546,27 @@ rb_compile_file(const char *f, VALUE file, int start)
     return rb_parser_compile_file(vparser, f, file, start);
 }
 
-rb_ast_t*
+NODE*
 rb_parser_compile_file(VALUE vparser, const char *f, VALUE file, int start)
 {
     return rb_parser_compile_file_path(vparser, rb_filesystem_str_new_cstr(f), file, start);
 }
 
-rb_ast_t*
+NODE*
 rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start)
 {
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-
-    p->lex.gets = lex_io_gets;
-    p->lex.input = file;
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
-
-    return yycompile(vparser, p, fname, start);
-}
-
-static VALUE
-lex_generic_gets(struct parser_params *p, VALUE input)
-{
-    return (*p->lex.gets_.call)(input, p->line_count);
-}
-
-rb_ast_t*
-rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int start)
-{
-    struct parser_params *p;
+    struct parser_params *parser;
+    NODE *node;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    lex_gets = lex_io_gets;
+    lex_input = file;
+    lex_pbeg = lex_p = lex_pend = 0;
 
-    p->lex.gets = lex_generic_gets;
-    p->lex.gets_.call = lex_gets;
-    p->lex.input = input;
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
+    node = yycompile(parser, fname, start);
+    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
 
-    return yycompile(vparser, p, fname, start);
+    return node;
 }
 #endif  /* !RIPPER */
 
@@ -5112,8 +5577,7 @@ rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fn
 #define STR_FUNC_SYMBOL 0x10
 #define STR_FUNC_INDENT 0x20
 #define STR_FUNC_LABEL  0x40
-#define STR_FUNC_LIST   0x4000
-#define STR_FUNC_TERM   0x8000
+#define STR_TERM_END    -1
 
 enum string_type {
     str_label  = STR_FUNC_LABEL,
@@ -5121,18 +5585,18 @@ enum string_type {
     str_dquote = (STR_FUNC_EXPAND),
     str_xquote = (STR_FUNC_EXPAND),
     str_regexp = (STR_FUNC_REGEXP|STR_FUNC_ESCAPE|STR_FUNC_EXPAND),
-    str_sword  = (STR_FUNC_QWORDS|STR_FUNC_LIST),
-    str_dword  = (STR_FUNC_QWORDS|STR_FUNC_EXPAND|STR_FUNC_LIST),
+    str_sword  = (STR_FUNC_QWORDS),
+    str_dword  = (STR_FUNC_QWORDS|STR_FUNC_EXPAND),
     str_ssym   = (STR_FUNC_SYMBOL),
     str_dsym   = (STR_FUNC_SYMBOL|STR_FUNC_EXPAND)
 };
 
 static VALUE
-parser_str_new(const char *ptr, long len, rb_encoding *enc, int func, rb_encoding *enc0)
+parser_str_new(const char *p, long n, rb_encoding *enc, int func, rb_encoding *enc0)
 {
     VALUE str;
 
-    str = rb_enc_str_new(ptr, len, enc);
+    str = rb_enc_str_new(p, n, enc);
     if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) {
 	if (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) {
 	}
@@ -5144,211 +5608,164 @@ parser_str_new(const char *ptr, long len, rb_encoding *enc, int func, rb_encodin
     return str;
 }
 
-#define lex_goto_eol(p) ((p)->lex.pcur = (p)->lex.pend)
-#define lex_eol_p(p) ((p)->lex.pcur >= (p)->lex.pend)
-#define lex_eol_n_p(p,n) ((p)->lex.pcur+(n) >= (p)->lex.pend)
-#define peek(p,c) peek_n(p, (c), 0)
-#define peek_n(p,c,n) (!lex_eol_n_p(p, n) && (c) == (unsigned char)(p)->lex.pcur[n])
-#define peekc(p) peekc_n(p, 0)
-#define peekc_n(p,n) (lex_eol_n_p(p, n) ? -1 : (unsigned char)(p)->lex.pcur[n])
-
-#ifdef RIPPER
-static void
-add_delayed_token(struct parser_params *p, const char *tok, const char *end)
-{
-    if (tok < end) {
-	if (!has_delayed_token(p)) {
-	    p->delayed = rb_str_buf_new(1024);
-	    rb_enc_associate(p->delayed, p->enc);
-	    p->delayed_line = p->ruby_sourceline;
-	    p->delayed_col = (int)(tok - p->lex.pbeg);
-	}
-	rb_str_buf_cat(p->delayed, tok, end - tok);
-	p->lex.ptok = end;
-    }
-}
-#else
-#define add_delayed_token(p, tok, end) ((void)(tok), (void)(end))
-#endif
+#define lex_goto_eol(parser) ((parser)->lex.pcur = (parser)->lex.pend)
+#define lex_eol_p() (lex_p >= lex_pend)
+#define peek(c) peek_n((c), 0)
+#define peek_n(c,n) (lex_p+(n) < lex_pend && (c) == (unsigned char)lex_p[n])
+#define peekc() peekc_n(0)
+#define peekc_n(n) (lex_p+(n) < lex_pend ? (unsigned char)lex_p[n] : -1)
 
 static int
-nextline(struct parser_params *p)
+parser_nextline(struct parser_params *parser)
 {
-    VALUE v = p->lex.nextline;
-    p->lex.nextline = 0;
+    VALUE v = lex_nextline;
+    lex_nextline = 0;
     if (!v) {
-	if (p->eofp)
+	if (parser->eofp)
 	    return -1;
 
-	if (!p->lex.input || NIL_P(v = lex_getline(p))) {
-	    p->eofp = 1;
-	    lex_goto_eol(p);
+	if (!lex_input || NIL_P(v = lex_getline(parser))) {
+	    parser->eofp = 1;
+	    lex_goto_eol(parser);
 	    return -1;
 	}
-	p->cr_seen = FALSE;
+	parser->cr_seen = FALSE;
     }
-    add_delayed_token(p, p->lex.ptok, p->lex.pend);
-    if (p->heredoc_end > 0) {
-	p->ruby_sourceline = p->heredoc_end;
-	p->heredoc_end = 0;
+#ifdef RIPPER
+    if (parser->tokp < lex_pend) {
+	if (!has_delayed_token()) {
+	    parser->delayed = rb_str_buf_new(1024);
+	    rb_enc_associate(parser->delayed, current_enc);
+	    rb_str_buf_cat(parser->delayed,
+			   parser->tokp, lex_pend - parser->tokp);
+	    parser->delayed_line = ruby_sourceline;
+	    parser->delayed_col = (int)(parser->tokp - lex_pbeg);
+	}
+	else {
+	    rb_str_buf_cat(parser->delayed,
+			   parser->tokp, lex_pend - parser->tokp);
+	}
     }
-    p->ruby_sourceline++;
-    p->lex.pbeg = p->lex.pcur = RSTRING_PTR(v);
-    p->lex.pend = p->lex.pcur + RSTRING_LEN(v);
-    token_flush(p);
-    p->lex.prevline = p->lex.lastline;
-    p->lex.lastline = v;
+#endif
+    if (heredoc_end > 0) {
+	ruby_sourceline = heredoc_end;
+	heredoc_end = 0;
+    }
+    ruby_sourceline++;
+    parser->line_count++;
+    lex_pbeg = lex_p = RSTRING_PTR(v);
+    lex_pend = lex_p + RSTRING_LEN(v);
+    ripper_flush(parser);
+    lex_lastline = v;
     return 0;
 }
 
 static int
-parser_cr(struct parser_params *p, int c)
+parser_cr(struct parser_params *parser, int c)
 {
-    if (peek(p, '\n')) {
-	p->lex.pcur++;
+    if (peek('\n')) {
+	lex_p++;
 	c = '\n';
     }
-    else if (!p->cr_seen) {
-	p->cr_seen = TRUE;
-	/* carried over with p->lex.nextline for nextc() */
+    else if (!parser->cr_seen) {
+	parser->cr_seen = TRUE;
+	/* carried over with lex_nextline for nextc() */
 	rb_warn0("encountered \\r in middle of line, treated as a mere space");
     }
     return c;
 }
 
 static inline int
-nextc(struct parser_params *p)
+parser_nextc(struct parser_params *parser)
 {
     int c;
 
-    if (UNLIKELY((p->lex.pcur == p->lex.pend) || p->eofp || p->lex.nextline)) {
-	if (nextline(p)) return -1;
+    if (UNLIKELY(lex_p == lex_pend)) {
+	if (parser_nextline(parser)) return -1;
     }
-    c = (unsigned char)*p->lex.pcur++;
+    c = (unsigned char)*lex_p++;
     if (UNLIKELY(c == '\r')) {
-	c = parser_cr(p, c);
+	c = parser_cr(parser, c);
     }
 
     return c;
 }
 
 static void
-pushback(struct parser_params *p, int c)
+parser_pushback(struct parser_params *parser, int c)
 {
     if (c == -1) return;
-    p->lex.pcur--;
-    if (p->lex.pcur > p->lex.pbeg && p->lex.pcur[0] == '\n' && p->lex.pcur[-1] == '\r') {
-	p->lex.pcur--;
+    lex_p--;
+    if (lex_p > lex_pbeg && lex_p[0] == '\n' && lex_p[-1] == '\r') {
+	lex_p--;
     }
 }
 
-#define was_bol(p) ((p)->lex.pcur == (p)->lex.pbeg + 1)
+#define was_bol() (lex_p == lex_pbeg + 1)
 
-#define tokfix(p) ((p)->tokenbuf[(p)->tokidx]='\0')
-#define tok(p) (p)->tokenbuf
-#define toklen(p) (p)->tokidx
+#define tokfix() (tokenbuf[tokidx]='\0')
+#define tok() tokenbuf
+#define toklen() tokidx
+#define toklast() (tokidx>0?tokenbuf[tokidx-1]:0)
 
 static char*
-newtok(struct parser_params *p)
+parser_newtok(struct parser_params *parser)
 {
-    p->tokidx = 0;
-    p->tokline = p->ruby_sourceline;
-    if (!p->tokenbuf) {
-	p->toksiz = 60;
-	p->tokenbuf = ALLOC_N(char, 60);
+    tokidx = 0;
+    tokline = ruby_sourceline;
+    if (!tokenbuf) {
+	toksiz = 60;
+	tokenbuf = ALLOC_N(char, 60);
     }
-    if (p->toksiz > 4096) {
-	p->toksiz = 60;
-	REALLOC_N(p->tokenbuf, char, 60);
+    if (toksiz > 4096) {
+	toksiz = 60;
+	REALLOC_N(tokenbuf, char, 60);
     }
-    return p->tokenbuf;
+    return tokenbuf;
 }
 
 static char *
-tokspace(struct parser_params *p, int n)
+parser_tokspace(struct parser_params *parser, int n)
 {
-    p->tokidx += n;
+    tokidx += n;
 
-    if (p->tokidx >= p->toksiz) {
-	do {p->toksiz *= 2;} while (p->toksiz < p->tokidx);
-	REALLOC_N(p->tokenbuf, char, p->toksiz);
+    if (tokidx >= toksiz) {
+	do {toksiz *= 2;} while (toksiz < tokidx);
+	REALLOC_N(tokenbuf, char, toksiz);
     }
-    return &p->tokenbuf[p->tokidx-n];
+    return &tokenbuf[tokidx-n];
 }
 
 static void
-tokadd(struct parser_params *p, int c)
+parser_tokadd(struct parser_params *parser, int c)
 {
-    p->tokenbuf[p->tokidx++] = (char)c;
-    if (p->tokidx >= p->toksiz) {
-	p->toksiz *= 2;
-	REALLOC_N(p->tokenbuf, char, p->toksiz);
+    tokenbuf[tokidx++] = (char)c;
+    if (tokidx >= toksiz) {
+	toksiz *= 2;
+	REALLOC_N(tokenbuf, char, toksiz);
     }
 }
 
 static int
-tok_hex(struct parser_params *p, size_t *numlen)
+parser_tok_hex(struct parser_params *parser, size_t *numlen)
 {
     int c;
 
-    c = scan_hex(p->lex.pcur, 2, numlen);
+    c = scan_hex(lex_p, 2, numlen);
     if (!*numlen) {
-	p->lex.ptok = p->lex.pcur;
-	yyerror0("invalid hex escape");
+	yyerror("invalid hex escape");
 	return 0;
     }
-    p->lex.pcur += *numlen;
+    lex_p += *numlen;
     return c;
 }
 
-#define tokcopy(p, n) memcpy(tokspace(p, n), (p)->lex.pcur - (n), (n))
-
-static int
-tokadd_codepoint(struct parser_params *p, rb_encoding **encp,
-		 int regexp_literal, int wide)
-{
-    size_t numlen;
-    int codepoint = scan_hex(p->lex.pcur, wide ? p->lex.pend - p->lex.pcur : 4, &numlen);
-    literal_flush(p, p->lex.pcur);
-    p->lex.pcur += numlen;
-    if (wide ? (numlen == 0 || numlen > 6) : (numlen < 4))  {
-	yyerror0("invalid Unicode escape");
-	return wide && numlen > 0;
-    }
-    if (codepoint > 0x10ffff) {
-	yyerror0("invalid Unicode codepoint (too large)");
-	return wide;
-    }
-    if ((codepoint & 0xfffff800) == 0xd800) {
-	yyerror0("invalid Unicode codepoint");
-	return wide;
-    }
-    if (regexp_literal) {
-	tokcopy(p, (int)numlen);
-    }
-    else if (codepoint >= 0x80) {
-	rb_encoding *utf8 = rb_utf8_encoding();
-	if (*encp && utf8 != *encp) {
-	    static const char mixed_utf8[] = "UTF-8 mixed within %s source";
-	    size_t len = sizeof(mixed_utf8) - 2 + strlen(rb_enc_name(*encp));
-	    char *mesg = alloca(len);
-	    snprintf(mesg, len, mixed_utf8, rb_enc_name(*encp));
-	    yyerror0(mesg);
-	    return wide;
-	}
-	*encp = utf8;
-	tokaddmbc(p, codepoint, *encp);
-    }
-    else {
-	tokadd(p, codepoint);
-    }
-    return TRUE;
-}
+#define tokcopy(n) memcpy(tokspace(n), lex_p - (n), (n))
 
 /* return value is for ?\u3042 */
 static int
-parser_tokadd_utf8(struct parser_params *p, rb_encoding **encp,
-		   int string_literal, int symbol_literal, int regexp_literal)
+parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
+                   int string_literal, int symbol_literal, int regexp_literal)
 {
     /*
      * If string_literal is true, then we allow multiple codepoints
@@ -5357,54 +5774,78 @@ parser_tokadd_utf8(struct parser_params *p, rb_encoding **encp,
      * codepoint without adding it
      */
 
-    const int open_brace = '{', close_brace = '}';
+    int codepoint;
+    size_t numlen;
 
-    if (regexp_literal) { tokadd(p, '\\'); tokadd(p, 'u'); }
+    if (regexp_literal) { tokadd('\\'); tokadd('u'); }
 
-    if (peek(p, open_brace)) {  /* handle \u{...} form */
-	int c, last = nextc(p);
-	if (p->lex.pcur >= p->lex.pend) goto unterminated;
-	while (ISSPACE(c = *p->lex.pcur) && ++p->lex.pcur < p->lex.pend);
-	while (c != close_brace) {
-	    if (regexp_literal) tokadd(p, last);
-	    if (!tokadd_codepoint(p, encp, regexp_literal, TRUE)) {
-		break;
+    if (peek('{')) {  /* handle \u{...} form */
+	do {
+            if (regexp_literal) { tokadd(*lex_p); }
+	    nextc();
+	    codepoint = scan_hex(lex_p, 6, &numlen);
+	    if (numlen == 0)  {
+		yyerror("invalid Unicode escape");
+		return 0;
 	    }
-	    while (ISSPACE(c = *p->lex.pcur)) {
-		if (++p->lex.pcur >= p->lex.pend) goto unterminated;
-		last = c;
+	    if (codepoint > 0x10ffff) {
+		yyerror("invalid Unicode codepoint (too large)");
+		return 0;
 	    }
-	}
+	    lex_p += numlen;
+            if (regexp_literal) {
+                tokcopy((int)numlen);
+            }
+            else if (codepoint >= 0x80) {
+		*encp = rb_utf8_encoding();
+		if (string_literal) tokaddmbc(codepoint, *encp);
+	    }
+	    else if (string_literal) {
+		tokadd(codepoint);
+	    }
+	} while (string_literal && (peek(' ') || peek('\t')));
 
-	if (c != close_brace) {
-	  unterminated:
-	    literal_flush(p, p->lex.pcur);
-	    yyerror0("unterminated Unicode escape");
+	if (!peek('}')) {
+	    yyerror("unterminated Unicode escape");
 	    return 0;
 	}
 
-	if (regexp_literal) tokadd(p, close_brace);
-	nextc(p);
+        if (regexp_literal) { tokadd('}'); }
+	nextc();
     }
     else {			/* handle \uxxxx form */
-	if (!tokadd_codepoint(p, encp, regexp_literal, FALSE)) {
+	codepoint = scan_hex(lex_p, 4, &numlen);
+	if (numlen < 4) {
+	    yyerror("invalid Unicode escape");
 	    return 0;
 	}
+	lex_p += 4;
+        if (regexp_literal) {
+            tokcopy(4);
+        }
+	else if (codepoint >= 0x80) {
+	    *encp = rb_utf8_encoding();
+	    if (string_literal) tokaddmbc(codepoint, *encp);
+	}
+	else if (string_literal) {
+	    tokadd(codepoint);
+	}
     }
 
-    return TRUE;
+    return codepoint;
 }
 
 #define ESCAPE_CONTROL 1
 #define ESCAPE_META    2
 
 static int
-read_escape(struct parser_params *p, int flags, rb_encoding **encp)
+parser_read_escape(struct parser_params *parser, int flags,
+		   rb_encoding **encp)
 {
     int c;
     size_t numlen;
 
-    switch (c = nextc(p)) {
+    switch (c = nextc()) {
       case '\\':	/* Backslash */
 	return c;
 
@@ -5431,13 +5872,13 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
 
       case '0': case '1': case '2': case '3': /* octal constant */
       case '4': case '5': case '6': case '7':
-	pushback(p, c);
-	c = scan_oct(p->lex.pcur, 3, &numlen);
-	p->lex.pcur += numlen;
+	pushback(c);
+	c = scan_oct(lex_p, 3, &numlen);
+	lex_p += numlen;
 	return c;
 
       case 'x':	/* hex constant */
-	c = tok_hex(p, &numlen);
+	c = tok_hex(&numlen);
 	if (numlen == 0) return 0;
 	return c;
 
@@ -5449,12 +5890,13 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
 
       case 'M':
 	if (flags & ESCAPE_META) goto eof;
-	if ((c = nextc(p)) != '-') {
+	if ((c = nextc()) != '-') {
+	    pushback(c);
 	    goto eof;
 	}
-	if ((c = nextc(p)) == '\\') {
-	    if (peek(p, 'u')) goto eof;
-	    return read_escape(p, flags|ESCAPE_META, encp) | 0x80;
+	if ((c = nextc()) == '\\') {
+	    if (peek('u')) goto eof;
+	    return read_escape(flags|ESCAPE_META, encp) | 0x80;
 	}
 	else if (c == -1 || !ISASCII(c)) goto eof;
 	else {
@@ -5462,14 +5904,15 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
 	}
 
       case 'C':
-	if ((c = nextc(p)) != '-') {
+	if ((c = nextc()) != '-') {
+	    pushback(c);
 	    goto eof;
 	}
       case 'c':
 	if (flags & ESCAPE_CONTROL) goto eof;
-	if ((c = nextc(p))== '\\') {
-	    if (peek(p, 'u')) goto eof;
-	    c = read_escape(p, flags|ESCAPE_CONTROL, encp);
+	if ((c = nextc())== '\\') {
+	    if (peek('u')) goto eof;
+	    c = read_escape(flags|ESCAPE_CONTROL, encp);
 	}
 	else if (c == '?')
 	    return 0177;
@@ -5478,8 +5921,7 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
 
       eof:
       case -1:
-        yyerror0("Invalid escape character syntax");
-	pushback(p, c);
+        yyerror("Invalid escape character syntax");
 	return '\0';
 
       default:
@@ -5488,95 +5930,95 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
 }
 
 static void
-tokaddmbc(struct parser_params *p, int c, rb_encoding *enc)
+parser_tokaddmbc(struct parser_params *parser, int c, rb_encoding *enc)
 {
     int len = rb_enc_codelen(c, enc);
-    rb_enc_mbcput(c, tokspace(p, len), enc);
+    rb_enc_mbcput(c, tokspace(len), enc);
 }
 
 static int
-tokadd_escape(struct parser_params *p, rb_encoding **encp)
+parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp)
 {
     int c;
     int flags = 0;
     size_t numlen;
 
   first:
-    switch (c = nextc(p)) {
+    switch (c = nextc()) {
       case '\n':
 	return 0;		/* just ignore */
 
       case '0': case '1': case '2': case '3': /* octal constant */
       case '4': case '5': case '6': case '7':
 	{
-	    ruby_scan_oct(--p->lex.pcur, 3, &numlen);
+	    ruby_scan_oct(--lex_p, 3, &numlen);
 	    if (numlen == 0) goto eof;
-	    p->lex.pcur += numlen;
-	    tokcopy(p, (int)numlen + 1);
+	    lex_p += numlen;
+	    tokcopy((int)numlen + 1);
 	}
 	return 0;
 
       case 'x':	/* hex constant */
 	{
-	    tok_hex(p, &numlen);
+	    tok_hex(&numlen);
 	    if (numlen == 0) return -1;
-	    tokcopy(p, (int)numlen + 2);
+	    tokcopy((int)numlen + 2);
 	}
 	return 0;
 
       case 'M':
 	if (flags & ESCAPE_META) goto eof;
-	if ((c = nextc(p)) != '-') {
-	    pushback(p, c);
+	if ((c = nextc()) != '-') {
+	    pushback(c);
 	    goto eof;
 	}
-	tokcopy(p, 3);
+	tokcopy(3);
 	flags |= ESCAPE_META;
 	goto escaped;
 
       case 'C':
 	if (flags & ESCAPE_CONTROL) goto eof;
-	if ((c = nextc(p)) != '-') {
-	    pushback(p, c);
+	if ((c = nextc()) != '-') {
+	    pushback(c);
 	    goto eof;
 	}
-	tokcopy(p, 3);
+	tokcopy(3);
 	goto escaped;
 
       case 'c':
 	if (flags & ESCAPE_CONTROL) goto eof;
-	tokcopy(p, 2);
+	tokcopy(2);
 	flags |= ESCAPE_CONTROL;
       escaped:
-	if ((c = nextc(p)) == '\\') {
+	if ((c = nextc()) == '\\') {
 	    goto first;
 	}
 	else if (c == -1) goto eof;
-	tokadd(p, c);
+	tokadd(c);
 	return 0;
 
       eof:
       case -1:
-        yyerror0("Invalid escape character syntax");
+        yyerror("Invalid escape character syntax");
 	return -1;
 
       default:
-	tokadd(p, '\\');
-	tokadd(p, c);
+        tokadd('\\');
+	tokadd(c);
     }
     return 0;
 }
 
 static int
-regx_options(struct parser_params *p)
+parser_regx_options(struct parser_params *parser)
 {
     int kcode = 0;
     int kopt = 0;
     int options = 0;
     int c, opt, kc;
 
-    newtok(p);
-    while (c = nextc(p), ISALPHA(c)) {
+    newtok();
+    while (c = nextc(), ISALPHA(c)) {
         if (c == 'o') {
             options |= RE_OPTION_ONCE;
         }
@@ -5590,30 +6032,42 @@ regx_options(struct parser_params *p)
 	    }
         }
         else {
-	    tokadd(p, c);
+	    tokadd(c);
         }
     }
     options |= kopt;
-    pushback(p, c);
-    if (toklen(p)) {
-	tokfix(p);
-	compile_error(p, "unknown regexp option%s - %*s",
-		      toklen(p) > 1 ? "s" : "", toklen(p), tok(p));
+    pushback(c);
+    if (toklen()) {
+	tokfix();
+	compile_error(PARSER_ARG "unknown regexp option%s - %s",
+		      toklen() > 1 ? "s" : "", tok());
     }
     return options | RE_OPTION_ENCODING(kcode);
 }
 
+static void
+dispose_string(VALUE str)
+{
+    rb_str_free(str);
+    rb_gc_force_recycle(str);
+}
+
 static int
-tokadd_mbchar(struct parser_params *p, int c)
+parser_tokadd_mbchar(struct parser_params *parser, int c)
 {
-    int len = parser_precise_mbclen(p, p->lex.pcur-1);
-    if (len < 0) return -1;
-    tokadd(p, c);
-    p->lex.pcur += --len;
-    if (len > 0) tokcopy(p, len);
+    int len = parser_precise_mbclen();
+    if (!MBCLEN_CHARFOUND_P(len)) {
+	compile_error(PARSER_ARG "invalid multibyte char (%s)", parser_encoding_name());
+	return -1;
+    }
+    tokadd(c);
+    lex_p += --len;
+    if (len > 0) tokcopy(len);
     return c;
 }
 
+#define tokadd_mbchar(c) parser_tokadd_mbchar(parser, (c))
+
 static inline int
 simple_re_meta(int c)
 {
@@ -5628,67 +6082,62 @@ simple_re_meta(int c)
 }
 
 static int
-parser_update_heredoc_indent(struct parser_params *p, int c)
+parser_update_heredoc_indent(struct parser_params *parser, int c)
 {
-    if (p->heredoc_line_indent == -1) {
-	if (c == '\n') p->heredoc_line_indent = 0;
+    if (heredoc_line_indent == -1) {
+	if (c == '\n') heredoc_line_indent = 0;
     }
     else {
 	if (c == ' ') {
-	    p->heredoc_line_indent++;
+	    heredoc_line_indent++;
 	    return TRUE;
 	}
 	else if (c == '\t') {
-	    int w = (p->heredoc_line_indent / TAB_WIDTH) + 1;
-	    p->heredoc_line_indent = w * TAB_WIDTH;
+	    int w = (heredoc_line_indent / TAB_WIDTH) + 1;
+	    heredoc_line_indent = w * TAB_WIDTH;
 	    return TRUE;
 	}
 	else if (c != '\n') {
-	    if (p->heredoc_indent > p->heredoc_line_indent) {
-		p->heredoc_indent = p->heredoc_line_indent;
+	    if (heredoc_indent > heredoc_line_indent) {
+		heredoc_indent = heredoc_line_indent;
 	    }
-	    p->heredoc_line_indent = -1;
+	    heredoc_line_indent = -1;
 	}
     }
     return FALSE;
 }
 
-static void
-parser_mixed_error(struct parser_params *p, rb_encoding *enc1, rb_encoding *enc2)
-{
-    static const char mixed_msg[] = "%s mixed within %s source";
-    const char *n1 = rb_enc_name(enc1), *n2 = rb_enc_name(enc2);
-    const size_t len = sizeof(mixed_msg) - 4 + strlen(n1) + strlen(n2);
-    char *errbuf = ALLOCA_N(char, len);
-    snprintf(errbuf, len, mixed_msg, n1, n2);
-    yyerror0(errbuf);
-}
-
-static void
-parser_mixed_escape(struct parser_params *p, const char *beg, rb_encoding *enc1, rb_encoding *enc2)
-{
-    const char *pos = p->lex.pcur;
-    p->lex.pcur = beg;
-    parser_mixed_error(p, enc1, enc2);
-    p->lex.pcur = pos;
-}
-
 static int
-tokadd_string(struct parser_params *p,
-	      int func, int term, int paren, long *nest,
-	      rb_encoding **encp, rb_encoding **enc)
+parser_tokadd_string(struct parser_params *parser,
+		     int func, int term, int paren, long *nest,
+		     rb_encoding **encp)
 {
     int c;
-    bool erred = false;
+    int has_nonascii = 0;
+    rb_encoding *enc = *encp;
+    char *errbuf = 0;
+    static const char mixed_msg[] = "%s mixed within %s source";
 
-#define mixed_error(enc1, enc2) \
-    (void)(erred || (parser_mixed_error(p, enc1, enc2), erred = true))
-#define mixed_escape(beg, enc1, enc2) \
-    (void)(erred || (parser_mixed_escape(p, beg, enc1, enc2), erred = true))
+#define mixed_error(enc1, enc2) if (!errbuf) {	\
+	size_t len = sizeof(mixed_msg) - 4;	\
+	len += strlen(rb_enc_name(enc1));	\
+	len += strlen(rb_enc_name(enc2));	\
+	errbuf = ALLOCA_N(char, len);		\
+	snprintf(errbuf, len, mixed_msg,	\
+		 rb_enc_name(enc1),		\
+		 rb_enc_name(enc2));		\
+	yyerror(errbuf);			\
+    }
+#define mixed_escape(beg, enc1, enc2) do {	\
+	const char *pos = lex_p;		\
+	lex_p = (beg);				\
+	mixed_error((enc1), (enc2));		\
+	lex_p = pos;				\
+    } while (0)
 
-    while ((c = nextc(p)) != -1) {
-	if (p->heredoc_indent > 0) {
-	    parser_update_heredoc_indent(p, c);
+    while ((c = nextc()) != -1) {
+	if (heredoc_indent > 0) {
+	    parser_update_heredoc_indent(parser, c);
 	}
 
 	if (paren && c == paren) {
@@ -5696,150 +6145,134 @@ tokadd_string(struct parser_params *p,
 	}
 	else if (c == term) {
 	    if (!nest || !*nest) {
-		pushback(p, c);
+		pushback(c);
 		break;
 	    }
 	    --*nest;
 	}
-	else if ((func & STR_FUNC_EXPAND) && c == '#' && p->lex.pcur < p->lex.pend) {
-	    int c2 = *p->lex.pcur;
+	else if ((func & STR_FUNC_EXPAND) && c == '#' && lex_p < lex_pend) {
+	    int c2 = *lex_p;
 	    if (c2 == '$' || c2 == '@' || c2 == '{') {
-		pushback(p, c);
+		pushback(c);
 		break;
 	    }
 	}
 	else if (c == '\\') {
-	    literal_flush(p, p->lex.pcur - 1);
-	    c = nextc(p);
+	    const char *beg = lex_p - 1;
+	    c = nextc();
 	    switch (c) {
 	      case '\n':
 		if (func & STR_FUNC_QWORDS) break;
-		if (func & STR_FUNC_EXPAND) {
-		    if (!(func & STR_FUNC_INDENT) || (p->heredoc_indent < 0))
-			continue;
-		    if (c == term) {
-			c = '\\';
-			goto terminate;
-		    }
-		}
-		tokadd(p, '\\');
+		if (func & STR_FUNC_EXPAND) continue;
+		tokadd('\\');
 		break;
 
 	      case '\\':
-		if (func & STR_FUNC_ESCAPE) tokadd(p, c);
+		if (func & STR_FUNC_ESCAPE) tokadd(c);
 		break;
 
 	      case 'u':
 		if ((func & STR_FUNC_EXPAND) == 0) {
-		    tokadd(p, '\\');
+		    tokadd('\\');
 		    break;
 		}
-		if (!parser_tokadd_utf8(p, enc, term,
-					func & STR_FUNC_SYMBOL,
-					func & STR_FUNC_REGEXP)) {
-		    return -1;
+		parser_tokadd_utf8(parser, &enc, 1,
+				   func & STR_FUNC_SYMBOL,
+                                   func & STR_FUNC_REGEXP);
+		if (has_nonascii && enc != *encp) {
+		    mixed_escape(beg, enc, *encp);
 		}
 		continue;
 
 	      default:
 		if (c == -1) return -1;
 		if (!ISASCII(c)) {
-		    if ((func & STR_FUNC_EXPAND) == 0) tokadd(p, '\\');
+		    if ((func & STR_FUNC_EXPAND) == 0) tokadd('\\');
 		    goto non_ascii;
 		}
 		if (func & STR_FUNC_REGEXP) {
 		    if (c == term && !simple_re_meta(c)) {
-			tokadd(p, c);
+			tokadd(c);
 			continue;
 		    }
-		    pushback(p, c);
-		    if ((c = tokadd_escape(p, enc)) < 0)
+		    pushback(c);
+		    if ((c = tokadd_escape(&enc)) < 0)
 			return -1;
-		    if (*enc && *enc != *encp) {
-			mixed_escape(p->lex.ptok+2, *enc, *encp);
+		    if (has_nonascii && enc != *encp) {
+			mixed_escape(beg, enc, *encp);
 		    }
 		    continue;
 		}
 		else if (func & STR_FUNC_EXPAND) {
-		    pushback(p, c);
-		    if (func & STR_FUNC_ESCAPE) tokadd(p, '\\');
-		    c = read_escape(p, 0, enc);
+		    pushback(c);
+		    if (func & STR_FUNC_ESCAPE) tokadd('\\');
+		    c = read_escape(0, &enc);
 		}
 		else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
 		    /* ignore backslashed spaces in %w */
 		}
 		else if (c != term && !(paren && c == paren)) {
-		    tokadd(p, '\\');
-		    pushback(p, c);
+		    tokadd('\\');
+		    pushback(c);
 		    continue;
 		}
 	    }
 	}
-	else if (!parser_isascii(p)) {
+	else if (!parser_isascii()) {
 	  non_ascii:
-	    if (!*enc) {
-		*enc = *encp;
-	    }
-	    else if (*enc != *encp) {
-		mixed_error(*enc, *encp);
+	    has_nonascii = 1;
+	    if (enc != *encp) {
+		mixed_error(enc, *encp);
 		continue;
 	    }
-	    if (tokadd_mbchar(p, c) == -1) return -1;
+	    if (tokadd_mbchar(c) == -1) return -1;
 	    continue;
 	}
 	else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
-	    pushback(p, c);
+	    pushback(c);
 	    break;
 	}
         if (c & 0x80) {
-	    if (!*enc) {
-		*enc = *encp;
-	    }
-	    else if (*enc != *encp) {
-		mixed_error(*enc, *encp);
+	    has_nonascii = 1;
+	    if (enc != *encp) {
+		mixed_error(enc, *encp);
 		continue;
 	    }
         }
-	tokadd(p, c);
+	tokadd(c);
     }
-  terminate:
-    if (*enc) *encp = *enc;
+    *encp = enc;
     return c;
 }
 
-static inline rb_strterm_t *
-new_strterm(VALUE v1, VALUE v2, VALUE v3, VALUE v0)
-{
-    return (rb_strterm_t*)rb_imemo_new(imemo_parser_strterm, v1, v2, v3, v0);
-}
-
-/* imemo_parser_strterm for literal */
 #define NEW_STRTERM(func, term, paren) \
-    new_strterm((VALUE)(func), (VALUE)(paren), (VALUE)(term), 0)
+	rb_node_newnode(NODE_STRTERM, (func), (term) | ((paren) << (CHAR_BIT * 2)), 0)
 
 #ifdef RIPPER
 static void
-flush_string_content(struct parser_params *p, rb_encoding *enc)
+ripper_flush_string_content(struct parser_params *parser, rb_encoding *enc)
 {
     VALUE content = yylval.val;
     if (!ripper_is_node_yylval(content))
-	content = ripper_new_yylval(p, 0, 0, content);
-    if (has_delayed_token(p)) {
-	ptrdiff_t len = p->lex.pcur - p->lex.ptok;
+	content = ripper_new_yylval(0, 0, content);
+    if (has_delayed_token()) {
+	ptrdiff_t len = lex_p - parser->tokp;
 	if (len > 0) {
-	    rb_enc_str_buf_cat(p->delayed, p->lex.ptok, len, enc);
+	    rb_enc_str_buf_cat(parser->delayed, parser->tokp, len, enc);
 	}
-	dispatch_delayed_token(p, tSTRING_CONTENT);
-	p->lex.ptok = p->lex.pcur;
+	dispatch_delayed_token(tSTRING_CONTENT);
+	parser->tokp = lex_p;
 	RNODE(content)->nd_rval = yylval.val;
     }
-    dispatch_scan_event(p, tSTRING_CONTENT);
+    dispatch_scan_event(tSTRING_CONTENT);
     if (yylval.val != content)
 	RNODE(content)->nd_rval = yylval.val;
     yylval.val = content;
 }
+
+#define flush_string_content(enc) ripper_flush_string_content(parser, (enc))
 #else
-#define flush_string_content(p, enc) ((void)(enc))
+#define flush_string_content(enc) ((void)(enc))
 #endif
 
 RUBY_FUNC_EXPORTED const unsigned int ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
@@ -5863,33 +6296,33 @@ const unsigned int ruby_global_name_punct_bits[] = {
 #undef SPECIAL_PUNCT
 #endif
 
-static enum yytokentype
-parser_peek_variable_name(struct parser_params *p)
+static int
+parser_peek_variable_name(struct parser_params *parser)
 {
     int c;
-    const char *ptr = p->lex.pcur;
+    const char *p = lex_p;
 
-    if (ptr + 1 >= p->lex.pend) return 0;
-    c = *ptr++;
+    if (p + 1 >= lex_pend) return 0;
+    c = *p++;
     switch (c) {
       case '$':
-	if ((c = *ptr) == '-') {
-	    if (++ptr >= p->lex.pend) return 0;
-	    c = *ptr;
+	if ((c = *p) == '-') {
+	    if (++p >= lex_pend) return 0;
+	    c = *p;
 	}
 	else if (is_global_name_punct(c) || ISDIGIT(c)) {
 	    return tSTRING_DVAR;
 	}
 	break;
       case '@':
-	if ((c = *ptr) == '@') {
-	    if (++ptr >= p->lex.pend) return 0;
-	    c = *ptr;
+	if ((c = *p) == '@') {
+	    if (++p >= lex_pend) return 0;
+	    c = *p;
 	}
 	break;
       case '{':
-	p->lex.pcur = ptr;
-	p->command_start = TRUE;
+	lex_p = p;
+	command_start = TRUE;
 	return tSTRING_DBEG;
       default:
 	return 0;
@@ -5899,221 +6332,156 @@ parser_peek_variable_name(struct parser_params *p)
     return 0;
 }
 
-#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
-#define IS_END() IS_lex_state(EXPR_END_ANY)
-#define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED))
-#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
-#define IS_LABEL_POSSIBLE() (\
-	(IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \
-	IS_ARG())
-#define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
-#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
-
-static inline enum yytokentype
-parser_string_term(struct parser_params *p, int func)
+static inline int
+parser_string_term(struct parser_params *parser, int func)
 {
-    p->lex.strterm = 0;
-    if (func & STR_FUNC_REGEXP) {
-	set_yylval_num(regx_options(p));
-	dispatch_scan_event(p, tREGEXP_END);
-	SET_LEX_STATE(EXPR_END);
-	return tREGEXP_END;
-    }
-    if ((func & STR_FUNC_LABEL) && IS_LABEL_SUFFIX(0)) {
-	nextc(p);
-	SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-	return tLABEL_END;
-    }
-    SET_LEX_STATE(EXPR_END);
-    return tSTRING_END;
+    if (!(func & STR_FUNC_REGEXP)) return tSTRING_END;
+    set_yylval_num(regx_options());
+    dispatch_scan_event(tREGEXP_END);
+    return tREGEXP_END;
 }
 
-static enum yytokentype
-parse_string(struct parser_params *p, rb_strterm_literal_t *quote)
+static int
+parser_parse_string(struct parser_params *parser, NODE *quote)
 {
-    int func = (int)quote->u1.func;
-    int term = (int)quote->u3.term;
-    int paren = (int)quote->u2.paren;
+    int func = (int)quote->nd_func;
+    int term = nd_term(quote);
+    int paren = nd_paren(quote);
     int c, space = 0;
-    rb_encoding *enc = p->enc;
-    rb_encoding *base_enc = 0;
-    VALUE lit;
+    rb_encoding *enc = current_enc;
 
-    if (func & STR_FUNC_TERM) {
-	if (func & STR_FUNC_QWORDS) nextc(p); /* delayed term */
-	SET_LEX_STATE(EXPR_END);
-	p->lex.strterm = 0;
-	return func & STR_FUNC_REGEXP ? tREGEXP_END : tSTRING_END;
-    }
-    c = nextc(p);
+    if (term == STR_TERM_END) return tSTRING_END;
+    c = nextc();
     if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
-	do {c = nextc(p);} while (ISSPACE(c));
+	do {c = nextc();} while (ISSPACE(c));
 	space = 1;
     }
-    if (func & STR_FUNC_LIST) {
-	quote->u1.func &= ~STR_FUNC_LIST;
-	space = 1;
-    }
-    if (c == term && !quote->u0.nest) {
+    if (c == term && !quote->nd_nest) {
 	if (func & STR_FUNC_QWORDS) {
-	    quote->u1.func |= STR_FUNC_TERM;
-	    pushback(p, c); /* dispatch the term at tSTRING_END */
-	    add_delayed_token(p, p->lex.ptok, p->lex.pcur);
+	    quote->u2.id = STR_TERM_END;
 	    return ' ';
 	}
-	return parser_string_term(p, func);
+	return parser_string_term(parser, func);
     }
     if (space) {
-	pushback(p, c);
-	add_delayed_token(p, p->lex.ptok, p->lex.pcur);
+	pushback(c);
 	return ' ';
     }
-    newtok(p);
+    newtok();
     if ((func & STR_FUNC_EXPAND) && c == '#') {
-	int t = parser_peek_variable_name(p);
+	int t = parser_peek_variable_name(parser);
 	if (t) return t;
-	tokadd(p, '#');
-	c = nextc(p);
-    }
-    pushback(p, c);
-    if (tokadd_string(p, func, term, paren, &quote->u0.nest,
-		      &enc, &base_enc) == -1) {
-	if (p->eofp) {
-#ifndef RIPPER
-# define unterminated_literal(mesg) yyerror0(mesg)
-#else
-# define unterminated_literal(mesg) compile_error(p,  mesg)
-#endif
-	    literal_flush(p, p->lex.pcur);
-	    if (func & STR_FUNC_REGEXP) {
-		unterminated_literal("unterminated regexp meets end of file");
-	    }
-	    else {
-		unterminated_literal("unterminated string meets end of file");
-	    }
-	    quote->u1.func |= STR_FUNC_TERM;
+	tokadd('#');
+	c = nextc();
+    }
+    pushback(c);
+    if (tokadd_string(func, term, paren, &quote->nd_nest,
+		      &enc) == -1) {
+	ruby_sourceline = nd_line(quote);
+	if (func & STR_FUNC_REGEXP) {
+	    if (parser->eofp)
+		compile_error(PARSER_ARG "unterminated regexp meets end of file");
+	    return tREGEXP_END;
+	}
+	else {
+	    if (parser->eofp)
+		compile_error(PARSER_ARG "unterminated string meets end of file");
+	    return tSTRING_END;
 	}
     }
 
-    tokfix(p);
-    add_mark_object(p, lit = STR_NEW3(tok(p), toklen(p), enc, func));
-    set_yylval_str(lit);
-    flush_string_content(p, enc);
+    tokfix();
+    set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
+    flush_string_content(enc);
 
     return tSTRING_CONTENT;
 }
 
-static enum yytokentype
-heredoc_identifier(struct parser_params *p)
+static int
+parser_heredoc_identifier(struct parser_params *parser)
 {
-    /*
-     * term_len is length of `<<"END"` except `END`,
-     * in this case term_len is 4 (<, <, " and ").
-     */
-    int c = nextc(p), term, func = 0, term_len = 2;
-    enum yytokentype token = tSTRING_BEG;
+    int c = nextc(), term, func = 0;
+    int token = tSTRING_BEG;
     long len;
-    int newline = 0;
-    int indent = 0;
 
     if (c == '-') {
-	c = nextc(p);
-	term_len++;
+	c = nextc();
 	func = STR_FUNC_INDENT;
     }
     else if (c == '~') {
-	c = nextc(p);
-	term_len++;
+	c = nextc();
 	func = STR_FUNC_INDENT;
-	indent = INT_MAX;
+	heredoc_indent = INT_MAX;
+	heredoc_line_indent = 0;
     }
     switch (c) {
       case '\'':
-	term_len++;
 	func |= str_squote; goto quoted;
       case '"':
-	term_len++;
 	func |= str_dquote; goto quoted;
       case '`':
-	term_len++;
 	token = tXSTRING_BEG;
 	func |= str_xquote; goto quoted;
 
       quoted:
-	term_len++;
-	newtok(p);
-	tokadd(p, term_len);
-	tokadd(p, func);
+	newtok();
+	tokadd(func);
 	term = c;
-	while ((c = nextc(p)) != -1 && c != term) {
-	    if (tokadd_mbchar(p, c) == -1) return 0;
-	    if (!newline && c == '\n') newline = 1;
-	    else if (newline) newline = 2;
+	while ((c = nextc()) != -1 && c != term) {
+	    if (tokadd_mbchar(c) == -1) return 0;
 	}
 	if (c == -1) {
-	    yyerror(NULL, p, "unterminated here document identifier");
-	    return -1;
-	}
-	switch (newline) {
-	  case 1:
-	    rb_warn0("here document identifier ends with a newline");
-	    if (--p->tokidx > 0 && p->tokenbuf[p->tokidx] == '\r') --p->tokidx;
-	    break;
-	  case 2:
-	    compile_error(p, "here document identifier across newlines, never match");
-	    return -1;
+	    compile_error(PARSER_ARG "unterminated here document identifier");
+	    return 0;
 	}
 	break;
 
       default:
-	if (!parser_is_identchar(p)) {
-	    pushback(p, c);
+	if (!parser_is_identchar()) {
+	    pushback(c);
 	    if (func & STR_FUNC_INDENT) {
-		pushback(p, indent > 0 ? '~' : '-');
+		pushback(heredoc_indent > 0 ? '~' : '-');
 	    }
 	    return 0;
 	}
-	newtok(p);
-	tokadd(p, term_len);
-	tokadd(p, func |= str_dquote);
+	newtok();
+	tokadd(func |= str_dquote);
 	do {
-	    if (tokadd_mbchar(p, c) == -1) return 0;
-	} while ((c = nextc(p)) != -1 && parser_is_identchar(p));
-	pushback(p, c);
+	    if (tokadd_mbchar(c) == -1) return 0;
+	} while ((c = nextc()) != -1 && parser_is_identchar());
+	pushback(c);
 	break;
     }
 
-    tokfix(p);
-    dispatch_scan_event(p, tHEREDOC_BEG);
-    len = p->lex.pcur - p->lex.pbeg;
-    lex_goto_eol(p);
-
-    p->lex.strterm = new_strterm(STR_NEW(tok(p), toklen(p)), /* term */
-				 p->lex.lastline, /* lastline */
-				 len, /* lastidx */
-				 p->ruby_sourceline);
-    p->lex.strterm->flags |= STRTERM_HEREDOC;
-
-    token_flush(p);
-    p->heredoc_indent = indent;
-    p->heredoc_line_indent = 0;
+    tokfix();
+    dispatch_scan_event(tHEREDOC_BEG);
+    len = lex_p - lex_pbeg;
+    lex_goto_eol(parser);
+    lex_strterm = rb_node_newnode(NODE_HEREDOC,
+				  STR_NEW(tok(), toklen()),	/* nd_lit */
+				  len,				/* nd_nth */
+				  lex_lastline);		/* nd_orig */
+    nd_set_line(lex_strterm, ruby_sourceline);
+    ripper_flush(parser);
     return token;
 }
 
 static void
-heredoc_restore(struct parser_params *p, rb_strterm_heredoc_t *here)
+parser_heredoc_restore(struct parser_params *parser, NODE *here)
 {
     VALUE line;
 
-    p->lex.strterm = 0;
-    line = here->lastline;
-    p->lex.lastline = line;
-    p->lex.pbeg = RSTRING_PTR(line);
-    p->lex.pend = p->lex.pbeg + RSTRING_LEN(line);
-    p->lex.pcur = p->lex.pbeg + here->u3.lastidx;
-    p->heredoc_end = p->ruby_sourceline;
-    p->ruby_sourceline = (int)here->sourceline;
-    token_flush(p);
+    lex_strterm = 0;
+    line = here->nd_orig;
+    lex_lastline = line;
+    lex_pbeg = RSTRING_PTR(line);
+    lex_pend = lex_pbeg + RSTRING_LEN(line);
+    lex_p = lex_pbeg + here->nd_nth;
+    heredoc_end = ruby_sourceline;
+    ruby_sourceline = nd_line(here);
+    dispose_string(here->nd_lit);
+    rb_gc_force_recycle((VALUE)here);
+    ripper_flush(parser);
 }
 
 static int
@@ -6137,11 +6505,6 @@ dedent_string(VALUE string, int width)
 	    break;
 	}
     }
-    if (!i) return 0;
-    rb_str_modify(string);
-    str = RSTRING_PTR(string);
-    if (RSTRING_LEN(string) != len)
-	rb_fatal("literal string changed: %+"PRIsVALUE, string);
     MEMMOVE(str, str + i, char, len - i);
     rb_str_set_len(string, len - i);
     return i;
@@ -6149,50 +6512,30 @@ dedent_string(VALUE string, int width)
 
 #ifndef RIPPER
 static NODE *
-heredoc_dedent(struct parser_params *p, NODE *root)
+parser_heredoc_dedent(struct parser_params *parser, NODE *root)
 {
-    NODE *node, *str_node, *prev_node;
-    int indent = p->heredoc_indent;
-    VALUE prev_lit = 0;
+    NODE *node, *str_node;
+    int bol = TRUE;
+    int indent = heredoc_indent;
 
     if (indent <= 0) return root;
-    p->heredoc_indent = 0;
+    heredoc_indent = 0;
     if (!root) return root;
 
-    prev_node = node = str_node = root;
+    node = str_node = root;
     if (nd_type(root) == NODE_ARRAY) str_node = root->nd_head;
 
     while (str_node) {
 	VALUE lit = str_node->nd_lit;
-	if (str_node->flags & NODE_FL_NEWLINE) {
-	    dedent_string(lit, indent);
-	}
-	if (!prev_lit) {
-	    prev_lit = lit;
-	}
-	else if (!literal_concat0(p, prev_lit, lit)) {
-	    return 0;
-	}
-	else {
-	    NODE *end = node->nd_end;
-	    node = prev_node->nd_next = node->nd_next;
-	    if (!node) {
-		if (nd_type(prev_node) == NODE_DSTR)
-		    nd_set_type(prev_node, NODE_STR);
-		break;
-	    }
-	    node->nd_end = end;
-	    goto next_str;
-	}
+	if (bol) dedent_string(lit, indent);
+	bol = TRUE;
 
 	str_node = 0;
-	while ((node = (prev_node = node)->nd_next) != 0) {
-	  next_str:
-	    if (nd_type(node) != NODE_ARRAY) break;
+	while ((node = node->nd_next) != 0 && nd_type(node) == NODE_ARRAY) {
 	    if ((str_node = node->nd_head) != 0) {
 		enum node_type type = nd_type(str_node);
 		if (type == NODE_STR || type == NODE_DSTR) break;
-		prev_lit = 0;
+		bol = FALSE;
 		str_node = 0;
 	    }
 	}
@@ -6201,25 +6544,16 @@ heredoc_dedent(struct parser_params *p, NODE *root)
 }
 #else /* RIPPER */
 static VALUE
-heredoc_dedent(struct parser_params *p, VALUE array)
+parser_heredoc_dedent(struct parser_params *parser, VALUE array)
 {
-    int indent = p->heredoc_indent;
+    int indent = heredoc_indent;
 
     if (indent <= 0) return array;
-    p->heredoc_indent = 0;
+    heredoc_indent = 0;
     dispatch2(heredoc_dedent, array, INT2NUM(indent));
     return array;
 }
 
-/*
- *  call-seq:
- *    Ripper.dedent_string(input, width)   -> Integer
- *
- *  USE OF RIPPER LIBRARY ONLY.
- *
- *  Strips up to +width+ leading whitespaces from +input+,
- *  and returns the stripped column width.
- */
 static VALUE
 parser_dedent_string(VALUE self, VALUE input, VALUE width)
 {
@@ -6227,27 +6561,29 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width)
 
     StringValue(input);
     wid = NUM2UINT(width);
+    rb_str_modify(input);
     col = dedent_string(input, wid);
     return INT2NUM(col);
 }
 #endif
 
 static int
-whole_match_p(struct parser_params *p, const char *eos, long len, int indent)
+parser_whole_match_p(struct parser_params *parser,
+    const char *eos, long len, int indent)
 {
-    const char *ptr = p->lex.pbeg;
+    const char *p = lex_pbeg;
     long n;
 
     if (indent) {
-	while (*ptr && ISSPACE(*ptr)) ptr++;
+	while (*p && ISSPACE(*p)) p++;
     }
-    n = p->lex.pend - (ptr + len);
+    n = lex_pend - (p + len);
     if (n < 0) return FALSE;
-    if (n > 0 && ptr[len] != '\n') {
-	if (ptr[len] != '\r') return FALSE;
-	if (n <= 1 || ptr[len+1] != '\n') return FALSE;
+    if (n > 0 && p[len] != '\n') {
+	if (p[len] != '\r') return FALSE;
+	if (n <= 1 || p[len+1] != '\n') return FALSE;
     }
-    return strncmp(eos, ptr, len) == 0;
+    return strncmp(eos, p, len) == 0;
 }
 
 #define NUM_SUFFIX_R   (1<<0)
@@ -6255,12 +6591,12 @@ whole_match_p(struct parser_params *p, const char *eos, long len, int indent)
 #define NUM_SUFFIX_ALL 3
 
 static int
-number_literal_suffix(struct parser_params *p, int mask)
+parser_number_literal_suffix(struct parser_params *parser, int mask)
 {
     int c, result = 0;
-    const char *lastp = p->lex.pcur;
+    const char *lastp = lex_p;
 
-    while ((c = nextc(p)) != -1) {
+    while ((c = nextc()) != -1) {
 	if ((mask & NUM_SUFFIX_I) && c == 'i') {
 	    result |= (mask & NUM_SUFFIX_I);
 	    mask &= ~NUM_SUFFIX_I;
@@ -6274,17 +6610,16 @@ number_literal_suffix(struct parser_params *p, int mask)
 	    continue;
 	}
 	if (!ISASCII(c) || ISALPHA(c) || c == '_') {
-	    p->lex.pcur = lastp;
-	    literal_flush(p, p->lex.pcur);
+	    lex_p = lastp;
 	    return 0;
 	}
-	pushback(p, c);
+	pushback(c);
 	if (c == '.') {
-	    c = peekc_n(p, 1);
+	    c = peekc_n(1);
 	    if (ISDIGIT(c)) {
-		yyerror0("unexpected fraction part after numeric literal");
-		p->lex.pcur += 2;
-		while (parser_is_identchar(p)) nextc(p);
+		yyerror("unexpected fraction part after numeric literal");
+		lex_p += 2;
+		while (parser_is_identchar()) nextc();
 	    }
 	}
 	break;
@@ -6292,266 +6627,236 @@ number_literal_suffix(struct parser_params *p, int mask)
     return result;
 }
 
-static enum yytokentype
-set_number_literal(struct parser_params *p, VALUE v,
-		   enum yytokentype type, int suffix)
+static int
+parser_set_number_literal(struct parser_params *parser, VALUE v, int type, int suffix)
 {
     if (suffix & NUM_SUFFIX_I) {
 	v = rb_complex_raw(INT2FIX(0), v);
 	type = tIMAGINARY;
     }
     set_yylval_literal(v);
-    add_mark_object(p, v);
-    SET_LEX_STATE(EXPR_END);
     return type;
 }
 
-static enum yytokentype
-set_integer_literal(struct parser_params *p, VALUE v, int suffix)
+static int
+parser_set_integer_literal(struct parser_params *parser, VALUE v, int suffix)
 {
-    enum yytokentype type = tINTEGER;
+    int type = tINTEGER;
     if (suffix & NUM_SUFFIX_R) {
 	v = rb_rational_raw1(v);
 	type = tRATIONAL;
     }
-    return set_number_literal(p, v, type, suffix);
+    return set_number_literal(v, type, suffix);
 }
 
 #ifdef RIPPER
 static void
-dispatch_heredoc_end(struct parser_params *p)
+ripper_dispatch_heredoc_end(struct parser_params *parser)
 {
     VALUE str;
-    if (has_delayed_token(p))
-	dispatch_delayed_token(p, tSTRING_CONTENT);
-    str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
-    ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str);
-    lex_goto_eol(p);
-    token_flush(p);
+    if (has_delayed_token())
+	dispatch_delayed_token(tSTRING_CONTENT);
+    str = STR_NEW(parser->tokp, lex_pend - parser->tokp);
+    ripper_dispatch1(parser, ripper_token2eventid(tHEREDOC_END), str);
+    lex_goto_eol(parser);
+    ripper_flush(parser);
 }
 
+#define dispatch_heredoc_end() ripper_dispatch_heredoc_end(parser)
 #else
-#define dispatch_heredoc_end(p) ((void)0)
+#define dispatch_heredoc_end() ((void)0)
 #endif
 
-static enum yytokentype
-here_document(struct parser_params *p, rb_strterm_heredoc_t *here)
+static int
+parser_here_document(struct parser_params *parser, NODE *here)
 {
     int c, func, indent = 0;
-    const char *eos, *ptr, *ptr_end;
+    const char *eos, *p, *pend;
     long len;
     VALUE str = 0;
-    rb_encoding *enc = p->enc;
-    rb_encoding *base_enc = 0;
-    int bol;
+    rb_encoding *enc = current_enc;
 
-    eos = RSTRING_PTR(here->term);
-    len = RSTRING_LEN(here->term) - 2; /* here->term includes term_len and func */
-    eos++; /* skip term_len */
+    eos = RSTRING_PTR(here->nd_lit);
+    len = RSTRING_LEN(here->nd_lit) - 1;
     indent = (func = *eos++) & STR_FUNC_INDENT;
 
-    if ((c = nextc(p)) == -1) {
+    if ((c = nextc()) == -1) {
       error:
-	compile_error(p, "can't find string \"%s\" anywhere before EOF", eos);
+	compile_error(PARSER_ARG "can't find string \"%s\" anywhere before EOF", eos);
 #ifdef RIPPER
-	if (!has_delayed_token(p)) {
-	    dispatch_scan_event(p, tSTRING_CONTENT);
+	if (!has_delayed_token()) {
+	    dispatch_scan_event(tSTRING_CONTENT);
 	}
 	else {
 	    if (str) {
-		rb_str_append(p->delayed, str);
+		rb_str_append(parser->delayed, str);
 	    }
-	    else if ((len = p->lex.pcur - p->lex.ptok) > 0) {
+	    else if ((len = lex_p - parser->tokp) > 0) {
 		if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) {
 		    int cr = ENC_CODERANGE_UNKNOWN;
-		    rb_str_coderange_scan_restartable(p->lex.ptok, p->lex.pcur, enc, &cr);
+		    rb_str_coderange_scan_restartable(parser->tokp, lex_p, enc, &cr);
 		    if (cr != ENC_CODERANGE_7BIT &&
-			p->enc == rb_usascii_encoding() &&
+			current_enc == rb_usascii_encoding() &&
 			enc != rb_utf8_encoding()) {
 			enc = rb_ascii8bit_encoding();
 		    }
 		}
-		rb_enc_str_buf_cat(p->delayed, p->lex.ptok, len, enc);
+		rb_enc_str_buf_cat(parser->delayed, parser->tokp, len, enc);
 	    }
-	    dispatch_delayed_token(p, tSTRING_CONTENT);
+	    dispatch_delayed_token(tSTRING_CONTENT);
 	}
-	lex_goto_eol(p);
+	lex_goto_eol(parser);
 #endif
       restore:
-	heredoc_restore(p, &p->lex.strterm->u.heredoc);
-	p->lex.strterm = 0;
+	heredoc_restore(lex_strterm);
 	return 0;
     }
-    bol = was_bol(p);
-    /* `heredoc_line_indent == -1` means
-     * - "after an interpolation in the same line", or
-     * - "in a continuing line"
-     */
-    if (bol &&
-	(p->heredoc_line_indent != -1 || (p->heredoc_line_indent = 0)) &&
-	whole_match_p(p, eos, len, indent)) {
-	dispatch_heredoc_end(p);
-	heredoc_restore(p, &p->lex.strterm->u.heredoc);
-	p->lex.strterm = 0;
-	SET_LEX_STATE(EXPR_END);
+    if (was_bol() && whole_match_p(eos, len, indent)) {
+	dispatch_heredoc_end();
+	heredoc_restore(lex_strterm);
 	return tSTRING_END;
     }
 
     if (!(func & STR_FUNC_EXPAND)) {
 	do {
-	    ptr = RSTRING_PTR(p->lex.lastline);
-	    ptr_end = p->lex.pend;
-	    if (ptr_end > ptr) {
-		switch (ptr_end[-1]) {
+	    p = RSTRING_PTR(lex_lastline);
+	    pend = lex_pend;
+	    if (pend > p) {
+		switch (pend[-1]) {
 		  case '\n':
-		    if (--ptr_end == ptr || ptr_end[-1] != '\r') {
-			ptr_end++;
+		    if (--pend == p || pend[-1] != '\r') {
+			pend++;
 			break;
 		    }
 		  case '\r':
-		    --ptr_end;
+		    --pend;
 		}
 	    }
 
-	    if (p->heredoc_indent > 0) {
+	    if (heredoc_indent > 0) {
 		long i = 0;
-		while (ptr + i < ptr_end && parser_update_heredoc_indent(p, ptr[i]))
+		while (p + i < pend && parser_update_heredoc_indent(parser, p[i]))
 		    i++;
-		p->heredoc_line_indent = 0;
+		heredoc_line_indent = 0;
 	    }
 
 	    if (str)
-		rb_str_cat(str, ptr, ptr_end - ptr);
+		rb_str_cat(str, p, pend - p);
 	    else
-		str = STR_NEW(ptr, ptr_end - ptr);
-	    if (ptr_end < p->lex.pend) rb_str_cat(str, "\n", 1);
-	    lex_goto_eol(p);
-	    if (p->heredoc_indent > 0) {
-		goto flush_str;
+		str = STR_NEW(p, pend - p);
+	    if (pend < lex_pend) rb_str_cat(str, "\n", 1);
+	    lex_goto_eol(parser);
+	    if (heredoc_indent > 0) {
+		set_yylval_str(str);
+		flush_string_content(enc);
+		return tSTRING_CONTENT;
 	    }
-	    if (nextc(p) == -1) {
+	    if (nextc() == -1) {
 		if (str) {
+		    dispose_string(str);
 		    str = 0;
 		}
 		goto error;
 	    }
-	} while (!whole_match_p(p, eos, len, indent));
+	} while (!whole_match_p(eos, len, indent));
     }
     else {
 	/*	int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/
-	newtok(p);
+	newtok();
 	if (c == '#') {
-	    int t = parser_peek_variable_name(p);
-	    if (p->heredoc_line_indent != -1) {
-		if (p->heredoc_indent > p->heredoc_line_indent) {
-		    p->heredoc_indent = p->heredoc_line_indent;
-		}
-		p->heredoc_line_indent = -1;
-	    }
+	    int t = parser_peek_variable_name(parser);
 	    if (t) return t;
-	    tokadd(p, '#');
-	    c = nextc(p);
+	    tokadd('#');
+	    c = nextc();
 	}
 	do {
-	    pushback(p, c);
-	    enc = p->enc;
-	    if ((c = tokadd_string(p, func, '\n', 0, NULL, &enc, &base_enc)) == -1) {
-		if (p->eofp) goto error;
+	    pushback(c);
+	    if ((c = tokadd_string(func, '\n', 0, NULL, &enc)) == -1) {
+		if (parser->eofp) goto error;
 		goto restore;
 	    }
 	    if (c != '\n') {
-		if (c == '\\') p->heredoc_line_indent = -1;
 	      flush:
-		str = STR_NEW3(tok(p), toklen(p), enc, func);
-	      flush_str:
-		set_yylval_str(str);
-		add_mark_object(p, str);
-#ifndef RIPPER
-		if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
-#endif
-		flush_string_content(p, enc);
+		set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
+		flush_string_content(enc);
 		return tSTRING_CONTENT;
 	    }
-	    tokadd(p, nextc(p));
-	    if (p->heredoc_indent > 0) {
-		lex_goto_eol(p);
+	    tokadd(nextc());
+	    if (heredoc_indent > 0) {
+		lex_goto_eol(parser);
 		goto flush;
 	    }
 	    /*	    if (mbp && mb == ENC_CODERANGE_UNKNOWN) mbp = 0;*/
-	    if ((c = nextc(p)) == -1) goto error;
-	} while (!whole_match_p(p, eos, len, indent));
-	str = STR_NEW3(tok(p), toklen(p), enc, func);
+	    if ((c = nextc()) == -1) goto error;
+	} while (!whole_match_p(eos, len, indent));
+	str = STR_NEW3(tok(), toklen(), enc, func);
     }
-    dispatch_heredoc_end(p);
+    dispatch_heredoc_end();
 #ifdef RIPPER
-    str = ripper_new_yylval(p, ripper_token2eventid(tSTRING_CONTENT),
+    str = ripper_new_yylval(ripper_token2eventid(tSTRING_CONTENT),
 			    yylval.val, str);
 #endif
-    heredoc_restore(p, &p->lex.strterm->u.heredoc);
-    p->lex.strterm = NEW_STRTERM(func | STR_FUNC_TERM, 0, 0);
+    heredoc_restore(lex_strterm);
+    lex_strterm = NEW_STRTERM(func, STR_TERM_END, 0);
     set_yylval_str(str);
-    add_mark_object(p, str);
-#ifndef RIPPER
-    if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
-#endif
     return tSTRING_CONTENT;
 }
 
 #include "lex.c"
 
-static int
-arg_ambiguous(struct parser_params *p, char c)
+static void
+arg_ambiguous_gen(struct parser_params *parser, char c)
 {
 #ifndef RIPPER
     rb_warning1("ambiguous first argument; put parentheses or a space even after `%c' operator", WARN_I(c));
 #else
     dispatch1(arg_ambiguous, rb_usascii_str_new(&c, 1));
 #endif
-    return TRUE;
 }
+#define arg_ambiguous(c) (arg_ambiguous_gen(parser, (c)), 1)
 
 static ID
-formal_argument(struct parser_params *p, ID lhs)
+formal_argument_gen(struct parser_params *parser, ID lhs)
 {
     switch (id_type(lhs)) {
       case ID_LOCAL:
 	break;
 #ifndef RIPPER
       case ID_CONST:
-	yyerror0("formal argument cannot be a constant");
+	yyerror("formal argument cannot be a constant");
 	return 0;
       case ID_INSTANCE:
-	yyerror0("formal argument cannot be an instance variable");
+	yyerror("formal argument cannot be an instance variable");
 	return 0;
       case ID_GLOBAL:
-	yyerror0("formal argument cannot be a global variable");
+	yyerror("formal argument cannot be a global variable");
 	return 0;
       case ID_CLASS:
-	yyerror0("formal argument cannot be a class variable");
+	yyerror("formal argument cannot be a class variable");
 	return 0;
       default:
-	yyerror0("formal argument must be local variable");
+	yyerror("formal argument must be local variable");
 	return 0;
 #else
       default:
 	lhs = dispatch1(param_error, lhs);
-	ripper_error(p);
+	ripper_error();
 	return 0;
 #endif
     }
-    shadowing_lvar(p, lhs);
+    shadowing_lvar(lhs);
     return lhs;
 }
 
 static int
-lvar_defined(struct parser_params *p, ID id)
+lvar_defined_gen(struct parser_params *parser, ID id)
 {
-    return (dyna_in_block(p) && dvar_defined(p, id)) || local_id(p, id);
+    return (dyna_in_block() && dvar_defined_get(id)) || local_id(id);
 }
 
 /* emacsen -*- hack */
 static long
-parser_encode_length(struct parser_params *p, const char *name, long len)
+parser_encode_length(struct parser_params *parser, const char *name, long len)
 {
     long nlen;
 
@@ -6571,7 +6876,7 @@ parser_encode_length(struct parser_params *p, const char *name, long len)
 }
 
 static void
-parser_set_encode(struct parser_params *p, const char *name)
+parser_set_encode(struct parser_params *parser, const char *name)
 {
     int idx = rb_enc_find_index(name);
     rb_encoding *enc;
@@ -6582,7 +6887,7 @@ parser_set_encode(struct parser_params *p, const char *name)
       error:
 	excargs[0] = rb_eArgError;
 	excargs[2] = rb_make_backtrace();
-	rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", p->ruby_sourcefile_string, p->ruby_sourceline));
+	rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", ruby_sourcefile_string, ruby_sourceline));
 	rb_exc_raise(rb_make_exception(3, excargs));
     }
     enc = rb_enc_from_index(idx);
@@ -6590,10 +6895,10 @@ parser_set_encode(struct parser_params *p, const char *name)
 	excargs[1] = rb_sprintf("%s is not ASCII compatible", rb_enc_name(enc));
 	goto error;
     }
-    p->enc = enc;
+    parser->enc = enc;
 #ifndef RIPPER
-    if (p->debug_lines) {
-	VALUE lines = p->debug_lines;
+    if (ruby_debug_lines) {
+	VALUE lines = ruby_debug_lines;
 	long i, n = RARRAY_LEN(lines);
 	for (i = 0; i < n; ++i) {
 	    rb_enc_associate_index(RARRAY_AREF(lines, i), idx);
@@ -6603,31 +6908,31 @@ parser_set_encode(struct parser_params *p, const char *name)
 }
 
 static int
-comment_at_top(struct parser_params *p)
+comment_at_top(struct parser_params *parser)
 {
-    const char *ptr = p->lex.pbeg, *ptr_end = p->lex.pcur - 1;
-    if (p->line_count != (p->has_shebang ? 2 : 1)) return 0;
-    while (ptr < ptr_end) {
-	if (!ISSPACE(*ptr)) return 0;
-	ptr++;
+    const char *p = lex_pbeg, *pend = lex_p - 1;
+    if (parser->line_count != (parser->has_shebang ? 2 : 1)) return 0;
+    while (p < pend) {
+	if (!ISSPACE(*p)) return 0;
+	p++;
     }
     return 1;
 }
 
-typedef long (*rb_magic_comment_length_t)(struct parser_params *p, const char *name, long len);
-typedef void (*rb_magic_comment_setter_t)(struct parser_params *p, const char *name, const char *val);
+typedef long (*rb_magic_comment_length_t)(struct parser_params *parser, const char *name, long len);
+typedef void (*rb_magic_comment_setter_t)(struct parser_params *parser, const char *name, const char *val);
 
 static void
-magic_comment_encoding(struct parser_params *p, const char *name, const char *val)
+magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
 {
-    if (!comment_at_top(p)) {
+    if (!comment_at_top(parser)) {
 	return;
     }
-    parser_set_encode(p, val);
+    parser_set_encode(parser, val);
 }
 
 static int
-parser_get_bool(struct parser_params *p, const char *name, const char *val)
+parser_get_bool(struct parser_params *parser, const char *name, const char *val)
 {
     switch (*val) {
       case 't': case 'T':
@@ -6641,42 +6946,42 @@ parser_get_bool(struct parser_params *p, const char *name, const char *val)
 	}
 	break;
     }
-    rb_compile_warning(p->ruby_sourcefile, p->ruby_sourceline, "invalid value for %s: %s", name, val);
+    rb_compile_warning(ruby_sourcefile, ruby_sourceline, "invalid value for %s: %s", name, val);
     return -1;
 }
 
 static void
-parser_set_token_info(struct parser_params *p, const char *name, const char *val)
+parser_set_token_info(struct parser_params *parser, const char *name, const char *val)
 {
-    int b = parser_get_bool(p, name, val);
-    if (b >= 0) p->token_info_enabled = b;
+    int b = parser_get_bool(parser, name, val);
+    if (b >= 0) parser->token_info_enabled = b;
 }
 
 static void
-parser_set_compile_option_flag(struct parser_params *p, const char *name, const char *val)
+parser_set_compile_option_flag(struct parser_params *parser, const char *name, const char *val)
 {
     int b;
 
-    if (p->token_seen) {
+    if (parser->token_seen) {
 	rb_warning1("`%s' is ignored after any tokens", WARN_S(name));
 	return;
     }
 
-    b = parser_get_bool(p, name, val);
+    b = parser_get_bool(parser, name, val);
     if (b < 0) return;
 
-    if (!p->compile_option)
-	p->compile_option = rb_obj_hide(rb_ident_hash_new());
-    rb_hash_aset(p->compile_option, ID2SYM(rb_intern(name)),
+    if (!parser->compile_option)
+	parser->compile_option = rb_obj_hide(rb_ident_hash_new());
+    rb_hash_aset(parser->compile_option, ID2SYM(rb_intern(name)),
 		 (b ? Qtrue : Qfalse));
 }
 
 # if WARN_PAST_SCOPE
 static void
-parser_set_past_scope(struct parser_params *p, const char *name, const char *val)
+parser_set_past_scope(struct parser_params *parser, const char *name, const char *val)
 {
-    int b = parser_get_bool(p, name, val);
-    if (b >= 0) p->past_scope_enabled = b;
+    int b = parser_get_bool(parser, name, val);
+    if (b >= 0) parser->past_scope_enabled = b;
 }
 # endif
 
@@ -6730,7 +7035,7 @@ magic_comment_marker(const char *str, long len)
 }
 
 static int
-parser_magic_comment(struct parser_params *p, const char *str, long len)
+parser_magic_comment(struct parser_params *parser, const char *str, long len)
 {
     int indicator = 0;
     VALUE name = 0, val = 0;
@@ -6751,7 +7056,7 @@ parser_magic_comment(struct parser_params *p, const char *str, long len)
 
     /* %r"([^\\s\'\":;]+)\\s*:\\s*(\"(?:\\\\.|[^\"])*\"|[^\"\\s;]+)[\\s;]*" */
     while (len > 0) {
-	const struct magic_comment *mc = magic_comments;
+	const struct magic_comment *p = magic_comments;
 	char *s;
 	int i;
 	long n = 0;
@@ -6814,16 +7119,16 @@ parser_magic_comment(struct parser_params *p, const char *str, long len)
 	    if (s[i] == '-') s[i] = '_';
 	}
 	do {
-	    if (STRNCASECMP(mc->name, s, n) == 0 && !mc->name[n]) {
+	    if (STRNCASECMP(p->name, s, n) == 0 && !p->name[n]) {
 		n = vend - vbeg;
-		if (mc->length) {
-		    n = (*mc->length)(p, vbeg, n);
+		if (p->length) {
+		    n = (*p->length)(parser, vbeg, n);
 		}
 		str_copy(val, vbeg, n);
-		(*mc->func)(p, mc->name, RSTRING_PTR(val));
+		(*p->func)(parser, p->name, RSTRING_PTR(val));
 		break;
 	    }
-	} while (++mc < magic_comments + numberof(magic_comments));
+	} while (++p < magic_comments + numberof(magic_comments));
 #ifdef RIPPER
 	str_copy(val, vbeg, vend - vbeg);
 	dispatch2(magic_comment, name, val);
@@ -6834,7 +7139,7 @@ parser_magic_comment(struct parser_params *p, const char *str, long len)
 }
 
 static void
-set_file_encoding(struct parser_params *p, const char *str, const char *send)
+set_file_encoding(struct parser_params *parser, const char *str, const char *send)
 {
     int sep = 0;
     const char *beg = str;
@@ -6871,53 +7176,62 @@ set_file_encoding(struct parser_params *p, const char *str, const char *send)
     }
     beg = str;
     while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send);
-    s = rb_str_new(beg, parser_encode_length(p, beg, str - beg));
-    parser_set_encode(p, RSTRING_PTR(s));
+    s = rb_str_new(beg, parser_encode_length(parser, beg, str - beg));
+    parser_set_encode(parser, RSTRING_PTR(s));
     rb_str_resize(s, 0);
 }
 
 static void
-parser_prepare(struct parser_params *p)
+parser_prepare(struct parser_params *parser)
 {
-    int c = nextc(p);
-    p->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
+    int c = nextc();
     switch (c) {
       case '#':
-	if (peek(p, '!')) p->has_shebang = 1;
+	if (peek('!')) parser->has_shebang = 1;
 	break;
       case 0xef:		/* UTF-8 BOM marker */
-	if (p->lex.pend - p->lex.pcur >= 2 &&
-	    (unsigned char)p->lex.pcur[0] == 0xbb &&
-	    (unsigned char)p->lex.pcur[1] == 0xbf) {
-	    p->enc = rb_utf8_encoding();
-	    p->lex.pcur += 2;
-	    p->lex.pbeg = p->lex.pcur;
+	if (lex_pend - lex_p >= 2 &&
+	    (unsigned char)lex_p[0] == 0xbb &&
+	    (unsigned char)lex_p[1] == 0xbf) {
+	    parser->enc = rb_utf8_encoding();
+	    lex_p += 2;
+	    lex_pbeg = lex_p;
 	    return;
 	}
 	break;
       case EOF:
 	return;
     }
-    pushback(p, c);
-    p->enc = rb_enc_get(p->lex.lastline);
+    pushback(c);
+    parser->enc = rb_enc_get(lex_lastline);
+    deferred_nodes = 0;
+    parser->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
 }
 
+#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
+#define IS_END() IS_lex_state(EXPR_END_ANY)
+#define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED))
+#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
+#define IS_LABEL_POSSIBLE() (\
+	(IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \
+	IS_ARG())
+#define IS_LABEL_SUFFIX(n) (peek_n(':',(n)) && !peek_n(':', (n)+1))
+#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
+
 #ifndef RIPPER
-#define ambiguous_operator(tok, op, syn) ( \
+#define ambiguous_operator(op, syn) ( \
     rb_warning0("`"op"' after local variable or literal is interpreted as binary operator"), \
     rb_warning0("even though it seems like "syn""))
 #else
-#define ambiguous_operator(tok, op, syn) \
-    dispatch2(operator_ambiguous, TOKEN2VAL(tok), rb_str_new_cstr(syn))
+#define ambiguous_operator(op, syn) dispatch2(operator_ambiguous, ripper_intern(op), rb_str_new_cstr(syn))
 #endif
-#define warn_balanced(tok, op, syn) ((void) \
-    (!IS_lex_state_for(last_state, EXPR_CLASS|EXPR_DOT|EXPR_FNAME|EXPR_ENDFN) && \
+#define warn_balanced(op, syn) ((void) \
+    (!IS_lex_state_for(last_state, EXPR_CLASS|EXPR_DOT|EXPR_FNAME|EXPR_ENDFN|EXPR_ENDARG) && \
      space_seen && !ISSPACE(c) && \
-     (ambiguous_operator(tok, op, syn), 0)), \
-     (enum yytokentype)(tok))
+     (ambiguous_operator(op, syn), 0)))
 
 static VALUE
-parse_rational(struct parser_params *p, char *str, int len, int seen_point)
+parse_rational(struct parser_params *parser, char *str, int len, int seen_point)
 {
     VALUE v;
     char *point = &str[seen_point];
@@ -6927,34 +7241,26 @@ parse_rational(struct parser_params *p, char *str, int len, int seen_point)
     return rb_rational_new(v, rb_int_positive_pow(10, fraclen));
 }
 
-static enum yytokentype
-no_digits(struct parser_params *p)
-{
-    yyerror0("numeric literal without digits");
-    if (peek(p, '_')) nextc(p);
-    /* dummy 0, for tUMINUS_NUM at numeric */
-    return set_integer_literal(p, INT2FIX(0), 0);
-}
-
-static enum yytokentype
-parse_numeric(struct parser_params *p, int c)
+static int
+parse_numeric(struct parser_params *parser, int c)
 {
     int is_float, seen_point, seen_e, nondigit;
     int suffix;
 
     is_float = seen_point = seen_e = nondigit = 0;
     SET_LEX_STATE(EXPR_END);
-    newtok(p);
+    newtok();
     if (c == '-' || c == '+') {
-	tokadd(p, c);
-	c = nextc(p);
+	tokadd(c);
+	c = nextc();
     }
     if (c == '0') {
-	int start = toklen(p);
-	c = nextc(p);
+#define no_digits() do {yyerror("numeric literal without digits"); return 0;} while (0)
+	int start = toklen();
+	c = nextc();
 	if (c == 'x' || c == 'X') {
 	    /* hexadecimal */
-	    c = nextc(p);
+	    c = nextc();
 	    if (c != -1 && ISXDIGIT(c)) {
 		do {
 		    if (c == '_') {
@@ -6964,21 +7270,21 @@ parse_numeric(struct parser_params *p, int c)
 		    }
 		    if (!ISXDIGIT(c)) break;
 		    nondigit = 0;
-		    tokadd(p, c);
-		} while ((c = nextc(p)) != -1);
+		    tokadd(c);
+		} while ((c = nextc()) != -1);
 	    }
-	    pushback(p, c);
-	    tokfix(p);
-	    if (toklen(p) == start) {
-		return no_digits(p);
+	    pushback(c);
+	    tokfix();
+	    if (toklen() == start) {
+		no_digits();
 	    }
 	    else if (nondigit) goto trailing_uc;
-	    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-	    return set_integer_literal(p, rb_cstr_to_inum(tok(p), 16, FALSE), suffix);
+	    suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+	    return set_integer_literal(rb_cstr_to_inum(tok(), 16, FALSE), suffix);
 	}
 	if (c == 'b' || c == 'B') {
 	    /* binary */
-	    c = nextc(p);
+	    c = nextc();
 	    if (c == '0' || c == '1') {
 		do {
 		    if (c == '_') {
@@ -6988,21 +7294,21 @@ parse_numeric(struct parser_params *p, int c)
 		    }
 		    if (c != '0' && c != '1') break;
 		    nondigit = 0;
-		    tokadd(p, c);
-		} while ((c = nextc(p)) != -1);
+		    tokadd(c);
+		} while ((c = nextc()) != -1);
 	    }
-	    pushback(p, c);
-	    tokfix(p);
-	    if (toklen(p) == start) {
-		return no_digits(p);
+	    pushback(c);
+	    tokfix();
+	    if (toklen() == start) {
+		no_digits();
 	    }
 	    else if (nondigit) goto trailing_uc;
-	    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-	    return set_integer_literal(p, rb_cstr_to_inum(tok(p), 2, FALSE), suffix);
+	    suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+	    return set_integer_literal(rb_cstr_to_inum(tok(), 2, FALSE), suffix);
 	}
 	if (c == 'd' || c == 'D') {
 	    /* decimal */
-	    c = nextc(p);
+	    c = nextc();
 	    if (c != -1 && ISDIGIT(c)) {
 		do {
 		    if (c == '_') {
@@ -7012,17 +7318,17 @@ parse_numeric(struct parser_params *p, int c)
 		    }
 		    if (!ISDIGIT(c)) break;
 		    nondigit = 0;
-		    tokadd(p, c);
-		} while ((c = nextc(p)) != -1);
+		    tokadd(c);
+		} while ((c = nextc()) != -1);
 	    }
-	    pushback(p, c);
-	    tokfix(p);
-	    if (toklen(p) == start) {
-		return no_digits(p);
+	    pushback(c);
+	    tokfix();
+	    if (toklen() == start) {
+		no_digits();
 	    }
 	    else if (nondigit) goto trailing_uc;
-	    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-	    return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix);
+	    suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+	    return set_integer_literal(rb_cstr_to_inum(tok(), 10, FALSE), suffix);
 	}
 	if (c == '_') {
 	    /* 0_0 */
@@ -7030,9 +7336,9 @@ parse_numeric(struct parser_params *p, int c)
 	}
 	if (c == 'o' || c == 'O') {
 	    /* prefixed octal */
-	    c = nextc(p);
+	    c = nextc();
 	    if (c == -1 || c == '_' || !ISDIGIT(c)) {
-		return no_digits(p);
+		no_digits();
 	    }
 	}
 	if (c >= '0' && c <= '7') {
@@ -7047,31 +7353,31 @@ parse_numeric(struct parser_params *p, int c)
 		if (c < '0' || c > '9') break;
 		if (c > '7') goto invalid_octal;
 		nondigit = 0;
-		tokadd(p, c);
-	    } while ((c = nextc(p)) != -1);
-	    if (toklen(p) > start) {
-		pushback(p, c);
-		tokfix(p);
+		tokadd(c);
+	    } while ((c = nextc()) != -1);
+	    if (toklen() > start) {
+		pushback(c);
+		tokfix();
 		if (nondigit) goto trailing_uc;
-		suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-		return set_integer_literal(p, rb_cstr_to_inum(tok(p), 8, FALSE), suffix);
+		suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+		return set_integer_literal(rb_cstr_to_inum(tok(), 8, FALSE), suffix);
 	    }
 	    if (nondigit) {
-		pushback(p, c);
+		pushback(c);
 		goto trailing_uc;
 	    }
 	}
 	if (c > '7' && c <= '9') {
 	  invalid_octal:
-	    yyerror0("Invalid octal digit");
+	    yyerror("Invalid octal digit");
 	}
 	else if (c == '.' || c == 'e' || c == 'E') {
-	    tokadd(p, '0');
+	    tokadd('0');
 	}
 	else {
-	    pushback(p, c);
-	    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-	    return set_integer_literal(p, INT2FIX(0), suffix);
+	    pushback(c);
+	    suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+	    return set_integer_literal(INT2FIX(0), suffix);
 	}
     }
 
@@ -7080,7 +7386,7 @@ parse_numeric(struct parser_params *p, int c)
 	  case '0': case '1': case '2': case '3': case '4':
 	  case '5': case '6': case '7': case '8': case '9':
 	    nondigit = 0;
-	    tokadd(p, c);
+	    tokadd(c);
 	    break;
 
 	  case '.':
@@ -7089,16 +7395,16 @@ parse_numeric(struct parser_params *p, int c)
 		goto decode_num;
 	    }
 	    else {
-		int c0 = nextc(p);
+		int c0 = nextc();
 		if (c0 == -1 || !ISDIGIT(c0)) {
-		    pushback(p, c0);
+		    pushback(c0);
 		    goto decode_num;
 		}
 		c = c0;
 	    }
-	    seen_point = toklen(p);
-	    tokadd(p, '.');
-	    tokadd(p, c);
+	    seen_point = toklen();
+	    tokadd('.');
+	    tokadd(c);
 	    is_float++;
 	    nondigit = 0;
 	    break;
@@ -7106,7 +7412,7 @@ parse_numeric(struct parser_params *p, int c)
 	  case 'e':
 	  case 'E':
 	    if (nondigit) {
-		pushback(p, c);
+		pushback(c);
 		c = nondigit;
 		goto decode_num;
 	    }
@@ -7114,16 +7420,16 @@ parse_numeric(struct parser_params *p, int c)
 		goto decode_num;
 	    }
 	    nondigit = c;
-	    c = nextc(p);
+	    c = nextc();
 	    if (c != '-' && c != '+' && !ISDIGIT(c)) {
-		pushback(p, c);
+		pushback(c);
 		nondigit = 0;
 		goto decode_num;
 	    }
-	    tokadd(p, nondigit);
+	    tokadd(nondigit);
 	    seen_e++;
 	    is_float++;
-	    tokadd(p, c);
+	    tokadd(c);
 	    nondigit = (c == '-' || c == '+') ? c : 0;
 	    break;
 
@@ -7135,59 +7441,57 @@ parse_numeric(struct parser_params *p, int c)
 	  default:
 	    goto decode_num;
 	}
-	c = nextc(p);
+	c = nextc();
     }
 
   decode_num:
-    pushback(p, c);
+    pushback(c);
     if (nondigit) {
 	char tmp[30];
       trailing_uc:
-	literal_flush(p, p->lex.pcur - 1);
 	snprintf(tmp, sizeof(tmp), "trailing `%c' in number", nondigit);
-	yyerror0(tmp);
+	yyerror(tmp);
     }
-    tokfix(p);
+    tokfix();
     if (is_float) {
-	enum yytokentype type = tFLOAT;
+	int type = tFLOAT;
 	VALUE v;
 
-	suffix = number_literal_suffix(p, seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL);
+	suffix = number_literal_suffix(seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL);
 	if (suffix & NUM_SUFFIX_R) {
 	    type = tRATIONAL;
-	    v = parse_rational(p, tok(p), toklen(p), seen_point);
+	    v = parse_rational(parser, tok(), toklen(), seen_point);
 	}
 	else {
-	    double d = strtod(tok(p), 0);
+	    double d = strtod(tok(), 0);
 	    if (errno == ERANGE) {
-		rb_warning1("Float %s out of range", WARN_S(tok(p)));
+		rb_warning1("Float %s out of range", WARN_S(tok()));
 		errno = 0;
 	    }
 	    v = DBL2NUM(d);
 	}
-	return set_number_literal(p, v, type, suffix);
+	return set_number_literal(v, type, suffix);
     }
-    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-    return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix);
+    suffix = number_literal_suffix(NUM_SUFFIX_ALL);
+    return set_integer_literal(rb_cstr_to_inum(tok(), 10, FALSE), suffix);
 }
 
-static enum yytokentype
-parse_qmark(struct parser_params *p, int space_seen)
+static int
+parse_qmark(struct parser_params *parser)
 {
     rb_encoding *enc;
     register int c;
-    VALUE lit;
 
     if (IS_END()) {
 	SET_LEX_STATE(EXPR_VALUE);
 	return '?';
     }
-    c = nextc(p);
+    c = nextc();
     if (c == -1) {
-	compile_error(p, "incomplete character syntax");
+	compile_error(PARSER_ARG "incomplete character syntax");
 	return 0;
     }
-    if (rb_enc_isspace(c, p->enc)) {
+    if (rb_enc_isspace(c, current_enc)) {
 	if (!IS_ARG()) {
 	    int c2 = 0;
 	    switch (c) {
@@ -7215,58 +7519,50 @@ parse_qmark(struct parser_params *p, int space_seen)
 	    }
 	}
       ternary:
-	pushback(p, c);
+	pushback(c);
 	SET_LEX_STATE(EXPR_VALUE);
 	return '?';
     }
-    newtok(p);
-    enc = p->enc;
-    if (!parser_isascii(p)) {
-	if (tokadd_mbchar(p, c) == -1) return 0;
+    newtok();
+    enc = current_enc;
+    if (!parser_isascii()) {
+	if (tokadd_mbchar(c) == -1) return 0;
     }
-    else if ((rb_enc_isalnum(c, p->enc) || c == '_') &&
-	     p->lex.pcur < p->lex.pend && is_identchar(p->lex.pcur, p->lex.pend, p->enc)) {
-	if (space_seen) {
-	    const char *start = p->lex.pcur - 1, *ptr = start;
-	    do {
-		int n = parser_precise_mbclen(p, ptr);
-		if (n < 0) return -1;
-		ptr += n;
-	    } while (ptr < p->lex.pend && is_identchar(ptr, p->lex.pend, p->enc));
-	    rb_warn2("`?' just followed by `%.*s' is interpreted as" \
-		     " a conditional operator, put a space after `?'",
-		     WARN_I((int)(ptr - start)), WARN_S_L(start, (ptr - start)));
-	}
+    else if ((rb_enc_isalnum(c, current_enc) || c == '_') &&
+	     lex_p < lex_pend && is_identchar(lex_p, lex_pend, current_enc)) {
 	goto ternary;
     }
     else if (c == '\\') {
-	if (peek(p, 'u')) {
-	    nextc(p);
-	    enc = rb_utf8_encoding();
-	    if (!parser_tokadd_utf8(p, &enc, -1, 0, 0))
-		return 0;
+	if (peek('u')) {
+	    nextc();
+	    c = parser_tokadd_utf8(parser, &enc, 0, 0, 0);
+	    if (0x80 <= c) {
+		tokaddmbc(c, enc);
+	    }
+	    else {
+		tokadd(c);
+	    }
 	}
-	else if (!lex_eol_p(p) && !(c = *p->lex.pcur, ISASCII(c))) {
-	    nextc(p);
-	    if (tokadd_mbchar(p, c) == -1) return 0;
+	else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) {
+	    nextc();
+	    if (tokadd_mbchar(c) == -1) return 0;
 	}
 	else {
-	    c = read_escape(p, 0, &enc);
-	    tokadd(p, c);
+	    c = read_escape(0, &enc);
+	    tokadd(c);
 	}
     }
     else {
-	tokadd(p, c);
+	tokadd(c);
     }
-    tokfix(p);
-    add_mark_object(p, lit = STR_NEW3(tok(p), toklen(p), enc, 0));
-    set_yylval_str(lit);
+    tokfix();
+    set_yylval_str(STR_NEW3(tok(), toklen(), enc, 0));
     SET_LEX_STATE(EXPR_END);
     return tCHAR;
 }
 
-static enum yytokentype
-parse_percent(struct parser_params *p, const int space_seen, const enum lex_state_e last_state)
+static int
+parse_percent(struct parser_params *parser, const int space_seen, const enum lex_state_e last_state)
 {
     register int c;
 
@@ -7274,21 +7570,21 @@ parse_percent(struct parser_params *p, const int space_seen, const enum lex_stat
 	int term;
 	int paren;
 
-	c = nextc(p);
+	c = nextc();
       quotation:
 	if (c == -1 || !ISALNUM(c)) {
 	    term = c;
 	    c = 'Q';
 	}
 	else {
-	    term = nextc(p);
-	    if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) {
-		yyerror0("unknown type of %string");
+	    term = nextc();
+	    if (rb_enc_isalnum(term, current_enc) || !parser_isascii()) {
+		yyerror("unknown type of %string");
 		return 0;
 	    }
 	}
 	if (c == -1 || term == -1) {
-	    compile_error(p, "unterminated quoted string meets end of file");
+	    compile_error(PARSER_ARG "unterminated quoted string meets end of file");
 	    return 0;
 	}
 	paren = term;
@@ -7300,48 +7596,56 @@ parse_percent(struct parser_params *p, const int space_seen, const enum lex_stat
 
 	switch (c) {
 	  case 'Q':
-	    p->lex.strterm = NEW_STRTERM(str_dquote, term, paren);
+	    lex_strterm = NEW_STRTERM(str_dquote, term, paren);
 	    return tSTRING_BEG;
 
 	  case 'q':
-	    p->lex.strterm = NEW_STRTERM(str_squote, term, paren);
+	    lex_strterm = NEW_STRTERM(str_squote, term, paren);
 	    return tSTRING_BEG;
 
 	  case 'W':
-	    p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
+	    lex_strterm = NEW_STRTERM(str_dword, term, paren);
+	    do {c = nextc();} while (ISSPACE(c));
+	    pushback(c);
 	    return tWORDS_BEG;
 
 	  case 'w':
-	    p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
+	    lex_strterm = NEW_STRTERM(str_sword, term, paren);
+	    do {c = nextc();} while (ISSPACE(c));
+	    pushback(c);
 	    return tQWORDS_BEG;
 
 	  case 'I':
-	    p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
+	    lex_strterm = NEW_STRTERM(str_dword, term, paren);
+	    do {c = nextc();} while (ISSPACE(c));
+	    pushback(c);
 	    return tSYMBOLS_BEG;
 
 	  case 'i':
-	    p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
+	    lex_strterm = NEW_STRTERM(str_sword, term, paren);
+	    do {c = nextc();} while (ISSPACE(c));
+	    pushback(c);
 	    return tQSYMBOLS_BEG;
 
 	  case 'x':
-	    p->lex.strterm = NEW_STRTERM(str_xquote, term, paren);
+	    lex_strterm = NEW_STRTERM(str_xquote, term, paren);
 	    return tXSTRING_BEG;
 
 	  case 'r':
-	    p->lex.strterm = NEW_STRTERM(str_regexp, term, paren);
+	    lex_strterm = NEW_STRTERM(str_regexp, term, paren);
 	    return tREGEXP_BEG;
 
 	  case 's':
-	    p->lex.strterm = NEW_STRTERM(str_ssym, term, paren);
+	    lex_strterm = NEW_STRTERM(str_ssym, term, paren);
 	    SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);
 	    return tSYMBEG;
 
 	  default:
-	    yyerror0("unknown type of %string");
+	    yyerror("unknown type of %string");
 	    return 0;
 	}
     }
-    if ((c = nextc(p)) == '=') {
+    if ((c = nextc()) == '=') {
 	set_yylval_id('%');
 	SET_LEX_STATE(EXPR_BEG);
 	return tOP_ASGN;
@@ -7350,23 +7654,24 @@ parse_percent(struct parser_params *p, const int space_seen, const enum lex_stat
 	goto quotation;
     }
     SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-    pushback(p, c);
-    return warn_balanced('%', "%%", "string literal");
+    pushback(c);
+    warn_balanced("%%", "string literal");
+    return '%';
 }
 
 static int
-tokadd_ident(struct parser_params *p, int c)
+tokadd_ident(struct parser_params *parser, int c)
 {
     do {
-	if (tokadd_mbchar(p, c) == -1) return -1;
-	c = nextc(p);
-    } while (parser_is_identchar(p));
-    pushback(p, c);
+	if (tokadd_mbchar(c) == -1) return -1;
+	c = nextc();
+    } while (parser_is_identchar());
+    pushback(c);
     return 0;
 }
 
 static ID
-tokenize_ident(struct parser_params *p, const enum lex_state_e last_state)
+tokenize_ident(struct parser_params *parser, const enum lex_state_e last_state)
 {
     ID ident = TOK_INTERN();
 
@@ -7376,11 +7681,11 @@ tokenize_ident(struct parser_params *p, const enum lex_state_e last_state)
 }
 
 static int
-parse_numvar(struct parser_params *p)
+parse_numvar(struct parser_params *parser)
 {
     size_t len;
     int overflow;
-    unsigned long n = ruby_scan_digits(tok(p)+1, toklen(p)-1, 10, &len, &overflow);
+    unsigned long n = ruby_scan_digits(tok()+1, toklen()-1, 10, &len, &overflow);
     const unsigned long nth_ref_max =
 	((FIXNUM_MAX < INT_MAX) ? FIXNUM_MAX : INT_MAX) >> 1;
     /* NTH_REF is left-shifted to be ORed with back-ref flag and
@@ -7388,7 +7693,7 @@ parse_numvar(struct parser_params *p)
 
     if (overflow || n > nth_ref_max) {
 	/* compile_error()? */
-	rb_warn1("`%s' is too big for a number variable, always nil", WARN_S(tok(p)));
+	rb_warn1("`%s' is too big for a number variable, always nil", WARN_S(tok()));
 	return 0;		/* $0 is $PROGRAM_NAME, not NTH_REF */
     }
     else {
@@ -7396,23 +7701,23 @@ parse_numvar(struct parser_params *p)
     }
 }
 
-static enum yytokentype
-parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
+static int
+parse_gvar(struct parser_params *parser, const enum lex_state_e last_state)
 {
     register int c;
 
     SET_LEX_STATE(EXPR_END);
-    newtok(p);
-    c = nextc(p);
+    newtok();
+    c = nextc();
     switch (c) {
       case '_':		/* $_: last read line string */
-	c = nextc(p);
-	if (parser_is_identchar(p)) {
-	    tokadd(p, '$');
-	    tokadd(p, '_');
+	c = nextc();
+	if (parser_is_identchar()) {
+	    tokadd('$');
+	    tokadd('_');
 	    break;
 	}
-	pushback(p, c);
+	pushback(c);
 	c = '_';
 	/* fall through */
       case '~':		/* $~: match-data */
@@ -7431,20 +7736,20 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
       case '<':		/* $<: reading filename */
       case '>':		/* $>: default output handle */
       case '\"':		/* $": already loaded files */
-	tokadd(p, '$');
-	tokadd(p, c);
+	tokadd('$');
+	tokadd(c);
 	goto gvar;
 
       case '-':
-	tokadd(p, '$');
-	tokadd(p, c);
-	c = nextc(p);
-	if (parser_is_identchar(p)) {
-	    if (tokadd_mbchar(p, c) == -1) return 0;
+	tokadd('$');
+	tokadd(c);
+	c = nextc();
+	if (parser_is_identchar()) {
+	    if (tokadd_mbchar(c) == -1) return 0;
 	}
 	else {
-	    pushback(p, c);
-	    pushback(p, '-');
+	    pushback(c);
+	    pushback('-');
 	    return '$';
 	}
       gvar:
@@ -7456,119 +7761,136 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
       case '\'':		/* $': string after last match */
       case '+':		/* $+: string matches last paren. */
 	if (IS_lex_state_for(last_state, EXPR_FNAME)) {
-	    tokadd(p, '$');
-	    tokadd(p, c);
+	    tokadd('$');
+	    tokadd(c);
 	    goto gvar;
 	}
-	set_yylval_node(NEW_BACK_REF(c, &_cur_loc));
+	set_yylval_node(NEW_BACK_REF(c));
 	return tBACK_REF;
 
       case '1': case '2': case '3':
       case '4': case '5': case '6':
       case '7': case '8': case '9':
-	tokadd(p, '$');
+	tokadd('$');
 	do {
-	    tokadd(p, c);
-	    c = nextc(p);
+	    tokadd(c);
+	    c = nextc();
 	} while (c != -1 && ISDIGIT(c));
-	pushback(p, c);
+	pushback(c);
 	if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar;
-	tokfix(p);
-	set_yylval_node(NEW_NTH_REF(parse_numvar(p), &_cur_loc));
+	tokfix();
+	set_yylval_node(NEW_NTH_REF(parse_numvar(parser)));
 	return tNTH_REF;
 
       default:
-	if (!parser_is_identchar(p)) {
+	if (!parser_is_identchar()) {
 	    if (c == -1 || ISSPACE(c)) {
-		compile_error(p, "`$' without identifiers is not allowed as a global variable name");
+		compile_error(PARSER_ARG "`$' without identifiers is not allowed as a global variable name");
 	    }
 	    else {
-		pushback(p, c);
-		compile_error(p, "`$%c' is not allowed as a global variable name", c);
+		pushback(c);
+		compile_error(PARSER_ARG "`$%c' is not allowed as a global variable name", c);
 	    }
 	    return 0;
 	}
       case '0':
-	tokadd(p, '$');
+	tokadd('$');
     }
 
-    if (tokadd_ident(p, c)) return 0;
+    if (tokadd_ident(parser, c)) return 0;
     SET_LEX_STATE(EXPR_END);
-    tokenize_ident(p, last_state);
+    tokenize_ident(parser, last_state);
     return tGVAR;
 }
 
-static enum yytokentype
-parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
+static int
+parse_atmark(struct parser_params *parser, const enum lex_state_e last_state)
 {
-    enum yytokentype result = tIVAR;
-    register int c = nextc(p);
+    int result = tIVAR;
+    register int c = nextc();
 
-    newtok(p);
-    tokadd(p, '@');
+    newtok();
+    tokadd('@');
     if (c == '@') {
 	result = tCVAR;
-	tokadd(p, '@');
-	c = nextc(p);
+	tokadd('@');
+	c = nextc();
     }
     if (c == -1 || ISSPACE(c)) {
 	if (result == tIVAR) {
-	    compile_error(p, "`@' without identifiers is not allowed as an instance variable name");
+	    compile_error(PARSER_ARG "`@' without identifiers is not allowed as an instance variable name");
 	}
 	else {
-	    compile_error(p, "`@@' without identifiers is not allowed as a class variable name");
+	    compile_error(PARSER_ARG "`@@' without identifiers is not allowed as a class variable name");
 	}
 	return 0;
     }
-    else if (ISDIGIT(c) || !parser_is_identchar(p)) {
-	pushback(p, c);
+    else if (ISDIGIT(c) || !parser_is_identchar()) {
+	pushback(c);
 	if (result == tIVAR) {
-	    compile_error(p, "`@%c' is not allowed as an instance variable name", c);
+	    compile_error(PARSER_ARG "`@%c' is not allowed as an instance variable name", c);
 	}
 	else {
-	    compile_error(p, "`@@%c' is not allowed as a class variable name", c);
+	    compile_error(PARSER_ARG "`@@%c' is not allowed as a class variable name", c);
 	}
 	return 0;
     }
 
-    if (tokadd_ident(p, c)) return 0;
+    if (tokadd_ident(parser, c)) return 0;
     SET_LEX_STATE(EXPR_END);
-    tokenize_ident(p, last_state);
+    tokenize_ident(parser, last_state);
     return result;
 }
 
-static enum yytokentype
-parse_ident(struct parser_params *p, int c, int cmd_state)
+static int
+parse_ident(struct parser_params *parser, int c, int cmd_state)
 {
-    enum yytokentype result;
+    int result = 0;
     int mb = ENC_CODERANGE_7BIT;
-    const enum lex_state_e last_state = p->lex.state;
+    const enum lex_state_e last_state = lex_state;
     ID ident;
 
     do {
 	if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN;
-	if (tokadd_mbchar(p, c) == -1) return 0;
-	c = nextc(p);
-    } while (parser_is_identchar(p));
-    if ((c == '!' || c == '?') && !peek(p, '=')) {
-	result = tFID;
-	tokadd(p, c);
+	if (tokadd_mbchar(c) == -1) return 0;
+	c = nextc();
+    } while (parser_is_identchar());
+    if ((c == '!' || c == '?') && !peek('=')) {
+	tokadd(c);
+    }
+    else {
+	pushback(c);
     }
-    else if (c == '=' && IS_lex_state(EXPR_FNAME) &&
-	     (!peek(p, '~') && !peek(p, '>') && (!peek(p, '=') || (peek_n(p, '>', 1))))) {
-	result = tIDENTIFIER;
-	tokadd(p, c);
+    tokfix();
+
+    if (toklast() == '!' || toklast() == '?') {
+	result = tFID;
     }
     else {
-	result = tCONSTANT;	/* assume provisionally */
-	pushback(p, c);
+	if (IS_lex_state(EXPR_FNAME)) {
+	    register int c = nextc();
+	    if (c == '=' && !peek('~') && !peek('>') &&
+		(!peek('=') || (peek_n('>', 1)))) {
+		result = tIDENTIFIER;
+		tokadd(c);
+		tokfix();
+	    }
+	    else {
+		pushback(c);
+	    }
+	}
+	if (result == 0 && ISUPPER(tok()[0])) {
+	    result = tCONSTANT;
+	}
+	else {
+	    result = tIDENTIFIER;
+	}
     }
-    tokfix(p);
 
     if (IS_LABEL_POSSIBLE()) {
 	if (IS_LABEL_SUFFIX(0)) {
 	    SET_LEX_STATE(EXPR_ARG|EXPR_LABELED);
-	    nextc(p);
+	    nextc();
 	    set_yylval_name(TOK_INTERN());
 	    return tLABEL;
 	}
@@ -7577,25 +7899,28 @@ parse_ident(struct parser_params *p, int c, int cmd_state)
 	const struct kwtable *kw;
 
 	/* See if it is a reserved word.  */
-	kw = rb_reserved_word(tok(p), toklen(p));
+	kw = rb_reserved_word(tok(), toklen());
 	if (kw) {
-	    enum lex_state_e state = p->lex.state;
+	    enum lex_state_e state = lex_state;
 	    SET_LEX_STATE(kw->state);
 	    if (IS_lex_state_for(state, EXPR_FNAME)) {
-		set_yylval_name(rb_intern2(tok(p), toklen(p)));
+		set_yylval_name(rb_intern2(tok(), toklen()));
 		return kw->id[0];
 	    }
 	    if (IS_lex_state(EXPR_BEG)) {
-		p->command_start = TRUE;
+		command_start = TRUE;
 	    }
 	    if (kw->id[0] == keyword_do) {
-		if (lambda_beginning_p()) {
-		    p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE in the body of "-> do ... end" */
+		if (lpar_beg && lpar_beg == paren_nest) {
+		    lpar_beg = 0;
+		    --paren_nest;
 		    return keyword_do_LAMBDA;
 		}
 		if (COND_P()) return keyword_do_cond;
 		if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG))
 		    return keyword_do_block;
+		if (IS_lex_state_for(state, (EXPR_BEG | EXPR_ENDARG)))
+		    return keyword_do_block;
 		return keyword_do;
 	    }
 	    if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED)))
@@ -7616,25 +7941,24 @@ parse_ident(struct parser_params *p, int c, int cmd_state)
 	    SET_LEX_STATE(EXPR_ARG);
 	}
     }
-    else if (p->lex.state == EXPR_FNAME) {
+    else if (lex_state == EXPR_FNAME) {
 	SET_LEX_STATE(EXPR_ENDFN);
     }
     else {
 	SET_LEX_STATE(EXPR_END);
     }
 
-    ident = tokenize_ident(p, last_state);
-    if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;
+    ident = tokenize_ident(parser, last_state);
     if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&
 	(result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */
-	lvar_defined(p, ident)) {
+	lvar_defined(ident)) {
 	SET_LEX_STATE(EXPR_END|EXPR_LABEL);
     }
     return result;
 }
 
-static enum yytokentype
-parser_yylex(struct parser_params *p)
+static int
+parser_yylex(struct parser_params *parser)
 {
     register int c;
     int space_seen = 0;
@@ -7642,26 +7966,40 @@ parser_yylex(struct parser_params *p)
     int label;
     enum lex_state_e last_state;
     int fallthru = FALSE;
-    int token_seen = p->token_seen;
-
-    if (p->lex.strterm) {
-	if (p->lex.strterm->flags & STRTERM_HEREDOC) {
-	    return here_document(p, &p->lex.strterm->u.heredoc);
+    int token_seen = parser->token_seen;
+
+    if (lex_strterm) {
+	int token;
+	if (nd_type(lex_strterm) == NODE_HEREDOC) {
+	    token = here_document(lex_strterm);
+	    if (token == tSTRING_END) {
+		lex_strterm = 0;
+		SET_LEX_STATE(EXPR_END);
+	    }
 	}
 	else {
-	    token_flush(p);
-	    return parse_string(p, &p->lex.strterm->u.literal);
+	    token = parse_string(lex_strterm);
+	    if ((token == tSTRING_END) && (lex_strterm->nd_func & STR_FUNC_LABEL)) {
+		if (((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !COND_P()) || IS_ARG()) &&
+		    IS_LABEL_SUFFIX(0)) {
+		    nextc();
+		    token = tLABEL_END;
+		}
+	    }
+	    if (token == tSTRING_END || token == tREGEXP_END || token == tLABEL_END) {
+		rb_gc_force_recycle((VALUE)lex_strterm);
+		lex_strterm = 0;
+		SET_LEX_STATE(token == tLABEL_END ? EXPR_BEG|EXPR_LABEL : EXPR_END);
+	    }
 	}
+	return token;
     }
-    cmd_state = p->command_start;
-    p->command_start = FALSE;
-    p->token_seen = TRUE;
+    cmd_state = command_start;
+    command_start = FALSE;
+    parser->token_seen = TRUE;
   retry:
-    last_state = p->lex.state;
-#ifndef RIPPER
-    token_flush(p);
-#endif
-    switch (c = nextc(p)) {
+    last_state = lex_state;
+    switch (c = nextc()) {
       case '\0':		/* NUL */
       case '\004':		/* ^D */
       case '\032':		/* ^Z */
@@ -7673,7 +8011,7 @@ parser_yylex(struct parser_params *p)
       case '\13': /* '\v' */
 	space_seen = 1;
 #ifdef RIPPER
-	while ((c = nextc(p))) {
+	while ((c = nextc())) {
 	    switch (c) {
 	      case ' ': case '\t': case '\f': case '\r':
 	      case '\13': /* '\v' */
@@ -7683,84 +8021,78 @@ parser_yylex(struct parser_params *p)
 	    }
 	}
       outofloop:
-	pushback(p, c);
-	dispatch_scan_event(p, tSP);
+	pushback(c);
+	dispatch_scan_event(tSP);
 #endif
 	goto retry;
 
       case '#':		/* it's a comment */
-	p->token_seen = token_seen;
+	parser->token_seen = token_seen;
 	/* no magic_comment in shebang line */
-	if (!parser_magic_comment(p, p->lex.pcur, p->lex.pend - p->lex.pcur)) {
-	    if (comment_at_top(p)) {
-		set_file_encoding(p, p->lex.pcur, p->lex.pend);
+	if (!parser_magic_comment(parser, lex_p, lex_pend - lex_p)) {
+	    if (comment_at_top(parser)) {
+		set_file_encoding(parser, lex_p, lex_pend);
 	    }
 	}
-	lex_goto_eol(p);
-        dispatch_scan_event(p, tCOMMENT);
+	lex_p = lex_pend;
+        dispatch_scan_event(tCOMMENT);
         fallthru = TRUE;
 	/* fall through */
       case '\n':
-	p->token_seen = token_seen;
+	parser->token_seen = token_seen;
 	c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) &&
 	     !IS_lex_state(EXPR_LABELED));
 	if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) {
             if (!fallthru) {
-                dispatch_scan_event(p, tIGNORED_NL);
+                dispatch_scan_event(tIGNORED_NL);
             }
             fallthru = FALSE;
-	    if (!c && p->in_kwarg) {
+	    if (!c && parser->in_kwarg) {
 		goto normal_newline;
 	    }
 	    goto retry;
 	}
-	while (1) {
-	    switch (c = nextc(p)) {
+	while ((c = nextc())) {
+	    switch (c) {
 	      case ' ': case '\t': case '\f': case '\r':
 	      case '\13': /* '\v' */
 		space_seen = 1;
 		break;
 	      case '&':
 	      case '.': {
-		dispatch_delayed_token(p, tIGNORED_NL);
-		if (peek(p, '.') == (c == '&')) {
-		    pushback(p, c);
-		    dispatch_scan_event(p, tSP);
+		dispatch_delayed_token(tIGNORED_NL);
+		if (peek('.') == (c == '&')) {
+		    pushback(c);
+		    dispatch_scan_event(tSP);
 		    goto retry;
 		}
 	      }
 	      default:
-		p->ruby_sourceline--;
-		p->lex.nextline = p->lex.lastline;
+		--ruby_sourceline;
+		lex_nextline = lex_lastline;
 	      case -1:		/* EOF no decrement*/
-#ifndef RIPPER
-		if (p->lex.prevline && !p->eofp) p->lex.lastline = p->lex.prevline;
-		p->lex.pbeg = RSTRING_PTR(p->lex.lastline);
-		p->lex.pend = p->lex.pcur = p->lex.pbeg + RSTRING_LEN(p->lex.lastline);
-		pushback(p, 1); /* always pushback */
-		p->lex.ptok = p->lex.pcur;
-#else
-		lex_goto_eol(p);
+		lex_goto_eol(parser);
+#ifdef RIPPER
 		if (c != -1) {
-		    p->lex.ptok = p->lex.pcur;
+		    parser->tokp = lex_p;
 		}
 #endif
 		goto normal_newline;
 	    }
 	}
       normal_newline:
-	p->command_start = TRUE;
+	command_start = TRUE;
 	SET_LEX_STATE(EXPR_BEG);
 	return '\n';
 
       case '*':
-	if ((c = nextc(p)) == '*') {
-	    if ((c = nextc(p)) == '=') {
-		set_yylval_id(idPow);
+	if ((c = nextc()) == '*') {
+	    if ((c = nextc()) == '=') {
+                set_yylval_id(tPOW);
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    if (IS_SPCARG(c)) {
 		rb_warning0("`**' interpreted as argument prefix");
 		c = tDSTAR;
@@ -7769,7 +8101,8 @@ parser_yylex(struct parser_params *p)
 		c = tDSTAR;
 	    }
 	    else {
-		c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix");
+		warn_balanced("**", "argument prefix");
+		c = tPOW;
 	    }
 	}
 	else {
@@ -7778,7 +8111,7 @@ parser_yylex(struct parser_params *p)
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    if (IS_SPCARG(c)) {
 		rb_warning0("`*' interpreted as argument prefix");
 		c = tSTAR;
@@ -7787,14 +8120,15 @@ parser_yylex(struct parser_params *p)
 		c = tSTAR;
 	    }
 	    else {
-		c = warn_balanced('*', "*", "argument prefix");
+		warn_balanced("*", "argument prefix");
+		c = '*';
 	    }
 	}
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
 	return c;
 
       case '!':
-	c = nextc(p);
+	c = nextc();
 	if (IS_AFTER_OPERATOR()) {
 	    SET_LEX_STATE(EXPR_ARG);
 	    if (c == '@') {
@@ -7810,46 +8144,46 @@ parser_yylex(struct parser_params *p)
 	if (c == '~') {
 	    return tNMATCH;
 	}
-	pushback(p, c);
+	pushback(c);
 	return '!';
 
       case '=':
-	if (was_bol(p)) {
+	if (was_bol()) {
 	    /* skip embedded rd document */
-	    if (strncmp(p->lex.pcur, "begin", 5) == 0 && ISSPACE(p->lex.pcur[5])) {
+	    if (strncmp(lex_p, "begin", 5) == 0 && ISSPACE(lex_p[5])) {
 		int first_p = TRUE;
 
-		lex_goto_eol(p);
-		dispatch_scan_event(p, tEMBDOC_BEG);
+		lex_goto_eol(parser);
+		dispatch_scan_event(tEMBDOC_BEG);
 		for (;;) {
-		    lex_goto_eol(p);
+		    lex_goto_eol(parser);
 		    if (!first_p) {
-			dispatch_scan_event(p, tEMBDOC);
+			dispatch_scan_event(tEMBDOC);
 		    }
 		    first_p = FALSE;
-		    c = nextc(p);
+		    c = nextc();
 		    if (c == -1) {
-			compile_error(p, "embedded document meets end of file");
+			compile_error(PARSER_ARG "embedded document meets end of file");
 			return 0;
 		    }
 		    if (c != '=') continue;
-		    if (c == '=' && strncmp(p->lex.pcur, "end", 3) == 0 &&
-			(p->lex.pcur + 3 == p->lex.pend || ISSPACE(p->lex.pcur[3]))) {
+		    if (c == '=' && strncmp(lex_p, "end", 3) == 0 &&
+			(lex_p + 3 == lex_pend || ISSPACE(lex_p[3]))) {
 			break;
 		    }
 		}
-		lex_goto_eol(p);
-		dispatch_scan_event(p, tEMBDOC_END);
+		lex_goto_eol(parser);
+		dispatch_scan_event(tEMBDOC_END);
 		goto retry;
 	    }
 	}
 
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-	if ((c = nextc(p)) == '=') {
-	    if ((c = nextc(p)) == '=') {
+	if ((c = nextc()) == '=') {
+	    if ((c = nextc()) == '=') {
 		return tEQQ;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tEQ;
 	}
 	if (c == '~') {
@@ -7858,17 +8192,17 @@ parser_yylex(struct parser_params *p)
 	else if (c == '>') {
 	    return tASSOC;
 	}
-	pushback(p, c);
+	pushback(c);
 	return '=';
 
       case '<':
-	last_state = p->lex.state;
-	c = nextc(p);
+	last_state = lex_state;
+	c = nextc();
 	if (c == '<' &&
 	    !IS_lex_state(EXPR_DOT | EXPR_CLASS) &&
 	    !IS_END() &&
 	    (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) {
-	    int token = heredoc_identifier(p);
+	    int token = heredoc_identifier();
 	    if (token) return token;
 	}
 	if (IS_AFTER_OPERATOR()) {
@@ -7876,48 +8210,49 @@ parser_yylex(struct parser_params *p)
 	}
 	else {
 	    if (IS_lex_state(EXPR_CLASS))
-		p->command_start = TRUE;
+		command_start = TRUE;
 	    SET_LEX_STATE(EXPR_BEG);
 	}
 	if (c == '=') {
-	    if ((c = nextc(p)) == '>') {
+	    if ((c = nextc()) == '>') {
 		return tCMP;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tLEQ;
 	}
 	if (c == '<') {
-	    if ((c = nextc(p)) == '=') {
-		set_yylval_id(idLTLT);
+	    if ((c = nextc()) == '=') {
+                set_yylval_id(tLSHFT);
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
-	    return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document");
+	    pushback(c);
+	    warn_balanced("<<", "here document");
+	    return tLSHFT;
 	}
-	pushback(p, c);
+	pushback(c);
 	return '<';
 
       case '>':
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-	if ((c = nextc(p)) == '=') {
+	if ((c = nextc()) == '=') {
 	    return tGEQ;
 	}
 	if (c == '>') {
-	    if ((c = nextc(p)) == '=') {
-		set_yylval_id(idGTGT);
+	    if ((c = nextc()) == '=') {
+                set_yylval_id(tRSHFT);
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tRSHFT;
 	}
-	pushback(p, c);
+	pushback(c);
 	return '>';
 
       case '"':
 	label = (IS_LABEL_POSSIBLE() ? str_label : 0);
-	p->lex.strterm = NEW_STRTERM(str_dquote | label, '"', 0);
+	lex_strterm = NEW_STRTERM(str_dquote | label, '"', 0);
 	return tSTRING_BEG;
 
       case '`':
@@ -7932,26 +8267,26 @@ parser_yylex(struct parser_params *p)
 		SET_LEX_STATE(EXPR_ARG);
 	    return c;
 	}
-	p->lex.strterm = NEW_STRTERM(str_xquote, '`', 0);
+	lex_strterm = NEW_STRTERM(str_xquote, '`', 0);
 	return tXSTRING_BEG;
 
       case '\'':
 	label = (IS_LABEL_POSSIBLE() ? str_label : 0);
-	p->lex.strterm = NEW_STRTERM(str_squote | label, '\'', 0);
+	lex_strterm = NEW_STRTERM(str_squote | label, '\'', 0);
 	return tSTRING_BEG;
 
       case '?':
-	return parse_qmark(p, space_seen);
+	return parse_qmark(parser);
 
       case '&':
-	if ((c = nextc(p)) == '&') {
+	if ((c = nextc()) == '&') {
 	    SET_LEX_STATE(EXPR_BEG);
-	    if ((c = nextc(p)) == '=') {
-                set_yylval_id(idANDOP);
+	    if ((c = nextc()) == '=') {
+                set_yylval_id(tANDOP);
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tANDOP;
 	}
 	else if (c == '=') {
@@ -7960,38 +8295,33 @@ parser_yylex(struct parser_params *p)
 	    return tOP_ASGN;
 	}
 	else if (c == '.') {
-	    set_yylval_id(idANDDOT);
 	    SET_LEX_STATE(EXPR_DOT);
 	    return tANDDOT;
 	}
-	pushback(p, c);
+	pushback(c);
 	if (IS_SPCARG(c)) {
-	    if ((c != ':') ||
-		(c = peekc_n(p, 1)) == -1 ||
-		!(c == '\'' || c == '"' ||
-		  is_identchar((p->lex.pcur+1), p->lex.pend, p->enc))) {
-		rb_warning0("`&' interpreted as argument prefix");
-	    }
+	    rb_warning0("`&' interpreted as argument prefix");
 	    c = tAMPER;
 	}
 	else if (IS_BEG()) {
 	    c = tAMPER;
 	}
 	else {
-	    c = warn_balanced('&', "&", "argument prefix");
+	    warn_balanced("&", "argument prefix");
+	    c = '&';
 	}
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
 	return c;
 
       case '|':
-	if ((c = nextc(p)) == '|') {
+	if ((c = nextc()) == '|') {
 	    SET_LEX_STATE(EXPR_BEG);
-	    if ((c = nextc(p)) == '=') {
-                set_yylval_id(idOROP);
+	    if ((c = nextc()) == '=') {
+                set_yylval_id(tOROP);
 		SET_LEX_STATE(EXPR_BEG);
 		return tOP_ASGN;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tOROP;
 	}
 	if (c == '=') {
@@ -8000,17 +8330,17 @@ parser_yylex(struct parser_params *p)
 	    return tOP_ASGN;
 	}
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL);
-	pushback(p, c);
+	pushback(c);
 	return '|';
 
       case '+':
-	c = nextc(p);
+	c = nextc();
 	if (IS_AFTER_OPERATOR()) {
 	    SET_LEX_STATE(EXPR_ARG);
 	    if (c == '@') {
 		return tUPLUS;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return '+';
 	}
 	if (c == '=') {
@@ -8018,26 +8348,27 @@ parser_yylex(struct parser_params *p)
 	    SET_LEX_STATE(EXPR_BEG);
 	    return tOP_ASGN;
 	}
-	if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '+'))) {
+	if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous('+'))) {
 	    SET_LEX_STATE(EXPR_BEG);
-	    pushback(p, c);
+	    pushback(c);
 	    if (c != -1 && ISDIGIT(c)) {
-		return parse_numeric(p, '+');
+		return parse_numeric(parser, '+');
 	    }
 	    return tUPLUS;
 	}
 	SET_LEX_STATE(EXPR_BEG);
-	pushback(p, c);
-	return warn_balanced('+', "+", "unary operator");
+	pushback(c);
+	warn_balanced("+", "unary operator");
+	return '+';
 
       case '-':
-	c = nextc(p);
+	c = nextc();
 	if (IS_AFTER_OPERATOR()) {
 	    SET_LEX_STATE(EXPR_ARG);
 	    if (c == '@') {
 		return tUMINUS;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return '-';
 	}
 	if (c == '=') {
@@ -8047,90 +8378,82 @@ parser_yylex(struct parser_params *p)
 	}
 	if (c == '>') {
 	    SET_LEX_STATE(EXPR_ENDFN);
+	    token_info_push("->");
 	    return tLAMBDA;
 	}
-	if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '-'))) {
+	if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous('-'))) {
 	    SET_LEX_STATE(EXPR_BEG);
-	    pushback(p, c);
+	    pushback(c);
 	    if (c != -1 && ISDIGIT(c)) {
 		return tUMINUS_NUM;
 	    }
 	    return tUMINUS;
 	}
 	SET_LEX_STATE(EXPR_BEG);
-	pushback(p, c);
-	return warn_balanced('-', "-", "unary operator");
+	pushback(c);
+	warn_balanced("-", "unary operator");
+	return '-';
 
       case '.':
 	SET_LEX_STATE(EXPR_BEG);
-	if ((c = nextc(p)) == '.') {
-	    if ((c = nextc(p)) == '.') {
+	if ((c = nextc()) == '.') {
+	    if ((c = nextc()) == '.') {
 		return tDOT3;
 	    }
-	    pushback(p, c);
+	    pushback(c);
 	    return tDOT2;
 	}
-	pushback(p, c);
+	pushback(c);
 	if (c != -1 && ISDIGIT(c)) {
-	    yyerror0("no .<digit> floating literal anymore; put 0 before dot");
+	    yyerror("no .<digit> floating literal anymore; put 0 before dot");
 	}
-	set_yylval_id('.');
 	SET_LEX_STATE(EXPR_DOT);
 	return '.';
 
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
-	return parse_numeric(p, c);
+	return parse_numeric(parser, c);
 
       case ')':
-	COND_POP();
-	CMDARG_POP();
-	SET_LEX_STATE(EXPR_ENDFN);
-	p->lex.paren_nest--;
-	return c;
-
       case ']':
-	COND_POP();
-	CMDARG_POP();
-	SET_LEX_STATE(EXPR_END);
-	p->lex.paren_nest--;
-	return c;
-
+	paren_nest--;
       case '}':
-	/* tSTRING_DEND does COND_POP and CMDARG_POP in the yacc's rule */
-	if (!p->lex.brace_nest--) return tSTRING_DEND;
-	COND_POP();
-	CMDARG_POP();
-	SET_LEX_STATE(EXPR_END);
-	p->lex.paren_nest--;
+	COND_LEXPOP();
+	CMDARG_LEXPOP();
+	if (c == ')')
+	    SET_LEX_STATE(EXPR_ENDFN);
+	else
+	    SET_LEX_STATE(EXPR_ENDARG);
+	if (c == '}') {
+	    if (!brace_nest--) c = tSTRING_DEND;
+	}
 	return c;
 
       case ':':
-	c = nextc(p);
+	c = nextc();
 	if (c == ':') {
 	    if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) {
 		SET_LEX_STATE(EXPR_BEG);
 		return tCOLON3;
 	    }
-	    set_yylval_id(idCOLON2);
 	    SET_LEX_STATE(EXPR_DOT);
 	    return tCOLON2;
 	}
 	if (IS_END() || ISSPACE(c) || c == '#') {
-	    pushback(p, c);
-	    c = warn_balanced(':', ":", "symbol literal");
+	    pushback(c);
+	    warn_balanced(":", "symbol literal");
 	    SET_LEX_STATE(EXPR_BEG);
-	    return c;
+	    return ':';
 	}
 	switch (c) {
 	  case '\'':
-	    p->lex.strterm = NEW_STRTERM(str_ssym, c, 0);
+	    lex_strterm = NEW_STRTERM(str_ssym, c, 0);
 	    break;
 	  case '"':
-	    p->lex.strterm = NEW_STRTERM(str_dsym, c, 0);
+	    lex_strterm = NEW_STRTERM(str_dsym, c, 0);
 	    break;
 	  default:
-	    pushback(p, c);
+	    pushback(c);
 	    break;
 	}
 	SET_LEX_STATE(EXPR_FNAME);
@@ -8138,36 +8461,37 @@ parser_yylex(struct parser_params *p)
 
       case '/':
 	if (IS_BEG()) {
-	    p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
+	    lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
 	    return tREGEXP_BEG;
 	}
-	if ((c = nextc(p)) == '=') {
+	if ((c = nextc()) == '=') {
             set_yylval_id('/');
 	    SET_LEX_STATE(EXPR_BEG);
 	    return tOP_ASGN;
 	}
-	pushback(p, c);
+	pushback(c);
 	if (IS_SPCARG(c)) {
-	    arg_ambiguous(p, '/');
-	    p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
+	    (void)arg_ambiguous('/');
+	    lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
 	    return tREGEXP_BEG;
 	}
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-	return warn_balanced('/', "/", "regexp literal");
+	warn_balanced("/", "regexp literal");
+	return '/';
 
       case '^':
-	if ((c = nextc(p)) == '=') {
+	if ((c = nextc()) == '=') {
             set_yylval_id('^');
 	    SET_LEX_STATE(EXPR_BEG);
 	    return tOP_ASGN;
 	}
 	SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-	pushback(p, c);
+	pushback(c);
 	return '^';
 
       case ';':
 	SET_LEX_STATE(EXPR_BEG);
-	p->command_start = TRUE;
+	command_start = TRUE;
 	return ';';
 
       case ',':
@@ -8176,8 +8500,8 @@ parser_yylex(struct parser_params *p)
 
       case '~':
 	if (IS_AFTER_OPERATOR()) {
-	    if ((c = nextc(p)) != '@') {
-		pushback(p, c);
+	    if ((c = nextc()) != '@') {
+		pushback(c);
 	    }
 	    SET_LEX_STATE(EXPR_ARG);
 	}
@@ -8190,35 +8514,28 @@ parser_yylex(struct parser_params *p)
 	if (IS_BEG()) {
 	    c = tLPAREN;
 	}
-	else if (!space_seen) {
-	    /* foo( ... ) => method call, no ambiguity */
-	}
-	else if (IS_ARG() || IS_lex_state_all(EXPR_END|EXPR_LABEL)) {
+	else if (IS_SPCARG(-1)) {
 	    c = tLPAREN_ARG;
 	}
-	else if (IS_lex_state(EXPR_ENDFN) && !lambda_beginning_p()) {
-	    rb_warning0("parentheses after method name is interpreted as "
-			"an argument list, not a decomposed argument");
-	}
-	p->lex.paren_nest++;
+	paren_nest++;
 	COND_PUSH(0);
 	CMDARG_PUSH(0);
 	SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
 	return c;
 
       case '[':
-	p->lex.paren_nest++;
+	paren_nest++;
 	if (IS_AFTER_OPERATOR()) {
-	    if ((c = nextc(p)) == ']') {
-		SET_LEX_STATE(EXPR_ARG);
-		if ((c = nextc(p)) == '=') {
+	    SET_LEX_STATE(EXPR_ARG);
+	    if ((c = nextc()) == ']') {
+		if ((c = nextc()) == '=') {
 		    return tASET;
 		}
-		pushback(p, c);
+		pushback(c);
 		return tAREF;
 	    }
-	    pushback(p, c);
-	    SET_LEX_STATE(EXPR_ARG|EXPR_LABEL);
+	    pushback(c);
+	    lex_state |= EXPR_LABEL;
 	    return '[';
 	}
 	else if (IS_BEG()) {
@@ -8233,15 +8550,15 @@ parser_yylex(struct parser_params *p)
 	return c;
 
       case '{':
-	++p->lex.brace_nest;
-	if (lambda_beginning_p()) {
+	++brace_nest;
+	if (lpar_beg && lpar_beg == paren_nest) {
 	    SET_LEX_STATE(EXPR_BEG);
+	    lpar_beg = 0;
+	    --paren_nest;
 	    COND_PUSH(0);
 	    CMDARG_PUSH(0);
-	    p->lex.paren_nest++;
 	    return tLAMBEG;
 	}
-	p->lex.paren_nest++;
 	if (IS_lex_state(EXPR_LABELED))
 	    c = tLBRACE;      /* hash */
 	else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN))
@@ -8252,103 +8569,83 @@ parser_yylex(struct parser_params *p)
 	    c = tLBRACE;      /* hash */
 	COND_PUSH(0);
 	CMDARG_PUSH(0);
-	SET_LEX_STATE(c != tLBRACE ? EXPR_BEG : EXPR_BEG|EXPR_LABEL);
-	if (c != tLBRACE) p->command_start = TRUE;
+	SET_LEX_STATE(EXPR_BEG);
+	if (c != tLBRACE_ARG) lex_state |= EXPR_LABEL;
+	if (c != tLBRACE) command_start = TRUE;
 	return c;
 
       case '\\':
-	c = nextc(p);
+	c = nextc();
 	if (c == '\n') {
 	    space_seen = 1;
-	    dispatch_scan_event(p, tSP);
+	    dispatch_scan_event(tSP);
 	    goto retry; /* skip \\n */
 	}
-	if (c == ' ') return tSP;
-	if (ISSPACE(c)) return c;
-	pushback(p, c);
+	pushback(c);
 	return '\\';
 
       case '%':
-	return parse_percent(p, space_seen, last_state);
+	return parse_percent(parser, space_seen, last_state);
 
       case '$':
-	return parse_gvar(p, last_state);
+	return parse_gvar(parser, last_state);
 
       case '@':
-	return parse_atmark(p, last_state);
+	return parse_atmark(parser, last_state);
 
       case '_':
-	if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) {
-	    p->ruby__end__seen = 1;
-	    p->eofp = 1;
+	if (was_bol() && whole_match_p("__END__", 7, 0)) {
+	    ruby__end__seen = 1;
+	    parser->eofp = 1;
 #ifndef RIPPER
 	    return -1;
 #else
-            lex_goto_eol(p);
-            dispatch_scan_event(p, k__END__);
+            lex_goto_eol(parser);
+            dispatch_scan_event(k__END__);
             return 0;
 #endif
 	}
-	newtok(p);
+	newtok();
 	break;
 
       default:
-	if (!parser_is_identchar(p)) {
-	    compile_error(p, "Invalid char `\\x%02X' in expression", c);
+	if (!parser_is_identchar()) {
+	    compile_error(PARSER_ARG  "Invalid char `\\x%02X' in expression", c);
 	    goto retry;
 	}
 
-	newtok(p);
+	newtok();
 	break;
     }
 
-    return parse_ident(p, c, cmd_state);
+    return parse_ident(parser, c, cmd_state);
 }
 
-static enum yytokentype
-yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p)
+static int
+yylex(YYSTYPE *lval, struct parser_params *parser)
 {
-    enum yytokentype t;
+    int t;
 
-    p->lval = lval;
+    parser->lval = lval;
     lval->val = Qundef;
-    t = parser_yylex(p);
-    if (has_delayed_token(p))
-	dispatch_delayed_token(p, t);
+    t = parser_yylex(parser);
+    if (has_delayed_token())
+	dispatch_delayed_token(t);
     else if (t != 0)
-	dispatch_scan_event(p, t);
-
-    if (p->lex.strterm && (p->lex.strterm->flags & STRTERM_HEREDOC))
-	RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*yylloc);
-    else
-	RUBY_SET_YYLLOC(*yylloc);
+	dispatch_scan_event(t);
 
     return t;
 }
 
-#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
-
+#ifndef RIPPER
 static NODE*
-node_newnode(struct parser_params *p, enum node_type type, VALUE a0, VALUE a1, VALUE a2, const rb_code_location_t *loc)
+node_newnode(struct parser_params *parser, enum node_type type, VALUE a0, VALUE a1, VALUE a2)
 {
-    NODE *n = rb_ast_newnode(p->ast);
-
-    rb_node_init(n, type, a0, a1, a2);
-
-    nd_set_loc(n, loc);
-    nd_set_node_id(n, parser_get_node_id(p));
+    NODE *n = (rb_node_newnode)(type, a0, a1, a2);
+    nd_set_line(n, ruby_sourceline);
     return n;
 }
 
-static NODE *
-nd_set_loc(NODE *nd, const YYLTYPE *loc)
-{
-    nd->nd_loc = *loc;
-    nd_set_line(nd, loc->beg_pos.lineno);
-    return nd;
-}
-
-#ifndef RIPPER
 static enum node_type
 nodetype(NODE *node)			/* for debug */
 {
@@ -8376,23 +8673,26 @@ fixpos(NODE *node, NODE *orig)
 {
     if (!node) return;
     if (!orig) return;
+    if (orig == (NODE*)1) return;
     nd_set_line(node, nd_line(orig));
 }
 
 static void
-parser_warning(struct parser_params *p, NODE *node, const char *mesg)
+parser_warning(struct parser_params *parser, NODE *node, const char *mesg)
 {
-    rb_compile_warning(p->ruby_sourcefile, nd_line(node), "%s", mesg);
+    rb_compile_warning(ruby_sourcefile, nd_line(node), "%s", mesg);
 }
+#define parser_warning(node, mesg) parser_warning(parser, (node), (mesg))
 
 static void
-parser_warn(struct parser_params *p, NODE *node, const char *mesg)
+parser_warn(struct parser_params *parser, NODE *node, const char *mesg)
 {
-    rb_compile_warn(p->ruby_sourcefile, nd_line(node), "%s", mesg);
+    rb_compile_warn(ruby_sourcefile, nd_line(node), "%s", mesg);
 }
+#define parser_warn(node, mesg) parser_warn(parser, (node), (mesg))
 
 static NODE*
-block_append(struct parser_params *p, NODE *head, NODE *tail)
+block_append_gen(struct parser_params *parser, NODE *head, NODE *tail)
 {
     NODE *end, *h = head, *nd;
 
@@ -8406,11 +8706,12 @@ block_append(struct parser_params *p, NODE *head, NODE *tail)
       case NODE_TRUE:
       case NODE_FALSE:
       case NODE_NIL:
-	parser_warning(p, h, "unused literal ignored");
+	parser_warning(h, "unused literal ignored");
 	return tail;
       default:
-	h = end = NEW_BLOCK(head, &head->nd_loc);
+	h = end = NEW_BLOCK(head);
 	end->nd_end = end;
+	fixpos(end, head);
 	head = end;
 	break;
       case NODE_BLOCK:
@@ -8426,7 +8727,7 @@ block_append(struct parser_params *p, NODE *head, NODE *tail)
       case NODE_REDO:
       case NODE_RETRY:
 	if (RTEST(ruby_verbose)) {
-	    parser_warning(p, tail, "statement not reached");
+	    parser_warning(tail, "statement not reached");
 	}
 	break;
 
@@ -8435,22 +8736,21 @@ block_append(struct parser_params *p, NODE *head, NODE *tail)
     }
 
     if (nd_type(tail) != NODE_BLOCK) {
-	tail = NEW_BLOCK(tail, &tail->nd_loc);
+	tail = NEW_BLOCK(tail);
 	tail->nd_end = tail;
     }
     end->nd_next = tail;
     h->nd_end = tail->nd_end;
-    nd_set_last_loc(head, nd_last_loc(tail));
     return head;
 }
 
 /* append item to the list */
 static NODE*
-list_append(struct parser_params *p, NODE *list, NODE *item)
+list_append_gen(struct parser_params *parser, NODE *list, NODE *item)
 {
     NODE *last;
 
-    if (list == 0) return NEW_LIST(item, &item->nd_loc);
+    if (list == 0) return NEW_LIST(item);
     if (list->nd_next) {
 	last = list->nd_next->nd_end;
     }
@@ -8459,11 +8759,8 @@ list_append(struct parser_params *p, NODE *list, NODE *item)
     }
 
     list->nd_alen += 1;
-    last->nd_next = NEW_LIST(item, &item->nd_loc);
+    last->nd_next = NEW_LIST(item);
     list->nd_next->nd_end = last->nd_next;
-
-    nd_set_last_loc(list, nd_last_loc(item));
-
     return list;
 }
 
@@ -8489,17 +8786,15 @@ list_concat(NODE *head, NODE *tail)
 	head->nd_next->nd_end = tail;
     }
 
-    nd_set_last_loc(head, nd_last_loc(tail));
-
     return head;
 }
 
 static int
-literal_concat0(struct parser_params *p, VALUE head, VALUE tail)
+literal_concat0(struct parser_params *parser, VALUE head, VALUE tail)
 {
     if (NIL_P(tail)) return 1;
     if (!rb_enc_compatible(head, tail)) {
-	compile_error(p, "string literal encodings differ (%s / %s)",
+	compile_error(PARSER_ARG "string literal encodings differ (%s / %s)",
 		      rb_enc_name(rb_enc_get(head)),
 		      rb_enc_name(rb_enc_get(tail)));
 	rb_str_resize(head, 0);
@@ -8512,7 +8807,7 @@ literal_concat0(struct parser_params *p, VALUE head, VALUE tail)
 
 /* concat two string literals */
 static NODE *
-literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *loc)
+literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail)
 {
     enum node_type htype;
     NODE *headlast;
@@ -8523,16 +8818,16 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
 
     htype = nd_type(head);
     if (htype == NODE_EVSTR) {
-	NODE *node = NEW_DSTR(add_mark_object(p, STR_NEW0()), loc);
-	head = list_append(p, node, head);
+	NODE *node = NEW_DSTR(STR_NEW0());
+	head = list_append(node, head);
 	htype = NODE_DSTR;
     }
-    if (p->heredoc_indent > 0) {
+    if (heredoc_indent > 0) {
 	switch (htype) {
 	  case NODE_STR:
 	    nd_set_type(head, NODE_DSTR);
 	  case NODE_DSTR:
-	    return list_append(p, head, tail);
+	    return list_append(head, tail);
 	  default:
 	    break;
 	}
@@ -8548,25 +8843,25 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
 	    lit = head->nd_lit;
 	}
 	if (htype == NODE_STR) {
-	    if (!literal_concat0(p, lit, tail->nd_lit)) {
+	    if (!literal_concat0(parser, lit, tail->nd_lit)) {
 	      error:
-		rb_discard_node(p, head);
-		rb_discard_node(p, tail);
+		rb_gc_force_recycle((VALUE)head);
+		rb_gc_force_recycle((VALUE)tail);
 		return 0;
 	    }
-	    rb_discard_node(p, tail);
+	    rb_gc_force_recycle((VALUE)tail);
 	}
 	else {
-	    list_append(p, head, tail);
+	    list_append(head, tail);
 	}
 	break;
 
       case NODE_DSTR:
 	if (htype == NODE_STR) {
-	    if (!literal_concat0(p, head->nd_lit, tail->nd_lit))
+	    if (!literal_concat0(parser, head->nd_lit, tail->nd_lit))
 		goto error;
 	    tail->nd_lit = head->nd_lit;
-	    rb_discard_node(p, head);
+	    rb_gc_force_recycle((VALUE)head);
 	    head = tail;
 	}
 	else if (NIL_P(tail->nd_lit)) {
@@ -8574,19 +8869,19 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
 	    head->nd_alen += tail->nd_alen - 1;
 	    head->nd_next->nd_end->nd_next = tail->nd_next;
 	    head->nd_next->nd_end = tail->nd_next->nd_end;
-	    rb_discard_node(p, tail);
+	    rb_gc_force_recycle((VALUE)tail);
 	}
 	else if (htype == NODE_DSTR && (headlast = head->nd_next->nd_end->nd_head) &&
 		 nd_type(headlast) == NODE_STR) {
 	    lit = headlast->nd_lit;
-	    if (!literal_concat0(p, lit, tail->nd_lit))
+	    if (!literal_concat0(parser, lit, tail->nd_lit))
 		goto error;
 	    tail->nd_lit = Qnil;
 	    goto append;
 	}
 	else {
 	    nd_set_type(tail, NODE_ARRAY);
-	    tail->nd_head = NEW_STR(tail->nd_lit, loc);
+	    tail->nd_head = NEW_STR(tail->nd_lit);
 	    list_concat(head, tail);
 	}
 	break;
@@ -8596,23 +8891,23 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
 	    nd_set_type(head, NODE_DSTR);
 	    head->nd_alen = 1;
 	}
-	list_append(p, head, tail);
+	list_append(head, tail);
 	break;
     }
     return head;
 }
 
 static NODE *
-evstr2dstr(struct parser_params *p, NODE *node)
+evstr2dstr_gen(struct parser_params *parser, NODE *node)
 {
     if (nd_type(node) == NODE_EVSTR) {
-	node = list_append(p, NEW_DSTR(add_mark_object(p, STR_NEW0()), &node->nd_loc), node);
+	node = list_append(NEW_DSTR(STR_NEW0()), node);
     }
     return node;
 }
 
 static NODE *
-new_evstr(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+new_evstr_gen(struct parser_params *parser, NODE *node)
 {
     NODE *head = node;
 
@@ -8622,102 +8917,63 @@ new_evstr(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 	    return node;
 	}
     }
-    return NEW_EVSTR(head, loc);
+    return NEW_EVSTR(head);
 }
 
 static NODE *
-call_bin_op(struct parser_params *p, NODE *recv, ID id, NODE *arg1,
-		const YYLTYPE *op_loc, const YYLTYPE *loc)
+call_bin_op_gen(struct parser_params *parser, NODE *recv, ID id, NODE *arg1)
 {
-    NODE *expr;
     value_expr(recv);
     value_expr(arg1);
-    expr = NEW_OPCALL(recv, id, NEW_LIST(arg1, &arg1->nd_loc), loc);
-    nd_set_line(expr, op_loc->beg_pos.lineno);
-    return expr;
+    return NEW_CALL(recv, id, NEW_LIST(arg1));
 }
 
 static NODE *
-call_uni_op(struct parser_params *p, NODE *recv, ID id, const YYLTYPE *op_loc, const YYLTYPE *loc)
+call_uni_op_gen(struct parser_params *parser, NODE *recv, ID id)
 {
-    NODE *opcall;
     value_expr(recv);
-    opcall = NEW_OPCALL(recv, id, 0, loc);
-    nd_set_line(opcall, op_loc->beg_pos.lineno);
-    return opcall;
-}
-
-static NODE *
-new_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, const YYLTYPE *op_loc, const YYLTYPE *loc)
-{
-    NODE *qcall = NEW_QCALL(atype, recv, mid, args, loc);
-    nd_set_line(qcall, op_loc->beg_pos.lineno);
-    return qcall;
+    return NEW_CALL(recv, id, 0);
 }
 
 static NODE*
-new_command_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, NODE *block, const YYLTYPE *op_loc, const YYLTYPE *loc)
+match_op_gen(struct parser_params *parser, NODE *node1, NODE *node2)
 {
-    NODE *ret;
-    if (block) block_dup_check(p, args, block);
-    ret = new_qcall(p, atype, recv, mid, args, op_loc, loc);
-    if (block) ret = method_add_block(p, ret, block, loc);
-    fixpos(ret, recv);
-    return ret;
-}
-
-#define nd_once_body(node) (nd_type(node) == NODE_ONCE ? (node)->nd_body : node)
-static NODE*
-match_op(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *op_loc, const YYLTYPE *loc)
-{
-    NODE *n;
-    int line = op_loc->beg_pos.lineno;
-
     value_expr(node1);
     value_expr(node2);
-    if (node1 && (n = nd_once_body(node1)) != 0) {
-	switch (nd_type(n)) {
+    if (node1) {
+	switch (nd_type(node1)) {
 	  case NODE_DREGX:
-	    {
-		NODE *match = NEW_MATCH2(node1, node2, loc);
-		nd_set_line(match, line);
-		return match;
-	    }
+	  case NODE_DREGX_ONCE:
+	    return NEW_MATCH2(node1, node2);
 
 	  case NODE_LIT:
-	    if (RB_TYPE_P(n->nd_lit, T_REGEXP)) {
-		const VALUE lit = n->nd_lit;
-		NODE *match = NEW_MATCH2(node1, node2, loc);
-		match->nd_args = reg_named_capture_assign(p, lit, loc);
-		nd_set_line(match, line);
-		return match;
+	    if (RB_TYPE_P(node1->nd_lit, T_REGEXP)) {
+		return NEW_MATCH2(node1, node2);
 	    }
 	}
     }
 
-    if (node2 && (n = nd_once_body(node2)) != 0) {
-        NODE *match3;
+    if (node2) {
+	switch (nd_type(node2)) {
+	  case NODE_DREGX:
+	  case NODE_DREGX_ONCE:
+	    return NEW_MATCH3(node2, node1);
 
-	switch (nd_type(n)) {
 	  case NODE_LIT:
-	    if (!RB_TYPE_P(n->nd_lit, T_REGEXP)) break;
-	    /* fallthru */
-	  case NODE_DREGX:
-	    match3 = NEW_MATCH3(node2, node1, loc);
-	    return match3;
+	    if (RB_TYPE_P(node2->nd_lit, T_REGEXP)) {
+		return NEW_MATCH3(node2, node1);
+	    }
 	}
     }
 
-    n = NEW_CALL(node1, tMATCH, NEW_LIST(node2, &node2->nd_loc), loc);
-    nd_set_line(n, line);
-    return n;
+    return NEW_CALL(node1, tMATCH, NEW_LIST(node2));
 }
 
 # if WARN_PAST_SCOPE
 static int
-past_dvar_p(struct parser_params *p, ID id)
+past_dvar_p(struct parser_params *parser, ID id)
 {
-    struct vtable *past = p->lvtbl->past;
+    struct vtable *past = lvtbl->past;
     while (past) {
 	if (vtable_included(past, id)) return 1;
 	past = past->prev;
@@ -8726,106 +8982,66 @@ past_dvar_p(struct parser_params *p, ID id)
 }
 # endif
 
-#define WARN_LOCATION(type) do { \
-    if (p->warn_location) { \
-	rb_warning0(type" in eval may not return location in binding;" \
-		    " use Binding#source_location instead"); \
-    } \
-} while (0)
-
 static NODE*
-gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
+gettable_gen(struct parser_params *parser, ID id)
 {
-    ID *vidp = NULL;
-    NODE *node;
     switch (id) {
       case keyword_self:
-	return NEW_SELF(loc);
+	return NEW_SELF();
       case keyword_nil:
-	return NEW_NIL(loc);
+	return NEW_NIL();
       case keyword_true:
-	return NEW_TRUE(loc);
+	return NEW_TRUE();
       case keyword_false:
-	return NEW_FALSE(loc);
+	return NEW_FALSE();
       case keyword__FILE__:
-	WARN_LOCATION("__FILE__");
-	{
-	    VALUE file = p->ruby_sourcefile_string;
-	    if (NIL_P(file))
-		file = rb_str_new(0, 0);
-	    else
-		file = rb_str_dup(file);
-	    node = NEW_STR(add_mark_object(p, file), loc);
-	}
-	return node;
+	return NEW_STR(rb_str_dup(ruby_sourcefile_string));
       case keyword__LINE__:
-	WARN_LOCATION("__LINE__");
-	return NEW_LIT(INT2FIX(p->tokline), loc);
+	return NEW_LIT(INT2FIX(tokline));
       case keyword__ENCODING__:
-	return NEW_LIT(add_mark_object(p, rb_enc_from_encoding(p->enc)), loc);
+	return NEW_LIT(rb_enc_from_encoding(current_enc));
     }
     switch (id_type(id)) {
       case ID_LOCAL:
-	if (dyna_in_block(p) && dvar_defined_ref(p, id, &vidp)) {
-	    if (id == p->cur_arg) {
+	if (dyna_in_block() && dvar_defined(id)) {
+	    if (id == current_arg) {
 		rb_warn1("circular argument reference - %"PRIsWARN, rb_id2str(id));
 	    }
-	    if (vidp) *vidp |= LVAR_USED;
-	    node = NEW_DVAR(id, loc);
-	    return node;
+	    return NEW_DVAR(id);
 	}
-	if (local_id_ref(p, id, &vidp)) {
-	    if (id == p->cur_arg) {
+	if (local_id(id)) {
+	    if (id == current_arg) {
 		rb_warn1("circular argument reference - %"PRIsWARN, rb_id2str(id));
 	    }
-	    if (vidp) *vidp |= LVAR_USED;
-	    node = NEW_LVAR(id, loc);
-	    return node;
+	    return NEW_LVAR(id);
 	}
 # if WARN_PAST_SCOPE
-	if (!p->in_defined && RTEST(ruby_verbose) && past_dvar_p(p, id)) {
+	if (!in_defined && RTEST(ruby_verbose) && past_dvar_p(parser, id)) {
 	    rb_warning1("possible reference to past scope - %"PRIsWARN, rb_id2str(id));
 	}
 # endif
 	/* method call without arguments */
-	return NEW_VCALL(id, loc);
+	return NEW_VCALL(id);
       case ID_GLOBAL:
-	return NEW_GVAR(id, loc);
+	return NEW_GVAR(id);
       case ID_INSTANCE:
-	return NEW_IVAR(id, loc);
+	return NEW_IVAR(id);
       case ID_CONST:
-	return NEW_CONST(id, loc);
+	return NEW_CONST(id);
       case ID_CLASS:
-	return NEW_CVAR(id, loc);
+	return NEW_CVAR(id);
     }
-    compile_error(p, "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id));
+    compile_error(PARSER_ARG "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id));
     return 0;
 }
 
 static NODE *
-opt_arg_append(NODE *opt_list, NODE *opt)
-{
-    NODE *opts = opt_list;
-    opts->nd_loc.end_pos = opt->nd_loc.end_pos;
-
-    while (opts->nd_next) {
-	opts = opts->nd_next;
-	opts->nd_loc.end_pos = opt->nd_loc.end_pos;
-    }
-    opts->nd_next = opt;
-
-    return opt_list;
-}
-
-static NODE *
 kwd_append(NODE *kwlist, NODE *kw)
 {
     if (kwlist) {
 	NODE *kws = kwlist;
-	kws->nd_loc.end_pos = kw->nd_loc.end_pos;
 	while (kws->nd_next) {
 	    kws = kws->nd_next;
-	    kws->nd_loc.end_pos = kw->nd_loc.end_pos;
 	}
 	kws->nd_next = kw;
     }
@@ -8833,62 +9049,45 @@ kwd_append(NODE *kwlist, NODE *kw)
 }
 
 static NODE *
-new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc)
-{
-    return NEW_DEFINED(remove_begin_all(expr), loc);
-}
-
-static NODE*
-symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol)
-{
-    if (nd_type(symbol) == NODE_DSTR) {
-	nd_set_type(symbol, NODE_DSYM);
-    }
-    else {
-	nd_set_type(symbol, NODE_LIT);
-	symbol->nd_lit = add_mark_object(p, rb_str_intern(symbol->nd_lit));
-    }
-    return list_append(p, symbols, symbol);
-}
-
-static NODE *
-new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
+new_regexp_gen(struct parser_params *parser, NODE *node, int options)
 {
     NODE *list, *prev;
-    VALUE lit;
 
     if (!node) {
-	return NEW_LIT(add_mark_object(p, reg_compile(p, STR_NEW0(), options)), loc);
+	return NEW_LIT(reg_compile(STR_NEW0(), options));
     }
     switch (nd_type(node)) {
       case NODE_STR:
 	{
 	    VALUE src = node->nd_lit;
 	    nd_set_type(node, NODE_LIT);
-	    nd_set_loc(node, loc);
-	    add_mark_object(p, node->nd_lit = reg_compile(p, src, options));
+	    node->nd_lit = reg_compile(src, options);
 	}
 	break;
       default:
-	add_mark_object(p, lit = STR_NEW0());
-	node = NEW_NODE(NODE_DSTR, lit, 1, NEW_LIST(node, loc), loc);
+	node = NEW_NODE(NODE_DSTR, STR_NEW0(), 1, NEW_LIST(node));
       case NODE_DSTR:
-	nd_set_type(node, NODE_DREGX);
-	nd_set_loc(node, loc);
+	if (options & RE_OPTION_ONCE) {
+	    nd_set_type(node, NODE_DREGX_ONCE);
+	}
+	else {
+	    nd_set_type(node, NODE_DREGX);
+	}
 	node->nd_cflag = options & RE_OPTION_MASK;
-	if (!NIL_P(node->nd_lit)) reg_fragment_check(p, node->nd_lit, options);
+	if (!NIL_P(node->nd_lit)) reg_fragment_check(node->nd_lit, options);
 	for (list = (prev = node)->nd_next; list; list = list->nd_next) {
 	    if (nd_type(list->nd_head) == NODE_STR) {
 		VALUE tail = list->nd_head->nd_lit;
-		if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) {
+		if (reg_fragment_check(tail, options) && prev && !NIL_P(prev->nd_lit)) {
 		    VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit;
-		    if (!literal_concat0(p, lit, tail)) {
-			return NEW_NIL(loc); /* dummy node on error */
+		    if (!literal_concat0(parser, lit, tail)) {
+			node = 0;
+			break;
 		    }
 		    rb_str_resize(tail, 0);
 		    prev->nd_next = list->nd_next;
-		    rb_discard_node(p, list->nd_head);
-		    rb_discard_node(p, list);
+		    rb_gc_force_recycle((VALUE)list->nd_head);
+		    rb_gc_force_recycle((VALUE)list);
 		    list = prev;
 		}
 		else {
@@ -8902,10 +9101,7 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
 	if (!node->nd_next) {
 	    VALUE src = node->nd_lit;
 	    nd_set_type(node, NODE_LIT);
-	    add_mark_object(p, node->nd_lit = reg_compile(p, src, options));
-	}
-	if (options & RE_OPTION_ONCE) {
-	    node = NEW_NODE(NODE_ONCE, 0, node, 0, loc);
+	    node->nd_lit = reg_compile(src, options);
 	}
 	break;
     }
@@ -8913,58 +9109,45 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
 }
 
 static NODE *
-new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc)
-{
-    if (!k) return 0;
-    return NEW_KW_ARG(0, (k), loc);
-}
-
-static NODE *
-new_xstring(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+new_xstring_gen(struct parser_params *parser, NODE *node)
 {
     if (!node) {
-	VALUE lit = STR_NEW0();
-	NODE *xstr = NEW_XSTR(lit, loc);
-	add_mark_object(p, lit);
-	return xstr;
+	return NEW_XSTR(STR_NEW0());
     }
     switch (nd_type(node)) {
       case NODE_STR:
 	nd_set_type(node, NODE_XSTR);
-	nd_set_loc(node, loc);
 	break;
       case NODE_DSTR:
 	nd_set_type(node, NODE_DXSTR);
-	nd_set_loc(node, loc);
 	break;
       default:
-	node = NEW_NODE(NODE_DXSTR, Qnil, 1, NEW_LIST(node, loc), loc);
+	node = NEW_NODE(NODE_DXSTR, Qnil, 1, NEW_LIST(node));
 	break;
     }
     return node;
 }
-
 #else  /* !RIPPER */
 static int
-id_is_var(struct parser_params *p, ID id)
+id_is_var_gen(struct parser_params *parser, ID id)
 {
     if (is_notop_id(id)) {
 	switch (id & ID_SCOPE_MASK) {
 	  case ID_GLOBAL: case ID_INSTANCE: case ID_CONST: case ID_CLASS:
 	    return 1;
 	  case ID_LOCAL:
-	    if (dyna_in_block(p) && dvar_defined(p, id)) return 1;
-	    if (local_id(p, id)) return 1;
+	    if (dyna_in_block() && dvar_defined(id)) return 1;
+	    if (local_id(id)) return 1;
 	    /* method call without arguments */
 	    return 0;
 	}
     }
-    compile_error(p, "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id));
+    compile_error(PARSER_ARG "identifier %s is not valid to get", rb_id2str(id));
     return 0;
 }
 
 static VALUE
-new_regexp(struct parser_params *p, VALUE re, VALUE opt, const YYLTYPE *loc)
+new_regexp_gen(struct parser_params *parser, VALUE re, VALUE opt)
 {
     VALUE src = 0, err;
     int options = 0;
@@ -8976,15 +9159,20 @@ new_regexp(struct parser_params *p, VALUE re, VALUE opt, const YYLTYPE *loc)
 	options = (int)RNODE(opt)->nd_tag;
 	opt = RNODE(opt)->nd_rval;
     }
-    if (src && NIL_P(parser_reg_compile(p, src, options, &err))) {
-	compile_error(p, "%"PRIsVALUE, err);
+    if (src && NIL_P(parser_reg_compile(parser, src, options, &err))) {
+	compile_error(PARSER_ARG "%"PRIsVALUE, err);
     }
     return dispatch2(regexp_literal, re, opt);
 }
+
+static VALUE
+new_xstring_gen(struct parser_params *parser, VALUE str)
+{
+    return dispatch1(xstring_literal, str);
+}
 #endif /* !RIPPER */
 
-#ifndef RIPPER
-static const char rb_parser_lex_state_names[][13] = {
+static const char lex_state_names[][13] = {
     "EXPR_BEG",    "EXPR_END",    "EXPR_ENDARG", "EXPR_ENDFN",  "EXPR_ARG",
     "EXPR_CMDARG", "EXPR_MID",    "EXPR_FNAME",  "EXPR_DOT",    "EXPR_CLASS",
     "EXPR_LABEL",  "EXPR_LABELED","EXPR_FITEM",
@@ -9003,7 +9191,7 @@ append_lex_state_name(enum lex_state_e state, VALUE buf)
 		rb_str_cat(buf, "|", 1);
 	    }
 	    sep = 1;
-	    rb_str_cat_cstr(buf, rb_parser_lex_state_names[i]);
+	    rb_str_cat_cstr(buf, lex_state_names[i]);
 	}
     }
     if (!sep) {
@@ -9012,23 +9200,8 @@ append_lex_state_name(enum lex_state_e state, VALUE buf)
     return buf;
 }
 
-static void
-flush_debug_buffer(struct parser_params *p, VALUE out, VALUE str)
-{
-    VALUE mesg = p->debug_buffer;
-
-    if (!NIL_P(mesg) && RSTRING_LEN(mesg)) {
-	p->debug_buffer = Qnil;
-	rb_io_puts(1, &mesg, out);
-    }
-    if (!NIL_P(str) && RSTRING_LEN(str)) {
-	rb_io_write(p->debug_output, str);
-    }
-}
-
-enum lex_state_e
-rb_parser_trace_lex_state(struct parser_params *p, enum lex_state_e from,
-			  enum lex_state_e to, int line)
+static enum lex_state_e
+trace_lex_state(enum lex_state_e from, enum lex_state_e to, int line)
 {
     VALUE mesg;
     mesg = rb_str_new_cstr("lex_state: ");
@@ -9036,19 +9209,14 @@ rb_parser_trace_lex_state(struct parser_params *p, enum lex_state_e from,
     rb_str_cat_cstr(mesg, " -> ");
     append_lex_state_name(to, mesg);
     rb_str_catf(mesg, " at line %d\n", line);
-    flush_debug_buffer(p, p->debug_output, mesg);
+    rb_io_write(rb_stdout, mesg);
     return to;
 }
 
-VALUE
-rb_parser_lex_state_name(enum lex_state_e state)
-{
-    return rb_fstring(append_lex_state_name(state, rb_str_new(0, 0)));
-}
-
 static void
-append_bitstack_value(stack_type stack, VALUE mesg)
+show_bitstack(stack_type stack, const char *name, int line)
 {
+    VALUE mesg = rb_sprintf("%s: ", name);
     if (stack == 0) {
 	rb_str_cat_cstr(mesg, "0");
     }
@@ -9057,200 +9225,92 @@ append_bitstack_value(stack_type stack, VALUE mesg)
 	for (; mask && !(stack & mask); mask >>= 1) continue;
 	for (; mask; mask >>= 1) rb_str_cat(mesg, stack & mask ? "1" : "0", 1);
     }
-}
-
-void
-rb_parser_show_bitstack(struct parser_params *p, stack_type stack,
-			const char *name, int line)
-{
-    VALUE mesg = rb_sprintf("%s: ", name);
-    append_bitstack_value(stack, mesg);
     rb_str_catf(mesg, " at line %d\n", line);
-    flush_debug_buffer(p, p->debug_output, mesg);
-}
-
-void
-rb_parser_fatal(struct parser_params *p, const char *fmt, ...)
-{
-    va_list ap;
-    VALUE mesg = rb_str_new_cstr("internal p error: ");
-
-    va_start(ap, fmt);
-    rb_str_vcatf(mesg, fmt, ap);
-    va_end(ap);
-    parser_yyerror(p, NULL, RSTRING_PTR(mesg));
-    RB_GC_GUARD(mesg);
-
-    mesg = rb_str_new(0, 0);
-    append_lex_state_name(p->lex.state, mesg);
-    compile_error(p, "p->lex.state: %"PRIsVALUE, mesg);
-    rb_str_resize(mesg, 0);
-    append_bitstack_value(p->cond_stack, mesg);
-    compile_error(p, "p->cond_stack: %"PRIsVALUE, mesg);
-    rb_str_resize(mesg, 0);
-    append_bitstack_value(p->cmdarg_stack, mesg);
-    compile_error(p, "p->cmdarg_stack: %"PRIsVALUE, mesg);
-    if (p->debug_output == rb_stdout)
-	p->debug_output = rb_stderr;
-    p->debug = TRUE;
-}
-
-void
-rb_parser_set_location_from_strterm_heredoc(struct parser_params *p, rb_strterm_heredoc_t *here, YYLTYPE *yylloc)
-{
-    const char *eos = RSTRING_PTR(here->term);
-    long term_len = RSTRING_LEN(here->term) - 2 + (unsigned char)eos[0];
-
-    yylloc->beg_pos.lineno = (int)here->sourceline;
-    yylloc->beg_pos.column = (int)(here->u3.lastidx - term_len);
-    yylloc->end_pos.lineno = (int)here->sourceline;
-    yylloc->end_pos.column = (int)(here->u3.lastidx);
-}
-
-void
-rb_parser_set_location_of_none(struct parser_params *p, YYLTYPE *yylloc)
-{
-    yylloc->beg_pos.lineno = p->ruby_sourceline;
-    yylloc->beg_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
-    yylloc->end_pos.lineno = p->ruby_sourceline;
-    yylloc->end_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
-}
-
-void
-rb_parser_set_location(struct parser_params *p, YYLTYPE *yylloc)
-{
-    yylloc->beg_pos.lineno = p->ruby_sourceline;
-    yylloc->beg_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
-    yylloc->end_pos.lineno = p->ruby_sourceline;
-    yylloc->end_pos.column = (int)(p->lex.pcur - p->lex.pbeg);
+    rb_io_write(rb_stdout, mesg);
 }
-#endif /* !RIPPER */
 
-static void
-parser_token_value_print(struct parser_params *p, enum yytokentype type, const YYSTYPE *valp)
-{
-    VALUE v;
-
-    switch (type) {
-      case tIDENTIFIER: case tFID: case tGVAR: case tIVAR:
-      case tCONSTANT: case tCVAR: case tLABEL: case tOP_ASGN:
-#ifndef RIPPER
-	v = rb_id2str(valp->id);
-#else
-	v = valp->val;
-#endif
-	rb_parser_printf(p, "%"PRIsVALUE, v);
-	break;
-      case tINTEGER: case tFLOAT: case tRATIONAL: case tIMAGINARY:
-      case tSTRING_CONTENT: case tCHAR:
-#ifndef RIPPER
-	v = valp->node->nd_lit;
-#else
-	v = valp->val;
-#endif
-	rb_parser_printf(p, "%+"PRIsVALUE, v);
-	break;
-      case tNTH_REF:
-#ifndef RIPPER
-	rb_parser_printf(p, "$%ld", valp->node->nd_nth);
+#ifdef RIPPER
+static VALUE
+assignable_gen(struct parser_params *parser, VALUE lhs)
 #else
-	rb_parser_printf(p, "%"PRIsVALUE, valp->val);
+static NODE*
+assignable_gen(struct parser_params *parser, ID id, NODE *val)
 #endif
-	break;
-      case tBACK_REF:
-#ifndef RIPPER
-	rb_parser_printf(p, "$%c", (int)valp->node->nd_nth);
+{
+#ifdef RIPPER
+    ID id = get_id(lhs);
+# define assignable_result(x) get_value(lhs)
+# define parser_yyerror(parser, x) assign_error_gen(parser, lhs)
 #else
-	rb_parser_printf(p, "%"PRIsVALUE, valp->val);
+# define assignable_result(x) (x)
 #endif
-	break;
-      default:
-	break;
-    }
-}
-
-static int
-assignable0(struct parser_params *p, ID id, const char **err)
-{
-    if (!id) return -1;
+    if (!id) return assignable_result(0);
     switch (id) {
       case keyword_self:
-	*err = "Can't change the value of self";
-	return -1;
+	yyerror("Can't change the value of self");
+	goto error;
       case keyword_nil:
-	*err = "Can't assign to nil";
-	return -1;
+	yyerror("Can't assign to nil");
+	goto error;
       case keyword_true:
-	*err = "Can't assign to true";
-	return -1;
+	yyerror("Can't assign to true");
+	goto error;
       case keyword_false:
-	*err = "Can't assign to false";
-	return -1;
+	yyerror("Can't assign to false");
+	goto error;
       case keyword__FILE__:
-	*err = "Can't assign to __FILE__";
-	return -1;
+	yyerror("Can't assign to __FILE__");
+	goto error;
       case keyword__LINE__:
-	*err = "Can't assign to __LINE__";
-	return -1;
+	yyerror("Can't assign to __LINE__");
+	goto error;
       case keyword__ENCODING__:
-	*err = "Can't assign to __ENCODING__";
-	return -1;
+	yyerror("Can't assign to __ENCODING__");
+	goto error;
     }
     switch (id_type(id)) {
       case ID_LOCAL:
-	if (dyna_in_block(p)) {
-	    if (dvar_curr(p, id)) return NODE_DASGN_CURR;
-	    if (dvar_defined(p, id)) return NODE_DASGN;
-	    if (local_id(p, id)) return NODE_LASGN;
-	    dyna_var(p, id);
-	    return NODE_DASGN_CURR;
+	if (dyna_in_block()) {
+	    if (dvar_curr(id)) {
+		return assignable_result(NEW_DASGN_CURR(id, val));
+	    }
+	    else if (dvar_defined(id)) {
+		return assignable_result(NEW_DASGN(id, val));
+	    }
+	    else if (local_id(id)) {
+		return assignable_result(NEW_LASGN(id, val));
+	    }
+	    else {
+		dyna_var(id);
+		return assignable_result(NEW_DASGN_CURR(id, val));
+	    }
 	}
 	else {
-	    if (!local_id(p, id)) local_var(p, id);
-	    return NODE_LASGN;
+	    if (!local_id(id)) {
+		local_var(id);
+	    }
+	    return assignable_result(NEW_LASGN(id, val));
 	}
 	break;
-      case ID_GLOBAL: return NODE_GASGN;
-      case ID_INSTANCE: return NODE_IASGN;
+      case ID_GLOBAL:
+	return assignable_result(NEW_GASGN(id, val));
+      case ID_INSTANCE:
+	return assignable_result(NEW_IASGN(id, val));
       case ID_CONST:
-	if (!p->in_def) return NODE_CDECL;
-	*err = "dynamic constant assignment";
-	return -1;
-      case ID_CLASS: return NODE_CVASGN;
+	if (!in_def && !in_single)
+	    return assignable_result(NEW_CDECL(id, val, 0));
+	yyerror("dynamic constant assignment");
+	break;
+      case ID_CLASS:
+	return assignable_result(NEW_CVASGN(id, val));
       default:
-	compile_error(p, "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id));
+	compile_error(PARSER_ARG "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id));
     }
-    return -1;
-}
-
-#ifndef RIPPER
-static NODE*
-assignable(struct parser_params *p, ID id, NODE *val, const YYLTYPE *loc)
-{
-    const char *err = 0;
-    int node_type = assignable0(p, id, &err);
-    switch (node_type) {
-      case NODE_DASGN_CURR: return NEW_DASGN_CURR(id, val, loc);
-      case NODE_DASGN: return NEW_DASGN(id, val, loc);
-      case NODE_LASGN: return NEW_LASGN(id, val, loc);
-      case NODE_GASGN: return NEW_GASGN(id, val, loc);
-      case NODE_IASGN: return NEW_IASGN(id, val, loc);
-      case NODE_CDECL: return NEW_CDECL(id, val, 0, loc);
-      case NODE_CVASGN: return NEW_CVASGN(id, val, loc);
-    }
-    if (err) yyerror1(loc, err);
-    return NEW_BEGIN(0, loc);
-}
-#else
-static VALUE
-assignable(struct parser_params *p, VALUE lhs)
-{
-    const char *err = 0;
-    assignable0(p, get_id(lhs), &err);
-    if (err) lhs = assign_error(p, lhs);
-    return lhs;
+  error:
+    return assignable_result(0);
+#undef assignable_result
+#undef parser_yyerror
 }
-#endif
 
 static int
 is_private_local_id(ID name)
@@ -9263,124 +9323,102 @@ is_private_local_id(ID name)
     return RSTRING_PTR(s)[0] == '_';
 }
 
+#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
+
 static int
-shadowing_lvar_0(struct parser_params *p, ID name)
+shadowing_lvar_0(struct parser_params *parser, ID name)
 {
     if (is_private_local_id(name)) return 1;
-    if (dyna_in_block(p)) {
-	if (dvar_curr(p, name)) {
-	    yyerror0("duplicated argument name");
-	}
-	else if (dvar_defined(p, name) || local_id(p, name)) {
-	    vtable_add(p->lvtbl->vars, name);
-	    if (p->lvtbl->used) {
-		vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline | LVAR_USED);
+    if (dyna_in_block()) {
+	if (dvar_curr(name)) {
+	    yyerror("duplicated argument name");
+	}
+	else if (dvar_defined_get(name) || local_id(name)) {
+	    rb_warning1("shadowing outer local variable - %"PRIsWARN, rb_id2str(name));
+	    vtable_add(lvtbl->vars, name);
+	    if (lvtbl->used) {
+		vtable_add(lvtbl->used, (ID)ruby_sourceline | LVAR_USED);
 	    }
 	    return 0;
 	}
     }
     else {
-	if (local_id(p, name)) {
-	    yyerror0("duplicated argument name");
+	if (local_id(name)) {
+	    yyerror("duplicated argument name");
 	}
     }
     return 1;
 }
 
 static ID
-shadowing_lvar(struct parser_params *p, ID name)
+shadowing_lvar_gen(struct parser_params *parser, ID name)
 {
-    shadowing_lvar_0(p, name);
+    shadowing_lvar_0(parser, name);
     return name;
 }
 
 static void
-new_bv(struct parser_params *p, ID name)
+new_bv_gen(struct parser_params *parser, ID name)
 {
     if (!name) return;
     if (!is_local_id(name)) {
-	compile_error(p, "invalid local variable - %"PRIsVALUE,
+	compile_error(PARSER_ARG "invalid local variable - %"PRIsVALUE,
 		      rb_id2str(name));
 	return;
     }
-    if (!shadowing_lvar_0(p, name)) return;
-    dyna_var(p, name);
+    if (!shadowing_lvar_0(parser, name)) return;
+    dyna_var(name);
 }
 
 #ifndef RIPPER
 static NODE *
-aryset(struct parser_params *p, NODE *recv, NODE *idx, const YYLTYPE *loc)
+aryset_gen(struct parser_params *parser, NODE *recv, NODE *idx)
 {
-    return NEW_ATTRASGN(recv, tASET, idx, loc);
+    return NEW_ATTRASGN(recv, tASET, idx);
 }
 
 static void
-block_dup_check(struct parser_params *p, NODE *node1, NODE *node2)
+block_dup_check_gen(struct parser_params *parser, NODE *node1, NODE *node2)
 {
     if (node2 && node1 && nd_type(node1) == NODE_BLOCK_PASS) {
-	compile_error(p, "both block arg and actual block given");
+	compile_error(PARSER_ARG "both block arg and actual block given");
     }
 }
 
 static NODE *
-attrset(struct parser_params *p, NODE *recv, ID atype, ID id, const YYLTYPE *loc)
+attrset_gen(struct parser_params *parser, NODE *recv, ID atype, ID id)
 {
     if (!CALL_Q_P(atype)) id = rb_id_attrset(id);
-    return NEW_ATTRASGN(recv, id, 0, loc);
+    return NEW_ATTRASGN(recv, id, 0);
 }
 
 static void
-rb_backref_error(struct parser_params *p, NODE *node)
+rb_backref_error_gen(struct parser_params *parser, NODE *node)
 {
     switch (nd_type(node)) {
       case NODE_NTH_REF:
-	compile_error(p, "Can't set variable $%ld", node->nd_nth);
+	compile_error(PARSER_ARG "Can't set variable $%ld", node->nd_nth);
 	break;
       case NODE_BACK_REF:
-	compile_error(p, "Can't set variable $%c", (int)node->nd_nth);
+	compile_error(PARSER_ARG "Can't set variable $%c", (int)node->nd_nth);
 	break;
     }
 }
 
 static NODE *
-arg_append(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc)
-{
-    if (!node1) return NEW_LIST(node2, &node2->nd_loc);
-    switch (nd_type(node1))  {
-      case NODE_ARRAY:
-	return list_append(p, node1, node2);
-      case NODE_BLOCK_PASS:
-	node1->nd_head = arg_append(p, node1->nd_head, node2, loc);
-	node1->nd_loc.end_pos = node1->nd_head->nd_loc.end_pos;
-	return node1;
-      case NODE_ARGSPUSH:
-	node1->nd_body = list_append(p, NEW_LIST(node1->nd_body, &node1->nd_body->nd_loc), node2);
-	node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos;
-	nd_set_type(node1, NODE_ARGSCAT);
-	return node1;
-      case NODE_ARGSCAT:
-        if (nd_type(node1->nd_body) != NODE_ARRAY) break;
-        node1->nd_body = list_append(p, node1->nd_body, node2);
-        node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos;
-        return node1;
-    }
-    return NEW_ARGSPUSH(node1, node2, loc);
-}
-
-static NODE *
-arg_concat(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc)
+arg_concat_gen(struct parser_params *parser, NODE *node1, NODE *node2)
 {
     if (!node2) return node1;
     switch (nd_type(node1)) {
       case NODE_BLOCK_PASS:
 	if (node1->nd_head)
-	    node1->nd_head = arg_concat(p, node1->nd_head, node2, loc);
+	    node1->nd_head = arg_concat(node1->nd_head, node2);
 	else
-	    node1->nd_head = NEW_LIST(node2, loc);
+	    node1->nd_head = NEW_LIST(node2);
 	return node1;
       case NODE_ARGSPUSH:
 	if (nd_type(node2) != NODE_ARRAY) break;
-	node1->nd_body = list_concat(NEW_LIST(node1->nd_body, loc), node2);
+	node1->nd_body = list_concat(NEW_LIST(node1->nd_body), node2);
 	nd_set_type(node1, NODE_ARGSCAT);
 	return node1;
       case NODE_ARGSCAT:
@@ -9389,27 +9427,25 @@ arg_concat(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc
 	node1->nd_body = list_concat(node1->nd_body, node2);
 	return node1;
     }
-    return NEW_ARGSCAT(node1, node2, loc);
+    return NEW_ARGSCAT(node1, node2);
 }
 
 static NODE *
-last_arg_append(struct parser_params *p, NODE *args, NODE *last_arg, const YYLTYPE *loc)
+arg_append_gen(struct parser_params *parser, NODE *node1, NODE *node2)
 {
-    NODE *n1;
-    if ((n1 = splat_array(args)) != 0) {
-	return list_append(p, n1, last_arg);
-    }
-    return arg_append(p, args, last_arg, loc);
-}
-
-static NODE *
-rest_arg_append(struct parser_params *p, NODE *args, NODE *rest_arg, const YYLTYPE *loc)
-{
-    NODE *n1;
-    if ((nd_type(rest_arg) == NODE_ARRAY) && (n1 = splat_array(args)) != 0) {
-	return list_concat(n1, rest_arg);
+    if (!node1) return NEW_LIST(node2);
+    switch (nd_type(node1))  {
+      case NODE_ARRAY:
+	return list_append(node1, node2);
+      case NODE_BLOCK_PASS:
+	node1->nd_head = arg_append(node1->nd_head, node2);
+	return node1;
+      case NODE_ARGSPUSH:
+	node1->nd_body = list_append(NEW_LIST(node1->nd_body), node2);
+	nd_set_type(node1, NODE_ARGSCAT);
+	return node1;
     }
-    return arg_concat(p, args, rest_arg, loc);
+    return NEW_ARGSPUSH(node1, node2);
 }
 
 static NODE *
@@ -9420,41 +9456,15 @@ splat_array(NODE* node)
     return 0;
 }
 
-static void
-mark_lvar_used(struct parser_params *p, NODE *rhs)
-{
-    ID *vidp = NULL;
-    if (!rhs) return;
-    switch (nd_type(rhs)) {
-      case NODE_LASGN:
-	if (local_id_ref(p, rhs->nd_vid, &vidp)) {
-	    if (vidp) *vidp |= LVAR_USED;
-	}
-	break;
-      case NODE_DASGN:
-      case NODE_DASGN_CURR:
-	if (dvar_defined_ref(p, rhs->nd_vid, &vidp)) {
-	    if (vidp) *vidp |= LVAR_USED;
-	}
-	break;
-#if 0
-      case NODE_MASGN:
-	for (rhs = rhs->nd_head; rhs; rhs = rhs->nd_next) {
-	    mark_lvar_used(p, rhs->nd_head);
-	}
-	break;
-#endif
-    }
-}
-
 static NODE *
-node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, const YYLTYPE *loc)
+node_assign_gen(struct parser_params *parser, NODE *lhs, NODE *rhs)
 {
     if (!lhs) return 0;
 
     switch (nd_type(lhs)) {
       case NODE_GASGN:
       case NODE_IASGN:
+      case NODE_IASGN2:
       case NODE_LASGN:
       case NODE_DASGN:
       case NODE_DASGN_CURR:
@@ -9462,12 +9472,11 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, const YYLTYPE *loc)
       case NODE_CDECL:
       case NODE_CVASGN:
 	lhs->nd_value = rhs;
-	nd_set_loc(lhs, loc);
 	break;
 
       case NODE_ATTRASGN:
-	lhs->nd_args = arg_append(p, lhs->nd_args, rhs, loc);
-	nd_set_loc(lhs, loc);
+      case NODE_CALL:
+	lhs->nd_args = arg_append(lhs->nd_args, rhs);
 	break;
 
       default:
@@ -9479,7 +9488,7 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, const YYLTYPE *loc)
 }
 
 static int
-value_expr_gen(struct parser_params *p, NODE *node)
+value_expr_gen(struct parser_params *parser, NODE *node)
 {
     int cond = 0;
 
@@ -9493,7 +9502,7 @@ value_expr_gen(struct parser_params *p, NODE *node)
 	  case NODE_NEXT:
 	  case NODE_REDO:
 	  case NODE_RETRY:
-	    if (!cond) yyerror1(&node->nd_loc, "void value expression");
+	    if (!cond) yyerror("void value expression");
 	    /* or "control never reach"? */
 	    return FALSE;
 
@@ -9509,7 +9518,6 @@ value_expr_gen(struct parser_params *p, NODE *node)
 	    break;
 
 	  case NODE_IF:
-	  case NODE_UNLESS:
 	    if (!node->nd_body) {
 		node = node->nd_else;
 		break;
@@ -9528,13 +9536,6 @@ value_expr_gen(struct parser_params *p, NODE *node)
 	    node = node->nd_2nd;
 	    break;
 
-	  case NODE_LASGN:
-	  case NODE_DASGN:
-	  case NODE_DASGN_CURR:
-	  case NODE_MASGN:
-	    mark_lvar_used(p, node);
-	    return TRUE;
-
 	  default:
 	    return TRUE;
 	}
@@ -9544,15 +9545,15 @@ value_expr_gen(struct parser_params *p, NODE *node)
 }
 
 static void
-void_expr(struct parser_params *p, NODE *node)
+void_expr_gen(struct parser_params *parser, NODE *node)
 {
     const char *useless = 0;
 
     if (!RTEST(ruby_verbose)) return;
 
-    if (!node || !(node = nd_once_body(node))) return;
+    if (!node) return;
     switch (nd_type(node)) {
-      case NODE_OPCALL:
+      case NODE_CALL:
 	switch (node->nd_mid) {
 	  case '+':
 	  case '-':
@@ -9593,6 +9594,7 @@ void_expr(struct parser_params *p, NODE *node)
       case NODE_STR:
       case NODE_DSTR:
       case NODE_DREGX:
+      case NODE_DREGX_ONCE:
 	useless = "a literal";
 	break;
       case NODE_COLON2:
@@ -9627,19 +9629,18 @@ void_expr(struct parser_params *p, NODE *node)
     }
 }
 
-static NODE *
-void_stmts(struct parser_params *p, NODE *node)
+static void
+void_stmts_gen(struct parser_params *parser, NODE *node)
 {
-    NODE *const n = node;
-    if (!RTEST(ruby_verbose)) return n;
-    if (!node) return n;
-    if (nd_type(node) != NODE_BLOCK) return n;
+    if (!RTEST(ruby_verbose)) return;
+    if (!node) return;
+    if (nd_type(node) != NODE_BLOCK) return;
 
-    while (node->nd_next) {
-	void_expr(p, node->nd_head);
+    for (;;) {
+	if (!node->nd_next) return;
+	void_expr0(node->nd_head);
 	node = node->nd_next;
     }
-    return n;
 }
 
 static NODE *
@@ -9663,18 +9664,18 @@ remove_begin_all(NODE *node)
 }
 
 static void
-reduce_nodes(struct parser_params *p, NODE **body)
+reduce_nodes_gen(struct parser_params *parser, NODE **body)
 {
     NODE *node = *body;
 
     if (!node) {
-	*body = NEW_NIL(&NULL_LOC);
+	*body = NEW_NIL();
 	return;
     }
 #define subnodes(n1, n2) \
     ((!node->n1) ? (node->n2 ? (body = &node->n2, 1) : 0) : \
      (!node->n2) ? (body = &node->n1, 1) : \
-     (reduce_nodes(p, &node->n1), body = &node->n2, 1))
+     (reduce_nodes(&node->n1), body = &node->n2, 1))
 
     while (node) {
 	int newline = (int)(node->flags & NODE_FL_NEWLINE);
@@ -9695,7 +9696,6 @@ reduce_nodes(struct parser_params *p, NODE **body)
 	    body = &node->nd_end->nd_head;
 	    break;
 	  case NODE_IF:
-	  case NODE_UNLESS:
 	    if (subnodes(nd_body, nd_else)) break;
 	    return;
 	  case NODE_CASE:
@@ -9749,7 +9749,7 @@ is_static_content(NODE *node)
 }
 
 static int
-assign_in_cond(struct parser_params *p, NODE *node)
+assign_in_cond(struct parser_params *parser, NODE *node)
 {
     switch (nd_type(node)) {
       case NODE_MASGN:
@@ -9767,27 +9767,56 @@ assign_in_cond(struct parser_params *p, NODE *node)
     if (!node->nd_value) return 1;
     if (is_static_content(node->nd_value)) {
 	/* reports always */
-	parser_warn(p, node->nd_value, "found `= literal' in conditional, should be ==");
+	parser_warn(node->nd_value, "found = in conditional, should be ==");
     }
     return 1;
 }
 
 static void
-warn_unless_e_option(struct parser_params *p, NODE *node, const char *str)
+warn_unless_e_option(struct parser_params *parser, NODE *node, const char *str)
 {
-    if (!e_option_supplied(p)) parser_warn(p, node, str);
+    if (!e_option_supplied(parser)) parser_warn(node, str);
 }
 
 static void
-warning_unless_e_option(struct parser_params *p, NODE *node, const char *str)
+warning_unless_e_option(struct parser_params *parser, NODE *node, const char *str)
 {
-    if (!e_option_supplied(p)) parser_warning(p, node, str);
+    if (!e_option_supplied(parser)) parser_warning(node, str);
+}
+
+static void
+fixup_nodes(NODE **rootnode)
+{
+    NODE *node, *next, *head;
+
+    for (node = *rootnode; node; node = next) {
+	enum node_type type;
+	VALUE val;
+
+	next = node->nd_next;
+	head = node->nd_head;
+	rb_gc_force_recycle((VALUE)node);
+	*rootnode = next;
+	switch (type = nd_type(head)) {
+	  case NODE_DOT2:
+	  case NODE_DOT3:
+	    val = rb_range_new(head->nd_beg->nd_lit, head->nd_end->nd_lit,
+			       type == NODE_DOT3);
+	    rb_gc_force_recycle((VALUE)head->nd_beg);
+	    rb_gc_force_recycle((VALUE)head->nd_end);
+	    nd_set_type(head, NODE_LIT);
+	    head->nd_lit = val;
+	    break;
+	  default:
+	    break;
+	}
+    }
 }
 
-static NODE *cond0(struct parser_params*,NODE*,int,const YYLTYPE*);
+static NODE *cond0(struct parser_params*,NODE*);
 
 static NODE*
-range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+range_op(struct parser_params *parser, NODE *node)
 {
     enum node_type type;
 
@@ -9796,23 +9825,23 @@ range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
     type = nd_type(node);
     value_expr(node);
     if (type == NODE_LIT && FIXNUM_P(node->nd_lit)) {
-	warn_unless_e_option(p, node, "integer literal in conditional range");
-	return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(rb_intern("$."), loc), loc), loc);
+	warn_unless_e_option(parser, node, "integer literal in conditional range");
+	return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(rb_intern("$."))));
     }
-    return cond0(p, node, FALSE, loc);
+    return cond0(parser, node);
 }
 
 static int
 literal_node(NODE *node)
 {
     if (!node) return 1;	/* same as NODE_NIL */
-    if (!(node = nd_once_body(node))) return 1;
     switch (nd_type(node)) {
       case NODE_LIT:
       case NODE_STR:
       case NODE_DSTR:
       case NODE_EVSTR:
       case NODE_DREGX:
+      case NODE_DREGX_ONCE:
       case NODE_DSYM:
 	return 2;
       case NODE_TRUE:
@@ -9824,65 +9853,55 @@ literal_node(NODE *node)
 }
 
 static NODE*
-cond0(struct parser_params *p, NODE *node, int method_op, const YYLTYPE *loc)
+cond0(struct parser_params *parser, NODE *node)
 {
     if (node == 0) return 0;
-    if (!(node = nd_once_body(node))) return 0;
-    assign_in_cond(p, node);
+    assign_in_cond(parser, node);
 
     switch (nd_type(node)) {
       case NODE_DSTR:
       case NODE_EVSTR:
       case NODE_STR:
-	if (!method_op) rb_warn0("string literal in condition");
+	rb_warn0("string literal in condition");
 	break;
 
       case NODE_DREGX:
-	{
-	    if (!method_op)
-		warning_unless_e_option(p, node, "regex literal in condition");
-
-	    return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc);
-	}
+      case NODE_DREGX_ONCE:
+	warning_unless_e_option(parser, node, "regex literal in condition");
+	return NEW_MATCH2(node, NEW_GVAR(idLASTLINE));
 
       case NODE_AND:
       case NODE_OR:
-	node->nd_1st = cond0(p, node->nd_1st, FALSE, loc);
-	node->nd_2nd = cond0(p, node->nd_2nd, FALSE, loc);
+	node->nd_1st = cond0(parser, node->nd_1st);
+	node->nd_2nd = cond0(parser, node->nd_2nd);
 	break;
 
       case NODE_DOT2:
       case NODE_DOT3:
-	node->nd_beg = range_op(p, node->nd_beg, loc);
-	node->nd_end = range_op(p, node->nd_end, loc);
+	node->nd_beg = range_op(parser, node->nd_beg);
+	node->nd_end = range_op(parser, node->nd_end);
 	if (nd_type(node) == NODE_DOT2) nd_set_type(node,NODE_FLIP2);
 	else if (nd_type(node) == NODE_DOT3) nd_set_type(node, NODE_FLIP3);
-	if (!method_op && !e_option_supplied(p)) {
+	if (!e_option_supplied(parser)) {
 	    int b = literal_node(node->nd_beg);
 	    int e = literal_node(node->nd_end);
 	    if ((b == 1 && e == 1) || (b + e >= 2 && RTEST(ruby_verbose))) {
-		parser_warn(p, node, "range literal in condition");
+		parser_warn(node, "range literal in condition");
 	    }
 	}
 	break;
 
       case NODE_DSYM:
-	if (!method_op) parser_warning(p, node, "literal in condition");
+	parser_warning(node, "literal in condition");
 	break;
 
       case NODE_LIT:
 	if (RB_TYPE_P(node->nd_lit, T_REGEXP)) {
-	    if (!method_op)
-		warn_unless_e_option(p, node, "regex literal in condition");
+	    warn_unless_e_option(parser, node, "regex literal in condition");
 	    nd_set_type(node, NODE_MATCH);
 	}
-	else if (node->nd_lit == Qtrue ||
-		 node->nd_lit == Qfalse) {
-	    /* booleans are OK, e.g., while true */
-	}
 	else {
-	    if (!method_op)
-		parser_warning(p, node, "literal in condition");
+	    parser_warning(node, "literal in condition");
 	}
       default:
 	break;
@@ -9891,70 +9910,48 @@ cond0(struct parser_params *p, NODE *node, int method_op, const YYLTYPE *loc)
 }
 
 static NODE*
-cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+cond_gen(struct parser_params *parser, NODE *node)
 {
     if (node == 0) return 0;
-    return cond0(p, node, FALSE, loc);
+    return cond0(parser, node);
 }
 
 static NODE*
-method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
-{
-    if (node == 0) return 0;
-    return cond0(p, node, TRUE, loc);
-}
-
-static NODE*
-new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
+new_if_gen(struct parser_params *parser, NODE *cc, NODE *left, NODE *right)
 {
     if (!cc) return right;
-    cc = cond0(p, cc, FALSE, loc);
-    return newline_node(NEW_IF(cc, left, right, loc));
+    cc = cond0(parser, cc);
+    return newline_node(NEW_IF(cc, left, right));
 }
 
 static NODE*
-new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
+logop_gen(struct parser_params *parser, enum node_type type, NODE *left, NODE *right)
 {
-    if (!cc) return right;
-    cc = cond0(p, cc, FALSE, loc);
-    return newline_node(NEW_UNLESS(cc, left, right, loc));
-}
-
-static NODE*
-logop(struct parser_params *p, ID id, NODE *left, NODE *right,
-	  const YYLTYPE *op_loc, const YYLTYPE *loc)
-{
-    enum node_type type = id == idAND || id == idANDOP ? NODE_AND : NODE_OR;
-    NODE *op;
     value_expr(left);
     if (left && (enum node_type)nd_type(left) == type) {
 	NODE *node = left, *second;
 	while ((second = node->nd_2nd) != 0 && (enum node_type)nd_type(second) == type) {
 	    node = second;
 	}
-	node->nd_2nd = NEW_NODE(type, second, right, 0, loc);
-	nd_set_line(node->nd_2nd, op_loc->beg_pos.lineno);
-	left->nd_loc.end_pos = loc->end_pos;
+	node->nd_2nd = NEW_NODE(type, second, right, 0);
 	return left;
     }
-    op = NEW_NODE(type, left, right, 0, loc);
-    nd_set_line(op, op_loc->beg_pos.lineno);
-    return op;
+    return NEW_NODE(type, left, right, 0);
 }
 
 static void
-no_blockarg(struct parser_params *p, NODE *node)
+no_blockarg(struct parser_params *parser, NODE *node)
 {
     if (node && nd_type(node) == NODE_BLOCK_PASS) {
-	compile_error(p, "block argument should not be given");
+	compile_error(PARSER_ARG "block argument should not be given");
     }
 }
 
 static NODE *
-ret_args(struct parser_params *p, NODE *node)
+ret_args_gen(struct parser_params *parser, NODE *node)
 {
     if (node) {
-	no_blockarg(p, node);
+	no_blockarg(parser, node);
 	if (nd_type(node) == NODE_ARRAY) {
 	    if (node->nd_next == 0) {
 		node = node->nd_head;
@@ -9968,46 +9965,43 @@ ret_args(struct parser_params *p, NODE *node)
 }
 
 static NODE *
-new_yield(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+new_yield_gen(struct parser_params *parser, NODE *node)
 {
-    if (node) no_blockarg(p, node);
+    if (node) no_blockarg(parser, node);
 
-    return NEW_YIELD(node, loc);
+    return NEW_YIELD(node);
 }
 
 static VALUE
-negate_lit(struct parser_params *p, VALUE lit)
+negate_lit(VALUE lit)
 {
-    if (FIXNUM_P(lit)) {
-	return LONG2FIX(-FIX2LONG(lit));
-    }
-    if (SPECIAL_CONST_P(lit)) {
-#if USE_FLONUM
-	if (FLONUM_P(lit)) {
-	    return DBL2NUM(-RFLOAT_VALUE(lit));
-	}
-#endif
-	goto unknown;
-    }
-    switch (BUILTIN_TYPE(lit)) {
+    int type = TYPE(lit);
+    switch (type) {
+      case T_FIXNUM:
+	lit = LONG2FIX(-FIX2LONG(lit));
+	break;
       case T_BIGNUM:
 	BIGNUM_NEGATE(lit);
 	lit = rb_big_norm(lit);
 	break;
       case T_RATIONAL:
-	RRATIONAL_SET_NUM(lit, negate_lit(p, RRATIONAL(lit)->num));
+	RRATIONAL_SET_NUM(lit, negate_lit(RRATIONAL(lit)->num));
 	break;
       case T_COMPLEX:
-	RCOMPLEX_SET_REAL(lit, negate_lit(p, RCOMPLEX(lit)->real));
-	RCOMPLEX_SET_IMAG(lit, negate_lit(p, RCOMPLEX(lit)->imag));
+	RCOMPLEX_SET_REAL(lit, negate_lit(RCOMPLEX(lit)->real));
+	RCOMPLEX_SET_IMAG(lit, negate_lit(RCOMPLEX(lit)->imag));
 	break;
       case T_FLOAT:
+#if USE_FLONUM
+	if (FLONUM_P(lit)) {
+	    lit = DBL2NUM(-RFLOAT_VALUE(lit));
+	    break;
+	}
+#endif
 	RFLOAT(lit)->float_value = -RFLOAT_VALUE(lit);
 	break;
-      unknown:
       default:
-	rb_parser_fatal(p, "unknown literal type (%s) passed to negate_lit",
-			rb_builtin_class_name(lit));
+	rb_bug("unknown literal type (%d) passed to negate_lit", type);
 	break;
     }
     return lit;
@@ -10017,10 +10011,7 @@ static NODE *
 arg_blk_pass(NODE *node1, NODE *node2)
 {
     if (node2) {
-        if (!node1) return node2;
 	node2->nd_head = node1;
-	nd_set_first_lineno(node2, nd_first_lineno(node1));
-	nd_set_first_column(node2, nd_first_column(node1));
 	return node2;
     }
     return node1;
@@ -10028,111 +10019,114 @@ arg_blk_pass(NODE *node1, NODE *node2)
 
 
 static NODE*
-new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, NODE *post_args, NODE *tail, const YYLTYPE *loc)
+new_args_gen(struct parser_params *parser, NODE *m, NODE *o, ID r, NODE *p, NODE *tail)
 {
-    int saved_line = p->ruby_sourceline;
+    int saved_line = ruby_sourceline;
     struct rb_args_info *args = tail->nd_ainfo;
 
-    args->pre_args_num   = pre_args ? rb_long2int(pre_args->nd_plen) : 0;
-    args->pre_init       = pre_args ? pre_args->nd_next : 0;
+    args->pre_args_num   = m ? rb_long2int(m->nd_plen) : 0;
+    args->pre_init       = m ? m->nd_next : 0;
 
-    args->post_args_num  = post_args ? rb_long2int(post_args->nd_plen) : 0;
-    args->post_init      = post_args ? post_args->nd_next : 0;
-    args->first_post_arg = post_args ? post_args->nd_pid : 0;
+    args->post_args_num  = p ? rb_long2int(p->nd_plen) : 0;
+    args->post_init      = p ? p->nd_next : 0;
+    args->first_post_arg = p ? p->nd_pid : 0;
 
-    args->rest_arg       = rest_arg;
+    args->rest_arg       = r;
 
-    args->opt_args       = opt_args;
+    args->opt_args       = o;
 
-    p->ruby_sourceline = saved_line;
-    nd_set_loc(tail, loc);
+    ruby_sourceline = saved_line;
 
     return tail;
 }
 
 static NODE*
-new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block, const YYLTYPE *loc)
+new_args_tail_gen(struct parser_params *parser, NODE *k, ID kr, ID b)
 {
-    int saved_line = p->ruby_sourceline;
+    int saved_line = ruby_sourceline;
     struct rb_args_info *args;
     NODE *node;
-    rb_imemo_tmpbuf_t *tmpbuf = new_tmpbuf();
 
     args = ZALLOC(struct rb_args_info);
-    tmpbuf->ptr = (VALUE *)args;
-    node = NEW_NODE(NODE_ARGS, 0, 0, args, &NULL_LOC);
-    if (p->error_p) return node;
+    node = NEW_NODE(NODE_ARGS, 0, 0, args);
 
-    args->block_arg      = block;
-    args->kw_args        = kw_args;
+    args->block_arg      = b;
+    args->kw_args        = k;
 
-    if (kw_args) {
+    if (k) {
 	/*
 	 * def foo(k1: 1, kr1:, k2: 2, **krest, &b)
 	 * variable order: k1, kr1, k2, &b, internal_id, krest
 	 * #=> <reorder>
 	 * variable order: kr1, k1, k2, internal_id, krest, &b
 	 */
-	ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars;
-	struct vtable *vtargs = p->lvtbl->args;
-	NODE *kwn = kw_args;
+	ID kw_bits;
+	NODE *kwn = k;
+	struct vtable *required_kw_vars = vtable_alloc(NULL);
+	struct vtable *kw_vars = vtable_alloc(NULL);
+	int i;
 
-	vtable_pop(vtargs, !!block + !!kw_rest_arg);
-	required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos];
 	while (kwn) {
-	    if (!NODE_REQUIRED_KEYWORD_P(kwn->nd_body))
-		--kw_vars;
-	    --required_kw_vars;
-	    kwn = kwn->nd_next;
-	}
-
-	for (kwn = kw_args; kwn; kwn = kwn->nd_next) {
+	    NODE *val_node = kwn->nd_body->nd_value;
 	    ID vid = kwn->nd_body->nd_vid;
-	    if (NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) {
-		*required_kw_vars++ = vid;
+
+	    if (val_node == (NODE *)-1) {
+		vtable_add(required_kw_vars, vid);
 	    }
 	    else {
-		*kw_vars++ = vid;
+		vtable_add(kw_vars, vid);
 	    }
+
+	    kwn = kwn->nd_next;
 	}
 
-	arg_var(p, kw_bits);
-	if (kw_rest_arg) arg_var(p, kw_rest_arg);
-	if (block) arg_var(p, block);
+	kw_bits = internal_id();
+	if (kr && is_junk_id(kr)) vtable_pop(lvtbl->args, 1);
+	vtable_pop(lvtbl->args, vtable_size(required_kw_vars) + vtable_size(kw_vars) + (b != 0));
+
+	for (i=0; i<vtable_size(required_kw_vars); i++) arg_var(required_kw_vars->tbl[i]);
+	for (i=0; i<vtable_size(kw_vars); i++) arg_var(kw_vars->tbl[i]);
+	vtable_free(required_kw_vars);
+	vtable_free(kw_vars);
 
-	args->kw_rest_arg = NEW_DVAR(kw_rest_arg, loc);
-	args->kw_rest_arg->nd_cflag = kw_bits;
+	arg_var(kw_bits);
+	if (kr) arg_var(kr);
+	if (b) arg_var(b);
+
+	args->kw_rest_arg = NEW_DVAR(kw_bits);
+	args->kw_rest_arg->nd_cflag = kr;
     }
-    else if (kw_rest_arg) {
-	args->kw_rest_arg = NEW_DVAR(kw_rest_arg, loc);
+    else if (kr) {
+	if (b) vtable_pop(lvtbl->args, 1); /* reorder */
+	arg_var(kr);
+	if (b) arg_var(b);
+	args->kw_rest_arg = NEW_DVAR(kr);
     }
 
-    p->ruby_sourceline = saved_line;
+    ruby_sourceline = saved_line;
     return node;
 }
 
 static NODE*
-dsym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+dsym_node_gen(struct parser_params *parser, NODE *node)
 {
     VALUE lit;
 
     if (!node) {
-	return NEW_LIT(ID2SYM(idNULL), loc);
+	return NEW_LIT(ID2SYM(idNULL));
     }
 
     switch (nd_type(node)) {
       case NODE_DSTR:
 	nd_set_type(node, NODE_DSYM);
-	nd_set_loc(node, loc);
 	break;
       case NODE_STR:
 	lit = node->nd_lit;
-	add_mark_object(p, node->nd_lit = ID2SYM(rb_intern_str(lit)));
+	node->nd_lit = ID2SYM(rb_intern_str(lit));
 	nd_set_type(node, NODE_LIT);
-	nd_set_loc(node, loc);
 	break;
       default:
-	node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node, loc), loc);
+	node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node));
 	break;
     }
     return node;
@@ -10154,7 +10148,7 @@ append_literal_keys(st_data_t k, st_data_t v, st_data_t h)
 }
 
 static NODE *
-remove_duplicate_keys(struct parser_params *p, NODE *hash)
+remove_duplicate_keys(struct parser_params *parser, NODE *hash)
 {
     st_table *literal_keys = st_init_numtable_with_size(hash->nd_alen / 2);
     NODE *result = 0;
@@ -10166,11 +10160,11 @@ remove_duplicate_keys(struct parser_params *p, NODE *hash)
 	st_data_t data;
 	if (nd_type(head) == NODE_LIT &&
 	    st_lookup(literal_keys, (key = head->nd_lit), &data)) {
-	    rb_compile_warn(p->ruby_sourcefile, nd_line((NODE *)data),
+	    rb_compile_warn(ruby_sourcefile, nd_line((NODE *)data),
 			    "key %+"PRIsVALUE" is duplicated and overwritten on line %d",
 			    head->nd_lit, nd_line(head));
 	    head = ((NODE *)data)->nd_next;
-	    head->nd_head = block_append(p, head->nd_head, value->nd_head);
+	    head->nd_head = block_append(head->nd_head, value->nd_head);
 	}
 	else {
 	    st_insert(literal_keys, (st_data_t)key, (st_data_t)hash);
@@ -10187,26 +10181,24 @@ remove_duplicate_keys(struct parser_params *p, NODE *hash)
 }
 
 static NODE *
-new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc)
+new_hash_gen(struct parser_params *parser, NODE *hash)
 {
-    if (hash) hash = remove_duplicate_keys(p, hash);
-    return NEW_HASH(hash, loc);
+    if (hash) hash = remove_duplicate_keys(parser, hash);
+    return NEW_HASH(hash);
 }
 #endif /* !RIPPER */
 
 #ifndef RIPPER
 static NODE *
-new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc)
+new_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs)
 {
     NODE *asgn;
 
     if (lhs) {
 	ID vid = lhs->nd_vid;
-	YYLTYPE lhs_loc = lhs->nd_loc;
 	if (op == tOROP) {
 	    lhs->nd_value = rhs;
-	    nd_set_loc(lhs, loc);
-	    asgn = NEW_OP_ASGN_OR(gettable(p, vid, &lhs_loc), lhs, loc);
+	    asgn = NEW_OP_ASGN_OR(gettable(vid), lhs);
 	    if (is_notop_id(vid)) {
 		switch (id_type(vid)) {
 		  case ID_GLOBAL:
@@ -10218,124 +10210,99 @@ new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYP
 	}
 	else if (op == tANDOP) {
 	    lhs->nd_value = rhs;
-	    nd_set_loc(lhs, loc);
-	    asgn = NEW_OP_ASGN_AND(gettable(p, vid, &lhs_loc), lhs, loc);
+	    asgn = NEW_OP_ASGN_AND(gettable(vid), lhs);
 	}
 	else {
 	    asgn = lhs;
-	    asgn->nd_value = NEW_CALL(gettable(p, vid, &lhs_loc), op, NEW_LIST(rhs, &rhs->nd_loc), loc);
-	    nd_set_loc(asgn, loc);
+	    asgn->nd_value = NEW_CALL(gettable(vid), op, NEW_LIST(rhs));
 	}
     }
     else {
-	asgn = NEW_BEGIN(0, loc);
+	asgn = NEW_BEGIN(0);
     }
     return asgn;
 }
 
 static NODE *
-new_ary_op_assign(struct parser_params *p, NODE *ary,
-		  NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc)
+new_attr_op_assign_gen(struct parser_params *parser, NODE *lhs,
+		       ID atype, ID attr, ID op, NODE *rhs)
 {
     NODE *asgn;
 
-    args = make_array(args, args_loc);
-    if (nd_type(args) == NODE_BLOCK_PASS) {
-	args = NEW_ARGSCAT(args, rhs, loc);
+    if (op == tOROP) {
+	op = 0;
     }
-    else {
-	args = arg_concat(p, args, rhs, loc);
+    else if (op == tANDOP) {
+	op = 1;
     }
-    asgn = NEW_OP_ASGN1(ary, op, args, loc);
-    fixpos(asgn, ary);
-    return asgn;
-}
-
-static NODE *
-new_attr_op_assign(struct parser_params *p, NODE *lhs,
-		   ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc)
-{
-    NODE *asgn;
-
-    asgn = NEW_OP_ASGN2(lhs, CALL_Q_P(atype), attr, op, rhs, loc);
+    asgn = NEW_OP_ASGN2(lhs, CALL_Q_P(atype), attr, op, rhs);
     fixpos(asgn, lhs);
     return asgn;
 }
 
 static NODE *
-new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc)
+new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs)
 {
     NODE *asgn;
 
+    if (op == tOROP) {
+	op = 0;
+    }
+    else if (op == tANDOP) {
+	op = 1;
+    }
     if (lhs) {
-	asgn = NEW_OP_CDECL(lhs, op, rhs, loc);
+	asgn = NEW_OP_CDECL(lhs, op, rhs);
     }
     else {
-	asgn = NEW_BEGIN(0, loc);
+	asgn = NEW_BEGIN(0);
     }
     fixpos(asgn, lhs);
     return asgn;
 }
 
 static NODE *
-const_decl(struct parser_params *p, NODE *path, const YYLTYPE *loc)
+const_decl_gen(struct parser_params *parser, NODE *path)
 {
-    if (p->in_def) {
-	yyerror1(loc, "dynamic constant assignment");
+    if (in_def || in_single) {
+	yyerror("dynamic constant assignment");
     }
-    return NEW_CDECL(0, 0, (path), loc);
+    return NEW_CDECL(0, 0, (path));
 }
 #else
 static VALUE
-const_decl(struct parser_params *p, VALUE path)
+new_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE op, VALUE rhs)
 {
-    if (p->in_def) {
-	path = dispatch1(assign_error, path);
-	ripper_error(p);
-    }
-    return path;
+    return dispatch3(opassign, lhs, op, rhs);
 }
 
 static VALUE
-assign_error(struct parser_params *p, VALUE a)
+new_attr_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs)
 {
-    a = dispatch1(assign_error, a);
-    ripper_error(p);
-    return a;
+    VALUE recv = dispatch3(field, lhs, type, attr);
+    return dispatch3(opassign, recv, op, rhs);
 }
 
 static VALUE
-var_field(struct parser_params *p, VALUE a)
+const_decl_gen(struct parser_params *parser, VALUE path)
 {
-    return ripper_new_yylval(p, get_id(a), dispatch1(var_field, a), 0);
+    if (in_def || in_single) {
+	assign_error(path);
+    }
+    return path;
 }
-#endif
 
-#ifndef RIPPER
-static NODE *
-new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc)
+static VALUE
+assign_error_gen(struct parser_params *parser, VALUE a)
 {
-    NODE *result = head;
-    if (rescue) {
-        NODE *tmp = rescue_else ? rescue_else : rescue;
-        YYLTYPE rescue_loc = code_loc_gen(&head->nd_loc, &tmp->nd_loc);
-
-        result = NEW_RESCUE(head, rescue, rescue_else, &rescue_loc);
-        nd_set_line(result, rescue->nd_loc.beg_pos.lineno);
-    }
-    else if (rescue_else) {
-        result = block_append(p, result, rescue_else);
-    }
-    if (ensure) {
-        result = NEW_ENSURE(result, ensure, loc);
-    }
-    fixpos(result, head);
-    return result;
+    a = dispatch1(assign_error, a);
+    ripper_error();
+    return a;
 }
 #endif
 
 static void
-warn_unused_var(struct parser_params *p, struct local_vars *local)
+warn_unused_var(struct parser_params *parser, struct local_vars *local)
 {
     int i, cnt;
     ID *v, *u;
@@ -10345,7 +10312,7 @@ warn_unused_var(struct parser_params *p, struct local_vars *local)
     u = local->used->tbl;
     cnt = local->used->pos;
     if (cnt != local->vars->pos) {
-	rb_parser_fatal(p, "local->used->pos != local->vars->pos");
+	rb_bug("local->used->pos != local->vars->pos");
     }
     for (i = 0; i < cnt; ++i) {
 	if (!v[i] || (u[i] & LVAR_USED)) continue;
@@ -10355,151 +10322,136 @@ warn_unused_var(struct parser_params *p, struct local_vars *local)
 }
 
 static void
-local_push(struct parser_params *p, int toplevel_scope)
+local_push_gen(struct parser_params *parser, int inherit_dvars)
 {
     struct local_vars *local;
-    int inherits_dvars = toplevel_scope && (compile_for_eval || p->in_main /* is p->in_main really needed? */);
-    int warn_unused_vars = RTEST(ruby_verbose);
 
     local = ALLOC(struct local_vars);
-    local->prev = p->lvtbl;
+    local->prev = lvtbl;
     local->args = vtable_alloc(0);
-    local->vars = vtable_alloc(inherits_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE);
-#ifndef RIPPER
-    if (toplevel_scope && compile_for_eval) warn_unused_vars = 0;
-    if (toplevel_scope && e_option_supplied(p)) warn_unused_vars = 0;
-#endif
-    local->used = warn_unused_vars ? vtable_alloc(0) : 0;
-
+    local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE);
+    local->used = !(inherit_dvars &&
+		    (ifndef_ripper(compile_for_eval || e_option_supplied(parser))+0)) &&
+	RTEST(ruby_verbose) ? vtable_alloc(0) : 0;
 # if WARN_PAST_SCOPE
     local->past = 0;
 # endif
-    CMDARG_PUSH(0);
-    COND_PUSH(0);
-    p->lvtbl = local;
+    local->cmdargs = cmdarg_stack;
+    CMDARG_SET(0);
+    lvtbl = local;
 }
 
 static void
-local_pop(struct parser_params *p)
+local_pop_gen(struct parser_params *parser)
 {
-    struct local_vars *local = p->lvtbl->prev;
-    if (p->lvtbl->used) {
-	warn_unused_var(p, p->lvtbl);
-	vtable_free(p->lvtbl->used);
+    struct local_vars *local = lvtbl->prev;
+    if (lvtbl->used) {
+	warn_unused_var(parser, lvtbl);
+	vtable_free(lvtbl->used);
     }
 # if WARN_PAST_SCOPE
-    while (p->lvtbl->past) {
-	struct vtable *past = p->lvtbl->past;
-	p->lvtbl->past = past->prev;
+    while (lvtbl->past) {
+	struct vtable *past = lvtbl->past;
+	lvtbl->past = past->prev;
 	vtable_free(past);
     }
 # endif
-    vtable_free(p->lvtbl->args);
-    vtable_free(p->lvtbl->vars);
-    CMDARG_POP();
-    COND_POP();
-    ruby_sized_xfree(p->lvtbl, sizeof(*p->lvtbl));
-    p->lvtbl = local;
+    vtable_free(lvtbl->args);
+    vtable_free(lvtbl->vars);
+    CMDARG_SET(lvtbl->cmdargs);
+    xfree(lvtbl);
+    lvtbl = local;
 }
 
 #ifndef RIPPER
 static ID*
-local_tbl(struct parser_params *p)
+local_tbl_gen(struct parser_params *parser)
 {
-    int cnt_args = vtable_size(p->lvtbl->args);
-    int cnt_vars = vtable_size(p->lvtbl->vars);
+    int cnt_args = vtable_size(lvtbl->args);
+    int cnt_vars = vtable_size(lvtbl->vars);
     int cnt = cnt_args + cnt_vars;
     int i, j;
     ID *buf;
-    rb_imemo_tmpbuf_t *tmpbuf = new_tmpbuf();
 
     if (cnt <= 0) return 0;
     buf = ALLOC_N(ID, cnt + 1);
-    tmpbuf->ptr = (void *)buf;
-    MEMCPY(buf+1, p->lvtbl->args->tbl, ID, cnt_args);
+    MEMCPY(buf+1, lvtbl->args->tbl, ID, cnt_args);
     /* remove IDs duplicated to warn shadowing */
     for (i = 0, j = cnt_args+1; i < cnt_vars; ++i) {
-	ID id = p->lvtbl->vars->tbl[i];
-	if (!vtable_included(p->lvtbl->args, id)) {
+	ID id = lvtbl->vars->tbl[i];
+	if (!vtable_included(lvtbl->args, id)) {
 	    buf[j++] = id;
 	}
     }
-    if (--j < cnt) tmpbuf->ptr = (void *)REALLOC_N(buf, ID, (cnt = j) + 1);
+    if (--j < cnt) REALLOC_N(buf, ID, (cnt = j) + 1);
     buf[0] = cnt;
-
     return buf;
 }
 #endif
 
 static void
-arg_var(struct parser_params *p, ID id)
+arg_var_gen(struct parser_params *parser, ID id)
 {
-    vtable_add(p->lvtbl->args, id);
+    vtable_add(lvtbl->args, id);
 }
 
 static void
-local_var(struct parser_params *p, ID id)
+local_var_gen(struct parser_params *parser, ID id)
 {
-    vtable_add(p->lvtbl->vars, id);
-    if (p->lvtbl->used) {
-	vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline);
+    vtable_add(lvtbl->vars, id);
+    if (lvtbl->used) {
+	vtable_add(lvtbl->used, (ID)ruby_sourceline);
     }
 }
 
 static int
-local_id_ref(struct parser_params *p, ID id, ID **vidrefp)
+local_id_gen(struct parser_params *parser, ID id)
 {
     struct vtable *vars, *args, *used;
 
-    vars = p->lvtbl->vars;
-    args = p->lvtbl->args;
-    used = p->lvtbl->used;
+    vars = lvtbl->vars;
+    args = lvtbl->args;
+    used = lvtbl->used;
 
-    while (vars && !DVARS_TERMINAL_P(vars->prev)) {
+    while (vars && POINTER_P(vars->prev)) {
 	vars = vars->prev;
 	args = args->prev;
 	if (used) used = used->prev;
     }
 
     if (vars && vars->prev == DVARS_INHERIT) {
-	return rb_local_defined(id, p->base_block);
+	return rb_local_defined(id, parser->base_block);
     }
     else if (vtable_included(args, id)) {
 	return 1;
     }
     else {
 	int i = vtable_included(vars, id);
-	if (i && used && vidrefp) *vidrefp = &used->tbl[i-1];
+	if (i && used) used->tbl[i-1] |= LVAR_USED;
 	return i != 0;
     }
 }
 
-static int
-local_id(struct parser_params *p, ID id)
-{
-    return local_id_ref(p, id, NULL);
-}
-
 static const struct vtable *
-dyna_push(struct parser_params *p)
+dyna_push_gen(struct parser_params *parser)
 {
-    p->lvtbl->args = vtable_alloc(p->lvtbl->args);
-    p->lvtbl->vars = vtable_alloc(p->lvtbl->vars);
-    if (p->lvtbl->used) {
-	p->lvtbl->used = vtable_alloc(p->lvtbl->used);
+    lvtbl->args = vtable_alloc(lvtbl->args);
+    lvtbl->vars = vtable_alloc(lvtbl->vars);
+    if (lvtbl->used) {
+	lvtbl->used = vtable_alloc(lvtbl->used);
     }
-    return p->lvtbl->args;
+    return lvtbl->args;
 }
 
 static void
-dyna_pop_vtable(struct parser_params *p, struct vtable **vtblp)
+dyna_pop_vtable(struct parser_params *parser, struct vtable **vtblp)
 {
     struct vtable *tmp = *vtblp;
     *vtblp = tmp->prev;
 # if WARN_PAST_SCOPE
-    if (p->past_scope_enabled) {
-	tmp->prev = p->lvtbl->past;
-	p->lvtbl->past = tmp;
+    if (parser->past_scope_enabled) {
+	tmp->prev = lvtbl->past;
+	lvtbl->past = tmp;
 	return;
     }
 # endif
@@ -10507,94 +10459,88 @@ dyna_pop_vtable(struct parser_params *p, struct vtable **vtblp)
 }
 
 static void
-dyna_pop_1(struct parser_params *p)
+dyna_pop_1(struct parser_params *parser)
 {
     struct vtable *tmp;
 
-    if ((tmp = p->lvtbl->used) != 0) {
-	warn_unused_var(p, p->lvtbl);
-	p->lvtbl->used = p->lvtbl->used->prev;
+    if ((tmp = lvtbl->used) != 0) {
+	warn_unused_var(parser, lvtbl);
+	lvtbl->used = lvtbl->used->prev;
 	vtable_free(tmp);
     }
-    dyna_pop_vtable(p, &p->lvtbl->args);
-    dyna_pop_vtable(p, &p->lvtbl->vars);
+    dyna_pop_vtable(parser, &lvtbl->args);
+    dyna_pop_vtable(parser, &lvtbl->vars);
 }
 
 static void
-dyna_pop(struct parser_params *p, const struct vtable *lvargs)
+dyna_pop_gen(struct parser_params *parser, const struct vtable *lvargs)
 {
-    while (p->lvtbl->args != lvargs) {
-	dyna_pop_1(p);
-	if (!p->lvtbl->args) {
-	    struct local_vars *local = p->lvtbl->prev;
-	    ruby_sized_xfree(p->lvtbl, sizeof(*p->lvtbl));
-	    p->lvtbl = local;
+    while (lvtbl->args != lvargs) {
+	dyna_pop_1(parser);
+	if (!lvtbl->args) {
+	    struct local_vars *local = lvtbl->prev;
+	    xfree(lvtbl);
+	    lvtbl = local;
 	}
     }
-    dyna_pop_1(p);
+    dyna_pop_1(parser);
 }
 
 static int
-dyna_in_block(struct parser_params *p)
+dyna_in_block_gen(struct parser_params *parser)
 {
-    return !DVARS_TERMINAL_P(p->lvtbl->vars) && p->lvtbl->vars->prev != DVARS_TOPSCOPE;
+    return POINTER_P(lvtbl->vars) && lvtbl->vars->prev != DVARS_TOPSCOPE;
 }
 
 static int
-dvar_defined_ref(struct parser_params *p, ID id, ID **vidrefp)
+dvar_defined_gen(struct parser_params *parser, ID id, int get)
 {
     struct vtable *vars, *args, *used;
     int i;
 
-    args = p->lvtbl->args;
-    vars = p->lvtbl->vars;
-    used = p->lvtbl->used;
+    args = lvtbl->args;
+    vars = lvtbl->vars;
+    used = lvtbl->used;
 
-    while (!DVARS_TERMINAL_P(vars)) {
+    while (POINTER_P(vars)) {
 	if (vtable_included(args, id)) {
 	    return 1;
 	}
 	if ((i = vtable_included(vars, id)) != 0) {
-	    if (used && vidrefp) *vidrefp = &used->tbl[i-1];
+	    if (used) used->tbl[i-1] |= LVAR_USED;
 	    return 1;
 	}
 	args = args->prev;
 	vars = vars->prev;
-	if (!vidrefp) used = 0;
+	if (get) used = 0;
 	if (used) used = used->prev;
     }
 
     if (vars == DVARS_INHERIT) {
-        return rb_dvar_defined(id, p->base_block);
+        return rb_dvar_defined(id, parser->base_block);
     }
 
     return 0;
 }
 
 static int
-dvar_defined(struct parser_params *p, ID id)
-{
-    return dvar_defined_ref(p, id, NULL);
-}
-
-static int
-dvar_curr(struct parser_params *p, ID id)
+dvar_curr_gen(struct parser_params *parser, ID id)
 {
-    return (vtable_included(p->lvtbl->args, id) ||
-	    vtable_included(p->lvtbl->vars, id));
+    return (vtable_included(lvtbl->args, id) ||
+	    vtable_included(lvtbl->vars, id));
 }
 
 static void
-reg_fragment_enc_error(struct parser_params* p, VALUE str, int c)
+reg_fragment_enc_error(struct parser_params* parser, VALUE str, int c)
 {
-    compile_error(p,
+    compile_error(PARSER_ARG
         "regexp encoding option '%c' differs from source encoding '%s'",
         c, rb_enc_name(rb_enc_get(str)));
 }
 
 #ifndef RIPPER
 int
-rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
+rb_reg_fragment_setenc(struct parser_params* parser, VALUE str, int options)
 {
     int c = RE_OPTION_ENCODING_IDX(options);
 
@@ -10615,7 +10561,7 @@ rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
         }
 	rb_enc_associate(str, rb_ascii8bit_encoding());
     }
-    else if (p->enc == rb_usascii_encoding()) {
+    else if (current_enc == rb_usascii_encoding()) {
 	if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
 	    /* raise in re.c */
 	    rb_enc_associate(str, rb_usascii_encoding());
@@ -10631,21 +10577,21 @@ rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
 }
 
 static void
-reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
+reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options)
 {
-    int c = rb_reg_fragment_setenc(p, str, options);
-    if (c) reg_fragment_enc_error(p, str, c);
+    int c = rb_reg_fragment_setenc(parser, str, options);
+    if (c) reg_fragment_enc_error(parser, str, c);
 }
 
 static int
-reg_fragment_check(struct parser_params* p, VALUE str, int options)
+reg_fragment_check_gen(struct parser_params* parser, VALUE str, int options)
 {
     VALUE err;
-    reg_fragment_setenc(p, str, options);
+    reg_fragment_setenc(str, options);
     err = rb_reg_check_preprocess(str);
     if (err != Qnil) {
         err = rb_obj_as_string(err);
-        compile_error(p, "%"PRIsVALUE, err);
+        compile_error(PARSER_ARG "%"PRIsVALUE, err);
 	return 0;
     }
     return 1;
@@ -10655,7 +10601,6 @@ typedef struct {
     struct parser_params* parser;
     rb_encoding *enc;
     NODE *succ_block;
-    const YYLTYPE *loc;
 } reg_named_capture_assign_t;
 
 static int
@@ -10663,37 +10608,35 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end,
           int back_num, int *back_refs, OnigRegex regex, void *arg0)
 {
     reg_named_capture_assign_t *arg = (reg_named_capture_assign_t*)arg0;
-    struct parser_params* p = arg->parser;
+    struct parser_params* parser = arg->parser;
     rb_encoding *enc = arg->enc;
     long len = name_end - name;
     const char *s = (const char *)name;
     ID var;
     NODE *node, *succ;
 
-    if (!len) return ST_CONTINUE;
-    if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len))
+    if (!len || (*name != '_' && ISASCII(*name) && !rb_enc_islower(*name, enc)) ||
+	(len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len)) ||
+	!rb_enc_symname2_p(s, len, enc)) {
         return ST_CONTINUE;
-    if (rb_enc_symname_type(s, len, enc, (1U<<ID_LOCAL)) != ID_LOCAL)
-        return ST_CONTINUE;
-
+    }
     var = intern_cstr(s, len, enc);
-    node = node_assign(p, assignable(p, var, 0, arg->loc), NEW_LIT(ID2SYM(var), arg->loc), arg->loc);
+    node = newline_node(node_assign(assignable(var, 0), NEW_LIT(ID2SYM(var))));
     succ = arg->succ_block;
-    if (!succ) succ = NEW_BEGIN(0, arg->loc);
-    succ = block_append(p, succ, node);
+    if (!succ) succ = NEW_BEGIN(0);
+    succ = block_append(succ, node);
     arg->succ_block = succ;
     return ST_CONTINUE;
 }
 
 static NODE *
-reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc)
+reg_named_capture_assign_gen(struct parser_params* parser, VALUE regexp)
 {
     reg_named_capture_assign_t arg;
 
-    arg.parser = p;
+    arg.parser = parser;
     arg.enc = rb_enc_get(regexp);
     arg.succ_block = 0;
-    arg.loc = loc;
     onig_foreach_name(RREGEXP_PTR(regexp), reg_named_capture_assign_iter, &arg);
 
     if (!arg.succ_block) return 0;
@@ -10701,43 +10644,48 @@ reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *l
 }
 
 static VALUE
-parser_reg_compile(struct parser_params* p, VALUE str, int options)
+parser_reg_compile(struct parser_params* parser, VALUE str, int options)
 {
-    reg_fragment_setenc(p, str, options);
-    return rb_parser_reg_compile(p, str, options);
+    reg_fragment_setenc(str, options);
+    return rb_parser_reg_compile(parser, str, options);
 }
 
 VALUE
-rb_parser_reg_compile(struct parser_params* p, VALUE str, int options)
+rb_parser_reg_compile(struct parser_params* parser, VALUE str, int options)
 {
-    return rb_reg_compile(str, options & RE_OPTION_MASK, p->ruby_sourcefile, p->ruby_sourceline);
+    return rb_reg_compile(str, options & RE_OPTION_MASK, ruby_sourcefile, ruby_sourceline);
 }
 
 static VALUE
-reg_compile(struct parser_params* p, VALUE str, int options)
+reg_compile_gen(struct parser_params* parser, VALUE str, int options)
 {
     VALUE re;
     VALUE err;
 
     err = rb_errinfo();
-    re = parser_reg_compile(p, str, options);
+    re = parser_reg_compile(parser, str, options);
     if (NIL_P(re)) {
 	VALUE m = rb_attr_get(rb_errinfo(), idMesg);
 	rb_set_errinfo(err);
-	compile_error(p, "%"PRIsVALUE, m);
+	if (!NIL_P(err)) {
+	    rb_str_append(rb_str_cat(rb_attr_get(err, idMesg), "\n", 1), m);
+	}
+	else {
+	    compile_error(PARSER_ARG "%"PRIsVALUE, m);
+	}
 	return Qnil;
     }
     return re;
 }
 #else
 static VALUE
-parser_reg_compile(struct parser_params* p, VALUE str, int options, VALUE *errmsg)
+parser_reg_compile(struct parser_params* parser, VALUE str, int options, VALUE *errmsg)
 {
     VALUE err = rb_errinfo();
     VALUE re;
-    int c = rb_reg_fragment_setenc(p, str, options);
-    if (c) reg_fragment_enc_error(p, str, c);
-    re = rb_parser_reg_compile(p, str, options);
+    int c = rb_reg_fragment_setenc(parser, str, options);
+    if (c) reg_fragment_enc_error(parser, str, c);
+    re = rb_parser_reg_compile(parser, str, options);
     if (NIL_P(re)) {
 	*errmsg = rb_attr_get(rb_errinfo(), idMesg);
 	rb_set_errinfo(err);
@@ -10747,56 +10695,77 @@ parser_reg_compile(struct parser_params* p, VALUE str, int options, VALUE *errms
 #endif
 
 #ifndef RIPPER
-void
-rb_parser_set_options(VALUE vparser, int print, int loop, int chomp, int split)
+NODE*
+rb_parser_append_print(VALUE vparser, NODE *node)
 {
-    struct parser_params *p;
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    p->do_print = print;
-    p->do_loop = loop;
-    p->do_chomp = chomp;
-    p->do_split = split;
-}
+    NODE *prelude = 0;
+    NODE *scope = node;
+    struct parser_params *parser;
 
-void
-rb_parser_warn_location(VALUE vparser, int warn)
-{
-    struct parser_params *p;
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    p->warn_location = warn;
+    if (!node) return node;
+
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+
+    node = node->nd_body;
+
+    if (nd_type(node) == NODE_PRELUDE) {
+	prelude = node;
+	node = node->nd_body;
+    }
+
+    node = block_append(node,
+			NEW_FCALL(rb_intern("print"),
+				  NEW_ARRAY(NEW_GVAR(idLASTLINE))));
+    if (prelude) {
+	prelude->nd_body = node;
+	scope->nd_body = prelude;
+    }
+    else {
+	scope->nd_body = node;
+    }
+
+    return scope;
 }
 
-static NODE *
-parser_append_options(struct parser_params *p, NODE *node)
+NODE *
+rb_parser_while_loop(VALUE vparser, NODE *node, int chop, int split)
 {
-    static const YYLTYPE default_location = {{1, 0}, {1, 0}};
-    const YYLTYPE *const LOC = &default_location;
+    NODE *prelude = 0;
+    NODE *scope = node;
+    struct parser_params *parser;
+
+    if (!node) return node;
+
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
 
-    if (p->do_print) {
-	NODE *print = NEW_FCALL(rb_intern("print"),
-				NEW_ARRAY(NEW_GVAR(idLASTLINE, LOC), LOC),
-				LOC);
-	node = block_append(p, node, print);
+    node = node->nd_body;
+
+    if (nd_type(node) == NODE_PRELUDE) {
+	prelude = node;
+	node = node->nd_body;
+    }
+    if (split) {
+	node = block_append(NEW_GASGN(rb_intern("$F"),
+				      NEW_CALL(NEW_GVAR(idLASTLINE),
+					       rb_intern("split"), 0)),
+			    node);
+    }
+    if (chop) {
+	node = block_append(NEW_CALL(NEW_GVAR(idLASTLINE),
+				     rb_intern("chop!"), 0), node);
     }
 
-    if (p->do_loop) {
-	if (p->do_split) {
-	    NODE *split = NEW_GASGN(rb_intern("$F"),
-				    NEW_CALL(NEW_GVAR(idLASTLINE, LOC),
-					     rb_intern("split"), 0, LOC),
-				    LOC);
-	    node = block_append(p, split, node);
-	}
-	if (p->do_chomp) {
-	    NODE *chomp = NEW_CALL(NEW_GVAR(idLASTLINE, LOC),
-				   rb_intern("chomp!"), 0, LOC);
-	    node = block_append(p, chomp, node);
-	}
+    node = NEW_OPT_N(node);
 
-	node = NEW_WHILE(NEW_VCALL(idGets, LOC), node, 1, LOC);
+    if (prelude) {
+	prelude->nd_body = node;
+	scope->nd_body = prelude;
+    }
+    else {
+	scope->nd_body = node;
     }
 
-    return node;
+    return scope;
 }
 
 void
@@ -10809,32 +10778,28 @@ rb_init_parse(void)
 #endif /* !RIPPER */
 
 static ID
-internal_id(struct parser_params *p)
+internal_id_gen(struct parser_params *parser)
 {
-    const ID max_id = RB_ID_SERIAL_MAX & ~0xffff;
-    ID id = (ID)vtable_size(p->lvtbl->args) + (ID)vtable_size(p->lvtbl->vars);
-    id = max_id - id;
+    ID id = (ID)vtable_size(lvtbl->args) + (ID)vtable_size(lvtbl->vars);
+    id += ((tLAST_TOKEN - ID_INTERNAL) >> ID_SCOPE_SHIFT) + 1;
     return ID_STATIC_SYM | ID_INTERNAL | (id << ID_SCOPE_SHIFT);
 }
 
 static void
-parser_initialize(struct parser_params *p)
+parser_initialize(struct parser_params *parser)
 {
     /* note: we rely on TypedData_Make_Struct to set most fields to 0 */
-    p->command_start = TRUE;
-    p->ruby_sourcefile_string = Qnil;
-    p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE at first */
-    p->node_id = 0;
+    command_start = TRUE;
+    ruby_sourcefile_string = Qnil;
 #ifdef RIPPER
-    p->delayed = Qnil;
-    p->result = Qnil;
-    p->parsing_thread = Qnil;
+    parser->delayed = Qnil;
+    parser->result = Qnil;
+    parser->parsing_thread = Qnil;
 #else
-    p->error_buffer = Qfalse;
+    parser->error_buffer = Qfalse;
 #endif
-    p->debug_buffer = Qnil;
-    p->debug_output = rb_stdout;
-    p->enc = rb_utf8_encoding();
+    parser->debug_buffer = Qnil;
+    parser->enc = rb_utf8_encoding();
 }
 
 #ifdef RIPPER
@@ -10845,50 +10810,50 @@ parser_initialize(struct parser_params *p)
 static void
 parser_mark(void *ptr)
 {
-    struct parser_params *p = (struct parser_params*)ptr;
+    struct parser_params *parser = (struct parser_params*)ptr;
 
-    rb_gc_mark(p->lex.input);
-    rb_gc_mark(p->lex.prevline);
-    rb_gc_mark(p->lex.lastline);
-    rb_gc_mark(p->lex.nextline);
-    rb_gc_mark(p->ruby_sourcefile_string);
-    rb_gc_mark((VALUE)p->lex.strterm);
-    rb_gc_mark((VALUE)p->ast);
+    rb_gc_mark((VALUE)lex_strterm);
+    rb_gc_mark((VALUE)deferred_nodes);
+    rb_gc_mark(lex_input);
+    rb_gc_mark(lex_lastline);
+    rb_gc_mark(lex_nextline);
+    rb_gc_mark(ruby_sourcefile_string);
 #ifndef RIPPER
-    rb_gc_mark(p->debug_lines);
-    rb_gc_mark(p->compile_option);
-    rb_gc_mark(p->error_buffer);
+    rb_gc_mark((VALUE)ruby_eval_tree_begin);
+    rb_gc_mark((VALUE)ruby_eval_tree);
+    rb_gc_mark(ruby_debug_lines);
+    rb_gc_mark(parser->compile_option);
+    rb_gc_mark(parser->error_buffer);
 #else
-    rb_gc_mark(p->delayed);
-    rb_gc_mark(p->value);
-    rb_gc_mark(p->result);
-    rb_gc_mark(p->parsing_thread);
+    rb_gc_mark(parser->delayed);
+    rb_gc_mark(parser->value);
+    rb_gc_mark(parser->result);
+    rb_gc_mark(parser->parsing_thread);
 #endif
-    rb_gc_mark(p->debug_buffer);
-    rb_gc_mark(p->debug_output);
+    rb_gc_mark(parser->debug_buffer);
 #ifdef YYMALLOC
-    rb_gc_mark((VALUE)p->heap);
+    rb_gc_mark((VALUE)parser->heap);
 #endif
 }
 
 static void
 parser_free(void *ptr)
 {
-    struct parser_params *p = (struct parser_params*)ptr;
+    struct parser_params *parser = (struct parser_params*)ptr;
     struct local_vars *local, *prev;
 
-    if (p->tokenbuf) {
-        ruby_sized_xfree(p->tokenbuf, p->toksiz);
+    if (tokenbuf) {
+        xfree(tokenbuf);
     }
-    for (local = p->lvtbl; local; local = prev) {
+    for (local = lvtbl; local; local = prev) {
 	if (local->vars) xfree(local->vars);
 	prev = local->prev;
 	xfree(local);
     }
     {
 	token_info *ptinfo;
-	while ((ptinfo = p->token_info) != 0) {
-	    p->token_info = ptinfo->next;
+	while ((ptinfo = parser->token_info) != 0) {
+	    parser->token_info = ptinfo->next;
 	    xfree(ptinfo);
 	}
     }
@@ -10898,12 +10863,12 @@ parser_free(void *ptr)
 static size_t
 parser_memsize(const void *ptr)
 {
-    struct parser_params *p = (struct parser_params*)ptr;
+    struct parser_params *parser = (struct parser_params*)ptr;
     struct local_vars *local;
-    size_t size = sizeof(*p);
+    size_t size = sizeof(*parser);
 
-    size += p->toksiz;
-    for (local = p->lvtbl; local; local = local->prev) {
+    size += toksiz;
+    for (local = lvtbl; local; local = local->prev) {
 	size += sizeof(*local);
 	if (local->vars) size += local->vars->capa * sizeof(ID);
     }
@@ -10946,12 +10911,12 @@ rb_parser_new(void)
 VALUE
 rb_parser_set_context(VALUE vparser, const struct rb_block *base, int main)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    p->error_buffer = main ? Qfalse : Qnil;
-    p->base_block = base;
-    p->in_main = main;
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    parser->error_buffer = main ? Qfalse : Qnil;
+    parser->base_block = base;
+    in_main = main;
     return vparser;
 }
 #endif
@@ -10968,48 +10933,48 @@ static VALUE ripper_parser_set_yydebug(VALUE self, VALUE flag);
 
 /*
  *  call-seq:
- *    ripper.error?   -> Boolean
+ *    ripper#error?   -> Boolean
  *
  *  Return true if parsed source has errors.
  */
 static VALUE
 ripper_error_p(VALUE vparser)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    return p->error_p ? Qtrue : Qfalse;
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    return parser->error_p ? Qtrue : Qfalse;
 }
 #endif
 
 /*
  *  call-seq:
- *    ripper.end_seen?   -> Boolean
+ *    ripper#end_seen?   -> Boolean
  *
  *  Return true if parsed source ended by +\_\_END\_\_+.
  */
 VALUE
 rb_parser_end_seen_p(VALUE vparser)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    return p->ruby__end__seen ? Qtrue : Qfalse;
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    return ruby__end__seen ? Qtrue : Qfalse;
 }
 
 /*
  *  call-seq:
- *    ripper.encoding   -> encoding
+ *    ripper#encoding   -> encoding
  *
  *  Return encoding of the source.
  */
 VALUE
 rb_parser_encoding(VALUE vparser)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    return rb_enc_from_encoding(p->enc);
+    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
+    return rb_enc_from_encoding(current_enc);
 }
 
 /*
@@ -11021,10 +10986,10 @@ rb_parser_encoding(VALUE vparser)
 VALUE
 rb_parser_get_yydebug(VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    return p->debug ? Qtrue : Qfalse;
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    return yydebug ? Qtrue : Qfalse;
 }
 
 /*
@@ -11036,56 +11001,54 @@ rb_parser_get_yydebug(VALUE self)
 VALUE
 rb_parser_set_yydebug(VALUE self, VALUE flag)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    p->debug = RTEST(flag);
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    yydebug = RTEST(flag);
     return flag;
 }
 
 #ifndef RIPPER
 #ifdef YYMALLOC
 #define HEAPCNT(n, size) ((n) * (size) / sizeof(YYSTYPE))
-/* Keep the order; NEWHEAP then xmalloc and ADD2HEAP to get rid of
- * potential memory leak */
-#define NEWHEAP() rb_imemo_tmpbuf_parser_heap(0, p->heap, 0)
-#define ADD2HEAP(new, cnt, ptr) ((p->heap = (new))->ptr = (ptr), \
-			   (new)->cnt = (cnt), (ptr))
+#define NEWHEAP() rb_node_newnode(NODE_ALLOCA, 0, (VALUE)parser->heap, 0)
+#define ADD2HEAP(n, c, p) ((parser->heap = (n))->u1.node = (p), \
+			   (n)->u3.cnt = (c), (p))
 
 void *
-rb_parser_malloc(struct parser_params *p, size_t size)
+rb_parser_malloc(struct parser_params *parser, size_t size)
 {
     size_t cnt = HEAPCNT(1, size);
-    rb_imemo_tmpbuf_t *n = NEWHEAP();
+    NODE *n = NEWHEAP();
     void *ptr = xmalloc(size);
 
     return ADD2HEAP(n, cnt, ptr);
 }
 
 void *
-rb_parser_calloc(struct parser_params *p, size_t nelem, size_t size)
+rb_parser_calloc(struct parser_params *parser, size_t nelem, size_t size)
 {
     size_t cnt = HEAPCNT(nelem, size);
-    rb_imemo_tmpbuf_t *n = NEWHEAP();
+    NODE *n = NEWHEAP();
     void *ptr = xcalloc(nelem, size);
 
     return ADD2HEAP(n, cnt, ptr);
 }
 
 void *
-rb_parser_realloc(struct parser_params *p, void *ptr, size_t size)
+rb_parser_realloc(struct parser_params *parser, void *ptr, size_t size)
 {
-    rb_imemo_tmpbuf_t *n;
+    NODE *n;
     size_t cnt = HEAPCNT(1, size);
 
-    if (ptr && (n = p->heap) != NULL) {
+    if (ptr && (n = parser->heap) != NULL) {
 	do {
-	    if (n->ptr == ptr) {
-		n->ptr = ptr = xrealloc(ptr, size);
-		if (n->cnt) n->cnt = cnt;
+	    if (n->u1.node == ptr) {
+		n->u1.node = ptr = xrealloc(ptr, size);
+		if (n->u3.cnt) n->u3.cnt = cnt;
 		return ptr;
 	    }
-	} while ((n = n->next) != NULL);
+	} while ((n = n->u2.node) != NULL);
     }
     n = NEWHEAP();
     ptr = xrealloc(ptr, size);
@@ -11093,52 +11056,51 @@ rb_parser_realloc(struct parser_params *p, void *ptr, size_t size)
 }
 
 void
-rb_parser_free(struct parser_params *p, void *ptr)
+rb_parser_free(struct parser_params *parser, void *ptr)
 {
-    rb_imemo_tmpbuf_t **prev = &p->heap, *n;
+    NODE **prev = &parser->heap, *n;
 
     while ((n = *prev) != NULL) {
-	if (n->ptr == ptr) {
-	    *prev = n->next;
+	if (n->u1.node == ptr) {
+	    *prev = n->u2.node;
 	    rb_gc_force_recycle((VALUE)n);
 	    break;
 	}
-	prev = &n->next;
+	prev = &n->u2.node;
     }
     xfree(ptr);
 }
 #endif
 
 void
-rb_parser_printf(struct parser_params *p, const char *fmt, ...)
+rb_parser_printf(struct parser_params *parser, const char *fmt, ...)
 {
     va_list ap;
-    VALUE mesg = p->debug_buffer;
+    VALUE mesg = parser->debug_buffer;
 
-    if (NIL_P(mesg)) p->debug_buffer = mesg = rb_str_new(0, 0);
+    if (NIL_P(mesg)) parser->debug_buffer = mesg = rb_str_new(0, 0);
     va_start(ap, fmt);
     rb_str_vcatf(mesg, fmt, ap);
     va_end(ap);
     if (RSTRING_END(mesg)[-1] == '\n') {
-	rb_io_write(p->debug_output, mesg);
-	p->debug_buffer = Qnil;
+	rb_io_write(rb_stdout, mesg);
+	parser->debug_buffer = Qnil;
     }
 }
 
 static void
-parser_compile_error(struct parser_params *p, const char *fmt, ...)
+parser_compile_error(struct parser_params *parser, const char *fmt, ...)
 {
     va_list ap;
 
-    rb_io_flush(p->debug_output);
-    p->error_p = 1;
+    parser->error_p = 1;
     va_start(ap, fmt);
-    p->error_buffer =
-	rb_syntax_error_append(p->error_buffer,
-			       p->ruby_sourcefile_string,
-			       p->ruby_sourceline,
-			       rb_long2int(p->lex.pcur - p->lex.pbeg),
-			       p->enc, fmt, ap);
+    parser->error_buffer =
+	rb_syntax_error_append(parser->error_buffer,
+			       ruby_sourcefile_string,
+			       ruby_sourceline,
+			       rb_long2int(lex_p - lex_pbeg),
+			       current_enc, fmt, ap);
     va_end(ap);
 }
 #endif
@@ -11185,58 +11147,58 @@ ripper_validate_object(VALUE self, VALUE x)
 #define validate(x) ((x) = get_value(x))
 
 static VALUE
-ripper_dispatch0(struct parser_params *p, ID mid)
+ripper_dispatch0(struct parser_params *parser, ID mid)
 {
-    return rb_funcall(p->value, mid, 0);
+    return rb_funcall(parser->value, mid, 0);
 }
 
 static VALUE
-ripper_dispatch1(struct parser_params *p, ID mid, VALUE a)
+ripper_dispatch1(struct parser_params *parser, ID mid, VALUE a)
 {
     validate(a);
-    return rb_funcall(p->value, mid, 1, a);
+    return rb_funcall(parser->value, mid, 1, a);
 }
 
 static VALUE
-ripper_dispatch2(struct parser_params *p, ID mid, VALUE a, VALUE b)
+ripper_dispatch2(struct parser_params *parser, ID mid, VALUE a, VALUE b)
 {
     validate(a);
     validate(b);
-    return rb_funcall(p->value, mid, 2, a, b);
+    return rb_funcall(parser->value, mid, 2, a, b);
 }
 
 static VALUE
-ripper_dispatch3(struct parser_params *p, ID mid, VALUE a, VALUE b, VALUE c)
+ripper_dispatch3(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c)
 {
     validate(a);
     validate(b);
     validate(c);
-    return rb_funcall(p->value, mid, 3, a, b, c);
+    return rb_funcall(parser->value, mid, 3, a, b, c);
 }
 
 static VALUE
-ripper_dispatch4(struct parser_params *p, ID mid, VALUE a, VALUE b, VALUE c, VALUE d)
+ripper_dispatch4(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c, VALUE d)
 {
     validate(a);
     validate(b);
     validate(c);
     validate(d);
-    return rb_funcall(p->value, mid, 4, a, b, c, d);
+    return rb_funcall(parser->value, mid, 4, a, b, c, d);
 }
 
 static VALUE
-ripper_dispatch5(struct parser_params *p, ID mid, VALUE a, VALUE b, VALUE c, VALUE d, VALUE e)
+ripper_dispatch5(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c, VALUE d, VALUE e)
 {
     validate(a);
     validate(b);
     validate(c);
     validate(d);
     validate(e);
-    return rb_funcall(p->value, mid, 5, a, b, c, d, e);
+    return rb_funcall(parser->value, mid, 5, a, b, c, d, e);
 }
 
 static VALUE
-ripper_dispatch7(struct parser_params *p, ID mid, VALUE a, VALUE b, VALUE c, VALUE d, VALUE e, VALUE f, VALUE g)
+ripper_dispatch7(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c, VALUE d, VALUE e, VALUE f, VALUE g)
 {
     validate(a);
     validate(b);
@@ -11245,7 +11207,95 @@ ripper_dispatch7(struct parser_params *p, ID mid, VALUE a, VALUE b, VALUE c, VAL
     validate(e);
     validate(f);
     validate(g);
-    return rb_funcall(p->value, mid, 7, a, b, c, d, e, f, g);
+    return rb_funcall(parser->value, mid, 7, a, b, c, d, e, f, g);
+}
+
+static const struct kw_assoc {
+    ID id;
+    const char *name;
+} keyword_to_name[] = {
+    {keyword_class,	"class"},
+    {keyword_module,	"module"},
+    {keyword_def,	"def"},
+    {keyword_undef,	"undef"},
+    {keyword_begin,	"begin"},
+    {keyword_rescue,	"rescue"},
+    {keyword_ensure,	"ensure"},
+    {keyword_end,	"end"},
+    {keyword_if,	"if"},
+    {keyword_unless,	"unless"},
+    {keyword_then,	"then"},
+    {keyword_elsif,	"elsif"},
+    {keyword_else,	"else"},
+    {keyword_case,	"case"},
+    {keyword_when,	"when"},
+    {keyword_while,	"while"},
+    {keyword_until,	"until"},
+    {keyword_for,	"for"},
+    {keyword_break,	"break"},
+    {keyword_next,	"next"},
+    {keyword_redo,	"redo"},
+    {keyword_retry,	"retry"},
+    {keyword_in,	"in"},
+    {keyword_do,	"do"},
+    {keyword_do_cond,	"do"},
+    {keyword_do_block,	"do"},
+    {keyword_return,	"return"},
+    {keyword_yield,	"yield"},
+    {keyword_super,	"super"},
+    {keyword_self,	"self"},
+    {keyword_nil,	"nil"},
+    {keyword_true,	"true"},
+    {keyword_false,	"false"},
+    {keyword_and,	"and"},
+    {keyword_or,	"or"},
+    {keyword_not,	"not"},
+    {modifier_if,	"if"},
+    {modifier_unless,	"unless"},
+    {modifier_while,	"while"},
+    {modifier_until,	"until"},
+    {modifier_rescue,	"rescue"},
+    {keyword_alias,	"alias"},
+    {keyword_defined,	"defined?"},
+    {keyword_BEGIN,	"BEGIN"},
+    {keyword_END,	"END"},
+    {keyword__LINE__,	"__LINE__"},
+    {keyword__FILE__,	"__FILE__"},
+    {keyword__ENCODING__, "__ENCODING__"},
+    {0, NULL}
+};
+
+static const char*
+keyword_id_to_str(ID id)
+{
+    const struct kw_assoc *a;
+
+    for (a = keyword_to_name; a->id; a++) {
+        if (a->id == id)
+            return a->name;
+    }
+    return NULL;
+}
+
+#undef ripper_id2sym
+static VALUE
+ripper_id2sym(ID id)
+{
+    const char *name;
+    char buf[8];
+
+    if (id == (ID)(signed char)id) {
+        buf[0] = (char)id;
+        buf[1] = '\0';
+        return ID2SYM(rb_intern2(buf, 1));
+    }
+    if ((name = keyword_id_to_str(id))) {
+        return ID2SYM(rb_intern(name));
+    }
+    if (!rb_id2str(id)) {
+	rb_bug("cannot convert ID to string: %ld", (unsigned long)id);
+    }
+    return ID2SYM(id);
 }
 
 static ID
@@ -11270,13 +11320,13 @@ ripper_get_value(VALUE v)
 }
 
 static void
-ripper_error(struct parser_params *p)
+ripper_error_gen(struct parser_params *parser)
 {
-    p->error_p = TRUE;
+    parser->error_p = TRUE;
 }
 
 static void
-ripper_compile_error(struct parser_params *p, const char *fmt, ...)
+ripper_compile_error(struct parser_params *parser, const char *fmt, ...)
 {
     VALUE str;
     va_list args;
@@ -11284,24 +11334,12 @@ ripper_compile_error(struct parser_params *p, const char *fmt, ...)
     va_start(args, fmt);
     str = rb_vsprintf(fmt, args);
     va_end(args);
-    rb_funcall(p->value, rb_intern("compile_error"), 1, str);
-    ripper_error(p);
-}
-
-static VALUE
-ripper_lex_get_generic(struct parser_params *p, VALUE src)
-{
-    VALUE line = rb_funcallv_public(src, id_gets, 0, 0);
-    if (!NIL_P(line) && !RB_TYPE_P(line, T_STRING)) {
-	rb_raise(rb_eTypeError,
-		 "gets returned %"PRIsVALUE" (expected String or nil)",
-		 rb_obj_class(line));
-    }
-    return line;
+    rb_funcall(parser->value, rb_intern("compile_error"), 1, str);
+    ripper_error_gen(parser);
 }
 
 static VALUE
-ripper_lex_io_get(struct parser_params *p, VALUE src)
+ripper_lex_get_generic(struct parser_params *parser, VALUE src)
 {
     return rb_io_gets(src);
 }
@@ -11331,94 +11369,94 @@ ripper_s_allocate(VALUE klass)
 static VALUE
 ripper_initialize(int argc, VALUE *argv, VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
     VALUE src, fname, lineno;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
     rb_scan_args(argc, argv, "12", &src, &fname, &lineno);
     if (RB_TYPE_P(src, T_FILE)) {
-        p->lex.gets = ripper_lex_io_get;
-    }
-    else if (rb_respond_to(src, id_gets)) {
-        p->lex.gets = ripper_lex_get_generic;
+        lex_gets = ripper_lex_get_generic;
     }
     else {
         StringValue(src);
-        p->lex.gets = lex_get_str;
+        lex_gets = lex_get_str;
     }
-    p->lex.input = src;
-    p->eofp = 0;
+    lex_input = src;
+    parser->eofp = 0;
     if (NIL_P(fname)) {
         fname = STR_NEW2("(ripper)");
 	OBJ_FREEZE(fname);
     }
     else {
-	StringValueCStr(fname);
+        StringValue(fname);
 	fname = rb_str_new_frozen(fname);
     }
-    parser_initialize(p);
+    parser_initialize(parser);
 
-    p->ruby_sourcefile_string = fname;
-    p->ruby_sourcefile = RSTRING_PTR(fname);
-    p->ruby_sourceline = NIL_P(lineno) ? 0 : NUM2INT(lineno) - 1;
+    ruby_sourcefile_string = fname;
+    ruby_sourcefile = RSTRING_PTR(fname);
+    ruby_sourceline = NIL_P(lineno) ? 0 : NUM2INT(lineno) - 1;
 
     return Qnil;
 }
 
+struct ripper_args {
+    struct parser_params *parser;
+    int argc;
+    VALUE *argv;
+};
+
 static VALUE
 ripper_parse0(VALUE parser_v)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(parser_v, struct parser_params, &parser_data_type, p);
-    parser_prepare(p);
-    p->ast = rb_ast_new();
-    ripper_yyparse((void*)p);
-    rb_ast_dispose(p->ast);
-    p->ast = 0;
-    return p->result;
+    TypedData_Get_Struct(parser_v, struct parser_params, &parser_data_type, parser);
+    parser_prepare(parser);
+    ripper_yyparse((void*)parser);
+    return parser->result;
 }
 
 static VALUE
 ripper_ensure(VALUE parser_v)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(parser_v, struct parser_params, &parser_data_type, p);
-    p->parsing_thread = Qnil;
+    TypedData_Get_Struct(parser_v, struct parser_params, &parser_data_type, parser);
+    parser->parsing_thread = Qnil;
     return Qnil;
 }
 
 /*
  *  call-seq:
- *    ripper.parse
+ *    ripper#parse
  *
  *  Start parsing and returns the value of the root action.
  */
 static VALUE
 ripper_parse(VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    if (!ripper_initialized_p(p)) {
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    if (!ripper_initialized_p(parser)) {
         rb_raise(rb_eArgError, "method called for uninitialized object");
     }
-    if (!NIL_P(p->parsing_thread)) {
-        if (p->parsing_thread == rb_thread_current())
+    if (!NIL_P(parser->parsing_thread)) {
+        if (parser->parsing_thread == rb_thread_current())
             rb_raise(rb_eArgError, "Ripper#parse is not reentrant");
         else
             rb_raise(rb_eArgError, "Ripper#parse is not multithread-safe");
     }
-    p->parsing_thread = rb_thread_current();
+    parser->parsing_thread = rb_thread_current();
     rb_ensure(ripper_parse0, self, ripper_ensure, self);
 
-    return p->result;
+    return parser->result;
 }
 
 /*
  *  call-seq:
- *    ripper.column   -> Integer
+ *    ripper#column   -> Integer
  *
  *  Return column number of current parsing line.
  *  This number starts from 0.
@@ -11426,39 +11464,39 @@ ripper_parse(VALUE self)
 static VALUE
 ripper_column(VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
     long col;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    if (!ripper_initialized_p(p)) {
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    if (!ripper_initialized_p(parser)) {
         rb_raise(rb_eArgError, "method called for uninitialized object");
     }
-    if (NIL_P(p->parsing_thread)) return Qnil;
-    col = p->lex.ptok - p->lex.pbeg;
+    if (NIL_P(parser->parsing_thread)) return Qnil;
+    col = parser->tokp - lex_pbeg;
     return LONG2NUM(col);
 }
 
 /*
  *  call-seq:
- *    ripper.filename   -> String
+ *    ripper#filename   -> String
  *
  *  Return current parsing filename.
  */
 static VALUE
 ripper_filename(VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    if (!ripper_initialized_p(p)) {
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    if (!ripper_initialized_p(parser)) {
         rb_raise(rb_eArgError, "method called for uninitialized object");
     }
-    return p->ruby_sourcefile_string;
+    return ruby_sourcefile_string;
 }
 
 /*
  *  call-seq:
- *    ripper.lineno   -> Integer
+ *    ripper#lineno   -> Integer
  *
  *  Return line number of current parsing line.
  *  This number starts from 1.
@@ -11466,33 +11504,14 @@ ripper_filename(VALUE self)
 static VALUE
 ripper_lineno(VALUE self)
 {
-    struct parser_params *p;
+    struct parser_params *parser;
 
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    if (!ripper_initialized_p(p)) {
+    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
+    if (!ripper_initialized_p(parser)) {
         rb_raise(rb_eArgError, "method called for uninitialized object");
     }
-    if (NIL_P(p->parsing_thread)) return Qnil;
-    return INT2NUM(p->ruby_sourceline);
-}
-
-/*
- *  call-seq:
- *    ripper.state   -> Integer
- *
- *  Return scanner state of current token.
- */
-static VALUE
-ripper_state(VALUE self)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    if (!ripper_initialized_p(p)) {
-	rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
-    if (NIL_P(p->parsing_thread)) return Qnil;
-    return INT2NUM(p->lex.state);
+    if (NIL_P(parser->parsing_thread)) return Qnil;
+    return INT2NUM(ruby_sourceline);
 }
 
 #ifdef RIPPER_DEBUG
@@ -11515,17 +11534,6 @@ ripper_value(VALUE self, VALUE obj)
 }
 #endif
 
-/*
- *  call-seq:
- *    Ripper.lex_state_name(integer)   -> string
- *
- *  Returns a string representation of lex_state.
- */
-static VALUE
-ripper_lex_state_name(VALUE self, VALUE state)
-{
-    return rb_parser_lex_state_name(NUM2INT(state));
-}
 
 void
 Init_ripper(void)
@@ -11534,7 +11542,6 @@ Init_ripper(void)
     ripper_init_eventids2();
     id_warn = rb_intern_const("warn");
     id_warning = rb_intern_const("warning");
-    id_gets = rb_intern_const("gets");
 
     InitVM(ripper);
 }
@@ -11553,7 +11560,6 @@ InitVM_ripper(void)
     rb_define_method(Ripper, "column", ripper_column, 0);
     rb_define_method(Ripper, "filename", ripper_filename, 0);
     rb_define_method(Ripper, "lineno", ripper_lineno, 0);
-    rb_define_method(Ripper, "state", ripper_state, 0);
     rb_define_method(Ripper, "end_seen?", rb_parser_end_seen_p, 0);
     rb_define_method(Ripper, "encoding", rb_parser_encoding, 0);
     rb_define_method(Ripper, "yydebug", rb_parser_get_yydebug, 0);
@@ -11568,12 +11574,6 @@ InitVM_ripper(void)
     rb_define_singleton_method(Ripper, "dedent_string", parser_dedent_string, 2);
     rb_define_private_method(Ripper, "dedent_string", parser_dedent_string, 2);
 
-    rb_define_singleton_method(Ripper, "lex_state_name", ripper_lex_state_name, 1);
-
-<% @exprs.each do |expr, desc| -%>
-    /* <%=desc%> */
-    rb_define_const(Ripper, "<%=expr%>", INT2NUM(<%=expr%>));
-<% end %>
     ripper_init_eventids1_table(Ripper);
     ripper_init_eventids2_table(Ripper);
 
diff --git a/prelude.rb b/prelude.rb
index 1d62c13219..f9bb7451f8 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -1,15 +1,18 @@
-class << Thread
+class Thread
+  MUTEX_FOR_THREAD_EXCLUSIVE = Thread::Mutex.new # :nodoc:
+  private_constant :MUTEX_FOR_THREAD_EXCLUSIVE
+
   # call-seq:
   #    Thread.exclusive { block }   => obj
   #
   # Wraps the block in a single, VM-global Mutex.synchronize, returning the
   # value of the block. A thread executing inside the exclusive section will
   # only block other threads which also use the Thread.exclusive mechanism.
-  def exclusive(&block) end if false
-  mutex = Mutex.new # :nodoc:
-  define_method(:exclusive) do |&block|
+  def self.exclusive
     warn "Thread.exclusive is deprecated, use Thread::Mutex", caller
-    mutex.synchronize(&block)
+    MUTEX_FOR_THREAD_EXCLUSIVE.synchronize{
+      yield
+    }
   end
 end
 
@@ -65,10 +68,9 @@ class IO
   # 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
+  # By specifying `exception: false`, the options hash allows you to 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.
+  # return the symbol :wait_readable instead.
   def read_nonblock(len, buf = nil, exception: true)
     __read_nonblock(len, buf, exception)
   end
@@ -97,7 +99,7 @@ class IO
   #
   #   # write_nonblock writes only 65536 bytes and return 65536.
   #   # (The pipe size is 65536 bytes on this environment.)
-  #   s = "a" * 100000
+  #   s = "a"  #100000
   #   p w.write_nonblock(s)     #=> 65536
   #
   #   # write_nonblock cannot write a byte and raise EWOULDBLOCK (EAGAIN).
@@ -124,39 +126,10 @@ class IO
   # 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
+  # By specifying `exception: false`, the options hash allows you to indicate
   # that write_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol +:wait_writable+ instead.
+  # return the symbol :wait_writable instead.
   def write_nonblock(buf, exception: true)
     __write_nonblock(buf, exception)
   end
 end
-
-class TracePoint
-  def enable target: nil, target_line: nil, &blk
-    self.__enable target, target_line, &blk
-  end
-end
-
-class Binding
-  # :nodoc:
-  def irb
-    require 'irb'
-    irb
-  end
-
-  # suppress redefinition warning
-  alias irb irb # :nodoc:
-end
-
-module Kernel
-  def pp(*objs)
-    require 'pp'
-    pp(*objs)
-  end
-
-  # suppress redefinition warning
-  alias pp pp # :nodoc:
-
-  private :pp
-end
diff --git a/probes_helper.h b/probes_helper.h
index 115c78d467..1becae5a8d 100644
--- a/probes_helper.h
+++ b/probes_helper.h
@@ -2,6 +2,7 @@
 #define RUBY_PROBES_HELPER_H
 
 #include "ruby/ruby.h"
+#include "probes.h"
 
 struct ruby_dtrace_method_hook_args {
     const char *classname;
@@ -12,13 +13,13 @@ struct ruby_dtrace_method_hook_args {
     volatile VALUE name;
 };
 
-NOINLINE(int rb_dtrace_setup(rb_execution_context_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *));
+NOINLINE(int ruby_th_dtrace_setup(rb_thread_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *));
 
-#define RUBY_DTRACE_METHOD_HOOK(name, ec, klazz, id) \
+#define RUBY_DTRACE_METHOD_HOOK(name, th, klazz, id) \
 do { \
     if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
 	struct ruby_dtrace_method_hook_args args; \
-	if (rb_dtrace_setup(ec, klazz, id, &args)) { \
+	if (ruby_th_dtrace_setup(th, klazz, id, &args)) { \
 	    RUBY_DTRACE_##name(args.classname, \
 			       args.methodname, \
 			       args.filename, \
@@ -27,16 +28,16 @@ do { \
     } \
 } while (0)
 
-#define RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, klass, id) \
-    RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, ec, klass, id)
+#define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \
+    RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, th, klass, id)
 
-#define RUBY_DTRACE_METHOD_RETURN_HOOK(ec, klass, id) \
-    RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, ec, klass, id)
+#define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \
+    RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, th, klass, id)
 
-#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, klass, id) \
-    RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, ec, klass, id)
+#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, klass, id) \
+    RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, th, klass, id)
 
-#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, klass, id) \
-    RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, ec, klass, id)
+#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, klass, id) \
+    RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, th, klass, id)
 
 #endif /* RUBY_PROBES_HELPER_H */
diff --git a/proc.c b/proc.c
index dc827c467f..f2002eb355 100644
--- a/proc.c
+++ b/proc.c
@@ -12,14 +12,13 @@
 #include "eval_intern.h"
 #include "internal.h"
 #include "gc.h"
-#include "vm_core.h"
 #include "iseq.h"
 
 /* Proc.new with no block will raise an exception in the future
  * versions */
 #define PROC_NEW_REQUIRES_BLOCK 0
 
-#if !defined(__GNUC__) || __GNUC__ < 5 || defined(__MINGW32__)
+#if !defined(__GNUC__) || __GNUC__ < 5
 # define NO_CLOBBERED(v) (*(volatile VALUE *)&(v))
 #else
 # define NO_CLOBBERED(v) (v)
@@ -30,7 +29,6 @@ const rb_cref_t *rb_vm_cref_in_context(VALUE self, VALUE cbase);
 struct METHOD {
     const VALUE recv;
     const VALUE klass;
-    const VALUE iclass;
     const rb_method_entry_t * const me;
     /* for bound methods, `me' should be rb_callable_method_entry_t * */
 };
@@ -50,6 +48,8 @@ static int method_min_max_arity(VALUE, int *max);
 
 #define IS_METHOD_PROC_IFUNC(ifunc) ((ifunc)->func == bmcall)
 
+static VALUE proc_to_s_(VALUE self, const rb_proc_t *proc);
+
 static void
 block_mark(const struct rb_block *block)
 {
@@ -124,11 +124,28 @@ rb_obj_is_proc(VALUE proc)
     }
 }
 
+VALUE rb_proc_create(VALUE klass, const struct rb_block *block,
+		     int8_t safe_level, int8_t is_from_method, int8_t is_lambda);
+
+/* :nodoc: */
+static VALUE
+proc_dup(VALUE self)
+{
+    VALUE procval;
+    rb_proc_t *src;
+
+    GetProcPtr(self, src);
+    procval = rb_proc_create(rb_cProc, &src->block,
+			     src->safe_level, src->is_from_method, src->is_lambda);
+    RB_GC_GUARD(self); /* for: body = proc_dup(body) */
+    return procval;
+}
+
 /* :nodoc: */
 static VALUE
 proc_clone(VALUE self)
 {
-    VALUE procval = rb_proc_dup(self);
+    VALUE procval = proc_dup(self);
     CLONESETUP(procval, self);
     return procval;
 }
@@ -218,7 +235,7 @@ proc_clone(VALUE self)
  *   C.new.e(1,2)       #=> ArgumentError
  *   C.new.method(:e).to_proc.lambda?   #=> true
  *
- * This exception ensures that methods never have tricks
+ * This exception insures that methods never have tricks
  * and makes it easy to have wrappers to define methods that behave as usual.
  *
  *   class C
@@ -248,8 +265,12 @@ rb_proc_lambda_p(VALUE procval)
 static void
 binding_free(void *ptr)
 {
+    rb_binding_t *bind;
     RUBY_FREE_ENTER("binding");
-    ruby_xfree(ptr);
+    if (ptr) {
+	bind = ptr;
+	ruby_xfree(bind);
+    }
     RUBY_FREE_LEAVE("binding");
 }
 
@@ -259,8 +280,11 @@ binding_mark(void *ptr)
     rb_binding_t *bind = ptr;
 
     RUBY_MARK_ENTER("binding");
+
     block_mark(&bind->block);
-    rb_gc_mark(bind->pathobj);
+
+    RUBY_MARK_UNLESS_NULL(bind->path);
+
     RUBY_MARK_LEAVE("binding");
 }
 
@@ -277,7 +301,7 @@ const rb_data_type_t ruby_binding_data_type = {
 	binding_free,
 	binding_memsize,
     },
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
@@ -289,7 +313,6 @@ rb_binding_alloc(VALUE klass)
     return obj;
 }
 
-
 /* :nodoc: */
 static VALUE
 binding_dup(VALUE self)
@@ -298,8 +321,8 @@ binding_dup(VALUE self)
     rb_binding_t *src, *dst;
     GetBindingPtr(self, src);
     GetBindingPtr(bindval, dst);
-    rb_vm_block_copy(bindval, &dst->block, &src->block);
-    RB_OBJ_WRITE(bindval, &dst->pathobj, src->pathobj);
+    dst->block = src->block;
+    dst->path = src->path;
     dst->first_lineno = src->first_lineno;
     return bindval;
 }
@@ -316,8 +339,8 @@ binding_clone(VALUE self)
 VALUE
 rb_binding_new(void)
 {
-    rb_execution_context_t *ec = GET_EC();
-    return rb_vm_make_binding(ec, ec->cfp);
+    rb_thread_t *th = GET_THREAD();
+    return rb_vm_make_binding(th, th->cfp);
 }
 
 /*
@@ -330,7 +353,7 @@ rb_binding_new(void)
  *  environment. See also the description of class +Binding+.
  *
  *     def get_binding(param)
- *       binding
+ *       return binding
  *     end
  *     b = get_binding("hello")
  *     eval("param", b)   #=> "hello"
@@ -352,7 +375,7 @@ rb_f_binding(VALUE self)
  *  reporting syntax errors.
  *
  *     def get_binding(param)
- *       binding
+ *       return binding
  *     end
  *     b = get_binding("hello")
  *     b.eval("param")   #=> "hello"
@@ -369,9 +392,8 @@ bind_eval(int argc, VALUE *argv, VALUE bindval)
 }
 
 static const VALUE *
-get_local_variable_ptr(const rb_env_t **envp, ID lid)
+get_local_variable_ptr(const rb_env_t *env, ID lid)
 {
-    const rb_env_t *env = *envp;
     do {
 	if (!VM_ENV_FLAGS(env->ep, VM_FRAME_FLAG_CFRAME)) {
 	    const rb_iseq_t *iseq = env->iseq;
@@ -381,28 +403,15 @@ get_local_variable_ptr(const rb_env_t **envp, ID lid)
 
 	    for (i=0; i<iseq->body->local_table_size; i++) {
 		if (iseq->body->local_table[i] == lid) {
-		    if (iseq->body->local_iseq == iseq &&
-			iseq->body->param.flags.has_block &&
-			(unsigned int)iseq->body->param.block_start == i) {
-			const VALUE *ep = env->ep;
-			if (!VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)) {
-			    RB_OBJ_WRITE(env, &env->env[i], rb_vm_bh_to_procval(GET_EC(), VM_ENV_BLOCK_HANDLER(ep)));
-			    VM_ENV_FLAGS_SET(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM);
-			}
-		    }
-
-		    *envp = env;
 		    return &env->env[i];
 		}
 	    }
 	}
 	else {
-	    *envp = NULL;
 	    return NULL;
 	}
     } while ((env = rb_vm_env_prev_env(env)) != NULL);
 
-    *envp = NULL;
     return NULL;
 }
 
@@ -437,7 +446,7 @@ check_local_id(VALUE bindval, volatile VALUE *pname)
  *  call-seq:
  *     binding.local_variables -> Array
  *
- *  Returns the names of the binding's local variables as symbols.
+ *  Returns the +symbol+ names of the binding's local variables
  *
  *	def foo
  *  	  a = 1
@@ -446,7 +455,7 @@ check_local_id(VALUE bindval, volatile VALUE *pname)
  *  	  end
  *  	end
  *
- *  This method is the short version of the following code:
+ *  This method is short version of the following code.
  *
  *	binding.eval("local_variables")
  *
@@ -466,7 +475,7 @@ bind_local_variables(VALUE bindval)
  *  call-seq:
  *     binding.local_variable_get(symbol) -> obj
  *
- *  Returns the value of the local variable +symbol+.
+ *  Returns a +value+ of local variable +symbol+.
  *
  *	def foo
  *  	  a = 1
@@ -474,7 +483,7 @@ bind_local_variables(VALUE bindval)
  *  	  binding.local_variable_get(:b) #=> NameError
  *  	end
  *
- *  This method is the short version of the following code:
+ *  This method is short version of the following code.
  *
  *	binding.eval("#{symbol}")
  *
@@ -485,17 +494,15 @@ bind_local_variable_get(VALUE bindval, VALUE sym)
     ID lid = check_local_id(bindval, &sym);
     const rb_binding_t *bind;
     const VALUE *ptr;
-    const rb_env_t *env;
 
     if (!lid) goto undefined;
 
     GetBindingPtr(bindval, bind);
 
-    env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
-    if ((ptr = get_local_variable_ptr(&env, lid)) == NULL) {
+    if ((ptr = get_local_variable_ptr(VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block)), lid)) == NULL) {
 	sym = ID2SYM(lid);
       undefined:
-	rb_name_err_raise("local variable `%1$s' is not defined for %2$s",
+	rb_name_err_raise("local variable `%1$s' not defined for %2$s",
 			  bindval, sym);
     }
 
@@ -513,19 +520,18 @@ bind_local_variable_get(VALUE bindval, VALUE sym)
  *  	  bind = binding
  *  	  bind.local_variable_set(:a, 2) # set existing local variable `a'
  *  	  bind.local_variable_set(:b, 3) # create new local variable `b'
- *  	                                 # `b' exists only in binding
- *
- *  	  p bind.local_variable_get(:a)  #=> 2
- *  	  p bind.local_variable_get(:b)  #=> 3
- *  	  p a                            #=> 2
- *  	  p b                            #=> NameError
+ *  	                                 # `b' exists only in binding.
+ *  	  p bind.local_variable_get(:a) #=> 2
+ *  	  p bind.local_variable_get(:b) #=> 3
+ *  	  p a #=> 2
+ *  	  p b #=> NameError
  *  	end
  *
- *  This method behaves similarly to the following code:
+ *  This method is a similar behavior of the following code
  *
  *    binding.eval("#{symbol} = #{obj}")
  *
- *  if +obj+ can be dumped in Ruby code.
+ *  if obj can be dumped in Ruby code.
  */
 static VALUE
 bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val)
@@ -539,9 +545,9 @@ bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val)
 
     GetBindingPtr(bindval, bind);
     env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
-    if ((ptr = get_local_variable_ptr(&env, lid)) == NULL) {
+    if ((ptr = get_local_variable_ptr(env, lid)) == NULL) {
 	/* not found. create new env */
-	ptr = rb_binding_add_dynavars(bindval, bind, 1, &lid);
+	ptr = rb_binding_add_dynavars(bind, 1, &lid);
 	env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
     }
 
@@ -554,7 +560,7 @@ bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val)
  *  call-seq:
  *     binding.local_variable_defined?(symbol) -> obj
  *
- *  Returns +true+ if a local variable +symbol+ exists.
+ *  Returns a +true+ if a local variable +symbol+ exists.
  *
  *	def foo
  *  	  a = 1
@@ -562,7 +568,7 @@ bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val)
  *  	  binding.local_variable_defined?(:b) #=> false
  *  	end
  *
- *  This method is the short version of the following code:
+ *  This method is short version of the following code.
  *
  *	binding.eval("defined?(#{symbol}) == 'local-variable'")
  *
@@ -572,13 +578,11 @@ bind_local_variable_defined_p(VALUE bindval, VALUE sym)
 {
     ID lid = check_local_id(bindval, &sym);
     const rb_binding_t *bind;
-    const rb_env_t *env;
 
     if (!lid) return Qfalse;
 
     GetBindingPtr(bindval, bind);
-    env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
-    return get_local_variable_ptr(&env, lid) ? Qtrue : Qfalse;
+    return get_local_variable_ptr(VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block)), lid) ? Qtrue : Qfalse;
 }
 
 /*
@@ -595,24 +599,6 @@ bind_receiver(VALUE bindval)
     return vm_block_self(&bind->block);
 }
 
-/*
- *  call-seq:
- *     binding.source_location  -> [String, Integer]
- *
- *  Returns the Ruby source filename and line number of the binding object.
- */
-static VALUE
-bind_location(VALUE bindval)
-{
-    VALUE loc[2];
-    const rb_binding_t *bind;
-    GetBindingPtr(bindval, bind);
-    loc[0] = pathobj_path(bind->pathobj);
-    loc[1] = INT2FIX(bind->first_lineno);
-
-    return rb_ary_new4(2, loc);
-}
-
 static VALUE
 cfunc_proc_new(VALUE klass, VALUE ifunc, int8_t is_lambda)
 {
@@ -648,47 +634,16 @@ sym_proc_new(VALUE klass, VALUE sym)
     return procval;
 }
 
-struct vm_ifunc *
-rb_vm_ifunc_new(VALUE (*func)(ANYARGS), const void *data, int min_argc, int max_argc)
-{
-    union {
-	struct vm_ifunc_argc argc;
-	VALUE packed;
-    } arity;
-
-    if (min_argc < UNLIMITED_ARGUMENTS ||
-#if SIZEOF_INT * 2 > SIZEOF_VALUE
-	min_argc >= (int)(1U << (SIZEOF_VALUE * CHAR_BIT) / 2) ||
-#endif
-	0) {
-	rb_raise(rb_eRangeError, "minimum argument number out of range: %d",
-		 min_argc);
-    }
-    if (max_argc < UNLIMITED_ARGUMENTS ||
-#if SIZEOF_INT * 2 > SIZEOF_VALUE
-	max_argc >= (int)(1U << (SIZEOF_VALUE * CHAR_BIT) / 2) ||
-#endif
-	0) {
-	rb_raise(rb_eRangeError, "maximum argument number out of range: %d",
-		 max_argc);
-    }
-    arity.argc.min = min_argc;
-    arity.argc.max = max_argc;
-    return IFUNC_NEW(func, data, arity.packed);
-}
-
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_func_proc_new(rb_block_call_func_t func, VALUE val)
 {
-    struct vm_ifunc *ifunc = rb_vm_ifunc_proc_new(func, (void *)val);
-    return cfunc_proc_new(rb_cProc, (VALUE)ifunc, 0);
+    return cfunc_proc_new(rb_cProc, (VALUE)IFUNC_NEW(func, val, 0), 0);
 }
 
 VALUE
-rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc)
+rb_func_lambda_new(rb_block_call_func_t func, VALUE val)
 {
-    struct vm_ifunc *ifunc = rb_vm_ifunc_new(func, (void *)val, min_argc, max_argc);
-    return cfunc_proc_new(rb_cProc, (VALUE)ifunc, 1);
+    return cfunc_proc_new(rb_cProc, (VALUE)IFUNC_NEW(func, val, 0), 1);
 }
 
 static const char proc_without_block[] = "tried to create Proc object without a block";
@@ -697,8 +652,8 @@ static VALUE
 proc_new(VALUE klass, int8_t is_lambda)
 {
     VALUE procval;
-    const rb_execution_context_t *ec = GET_EC();
-    rb_control_frame_t *cfp = ec->cfp;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     VALUE block_handler;
 
     if ((block_handler = rb_vm_frame_block_handler(cfp)) == VM_BLOCK_HANDLER_NONE) {
@@ -706,6 +661,13 @@ proc_new(VALUE klass, int8_t is_lambda)
 	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 
 	if ((block_handler = rb_vm_frame_block_handler(cfp)) != VM_BLOCK_HANDLER_NONE) {
+	    const VALUE *lep = rb_vm_ep_local_ep(cfp->ep);
+
+	    if (VM_ENV_ESCAPED_P(lep)) {
+		procval = VM_ENV_PROCVAL(lep);
+		goto return_existing_proc;
+	    }
+
 	    if (is_lambda) {
 		rb_warn(proc_without_block);
 	    }
@@ -723,12 +685,13 @@ proc_new(VALUE klass, int8_t is_lambda)
       case block_handler_type_proc:
 	procval = VM_BH_TO_PROC(block_handler);
 
+      return_existing_proc:
 	if (RBASIC_CLASS(procval) == klass) {
 	    return procval;
 	}
 	else {
-	    VALUE newprocval = rb_proc_dup(procval);
-            RBASIC_SET_CLASS(newprocval, klass);
+	    VALUE newprocval = proc_dup(procval);
+	    RBASIC_SET_CLASS(newprocval, klass);
 	    return newprocval;
 	}
 	break;
@@ -741,7 +704,7 @@ proc_new(VALUE klass, int8_t is_lambda)
 
       case block_handler_type_ifunc:
       case block_handler_type_iseq:
-	return rb_vm_make_proc_lambda(ec, VM_BH_TO_CAPT_BLOCK(block_handler), klass, is_lambda);
+	return rb_vm_make_proc_lambda(th, VM_BH_TO_CAPT_BLOCK(block_handler), klass, is_lambda);
     }
     VM_UNREACHABLE(proc_new);
     return Qnil;
@@ -800,55 +763,58 @@ rb_block_lambda(void)
     return proc_new(rb_cProc, TRUE);
 }
 
-/*  Document-method: Proc#===
+/*  Document-method: ===
  *
  *  call-seq:
  *     proc === obj   -> result_of_proc
  *
- *  Invokes the block with +obj+ as the proc's parameter like Proc#call.
- *  This allows a proc object to be the target of a +when+ clause
- *  in a case statement.
+ *  Invokes the block with +obj+ as the proc's parameter like Proc#call.  It
+ *  is to allow a proc object to be a target of +when+ clause in a case
+ *  statement.
  */
 
 /* CHECKME: are the argument checking semantics correct? */
 
 /*
- *  Document-method: Proc#[]
- *  Document-method: Proc#call
- *  Document-method: Proc#yield
+ *  Document-method: call
+ *  Document-method: []
+ *  Document-method: yield
  *
  *  call-seq:
  *     prc.call(params,...)   -> obj
  *     prc[params,...]        -> obj
  *     prc.(params,...)       -> obj
- *     prc.yield(params,...)  -> obj
  *
  *  Invokes the block, setting the block's parameters to the values in
  *  <i>params</i> using something close to method calling semantics.
- *  Returns the value of the last expression evaluated in the block.
+ *  Generates a warning if multiple values are passed to a proc that
+ *  expects just one (previously this silently converted the parameters
+ *  to an array).  Note that <code>prc.()</code> invokes
+ *  <code>prc.call()</code> with the parameters given.  It's a syntax sugar to
+ *  hide "call".
  *
- *     a_proc = Proc.new {|scalar, *values| values.map {|value| value*scalar } }
- *     a_proc.call(9, 1, 2, 3)    #=> [9, 18, 27]
- *     a_proc[9, 1, 2, 3]         #=> [9, 18, 27]
- *     a_proc.(9, 1, 2, 3)        #=> [9, 18, 27]
- *     a_proc.yield(9, 1, 2, 3)   #=> [9, 18, 27]
+ *  Returns the value of the last expression evaluated in the block. See
+ *  also Proc#yield.
  *
- *  Note that <code>prc.()</code> invokes <code>prc.call()</code> with
- *  the parameters given.  It's syntactic sugar to hide "call".
+ *     a_proc = Proc.new { |scalar, *values| values.collect { |value| value*scalar } }
+ *     a_proc.call(9, 1, 2, 3)   #=> [9, 18, 27]
+ *     a_proc[9, 1, 2, 3]        #=> [9, 18, 27]
+ *     a_proc.(9, 1, 2, 3)       #=> [9, 18, 27]
  *
  *  For procs created using <code>lambda</code> or <code>->()</code> an error
- *  is generated if the wrong number of parameters are passed to the proc.
- *  For procs created using <code>Proc.new</code> or <code>Kernel.proc</code>,
- *  extra parameters are silently discarded and missing parameters are
- *  set to +nil+.
+ *  is generated if the wrong number of parameters are passed to a Proc with
+ *  multiple parameters.  For procs created using <code>Proc.new</code> or
+ *  <code>Kernel.proc</code>, extra parameters are silently discarded.
+ *
+ *     a_proc = lambda {|a,b| a}
+ *     a_proc.call(1,2,3)
  *
- *     a_proc = proc {|a,b| [a,b] }
- *     a_proc.call(1)   #=> [1, nil]
+ *  <em>produces:</em>
  *
- *     a_proc = lambda {|a,b| [a,b] }
- *     a_proc.call(1)   # ArgumentError: wrong number of arguments (given 1, expected 2)
+ *     prog.rb:4:in `block in <main>': wrong number of arguments (given 3, expected 2) (ArgumentError)
+ *     	from prog.rb:5:in `call'
+ *     	from prog.rb:5:in `<main>'
  *
- *  See also Proc#lambda?.
  */
 #if 0
 static VALUE
@@ -878,7 +844,7 @@ rb_proc_call(VALUE self, VALUE args)
     VALUE vret;
     rb_proc_t *proc;
     GetProcPtr(self, proc);
-    vret = rb_vm_invoke_proc(GET_EC(), proc,
+    vret = rb_vm_invoke_proc(GET_THREAD(), proc,
 			     check_argc(RARRAY_LEN(args)), RARRAY_CONST_PTR(args),
 			     VM_BLOCK_HANDLER_NONE);
     RB_GC_GUARD(self);
@@ -895,11 +861,11 @@ proc_to_block_handler(VALUE procval)
 VALUE
 rb_proc_call_with_block(VALUE self, int argc, const VALUE *argv, VALUE passed_procval)
 {
-    rb_execution_context_t *ec = GET_EC();
+    rb_thread_t *th = GET_THREAD();
     VALUE vret;
     rb_proc_t *proc;
     GetProcPtr(self, proc);
-    vret = rb_vm_invoke_proc(ec, proc, argc, argv, proc_to_block_handler(passed_procval));
+    vret = rb_vm_invoke_proc(th, proc, argc, argv, proc_to_block_handler(passed_procval));
     RB_GC_GUARD(self);
     return vret;
 }
@@ -916,7 +882,7 @@ rb_proc_call_with_block(VALUE self, int argc, const VALUE *argv, VALUE passed_pr
  *  number of mandatory arguments, with the exception for blocks that
  *  are not lambdas and have only a finite number of optional arguments;
  *  in this latter case, returns n.
- *  Keyword arguments will be considered as a single additional argument,
+ *  Keywords arguments will considered as a single additional argument,
  *  that argument being mandatory if any keyword argument is mandatory.
  *  A <code>proc</code> with no argument declarations
  *  is the same as a block declaring <code>||</code> as its arguments.
@@ -932,16 +898,16 @@ rb_proc_call_with_block(VALUE self, int argc, const VALUE *argv, VALUE passed_pr
  *     proc { |x:, y:, z:0| }.arity   #=>  1
  *     proc { |*a, x:, y:0| }.arity   #=> -2
  *
- *     proc   { |a=0| }.arity         #=>  0
- *     lambda { |a=0| }.arity         #=> -1
- *     proc   { |a=0, b| }.arity      #=>  1
- *     lambda { |a=0, b| }.arity      #=> -2
- *     proc   { |a=0, b=0| }.arity    #=>  0
- *     lambda { |a=0, b=0| }.arity    #=> -1
- *     proc   { |a, b=0| }.arity      #=>  1
- *     lambda { |a, b=0| }.arity      #=> -2
- *     proc   { |(a, b), c=0| }.arity #=>  1
- *     lambda { |(a, b), c=0| }.arity #=> -2
+ *     proc   { |x=0| }.arity         #=>  0
+ *     lambda { |x=0| }.arity         #=> -1
+ *     proc   { |x=0, y| }.arity      #=>  1
+ *     lambda { |x=0, y| }.arity      #=> -2
+ *     proc   { |x=0, y=0| }.arity    #=>  0
+ *     lambda { |x=0, y=0| }.arity    #=> -1
+ *     proc   { |x, y=0| }.arity      #=>  1
+ *     lambda { |x, y=0| }.arity      #=> -2
+ *     proc   { |(x, y), z=0| }.arity #=>  1
+ *     lambda { |(x, y), z=0| }.arity #=> -2
  *     proc   { |a, x:0, y:0| }.arity #=>  1
  *     lambda { |a, x:0, y:0| }.arity #=> -2
  */
@@ -964,15 +930,13 @@ rb_iseq_min_max_arity(const rb_iseq_t *iseq, int *max)
 }
 
 static int
-rb_vm_block_min_max_arity(const struct rb_block *block, int *max)
+rb_block_min_max_arity(const struct rb_block *block, int *max)
 {
-  again:
     switch (vm_block_type(block)) {
       case block_type_iseq:
-	return rb_iseq_min_max_arity(rb_iseq_check(block->as.captured.code.iseq), max);
+	return rb_iseq_min_max_arity(block->as.captured.code.iseq, max);
       case block_type_proc:
-	block = vm_proc_block(block->as.proc);
-	goto again;
+	return rb_block_min_max_arity(vm_proc_block(block->as.proc), max);
       case block_type_ifunc:
 	{
 	    const struct vm_ifunc *ifunc = block->as.captured.code.ifunc;
@@ -980,9 +944,8 @@ rb_vm_block_min_max_arity(const struct rb_block *block, int *max)
 		/* e.g. method(:foo).to_proc.arity */
 		return method_min_max_arity((VALUE)ifunc->data, max);
 	    }
-	    *max = ifunc->argc.max;
-	    return ifunc->argc.min;
 	}
+	/* fall through */
       case block_type_symbol:
 	break;
     }
@@ -1000,17 +963,18 @@ static int
 rb_proc_min_max_arity(VALUE self, int *max)
 {
     rb_proc_t *proc;
+    const struct rb_block *block;
     GetProcPtr(self, proc);
-    return rb_vm_block_min_max_arity(&proc->block, max);
+    block = &proc->block;
+    return rb_block_min_max_arity(block, max);
 }
 
 int
 rb_proc_arity(VALUE self)
 {
     rb_proc_t *proc;
-    int max, min;
+    int max, min = rb_proc_min_max_arity(self, &max);
     GetProcPtr(self, proc);
-    min = rb_vm_block_min_max_arity(&proc->block, &max);
     return (proc->is_lambda ? min == max : max != UNLIMITED_ARGUMENTS) ? min : -min-1;
 }
 
@@ -1040,8 +1004,8 @@ int
 rb_block_arity(void)
 {
     int min, max;
-    const rb_execution_context_t *ec = GET_EC();
-    rb_control_frame_t *cfp = ec->cfp;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
     VALUE block_handler = rb_vm_frame_block_handler(cfp);
     struct rb_block block;
 
@@ -1050,7 +1014,7 @@ rb_block_arity(void)
     }
 
     block_setup(&block, block_handler);
-    min = rb_vm_block_min_max_arity(&block, &max);
+    min = rb_block_min_max_arity(&block, &max);
 
     switch (vm_block_type(&block)) {
       case block_handler_type_symbol:
@@ -1070,22 +1034,6 @@ rb_block_arity(void)
     }
 }
 
-int
-rb_block_min_max_arity(int *max)
-{
-    const rb_execution_context_t *ec = GET_EC();
-    rb_control_frame_t *cfp = ec->cfp;
-    VALUE block_handler = rb_vm_frame_block_handler(cfp);
-    struct rb_block block;
-
-    if (block_handler == VM_BLOCK_HANDLER_NONE) {
-	rb_raise(rb_eArgError, "no block given");
-    }
-
-    block_setup(&block, block_handler);
-    return rb_vm_block_min_max_arity(&block, max);
-}
-
 const rb_iseq_t *
 rb_proc_get_iseq(VALUE self, int *is_proc)
 {
@@ -1128,18 +1076,22 @@ iseq_location(const rb_iseq_t *iseq)
 
     if (!iseq) return Qnil;
     rb_iseq_check(iseq);
-    loc[0] = rb_iseq_path(iseq);
-    loc[1] = iseq->body->location.first_lineno;
-
+    loc[0] = iseq->body->location.path;
+    if (iseq->body->line_info_table) {
+	loc[1] = rb_iseq_first_lineno(iseq);
+    }
+    else {
+	loc[1] = Qnil;
+    }
     return rb_ary_new4(2, loc);
 }
 
 /*
  * call-seq:
- *    prc.source_location  -> [String, Integer]
+ *    prc.source_location  -> [String, Fixnum]
  *
  * Returns the Ruby source filename and line number containing this proc
- * or +nil+ if this proc was not defined in Ruby (i.e. native).
+ * or +nil+ if this proc was not defined in Ruby (i.e. native)
  */
 
 VALUE
@@ -1148,8 +1100,8 @@ rb_proc_location(VALUE self)
     return iseq_location(rb_proc_get_iseq(self, 0));
 }
 
-VALUE
-rb_unnamed_parameters(int arity)
+static VALUE
+unnamed_parameters(int arity)
 {
     VALUE a, param = rb_ary_new2((arity < 0) ? -arity : arity);
     int n = (arity < 0) ? ~arity : arity;
@@ -1183,7 +1135,7 @@ rb_proc_parameters(VALUE self)
     int is_proc;
     const rb_iseq_t *iseq = rb_proc_get_iseq(self, &is_proc);
     if (!iseq) {
-	return rb_unnamed_parameters(rb_proc_arity(self));
+	return unnamed_parameters(rb_proc_arity(self));
     }
     return rb_iseq_parameters(iseq, is_proc);
 }
@@ -1198,7 +1150,7 @@ rb_hash_proc(st_index_t hash, VALUE prc)
     return rb_hash_uint(hash, (st_index_t)proc->block.as.captured.ep >> 16);
 }
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_sym_to_proc(VALUE sym)
 {
     static VALUE sym_proc_cache = Qfalse;
@@ -1206,6 +1158,7 @@ rb_sym_to_proc(VALUE sym)
     VALUE proc;
     long index;
     ID id;
+    VALUE *aryp;
 
     if (!sym_proc_cache) {
 	sym_proc_cache = rb_ary_tmp_new(SYM_PROC_CACHE_SIZE * 2);
@@ -1216,13 +1169,14 @@ rb_sym_to_proc(VALUE sym)
     id = SYM2ID(sym);
     index = (id % SYM_PROC_CACHE_SIZE) << 1;
 
-    if (RARRAY_AREF(sym_proc_cache, index) == sym) {
-        return RARRAY_AREF(sym_proc_cache, index + 1);
+    aryp = RARRAY_PTR(sym_proc_cache);
+    if (aryp[index] == sym) {
+	return aryp[index + 1];
     }
     else {
-        proc = sym_proc_new(rb_cProc, ID2SYM(id));
-        RARRAY_ASET(sym_proc_cache, index, sym);
-        RARRAY_ASET(sym_proc_cache, index + 1, proc);
+	proc = sym_proc_new(rb_cProc, ID2SYM(id));
+	aryp[index] = sym;
+	aryp[index + 1] = proc;
 	return proc;
     }
 }
@@ -1243,14 +1197,27 @@ proc_hash(VALUE self)
     hash = rb_hash_start(0);
     hash = rb_hash_proc(hash, self);
     hash = rb_hash_end(hash);
-    return ST2FIX(hash);
+    return LONG2FIX(hash);
 }
 
-VALUE
-rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info)
+/*
+ * call-seq:
+ *   prc.to_s   -> string
+ *
+ * Returns the unique identifier for this proc, along with
+ * an indication of where the proc was defined.
+ */
+
+static VALUE
+proc_to_s_(VALUE self, const rb_proc_t *proc)
 {
-    VALUE cname = rb_obj_class(self);
-    VALUE str = rb_sprintf("#<%"PRIsVALUE":", cname);
+    VALUE str = 0;
+    const char *cname = rb_obj_classname(self);
+    const struct rb_block *block;
+    const char *is_lambda;
+
+    block = &proc->block;
+    is_lambda = proc->is_lambda ? " (lambda)" : "";
 
   again:
     switch (vm_block_type(block)) {
@@ -1260,39 +1227,36 @@ rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_i
       case block_type_iseq:
 	{
 	    const rb_iseq_t *iseq = rb_iseq_check(block->as.captured.code.iseq);
-	    rb_str_catf(str, "%p@%"PRIsVALUE":%d", (void *)self,
-			rb_iseq_path(iseq),
-			FIX2INT(iseq->body->location.first_lineno));
+	    int first_lineno = 0;
+	    if (iseq->body->line_info_table) {
+		first_lineno = FIX2INT(rb_iseq_first_lineno(iseq));
+	    }
+	    str = rb_sprintf("#<%s:%p@%"PRIsVALUE":%d%s>", cname, (void *)self,
+			     iseq->body->location.path, first_lineno, is_lambda);
 	}
 	break;
       case block_type_symbol:
-	rb_str_catf(str, "%p(&%+"PRIsVALUE")", (void *)self, block->as.symbol);
+	str = rb_sprintf("#<%s:%p(&%+"PRIsVALUE")%s>", cname, (void *)self,
+			 block->as.symbol, is_lambda);
 	break;
       case block_type_ifunc:
-	rb_str_catf(str, "%p", (void *)block->as.captured.code.ifunc);
+	str = rb_sprintf("#<%s:%p%s>", cname, proc->block.as.captured.code.ifunc,
+			 is_lambda);
 	break;
     }
 
-    if (additional_info) rb_str_cat_cstr(str, additional_info);
-    rb_str_cat_cstr(str, ">");
-    OBJ_INFECT_RAW(str, self);
+    if (OBJ_TAINTED(self)) {
+	OBJ_TAINT(str);
+    }
     return str;
 }
 
-/*
- * call-seq:
- *   prc.to_s   -> string
- *
- * Returns the unique identifier for this proc, along with
- * an indication of where the proc was defined.
- */
-
 static VALUE
 proc_to_s(VALUE self)
 {
     const rb_proc_t *proc;
     GetProcPtr(self, proc);
-    return rb_block_to_s(self, &proc->block, proc->is_lambda ? " (lambda)" : NULL);
+    return proc_to_s_(self, proc);
 }
 
 /*
@@ -1316,7 +1280,6 @@ bm_mark(void *ptr)
     struct METHOD *data = ptr;
     rb_gc_mark(data->recv);
     rb_gc_mark(data->klass);
-    rb_gc_mark(data->iclass);
     rb_gc_mark((VALUE)data->me);
 }
 
@@ -1384,7 +1347,7 @@ mnew_missing(VALUE klass, VALUE obj, ID id, VALUE mclass)
 }
 
 static VALUE
-mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
+mnew_internal(const rb_method_entry_t *me, VALUE klass,
 	      VALUE obj, ID id, VALUE mclass, int scope, int error)
 {
     struct METHOD *data;
@@ -1408,23 +1371,26 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
     }
     if (me->def->type == VM_METHOD_TYPE_ZSUPER) {
 	if (me->defined_class) {
-	    VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class));
+	    VALUE klass = RCLASS_SUPER(me->defined_class);
 	    id = me->def->original_id;
-	    me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id, &iclass);
+	    me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id);
 	}
 	else {
 	    VALUE klass = RCLASS_SUPER(me->owner);
 	    id = me->def->original_id;
-	    me = rb_method_entry_without_refinements(klass, id, &iclass);
+	    me = rb_method_entry_without_refinements(klass, id);
 	}
 	goto again;
     }
 
+    while (klass != me->owner && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
+	klass = RCLASS_SUPER(klass);
+    }
+
     method = TypedData_Make_Struct(mclass, struct METHOD, &method_data_type, data);
 
     RB_OBJ_WRITE(method, &data->recv, obj);
     RB_OBJ_WRITE(method, &data->klass, klass);
-    RB_OBJ_WRITE(method, &data->iclass, iclass);
     RB_OBJ_WRITE(method, &data->me, me);
 
     OBJ_INFECT(method, klass);
@@ -1432,25 +1398,24 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
 }
 
 static VALUE
-mnew_from_me(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
+mnew_from_me(const rb_method_entry_t *me, VALUE klass,
 	     VALUE obj, ID id, VALUE mclass, int scope)
 {
-    return mnew_internal(me, klass, iclass, obj, id, mclass, scope, TRUE);
+    return mnew_internal(me, klass, obj, id, mclass, scope, TRUE);
 }
 
 static VALUE
 mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
 {
     const rb_method_entry_t *me;
-    VALUE iclass = Qnil;
 
     if (obj == Qundef) { /* UnboundMethod */
-	me = rb_method_entry_without_refinements(klass, id, &iclass);
+	me = rb_method_entry_without_refinements(klass, id);
     }
     else {
-	me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id, &iclass);
+	me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id);
     }
-    return mnew_from_me(me, klass, iclass, obj, id, mclass, scope);
+    return mnew_from_me(me, klass, obj, id, mclass, scope);
 }
 
 static inline VALUE
@@ -1462,7 +1427,7 @@ method_entry_defined_class(const rb_method_entry_t *me)
 
 /**********************************************************************
  *
- * Document-class: Method
+ * Document-class : Method
  *
  *  Method objects are created by <code>Object#method</code>, and are
  *  associated with a particular object (not just with a class). They
@@ -1482,11 +1447,6 @@ method_entry_defined_class(const rb_method_entry_t *me)
  *     meth.call(9)                 #=> 81
  *     [ 1, 2, 3 ].collect(&meth)   #=> [1, 4, 9]
  *
- *     [ 1, 2, 3 ].each(&method(:puts)) #=> prints 1, 2, 3
- *
- *     require 'date'
- *     %w[2017-03-01 2017-03-02].collect(&Date.method(:parse))
- *     #=> [#<Date: 2017-03-01 ((2457814j,0s,0n),+0s,2299161j)>, #<Date: 2017-03-02 ((2457815j,0s,0n),+0s,2299161j)>]
  */
 
 /*
@@ -1547,7 +1507,7 @@ method_hash(VALUE method)
     hash = rb_hash_method_entry(hash, m->me);
     hash = rb_hash_end(hash);
 
-    return ST2FIX(hash);
+    return INT2FIX(hash);
 }
 
 /*
@@ -1581,8 +1541,6 @@ method_unbind(VALUE obj)
  *     meth.receiver    -> object
  *
  *  Returns the bound receiver of the method object.
- *
- *    (1..3).method(:map).receiver # => 1..3
  */
 
 static VALUE
@@ -1615,12 +1573,6 @@ method_name(VALUE obj)
  *     meth.original_name    -> symbol
  *
  *  Returns the original name of the method.
- *
- *    class C
- *      def foo; end
- *      alias bar foo
- *    end
- *    C.instance_method(:bar).original_name # => :foo
  */
 
 static VALUE
@@ -1637,9 +1589,6 @@ method_original_name(VALUE obj)
  *     meth.owner    -> class_or_module
  *
  *  Returns the class or module that defines the method.
- *  See also receiver.
- *
- *    (1..3).method(:map).owner #=> Enumerable
  */
 
 static VALUE
@@ -1653,7 +1602,7 @@ method_owner(VALUE obj)
 void
 rb_method_name_error(VALUE klass, VALUE str)
 {
-#define MSG(s) rb_fstring_lit("undefined method `%1$s' for"s" `%2$s'")
+#define MSG(s) rb_fstring_cstr("undefined method `%1$s' for"s" `%2$s'")
     VALUE c = klass;
     VALUE s;
 
@@ -1722,18 +1671,6 @@ obj_method(VALUE obj, VALUE vid, int scope)
  *     l = Demo.new('Fred')
  *     m = l.method("hello")
  *     m.call   #=> "Hello, @iv = Fred"
- *
- *  Note that <code>Method</code> implements <code>to_proc</code> method,
- *  which means it can be used with iterators.
- *
- *     [ 1, 2, 3 ].each(&method(:puts)) # => prints 3 lines to stdout
- *
- *     out = File.open('test.txt', 'w')
- *     [ 1, 2, 3 ].each(&out.method(:puts)) # => prints 3 lines to file
- *
- *     require 'date'
- *     %w[2017-03-01 2017-03-02].collect(&Date.method(:parse))
- *     #=> [#<Date: 2017-03-01 ((2457814j,0s,0n),+0s,2299161j)>, #<Date: 2017-03-02 ((2457815j,0s,0n),+0s,2299161j)>]
  */
 
 VALUE
@@ -1783,28 +1720,26 @@ VALUE
 rb_obj_singleton_method(VALUE obj, VALUE vid)
 {
     const rb_method_entry_t *me;
-    VALUE klass = rb_singleton_class_get(obj);
+    VALUE klass;
     ID id = rb_check_id(&vid);
 
-    if (NIL_P(klass) || NIL_P(klass = RCLASS_ORIGIN(klass))) {
-      undef:
-	rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
-			  obj, vid);
-    }
     if (!id) {
-	if (respond_to_missing_p(klass, obj, vid, FALSE)) {
+	if (!NIL_P(klass = rb_singleton_class_get(obj)) &&
+	    respond_to_missing_p(klass, obj, vid, FALSE)) {
 	    id = rb_intern_str(vid);
 	    return mnew_missing(klass, obj, id, rb_cMethod);
 	}
-	goto undef;
+      undef:
+	rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
+			  obj, vid);
     }
-    me = rb_method_entry_at(klass, id);
-    if (UNDEFINED_METHOD_ENTRY_P(me) ||
+    if (NIL_P(klass = rb_singleton_class_get(obj)) ||
+	UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) ||
 	UNDEFINED_REFINED_METHOD_P(me->def)) {
 	vid = ID2SYM(id);
 	goto undef;
     }
-    return mnew_from_me(me, klass, klass, obj, id, rb_cMethod, FALSE);
+    return mnew_from_me(me, klass, obj, id, rb_cMethod, FALSE);
 }
 
 /*
@@ -1873,14 +1808,16 @@ rb_mod_public_instance_method(VALUE mod, VALUE vid)
  *  Defines an instance method in the receiver. The _method_
  *  parameter can be a +Proc+, a +Method+ or an +UnboundMethod+ object.
  *  If a block is specified, it is used as the method body. This block
- *  is evaluated using <code>instance_eval</code>.
+ *  is evaluated using <code>instance_eval</code>, a point that is
+ *  tricky to demonstrate because <code>define_method</code> is private.
+ *  (This is why we resort to the +send+ hack in this example.)
  *
  *     class A
  *       def fred
  *         puts "In Fred"
  *       end
  *       def create_method(name, &block)
- *         self.class.define_method(name, &block)
+ *         self.class.send(:define_method, name, &block)
  *       end
  *       define_method(:wilma) { puts "Charge it!" }
  *     end
@@ -1922,8 +1859,8 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 #if PROC_NEW_REQUIRES_BLOCK
 	body = rb_block_lambda();
 #else
-	const rb_execution_context_t *ec = GET_EC();
-	VALUE block_handler = rb_vm_frame_block_handler(ec->cfp);
+	rb_thread_t *th = GET_THREAD();
+	VALUE block_handler = rb_vm_frame_block_handler(th->cfp);
 	if (block_handler == VM_BLOCK_HANDLER_NONE) rb_raise(rb_eArgError, proc_without_block);
 
 	switch (vm_block_handler_type(block_handler)) {
@@ -1935,7 +1872,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 	    break;
 	  case block_handler_type_iseq:
 	  case block_handler_type_ifunc:
-	    body = rb_vm_make_lambda(ec, VM_BH_TO_CAPT_BLOCK(block_handler), rb_cProc);
+	    body = rb_vm_make_proc_lambda(th, VM_BH_TO_CAPT_BLOCK(block_handler), rb_cProc, TRUE);
 	}
 #endif
     }
@@ -1967,7 +1904,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 	    else {
 		rb_raise(rb_eTypeError,
 			 "bind argument must be a subclass of % "PRIsVALUE,
-			 method->me->owner);
+			 rb_class_name(method->me->owner));
 	    }
 	}
 	rb_method_entry_set(mod, id, method->me, scope_visi->method_visi);
@@ -1977,7 +1914,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 	RB_GC_GUARD(body);
     }
     else {
-	VALUE procval = rb_proc_dup(body);
+	VALUE procval = proc_dup(body);
 	if (vm_proc_iseq(procval) != NULL) {
 	    rb_proc_t *proc;
 	    GetProcPtr(procval, proc);
@@ -2082,24 +2019,6 @@ method_clone(VALUE self)
     return clone;
 }
 
-/*  Document-method: Method#===
- *
- *  call-seq:
- *     method === obj   -> result_of_method
- *
- *  Invokes the method with +obj+ as the parameter like #call.
- *  This allows a method object to be the target of a +when+ clause
- *  in a case statement.
- *
- *      require 'prime'
- *
- *      case 1373
- *      when Prime.method(:prime?)
- *        # ...
- *      end
- */
-
-
 /*
  *  call-seq:
  *     meth.call(args, ...)    -> obj
@@ -2128,32 +2047,32 @@ method_callable_method_entry(const struct METHOD *data)
 }
 
 static inline VALUE
-call_method_data(rb_execution_context_t *ec, const struct METHOD *data,
+call_method_data(rb_thread_t *th, const struct METHOD *data,
 		 int argc, const VALUE *argv, VALUE passed_procval)
 {
-    vm_passed_block_handler_set(ec, proc_to_block_handler(passed_procval));
-    return rb_vm_call(ec, data->recv, data->me->called_id, argc, argv,
+    vm_passed_block_handler_set(th, proc_to_block_handler(passed_procval));
+    return rb_vm_call(th, data->recv, data->me->called_id, argc, argv,
 		      method_callable_method_entry(data));
 }
 
 static VALUE
-call_method_data_safe(rb_execution_context_t *ec, const struct METHOD *data,
+call_method_data_safe(rb_thread_t *th, const struct METHOD *data,
 		      int argc, const VALUE *argv, VALUE passed_procval,
 		      int safe)
 {
     VALUE result = Qnil;	/* OK */
-    enum ruby_tag_type state;
+    int state;
 
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    TH_PUSH_TAG(th);
+    if ((state = TH_EXEC_TAG()) == 0) {
 	/* result is used only if state == 0, no exceptions is caught. */
 	/* otherwise it doesn't matter even if clobbered. */
-	NO_CLOBBERED(result) = call_method_data(ec, data, argc, argv, passed_procval);
+	NO_CLOBBERED(result) = call_method_data(th, data, argc, argv, passed_procval);
     }
-    EC_POP_TAG();
+    TH_POP_TAG();
     rb_set_safe_level_force(safe);
     if (state)
-	EC_JUMP_TAG(ec, state);
+	TH_JUMP_TAG(th, state);
     return result;
 }
 
@@ -2161,7 +2080,7 @@ VALUE
 rb_method_call_with_block(int argc, const VALUE *argv, VALUE method, VALUE passed_procval)
 {
     const struct METHOD *data;
-    rb_execution_context_t *ec = GET_EC();
+    rb_thread_t *const th = GET_THREAD();
 
     TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
     if (data->recv == Qundef) {
@@ -2172,10 +2091,10 @@ rb_method_call_with_block(int argc, const VALUE *argv, VALUE method, VALUE passe
 	int safe = rb_safe_level();
 	if (safe < safe_level_to_run) {
 	    rb_set_safe_level_force(safe_level_to_run);
-	    return call_method_data_safe(ec, data, argc, argv, passed_procval, safe);
+	    return call_method_data_safe(th, data, argc, argv, passed_procval, safe);
 	}
     }
-    return call_method_data(ec, data, argc, argv, passed_procval);
+    return call_method_data(th, data, argc, argv, passed_procval);
 }
 
 /**********************************************************************
@@ -2287,7 +2206,7 @@ umethod_bind(VALUE method, VALUE recv)
 	}
 	else {
 	    rb_raise(rb_eTypeError, "bind argument must be an instance of % "PRIsVALUE,
-		     methclass);
+		     rb_class_name(methclass));
 	}
     }
 
@@ -2306,7 +2225,7 @@ umethod_bind(VALUE method, VALUE recv)
 	else {
 	    klass = rb_include_class_new(methclass, klass);
 	}
-	RB_OBJ_WRITE(method, &bound->me, rb_method_entry_complement_defined_class(bound->me, bound->me->called_id, klass));
+	RB_OBJ_WRITE(method, &bound->me, rb_method_entry_complement_defined_class(bound->me, klass));
     }
 
     return method;
@@ -2322,7 +2241,6 @@ rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
 {
     const rb_method_definition_t *def = me->def;
 
-  again:
     if (!def) return *max = 0;
     switch (def->type) {
       case VM_METHOD_TYPE_CFUNC:
@@ -2339,12 +2257,13 @@ rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
       case VM_METHOD_TYPE_IVAR:
 	return *max = 0;
       case VM_METHOD_TYPE_ALIAS:
-	def = def->body.alias.original_me->def;
-	goto again;
+	return rb_method_entry_min_max_arity(def->body.alias.original_me, max);
       case VM_METHOD_TYPE_BMETHOD:
-        return rb_proc_min_max_arity(def->body.bmethod.proc, max);
-      case VM_METHOD_TYPE_ISEQ:
-	return rb_iseq_min_max_arity(rb_iseq_check(def->body.iseq.iseqptr), max);
+	return rb_proc_min_max_arity(def->body.proc, max);
+      case VM_METHOD_TYPE_ISEQ: {
+	const rb_iseq_t *iseq = rb_iseq_check(def->body.iseq.iseqptr);
+	return rb_iseq_min_max_arity(iseq, max);
+      }
       case VM_METHOD_TYPE_UNDEF:
       case VM_METHOD_TYPE_NOTIMPLEMENTED:
 	return *max = 0;
@@ -2359,9 +2278,6 @@ rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
 	  case OPTIMIZED_METHOD_TYPE_CALL:
 	    *max = UNLIMITED_ARGUMENTS;
 	    return 0;
-	  case OPTIMIZED_METHOD_TYPE_BLOCK_CALL:
-	    *max = UNLIMITED_ARGUMENTS;
-	    return 0;
 	  default:
 	    break;
 	}
@@ -2372,7 +2288,7 @@ rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
 	return 0;
     }
     rb_bug("rb_method_entry_min_max_arity: invalid method entry type (%d)", def->type);
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 int
@@ -2389,10 +2305,8 @@ rb_method_entry_arity(const rb_method_entry_t *me)
  *  Returns an indication of the number of arguments accepted by a
  *  method. Returns a nonnegative integer for methods that take a fixed
  *  number of arguments. For Ruby methods that take a variable number of
- *  arguments, returns -n-1, where n is the number of required arguments.
- *  Keyword arguments will be considered as a single additional argument,
- *  that argument being mandatory if any keyword argument is mandatory.
- *  For methods written in C, returns -1 if the call takes a
+ *  arguments, returns -n-1, where n is the number of required
+ *  arguments. For methods written in C, returns -1 if the call takes a
  *  variable number of arguments.
  *
  *     class C
@@ -2402,10 +2316,6 @@ rb_method_entry_arity(const rb_method_entry_t *me)
  *       def four(a, b); end
  *       def five(a, b, *c);    end
  *       def six(a, b, *c, &d); end
- *       def seven(a, b, x:0); end
- *       def eight(x:, y:); end
- *       def nine(x:, y:, **z); end
- *       def ten(*a, x:, y:); end
  *     end
  *     c = C.new
  *     c.method(:one).arity     #=> 0
@@ -2414,10 +2324,6 @@ rb_method_entry_arity(const rb_method_entry_t *me)
  *     c.method(:four).arity    #=> 2
  *     c.method(:five).arity    #=> -3
  *     c.method(:six).arity     #=> -3
- *     c.method(:seven).arity   #=> -3
- *     c.method(:eight).arity   #=> 1
- *     c.method(:nine).arity    #=> 1
- *     c.method(:ten).arity     #=> -2
  *
  *     "cat".method(:size).arity      #=> 0
  *     "cat".method(:replace).arity   #=> 1
@@ -2478,8 +2384,8 @@ rb_obj_method_arity(VALUE obj, ID id)
     return rb_mod_method_arity(CLASS_OF(obj), id);
 }
 
-const rb_method_definition_t *
-rb_method_def(VALUE method)
+static inline const rb_method_definition_t *
+method_def(VALUE method)
 {
     const struct METHOD *data;
 
@@ -2494,7 +2400,7 @@ method_def_iseq(const rb_method_definition_t *def)
       case VM_METHOD_TYPE_ISEQ:
 	return rb_iseq_check(def->body.iseq.iseqptr);
       case VM_METHOD_TYPE_BMETHOD:
-        return rb_proc_get_iseq(def->body.bmethod.proc, 0);
+	return rb_proc_get_iseq(def->body.proc, 0);
       case VM_METHOD_TYPE_ALIAS:
 	return method_def_iseq(def->body.alias.original_me->def);
       case VM_METHOD_TYPE_CFUNC:
@@ -2514,13 +2420,13 @@ method_def_iseq(const rb_method_definition_t *def)
 const rb_iseq_t *
 rb_method_iseq(VALUE method)
 {
-    return method_def_iseq(rb_method_def(method));
+    return method_def_iseq(method_def(method));
 }
 
 static const rb_cref_t *
 method_cref(VALUE method)
 {
-    const rb_method_definition_t *def = rb_method_def(method);
+    const rb_method_definition_t *def = method_def(method);
 
   again:
     switch (def->type) {
@@ -2567,16 +2473,16 @@ rb_obj_method_location(VALUE obj, ID id)
 
 /*
  * call-seq:
- *    meth.source_location  -> [String, Integer]
+ *    meth.source_location  -> [String, Fixnum]
  *
  * Returns the Ruby source filename and line number containing this method
- * or nil if this method was not defined in Ruby (i.e. native).
+ * or nil if this method was not defined in Ruby (i.e. native)
  */
 
 VALUE
 rb_method_location(VALUE method)
 {
-    return method_def_location(rb_method_def(method));
+    return method_def_location(method_def(method));
 }
 
 /*
@@ -2603,7 +2509,7 @@ rb_method_parameters(VALUE method)
 {
     const rb_iseq_t *iseq = rb_method_iseq(method);
     if (!iseq) {
-	return rb_unnamed_parameters(method_arity(method));
+	return unnamed_parameters(method_arity(method));
     }
     return rb_iseq_parameters(iseq, 0);
 }
@@ -2613,13 +2519,9 @@ rb_method_parameters(VALUE method)
  *   meth.to_s      ->  string
  *   meth.inspect   ->  string
  *
- *  Returns a human-readable description of the underlying method.
+ *  Returns the name of the underlying method.
  *
  *    "cat".method(:count).inspect   #=> "#<Method: String#count>"
- *    (1..3).method(:map).inspect    #=> "#<Method: Range(Enumerable)#map>"
- *
- *  In the latter case, the method description includes the "owner" of the
- *  original method (+Enumerable+ module, which is included into +Range+).
  */
 
 static VALUE
@@ -2627,13 +2529,16 @@ method_inspect(VALUE method)
 {
     struct METHOD *data;
     VALUE str;
+    const char *s;
     const char *sharp = "#";
     VALUE mklass;
     VALUE defined_class;
 
     TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
-    str = rb_sprintf("#<% "PRIsVALUE": ", rb_obj_class(method));
-    OBJ_INFECT_RAW(str, method);
+    str = rb_str_buf_new2("#<");
+    s = rb_obj_classname(method);
+    rb_str_buf_cat2(str, s);
+    rb_str_buf_cat2(str, ": ");
 
     mklass = data->klass;
 
@@ -2667,9 +2572,11 @@ method_inspect(VALUE method)
 	}
     }
     else {
-	rb_str_buf_append(str, rb_inspect(mklass));
+	rb_str_buf_append(str, rb_class_name(mklass));
 	if (defined_class != mklass) {
-	    rb_str_catf(str, "(% "PRIsVALUE")", defined_class);
+	    rb_str_buf_cat2(str, "(");
+	    rb_str_buf_append(str, rb_class_name(defined_class));
+	    rb_str_buf_cat2(str, ")");
 	}
     }
     rb_str_buf_cat2(str, sharp);
@@ -2753,19 +2660,15 @@ static VALUE
 method_super_method(VALUE method)
 {
     const struct METHOD *data;
-    VALUE super_class, iclass;
-    ID mid;
+    VALUE super_class;
     const rb_method_entry_t *me;
 
     TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
-    iclass = data->iclass;
-    if (!iclass) return Qnil;
-    super_class = RCLASS_SUPER(RCLASS_ORIGIN(iclass));
-    mid = data->me->called_id;
+    super_class = RCLASS_SUPER(method_entry_defined_class(data->me));
     if (!super_class) return Qnil;
-    me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(super_class, mid, &iclass);
+    me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(super_class, data->me->called_id);
     if (!me) return Qnil;
-    return mnew_internal(me, me->owner, iclass, data->recv, mid, rb_obj_class(method), FALSE, FALSE);
+    return mnew_internal(me, super_class, data->recv, data->me->called_id, rb_obj_class(method), FALSE, FALSE);
 }
 
 /*
@@ -2823,7 +2726,9 @@ env_clone(const rb_env_t *env, const rb_cref_t *cref)
  *  call-seq:
  *     prc.binding    -> binding
  *
- *  Returns the binding associated with <i>prc</i>.
+ *  Returns the binding associated with <i>prc</i>. Note that
+ *  <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
+ *  <code>Binding</code> object as its second parameter.
  *
  *     def fred(param)
  *       proc {}
@@ -2863,15 +2768,12 @@ proc_binding(VALUE self)
 	    const struct vm_ifunc *ifunc = block->as.captured.code.ifunc;
 	    if (IS_METHOD_PROC_IFUNC(ifunc)) {
 		VALUE method = (VALUE)ifunc->data;
-		VALUE name = rb_fstring_lit("<empty_iseq>");
-		rb_iseq_t *empty;
 		binding_self = method_receiver(method);
 		iseq = rb_method_iseq(method);
 		env = VM_ENV_ENVVAL_PTR(block->as.captured.ep);
 		env = env_clone(env, method_cref(method));
 		/* set empty iseq */
-		empty = rb_iseq_new(NULL, name, name, Qnil, 0, ISEQ_TYPE_TOP);
-		RB_OBJ_WRITE(env, &env->iseq, empty);
+		RB_OBJ_WRITE(env, &env->iseq, rb_iseq_new(NULL, rb_str_new2("<empty iseq>"), rb_str_new2("<empty_iseq>"), Qnil, 0, ISEQ_TYPE_TOP));
 		break;
 	    }
 	    else {
@@ -2884,20 +2786,19 @@ proc_binding(VALUE self)
 
     bindval = rb_binding_alloc(rb_cBinding);
     GetBindingPtr(bindval, bind);
-    RB_OBJ_WRITE(bindval, &bind->block.as.captured.self, binding_self);
-    RB_OBJ_WRITE(bindval, &bind->block.as.captured.code.iseq, env->iseq);
-    rb_vm_block_ep_update(bindval, &bind->block, env->ep);
-    RB_OBJ_WRITTEN(bindval, Qundef, VM_ENV_ENVVAL(env->ep));
+
+    bind->block.as.captured.self = binding_self;
+    bind->block.as.captured.code.iseq = env->iseq;
+    bind->block.as.captured.ep = env->ep;
 
     if (iseq) {
 	rb_iseq_check(iseq);
-	RB_OBJ_WRITE(bindval, &bind->pathobj, iseq->body->location.pathobj);
+	bind->path = iseq->body->location.path;
 	bind->first_lineno = FIX2INT(rb_iseq_first_lineno(iseq));
     }
     else {
-	RB_OBJ_WRITE(bindval, &bind->pathobj,
-		     rb_iseq_pathobj_new(rb_fstring_lit("(binding)"), Qnil));
-	bind->first_lineno = 1;
+	bind->path = Qnil;
+	bind->first_lineno = 0;
     }
 
     return bindval;
@@ -2993,7 +2894,8 @@ proc_curry(int argc, const VALUE *argv, VALUE self)
     int sarity, max_arity, min_arity = rb_proc_min_max_arity(self, &max_arity);
     VALUE arity;
 
-    if (rb_check_arity(argc, 0, 1) == 0 || NIL_P(arity = argv[0])) {
+    rb_scan_args(argc, argv, "01", &arity);
+    if (NIL_P(arity)) {
 	arity = INT2FIX(min_arity);
     }
     else {
@@ -3045,136 +2947,6 @@ rb_method_curry(int argc, const VALUE *argv, VALUE self)
     return proc_curry(argc, argv, proc);
 }
 
-static VALUE
-compose(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
-{
-    VALUE f, g, fargs;
-    f = RARRAY_AREF(args, 0);
-    g = RARRAY_AREF(args, 1);
-
-    if (rb_obj_is_proc(g))
-        fargs = rb_proc_call_with_block(g, argc, argv, passed_proc);
-    else
-        fargs = rb_funcall_with_block(g, idCall, argc, argv, passed_proc);
-
-    if (rb_obj_is_proc(f))
-        return rb_proc_call(f, rb_ary_new3(1, fargs));
-    else
-        return rb_funcallv(f, idCall, 1, &fargs);
-}
-
-/*
- *  call-seq:
- *     prc << g -> a_proc
- *
- *  Returns a proc that is the composition of this proc and the given <i>g</i>.
- *  The returned proc takes a variable number of arguments, calls <i>g</i> with them
- *  then calls this proc with the result.
- *
- *     f = proc {|x| x * x }
- *     g = proc {|x| x + x }
- *     p (f << g).call(2) #=> 16
- */
-static VALUE
-proc_compose_to_left(VALUE self, VALUE g)
-{
-    VALUE proc, args, procs[2];
-    rb_proc_t *procp;
-    int is_lambda;
-
-    procs[0] = self;
-    procs[1] = g;
-    args = rb_ary_tmp_new_from_values(0, 2, procs);
-
-    GetProcPtr(self, procp);
-    is_lambda = procp->is_lambda;
-
-    proc = rb_proc_new(compose, args);
-    GetProcPtr(proc, procp);
-    procp->is_lambda = is_lambda;
-
-    return proc;
-}
-
-/*
- *  call-seq:
- *     prc >> g -> a_proc
- *
- *  Returns a proc that is the composition of this proc and the given <i>g</i>.
- *  The returned proc takes a variable number of arguments, calls <i>g</i> with them
- *  then calls this proc with the result.
- *
- *     f = proc {|x| x * x }
- *     g = proc {|x| x + x }
- *     p (f >> g).call(2) #=> 8
- */
-static VALUE
-proc_compose_to_right(VALUE self, VALUE g)
-{
-    VALUE proc, args, procs[2];
-    rb_proc_t *procp;
-    int is_lambda;
-
-    procs[0] = g;
-    procs[1] = self;
-    args = rb_ary_tmp_new_from_values(0, 2, procs);
-
-    GetProcPtr(self, procp);
-    is_lambda = procp->is_lambda;
-
-    proc = rb_proc_new(compose, args);
-    GetProcPtr(proc, procp);
-    procp->is_lambda = is_lambda;
-
-    return proc;
-}
-
-/*
- *  call-seq:
- *     meth << g -> a_proc
- *
- *  Returns a proc that is the composition of this method and the given <i>g</i>.
- *  The returned proc takes a variable number of arguments, calls <i>g</i> with them
- *  then calls this method with the result.
- *
- *     def f(x)
- *       x * x
- *     end
- *
- *     f = self.method(:f)
- *     g = proc {|x| x + x }
- *     p (f << g).call(2) #=> 16
- */
-static VALUE
-rb_method_compose_to_left(VALUE self, VALUE g)
-{
-    VALUE proc = method_to_proc(self);
-    return proc_compose_to_left(proc, g);
-}
-
-/*
- *  call-seq:
- *     meth >> g -> a_proc
- *
- *  Returns a proc that is the composition of this method and the given <i>g</i>.
- *  The returned proc takes a variable number of arguments, calls <i>g</i> with them
- *  then calls this method with the result.
- *
- *     def f(x)
- *       x * x
- *     end
- *
- *     f = self.method(:f)
- *     g = proc {|x| x + x }
- *     p (f >> g).call(2) #=> 8
- */
-static VALUE
-rb_method_compose_to_right(VALUE self, VALUE g)
-{
-    VALUE proc = method_to_proc(self);
-    return proc_compose_to_right(proc, g);
-}
-
 /*
  *  Document-class: LocalJumpError
  *
@@ -3219,25 +2991,12 @@ rb_method_compose_to_right(VALUE self, VALUE g)
  */
 
 /*
- *  Document-class: Proc
- *
- * A +Proc+ object is an encapsulation of a block of code, which can be stored
- * in a local variable, passed to a method or another Proc, and can be called.
- * Proc is an essential concept in Ruby and a core of its functional
- * programming features.
- *
- *      square = Proc.new {|x| x**2 }
- *
- *      square.call(3)  #=> 9
- *      # shorthands:
- *      square.(3)      #=> 9
- *      square[3]       #=> 9
- *
- * Proc objects are _closures_, meaning they remember and can use the entire
- * context in which they were created.
+ *  <code>Proc</code> objects are blocks of code that have been bound to
+ *  a set of local variables. Once bound, the code may be called in
+ *  different contexts and still access those variables.
  *
  *     def gen_times(factor)
- *       Proc.new {|n| n*factor } # remembers the value of factor at the moment of creation
+ *       return Proc.new {|n| n*factor }
  *     end
  *
  *     times3 = gen_times(3)
@@ -3247,170 +3006,17 @@ rb_method_compose_to_right(VALUE self, VALUE g)
  *     times5.call(5)                #=> 25
  *     times3.call(times5.call(4))   #=> 60
  *
- * == Creation
- *
- * There are several methods to create a Proc
- *
- * * Use the Proc class constructor:
- *
- *      proc1 = Proc.new {|x| x**2 }
- *
- * * Use the Kernel#proc method as a shorthand of Proc.new:
- *
- *      proc2 = proc {|x| x**2 }
- *
- * * Receiving a block of code into proc argument (note the <code>&</code>):
- *
- *      def make_proc(&block)
- *        block
- *      end
- *
- *      proc3 = make_proc {|x| x**2 }
- *
- * * Construct a proc with lambda semantics using the Kernel#lambda method
- *   (see below for explanations about lambdas):
- *
- *      lambda1 = lambda {|x| x**2 }
- *
- * * Use the Lambda literal syntax (also constructs a proc with lambda semantics):
- *
- *      lambda2 = ->(x) { x**2 }
- *
- * == Lambda and non-lambda semantics
- *
- * Procs are coming in two flavors: lambda and non-lambda (regular procs).
- * Differences are:
- *
- * * In lambdas, +return+ means exit from this lambda;
- * * In regular procs, +return+ means exit from embracing method
- *   (and will throw +LocalJumpError+ if invoked outside the method);
- * * In lambdas, arguments are treated in the same way as in methods: strict,
- *   with +ArgumentError+ for mismatching argument number,
- *   and no additional argument processing;
- * * Regular procs accept arguments more generously: missing arguments
- *   are filled with +nil+, single Array arguments are deconstructed if the
- *   proc has multiple arguments, and there is no error raised on extra
- *   arguments.
- *
- * Examples:
- *
- *      p = proc {|x, y| "x=#{x}, y=#{y}" }
- *      p.call(1, 2)      #=> "x=1, y=2"
- *      p.call([1, 2])    #=> "x=1, y=2", array deconstructed
- *      p.call(1, 2, 8)   #=> "x=1, y=2", extra argument discarded
- *      p.call(1)         #=> "x=1, y=", nil substituted instead of error
- *
- *      l = lambda {|x, y| "x=#{x}, y=#{y}" }
- *      l.call(1, 2)      #=> "x=1, y=2"
- *      l.call([1, 2])    # ArgumentError: wrong number of arguments (given 1, expected 2)
- *      l.call(1, 2, 8)   # ArgumentError: wrong number of arguments (given 3, expected 2)
- *      l.call(1)         # ArgumentError: wrong number of arguments (given 1, expected 2)
- *
- *      def test_return
- *        -> { return 3 }.call      # just returns from lambda into method body
- *        proc { return 4 }.call    # returns from method
- *        return 5
- *      end
- *
- *      test_return # => 4, return from proc
- *
- * Lambdas are useful as self-sufficient functions, in particular useful as
- * arguments to higher-order functions, behaving exactly like Ruby methods.
- *
- * Procs are useful for implementing iterators:
- *
- *      def test
- *        [[1, 2], [3, 4], [5, 6]].map {|a, b| return a if a + b > 10 }
- *                                  #  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- *      end
- *
- * Inside +map+, the block of code is treated as a regular (non-lambda) proc,
- * which means that the internal arrays will be deconstructed to pairs of
- * arguments, and +return+ will exit from the method +test+. That would
- * not be possible with a stricter lambda.
- *
- * You can tell a lambda from a regular proc by using the #lambda? instance method.
- *
- * Lambda semantics is typically preserved during the proc lifetime, including
- * <code>&</code>-deconstruction to a block of code:
- *
- *      p = proc {|x, y| x }
- *      l = lambda {|x, y| x }
- *      [[1, 2], [3, 4]].map(&p) #=> [1, 2]
- *      [[1, 2], [3, 4]].map(&l) # ArgumentError: wrong number of arguments (given 1, expected 2)
- *
- * The only exception is dynamic method definition: even if defined by
- * passing a non-lambda proc, methods still have normal semantics of argument
- * checking.
- *
- *   class C
- *     define_method(:e, &proc {})
- *   end
- *   C.new.e(1,2)       #=> ArgumentError
- *   C.new.method(:e).to_proc.lambda?   #=> true
- *
- * This exception ensures that methods never have unusual argument passing
- * conventions, and makes it easy to have wrappers defining methods that
- * behave as usual.
- *
- *   class C
- *     def self.def2(name, &body)
- *       define_method(name, &body)
- *     end
- *
- *     def2(:f) {}
- *   end
- *   C.new.f(1,2)       #=> ArgumentError
- *
- * The wrapper <i>def2</i> receives <code>body</code> as a non-lambda proc,
- * yet defines a method which has normal semantics.
- *
- * == Conversion of other objects to procs
- *
- * Any object that implements the +to_proc+ method can be converted into
- * a proc by the <code>&</code> operator, and therefore con be
- * consumed by iterators.
- *
- *      class Greater
- *        def initialize(greating)
- *          @greating = greating
- *        end
- *
- *        def to_proc
- *          proc {|name| "#{@greating}, #{name}!" }
- *        end
- *      end
- *
- *      hi = Greater.new("Hi")
- *      hey = Greater.new("Hey")
- *      ["Bob", "Jane"].map(&hi)    #=> ["Hi, Bob!", "Hi, Jane!"]
- *      ["Bob", "Jane"].map(&hey)   #=> ["Hey, Bob!", "Hey, Jane!"]
- *
- * Of the Ruby core classes, this method is implemented by Symbol,
- * Method, and Hash.
- *
- *      :to_s.to_proc.call(1)           #=> "1"
- *      [1, 2].map(&:to_s)              #=> ["1", "2"]
- *
- *      method(:puts).to_proc.call(1)   # prints 1
- *      [1, 2].each(&method(:puts))     # prints 1, 2
- *
- *      {test: 1}.to_proc.call(:test)       #=> 1
- *      %i[test many keys].map(&{test: 1})  #=> [1, nil, nil]
- *
  */
 
-
 void
 Init_Proc(void)
 {
-#undef rb_intern
     /* Proc */
     rb_cProc = rb_define_class("Proc", rb_cObject);
     rb_undef_alloc_func(rb_cProc);
     rb_define_singleton_method(rb_cProc, "new", rb_proc_s_new, -1);
 
-    rb_add_method(rb_cProc, idCall, VM_METHOD_TYPE_OPTIMIZED,
+    rb_add_method(rb_cProc, rb_intern("call"), VM_METHOD_TYPE_OPTIMIZED,
 		  (void *)OPTIMIZED_METHOD_TYPE_CALL, METHOD_VISI_PUBLIC);
     rb_add_method(rb_cProc, rb_intern("[]"), VM_METHOD_TYPE_OPTIMIZED,
 		  (void *)OPTIMIZED_METHOD_TYPE_CALL, METHOD_VISI_PUBLIC);
@@ -3429,15 +3035,13 @@ Init_Proc(void)
     rb_define_method(rb_cProc, "to_proc", proc_to_proc, 0);
     rb_define_method(rb_cProc, "arity", proc_arity, 0);
     rb_define_method(rb_cProc, "clone", proc_clone, 0);
-    rb_define_method(rb_cProc, "dup", rb_proc_dup, 0);
+    rb_define_method(rb_cProc, "dup", proc_dup, 0);
     rb_define_method(rb_cProc, "hash", proc_hash, 0);
     rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
     rb_define_alias(rb_cProc, "inspect", "to_s");
     rb_define_method(rb_cProc, "lambda?", rb_proc_lambda_p, 0);
     rb_define_method(rb_cProc, "binding", proc_binding, 0);
     rb_define_method(rb_cProc, "curry", proc_curry, -1);
-    rb_define_method(rb_cProc, "<<", proc_compose_to_left, 1);
-    rb_define_method(rb_cProc, ">>", proc_compose_to_right, 1);
     rb_define_method(rb_cProc, "source_location", rb_proc_location, 0);
     rb_define_method(rb_cProc, "parameters", rb_proc_parameters, 0);
 
@@ -3462,10 +3066,7 @@ Init_Proc(void)
     rb_define_method(rb_cMethod, "hash", method_hash, 0);
     rb_define_method(rb_cMethod, "clone", method_clone, 0);
     rb_define_method(rb_cMethod, "call", rb_method_call, -1);
-    rb_define_method(rb_cMethod, "===", rb_method_call, -1);
     rb_define_method(rb_cMethod, "curry", rb_method_curry, -1);
-    rb_define_method(rb_cMethod, "<<", rb_method_compose_to_left, 1);
-    rb_define_method(rb_cMethod, ">>", rb_method_compose_to_right, 1);
     rb_define_method(rb_cMethod, "[]", rb_method_call, -1);
     rb_define_method(rb_cMethod, "arity", method_arity_m, 0);
     rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
@@ -3505,7 +3106,7 @@ Init_Proc(void)
     /* Module#*_method */
     rb_define_method(rb_cModule, "instance_method", rb_mod_instance_method, 1);
     rb_define_method(rb_cModule, "public_instance_method", rb_mod_public_instance_method, 1);
-    rb_define_method(rb_cModule, "define_method", rb_mod_define_method, -1);
+    rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
 
     /* Kernel */
     rb_define_method(rb_mKernel, "define_singleton_method", rb_obj_define_method, -1);
@@ -3532,7 +3133,7 @@ Init_Proc(void)
  *         @secret = n
  *       end
  *       def get_binding
- *         binding
+ *         return binding()
  *       end
  *     end
  *
@@ -3563,6 +3164,5 @@ Init_Binding(void)
     rb_define_method(rb_cBinding, "local_variable_set", bind_local_variable_set, 2);
     rb_define_method(rb_cBinding, "local_variable_defined?", bind_local_variable_defined_p, 1);
     rb_define_method(rb_cBinding, "receiver", bind_receiver, 0);
-    rb_define_method(rb_cBinding, "source_location", bind_location, 0);
     rb_define_global_function("binding", rb_f_binding, 0);
 }
diff --git a/process.c b/process.c
index 47f4771974..7827f03dc2 100644
--- a/process.c
+++ b/process.c
@@ -11,13 +11,11 @@
 
 **********************************************************************/
 
-#include "ruby/config.h"
-#include "ruby/io.h"
 #include "internal.h"
+#include "ruby/io.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
 #include "vm_core.h"
-#include "hrtime.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -63,6 +61,13 @@
 #include "ruby/st.h"
 
 #include <sys/stat.h>
+#if defined(__native_client__) && defined(NACL_NEWLIB)
+# include <sys/unistd.h>
+# include "nacl/stat.h"
+# include "nacl/unistd.h"
+# include "nacl/resource.h"
+# undef HAVE_ISSETUGID
+#endif
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -145,9 +150,11 @@ int setregid(rb_gid_t rgid, rb_gid_t egid);
 #endif
 #endif
 
+#define preserving_errno(stmts) \
+	do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
+
 static void check_uid_switch(void);
 static void check_gid_switch(void);
-static int exec_async_signal_safe(const struct rb_execarg *, char *, size_t);
 
 #if 1
 #define p_uid_from_name p_uid_from_name
@@ -165,7 +172,7 @@ static int exec_async_signal_safe(const struct rb_execarg *, char *, size_t);
 #   define PREPARE_GETPWNAM \
     VALUE getpw_buf = 0
 #   define FINISH_GETPWNAM \
-    (getpw_buf ? (void)rb_str_resize(getpw_buf, 0) : (void)0)
+    ALLOCV_END(getpw_buf)
 #   define OBJ2UID1(id) obj2uid((id), &getpw_buf)
 #   define OBJ2UID(id) obj2uid0(id)
 static rb_uid_t obj2uid(VALUE id, VALUE *getpw_buf);
@@ -207,7 +214,7 @@ static rb_uid_t obj2uid(VALUE id);
 #   define PREPARE_GETGRNAM \
     VALUE getgr_buf = 0
 #   define FINISH_GETGRNAM \
-    (getgr_buf ? (void)rb_str_resize(getgr_buf, 0) : (void)0)
+    ALLOCV_END(getgr_buf)
 #   define OBJ2GID1(id) obj2gid((id), &getgr_buf)
 #   define OBJ2GID(id) obj2gid0(id)
 static rb_gid_t obj2gid(VALUE id, VALUE *getgr_buf);
@@ -250,7 +257,6 @@ typedef unsigned LONG_LONG unsigned_clock_t;
 typedef void (*sig_t) (int);
 #endif
 
-#define id_exception idException
 static ID id_in, id_out, id_err, id_pid, id_uid, id_gid;
 static ID id_close, id_child;
 #ifdef HAVE_SETPGID
@@ -275,6 +281,8 @@ static ID id_CLOCK_BASED_CLOCK_PROCESS_CPUTIME_ID;
 static ID id_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC;
 #endif
 static ID id_hertz;
+extern ID ruby_static_id_status;
+#define id_status ruby_static_id_status
 
 /* execv and execl are async-signal-safe since SUSv4 (POSIX.1-2008, XPG7) */
 #if defined(__sun) && !defined(_XPG7) /* Solaris 10, 9, ... */
@@ -285,30 +293,12 @@ static ID id_hertz;
 #define ALWAYS_NEED_ENVP 0
 #endif
 
-static void
-assert_close_on_exec(int fd)
-{
-#if VM_CHECK_MODE > 0
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(FD_CLOEXEC)
-    int flags = fcntl(fd, F_GETFD);
-    if (flags == -1) {
-        static const char m[] = "reserved FD closed unexpectedly?\n";
-        (void)!write(2, m, sizeof(m) - 1);
-        return;
-    }
-    if (flags & FD_CLOEXEC) return;
-    rb_bug("reserved FD did not have close-on-exec set");
-#else
-    rb_bug("reserved FD without close-on-exec support");
-#endif /* FD_CLOEXEC */
-#endif /* VM_CHECK_MODE */
-}
-
 static inline int
 close_unless_reserved(int fd)
 {
+    /* We should not have reserved FDs at this point */
     if (rb_reserved_fd_p(fd)) { /* async-signal-safe */
-        assert_close_on_exec(fd);
+        rb_async_bug_errno("BUG timer thread still running", 0 /* EDOOFUS */);
         return 0;
     }
     return close(fd); /* async-signal-safe */
@@ -414,12 +404,6 @@ parent_redirect_close(int fd)
 #endif
 
 /*
- * Document-module: Process
- *
- * Module to handle processes.
- */
-
-/*
  *  call-seq:
  *     Process.pid   -> integer
  *
@@ -497,27 +481,6 @@ rb_last_status_get(void)
     return GET_THREAD()->last_status;
 }
 
-/*
- *  call-seq:
- *     Process.last_status   -> Process::Status or nil
- *
- *  Returns the status of the last executed child process in the
- *  current thread.
- *
- *     Process.wait Process.spawn("ruby", "-e", "exit 13")
- *     Process.last_status   #=> #<Process::Status: pid 4825 exit 13>
- *
- *  If no child process has ever been executed in the current
- *  thread, this returns +nil+.
- *
- *     Process.last_status   #=> nil
- */
-static VALUE
-proc_s_last_status(VALUE mod)
-{
-    return rb_last_status_get();
-}
-
 void
 rb_last_status_set(int status, rb_pid_t pid)
 {
@@ -538,7 +501,7 @@ rb_last_status_clear(void)
  *     stat.to_i     -> integer
  *     stat.to_int   -> integer
  *
- *  Returns the bits in _stat_ as a <code>Integer</code>. Poking
+ *  Returns the bits in _stat_ as a <code>Fixnum</code>. Poking
  *  around in these bits is platform dependent.
  *
  *     fork { exit 0xab }         #=> 26566
@@ -571,18 +534,10 @@ pst_pid(VALUE st)
     return rb_attr_get(st, id_pid);
 }
 
-static VALUE pst_message_status(VALUE str, int status);
-
 static void
 pst_message(VALUE str, rb_pid_t pid, int status)
 {
     rb_str_catf(str, "pid %ld", (long)pid);
-    pst_message_status(str, status);
-}
-
-static VALUE
-pst_message_status(VALUE str, int status)
-{
     if (WIFSTOPPED(status)) {
 	int stopsig = WSTOPSIG(status);
 	const char *signame = ruby_signal_name(stopsig);
@@ -611,7 +566,6 @@ pst_message_status(VALUE str, int status)
 	rb_str_cat2(str, " (core dumped)");
     }
 #endif
-    return str;
 }
 
 
@@ -905,6 +859,12 @@ pst_wcoredump(VALUE st)
 #endif
 }
 
+struct waitpid_arg {
+    rb_pid_t pid;
+    int flags;
+    int *st;
+};
+
 static rb_pid_t
 do_waitpid(rb_pid_t pid, int *st, int flags)
 {
@@ -917,306 +877,46 @@ do_waitpid(rb_pid_t pid, int *st, int flags)
 #endif
 }
 
-#define WAITPID_LOCK_ONLY ((struct waitpid_state *)-1)
-
-struct waitpid_state {
-    struct list_node wnode;
-    rb_execution_context_t *ec;
-    rb_nativethread_cond_t *cond;
-    rb_pid_t ret;
-    rb_pid_t pid;
-    int status;
-    int options;
-    int errnum;
-};
-
-void rb_native_mutex_lock(rb_nativethread_lock_t *);
-void rb_native_mutex_unlock(rb_nativethread_lock_t *);
-void rb_native_cond_signal(rb_nativethread_cond_t *);
-void rb_native_cond_wait(rb_nativethread_cond_t *, rb_nativethread_lock_t *);
-int rb_sigwait_fd_get(const rb_thread_t *);
-void rb_sigwait_sleep(const rb_thread_t *, int fd, const rb_hrtime_t *);
-void rb_sigwait_fd_put(const rb_thread_t *, int fd);
-void rb_thread_sleep_interruptible(void);
-
-static int
-waitpid_signal(struct waitpid_state *w)
-{
-    if (w->ec) { /* rb_waitpid */
-        rb_threadptr_interrupt(rb_ec_thread_ptr(w->ec));
-        return TRUE;
-    }
-    else { /* ruby_waitpid_locked */
-        if (w->cond) {
-            rb_native_cond_signal(w->cond);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-/*
- * When a thread is done using sigwait_fd and there are other threads
- * sleeping on waitpid, we must kick one of the threads out of
- * rb_native_cond_wait so it can switch to rb_sigwait_sleep
- */
-static void
-sigwait_fd_migrate_sleeper(rb_vm_t *vm)
-{
-    struct waitpid_state *w = 0;
-
-    list_for_each(&vm->waiting_pids, w, wnode) {
-        if (waitpid_signal(w)) return;
-    }
-    list_for_each(&vm->waiting_grps, w, wnode) {
-        if (waitpid_signal(w)) return;
-    }
-}
-
-void
-rb_sigwait_fd_migrate(rb_vm_t *vm)
-{
-    rb_native_mutex_lock(&vm->waitpid_lock);
-    sigwait_fd_migrate_sleeper(vm);
-    rb_native_mutex_unlock(&vm->waitpid_lock);
-}
-
-#if RUBY_SIGCHLD
-extern volatile unsigned int ruby_nocldwait; /* signal.c */
-/* called by timer thread or thread which acquired sigwait_fd */
-static void
-waitpid_each(struct list_head *head)
-{
-    struct waitpid_state *w = 0, *next;
-
-    list_for_each_safe(head, w, next, wnode) {
-        rb_pid_t ret = do_waitpid(w->pid, &w->status, w->options | WNOHANG);
-
-        if (!ret) continue;
-        if (ret == -1) w->errnum = errno;
-
-        w->ret = ret;
-        list_del_init(&w->wnode);
-        waitpid_signal(w);
-    }
-}
-#else
-# define ruby_nocldwait 0
-#endif
-
-void
-ruby_waitpid_all(rb_vm_t *vm)
-{
-#if RUBY_SIGCHLD
-    rb_native_mutex_lock(&vm->waitpid_lock);
-    waitpid_each(&vm->waiting_pids);
-    if (list_empty(&vm->waiting_pids)) {
-        waitpid_each(&vm->waiting_grps);
-    }
-    /* emulate SA_NOCLDWAIT */
-    if (list_empty(&vm->waiting_pids) && list_empty(&vm->waiting_grps)) {
-        while (ruby_nocldwait && do_waitpid(-1, 0, WNOHANG) > 0)
-            ; /* keep looping */
-    }
-    rb_native_mutex_unlock(&vm->waitpid_lock);
-#endif
-}
-
-static void
-waitpid_state_init(struct waitpid_state *w, rb_pid_t pid, int options)
-{
-    w->ret = 0;
-    w->pid = pid;
-    w->options = options;
-}
-
-static const rb_hrtime_t *
-sigwait_sleep_time(void)
-{
-    if (SIGCHLD_LOSSY) {
-        static const rb_hrtime_t busy_wait = 100 * RB_HRTIME_PER_MSEC;
-
-        return &busy_wait;
-    }
-    return 0;
-}
-
-/*
- * must be called with vm->waitpid_lock held, this is not interruptible
- */
-rb_pid_t
-ruby_waitpid_locked(rb_vm_t *vm, rb_pid_t pid, int *status, int options,
-                    rb_nativethread_cond_t *cond)
-{
-    struct waitpid_state w;
-
-    assert(!ruby_thread_has_gvl_p() && "must not have GVL");
-
-    waitpid_state_init(&w, pid, options);
-    if (w.pid > 0 || list_empty(&vm->waiting_pids))
-        w.ret = do_waitpid(w.pid, &w.status, w.options | WNOHANG);
-    if (w.ret) {
-        if (w.ret == -1) w.errnum = errno;
-    }
-    else {
-        int sigwait_fd = -1;
-
-        w.ec = 0;
-        list_add(w.pid > 0 ? &vm->waiting_pids : &vm->waiting_grps, &w.wnode);
-        do {
-            if (sigwait_fd < 0)
-                sigwait_fd = rb_sigwait_fd_get(0);
-
-            if (sigwait_fd >= 0) {
-                w.cond = 0;
-                rb_native_mutex_unlock(&vm->waitpid_lock);
-                rb_sigwait_sleep(0, sigwait_fd, sigwait_sleep_time());
-                rb_native_mutex_lock(&vm->waitpid_lock);
-            }
-            else {
-                w.cond = cond;
-                rb_native_cond_wait(w.cond, &vm->waitpid_lock);
-            }
-        } while (!w.ret);
-        list_del(&w.wnode);
-
-        /* we're done, maybe other waitpid callers are not: */
-        if (sigwait_fd >= 0) {
-            rb_sigwait_fd_put(0, sigwait_fd);
-            sigwait_fd_migrate_sleeper(vm);
-        }
-    }
-    if (status) {
-        *status = w.status;
-    }
-    if (w.ret == -1) errno = w.errnum;
-    return w.ret;
-}
-
-static VALUE
-waitpid_sleep(VALUE x)
-{
-    struct waitpid_state *w = (struct waitpid_state *)x;
-
-    while (!w->ret) {
-        rb_thread_sleep_interruptible();
-    }
-
-    return Qfalse;
-}
-
-static VALUE
-waitpid_cleanup(VALUE x)
-{
-    struct waitpid_state *w = (struct waitpid_state *)x;
-
-    /*
-     * XXX w->ret is sometimes set but list_del is still needed, here,
-     * Not sure why, so we unconditionally do list_del here:
-     */
-    if (TRUE || w->ret == 0) {
-        rb_vm_t *vm = rb_ec_vm_ptr(w->ec);
-
-        rb_native_mutex_lock(&vm->waitpid_lock);
-        list_del(&w->wnode);
-        rb_native_mutex_unlock(&vm->waitpid_lock);
-    }
-
-    return Qfalse;
-}
-
-static void
-waitpid_wait(struct waitpid_state *w)
-{
-    rb_vm_t *vm = rb_ec_vm_ptr(w->ec);
-    int need_sleep = FALSE;
-
-    /*
-     * Lock here to prevent do_waitpid from stealing work from the
-     * ruby_waitpid_locked done by mjit workers since mjit works
-     * outside of GVL
-     */
-    rb_native_mutex_lock(&vm->waitpid_lock);
-
-    if (w->pid > 0 || list_empty(&vm->waiting_pids))
-        w->ret = do_waitpid(w->pid, &w->status, w->options | WNOHANG);
-    if (w->ret) {
-        if (w->ret == -1) w->errnum = errno;
-    }
-    else if (w->options & WNOHANG) {
-    }
-    else {
-        need_sleep = TRUE;
-    }
-
-    if (need_sleep) {
-        w->cond = 0;
-        /* order matters, favor specified PIDs rather than -1 or 0 */
-        list_add(w->pid > 0 ? &vm->waiting_pids : &vm->waiting_grps, &w->wnode);
-    }
-
-    rb_native_mutex_unlock(&vm->waitpid_lock);
-
-    if (need_sleep) {
-        rb_ensure(waitpid_sleep, (VALUE)w, waitpid_cleanup, (VALUE)w);
-    }
-}
-
 static void *
-waitpid_blocking_no_SIGCHLD(void *x)
+rb_waitpid_blocking(void *data)
 {
-    struct waitpid_state *w = x;
-
-    w->ret = do_waitpid(w->pid, &w->status, w->options);
-
-    return 0;
+    struct waitpid_arg *arg = data;
+    rb_pid_t result = do_waitpid(arg->pid, arg->st, arg->flags);
+    return (void *)(VALUE)result;
 }
 
-static void
-waitpid_no_SIGCHLD(struct waitpid_state *w)
+static rb_pid_t
+do_waitpid_nonblocking(rb_pid_t pid, int *st, int flags)
 {
-    if (w->options & WNOHANG) {
-        w->ret = do_waitpid(w->pid, &w->status, w->options);
-    }
-    else {
-        do {
-            rb_thread_call_without_gvl(waitpid_blocking_no_SIGCHLD, w,
-                                       RUBY_UBF_PROCESS, 0);
-        } while (w->ret < 0 && errno == EINTR && (RUBY_VM_CHECK_INTS(w->ec),1));
-    }
-    if (w->ret == -1)
-        w->errnum = errno;
+    void *result;
+    struct waitpid_arg arg;
+    arg.pid = pid;
+    arg.st = st;
+    arg.flags = flags;
+    result = rb_thread_call_without_gvl(rb_waitpid_blocking, &arg,
+					RUBY_UBF_PROCESS, 0);
+    return (rb_pid_t)(VALUE)result;
 }
 
 rb_pid_t
 rb_waitpid(rb_pid_t pid, int *st, int flags)
 {
-    struct waitpid_state w;
-
-    waitpid_state_init(&w, pid, flags);
-    w.ec = GET_EC();
+    rb_pid_t result;
 
-    if (WAITPID_USE_SIGCHLD) {
-        waitpid_wait(&w);
+    if (flags & WNOHANG) {
+	result = do_waitpid(pid, st, flags);
     }
     else {
-        waitpid_no_SIGCHLD(&w);
-    }
-
-    if (st) *st = w.status;
-    if (w.ret == -1) {
-        errno = w.errnum;
+	while ((result = do_waitpid_nonblocking(pid, st, flags)) < 0 &&
+	       (errno == EINTR)) {
+	    rb_thread_t *th = GET_THREAD();
+	    RUBY_VM_CHECK_INTS(th);
+	}
     }
-    else if (w.ret > 0) {
-        if (ruby_nocldwait) {
-            w.ret = -1;
-            errno = ECHILD;
-        }
-        else {
-            rb_last_status_set(w.status, w.ret);
-        }
+    if (result > 0) {
+	rb_last_status_set(*st, result);
     }
-    return w.ret;
+    return result;
 }
 
 
@@ -1477,39 +1177,6 @@ before_exec_non_async_signal_safe(void)
     rb_thread_stop_timer_thread();
 }
 
-#define WRITE_CONST(fd, str) (void)(write((fd),(str),sizeof(str)-1)<0)
-#ifdef _WIN32
-int rb_w32_set_nonblock2(int fd, int nonblock);
-#endif
-
-static int
-set_blocking(int fd)
-{
-#ifdef _WIN32
-    return rb_w32_set_nonblock2(fd, 0);
-#elif defined(F_GETFL) && defined(F_SETFL)
-    int fl = fcntl(fd, F_GETFL); /* async-signal-safe */
-
-    /* EBADF ought to be possible */
-    if (fl == -1) return fl;
-    if (fl & O_NONBLOCK) {
-        fl &= ~O_NONBLOCK;
-        return fcntl(fd, F_SETFL, fl);
-    }
-    return 0;
-#endif
-}
-
-static void
-stdfd_clear_nonblock(void)
-{
-    /* many programs cannot deal with non-blocking stdin/stdout/stderr */
-    int fd;
-    for (fd = 0; fd < 3; fd++) {
-        (void)set_blocking(fd); /* can't do much about errors anyhow */
-    }
-}
-
 static void
 before_exec(void)
 {
@@ -1537,15 +1204,8 @@ after_exec(void)
     after_exec_non_async_signal_safe();
 }
 
-#if defined HAVE_WORKING_FORK || defined HAVE_DAEMON
 #define before_fork_ruby() before_exec()
-static void
-after_fork_ruby(void)
-{
-    rb_threadptr_pending_interrupt_clear(GET_THREAD());
-    after_exec();
-}
-#endif
+#define after_fork_ruby() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec())
 
 #include "dln.h"
 
@@ -1559,10 +1219,10 @@ security(const char *str)
     }
 }
 
-#if defined(HAVE_WORKING_FORK)
+#if defined(HAVE_WORKING_FORK) && !defined(__native_client__)
 
 /* try_with_sh and exec_with_sh should be async-signal-safe. Actually it is.*/
-#define try_with_sh(err, prog, argv, envp) ((err == ENOEXEC) ? exec_with_sh((prog), (argv), (envp)) : (void)0)
+#define try_with_sh(prog, argv, envp) ((saved_errno == ENOEXEC) ? exec_with_sh((prog), (argv), (envp)) : (void)0)
 static void
 exec_with_sh(const char *prog, char **argv, char **envp)
 {
@@ -1575,37 +1235,34 @@ exec_with_sh(const char *prog, char **argv, char **envp)
 }
 
 #else
-#define try_with_sh(err, prog, argv, envp) (void)0
+#define try_with_sh(prog, argv, envp) (void)0
 #endif
 
 /* This function should be async-signal-safe.  Actually it is. */
 static int
 proc_exec_cmd(const char *prog, VALUE argv_str, VALUE envp_str)
 {
+#ifdef __native_client__
+    rb_notimplement();
+    UNREACHABLE;
+#else
     char **argv;
-#ifndef _WIN32
     char **envp;
-    int err;
-#endif
 
     argv = ARGVSTR2ARGV(argv_str);
 
     if (!prog) {
-	return ENOENT;
+	errno = ENOENT;
+	return -1;
     }
 
-#ifdef _WIN32
-    rb_w32_uaspawn(P_OVERLAY, prog, argv);
-    return errno;
-#else
-    envp = envp_str ? RB_IMEMO_TMPBUF_PTR(envp_str) : NULL;
+    envp = envp_str ? (char **)RSTRING_PTR(envp_str) : NULL;
     if (envp_str)
         execve(prog, argv, envp); /* async-signal-safe */
     else
         execv(prog, argv); /* async-signal-safe (since SUSv4) */
-    err = errno;
-    try_with_sh(err, prog, argv, envp); /* try_with_sh() is async-signal-safe. */
-    return err;
+    preserving_errno(try_with_sh(prog, argv, envp)); /* try_with_sh() is async-signal-safe. */
+    return -1;
 #endif
 }
 
@@ -1613,6 +1270,10 @@ proc_exec_cmd(const char *prog, VALUE argv_str, VALUE envp_str)
 static int
 proc_exec_sh(const char *str, VALUE envp_str)
 {
+#ifdef __native_client__
+    rb_notimplement();
+    UNREACHABLE;
+#else
     const char *s;
 
     s = str;
@@ -1620,12 +1281,15 @@ proc_exec_sh(const char *str, VALUE envp_str)
 	s++;
 
     if (!*s) {
-        return ENOENT;
+        errno = ENOENT;
+        return -1;
     }
 
 #ifdef _WIN32
     rb_w32_uspawn(P_OVERLAY, (char *)str, 0);
-#elif defined(__CYGWIN32__)
+    return -1;
+#else
+#if defined(__CYGWIN32__)
     {
         char fbuf[MAXPATHLEN];
         char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf));
@@ -1639,11 +1303,13 @@ proc_exec_sh(const char *str, VALUE envp_str)
     }
 #else
     if (envp_str)
-        execle("/bin/sh", "sh", "-c", str, (char *)NULL, RB_IMEMO_TMPBUF_PTR(envp_str)); /* async-signal-safe */
+        execle("/bin/sh", "sh", "-c", str, (char *)NULL, (char **)RSTRING_PTR(envp_str)); /* async-signal-safe */
     else
         execl("/bin/sh", "sh", "-c", str, (char *)NULL); /* async-signal-safe (since SUSv4) */
+#endif
+    return -1;
 #endif	/* _WIN32 */
-    return errno;
+#endif
 }
 
 int
@@ -1652,9 +1318,8 @@ rb_proc_exec(const char *str)
     int ret;
     before_exec();
     ret = proc_exec_sh(str, Qfalse);
-    after_exec();
-    errno = ret;
-    return -1;
+    preserving_errno(after_exec());
+    return ret;
 }
 
 static void
@@ -1679,7 +1344,6 @@ mark_exec_arg(void *ptr)
     rb_gc_mark(eargp->fd_open);
     rb_gc_mark(eargp->fd_dup2_child);
     rb_gc_mark(eargp->env_modification);
-    rb_gc_mark(eargp->path_env);
     rb_gc_mark(eargp->chdir_dir);
 }
 
@@ -1815,7 +1479,7 @@ check_exec_redirect_fd(VALUE v, int iskey)
         else
             goto wrong;
     }
-    else if (!NIL_P(tmp = rb_check_convert_type_with_id(v, T_FILE, "IO", idTo_io))) {
+    else if (!NIL_P(tmp = rb_check_convert_type(v, T_FILE, "IO", "to_io"))) {
         rb_io_t *fptr;
         GetOpenFile(tmp, fptr);
         if (fptr->tied_io_for_writing)
@@ -1936,7 +1600,7 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
         else if (RB_TYPE_P(key, T_ARRAY)) {
 	    int i;
 	    for (i = 0; i < RARRAY_LEN(key); i++) {
-                VALUE v = RARRAY_AREF(key, i);
+		VALUE v = RARRAY_PTR(key)[i];
 		VALUE fd = check_exec_redirect_fd(v, 1);
 		if (FIX2INT(fd) != 1 && FIX2INT(fd) != 2) break;
 	    }
@@ -1963,35 +1627,7 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
 }
 
 #if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
-static int rlimit_type_by_sym(VALUE key);
-
-static void
-rb_execarg_addopt_rlimit(struct rb_execarg *eargp, int rtype, VALUE val)
-{
-    VALUE ary = eargp->rlimit_limits;
-    VALUE tmp, softlim, hardlim;
-    if (eargp->rlimit_limits == Qfalse)
-	ary = eargp->rlimit_limits = hide_obj(rb_ary_new());
-    else
-	ary = eargp->rlimit_limits;
-    tmp = rb_check_array_type(val);
-    if (!NIL_P(tmp)) {
-	if (RARRAY_LEN(tmp) == 1)
-	    softlim = hardlim = rb_to_int(rb_ary_entry(tmp, 0));
-	else if (RARRAY_LEN(tmp) == 2) {
-	    softlim = rb_to_int(rb_ary_entry(tmp, 0));
-	    hardlim = rb_to_int(rb_ary_entry(tmp, 1));
-	}
-	else {
-	    rb_raise(rb_eArgError, "wrong exec rlimit option");
-	}
-    }
-    else {
-	softlim = hardlim = rb_to_int(val);
-    }
-    tmp = hide_obj(rb_ary_new3(3, INT2NUM(rtype), softlim, hardlim));
-    rb_ary_push(ary, tmp);
-}
+static int rlimit_type_by_lname(const char *name);
 #endif
 
 int
@@ -2000,19 +1636,12 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
 
     ID id;
+#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+    int rtype;
+#endif
 
     switch (TYPE(key)) {
       case T_SYMBOL:
-#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
-        {
-            int rtype = rlimit_type_by_sym(key);
-            if (rtype != -1) {
-                rb_execarg_addopt_rlimit(eargp, rtype, val);
-                RB_GC_GUARD(execarg_obj);
-                return ST_CONTINUE;
-            }
-        }
-#endif
         if (!(id = rb_check_id(&key))) return ST_STOP;
 #ifdef HAVE_SETPGID
         if (id == id_pgroup) {
@@ -2045,6 +1674,35 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
         }
         else
 #endif
+#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+        if (strncmp("rlimit_", rb_id2name(id), 7) == 0 &&
+            (rtype = rlimit_type_by_lname(rb_id2name(id)+7)) != -1) {
+            VALUE ary = eargp->rlimit_limits;
+            VALUE tmp, softlim, hardlim;
+            if (eargp->rlimit_limits == Qfalse)
+                ary = eargp->rlimit_limits = hide_obj(rb_ary_new());
+            else
+                ary = eargp->rlimit_limits;
+            tmp = rb_check_array_type(val);
+            if (!NIL_P(tmp)) {
+                if (RARRAY_LEN(tmp) == 1)
+                    softlim = hardlim = rb_to_int(rb_ary_entry(tmp, 0));
+                else if (RARRAY_LEN(tmp) == 2) {
+                    softlim = rb_to_int(rb_ary_entry(tmp, 0));
+                    hardlim = rb_to_int(rb_ary_entry(tmp, 1));
+                }
+                else {
+                    rb_raise(rb_eArgError, "wrong exec rlimit option");
+                }
+            }
+            else {
+                softlim = hardlim = rb_to_int(val);
+            }
+            tmp = hide_obj(rb_ary_new3(3, INT2NUM(rtype), softlim, hardlim));
+            rb_ary_push(ary, tmp);
+        }
+        else
+#endif
         if (id == id_unsetenv_others) {
             if (eargp->unsetenv_others_given) {
                 rb_raise(rb_eArgError, "unsetenv_others option specified twice");
@@ -2146,7 +1804,7 @@ check_exec_options_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
     VALUE execarg_obj = (VALUE)arg;
     if (rb_execarg_addopt(execarg_obj, key, val) != ST_CONTINUE) {
 	if (SYMBOL_P(key))
-	    rb_raise(rb_eArgError, "wrong exec option symbol: % "PRIsVALUE,
+	    rb_raise(rb_eArgError, "wrong exec option symbol: %"PRIsVALUE,
 		     key);
 	rb_raise(rb_eArgError, "wrong exec option");
     }
@@ -2250,7 +1908,7 @@ rb_check_exec_options(VALUE opthash, VALUE execarg_obj)
 {
     if (RHASH_EMPTY_P(opthash))
         return;
-    rb_hash_stlike_foreach(opthash, check_exec_options_i, (st_data_t)execarg_obj);
+    st_foreach(rb_hash_tbl_raw(opthash), check_exec_options_i, (st_data_t)execarg_obj);
 }
 
 VALUE
@@ -2261,23 +1919,16 @@ rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash)
         return Qnil;
     args[0] = execarg_obj;
     args[1] = Qnil;
-    rb_hash_stlike_foreach(opthash, check_exec_options_i_extract, (st_data_t)args);
+    st_foreach(rb_hash_tbl_raw(opthash), check_exec_options_i_extract, (st_data_t)args);
     return args[1];
 }
 
-#ifdef ENV_IGNORECASE
-#define ENVMATCH(s1, s2) (STRCASECMP((s1), (s2)) == 0)
-#else
-#define ENVMATCH(n1, n2) (strcmp((n1), (n2)) == 0)
-#endif
-
 static int
 check_exec_env_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
 {
     VALUE key = (VALUE)st_key;
     VALUE val = (VALUE)st_val;
-    VALUE env = ((VALUE *)arg)[0];
-    VALUE *path = &((VALUE *)arg)[1];
+    VALUE env = (VALUE)arg;
     char *k;
 
     k = StringValueCStr(key);
@@ -2290,25 +1941,20 @@ check_exec_env_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
     key = EXPORT_STR(key);
     if (!NIL_P(val)) val = EXPORT_STR(val);
 
-    if (ENVMATCH(k, PATH_ENV)) {
-	*path = val;
-    }
     rb_ary_push(env, hide_obj(rb_assoc_new(key, val)));
 
     return ST_CONTINUE;
 }
 
 static VALUE
-rb_check_exec_env(VALUE hash, VALUE *path)
+rb_check_exec_env(VALUE hash)
 {
-    VALUE env[2];
+    VALUE env;
 
-    env[0] = hide_obj(rb_ary_new());
-    env[1] = Qfalse;
-    rb_hash_stlike_foreach(hash, check_exec_env_i, (st_data_t)env);
-    *path = env[1];
+    env = hide_obj(rb_ary_new());
+    st_foreach(rb_hash_tbl_raw(hash), check_exec_env_i, (st_data_t)env);
 
-    return env[0];
+    return env;
 }
 
 static VALUE
@@ -2414,7 +2060,7 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VAL
         rb_check_exec_options(opthash, execarg_obj);
     }
     if (!NIL_P(env)) {
-        env = rb_check_exec_env(env, &eargp->path_env);
+        env = rb_check_exec_env(env);
         eargp->env_modification = env;
     }
 
@@ -2531,19 +2177,14 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VAL
                 }
             }
             eargp->invoke.cmd.argv_buf = argv_buf;
-            eargp->invoke.cmd.command_name =
-                hide_obj(rb_str_subseq(argv_buf, 0, strlen(RSTRING_PTR(argv_buf))));
-            rb_enc_copy(eargp->invoke.cmd.command_name, prog);
+            eargp->invoke.cmd.command_name = hide_obj(rb_str_new_cstr(RSTRING_PTR(argv_buf)));
         }
     }
 #endif
 
     if (!eargp->use_shell) {
 	const char *abspath;
-	const char *path_env = 0;
-	if (RTEST(eargp->path_env)) path_env = RSTRING_PTR(eargp->path_env);
-	abspath = dln_find_exe_r(RSTRING_PTR(eargp->invoke.cmd.command_name),
-				 path_env, fbuf, sizeof(fbuf));
+        abspath = dln_find_exe_r(RSTRING_PTR(eargp->invoke.cmd.command_name), 0, fbuf, sizeof(fbuf));
 	if (abspath)
 	    eargp->invoke.cmd.command_abspath = rb_str_new_cstr(abspath);
 	else
@@ -2579,12 +2220,22 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VAL
             p += strlen(p) + 1;
         }
         rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* terminator for execve.  */
-        eargp->invoke.cmd.argv_str =
-            rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(argv_str);
+        eargp->invoke.cmd.argv_str = argv_str;
     }
     RB_GC_GUARD(execarg_obj);
 }
 
+VALUE
+rb_execarg_new(int argc, const VALUE *argv, int accept_shell)
+{
+    VALUE execarg_obj;
+    struct rb_execarg *eargp;
+    execarg_obj = TypedData_Make_Struct(rb_cData, struct rb_execarg, &exec_arg_data_type, eargp);
+    hide_obj(execarg_obj);
+    rb_execarg_init(argc, argv, accept_shell, execarg_obj);
+    return execarg_obj;
+}
+
 struct rb_execarg *
 rb_execarg_get(VALUE execarg_obj)
 {
@@ -2593,45 +2244,28 @@ rb_execarg_get(VALUE execarg_obj)
     return eargp;
 }
 
-static VALUE
-rb_execarg_init(int argc, const VALUE *orig_argv, int accept_shell, VALUE execarg_obj, int allow_exc_opt)
+VALUE
+rb_execarg_init(int argc, const VALUE *orig_argv, int accept_shell, VALUE execarg_obj)
 {
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
-    VALUE prog, ret, exception = Qnil;
+    VALUE prog, ret;
     VALUE env = Qnil, opthash = Qnil;
     VALUE argv_buf;
     VALUE *argv = ALLOCV_N(VALUE, argv_buf, argc);
     MEMCPY(argv, orig_argv, VALUE, argc);
     prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash);
-    if (allow_exc_opt && !NIL_P(opthash) && rb_hash_has_key(opthash, ID2SYM(id_exception))) {
-        opthash = rb_hash_dup(opthash);
-        exception = rb_hash_delete(opthash, ID2SYM(id_exception));
-    }
     rb_exec_fillarg(prog, argc, argv, env, opthash, execarg_obj);
-    if (RTEST(exception)) {
-        eargp->exception = 1;
-    }
     ALLOCV_END(argv_buf);
     ret = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
     RB_GC_GUARD(execarg_obj);
     return ret;
 }
 
-VALUE
-rb_execarg_new(int argc, const VALUE *argv, int accept_shell, int allow_exc_opt)
-{
-    VALUE execarg_obj;
-    struct rb_execarg *eargp;
-    execarg_obj = TypedData_Make_Struct(0, struct rb_execarg, &exec_arg_data_type, eargp);
-    rb_execarg_init(argc, argv, accept_shell, execarg_obj, allow_exc_opt);
-    return execarg_obj;
-}
-
 void
 rb_execarg_setenv(VALUE execarg_obj, VALUE env)
 {
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
-    env = !NIL_P(env) ? rb_check_exec_env(env, &eargp->path_env) : Qfalse;
+    env = !NIL_P(env) ? rb_check_exec_env(env) : Qfalse;
     eargp->env_modification = env;
 }
 
@@ -2671,14 +2305,6 @@ open_func(void *ptr)
     return NULL;
 }
 
-static void
-rb_execarg_allocate_dup2_tmpbuf(struct rb_execarg *eargp, long len)
-{
-    VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer(NULL);
-    ((rb_imemo_tmpbuf_t *)tmpbuf)->ptr = ruby_xmalloc(run_exec_dup2_tmpbuf_size(len));
-    eargp->dup2_tmpbuf = tmpbuf;
-}
-
 static VALUE
 rb_execarg_parent_start1(VALUE execarg_obj)
 {
@@ -2696,7 +2322,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
             VALUE param = RARRAY_AREF(elt, 1);
             VALUE vpath = RARRAY_AREF(param, 0);
             int flags = NUM2INT(RARRAY_AREF(param, 1));
-            mode_t perm = NUM2MODET(RARRAY_AREF(param, 2));
+            int perm = NUM2INT(RARRAY_AREF(param, 2));
             VALUE fd2v = RARRAY_AREF(param, 3);
             int fd2;
             if (NIL_P(fd2v)) {
@@ -2733,7 +2359,10 @@ rb_execarg_parent_start1(VALUE execarg_obj)
 
     ary = eargp->fd_dup2;
     if (ary != Qfalse) {
-        rb_execarg_allocate_dup2_tmpbuf(eargp, RARRAY_LEN(ary));
+        size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
+        VALUE tmpbuf = hide_obj(rb_str_new(0, len));
+        rb_str_set_len(tmpbuf, len);
+        eargp->dup2_tmpbuf = tmpbuf;
     }
 
     unsetenv_others = eargp->unsetenv_others_given && eargp->unsetenv_others_do;
@@ -2746,7 +2375,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
         }
         else {
             envtbl = rb_const_get(rb_cObject, id_ENV);
-            envtbl = rb_to_hash_type(envtbl);
+            envtbl = rb_convert_type(envtbl, T_HASH, "Hash", "to_hash");
         }
         hide_obj(envtbl);
         if (envopts != Qfalse) {
@@ -2769,7 +2398,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
         }
         envp_buf = rb_str_buf_new(0);
         hide_obj(envp_buf);
-        rb_hash_stlike_foreach(envtbl, fill_envp_buf_i, (st_data_t)envp_buf);
+        st_foreach(RHASH_TBL_RAW(envtbl), fill_envp_buf_i, (st_data_t)envp_buf);
         envp_str = rb_str_buf_new(sizeof(char*) * (RHASH_SIZE(envtbl) + 1));
         hide_obj(envp_str);
         p = RSTRING_PTR(envp_buf);
@@ -2780,8 +2409,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
         }
         p = NULL;
         rb_str_buf_cat(envp_str, (char *)&p, sizeof(p));
-        eargp->envp_str =
-            rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(envp_str);
+        eargp->envp_str = envp_str;
         eargp->envp_buf = envp_buf;
 
         /*
@@ -2943,29 +2571,23 @@ rb_f_exec(int argc, const VALUE *argv)
     struct rb_execarg *eargp;
 #define CHILD_ERRMSG_BUFLEN 80
     char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' };
-    int err, state;
+    int err;
 
-    execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
+    execarg_obj = rb_execarg_new(argc, argv, TRUE);
     eargp = rb_execarg_get(execarg_obj);
-    if (mjit_enabled) mjit_finish(FALSE); /* avoid leaking resources, and do not leave files. XXX: JIT-ed handle can leak after exec error is rescued. */
     before_exec(); /* stop timer thread before redirects */
-
-    rb_protect(rb_execarg_parent_start1, execarg_obj, &state);
-    if (state) {
-        execarg_parent_end(execarg_obj);
-        after_exec(); /* restart timer thread */
-        rb_jump_tag(state);
-    }
-
+    rb_execarg_parent_start(execarg_obj);
     fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
 
-    err = exec_async_signal_safe(eargp, errmsg, sizeof(errmsg));
+    rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg));
+
+    err = errno;
     after_exec(); /* restart timer thread */
 
     rb_exec_fail(eargp, err, errmsg);
     RB_GC_GUARD(execarg_obj);
     rb_syserr_fail_str(err, fail_str);
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 #define ERRMSG(str) do { if (errmsg && 0 < errmsg_buflen) strlcpy(errmsg, (str), errmsg_buflen); } while (0)
@@ -3105,10 +2727,10 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
     long n, i;
     int ret;
     int extra_fd = -1;
-    struct rb_imemo_tmpbuf_struct *buf = (void *)tmpbuf;
-    struct run_exec_dup2_fd_pair *pairs = (void *)buf->ptr;
+    struct run_exec_dup2_fd_pair *pairs = 0;
 
     n = RARRAY_LEN(ary);
+    pairs = (struct run_exec_dup2_fd_pair *)RSTRING_PTR(tmpbuf);
 
     /* initialize oldfd and newfd: O(n) */
     for (i = 0; i < n; i++) {
@@ -3441,7 +3063,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
     }
 
 #ifdef HAVE_WORKING_FORK
-    if (eargp->close_others_do) {
+    if (!eargp->close_others_given || eargp->close_others_do) {
         rb_close_before_exec(3, eargp->close_others_maxhint, eargp->redirect_fds); /* async-signal-safe */
     }
 #endif
@@ -3454,7 +3076,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
 
     if (eargp->chdir_given) {
         if (sargp) {
-            char *cwd = ruby_getcwd();
+            char *cwd = my_getcwd();
             sargp->chdir_given = 1;
             sargp->chdir_dir = hide_obj(rb_str_new2(cwd));
             xfree(cwd);
@@ -3485,14 +3107,12 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
     if (sargp) {
         VALUE ary = sargp->fd_dup2;
         if (ary != Qfalse) {
-            rb_execarg_allocate_dup2_tmpbuf(sargp, RARRAY_LEN(ary));
+            size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
+            VALUE tmpbuf = hide_obj(rb_str_new(0, len));
+            rb_str_set_len(tmpbuf, len);
+            sargp->dup2_tmpbuf = tmpbuf;
         }
     }
-    {
-        int preserve = errno;
-        stdfd_clear_nonblock();
-        errno = preserve;
-    }
 
     return 0;
 }
@@ -3501,38 +3121,31 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
 int
 rb_exec_async_signal_safe(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
 {
-    errno = exec_async_signal_safe(eargp, errmsg, errmsg_buflen);
-    return -1;
-}
-
-static int
-exec_async_signal_safe(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
-{
 #if !defined(HAVE_WORKING_FORK)
     struct rb_execarg sarg, *const sargp = &sarg;
 #else
     struct rb_execarg *const sargp = NULL;
 #endif
-    int err;
 
     if (rb_execarg_run_options(eargp, sargp, errmsg, errmsg_buflen) < 0) { /* hopefully async-signal-safe */
-	return errno;
+        goto failure;
     }
 
     if (eargp->use_shell) {
-	err = proc_exec_sh(RSTRING_PTR(eargp->invoke.sh.shell_script), eargp->envp_str); /* async-signal-safe */
+	proc_exec_sh(RSTRING_PTR(eargp->invoke.sh.shell_script), eargp->envp_str); /* async-signal-safe */
     }
     else {
 	char *abspath = NULL;
 	if (!NIL_P(eargp->invoke.cmd.command_abspath))
 	    abspath = RSTRING_PTR(eargp->invoke.cmd.command_abspath);
-	err = proc_exec_cmd(abspath, eargp->invoke.cmd.argv_str, eargp->envp_str); /* async-signal-safe */
+	proc_exec_cmd(abspath, eargp->invoke.cmd.argv_str, eargp->envp_str); /* async-signal-safe */
     }
 #if !defined(HAVE_WORKING_FORK)
-    rb_execarg_run_options(sargp, NULL, errmsg, errmsg_buflen);
+    preserving_errno(rb_execarg_run_options(sargp, NULL, errmsg, errmsg_buflen));
 #endif
 
-    return err;
+failure:
+    return -1;
 }
 
 #ifdef HAVE_WORKING_FORK
@@ -3602,19 +3215,12 @@ pipe_nocrash(int filedes[2], VALUE fds)
 #define O_BINARY 0
 #endif
 
-static VALUE
-rb_thread_sleep_that_takes_VALUE_as_sole_argument(VALUE n)
-{
-    rb_thread_sleep(NUM2INT(n));
-    return Qundef;
-}
-
 static int
-handle_fork_error(int err, int *status, int *ep, volatile int *try_gc_p)
+handle_fork_error(int *status, int *ep, volatile int *try_gc_p)
 {
     int state = 0;
 
-    switch (err) {
+    switch (errno) {
       case ENOMEM:
         if ((*try_gc_p)-- > 0 && !rb_during_gc()) {
             rb_gc();
@@ -3630,16 +3236,14 @@ handle_fork_error(int err, int *status, int *ep, volatile int *try_gc_p)
             return 0;
         }
         else {
-            rb_protect(rb_thread_sleep_that_takes_VALUE_as_sole_argument, INT2FIX(1), &state);
+            rb_protect((VALUE (*)())rb_thread_sleep, 1, &state);
             if (status) *status = state;
             if (!state) return 0;
         }
         break;
     }
     if (ep) {
-	close(ep[0]);
-	close(ep[1]);
-	errno = err;
+        preserving_errno((close(ep[0]), close(ep[1])));
     }
     if (state && !status) rb_jump_tag(state);
     return -1;
@@ -3693,12 +3297,6 @@ read_retry(int fd, void *buf, size_t len)
 {
     ssize_t r;
 
-    if (set_blocking(fd) != 0) {
-#ifndef _WIN32
-        rb_async_bug_errno("set_blocking failed reading child error", errno);
-#endif
-    }
-
     do {
 	r = read(fd, buf, len);
     } while (r < 0 && errno == EINTR);
@@ -3844,6 +3442,7 @@ has_privilege(void)
 struct child_handler_disabler_state
 {
     sigset_t sigmask;
+    int cancelstate;
 };
 
 static void
@@ -3864,6 +3463,13 @@ disable_child_handler_before_fork(struct child_handler_disabler_state *old)
 #else
 # pragma GCC warning "pthread_sigmask on fork is not available. potentially dangerous"
 #endif
+
+#ifdef PTHREAD_CANCEL_DISABLE
+    ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old->cancelstate);
+    if (ret != 0) {
+	rb_syserr_fail(ret, "pthread_setcancelstate");
+    }
+#endif
 }
 
 static void
@@ -3871,6 +3477,13 @@ disable_child_handler_fork_parent(struct child_handler_disabler_state *old)
 {
     int ret;
 
+#ifdef PTHREAD_CANCEL_DISABLE
+    ret = pthread_setcancelstate(old->cancelstate, NULL);
+    if (ret != 0) {
+	rb_syserr_fail(ret, "pthread_setcancelstate");
+    }
+#endif
+
 #ifdef HAVE_PTHREAD_SIGMASK
     ret = pthread_sigmask(SIG_SETMASK, &old->sigmask, NULL); /* not async-signal-safe */
     if (ret != 0) {
@@ -3889,28 +3502,26 @@ disable_child_handler_fork_child(struct child_handler_disabler_state *old, char
     int ret;
 
     for (sig = 1; sig < NSIG; sig++) {
-	sig_t handler = signal(sig, SIG_DFL);
+            sig_t handler = signal(sig, SIG_DFL);
 
-	if (handler == SIG_ERR && errno == EINVAL) {
-	    continue; /* Ignore invalid signal number */
-	}
-	if (handler == SIG_ERR) {
-	    ERRMSG("signal to obtain old action");
-	    return -1;
-	}
+            if (handler == SIG_ERR && errno == EINVAL) {
+                continue; /* Ignore invalid signal number */
+            }
+            if (handler == SIG_ERR) {
+                ERRMSG("signal to obtain old action");
+                return -1;
+            }
 #ifdef SIGPIPE
-	if (sig == SIGPIPE) {
-	    continue;
-	}
+            if (sig == SIGPIPE) {
+                continue;
+            }
 #endif
-	/* it will be reset to SIG_DFL at execve time, instead */
-	if (handler == SIG_IGN) {
-	    signal(sig, SIG_IGN);
-	}
+            /* it will be reset to SIG_DFL at execve time, instead */
+            if (handler == SIG_IGN) {
+                signal(sig, SIG_IGN);
+            }
     }
 
-    /* non-Ruby child process, ensure cmake can see SIGCHLD */
-    sigemptyset(&old->sigmask);
     ret = sigprocmask(SIG_SETMASK, &old->sigmask, NULL); /* async-signal-safe */
     if (ret != 0) {
         ERRMSG("sigprocmask");
@@ -3919,30 +3530,18 @@ disable_child_handler_fork_child(struct child_handler_disabler_state *old, char
     return 0;
 }
 
-COMPILER_WARNING_PUSH
-#ifdef __GNUC__
-COMPILER_WARNING_IGNORED(-Wdeprecated-declarations)
-#endif
 static rb_pid_t
 retry_fork_async_signal_safe(int *status, int *ep,
         int (*chfunc)(void*, char *, size_t), void *charg,
-        char *errmsg, size_t errmsg_buflen,
-        struct waitpid_state *w)
+        char *errmsg, size_t errmsg_buflen)
 {
     rb_pid_t pid;
     volatile int try_gc = 1;
     struct child_handler_disabler_state old;
-    int err;
-    rb_nativethread_lock_t *const waitpid_lock_init =
-        (w && WAITPID_USE_SIGCHLD) ? &GET_VM()->waitpid_lock : 0;
 
     while (1) {
-        rb_nativethread_lock_t *waitpid_lock = waitpid_lock_init;
         prefork();
         disable_child_handler_before_fork(&old);
-        if (waitpid_lock) {
-            rb_native_mutex_lock(waitpid_lock);
-        }
 #ifdef HAVE_WORKING_VFORK
         if (!has_privilege())
             pid = vfork();
@@ -3966,54 +3565,37 @@ retry_fork_async_signal_safe(int *status, int *ep,
             _exit(127);
 #endif
         }
-	err = errno;
-        waitpid_lock = waitpid_lock_init;
-        if (waitpid_lock) {
-            if (pid > 0 && w != WAITPID_LOCK_ONLY) {
-                w->pid = pid;
-                list_add(&GET_VM()->waiting_pids, &w->wnode);
-            }
-            rb_native_mutex_unlock(waitpid_lock);
-        }
-	disable_child_handler_fork_parent(&old);
+        preserving_errno(disable_child_handler_fork_parent(&old));
         if (0 < pid) /* fork succeed, parent process */
             return pid;
         /* fork failed */
-	if (handle_fork_error(err, status, ep, &try_gc))
+        if (handle_fork_error(status, ep, &try_gc))
             return -1;
     }
 }
-COMPILER_WARNING_POP
 
-static rb_pid_t
-fork_check_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
-        VALUE fds, char *errmsg, size_t errmsg_buflen,
-        struct rb_execarg *eargp)
+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)
 {
     rb_pid_t pid;
     int err;
     int ep[2];
     int error_occurred;
-    struct waitpid_state *w;
-
-    w = eargp && eargp->waitpid_state ? eargp->waitpid_state : 0;
 
     if (status) *status = 0;
 
     if (pipe_nocrash(ep, fds)) return -1;
-    pid = retry_fork_async_signal_safe(status, ep, chfunc, charg,
-                                       errmsg, errmsg_buflen, w);
+    pid = retry_fork_async_signal_safe(status, ep, chfunc, charg, errmsg, errmsg_buflen);
     if (pid < 0)
         return pid;
     close(ep[1]);
     error_occurred = recv_child_error(ep[0], &err, errmsg, errmsg_buflen);
     if (error_occurred) {
         if (status) {
-            VM_ASSERT((w == 0 || w == WAITPID_LOCK_ONLY) &&
-                      "only used by extensions");
             rb_protect(proc_syswait, (VALUE)pid, status);
         }
-        else if (!w) {
+        else {
             rb_syswait(pid);
         }
         errno = err;
@@ -4022,52 +3604,42 @@ fork_check_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
     return pid;
 }
 
-/*
- * The "async_signal_safe" name is a lie, but it is used by pty.c and
- * maybe other exts.  fork() is not async-signal-safe due to pthread_atfork
- * and future POSIX revisions will remove it from a list of signal-safe
- * functions.  rb_waitpid is not async-signal-safe since MJIT, either.
- * For our purposes, we do not need async-signal-safety, here
- */
-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)
+static rb_pid_t
+retry_fork_ruby(int *status)
 {
-    return fork_check_err(status, chfunc, charg, fds, errmsg, errmsg_buflen, 0);
+    rb_pid_t pid;
+    int try_gc = 1;
+
+    while (1) {
+        prefork();
+        before_fork_ruby();
+        pid = fork();
+        if (pid == 0) /* fork succeed, child process */
+            return pid;
+        preserving_errno(after_fork_ruby());
+        if (0 < pid) /* fork succeed, parent process */
+            return pid;
+        /* fork failed */
+        if (handle_fork_error(status, NULL, &try_gc))
+            return -1;
+    }
 }
 
-COMPILER_WARNING_PUSH
-#ifdef __GNUC__
-COMPILER_WARNING_IGNORED(-Wdeprecated-declarations)
-#endif
 rb_pid_t
 rb_fork_ruby(int *status)
 {
     rb_pid_t pid;
-    int try_gc = 1, err;
-    struct child_handler_disabler_state old;
 
     if (status) *status = 0;
 
-    while (1) {
-	prefork();
-        if (mjit_enabled) mjit_pause(FALSE); /* Don't leave locked mutex to child. Note: child_handler must be enabled to pause MJIT. */
-	disable_child_handler_before_fork(&old);
-	before_fork_ruby();
-	pid = fork();
-	err = errno;
+    pid = retry_fork_ruby(status);
+    if (pid < 0)
+        return pid;
+    if (!pid) {
         after_fork_ruby();
-	disable_child_handler_fork_parent(&old); /* yes, bad name */
-        if (mjit_enabled && pid > 0) mjit_resume(); /* child (pid == 0) is cared by rb_thread_atfork */
-	if (pid >= 0) /* fork succeed */
-	    return pid;
-	/* fork failed */
-	if (handle_fork_error(err, status, NULL, &try_gc))
-	    return -1;
     }
+    return pid;
 }
-COMPILER_WARNING_POP
 
 #endif
 
@@ -4172,13 +3744,13 @@ rb_f_exit_bang(int argc, VALUE *argv, VALUE obj)
     }
     _exit(istatus);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 void
 rb_exit(int status)
 {
-    if (GET_EC()->tag) {
+    if (GET_THREAD()->tag) {
 	VALUE args[2];
 
 	args[0] = INT2NUM(status);
@@ -4243,7 +3815,7 @@ rb_f_exit(int argc, const VALUE *argv)
     }
     rb_exit(istatus);
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 
@@ -4263,10 +3835,8 @@ rb_f_abort(int argc, const VALUE *argv)
 {
     rb_check_arity(argc, 0, 1);
     if (argc == 0) {
-	rb_execution_context_t *ec = GET_EC();
-	VALUE errinfo = ec->errinfo;
-	if (!NIL_P(errinfo)) {
-	    rb_ec_error_print(ec, errinfo);
+	if (!NIL_P(GET_THREAD()->errinfo)) {
+	    ruby_error_print();
 	}
 	rb_exit(EXIT_FAILURE);
     }
@@ -4280,7 +3850,7 @@ rb_f_abort(int argc, const VALUE *argv)
 	rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
     }
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 
 void
@@ -4327,8 +3897,7 @@ rb_spawn_process(struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
 #endif
 
 #if defined HAVE_WORKING_FORK && !USE_SPAWNV
-    pid = fork_check_err(0, rb_exec_atfork, eargp, eargp->redirect_fds,
-                         errmsg, errmsg_buflen, eargp);
+    pid = rb_fork_async_signal_safe(NULL, rb_exec_atfork, eargp, eargp->redirect_fds, errmsg, errmsg_buflen);
 #else
     prog = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
 
@@ -4355,9 +3924,7 @@ rb_spawn_process(struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
     rb_last_status_set((status & 0xff) << 8, 0);
     pid = 1;			/* dummy */
 # endif
-    if (eargp->waitpid_state && eargp->waitpid_state != WAITPID_LOCK_ONLY) {
-        eargp->waitpid_state->pid = pid;
-    }
+
     rb_execarg_run_options(&sarg, NULL, errmsg, errmsg_buflen);
 #endif
     return pid;
@@ -4384,15 +3951,6 @@ static rb_pid_t
 rb_execarg_spawn(VALUE execarg_obj, char *errmsg, size_t errmsg_buflen)
 {
     struct spawn_args args;
-    struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
-
-    /*
-     * Prevent a race with MJIT where the compiler process where
-     * can hold an FD of ours in between vfork + execve
-     */
-    if (!eargp->waitpid_state && mjit_enabled) {
-        eargp->waitpid_state = WAITPID_LOCK_ONLY;
-    }
 
     args.execarg = execarg_obj;
     args.errmsg.ptr = errmsg;
@@ -4406,7 +3964,7 @@ rb_spawn_internal(int argc, const VALUE *argv, char *errmsg, size_t errmsg_bufle
 {
     VALUE execarg_obj;
 
-    execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
+    execarg_obj = rb_execarg_new(argc, argv, TRUE);
     return rb_execarg_spawn(execarg_obj, errmsg, errmsg_buflen);
 }
 
@@ -4458,59 +4016,37 @@ rb_spawn(int argc, const VALUE *argv)
 static VALUE
 rb_f_system(int argc, VALUE *argv)
 {
-    /*
-     * n.b. using alloca for now to simplify future Thread::Light code
-     * when we need to use malloc for non-native Fiber
-     */
-    struct waitpid_state *w = alloca(sizeof(struct waitpid_state));
-    rb_pid_t pid; /* may be different from waitpid_state.pid on exec failure */
-    VALUE execarg_obj;
-    struct rb_execarg *eargp;
-    int exec_errnum;
+    rb_pid_t pid;
+    int status;
 
-    execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE);
-    eargp = rb_execarg_get(execarg_obj);
-    w->ec = GET_EC();
-    waitpid_state_init(w, 0, 0);
-    eargp->waitpid_state = w;
-    pid = rb_execarg_spawn(execarg_obj, 0, 0);
-    exec_errnum = pid < 0 ? errno : 0;
+#if defined(SIGCLD) && !defined(SIGCHLD)
+# define SIGCHLD SIGCLD
+#endif
+
+#ifdef SIGCHLD
+    RETSIGTYPE (*chfunc)(int);
 
+    rb_last_status_clear();
+    chfunc = signal(SIGCHLD, SIG_DFL);
+#endif
+    pid = rb_spawn_internal(argc, argv, NULL, 0);
 #if defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV)
-    if (w->pid > 0) {
-        /* `pid' (not w->pid) may be < 0 here if execve failed in child */
-        if (WAITPID_USE_SIGCHLD) {
-            rb_ensure(waitpid_sleep, (VALUE)w, waitpid_cleanup, (VALUE)w);
-        }
-        else {
-            waitpid_no_SIGCHLD(w);
-        }
-        rb_last_status_set(w->status, w->ret);
+    if (pid > 0) {
+        int ret, status;
+        ret = rb_waitpid(pid, &status, 0);
+        if (ret == (rb_pid_t)-1)
+            rb_sys_fail("Another thread waited the process started by system().");
     }
 #endif
-    if (w->pid < 0 /* fork failure */ || pid < 0 /* exec failure */) {
-        if (eargp->exception) {
-            int err = exec_errnum ? exec_errnum : w->errnum;
-            VALUE command = eargp->invoke.sh.shell_script;
-            RB_GC_GUARD(execarg_obj);
-            rb_syserr_fail_str(err, command);
-        }
-        else {
-            return Qnil;
-        }
-    }
-    if (w->status == EXIT_SUCCESS) return Qtrue;
-    if (eargp->exception) {
-        VALUE command = eargp->invoke.sh.shell_script;
-        VALUE str = rb_str_new_cstr("Command failed with");
-        rb_str_cat_cstr(pst_message_status(str, w->status), ": ");
-        rb_str_append(str, command);
-        RB_GC_GUARD(execarg_obj);
-        rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, str));
-    }
-    else {
-        return Qfalse;
+#ifdef SIGCHLD
+    signal(SIGCHLD, chfunc);
+#endif
+    if (pid < 0) {
+	return Qnil;
     }
+    status = PST2INT(rb_last_status_get());
+    if (status == EXIT_SUCCESS) return Qtrue;
+    return Qfalse;
 }
 
 /*
@@ -4582,7 +4118,7 @@ rb_f_system(int argc, VALUE *argv)
  *          integer : the file descriptor of specified the integer
  *          io      : the file descriptor specified as io.fileno
  *      file descriptor inheritance: close non-redirected non-standard fds (3, 4, 5, ...) or not
- *        :close_others => false  : inherit
+ *        :close_others => true  : don't inherit
  *      current directory:
  *        :chdir => str
  *
@@ -4652,7 +4188,7 @@ rb_f_system(int argc, VALUE *argv)
  *
  *    pid = spawn(command, :umask=>077)
  *
- *  The :in, :out, :err, an integer, an IO and an array key specifies a redirection.
+ *  The :in, :out, :err, a integer, an IO and an array key specifies a redirection.
  *  The redirection maps a file descriptor in the child process.
  *
  *  For example, stderr can be merged into stdout as follows:
@@ -4741,7 +4277,7 @@ rb_f_system(int argc, VALUE *argv)
  *    pid = spawn(command, :close_others=>true)  # close 3,4,5,... (default)
  *    pid = spawn(command, :close_others=>false) # don't close 3,4,5,...
  *
- *  :close_others is false by default for spawn and IO.popen.
+ *  :close_others is true by default for spawn and IO.popen.
  *
  *  Note that fds which close-on-exec flag is already set are closed
  *  regardless of :close_others option.
@@ -4789,7 +4325,7 @@ rb_f_spawn(int argc, VALUE *argv)
     VALUE execarg_obj, fail_str;
     struct rb_execarg *eargp;
 
-    execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
+    execarg_obj = rb_execarg_new(argc, argv, TRUE);
     eargp = rb_execarg_get(execarg_obj);
     fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
 
@@ -5112,13 +4648,13 @@ proc_setpriority(VALUE obj, VALUE which, VALUE who, VALUE prio)
 
 #if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
 static int
-rlimit_resource_name2int(const char *name, long len, int casetype)
+rlimit_resource_name2int(const char *name, int casetype)
 {
     int resource;
     const char *p;
 #define RESCHECK(r) \
     do { \
-        if (len == rb_strlen_lit(#r) && STRCASECMP(name, #r) == 0) { \
+        if (STRCASECMP(name, #r) == 0) { \
             resource = RLIMIT_##r; \
             goto found; \
         } \
@@ -5221,40 +4757,21 @@ rlimit_resource_name2int(const char *name, long len, int casetype)
 }
 
 static int
-rlimit_type_by_hname(const char *name, long len)
+rlimit_type_by_hname(const char *name)
 {
-    return rlimit_resource_name2int(name, len, 0);
+    return rlimit_resource_name2int(name, 0);
 }
 
 static int
-rlimit_type_by_lname(const char *name, long len)
+rlimit_type_by_lname(const char *name)
 {
-    return rlimit_resource_name2int(name, len, 1);
-}
-
-static int
-rlimit_type_by_sym(VALUE key)
-{
-    VALUE name = rb_sym2str(key);
-    const char *rname = RSTRING_PTR(name);
-    long len = RSTRING_LEN(name);
-    int rtype = -1;
-    static const char prefix[] = "rlimit_";
-    enum {prefix_len = sizeof(prefix)-1};
-
-    if (len > prefix_len && strncmp(prefix, rname, prefix_len) == 0) {
-	rtype = rlimit_type_by_lname(rname + prefix_len, len - prefix_len);
-    }
-
-    RB_GC_GUARD(key);
-    return rtype;
+    return rlimit_resource_name2int(name, 1);
 }
 
 static int
 rlimit_resource_type(VALUE rtype)
 {
     const char *name;
-    long len;
     VALUE v;
     int r;
 
@@ -5262,7 +4779,6 @@ rlimit_resource_type(VALUE rtype)
       case T_SYMBOL:
 	v = rb_sym2str(rtype);
 	name = RSTRING_PTR(v);
-	len = RSTRING_LEN(v);
         break;
 
       default:
@@ -5271,7 +4787,6 @@ rlimit_resource_type(VALUE rtype)
             rtype = v;
       case T_STRING:
             name = StringValueCStr(rtype);
-	    len = RSTRING_LEN(rtype);
             break;
         }
         /* fall through */
@@ -5281,13 +4796,13 @@ rlimit_resource_type(VALUE rtype)
         return NUM2INT(rtype);
     }
 
-    r = rlimit_type_by_hname(name, len);
+    r = rlimit_type_by_hname(name);
     if (r != -1)
         return r;
 
-    rb_raise(rb_eArgError, "invalid resource name: % "PRIsVALUE, rtype);
+    rb_raise(rb_eArgError, "invalid resource name: %"PRIsVALUE, rtype);
 
-    UNREACHABLE_RETURN(-1);
+    UNREACHABLE;
 }
 
 static rlim_t
@@ -5328,7 +4843,7 @@ rlimit_resource_value(VALUE rval)
 #endif
     rb_raise(rb_eArgError, "invalid resource value: %"PRIsVALUE, rval);
 
-    UNREACHABLE_RETURN((rlim_t)-1);
+    UNREACHABLE;
 }
 #endif
 
@@ -5493,19 +5008,21 @@ obj2uid(VALUE id
 	struct passwd pwbuf;
 	char *getpw_buf;
 	long getpw_buf_len;
-	int e;
 	if (!*getpw_tmp) {
 	    getpw_buf_len = GETPW_R_SIZE_INIT;
 	    if (getpw_buf_len < 0) getpw_buf_len = GETPW_R_SIZE_DEFAULT;
-	    *getpw_tmp = rb_str_tmp_new(getpw_buf_len);
+	    getpw_buf = rb_alloc_tmp_buffer(getpw_tmp, getpw_buf_len);
+	}
+	else {
+	    getpw_buf = RSTRING_PTR(*getpw_tmp);
+	    getpw_buf_len = rb_str_capacity(*getpw_tmp);
 	}
-	getpw_buf = RSTRING_PTR(*getpw_tmp);
-	getpw_buf_len = rb_str_capacity(*getpw_tmp);
-	rb_str_set_len(*getpw_tmp, getpw_buf_len);
-	errno = 0;
-	while ((e = getpwnam_r(usrname, &pwbuf, getpw_buf, getpw_buf_len, &pwptr)) != 0) {
+	errno = ERANGE;
+	/* gepwnam_r() on MacOS X doesn't set errno if buffer size is insufficient */
+	while (getpwnam_r(usrname, &pwbuf, getpw_buf, getpw_buf_len, &pwptr)) {
+	    int e = errno;
 	    if (e != ERANGE || getpw_buf_len >= GETPW_R_SIZE_LIMIT) {
-		rb_str_resize(*getpw_tmp, 0);
+		rb_free_tmp_buffer(getpw_tmp);
 		rb_syserr_fail(e, "getpwnam_r");
 	    }
 	    rb_str_modify_expand(*getpw_tmp, getpw_buf_len);
@@ -5570,19 +5087,21 @@ obj2gid(VALUE id
 	struct group grbuf;
 	char *getgr_buf;
 	long getgr_buf_len;
-	int e;
 	if (!*getgr_tmp) {
 	    getgr_buf_len = GETGR_R_SIZE_INIT;
 	    if (getgr_buf_len < 0) getgr_buf_len = GETGR_R_SIZE_DEFAULT;
-	    *getgr_tmp = rb_str_tmp_new(getgr_buf_len);
+	    getgr_buf = rb_alloc_tmp_buffer(getgr_tmp, getgr_buf_len);
 	}
-	getgr_buf = RSTRING_PTR(*getgr_tmp);
-	getgr_buf_len = rb_str_capacity(*getgr_tmp);
-	rb_str_set_len(*getgr_tmp, getgr_buf_len);
-	errno = 0;
-	while ((e = getgrnam_r(grpname, &grbuf, getgr_buf, getgr_buf_len, &grptr)) != 0) {
+	else {
+	    getgr_buf = RSTRING_PTR(*getgr_tmp);
+	    getgr_buf_len = rb_str_capacity(*getgr_tmp);
+	}
+	errno = ERANGE;
+	/* gegrnam_r() on MacOS X doesn't set errno if buffer size is insufficient */
+	while (getgrnam_r(grpname, &grbuf, getgr_buf, getgr_buf_len, &grptr)) {
+	    int e = errno;
 	    if (e != ERANGE || getgr_buf_len >= GETGR_R_SIZE_LIMIT) {
-		rb_str_resize(*getgr_tmp, 0);
+		rb_free_tmp_buffer(getgr_tmp);
 		rb_syserr_fail(e, "getgrnam_r");
 	    }
 	    rb_str_modify_expand(*getgr_tmp, getgr_buf_len);
@@ -6271,24 +5790,11 @@ maxgroups(void)
  *  call-seq:
  *     Process.groups   -> array
  *
- *  Get an <code>Array</code> of the group IDs in the
+ *  Get an <code>Array</code> of the gids of groups in the
  *  supplemental group access list for this process.
  *
  *     Process.groups   #=> [27, 6, 10, 11]
  *
- *  Note that this method is just a wrapper of getgroups(2).
- *  This means that the following characteristics of
- *  the result completely depend on your system:
- *
- *  - the result is sorted
- *  - the result includes effective GIDs
- *  - the result does not include duplicated GIDs
- *
- *  You can make sure to get a sorted unique GID list of
- *  the current process by this expression:
- *
- *     Process.groups.uniq.sort
- *
  */
 
 static VALUE
@@ -6391,7 +5897,7 @@ proc_setgroups(VALUE obj, VALUE ary)
 static VALUE
 proc_initgroups(VALUE obj, VALUE uname, VALUE base_grp)
 {
-    if (initgroups(StringValueCStr(uname), OBJ2GID(base_grp)) != 0) {
+    if (initgroups(StringValuePtr(uname), OBJ2GID(base_grp)) != 0) {
 	rb_sys_fail(0);
     }
     return proc_getgroups(obj);
@@ -6490,11 +5996,10 @@ rb_daemon(int nochdir, int noclose)
 {
     int err = 0;
 #ifdef HAVE_DAEMON
-    if (mjit_enabled) mjit_pause(FALSE); /* Don't leave locked mutex to child. */
     before_fork_ruby();
     err = daemon(nochdir, noclose);
     after_fork_ruby();
-    rb_thread_atfork(); /* calls mjit_resume() */
+    rb_thread_atfork();
 #else
     int n;
 
@@ -7181,7 +6686,7 @@ p_uid_switch(VALUE obj)
 	rb_syserr_fail(EPERM, 0);
     }
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 #else
 static VALUE
@@ -7294,7 +6799,7 @@ p_gid_switch(VALUE obj)
 	rb_syserr_fail(EPERM, 0);
     }
 
-    UNREACHABLE_RETURN(Qnil);
+    UNREACHABLE;
 }
 #else
 static VALUE
@@ -7333,15 +6838,20 @@ p_gid_switch(VALUE obj)
 static long
 get_clk_tck(void)
 {
+    long hertz =
 #ifdef HAVE__SC_CLK_TCK
-    return sysconf(_SC_CLK_TCK);
-#elif defined CLK_TCK
-    return CLK_TCK;
-#elif defined HZ
-    return HZ;
+	(double)sysconf(_SC_CLK_TCK);
 #else
-    return 60;
+#ifndef HZ
+# ifdef CLK_TCK
+#   define HZ CLK_TCK
+# else
+#   define HZ 60
+# endif
+#endif /* HZ */
+	HZ;
 #endif
+    return hertz;
 }
 
 /*
@@ -7359,26 +6869,15 @@ get_clk_tck(void)
 VALUE
 rb_proc_times(VALUE obj)
 {
-    VALUE utime, stime, cutime, cstime, ret;
-#if defined(RUSAGE_SELF) && defined(RUSAGE_CHILDREN)
-    struct rusage usage_s, usage_c;
-
-    if (getrusage(RUSAGE_SELF, &usage_s) != 0 || getrusage(RUSAGE_CHILDREN, &usage_c) != 0)
-	rb_sys_fail("getrusage");
-    utime = DBL2NUM((double)usage_s.ru_utime.tv_sec + (double)usage_s.ru_utime.tv_usec/1e6);
-    stime = DBL2NUM((double)usage_s.ru_stime.tv_sec + (double)usage_s.ru_stime.tv_usec/1e6);
-    cutime = DBL2NUM((double)usage_c.ru_utime.tv_sec + (double)usage_c.ru_utime.tv_usec/1e6);
-    cstime = DBL2NUM((double)usage_c.ru_stime.tv_sec + (double)usage_c.ru_stime.tv_usec/1e6);
-#else
-    const double hertz = (double)get_clk_tck();
+    const double hertz = get_clk_tck();
     struct tms buf;
+    VALUE utime, stime, cutime, cstime, ret;
 
     times(&buf);
     utime = DBL2NUM(buf.tms_utime / hertz);
     stime = DBL2NUM(buf.tms_stime / hertz);
     cutime = DBL2NUM(buf.tms_cutime / hertz);
     cstime = DBL2NUM(buf.tms_cstime / hertz);
-#endif
     ret = rb_struct_new(rb_cProcessTms, utime, stime, cutime, cstime);
     RB_GC_GUARD(utime);
     RB_GC_GUARD(stime);
@@ -7395,13 +6894,11 @@ typedef LONG_LONG timetick_int_t;
 #define TIMETICK_INT_MIN LLONG_MIN
 #define TIMETICK_INT_MAX LLONG_MAX
 #define TIMETICK_INT2NUM(v) LL2NUM(v)
-#define MUL_OVERFLOW_TIMETICK_P(a, b) MUL_OVERFLOW_LONG_LONG_P(a, b)
 #else
 typedef long timetick_int_t;
 #define TIMETICK_INT_MIN LONG_MIN
 #define TIMETICK_INT_MAX LONG_MAX
 #define TIMETICK_INT2NUM(v) LONG2NUM(v)
-#define MUL_OVERFLOW_TIMETICK_P(a, b) MUL_OVERFLOW_LONG_P(a, b)
 #endif
 
 CONSTFUNC(static timetick_int_t gcd_timetick_int(timetick_int_t, timetick_int_t));
@@ -7517,7 +7014,8 @@ timetick2integer(struct timetick *ttp,
         timetick_int_t t = ttp->giga_count * 1000000000 + ttp->count;
         for (i = 0; i < num_numerators; i++) {
             timetick_int_t factor = numerators[i];
-            if (MUL_OVERFLOW_TIMETICK_P(factor, t))
+            if (MUL_OVERFLOW_SIGNED_INTEGER_P(factor, t,
+                        TIMETICK_INT_MIN, TIMETICK_INT_MAX))
                 goto generic;
             t *= factor;
         }
@@ -7580,7 +7078,7 @@ make_clock_result(struct timetick *ttp,
 }
 
 #ifdef __APPLE__
-static const mach_timebase_info_data_t *
+static mach_timebase_info_data_t *
 get_mach_timebase_info(void)
 {
     static mach_timebase_info_data_t sTimebaseInfo;
@@ -7591,14 +7089,6 @@ get_mach_timebase_info(void)
 
     return &sTimebaseInfo;
 }
-
-double
-ruby_real_ms_time(void)
-{
-    const mach_timebase_info_data_t *info = get_mach_timebase_info();
-    uint64_t t = mach_absolute_time();
-    return (double)t * info->numer / info->denom / 1e6;
-}
 #endif
 
 /*
@@ -7617,10 +7107,10 @@ ruby_real_ms_time(void)
  *  The supported constants depends on OS and version.
  *  Ruby provides following types of +clock_id+ if available.
  *
- *  [CLOCK_REALTIME] SUSv2 to 4, Linux 2.5.63, FreeBSD 3.0, NetBSD 2.0, OpenBSD 2.1, macOS 10.12
- *  [CLOCK_MONOTONIC] SUSv3 to 4, Linux 2.5.63, FreeBSD 3.0, NetBSD 2.0, OpenBSD 3.4, macOS 10.12
- *  [CLOCK_PROCESS_CPUTIME_ID] SUSv3 to 4, Linux 2.5.63, OpenBSD 5.4, macOS 10.12
- *  [CLOCK_THREAD_CPUTIME_ID] SUSv3 to 4, Linux 2.5.63, FreeBSD 7.1, OpenBSD 5.4, macOS 10.12
+ *  [CLOCK_REALTIME] SUSv2 to 4, Linux 2.5.63, FreeBSD 3.0, NetBSD 2.0, OpenBSD 2.1
+ *  [CLOCK_MONOTONIC] SUSv3 to 4, Linux 2.5.63, FreeBSD 3.0, NetBSD 2.0, OpenBSD 3.4
+ *  [CLOCK_PROCESS_CPUTIME_ID] SUSv3 to 4, Linux 2.5.63, OpenBSD 5.4
+ *  [CLOCK_THREAD_CPUTIME_ID] SUSv3 to 4, Linux 2.5.63, FreeBSD 7.1, OpenBSD 5.4
  *  [CLOCK_VIRTUAL] FreeBSD 3.0, OpenBSD 2.1
  *  [CLOCK_PROF] FreeBSD 3.0, OpenBSD 2.1
  *  [CLOCK_REALTIME_FAST] FreeBSD 8.1
@@ -7630,14 +7120,11 @@ ruby_real_ms_time(void)
  *  [CLOCK_MONOTONIC_FAST] FreeBSD 8.1
  *  [CLOCK_MONOTONIC_PRECISE] FreeBSD 8.1
  *  [CLOCK_MONOTONIC_COARSE] Linux 2.6.32
- *  [CLOCK_MONOTONIC_RAW] Linux 2.6.28, macOS 10.12
- *  [CLOCK_MONOTONIC_RAW_APPROX] macOS 10.12
+ *  [CLOCK_MONOTONIC_RAW] Linux 2.6.28
  *  [CLOCK_BOOTTIME] Linux 2.6.39
  *  [CLOCK_BOOTTIME_ALARM] Linux 3.0
  *  [CLOCK_UPTIME] FreeBSD 7.0, OpenBSD 5.5
  *  [CLOCK_UPTIME_FAST] FreeBSD 8.1
- *  [CLOCK_UPTIME_RAW] macOS 10.12
- *  [CLOCK_UPTIME_RAW_APPROX] macOS 10.12
  *  [CLOCK_UPTIME_PRECISE] FreeBSD 8.1
  *  [CLOCK_SECOND] FreeBSD 8.1
  *
@@ -7744,9 +7231,8 @@ rb_clock_gettime(int argc, VALUE *argv)
     if (SYMBOL_P(clk_id)) {
         /*
          * Non-clock_gettime clocks are provided by symbol clk_id.
-         */
-#ifdef HAVE_GETTIMEOFDAY
-        /*
+         *
+         * gettimeofday is always available on platforms supported by Ruby.
          * GETTIMEOFDAY_BASED_CLOCK_REALTIME is used for
          * CLOCK_REALTIME if clock_gettime is not available.
          */
@@ -7761,7 +7247,6 @@ rb_clock_gettime(int argc, VALUE *argv)
             denominators[num_denominators++] = 1000000000;
             goto success;
         }
-#endif
 
 #define RUBY_TIME_BASED_CLOCK_REALTIME ID2SYM(id_TIME_BASED_CLOCK_REALTIME)
         if (clk_id == RUBY_TIME_BASED_CLOCK_REALTIME) {
@@ -7854,7 +7339,7 @@ rb_clock_gettime(int argc, VALUE *argv)
 #ifdef __APPLE__
 #define RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC ID2SYM(id_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC)
         if (clk_id == RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC) {
-	    const mach_timebase_info_data_t *info = get_mach_timebase_info();
+	    mach_timebase_info_data_t *info = get_mach_timebase_info();
             uint64_t t = mach_absolute_time();
             tt.count = (int32_t)(t % 1000000000);
             tt.giga_count = t / 1000000000;
@@ -7993,7 +7478,7 @@ rb_clock_getres(int argc, VALUE *argv)
 
 #ifdef RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC
         if (clk_id == RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC) {
-	    const mach_timebase_info_data_t *info = get_mach_timebase_info();
+	    mach_timebase_info_data_t *info = get_mach_timebase_info();
             tt.count = 1;
             tt.giga_count = 0;
             numerators[num_numerators++] = info->numer;
@@ -8029,9 +7514,9 @@ rb_clock_getres(int argc, VALUE *argv)
 }
 
 VALUE rb_mProcess;
-static VALUE rb_mProcUID;
-static VALUE rb_mProcGID;
-static VALUE rb_mProcID_Syscall;
+VALUE rb_mProcUID;
+VALUE rb_mProcGID;
+VALUE rb_mProcID_Syscall;
 
 
 /*
@@ -8078,7 +7563,6 @@ InitVM_process(void)
     rb_define_singleton_method(rb_mProcess, "exit!", rb_f_exit_bang, -1);
     rb_define_singleton_method(rb_mProcess, "exit", rb_f_exit, -1);
     rb_define_singleton_method(rb_mProcess, "abort", rb_f_abort, -1);
-    rb_define_singleton_method(rb_mProcess, "last_status", proc_s_last_status, 0);
 
     rb_define_module_function(rb_mProcess, "kill", rb_f_kill, -1); /* in signal.c */
     rb_define_module_function(rb_mProcess, "wait", proc_wait, -1);
@@ -8088,7 +7572,6 @@ InitVM_process(void)
     rb_define_module_function(rb_mProcess, "waitall", proc_waitall, 0);
     rb_define_module_function(rb_mProcess, "detach", proc_detach, 1);
 
-    /* :nodoc: */
     rb_cWaiter = rb_define_class_under(rb_mProcess, "Waiter", rb_cThread);
     rb_undef_alloc_func(rb_cWaiter);
     rb_undef_method(CLASS_OF(rb_cWaiter), "new");
@@ -8296,115 +7779,77 @@ InitVM_process(void)
     rb_define_module_function(rb_mProcess, "times", rb_proc_times, 0);
 
 #ifdef CLOCK_REALTIME
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME", CLOCKID2NUM(CLOCK_REALTIME));
 #elif defined(RUBY_GETTIMEOFDAY_BASED_CLOCK_REALTIME)
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME", RUBY_GETTIMEOFDAY_BASED_CLOCK_REALTIME);
 #endif
 #ifdef CLOCK_MONOTONIC
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC", CLOCKID2NUM(CLOCK_MONOTONIC));
 #elif defined(RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC)
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC", RUBY_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC);
 #endif
 #ifdef CLOCK_PROCESS_CPUTIME_ID
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_PROCESS_CPUTIME_ID", CLOCKID2NUM(CLOCK_PROCESS_CPUTIME_ID));
 #elif defined(RUBY_GETRUSAGE_BASED_CLOCK_PROCESS_CPUTIME_ID)
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_PROCESS_CPUTIME_ID", RUBY_GETRUSAGE_BASED_CLOCK_PROCESS_CPUTIME_ID);
 #endif
 #ifdef CLOCK_THREAD_CPUTIME_ID
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_THREAD_CPUTIME_ID", CLOCKID2NUM(CLOCK_THREAD_CPUTIME_ID));
 #endif
 #ifdef CLOCK_VIRTUAL
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_VIRTUAL", CLOCKID2NUM(CLOCK_VIRTUAL));
 #endif
 #ifdef CLOCK_PROF
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_PROF", CLOCKID2NUM(CLOCK_PROF));
 #endif
 #ifdef CLOCK_REALTIME_FAST
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME_FAST", CLOCKID2NUM(CLOCK_REALTIME_FAST));
 #endif
 #ifdef CLOCK_REALTIME_PRECISE
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME_PRECISE", CLOCKID2NUM(CLOCK_REALTIME_PRECISE));
 #endif
 #ifdef CLOCK_REALTIME_COARSE
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME_COARSE", CLOCKID2NUM(CLOCK_REALTIME_COARSE));
 #endif
 #ifdef CLOCK_REALTIME_ALARM
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_REALTIME_ALARM", CLOCKID2NUM(CLOCK_REALTIME_ALARM));
 #endif
 #ifdef CLOCK_MONOTONIC_FAST
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC_FAST", CLOCKID2NUM(CLOCK_MONOTONIC_FAST));
 #endif
 #ifdef CLOCK_MONOTONIC_PRECISE
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC_PRECISE", CLOCKID2NUM(CLOCK_MONOTONIC_PRECISE));
 #endif
 #ifdef CLOCK_MONOTONIC_RAW
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC_RAW", CLOCKID2NUM(CLOCK_MONOTONIC_RAW));
 #endif
-#ifdef CLOCK_MONOTONIC_RAW_APPROX
-    /* see Process.clock_gettime */
-    rb_define_const(rb_mProcess, "CLOCK_MONOTONIC_RAW_APPROX", CLOCKID2NUM(CLOCK_MONOTONIC_RAW_APPROX));
-#endif
 #ifdef CLOCK_MONOTONIC_COARSE
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_MONOTONIC_COARSE", CLOCKID2NUM(CLOCK_MONOTONIC_COARSE));
 #endif
 #ifdef CLOCK_BOOTTIME
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_BOOTTIME", CLOCKID2NUM(CLOCK_BOOTTIME));
 #endif
 #ifdef CLOCK_BOOTTIME_ALARM
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_BOOTTIME_ALARM", CLOCKID2NUM(CLOCK_BOOTTIME_ALARM));
 #endif
 #ifdef CLOCK_UPTIME
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_UPTIME", CLOCKID2NUM(CLOCK_UPTIME));
 #endif
 #ifdef CLOCK_UPTIME_FAST
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_UPTIME_FAST", CLOCKID2NUM(CLOCK_UPTIME_FAST));
 #endif
 #ifdef CLOCK_UPTIME_PRECISE
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_UPTIME_PRECISE", CLOCKID2NUM(CLOCK_UPTIME_PRECISE));
 #endif
-#ifdef CLOCK_UPTIME_RAW
-    /* see Process.clock_gettime */
-    rb_define_const(rb_mProcess, "CLOCK_UPTIME_RAW", CLOCKID2NUM(CLOCK_UPTIME_RAW));
-#endif
-#ifdef CLOCK_UPTIME_RAW_APPROX
-    /* see Process.clock_gettime */
-    rb_define_const(rb_mProcess, "CLOCK_UPTIME_RAW_APPROX", CLOCKID2NUM(CLOCK_UPTIME_RAW_APPROX));
-#endif
 #ifdef CLOCK_SECOND
-    /* see Process.clock_gettime */
     rb_define_const(rb_mProcess, "CLOCK_SECOND", CLOCKID2NUM(CLOCK_SECOND));
 #endif
     rb_define_module_function(rb_mProcess, "clock_gettime", rb_clock_gettime, -1);
     rb_define_module_function(rb_mProcess, "clock_getres", rb_clock_getres, -1);
 
 #if defined(HAVE_TIMES) || defined(_WIN32)
-    /* Placeholder for rusage */
     rb_cProcessTms = rb_struct_define_under(rb_mProcess, "Tms", "utime", "stime", "cutime", "cstime", NULL);
-    /* An obsolete name of Process::Tms for backward compatibility */
-    rb_define_const(rb_cStruct, "Tms", rb_cProcessTms);
-    rb_deprecate_constant(rb_cStruct, "Tms");
+    rb_define_const(rb_cStruct, "Tms", rb_cProcessTms); /* for the backward compatibility */
 #endif
 
     SAVED_USER_ID = geteuid();
diff --git a/random.c b/random.c
index 38dfaeb272..ee91c533aa 100644
--- a/random.c
+++ b/random.c
@@ -89,11 +89,6 @@ The original copyright notice follows.
 #endif
 #include "ruby_atomic.h"
 
-#ifdef __OpenBSD__
-/* to define OpenBSD for version check */
-#include <sys/param.h>
-#endif
-
 typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1];
 
 /* Period parameters */
@@ -117,9 +112,6 @@ struct MT {
 #define genrand_initialized(mt) ((mt)->next != 0)
 #define uninit_genrand(mt) ((mt)->next = 0)
 
-NO_SANITIZE("unsigned-integer-overflow", static void init_genrand(struct MT *mt, unsigned int s));
-NO_SANITIZE("unsigned-integer-overflow", static void init_by_array(struct MT *mt, const uint32_t init_key[], int key_length));
-
 /* initializes state[N] with a seed */
 static void
 init_genrand(struct MT *mt, unsigned int s)
@@ -310,7 +302,6 @@ VALUE rb_cRandom;
 #define id_minus '-'
 #define id_plus  '+'
 static ID id_rand, id_bytes;
-NORETURN(static void domain_error(void));
 
 /* :nodoc: */
 static void
@@ -347,7 +338,7 @@ get_rnd(VALUE obj)
 {
     rb_random_t *ptr;
     TypedData_Get_Struct(obj, rb_random_t, &random_data_type, ptr);
-    return rand_start(ptr);
+    return ptr;
 }
 
 static rb_random_t *
@@ -357,7 +348,7 @@ try_get_rnd(VALUE obj)
 	return rand_start(&default_rand);
     }
     if (!rb_typeddata_is_kind_of(obj, &random_data_type)) return NULL;
-    return rand_start(DATA_PTR(obj));
+    return DATA_PTR(obj);
 }
 
 /* :nodoc: */
@@ -456,21 +447,14 @@ fill_random_bytes_urandom(void *seed, size_t size)
 			     O_RDONLY, 0);
     struct stat statbuf;
     ssize_t ret = 0;
-    size_t offset = 0;
 
     if (fd < 0) return -1;
     rb_update_max_fd(fd);
     if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) {
-	do {
-	    ret = read(fd, ((char*)seed) + offset, size - offset);
-	    if (ret < 0) {
-		close(fd);
-		return -1;
-	    }
-	    offset += (size_t)ret;
-	} while(offset < size);
+	ret = read(fd, seed, size);
     }
     close(fd);
+    if (ret < 0 || (size_t)ret < size) return -1;
     return 0;
 }
 #else
@@ -478,38 +462,12 @@ fill_random_bytes_urandom(void *seed, size_t size)
 #endif
 
 #if 0
-#elif defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-#include <Security/Security.h>
-
-static int
-fill_random_bytes_syscall(void *seed, size_t size, int unused)
-{
-    int status = SecRandomCopyBytes(kSecRandomDefault, size, seed);
-
-    if (status != errSecSuccess) {
-# if 0
-        CFStringRef s = SecCopyErrorMessageString(status, NULL);
-        const char *m = s ? CFStringGetCStringPtr(s, kCFStringEncodingUTF8) : NULL;
-        fprintf(stderr, "SecRandomCopyBytes failed: %d: %s\n", status,
-                m ? m : "unknown");
-        if (s) CFRelease(s);
-# endif
-        return -1;
-    }
-    return 0;
-}
 #elif defined(HAVE_ARC4RANDOM_BUF)
 static int
 fill_random_bytes_syscall(void *buf, size_t size, int unused)
 {
-#if (defined(__OpenBSD__) && OpenBSD >= 201411) || \
-    (defined(__NetBSD__)  && __NetBSD_Version__ >= 700000000) || \
-    (defined(__FreeBSD__) && __FreeBSD_version >= 1200079)
     arc4random_buf(buf, size);
     return 0;
-#else
-    return -1;
-#endif
 }
 #elif defined(_WIN32)
 static void
@@ -531,12 +489,12 @@ fill_random_bytes_syscall(void *seed, size_t size, int unused)
 	    prov = (HCRYPTPROV)INVALID_HANDLE_VALUE;
 	}
 	old_prov = (HCRYPTPROV)ATOMIC_PTR_CAS(perm_prov, 0, prov);
-	if (LIKELY(!old_prov)) { /* no other threads acquired */
+	if (LIKELY(!old_prov)) { /* no other threads acquried */
 	    if (prov != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
 		rb_gc_register_mark_object(Data_Wrap_Struct(0, 0, release_crypt, &perm_prov));
 	    }
 	}
-	else {			/* another thread acquired */
+	else {			/* another thread acquried */
 	    if (prov != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
 		CryptReleaseContext(prov, 0);
 	    }
@@ -547,7 +505,7 @@ fill_random_bytes_syscall(void *seed, size_t size, int unused)
     CryptGenRandom(prov, size, seed);
     return 0;
 }
-#elif defined __linux__ && defined __NR_getrandom
+#elif defined __linux__ && defined SYS_getrandom
 #include <linux/random.h>
 
 # ifndef GRND_NONBLOCK
@@ -560,20 +518,16 @@ fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
     static rb_atomic_t try_syscall = 1;
     if (try_syscall) {
 	long ret;
-	size_t offset = 0;
 	int flags = 0;
 	if (!need_secure)
 	    flags = GRND_NONBLOCK;
-	do {
-	    errno = 0;
-	    ret = syscall(__NR_getrandom, ((char*)seed) + offset, size - offset, flags);
-	    if (ret == -1) {
-		ATOMIC_SET(try_syscall, 0);
-		return -1;
-	    }
-	    offset += (size_t)ret;
-	} while(offset < size);
-	return 0;
+	errno = 0;
+	ret = syscall(SYS_getrandom, seed, size, flags);
+	if (errno == ENOSYS) {
+	    ATOMIC_SET(try_syscall, 0);
+	    return -1;
+	}
+	if ((size_t)ret == size) return 0;
     }
     return -1;
 }
@@ -581,38 +535,27 @@ fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
 # define fill_random_bytes_syscall(seed, size, need_secure) -1
 #endif
 
-int
-ruby_fill_random_bytes(void *seed, size_t size, int need_secure)
+static int
+fill_random_bytes(void *seed, size_t size, int need_secure)
 {
     int ret = fill_random_bytes_syscall(seed, size, need_secure);
     if (ret == 0) return ret;
     return fill_random_bytes_urandom(seed, size);
 }
 
-#define fill_random_bytes ruby_fill_random_bytes
-
 static void
 fill_random_seed(uint32_t *seed, size_t cnt)
 {
     static int n = 0;
-#if defined HAVE_CLOCK_GETTIME
-    struct timespec tv;
-#elif defined HAVE_GETTIMEOFDAY
     struct timeval tv;
-#endif
     size_t len = cnt * sizeof(*seed);
 
     memset(seed, 0, len);
 
-    fill_random_bytes(seed, len, FALSE);
+    fill_random_bytes(seed, len, TRUE);
 
-#if defined HAVE_CLOCK_GETTIME
-    clock_gettime(CLOCK_REALTIME, &tv);
-    seed[0] ^= tv.tv_nsec;
-#elif defined HAVE_GETTIMEOFDAY
     gettimeofday(&tv, 0);
     seed[0] ^= tv.tv_usec;
-#endif
     seed[1] ^= (uint32_t)tv.tv_sec;
 #if SIZEOF_TIME_T > SIZEOF_INT
     seed[0] ^= (uint32_t)((time_t)tv.tv_sec >> SIZEOF_INT * CHAR_BIT);
@@ -660,20 +603,11 @@ random_seed(void)
 }
 
 /*
- * call-seq: Random.urandom(size) -> string
+ * call-seq: Random.raw_seed(size) -> string
  *
- * Returns a string, using platform providing features.
- * Returned value is expected to be a cryptographically secure
- * pseudo-random number in binary form.
- * This method raises a RuntimeError if the feature provided by platform
- * failed to prepare the result.
+ * Returns a raw seed string, using platform providing features.
  *
- * In 2017, Linux manpage random(7) writes that "no cryptographic
- * primitive available today can hope to promise more than 256 bits of
- * security".  So it might be questionable to pass size > 32 to this
- * method.
- *
- *   Random.urandom(8)  #=> "\x78\x41\xBA\xAF\x7D\xEA\xD8\xEA"
+ *   Random.raw_seed(8)  #=> "\x78\x41\xBA\xAF\x7D\xEA\xD8\xEA"
  */
 static VALUE
 random_raw_seed(VALUE self, VALUE size)
@@ -681,8 +615,7 @@ random_raw_seed(VALUE self, VALUE size)
     long n = NUM2ULONG(size);
     VALUE buf = rb_str_new(0, n);
     if (n == 0) return buf;
-    if (fill_random_bytes(RSTRING_PTR(buf), n, TRUE))
-	rb_raise(rb_eRuntimeError, "failed to get urandom");
+    if (fill_random_bytes(RSTRING_PTR(buf), n, FALSE)) return Qnil;
     return buf;
 }
 
@@ -783,17 +716,19 @@ random_load(VALUE obj, VALUE dump)
     rb_random_t *rnd = get_rnd(obj);
     struct MT *mt = &rnd->mt;
     VALUE state, left = INT2FIX(1), seed = INT2FIX(0);
+    const VALUE *ary;
     unsigned long x;
 
     rb_check_copyable(obj, dump);
     Check_Type(dump, T_ARRAY);
+    ary = RARRAY_CONST_PTR(dump);
     switch (RARRAY_LEN(dump)) {
       case 3:
-        seed = RARRAY_AREF(dump, 2);
+	seed = ary[2];
       case 2:
-        left = RARRAY_AREF(dump, 1);
+	left = ary[1];
       case 1:
-        state = RARRAY_AREF(dump, 0);
+	state = ary[0];
 	break;
       default:
 	rb_raise(rb_eArgError, "wrong dump data");
@@ -1083,7 +1018,7 @@ rb_random_ulong_limited(VALUE obj, unsigned long limit)
     rb_random_t *rnd = try_get_rnd(obj);
     if (!rnd) {
 	VALUE lim = ulong_to_num_plus_1(limit);
-	VALUE v = rb_to_int(rb_funcallv_public(obj, id_rand, 1, &lim));
+	VALUE v = rb_to_int(rb_funcallv(obj, id_rand, 1, &lim));
 	unsigned long r = NUM2ULONG(v);
 	if (rb_num_negative_p(v)) {
 	    rb_raise(rb_eRangeError, "random number too small %ld", r);
@@ -1128,7 +1063,7 @@ random_ulong_limited_big(VALUE obj, rb_random_t *rnd, VALUE vmax)
 static VALUE genrand_bytes(rb_random_t *rnd, long n);
 
 /*
- * call-seq: prng.bytes(size) -> string
+ * call-seq: prng.bytes(size) -> a_string
  *
  * Returns a random binary string containing +size+ bytes.
  *
@@ -1178,28 +1113,17 @@ rb_random_bytes(VALUE obj, long n)
     return genrand_bytes(rnd, n);
 }
 
-/*
- * call-seq: Random.bytes(size) -> string
- *
- * Returns a random binary string.
- * The argument +size+ specifies the length of the returned string.
- */
-static VALUE
-random_s_bytes(VALUE obj, VALUE len)
-{
-    rb_random_t *rnd = rand_start(&default_rand);
-    return genrand_bytes(rnd, NUM2LONG(rb_to_int(len)));
-}
-
 static VALUE
 range_values(VALUE vmax, VALUE *begp, VALUE *endp, int *exclp)
 {
-    VALUE end;
+    VALUE end, r;
 
     if (!rb_range_values(vmax, begp, &end, exclp)) return Qfalse;
     if (endp) *endp = end;
-    if (NIL_P(end)) return Qnil;
-    return rb_check_funcall_default(end, id_minus, 1, begp, Qfalse);
+    if (!rb_respond_to(end, id_minus)) return Qfalse;
+    r = rb_funcallv(end, id_minus, 1, begp);
+    if (NIL_P(r)) return Qfalse;
+    return r;
 }
 
 static VALUE
@@ -1238,6 +1162,7 @@ rand_int(VALUE obj, rb_random_t *rnd, VALUE vmax, int restrictive)
     }
 }
 
+NORETURN(static void domain_error(void));
 static void
 domain_error(void)
 {
@@ -1283,7 +1208,6 @@ rand_range(VALUE obj, rb_random_t* rnd, VALUE range)
 
     if ((v = vmax = range_values(range, &beg, &end, &excl)) == Qfalse)
 	return Qfalse;
-    if (NIL_P(v)) domain_error();
     if (!RB_TYPE_P(vmax, T_FLOAT) && (v = rb_check_to_int(vmax), !NIL_P(v))) {
 	long max;
 	vmax = v;
@@ -1420,16 +1344,6 @@ rand_random(int argc, VALUE *argv, VALUE obj, rb_random_t *rnd)
     return rand_range(obj, rnd, vmax);
 }
 
-/*
- * call-seq:
- *   prng.random_number      -> float
- *   prng.random_number(max) -> number
- *   prng.rand               -> float
- *   prng.rand(max)          -> number
- *
- * Generates formatted random number from raw random bytes.
- * See Random#rand.
- */
 static VALUE
 rand_random_number(int argc, VALUE *argv, VALUE obj)
 {
@@ -1543,7 +1457,7 @@ random_s_rand(int argc, VALUE *argv, VALUE obj)
 }
 
 #define SIP_HASH_STREAMING 0
-#define sip_hash13 ruby_sip_hash13
+#define sip_hash24 ruby_sip_hash24
 #if !defined _WIN32 && !defined BYTE_ORDER
 # ifdef WORDS_BIGENDIAN
 #   define BYTE_ORDER BIG_ENDIAN
@@ -1559,36 +1473,50 @@ random_s_rand(int argc, VALUE *argv, VALUE obj)
 #endif
 #include "siphash.c"
 
-typedef struct {
-    st_index_t hash;
-    uint8_t sip[16];
-} seed_keys_t;
-
+static st_index_t hashseed;
+typedef uint8_t sipseed_keys_t[16];
 static union {
-    seed_keys_t key;
-    uint32_t u32[type_roomof(seed_keys_t, uint32_t)];
-} seed;
+    sipseed_keys_t key;
+    uint32_t u32[type_roomof(sipseed_keys_t, uint32_t)];
+} sipseed;
+
+static void
+init_hashseed(struct MT *mt)
+{
+    hashseed = genrand_int32(mt);
+#if SIZEOF_ST_INDEX_T*CHAR_BIT > 4*8
+    hashseed <<= 32;
+    hashseed |= genrand_int32(mt);
+#endif
+#if SIZEOF_ST_INDEX_T*CHAR_BIT > 8*8
+    hashseed <<= 32;
+    hashseed |= genrand_int32(mt);
+#endif
+#if SIZEOF_ST_INDEX_T*CHAR_BIT > 12*8
+    hashseed <<= 32;
+    hashseed |= genrand_int32(mt);
+#endif
+}
 
 static void
-init_seed(struct MT *mt)
+init_siphash(struct MT *mt)
 {
     int i;
 
-    for (i = 0; i < numberof(seed.u32); ++i)
-	seed.u32[i] = genrand_int32(mt);
+    for (i = 0; i < numberof(sipseed.u32); ++i)
+	sipseed.u32[i] = genrand_int32(mt);
 }
 
-NO_SANITIZE("unsigned-integer-overflow", extern st_index_t rb_hash_start(st_index_t h));
 st_index_t
 rb_hash_start(st_index_t h)
 {
-    return st_hash_start(seed.key.hash + h);
+    return st_hash_start(hashseed + h);
 }
 
 st_index_t
 rb_memhash(const void *ptr, long len)
 {
-    sip_uint64_t h = sip_hash13(seed.key.sip, ptr, len);
+    sip_uint64_t h = sip_hash24(sipseed.key, ptr, len);
 #ifdef HAVE_UINT64_T
     return (st_index_t)h;
 #else
@@ -1611,7 +1539,8 @@ Init_RandomSeedCore(void)
     fill_random_seed(initial_seed, DEFAULT_SEED_CNT);
     init_by_array(&mt, initial_seed, DEFAULT_SEED_CNT);
 
-    init_seed(&mt);
+    init_hashseed(&mt);
+    init_siphash(&mt);
 
     explicit_bzero(initial_seed, DEFAULT_SEED_LEN);
 }
@@ -1697,24 +1626,19 @@ InitVM_Random(void)
     {
 	/* Direct access to Ruby's Pseudorandom number generator (PRNG). */
 	VALUE rand_default = Init_Random_default();
-	/* The default Pseudorandom number generator.  Used by class
-	 * methods of Random. */
 	rb_define_const(rb_cRandom, "DEFAULT", rand_default);
     }
 
     rb_define_singleton_method(rb_cRandom, "srand", rb_f_srand, -1);
     rb_define_singleton_method(rb_cRandom, "rand", random_s_rand, -1);
-    rb_define_singleton_method(rb_cRandom, "bytes", random_s_bytes, 1);
     rb_define_singleton_method(rb_cRandom, "new_seed", random_seed, 0);
-    rb_define_singleton_method(rb_cRandom, "urandom", random_raw_seed, 1);
+    rb_define_singleton_method(rb_cRandom, "raw_seed", random_raw_seed, 1);
     rb_define_private_method(CLASS_OF(rb_cRandom), "state", random_s_state, 0);
     rb_define_private_method(CLASS_OF(rb_cRandom), "left", random_s_left, 0);
 
     {
-	/* Format raw random number as Random does */
 	VALUE m = rb_define_module_under(rb_cRandom, "Formatter");
 	rb_include_module(rb_cRandom, m);
-	rb_extend_object(rb_cRandom, m);
 	rb_define_method(m, "random_number", rand_random_number, -1);
 	rb_define_method(m, "rand", rand_random_number, -1);
     }
diff --git a/range.c b/range.c
index 293d9bdbcf..3b5d7dc870 100644
--- a/range.c
+++ b/range.c
@@ -18,12 +18,15 @@
 #include <math.h>
 
 VALUE rb_cRange;
-static ID id_beg, id_end, id_excl;
+static ID id_beg, id_end, id_excl, id_integer_p, id_div;
 #define id_cmp idCmp
 #define id_succ idSucc
 
 static VALUE r_cover_p(VALUE, VALUE, VALUE, VALUE);
 
+#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
+#define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
+#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
 #define RANGE_SET_BEG(r, v) (RSTRUCT_SET(r, 0, v))
 #define RANGE_SET_END(r, v) (RSTRUCT_SET(r, 1, v))
 #define RANGE_SET_EXCL(r, v) (RSTRUCT_SET(r, 2, v))
@@ -31,15 +34,33 @@ static VALUE r_cover_p(VALUE, VALUE, VALUE, VALUE);
 
 #define EXCL(r) RTEST(RANGE_EXCL(r))
 
+static VALUE
+range_failed(void)
+{
+    rb_raise(rb_eArgError, "bad value for range");
+    return Qnil;		/* dummy */
+}
+
+static VALUE
+range_check(VALUE *args)
+{
+    return rb_funcall(args[0], id_cmp, 1, args[1]);
+}
+
 static void
 range_init(VALUE range, VALUE beg, VALUE end, VALUE exclude_end)
 {
-    if ((!FIXNUM_P(beg) || !FIXNUM_P(end)) && !NIL_P(end)) {
+    VALUE args[2];
+
+    args[0] = beg;
+    args[1] = end;
+
+    if (!FIXNUM_P(beg) || !FIXNUM_P(end)) {
 	VALUE v;
 
-	v = rb_funcall(beg, id_cmp, 1, end);
+	v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
 	if (NIL_P(v))
-	    rb_raise(rb_eArgError, "bad value for range");
+	    range_failed();
     }
 
     RANGE_SET_EXCL(range, exclude_end);
@@ -59,7 +80,6 @@ rb_range_new(VALUE beg, VALUE end, int exclude_end)
 static void
 range_modify(VALUE range)
 {
-    rb_check_frozen(range);
     /* Ranges are immutable, so that they should be initialized only once. */
     if (RANGE_EXCL(range) != Qnil) {
 	rb_name_err_raise("`initialize' called twice", range, ID2SYM(idInitialize));
@@ -71,7 +91,7 @@ range_modify(VALUE range)
  *     Range.new(begin, end, exclude_end=false)    -> rng
  *
  *  Constructs a range using the given +begin+ and +end+. If the +exclude_end+
- *  parameter is omitted or is <code>false</code>, the range will include
+ *  parameter is omitted or is <code>false</code>, the +rng+ will include
  *  the end object; otherwise, it will be excluded.
  */
 
@@ -229,11 +249,11 @@ range_hash(VALUE range)
     hash = rb_hash_uint(hash, EXCL(range) << 24);
     hash = rb_hash_end(hash);
 
-    return ST2FIX(hash);
+    return LONG2FIX(hash);
 }
 
 static void
-range_each_func(VALUE range, int (*func)(VALUE, VALUE), VALUE arg)
+range_each_func(VALUE range, rb_block_call_func *func, VALUE arg)
 {
     int c;
     VALUE b = RANGE_BEG(range);
@@ -242,21 +262,21 @@ range_each_func(VALUE range, int (*func)(VALUE, VALUE), VALUE arg)
 
     if (EXCL(range)) {
 	while (r_less(v, e) < 0) {
-	    if ((*func)(v, arg)) break;
+	    (*func) (v, arg, 0, 0, 0);
 	    v = rb_funcallv(v, id_succ, 0, 0);
 	}
     }
     else {
 	while ((c = r_less(v, e)) <= 0) {
-	    if ((*func)(v, arg)) break;
+	    (*func) (v, arg, 0, 0, 0);
 	    if (!c) break;
 	    v = rb_funcallv(v, id_succ, 0, 0);
 	}
     }
 }
 
-static int
-sym_step_i(VALUE i, VALUE arg)
+static VALUE
+sym_step_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     VALUE *iter = (VALUE *)arg;
 
@@ -270,11 +290,11 @@ sym_step_i(VALUE i, VALUE arg)
 	rb_yield(rb_str_intern(i));
 	iter[0] = iter[1];
     }
-    return 0;
+    return Qnil;
 }
 
-static int
-step_i(VALUE i, VALUE arg)
+static VALUE
+step_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     VALUE *iter = (VALUE *)arg;
 
@@ -288,7 +308,7 @@ step_i(VALUE i, VALUE arg)
 	rb_yield(i);
 	iter[0] = iter[1];
     }
-    return 0;
+    return Qnil;
 }
 
 static int
@@ -347,14 +367,9 @@ range_step_size(VALUE range, VALUE args, VALUE eobj)
 }
 
 /*
- *  Document-method: Range#step
- *  Document-method: Range#%
  *  call-seq:
  *     rng.step(n=1) {| obj | block }    -> rng
  *     rng.step(n=1)                     -> an_enumerator
- *     rng.step(n=1)                     -> an_arithmetic_sequence
- *     rng % n                           -> an_enumerator
- *     rng % n                           -> an_arithmetic_sequence
  *
  *  Iterates over the range, passing each <code>n</code>th element to the block.
  *  If begin and end are numeric, +n+ is added for each iteration.
@@ -362,8 +377,6 @@ range_step_size(VALUE range, VALUE args, VALUE eobj)
  *  range elements.
  *
  *  If no block is given, an enumerator is returned instead.
- *  Especially, the enumerator is an Enumerator::ArithmeticSequence
- *  if begin and end of the range are numeric.
  *
  *    range = Xs.new(1)..Xs.new(10)
  *    range.step(2) {|x| puts x}
@@ -392,33 +405,19 @@ range_step(int argc, VALUE *argv, VALUE range)
 {
     VALUE b, e, step, tmp;
 
+    RETURN_SIZED_ENUMERATOR(range, argc, argv, range_step_size);
+
     b = RANGE_BEG(range);
     e = RANGE_END(range);
-    step = (!rb_check_arity(argc, 0, 1) ? INT2FIX(1) : argv[0]);
-
-    if (!rb_block_given_p()) {
-        if (rb_obj_is_kind_of(b, rb_cNumeric) && (NIL_P(e) || rb_obj_is_kind_of(e, rb_cNumeric))) {
-            return rb_arith_seq_new(range, ID2SYM(rb_frame_this_func()), argc, argv,
-                    range_step_size, b, e, step, EXCL(range));
-        }
-
-        RETURN_SIZED_ENUMERATOR(range, argc, argv, range_step_size);
+    if (argc == 0) {
+	step = INT2FIX(1);
     }
-
-    step = check_step_domain(step);
-
-    if (FIXNUM_P(b) && NIL_P(e) && FIXNUM_P(step)) {
-	long i = FIX2LONG(b), unit = FIX2LONG(step);
-	do {
-	    rb_yield(LONG2FIX(i));
-	    i += unit;          /* FIXABLE+FIXABLE never overflow */
-	} while (FIXABLE(i));
-	b = LONG2NUM(i);
-
-	for (;; b = rb_big_plus(b, step))
-	    rb_yield(b);
+    else {
+	rb_scan_args(argc, argv, "01", &step);
+	step = check_step_domain(step);
     }
-    else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
+
+    if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
 	long end = FIX2LONG(e);
 	long i, unit = FIX2LONG(step);
 
@@ -432,20 +431,16 @@ range_step(int argc, VALUE *argv, VALUE range)
 	}
 
     }
-    else if (SYMBOL_P(b) && (NIL_P(e) || SYMBOL_P(e))) { /* symbols are special */
-	VALUE iter[2];
+    else if (SYMBOL_P(b) && SYMBOL_P(e)) { /* symbols are special */
+	VALUE args[2], iter[2];
+
+	args[0] = rb_sym2str(e);
+	args[1] = EXCL(range) ? Qtrue : Qfalse;
 	iter[0] = INT2FIX(1);
 	iter[1] = step;
-
-	b = rb_sym2str(b);
-	if (NIL_P(e)) {
-	    rb_str_upto_endless_each(b, sym_step_i, (VALUE)iter);
-	}
-	else {
-	    rb_str_upto_each(b, rb_sym2str(e), EXCL(range), sym_step_i, (VALUE)iter);
-	}
+	rb_block_call(rb_sym2str(b), rb_intern("upto"), 2, args, sym_step_i, (VALUE)iter);
     }
-    else if (ruby_float_step(b, e, step, EXCL(range), TRUE)) {
+    else if (ruby_float_step(b, e, step, EXCL(range))) {
 	/* done */
     }
     else if (rb_obj_is_kind_of(b, rb_cNumeric) ||
@@ -455,7 +450,7 @@ range_step(int argc, VALUE *argv, VALUE range)
 	VALUE v = b;
 	int i = 0;
 
-	while (NIL_P(e) || RTEST(rb_funcall(v, op, 1, e))) {
+	while (RTEST(rb_funcall(v, op, 1, e))) {
 	    rb_yield(v);
 	    i++;
 	    v = rb_funcall(b, '+', 1, rb_funcall(INT2NUM(i), '*', 1, step));
@@ -465,18 +460,14 @@ range_step(int argc, VALUE *argv, VALUE range)
 	tmp = rb_check_string_type(b);
 
 	if (!NIL_P(tmp)) {
-	    VALUE iter[2];
+	    VALUE args[2], iter[2];
 
 	    b = tmp;
+	    args[0] = e;
+	    args[1] = EXCL(range) ? Qtrue : Qfalse;
 	    iter[0] = INT2FIX(1);
 	    iter[1] = step;
-
-	    if (NIL_P(e)) {
-		rb_str_upto_endless_each(b, step_i, (VALUE)iter);
-	    }
-	    else {
-		rb_str_upto_each(b, e, EXCL(range), step_i, (VALUE)iter);
-	    }
+	    rb_block_call(b, rb_intern("upto"), 2, args, step_i, (VALUE)iter);
 	}
 	else {
 	    VALUE args[2];
@@ -493,12 +484,6 @@ range_step(int argc, VALUE *argv, VALUE range)
     return range;
 }
 
-static VALUE
-range_percent_step(VALUE range, VALUE step)
-{
-    return range_step(1, &step, range);
-}
-
 #if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
 union int64_double {
     int64_t i;
@@ -531,72 +516,10 @@ double_as_int64(double d)
 static int
 is_integer_p(VALUE v)
 {
-    ID id_integer_p;
-    VALUE is_int;
-    CONST_ID(id_integer_p, "integer?");
-    is_int = rb_check_funcall(v, id_integer_p, 0, 0);
+    VALUE is_int = rb_check_funcall(v, id_integer_p, 0, 0);
     return RTEST(is_int) && is_int != Qundef;
 }
 
-static VALUE
-bsearch_integer_range(VALUE beg, VALUE end, int excl)
-{
-    VALUE satisfied = Qnil;
-    int smaller;
-
-#define BSEARCH_CHECK(expr) \
-    do { \
-	VALUE val = (expr); \
-	VALUE v = rb_yield(val); \
-	if (FIXNUM_P(v)) { \
-	    if (v == INT2FIX(0)) return val; \
-	    smaller = (SIGNED_VALUE)v < 0; \
-	} \
-	else if (v == Qtrue) { \
-	    satisfied = val; \
-	    smaller = 1; \
-	} \
-	else if (v == Qfalse || v == Qnil) { \
-	    smaller = 0; \
-	} \
-	else if (rb_obj_is_kind_of(v, rb_cNumeric)) { \
-	    int cmp = rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0)); \
-	    if (!cmp) return val; \
-	    smaller = cmp < 0; \
-	} \
-	else { \
-	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE \
-		     " (must be numeric, true, false or nil)", \
-		     rb_obj_class(v)); \
-	} \
-    } while (0)
-
-    VALUE low = rb_to_int(beg);
-    VALUE high = rb_to_int(end);
-    VALUE mid, org_high;
-    ID id_div;
-    CONST_ID(id_div, "div");
-
-    if (excl) high = rb_funcall(high, '-', 1, INT2FIX(1));
-    org_high = high;
-
-    while (rb_cmpint(rb_funcall(low, id_cmp, 1, high), low, high) < 0) {
-	mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2));
-	BSEARCH_CHECK(mid);
-	if (smaller) {
-	    high = mid;
-	}
-	else {
-	    low = rb_funcall(mid, '+', 1, INT2FIX(1));
-	}
-    }
-    if (rb_equal(low, org_high)) {
-	BSEARCH_CHECK(low);
-	if (!smaller) return Qnil;
-    }
-    return satisfied;
-}
-
 /*
  *  call-seq:
  *     rng.bsearch {|obj| block }  -> value
@@ -669,6 +592,33 @@ range_bsearch(VALUE range)
      * (-1...0.0).bsearch to yield -0.0.
      */
 
+#define BSEARCH_CHECK(expr) \
+    do { \
+	VALUE val = (expr); \
+	VALUE v = rb_yield(val); \
+	if (FIXNUM_P(v)) { \
+	    if (v == INT2FIX(0)) return val; \
+	    smaller = (SIGNED_VALUE)v < 0; \
+	} \
+	else if (v == Qtrue) { \
+	    satisfied = val; \
+	    smaller = 1; \
+	} \
+	else if (v == Qfalse || v == Qnil) { \
+	    smaller = 0; \
+	} \
+	else if (rb_obj_is_kind_of(v, rb_cNumeric)) { \
+	    int cmp = rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0)); \
+	    if (!cmp) return val; \
+	    smaller = cmp < 0; \
+	} \
+	else { \
+	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE \
+		     " (must be numeric, true, false or nil)", \
+		     rb_obj_class(v)); \
+	} \
+    } while (0)
+
 #define BSEARCH(conv) \
     do { \
 	RETURN_ENUMERATOR(range, 0, 0); \
@@ -705,26 +655,34 @@ range_bsearch(VALUE range)
 #if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
     else if (RB_TYPE_P(beg, T_FLOAT) || RB_TYPE_P(end, T_FLOAT)) {
 	int64_t low  = double_as_int64(RFLOAT_VALUE(rb_Float(beg)));
-	int64_t high = double_as_int64(NIL_P(end) ? HUGE_VAL : RFLOAT_VALUE(rb_Float(end)));
+	int64_t high = double_as_int64(RFLOAT_VALUE(rb_Float(end)));
 	int64_t mid, org_high;
 	BSEARCH(int64_as_double_to_num);
     }
 #endif
     else if (is_integer_p(beg) && is_integer_p(end)) {
+	VALUE low = rb_to_int(beg);
+	VALUE high = rb_to_int(end);
+	VALUE mid, org_high;
 	RETURN_ENUMERATOR(range, 0, 0);
-	return bsearch_integer_range(beg, end, EXCL(range));
-    }
-    else if (is_integer_p(beg) && NIL_P(end)) {
-	VALUE diff = LONG2FIX(1);
-	RETURN_ENUMERATOR(range, 0, 0);
-	while (1) {
-	    VALUE mid = rb_funcall(beg, '+', 1, diff);
+	if (EXCL(range)) high = rb_funcall(high, '-', 1, INT2FIX(1));
+	org_high = high;
+
+	while (rb_cmpint(rb_funcall(low, id_cmp, 1, high), low, high) < 0) {
+	    mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2));
 	    BSEARCH_CHECK(mid);
 	    if (smaller) {
-		return bsearch_integer_range(beg, mid, 0);
+		high = mid;
 	    }
-	    diff = rb_funcall(diff, '*', 1, LONG2FIX(2));
+	    else {
+		low = rb_funcall(mid, '+', 1, INT2FIX(1));
+	    }
+	}
+	if (rb_equal(low, org_high)) {
+	    BSEARCH_CHECK(low);
+	    if (!smaller) return Qnil;
 	}
+	return satisfied;
     }
     else {
 	rb_raise(rb_eTypeError, "can't do binary search for %s", rb_obj_classname(beg));
@@ -732,18 +690,18 @@ range_bsearch(VALUE range)
     return range;
 }
 
-static int
-each_i(VALUE v, VALUE arg)
+static VALUE
+each_i(RB_BLOCK_CALL_FUNC_ARGLIST(v, arg))
 {
     rb_yield(v);
-    return 0;
+    return Qnil;
 }
 
-static int
-sym_each_i(VALUE v, VALUE arg)
+static VALUE
+sym_each_i(RB_BLOCK_CALL_FUNC_ARGLIST(v, arg))
 {
     rb_yield(rb_str_intern(v));
-    return 0;
+    return Qnil;
 }
 
 /*
@@ -762,38 +720,12 @@ static VALUE
 range_size(VALUE range)
 {
     VALUE b = RANGE_BEG(range), e = RANGE_END(range);
-    if (rb_obj_is_kind_of(b, rb_cNumeric)) {
-        if (rb_obj_is_kind_of(e, rb_cNumeric)) {
-	    return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
-        }
-        if (NIL_P(e)) {
-            return DBL2NUM(HUGE_VAL);
-        }
+    if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) {
+	return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
     }
-
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     rng.to_a                   -> array
- *     rng.entries                -> array
- *
- *  Returns an array containing the items in the range.
- *
- *    (1..7).to_a  #=> [1, 2, 3, 4, 5, 6, 7]
- *    (1..).to_a   #=> RangeError: cannot convert endless range to an array
- */
-
-static VALUE
-range_to_a(VALUE range)
-{
-    if (NIL_P(RANGE_END(range))) {
-	rb_raise(rb_eRangeError, "cannot convert endless range to an array");
-    }
-    return rb_call_super(0, 0);
-}
-
 static VALUE
 range_enum_size(VALUE range, VALUE args, VALUE eobj)
 {
@@ -825,105 +757,45 @@ static VALUE
 range_each(VALUE range)
 {
     VALUE beg, end;
-    long i, lim;
 
     RETURN_SIZED_ENUMERATOR(range, 0, 0, range_enum_size);
 
     beg = RANGE_BEG(range);
     end = RANGE_END(range);
 
-    if (FIXNUM_P(beg) && NIL_P(end)) {
-      fixnum_endless:
-	i = FIX2LONG(beg);
-	while (FIXABLE(i)) {
-	    rb_yield(LONG2FIX(i++));
-	}
-	beg = LONG2NUM(i);
-      bignum_endless:
-	for (;; beg = rb_big_plus(beg, INT2FIX(1)))
-	    rb_yield(beg);
-    }
-    else if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
-      fixnum_loop:
-	lim = FIX2LONG(end);
+    if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
+	long lim = FIX2LONG(end);
+	long i;
+
 	if (!EXCL(range))
 	    lim += 1;
 	for (i = FIX2LONG(beg); i < lim; i++) {
 	    rb_yield(LONG2FIX(i));
 	}
     }
-    else if (RB_INTEGER_TYPE_P(beg) && (NIL_P(end) || RB_INTEGER_TYPE_P(end))) {
-	if (SPECIAL_CONST_P(end) || RBIGNUM_POSITIVE_P(end)) { /* end >= FIXNUM_MIN */
-	    if (!FIXNUM_P(beg)) {
-		if (RBIGNUM_NEGATIVE_P(beg)) {
-		    do {
-			rb_yield(beg);
-		    } while (!FIXNUM_P(beg = rb_big_plus(beg, INT2FIX(1))));
-		    if (NIL_P(end)) goto fixnum_endless;
-		    if (FIXNUM_P(end)) goto fixnum_loop;
-		}
-		else {
-		    if (NIL_P(end)) goto bignum_endless;
-		    if (FIXNUM_P(end)) return range;
-		}
-	    }
-	    if (FIXNUM_P(beg)) {
-		i = FIX2LONG(beg);
-		do {
-		    rb_yield(LONG2FIX(i));
-		} while (POSFIXABLE(++i));
-		beg = LONG2NUM(i);
-	    }
-	    ASSUME(!FIXNUM_P(beg));
-	    ASSUME(!SPECIAL_CONST_P(end));
-	}
-	if (!FIXNUM_P(beg) && RBIGNUM_SIGN(beg) == RBIGNUM_SIGN(end)) {
-	    if (EXCL(range)) {
-		while (rb_big_cmp(beg, end) == INT2FIX(-1)) {
-		    rb_yield(beg);
-		    beg = rb_big_plus(beg, INT2FIX(1));
-		}
-	    }
-	    else {
-		VALUE c;
-		while ((c = rb_big_cmp(beg, end)) != INT2FIX(1)) {
-		    rb_yield(beg);
-		    if (c == INT2FIX(0)) break;
-		    beg = rb_big_plus(beg, INT2FIX(1));
-		}
-	    }
-	}
-    }
-    else if (SYMBOL_P(beg) && (NIL_P(end) || SYMBOL_P(end))) { /* symbols are special */
-	beg = rb_sym2str(beg);
-	if (NIL_P(end)) {
-	    rb_str_upto_endless_each(beg, sym_each_i, 0);
-	}
-	else {
-	    rb_str_upto_each(beg, rb_sym2str(end), EXCL(range), sym_each_i, 0);
-	}
+    else if (SYMBOL_P(beg) && SYMBOL_P(end)) { /* symbols are special */
+	VALUE args[2];
+
+	args[0] = rb_sym2str(end);
+	args[1] = EXCL(range) ? Qtrue : Qfalse;
+	rb_block_call(rb_sym2str(beg), rb_intern("upto"), 2, args, sym_each_i, 0);
     }
     else {
 	VALUE tmp = rb_check_string_type(beg);
 
 	if (!NIL_P(tmp)) {
-	    if (!NIL_P(end)) {
-		rb_str_upto_each(tmp, end, EXCL(range), each_i, 0);
-	    }
-	    else {
-		rb_str_upto_endless_each(tmp, each_i, 0);
-	    }
+	    VALUE args[2];
+
+	    args[0] = end;
+	    args[1] = EXCL(range) ? Qtrue : Qfalse;
+	    rb_block_call(tmp, rb_intern("upto"), 2, args, each_i, 0);
 	}
 	else {
 	    if (!discrete_object_p(beg)) {
 		rb_raise(rb_eTypeError, "can't iterate from %s",
 			 rb_obj_classname(beg));
 	    }
-	    if (!NIL_P(end))
-		range_each_func(range, each_i, 0);
-	    else
-		for (;; beg = rb_funcallv(beg, id_succ, 0, 0))
-		    rb_yield(beg);
+	    range_each_func(range, each_i, 0);
 	}
     }
     return range;
@@ -1026,9 +898,6 @@ range_first(int argc, VALUE *argv, VALUE range)
 static VALUE
 range_last(int argc, VALUE *argv, VALUE range)
 {
-    if (NIL_P(RANGE_END(range))) {
-        rb_raise(rb_eRangeError, "cannot get the last element of endless range");
-    }
     if (argc == 0) return RANGE_END(range);
     return rb_ary_last(argc, argv, rb_Array(range));
 }
@@ -1042,8 +911,7 @@ range_last(int argc, VALUE *argv, VALUE range)
  *     rng.min(n) {| a,b | block }   -> array
  *
  *  Returns the minimum value in the range. Returns +nil+ if the begin
- *  value of the range is larger than the end value. Returns +nil+ if
- *  the begin value of an exclusive range is equal to the end value.
+ *  value of the range is larger than the end value.
  *
  *  Can be given an optional block to override the default comparison
  *  method <code>a <=> b</code>.
@@ -1056,19 +924,15 @@ static VALUE
 range_min(int argc, VALUE *argv, VALUE range)
 {
     if (rb_block_given_p()) {
-        if (NIL_P(RANGE_END(range))) {
-            rb_raise(rb_eRangeError, "cannot get the minimum of endless range with custom comparison method");
-        }
 	return rb_call_super(argc, argv);
     }
     else if (argc != 0) {
 	return range_first(argc, argv, range);
     }
     else {
-	struct cmp_opt_data cmp_opt = { 0, 0 };
 	VALUE b = RANGE_BEG(range);
 	VALUE e = RANGE_END(range);
-	int c = NIL_P(e) ? -1 : OPTIMIZED_CMP(b, e, cmp_opt);
+	int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
 
 	if (c > 0 || (c == 0 && EXCL(range)))
 	    return Qnil;
@@ -1084,8 +948,7 @@ range_min(int argc, VALUE *argv, VALUE range)
  *     rng.max(n) {| a,b | block }   -> obj
  *
  *  Returns the maximum value in the range. Returns +nil+ if the begin
- *  value of the range larger than the end value. Returns +nil+ if
- *  the begin value of an exclusive range is equal to the end value.
+ *  value of the range larger than the end value.
  *
  *  Can be given an optional block to override the default comparison
  *  method <code>a <=> b</code>.
@@ -1099,34 +962,29 @@ range_max(int argc, VALUE *argv, VALUE range)
     VALUE e = RANGE_END(range);
     int nm = FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cNumeric);
 
-    if (NIL_P(RANGE_END(range))) {
-	rb_raise(rb_eRangeError, "cannot get the maximum of endless range");
-    }
-
     if (rb_block_given_p() || (EXCL(range) && !nm) || argc) {
-        return rb_call_super(argc, argv);
+	return rb_call_super(argc, argv);
     }
     else {
-        struct cmp_opt_data cmp_opt = { 0, 0 };
-        VALUE b = RANGE_BEG(range);
-        int c = OPTIMIZED_CMP(b, e, cmp_opt);
-
-        if (c > 0)
-            return Qnil;
-        if (EXCL(range)) {
-            if (!RB_INTEGER_TYPE_P(e)) {
-                rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
-            }
-            if (c == 0) return Qnil;
-            if (!RB_INTEGER_TYPE_P(b)) {
-                rb_raise(rb_eTypeError, "cannot exclude end value with non Integer begin value");
-            }
-            if (FIXNUM_P(e)) {
-                return LONG2NUM(FIX2LONG(e) - 1);
-            }
-            return rb_funcall(e, '-', 1, INT2FIX(1));
-        }
-        return e;
+	VALUE b = RANGE_BEG(range);
+	int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
+
+	if (c > 0)
+	    return Qnil;
+	if (EXCL(range)) {
+	    if (!FIXNUM_P(e) && !rb_obj_is_kind_of(e, rb_cInteger)) {
+		rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
+	    }
+	    if (c == 0) return Qnil;
+	    if (!FIXNUM_P(b) && !rb_obj_is_kind_of(b,rb_cInteger)) {
+		rb_raise(rb_eTypeError, "cannot exclude end value with non Integer begin value");
+	    }
+	    if (FIXNUM_P(e)) {
+		return LONG2NUM(FIX2LONG(e) - 1);
+	    }
+	    return rb_funcall(e, '-', 1, INT2FIX(1));
+	}
+	return e;
     }
 }
 
@@ -1141,18 +999,12 @@ rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp)
 	e = RANGE_END(range);
 	excl = EXCL(range);
     }
-    else if (RTEST(rb_obj_is_kind_of(range, rb_cArithSeq))) {
-        return (int)Qfalse;
-    }
     else {
-	VALUE x;
-	b = rb_check_funcall(range, id_beg, 0, 0);
-	if (b == Qundef) return (int)Qfalse;
-	e = rb_check_funcall(range, id_end, 0, 0);
-	if (e == Qundef) return (int)Qfalse;
-	x = rb_check_funcall(range, rb_intern("exclude_end?"), 0, 0);
-	if (x == Qundef) return (int)Qfalse;
-	excl = RTEST(x);
+	if (!rb_respond_to(range, id_beg)) return (int)Qfalse;
+	if (!rb_respond_to(range, id_end)) return (int)Qfalse;
+	b = rb_funcall(range, id_beg, 0);
+	e = rb_funcall(range, id_end, 0);
+	excl = RTEST(rb_funcall(range, rb_intern("exclude_end?"), 0));
     }
     *begp = b;
     *endp = e;
@@ -1170,8 +1022,7 @@ rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err)
     if (!rb_range_values(range, &b, &e, &excl))
 	return Qfalse;
     beg = NUM2LONG(b);
-    end = NIL_P(e) ? -1 : NUM2LONG(e);
-    if (NIL_P(e)) excl = 0;
+    end = NUM2LONG(e);
     origbeg = beg;
     origend = end;
     if (beg < 0) {
@@ -1231,16 +1082,16 @@ range_to_s(VALUE range)
 static VALUE
 inspect_range(VALUE range, VALUE dummy, int recur)
 {
-    VALUE str, str2 = Qundef;
+    VALUE str, str2;
 
     if (recur) {
 	return rb_str_new2(EXCL(range) ? "(... ... ...)" : "(... .. ...)");
     }
     str = rb_inspect(RANGE_BEG(range));
-    if (!NIL_P(RANGE_END(range))) str2 = rb_inspect(RANGE_END(range));
+    str2 = rb_inspect(RANGE_END(range));
     str = rb_str_dup(str);
     rb_str_cat(str, "...", EXCL(range) ? 3 : 2);
-    if (str2 != Qundef) rb_str_append(str, str2);
+    rb_str_append(str, str2);
     OBJ_INFECT(str, range);
 
     return str;
@@ -1262,8 +1113,6 @@ range_inspect(VALUE range)
     return rb_exec_recursive(inspect_range, range, 0);
 }
 
-static VALUE range_include_internal(VALUE range, VALUE val);
-
 /*
  *  call-seq:
  *     rng === obj       ->  true or false
@@ -1286,9 +1135,7 @@ static VALUE range_include_internal(VALUE range, VALUE val);
 static VALUE
 range_eqq(VALUE range, VALUE val)
 {
-    VALUE ret = range_include_internal(range, val);
-    if (ret != Qundef) return ret;
-    return r_cover_p(range, RANGE_BEG(range), RANGE_END(range), val);
+    return rb_funcall(range, rb_intern("include?"), 1, val);
 }
 
 
@@ -1309,14 +1156,6 @@ range_eqq(VALUE range, VALUE val)
 static VALUE
 range_include(VALUE range, VALUE val)
 {
-    VALUE ret = range_include_internal(range, val);
-    if (ret != Qundef) return ret;
-    return rb_call_super(1, &val);
-}
-
-static VALUE
-range_include_internal(VALUE range, VALUE val)
-{
     VALUE beg = RANGE_BEG(range);
     VALUE end = RANGE_END(range);
     int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
@@ -1327,27 +1166,18 @@ range_include_internal(VALUE range, VALUE val)
 	!NIL_P(rb_check_to_integer(end, "to_int"))) {
 	return r_cover_p(range, beg, end, val);
     }
-    else if (RB_TYPE_P(beg, T_STRING)) {
-	if (RB_TYPE_P(end, T_STRING)) {
-	    VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
-	    return rb_str_include_range_p(beg, end, val, RANGE_EXCL(range));
-	}
-	else if (NIL_P(end)) {
-	    VALUE r = rb_funcall(beg, id_cmp, 1, val);
-	    if (NIL_P(r)) return Qfalse;
-	    if (rb_cmpint(r, beg, val) <= 0) return Qtrue;
-	    return Qfalse;
-	}
+    else if (RB_TYPE_P(beg, T_STRING) && RB_TYPE_P(end, T_STRING)) {
+	VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
+	return rb_str_include_range_p(beg, end, val, RANGE_EXCL(range));
     }
-    return Qundef;
+    /* TODO: ruby_frame->this_func = rb_intern("include?"); */
+    return rb_call_super(1, &val);
 }
 
-static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
 
 /*
  *  call-seq:
- *     rng.cover?(obj)   ->  true or false
- *     rng.cover?(range) ->  true or false
+ *     rng.cover?(obj)  ->  true or false
  *
  *  Returns <code>true</code> if +obj+ is between the begin and end of
  *  the range.
@@ -1355,22 +1185,9 @@ static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
  *  This tests <code>begin <= obj <= end</code> when #exclude_end? is +false+
  *  and <code>begin <= obj < end</code> when #exclude_end? is +true+.
  *
- *  If called with a Range argument, returns <code>true</code> when the
- *  given range is covered by the receiver,
- *  by comparing the begin and end values. If the argument can be treated as
- *  a sequence, this method treats it that way. In the specific case of
- *  <code>(a..b).cover?(c...d)</code> with <code>a <= c && b < d</code>,
- *  the end of the sequence must be calculated, which may exhibit poor
- *  performance if <code>c</code> is non-numeric.
- *  Returns <code>false</code> if the begin value of the
- *  range is larger than the end value.
- *
- *     ("a".."z").cover?("c")  #=> true
- *     ("a".."z").cover?("5")  #=> false
- *     ("a".."z").cover?("cc") #=> true
- *     (1..5).cover?(2..3)     #=> true
- *     (1..5).cover?(0..6)     #=> false
- *     (1..5).cover?(1...6)    #=> true
+ *     ("a".."z").cover?("c")    #=> true
+ *     ("a".."z").cover?("5")    #=> false
+ *     ("a".."z").cover?("cc")   #=> true
  */
 
 static VALUE
@@ -1380,54 +1197,15 @@ range_cover(VALUE range, VALUE val)
 
     beg = RANGE_BEG(range);
     end = RANGE_END(range);
-
-    if (rb_obj_is_kind_of(val, rb_cRange)) {
-        return RBOOL(r_cover_range_p(range, beg, end, val));
-    }
     return r_cover_p(range, beg, end, val);
 }
 
 static VALUE
-r_call_max(VALUE r)
-{
-    return rb_funcallv(r, rb_intern("max"), 0, 0);
-}
-
-static int
-r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val)
-{
-    VALUE val_beg, val_end, val_max;
-    int cmp_end;
-
-    val_beg = RANGE_BEG(val);
-    val_end = RANGE_END(val);
-
-    if (!NIL_P(end) && NIL_P(val_end)) return FALSE;
-    if (!NIL_P(val_end) && r_less(val_beg, val_end) > -EXCL(val)) return FALSE;
-    if (!r_cover_p(range, beg, end, val_beg)) return FALSE;
-
-    cmp_end = r_less(end, val_end);
-
-    if (EXCL(range) == EXCL(val)) {
-        return cmp_end >= 0;
-    } else if (EXCL(range)) {
-        return cmp_end > 0;
-    } else if (cmp_end >= 0) {
-        return TRUE;
-    }
-
-    val_max = rb_rescue2(r_call_max, val, NULL, Qnil, rb_eTypeError, (VALUE)0);
-    if (val_max == Qnil) return FALSE;
-
-    return r_less(end, val_max) >= 0;
-}
-
-static VALUE
 r_cover_p(VALUE range, VALUE beg, VALUE end, VALUE val)
 {
     if (r_less(beg, val) <= 0) {
 	int excl = EXCL(range);
-	if (NIL_P(end) || r_less(val, end) <= -excl)
+	if (r_less(val, end) <= -excl)
 	    return Qtrue;
     }
     return Qfalse;
@@ -1450,27 +1228,22 @@ range_dumper(VALUE range)
 static VALUE
 range_loader(VALUE range, VALUE obj)
 {
-    VALUE beg, end, excl;
-
     if (!RB_TYPE_P(obj, T_OBJECT) || RBASIC(obj)->klass != rb_cObject) {
         rb_raise(rb_eTypeError, "not a dumped range object");
     }
 
     range_modify(range);
-    beg = rb_ivar_get(obj, id_beg);
-    end = rb_ivar_get(obj, id_end);
-    excl = rb_ivar_get(obj, id_excl);
-    if (!NIL_P(excl)) {
-	range_init(range, beg, end, RBOOL(RTEST(excl)));
-    }
+    RANGE_SET_BEG(range, rb_ivar_get(obj, id_beg));
+    RANGE_SET_END(range, rb_ivar_get(obj, id_end));
+    RANGE_SET_EXCL(range, rb_ivar_get(obj, id_excl));
     return range;
 }
 
 static VALUE
 range_alloc(VALUE klass)
 {
-    /* rb_struct_alloc_noinit itself should not be used because
-     * rb_marshal_define_compat uses equality of allocation function */
+  /* rb_struct_alloc_noinit itself should not be used because
+   * rb_marshal_define_compat uses equality of allocation function */
     return rb_struct_alloc_noinit(klass);
 }
 
@@ -1488,34 +1261,6 @@ range_alloc(VALUE klass)
  *     ('a'..'e').to_a    #=> ["a", "b", "c", "d", "e"]
  *     ('a'...'e').to_a   #=> ["a", "b", "c", "d"]
  *
- *  == Endless Ranges
- *
- *  An "endless range" represents a semi-infinite range.
- *  Literal notation for an endless range is:
- *
- *     (1..)
- *     # or similarly
- *     (1...)
- *
- *  Which is equivalent to
- *
- *     (1..nil)  # or similarly (1...nil)
- *     Range.new(1, nil) # or Range.new(1, nil, true)
- *
- *  Endless ranges are useful, for example, for idiomatic slicing of
- *  arrays:
- *
- *    [1, 2, 3, 4, 5][2...]   # => [3, 4, 5]
- *
- *  Some implementation details:
- *
- *  * +end+ of endless range is +nil+;
- *  * +each+ of endless range enumerates infinite sequence (may be
- *    useful in combination with Enumerable#take_while or similar
- *    methods);
- *  * <code>(1..)</code> and <code>(1...)</code> are not equal,
- *    although technically representing the same sequence.
- *
  *  == Custom Objects in Ranges
  *
  *  Ranges can be constructed using any objects that can be compared
@@ -1568,6 +1313,8 @@ Init_Range(void)
     id_beg = rb_intern("begin");
     id_end = rb_intern("end");
     id_excl = rb_intern("excl");
+    id_integer_p = rb_intern("integer?");
+    id_div = rb_intern("div");
 
     rb_cRange = rb_struct_define_without_accessor(
         "Range", rb_cObject, range_alloc,
@@ -1583,7 +1330,6 @@ Init_Range(void)
     rb_define_method(rb_cRange, "hash", range_hash, 0);
     rb_define_method(rb_cRange, "each", range_each, 0);
     rb_define_method(rb_cRange, "step", range_step, -1);
-    rb_define_method(rb_cRange, "%", range_percent_step, 1);
     rb_define_method(rb_cRange, "bsearch", range_bsearch, 0);
     rb_define_method(rb_cRange, "begin", range_begin, 0);
     rb_define_method(rb_cRange, "end", range_end, 0);
@@ -1592,8 +1338,6 @@ Init_Range(void)
     rb_define_method(rb_cRange, "min", range_min, -1);
     rb_define_method(rb_cRange, "max", range_max, -1);
     rb_define_method(rb_cRange, "size", range_size, 0);
-    rb_define_method(rb_cRange, "to_a", range_to_a, 0);
-    rb_define_method(rb_cRange, "entries", range_to_a, 0);
     rb_define_method(rb_cRange, "to_s", range_to_s, 0);
     rb_define_method(rb_cRange, "inspect", range_inspect, 0);
 
diff --git a/rational.c b/rational.c
index 435a68f421..f0e8d56cbf 100644
--- a/rational.c
+++ b/rational.c
@@ -6,7 +6,6 @@
 */
 
 #include "internal.h"
-#include "id.h"
 #include <math.h>
 #include <float.h>
 
@@ -28,26 +27,21 @@
 
 #define GMP_GCD_DIGITS 1
 
-#define INT_POSITIVE_P(x) (FIXNUM_P(x) ? FIXNUM_POSITIVE_P(x) : BIGNUM_POSITIVE_P(x))
-#define INT_ZERO_P(x) (FIXNUM_P(x) ? FIXNUM_ZERO_P(x) : rb_bigzero_p(x))
-
 VALUE rb_cRational;
 
-static ID id_abs, id_idiv, id_integer_p,
-    id_i_num, id_i_den;
-#define id_to_i idTo_i
+static ID id_abs, id_cmp, id_convert, id_eqeq_p, id_expt, id_fdiv,
+    id_idiv, id_integer_p, id_negate, id_to_f,
+    id_to_i, id_truncate, id_i_num, id_i_den;
 
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
 #define f_inspect rb_inspect
 #define f_to_s rb_obj_as_string
 
-static VALUE nurat_to_f(VALUE self);
-
 #define binop(n,op) \
 inline static VALUE \
 f_##n(VALUE x, VALUE y)\
 {\
-    return rb_funcall(x, (op), 1, y); \
+  return rb_funcall(x, (op), 1, y);\
 }
 
 #define fun1(n) \
@@ -57,70 +51,90 @@ f_##n(VALUE x)\
     return rb_funcall(x, id_##n, 0);\
 }
 
+#define fun2(n) \
+inline static VALUE \
+f_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(x, id_##n, 1, y);\
+}
+
 inline static VALUE
 f_add(VALUE x, VALUE y)
 {
-    if (FIXNUM_ZERO_P(y))
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
 	return x;
-    if (FIXNUM_ZERO_P(x))
+    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
 	return y;
     return rb_funcall(x, '+', 1, y);
 }
 
 inline static VALUE
+f_cmp(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y)) {
+	long c = FIX2LONG(x) - FIX2LONG(y);
+	if (c > 0)
+	    c = 1;
+	else if (c < 0)
+	    c = -1;
+	return INT2FIX(c);
+    }
+    return rb_funcall(x, id_cmp, 1, y);
+}
+
+inline static VALUE
 f_div(VALUE x, VALUE y)
 {
-    if (y == ONE)
+    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
 	return x;
-    if (RB_INTEGER_TYPE_P(x))
-	return rb_int_div(x, y);
     return rb_funcall(x, '/', 1, y);
 }
 
-inline static int
+inline static VALUE
 f_lt_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return (SIGNED_VALUE)x < (SIGNED_VALUE)y;
-    return RTEST(rb_funcall(x, '<', 1, y));
+	return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
+    return rb_funcall(x, '<', 1, y);
 }
 
-#ifndef NDEBUG
-/* f_mod is used only in f_gcd defined when NDEBUG is not defined */
 binop(mod, '%')
-#endif
 
 inline static VALUE
 f_mul(VALUE x, VALUE y)
 {
-    if (FIXNUM_ZERO_P(y) && RB_INTEGER_TYPE_P(x))
-	return ZERO;
-    if (y == ONE) return x;
-    if (FIXNUM_ZERO_P(x) && RB_INTEGER_TYPE_P(y))
-	return ZERO;
-    if (x == ONE) return y;
-    else if (RB_INTEGER_TYPE_P(x))
-	return rb_int_mul(x, y);
+    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;
+    }
     return rb_funcall(x, '*', 1, y);
 }
 
 inline static VALUE
 f_sub(VALUE x, VALUE y)
 {
-    if (FIXNUM_P(y) && FIXNUM_ZERO_P(y))
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
 	return x;
     return rb_funcall(x, '-', 1, y);
 }
 
-inline static VALUE
-f_abs(VALUE x)
-{
-    if (RB_INTEGER_TYPE_P(x))
-	return rb_int_abs(x);
-    return rb_funcall(x, id_abs, 0);
-}
-
+fun1(abs)
 fun1(integer_p)
+fun1(negate)
 
 inline static VALUE
 f_to_i(VALUE x)
@@ -129,61 +143,81 @@ 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)
+{
+    if (RB_TYPE_P(x, T_STRING))
+	return DBL2NUM(rb_str_to_dbl(x, 0));
+    return rb_funcall(x, id_to_f, 0);
+}
 
 inline static VALUE
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return x == y;
-    return (int)rb_equal(x, y);
+	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
+    return rb_funcall(x, id_eqeq_p, 1, y);
 }
 
+fun2(expt)
+fun2(fdiv)
+fun2(idiv)
+
+#define f_expt10(x) f_expt(INT2FIX(10), x)
+
 inline static VALUE
-f_idiv(VALUE x, VALUE y)
+f_negative_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x))
-	return rb_int_idiv(x, y);
-    return rb_funcall(x, id_idiv, 1, y);
+    if (FIXNUM_P(x))
+	return f_boolcast(FIX2LONG(x) < 0);
+    return rb_funcall(x, '<', 1, ZERO);
 }
 
-#define f_expt10(x) rb_int_pow(INT2FIX(10), x)
+#define f_positive_p(x) (!f_negative_p(x))
 
-inline static int
+inline static VALUE
 f_zero_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-	return FIXNUM_ZERO_P(x);
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 0);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
 	VALUE num = RRATIONAL(x)->num;
 
-	return FIXNUM_ZERO_P(num);
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
     }
-    return (int)rb_equal(x, ZERO);
+    return rb_funcall(x, id_eqeq_p, 1, ZERO);
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
 
-inline static int
+inline static VALUE
 f_one_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-	return x == LONG2FIX(1);
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 1);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
 	VALUE num = RRATIONAL(x)->num;
 	VALUE den = RRATIONAL(x)->den;
 
-	return num == LONG2FIX(1) && den == LONG2FIX(1);
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
+			  FIXNUM_P(den) && FIX2LONG(den) == 1);
     }
-    return (int)rb_equal(x, ONE);
+    return rb_funcall(x, id_eqeq_p, 1, ONE);
 }
 
-inline static int
+inline static VALUE
 f_minus_one_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-	return x == LONG2FIX(-1);
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == -1);
     }
     else if (RB_TYPE_P(x, T_BIGNUM)) {
 	return Qfalse;
@@ -192,39 +226,40 @@ f_minus_one_p(VALUE x)
 	VALUE num = RRATIONAL(x)->num;
 	VALUE den = RRATIONAL(x)->den;
 
-	return num == LONG2FIX(-1) && den == LONG2FIX(1);
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == -1 &&
+			  FIXNUM_P(den) && FIX2LONG(den) == 1);
     }
-    return (int)rb_equal(x, INT2FIX(-1));
+    return rb_funcall(x, id_eqeq_p, 1, INT2FIX(-1));
 }
 
-inline static int
+inline static VALUE
 f_kind_of_p(VALUE x, VALUE c)
 {
-    return (int)rb_obj_is_kind_of(x, c);
+    return rb_obj_is_kind_of(x, c);
 }
 
-inline static int
+inline static VALUE
 k_numeric_p(VALUE x)
 {
     return f_kind_of_p(x, rb_cNumeric);
 }
 
-inline static int
+inline static VALUE
 k_integer_p(VALUE x)
 {
-    return RB_INTEGER_TYPE_P(x);
+    return f_kind_of_p(x, rb_cInteger);
 }
 
-inline static int
+inline static VALUE
 k_float_p(VALUE x)
 {
-    return RB_FLOAT_TYPE_P(x);
+    return f_kind_of_p(x, rb_cFloat);
 }
 
-inline static int
+inline static VALUE
 k_rational_p(VALUE x)
 {
-    return RB_TYPE_P(x, T_RATIONAL);
+    return f_kind_of_p(x, rb_cRational);
 }
 
 #define k_exact_p(x) (!k_float_p(x))
@@ -251,15 +286,10 @@ rb_gcd_gmp(VALUE x, VALUE y)
 
     mpz_gcd(mz, mx, my);
 
-    mpz_clear(mx);
-    mpz_clear(my);
-
     zn = (mpz_sizeinbase(mz, 16) + SIZEOF_BDIGIT*2 - 1) / (SIZEOF_BDIGIT*2);
     z = rb_big_new(zn, 1);
     mpz_export(BIGNUM_DIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz);
 
-    mpz_clear(mz);
-
     return rb_big_norm(z);
 }
 #endif
@@ -271,9 +301,6 @@ rb_gcd_gmp(VALUE x, VALUE y)
 inline static long
 i_gcd(long x, long y)
 {
-    unsigned long u, v, t;
-    int shift;
-
     if (x < 0)
 	x = -x;
     if (y < 0)
@@ -284,29 +311,12 @@ i_gcd(long x, long y)
     if (y == 0)
 	return x;
 
-    u = (unsigned long)x;
-    v = (unsigned long)y;
-    for (shift = 0; ((u | v) & 1) == 0; ++shift) {
-	u >>= 1;
-	v >>= 1;
+    while (x > 0) {
+	long t = x;
+	x = y % x;
+	y = t;
     }
-
-    while ((u & 1) == 0)
-	u >>= 1;
-
-    do {
-	while ((v & 1) == 0)
-	    v >>= 1;
-
-	if (u > v) {
-	    t = v;
-	    v = u;
-	    u = t;
-	}
-	v = v - u;
-    } while (v != 0);
-
-    return (long)(u << shift);
+    return y;
 }
 
 inline static VALUE
@@ -317,25 +327,25 @@ f_gcd_normal(VALUE x, VALUE y)
     if (FIXNUM_P(x) && FIXNUM_P(y))
 	return LONG2NUM(i_gcd(FIX2LONG(x), FIX2LONG(y)));
 
-    if (INT_NEGATIVE_P(x))
-	x = rb_int_uminus(x);
-    if (INT_NEGATIVE_P(y))
-	y = rb_int_uminus(y);
+    if (f_negative_p(x))
+	x = f_negate(x);
+    if (f_negative_p(y))
+	y = f_negate(y);
 
-    if (INT_ZERO_P(x))
+    if (f_zero_p(x))
 	return y;
-    if (INT_ZERO_P(y))
+    if (f_zero_p(y))
 	return x;
 
     for (;;) {
 	if (FIXNUM_P(x)) {
-	    if (FIXNUM_ZERO_P(x))
+	    if (FIX2LONG(x) == 0)
 		return y;
 	    if (FIXNUM_P(y))
 		return LONG2NUM(i_gcd(FIX2LONG(x), FIX2LONG(y)));
 	}
 	z = x;
-	x = rb_int_modulo(y, x);
+	x = f_mod(y, x);
 	y = z;
     }
     /* NOTREACHED */
@@ -379,7 +389,7 @@ f_gcd(VALUE x, VALUE y)
 inline static VALUE
 f_lcm(VALUE x, VALUE y)
 {
-    if (INT_ZERO_P(x) || INT_ZERO_P(y))
+    if (f_zero_p(x) || f_zero_p(y))
 	return ZERO;
     return f_abs(f_mul(f_div(x, f_gcd(x, y)), y));
 }
@@ -390,6 +400,9 @@ f_lcm(VALUE x, VALUE y)
 #define get_dat2(x,y) \
     struct RRational *adat = RRATIONAL(x), *bdat = RRATIONAL(y)
 
+#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))
+
 inline static VALUE
 nurat_s_new_internal(VALUE klass, VALUE num, VALUE den)
 {
@@ -397,7 +410,6 @@ nurat_s_new_internal(VALUE klass, VALUE num, VALUE den)
 
     RRATIONAL_SET_NUM(obj, num);
     RRATIONAL_SET_DEN(obj, den);
-    OBJ_FREEZE_RAW(obj);
 
     return (VALUE)obj;
 }
@@ -408,6 +420,42 @@ nurat_s_alloc(VALUE klass)
     return nurat_s_new_internal(klass, ZERO, ONE);
 }
 
+#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0")
+
+#if 0
+static VALUE
+nurat_s_new_bang(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE num, den;
+
+    switch (rb_scan_args(argc, argv, "11", &num, &den)) {
+      case 1:
+	if (!k_integer_p(num))
+	    num = f_to_i(num);
+	den = ONE;
+	break;
+      default:
+	if (!k_integer_p(num))
+	    num = f_to_i(num);
+	if (!k_integer_p(den))
+	    den = f_to_i(den);
+
+	switch (FIX2INT(f_cmp(den, ZERO))) {
+	  case -1:
+	    num = f_negate(num);
+	    den = f_negate(den);
+	    break;
+	  case 0:
+	    rb_raise_zerodiv();
+	    break;
+	}
+	break;
+    }
+
+    return nurat_s_new_internal(klass, num, den);
+}
+#endif
+
 inline static VALUE
 f_rational_new_bang1(VALUE klass, VALUE x)
 {
@@ -415,6 +463,10 @@ f_rational_new_bang1(VALUE klass, VALUE x)
 }
 
 #ifdef CANONICALIZATION_FOR_MATHN
+#define CANON
+#endif
+
+#ifdef CANON
 static int canonicalization = 0;
 
 RUBY_FUNC_EXPORTED void
@@ -422,14 +474,12 @@ nurat_canonicalization(int f)
 {
     canonicalization = f;
 }
-#else
-# define canonicalization 0
 #endif
 
 inline static void
 nurat_int_check(VALUE num)
 {
-    if (!RB_INTEGER_TYPE_P(num)) {
+    if (!(RB_TYPE_P(num, T_FIXNUM) || RB_TYPE_P(num, T_BIGNUM))) {
 	if (!k_numeric_p(num) || !f_integer_p(num))
 	    rb_raise(rb_eTypeError, "not an integer");
     }
@@ -444,48 +494,49 @@ nurat_int_value(VALUE num)
     return num;
 }
 
-static void
-nurat_canonicalize(VALUE *num, VALUE *den)
-{
-    assert(num); assert(RB_INTEGER_TYPE_P(*num));
-    assert(den); assert(RB_INTEGER_TYPE_P(*den));
-    if (INT_NEGATIVE_P(*den)) {
-        *num = rb_int_uminus(*num);
-        *den = rb_int_uminus(*den);
-    }
-    else if (INT_ZERO_P(*den)) {
-        rb_num_zerodiv();
-    }
-}
-
-static void
-nurat_reduce(VALUE *x, VALUE *y)
-{
-    VALUE gcd;
-    if (*x == ONE || *y == ONE) return;
-    gcd = f_gcd(*x, *y);
-    *x = f_idiv(*x, gcd);
-    *y = f_idiv(*y, gcd);
-}
-
 inline static VALUE
 nurat_s_canonicalize_internal(VALUE klass, VALUE num, VALUE den)
 {
-    nurat_canonicalize(&num, &den);
-    nurat_reduce(&num, &den);
+    VALUE gcd;
 
-    if (canonicalization && f_one_p(den))
+    switch (FIX2INT(f_cmp(den, ZERO))) {
+      case -1:
+	num = f_negate(num);
+	den = f_negate(den);
+	break;
+      case 0:
+	rb_raise_zerodiv();
+	break;
+    }
+
+    gcd = f_gcd(num, den);
+    num = f_idiv(num, gcd);
+    den = f_idiv(den, gcd);
+
+#ifdef CANON
+    if (f_one_p(den) && canonicalization)
 	return num;
+#endif
     return nurat_s_new_internal(klass, num, den);
 }
 
 inline static VALUE
 nurat_s_canonicalize_internal_no_reduce(VALUE klass, VALUE num, VALUE den)
 {
-    nurat_canonicalize(&num, &den);
+    switch (FIX2INT(f_cmp(den, ZERO))) {
+      case -1:
+	num = f_negate(num);
+	den = f_negate(den);
+	break;
+      case 0:
+	rb_raise_zerodiv();
+	break;
+    }
 
-    if (canonicalization && f_one_p(den))
+#ifdef CANON
+    if (f_one_p(den) && canonicalization)
 	return num;
+#endif
     return nurat_s_new_internal(klass, num, den);
 }
 
@@ -524,31 +575,18 @@ f_rational_new_no_reduce2(VALUE klass, VALUE x, VALUE y)
     return nurat_s_canonicalize_internal_no_reduce(klass, x, y);
 }
 
-static VALUE nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise);
-static VALUE nurat_s_convert(int argc, VALUE *argv, VALUE klass);
-
 /*
  * call-seq:
- *    Rational(x, y, exception: true)  ->  rational
- *    Rational(arg, exception: true)   ->  rational
- *
- * Returns +x/y+ or +arg+ as a Rational.
- *
- *    Rational(2, 3)   #=> (2/3)
- *    Rational(5)      #=> (5/1)
- *    Rational(0.5)    #=> (1/2)
- *    Rational(0.3)    #=> (5404319552844595/18014398509481984)
- *
- *    Rational("2/3")  #=> (2/3)
- *    Rational("0.3")  #=> (3/10)
+ *    Rational(x[, y])  ->  numeric
  *
- *    Rational("10 cents")  #=> ArgumentError
- *    Rational(nil)         #=> TypeError
- *    Rational(1, nil)      #=> TypeError
+ * Returns x/y;
  *
- *    Rational("10 cents", exception: false)  #=> nil
+ *    Rational(1, 2)   #=> (1/2)
+ *    Rational('1/2')  #=> (1/2)
+ *    Rational(nil)    #=> TypeError
+ *    Rational(1, nil) #=> TypeError
  *
- * Syntax of the string form:
+ * Syntax of string form:
  *
  *   string form = extra spaces , rational , extra spaces ;
  *   rational = [ sign ] , unsigned rational ;
@@ -562,27 +600,12 @@ static VALUE nurat_s_convert(int argc, VALUE *argv, VALUE klass);
  *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
  *   extra spaces = ? \s* ? ;
  *
- * See also String#to_r.
+ * See String#to_r.
  */
 static VALUE
 nurat_f_rational(int argc, VALUE *argv, VALUE klass)
 {
-    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)) {
-        static ID kwds[1];
-        VALUE exception;
-        if (!kwds[0]) {
-            kwds[0] = idException;
-        }
-        rb_get_kwargs(opts, kwds, 0, 1, &exception);
-        raise = (exception != Qfalse);
-    }
-    return nurat_convert(rb_cRational, a1, a2, raise);
+    return rb_funcallv(rb_cRational, id_convert, argc, argv);
 }
 
 /*
@@ -613,6 +636,7 @@ nurat_numerator(VALUE self)
  *    Rational(7, 1).denominator          #=> 1
  *    Rational(9, -4).denominator         #=> 4
  *    Rational(-2, -10).denominator       #=> 5
+ *    rat.numerator.gcd(rat.denominator)  #=> 1
  */
 static VALUE
 nurat_denominator(VALUE self)
@@ -621,21 +645,6 @@ nurat_denominator(VALUE self)
     return dat->den;
 }
 
-/*
- * call-seq:
- *    -rat  ->  rational
- *
- * Negates +rat+.
- */
-VALUE
-rb_rational_uminus(VALUE self)
-{
-    const int unused = (assert(RB_TYPE_P(self, T_RATIONAL)), 0);
-    get_dat1(self);
-    (void)unused;
-    return f_rational_new2(CLASS_OF(self), rb_int_uminus(dat->num), dat->den);
-}
-
 #ifndef NDEBUG
 #define f_imul f_imul_orig
 #endif
@@ -690,44 +699,36 @@ f_addsub(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
 	VALUE c;
 
 	if (k == '+')
-	    c = rb_int_plus(a, b);
+	    c = f_add(a, b);
 	else
-	    c = rb_int_minus(a, b);
+	    c = f_sub(a, b);
 
-	b = rb_int_idiv(aden, g);
+	b = f_idiv(aden, g);
 	g = f_gcd(c, g);
-	num = rb_int_idiv(c, g);
-	a = rb_int_idiv(bden, g);
-	den = rb_int_mul(a, b);
+	num = f_idiv(c, g);
+	a = f_idiv(bden, g);
+	den = f_mul(a, b);
     }
-    else if (RB_INTEGER_TYPE_P(anum) && RB_INTEGER_TYPE_P(aden) &&
-             RB_INTEGER_TYPE_P(bnum) && RB_INTEGER_TYPE_P(bden)) {
+    else {
 	VALUE g = f_gcd(aden, bden);
-	VALUE a = rb_int_mul(anum, rb_int_idiv(bden, g));
-	VALUE b = rb_int_mul(bnum, rb_int_idiv(aden, g));
+	VALUE a = f_mul(anum, f_idiv(bden, g));
+	VALUE b = f_mul(bnum, f_idiv(aden, g));
 	VALUE c;
 
 	if (k == '+')
-	    c = rb_int_plus(a, b);
+	    c = f_add(a, b);
 	else
-	    c = rb_int_minus(a, b);
+	    c = f_sub(a, b);
 
-	b = rb_int_idiv(aden, g);
+	b = f_idiv(aden, g);
 	g = f_gcd(c, g);
-	num = rb_int_idiv(c, g);
-	a = rb_int_idiv(bden, g);
-	den = rb_int_mul(a, b);
-    }
-    else {
-        double a = NUM2DBL(anum) / NUM2DBL(aden);
-        double b = NUM2DBL(bnum) / NUM2DBL(bden);
-        double c = k == '+' ? a + b : a - b;
-        return DBL2NUM(c);
+	num = f_idiv(c, g);
+	a = f_idiv(bden, g);
+	den = f_mul(a, b);
     }
     return f_rational_new_no_reduce2(CLASS_OF(self), num, den);
 }
 
-static double nurat_to_double(VALUE self);
 /*
  * call-seq:
  *    rat + numeric  ->  numeric
@@ -735,7 +736,7 @@ static double nurat_to_double(VALUE self);
  * Performs addition.
  *
  *    Rational(2, 3)  + Rational(2, 3)   #=> (4/3)
- *    Rational(900)   + Rational(1)      #=> (901/1)
+ *    Rational(900)   + Rational(1)      #=> (900/1)
  *    Rational(-2, 9) + Rational(-9, 2)  #=> (-85/18)
  *    Rational(9, 8)  + 4                #=> (41/8)
  *    Rational(20, 9) + 9.8              #=> 12.022222222222222
@@ -743,17 +744,17 @@ static double nurat_to_double(VALUE self);
 VALUE
 rb_rational_plus(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	{
 	    get_dat1(self);
 
-	    return f_rational_new_no_reduce2(CLASS_OF(self),
-					     rb_int_plus(dat->num, rb_int_mul(other, dat->den)),
-					     dat->den);
+	    return f_addsub(self,
+			    dat->num, dat->den,
+			    other, ONE, '+');
 	}
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-	return DBL2NUM(nurat_to_double(self) + RFLOAT_VALUE(other));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return f_add(f_to_f(self), other);
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	{
@@ -778,23 +779,23 @@ rb_rational_plus(VALUE self, VALUE other)
  *    Rational(2, 3)  - Rational(2, 3)   #=> (0/1)
  *    Rational(900)   - Rational(1)      #=> (899/1)
  *    Rational(-2, 9) - Rational(-9, 2)  #=> (77/18)
- *    Rational(9, 8)  - 4                #=> (-23/8)
+ *    Rational(9, 8)  - 4                #=> (23/8)
  *    Rational(20, 9) - 9.8              #=> -7.577777777777778
  */
 static VALUE
 nurat_sub(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	{
 	    get_dat1(self);
 
-	    return f_rational_new_no_reduce2(CLASS_OF(self),
-					     rb_int_minus(dat->num, rb_int_mul(other, dat->den)),
-					     dat->den);
+	    return f_addsub(self,
+			    dat->num, dat->den,
+			    other, ONE, '-');
 	}
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-	return DBL2NUM(nurat_to_double(self) - RFLOAT_VALUE(other));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return f_sub(f_to_f(self), other);
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	{
@@ -815,28 +816,12 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
 {
     VALUE num, den;
 
-    assert(RB_TYPE_P(self, T_RATIONAL));
-
-    /* Integer#** can return Rational with Float right now */
-    if (RB_FLOAT_TYPE_P(anum) || RB_FLOAT_TYPE_P(aden) ||
-        RB_FLOAT_TYPE_P(bnum) || RB_FLOAT_TYPE_P(bden)) {
-        double an = NUM2DBL(anum), ad = NUM2DBL(aden);
-        double bn = NUM2DBL(bnum), bd = NUM2DBL(bden);
-        double x = (an * bn) / (ad * bd);
-        return DBL2NUM(x);
-    }
-
-    assert(RB_INTEGER_TYPE_P(anum));
-    assert(RB_INTEGER_TYPE_P(aden));
-    assert(RB_INTEGER_TYPE_P(bnum));
-    assert(RB_INTEGER_TYPE_P(bden));
-
     if (k == '/') {
 	VALUE t;
 
-	if (INT_NEGATIVE_P(bnum)) {
-	    anum = rb_int_uminus(anum);
-	    bnum = rb_int_uminus(bnum);
+	if (f_negative_p(bnum)) {
+	    anum = f_negate(anum);
+	    bnum = f_negate(bnum);
 	}
 	t = bnum;
 	bnum = bden;
@@ -859,8 +844,8 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
 	VALUE g1 = f_gcd(anum, bden);
 	VALUE g2 = f_gcd(aden, bnum);
 
-	num = rb_int_mul(rb_int_idiv(anum, g1), rb_int_idiv(bnum, g2));
-	den = rb_int_mul(rb_int_idiv(aden, g2), rb_int_idiv(bden, g1));
+	num = f_mul(f_idiv(anum, g1), f_idiv(bnum, g2));
+	den = f_mul(f_idiv(aden, g2), f_idiv(bden, g1));
     }
     return f_rational_new_no_reduce2(CLASS_OF(self), num, den);
 }
@@ -877,10 +862,10 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
  *    Rational(9, 8)  * 4                #=> (9/2)
  *    Rational(20, 9) * 9.8              #=> 21.77777777777778
  */
-VALUE
-rb_rational_mul(VALUE self, VALUE other)
+static VALUE
+nurat_mul(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	{
 	    get_dat1(self);
 
@@ -889,8 +874,8 @@ rb_rational_mul(VALUE self, VALUE other)
 			    other, ONE, '*');
 	}
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-	return DBL2NUM(nurat_to_double(self) * RFLOAT_VALUE(other));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return f_mul(f_to_f(self), other);
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	{
@@ -922,9 +907,9 @@ rb_rational_mul(VALUE self, VALUE other)
 static VALUE
 nurat_div(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	if (f_zero_p(other))
-            rb_num_zerodiv();
+	    rb_raise_zerodiv();
 	{
 	    get_dat1(self);
 
@@ -933,13 +918,11 @@ nurat_div(VALUE self, VALUE other)
 			    other, ONE, '/');
 	}
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-        VALUE v = nurat_to_f(self);
-        return rb_flo_div_flo(v, other);
-    }
+    else if (RB_TYPE_P(other, T_FLOAT))
+	return rb_funcall(f_to_f(self), '/', 1, other);
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	if (f_zero_p(other))
-            rb_num_zerodiv();
+	    rb_raise_zerodiv();
 	{
 	    get_dat2(self, other);
 
@@ -961,7 +944,7 @@ nurat_div(VALUE self, VALUE other)
  * call-seq:
  *    rat.fdiv(numeric)  ->  float
  *
- * Performs division and returns the value as a Float.
+ * Performs division and returns the value as a float.
  *
  *    Rational(2, 3).fdiv(1)       #=> 0.6666666666666666
  *    Rational(2, 3).fdiv(0.5)     #=> 1.3333333333333333
@@ -970,17 +953,9 @@ nurat_div(VALUE self, VALUE other)
 static VALUE
 nurat_fdiv(VALUE self, VALUE other)
 {
-    VALUE div;
     if (f_zero_p(other))
-        return nurat_div(self, rb_float_new(0.0));
-    if (FIXNUM_P(other) && other == LONG2FIX(1))
-	return nurat_to_f(self);
-    div = nurat_div(self, other);
-    if (RB_TYPE_P(div, T_RATIONAL))
-	return nurat_to_f(div);
-    if (RB_FLOAT_TYPE_P(div))
-	return div;
-    return rb_funcall(div, idTo_f, 0);
+	return f_div(self, f_to_f(other));
+    return f_to_f(f_div(self, other));
 }
 
 inline static VALUE
@@ -998,15 +973,15 @@ f_odd_p(VALUE integer)
  *
  * Performs exponentiation.
  *
- *    Rational(2)    ** Rational(3)     #=> (8/1)
- *    Rational(10)   ** -2              #=> (1/100)
- *    Rational(10)   ** -2.0            #=> 0.01
- *    Rational(-4)   ** Rational(1, 2)  #=> (0.0+2.0i)
- *    Rational(1, 2) ** 0               #=> (1/1)
- *    Rational(1, 2) ** 0.0             #=> 1.0
+ *    Rational(2)    ** Rational(3)    #=> (8/1)
+ *    Rational(10)   ** -2             #=> (1/100)
+ *    Rational(10)   ** -2.0           #=> 0.01
+ *    Rational(-4)   ** Rational(1,2)  #=> (1.2246063538223773e-16+2.0i)
+ *    Rational(1, 2) ** 0              #=> (1/1)
+ *    Rational(1, 2) ** 0.0            #=> 1.0
  */
-VALUE
-rb_rational_pow(VALUE self, VALUE other)
+static VALUE
+nurat_expt(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && k_exact_zero_p(other))
 	return f_rational_new_bang1(CLASS_OF(self), ONE);
@@ -1025,12 +1000,12 @@ rb_rational_pow(VALUE self, VALUE other)
 	    if (f_one_p(dat->num)) {
 		return f_rational_new_bang1(CLASS_OF(self), ONE);
 	    }
-	    else if (f_minus_one_p(dat->num) && RB_INTEGER_TYPE_P(other)) {
+	    else if (f_minus_one_p(dat->num) && k_integer_p(other)) {
 		return f_rational_new_bang1(CLASS_OF(self), INT2FIX(f_odd_p(other) ? -1 : 1));
 	    }
-	    else if (INT_ZERO_P(dat->num)) {
-		if (rb_num_negative_p(other)) {
-                    rb_num_zerodiv();
+	    else if (f_zero_p(dat->num)) {
+		if (FIX2INT(f_cmp(other, ZERO)) == -1) {
+		    rb_raise_zerodiv();
 		}
 		else {
 		    return f_rational_new_bang1(CLASS_OF(self), ZERO);
@@ -1040,84 +1015,71 @@ rb_rational_pow(VALUE self, VALUE other)
     }
 
     /* General case */
-    if (FIXNUM_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM)) {
 	{
 	    VALUE num, den;
 
 	    get_dat1(self);
 
-            if (INT_POSITIVE_P(other)) {
-		num = rb_int_pow(dat->num, other);
-		den = rb_int_pow(dat->den, other);
-            }
-            else if (INT_NEGATIVE_P(other)) {
-		num = rb_int_pow(dat->den, rb_int_uminus(other));
-		den = rb_int_pow(dat->num, rb_int_uminus(other));
-            }
-            else {
+	    switch (FIX2INT(f_cmp(other, ZERO))) {
+	      case 1:
+		num = f_expt(dat->num, other);
+		den = f_expt(dat->den, other);
+		break;
+	      case -1:
+		num = f_expt(dat->den, f_negate(other));
+		den = f_expt(dat->num, f_negate(other));
+		break;
+	      default:
 		num = ONE;
 		den = ONE;
-	    }
-	    if (RB_FLOAT_TYPE_P(num)) { /* infinity due to overflow */
-		if (RB_FLOAT_TYPE_P(den))
-		    return DBL2NUM(nan(""));
-		return num;
-	    }
-	    if (RB_FLOAT_TYPE_P(den)) { /* infinity due to overflow */
-		num = ZERO;
-		den = ONE;
+		break;
 	    }
 	    return f_rational_new2(CLASS_OF(self), num, den);
 	}
     }
     else if (RB_TYPE_P(other, T_BIGNUM)) {
 	rb_warn("in a**b, b may be too big");
-	return rb_float_pow(nurat_to_f(self), other);
+	return f_expt(f_to_f(self), other);
     }
-    else if (RB_FLOAT_TYPE_P(other) || RB_TYPE_P(other, T_RATIONAL)) {
-	return rb_float_pow(nurat_to_f(self), other);
+    else if (RB_TYPE_P(other, T_FLOAT) || RB_TYPE_P(other, T_RATIONAL)) {
+	return f_expt(f_to_f(self), other);
     }
     else {
-	return rb_num_coerce_bin(self, other, rb_intern("**"));
+	return rb_num_coerce_bin(self, other, id_expt);
     }
 }
-#define nurat_expt rb_rational_pow
 
 /*
  * call-seq:
- *    rational <=> numeric  ->  -1, 0, +1, or nil
+ *    rational <=> numeric  ->  -1, 0, +1 or nil
  *
- * Returns -1, 0, or +1 depending on whether +rational+ is
- * less than, equal to, or greater than +numeric+.
+ * Performs comparison and returns -1, 0, or +1.
  *
  * +nil+ is returned if the two values are incomparable.
  *
- *    Rational(2, 3) <=> Rational(2, 3)  #=> 0
- *    Rational(5)    <=> 5               #=> 0
- *    Rational(2, 3) <=> Rational(1, 3)  #=> 1
- *    Rational(1, 3) <=> 1               #=> -1
- *    Rational(1, 3) <=> 0.3             #=> 1
- *
- *    Rational(1, 3) <=> "0.3"           #=> nil
+ *    Rational(2, 3)  <=> Rational(2, 3)  #=> 0
+ *    Rational(5)     <=> 5               #=> 0
+ *    Rational(2,3)   <=> Rational(1,3)   #=> 1
+ *    Rational(1,3)   <=> 1               #=> -1
+ *    Rational(1,3)   <=> 0.3             #=> 1
  */
-VALUE
-rb_rational_cmp(VALUE self, VALUE other)
+static VALUE
+nurat_cmp(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	{
 	    get_dat1(self);
 
-	    if (dat->den == LONG2FIX(1))
-		return rb_int_cmp(dat->num, other); /* c14n */
-	    other = f_rational_new_bang1(CLASS_OF(self), other);
-	    goto other_is_rational;
+	    if (FIXNUM_P(dat->den) && FIX2LONG(dat->den) == 1)
+		return f_cmp(dat->num, other); /* c14n */
+	    return f_cmp(self, f_rational_new_bang1(CLASS_OF(self), other));
 	}
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-	return rb_dbl_cmp(nurat_to_double(self), RFLOAT_VALUE(other));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return f_cmp(f_to_f(self), other);
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
-	other_is_rational:
 	{
 	    VALUE num1, num2;
 
@@ -1129,14 +1091,14 @@ rb_rational_cmp(VALUE self, VALUE other)
 		num2 = f_imul(FIX2LONG(bdat->num), FIX2LONG(adat->den));
 	    }
 	    else {
-		num1 = rb_int_mul(adat->num, bdat->den);
-		num2 = rb_int_mul(bdat->num, adat->den);
+		num1 = f_mul(adat->num, bdat->den);
+		num2 = f_mul(bdat->num, adat->den);
 	    }
-	    return rb_int_cmp(rb_int_minus(num1, num2), ZERO);
+	    return f_cmp(f_sub(num1, num2), ZERO);
 	}
     }
     else {
-	return rb_num_coerce_cmp(self, other, rb_intern("<=>"));
+	return rb_num_coerce_cmp(self, other, id_cmp);
     }
 }
 
@@ -1144,7 +1106,7 @@ rb_rational_cmp(VALUE self, VALUE other)
  * call-seq:
  *    rat == object  ->  true or false
  *
- * Returns +true+ if +rat+ equals +object+ numerically.
+ * Returns true if rat equals object numerically.
  *
  *    Rational(2, 3)  == Rational(2, 3)   #=> true
  *    Rational(5)     == 5                #=> true
@@ -1155,41 +1117,38 @@ rb_rational_cmp(VALUE self, VALUE other)
 static VALUE
 nurat_eqeq_p(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
-        get_dat1(self);
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
+	{
+	    get_dat1(self);
 
-        if (RB_INTEGER_TYPE_P(dat->num) && RB_INTEGER_TYPE_P(dat->den)) {
-	    if (INT_ZERO_P(dat->num) && INT_ZERO_P(other))
+	    if (f_zero_p(dat->num) && f_zero_p(other))
 		return Qtrue;
 
 	    if (!FIXNUM_P(dat->den))
 		return Qfalse;
 	    if (FIX2LONG(dat->den) != 1)
 		return Qfalse;
-	    return rb_int_equal(dat->num, other);
+	    if (f_eqeq_p(dat->num, other))
+		return Qtrue;
+	    return Qfalse;
 	}
-        else {
-            const double d = nurat_to_double(self);
-            return f_boolcast(FIXNUM_ZERO_P(rb_dbl_cmp(d, NUM2DBL(other))));
-        }
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-	const double d = nurat_to_double(self);
-	return f_boolcast(FIXNUM_ZERO_P(rb_dbl_cmp(d, RFLOAT_VALUE(other))));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return f_eqeq_p(f_to_f(self), other);
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	{
 	    get_dat2(self, other);
 
-	    if (INT_ZERO_P(adat->num) && INT_ZERO_P(bdat->num))
+	    if (f_zero_p(adat->num) && f_zero_p(bdat->num))
 		return Qtrue;
 
-	    return f_boolcast(rb_int_equal(adat->num, bdat->num) &&
-			      rb_int_equal(adat->den, bdat->den));
+	    return f_boolcast(f_eqeq_p(adat->num, bdat->num) &&
+			      f_eqeq_p(adat->den, bdat->den));
 	}
     }
     else {
-	return rb_equal(other, self);
+	return f_eqeq_p(other, self);
     }
 }
 
@@ -1197,11 +1156,11 @@ nurat_eqeq_p(VALUE self, VALUE other)
 static VALUE
 nurat_coerce(VALUE self, VALUE other)
 {
-    if (RB_INTEGER_TYPE_P(other)) {
+    if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
 	return rb_assoc_new(f_rational_new_bang1(CLASS_OF(self), other), self);
     }
-    else if (RB_FLOAT_TYPE_P(other)) {
-        return rb_assoc_new(other, nurat_to_f(self));
+    else if (RB_TYPE_P(other, T_FLOAT)) {
+	return rb_assoc_new(other, f_to_f(self));
     }
     else if (RB_TYPE_P(other, T_RATIONAL)) {
 	return rb_assoc_new(other, self);
@@ -1219,68 +1178,51 @@ nurat_coerce(VALUE self, VALUE other)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     rat.positive?  ->  true or false
- *
- *  Returns +true+ if +rat+ is greater than 0.
- */
+#if 0
+/* :nodoc: */
 static VALUE
-nurat_positive_p(VALUE self)
+nurat_idiv(VALUE self, VALUE other)
 {
-    get_dat1(self);
-    return f_boolcast(INT_POSITIVE_P(dat->num));
+    return f_idiv(self, other);
 }
 
-/*
- *  call-seq:
- *     rat.negative?  ->  true or false
- *
- *  Returns +true+ if +rat+ is less than 0.
- */
+/* :nodoc: */
 static VALUE
-nurat_negative_p(VALUE self)
+nurat_quot(VALUE self, VALUE other)
 {
-    get_dat1(self);
-    return f_boolcast(INT_NEGATIVE_P(dat->num));
+    return f_truncate(f_div(self, other));
 }
 
-/*
- *  call-seq:
- *     rat.abs        ->  rational
- *     rat.magnitude  ->  rational
- *
- *  Returns the absolute value of +rat+.
- *
- *     (1/2r).abs    #=> (1/2)
- *     (-1/2r).abs   #=> (1/2)
- *
- *  Rational#magnitude is an alias for Rational#abs.
- */
+/* :nodoc: */
+static VALUE
+nurat_quotrem(VALUE self, VALUE other)
+{
+    VALUE val = f_truncate(f_div(self, other));
+    return rb_assoc_new(val, f_sub(self, f_mul(other, val)));
+}
+#endif
 
-VALUE
-rb_rational_abs(VALUE self)
+#if 0
+/* :nodoc: */
+static VALUE
+nurat_true(VALUE self)
 {
-    get_dat1(self);
-    if (INT_NEGATIVE_P(dat->num)) {
-        VALUE num = rb_int_abs(dat->num);
-        return nurat_s_canonicalize_internal_no_reduce(CLASS_OF(self), num, dat->den);
-    }
-    return self;
+    return Qtrue;
 }
+#endif
 
 static VALUE
 nurat_floor(VALUE self)
 {
     get_dat1(self);
-    return rb_int_idiv(dat->num, dat->den);
+    return f_idiv(dat->num, dat->den);
 }
 
 static VALUE
 nurat_ceil(VALUE self)
 {
     get_dat1(self);
-    return rb_int_uminus(rb_int_idiv(rb_int_uminus(dat->num), dat->den));
+    return f_negate(f_idiv(f_negate(dat->num), dat->den));
 }
 
 /*
@@ -1289,25 +1231,26 @@ nurat_ceil(VALUE self)
  *
  * Returns the truncated value as an integer.
  *
- * Equivalent to Rational#truncate.
+ * Equivalent to
+ *    rat.truncate.
  *
- *    Rational(2, 3).to_i    #=> 0
- *    Rational(3).to_i       #=> 3
- *    Rational(300.6).to_i   #=> 300
- *    Rational(98, 71).to_i  #=> 1
- *    Rational(-31, 2).to_i  #=> -15
+ *    Rational(2, 3).to_i   #=> 0
+ *    Rational(3).to_i      #=> 3
+ *    Rational(300.6).to_i  #=> 300
+ *    Rational(98,71).to_i  #=> 1
+ *    Rational(-30,2).to_i  #=> -15
  */
 static VALUE
 nurat_truncate(VALUE self)
 {
     get_dat1(self);
-    if (INT_NEGATIVE_P(dat->num))
-	return rb_int_uminus(rb_int_idiv(rb_int_uminus(dat->num), dat->den));
-    return rb_int_idiv(dat->num, dat->den);
+    if (f_negative_p(dat->num))
+	return f_negate(f_idiv(f_negate(dat->num), dat->den));
+    return f_idiv(dat->num, dat->den);
 }
 
 static VALUE
-nurat_round_half_up(VALUE self)
+nurat_round(VALUE self)
 {
     VALUE num, den, neg;
 
@@ -1315,69 +1258,17 @@ nurat_round_half_up(VALUE self)
 
     num = dat->num;
     den = dat->den;
-    neg = INT_NEGATIVE_P(num);
+    neg = f_negative_p(num);
 
     if (neg)
-	num = rb_int_uminus(num);
+	num = f_negate(num);
 
-    num = rb_int_plus(rb_int_mul(num, TWO), den);
-    den = rb_int_mul(den, TWO);
-    num = rb_int_idiv(num, den);
+    num = f_add(f_mul(num, TWO), den);
+    den = f_mul(den, TWO);
+    num = f_idiv(num, den);
 
     if (neg)
-	num = rb_int_uminus(num);
-
-    return num;
-}
-
-static VALUE
-nurat_round_half_down(VALUE self)
-{
-    VALUE num, den, neg;
-
-    get_dat1(self);
-
-    num = dat->num;
-    den = dat->den;
-    neg = INT_NEGATIVE_P(num);
-
-    if (neg)
-	num = rb_int_uminus(num);
-
-    num = rb_int_plus(rb_int_mul(num, TWO), den);
-    num = rb_int_minus(num, ONE);
-    den = rb_int_mul(den, TWO);
-    num = rb_int_idiv(num, den);
-
-    if (neg)
-	num = rb_int_uminus(num);
-
-    return num;
-}
-
-static VALUE
-nurat_round_half_even(VALUE self)
-{
-    VALUE num, den, neg, qr;
-
-    get_dat1(self);
-
-    num = dat->num;
-    den = dat->den;
-    neg = INT_NEGATIVE_P(num);
-
-    if (neg)
-	num = rb_int_uminus(num);
-
-    num = rb_int_plus(rb_int_mul(num, TWO), den);
-    den = rb_int_mul(den, TWO);
-    qr = rb_int_divmod(num, den);
-    num = RARRAY_AREF(qr, 0);
-    if (INT_ZERO_P(RARRAY_AREF(qr, 1)))
-	num = rb_int_and(num, LONG2FIX(((int)~1)));
-
-    if (neg)
-	num = rb_int_uminus(num);
+	num = f_negate(num);
 
     return num;
 }
@@ -1387,19 +1278,19 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
 {
     VALUE n, b, s;
 
-    if (rb_check_arity(argc, 0, 1) == 0)
+    if (argc == 0)
 	return (*func)(self);
 
-    n = argv[0];
+    rb_scan_args(argc, argv, "01", &n);
 
     if (!k_integer_p(n))
 	rb_raise(rb_eTypeError, "not an integer");
 
     b = f_expt10(n);
-    s = rb_rational_mul(self, b);
+    s = f_mul(self, b);
 
     if (k_float_p(s)) {
-	if (INT_NEGATIVE_P(n))
+	if (f_lt_p(n, ZERO))
 	    return ZERO;
 	return self;
     }
@@ -1410,37 +1301,31 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
 
     s = (*func)(s);
 
-    s = nurat_div(f_rational_new_bang1(CLASS_OF(self), s), b);
+    s = f_div(f_rational_new_bang1(CLASS_OF(self), s), b);
 
-    if (RB_TYPE_P(s, T_RATIONAL) && FIX2INT(rb_int_cmp(n, ONE)) < 0)
-	s = nurat_truncate(s);
+    if (f_lt_p(n, ONE))
+	s = f_to_i(s);
 
     return s;
 }
 
 /*
  * call-seq:
- *    rat.floor([ndigits])  ->  integer or rational
- *
- * Returns the largest number less than or equal to +rat+ with
- * a precision of +ndigits+ decimal digits (default: 0).
- *
- * When the precision is negative, the returned value is an integer
- * with at least <code>ndigits.abs</code> trailing zeros.
+ *    rat.floor               ->  integer
+ *    rat.floor(precision=0)  ->  rational
  *
- * Returns a rational when +ndigits+ is positive,
- * otherwise returns an integer.
+ * Returns the truncated value (toward negative infinity).
  *
  *    Rational(3).floor      #=> 3
  *    Rational(2, 3).floor   #=> 0
- *    Rational(-3, 2).floor  #=> -2
+ *    Rational(-3, 2).floor  #=> -1
  *
- *      #    decimal      -  1  2  3 . 4  5  6
- *      #                   ^  ^  ^  ^   ^  ^
- *      #   precision      -3 -2 -1  0  +1 +2
+ *           decimal      -  1  2  3 . 4  5  6
+ *                          ^  ^  ^  ^   ^  ^
+ *          precision      -3 -2 -1  0  +1 +2
  *
- *    Rational('-123.456').floor(+1).to_f  #=> -123.5
- *    Rational('-123.456').floor(-1)       #=> -130
+ *    '%f' % Rational('-123.456').floor(+1)  #=> "-123.500000"
+ *    '%f' % Rational('-123.456').floor(-1)  #=> "-130.000000"
  */
 static VALUE
 nurat_floor_n(int argc, VALUE *argv, VALUE self)
@@ -1450,27 +1335,21 @@ nurat_floor_n(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    rat.ceil([ndigits])  ->  integer or rational
+ *    rat.ceil               ->  integer
+ *    rat.ceil(precision=0)  ->  rational
  *
- * Returns the smallest number greater than or equal to +rat+ with
- * a precision of +ndigits+ decimal digits (default: 0).
- *
- * When the precision is negative, the returned value is an integer
- * with at least <code>ndigits.abs</code> trailing zeros.
- *
- * Returns a rational when +ndigits+ is positive,
- * otherwise returns an integer.
+ * Returns the truncated value (toward positive infinity).
  *
  *    Rational(3).ceil      #=> 3
  *    Rational(2, 3).ceil   #=> 1
  *    Rational(-3, 2).ceil  #=> -1
  *
- *      #    decimal      -  1  2  3 . 4  5  6
- *      #                   ^  ^  ^  ^   ^  ^
- *      #   precision      -3 -2 -1  0  +1 +2
+ *           decimal      -  1  2  3 . 4  5  6
+ *                          ^  ^  ^  ^   ^  ^
+ *          precision      -3 -2 -1  0  +1 +2
  *
- *    Rational('-123.456').ceil(+1).to_f  #=> -123.4
- *    Rational('-123.456').ceil(-1)       #=> -120
+ *    '%f' % Rational('-123.456').ceil(+1)  #=> "-123.400000"
+ *    '%f' % Rational('-123.456').ceil(-1)  #=> "-120.000000"
  */
 static VALUE
 nurat_ceil_n(int argc, VALUE *argv, VALUE self)
@@ -1480,27 +1359,21 @@ nurat_ceil_n(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    rat.truncate([ndigits])  ->  integer or rational
- *
- * Returns +rat+ truncated (toward zero) to
- * a precision of +ndigits+ decimal digits (default: 0).
+ *    rat.truncate               ->  integer
+ *    rat.truncate(precision=0)  ->  rational
  *
- * When the precision is negative, the returned value is an integer
- * with at least <code>ndigits.abs</code> trailing zeros.
- *
- * Returns a rational when +ndigits+ is positive,
- * otherwise returns an integer.
+ * Returns the truncated value (toward zero).
  *
  *    Rational(3).truncate      #=> 3
  *    Rational(2, 3).truncate   #=> 0
  *    Rational(-3, 2).truncate  #=> -1
  *
- *      #    decimal      -  1  2  3 . 4  5  6
- *      #                   ^  ^  ^  ^   ^  ^
- *      #   precision      -3 -2 -1  0  +1 +2
+ *           decimal      -  1  2  3 . 4  5  6
+ *                          ^  ^  ^  ^   ^  ^
+ *          precision      -3 -2 -1  0  +1 +2
  *
- *    Rational('-123.456').truncate(+1).to_f  #=> -123.4
- *    Rational('-123.456').truncate(-1)       #=> -120
+ *    '%f' % Rational('-123.456').truncate(+1)  #=>  "-123.400000"
+ *    '%f' % Rational('-123.456').truncate(-1)  #=>  "-120.000000"
  */
 static VALUE
 nurat_truncate_n(int argc, VALUE *argv, VALUE self)
@@ -1510,67 +1383,34 @@ nurat_truncate_n(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    rat.round([ndigits] [, half: mode])  ->  integer or rational
- *
- * Returns +rat+ rounded to the nearest value with
- * a precision of +ndigits+ decimal digits (default: 0).
- *
- * When the precision is negative, the returned value is an integer
- * with at least <code>ndigits.abs</code> trailing zeros.
+ *    rat.round               ->  integer
+ *    rat.round(precision=0)  ->  rational
  *
- * Returns a rational when +ndigits+ is positive,
- * otherwise returns an integer.
+ * Returns the truncated value (toward the nearest integer;
+ * 0.5 => 1; -0.5 => -1).
  *
  *    Rational(3).round      #=> 3
  *    Rational(2, 3).round   #=> 1
  *    Rational(-3, 2).round  #=> -2
  *
- *      #    decimal      -  1  2  3 . 4  5  6
- *      #                   ^  ^  ^  ^   ^  ^
- *      #   precision      -3 -2 -1  0  +1 +2
- *
- *    Rational('-123.456').round(+1).to_f  #=> -123.5
- *    Rational('-123.456').round(-1)       #=> -120
- *
- * The optional +half+ keyword argument is available
- * similar to Float#round.
- *
- *    Rational(25, 100).round(1, half: :up)    #=> (3/10)
- *    Rational(25, 100).round(1, half: :down)  #=> (1/5)
- *    Rational(25, 100).round(1, half: :even)  #=> (1/5)
- *    Rational(35, 100).round(1, half: :up)    #=> (2/5)
- *    Rational(35, 100).round(1, half: :down)  #=> (3/10)
- *    Rational(35, 100).round(1, half: :even)  #=> (2/5)
- *    Rational(-25, 100).round(1, half: :up)   #=> (-3/10)
- *    Rational(-25, 100).round(1, half: :down) #=> (-1/5)
- *    Rational(-25, 100).round(1, half: :even) #=> (-1/5)
+ *           decimal      -  1  2  3 . 4  5  6
+ *                          ^  ^  ^  ^   ^  ^
+ *          precision      -3 -2 -1  0  +1 +2
+ *
+ *    '%f' % Rational('-123.456').round(+1)  #=> "-123.500000"
+ *    '%f' % Rational('-123.456').round(-1)  #=> "-120.000000"
  */
 static VALUE
 nurat_round_n(int argc, VALUE *argv, VALUE self)
 {
-    VALUE opt;
-    enum ruby_num_rounding_mode mode = (
-	argc = rb_scan_args(argc, argv, "*:", NULL, &opt),
-	rb_num_get_rounding_option(opt));
-    VALUE (*round_func)(VALUE) = ROUND_FUNC(mode, nurat_round);
-    return f_round_common(argc, argv, self, round_func);
-}
-
-static double
-nurat_to_double(VALUE self)
-{
-    get_dat1(self);
-    if (!RB_INTEGER_TYPE_P(dat->num) || !RB_INTEGER_TYPE_P(dat->den)) {
-        return NUM2DBL(dat->num) / NUM2DBL(dat->den);
-    }
-    return rb_int_fdiv_double(dat->num, dat->den);
+    return f_round_common(argc, argv, self, nurat_round);
 }
 
 /*
  * call-seq:
  *    rat.to_f  ->  float
  *
- * Returns the value as a Float.
+ * Return the value as a float.
  *
  *    Rational(2).to_f      #=> 2.0
  *    Rational(9, 4).to_f   #=> 2.25
@@ -1580,7 +1420,8 @@ nurat_to_double(VALUE self)
 static VALUE
 nurat_to_f(VALUE self)
 {
-    return DBL2NUM(nurat_to_double(self));
+    get_dat1(self);
+    return f_fdiv(dat->num, dat->den);
 }
 
 /*
@@ -1700,8 +1541,8 @@ nurat_rationalize_internal(VALUE a, VALUE b, VALUE *p, VALUE *q)
  *    rat.rationalize(eps)  ->  rational
  *
  * Returns a simpler approximation of the value if the optional
- * argument +eps+ is given (rat-|eps| <= result <= rat+|eps|),
- * self otherwise.
+ * argument eps is given (rat-|eps| <= result <= rat+|eps|), self
+ * otherwise.
  *
  *    r = Rational(5033165, 16777216)
  *    r.rationalize                    #=> (5033165/16777216)
@@ -1713,13 +1554,14 @@ nurat_rationalize(int argc, VALUE *argv, VALUE self)
 {
     VALUE e, a, b, p, q;
 
-    if (rb_check_arity(argc, 0, 1) == 0)
+    if (argc == 0)
 	return self;
 
-    if (nurat_negative_p(self))
-	return rb_rational_uminus(nurat_rationalize(argc, argv, rb_rational_uminus(self)));
+    if (f_negative_p(self))
+	return f_negate(nurat_rationalize(argc, argv, f_abs(self)));
 
-    e = f_abs(argv[0]);
+    rb_scan_args(argc, argv, "01", &e);
+    e = f_abs(e);
     a = f_sub(self, e);
     b = f_add(self, e);
 
@@ -1743,7 +1585,7 @@ nurat_hash(VALUE self)
     n = rb_hash(dat->den);
     h[1] = NUM2LONG(n);
     v = rb_memhash(h, sizeof(h));
-    return ST2FIX(v);
+    return LONG2FIX(v);
 }
 
 static VALUE
@@ -1808,17 +1650,10 @@ nurat_dumper(VALUE self)
 static VALUE
 nurat_loader(VALUE self, VALUE a)
 {
-    VALUE num, den;
-
     get_dat1(self);
-    num = rb_ivar_get(a, id_i_num);
-    den = rb_ivar_get(a, id_i_den);
-    nurat_int_check(num);
-    nurat_int_check(den);
-    nurat_canonicalize(&num, &den);
-    RRATIONAL_SET_NUM(dat, num);
-    RRATIONAL_SET_DEN(dat, den);
-    OBJ_FREEZE_RAW(self);
+
+    RRATIONAL_SET_NUM(dat, rb_ivar_get(a, id_i_num));
+    RRATIONAL_SET_DEN(dat, rb_ivar_get(a, id_i_den));
 
     return self;
 }
@@ -1839,22 +1674,17 @@ nurat_marshal_dump(VALUE self)
 static VALUE
 nurat_marshal_load(VALUE self, VALUE a)
 {
-    VALUE num, den;
-
     rb_check_frozen(self);
     rb_check_trusted(self);
 
     Check_Type(a, T_ARRAY);
     if (RARRAY_LEN(a) != 2)
 	rb_raise(rb_eArgError, "marshaled rational must have an array whose length is 2 but %ld", RARRAY_LEN(a));
+    if (f_zero_p(RARRAY_AREF(a, 1)))
+	rb_raise_zerodiv();
 
-    num = RARRAY_AREF(a, 0);
-    den = RARRAY_AREF(a, 1);
-    nurat_int_check(num);
-    nurat_int_check(den);
-    nurat_canonicalize(&num, &den);
-    rb_ivar_set(self, id_i_num, num);
-    rb_ivar_set(self, id_i_den, den);
+    rb_ivar_set(self, id_i_num, RARRAY_AREF(a, 0));
+    rb_ivar_set(self, id_i_den, RARRAY_AREF(a, 1));
 
     return self;
 }
@@ -1870,12 +1700,11 @@ rb_rational_reciprocal(VALUE x)
 
 /*
  * call-seq:
- *    int.gcd(other_int)  ->  integer
+ *    int.gcd(int2)  ->  integer
  *
- * Returns the greatest common divisor of the two integers.
- * The result is always positive. 0.gcd(x) and x.gcd(0) return x.abs.
+ * Returns the greatest common divisor (always positive).  0.gcd(x)
+ * and x.gcd(0) return abs(x).
  *
- *    36.gcd(60)                  #=> 12
  *    2.gcd(2)                    #=> 2
  *    3.gcd(-7)                   #=> 1
  *    ((1<<31)-1).gcd((1<<61)-1)  #=> 1
@@ -1889,12 +1718,11 @@ rb_gcd(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    int.lcm(other_int)  ->  integer
+ *    int.lcm(int2)  ->  integer
  *
- * Returns the least common multiple of the two integers.
- * The result is always positive. 0.lcm(x) and x.lcm(0) return zero.
+ * Returns the least common multiple (always positive).  0.lcm(x) and
+ * x.lcm(0) return zero.
  *
- *    36.lcm(60)                  #=> 180
  *    2.lcm(2)                    #=> 2
  *    3.lcm(-7)                   #=> 21
  *    ((1<<31)-1).lcm((1<<61)-1)  #=> 4951760154835678088235319297
@@ -1908,12 +1736,10 @@ rb_lcm(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    int.gcdlcm(other_int)  ->  array
+ *    int.gcdlcm(int2)  ->  array
  *
- * Returns an array with the greatest common divisor and
- * the least common multiple of the two integers, [gcd, lcm].
+ * Returns an array; [int.gcd(int2), int.lcm(int2)].
  *
- *    36.gcdlcm(60)                  #=> [12, 180]
  *    2.gcdlcm(2)                    #=> [2, 2]
  *    3.gcdlcm(-7)                   #=> [1, 21]
  *    ((1<<31)-1).gcdlcm((1<<61)-1)  #=> [1, 4951760154835678088235319297]
@@ -1937,6 +1763,8 @@ rb_rational_new(VALUE x, VALUE y)
     return nurat_s_canonicalize_internal(rb_cRational, x, y);
 }
 
+static VALUE nurat_s_convert(int argc, VALUE *argv, VALUE klass);
+
 VALUE
 rb_Rational(VALUE x, VALUE y)
 {
@@ -1964,7 +1792,7 @@ rb_rational_den(VALUE rat)
 #define id_denominator rb_intern("denominator")
 #define f_denominator(x) rb_funcall((x), id_denominator, 0)
 
-#define id_to_r idTo_r
+#define id_to_r rb_intern("to_r")
 #define f_to_r(x) rb_funcall((x), id_to_r, 0)
 
 /*
@@ -1997,34 +1825,28 @@ numeric_denominator(VALUE self)
  *     num.quo(int_or_rat)   ->  rat
  *     num.quo(flo)          ->  flo
  *
- *  Returns the most exact division (rational for integers, float for floats).
+ *  Returns most exact division (rational for integers, float for floats).
  */
 
-VALUE
-rb_numeric_quo(VALUE x, VALUE y)
+static VALUE
+numeric_quo(VALUE x, VALUE y)
 {
-    if (RB_FLOAT_TYPE_P(y)) {
-        return rb_funcall(x, rb_intern("fdiv"), 1, y);
+    if (RB_TYPE_P(y, T_FLOAT)) {
+        return f_fdiv(x, y);
     }
 
+#ifdef CANON
     if (canonicalization) {
         x = rb_rational_raw1(x);
     }
-    else {
+    else
+#endif
+    {
         x = rb_convert_type(x, T_RATIONAL, "Rational", "to_r");
     }
-    return nurat_div(x, y);
+    return rb_funcall(x, '/', 1, y);
 }
 
-VALUE
-rb_rational_canonicalize(VALUE x)
-{
-    if (RB_TYPE_P(x, T_RATIONAL)) {
-        get_dat1(x);
-        if (f_one_p(dat->den)) return dat->num;
-    }
-    return x;
-}
 
 /*
  * call-seq:
@@ -2050,7 +1872,6 @@ integer_denominator(VALUE self)
     return INT2FIX(1);
 }
 
-static VALUE float_to_r(VALUE self);
 /*
  * call-seq:
  *    flo.numerator  ->  integer
@@ -2060,21 +1881,14 @@ static VALUE float_to_r(VALUE self);
  *    n = 0.3.numerator    #=> 5404319552844595
  *    d = 0.3.denominator  #=> 18014398509481984
  *    n.fdiv(d)            #=> 0.3
- *
- * See also Float#denominator.
  */
 static VALUE
 float_numerator(VALUE self)
 {
     double d = RFLOAT_VALUE(self);
-    VALUE r;
     if (isinf(d) || isnan(d))
 	return self;
-    r = float_to_r(self);
-    if (canonicalization && k_integer_p(r)) {
-	return r;
-    }
-    return nurat_numerator(r);
+    return rb_call_super(0, 0);
 }
 
 /*
@@ -2084,20 +1898,15 @@ float_numerator(VALUE self)
  * Returns the denominator (always positive).  The result is machine
  * dependent.
  *
- * See also Float#numerator.
+ * See numerator.
  */
 static VALUE
 float_denominator(VALUE self)
 {
     double d = RFLOAT_VALUE(self);
-    VALUE r;
     if (isinf(d) || isnan(d))
 	return INT2FIX(1);
-    r = float_to_r(self);
-    if (canonicalization && k_integer_p(r)) {
-	return ONE;
-    }
-    return nurat_denominator(r);
+    return rb_call_super(0, 0);
 }
 
 /*
@@ -2116,13 +1925,13 @@ nilclass_to_r(VALUE self)
  * call-seq:
  *    nil.rationalize([eps])  ->  (0/1)
  *
- * Returns zero as a rational.  The optional argument +eps+ is always
+ * Returns zero as a rational.  The optional argument eps is always
  * ignored.
  */
 static VALUE
 nilclass_rationalize(int argc, VALUE *argv, VALUE self)
 {
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", NULL);
     return nilclass_to_r(self);
 }
 
@@ -2145,13 +1954,13 @@ integer_to_r(VALUE self)
  * call-seq:
  *    int.rationalize([eps])  ->  rational
  *
- * Returns the value as a rational.  The optional argument +eps+ is
+ * Returns the value as a rational.  The optional argument eps is
  * always ignored.
  */
 static VALUE
 integer_rationalize(int argc, VALUE *argv, VALUE self)
 {
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", NULL);
     return integer_to_r(self);
 }
 
@@ -2168,25 +1977,35 @@ float_decode_internal(VALUE self, VALUE *rf, VALUE *rn)
     *rn = INT2FIX(n);
 }
 
+#if 0
+static VALUE
+float_decode(VALUE self)
+{
+    VALUE f, n;
+
+    float_decode_internal(self, &f, &n);
+    return rb_assoc_new(f, n);
+}
+#endif
+
+#define id_lshift rb_intern("<<")
+#define f_lshift(x,n) rb_funcall((x), id_lshift, 1, (n))
+
 /*
  * call-seq:
  *    flt.to_r  ->  rational
  *
  * Returns the value as a rational.
  *
+ * NOTE: 0.3.to_r isn't the same as '0.3'.to_r.  The latter is
+ * equivalent to '3/10'.to_r, but the former isn't so.
+ *
  *    2.0.to_r    #=> (2/1)
  *    2.5.to_r    #=> (5/2)
  *    -0.75.to_r  #=> (-3/4)
  *    0.0.to_r    #=> (0/1)
- *    0.3.to_r    #=> (5404319552844595/18014398509481984)
  *
- * NOTE: 0.3.to_r isn't the same as "0.3".to_r.  The latter is
- * equivalent to "3/10".to_r, but the former isn't so.
- *
- *    0.3.to_r   == 3/10r  #=> false
- *    "0.3".to_r == 3/10r  #=> true
- *
- * See also Float#rationalize.
+ * See rationalize.
  */
 static VALUE
 float_to_r(VALUE self)
@@ -2199,17 +2018,14 @@ float_to_r(VALUE self)
 	long ln = FIX2LONG(n);
 
 	if (ln == 0)
-	    return rb_rational_new1(f);
+	    return f_to_r(f);
 	if (ln > 0)
-	    return rb_rational_new1(rb_int_lshift(f, n));
+	    return f_to_r(f_lshift(f, n));
 	ln = -ln;
-	return rb_rational_new2(f, rb_int_lshift(ONE, INT2FIX(ln)));
+	return rb_rational_new2(f, f_lshift(ONE, INT2FIX(ln)));
     }
 #else
-    f = rb_int_mul(f, rb_int_pow(INT2FIX(FLT_RADIX), n));
-    if (RB_TYPE_P(f, T_RATIONAL))
-	return f;
-    return rb_rational_new1(f);
+    return f_to_r(f_mul(f, f_expt(INT2FIX(FLT_RADIX), n)));
 #endif
 }
 
@@ -2223,7 +2039,7 @@ rb_flt_rationalize_with_prec(VALUE flt, VALUE prec)
     b = f_add(flt, e);
 
     if (f_eqeq_p(a, b))
-        return float_to_r(flt);
+        return f_to_r(flt);
 
     nurat_rationalize_internal(a, b, &p, &q);
     return rb_rational_new2(p, q);
@@ -2235,33 +2051,33 @@ rb_flt_rationalize(VALUE flt)
     VALUE a, b, f, n, p, q;
 
     float_decode_internal(flt, &f, &n);
-    if (INT_ZERO_P(f) || FIX2INT(n) >= 0)
-        return rb_rational_new1(rb_int_lshift(f, n));
+    if (f_zero_p(f) || f_positive_p(n))
+        return rb_rational_new1(f_lshift(f, n));
 
 #if FLT_RADIX == 2
     {
         VALUE two_times_f, den;
 
-        two_times_f = rb_int_mul(TWO, f);
-        den = rb_int_lshift(ONE, rb_int_minus(ONE, n));
+        two_times_f = f_mul(TWO, f);
+        den = f_lshift(ONE, f_sub(ONE, n));
 
-        a = rb_rational_new2(rb_int_minus(two_times_f, ONE), den);
-        b = rb_rational_new2(rb_int_plus(two_times_f, ONE), den);
+        a = rb_rational_new2(f_sub(two_times_f, ONE), den);
+        b = rb_rational_new2(f_add(two_times_f, ONE), den);
     }
 #else
     {
         VALUE radix_times_f, den;
 
-        radix_times_f = rb_int_mul(INT2FIX(FLT_RADIX), f);
-        den = rb_int_pow(INT2FIX(FLT_RADIX), rb_int_minus(ONE, n));
+        radix_times_f = f_mul(INT2FIX(FLT_RADIX), f);
+        den = f_expt(INT2FIX(FLT_RADIX), f_sub(ONE, n));
 
-        a = rb_rational_new2(rb_int_minus(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
-        b = rb_rational_new2(rb_int_plus(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
+        a = rb_rational_new2(f_sub(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
+        b = rb_rational_new2(f_add(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
     }
 #endif
 
-    if (nurat_eqeq_p(a, b))
-        return float_to_r(flt);
+    if (f_eqeq_p(a, b))
+        return f_to_r(flt);
 
     nurat_rationalize_internal(a, b, &p, &q);
     return rb_rational_new2(p, q);
@@ -2272,25 +2088,27 @@ rb_flt_rationalize(VALUE flt)
  *    flt.rationalize([eps])  ->  rational
  *
  * Returns a simpler approximation of the value (flt-|eps| <= result
- * <= flt+|eps|).  If the optional argument +eps+ is not given,
- * it will be chosen automatically.
+ * <= flt+|eps|).  if the optional eps is not given, it will be chosen
+ * automatically.
  *
  *    0.3.rationalize          #=> (3/10)
  *    1.333.rationalize        #=> (1333/1000)
  *    1.333.rationalize(0.01)  #=> (4/3)
  *
- * See also Float#to_r.
+ * See to_r.
  */
 static VALUE
 float_rationalize(int argc, VALUE *argv, VALUE self)
 {
-    double d = RFLOAT_VALUE(self);
+    VALUE e;
+
+    if (f_negative_p(self))
+        return f_negate(float_rationalize(argc, argv, f_abs(self)));
 
-    if (d < 0.0)
-        return rb_rational_uminus(float_rationalize(argc, argv, DBL2NUM(-d)));
+    rb_scan_args(argc, argv, "01", &e);
 
-    if (rb_check_arity(argc, 0, 1)) {
-        return rb_flt_rationalize_with_prec(self, argv[0]);
+    if (argc != 0) {
+        return rb_flt_rationalize_with_prec(self, e);
     }
     else {
         return rb_flt_rationalize(self);
@@ -2306,11 +2124,11 @@ issign(int c)
 }
 
 static int
-read_sign(const char **s, const char *const e)
+read_sign(const char **s)
 {
     int sign = '?';
 
-    if (*s < e && issign(**s)) {
+    if (issign(**s)) {
 	sign = **s;
 	(*s)++;
     }
@@ -2318,180 +2136,200 @@ read_sign(const char **s, const char *const e)
 }
 
 inline static int
-islettere(int c)
+isdecimal(int c)
 {
-    return (c == 'e' || c == 'E');
+    return isdigit((unsigned char)c);
 }
 
-static VALUE
-negate_num(VALUE num)
+static int
+read_digits(const char **s, int strict,
+	    VALUE *num, int *count)
 {
-    if (FIXNUM_P(num)) {
-	return rb_int_uminus(num);
+    char *b, *bb;
+    int us = 1, ret = 1;
+    VALUE tmp;
+
+    if (!isdecimal(**s)) {
+	*num = ZERO;
+	return 0;
     }
-    else {
-	BIGNUM_NEGATE(num);
-	return rb_big_norm(num);
+
+    bb = b = ALLOCV_N(char, tmp, strlen(*s) + 1);
+
+    while (isdecimal(**s) || **s == '_') {
+	if (**s == '_') {
+	    if (strict) {
+		if (us) {
+		    ret = 0;
+		    goto conv;
+		}
+	    }
+	    us = 1;
+	}
+	else {
+	    if (count)
+		(*count)++;
+	    *b++ = **s;
+	    us = 0;
+	}
+	(*s)++;
     }
+    if (us)
+	do {
+	    (*s)--;
+	} while (**s == '_');
+  conv:
+    *b = '\0';
+    *num = rb_cstr_to_inum(bb, 10, 0);
+    ALLOCV_END(tmp);
+    return ret;
+}
+
+inline static int
+islettere(int c)
+{
+    return (c == 'e' || c == 'E');
 }
 
 static int
-read_num(const char **s, const char *const end, VALUE *num, VALUE *nexp)
-{
-    VALUE fp = ONE, exp, fn = ZERO, n = ZERO;
-    int expsign = 0, ok = 0;
-    char *e;
-
-    *nexp = ZERO;
-    *num = ZERO;
-    if (*s < end && **s != '.') {
-	n = rb_int_parse_cstr(*s, end-*s, &e, NULL,
-			      10, RB_INT_PARSE_UNDERSCORE);
-	if (NIL_P(n))
+read_num(const char **s, int numsign, int strict,
+	 VALUE *num)
+{
+    VALUE ip, fp, exp;
+
+    *num = rb_rational_new2(ZERO, ONE);
+    exp = Qnil;
+
+    if (**s != '.') {
+	if (!read_digits(s, strict, &ip, NULL))
 	    return 0;
-	*s = e;
-	*num = n;
-	ok = 1;
+	*num = rb_rational_new2(ip, ONE);
     }
 
-    if (*s < end && **s == '.') {
-	size_t count = 0;
+    if (**s == '.') {
+	int count = 0;
 
 	(*s)++;
-	fp = rb_int_parse_cstr(*s, end-*s, &e, &count,
-			       10, RB_INT_PARSE_UNDERSCORE);
-	if (NIL_P(fp))
-	    return 1;
-	*s = e;
+	if (!read_digits(s, strict, &fp, &count))
+	    return 0;
 	{
-            VALUE l = f_expt10(*nexp = SIZET2NUM(count));
-	    n = n == ZERO ? fp : rb_int_plus(rb_int_mul(*num, l), fp);
-	    *num = n;
-	    fn = SIZET2NUM(count);
+	    VALUE l = f_expt10(INT2NUM(count));
+	    *num = f_mul(*num, l);
+	    *num = f_add(*num, fp);
+	    *num = f_div(*num, l);
 	}
-	ok = 1;
     }
 
-    if (ok && *s + 1 < end && islettere(**s)) {
+    if (islettere(**s)) {
+	int expsign;
+
 	(*s)++;
-	expsign = read_sign(s, end);
-	exp = rb_int_parse_cstr(*s, end-*s, &e, NULL,
-				10, RB_INT_PARSE_UNDERSCORE);
-	if (NIL_P(exp))
-	    return 1;
-	*s = e;
-	if (exp != ZERO) {
-	    if (expsign == '-') {
-		if (fn != ZERO) exp = rb_int_plus(exp, fn);
-	    }
-	    else {
-		if (fn != ZERO) exp = rb_int_minus(exp, fn);
-                exp = negate_num(exp);
-	    }
-            *nexp = exp;
-	}
+	expsign = read_sign(s);
+	if (!read_digits(s, strict, &exp, NULL))
+	    return 0;
+	if (expsign == '-')
+	    exp = f_negate(exp);
     }
 
-    return ok;
+    if (numsign == '-')
+	*num = f_negate(*num);
+    if (!NIL_P(exp)) {
+	VALUE l = f_expt10(exp);
+	*num = f_mul(*num, l);
+    }
+    return 1;
 }
 
-inline static const char *
-skip_ws(const char *s, const char *e)
+inline static int
+read_den(const char **s, int strict,
+	 VALUE *num)
 {
-    while (s < e && isspace((unsigned char)*s))
-	++s;
-    return s;
+    if (!read_digits(s, strict, num, NULL))
+	return 0;
+    return 1;
 }
 
-static VALUE
-parse_rat(const char *s, const char *const e, int strict, int raise)
+static int
+read_rat_nos(const char **s, int sign, int strict,
+	     VALUE *num)
+{
+    VALUE den;
+
+    if (!read_num(s, sign, strict, num))
+	return 0;
+    if (**s == '/') {
+	(*s)++;
+	if (!read_den(s, strict, &den))
+	    return 0;
+	if (!(FIXNUM_P(den) && FIX2LONG(den) == 1))
+	    *num = f_div(*num, den);
+    }
+    return 1;
+}
+
+static int
+read_rat(const char **s, int strict,
+	 VALUE *num)
 {
     int sign;
-    VALUE num, den, nexp, dexp;
 
-    s = skip_ws(s, e);
-    sign = read_sign(&s, e);
+    sign = read_sign(s);
+    if (!read_rat_nos(s, sign, strict, num))
+	return 0;
+    return 1;
+}
 
-    if (!read_num(&s, e, &num, &nexp)) {
-	if (strict) return Qnil;
-	return canonicalization ? ZERO : nurat_s_alloc(rb_cRational);
-    }
-    den = ONE;
-    if (s < e && *s == '/') {
-	s++;
-        if (!read_num(&s, e, &den, &dexp)) {
-	    if (strict) return Qnil;
-            den = ONE;
-	}
-	else if (den == ZERO) {
-            if (!raise) return Qnil;
-	    rb_num_zerodiv();
-	}
-	else if (strict && skip_ws(s, e) != e) {
-	    return Qnil;
-	}
-	else {
-            nexp = rb_int_minus(nexp, dexp);
-	    nurat_reduce(&num, &den);
-	}
-    }
-    else if (strict && skip_ws(s, e) != e) {
-	return Qnil;
-    }
-
-    if (nexp != ZERO) {
-        if (INT_NEGATIVE_P(nexp)) {
-            VALUE mul;
-            if (!FIXNUM_P(nexp)) {
-              overflow:
-                return sign == '-' ? DBL2NUM(-HUGE_VAL) : DBL2NUM(HUGE_VAL);
-            }
-            mul = f_expt10(LONG2NUM(-FIX2LONG(nexp)));
-            if (RB_FLOAT_TYPE_P(mul)) goto overflow;
-            num = rb_int_mul(num, mul);
-        }
-        else {
-            VALUE div;
-            if (!FIXNUM_P(nexp)) {
-              underflow:
-                return sign == '-' ? DBL2NUM(-0.0) : DBL2NUM(+0.0);
-            }
-            div = f_expt10(nexp);
-            if (RB_FLOAT_TYPE_P(div)) goto underflow;
-            den = rb_int_mul(den, div);
-        }
-        nurat_reduce(&num, &den);
-    }
-
-    if (sign == '-') {
-	num = negate_num(num);
-    }
-
-    if (!canonicalization || den != ONE)
-	num = rb_rational_raw(num, den);
-    return num;
+inline static void
+skip_ws(const char **s)
+{
+    while (isspace((unsigned char)**s))
+	(*s)++;
 }
 
-#define FLOAT_ZERO_P(x) (rb_float_value(x) == 0.0)
+static int
+parse_rat(const char *s, int strict,
+	  VALUE *num)
+{
+    skip_ws(&s);
+    if (!read_rat(&s, strict, num))
+	return 0;
+    skip_ws(&s);
+
+    if (strict)
+	if (*s != '\0')
+	    return 0;
+    return 1;
+}
 
 static VALUE
-string_to_r_strict(VALUE self, int raise)
+string_to_r_strict(VALUE self)
 {
+    char *s;
     VALUE num;
 
     rb_must_asciicompat(self);
 
-    num = parse_rat(RSTRING_PTR(self), RSTRING_END(self), 1, raise);
-    if (NIL_P(num)) {
-        if (!raise) return Qnil;
-        rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
-                 self);
+    s = RSTRING_PTR(self);
+
+    if (!s || memchr(s, '\0', RSTRING_LEN(self)))
+	rb_raise(rb_eArgError, "string contains null byte");
+
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
     }
 
-    if (RB_FLOAT_TYPE_P(num) && !FLOAT_ZERO_P(num)) {
-        if (!raise) return Qnil;
-        rb_raise(rb_eFloatDomainError, "Infinity");
+    if (!s)
+	s = (char *)"";
+
+    if (!parse_rat(s, 1, &num)) {
+	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
+		 self);
     }
+
+    if (RB_TYPE_P(num, T_FLOAT))
+	rb_raise(rb_eFloatDomainError, "Infinity");
     return num;
 }
 
@@ -2499,40 +2337,47 @@ string_to_r_strict(VALUE self, int raise)
  * call-seq:
  *    str.to_r  ->  rational
  *
- * Returns the result of interpreting leading characters in +str+
- * as a rational.  Leading whitespace and extraneous characters
- * past the end of a valid number are ignored.
- * Digit sequences can be separated by an underscore.
- * If there is not a valid number at the start of +str+,
- * zero is returned.  This method never raises an exception.
+ * Returns a rational which denotes the string form.  The parser
+ * ignores leading whitespaces and trailing garbage.  Any digit
+ * sequences can be separated by an underscore.  Returns zero for null
+ * or garbage string.
+ *
+ * NOTE: '0.3'.to_r isn't the same as 0.3.to_r.  The former is
+ * equivalent to '3/10'.to_r, but the latter isn't so.
  *
  *    '  2  '.to_r       #=> (2/1)
  *    '300/2'.to_r       #=> (150/1)
  *    '-9.2'.to_r        #=> (-46/5)
  *    '-9.2e2'.to_r      #=> (-920/1)
  *    '1_234_567'.to_r   #=> (1234567/1)
- *    '21 June 09'.to_r  #=> (21/1)
+ *    '21 june 09'.to_r  #=> (21/1)
  *    '21/06/09'.to_r    #=> (7/2)
- *    'BWV 1079'.to_r    #=> (0/1)
+ *    'bwv 1079'.to_r    #=> (0/1)
  *
- * NOTE: "0.3".to_r isn't the same as 0.3.to_r.  The former is
- * equivalent to "3/10".to_r, but the latter isn't so.
- *
- *    "0.3".to_r == 3/10r  #=> true
- *    0.3.to_r   == 3/10r  #=> false
- *
- * See also Kernel#Rational.
+ * See Kernel.Rational.
  */
 static VALUE
 string_to_r(VALUE self)
 {
+    char *s;
     VALUE num;
 
     rb_must_asciicompat(self);
 
-    num = parse_rat(RSTRING_PTR(self), RSTRING_END(self), 0, TRUE);
+    s = RSTRING_PTR(self);
+
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
+    }
+
+    if (!s)
+	s = (char *)"";
 
-    if (RB_FLOAT_TYPE_P(num) && !FLOAT_ZERO_P(num))
+    (void)parse_rat(s, 0, &num);
+
+    if (RB_TYPE_P(num, T_FLOAT))
 	rb_raise(rb_eFloatDomainError, "Infinity");
     return num;
 }
@@ -2542,138 +2387,82 @@ rb_cstr_to_rat(const char *s, int strict) /* for complex's internal */
 {
     VALUE num;
 
-    num = parse_rat(s, s + strlen(s), strict, TRUE);
+    (void)parse_rat(s, strict, &num);
 
-    if (RB_FLOAT_TYPE_P(num) && !FLOAT_ZERO_P(num))
+    if (RB_TYPE_P(num, T_FLOAT))
 	rb_raise(rb_eFloatDomainError, "Infinity");
     return num;
 }
 
 static VALUE
-to_rational(VALUE val)
+nurat_s_convert(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_convert_type_with_id(val, T_RATIONAL, "Rational", idTo_r);
-}
+    VALUE a1, a2, backref;
 
-static VALUE
-nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise)
-{
-    VALUE a1 = numv, a2 = denv;
-    int state;
+    rb_scan_args(argc, argv, "11", &a1, &a2);
 
-    if (NIL_P(a1) || NIL_P(a2)) {
-        if (!raise) return Qnil;
-        rb_raise(rb_eTypeError, "can't convert nil into Rational");
-    }
+    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
+	rb_raise(rb_eTypeError, "can't convert nil into Rational");
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-        if (k_exact_zero_p(RCOMPLEX(a1)->imag))
-            a1 = RCOMPLEX(a1)->real;
+	if (k_exact_zero_p(RCOMPLEX(a1)->imag))
+	    a1 = RCOMPLEX(a1)->real;
     }
 
     if (RB_TYPE_P(a2, T_COMPLEX)) {
-        if (k_exact_zero_p(RCOMPLEX(a2)->imag))
-            a2 = RCOMPLEX(a2)->real;
+	if (k_exact_zero_p(RCOMPLEX(a2)->imag))
+	    a2 = RCOMPLEX(a2)->real;
     }
 
-    if (RB_FLOAT_TYPE_P(a1)) {
-        a1 = float_to_r(a1);
+    backref = rb_backref_get();
+    rb_match_busy(backref);
+
+    if (RB_TYPE_P(a1, T_FLOAT)) {
+	a1 = f_to_r(a1);
     }
     else if (RB_TYPE_P(a1, T_STRING)) {
-        a1 = string_to_r_strict(a1, raise);
-        if (!raise && NIL_P(a1)) return Qnil;
+	a1 = string_to_r_strict(a1);
     }
 
-    if (RB_FLOAT_TYPE_P(a2)) {
-        a2 = float_to_r(a2);
+    if (RB_TYPE_P(a2, T_FLOAT)) {
+	a2 = f_to_r(a2);
     }
     else if (RB_TYPE_P(a2, T_STRING)) {
-        a2 = string_to_r_strict(a2, raise);
-        if (!raise && NIL_P(a2)) return Qnil;
+	a2 = string_to_r_strict(a2);
     }
 
+    rb_backref_set(backref);
+
     if (RB_TYPE_P(a1, T_RATIONAL)) {
-        if (a2 == Qundef || (k_exact_one_p(a2)))
-            return a1;
+	if (argc == 1 || (k_exact_one_p(a2)))
+	    return a1;
     }
 
-    if (a2 == Qundef) {
-        if (!k_integer_p(a1)) {
-            if (!raise) {
-                VALUE result = rb_protect(to_rational, a1, NULL);
-                rb_set_errinfo(Qnil);
-                return result;
-            }
-            return to_rational(a1);
-        }
+    if (argc == 1) {
+	if (!(k_numeric_p(a1) && k_integer_p(a1)))
+	    return rb_convert_type(a1, T_RATIONAL, "Rational", "to_r");
     }
     else {
-        if (!k_numeric_p(a1)) {
-            if (!raise) {
-                a1 = rb_protect(to_rational, a1, &state);
-                if (state) {
-                    rb_set_errinfo(Qnil);
-                    return Qnil;
-                }
-            }
-            else {
-                a1 = rb_check_convert_type_with_id(a1, T_RATIONAL, "Rational", idTo_r);
-            }
-        }
-        if (!k_numeric_p(a2)) {
-            if (!raise) {
-                a2 = rb_protect(to_rational, a2, &state);
-                if (state) {
-                    rb_set_errinfo(Qnil);
-                    return Qnil;
-                }
-            }
-            else {
-                a2 = rb_check_convert_type_with_id(a2, T_RATIONAL, "Rational", idTo_r);
-            }
-        }
-        if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
-                (!f_integer_p(a1) || !f_integer_p(a2)))
-            return f_div(a1, a2);
+	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
+	    (!f_integer_p(a1) || !f_integer_p(a2)))
+	    return f_div(a1, a2);
     }
 
     {
-        int argc;
-        VALUE argv2[2];
-        argv2[0] = a1;
-        if (a2 == Qundef) {
-            argv2[1] = Qnil;
-            argc = 1;
-        }
-        else {
-            if (!k_integer_p(a2) && !raise) return Qnil;
-            argv2[1] = a2;
-            argc = 2;
-        }
-        return nurat_s_new(argc, argv2, klass);
-    }
-}
-
-static VALUE
-nurat_s_convert(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE a1, a2;
-
-    if (rb_scan_args(argc, argv, "11", &a1, &a2) == 1) {
-        a2 = Qundef;
+	VALUE argv2[2];
+	argv2[0] = a1;
+	argv2[1] = a2;
+	return nurat_s_new(argc, argv2, klass);
     }
-
-    return nurat_convert(klass, a1, a2, TRUE);
 }
 
 /*
- * A rational number can be represented as a pair of integer numbers:
- * a/b (b>0), where a is the numerator and b is the denominator.
- * Integer a equals rational a/1 mathematically.
+ * A rational number can be represented as a paired integer number;
+ * a/b (b>0).  Where a is numerator and b is denominator.  Integer a
+ * equals rational a/1 mathematically.
  *
- * In Ruby, you can create rational objects with the Kernel#Rational,
- * to_r, or rationalize methods or by suffixing +r+ to a literal.
- * The return values will be irreducible fractions.
+ * In ruby, you can create rational object with Rational, to_r,
+ * rationalize method or suffixing r to a literal.  The return values will be irreducible.
  *
  *    Rational(1)      #=> (1/1)
  *    Rational(2, 3)   #=> (2/3)
@@ -2681,7 +2470,7 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
  *    3.to_r           #=> (3/1)
  *    2/3r             #=> (2/3)
  *
- * You can also create rational objects from floating-point numbers or
+ * You can also create rational object from floating-point numbers or
  * strings.
  *
  *    Rational(0.3)    #=> (5404319552844595/18014398509481984)
@@ -2694,13 +2483,13 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
  *    0.3.rationalize  #=> (3/10)
  *
  * A rational object is an exact number, which helps you to write
- * programs without any rounding errors.
+ * program without any rounding errors.
  *
- *    10.times.inject(0) {|t| t + 0.1 }              #=> 0.9999999999999999
- *    10.times.inject(0) {|t| t + Rational('0.1') }  #=> (1/1)
+ *    10.times.inject(0){|t,| t + 0.1}              #=> 0.9999999999999999
+ *    10.times.inject(0){|t,| t + Rational('0.1')}  #=> (1/1)
  *
- * However, when an expression includes an inexact component (numerical value
- * or operation), it will produce an inexact result.
+ * However, when an expression has inexact factor (numerical value or
+ * operation), will produce an inexact result.
  *
  *    Rational(10) / 3   #=> (10/3)
  *    Rational(10) / 3.0 #=> 3.3333333333333335
@@ -2715,9 +2504,20 @@ Init_Rational(void)
 #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_cmp = rb_intern("<=>");
+    id_convert = rb_intern("convert");
+    id_eqeq_p = rb_intern("==");
+    id_expt = rb_intern("**");
+    id_fdiv = rb_intern("fdiv");
     id_idiv = rb_intern("div");
     id_integer_p = rb_intern("integer?");
+    id_negate = rb_intern("-@");
+    id_to_f = rb_intern("to_f");
+    id_to_i = rb_intern("to_i");
+    id_truncate = rb_intern("truncate");
     id_i_num = rb_intern("@numerator");
     id_i_den = rb_intern("@denominator");
 
@@ -2726,30 +2526,39 @@ Init_Rational(void)
     rb_define_alloc_func(rb_cRational, nurat_s_alloc);
     rb_undef_method(CLASS_OF(rb_cRational), "allocate");
 
+#if 0
+    rb_define_private_method(CLASS_OF(rb_cRational), "new!", nurat_s_new_bang, -1);
+    rb_define_private_method(CLASS_OF(rb_cRational), "new", nurat_s_new, -1);
+#else
     rb_undef_method(CLASS_OF(rb_cRational), "new");
+#endif
 
     rb_define_global_function("Rational", nurat_f_rational, -1);
 
     rb_define_method(rb_cRational, "numerator", nurat_numerator, 0);
     rb_define_method(rb_cRational, "denominator", nurat_denominator, 0);
 
-    rb_define_method(rb_cRational, "-@", rb_rational_uminus, 0);
     rb_define_method(rb_cRational, "+", rb_rational_plus, 1);
     rb_define_method(rb_cRational, "-", nurat_sub, 1);
-    rb_define_method(rb_cRational, "*", rb_rational_mul, 1);
+    rb_define_method(rb_cRational, "*", nurat_mul, 1);
     rb_define_method(rb_cRational, "/", nurat_div, 1);
     rb_define_method(rb_cRational, "quo", nurat_div, 1);
     rb_define_method(rb_cRational, "fdiv", nurat_fdiv, 1);
     rb_define_method(rb_cRational, "**", nurat_expt, 1);
 
-    rb_define_method(rb_cRational, "<=>", rb_rational_cmp, 1);
+    rb_define_method(rb_cRational, "<=>", nurat_cmp, 1);
     rb_define_method(rb_cRational, "==", nurat_eqeq_p, 1);
     rb_define_method(rb_cRational, "coerce", nurat_coerce, 1);
 
-    rb_define_method(rb_cRational, "positive?", nurat_positive_p, 0);
-    rb_define_method(rb_cRational, "negative?", nurat_negative_p, 0);
-    rb_define_method(rb_cRational, "abs", rb_rational_abs, 0);
-    rb_define_method(rb_cRational, "magnitude", rb_rational_abs, 0);
+#if 0
+    rb_define_method(rb_cRational, "quot", nurat_quot, 1);
+    rb_define_method(rb_cRational, "quotrem", nurat_quotrem, 1);
+#endif
+
+#if 0
+    rb_define_method(rb_cRational, "rational?", nurat_true, 0);
+    rb_define_method(rb_cRational, "exact?", nurat_true, 0);
+#endif
 
     rb_define_method(rb_cRational, "floor", nurat_floor_n, -1);
     rb_define_method(rb_cRational, "ceil", nurat_ceil_n, -1);
@@ -2767,7 +2576,6 @@ Init_Rational(void)
     rb_define_method(rb_cRational, "inspect", nurat_inspect, 0);
 
     rb_define_private_method(rb_cRational, "marshal_dump", nurat_marshal_dump, 0);
-    /* :nodoc: */
     compat = rb_define_class_under(rb_cRational, "compatible", rb_cObject);
     rb_define_private_method(compat, "marshal_load", nurat_marshal_load, 1);
     rb_marshal_define_compat(rb_cRational, compat, nurat_dumper, nurat_loader);
@@ -2780,7 +2588,7 @@ Init_Rational(void)
 
     rb_define_method(rb_cNumeric, "numerator", numeric_numerator, 0);
     rb_define_method(rb_cNumeric, "denominator", numeric_denominator, 0);
-    rb_define_method(rb_cNumeric, "quo", rb_numeric_quo, 1);
+    rb_define_method(rb_cNumeric, "quo", numeric_quo, 1);
 
     rb_define_method(rb_cInteger, "numerator", integer_numerator, 0);
     rb_define_method(rb_cInteger, "denominator", integer_denominator, 0);
diff --git a/re.c b/re.c
index a86663034a..6fd086a1bd 100644
--- a/re.c
+++ b/re.c
@@ -9,10 +9,9 @@
 
 **********************************************************************/
 
-#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/re.h"
 #include "ruby/util.h"
-#include "internal.h"
 #include "regint.h"
 #include "encindex.h"
 #include <ctype.h>
@@ -89,13 +88,21 @@ rb_memcicmp(const void *x, const void *y, long len)
     return 0;
 }
 
+#undef rb_memcmp
+
+int
+rb_memcmp(const void *p1, const void *p2, long len)
+{
+    return memcmp(p1, p2, len);
+}
+
 #ifdef HAVE_MEMMEM
 static inline long
 rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n)
 {
     const unsigned char *y;
 
-    if ((y = memmem(ys, n, xs, m)) != NULL)
+    if (y = memmem(ys, n, xs, m))
 	return y - ys;
     else
 	return -1;
@@ -106,7 +113,13 @@ rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n
 {
     const unsigned char *x = xs, *xe = xs + m;
     const unsigned char *y = ys, *ye = ys + n;
-#define VALUE_MAX ((VALUE)~(VALUE)0)
+#ifndef VALUE_MAX
+# if SIZEOF_VALUE == 8
+#  define VALUE_MAX 0xFFFFFFFFFFFFFFFFULL
+# elif SIZEOF_VALUE == 4
+#  define VALUE_MAX 0xFFFFFFFFUL
+# endif
+#endif
     VALUE hx, hy, mask = VALUE_MAX >> ((SIZEOF_VALUE - m) * CHAR_BIT);
 
     if (m > SIZEOF_VALUE)
@@ -351,7 +364,7 @@ rb_reg_check(VALUE re)
 
 static void
 rb_reg_expr_str(VALUE str, const char *s, long len,
-		rb_encoding *enc, rb_encoding *resenc, int term)
+	rb_encoding *enc, rb_encoding *resenc)
 {
     const char *p, *pend;
     int cr = ENC_CODERANGE_UNKNOWN;
@@ -372,7 +385,7 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
 		    break;
 		}
 	    }
-	    else if (c != term && rb_enc_isprint(c, enc)) {
+	    else if (c != '/' && rb_enc_isprint(c, enc)) {
 		p += clen;
 	    }
 	    else {
@@ -399,6 +412,11 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
 		p += n;
 		continue;
 	    }
+	    else if (c == '/') {
+		char c = '\\';
+		rb_str_buf_cat(str, &c, 1);
+		rb_str_buf_cat(str, p, clen);
+	    }
 	    else if (c == -1) {
 		clen = rb_enc_precise_mbclen(p, pend, enc);
 		if (!MBCLEN_CHARFOUND_P(clen)) {
@@ -415,11 +433,6 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
 		    rb_str_buf_cat(str, p, clen);
 		}
 	    }
-	    else if (c == term) {
-		char c = '\\';
-		rb_str_buf_cat(str, &c, 1);
-		rb_str_buf_cat(str, p, clen);
-	    }
 	    else if (rb_enc_isprint(c, enc)) {
 		rb_str_buf_cat(str, p, clen);
 	    }
@@ -452,7 +465,7 @@ rb_reg_desc(const char *s, long len, VALUE re)
     else {
 	rb_enc_associate(str, rb_usascii_encoding());
     }
-    rb_reg_expr_str(str, s, len, enc, resenc, '/');
+    rb_reg_expr_str(str, s, len, enc, resenc);
     rb_str_buf_cat2(str, "/");
     if (re) {
 	char opts[4];
@@ -513,7 +526,6 @@ rb_reg_inspect(VALUE re)
     return rb_reg_desc(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), re);
 }
 
-static VALUE rb_reg_str_with_term(VALUE re, int term);
 
 /*
  *  call-seq:
@@ -538,12 +550,6 @@ static VALUE rb_reg_str_with_term(VALUE re, int term);
 static VALUE
 rb_reg_to_s(VALUE re)
 {
-    return rb_reg_str_with_term(re, '/');
-}
-
-static VALUE
-rb_reg_str_with_term(VALUE re, int term)
-{
     int options, opt;
     const int embeddable = ONIG_OPTION_MULTILINE|ONIG_OPTION_IGNORECASE|ONIG_OPTION_EXTEND;
     long len;
@@ -600,7 +606,7 @@ rb_reg_str_with_term(VALUE re, int term)
 
 	    ++ptr;
 	    len -= 2;
-            err = onig_new(&rp, ptr, ptr + len, options,
+            err = onig_new(&rp, ptr, ptr + len, ONIG_OPTION_DEFAULT,
 			   enc, OnigDefaultSyntax, NULL);
 	    onig_free(rp);
 	    ruby_verbose = verbose;
@@ -622,7 +628,7 @@ rb_reg_str_with_term(VALUE re, int term)
 
     rb_str_buf_cat2(str, ":");
     if (rb_enc_asciicompat(enc)) {
-	rb_reg_expr_str(str, (char*)ptr, len, enc, NULL, term);
+	rb_reg_expr_str(str, (char*)ptr, len, enc, NULL);
 	rb_str_buf_cat2(str, ")");
     }
     else {
@@ -642,7 +648,7 @@ rb_reg_str_with_term(VALUE re, int term)
 	memcpy(paren, s, n);
 	rb_str_resize(str, RSTRING_LEN(str) - n);
 
-	rb_reg_expr_str(str, (char*)ptr, len, enc, NULL, term);
+	rb_reg_expr_str(str, (char*)ptr, len, enc, NULL);
 	rb_str_buf_cat(str, paren, n);
     }
     rb_enc_copy(str, re);
@@ -651,8 +657,6 @@ rb_reg_str_with_term(VALUE re, int term)
     return str;
 }
 
-NORETURN(static void rb_reg_raise(const char *s, long len, const char *err, VALUE re));
-
 static void
 rb_reg_raise(const char *s, long len, const char *err, VALUE re)
 {
@@ -671,15 +675,13 @@ rb_enc_reg_error_desc(const char *s, long len, rb_encoding *enc, int options, co
 
     rb_enc_associate(desc, enc);
     rb_str_buf_cat2(desc, ": /");
-    rb_reg_expr_str(desc, s, len, enc, resenc, '/');
+    rb_reg_expr_str(desc, s, len, enc, resenc);
     opts[0] = '/';
     option_to_str(opts + 1, options);
     rb_str_buf_cat2(desc, opts);
     return rb_exc_new3(rb_eRegexpError, desc);
 }
 
-NORETURN(static void rb_enc_reg_raise(const char *s, long len, rb_encoding *enc, int options, const char *err));
-
 static void
 rb_enc_reg_raise(const char *s, long len, rb_encoding *enc, int options, const char *err)
 {
@@ -693,8 +695,6 @@ rb_reg_error_desc(VALUE str, int options, const char *err)
 				 rb_enc_get(str), options, err);
 }
 
-NORETURN(static void rb_reg_raise_str(VALUE str, int options, const char *err));
-
 static void
 rb_reg_raise_str(VALUE str, int options, const char *err)
 {
@@ -828,9 +828,9 @@ reg_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end,
 static VALUE
 rb_reg_named_captures(VALUE re)
 {
-    regex_t *reg = (rb_reg_check(re), RREGEXP_PTR(re));
-    VALUE hash = rb_hash_new_with_size(onig_number_of_names(reg));
-    onig_foreach_name(reg, reg_named_captures_iter, (void*)hash);
+    VALUE hash = rb_hash_new();
+    rb_reg_check(re);
+    onig_foreach_name(RREGEXP_PTR(re), reg_named_captures_iter, (void*)hash);
     return hash;
 }
 
@@ -847,7 +847,7 @@ onig_new_with_source(regex_t** reg, const UChar* pattern, const UChar* pattern_e
     r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
     if (r) goto err;
 
-    r = onig_compile_ruby(*reg, pattern, pattern_end, einfo, sourcefile, sourceline);
+    r = onig_compile(*reg, pattern, pattern_end, einfo, sourcefile, sourceline);
     if (r) {
       err:
 	onig_free(*reg);
@@ -884,51 +884,13 @@ make_regexp(const char *s, long len, rb_encoding *enc, int flags, onig_errmsg_bu
 /*
  *  Document-class: MatchData
  *
- *  <code>MatchData</code> encapsulates the result of matching a Regexp against
- *  string. It is returned by Regexp#match and
- *  String#match, and also stored in a global variable returned by
- *  Regexp.last_match.
- *
- *  Usage:
- *
- *      url = 'https://docs.ruby-lang.org/en/2.5.0/MatchData.html'
- *      m = url.match(/(\d\.?)+/)   # => #<MatchData "2.5.0" 1:"0">
- *      m.string                    # => "https://docs.ruby-lang.org/en/2.5.0/MatchData.html"
- *      m.regexp                    # => /(\d\.?)+/
- *      # entire matched substring:
- *      m[0]                        # => "2.5.0"
- *
- *      # Working with unnamed captures
- *      m = url.match(%r{([^/]+)/([^/]+)\.html$})
- *      m.captures                  # => ["2.5.0", "MatchData"]
- *      m[1]                        # => "2.5.0"
- *      m.values_at(1, 2)           # => ["2.5.0", "MatchData"]
- *
- *      # Working with named captures
- *      m = url.match(%r{(?<version>[^/]+)/(?<module>[^/]+)\.html$})
- *      m.captures                  # => ["2.5.0", "MatchData"]
- *      m.named_captures            # => {"version"=>"2.5.0", "module"=>"MatchData"}
- *      m[:version]                 # => "2.5.0"
- *      m.values_at(:version, :module)
- *                                  # => ["2.5.0", "MatchData"]
- *      # Numerical indexes are working, too
- *      m[1]                        # => "2.5.0"
- *      m.values_at(1, 2)           # => ["2.5.0", "MatchData"]
- *
- *  == Global variables equivalence
- *
- *  Parts of last <code>MatchData</code> (returned by Regexp.last_match) are also
- *  aliased as global variables:
- *
- *  * <code>$~</code> is <code>Regexp.last_match</code>;
- *  * <code>$&</code> is <code>Regexp.last_match[0]</code>;
- *  * <code>$1</code>, <code>$2</code>, and so on are
- *    <code>Regexp.last_match[i]</code> (captures by number);
- *  * <code>$`</code> is <code>Regexp.last_match.pre_match</code>;
- *  * <code>$'</code> is <code>Regexp.last_match.post_match</code>;
- *  * <code>$+</code> is <code>Regexp.last_match[-1]</code> (the last capture).
- *
- *  See also "Special global variables" section in Regexp documentation.
+ *  <code>MatchData</code> is the type of the special variable <code>$~</code>,
+ *  and is the type of the object returned by <code>Regexp#match</code> and
+ *  <code>Regexp.last_match</code>. It encapsulates all the results of a pattern
+ *  match, results normally accessed through the special variables
+ *  <code>$&</code>, <code>$'</code>, <code>$`</code>, <code>$1</code>,
+ *  <code>$2</code>, and so on.
+ *
  */
 
 VALUE rb_cMatch;
@@ -1127,8 +1089,6 @@ static VALUE
 match_names(VALUE match)
 {
     match_check(match);
-    if (NIL_P(RMATCH(match)->regexp))
-	return rb_ary_new_capa(0);
     return rb_reg_names(RMATCH(match)->regexp);
 }
 
@@ -1151,8 +1111,6 @@ match_size(VALUE match)
     return INT2FIX(RMATCH_REGS(match)->num_regs);
 }
 
-static int name_to_backref_number(struct re_registers *, VALUE, const char*, const char*);
-
 static int
 match_backref_number(VALUE match, VALUE backref)
 {
@@ -1163,15 +1121,23 @@ match_backref_number(VALUE match, VALUE backref)
     VALUE regexp = RMATCH(match)->regexp;
 
     match_check(match);
-    if (SYMBOL_P(backref)) {
+    switch (TYPE(backref)) {
+      default:
+        return NUM2INT(backref);
+
+      case T_SYMBOL:
 	backref = rb_sym2str(backref);
+	/* fall through */
+
+      case T_STRING:
+        name = StringValueCStr(backref);
+        break;
     }
-    else if (!RB_TYPE_P(backref, T_STRING)) {
-	return NUM2INT(backref);
-    }
-    name = StringValueCStr(backref);
 
-    num = name_to_backref_number(regs, regexp, name, name + strlen(name));
+    num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
+              (const unsigned char*)name,
+              (const unsigned char*)name + strlen(name),
+              regs);
 
     if (num < 1) {
         rb_raise(rb_eIndexError, "undefined group name reference: %s", name);
@@ -1300,12 +1266,6 @@ rb_match_busy(VALUE match)
     FL_SET(match, MATCH_BUSY);
 }
 
-void
-rb_match_unbusy(VALUE match)
-{
-    FL_UNSET(match, MATCH_BUSY);
-}
-
 int
 rb_match_count(VALUE match)
 {
@@ -1377,14 +1337,14 @@ rb_backref_set_string(VALUE string, long pos, long len)
  *      r.fixed_encoding?                               #=> true
  *      r.encoding                                      #=> #<Encoding:UTF-8>
  *      r =~ "\u{6666} a"                               #=> 2
- *      r =~ "\xa1\xa2".force_encoding("euc-jp")        #=> Encoding::CompatibilityError
+ *      r =~ "\xa1\xa2".force_encoding("euc-jp")        #=> ArgumentError
  *      r =~ "abc".force_encoding("euc-jp")             #=> 0
  *
  *      r = /\u{6666}/
  *      r.fixed_encoding?                               #=> true
  *      r.encoding                                      #=> #<Encoding:UTF-8>
  *      r =~ "\u{6666} a"                               #=> 0
- *      r =~ "\xa1\xa2".force_encoding("euc-jp")        #=> Encoding::CompatibilityError
+ *      r =~ "\xa1\xa2".force_encoding("euc-jp")        #=> ArgumentError
  *      r =~ "abc".force_encoding("euc-jp")             #=> nil
  */
 
@@ -1401,7 +1361,6 @@ static VALUE
 rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
         rb_encoding **fixed_enc, onig_errmsg_buffer err);
 
-NORETURN(static void reg_enc_error(VALUE re, VALUE str));
 
 static void
 reg_enc_error(VALUE re, VALUE str)
@@ -1455,7 +1414,7 @@ rb_reg_prepare_enc(VALUE re, VALUE str, int warn)
     else if (warn && (RBASIC(re)->flags & REG_ENCODING_NONE) &&
 	enc != rb_ascii8bit_encoding() &&
 	cr != ENC_CODERANGE_7BIT) {
-	rb_warn("historical binary regexp match /.../n against %s string",
+	rb_warn("regexp match /.../n against to %s string",
 		rb_enc_name(enc));
     }
     return enc;
@@ -1633,83 +1592,6 @@ rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
     return rb_reg_search0(re, str, pos, reverse, 1);
 }
 
-bool
-rb_reg_start_with_p(VALUE re, VALUE str)
-{
-    long result;
-    VALUE match;
-    struct re_registers regi, *regs = &regi;
-    regex_t *reg;
-    int tmpreg;
-    onig_errmsg_buffer err = "";
-
-    reg = rb_reg_prepare_re0(re, str, err);
-    tmpreg = reg != RREGEXP_PTR(re);
-    if (!tmpreg) RREGEXP(re)->usecnt++;
-
-    match = rb_backref_get();
-    if (!NIL_P(match)) {
-	if (FL_TEST(match, MATCH_BUSY)) {
-	    match = Qnil;
-	}
-	else {
-	    regs = RMATCH_REGS(match);
-	}
-    }
-    if (NIL_P(match)) {
-	MEMZERO(regs, struct re_registers, 1);
-    }
-    result = onig_match(reg,
-	    (UChar*)(RSTRING_PTR(str)),
-	    ((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)),
-	    (UChar*)(RSTRING_PTR(str)),
-	    regs, ONIG_OPTION_NONE);
-    if (!tmpreg) RREGEXP(re)->usecnt--;
-    if (tmpreg) {
-	if (RREGEXP(re)->usecnt) {
-	    onig_free(reg);
-	}
-	else {
-	    onig_free(RREGEXP_PTR(re));
-	    RREGEXP_PTR(re) = reg;
-	}
-    }
-    if (result < 0) {
-	if (regs == &regi)
-	    onig_region_free(regs, 0);
-	if (result == ONIG_MISMATCH) {
-	    rb_backref_set(Qnil);
-	    return false;
-	}
-	else {
-	    onig_error_code_to_str((UChar*)err, (int)result);
-	    rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, re);
-	}
-    }
-
-    if (NIL_P(match)) {
-	int err;
-	match = match_alloc(rb_cMatch);
-	err = rb_reg_region_copy(RMATCH_REGS(match), regs);
-	onig_region_free(regs, 0);
-	if (err) rb_memerror();
-    }
-    else {
-	FL_UNSET(match, FL_TAINT);
-    }
-
-    RMATCH(match)->str = rb_str_new4(str);
-    OBJ_INFECT(match, str);
-
-    RMATCH(match)->regexp = re;
-    RMATCH(match)->rmatch->char_offset_updated = 0;
-    rb_backref_set(match);
-
-    OBJ_INFECT(match, re);
-
-    return true;
-}
-
 VALUE
 rb_reg_nth_defined(int nth, VALUE match)
 {
@@ -1936,9 +1818,8 @@ match_captures(VALUE match)
 static int
 name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end)
 {
-    if (NIL_P(regexp)) return -1;
     return onig_name_to_backref_number(RREGEXP_PTR(regexp),
-	(const unsigned char *)name, (const unsigned char *)name_end, regs);
+	(const unsigned char* )name, (const unsigned char* )name_end, regs);
 }
 
 NORETURN(static void name_to_backref_error(VALUE name));
@@ -1949,28 +1830,26 @@ name_to_backref_error(VALUE name)
 	     name);
 }
 
-#define NAME_TO_NUMBER(regs, re, name, name_ptr, name_end)	\
-    (NIL_P(re) ? 0 : \
-     !rb_enc_compatible(RREGEXP_SRC(re), (name)) ? 0 : \
-     name_to_backref_number((regs), (re), (name_ptr), (name_end)))
-
 static int
 namev_to_backref_number(struct re_registers *regs, VALUE re, VALUE name)
 {
     int num;
 
-    if (SYMBOL_P(name)) {
+    switch (TYPE(name)) {
+      case T_SYMBOL:
 	name = rb_sym2str(name);
-    }
-    else if (!RB_TYPE_P(name, T_STRING)) {
+	/* fall through */
+      case T_STRING:
+	if (NIL_P(re) || !rb_enc_compatible(RREGEXP_SRC(re), name) ||
+		(num = name_to_backref_number(regs, re,
+					      RSTRING_PTR(name), RSTRING_END(name))) < 1) {
+	    name_to_backref_error(name);
+	}
+	return num;
+
+      default:
 	return -1;
     }
-    num = NAME_TO_NUMBER(regs, re, name,
-			 RSTRING_PTR(name), RSTRING_END(name));
-    if (num < 1) {
-	name_to_backref_error(name);
-    }
-    return num;
 }
 
 static VALUE
@@ -2082,7 +1961,7 @@ match_aref(int argc, VALUE *argv, VALUE match)
 /*
  *  call-seq:
  *
- *     mtch.values_at(index, ...)   -> array
+ *     mtch.values_at([index]*)   -> array
  *
  *  Uses each <i>index</i> to access the matching values, returning an array of
  *  the corresponding matches.
@@ -2203,8 +2082,6 @@ match_named_captures(VALUE match)
     struct MEMO *memo;
 
     match_check(match);
-    if (NIL_P(RMATCH(match)->regexp))
-	return rb_hash_new();
 
     hash = rb_hash_new();
     memo = MEMO_NEW(hash, match, 0);
@@ -2434,8 +2311,7 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
 {
     const char *p = *pp;
     int chmaxlen = rb_enc_mbmaxlen(enc);
-    unsigned char *area = ALLOCA_N(unsigned char, chmaxlen);
-    char *chbuf = (char *)area;
+    char *chbuf = ALLOCA_N(char, chmaxlen);
     int chlen = 0;
     int byte;
     int l;
@@ -2447,14 +2323,14 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
         return -1;
     }
 
-    area[chlen++] = byte;
+    chbuf[chlen++] = byte;
     while (chlen < chmaxlen &&
            MBCLEN_NEEDMORE_P(rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc))) {
         byte = read_escaped_byte(&p, end, err);
         if (byte == -1) {
             return -1;
         }
-        area[chlen++] = byte;
+        chbuf[chlen++] = byte;
     }
 
     l = rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc);
@@ -2462,7 +2338,7 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
         errcpy(err, "invalid multibyte escape");
         return -1;
     }
-    if (1 < chlen || (area[0] & 0x80)) {
+    if (1 < chlen || (chbuf[0] & 0x80)) {
         rb_str_buf_cat(buf, chbuf, chlen);
 
         if (*encp == 0)
@@ -2474,7 +2350,7 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
     }
     else {
         char escbuf[5];
-        snprintf(escbuf, sizeof(escbuf), "\\x%02X", area[0]&0xff);
+        snprintf(escbuf, sizeof(escbuf), "\\x%02X", chbuf[0]&0xff);
         rb_str_buf_cat(buf, escbuf, 4);
     }
     *pp = p;
@@ -2584,19 +2460,17 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
         VALUE buf, rb_encoding **encp, int *has_property,
         onig_errmsg_buffer err)
 {
-    unsigned char c;
+    char c;
     char smallbuf[2];
 
     while (p < end) {
         int chlen = rb_enc_precise_mbclen(p, end, enc);
         if (!MBCLEN_CHARFOUND_P(chlen)) {
-          invalid_multibyte:
             errcpy(err, "invalid multibyte character");
             return -1;
         }
         chlen = MBCLEN_CHARFOUND_LEN(chlen);
         if (1 < chlen || (*p & 0x80)) {
-          multibyte:
             rb_str_buf_cat(buf, p, chlen);
             p += chlen;
             if (*encp == 0)
@@ -2614,16 +2488,6 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
                 errcpy(err, "too short escape sequence");
                 return -1;
             }
-            chlen = rb_enc_precise_mbclen(p, end, enc);
-            if (!MBCLEN_CHARFOUND_P(chlen)) {
-                goto invalid_multibyte;
-            }
-            if ((chlen = MBCLEN_CHARFOUND_LEN(chlen)) > 1) {
-		/* include the previous backslash */
-                --p;
-                ++chlen;
-                goto multibyte;
-            }
             switch (c = *p++) {
               case '1': case '2': case '3':
               case '4': case '5': case '6': case '7': /* \O, \OO, \OOO or backref */
@@ -2647,9 +2511,8 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
                 p = p-2;
 		if (enc == rb_usascii_encoding()) {
 		    const char *pbeg = p;
-                    int byte = read_escaped_byte(&p, end, err);
-                    if (byte == -1) return -1;
-                    c = byte;
+		    c = read_escaped_byte(&p, end, err);
+		    if (c == (char)-1) return -1;
 		    rb_str_buf_cat(buf, pbeg, p-pbeg);
 		}
 		else {
@@ -2698,7 +2561,7 @@ escape_asis:
             break;
 
           default:
-            rb_str_buf_cat(buf, (char *)&c, 1);
+            rb_str_buf_cat(buf, &c, 1);
             break;
         }
     }
@@ -2957,7 +2820,7 @@ rb_reg_init_str_enc(VALUE re, VALUE s, rb_encoding *enc, int options)
     return re;
 }
 
-MJIT_FUNC_EXPORTED VALUE
+VALUE
 rb_reg_new_ary(VALUE ary, int opt)
 {
     return rb_reg_new_str(rb_reg_preprocess_dregexp(ary, opt), opt);
@@ -3025,7 +2888,7 @@ static VALUE
 rb_reg_hash(VALUE re)
 {
     st_index_t hashval = reg_hash(re);
-    return ST2FIX(hashval);
+    return LONG2FIX(hashval);
 }
 
 static st_index_t
@@ -3085,17 +2948,15 @@ static VALUE
 match_hash(VALUE match)
 {
     const struct re_registers *regs;
-    st_index_t hashval;
+    st_index_t hashval = rb_hash_start(rb_str_hash(RMATCH(match)->str));
 
-    match_check(match);
-    hashval = rb_hash_start(rb_str_hash(RMATCH(match)->str));
-    hashval = rb_hash_uint(hashval, reg_hash(match_regexp(match)));
+    rb_hash_uint(hashval, reg_hash(RMATCH(match)->regexp));
     regs = RMATCH_REGS(match);
     hashval = rb_hash_uint(hashval, regs->num_regs);
     hashval = rb_hash_uint(hashval, rb_memhash(regs->beg, regs->num_regs * sizeof(*regs->beg)));
     hashval = rb_hash_uint(hashval, rb_memhash(regs->end, regs->num_regs * sizeof(*regs->end)));
     hashval = rb_hash_end(hashval);
-    return ST2FIX(hashval);
+    return LONG2FIX(hashval);
 }
 
 /*
@@ -3111,12 +2972,10 @@ static VALUE
 match_equal(VALUE match1, VALUE match2)
 {
     const struct re_registers *regs1, *regs2;
-
     if (match1 == match2) return Qtrue;
     if (!RB_TYPE_P(match2, T_MATCH)) return Qfalse;
-    if (!RMATCH(match1)->regexp || !RMATCH(match2)->regexp) return Qfalse;
     if (!rb_str_equal(RMATCH(match1)->str, RMATCH(match2)->str)) return Qfalse;
-    if (!rb_reg_equal(match_regexp(match1), match_regexp(match2))) return Qfalse;
+    if (!rb_reg_equal(RMATCH(match1)->regexp, RMATCH(match2)->regexp)) return Qfalse;
     regs1 = RMATCH_REGS(match1);
     regs2 = RMATCH_REGS(match2);
     if (regs1->num_regs != regs2->num_regs) return Qfalse;
@@ -3131,11 +2990,8 @@ reg_operand(VALUE s, int check)
     if (SYMBOL_P(s)) {
 	return rb_sym2str(s);
     }
-    else if (RB_TYPE_P(s, T_STRING)) {
-        return s;
-    }
     else {
-        return check ? rb_str_to_str(s) : rb_check_string_type(s);
+	return (check ? rb_str_to_str : rb_check_string_type)(s);
     }
 }
 
@@ -3227,9 +3083,9 @@ rb_reg_match(VALUE re, VALUE str)
  *
  *     a = "HELLO"
  *     case a
- *     when /\A[a-z]*\z/; print "Lower case\n"
- *     when /\A[A-Z]*\z/; print "Upper case\n"
- *     else;              print "Mixed case\n"
+ *     when /^[a-z]*$/; print "Lower case\n"
+ *     when /^[A-Z]*$/; print "Upper case\n"
+ *     else;            print "Mixed case\n"
  *     end
  *     #=> "Upper case"
  *
@@ -3366,29 +3222,26 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re)
 static VALUE
 rb_reg_match_m_p(int argc, VALUE *argv, VALUE re)
 {
-    long pos = rb_check_arity(argc, 1, 2) > 1 ? NUM2LONG(argv[1]) : 0;
-    return rb_reg_match_p(re, argv[0], pos);
-}
-
-VALUE
-rb_reg_match_p(VALUE re, VALUE str, long pos)
-{
+    VALUE str, initpos;
+    long pos = 0;
     regex_t *reg;
     onig_errmsg_buffer err = "";
     OnigPosition result;
     const UChar *start, *end;
     int tmpreg;
 
+    rb_scan_args(argc, argv, "11", &str, &initpos);
     if (NIL_P(str)) return Qfalse;
-    str = SYMBOL_P(str) ? rb_sym2str(str) : StringValue(str);
-    if (pos) {
+    str = SYMBOL_P(str) ? rb_sym2str(str) : rb_str_to_str(str);
+    if (argc == 2) {
+	pos = NUM2LONG(initpos);
 	if (pos < 0) {
 	    pos += NUM2LONG(rb_str_length(str));
 	    if (pos < 0) return Qfalse;
 	}
 	if (pos > 0) {
-	    long len = 1;
-	    const char *beg = rb_str_subpos(str, pos, &len);
+	    long len = 0;
+	    char *beg = rb_str_subpos(str, pos, &len);
 	    if (!beg) return Qfalse;
 	    pos = beg - RSTRING_PTR(str);
 	}
@@ -3439,7 +3292,7 @@ rb_reg_match_p(VALUE re, VALUE str, long pos)
  *  String or a Regexp (in which case that regexp's options are propagated),
  *  and new options may not be specified (a change as of Ruby 1.8).
  *
- *  If +options+ is an Integer, it should be one or more of the constants
+ *  If +options+ is a Fixnum, it should be one or more of the constants
  *  Regexp::EXTENDED, Regexp::IGNORECASE, and Regexp::MULTILINE,
  *  <em>or</em>-ed together.  Otherwise, if +options+ is not
  *  +nil+ or +false+, the regexp will be case insensitive.
@@ -3708,7 +3561,7 @@ rb_reg_s_union(VALUE self, VALUE args0)
                 else {
                     has_asciionly = 1;
                 }
-		v = rb_reg_str_with_term(v, -1);
+		v = rb_reg_to_s(v);
 	    }
 	    else {
                 rb_encoding *enc;
@@ -3872,7 +3725,8 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
                 if (name_end < e) {
 		    VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)),
 					    (long)(name_end - name));
-		    if ((no = NAME_TO_NUMBER(regs, regexp, n, name, name_end)) < 1) {
+		    if (!rb_enc_compatible(RREGEXP_SRC(regexp), n) ||
+			(no = name_to_backref_number(regs, regexp, name, name_end)) < 1) {
 			name_to_backref_error(n);
 		    }
                     p = s = name_end + clen;
@@ -4005,11 +3859,13 @@ match_setter(VALUE val)
 static VALUE
 rb_reg_s_last_match(int argc, VALUE *argv)
 {
-    if (rb_check_arity(argc, 0, 1) == 1) {
+    VALUE nth;
+
+    if (argc > 0 && rb_scan_args(argc, argv, "01", &nth) == 1) {
         VALUE match = rb_backref_get();
         int n;
         if (NIL_P(match)) return Qnil;
-        n = match_backref_number(match, argv[0]);
+        n = match_backref_number(match, nth);
 	return rb_reg_nth_match(n, match);
     }
     return match_getter();
@@ -4049,6 +3905,7 @@ Init_Regexp(void)
 {
     rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError);
 
+    onigenc_set_default_caseconv_table((UChar*)casetable);
     onigenc_set_default_encoding(ONIG_ENCODING_ASCII);
     onig_set_warn_func(re_warn);
     onig_set_verb_warn_func(re_warn);
diff --git a/regcomp.c b/regcomp.c
index df7f73bac5..869299cc37 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2013  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -30,6 +30,15 @@
 
 #include "regparse.h"
 
+#if defined(USE_MULTI_THREAD_SYSTEM) \
+  && defined(USE_DEFAULT_MULTI_THREAD_SYSTEM)
+#ifdef _WIN32
+CRITICAL_SECTION gOnigMutex;
+#else
+pthread_mutex_t gOnigMutex;
+#endif
+#endif
+
 OnigCaseFoldType OnigDefaultCaseFoldFlag = ONIGENC_CASE_FOLD_MIN;
 
 extern OnigCaseFoldType
@@ -254,7 +263,6 @@ add_mem_num(regex_t* reg, int num)
   return 0;
 }
 
-#if 0
 static int
 add_pointer(regex_t* reg, void* addr)
 {
@@ -263,7 +271,6 @@ add_pointer(regex_t* reg, void* addr)
   BBUF_ADD(reg, &ptr, SIZE_POINTER);
   return 0;
 }
-#endif
 
 static int
 add_option(regex_t* reg, OnigOptionType option)
@@ -584,6 +591,11 @@ compile_length_cclass_node(CClassNode* cc, regex_t* reg)
 {
   int len;
 
+  if (IS_NCCLASS_SHARE(cc)) {
+    len = SIZE_OPCODE + SIZE_POINTER;
+    return len;
+  }
+
   if (IS_NULL(cc->mbuf)) {
     len = SIZE_OPCODE + SIZE_BITSET;
   }
@@ -609,6 +621,12 @@ compile_cclass_node(CClassNode* cc, regex_t* reg)
 {
   int r;
 
+  if (IS_NCCLASS_SHARE(cc)) {
+    add_opcode(reg, OP_CCLASS_NODE);
+    r = add_pointer(reg, cc);
+    return r;
+  }
+
   if (IS_NULL(cc->mbuf)) {
     if (IS_NCCLASS_NOT(cc))
       add_opcode(reg, OP_CCLASS_NOT);
@@ -620,17 +638,17 @@ compile_cclass_node(CClassNode* cc, regex_t* reg)
   else {
     if (ONIGENC_MBC_MINLEN(reg->enc) > 1 || bitset_is_empty(cc->bs)) {
       if (IS_NCCLASS_NOT(cc))
-	add_opcode(reg, OP_CCLASS_MB_NOT);
+        add_opcode(reg, OP_CCLASS_MB_NOT);
       else
-	add_opcode(reg, OP_CCLASS_MB);
+        add_opcode(reg, OP_CCLASS_MB);
 
       r = add_multi_byte_cclass(cc->mbuf, reg);
     }
     else {
       if (IS_NCCLASS_NOT(cc))
-	add_opcode(reg, OP_CCLASS_MIX_NOT);
+        add_opcode(reg, OP_CCLASS_MIX_NOT);
       else
-	add_opcode(reg, OP_CCLASS_MIX);
+        add_opcode(reg, OP_CCLASS_MIX);
 
       r = add_bitset(reg, cc->bs);
       if (r) return r;
@@ -742,9 +760,9 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
   if (NTYPE(qn->target) == NT_CANY) {
     if (qn->greedy && infinite) {
       if (IS_NOT_NULL(qn->next_head_exact) && !CKN_ON)
-	return SIZE_OP_ANYCHAR_STAR_PEEK_NEXT + tlen * qn->lower + cklen;
+        return SIZE_OP_ANYCHAR_STAR_PEEK_NEXT + tlen * qn->lower + cklen;
       else
-	return SIZE_OP_ANYCHAR_STAR + tlen * qn->lower + cklen;
+        return SIZE_OP_ANYCHAR_STAR + tlen * qn->lower + cklen;
     }
   }
 
@@ -772,7 +790,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
   }
   else if (qn->upper == 0) {
-    if (qn->is_referred != 0) /* /(?<n>..){0}/ */
+    if (qn->is_refered != 0) /* /(?<n>..){0}/ */
       len = SIZE_OP_JUMP + tlen;
     else
       len = 0;
@@ -901,7 +919,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
   }
   else if (qn->upper == 0) {
-    if (qn->is_referred != 0) { /* /(?<n>..){0}/ */
+    if (qn->is_refered != 0) { /* /(?<n>..){0}/ */
       r = add_opcode_rel_addr(reg, OP_JUMP, tlen);
       if (r) return r;
       r = compile_tree(qn->target, reg);
@@ -971,9 +989,9 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
   if (NTYPE(qn->target) == NT_CANY) {
     if (qn->greedy && infinite) {
       if (IS_NOT_NULL(qn->next_head_exact))
-	return SIZE_OP_ANYCHAR_STAR_PEEK_NEXT + tlen * qn->lower;
+        return SIZE_OP_ANYCHAR_STAR_PEEK_NEXT + tlen * qn->lower;
       else
-	return SIZE_OP_ANYCHAR_STAR + tlen * qn->lower;
+        return SIZE_OP_ANYCHAR_STAR + tlen * qn->lower;
     }
   }
 
@@ -992,12 +1010,9 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
 
     if (qn->greedy) {
-#ifdef USE_OP_PUSH_OR_JUMP_EXACT
       if (IS_NOT_NULL(qn->head_exact))
 	len += SIZE_OP_PUSH_OR_JUMP_EXACT1 + mod_tlen + SIZE_OP_JUMP;
-      else
-#endif
-      if (IS_NOT_NULL(qn->next_head_exact))
+      else if (IS_NOT_NULL(qn->next_head_exact))
 	len += SIZE_OP_PUSH_IF_PEEK_NEXT + mod_tlen + SIZE_OP_JUMP;
       else
 	len += SIZE_OP_PUSH + mod_tlen + SIZE_OP_JUMP;
@@ -1005,7 +1020,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
     else
       len += SIZE_OP_JUMP + mod_tlen + SIZE_OP_PUSH;
   }
-  else if (qn->upper == 0 && qn->is_referred != 0) { /* /(?<n>..){0}/ */
+  else if (qn->upper == 0 && qn->is_refered != 0) { /* /(?<n>..){0}/ */
     len = SIZE_OP_JUMP + tlen;
   }
   else if (!infinite && qn->greedy &&
@@ -1063,12 +1078,9 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
       (qn->lower <= 1 || tlen * qn->lower <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {
     if (qn->lower == 1 && tlen > QUANTIFIER_EXPAND_LIMIT_SIZE) {
       if (qn->greedy) {
-#ifdef USE_OP_PUSH_OR_JUMP_EXACT
 	if (IS_NOT_NULL(qn->head_exact))
 	  r = add_opcode_rel_addr(reg, OP_JUMP, SIZE_OP_PUSH_OR_JUMP_EXACT1);
-	else
-#endif
-	if (IS_NOT_NULL(qn->next_head_exact))
+	else if (IS_NOT_NULL(qn->next_head_exact))
 	  r = add_opcode_rel_addr(reg, OP_JUMP, SIZE_OP_PUSH_IF_PEEK_NEXT);
 	else
 	  r = add_opcode_rel_addr(reg, OP_JUMP, SIZE_OP_PUSH);
@@ -1084,7 +1096,6 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
 
     if (qn->greedy) {
-#ifdef USE_OP_PUSH_OR_JUMP_EXACT
       if (IS_NOT_NULL(qn->head_exact)) {
 	r = add_opcode_rel_addr(reg, OP_PUSH_OR_JUMP_EXACT1,
 			     mod_tlen + SIZE_OP_JUMP);
@@ -1095,9 +1106,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
 	r = add_opcode_rel_addr(reg, OP_JUMP,
 	-(mod_tlen + (int )SIZE_OP_JUMP + (int )SIZE_OP_PUSH_OR_JUMP_EXACT1));
       }
-      else
-#endif
-      if (IS_NOT_NULL(qn->next_head_exact)) {
+      else if (IS_NOT_NULL(qn->next_head_exact)) {
 	r = add_opcode_rel_addr(reg, OP_PUSH_IF_PEEK_NEXT,
 				mod_tlen + SIZE_OP_JUMP);
 	if (r) return r;
@@ -1124,7 +1133,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
       r = add_opcode_rel_addr(reg, OP_PUSH, -(mod_tlen + (int )SIZE_OP_PUSH));
     }
   }
-  else if (qn->upper == 0 && qn->is_referred != 0) { /* /(?<n>..){0}/ */
+  else if (qn->upper == 0 && qn->is_refered != 0) { /* /(?<n>..){0}/ */
     r = add_opcode_rel_addr(reg, OP_JUMP, tlen);
     if (r) return r;
     r = compile_tree(qn->target, reg);
@@ -1234,11 +1243,6 @@ compile_length_enclose_node(EncloseNode* node, regex_t* reg)
 	len += (IS_ENCLOSE_RECURSION(node)
 		? SIZE_OP_MEMORY_END_REC : SIZE_OP_MEMORY_END);
     }
-    else if (IS_ENCLOSE_RECURSION(node)) {
-      len = SIZE_OP_MEMORY_START_PUSH;
-      len += tlen + (BIT_STATUS_AT(reg->bt_mem_end, node->regnum)
-		     ? SIZE_OP_MEMORY_END_PUSH_REC : SIZE_OP_MEMORY_END_REC);
-    }
     else
 #endif
     {
@@ -1286,10 +1290,6 @@ compile_length_enclose_node(EncloseNode* node, regex_t* reg)
     }
     break;
 
-  case ENCLOSE_ABSENT:
-    len = SIZE_OP_PUSH_ABSENT_POS + SIZE_OP_ABSENT + tlen + SIZE_OP_ABSENT_END;
-    break;
-
   default:
     return ONIGERR_TYPE_BUG;
     break;
@@ -1354,14 +1354,6 @@ compile_enclose_node(EncloseNode* node, regex_t* reg)
       if (r) return r;
       r = add_opcode(reg, OP_RETURN);
     }
-    else if (IS_ENCLOSE_RECURSION(node)) {
-      if (BIT_STATUS_AT(reg->bt_mem_end, node->regnum))
-	r = add_opcode(reg, OP_MEMORY_END_PUSH_REC);
-      else
-	r = add_opcode(reg, OP_MEMORY_END_REC);
-      if (r) return r;
-      r = add_mem_num(reg, node->regnum);
-    }
     else
 #endif
     {
@@ -1434,19 +1426,6 @@ compile_enclose_node(EncloseNode* node, regex_t* reg)
     }
     break;
 
-  case ENCLOSE_ABSENT:
-    len = compile_length_tree(node->target, reg);
-    if (len < 0) return len;
-
-    r = add_opcode(reg, OP_PUSH_ABSENT_POS);
-    if (r) return r;
-    r = add_opcode_rel_addr(reg, OP_ABSENT, len + SIZE_OP_ABSENT_END);
-    if (r) return r;
-    r = compile_tree(node->target, reg);
-    if (r) return r;
-    r = add_opcode(reg, OP_ABSENT_END);
-    break;
-
   default:
     return ONIGERR_TYPE_BUG;
     break;
@@ -1501,6 +1480,9 @@ compile_anchor_node(AnchorNode* node, regex_t* reg)
   case ANCHOR_SEMI_END_BUF:   r = add_opcode(reg, OP_SEMI_END_BUF);   break;
   case ANCHOR_BEGIN_POSITION: r = add_opcode(reg, OP_BEGIN_POSITION); break;
 
+  /* used for implicit anchor optimization: /.*a/ ==> /(?:^|\G).*a/ */
+  case ANCHOR_ANYCHAR_STAR:   r = add_opcode(reg, OP_BEGIN_POS_OR_LINE); break;
+
   case ANCHOR_WORD_BOUND:
     if (node->ascii_range)    r = add_opcode(reg, OP_ASCII_WORD_BOUND);
     else                      r = add_opcode(reg, OP_WORD_BOUND);
@@ -1607,10 +1589,10 @@ compile_length_tree(Node* node, regex_t* reg)
       int n = 0;
       len = 0;
       do {
-	r = compile_length_tree(NCAR(node), reg);
-	if (r < 0) return r;
-	len += r;
-	n++;
+        r = compile_length_tree(NCAR(node), reg);
+        if (r < 0) return r;
+        len += r;
+        n++;
       } while (IS_NOT_NULL(node = NCDR(node)));
       r = len;
       r += (SIZE_OP_PUSH + SIZE_OP_JUMP) * (n - 1);
@@ -1639,7 +1621,7 @@ compile_length_tree(Node* node, regex_t* reg)
 
 #ifdef USE_BACKREF_WITH_LEVEL
       if (IS_BACKREF_NEST_LEVEL(br)) {
-	r = SIZE_OPCODE + SIZE_OPTION + SIZE_LENGTH +
+        r = SIZE_OPCODE + SIZE_OPTION + SIZE_LENGTH +
             SIZE_LENGTH + (SIZE_MEMNUM * br->back_num);
       }
       else
@@ -1803,12 +1785,12 @@ compile_tree(Node* node, regex_t* reg)
 	int i;
 	int* p;
 
-	if (IS_IGNORECASE(reg->options)) {
-	  r = add_opcode(reg, OP_BACKREF_MULTI_IC);
-	}
-	else {
-	  r = add_opcode(reg, OP_BACKREF_MULTI);
-	}
+        if (IS_IGNORECASE(reg->options)) {
+          r = add_opcode(reg, OP_BACKREF_MULTI_IC);
+        }
+        else {
+          r = add_opcode(reg, OP_BACKREF_MULTI);
+        }
 	if (r) return r;
 
 #ifdef USE_BACKREF_WITH_LEVEL
@@ -1902,8 +1884,17 @@ noname_disable_map(Node** plink, GroupNumRemap* map, int* counter)
     break;
 
   case NT_ANCHOR:
-    if (NANCHOR(node)->target)
-      r = noname_disable_map(&(NANCHOR(node)->target), map, counter);
+    {
+      AnchorNode* an = NANCHOR(node);
+      switch (an->type) {
+      case ANCHOR_PREC_READ:
+      case ANCHOR_PREC_READ_NOT:
+      case ANCHOR_LOOK_BEHIND:
+      case ANCHOR_LOOK_BEHIND_NOT:
+	r = noname_disable_map(&(an->target), map, counter);
+	break;
+      }
+    }
     break;
 
   default:
@@ -1960,7 +1951,7 @@ renumber_by_map(Node* node, GroupNumRemap* map)
     {
       EncloseNode* en = NENCLOSE(node);
       if (en->type == ENCLOSE_CONDITION)
-	en->regnum = map[en->regnum].new_val;
+        en->regnum = map[en->regnum].new_val;
       r = renumber_by_map(en->target, map);
     }
     break;
@@ -1970,8 +1961,17 @@ renumber_by_map(Node* node, GroupNumRemap* map)
     break;
 
   case NT_ANCHOR:
-    if (NANCHOR(node)->target)
-      r = renumber_by_map(NANCHOR(node)->target, map);
+    {
+      AnchorNode* an = NANCHOR(node);
+      switch (an->type) {
+      case ANCHOR_PREC_READ:
+      case ANCHOR_PREC_READ_NOT:
+      case ANCHOR_LOOK_BEHIND:
+      case ANCHOR_LOOK_BEHIND_NOT:
+	r = renumber_by_map(an->target, map);
+	break;
+      }
+    }
     break;
 
   default:
@@ -2005,11 +2005,6 @@ numbered_ref_check(Node* node)
       return ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED;
     break;
 
-  case NT_ANCHOR:
-    if (NANCHOR(node)->target)
-      r = numbered_ref_check(NANCHOR(node)->target);
-    break;
-
   default:
     break;
   }
@@ -2096,7 +2091,7 @@ quantifiers_memory_node_info(Node* node)
     }
     break;
 
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
   case NT_CALL:
     if (IS_CALL_RECURSION(NCALL(node))) {
       return NQ_TARGET_IS_EMPTY_REC; /* tiny version */
@@ -2104,7 +2099,7 @@ quantifiers_memory_node_info(Node* node)
     else
       r = quantifiers_memory_node_info(NCALL(node)->target);
     break;
-# endif
+#endif
 
   case NT_QTFR:
     {
@@ -2126,7 +2121,6 @@ quantifiers_memory_node_info(Node* node)
       case ENCLOSE_OPTION:
       case ENCLOSE_STOP_BACKTRACK:
       case ENCLOSE_CONDITION:
-      case ENCLOSE_ABSENT:
 	r = quantifiers_memory_node_info(en->target);
 	break;
       default:
@@ -2244,31 +2238,23 @@ get_min_match_length(Node* node, OnigDistance *min, ScanEnv* env)
       EncloseNode* en = NENCLOSE(node);
       switch (en->type) {
       case ENCLOSE_MEMORY:
-        if (IS_ENCLOSE_MIN_FIXED(en))
-          *min = en->min_len;
-        else {
-	  if (IS_ENCLOSE_MARK1(NENCLOSE(node)))
-	    *min = 0;  /* recursive */
-	  else {
-	    SET_ENCLOSE_STATUS(node, NST_MARK1);
-	    r = get_min_match_length(en->target, min, env);
-	    CLEAR_ENCLOSE_STATUS(node, NST_MARK1);
-	    if (r == 0) {
-	      en->min_len = *min;
-	      SET_ENCLOSE_STATUS(node, NST_MIN_FIXED);
-	    }
+#ifdef USE_SUBEXP_CALL
+	if (IS_ENCLOSE_MIN_FIXED(en))
+	  *min = en->min_len;
+	else {
+	  r = get_min_match_length(en->target, min, env);
+	  if (r == 0) {
+	    en->min_len = *min;
+	    SET_ENCLOSE_STATUS(node, NST_MIN_FIXED);
 	  }
-        }
-        break;
-
+	}
+	break;
+#endif
       case ENCLOSE_OPTION:
       case ENCLOSE_STOP_BACKTRACK:
       case ENCLOSE_CONDITION:
 	r = get_min_match_length(en->target, min, env);
 	break;
-
-      case ENCLOSE_ABSENT:
-	break;
       }
     }
     break;
@@ -2370,31 +2356,23 @@ get_max_match_length(Node* node, OnigDistance *max, ScanEnv* env)
       EncloseNode* en = NENCLOSE(node);
       switch (en->type) {
       case ENCLOSE_MEMORY:
+#ifdef USE_SUBEXP_CALL
 	if (IS_ENCLOSE_MAX_FIXED(en))
 	  *max = en->max_len;
 	else {
-	  if (IS_ENCLOSE_MARK1(NENCLOSE(node)))
-	    *max = ONIG_INFINITE_DISTANCE;
-	  else {
-	    SET_ENCLOSE_STATUS(node, NST_MARK1);
-	    r = get_max_match_length(en->target, max, env);
-	    CLEAR_ENCLOSE_STATUS(node, NST_MARK1);
-	    if (r == 0) {
-	      en->max_len = *max;
-	      SET_ENCLOSE_STATUS(node, NST_MAX_FIXED);
-	    }
+	  r = get_max_match_length(en->target, max, env);
+	  if (r == 0) {
+	    en->max_len = *max;
+	    SET_ENCLOSE_STATUS(node, NST_MAX_FIXED);
 	  }
 	}
 	break;
-
+#endif
       case ENCLOSE_OPTION:
       case ENCLOSE_STOP_BACKTRACK:
       case ENCLOSE_CONDITION:
 	r = get_max_match_length(en->target, max, env);
 	break;
-
-      case ENCLOSE_ABSENT:
-	break;
       }
     }
     break;
@@ -2518,7 +2496,6 @@ get_char_length_tree1(Node* node, regex_t* reg, int* len, int level)
       case ENCLOSE_CONDITION:
 	r = get_char_length_tree1(en->target, reg, len, level);
 	break;
-      case ENCLOSE_ABSENT:
       default:
 	break;
       }
@@ -2645,10 +2622,10 @@ is_not_included(Node* x, Node* y, regex_t* reg)
 	  for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
 	    v = BITSET_AT(xc->bs, i);
 	    if ((v != 0 && !IS_NCCLASS_NOT(xc)) ||
-		(v == 0 && IS_NCCLASS_NOT(xc))) {
+                (v == 0 && IS_NCCLASS_NOT(xc))) {
 	      v = BITSET_AT(yc->bs, i);
 	      if ((v != 0 && !IS_NCCLASS_NOT(yc)) ||
-		  (v == 0 && IS_NCCLASS_NOT(yc)))
+                  (v == 0 && IS_NCCLASS_NOT(yc)))
 		return 0;
 	    }
 	  }
@@ -2698,24 +2675,24 @@ is_not_included(Node* x, Node* y, regex_t* reg)
 	break;
 
       case NT_CCLASS:
-	{
-	  CClassNode* cc = NCCLASS(y);
+        {
+          CClassNode* cc = NCCLASS(y);
 
-	  code = ONIGENC_MBC_TO_CODE(reg->enc, xs->s,
-				     xs->s + ONIGENC_MBC_MAXLEN(reg->enc));
-	  return (onig_is_code_in_cc(reg->enc, code, cc) != 0 ? 0 : 1);
-	}
-	break;
+          code = ONIGENC_MBC_TO_CODE(reg->enc, xs->s,
+                                     xs->s + ONIGENC_MBC_MAXLEN(reg->enc));
+          return (onig_is_code_in_cc(reg->enc, code, cc) != 0 ? 0 : 1);
+        }
+        break;
 
       case NT_STR:
-	{
-	  UChar *q;
-	  StrNode* ys = NSTR(y);
-	  len = NSTRING_LEN(x);
-	  if (len > NSTRING_LEN(y)) len = NSTRING_LEN(y);
-	  if (NSTRING_IS_AMBIG(x) || NSTRING_IS_AMBIG(y)) {
-	    /* tiny version */
-	    return 0;
+        {
+          UChar *q;
+          StrNode* ys = NSTR(y);
+          len = NSTRING_LEN(x);
+          if (len > NSTRING_LEN(y)) len = NSTRING_LEN(y);
+          if (NSTRING_IS_AMBIG(x) || NSTRING_IS_AMBIG(y)) {
+            /* tiny version */
+            return 0;
 	  }
 	  else {
 	    for (i = 0, p = ys->s, q = xs->s; (OnigDistance )i < len; i++, p++, q++) {
@@ -2726,7 +2703,7 @@ is_not_included(Node* x, Node* y, regex_t* reg)
 	break;
 
       default:
-	break;
+        break;
       }
     }
     break;
@@ -2783,11 +2760,9 @@ get_head_value_node(Node* node, int exact, regex_t* reg)
     {
       QtfrNode* qn = NQTFR(node);
       if (qn->lower > 0) {
-#ifdef USE_OP_PUSH_OR_JUMP_EXACT
 	if (IS_NOT_NULL(qn->head_exact))
 	  n = qn->head_exact;
 	else
-#endif
 	  n = get_head_value_node(qn->target, exact, reg);
       }
     }
@@ -2812,9 +2787,6 @@ get_head_value_node(Node* node, int exact, regex_t* reg)
       case ENCLOSE_CONDITION:
 	n = get_head_value_node(en->target, exact, reg);
 	break;
-
-      case ENCLOSE_ABSENT:
-	break;
       }
     }
     break;
@@ -2882,8 +2854,8 @@ check_type_tree(Node* node, int type_mask, int enclose_mask, int anchor_mask)
 
 #ifdef USE_SUBEXP_CALL
 
-# define RECURSION_EXIST       1
-# define RECURSION_INFINITE    2
+#define RECURSION_EXIST       1
+#define RECURSION_INFINITE    2
 
 static int
 subexp_inf_recursive_check(Node* node, ScanEnv* env, int head)
@@ -3083,7 +3055,7 @@ subexp_recursive_check(Node* node)
 static int
 subexp_recursive_check_trav(Node* node, ScanEnv* env)
 {
-# define FOUND_CALLED_NODE    1
+#define FOUND_CALLED_NODE    1
 
   int type;
   int r = 0;
@@ -3106,7 +3078,7 @@ subexp_recursive_check_trav(Node* node, ScanEnv* env)
     r = subexp_recursive_check_trav(NQTFR(node)->target, env);
     if (NQTFR(node)->upper == 0) {
       if (r == FOUND_CALLED_NODE)
-	NQTFR(node)->is_referred = 1;
+	NQTFR(node)->is_refered = 1;
     }
     break;
 
@@ -3184,22 +3156,22 @@ setup_subexp_call(Node* node, ScanEnv* env)
       if (cn->group_num != 0) {
 	int gnum = cn->group_num;
 
-# ifdef USE_NAMED_GROUP
+#ifdef USE_NAMED_GROUP
 	if (env->num_named > 0 &&
 	    IS_SYNTAX_BV(env->syntax, ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP) &&
 	    !ONIG_IS_OPTION_ON(env->option, ONIG_OPTION_CAPTURE_GROUP)) {
 	  return ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED;
 	}
-# endif
+#endif
 	if (gnum > env->num_mem) {
 	  onig_scan_env_set_error_string(env,
 		 ONIGERR_UNDEFINED_GROUP_REFERENCE, cn->name, cn->name_end);
 	  return ONIGERR_UNDEFINED_GROUP_REFERENCE;
 	}
 
-# ifdef USE_NAMED_GROUP
+#ifdef USE_NAMED_GROUP
       set_call_attr:
-# endif
+#endif
 	cn->target = nodes[cn->group_num];
 	if (IS_NULL(cn->target)) {
 	  onig_scan_env_set_error_string(env,
@@ -3210,12 +3182,12 @@ setup_subexp_call(Node* node, ScanEnv* env)
 	BIT_STATUS_ON_AT(env->bt_mem_start, cn->group_num);
 	cn->unset_addr_list = env->unset_addr_list;
       }
-# ifdef USE_NAMED_GROUP
-#  ifdef USE_PERL_SUBEXP_CALL
+#ifdef USE_NAMED_GROUP
+#ifdef USE_PERL_SUBEXP_CALL
       else if (cn->name == cn->name_end) {
 	goto set_call_attr;
       }
-#  endif
+#endif
       else {
 	int *refs;
 
@@ -3237,7 +3209,7 @@ setup_subexp_call(Node* node, ScanEnv* env)
 	  goto set_call_attr;
 	}
       }
-# endif
+#endif
     }
     break;
 
@@ -3320,7 +3292,7 @@ setup_look_behind(Node* node, regex_t* reg, ScanEnv* env)
 }
 
 static int
-next_setup(Node* node, Node* next_node, regex_t* reg)
+next_setup(Node* node, Node* next_node, int in_root, regex_t* reg)
 {
   int type;
 
@@ -3354,10 +3326,32 @@ next_setup(Node* node, Node* next_node, regex_t* reg)
 	  }
 	}
       }
+
+#ifndef ONIG_DONT_OPTIMIZE
+      if (NTYPE(node) == NT_QTFR && /* the type may be changed by above block */
+	  in_root && /* qn->lower == 0 && */
+	  NTYPE(qn->target) == NT_CANY &&
+	  ! IS_MULTILINE(reg->options)) {
+	/* implicit anchor: /.*a/ ==> /(?:^|\G).*a/ */
+	Node *np;
+	np = onig_node_new_list(NULL_NODE, NULL_NODE);
+	CHECK_NULL_RETURN_MEMERR(np);
+	swap_node(node, np);
+	NCDR(node) = onig_node_new_list(np, NULL_NODE);
+	if (IS_NULL(NCDR(node))) {
+	  onig_node_free(np);
+	  return ONIGERR_MEMORY;
+	}
+	np = onig_node_new_anchor(ANCHOR_ANYCHAR_STAR);   /* (?:^|\G) */
+	CHECK_NULL_RETURN_MEMERR(np);
+	NCAR(node) = np;
+      }
+#endif
     }
   }
   else if (type == NT_ENCLOSE) {
     EncloseNode* en = NENCLOSE(node);
+    in_root = 0;
     if (en->type == ENCLOSE_MEMORY) {
       node = en->target;
       goto retry;
@@ -3404,9 +3398,13 @@ update_string_node_case_fold(regex_t* reg, Node *node)
   }
 
   r = onig_node_str_set(node, sbuf, sp);
+  if (r != 0) {
+    xfree(sbuf);
+    return r;
+  }
 
   xfree(sbuf);
-  return r;
+  return 0;
 }
 
 static int
@@ -3514,29 +3512,29 @@ expand_case_fold_string_alt(int item_num, OnigCaseFoldCodeItem items[],
       UChar *q = p + items[i].byte_len;
 
       if (q < end) {
-	r = expand_case_fold_make_rem_string(&rem, q, end, reg);
-	if (r != 0) {
-	  onig_node_free(an);
-	  goto mem_err2;
-	}
+        r = expand_case_fold_make_rem_string(&rem, q, end, reg);
+        if (r != 0) {
+          onig_node_free(an);
+          goto mem_err2;
+        }
 
-	xnode = onig_node_list_add(NULL_NODE, snode);
-	if (IS_NULL(xnode)) {
-	  onig_node_free(an);
-	  onig_node_free(rem);
-	  goto mem_err2;
-	}
-	if (IS_NULL(onig_node_list_add(xnode, rem))) {
-	  onig_node_free(an);
-	  onig_node_free(xnode);
-	  onig_node_free(rem);
-	  goto mem_err;
-	}
+        xnode = onig_node_list_add(NULL_NODE, snode);
+        if (IS_NULL(xnode)) {
+          onig_node_free(an);
+          onig_node_free(rem);
+          goto mem_err2;
+        }
+        if (IS_NULL(onig_node_list_add(xnode, rem))) {
+          onig_node_free(an);
+          onig_node_free(xnode);
+          onig_node_free(rem);
+          goto mem_err;
+        }
 
-	NCAR(an) = xnode;
+        NCAR(an) = xnode;
       }
       else {
-	NCAR(an) = snode;
+        NCAR(an) = snode;
       }
 
       NCDR(var_anode) = an;
@@ -3596,7 +3594,6 @@ expand_case_fold_string(Node* node, regex_t* reg)
     if (n == 0 || varlen == 0) {
       if (IS_NULL(snode)) {
 	if (IS_NULL(root) && IS_NOT_NULL(prev_node)) {
-          onig_node_free(top_root);
 	  top_root = root = onig_node_list_add(NULL_NODE, prev_node);
 	  if (IS_NULL(root)) {
 	    onig_node_free(prev_node);
@@ -3628,7 +3625,6 @@ expand_case_fold_string(Node* node, regex_t* reg)
 	}
       }
       if (IS_NULL(root) && IS_NOT_NULL(prev_node)) {
-        onig_node_free(top_root);
 	top_root = root = onig_node_list_add(NULL_NODE, prev_node);
 	if (IS_NULL(root)) {
 	  onig_node_free(prev_node);
@@ -3679,7 +3675,6 @@ expand_case_fold_string(Node* node, regex_t* reg)
     if (r != 0) goto mem_err;
 
     if (IS_NOT_NULL(prev_node) && IS_NULL(root)) {
-      onig_node_free(top_root);
       top_root = root = onig_node_list_add(NULL_NODE, prev_node);
       if (IS_NULL(root)) {
 	onig_node_free(srem);
@@ -3716,12 +3711,12 @@ expand_case_fold_string(Node* node, regex_t* reg)
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
 
-# define CEC_THRES_NUM_BIG_REPEAT         512
-# define CEC_INFINITE_NUM          0x7fffffff
+#define CEC_THRES_NUM_BIG_REPEAT         512
+#define CEC_INFINITE_NUM          0x7fffffff
 
-# define CEC_IN_INFINITE_REPEAT    (1<<0)
-# define CEC_IN_FINITE_REPEAT      (1<<1)
-# define CEC_CONT_BIG_REPEAT       (1<<2)
+#define CEC_IN_INFINITE_REPEAT    (1<<0)
+#define CEC_IN_FINITE_REPEAT      (1<<1)
+#define CEC_CONT_BIG_REPEAT       (1<<2)
 
 static int
 setup_comb_exp_check(Node* node, int state, ScanEnv* env)
@@ -3837,14 +3832,14 @@ setup_comb_exp_check(Node* node, int state, ScanEnv* env)
     }
     break;
 
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
   case NT_CALL:
     if (IS_CALL_RECURSION(NCALL(node)))
       env->has_recursion = 1;
     else
       r = setup_comb_exp_check(NCALL(node)->target, state, env);
     break;
-# endif
+#endif
 
   default:
     break;
@@ -3858,8 +3853,7 @@ setup_comb_exp_check(Node* node, int state, ScanEnv* env)
 #define IN_NOT        (1<<1)
 #define IN_REPEAT     (1<<2)
 #define IN_VAR_REPEAT (1<<3)
-#define IN_CALL       (1<<4)
-#define IN_RECCALL    (1<<5)
+#define IN_ROOT       (1<<4)
 
 /* setup_tree does the following work.
  1. check empty loop. (set qn->target_empty_info)
@@ -3874,19 +3868,25 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
 {
   int type;
   int r = 0;
+  int in_root = state & IN_ROOT;
 
+  state &= ~IN_ROOT;
 restart:
   type = NTYPE(node);
   switch (type) {
   case NT_LIST:
     {
       Node* prev = NULL_NODE;
+      int prev_in_root = 0;
+      state |= in_root;
       do {
 	r = setup_tree(NCAR(node), reg, state, env);
 	if (IS_NOT_NULL(prev) && r == 0) {
-	  r = next_setup(prev, NCAR(node), reg);
+	  r = next_setup(prev, NCAR(node), prev_in_root, reg);
 	}
 	prev = NCAR(node);
+	prev_in_root = state & IN_ROOT;
+	state &= ~IN_ROOT;
       } while (r == 0 && IS_NOT_NULL(node = NCDR(node)));
     }
     break;
@@ -3943,7 +3943,7 @@ restart:
       Node* target = qn->target;
 
       if ((state & IN_REPEAT) != 0) {
-	qn->state |= NST_IN_REPEAT;
+        qn->state |= NST_IN_REPEAT;
       }
 
       if (IS_REPEAT_INFINITE(qn->upper) || qn->upper >= 1) {
@@ -4050,6 +4050,7 @@ restart:
       case ENCLOSE_OPTION:
 	{
 	  OnigOptionType options = reg->options;
+	  state |= in_root;
 	  reg->options = NENCLOSE(node)->option;
 	  r = setup_tree(NENCLOSE(node)->target, reg, state, env);
 	  reg->options = options;
@@ -4057,18 +4058,12 @@ restart:
 	break;
 
       case ENCLOSE_MEMORY:
-	if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT | IN_CALL)) != 0) {
+	if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT)) != 0) {
 	  BIT_STATUS_ON_AT(env->bt_mem_start, en->regnum);
 	  /* SET_ENCLOSE_STATUS(node, NST_MEM_IN_ALT_NOT); */
 	}
-	if (IS_ENCLOSE_CALLED(en))
-	  state |= IN_CALL;
-	if (IS_ENCLOSE_RECURSION(en))
-	  state |= IN_RECCALL;
-	else if ((state & IN_RECCALL) != 0)
-	  SET_CALL_RECURSION(node);
-	r = setup_tree(en->target, reg, state, env);
-	break;
+        r = setup_tree(en->target, reg, state, env);
+        break;
 
       case ENCLOSE_STOP_BACKTRACK:
 	{
@@ -4095,12 +4090,6 @@ restart:
 	  return ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED;
 	}
 #endif
-	if (NENCLOSE(node)->regnum > env->num_mem)
-	  return ONIGERR_INVALID_BACKREF;
-	r = setup_tree(NENCLOSE(node)->target, reg, state, env);
-	break;
-
-      case ENCLOSE_ABSENT:
 	r = setup_tree(NENCLOSE(node)->target, reg, state, env);
 	break;
       }
@@ -4144,10 +4133,10 @@ restart:
 			      ALLOWED_ENCLOSE_IN_LB, ALLOWED_ANCHOR_IN_LB);
 	  if (r < 0) return r;
 	  if (r > 0) return ONIGERR_INVALID_LOOK_BEHIND_PATTERN;
+	  r = setup_look_behind(node, reg, env);
+	  if (r != 0) return r;
 	  if (NTYPE(node) != NT_ANCHOR) goto restart;
 	  r = setup_tree(an->target, reg, state, env);
-	  if (r != 0) return r;
-	  r = setup_look_behind(node, reg, env);
 	}
 	break;
 
@@ -4157,10 +4146,10 @@ restart:
 		      ALLOWED_ENCLOSE_IN_LB_NOT, ALLOWED_ANCHOR_IN_LB_NOT);
 	  if (r < 0) return r;
 	  if (r > 0) return ONIGERR_INVALID_LOOK_BEHIND_PATTERN;
+	  r = setup_look_behind(node, reg, env);
+	  if (r != 0) return r;
 	  if (NTYPE(node) != NT_ANCHOR) goto restart;
 	  r = setup_tree(an->target, reg, (state | IN_NOT), env);
-	  if (r != 0) return r;
-	  r = setup_look_behind(node, reg, env);
 	}
 	break;
       }
@@ -4197,8 +4186,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
 					       p, end, items);
       clen = enclen(enc, p, end);
-      if (p + clen > end)
-	clen = (int )(end - p);
 
       for (j = 0; j < n; j++) {
 	if ((items[j].code_len != 1) || (items[j].byte_len != clen))
@@ -4216,10 +4203,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
     }
   }
   else {
-# if OPT_EXACT_MAXLEN < ONIG_CHAR_TABLE_SIZE
-    /* This should not happen. */
-    return ONIGERR_TYPE_BUG;
-# else
     if (IS_NULL(*int_skip)) {
       *int_skip = (int* )xmalloc(sizeof(int) * ONIG_CHAR_TABLE_SIZE);
       if (IS_NULL(*int_skip)) return ONIGERR_MEMORY;
@@ -4233,8 +4216,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
 					       p, end, items);
       clen = enclen(enc, p, end);
-      if (p + clen > end)
-	clen = (int )(end - p);
 
       for (j = 0; j < n; j++) {
 	if ((items[j].code_len != 1) || (items[j].byte_len != clen))
@@ -4250,7 +4231,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	}
       }
     }
-# endif
   }
   return 0;
 }
@@ -4279,8 +4259,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
 					       p, end, items);
       clen = enclen(enc, p, end);
-      if (p + clen > end)
-	clen = (int )(end - p);
 
       for (j = 0; j < n; j++) {
 	if ((items[j].code_len != 1) || (items[j].byte_len != clen))
@@ -4298,10 +4276,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
     }
   }
   else {
-# if OPT_EXACT_MAXLEN < ONIG_CHAR_TABLE_SIZE
-    /* This should not happen. */
-    return ONIGERR_TYPE_BUG;
-# else
     if (IS_NULL(*int_skip)) {
       *int_skip = (int* )xmalloc(sizeof(int) * ONIG_CHAR_TABLE_SIZE);
       if (IS_NULL(*int_skip)) return ONIGERR_MEMORY;
@@ -4315,8 +4289,6 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
 					       p, end, items);
       clen = enclen(enc, p, end);
-      if (p + clen > end)
-	clen = (int )(end - p);
 
       for (j = 0; j < n; j++) {
 	if ((items[j].code_len != 1) || (items[j].byte_len != clen))
@@ -4332,12 +4304,13 @@ set_bm_skip(UChar* s, UChar* end, regex_t* reg,
 	}
       }
     }
-# endif
   }
   return 0;
 }
 #endif /* USE_SUNDAY_QUICK_SEARCH */
 
+#define OPT_EXACT_MAXLEN   24
+
 typedef struct {
   OnigDistance min;  /* min byte length */
   OnigDistance max;  /* max byte length */
@@ -5007,14 +4980,14 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
 	if (slen > 0) {
 	  add_char_opt_map_info(&opt->map, *(sn->s), env->enc);
 	}
-	set_mml(&opt->len, slen, slen);
+        set_mml(&opt->len, slen, slen);
       }
       else {
-	OnigDistance max;
+        OnigDistance max;
 
 	if (NSTRING_IS_DONT_GET_OPT_INFO(node)) {
-	  int n = onigenc_strlen(env->enc, sn->s, sn->end);
-	  max = ONIGENC_MBC_MAXLEN_DIST(env->enc) * n;
+          int n = onigenc_strlen(env->enc, sn->s, sn->end);
+          max = ONIGENC_MBC_MAXLEN_DIST(env->enc) * n;
 	}
 	else {
 	  concat_opt_exact_info_str(&opt->exb, sn->s, sn->end,
@@ -5030,7 +5003,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
 	  max = slen;
 	}
 
-	set_mml(&opt->len, slen, max);
+        set_mml(&opt->len, slen, max);
       }
 
       if ((OnigDistance )opt->exb.len == slen)
@@ -5046,18 +5019,18 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
       /* no need to check ignore case. (set in setup_tree()) */
 
       if (IS_NOT_NULL(cc->mbuf) || IS_NCCLASS_NOT(cc)) {
-	OnigDistance min = ONIGENC_MBC_MINLEN(env->enc);
+        OnigDistance min = ONIGENC_MBC_MINLEN(env->enc);
 	OnigDistance max = ONIGENC_MBC_MAXLEN_DIST(env->enc);
 
 	set_mml(&opt->len, min, max);
       }
       else {
-	for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
-	  z = BITSET_AT(cc->bs, i);
-	  if ((z && !IS_NCCLASS_NOT(cc)) || (!z && IS_NCCLASS_NOT(cc))) {
-	    add_char_opt_map_info(&opt->map, (UChar )i, env->enc);
-	  }
-	}
+        for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
+          z = BITSET_AT(cc->bs, i);
+          if ((z && !IS_NCCLASS_NOT(cc)) || (!z && IS_NCCLASS_NOT(cc))) {
+            add_char_opt_map_info(&opt->map, (UChar )i, env->enc);
+          }
+        }
 	set_mml(&opt->len, 1, 1);
       }
     }
@@ -5071,7 +5044,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
       max = ONIGENC_MBC_MAXLEN_DIST(env->enc);
 
       if (max == 1) {
-	min = 1;
+        min = 1;
 
 	maxcode = NCTYPE(node)->ascii_range ? 0x80 : SINGLE_BYTE_SIZE;
 	switch (NCTYPE(node)->ctype) {
@@ -5094,7 +5067,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
 	}
       }
       else {
-	min = ONIGENC_MBC_MINLEN(env->enc);
+        min = ONIGENC_MBC_MINLEN(env->enc);
       }
       set_mml(&opt->len, min, max);
     }
@@ -5213,7 +5186,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
 	  if (nopt.exb.len > 0) {
 	    if (nopt.exb.reach_end) {
 	      for (i = 2; i <= qn->lower &&
-			  ! is_full_opt_exact_info(&opt->exb); i++) {
+		          ! is_full_opt_exact_info(&opt->exb); i++) {
 		concat_opt_exact_info(&opt->exb, &nopt.exb, env->enc);
 	      }
 	      if (i < qn->lower) {
@@ -5284,10 +5257,6 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
       case ENCLOSE_CONDITION:
 	r = optimize_node_left(en->target, opt, env);
 	break;
-
-      case ENCLOSE_ABSENT:
-	set_mml(&opt->len, 0, ONIG_INFINITE_DISTANCE);
-	break;
       }
     }
     break;
@@ -5339,14 +5308,11 @@ set_optimize_exact_info(regex_t* reg, OptExactInfo* e)
   else {
     if (e->len >= 3 || (e->len >= 2 && allow_reverse)) {
       r = set_bm_skip(reg->exact, reg->exact_end, reg,
-		      reg->map, &(reg->int_map), 0);
-      if (r == 0) {
-	reg->optimize = (allow_reverse != 0
+	              reg->map, &(reg->int_map), 0);
+      if (r) return r;
+
+      reg->optimize = (allow_reverse != 0
 		       ? ONIG_OPTIMIZE_EXACT_BM : ONIG_OPTIMIZE_EXACT_BM_NOT_REV);
-      }
-      else {
-	reg->optimize = ONIG_OPTIMIZE_EXACT;
-      }
     }
     else {
       reg->optimize = ONIG_OPTIMIZE_EXACT;
@@ -5412,9 +5378,6 @@ set_optimize_info_from_tree(Node* node, regex_t* reg, ScanEnv* scan_env)
         ANCHOR_BEGIN_POSITION | ANCHOR_ANYCHAR_STAR | ANCHOR_ANYCHAR_STAR_ML |
         ANCHOR_LOOK_BEHIND);
 
-  if ((opt.anc.left_anchor & (ANCHOR_LOOK_BEHIND | ANCHOR_PREC_READ_NOT)) != 0)
-    reg->anchor &= ~ANCHOR_ANYCHAR_STAR_ML;
-
   reg->anchor |= opt.anc.right_anchor & (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF |
 	ANCHOR_PREC_READ_NOT);
 
@@ -5607,14 +5570,14 @@ print_optimize_info(FILE* f, regex_t* reg)
       fputc('[', f);
       for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) {
 	if (reg->map[i] != 0) {
-	  if (c > 0)  fputs(", ", f);
-	  c++;
-	  if (ONIGENC_MBC_MAXLEN(reg->enc) == 1 &&
-	      ONIGENC_IS_CODE_PRINT(reg->enc, (OnigCodePoint )i))
-	    fputc(i, f);
-	  else
-	    fprintf(f, "%d", i);
-	}
+          if (c > 0)  fputs(", ", f);
+          c++;
+          if (ONIGENC_MBC_MAXLEN(reg->enc) == 1 &&
+              ONIGENC_IS_CODE_PRINT(reg->enc, (OnigCodePoint )i))
+            fputc(i, f);
+          else
+            fprintf(f, "%d", i);
+        }
       }
       fprintf(f, "]\n");
     }
@@ -5649,7 +5612,6 @@ onig_free(regex_t* reg)
   }
 }
 
-#ifdef RUBY
 size_t
 onig_memsize(const regex_t *reg)
 {
@@ -5673,47 +5635,65 @@ onig_region_memsize(const OnigRegion *regs)
     size += regs->allocated * (sizeof(*regs->beg) + sizeof(*regs->end));
     return size;
 }
-#endif
 
 #define REGEX_TRANSFER(to,from) do {\
+  (to)->state = ONIG_STATE_MODIFY;\
   onig_free_body(to);\
   xmemcpy(to, from, sizeof(regex_t));\
   xfree(from);\
 } while (0)
 
-#if 0
 extern void
 onig_transfer(regex_t* to, regex_t* from)
 {
+  THREAD_ATOMIC_START;
   REGEX_TRANSFER(to, from);
+  THREAD_ATOMIC_END;
+}
+
+#define REGEX_CHAIN_HEAD(reg) do {\
+  while (IS_NOT_NULL((reg)->chain)) {\
+    (reg) = (reg)->chain;\
+  }\
+} while (0)
+
+extern void
+onig_chain_link_add(regex_t* to, regex_t* add)
+{
+  THREAD_ATOMIC_START;
+  REGEX_CHAIN_HEAD(to);
+  to->chain = add;
+  THREAD_ATOMIC_END;
+}
+
+extern void
+onig_chain_reduce(regex_t* reg)
+{
+  regex_t *head, *prev;
+
+  prev = reg;
+  head = prev->chain;
+  if (IS_NOT_NULL(head)) {
+    reg->state = ONIG_STATE_MODIFY;
+    while (IS_NOT_NULL(head->chain)) {
+      prev = head;
+      head = head->chain;
+    }
+    prev->chain = (regex_t* )NULL;
+    REGEX_TRANSFER(reg, head);
+  }
 }
-#endif
 
 #ifdef ONIG_DEBUG_COMPILE
-static void print_compiled_byte_code_list(FILE* f, regex_t* reg);
+static void print_compiled_byte_code_list P_((FILE* f, regex_t* reg));
 #endif
 #ifdef ONIG_DEBUG_PARSE_TREE
-static void print_tree(FILE* f, Node* node);
+static void print_tree P_((FILE* f, Node* node));
 #endif
 
-#ifdef RUBY
 extern int
 onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
-	     OnigErrorInfo* einfo)
-{
-  return onig_compile_ruby(reg, pattern, pattern_end, einfo, NULL, 0);
-}
-#endif
-
-#ifdef RUBY
-extern int
-onig_compile_ruby(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
 	      OnigErrorInfo* einfo, const char *sourcefile, int sourceline)
-#else
-extern int
-onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
-	     OnigErrorInfo* einfo)
-#endif
 {
 #define COMPILE_INIT_SIZE  20
 
@@ -5727,10 +5707,9 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
 
   if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL;
 
-#ifdef RUBY
   scan_env.sourcefile = sourcefile;
   scan_env.sourceline = sourceline;
-#endif
+  reg->state = ONIG_STATE_COMPILING;
 
 #ifdef ONIG_DEBUG
   print_enc_string(stderr, reg->enc, pattern, pattern_end);
@@ -5796,7 +5775,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
     reg->num_call = 0;
 #endif
 
-  r = setup_tree(root, reg, 0, &scan_env);
+  r = setup_tree(root, reg, IN_ROOT, &scan_env);
   if (r != 0) goto err_unset;
 
 #ifdef ONIG_DEBUG_PARSE_TREE
@@ -5815,17 +5794,17 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
   if (scan_env.backrefed_mem == 0
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
       || scan_env.num_call == 0
-# endif
+#endif
       ) {
     setup_comb_exp_check(root, 0, &scan_env);
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
     if (scan_env.has_recursion != 0) {
       scan_env.num_comb_exp_check = 0;
     }
     else
-# endif
+#endif
     if (scan_env.comb_exp_max_regnum > 0) {
       int i;
       for (i = 1; i <= scan_env.comb_exp_max_regnum; i++) {
@@ -5879,13 +5858,14 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
   onig_node_free(root);
 
 #ifdef ONIG_DEBUG_COMPILE
-# ifdef USE_NAMED_GROUP
+#ifdef USE_NAMED_GROUP
   onig_print_names(stderr, reg);
-# endif
+#endif
   print_compiled_byte_code_list(stderr, reg);
 #endif
 
  end:
+  reg->state = ONIG_STATE_NORMAL;
   return r;
 
  err_unset:
@@ -5909,6 +5889,27 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
   return r;
 }
 
+#ifdef USE_RECOMPILE_API
+extern int
+onig_recompile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
+	    OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax,
+	    OnigErrorInfo* einfo)
+{
+  int r;
+  regex_t *new_reg;
+
+  r = onig_new(&new_reg, pattern, pattern_end, option, enc, syntax, einfo);
+  if (r) return r;
+  if (ONIG_STATE(reg) == ONIG_STATE_NORMAL) {
+    onig_transfer(reg, new_reg);
+  }
+  else {
+    onig_chain_link_add(reg, new_reg);
+  }
+  return 0;
+}
+#endif
+
 static int onig_inited = 0;
 
 extern int
@@ -5930,6 +5931,8 @@ onig_reg_init(regex_t* reg, OnigOptionType option,
     return ONIGERR_INVALID_COMBINATION_OF_OPTIONS;
   }
 
+  (reg)->state = ONIG_STATE_MODIFY;
+
   if ((option & ONIG_OPTION_NEGATE_SINGLELINE) != 0) {
     option |= syntax->options;
     option &= ~ONIG_OPTION_SINGLELINE;
@@ -5958,14 +5961,14 @@ onig_reg_init(regex_t* reg, OnigOptionType option,
 extern int
 onig_new_without_alloc(regex_t* reg, const UChar* pattern,
           const UChar* pattern_end, OnigOptionType option, OnigEncoding enc,
-          const OnigSyntaxType* syntax, OnigErrorInfo* einfo)
+          OnigSyntaxType* syntax, OnigErrorInfo* einfo)
 {
   int r;
 
   r = onig_reg_init(reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
   if (r) return r;
 
-  r = onig_compile(reg, pattern, pattern_end, einfo);
+  r = onig_compile(reg, pattern, pattern_end, einfo, NULL, 0);
   return r;
 }
 
@@ -5982,7 +5985,7 @@ onig_new(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
   r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
   if (r) goto err;
 
-  r = onig_compile(*reg, pattern, pattern_end, einfo);
+  r = onig_compile(*reg, pattern, pattern_end, einfo, NULL, 0);
   if (r) {
   err:
     onig_free(*reg);
@@ -5991,11 +5994,6 @@ onig_new(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
   return r;
 }
 
-extern int
-onig_initialize(OnigEncoding encodings[] ARG_UNUSED, int n ARG_UNUSED)
-{
-  return onig_init();
-}
 
 extern int
 onig_init(void)
@@ -6003,11 +6001,10 @@ onig_init(void)
   if (onig_inited != 0)
     return 0;
 
-  onig_inited = 1;
+  THREAD_SYSTEM_INIT;
+  THREAD_ATOMIC_START;
 
-#if defined(ONIG_DEBUG_MEMLEAK) && defined(_MSC_VER)
-  _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-#endif
+  onig_inited = 1;
 
   onigenc_init();
   /* onigenc_set_default_caseconv_table((UChar* )0); */
@@ -6016,6 +6013,7 @@ onig_init(void)
   onig_statistics_init();
 #endif
 
+  THREAD_ATOMIC_END;
   return 0;
 }
 
@@ -6054,18 +6052,26 @@ exec_end_call_list(void)
 extern int
 onig_end(void)
 {
+  THREAD_ATOMIC_START;
+
   exec_end_call_list();
 
 #ifdef ONIG_DEBUG_STATISTICS
   onig_print_statistics(stderr);
 #endif
 
-#if defined(ONIG_DEBUG_MEMLEAK) && defined(_MSC_VER)
-  _CrtDumpMemoryLeaks();
+#ifdef USE_SHARED_CCLASS_TABLE
+  onig_free_shared_cclass_table();
+#endif
+
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+  onig_free_node_list();
 #endif
 
   onig_inited = 0;
 
+  THREAD_ATOMIC_END;
+  THREAD_SYSTEM_END;
   return 0;
 }
 
@@ -6131,14 +6137,14 @@ onig_is_code_in_cc(OnigEncoding enc, OnigCodePoint code, CClassNode* cc)
 #ifdef ONIG_DEBUG
 
 /* arguments type */
-# define ARG_SPECIAL     -1
-# define ARG_NON          0
-# define ARG_RELADDR      1
-# define ARG_ABSADDR      2
-# define ARG_LENGTH       3
-# define ARG_MEMNUM       4
-# define ARG_OPTION       5
-# define ARG_STATE_CHECK  6
+#define ARG_SPECIAL     -1
+#define ARG_NON          0
+#define ARG_RELADDR      1
+#define ARG_ABSADDR      2
+#define ARG_LENGTH       3
+#define ARG_MEMNUM       4
+#define ARG_OPTION       5
+#define ARG_STATE_CHECK  6
 
 OnigOpInfoType OnigOpInfo[] = {
   { OP_FINISH,            "finish",          ARG_NON },
@@ -6163,6 +6169,7 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_CCLASS_NOT,        "cclass-not",      ARG_SPECIAL },
   { OP_CCLASS_MB_NOT,     "cclass-mb-not",   ARG_SPECIAL },
   { OP_CCLASS_MIX_NOT,    "cclass-mix-not",  ARG_SPECIAL },
+  { OP_CCLASS_NODE,       "cclass-node",     ARG_SPECIAL },
   { OP_ANYCHAR,           "anychar",         ARG_NON },
   { OP_ANYCHAR_ML,        "anychar-ml",      ARG_NON },
   { OP_ANYCHAR_STAR,      "anychar*",        ARG_NON },
@@ -6187,6 +6194,7 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_END_LINE,            "end-line",        ARG_NON },
   { OP_SEMI_END_BUF,        "semi-end-buf",    ARG_NON },
   { OP_BEGIN_POSITION,      "begin-position",  ARG_NON },
+  { OP_BEGIN_POS_OR_LINE,   "begin-pos-or-line",    ARG_NON },
   { OP_BACKREF1,            "backref1",             ARG_NON },
   { OP_BACKREF2,            "backref2",             ARG_NON },
   { OP_BACKREFN,            "backrefn",             ARG_MEMNUM  },
@@ -6228,9 +6236,6 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_LOOK_BEHIND,          "look-behind",          ARG_SPECIAL },
   { OP_PUSH_LOOK_BEHIND_NOT, "push-look-behind-not", ARG_SPECIAL },
   { OP_FAIL_LOOK_BEHIND_NOT, "fail-look-behind-not", ARG_NON },
-  { OP_PUSH_ABSENT_POS,      "push-absent-pos",      ARG_NON },
-  { OP_ABSENT,               "absent",               ARG_RELADDR },
-  { OP_ABSENT_END,           "absent-end",           ARG_NON },
   { OP_CALL,                 "call",                 ARG_ABSADDR },
   { OP_RETURN,               "return",               ARG_NON },
   { OP_CONDITION,            "condition",            ARG_SPECIAL },
@@ -6267,14 +6272,14 @@ op2arg_type(int opcode)
   return ARG_SPECIAL;
 }
 
-# ifdef ONIG_DEBUG_PARSE_TREE
+#ifdef ONIG_DEBUG_PARSE_TREE
 static void
 Indent(FILE* f, int indent)
 {
   int i;
   for (i = 0; i < indent; i++) putc(' ', f);
 }
-# endif /* ONIG_DEBUG_PARSE_TREE */
+#endif /* ONIG_DEBUG_PARSE_TREE */
 
 static void
 p_string(FILE* f, ptrdiff_t len, UChar* s)
@@ -6313,7 +6318,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
       break;
     case ARG_RELADDR:
       GET_RELADDR_INC(addr, bp);
-      fprintf(f, ":(%s%d)", (addr >= 0) ? "+" : "", addr);
+      fprintf(f, ":(%d)", addr);
       break;
     case ARG_ABSADDR:
       GET_ABSADDR_INC(addr, bp);
@@ -6418,9 +6423,9 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
     case OP_CCLASS_MB_NOT:
       GET_LENGTH_INC(len, bp);
       q = bp;
-# ifndef PLATFORM_UNALIGNED_WORD_ACCESS
+#ifndef PLATFORM_UNALIGNED_WORD_ACCESS
       ALIGNMENT_RIGHT(q);
-# endif
+#endif
       GET_CODE_POINT(code, q);
       bp += len;
       fprintf(f, ":%d:%d", (int )code, len);
@@ -6432,14 +6437,24 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
       bp += SIZE_BITSET;
       GET_LENGTH_INC(len, bp);
       q = bp;
-# ifndef PLATFORM_UNALIGNED_WORD_ACCESS
+#ifndef PLATFORM_UNALIGNED_WORD_ACCESS
       ALIGNMENT_RIGHT(q);
-# endif
+#endif
       GET_CODE_POINT(code, q);
       bp += len;
       fprintf(f, ":%d:%d:%d", n, (int )code, len);
       break;
 
+    case OP_CCLASS_NODE:
+      {
+        CClassNode *cc;
+
+        GET_POINTER_INC(cc, bp);
+        n = bitset_on_num(cc->bs);
+        fprintf(f, ":%"PRIuPTR":%d", (uintptr_t )cc, n);
+      }
+      break;
+
     case OP_BACKREFN_IC:
       mem = *((MemNumType* )bp);
       bp += SIZE_MEMNUM;
@@ -6492,7 +6507,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
     case OP_PUSH_IF_PEEK_NEXT:
       addr = *((RelAddrType* )bp);
       bp += SIZE_RELADDR;
-      fprintf(f, ":(%s%d)", (addr >= 0) ? "+" : "", addr);
+      fprintf(f, ":(%d)", addr);
       p_string(f, 1, bp);
       bp += 1;
       break;
@@ -6505,7 +6520,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
     case OP_PUSH_LOOK_BEHIND_NOT:
       GET_RELADDR_INC(addr, bp);
       GET_LENGTH_INC(len, bp);
-      fprintf(f, ":%d:(%s%d)", len, (addr >= 0) ? "+" : "", addr);
+      fprintf(f, ":%d:(%d)", len, addr);
       break;
 
     case OP_STATE_CHECK_PUSH:
@@ -6514,25 +6529,25 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
       bp += SIZE_STATE_CHECK_NUM;
       addr = *((RelAddrType* )bp);
       bp += SIZE_RELADDR;
-      fprintf(f, ":%d:(%s%d)", scn, (addr >= 0) ? "+" : "", addr);
+      fprintf(f, ":%d:(%d)", scn, addr);
       break;
 
     case OP_CONDITION:
       GET_MEMNUM_INC(mem, bp);
       GET_RELADDR_INC(addr, bp);
-      fprintf(f, ":%d:(%s%d)", mem, (addr >= 0) ? "+" : "", addr);
+      fprintf(f, ":%d:(%d)", mem, addr);
       break;
 
     default:
       fprintf(stderr, "onig_print_compiled_byte_code: undefined code %d\n",
-	      bp[-1]);
+	      *--bp);
     }
   }
   fputs("]", f);
   if (nextp) *nextp = bp;
 }
 
-# ifdef ONIG_DEBUG_COMPILE
+#ifdef ONIG_DEBUG_COMPILE
 static void
 print_compiled_byte_code_list(FILE* f, regex_t* reg)
 {
@@ -6554,9 +6569,9 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
 
   fprintf(f, "\n");
 }
-# endif /* ONIG_DEBUG_COMPILE */
+#endif /* ONIG_DEBUG_COMPILE */
 
-# ifdef ONIG_DEBUG_PARSE_TREE
+#ifdef ONIG_DEBUG_PARSE_TREE
 static void
 print_indent_tree(FILE* f, Node* node, int indent)
 {
@@ -6603,15 +6618,12 @@ print_indent_tree(FILE* f, Node* node, int indent)
 
   case NT_CCLASS:
     fprintf(f, "<cclass:%"PRIxPTR">", (intptr_t )node);
-    if (IS_NCCLASS_NOT(NCCLASS(node))) fputs("not ", f);
+    if (IS_NCCLASS_NOT(NCCLASS(node))) fputs(" not", f);
     if (NCCLASS(node)->mbuf) {
       BBuf* bbuf = NCCLASS(node)->mbuf;
-      OnigCodePoint* data = (OnigCodePoint* )bbuf->p;
-      OnigCodePoint* end = (OnigCodePoint* )(bbuf->p + bbuf->used);
-      fprintf(f, "%d", *data++);
-      for (; data < end; data+=2) {
-	fprintf(f, ",");
-	fprintf(f, "%04x-%04x", data[0], data[1]);
+      for (i = 0; i < (int )bbuf->used; i++) {
+	if (i > 0) fprintf(f, ",");
+	fprintf(f, "%0x", bbuf->p[i]);
       }
     }
     break;
@@ -6645,13 +6657,14 @@ print_indent_tree(FILE* f, Node* node, int indent)
     case ANCHOR_END_LINE:       fputs("end line",       f); break;
     case ANCHOR_SEMI_END_BUF:   fputs("semi end buf",   f); break;
     case ANCHOR_BEGIN_POSITION: fputs("begin position", f); break;
+    case ANCHOR_ANYCHAR_STAR:   fputs("begin position/line", f); break;
 
     case ANCHOR_WORD_BOUND:      fputs("word bound",     f); break;
     case ANCHOR_NOT_WORD_BOUND:  fputs("not word bound", f); break;
-#  ifdef USE_WORD_BEGIN_END
+#ifdef USE_WORD_BEGIN_END
     case ANCHOR_WORD_BEGIN:      fputs("word begin", f);     break;
     case ANCHOR_WORD_END:        fputs("word end", f);       break;
-#  endif
+#endif
     case ANCHOR_PREC_READ:       fputs("prec read",      f); container_p = TRUE; break;
     case ANCHOR_PREC_READ_NOT:   fputs("prec read not",  f); container_p = TRUE; break;
     case ANCHOR_LOOK_BEHIND:     fputs("look_behind",    f); container_p = TRUE; break;
@@ -6677,7 +6690,7 @@ print_indent_tree(FILE* f, Node* node, int indent)
     }
     break;
 
-#  ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
   case NT_CALL:
     {
       CallNode* cn = NCALL(node);
@@ -6685,7 +6698,7 @@ print_indent_tree(FILE* f, Node* node, int indent)
       p_string(f, cn->name_end - cn->name, cn->name);
     }
     break;
-#  endif
+#endif
 
   case NT_QTFR:
     fprintf(f, "<quantifier:%"PRIxPTR">{%d,%d}%s\n", (intptr_t )node,
@@ -6709,9 +6722,6 @@ print_indent_tree(FILE* f, Node* node, int indent)
     case ENCLOSE_CONDITION:
       fprintf(f, "condition:%d", NENCLOSE(node)->regnum);
       break;
-    case ENCLOSE_ABSENT:
-      fprintf(f, "absent");
-      break;
 
     default:
       break;
@@ -6739,5 +6749,5 @@ print_tree(FILE* f, Node* node)
 {
   print_indent_tree(f, node, 0);
 }
-# endif /* ONIG_DEBUG_PARSE_TREE */
+#endif /* ONIG_DEBUG_PARSE_TREE */
 #endif /* ONIG_DEBUG */
diff --git a/regenc.c b/regenc.c
index 16d62fdf40..5cacbdfaa4 100644
--- a/regenc.c
+++ b/regenc.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -54,11 +54,11 @@ onigenc_set_default_encoding(OnigEncoding enc)
 extern int
 onigenc_mbclen_approximate(const OnigUChar* p,const OnigUChar* e, OnigEncoding enc)
 {
-  int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc, p, e);
+  int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc,p,e);
   if (ONIGENC_MBCLEN_CHARFOUND_P(ret))
     return ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
   else if (ONIGENC_MBCLEN_NEEDMORE_P(ret))
-    return (int )(e - p) + ONIGENC_MBCLEN_NEEDMORE_LEN(ret);
+    return (int)(e-p)+ONIGENC_MBCLEN_NEEDMORE_LEN(ret);
   return 1;
 }
 
@@ -364,14 +364,12 @@ const UChar OnigEncISO_8859_1_ToUpperCaseTable[256] = {
 };
 #endif
 
-#if 0
 extern void
 onigenc_set_default_caseconv_table(const UChar* table ARG_UNUSED)
 {
   /* nothing */
   /* obsoleted. */
 }
-#endif
 
 extern UChar*
 onigenc_get_left_adjust_char_head(OnigEncoding enc, const UChar* start, const UChar* s, const UChar* end)
@@ -633,10 +631,8 @@ onigenc_single_byte_code_to_mbclen(OnigCodePoint code ARG_UNUSED, OnigEncoding e
 extern int
 onigenc_single_byte_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
 {
-#ifdef RUBY
   if (code > 0xff)
     rb_raise(rb_eRangeError, "%u out of char range", code);
-#endif
   *buf = (UChar )(code & 0xff);
   return 1;
 }
@@ -896,7 +892,6 @@ onigenc_with_ascii_strnicmp(OnigEncoding enc, const UChar* p, const UChar* end,
   return 0;
 }
 
-#if 0
 /* Property management */
 static int
 resize_property_list(int new_size, const OnigCodePoint*** plist, int* psize)
@@ -949,64 +944,68 @@ onigenc_property_list_add_property(UChar* name, const OnigCodePoint* prop,
 			(hash_data_type )(*pnum + ONIGENC_MAX_STD_CTYPE));
   return 0;
 }
-#endif
 
 extern int
-onigenc_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end,
-			    OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc)
+onigenc_property_list_init(int (*f)(void))
+{
+  int r;
+
+  THREAD_ATOMIC_START;
+
+  r = f();
+
+  THREAD_ATOMIC_END;
+  return r;
+}
+
+extern int
+onigenc_ascii_only_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;
   int codepoint_length;
 
-  while (*pp < end && to < to_end) {
+  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 >= 'a' && code <= 'z' && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code += 'A' - 'a';
-    } else if (code >= 'A' && code <= 'Z' &&
-	(flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code += 'a' - 'A';
-    }
+    if (code>='a' && code<='z' && (flags&ONIGENC_CASE_UPCASE))
+      flags |= ONIGENC_CASE_MODIFIED,  code += 'A'-'a';
+    else if (code>='A' && code<='Z' && (flags&(ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD)))
+      flags |= ONIGENC_CASE_MODIFIED,  code += 'a'-'A';
     to += ONIGENC_CODE_TO_MBC(enc, code, to);
     if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+      flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
   }
   *flagP = flags;
-  return (int )(to - to_start);
+  return (int)(to-to_start);
 }
 
 extern int
-onigenc_single_byte_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-					const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-					const struct OnigEncodingTypeST* enc)
+onigenc_single_byte_ascii_only_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 >= 'a' && code <= 'z' && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code += 'A' - 'a';
-    } else if (code >= 'A' && code <= 'Z' &&
-	(flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code += 'a' - 'A';
-    }
+    if (code>='a' && code<='z' && (flags&ONIGENC_CASE_UPCASE))
+      flags |= ONIGENC_CASE_MODIFIED,  code += 'A'-'a';
+    else if (code>='A' && code<='Z' && (flags&(ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD)))
+      flags |= ONIGENC_CASE_MODIFIED,  code += 'a'-'A';
     *to++ = code;
     if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+      flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
   }
   *flagP = flags;
-  return (int )(to - to_start);
+  return (int)(to-to_start);
 }
diff --git a/regenc.h b/regenc.h
index 16ed6c39da..2c4c9343c5 100644
--- a/regenc.h
+++ b/regenc.h
@@ -1,11 +1,11 @@
-#ifndef ONIGMO_REGENC_H
-#define ONIGMO_REGENC_H
+#ifndef ONIGURUMA_REGENC_H
+#define ONIGURUMA_REGENC_H
 /**********************************************************************
   regenc.h -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -30,32 +30,18 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(RUBY) && (defined(RUBY_EXPORT) || defined(ONIG_ENC_REGISTER))
-# define RUBY
+#ifndef REGINT_H
+#ifndef RUBY_EXTERN
+#include "ruby/config.h"
+#include "ruby/defines.h"
+#endif
 #endif
-#ifdef RUBY
-# ifndef ONIGMO_REGINT_H
-#  ifndef RUBY_EXTERN
-#   include "ruby/config.h"
-#   include "ruby/defines.h"
-#  endif
-# endif
-#else /* RUBY */
-# ifndef PACKAGE
-/* PACKAGE is defined in config.h */
-#  include "config.h"
-# endif
-#endif /* RUBY */
 
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
-# undef ONIG_ESCAPE_UCHAR_COLLISION
+#undef ONIG_ESCAPE_UCHAR_COLLISION
 #endif
 
-#ifdef RUBY
-# include "ruby/onigmo.h"
-#else
-# include "onigmo.h"
-#endif
+#include "ruby/oniguruma.h"
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
@@ -66,23 +52,23 @@ typedef struct {
 
 
 #ifndef NULL
-# define NULL   ((void* )0)
+#define NULL   ((void* )0)
 #endif
 
 #ifndef TRUE
-# define TRUE    1
+#define TRUE    1
 #endif
 
 #ifndef FALSE
-# define FALSE   0
+#define FALSE   0
 #endif
 
 #ifndef ARG_UNUSED
-# if defined(__GNUC__)
+#if defined(__GNUC__)
 #  define ARG_UNUSED  __attribute__ ((unused))
-# else
+#else
 #  define ARG_UNUSED
-# endif
+#endif
 #endif
 
 #define ONIG_IS_NULL(p)                    (((void*)(p)) == (void*)0)
@@ -122,10 +108,10 @@ typedef struct {
 } PosixBracketEntryType;
 
 #define POSIX_BRACKET_ENTRY_INIT(name, ctype) \
-  {(short int )(sizeof(name) - 1), name, (ctype)}
+  {(short int )(sizeof(name) - 1), (name), (ctype)}
 
 #ifndef numberof
-# define numberof(array) (int )(sizeof(array) / sizeof((array)[0]))
+#define numberof(array) (int )(sizeof(array) / sizeof((array)[0]))
 #endif
 
 
@@ -139,56 +125,53 @@ typedef struct {
 #define ONIG_ENCODING_INIT_DEFAULT           ONIG_ENCODING_ASCII
 
 /* for encoding system implementation (internal) */
-ONIG_EXTERN int onigenc_ascii_apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc);
-ONIG_EXTERN int onigenc_ascii_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc);
-ONIG_EXTERN int onigenc_apply_all_case_fold_with_map(int map_size, const OnigPairCaseFoldCodes map[], int ess_tsett_flag, OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg);
-ONIG_EXTERN int onigenc_get_case_fold_codes_by_str_with_map(int map_size, const OnigPairCaseFoldCodes map[], int ess_tsett_flag, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]);
-ONIG_EXTERN int onigenc_not_support_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], OnigEncoding enc);
-ONIG_EXTERN int onigenc_is_mbc_newline_0x0a(const UChar* p, const UChar* end, OnigEncoding enc);
-ONIG_EXTERN int    onigenc_single_byte_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
+ONIG_EXTERN int onigenc_ascii_apply_all_case_fold P_((OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc));
+ONIG_EXTERN int onigenc_ascii_get_case_fold_codes_by_str P_((OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc));
+ONIG_EXTERN int onigenc_apply_all_case_fold_with_map P_((int map_size, const OnigPairCaseFoldCodes map[], int ess_tsett_flag, OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg));
+ONIG_EXTERN int onigenc_get_case_fold_codes_by_str_with_map P_((int map_size, const OnigPairCaseFoldCodes map[], int ess_tsett_flag, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]));
+CONSTFUNC(ONIG_EXTERN int onigenc_not_support_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], OnigEncoding enc)));
+PUREFUNC(ONIG_EXTERN int onigenc_is_mbc_newline_0x0a P_((const UChar* p, const UChar* end, OnigEncoding enc)));
+ONIG_EXTERN int    onigenc_single_byte_ascii_only_case_map P_((OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc));
 
 
 /* methods for single byte encoding */
-ONIG_EXTERN int onigenc_ascii_mbc_case_fold(OnigCaseFoldType flag, const UChar** p, const UChar* end, UChar* lower, OnigEncoding enc);
-ONIG_EXTERN int onigenc_single_byte_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc);
-ONIG_EXTERN OnigCodePoint onigenc_single_byte_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
-ONIG_EXTERN int onigenc_single_byte_code_to_mbclen(OnigCodePoint code, OnigEncoding enc);
-ONIG_EXTERN int onigenc_single_byte_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc);
-ONIG_EXTERN UChar* onigenc_single_byte_left_adjust_char_head(const UChar* start, const UChar* s, const OnigUChar* end, OnigEncoding enc);
-ONIG_EXTERN int onigenc_always_true_is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc);
-ONIG_EXTERN int onigenc_always_false_is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc);
-ONIG_EXTERN int onigenc_ascii_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc);
+ONIG_EXTERN int onigenc_ascii_mbc_case_fold P_((OnigCaseFoldType flag, const UChar** p, const UChar* end, UChar* lower, OnigEncoding enc));
+CONSTFUNC(ONIG_EXTERN int onigenc_single_byte_mbc_enc_len P_((const UChar* p, const UChar* e, OnigEncoding enc)));
+PUREFUNC(ONIG_EXTERN OnigCodePoint onigenc_single_byte_mbc_to_code P_((const UChar* p, const UChar* end, OnigEncoding enc)));
+CONSTFUNC(ONIG_EXTERN int onigenc_single_byte_code_to_mbclen P_((OnigCodePoint code, OnigEncoding enc)));
+ONIG_EXTERN int onigenc_single_byte_code_to_mbc P_((OnigCodePoint code, UChar *buf, OnigEncoding enc));
+CONSTFUNC(ONIG_EXTERN UChar* onigenc_single_byte_left_adjust_char_head P_((const UChar* start, const UChar* s, const OnigUChar* end, OnigEncoding enc)));
+CONSTFUNC(ONIG_EXTERN int onigenc_always_true_is_allowed_reverse_match P_((const UChar* s, const UChar* end, OnigEncoding enc)));
+CONSTFUNC(ONIG_EXTERN int onigenc_always_false_is_allowed_reverse_match P_((const UChar* s, const UChar* end, OnigEncoding enc)));
+CONSTFUNC(ONIG_EXTERN int onigenc_ascii_is_code_ctype P_((OnigCodePoint code, unsigned int ctype, OnigEncoding enc)));
 
 /* methods for multi byte encoding */
-ONIG_EXTERN OnigCodePoint onigenc_mbn_mbc_to_code(OnigEncoding enc, const UChar* p, const UChar* end);
-ONIG_EXTERN int onigenc_mbn_mbc_case_fold(OnigEncoding enc, OnigCaseFoldType flag, const UChar** p, const UChar* end, UChar* lower);
-ONIG_EXTERN int onigenc_mb2_code_to_mbclen(OnigCodePoint code, OnigEncoding enc);
-ONIG_EXTERN int onigenc_mb2_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf);
-ONIG_EXTERN int onigenc_minimum_property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end);
-ONIG_EXTERN int onigenc_unicode_property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end);
-ONIG_EXTERN int onigenc_mb2_is_code_ctype(OnigEncoding enc, OnigCodePoint code, unsigned int ctype);
-ONIG_EXTERN int onigenc_mb4_code_to_mbclen(OnigCodePoint code, OnigEncoding enc);
-ONIG_EXTERN int onigenc_mb4_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf);
-ONIG_EXTERN int onigenc_mb4_is_code_ctype(OnigEncoding enc, OnigCodePoint code, unsigned int ctype);
+ONIG_EXTERN OnigCodePoint onigenc_mbn_mbc_to_code P_((OnigEncoding enc, const UChar* p, const UChar* end));
+ONIG_EXTERN int onigenc_mbn_mbc_case_fold P_((OnigEncoding enc, OnigCaseFoldType flag, const UChar** p, const UChar* end, UChar* lower));
+CONSTFUNC(ONIG_EXTERN int onigenc_mb2_code_to_mbclen P_((OnigCodePoint code, OnigEncoding enc)));
+ONIG_EXTERN int onigenc_mb2_code_to_mbc P_((OnigEncoding enc, OnigCodePoint code, UChar *buf));
+ONIG_EXTERN int onigenc_minimum_property_name_to_ctype P_((OnigEncoding enc, const UChar* p, const UChar* end));
+ONIG_EXTERN int onigenc_unicode_property_name_to_ctype P_((OnigEncoding enc, const UChar* p, const UChar* end));
+ONIG_EXTERN int onigenc_mb2_is_code_ctype P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype));
+CONSTFUNC(ONIG_EXTERN int onigenc_mb4_code_to_mbclen P_((OnigCodePoint code, OnigEncoding enc)));
+ONIG_EXTERN int onigenc_mb4_code_to_mbc P_((OnigEncoding enc, OnigCodePoint code, UChar *buf));
+ONIG_EXTERN int onigenc_mb4_is_code_ctype P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype));
 
-ONIG_EXTERN int onigenc_unicode_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
+ONIG_EXTERN int    onigenc_unicode_case_map P_((OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc));
 
 
 /* in enc/unicode.c */
-ONIG_EXTERN int onigenc_unicode_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc);
-ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc);
-ONIG_EXTERN int onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[]);
-ONIG_EXTERN int onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]);
-ONIG_EXTERN int onigenc_unicode_mbc_case_fold(OnigEncoding enc, OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold);
-ONIG_EXTERN int onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc);
+ONIG_EXTERN int onigenc_unicode_is_code_ctype P_((OnigCodePoint code, unsigned int ctype, OnigEncoding enc));
+ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc));
+ONIG_EXTERN int onigenc_unicode_ctype_code_range P_((int ctype, const OnigCodePoint* ranges[]));
+ONIG_EXTERN int onigenc_unicode_get_case_fold_codes_by_str P_((OnigEncoding enc, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]));
+ONIG_EXTERN int onigenc_unicode_mbc_case_fold P_((OnigEncoding enc, OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold));
+ONIG_EXTERN int onigenc_unicode_apply_all_case_fold P_((OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc));
 
 
 #define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
 #define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
 #define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
-#define UNICODE_VALID_CODEPOINT_P(c) ( \
-	((c) <= 0x10ffff) && \
-	!((c) < 0x10000 && UTF16_IS_SURROGATE((c) >> 8)))
 
 #define ONIGENC_ISO_8859_1_TO_LOWER_CASE(c) \
   OnigEncISO_8859_1_ToLowerCaseTable[c]
@@ -199,14 +182,14 @@ ONIG_EXTERN const UChar OnigEncISO_8859_1_ToLowerCaseTable[];
 ONIG_EXTERN const UChar OnigEncISO_8859_1_ToUpperCaseTable[];
 
 ONIG_EXTERN int
-onigenc_with_ascii_strncmp(OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n);
+onigenc_with_ascii_strncmp P_((OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n));
 ONIG_EXTERN int
-onigenc_with_ascii_strnicmp(OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n);
+onigenc_with_ascii_strnicmp P_((OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n));
 ONIG_EXTERN UChar*
-onigenc_step(OnigEncoding enc, const UChar* p, const UChar* end, int n);
+onigenc_step P_((OnigEncoding enc, const UChar* p, const UChar* end, int n));
 
 /* defined in regexec.c, but used in enc/xxx.c */
-extern int  onig_is_in_code_range(const UChar* p, OnigCodePoint code);
+extern int  onig_is_in_code_range P_((const UChar* p, OnigCodePoint code));
 
 ONIG_EXTERN OnigEncoding  OnigEncDefaultCharEncoding;
 ONIG_EXTERN const UChar  OnigEncAsciiToLowerCaseTable[];
@@ -229,9 +212,9 @@ ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[];
 
 #ifdef ONIG_ENC_REGISTER
 extern int ONIG_ENC_REGISTER(const char *, OnigEncoding);
-# define OnigEncodingName(n) encoding_##n
-# define OnigEncodingDeclare(n) static const OnigEncodingType OnigEncodingName(n)
-# define OnigEncodingDefine(f,n)			     \
+#define OnigEncodingName(n) encoding_##n
+#define OnigEncodingDeclare(n) static const OnigEncodingType OnigEncodingName(n)
+#define OnigEncodingDefine(f,n)			     \
     OnigEncodingDeclare(n);			     \
     void Init_##f(void) {			     \
 	ONIG_ENC_REGISTER(OnigEncodingName(n).name,  \
@@ -239,9 +222,9 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncoding);
     }						     \
     OnigEncodingDeclare(n)
 #else
-# define OnigEncodingName(n) OnigEncoding##n
-# define OnigEncodingDeclare(n) const OnigEncodingType OnigEncodingName(n)
-# define OnigEncodingDefine(f,n) OnigEncodingDeclare(n)
+#define OnigEncodingName(n) OnigEncoding##n
+#define OnigEncodingDeclare(n) const OnigEncodingType OnigEncodingName(n)
+#define OnigEncodingDefine(f,n) OnigEncodingDeclare(n)
 #endif
 
 /* macros for define replica encoding and encoding alias */
@@ -251,4 +234,4 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncoding);
 
 RUBY_SYMBOL_EXPORT_END
 
-#endif /* ONIGMO_REGENC_H */
+#endif /* ONIGURUMA_REGENC_H */
diff --git a/regerror.c b/regerror.c
index 59cf53068e..9ec3f65f4c 100644
--- a/regerror.c
+++ b/regerror.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -31,7 +31,13 @@
 #include "regint.h"
 #include <stdio.h> /* for vsnprintf() */
 
+#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
 
 extern UChar*
 onig_error_code_to_format(OnigPosition code)
@@ -59,8 +65,6 @@ onig_error_code_to_format(OnigPosition code)
     p = "unexpected bytecode (bug)"; break;
   case ONIGERR_MATCH_STACK_LIMIT_OVER:
     p = "match-stack limit over"; break;
-  case ONIGERR_PARSE_DEPTH_LIMIT_OVER:
-    p = "parse depth limit over"; break;
   case ONIGERR_DEFAULT_ENCODING_IS_NOT_SET:
     p = "default multibyte-encoding is not set"; break;
   case ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR:
@@ -175,6 +179,8 @@ onig_error_code_to_format(OnigPosition code)
     p = "not supported encoding combination"; break;
   case ONIGERR_INVALID_COMBINATION_OF_OPTIONS:
     p = "invalid combination of options"; break;
+  case ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT:
+    p = "over thread pass limit count"; break;
 
   default:
     p = "undefined error code"; break;
@@ -185,12 +191,12 @@ onig_error_code_to_format(OnigPosition code)
 
 static void sprint_byte(char* s, unsigned int v)
 {
-  xsnprintf(s, 3, "%02x", (v & 0377));
+  sprintf(s, "%02x", (v & 0377));
 }
 
 static void sprint_byte_with_x(char* s, unsigned int v)
 {
-  xsnprintf(s, 5, "\\x%02x", (v & 0377));
+  sprintf(s, "\\x%02x", (v & 0377));
 }
 
 static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
@@ -242,11 +248,18 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
 }
 
 
-/* < ONIG_MAX_ERROR_MESSAGE_LEN - max length of messages with %n */
-#define MAX_ERROR_PAR_LEN   50
+/* for ONIG_MAX_ERROR_MESSAGE_LEN */
+#define MAX_ERROR_PAR_LEN   30
 
 extern int
+#ifdef HAVE_STDARG_PROTOTYPES
 onig_error_code_to_str(UChar* s, OnigPosition code, ...)
+#else
+onig_error_code_to_str(s, code, va_alist)
+  UChar* s;
+  OnigPosition code;
+  va_dcl
+#endif
 {
   UChar *p, *q;
   OnigErrorInfo* einfo;
@@ -255,7 +268,7 @@ onig_error_code_to_str(UChar* s, OnigPosition code, ...)
   UChar parbuf[MAX_ERROR_PAR_LEN];
   va_list vargs;
 
-  va_start(vargs, code);
+  va_init_list(vargs, code);
 
   switch (code) {
   case ONIGERR_UNDEFINED_NAME_REFERENCE:
@@ -324,18 +337,26 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
   need = (pat_end - pat) * 4 + 4;
 
   if (n + need < (size_t )bufsize) {
-    static const char sep[] = ": /";
-    memcpy((char* )buf + n, sep, sizeof(sep));
+    strcat((char* )buf, ": /");
     s = buf + onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, buf);
 
     p = pat;
     while (p < pat_end) {
-      if (ONIGENC_IS_MBC_HEAD(enc, p, pat_end)) {
+      if (*p == '\\') {
+	*s++ = *p++;
+	len = enclen(enc, p, pat_end);
+	while (len-- > 0) *s++ = *p++;
+      }
+      else if (*p == '/') {
+	*s++ = (unsigned char )'\\';
+	*s++ = *p++;
+      }
+      else if (ONIGENC_IS_MBC_HEAD(enc, p, pat_end)) {
         len = enclen(enc, p, pat_end);
         if (ONIGENC_MBC_MINLEN(enc) == 1) {
           while (len-- > 0) *s++ = *p++;
         }
-        else { /* for UTF16/32 */
+        else { /* for UTF16 */
           int blen;
 
           while (len-- > 0) {
@@ -346,15 +367,6 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
           }
         }
       }
-      else if (*p == '\\') {
-	*s++ = *p++;
-	len = enclen(enc, p, pat_end);
-	while (len-- > 0) *s++ = *p++;
-      }
-      else if (*p == '/') {
-	*s++ = (unsigned char )'\\';
-	*s++ = *p++;
-      }
       else if (!ONIGENC_IS_CODE_PRINT(enc, *p) &&
 	       !ONIGENC_IS_CODE_SPACE(enc, *p)) {
 	sprint_byte_with_x((char* )bs, (unsigned int )(*p++));
@@ -372,15 +384,25 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
   }
 }
 
-#if 0 /* unused */
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
                            UChar* pat, UChar* pat_end, const UChar *fmt, ...)
+#else
+onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
+    UChar buf[];
+    int bufsize;
+    OnigEncoding enc;
+    UChar* pat;
+    UChar* pat_end;
+    const UChar *fmt;
+    va_dcl
+#endif
 {
   va_list args;
-  va_start(args, fmt);
+  va_init_list(args, fmt);
   onig_vsnprintf_with_pattern(buf, bufsize, enc,
 	  pat, pat_end, fmt, args);
   va_end(args);
 }
-#endif
+
diff --git a/regexec.c b/regexec.c
index 9b6232e30b..480017ae54 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -30,39 +30,33 @@
 
 #include "regint.h"
 
-#ifdef RUBY
-# undef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
-#else
-# define USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
-#endif
+/* #define USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
 
-#ifndef USE_TOKEN_THREADED_VM
+#ifndef USE_DIRECT_THREADED_VM
 # ifdef __GNUC__
-#  define USE_TOKEN_THREADED_VM 1
+#   define USE_DIRECT_THREADED_VM 1
 # else
-#  define USE_TOKEN_THREADED_VM 0
+#   define USE_DIRECT_THREADED_VM 0
 # endif
 #endif
 
-#ifdef RUBY
-# define ENC_DUMMY_FLAG (1<<24)
+#define ENC_DUMMY_FLAG (1<<24)
 static inline int
 rb_enc_asciicompat(OnigEncoding enc)
 {
-  return ONIGENC_MBC_MINLEN(enc)==1 && !((enc)->ruby_encoding_index & ENC_DUMMY_FLAG);
+    return ONIGENC_MBC_MINLEN(enc)==1 && !((enc)->ruby_encoding_index & ENC_DUMMY_FLAG);
 }
-# undef ONIGENC_IS_MBC_ASCII_WORD
-# define ONIGENC_IS_MBC_ASCII_WORD(enc,s,end) \
+#undef ONIGENC_IS_MBC_ASCII_WORD
+#define ONIGENC_IS_MBC_ASCII_WORD(enc,s,end) \
     (rb_enc_asciicompat(enc) ? (ISALNUM(*s) || *s=='_') : \
    onigenc_ascii_is_code_ctype( \
 	ONIGENC_MBC_TO_CODE(enc,s,end),ONIGENC_CTYPE_WORD,enc))
-#endif /* RUBY */
 
 #ifdef USE_CRNL_AS_LINE_TERMINATOR
-# define ONIGENC_IS_MBC_CRNL(enc,p,end) \
+#define ONIGENC_IS_MBC_CRNL(enc,p,end) \
   (ONIGENC_MBC_TO_CODE(enc,p,end) == 13 && \
    ONIGENC_MBC_TO_CODE(enc,(p+enclen(enc,p,end)),end) == 10)
-# define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
+#define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
   is_mbc_newline_ex((enc),(p),(start),(end),(option),(check_prev))
 static int
 is_mbc_newline_ex(OnigEncoding enc, const UChar *p, const UChar *start,
@@ -96,7 +90,7 @@ is_mbc_newline_ex(OnigEncoding enc, const UChar *p, const UChar *start,
   }
 }
 #else /* USE_CRNL_AS_LINE_TERMINATOR */
-# define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
+#define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
   ONIGENC_IS_MBC_NEWLINE((enc), (p), (end))
 #endif /* USE_CRNL_AS_LINE_TERMINATOR */
 
@@ -111,7 +105,7 @@ history_tree_clear(OnigCaptureTreeNode* node)
   if (IS_NOT_NULL(node)) {
     for (i = 0; i < node->num_childs; i++) {
       if (IS_NOT_NULL(node->childs[i])) {
-	history_tree_free(node->childs[i]);
+        history_tree_free(node->childs[i]);
       }
     }
     for (i = 0; i < node->allocated; i++) {
@@ -162,7 +156,7 @@ history_node_new(void)
 static int
 history_tree_add_child(OnigCaptureTreeNode* parent, OnigCaptureTreeNode* child)
 {
-# define HISTORY_TREE_INIT_ALLOC_SIZE  8
+#define HISTORY_TREE_INIT_ALLOC_SIZE  8
 
   if (parent->num_childs >= parent->allocated) {
     int n, i;
@@ -170,15 +164,15 @@ history_tree_add_child(OnigCaptureTreeNode* parent, OnigCaptureTreeNode* child)
     if (IS_NULL(parent->childs)) {
       n = HISTORY_TREE_INIT_ALLOC_SIZE;
       parent->childs =
-	(OnigCaptureTreeNode** )xmalloc(sizeof(OnigCaptureTreeNode*) * n);
+        (OnigCaptureTreeNode** )xmalloc(sizeof(OnigCaptureTreeNode*) * n);
       CHECK_NULL_RETURN_MEMERR(parent->childs);
     }
     else {
       OnigCaptureTreeNode** tmp;
       n = parent->allocated * 2;
       tmp =
-	(OnigCaptureTreeNode** )xrealloc(parent->childs,
-					 sizeof(OnigCaptureTreeNode*) * n);
+        (OnigCaptureTreeNode** )xrealloc(parent->childs,
+                                         sizeof(OnigCaptureTreeNode*) * n);
       if (tmp == 0) {
 	history_tree_clear(parent);
 	return ONIGERR_MEMORY;
@@ -354,7 +348,7 @@ onig_region_free(OnigRegion* r, int free_self)
 }
 
 extern void
-onig_region_copy(OnigRegion* to, const OnigRegion* from)
+onig_region_copy(OnigRegion* to, OnigRegion* from)
 {
 #define RREGC_SIZE   (sizeof(int) * from->num_regs)
   int i, r;
@@ -403,8 +397,6 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
 #define STK_CALL_FRAME             0x0800
 #define STK_RETURN                 0x0900
 #define STK_VOID                   0x0a00  /* for fill a blank */
-#define STK_ABSENT_POS             0x0b00  /* for absent */
-#define STK_ABSENT                 0x0c00  /* absent inner loop marker */
 
 /* stack type check mask */
 #define STK_MASK_POP_USED          0x00ff
@@ -412,7 +404,7 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
 #define STK_MASK_MEM_END_OR_MARK   0x8000  /* MEM_END or MEM_END_MARK */
 
 #ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
-# define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
+#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
   (msa).stack_p  = (void* )0;\
   (msa).options  = (arg_option);\
   (msa).region   = (arg_region);\
@@ -421,7 +413,7 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
   (msa).best_len = ONIG_MISMATCH;\
 } while(0)
 #else
-# define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
+#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
   (msa).stack_p  = (void* )0;\
   (msa).options  = (arg_option);\
   (msa).region   = (arg_region);\
@@ -432,9 +424,9 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
 
-# define STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE  16
+#define STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE  16
 
-# define STATE_CHECK_BUFF_INIT(msa, str_len, offset, state_num) do {	\
+#define STATE_CHECK_BUFF_INIT(msa, str_len, offset, state_num) do {	\
   if ((state_num) > 0 && str_len >= STATE_CHECK_STRING_THRESHOLD_LEN) {\
     unsigned int size = (unsigned int )(((str_len) + 1) * (state_num) + 7) >> 3;\
     offset = ((offset) * (state_num)) >> 3;\
@@ -460,14 +452,14 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
   }\
   } while(0)
 
-# define MATCH_ARG_FREE(msa) do {\
+#define MATCH_ARG_FREE(msa) do {\
   if ((msa).stack_p) xfree((msa).stack_p);\
   if ((msa).state_check_buff_size >= STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE) { \
     if ((msa).state_check_buff) xfree((msa).state_check_buff);\
   }\
 } while(0)
 #else /* USE_COMBINATION_EXPLOSION_CHECK */
-# define MATCH_ARG_FREE(msa)  if ((msa).stack_p) xfree((msa).stack_p)
+#define MATCH_ARG_FREE(msa)  if ((msa).stack_p) xfree((msa).stack_p)
 #endif /* USE_COMBINATION_EXPLOSION_CHECK */
 
 
@@ -556,9 +548,9 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
     n *= 2;
     if (limit_size != 0 && n > limit_size) {
       if ((unsigned int )(stk_end - stk_base) == limit_size)
-	return ONIGERR_MATCH_STACK_LIMIT_OVER;
+        return ONIGERR_MATCH_STACK_LIMIT_OVER;
       else
-	n = limit_size;
+        n = limit_size;
     }
     x = (OnigStackType* )xrealloc(stk_base, sizeof(OnigStackType) * n);
     if (IS_NULL(x)) {
@@ -595,9 +587,9 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
 #define IS_TO_VOID_TARGET(stk) (((stk)->type & STK_MASK_TO_VOID_TARGET) != 0)
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
-# define STATE_CHECK_POS(s,snum) \
+#define STATE_CHECK_POS(s,snum) \
   (((s) - str) * num_comb_exp_check + ((snum) - 1))
-# define STATE_CHECK_VAL(v,snum) do {\
+#define STATE_CHECK_VAL(v,snum) do {\
   if (state_check_buff != NULL) {\
     int x = STATE_CHECK_POS(s,snum);\
     (v) = state_check_buff[x/8] & (1<<(x%8));\
@@ -606,13 +598,13 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
 } while(0)
 
 
-# define ELSE_IF_STATE_CHECK_MARK(stk) \
+#define ELSE_IF_STATE_CHECK_MARK(stk) \
   else if ((stk)->type == STK_STATE_CHECK_MARK) { \
     int x = STATE_CHECK_POS(stk->u.state.pstr, stk->u.state.state_check);\
     state_check_buff[x/8] |= (1<<(x%8));				\
   }
 
-# define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
+#define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
   STACK_ENSURE(1);\
   stk->type = (stack_type);\
   stk->u.state.pcode     = (pat);\
@@ -623,14 +615,14 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   STACK_INC;\
 } while(0)
 
-# define STACK_PUSH_ENSURED(stack_type,pat) do {\
+#define STACK_PUSH_ENSURED(stack_type,pat) do {\
   stk->type = (stack_type);\
   stk->u.state.pcode = (pat);\
   stk->u.state.state_check = 0;\
   STACK_INC;\
 } while(0)
 
-# define STACK_PUSH_ALT_WITH_STATE_CHECK(pat,s,sprev,snum,keep) do {\
+#define STACK_PUSH_ALT_WITH_STATE_CHECK(pat,s,sprev,snum,keep) do {\
   STACK_ENSURE(1);\
   stk->type = STK_ALT;\
   stk->u.state.pcode     = (pat);\
@@ -641,7 +633,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   STACK_INC;\
 } while(0)
 
-# define STACK_PUSH_STATE_CHECK(s,snum) do {\
+#define STACK_PUSH_STATE_CHECK(s,snum) do {\
   if (state_check_buff != NULL) {\
     STACK_ENSURE(1);\
     stk->type = STK_STATE_CHECK_MARK;\
@@ -653,9 +645,9 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
 
 #else /* USE_COMBINATION_EXPLOSION_CHECK */
 
-# define ELSE_IF_STATE_CHECK_MARK(stk)
+#define ELSE_IF_STATE_CHECK_MARK(stk)
 
-# define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
+#define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
   STACK_ENSURE(1);\
   stk->type = (stack_type);\
   stk->u.state.pcode     = (pat);\
@@ -665,7 +657,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   STACK_INC;\
 } while(0)
 
-# define STACK_PUSH_ENSURED(stack_type,pat) do {\
+#define STACK_PUSH_ENSURED(stack_type,pat) do {\
   stk->type = (stack_type);\
   stk->u.state.pcode = (pat);\
   STACK_INC;\
@@ -675,8 +667,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
 #define STACK_PUSH_ALT(pat,s,sprev,keep)     STACK_PUSH(STK_ALT,pat,s,sprev,keep)
 #define STACK_PUSH_POS(s,sprev,keep)         STACK_PUSH(STK_POS,NULL_UCHARP,s,sprev,keep)
 #define STACK_PUSH_POS_NOT(pat,s,sprev,keep) STACK_PUSH(STK_POS_NOT,pat,s,sprev,keep)
-#define STACK_PUSH_ABSENT                    STACK_PUSH_TYPE(STK_ABSENT)
-#define STACK_PUSH_STOP_BT                   STACK_PUSH_TYPE(STK_STOP_BT)
+#define STACK_PUSH_STOP_BT              STACK_PUSH_TYPE(STK_STOP_BT)
 #define STACK_PUSH_LOOK_BEHIND_NOT(pat,s,sprev,keep) \
         STACK_PUSH(STK_LOOK_BEHIND_NOT,pat,s,sprev,keep)
 
@@ -788,23 +779,15 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   STACK_INC;\
 } while(0)
 
-#define STACK_PUSH_ABSENT_POS(start, end) do {\
-  STACK_ENSURE(1);\
-  stk->type = STK_ABSENT_POS;\
-  stk->u.absent_pos.abs_pstr = (start);\
-  stk->u.absent_pos.end_pstr = (end);\
-  STACK_INC;\
-} while(0)
-
 
 #ifdef ONIG_DEBUG
-# define STACK_BASE_CHECK(p, at) \
+#define STACK_BASE_CHECK(p, at) \
   if ((p) < stk_base) {\
     fprintf(stderr, "at %s\n", at);\
     goto stack_error;\
   }
 #else
-# define STACK_BASE_CHECK(p, at)
+#define STACK_BASE_CHECK(p, at)
 #endif
 
 #define STACK_POP_ONE do {\
@@ -896,33 +879,6 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   }\
 } while(0)
 
-#define STACK_POP_TIL_ABSENT  do {\
-  while (1) {\
-    stk--;\
-    STACK_BASE_CHECK(stk, "STACK_POP_TIL_ABSENT"); \
-    if (stk->type == STK_ABSENT) break;\
-    else if (stk->type == STK_MEM_START) {\
-      mem_start_stk[stk->u.mem.num] = stk->u.mem.start;\
-      mem_end_stk[stk->u.mem.num]   = stk->u.mem.end;\
-    }\
-    else if (stk->type == STK_REPEAT_INC) {\
-      STACK_AT(stk->u.repeat_inc.si)->u.repeat.count--;\
-    }\
-    else if (stk->type == STK_MEM_END) {\
-      mem_start_stk[stk->u.mem.num] = stk->u.mem.start;\
-      mem_end_stk[stk->u.mem.num]   = stk->u.mem.end;\
-    }\
-    ELSE_IF_STATE_CHECK_MARK(stk);\
-  }\
-} while(0)
-
-#define STACK_POP_ABSENT_POS(start, end) do {\
-  stk--;\
-  STACK_BASE_CHECK(stk, "STACK_POP_ABSENT_POS"); \
-  (start) = stk->u.absent_pos.abs_pstr;\
-  (end) = stk->u.absent_pos.end_pstr;\
-} while(0)
-
 #define STACK_POS_END(k) do {\
   k = stk;\
   while (1) {\
@@ -1168,18 +1124,16 @@ static int string_cmp_ic(OnigEncoding enc, int case_fold_flag,
 
 
 #define IS_EMPTY_STR           (str == end)
-#define ON_STR_BEGIN(s)        ((s) == str)
-#define ON_STR_END(s)          ((s) == end)
+#define ON_STR_BEGIN(s)       ((s) == str)
+#define ON_STR_END(s)         ((s) == end)
 #ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
-# define DATA_ENSURE_CHECK1    (s < right_range)
-# define DATA_ENSURE_CHECK(n)  (s + (n) <= right_range)
-# define DATA_ENSURE(n)        if (s + (n) > right_range) goto fail
-# define ABSENT_END_POS        right_range
+#define DATA_ENSURE_CHECK1     (s < right_range)
+#define DATA_ENSURE_CHECK(n)   (s + (n) <= right_range)
+#define DATA_ENSURE(n)         if (s + (n) > right_range) goto fail
 #else
-# define DATA_ENSURE_CHECK1    (s < end)
-# define DATA_ENSURE_CHECK(n)  (s + (n) <= end)
-# define DATA_ENSURE(n)        if (s + (n) > end) goto fail
-# define ABSENT_END_POS        end
+#define DATA_ENSURE_CHECK1     (s < end)
+#define DATA_ENSURE_CHECK(n)   (s + (n) <= end)
+#define DATA_ENSURE(n)         if (s + (n) > end) goto fail
 #endif /* USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
 
 
@@ -1196,29 +1150,29 @@ make_capture_history_tree(OnigCaptureTreeNode* node, OnigStackType** kp,
     if (k->type == STK_MEM_START) {
       n = k->u.mem.num;
       if (n <= ONIG_MAX_CAPTURE_HISTORY_GROUP &&
-	  BIT_STATUS_AT(reg->capture_history, n) != 0) {
-	child = history_node_new();
-	CHECK_NULL_RETURN_MEMERR(child);
-	child->group = n;
-	child->beg = k->u.mem.pstr - str;
-	r = history_tree_add_child(node, child);
-	if (r != 0) {
-	  history_tree_free(child);
-	  return r;
-	}
-	*kp = (k + 1);
-	r = make_capture_history_tree(child, kp, stk_top, str, reg);
-	if (r != 0) return r;
-
-	k = *kp;
-	child->end = k->u.mem.pstr - str;
+          BIT_STATUS_AT(reg->capture_history, n) != 0) {
+        child = history_node_new();
+        CHECK_NULL_RETURN_MEMERR(child);
+        child->group = n;
+        child->beg = k->u.mem.pstr - str;
+        r = history_tree_add_child(node, child);
+        if (r != 0) {
+          history_tree_free(child);
+          return r;
+        }
+        *kp = (k + 1);
+        r = make_capture_history_tree(child, kp, stk_top, str, reg);
+        if (r != 0) return r;
+
+        k = *kp;
+        child->end = k->u.mem.pstr - str;
       }
     }
     else if (k->type == STK_MEM_END) {
       if (k->u.mem.num == node->group) {
-	node->end = k->u.mem.pstr - str;
-	*kp = k;
-	return 0;
+        node->end = k->u.mem.pstr - str;
+        *kp = k;
+        return 0;
       }
     }
     k++;
@@ -1241,10 +1195,10 @@ static int mem_is_in_memp(int mem, int num, UChar* memp)
   return 0;
 }
 
-static int backref_match_at_nested_level(regex_t* reg,
-	 OnigStackType* top, OnigStackType* stk_base,
-	 int ignore_case, int case_fold_flag,
-	 int nest, int mem_num, UChar* memp, UChar** s, const UChar* send)
+static int backref_match_at_nested_level(regex_t* reg
+	 , OnigStackType* top, OnigStackType* stk_base
+	 , int ignore_case, int case_fold_flag
+	 , int nest, int mem_num, UChar* memp, UChar** s, const UChar* send)
 {
   UChar *ss, *p, *pstart, *pend = NULL_UCHARP;
   int level;
@@ -1301,37 +1255,27 @@ static int backref_match_at_nested_level(regex_t* reg,
 
 #ifdef ONIG_DEBUG_STATISTICS
 
-# ifdef _WIN32
-#  include <windows.h>
-static LARGE_INTEGER ts, te, freq;
-#  define GETTIME(t)	  QueryPerformanceCounter(&(t))
-#  define TIMEDIFF(te,ts) (unsigned long )(((te).QuadPart - (ts).QuadPart) \
-			    * 1000000 / freq.QuadPart)
-# else /* _WIN32 */
-
-#  define USE_TIMEOFDAY
-
-#  ifdef USE_TIMEOFDAY
-#   ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#   endif
-#   ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#   endif
+#define USE_TIMEOFDAY
+
+#ifdef USE_TIMEOFDAY
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 static struct timeval ts, te;
-#   define GETTIME(t)      gettimeofday(&(t), (struct timezone* )0)
-#   define TIMEDIFF(te,ts) (((te).tv_usec - (ts).tv_usec) + \
-                            (((te).tv_sec - (ts).tv_sec)*1000000))
-#  else /* USE_TIMEOFDAY */
-#   ifdef HAVE_SYS_TIMES_H
-#    include <sys/times.h>
-#   endif
+#define GETTIME(t)        gettimeofday(&(t), (struct timezone* )0)
+#define TIMEDIFF(te,ts)   (((te).tv_usec - (ts).tv_usec) + \
+                           (((te).tv_sec - (ts).tv_sec)*1000000))
+#else /* USE_TIMEOFDAY */
+#ifdef HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#endif
 static struct tms ts, te;
-#   define GETTIME(t)       times(&(t))
-#   define TIMEDIFF(te,ts)  ((te).tms_utime - (ts).tms_utime)
-#  endif /* USE_TIMEOFDAY */
-
-# endif /* _WIN32 */
+#define GETTIME(t)         times(&(t))
+#define TIMEDIFF(te,ts)   ((te).tms_utime - (ts).tms_utime)
+#endif /* USE_TIMEOFDAY */
 
 static int OpCounter[256];
 static int OpPrevCounter[256];
@@ -1340,14 +1284,14 @@ static int OpCurr = OP_FINISH;
 static int OpPrevTarget = OP_FAIL;
 static int MaxStackDepth = 0;
 
-# define MOP_IN(opcode) do {\
+#define MOP_IN(opcode) do {\
   if (opcode == OpPrevTarget) OpPrevCounter[OpCurr]++;\
   OpCurr = opcode;\
   OpCounter[opcode]++;\
   GETTIME(ts);\
 } while(0)
 
-# define MOP_OUT do {\
+#define MOP_OUT do {\
   GETTIME(te);\
   OpTime[OpCurr] += TIMEDIFF(te, ts);\
 } while(0)
@@ -1360,9 +1304,6 @@ onig_statistics_init(void)
     OpCounter[i] = OpPrevCounter[i] = 0; OpTime[i] = 0;
   }
   MaxStackDepth = 0;
-# ifdef _WIN32
-  QueryPerformanceFrequency(&freq);
-# endif
 }
 
 extern void
@@ -1377,47 +1318,28 @@ onig_print_statistics(FILE* f)
   fprintf(f, "\nmax stack depth: %d\n", MaxStackDepth);
 }
 
-# define STACK_INC do {\
+#define STACK_INC do {\
   stk++;\
   if (stk - stk_base > MaxStackDepth) \
     MaxStackDepth = stk - stk_base;\
 } while(0)
 
 #else /* ONIG_DEBUG_STATISTICS */
-# define STACK_INC     stk++
+#define STACK_INC     stk++
 
-# define MOP_IN(opcode)
-# define MOP_OUT
+#define MOP_IN(opcode)
+#define MOP_OUT
 #endif /* ONIG_DEBUG_STATISTICS */
 
 
-#ifdef ONIG_DEBUG_MATCH
-static char *
-stack_type_str(int stack_type)
-{
-  switch (stack_type) {
-    case STK_ALT:		return "Alt   ";
-    case STK_LOOK_BEHIND_NOT:	return "LBNot ";
-    case STK_POS_NOT:		return "PosNot";
-    case STK_MEM_START:		return "MemS  ";
-    case STK_MEM_END:		return "MemE  ";
-    case STK_REPEAT_INC:	return "RepInc";
-    case STK_STATE_CHECK_MARK:	return "StChMk";
-    case STK_NULL_CHECK_START:	return "NulChS";
-    case STK_NULL_CHECK_END:	return "NulChE";
-    case STK_MEM_END_MARK:	return "MemEMk";
-    case STK_POS:		return "Pos   ";
-    case STK_STOP_BT:		return "StopBt";
-    case STK_REPEAT:		return "Rep   ";
-    case STK_CALL_FRAME:	return "Call  ";
-    case STK_RETURN:		return "Ret   ";
-    case STK_VOID:		return "Void  ";
-    case STK_ABSENT_POS:	return "AbsPos";
-    case STK_ABSENT:		return "Absent";
-    default:			return "      ";
-  }
-}
-#endif
+
+/* matching region of POSIX API */
+typedef int regoff_t;
+
+typedef struct {
+  regoff_t  rm_so;
+  regoff_t  rm_eo;
+} posix_regmatch_t;
 
 /* match data(str - end) from position (sstart). */
 /* if sstart == str then set sprev to NULL. */
@@ -1454,16 +1376,15 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   int num_comb_exp_check = reg->num_comb_exp_check;
 #endif
 
-#if USE_TOKEN_THREADED_VM
-# define OP_OFFSET  1
-# define VM_LOOP JUMP;
-# define VM_LOOP_END
-# define CASE(x) L_##x: sbegin = s; OPCODE_EXEC_HOOK;
-# define DEFAULT L_DEFAULT:
-# define NEXT sprev = sbegin; JUMP
-# define JUMP RB_GNUC_EXTENSION_BLOCK(goto *oplabels[*p++])
+#if USE_DIRECT_THREADED_VM
+#define VM_LOOP JUMP;
+#define VM_LOOP_END
+#define CASE(x) L_##x: sbegin = s; OPCODE_EXEC_HOOK;
+#define DEFAULT L_DEFAULT:
+#define NEXT sprev = sbegin; JUMP
+#define JUMP goto *oplabels[*p++]
 
-  RB_GNUC_EXTENSION static const void *oplabels[] = {
+  static const void *oplabels[] = {
     &&L_OP_FINISH,               /* matching process terminator (no more alternative) */
     &&L_OP_END,                  /* pattern code terminator (success end) */
 
@@ -1489,6 +1410,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_CCLASS_NOT,
     &&L_OP_CCLASS_MB_NOT,
     &&L_OP_CCLASS_MIX_NOT,
+    &&L_OP_CCLASS_NODE,          /* pointer to CClassNode node */
 
     &&L_OP_ANYCHAR,                 /* "."  */
     &&L_OP_ANYCHAR_ML,              /* "."  multi-line */
@@ -1501,24 +1423,24 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_NOT_WORD,
     &&L_OP_WORD_BOUND,
     &&L_OP_NOT_WORD_BOUND,
-# ifdef USE_WORD_BEGIN_END
+#ifdef USE_WORD_BEGIN_END
     &&L_OP_WORD_BEGIN,
     &&L_OP_WORD_END,
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT,
-# endif
+#endif
     &&L_OP_ASCII_WORD,
     &&L_OP_NOT_ASCII_WORD,
     &&L_OP_ASCII_WORD_BOUND,
     &&L_OP_NOT_ASCII_WORD_BOUND,
-# ifdef USE_WORD_BEGIN_END
+#ifdef USE_WORD_BEGIN_END
     &&L_OP_ASCII_WORD_BEGIN,
     &&L_OP_ASCII_WORD_END,
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT,
-# endif
+#endif
 
     &&L_OP_BEGIN_BUF,
     &&L_OP_END_BUF,
@@ -1526,6 +1448,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_END_LINE,
     &&L_OP_SEMI_END_BUF,
     &&L_OP_BEGIN_POSITION,
+    &&L_OP_BEGIN_POS_OR_LINE,    /* used for implicit anchor optimization */
 
     &&L_OP_BACKREF1,
     &&L_OP_BACKREF2,
@@ -1533,25 +1456,25 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_BACKREFN_IC,
     &&L_OP_BACKREF_MULTI,
     &&L_OP_BACKREF_MULTI_IC,
-# ifdef USE_BACKREF_WITH_LEVEL
+#ifdef USE_BACKREF_WITH_LEVEL
     &&L_OP_BACKREF_WITH_LEVEL,   /* \k<xxx+n>, \k<xxx-n> */
-# else
+#else
     &&L_DEFAULT,
-# endif
+#endif
     &&L_OP_MEMORY_START,
     &&L_OP_MEMORY_START_PUSH,    /* push back-tracker to stack */
     &&L_OP_MEMORY_END_PUSH,      /* push back-tracker to stack */
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
     &&L_OP_MEMORY_END_PUSH_REC,  /* push back-tracker to stack */
-# else
+#else
     &&L_DEFAULT,
-# endif
+#endif
     &&L_OP_MEMORY_END,
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
     &&L_OP_MEMORY_END_REC,       /* push marker to stack */
-# else
+#else
     &&L_DEFAULT,
-# endif
+#endif
 
     &&L_OP_KEEP,
 
@@ -1559,11 +1482,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_JUMP,
     &&L_OP_PUSH,
     &&L_OP_POP,
-# ifdef USE_OP_PUSH_OR_JUMP_EXACT
     &&L_OP_PUSH_OR_JUMP_EXACT1,  /* if match exact then push, else jump. */
-# else
-    &&L_DEFAULT,
-# endif
     &&L_OP_PUSH_IF_PEEK_NEXT,    /* if match exact then push, else none. */
     &&L_OP_REPEAT,               /* {n,m} */
     &&L_OP_REPEAT_NG,            /* {n,m}? (non greedy) */
@@ -1573,16 +1492,16 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_REPEAT_INC_NG_SG,     /* search and get in stack (non greedy) */
     &&L_OP_NULL_CHECK_START,     /* null loop checker start */
     &&L_OP_NULL_CHECK_END,       /* null loop checker end   */
-# ifdef USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT
+#ifdef USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT
     &&L_OP_NULL_CHECK_END_MEMST, /* null loop checker end (with capture status) */
-# else
+#else
     &&L_DEFAULT,
-# endif
-# ifdef USE_SUBEXP_CALL
+#endif
+#ifdef USE_SUBEXP_CALL
     &&L_OP_NULL_CHECK_END_MEMST_PUSH, /* with capture status and push check-end */
-# else
+#else
     &&L_DEFAULT,
-# endif
+#endif
 
     &&L_OP_PUSH_POS,             /* (?=...)  start */
     &&L_OP_POP_POS,              /* (?=...)  end   */
@@ -1593,70 +1512,70 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     &&L_OP_LOOK_BEHIND,          /* (?<=...) start (no needs end opcode) */
     &&L_OP_PUSH_LOOK_BEHIND_NOT, /* (?<!...) start */
     &&L_OP_FAIL_LOOK_BEHIND_NOT, /* (?<!...) end   */
-    &&L_OP_PUSH_ABSENT_POS,      /* (?~...)  start */
-    &&L_OP_ABSENT,               /* (?~...)  start of inner loop */
-    &&L_OP_ABSENT_END,           /* (?~...)  end   */
 
-# ifdef USE_SUBEXP_CALL
+#ifdef USE_SUBEXP_CALL
     &&L_OP_CALL,                 /* \g<name> */
     &&L_OP_RETURN,
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT,
-# endif
+#endif
     &&L_OP_CONDITION,
 
-# ifdef USE_COMBINATION_EXPLOSION_CHECK
+#ifdef USE_COMBINATION_EXPLOSION_CHECK
     &&L_OP_STATE_CHECK_PUSH,         /* combination explosion check and push */
     &&L_OP_STATE_CHECK_PUSH_OR_JUMP, /* check ok -> push, else jump  */
     &&L_OP_STATE_CHECK,              /* check only */
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT,
     &&L_DEFAULT,
-# endif
-# ifdef USE_COMBINATION_EXPLOSION_CHECK
+#endif
+#ifdef USE_COMBINATION_EXPLOSION_CHECK
     &&L_OP_STATE_CHECK_ANYCHAR_STAR,
     &&L_OP_STATE_CHECK_ANYCHAR_ML_STAR,
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT,
-# endif
+#endif
     /* no need: IS_DYNAMIC_OPTION() == 0 */
-# if 0   /* no need: IS_DYNAMIC_OPTION() == 0 */
+#if 0   /* no need: IS_DYNAMIC_OPTION() == 0 */
     &&L_OP_SET_OPTION_PUSH,    /* set option and push recover option */
     &&L_OP_SET_OPTION          /* set option */
-# else
+#else
     &&L_DEFAULT,
     &&L_DEFAULT
-# endif
+#endif
   };
-#else /* USE_TOKEN_THREADED_VM */
+#else
 
-# define OP_OFFSET  0
-# define VM_LOOP                                \
+#define VM_LOOP                                 \
   while (1) {                                   \
   OPCODE_EXEC_HOOK;                             \
   sbegin = s;                                   \
   switch (*p++) {
-# define VM_LOOP_END } sprev = sbegin; }
-# define CASE(x) case x:
-# define DEFAULT default:
-# define NEXT break
-# define JUMP continue; break
-#endif /* USE_TOKEN_THREADED_VM */
+#define VM_LOOP_END } sprev = sbegin; }
+#define CASE(x) case x:
+#define DEFAULT default:
+#define NEXT break
+#define JUMP continue; break
+#endif
 
 
 #ifdef USE_SUBEXP_CALL
-/* Stack #0 is used to store the pattern itself and used for (?R), \g<0>,
-   etc. Additional space is required. */
-# define ADD_NUMMEM 1
-#else
-/* Stack #0 not is used. */
-# define ADD_NUMMEM 0
-#endif
+  /* Stack #0 is used to store the pattern itself and used for (?R), \g<0>, etc. */
+  n = reg->num_repeat + (reg->num_mem + 1) * 2;
 
-  n = reg->num_repeat + (reg->num_mem + ADD_NUMMEM) * 2;
+  STACK_INIT(alloca_base, xmalloc_base, n, INIT_MATCH_STACK_SIZE);
+  pop_level = reg->stack_pop_level;
+  num_mem = reg->num_mem;
+  repeat_stk = (OnigStackIndex* )alloca_base;
+
+  mem_start_stk = (OnigStackIndex* )(repeat_stk + reg->num_repeat);
+  mem_end_stk   = mem_start_stk + (num_mem + 1);
+#else /* USE_SUBEXP_CALL */
+  /* Stack #0 not is used. */
+  n = reg->num_repeat + reg->num_mem * 2;
 
   STACK_INIT(alloca_base, xmalloc_base, n, INIT_MATCH_STACK_SIZE);
   pop_level = reg->stack_pop_level;
@@ -1664,27 +1583,25 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   repeat_stk = (OnigStackIndex* )alloca_base;
 
   mem_start_stk = (OnigStackIndex* )(repeat_stk + reg->num_repeat);
-  mem_end_stk   = mem_start_stk + (num_mem + ADD_NUMMEM);
-  {
-    OnigStackIndex *pp = mem_start_stk;
-    for (; pp < repeat_stk + n; pp += 2) {
-      pp[0] = INVALID_STACK_INDEX;
-      pp[1] = INVALID_STACK_INDEX;
-    }
-  }
-#ifndef USE_SUBEXP_CALL
+  mem_end_stk   = mem_start_stk + num_mem;
   mem_start_stk--; /* for index start from 1,
 		      mem_start_stk[1]..mem_start_stk[num_mem] */
   mem_end_stk--;   /* for index start from 1,
 		      mem_end_stk[1]..mem_end_stk[num_mem] */
-#endif
+#endif /* USE_SUBEXP_CALL */
+  {
+      OnigStackIndex *pp = mem_start_stk;
+      for (; pp < (repeat_stk + n); pp+=2) {
+	  pp[0] = INVALID_STACK_INDEX;
+	  pp[1] = INVALID_STACK_INDEX;
+      }
+  }
 
 #ifdef ONIG_DEBUG_MATCH
-  fprintf(stderr, "match_at: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), start: %"PRIuPTR" (%p), sprev: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )str, str, (uintptr_t )end, end, (uintptr_t )sstart, sstart, (uintptr_t )sprev, sprev);
+  fprintf(stderr, "match_at: str: %"PRIdPTR" (%p), end: %"PRIdPTR" (%p), start: %"PRIdPTR" (%p), sprev: %"PRIdPTR" (%p)\n",
+	  (intptr_t )str, str, (intptr_t )end, end, (intptr_t )sstart, sstart, (intptr_t )sprev, sprev);
   fprintf(stderr, "size: %d, start offset: %d\n",
 	  (int )(end - str), (int )(sstart - str));
-  fprintf(stderr, "\n ofs> str                   stk:type   addr:opcode\n");
 #endif
 
   STACK_PUSH_ENSURED(STK_ALT, (UChar* )FinishCode);  /* bottom stack */
@@ -1694,34 +1611,30 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
 
 #ifdef ONIG_DEBUG_MATCH
-# define OPCODE_EXEC_HOOK                                               \
+#define OPCODE_EXEC_HOOK                                                \
     if (s) {                                                            \
-      UChar *op, *q, *bp, buf[50];                                      \
+      UChar *q, *bp, buf[50];                                           \
       int len;                                                          \
-      op = p - OP_OFFSET;                                               \
-      fprintf(stderr, "%4"PRIdPTR"> \"", (*op == OP_FINISH) ? (ptrdiff_t )-1 : s - str); \
+      fprintf(stderr, "%4"PRIdPTR"> \"", (*p == OP_FINISH) ? (ptrdiff_t )-1 : s - str); \
       bp = buf;                                                         \
       q = s;                                                            \
-      if (*op != OP_FINISH) {    /* s may not be a valid pointer if OP_FINISH. */ \
+      if (*p != OP_FINISH) {    /* s may not be a valid pointer if OP_FINISH. */ \
 	for (i = 0; i < 7 && q < end; i++) {                            \
-	  len = enclen(encode, q, end);                                 \
+	  len = enclen(encode, q, end);                                  \
 	  while (len-- > 0) *bp++ = *q++;                               \
 	}                                                               \
-        if (q < end) { xmemcpy(bp, "...", 3); bp += 3; }                \
       }                                                                 \
-      xmemcpy(bp, "\"", 1); bp += 1;                                    \
+      if (q < end) { xmemcpy(bp, "...\"", 4); bp += 4; }                \
+      else         { xmemcpy(bp, "\"",    1); bp += 1; }                \
       *bp = 0;                                                          \
       fputs((char* )buf, stderr);                                       \
       for (i = 0; i < 20 - (bp - buf); i++) fputc(' ', stderr);         \
-      fprintf(stderr, "%4"PRIdPTR":%s %4"PRIdPTR":",                    \
-	  stk - stk_base - 1,                                           \
-	  (stk > stk_base) ? stack_type_str(stk[-1].type) : "      ",   \
-	  (op == FinishCode) ? (ptrdiff_t )-1 : op - reg->p);           \
-      onig_print_compiled_byte_code(stderr, op, reg->p+reg->used, NULL, encode); \
+      fprintf(stderr, "%4"PRIdPTR":", (p == FinishCode) ? (ptrdiff_t )-1 : p - reg->p); \
+      onig_print_compiled_byte_code(stderr, p, p + strlen((char *)p),NULL, encode); \
       fprintf(stderr, "\n");                                            \
     }
 #else
-# define OPCODE_EXEC_HOOK ((void) 0)
+#define OPCODE_EXEC_HOOK ((void) 0)
 #endif
 
 
@@ -1738,56 +1651,83 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  }
 	  else
 	    goto end_best_len;
-	}
+        }
 #endif
 	best_len = n;
 	region = msa->region;
 	if (region) {
-	  region->beg[0] = ((pkeep > s) ? s : pkeep) - str;
-	  region->end[0] = s - str;
-	  for (i = 1; i <= num_mem; i++) {
-	    if (mem_end_stk[i] != INVALID_STACK_INDEX) {
-	      if (BIT_STATUS_AT(reg->bt_mem_start, i))
-		region->beg[i] = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
-	      else
-		region->beg[i] = (UChar* )((void* )mem_start_stk[i]) - str;
-
-	      region->end[i] = (BIT_STATUS_AT(reg->bt_mem_end, i)
+#ifdef USE_POSIX_API_REGION_OPTION
+	  if (IS_POSIX_REGION(msa->options)) {
+	    posix_regmatch_t* rmt = (posix_regmatch_t* )region;
+
+	    rmt[0].rm_so = (regoff_t )(((pkeep > s) ? s : pkeep) - str);
+	    rmt[0].rm_eo = (regoff_t )(s - str);
+	    for (i = 1; i <= num_mem; i++) {
+	      if (mem_end_stk[i] != INVALID_STACK_INDEX) {
+		if (BIT_STATUS_AT(reg->bt_mem_start, i))
+		  rmt[i].rm_so = (regoff_t )(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
+		else
+		  rmt[i].rm_so = (regoff_t )((UChar* )((void* )(mem_start_stk[i])) - str);
+
+		rmt[i].rm_eo = (regoff_t )((BIT_STATUS_AT(reg->bt_mem_end, i)
 				? STACK_AT(mem_end_stk[i])->u.mem.pstr
-				: (UChar* )((void* )mem_end_stk[i])) - str;
-	    }
-	    else {
-	      region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;
+				: (UChar* )((void* )mem_end_stk[i])) - str);
+	      }
+	      else {
+		rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;
+	      }
 	    }
 	  }
-
-#ifdef USE_CAPTURE_HISTORY
-	  if (reg->capture_history != 0) {
-	    int r;
-	    OnigCaptureTreeNode* node;
-
-	    if (IS_NULL(region->history_root)) {
-	      region->history_root = node = history_node_new();
-	      CHECK_NULL_RETURN_MEMERR(node);
-	    }
-	    else {
-	      node = region->history_root;
-	      history_tree_clear(node);
+	  else {
+#endif /* USE_POSIX_API_REGION_OPTION */
+	    region->beg[0] = ((pkeep > s) ? s : pkeep) - str;
+	    region->end[0] = s - str;
+	    for (i = 1; i <= num_mem; i++) {
+	      if (mem_end_stk[i] != INVALID_STACK_INDEX) {
+		if (BIT_STATUS_AT(reg->bt_mem_start, i))
+		  region->beg[i] = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
+		else
+		  region->beg[i] = (UChar* )((void* )mem_start_stk[i]) - str;
+
+		region->end[i] = (BIT_STATUS_AT(reg->bt_mem_end, i)
+				  ? STACK_AT(mem_end_stk[i])->u.mem.pstr
+				  : (UChar* )((void* )mem_end_stk[i])) - str;
+	      }
+	      else {
+		region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;
+	      }
 	    }
 
-	    node->group = 0;
-	    node->beg   = ((pkeep > s) ? s : pkeep) - str;
-	    node->end   = s - str;
-
-	    stkp = stk_base;
-	    r = make_capture_history_tree(region->history_root, &stkp,
-		stk, (UChar* )str, reg);
-	    if (r < 0) {
-	      best_len = r; /* error code */
-	      goto finish;
+#ifdef USE_CAPTURE_HISTORY
+	    if (reg->capture_history != 0) {
+              int r;
+              OnigCaptureTreeNode* node;
+
+              if (IS_NULL(region->history_root)) {
+                region->history_root = node = history_node_new();
+                CHECK_NULL_RETURN_MEMERR(node);
+              }
+              else {
+                node = region->history_root;
+                history_tree_clear(node);
+              }
+
+              node->group = 0;
+              node->beg   = ((pkeep > s) ? s : pkeep) - str;
+              node->end   = s - str;
+
+              stkp = stk_base;
+              r = make_capture_history_tree(region->history_root, &stkp,
+                                            stk, (UChar* )str, reg);
+              if (r < 0) {
+                best_len = r; /* error code */
+                goto finish;
+              }
 	    }
-	  }
 #endif /* USE_CAPTURE_HISTORY */
+#ifdef USE_POSIX_API_REGION_OPTION
+	  } /* else IS_POSIX_REGION() */
+#endif
 	} /* if (region) */
       } /* n > best_len */
 
@@ -1811,9 +1751,14 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       NEXT;
 
     CASE(OP_EXACT1)  MOP_IN(OP_EXACT1);
+#if 0
       DATA_ENSURE(1);
       if (*p != *s) goto fail;
       p++; s++;
+#endif
+      if (*p != *s++) goto fail;
+      DATA_ENSURE(0);
+      p++;
       MOP_OUT;
       NEXT;
 
@@ -1831,8 +1776,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	q = lowbuf;
 	while (len-- > 0) {
 	  if (*p != *q) {
-	    goto fail;
-	  }
+            goto fail;
+          }
 	  p++; q++;
 	}
       }
@@ -2090,7 +2035,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	int mb_len = enclen(encode, s, end);
 
 	if (! DATA_ENSURE_CHECK(mb_len)) {
-	  DATA_ENSURE(1);
+          DATA_ENSURE(1);
 	  s = (UChar* )end;
 	  p += tlen;
 	  goto cc_mb_not_success;
@@ -2132,6 +2077,25 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       MOP_OUT;
       NEXT;
 
+    CASE(OP_CCLASS_NODE)  MOP_IN(OP_CCLASS_NODE);
+      {
+	OnigCodePoint code;
+        void *node;
+        int mb_len;
+        UChar *ss;
+
+        DATA_ENSURE(1);
+        GET_POINTER_INC(node, p);
+	mb_len = enclen(encode, s, end);
+	ss = s;
+	s += mb_len;
+	DATA_ENSURE(0);
+	code = ONIGENC_MBC_TO_CODE(encode, ss, s);
+	if (onig_is_code_in_cc_len(mb_len, code, node) == 0) goto fail;
+      }
+      MOP_OUT;
+      NEXT;
+
     CASE(OP_ANYCHAR)  MOP_IN(OP_ANYCHAR);
       DATA_ENSURE(1);
       n = enclen(encode, s, end);
@@ -2153,13 +2117,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       while (DATA_ENSURE_CHECK1) {
 	STACK_PUSH_ALT(p, s, sprev, pkeep);
 	n = enclen(encode, s, end);
-	DATA_ENSURE(n);
-	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
-	sprev = s;
-	s += n;
+        DATA_ENSURE(n);
+        if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
+        sprev = s;
+        s += n;
       }
       MOP_OUT;
-      JUMP;
+      NEXT;
 
     CASE(OP_ANYCHAR_ML_STAR)  MOP_IN(OP_ANYCHAR_ML_STAR);
       while (DATA_ENSURE_CHECK1) {
@@ -2176,7 +2140,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	}
       }
       MOP_OUT;
-      JUMP;
+      NEXT;
 
     CASE(OP_ANYCHAR_STAR_PEEK_NEXT)  MOP_IN(OP_ANYCHAR_STAR_PEEK_NEXT);
       while (DATA_ENSURE_CHECK1) {
@@ -2184,10 +2148,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  STACK_PUSH_ALT(p + 1, s, sprev, pkeep);
 	}
 	n = enclen(encode, s, end);
-	DATA_ENSURE(n);
-	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
-	sprev = s;
-	s += n;
+        DATA_ENSURE(n);
+        if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
+        sprev = s;
+        s += n;
       }
       p++;
       MOP_OUT;
@@ -2222,10 +2186,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
 	STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem, pkeep);
 	n = enclen(encode, s, end);
-	DATA_ENSURE(n);
-	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
-	sprev = s;
-	s += n;
+        DATA_ENSURE(n);
+        if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
+        sprev = s;
+        s += n;
       }
       MOP_OUT;
       NEXT;
@@ -2417,6 +2381,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       JUMP;
 
     CASE(OP_BEGIN_LINE)  MOP_IN(OP_BEGIN_LINE);
+    op_begin_line:
       if (ON_STR_BEGIN(s)) {
 	if (IS_NOTBOL(msa->options)) goto fail;
 	MOP_OUT;
@@ -2492,6 +2457,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       MOP_OUT;
       JUMP;
 
+    CASE(OP_BEGIN_POS_OR_LINE)  MOP_IN(OP_BEGIN_POS_OR_LINE);
+      if (s != msa->gpos)
+	goto op_begin_line;
+
+      MOP_OUT;
+      JUMP;
+
     CASE(OP_MEMORY_START_PUSH)  MOP_IN(OP_MEMORY_START_PUSH);
       GET_MEMNUM_INC(mem, p);
       STACK_PUSH_MEM_START(mem, s);
@@ -2501,7 +2473,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     CASE(OP_MEMORY_START)  MOP_IN(OP_MEMORY_START);
       GET_MEMNUM_INC(mem, p);
       mem_start_stk[mem] = (OnigStackIndex )((void* )s);
-      mem_end_stk[mem] = INVALID_STACK_INDEX;
       MOP_OUT;
       JUMP;
 
@@ -2709,8 +2680,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	GET_LENGTH_INC(tlen,  p);
 
 	sprev = s;
-	if (backref_match_at_nested_level(reg, stk, stk_base, ic,
-		  case_fold_flag, (int )level, (int )tlen, p, &s, end)) {
+	if (backref_match_at_nested_level(reg, stk, stk_base, ic
+		  , case_fold_flag, (int )level, (int )tlen, p, &s, end)) {
 	  while (sprev + (len = enclen(encode, sprev, end)) < s)
 	    sprev += len;
 
@@ -2753,8 +2724,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	STACK_NULL_CHECK(isnull, mem, s);
 	if (isnull) {
 #ifdef ONIG_DEBUG_MATCH
-	  fprintf(stderr, "NULL_CHECK_END: skip  id:%d, s:%"PRIuPTR" (%p)\n",
-		  (int )mem, (uintptr_t )s, s);
+	  fprintf(stderr, "NULL_CHECK_END: skip  id:%d, s:%"PRIdPTR" (%p)\n",
+		  (int )mem, (intptr_t )s, s);
 #endif
 	null_check_found:
 	  /* empty loop founded, skip next instruction */
@@ -2786,10 +2757,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	GET_MEMNUM_INC(mem, p); /* mem: null check id */
 	STACK_NULL_CHECK_MEMST(isnull, mem, s, reg);
 	if (isnull) {
-# ifdef ONIG_DEBUG_MATCH
-	  fprintf(stderr, "NULL_CHECK_END_MEMST: skip  id:%d, s:%"PRIuPTR" (%p)\n",
-		  (int )mem, (uintptr_t )s, s);
-# endif
+#ifdef ONIG_DEBUG_MATCH
+	  fprintf(stderr, "NULL_CHECK_END_MEMST: skip  id:%d, s:%"PRIdPTR" (%p)\n",
+		  (int )mem, (intptr_t )s, s);
+#endif
 	  if (isnull == -1) goto fail;
 	  goto null_check_found;
 	}
@@ -2805,16 +2776,16 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	int isnull;
 
 	GET_MEMNUM_INC(mem, p); /* mem: null check id */
-# ifdef USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT
+#ifdef USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT
 	STACK_NULL_CHECK_MEMST_REC(isnull, mem, s, reg);
-# else
+#else
 	STACK_NULL_CHECK_REC(isnull, mem, s);
-# endif
+#endif
 	if (isnull) {
-# ifdef ONIG_DEBUG_MATCH
-	  fprintf(stderr, "NULL_CHECK_END_MEMST_PUSH: skip  id:%d, s:%"PRIuPTR" (%p)\n",
-		  (int )mem, (uintptr_t )s, s);
-# endif
+#ifdef ONIG_DEBUG_MATCH
+	  fprintf(stderr, "NULL_CHECK_END_MEMST_PUSH: skip  id:%d, s:%"PRIdPTR" (%p)\n",
+		  (int )mem, (intptr_t )s, s);
+#endif
 	  if (isnull == -1) goto fail;
 	  goto null_check_found;
 	}
@@ -2878,7 +2849,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       MOP_OUT;
       JUMP;
 
-#ifdef USE_OP_PUSH_OR_JUMP_EXACT
     CASE(OP_PUSH_OR_JUMP_EXACT1)  MOP_IN(OP_PUSH_OR_JUMP_EXACT1);
       GET_RELADDR_INC(addr, p);
       if (*p == *s && DATA_ENSURE_CHECK1) {
@@ -2890,7 +2860,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       p += (addr + 1);
       MOP_OUT;
       JUMP;
-#endif
 
     CASE(OP_PUSH_IF_PEEK_NEXT)  MOP_IN(OP_PUSH_IF_PEEK_NEXT);
       GET_RELADDR_INC(addr, p);
@@ -2945,14 +2914,14 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     repeat_inc:
       stkp->u.repeat.count++;
       if (stkp->u.repeat.count >= reg->repeat_range[mem].upper) {
-	/* end of repeat. Nothing to do. */
+        /* end of repeat. Nothing to do. */
       }
       else if (stkp->u.repeat.count >= reg->repeat_range[mem].lower) {
-	STACK_PUSH_ALT(p, s, sprev, pkeep);
-	p = STACK_AT(si)->u.repeat.pcode; /* Don't use stkp after PUSH. */
+        STACK_PUSH_ALT(p, s, sprev, pkeep);
+        p = STACK_AT(si)->u.repeat.pcode; /* Don't use stkp after PUSH. */
       }
       else {
-	p = stkp->u.repeat.pcode;
+        p = stkp->u.repeat.pcode;
       }
       STACK_PUSH_REPEAT_INC(si);
       MOP_OUT;
@@ -2974,19 +2943,19 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     repeat_inc_ng:
       stkp->u.repeat.count++;
       if (stkp->u.repeat.count < reg->repeat_range[mem].upper) {
-	if (stkp->u.repeat.count >= reg->repeat_range[mem].lower) {
-	  UChar* pcode = stkp->u.repeat.pcode;
-
-	  STACK_PUSH_REPEAT_INC(si);
-	  STACK_PUSH_ALT(pcode, s, sprev, pkeep);
-	}
-	else {
-	  p = stkp->u.repeat.pcode;
-	  STACK_PUSH_REPEAT_INC(si);
-	}
+        if (stkp->u.repeat.count >= reg->repeat_range[mem].lower) {
+          UChar* pcode = stkp->u.repeat.pcode;
+
+          STACK_PUSH_REPEAT_INC(si);
+          STACK_PUSH_ALT(pcode, s, sprev, pkeep);
+        }
+        else {
+          p = stkp->u.repeat.pcode;
+          STACK_PUSH_REPEAT_INC(si);
+        }
       }
       else if (stkp->u.repeat.count == reg->repeat_range[mem].upper) {
-	STACK_PUSH_REPEAT_INC(si);
+        STACK_PUSH_REPEAT_INC(si);
       }
       MOP_OUT;
       CHECK_INTERRUPT_IN_MATCH_AT;
@@ -3065,63 +3034,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       goto fail;
       NEXT;
 
-    CASE(OP_PUSH_ABSENT_POS)  MOP_IN(OP_PUSH_ABSENT_POS);
-      /* Save the absent-start-pos and the original end-pos. */
-      STACK_PUSH_ABSENT_POS(s, ABSENT_END_POS);
-      MOP_OUT;
-      JUMP;
-
-    CASE(OP_ABSENT)  MOP_IN(OP_ABSENT);
-      {
-	const UChar* aend = ABSENT_END_POS;
-	UChar* absent;
-	UChar* selfp = p - 1;
-
-	STACK_POP_ABSENT_POS(absent, ABSENT_END_POS);  /* Restore end-pos. */
-	GET_RELADDR_INC(addr, p);
-#ifdef ONIG_DEBUG_MATCH
-	fprintf(stderr, "ABSENT: s:%p, end:%p, absent:%p, aend:%p\n", s, end, absent, aend);
-#endif
-	if ((absent > aend) && (s > absent)) {
-	  /* An empty match occurred in (?~...) at the start point.
-	   * Never match. */
-	  STACK_POP;
-	  goto fail;
-	}
-	else if ((s >= aend) && (s > absent)) {
-	  if (s > aend) {
-	    /* Only one (or less) character matched in the last iteration.
-	     * This is not a possible point. */
-	    goto fail;
-	  }
-	  /* All possible points were found. Try matching after (?~...). */
-	  DATA_ENSURE(0);
-	  p += addr;
-	}
-	else {
-	  STACK_PUSH_ALT(p + addr, s, sprev, pkeep); /* Push possible point. */
-	  n = enclen(encode, s, end);
-	  STACK_PUSH_ABSENT_POS(absent, ABSENT_END_POS); /* Save the original pos. */
-	  STACK_PUSH_ALT(selfp, s + n, s, pkeep); /* Next iteration. */
-	  STACK_PUSH_ABSENT;
-	  ABSENT_END_POS = aend;
-	}
-      }
-      MOP_OUT;
-      JUMP;
-
-    CASE(OP_ABSENT_END)  MOP_IN(OP_ABSENT_END);
-      /* The pattern inside (?~...) was matched.
-       * Set the end-pos temporary and go to next iteration. */
-      if (sprev < ABSENT_END_POS)
-	ABSENT_END_POS = sprev;
-#ifdef ONIG_DEBUG_MATCH
-      fprintf(stderr, "ABSENT_END: end:%p\n", ABSENT_END_POS);
-#endif
-      STACK_POP_TIL_ABSENT;
-      goto fail;
-      NEXT;
-
 #ifdef USE_SUBEXP_CALL
     CASE(OP_CALL)  MOP_IN(OP_CALL);
       GET_ABSADDR_INC(addr, p);
@@ -3152,13 +3064,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       goto finish;
       NEXT;
 
-    CASE(OP_FAIL)
-      if (0) {
-	/* fall */
-      fail:
-	MOP_OUT;
-      }
-      MOP_IN(OP_FAIL);
+    fail:
+      MOP_OUT;
+      /* fall */
+    CASE(OP_FAIL)  MOP_IN(OP_FAIL);
       STACK_POP;
       p     = stk->u.state.pcode;
       s     = stk->u.state.pstr;
@@ -3167,8 +3076,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
       if (stk->u.state.state_check != 0) {
-	stk->type = STK_STATE_CHECK_MARK;
-	stk++;
+        stk->type = STK_STATE_CHECK_MARK;
+        stk++;
       }
 #endif
 
@@ -3245,7 +3154,7 @@ slow_search(OnigEncoding enc, UChar* target, UChar* target_end,
 
 static int
 str_lower_case_match(OnigEncoding enc, int case_fold_flag,
-		     const UChar* t, const UChar* tend,
+                     const UChar* t, const UChar* tend,
 		     const UChar* p, const UChar* end)
 {
   int lowlen;
@@ -3337,7 +3246,7 @@ slow_search_backward_ic(OnigEncoding enc, int case_fold_flag,
 
   while (s >= text) {
     if (str_lower_case_match(enc, case_fold_flag,
-			     target, target_end, s, text_end))
+                             target, target_end, s, text_end))
       return s;
 
     s = (UChar* )onigenc_get_prev_char_head(enc, adjust_text, s, text_end);
@@ -3357,10 +3266,10 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
   const UChar *tail;
   ptrdiff_t skip, tlen1;
 
-# ifdef ONIG_DEBUG_SEARCH
+#ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "bm_search_notrev: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
+	  text, text, text_end, text_end, text_range, text_range);
+#endif
 
   tail = target_end - 1;
   tlen1 = tail - target;
@@ -3381,12 +3290,11 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->map[*se];
       t = s;
       do {
-	s += enclen(reg->enc, s, end);
+        s += enclen(reg->enc, s, end);
       } while ((s - t) < skip && s < end);
     }
   }
   else {
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = se = s + tlen1;
       t = tail;
@@ -3397,10 +3305,9 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->int_map[*se];
       t = s;
       do {
-	s += enclen(reg->enc, s, end);
+        s += enclen(reg->enc, s, end);
       } while ((s - t) < skip && s < end);
     }
-# endif
   }
 
   return (UChar* )NULL;
@@ -3414,10 +3321,10 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
   const UChar *s, *t, *p, *end;
   const UChar *tail;
 
-# ifdef ONIG_DEBUG_SEARCH
-  fprintf(stderr, "bm_search: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
+#ifdef ONIG_DEBUG_SEARCH
+  fprintf(stderr, "bm_search: text: %"PRIuPTR", text_end: %"PRIuPTR", text_range: %"PRIuPTR"\n",
+	  text, text_end, text_range);
+#endif
 
   end = text_range + (target_end - target) - 1;
   if (end > text_end)
@@ -3429,10 +3336,10 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
     while (s < end) {
       p = s;
       t = tail;
-# ifdef ONIG_DEBUG_SEARCH
+#ifdef ONIG_DEBUG_SEARCH
       fprintf(stderr, "bm_search_loop: pos: %"PRIdPTR" %s\n",
 	  (intptr_t )(s - text), s);
-# endif
+#endif
       while (*p == *t) {
 	if (t == target) return (UChar* )p;
 	p--; t--;
@@ -3441,7 +3348,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
     }
   }
   else { /* see int_map[] */
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = s;
       t = tail;
@@ -3451,7 +3357,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
       }
       s += reg->int_map[*s];
     }
-# endif
   }
   return (UChar* )NULL;
 }
@@ -3468,10 +3373,10 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
   OnigEncoding enc = reg->enc;
   int case_fold_flag = reg->case_fold_flag;
 
-# ifdef ONIG_DEBUG_SEARCH
+#ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "bm_search_notrev_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
 	  (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-# endif
+#endif
 
   tail = target_end - 1;
   tlen1 = tail - target;
@@ -3490,12 +3395,11 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->map[*se];
       t = s;
       do {
-	s += enclen(reg->enc, s, end);
+        s += enclen(reg->enc, s, end);
       } while ((s - t) < skip && s < end);
     }
   }
   else {
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       se = s + tlen1;
       if (str_lower_case_match(enc, case_fold_flag, target, target_end,
@@ -3504,10 +3408,9 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->int_map[*se];
       t = s;
       do {
-	s += enclen(reg->enc, s, end);
+        s += enclen(reg->enc, s, end);
       } while ((s - t) < skip && s < end);
     }
-# endif
   }
 
   return (UChar* )NULL;
@@ -3523,10 +3426,10 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
   OnigEncoding enc = reg->enc;
   int case_fold_flag = reg->case_fold_flag;
 
-# ifdef ONIG_DEBUG_SEARCH
+#ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "bm_search_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
 	  (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-# endif
+#endif
 
   end = text_range + (target_end - target) - 1;
   if (end > text_end)
@@ -3544,7 +3447,6 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
     }
   }
   else { /* see int_map[] */
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = s - (target_end - target) + 1;
       if (str_lower_case_match(enc, case_fold_flag, target, target_end,
@@ -3552,7 +3454,6 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
 	return (UChar* )p;
       s += reg->int_map[*s];
     }
-# endif
   }
   return (UChar* )NULL;
 }
@@ -3570,10 +3471,10 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
   ptrdiff_t skip, tlen1;
   OnigEncoding enc = reg->enc;
 
-# ifdef ONIG_DEBUG_SEARCH
-  fprintf(stderr, "bm_search_notrev: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
+#ifdef ONIG_DEBUG_SEARCH
+  fprintf(stderr, "bm_search_notrev: text: %"PRIdPTR" (%p), text_end: %"PRIdPTR" (%p), text_range: %"PRIdPTR" (%p)\n",
+	  (intptr_t )text, text, (intptr_t )text_end, text_end, (intptr_t )text_range, text_range);
+#endif
 
   tail = target_end - 1;
   tlen1 = tail - target;
@@ -3595,12 +3496,11 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->map[se[1]];
       t = s;
       do {
-	s += enclen(enc, s, end);
+        s += enclen(enc, s, end);
       } while ((s - t) < skip && s < end);
     }
   }
   else {
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = se = s + tlen1;
       t = tail;
@@ -3612,10 +3512,9 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->int_map[se[1]];
       t = s;
       do {
-	s += enclen(enc, s, end);
+        s += enclen(enc, s, end);
       } while ((s - t) < skip && s < end);
     }
-# endif
   }
 
   return (UChar* )NULL;
@@ -3630,11 +3529,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
   const UChar *tail;
   ptrdiff_t tlen1;
 
-# ifdef ONIG_DEBUG_SEARCH
-  fprintf(stderr, "bm_search: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
-
   tail = target_end - 1;
   tlen1 = tail - target;
   end = text_range + tlen1;
@@ -3655,7 +3549,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
     }
   }
   else { /* see int_map[] */
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = s;
       t = tail;
@@ -3666,7 +3559,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
       if (s + 1 >= end) break;
       s += reg->int_map[s[1]];
     }
-# endif
   }
   return (UChar* )NULL;
 }
@@ -3683,10 +3575,10 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
   OnigEncoding enc = reg->enc;
   int case_fold_flag = reg->case_fold_flag;
 
-# ifdef ONIG_DEBUG_SEARCH
-  fprintf(stderr, "bm_search_notrev_ic: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
+#ifdef ONIG_DEBUG_SEARCH
+  fprintf(stderr, "bm_search_notrev_ic: text: %"PRIdPTR" (%p), text_end: %"PRIdPTR" (%p), text_range: %"PRIdPTR" (%p)\n",
+	  (intptr_t )text, text, (intptr_t )text_end, text_end, (intptr_t )text_range, text_range);
+#endif
 
   tail = target_end - 1;
   tlen1 = tail - target;
@@ -3706,12 +3598,11 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->map[se[1]];
       t = s;
       do {
-	s += enclen(enc, s, end);
+        s += enclen(enc, s, end);
       } while ((s - t) < skip && s < end);
     }
   }
   else {
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       se = s + tlen1;
       if (str_lower_case_match(enc, case_fold_flag, target, target_end,
@@ -3721,10 +3612,9 @@ bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
       skip = reg->int_map[se[1]];
       t = s;
       do {
-	s += enclen(enc, s, end);
+        s += enclen(enc, s, end);
       } while ((s - t) < skip && s < end);
     }
-# endif
   }
 
   return (UChar* )NULL;
@@ -3741,10 +3631,10 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
   OnigEncoding enc = reg->enc;
   int case_fold_flag = reg->case_fold_flag;
 
-# ifdef ONIG_DEBUG_SEARCH
-  fprintf(stderr, "bm_search_ic: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )text, text, (uintptr_t )text_end, text_end, (uintptr_t )text_range, text_range);
-# endif
+#ifdef ONIG_DEBUG_SEARCH
+  fprintf(stderr, "bm_search_ic: text: %"PRIdPTR" (%p), text_end: %"PRIdPTR" (%p), text_range: %"PRIdPTR" (%p)\n",
+	  (intptr_t )text, text, (intptr_t )text_end, text_end, (intptr_t )text_range, text_range);
+#endif
 
   tail = target_end - 1;
   tlen1 = tail - target;
@@ -3764,7 +3654,6 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
     }
   }
   else { /* see int_map[] */
-# if OPT_EXACT_MAXLEN >= ONIG_CHAR_TABLE_SIZE
     while (s < end) {
       p = s - tlen1;
       if (str_lower_case_match(enc, case_fold_flag, target, target_end,
@@ -3773,13 +3662,11 @@ bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
       if (s + 1 >= end) break;
       s += reg->int_map[s[1]];
     }
-# endif
   }
   return (UChar* )NULL;
 }
 #endif /* USE_SUNDAY_QUICK_SEARCH */
 
-#ifdef USE_INT_MAP_BACKWARD
 static int
 set_bm_backward_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
 		     int** skip)
@@ -3829,7 +3716,6 @@ bm_search_backward(regex_t* reg, const UChar* target, const UChar* target_end,
 
   return (UChar* )NULL;
 }
-#endif
 
 static UChar*
 map_search(OnigEncoding enc, UChar map[],
@@ -3868,6 +3754,31 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, On
   UChar *prev;
   OnigMatchArg msa;
 
+#if defined(USE_RECOMPILE_API) && defined(USE_MULTI_THREAD_SYSTEM)
+ start:
+  THREAD_ATOMIC_START;
+  if (ONIG_STATE(reg) >= ONIG_STATE_NORMAL) {
+    ONIG_STATE_INC(reg);
+    if (IS_NOT_NULL(reg->chain) && ONIG_STATE(reg) == ONIG_STATE_NORMAL) {
+      onig_chain_reduce(reg);
+      ONIG_STATE_INC(reg);
+    }
+  }
+  else {
+    int n;
+
+    THREAD_ATOMIC_END;
+    n = 0;
+    while (ONIG_STATE(reg) < ONIG_STATE_NORMAL) {
+      if (++n > THREAD_PASS_LIMIT_COUNT)
+	return ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT;
+      THREAD_PASS;
+    }
+    goto start;
+  }
+  THREAD_ATOMIC_END;
+#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */
+
   MATCH_ARG_INIT(msa, option, region, at, at);
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
   {
@@ -3876,7 +3787,11 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, On
   }
 #endif
 
-  if (region) {
+  if (region
+#ifdef USE_POSIX_API_REGION_OPTION
+      && !IS_POSIX_REGION(option)
+#endif
+      ) {
     r = onig_region_resize_clear(region, reg->num_mem + 1);
   }
   else
@@ -3892,6 +3807,7 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, On
   }
 
   MATCH_ARG_FREE(msa);
+  ONIG_STATE_DEC_THREAD(reg);
   return r;
 }
 
@@ -3903,7 +3819,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 
 #ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "forward_search_range: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), s: %"PRIuPTR" (%p), range: %"PRIuPTR" (%p)\n",
-	  (uintptr_t )str, str, (uintptr_t )end, end, (uintptr_t )s, s, (uintptr_t )range, range);
+	  (intptr_t )str, str, (intptr_t )end, end, (intptr_t )s, s, (intptr_t )range, range);
 #endif
 
   p = s;
@@ -3913,8 +3829,6 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
     }
     else {
       UChar *q = p + reg->dmin;
-
-      if (q >= end) return 0; /* fail */
       while (p < q) p += enclen(reg->enc, p, end);
     }
   }
@@ -3926,7 +3840,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
     break;
   case ONIG_OPTIMIZE_EXACT_IC:
     p = slow_search_ic(reg->enc, reg->case_fold_flag,
-		       reg->exact, reg->exact_end, p, end, range);
+                       reg->exact, reg->exact_end, p, end, range);
     break;
 
   case ONIG_OPTIMIZE_EXACT_BM:
@@ -3998,25 +3912,18 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
     }
     else {
       if (reg->dmax != ONIG_INFINITE_DISTANCE) {
-	if (p < str + reg->dmax) {
-	  *low = (UChar* )str;
-	  if (low_prev)
-	    *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low, end);
+	*low = p - reg->dmax;
+	if (*low > s) {
+	  *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
+							      *low, end, (const UChar** )low_prev);
+	  if (low_prev && IS_NULL(*low_prev))
+	    *low_prev = onigenc_get_prev_char_head(reg->enc,
+						   (pprev ? pprev : s), *low, end);
 	}
 	else {
-	  *low = p - reg->dmax;
-	  if (*low > s) {
-	    *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
-								*low, end, (const UChar** )low_prev);
-	    if (low_prev && IS_NULL(*low_prev))
-	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-						     (pprev ? pprev : s), *low, end);
-	  }
-	  else {
-	    if (low_prev)
-	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-						 (pprev ? pprev : str), *low, end);
-	  }
+	  if (low_prev)
+	    *low_prev = onigenc_get_prev_char_head(reg->enc,
+					       (pprev ? pprev : str), *low, end);
 	}
       }
     }
@@ -4041,6 +3948,7 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
 		      UChar* s, const UChar* range, UChar* adjrange,
 		      UChar** low, UChar** high)
 {
+  int r;
   UChar *p;
 
   range += reg->dmin;
@@ -4058,15 +3966,13 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
   case ONIG_OPTIMIZE_EXACT_BM_IC:
   case ONIG_OPTIMIZE_EXACT_BM_NOT_REV_IC:
     p = slow_search_backward_ic(reg->enc, reg->case_fold_flag,
-				reg->exact, reg->exact_end,
-				range, adjrange, end, p);
+                                reg->exact, reg->exact_end,
+                                range, adjrange, end, p);
     break;
 
   case ONIG_OPTIMIZE_EXACT_BM:
   case ONIG_OPTIMIZE_EXACT_BM_NOT_REV:
-#ifdef USE_INT_MAP_BACKWARD
     if (IS_NULL(reg->int_map_backward)) {
-      int r;
       if (s - range < BM_BACKWARD_SEARCH_LENGTH_THRESHOLD)
 	goto exact_method;
 
@@ -4076,9 +3982,6 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
     }
     p = bm_search_backward(reg, reg->exact, reg->exact_end, range, adjrange,
 			   end, p);
-#else
-    goto exact_method;
-#endif
     break;
 
   case ONIG_OPTIMIZE_MAP:
@@ -4163,13 +4066,42 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
   const UChar *orig_range = range;
 #endif
 
+#if defined(USE_RECOMPILE_API) && defined(USE_MULTI_THREAD_SYSTEM)
+ start:
+  THREAD_ATOMIC_START;
+  if (ONIG_STATE(reg) >= ONIG_STATE_NORMAL) {
+    ONIG_STATE_INC(reg);
+    if (IS_NOT_NULL(reg->chain) && ONIG_STATE(reg) == ONIG_STATE_NORMAL) {
+      onig_chain_reduce(reg);
+      ONIG_STATE_INC(reg);
+    }
+  }
+  else {
+    int n;
+
+    THREAD_ATOMIC_END;
+    n = 0;
+    while (ONIG_STATE(reg) < ONIG_STATE_NORMAL) {
+      if (++n > THREAD_PASS_LIMIT_COUNT)
+	return ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT;
+      THREAD_PASS;
+    }
+    goto start;
+  }
+  THREAD_ATOMIC_END;
+#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */
+
 #ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr,
      "onig_search (entry point): str: %"PRIuPTR" (%p), end: %"PRIuPTR", start: %"PRIuPTR", range: %"PRIuPTR"\n",
-     (uintptr_t )str, str, end - str, start - str, range - str);
+     (intptr_t )str, str, end - str, start - str, range - str);
 #endif
 
-  if (region) {
+  if (region
+#ifdef USE_POSIX_API_REGION_OPTION
+      && !IS_POSIX_REGION(option)
+#endif
+      ) {
     r = onig_region_resize_clear(region, reg->num_mem + 1);
     if (r) goto finish_no_msa;
   }
@@ -4178,8 +4110,8 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
 
 
 #ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
-# ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
-#  define MATCH_AND_RETURN_CHECK(upper_range) \
+#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
+#define MATCH_AND_RETURN_CHECK(upper_range) \
   r = match_at(reg, str, end, (upper_range), s, prev, &msa); \
   if (r != ONIG_MISMATCH) {\
     if (r >= 0) {\
@@ -4189,8 +4121,8 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
     }\
     else goto finish; /* error */ \
   }
-# else
-#  define MATCH_AND_RETURN_CHECK(upper_range) \
+#else
+#define MATCH_AND_RETURN_CHECK(upper_range) \
   r = match_at(reg, str, end, (upper_range), s, prev, &msa); \
   if (r != ONIG_MISMATCH) {\
     if (r >= 0) {\
@@ -4198,10 +4130,10 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
     }\
     else goto finish; /* error */ \
   }
-# endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
+#endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
 #else
-# ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
-#  define MATCH_AND_RETURN_CHECK(none) \
+#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
+#define MATCH_AND_RETURN_CHECK(none) \
   r = match_at(reg, str, end, s, prev, &msa);\
   if (r != ONIG_MISMATCH) {\
     if (r >= 0) {\
@@ -4211,8 +4143,8 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
     }\
     else goto finish; /* error */ \
   }
-# else
-#  define MATCH_AND_RETURN_CHECK(none) \
+#else
+#define MATCH_AND_RETURN_CHECK(none) \
   r = match_at(reg, str, end, s, prev, &msa);\
   if (r != ONIG_MISMATCH) {\
     if (r >= 0) {\
@@ -4220,7 +4152,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
     }\
     else goto finish; /* error */ \
   }
-# endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
+#endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
 #endif /* USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
 
 
@@ -4232,15 +4164,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
       /* search start-position only */
     begin_position:
       if (range > start)
-      {
-	if (global_pos > start)
-	{
-	  if (global_pos < range)
-	    range = global_pos + 1;
-	}
-	else
-	  range = start + 1;
-      }
+	range = start + 1;
       else
 	range = start;
     }
@@ -4316,7 +4240,9 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
       }
     }
     else if ((reg->anchor & ANCHOR_ANYCHAR_STAR_ML)) {
-      goto begin_position;
+      if (! (reg->anchor & ANCHOR_LOOK_BEHIND)) {
+	goto begin_position;
+      }
     }
   }
   else if (str == end) { /* empty string */
@@ -4376,7 +4302,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
       }
 
       if ((end - start) < reg->threshold_len)
-	goto mismatch;
+        goto mismatch;
 
       if (reg->dmax != ONIG_INFINITE_DISTANCE) {
 	do {
@@ -4398,22 +4324,24 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
 	if (! forward_search_range(reg, str, end, s, sch_range,
 				   &low, &high, (UChar** )NULL)) goto mismatch;
 
-	if ((reg->anchor & ANCHOR_ANYCHAR_STAR) != 0) {
-	  do {
-	    MATCH_AND_RETURN_CHECK(orig_range);
-	    prev = s;
-	    s += enclen(reg->enc, s, end);
-
-	    if ((reg->anchor & (ANCHOR_LOOK_BEHIND | ANCHOR_PREC_READ_NOT)) == 0) {
-	      while (!ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 0)
-		  && s < range) {
-		prev = s;
-		s += enclen(reg->enc, s, end);
-	      }
-	    }
-	  } while (s < range);
-	  goto mismatch;
-	}
+        if ((reg->anchor & ANCHOR_ANYCHAR_STAR) != 0) {
+          do {
+            if ((reg->anchor & ANCHOR_BEGIN_POSITION) == 0)
+              msa.gpos = s;     /* move \G position */
+            MATCH_AND_RETURN_CHECK(orig_range);
+            prev = s;
+            s += enclen(reg->enc, s, end);
+
+            if ((reg->anchor & (ANCHOR_LOOK_BEHIND | ANCHOR_PREC_READ_NOT)) == 0) {
+              while (!ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 0)
+                     && s < range) {
+                prev = s;
+                s += enclen(reg->enc, s, end);
+              }
+            }
+          } while (s < range);
+          goto mismatch;
+        }
       }
     }
 
@@ -4496,10 +4424,15 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
 
  finish:
   MATCH_ARG_FREE(msa);
+  ONIG_STATE_DEC_THREAD(reg);
 
   /* If result is mismatch and no FIND_NOT_EMPTY option,
      then the region is not set in match_at(). */
-  if (IS_FIND_NOT_EMPTY(reg->options) && region) {
+  if (IS_FIND_NOT_EMPTY(reg->options) && region
+#ifdef USE_POSIX_API_REGION_OPTION
+      && !IS_POSIX_REGION(option)
+#endif
+      ) {
     onig_region_clear(region);
   }
 
@@ -4512,6 +4445,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
  mismatch_no_msa:
   r = ONIG_MISMATCH;
  finish_no_msa:
+  ONIG_STATE_DEC_THREAD(reg);
 #ifdef ONIG_DEBUG
   if (r != ONIG_MISMATCH)
     fprintf(stderr, "onig_search: error %"PRIdPTRDIFF"\n", r);
@@ -4519,84 +4453,43 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
   return r;
 
  match:
+  ONIG_STATE_DEC_THREAD(reg);
   MATCH_ARG_FREE(msa);
   return s - str;
 }
 
-extern OnigPosition
-onig_scan(regex_t* reg, const UChar* str, const UChar* end,
-	  OnigRegion* region, OnigOptionType option,
-	  int (*scan_callback)(OnigPosition, OnigPosition, OnigRegion*, void*),
-	  void* callback_arg)
-{
-  OnigPosition r;
-  OnigPosition n;
-  int rs;
-  const UChar* start;
-
-  n = 0;
-  start = str;
-  while (1) {
-    r = onig_search(reg, str, end, start, end, region, option);
-    if (r >= 0) {
-      rs = scan_callback(n, r, region, callback_arg);
-      n++;
-      if (rs != 0)
-	return rs;
-
-      if (region->end[0] == start - str) {
-	if (start >= end) break;
-	start += enclen(reg->enc, start, end);
-      }
-      else
-	start = str + region->end[0];
-
-      if (start > end)
-	break;
-    }
-    else if (r == ONIG_MISMATCH) {
-      break;
-    }
-    else { /* error */
-      return r;
-    }
-  }
-
-  return n;
-}
-
 extern OnigEncoding
-onig_get_encoding(const regex_t* reg)
+onig_get_encoding(regex_t* reg)
 {
   return reg->enc;
 }
 
 extern OnigOptionType
-onig_get_options(const regex_t* reg)
+onig_get_options(regex_t* reg)
 {
   return reg->options;
 }
 
 extern  OnigCaseFoldType
-onig_get_case_fold_flag(const regex_t* reg)
+onig_get_case_fold_flag(regex_t* reg)
 {
   return reg->case_fold_flag;
 }
 
 extern const OnigSyntaxType*
-onig_get_syntax(const regex_t* reg)
+onig_get_syntax(regex_t* reg)
 {
   return reg->syntax;
 }
 
 extern int
-onig_number_of_captures(const regex_t* reg)
+onig_number_of_captures(regex_t* reg)
 {
   return reg->num_mem;
 }
 
 extern int
-onig_number_of_capture_histories(const regex_t* reg)
+onig_number_of_capture_histories(regex_t* reg)
 {
 #ifdef USE_CAPTURE_HISTORY
   int i, n;
@@ -4617,3 +4510,4 @@ onig_copy_encoding(OnigEncodingType *to, OnigEncoding from)
 {
   *to = *from;
 }
+
diff --git a/regint.h b/regint.h
index a2f5bbba1d..80d3523126 100644
--- a/regint.h
+++ b/regint.h
@@ -1,11 +1,11 @@
-#ifndef ONIGMO_REGINT_H
-#define ONIGMO_REGINT_H
+#ifndef ONIGURUMA_REGINT_H
+#define ONIGURUMA_REGINT_H
 /**********************************************************************
   regint.h -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2013  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -35,7 +35,6 @@
 /* #define ONIG_DEBUG_COMPILE */
 /* #define ONIG_DEBUG_SEARCH */
 /* #define ONIG_DEBUG_MATCH */
-/* #define ONIG_DEBUG_MEMLEAK */
 /* #define ONIG_DONT_OPTIMIZE */
 
 /* for byte-code statistical data. */
@@ -43,25 +42,25 @@
 
 #if defined(ONIG_DEBUG_PARSE_TREE) || defined(ONIG_DEBUG_MATCH) || \
     defined(ONIG_DEBUG_SEARCH) || defined(ONIG_DEBUG_COMPILE) || \
-    defined(ONIG_DEBUG_STATISTICS) || defined(ONIG_DEBUG_MEMLEAK)
-# ifndef ONIG_DEBUG
-#  define ONIG_DEBUG
-# endif
+    defined(ONIG_DEBUG_STATISTICS)
+#ifndef ONIG_DEBUG
+#define ONIG_DEBUG
+#endif
 #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
+#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
 
 #if UNALIGNED_WORD_ACCESS
-# define PLATFORM_UNALIGNED_WORD_ACCESS
+#define PLATFORM_UNALIGNED_WORD_ACCESS
 #endif
 
 /* config */
@@ -74,165 +73,213 @@
 #define USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT  /* /(?:()|())*\2/ */
 #define USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE     /* /\n$/ =~ "\n" */
 #define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
+/* #define USE_RECOMPILE_API */
 /* !!! moved to regenc.h. */ /* #define USE_CRNL_AS_LINE_TERMINATOR */
 #define USE_NO_INVALID_QUANTIFIER
 
 /* internal config */
-/* #define USE_OP_PUSH_OR_JUMP_EXACT */
+#define USE_PARSE_TREE_NODE_RECYCLE
+#define USE_OP_PUSH_OR_JUMP_EXACT
 #define USE_QTFR_PEEK_NEXT
 #define USE_ST_LIBRARY
+#define USE_SHARED_CCLASS_TABLE
 #define USE_SUNDAY_QUICK_SEARCH
 
 #define INIT_MATCH_STACK_SIZE                     160
 #define DEFAULT_MATCH_STACK_LIMIT_SIZE              0 /* unlimited */
-#define DEFAULT_PARSE_DEPTH_LIMIT                4096
-
-#define OPT_EXACT_MAXLEN   24
 
 /* check config */
 #if defined(USE_PERL_SUBEXP_CALL) || defined(USE_CAPITAL_P_NAMED_GROUP)
-# if !defined(USE_NAMED_GROUP) || !defined(USE_SUBEXP_CALL)
-#  error USE_NAMED_GROUP and USE_SUBEXP_CALL must be defined.
-# endif
+#if !defined(USE_NAMED_GROUP) || !defined(USE_SUBEXP_CALL)
+#error USE_NAMED_GROUP and USE_SUBEXP_CALL must be defined.
+#endif
 #endif
 
 #if defined(__GNUC__)
-# define ARG_UNUSED  __attribute__ ((unused))
+#  define ARG_UNUSED  __attribute__ ((unused))
 #else
-# define ARG_UNUSED
+#  define ARG_UNUSED
 #endif
 
-#if !defined(RUBY) && defined(RUBY_EXPORT)
-# define RUBY
+#ifndef RUBY_DEFINES_H
+#include "ruby/ruby.h"
+#undef xmalloc
+#undef xrealloc
+#undef xcalloc
+#undef xfree
 #endif
-#ifdef RUBY
-# ifndef RUBY_DEFINES_H
-#  include "ruby/ruby.h"
-#  undef xmalloc
-#  undef xrealloc
-#  undef xcalloc
-#  undef xfree
-# endif
-#else /* RUBY */
-# include "config.h"
-# if SIZEOF_LONG_LONG > 0
-#  define LONG_LONG long long
-# endif
-#endif /* RUBY */
-
-#include <stdarg.h>
 
 /* */
 /* escape other system UChar definition */
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
-# undef ONIG_ESCAPE_UCHAR_COLLISION
+#undef ONIG_ESCAPE_UCHAR_COLLISION
 #endif
 
 #define USE_WORD_BEGIN_END          /* "\<": word-begin, "\>": word-end */
-#ifdef RUBY
-# undef USE_CAPTURE_HISTORY
-#else
-# define USE_CAPTURE_HISTORY
-#endif
+#undef USE_CAPTURE_HISTORY
 #define USE_VARIABLE_META_CHARS
+#define USE_POSIX_API_REGION_OPTION     /* needed for POSIX API support */
 #define USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
 /* #define USE_COMBINATION_EXPLOSION_CHECK */     /* (X*)* */
 
+/* multithread config */
+/* #define USE_MULTI_THREAD_SYSTEM */
+/* #define USE_DEFAULT_MULTI_THREAD_SYSTEM */
+
+#if defined(USE_MULTI_THREAD_SYSTEM) \
+  && defined(USE_DEFAULT_MULTI_THREAD_SYSTEM)
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+extern CRITICAL_SECTION gOnigMutex;
+#define THREAD_SYSTEM_INIT      InitializeCriticalSection(&gOnigMutex)
+#define THREAD_SYSTEM_END       DeleteCriticalSection(&gOnigMutex)
+#define THREAD_ATOMIC_START     EnterCriticalSection(&gOnigMutex)
+#define THREAD_ATOMIC_END       LeaveCriticalSection(&gOnigMutex)
+#define THREAD_PASS             Sleep(0)
+#else /* _WIN32 */
+#include <pthread.h>
+#include <sched.h>
+extern pthread_mutex_t gOnigMutex;
+#define THREAD_SYSTEM_INIT      pthread_mutex_init(&gOnigMutex, NULL)
+#define THREAD_SYSTEM_END       pthread_mutex_destroy(&gOnigMutex)
+#define THREAD_ATOMIC_START     pthread_mutex_lock(&gOnigMutex)
+#define THREAD_ATOMIC_END       pthread_mutex_unlock(&gOnigMutex)
+#define THREAD_PASS             sched_yield()
+#endif /* _WIN32 */
+
+#else /* USE_DEFAULT_MULTI_THREAD_SYSTEM */
+
+#ifndef THREAD_SYSTEM_INIT
+#define THREAD_SYSTEM_INIT      /* depend on thread system */
+#endif
+#ifndef THREAD_SYSTEM_END
+#define THREAD_SYSTEM_END       /* depend on thread system */
+#endif
+#ifndef THREAD_ATOMIC_START
+#define THREAD_ATOMIC_START     /* depend on thread system */
+#endif
+#ifndef THREAD_ATOMIC_END
+#define THREAD_ATOMIC_END       /* depend on thread system */
+#endif
+#ifndef THREAD_PASS
+#define THREAD_PASS             /* depend on thread system */
+#endif
+
+#endif /* USE_DEFAULT_MULTI_THREAD_SYSTEM */
 
 #ifndef xmalloc
-# define xmalloc     malloc
-# define xrealloc    realloc
-# define xcalloc     calloc
-# define xfree       free
+#define xmalloc     malloc
+#define xrealloc    realloc
+#define xcalloc     calloc
+#define xfree       free
 #endif
 
 #ifdef RUBY
 
-# define CHECK_INTERRUPT_IN_MATCH_AT rb_thread_check_ints()
-# define onig_st_init_table                  st_init_table
-# define onig_st_init_table_with_size        st_init_table_with_size
-# define onig_st_init_numtable               st_init_numtable
-# define onig_st_init_numtable_with_size     st_init_numtable_with_size
-# define onig_st_init_strtable               st_init_strtable
-# define onig_st_init_strtable_with_size     st_init_strtable_with_size
-# define onig_st_delete                      st_delete
-# define onig_st_delete_safe                 st_delete_safe
-# define onig_st_insert                      st_insert
-# define onig_st_lookup                      st_lookup
-# define onig_st_foreach                     st_foreach
-# define onig_st_add_direct                  st_add_direct
-# define onig_st_free_table                  st_free_table
-# define onig_st_cleanup_safe                st_cleanup_safe
-# define onig_st_copy                        st_copy
-# define onig_st_nothing_key_clone           st_nothing_key_clone
-# define onig_st_nothing_key_free            st_nothing_key_free
-# define onig_st_is_member                   st_is_member
-
-# define USE_UPPER_CASE_TABLE
-#else /* RUBY */
-
-# define CHECK_INTERRUPT_IN_MATCH_AT
-
-# define st_init_table                  onig_st_init_table
-# define st_init_table_with_size        onig_st_init_table_with_size
-# define st_init_numtable               onig_st_init_numtable
-# define st_init_numtable_with_size     onig_st_init_numtable_with_size
-# define st_init_strtable               onig_st_init_strtable
-# define st_init_strtable_with_size     onig_st_init_strtable_with_size
-# define st_delete                      onig_st_delete
-# define st_delete_safe                 onig_st_delete_safe
-# define st_insert                      onig_st_insert
-# define st_lookup                      onig_st_lookup
-# define st_foreach                     onig_st_foreach
-# define st_add_direct                  onig_st_add_direct
-# define st_free_table                  onig_st_free_table
-# define st_cleanup_safe                onig_st_cleanup_safe
-# define st_copy                        onig_st_copy
-# define st_nothing_key_clone           onig_st_nothing_key_clone
-# define st_nothing_key_free            onig_st_nothing_key_free
+#define CHECK_INTERRUPT_IN_MATCH_AT rb_thread_check_ints()
+#define onig_st_init_table                  st_init_table
+#define onig_st_init_table_with_size        st_init_table_with_size
+#define onig_st_init_numtable               st_init_numtable
+#define onig_st_init_numtable_with_size     st_init_numtable_with_size
+#define onig_st_init_strtable               st_init_strtable
+#define onig_st_init_strtable_with_size     st_init_strtable_with_size
+#define onig_st_delete                      st_delete
+#define onig_st_delete_safe                 st_delete_safe
+#define onig_st_insert                      st_insert
+#define onig_st_lookup                      st_lookup
+#define onig_st_foreach                     st_foreach
+#define onig_st_add_direct                  st_add_direct
+#define onig_st_free_table                  st_free_table
+#define onig_st_cleanup_safe                st_cleanup_safe
+#define onig_st_copy                        st_copy
+#define onig_st_nothing_key_clone           st_nothing_key_clone
+#define onig_st_nothing_key_free            st_nothing_key_free
+#define onig_st_is_member                   st_is_member
+
+#define USE_UPPER_CASE_TABLE
+#else
+
+#define CHECK_INTERRUPT_IN_MATCH_AT
+
+#define st_init_table                  onig_st_init_table
+#define st_init_table_with_size        onig_st_init_table_with_size
+#define st_init_numtable               onig_st_init_numtable
+#define st_init_numtable_with_size     onig_st_init_numtable_with_size
+#define st_init_strtable               onig_st_init_strtable
+#define st_init_strtable_with_size     onig_st_init_strtable_with_size
+#define st_delete                      onig_st_delete
+#define st_delete_safe                 onig_st_delete_safe
+#define st_insert                      onig_st_insert
+#define st_lookup                      onig_st_lookup
+#define st_foreach                     onig_st_foreach
+#define st_add_direct                  onig_st_add_direct
+#define st_free_table                  onig_st_free_table
+#define st_cleanup_safe                onig_st_cleanup_safe
+#define st_copy                        onig_st_copy
+#define st_nothing_key_clone           onig_st_nothing_key_clone
+#define st_nothing_key_free            onig_st_nothing_key_free
 /* */
-# define onig_st_is_member              st_is_member
+#define onig_st_is_member              st_is_member
 
-#endif /* RUBY */
+#endif
 
 #define STATE_CHECK_STRING_THRESHOLD_LEN             7
 #define STATE_CHECK_BUFF_MAX_SIZE               0x4000
 
+#define THREAD_PASS_LIMIT_COUNT     8
 #define xmemset     memset
 #define xmemcpy     memcpy
 #define xmemmove    memmove
 
-#if ((defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 90) \
-        || (!defined(RUBY_MSVCRT_VERSION) && defined(_WIN32))) \
-    && !defined(__GNUC__)
-# define xalloca     _alloca
-# define xvsnprintf(buf,size,fmt,args)  _vsnprintf_s(buf,size,_TRUNCATE,fmt,args)
-# define xsnprintf   sprintf_s
-# define xstrcat(dest,src,size)   strcat_s(dest,size,src)
+#if defined(_WIN32) && !defined(__GNUC__)
+#define xalloca     _alloca
+#define xvsnprintf  _vsnprintf
 #else
-# define xalloca     alloca
-# define xvsnprintf  vsnprintf
-# define xsnprintf   snprintf
-# define xstrcat(dest,src,size)	  strcat(dest,src)
+#define xalloca     alloca
+#define xvsnprintf  vsnprintf
 #endif
 
-#if defined(ONIG_DEBUG_MEMLEAK) && defined(_MSC_VER)
-# define _CRTDBG_MAP_ALLOC
-# include <malloc.h>
-# include <crtdbg.h>
-#endif
 
+#if defined(USE_RECOMPILE_API) && defined(USE_MULTI_THREAD_SYSTEM)
+#define ONIG_STATE_INC(reg) (reg)->state++
+#define ONIG_STATE_DEC(reg) (reg)->state--
+
+#define ONIG_STATE_INC_THREAD(reg) do {\
+  THREAD_ATOMIC_START;\
+  (reg)->state++;\
+  THREAD_ATOMIC_END;\
+} while(0)
+#define ONIG_STATE_DEC_THREAD(reg) do {\
+  THREAD_ATOMIC_START;\
+  (reg)->state--;\
+  THREAD_ATOMIC_END;\
+} while(0)
+#else
+#define ONIG_STATE_INC(reg)         /* Nothing */
+#define ONIG_STATE_DEC(reg)         /* Nothing */
+#define ONIG_STATE_INC_THREAD(reg)  /* Nothing */
+#define ONIG_STATE_DEC_THREAD(reg)  /* Nothing */
+#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #if defined(HAVE_ALLOCA_H) && (defined(_AIX) || !defined(__GNUC__))
-# include <alloca.h>
+#include <alloca.h>
 #endif
 
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 
 #include <ctype.h>
 #ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <sys/types.h>
 #endif
 
 #ifdef HAVE_STDINT_H
@@ -243,10 +290,12 @@
 # include <inttypes.h>
 #endif
 
-#include <stddef.h>
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
 
 #ifdef _WIN32
-# include <malloc.h>	/* for alloca() */
+#include <malloc.h>	/* for alloca() */
 #endif
 
 #ifdef ONIG_DEBUG
@@ -254,32 +303,28 @@
 #endif
 
 #ifdef _WIN32
-# if defined(_MSC_VER) && (_MSC_VER < 1300)
-#  ifndef _INTPTR_T_DEFINED
-#   define _INTPTR_T_DEFINED
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+#ifndef _INTPTR_T_DEFINED
+#define _INTPTR_T_DEFINED
 typedef int intptr_t;
-#  endif
-#  ifndef _UINTPTR_T_DEFINED
-#   define _UINTPTR_T_DEFINED
+#endif
+#ifndef _UINTPTR_T_DEFINED
+#define _UINTPTR_T_DEFINED
 typedef unsigned int uintptr_t;
-#  endif
-# endif
+#endif
+#endif
 #endif /* _WIN32 */
 
 #ifndef PRIdPTR
-# ifdef _WIN64
-#  define PRIdPTR	"I64d"
-#  define PRIuPTR	"I64u"
-#  define PRIxPTR	"I64x"
-# else
-#  define PRIdPTR	"ld"
-#  define PRIuPTR	"lu"
-#  define PRIxPTR	"lx"
-# endif
+#ifdef _WIN64
+#define PRIdPTR	"I64d"
+#define PRIuPTR	"I64u"
+#define PRIxPTR	"I64x"
+#else
+#define PRIdPTR	"ld"
+#define PRIuPTR	"lu"
+#define PRIxPTR	"lx"
 #endif
-
-#ifndef PRIdPTRDIFF
-# define PRIdPTRDIFF PRIdPTR
 #endif
 
 #include "regenc.h"
@@ -287,10 +332,10 @@ typedef unsigned int uintptr_t;
 RUBY_SYMBOL_EXPORT_BEGIN
 
 #ifdef MIN
-# undef MIN
+#undef MIN
 #endif
 #ifdef MAX
-# undef MAX
+#undef MAX
 #endif
 #define MIN(a,b) (((a)>(b))?(b):(a))
 #define MAX(a,b) (((a)<(b))?(b):(a))
@@ -305,28 +350,28 @@ RUBY_SYMBOL_EXPORT_BEGIN
 
 #ifdef PLATFORM_UNALIGNED_WORD_ACCESS
 
-# define PLATFORM_GET_INC(val,p,type) do{\
+#define PLATFORM_GET_INC(val,p,type) do{\
   val  = *(type* )p;\
   (p) += sizeof(type);\
 } while(0)
 
 #else
 
-# define PLATFORM_GET_INC(val,p,type) do{\
+#define PLATFORM_GET_INC(val,p,type) do{\
   xmemcpy(&val, (p), sizeof(type));\
   (p) += sizeof(type);\
 } while(0)
 
 /* sizeof(OnigCodePoint) */
-# define WORD_ALIGNMENT_SIZE     SIZEOF_LONG
+#define WORD_ALIGNMENT_SIZE     SIZEOF_LONG
 
-# define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
+#define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
   (pad_size) = WORD_ALIGNMENT_SIZE \
                - ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
   if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\
 } while (0)
 
-# define ALIGNMENT_RIGHT(addr) do {\
+#define ALIGNMENT_RIGHT(addr) do {\
   (addr) += (WORD_ALIGNMENT_SIZE - 1);\
   (addr) -= ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
 } while (0)
@@ -390,6 +435,7 @@ typedef unsigned int  BitStatusType;
 #define IS_NOTEOL(option)         ((option) & ONIG_OPTION_NOTEOL)
 #define IS_NOTBOS(option)         ((option) & ONIG_OPTION_NOTBOS)
 #define IS_NOTEOS(option)         ((option) & ONIG_OPTION_NOTEOS)
+#define IS_POSIX_REGION(option)   ((option) & ONIG_OPTION_POSIX_REGION)
 #define IS_ASCII_RANGE(option)    ((option) & ONIG_OPTION_ASCII_RANGE)
 #define IS_POSIX_BRACKET_ALL_RANGE(option)  ((option) & ONIG_OPTION_POSIX_BRACKET_ALL_RANGE)
 #define IS_WORD_BOUND_ALL_RANGE(option)     ((option) & ONIG_OPTION_WORD_BOUND_ALL_RANGE)
@@ -572,6 +618,7 @@ enum OpCode {
   OP_CCLASS_NOT,
   OP_CCLASS_MB_NOT,
   OP_CCLASS_MIX_NOT,
+  OP_CCLASS_NODE,       /* pointer to CClassNode node */
 
   OP_ANYCHAR,                 /* "."  */
   OP_ANYCHAR_ML,              /* "."  multi-line */
@@ -600,6 +647,7 @@ enum OpCode {
   OP_END_LINE,
   OP_SEMI_END_BUF,
   OP_BEGIN_POSITION,
+  OP_BEGIN_POS_OR_LINE,   /* used for implicit anchor optimization */
 
   OP_BACKREF1,
   OP_BACKREF2,
@@ -644,9 +692,6 @@ enum OpCode {
   OP_LOOK_BEHIND,          /* (?<=...) start (no needs end opcode) */
   OP_PUSH_LOOK_BEHIND_NOT, /* (?<!...) start */
   OP_FAIL_LOOK_BEHIND_NOT, /* (?<!...) end   */
-  OP_PUSH_ABSENT_POS,      /* (?~...)  start */
-  OP_ABSENT,               /* (?~...)  start of inner loop */
-  OP_ABSENT_END,           /* (?~...)  end   */
 
   OP_CALL,                 /* \g<name> */
   OP_RETURN,
@@ -734,15 +779,12 @@ typedef void* PointerType;
 #define SIZE_OP_CALL                   (SIZE_OPCODE + SIZE_ABSADDR)
 #define SIZE_OP_RETURN                  SIZE_OPCODE
 #define SIZE_OP_CONDITION              (SIZE_OPCODE + SIZE_MEMNUM + SIZE_RELADDR)
-#define SIZE_OP_PUSH_ABSENT_POS         SIZE_OPCODE
-#define SIZE_OP_ABSENT                 (SIZE_OPCODE + SIZE_RELADDR)
-#define SIZE_OP_ABSENT_END              SIZE_OPCODE
 
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
-# define SIZE_OP_STATE_CHECK           (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
-# define SIZE_OP_STATE_CHECK_PUSH      (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
-# define SIZE_OP_STATE_CHECK_PUSH_OR_JUMP (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
-# define SIZE_OP_STATE_CHECK_ANYCHAR_STAR (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
+#define SIZE_OP_STATE_CHECK            (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
+#define SIZE_OP_STATE_CHECK_PUSH       (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
+#define SIZE_OP_STATE_CHECK_PUSH_OR_JUMP (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)
+#define SIZE_OP_STATE_CHECK_ANYCHAR_STAR (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
 #endif
 
 #define MC_ESC(syn)               (syn)->meta_char_table.esc
@@ -790,10 +832,13 @@ typedef void* PointerType;
 
 /* cclass node */
 #define FLAG_NCCLASS_NOT           (1<<0)
+#define FLAG_NCCLASS_SHARE         (1<<1)
 
 #define NCCLASS_SET_NOT(nd)     NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_NOT)
+#define NCCLASS_SET_SHARE(nd)   NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_SHARE)
 #define NCCLASS_CLEAR_NOT(nd)   NCCLASS_FLAG_CLEAR(nd, FLAG_NCCLASS_NOT)
 #define IS_NCCLASS_NOT(nd)      IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_NOT)
+#define IS_NCCLASS_SHARE(nd)    IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_SHARE)
 
 typedef struct {
   int type;
@@ -848,10 +893,6 @@ typedef struct _OnigStackType {
       UChar *pstr;       /* string position */
     } call_frame;
 #endif
-    struct {
-      UChar *abs_pstr;        /* absent start position */
-      const UChar *end_pstr;  /* end position */
-    } absent_pos;
   } u;
 } OnigStackType;
 
@@ -895,44 +936,60 @@ typedef struct {
 extern OnigOpInfoType OnigOpInfo[];
 
 
-extern void onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc);
+extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc));
 
-# ifdef ONIG_DEBUG_STATISTICS
-extern void onig_statistics_init(void);
-extern void onig_print_statistics(FILE* f);
-# endif
+#ifdef ONIG_DEBUG_STATISTICS
+extern void onig_statistics_init P_((void));
+extern void onig_print_statistics P_((FILE* f));
 #endif
-
-extern UChar* onig_error_code_to_format(OnigPosition code);
-extern void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, va_list args);
-extern void onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...);
-extern int  onig_bbuf_init(BBuf* buf, OnigDistance size);
-extern int  onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo);
-#ifdef RUBY
-extern int  onig_compile_ruby(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline);
 #endif
-extern void onig_transfer(regex_t* to, regex_t* from);
-extern int  onig_is_code_in_cc(OnigEncoding enc, OnigCodePoint code, CClassNode* cc);
-extern int  onig_is_code_in_cc_len(int enclen, OnigCodePoint code, CClassNode* cc);
+
+extern UChar* onig_error_code_to_format P_((OnigPosition code));
+extern void  onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));
+extern int  onig_bbuf_init P_((BBuf* buf, OnigDistance size));
+extern int  onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline));
+extern void onig_chain_reduce P_((regex_t* reg));
+extern void onig_chain_link_add P_((regex_t* to, regex_t* add));
+extern void onig_transfer P_((regex_t* to, regex_t* from));
+extern int  onig_is_code_in_cc P_((OnigEncoding enc, OnigCodePoint code, CClassNode* cc));
+extern int  onig_is_code_in_cc_len P_((int enclen, OnigCodePoint code, CClassNode* cc));
 
 /* strend hash */
 typedef void hash_table_type;
 #ifdef RUBY
-# include "ruby/st.h"
+#include "ruby/st.h"
+typedef st_data_t hash_data_type;
 #else
-# include "st.h"
+#include "st.h"
+typedef uintptr_t hash_data_type;
 #endif
-typedef st_data_t hash_data_type;
 
-extern hash_table_type* onig_st_init_strend_table_with_size(st_index_t size);
-extern int onig_st_lookup_strend(hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value);
-extern int onig_st_insert_strend(hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type value);
+extern hash_table_type* onig_st_init_strend_table_with_size P_((st_index_t size));
+extern int onig_st_lookup_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value));
+extern int onig_st_insert_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type value));
 
-#ifdef RUBY
-extern size_t onig_memsize(const regex_t *reg);
-extern size_t onig_region_memsize(const struct re_registers *regs);
-#endif
+/* encoding property management */
+#define PROPERTY_LIST_ADD_PROP(Name, CR) \
+  r = onigenc_property_list_add_property((UChar* )Name, CR,\
+	      &PropertyNameTable, &PropertyList, &PropertyListNum,\
+	      &PropertyListSize);\
+  if (r != 0) goto end
+
+#define PROPERTY_LIST_INIT_CHECK \
+  if (PropertyInited == 0) {\
+    int r = onigenc_property_list_init(init_property_list);\
+    if (r != 0) return r;\
+  }
+
+extern int onigenc_property_list_add_property P_((UChar* name, const OnigCodePoint* prop, hash_table_type **table, const OnigCodePoint*** plist, int *pnum, int *psize));
+
+typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);
+
+extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
+
+extern size_t onig_memsize P_((const regex_t *reg));
+extern size_t onig_region_memsize P_((const struct re_registers *regs));
 
 RUBY_SYMBOL_EXPORT_END
 
-#endif /* ONIGMO_REGINT_H */
+#endif /* ONIGURUMA_REGINT_H */
diff --git a/regparse.c b/regparse.c
index 574a07e05d..2924601bc2 100644
--- a/regparse.c
+++ b/regparse.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -29,7 +29,6 @@
  */
 
 #include "regparse.h"
-#include <stdarg.h>
 
 #define WARN_BUFSIZE    256
 
@@ -52,14 +51,10 @@ const OnigSyntaxType OnigSyntaxRuby = {
       ONIG_SYN_OP2_CCLASS_SET_OP | ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL |
       ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META | ONIG_SYN_OP2_ESC_V_VTAB |
       ONIG_SYN_OP2_ESC_H_XDIGIT |
-#ifndef RUBY
-      ONIG_SYN_OP2_ESC_U_HEX4 |
-#endif
       ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER |
       ONIG_SYN_OP2_QMARK_LPAREN_CONDITION |
       ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK |
-      ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |
-      ONIG_SYN_OP2_QMARK_TILDE_ABSENT )
+      ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP )
   , ( SYN_GNU_REGEX_BV |
       ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV |
       ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND |
@@ -108,27 +103,7 @@ extern void onig_set_verb_warn_func(OnigWarnFunc f)
   onig_verb_warn = f;
 }
 
-static void CC_DUP_WARN(ScanEnv *env, OnigCodePoint from, OnigCodePoint to);
-
-
-static unsigned int ParseDepthLimit = DEFAULT_PARSE_DEPTH_LIMIT;
-
-extern unsigned int
-onig_get_parse_depth_limit(void)
-{
-  return ParseDepthLimit;
-}
-
-extern int
-onig_set_parse_depth_limit(unsigned int depth)
-{
-  if (depth == 0)
-    ParseDepthLimit = DEFAULT_PARSE_DEPTH_LIMIT;
-  else
-    ParseDepthLimit = depth;
-  return 0;
-}
-
+static void CC_DUP_WARN(ScanEnv *env);
 
 static void
 bbuf_free(BBuf* bbuf)
@@ -174,7 +149,7 @@ bbuf_clone(BBuf** rto, BBuf* from)
 
 
 #define BITSET_SET_BIT_CHKDUP(bs, pos) do { \
-  if (BITSET_AT(bs, pos)) CC_DUP_WARN(env, pos, pos); \
+  if (BITSET_AT(bs, pos)) CC_DUP_WARN(env); \
   BS_ROOM(bs, pos) |= BS_BIT(pos); \
 } while (0)
 
@@ -241,7 +216,6 @@ bitset_copy(BitSetRef dest, BitSetRef bs)
   for (i = 0; i < BITSET_SIZE; i++) { dest[i] = bs[i]; }
 }
 
-#if defined(USE_NAMED_GROUP) && !defined(USE_ST_LIBRARY)
 extern int
 onig_strncmp(const UChar* s1, const UChar* s2, int n)
 {
@@ -253,7 +227,6 @@ onig_strncmp(const UChar* s1, const UChar* s2, int n)
   }
   return 0;
 }
-#endif
 
 extern void
 onig_strcpy(UChar* dest, const UChar* src, const UChar* end)
@@ -292,9 +265,9 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
 
 #ifdef __GNUC__
 /* get rid of Wunused-but-set-variable and Wuninitialized */
-# define PFETCH_READY  UChar* pfetch_prev = NULL; (void)pfetch_prev
+#define PFETCH_READY  UChar* pfetch_prev = NULL; (void)pfetch_prev
 #else
-# define PFETCH_READY  UChar* pfetch_prev
+#define PFETCH_READY  UChar* pfetch_prev
 #endif
 #define PEND         (p < end ?  0 : 1)
 #define PUNFETCH     p = pfetch_prev
@@ -352,11 +325,7 @@ strcat_capa_from_static(UChar* dest, UChar* dest_end,
 
 #ifdef USE_ST_LIBRARY
 
-# ifdef RUBY
-#  include "ruby/st.h"
-# else
-#  include "st.h"
-# endif
+#include "ruby/st.h"
 
 typedef struct {
   const UChar* s;
@@ -448,7 +417,7 @@ onig_st_insert_strend(hash_table_type* table, const UChar* str_key,
 
 #ifdef USE_NAMED_GROUP
 
-# define INIT_NAME_BACKREFS_ALLOC_NUM   8
+#define INIT_NAME_BACKREFS_ALLOC_NUM   8
 
 typedef struct {
   UChar* name;
@@ -459,12 +428,12 @@ typedef struct {
   int*   back_refs;
 } NameEntry;
 
-# ifdef USE_ST_LIBRARY
+#ifdef USE_ST_LIBRARY
 
 typedef st_table  NameTable;
 typedef st_data_t HashDataType;   /* 1.6 st.h doesn't define st_data_t type */
 
-#  ifdef ONIG_DEBUG
+#ifdef ONIG_DEBUG
 static int
 i_print_name_entry(UChar* key, NameEntry* e, void* arg)
 {
@@ -498,7 +467,7 @@ onig_print_names(FILE* fp, regex_t* reg)
   }
   return 0;
 }
-#  endif /* ONIG_DEBUG */
+#endif /* ONIG_DEBUG */
 
 static int
 i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED)
@@ -561,8 +530,8 @@ static int
 i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg)
 {
   int r = (*(arg->func))(e->name,
-			 e->name + e->name_len,
-			 e->back_num,
+                         e->name + e->name_len,
+                         e->back_num,
 			 (e->back_num > 1 ? e->back_refs : &(e->back_ref1)),
 			 arg->reg, arg->arg);
   if (r != 0) {
@@ -620,7 +589,7 @@ onig_renumber_name_table(regex_t* reg, GroupNumRemap* map)
 
 
 extern int
-onig_number_of_names(const regex_t* reg)
+onig_number_of_names(regex_t* reg)
 {
   NameTable* t = (NameTable* )reg->name_table;
 
@@ -630,9 +599,9 @@ onig_number_of_names(const regex_t* reg)
     return 0;
 }
 
-# else  /* USE_ST_LIBRARY */
+#else  /* USE_ST_LIBRARY */
 
-#  define INIT_NAMES_ALLOC_NUM    8
+#define INIT_NAMES_ALLOC_NUM    8
 
 typedef struct {
   NameEntry* e;
@@ -640,7 +609,7 @@ typedef struct {
   int        alloc;
 } NameTable;
 
-#  ifdef ONIG_DEBUG
+#ifdef ONIG_DEBUG
 extern int
 onig_print_names(FILE* fp, regex_t* reg)
 {
@@ -671,7 +640,7 @@ onig_print_names(FILE* fp, regex_t* reg)
   }
   return 0;
 }
-#  endif
+#endif
 
 static int
 names_clear(regex_t* reg)
@@ -756,7 +725,7 @@ onig_foreach_name(regex_t* reg,
 }
 
 extern int
-onig_number_of_names(const regex_t* reg)
+onig_number_of_names(regex_t* reg)
 {
   NameTable* t = (NameTable* )reg->name_table;
 
@@ -766,7 +735,7 @@ onig_number_of_names(const regex_t* reg)
     return 0;
 }
 
-# endif /* else USE_ST_LIBRARY */
+#endif /* else USE_ST_LIBRARY */
 
 static int
 name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
@@ -780,7 +749,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
 
   e = name_find(reg, name, name_end);
   if (IS_NULL(e)) {
-# ifdef USE_ST_LIBRARY
+#ifdef USE_ST_LIBRARY
     if (IS_NULL(t)) {
       t = onig_st_init_strend_table_with_size(5);
       reg->name_table = (void* )t;
@@ -801,7 +770,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
     e->back_alloc = 0;
     e->back_refs  = (int* )NULL;
 
-# else
+#else
 
     if (IS_NULL(t)) {
       alloc = INIT_NAMES_ALLOC_NUM;
@@ -844,7 +813,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
     e->name = strdup_with_null(reg->enc, name, name_end);
     if (IS_NULL(e->name)) return ONIGERR_MEMORY;
     e->name_len = name_end - name;
-# endif
+#endif
   }
 
   if (e->back_num >= 1 &&
@@ -907,7 +876,7 @@ onig_name_to_group_numbers(regex_t* reg, const UChar* name,
 
 extern int
 onig_name_to_backref_number(regex_t* reg, const UChar* name,
-			    const UChar* name_end, const OnigRegion *region)
+			    const UChar* name_end, OnigRegion *region)
 {
   int i, n, *nums;
 
@@ -940,7 +909,7 @@ onig_name_to_group_numbers(regex_t* reg, const UChar* name,
 
 extern int
 onig_name_to_backref_number(regex_t* reg, const UChar* name,
-			    const UChar* name_end, const OnigRegion* region)
+			    const UChar* name_end, OnigRegion* region)
 {
   return ONIG_NO_SUPPORT_CONFIG;
 }
@@ -953,14 +922,14 @@ onig_foreach_name(regex_t* reg,
 }
 
 extern int
-onig_number_of_names(const regex_t* reg)
+onig_number_of_names(regex_t* reg)
 {
   return 0;
 }
 #endif /* else USE_NAMED_GROUP */
 
 extern int
-onig_noname_group_capture_is_active(const regex_t* reg)
+onig_noname_group_capture_is_active(regex_t* reg)
 {
   if (ONIG_IS_OPTION_ON(reg->options, ONIG_OPTION_DONT_CAPTURE_GROUP))
     return 0;
@@ -1007,7 +976,6 @@ scan_env_clear(ScanEnv* env)
   env->curr_max_regnum     = 0;
   env->has_recursion       = 0;
 #endif
-  env->parse_depth         = 0;
   env->warnings_flag       = 0;
 }
 
@@ -1025,15 +993,14 @@ scan_env_add_mem_entry(ScanEnv* env)
       if (IS_NULL(env->mem_nodes_dynamic)) {
 	alloc = INIT_SCANENV_MEMNODES_ALLOC_SIZE;
 	p = (Node** )xmalloc(sizeof(Node*) * alloc);
-	CHECK_NULL_RETURN_MEMERR(p);
 	xmemcpy(p, env->mem_nodes_static,
 		sizeof(Node*) * SCANENV_MEMNODES_SIZE);
       }
       else {
 	alloc = env->mem_alloc * 2;
 	p = (Node** )xrealloc(env->mem_nodes_dynamic, sizeof(Node*) * alloc);
-	CHECK_NULL_RETURN_MEMERR(p);
       }
+      CHECK_NULL_RETURN_MEMERR(p);
 
       for (i = env->num_mem + 1; i < alloc; i++)
 	p[i] = NULL_NODE;
@@ -1058,6 +1025,14 @@ scan_env_set_mem_node(ScanEnv* env, int num, Node* node)
 }
 
 
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+typedef struct _FreeNode {
+  struct _FreeNode* next;
+} FreeNode;
+
+static FreeNode* FreeNodeList = (FreeNode* )NULL;
+#endif
+
 extern void
 onig_node_free(Node* node)
 {
@@ -1078,7 +1053,18 @@ onig_node_free(Node* node)
     {
       Node* next_node = NCDR(node);
 
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+      {
+	FreeNode* n = (FreeNode* )node;
+
+        THREAD_ATOMIC_START;
+	n->next = FreeNodeList;
+	FreeNodeList = n;
+        THREAD_ATOMIC_END;
+      }
+#else
       xfree(node);
+#endif
       node = next_node;
       goto start;
     }
@@ -1088,8 +1074,9 @@ onig_node_free(Node* node)
     {
       CClassNode* cc = NCCLASS(node);
 
+      if (IS_NCCLASS_SHARE(cc)) return ;
       if (cc->mbuf)
-	bbuf_free(cc->mbuf);
+        bbuf_free(cc->mbuf);
     }
     break;
 
@@ -1114,19 +1101,78 @@ onig_node_free(Node* node)
     break;
   }
 
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+  {
+    FreeNode* n = (FreeNode* )node;
+
+    THREAD_ATOMIC_START;
+    n->next = FreeNodeList;
+    FreeNodeList = n;
+    THREAD_ATOMIC_END;
+  }
+#else
   xfree(node);
+#endif
+}
+
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+extern int
+onig_free_node_list(void)
+{
+  FreeNode* n;
+
+  /* THREAD_ATOMIC_START; */
+  while (IS_NOT_NULL(FreeNodeList)) {
+    n = FreeNodeList;
+    FreeNodeList = FreeNodeList->next;
+    xfree(n);
+  }
+  /* THREAD_ATOMIC_END; */
+  return 0;
 }
+#endif
 
 static Node*
 node_new(void)
 {
   Node* node;
 
+#ifdef USE_PARSE_TREE_NODE_RECYCLE
+  THREAD_ATOMIC_START;
+  if (IS_NOT_NULL(FreeNodeList)) {
+    node = (Node* )FreeNodeList;
+    FreeNodeList = FreeNodeList->next;
+    THREAD_ATOMIC_END;
+    return node;
+  }
+  THREAD_ATOMIC_END;
+#endif
+
   node = (Node* )xmalloc(sizeof(Node));
   /* xmemset(node, 0, sizeof(Node)); */
   return node;
 }
 
+#if defined(USE_MULTI_THREAD_SYSTEM) && \
+    defined(USE_SHARED_CCLASS_TABLE) && \
+    defined(USE_PARSE_TREE_NODE_RECYCLE)
+static Node*
+node_new_locked(void)
+{
+  Node* node;
+
+  if (IS_NOT_NULL(FreeNodeList)) {
+    node = (Node* )FreeNodeList;
+    FreeNodeList = FreeNodeList->next;
+    return node;
+  }
+
+  node = (Node* )xmalloc(sizeof(Node));
+  /* xmemset(node, 0, sizeof(Node)); */
+  return node;
+}
+#endif
+
 static void
 initialize_cclass(CClassNode* cc)
 {
@@ -1147,6 +1193,75 @@ node_new_cclass(void)
   return node;
 }
 
+#if defined(USE_MULTI_THREAD_SYSTEM) && \
+    defined(USE_SHARED_CCLASS_TABLE) && \
+    defined(USE_PARSE_TREE_NODE_RECYCLE)
+static Node*
+node_new_cclass_locked(void)
+{
+  Node* node = node_new_locked();
+  CHECK_NULL_RETURN(node);
+
+  SET_NTYPE(node, NT_CCLASS);
+  initialize_cclass(NCCLASS(node));
+  return node;
+}
+#else
+#define node_new_cclass_locked()  node_new_cclass()
+#endif
+
+#ifdef USE_SHARED_CCLASS_TABLE
+static Node*
+node_new_cclass_by_codepoint_range(int not, OnigCodePoint sb_out,
+				   const OnigCodePoint ranges[])
+{
+  int n, i;
+  CClassNode* cc;
+  OnigCodePoint j;
+
+  Node* node = node_new_cclass_locked();
+  CHECK_NULL_RETURN(node);
+
+  cc = NCCLASS(node);
+  if (not != 0) NCCLASS_SET_NOT(cc);
+
+  BITSET_CLEAR(cc->bs);
+  if (sb_out > 0 && IS_NOT_NULL(ranges)) {
+    n = ONIGENC_CODE_RANGE_NUM(ranges);
+    for (i = 0; i < n; i++) {
+      for (j  = ONIGENC_CODE_RANGE_FROM(ranges, i);
+           j <= (OnigCodePoint )ONIGENC_CODE_RANGE_TO(ranges, i); j++) {
+	if (j >= sb_out) goto sb_end;
+
+        BITSET_SET_BIT(cc->bs, j);
+      }
+    }
+  }
+
+ sb_end:
+  if (IS_NULL(ranges)) {
+  is_null:
+    cc->mbuf = NULL;
+  }
+  else {
+    BBuf* bbuf;
+
+    n = ONIGENC_CODE_RANGE_NUM(ranges);
+    if (n == 0) goto is_null;
+
+    bbuf = (BBuf* )xmalloc(sizeof(BBuf));
+    CHECK_NULL_RETURN(bbuf);
+    bbuf->alloc = n + 1;
+    bbuf->used  = n + 1;
+    bbuf->p     = (UChar* )((void* )ranges);
+
+    cc->mbuf = bbuf;
+  }
+
+  return node;
+}
+#endif /* USE_SHARED_CCLASS_TABLE */
+
 static Node*
 node_new_ctype(int type, int not, int ascii_range)
 {
@@ -1315,7 +1430,7 @@ node_new_quantifier(int lower, int upper, int by_number)
   NQTFR(node)->target_empty_info = NQ_TARGET_ISNOT_EMPTY;
   NQTFR(node)->head_exact        = NULL_NODE;
   NQTFR(node)->next_head_exact   = NULL_NODE;
-  NQTFR(node)->is_referred       = 0;
+  NQTFR(node)->is_refered        = 0;
   if (by_number != 0)
     NQTFR(node)->state |= NST_BY_NUMBER;
 
@@ -1433,7 +1548,6 @@ node_str_cat_codepoint(Node* node, OnigEncoding enc, OnigCodePoint c)
   return onig_node_str_cat(node, buf, buf + num);
 }
 
-#if 0
 extern void
 onig_node_conv_to_str_node(Node* node, int flag)
 {
@@ -1443,7 +1557,6 @@ onig_node_conv_to_str_node(Node* node, int flag)
   NSTR(node)->s    = NSTR(node)->buf;
   NSTR(node)->end  = NSTR(node)->buf;
 }
-#endif
 
 extern void
 onig_node_str_clear(Node* node)
@@ -1602,7 +1715,6 @@ scan_unsigned_hexadecimal_number(UChar** src, UChar* end, int minlen,
     }
     else {
       PUNFETCH;
-      maxlen++;
       break;
     }
   }
@@ -1720,7 +1832,7 @@ add_code_range_to_buf0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePo
   if (inc_n != 1) {
     if (checkdup && from <= data[low*2+1]
 	&& (data[low*2] <= from || data[low*2+1] <= to))
-      CC_DUP_WARN(env, from, to);
+      CC_DUP_WARN(env);
     if (from > data[low*2])
       from = data[low*2];
     if (to < data[(high - 1)*2 + 1])
@@ -1774,7 +1886,7 @@ add_code_range0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePoint to,
 static int
 add_code_range(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePoint to)
 {
-  return add_code_range0(pbuf, env, from, to, 1);
+    return add_code_range0(pbuf, env, from, to, 1);
 }
 
 static int
@@ -1878,7 +1990,7 @@ or_code_range_buf(OnigEncoding enc, BBuf* bbuf1, int not1,
 
 static int
 and_code_range1(BBuf** pbuf, ScanEnv* env, OnigCodePoint from1, OnigCodePoint to1,
-		OnigCodePoint* data, int n)
+	        OnigCodePoint* data, int n)
 {
   int i, r;
   OnigCodePoint from2, to2;
@@ -2092,8 +2204,8 @@ or_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env)
 
 static void UNKNOWN_ESC_WARN(ScanEnv *env, int c);
 
-static OnigCodePoint
-conv_backslash_value(OnigCodePoint c, ScanEnv* env)
+static int
+conv_backslash_value(int c, ScanEnv* env)
 {
   if (IS_SYNTAX_OP(env->syntax, ONIG_SYN_OP_ESC_CONTROL_CHARS)) {
     switch (c) {
@@ -2119,7 +2231,7 @@ conv_backslash_value(OnigCodePoint c, ScanEnv* env)
 }
 
 #ifdef USE_NO_INVALID_QUANTIFIER
-# define is_invalid_quantifier_target(node) 0
+#define is_invalid_quantifier_target(node) 0
 #else
 static int
 is_invalid_quantifier_target(Node* node)
@@ -2191,7 +2303,6 @@ enum ReduceType {
 };
 
 static enum ReduceType const ReduceTypeTable[6][6] = {
-/* '?',     '*',     '+',    '??',    '*?',    '+?'      p / c   */
   {RQ_DEL,  RQ_A,    RQ_A,   RQ_QQ,   RQ_AQ,   RQ_ASIS}, /* '?'  */
   {RQ_DEL,  RQ_DEL,  RQ_DEL, RQ_P_QQ, RQ_P_QQ, RQ_DEL},  /* '*'  */
   {RQ_A,    RQ_A,    RQ_DEL, RQ_ASIS, RQ_P_QQ, RQ_DEL},  /* '+'  */
@@ -2394,7 +2505,6 @@ fetch_range_quantifier(UChar** src, UChar* end, OnigToken* tok, ScanEnv* env)
   PFETCH(c);
   if (IS_SYNTAX_OP(env->syntax, ONIG_SYN_OP_ESC_BRACE_INTERVAL)) {
     if (c != MC_ESC(env->syntax)) goto invalid;
-    if (PEND) goto invalid;
     PFETCH(c);
   }
   if (c != '}') goto invalid;
@@ -2418,7 +2528,7 @@ fetch_range_quantifier(UChar** src, UChar* end, OnigToken* tok, ScanEnv* env)
 
 /* \M-, \C-, \c, or \... */
 static int
-fetch_escaped_value(UChar** src, UChar* end, ScanEnv* env, OnigCodePoint* val)
+fetch_escaped_value(UChar** src, UChar* end, ScanEnv* env)
 {
   int v;
   OnigCodePoint c;
@@ -2437,8 +2547,9 @@ fetch_escaped_value(UChar** src, UChar* end, ScanEnv* env, OnigCodePoint* val)
       if (PEND) return ONIGERR_END_PATTERN_AT_META;
       PFETCH_S(c);
       if (c == MC_ESC(env->syntax)) {
-	v = fetch_escaped_value(&p, end, env, &c);
-	if (v < 0) return v;
+        v = fetch_escaped_value(&p, end, env);
+        if (v < 0) return v;
+        c = (OnigCodePoint )v;
       }
       c = ((c & 0xff) | 0x80);
     }
@@ -2462,14 +2573,15 @@ fetch_escaped_value(UChar** src, UChar* end, ScanEnv* env, OnigCodePoint* val)
       if (PEND) return ONIGERR_END_PATTERN_AT_CONTROL;
       PFETCH_S(c);
       if (c == '?') {
-	c = 0177;
+        c = 0177;
       }
       else {
-	if (c == MC_ESC(env->syntax)) {
-	  v = fetch_escaped_value(&p, end, env, &c);
-	  if (v < 0) return v;
-	}
-	c &= 0x9f;
+        if (c == MC_ESC(env->syntax)) {
+          v = fetch_escaped_value(&p, end, env);
+          if (v < 0) return v;
+          c = (OnigCodePoint )v;
+        }
+        c &= 0x9f;
       }
       break;
     }
@@ -2484,8 +2596,7 @@ fetch_escaped_value(UChar** src, UChar* end, ScanEnv* env, OnigCodePoint* val)
   }
 
   *src = p;
-  *val = c;
-  return 0;
+  return c;
 }
 
 static int fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env);
@@ -2506,13 +2617,8 @@ get_name_end_code_point(OnigCodePoint start)
 }
 
 #ifdef USE_NAMED_GROUP
-# ifdef RUBY
-#  define ONIGENC_IS_CODE_NAME(enc, c)  TRUE
-# else
-#  define ONIGENC_IS_CODE_NAME(enc, c)  ONIGENC_IS_CODE_WORD(enc, c)
-# endif
-
-# ifdef USE_BACKREF_WITH_LEVEL
+#define ONIGENC_IS_CODE_NAME(enc, c) TRUE
+#ifdef USE_BACKREF_WITH_LEVEL
 /*
    \k<name+n>, \k<name-n>
    \k<num+n>,  \k<num-n>
@@ -2572,11 +2678,11 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
 
     if (is_num != 0) {
       if (ONIGENC_IS_CODE_DIGIT(enc, c)) {
-	is_num = 1;
+        is_num = 1;
       }
       else {
-	r = ONIGERR_INVALID_GROUP_NAME;
-	is_num = 0;
+        r = ONIGERR_INVALID_GROUP_NAME;
+        is_num = 0;
       }
     }
     else if (!ONIGENC_IS_CODE_NAME(enc, c)) {
@@ -2589,10 +2695,6 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
       int level;
       int flag = (c == '-' ? -1 : 1);
 
-      if (PEND) {
-	r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME;
-	goto end;
-      }
       PFETCH(c);
       if (! ONIGENC_IS_CODE_DIGIT(enc, c)) goto err;
       PUNFETCH;
@@ -2601,11 +2703,9 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
       *rlevel = (level * flag);
       exist_level = 1;
 
-      if (!PEND) {
-	PFETCH(c);
-	if (c == end_code)
-	  goto end;
-      }
+      PFETCH(c);
+      if (c == end_code)
+	goto end;
     }
 
   err:
@@ -2632,7 +2732,7 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
     return r;
   }
 }
-# endif /* USE_BACKREF_WITH_LEVEL */
+#endif /* USE_BACKREF_WITH_LEVEL */
 
 /*
   ref: 0 -> define name    (don't allow number name)
@@ -2669,17 +2769,17 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
 
     if (ONIGENC_IS_CODE_DIGIT(enc, c)) {
       if (ref == 1)
-	is_num = 1;
+        is_num = 1;
       else {
-	r = ONIGERR_INVALID_GROUP_NAME;
-	is_num = 0;
+        r = ONIGERR_INVALID_GROUP_NAME;
+        is_num = 0;
       }
     }
     else if (c == '-') {
       if (ref == 1) {
-	is_num = 2;
-	sign = -1;
-	pnum_head = p;
+        is_num = 2;
+        sign = -1;
+        pnum_head = p;
       }
       else {
 	r = ONIGERR_INVALID_GROUP_NAME;
@@ -2696,30 +2796,30 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
       name_end = p;
       PFETCH_S(c);
       if (c == end_code || c == ')') {
-	if (is_num == 2) {
-	  r = ONIGERR_INVALID_GROUP_NAME;
-	  goto teardown;
-	}
-	break;
+        if (is_num == 2) {
+          r = ONIGERR_INVALID_GROUP_NAME;
+          goto teardown;
+        }
+        break;
       }
 
       if (is_num != 0) {
-	if (ONIGENC_IS_CODE_DIGIT(enc, c)) {
-	  is_num = 1;
-	}
-	else {
-	  if (!ONIGENC_IS_CODE_WORD(enc, c))
-	    r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME;
-	  else
-	    r = ONIGERR_INVALID_GROUP_NAME;
-	  goto teardown;
-	}
+        if (ONIGENC_IS_CODE_DIGIT(enc, c)) {
+          is_num = 1;
+        }
+        else {
+          if (!ONIGENC_IS_CODE_WORD(enc, c))
+            r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME;
+          else
+            r = ONIGERR_INVALID_GROUP_NAME;
+          goto teardown;
+        }
       }
       else {
-	if (!ONIGENC_IS_CODE_NAME(enc, c)) {
-	  r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME;
-	  goto teardown;
-	}
+        if (!ONIGENC_IS_CODE_NAME(enc, c)) {
+          r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME;
+          goto teardown;
+        }
       }
     }
 
@@ -2733,8 +2833,8 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
       *rback_num = onig_scan_unsigned_number(&pnum_head, name_end, enc);
       if (*rback_num < 0) return ONIGERR_TOO_BIG_NUMBER;
       else if (*rback_num == 0) {
-	r = ONIGERR_INVALID_GROUP_NAME;
-	goto err;
+        r = ONIGERR_INVALID_GROUP_NAME;
+        goto err;
       }
 
       *rback_num *= sign;
@@ -2745,12 +2845,12 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
     return 0;
   }
   else {
-teardown:
+  teardown:
     while (!PEND) {
       name_end = p;
       PFETCH_S(c);
       if (c == end_code || c == ')')
-	break;
+        break;
     }
     if (PEND)
       name_end = end;
@@ -2839,6 +2939,8 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
 }
 #endif /* USE_NAMED_GROUP */
 
+void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
+                           UChar* pat, UChar* pat_end, const UChar *fmt, va_list args);
 
 static void
 onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
@@ -2850,14 +2952,10 @@ onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
 		env->pattern, env->pattern_end,
 		(const UChar *)fmt, args);
     va_end(args);
-#ifdef RUBY
     if (env->sourcefile == NULL)
       rb_warn("%s", (char *)buf);
     else
       rb_compile_warn(env->sourcefile, env->sourceline, "%s", (char *)buf);
-#else
-    (*onig_warn)((char* )buf);
-#endif
 }
 
 static void
@@ -2881,23 +2979,15 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c)
   }
 }
 
-#ifndef RTEST
-# define RTEST(v)  1
-#endif
-
 static void
-CC_DUP_WARN(ScanEnv *env, OnigCodePoint from ARG_UNUSED, OnigCodePoint to ARG_UNUSED)
+CC_DUP_WARN(ScanEnv *env)
 {
   if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
 
   if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_DUP) &&
       !(env->warnings_flag & ONIG_SYN_WARN_CC_DUP)) {
-#ifdef WARN_ALL_CC_DUP
-    onig_syntax_warn(env, "character class has duplicated range: %04x-%04x", from, to);
-#else
     env->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
     onig_syntax_warn(env, "character class has duplicated range");
-#endif
   }
 }
 
@@ -3058,8 +3148,6 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
     case 'p':
     case 'P':
-      if (PEND) break;
-
       c2 = PPEEK;
       if (c2 == '{' &&
 	  IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY)) {
@@ -3067,7 +3155,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	tok->type = TK_CHAR_PROPERTY;
 	tok->u.prop.not = (c == 'P' ? 1 : 0);
 
-	if (!PEND && IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT)) {
+	if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT)) {
 	  PFETCH(c2);
 	  if (c2 == '^') {
 	    tok->u.prop.not = (tok->u.prop.not == 0 ? 1 : 0);
@@ -3090,10 +3178,10 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	num = scan_unsigned_hexadecimal_number(&p, end, 0, 8, enc);
 	if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
 	if (!PEND) {
-	  c2 = PPEEK;
-	  if (ONIGENC_IS_CODE_XDIGIT(enc, c2))
-	    return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
-	}
+          c2 = PPEEK;
+          if (ONIGENC_IS_CODE_XDIGIT(enc, c2))
+            return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
+        }
 
 	if (p > prev + enclen(enc, prev, end) && !PEND && (PPEEK_IS('}'))) {
 	  PINC;
@@ -3135,33 +3223,6 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       }
       break;
 
-    case 'o':
-      if (PEND) break;
-
-      prev = p;
-      if (PPEEK_IS('{') && IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_O_BRACE_OCTAL)) {
-	PINC;
-	num = scan_unsigned_octal_number(&p, end, 11, enc);
-	if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-	if (!PEND) {
-	  c2 = PPEEK;
-	  if (ONIGENC_IS_CODE_DIGIT(enc, c2) && c2 < '8')
-	    return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
-	}
-
-	if (p > prev + enclen(enc, prev, end) && !PEND && (PPEEK_IS('}'))) {
-	  PINC;
-	  tok->type   = TK_CODE_POINT;
-	  tok->base   = 8;
-	  tok->u.code = (OnigCodePoint )num;
-	}
-	else {
-	  /* can't read nothing or invalid format */
-	  p = prev;
-	}
-      }
-      break;
-
     case '0':
     case '1': case '2': case '3': case '4': case '5': case '6': case '7':
       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
@@ -3180,10 +3241,10 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
     default:
       PUNFETCH;
-      num = fetch_escaped_value(&p, end, env, &c2);
+      num = fetch_escaped_value(&p, end, env);
       if (num < 0) return num;
-      if ((OnigCodePoint )tok->u.c != c2) {
-	tok->u.code = (OnigCodePoint )c2;
+      if (tok->u.c != num) {
+	tok->u.code = (OnigCodePoint )num;
 	tok->type   = TK_CODE_POINT;
       }
       break;
@@ -3241,15 +3302,15 @@ fetch_named_backref_token(OnigCodePoint c, OnigToken* tok, UChar** src,
 
   prev = p;
 
-# ifdef USE_BACKREF_WITH_LEVEL
+#ifdef USE_BACKREF_WITH_LEVEL
   name_end = NULL_UCHARP; /* no need. escape gcc warning. */
   r = fetch_name_with_level(c, &p, end, &name_end,
 			    env, &back_num, &tok->u.backref.level);
   if (r == 1) tok->u.backref.exist_level = 1;
   else        tok->u.backref.exist_level = 0;
-# else
+#else
   r = fetch_name(&p, end, &name_end, env, &back_num, 1);
-# endif
+#endif
   if (r < 0) return r;
 
   if (back_num != 0) {
@@ -3287,7 +3348,7 @@ fetch_named_backref_token(OnigCodePoint c, OnigToken* tok, UChar** src,
 
     tok->type = TK_BACKREF;
     tok->u.backref.by_name = 1;
-    if (num == 1 || IS_SYNTAX_BV(syn, ONIG_SYN_USE_LEFT_MOST_NAMED_GROUP)) {
+    if (num == 1) {
       tok->u.backref.num  = 1;
       tok->u.backref.ref1 = backs[0];
     }
@@ -3540,9 +3601,9 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	num = scan_unsigned_hexadecimal_number(&p, end, 0, 8, enc);
 	if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
 	if (!PEND) {
-	  if (ONIGENC_IS_CODE_XDIGIT(enc, PPEEK))
-	    return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
-	}
+          if (ONIGENC_IS_CODE_XDIGIT(enc, PPEEK))
+            return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
+        }
 
 	if ((p > prev + enclen(enc, prev, end)) && !PEND && PPEEK_IS('}')) {
 	  PINC;
@@ -3583,39 +3644,13 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       }
       break;
 
-    case 'o':
-      if (PEND) break;
-
-      prev = p;
-      if (PPEEK_IS('{') && IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_O_BRACE_OCTAL)) {
-	PINC;
-	num = scan_unsigned_octal_number(&p, end, 11, enc);
-	if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-	if (!PEND) {
-	  OnigCodePoint c = PPEEK;
-	  if (ONIGENC_IS_CODE_DIGIT(enc, c) && c < '8')
-	    return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
-	}
-
-	if ((p > prev + enclen(enc, prev, end)) && !PEND && PPEEK_IS('}')) {
-	  PINC;
-	  tok->type   = TK_CODE_POINT;
-	  tok->u.code = (OnigCodePoint )num;
-	}
-	else {
-	  /* can't read nothing or invalid format */
-	  p = prev;
-	}
-      }
-      break;
-
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':
       PUNFETCH;
       prev = p;
       num = onig_scan_unsigned_number(&p, end, enc);
       if (num < 0 || num > ONIG_MAX_BACKREF_NUM) {
-	goto skip_backref;
+        goto skip_backref;
       }
 
       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_DECIMAL_BACKREF) &&
@@ -3648,7 +3683,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
 	prev = p;
 	num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc);
-	if (num < 0 || 0xff < num) return ONIGERR_TOO_BIG_NUMBER;
+	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
 	if (p == prev) {  /* can't read nothing. */
 	  num = 0; /* but, it's not error */
 	}
@@ -3663,7 +3698,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
 #ifdef USE_NAMED_GROUP
     case 'k':
-      if (!PEND && IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_K_NAMED_BACKREF)) {
+      if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_K_NAMED_BACKREF)) {
 	PFETCH(c);
 	if (c == '<' || c == '\'') {
 	  r = fetch_named_backref_token(c, tok, &p, end, env);
@@ -3679,8 +3714,8 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
 #if defined(USE_SUBEXP_CALL) || defined(USE_NAMED_GROUP)
     case 'g':
-# ifdef USE_NAMED_GROUP
-      if (!PEND && IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_BRACE_BACKREF)) {
+#ifdef USE_NAMED_GROUP
+      if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_BRACE_BACKREF)) {
 	PFETCH(c);
 	if (c == '{') {
 	  r = fetch_named_backref_token(c, tok, &p, end, env);
@@ -3689,9 +3724,9 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	else
 	  PUNFETCH;
       }
-# endif
-# ifdef USE_SUBEXP_CALL
-      if (!PEND && IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_SUBEXP_CALL)) {
+#endif
+#ifdef USE_SUBEXP_CALL
+      if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_SUBEXP_CALL)) {
 	PFETCH(c);
 	if (c == '<' || c == '\'') {
 	  int gnum = -1, rel = 0;
@@ -3728,7 +3763,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	  PUNFETCH;
 	}
       }
-# endif
+#endif
       break;
 #endif
 
@@ -3746,7 +3781,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	tok->type = TK_CHAR_PROPERTY;
 	tok->u.prop.not = (c == 'P' ? 1 : 0);
 
-	if (!PEND && IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT)) {
+	if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT)) {
 	  PFETCH(c);
 	  if (c == '^') {
 	    tok->u.prop.not = (tok->u.prop.not == 0 ? 1 : 0);
@@ -3779,20 +3814,16 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       break;
 
     default:
-      {
-	OnigCodePoint c2;
-
-	PUNFETCH;
-	num = fetch_escaped_value(&p, end, env, &c2);
-	if (num < 0) return num;
-	/* set_raw: */
-	if ((OnigCodePoint )tok->u.c != c2) {
-	  tok->type = TK_CODE_POINT;
-	  tok->u.code = (OnigCodePoint )c2;
-	}
-	else { /* string */
-	  p = tok->backp + enclen(enc, tok->backp, end);
-	}
+      PUNFETCH;
+      num = fetch_escaped_value(&p, end, env);
+      if (num < 0) return num;
+      /* set_raw: */
+      if (tok->u.c != num) {
+	tok->type = TK_CODE_POINT;
+	tok->u.code = (OnigCodePoint )num;
+      }
+      else { /* string */
+	p = tok->backp + enclen(enc, tok->backp, end);
       }
       break;
     }
@@ -3882,22 +3913,22 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
     case '(':
       if (PPEEK_IS('?') &&
-	  IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_QMARK_GROUP_EFFECT)) {
-	PINC;
-	if (PPEEK_IS('#')) {
-	  PFETCH(c);
-	  while (1) {
-	    if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
-	    PFETCH(c);
-	    if (c == MC_ESC(syn)) {
-	      if (!PEND) PFETCH(c);
-	    }
-	    else {
-	      if (c == ')') break;
-	    }
-	  }
-	  goto start;
-	}
+          IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_QMARK_GROUP_EFFECT)) {
+        PINC;
+        if (PPEEK_IS('#')) {
+          PFETCH(c);
+          while (1) {
+            if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
+            PFETCH(c);
+            if (c == MC_ESC(syn)) {
+              if (!PEND) PFETCH(c);
+            }
+            else {
+              if (c == ')') break;
+            }
+          }
+          goto start;
+        }
 #ifdef USE_PERL_SUBEXP_CALL
 	/* (?&name), (?n), (?R), (?0), (?+n), (?-n) */
 	c = PPEEK;
@@ -3968,7 +3999,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	  PFETCH_READY;
 
 	  PINC;     /* skip 'P' */
-	  if (PEND) return ONIGERR_UNDEFINED_GROUP_OPTION;
 	  PFETCH(c);
 	  if (c == '=') {       /* (?P=name): backref */
 	    r = fetch_named_backref_token((OnigCodePoint )'(', tok, &p, end, env);
@@ -3987,9 +4017,10 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
 	    tok->u.call.rel      = 0;
 	    break;
 	  }
+	  PUNFETCH;
 	}
 #endif /* USE_CAPITAL_P_NAMED_GROUP */
-	PUNFETCH;
+        PUNFETCH;
       }
 
       if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_LPAREN_SUBEXP)) break;
@@ -4067,8 +4098,8 @@ add_ctype_to_cc_by_range(CClassNode* cc, int ctype ARG_UNUSED, int not,
 
   if (not == 0) {
     for (i = 0; i < n; i++) {
-      for (j = ONIGENC_CODE_RANGE_FROM(mbr, i);
-	  j <= ONIGENC_CODE_RANGE_TO(mbr, i); j++) {
+      for (j  = ONIGENC_CODE_RANGE_FROM(mbr, i);
+           j <= ONIGENC_CODE_RANGE_TO(mbr, i); j++) {
 	if (j >= sb_out) {
 	  if (j > ONIGENC_CODE_RANGE_FROM(mbr, i)) {
 	    r = add_code_range_to_buf(&(cc->mbuf), env, j,
@@ -4079,7 +4110,7 @@ add_ctype_to_cc_by_range(CClassNode* cc, int ctype ARG_UNUSED, int not,
 
 	  goto sb_end;
 	}
-	BITSET_SET_BIT_CHKDUP(cc->bs, j);
+        BITSET_SET_BIT_CHKDUP(cc->bs, j);
       }
     }
 
@@ -4152,15 +4183,12 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int ascii_range, ScanEnv* en
 	  CClassNode ccascii;
 	  initialize_cclass(&ccascii);
 	  if (ONIGENC_MBC_MINLEN(env->enc) > 1) {
-	    r = add_code_range(&(ccascii.mbuf), env, 0x00, 0x7F);
+	    add_code_range(&(ccascii.mbuf), env, 0x00, 0x7F);
 	  }
 	  else {
 	    bitset_set_range(env, ccascii.bs, 0x00, 0x7F);
-	    r = 0;
-	  }
-	  if (r == 0) {
-	    r = and_cclass(&ccwork, &ccascii, env);
 	  }
+	  r = and_cclass(&ccwork, &ccascii, env);
 	  if (IS_NOT_NULL(ccascii.mbuf)) bbuf_free(ccascii.mbuf);
 	}
 	if (r == 0) {
@@ -4216,7 +4244,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int ascii_range, ScanEnv* en
 	  BITSET_SET_BIT_CHKDUP(cc->bs, c);
       }
       if (ascii_range)
-	ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+        ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }
     else {
       for (c = 0; c < maxcode; c++) {
@@ -4224,7 +4252,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int ascii_range, ScanEnv* en
 	  BITSET_SET_BIT_CHKDUP(cc->bs, c);
       }
       if (! ascii_range)
-	ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+        ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }
     break;
 
@@ -4234,16 +4262,16 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int ascii_range, ScanEnv* en
 	if (ONIGENC_IS_CODE_WORD(enc, c)) BITSET_SET_BIT_CHKDUP(cc->bs, c);
       }
       if (! ascii_range)
-	ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+        ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }
     else {
       for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
-	if ((ONIGENC_CODE_TO_MBCLEN(enc, c) > 0) /* check invalid code point */
+        if ((ONIGENC_CODE_TO_MBCLEN(enc, c) > 0) /* check invalid code point */
 	    && (! ONIGENC_IS_CODE_WORD(enc, c) || c >= maxcode))
 	  BITSET_SET_BIT_CHKDUP(cc->bs, c);
       }
       if (ascii_range)
-	ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+        ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }
     break;
 
@@ -4302,7 +4330,7 @@ parse_posix_bracket(CClassNode* cc, CClassNode* asc_cc,
     if (onigenc_with_ascii_strncmp(enc, p, end, pb->name, pb->len) == 0) {
       p = (UChar* )onigenc_step(enc, p, end, pb->len);
       if (onigenc_with_ascii_strncmp(enc, p, end, (UChar* )":]", 2) != 0)
-	return ONIGERR_INVALID_POSIX_BRACKET_TYPE;
+        return ONIGERR_INVALID_POSIX_BRACKET_TYPE;
 
       r = add_ctype_to_cc(cc, pb->ctype, not, ascii_range, env);
       if (r != 0) return r;
@@ -4333,7 +4361,7 @@ parse_posix_bracket(CClassNode* cc, CClassNode* asc_cc,
     if (! PEND) {
       PFETCH_S(c);
       if (c == ']')
-	return ONIGERR_INVALID_POSIX_BRACKET_TYPE;
+        return ONIGERR_INVALID_POSIX_BRACKET_TYPE;
     }
   }
 
@@ -4413,7 +4441,7 @@ enum CCVALTYPE {
 
 static int
 next_state_class(CClassNode* cc, CClassNode* asc_cc,
-		 OnigCodePoint* vs, enum CCVALTYPE* type,
+	         OnigCodePoint* vs, enum CCVALTYPE* type,
 		 enum CCSTATE* state, ScanEnv* env)
 {
   int r;
@@ -4444,8 +4472,8 @@ next_state_class(CClassNode* cc, CClassNode* asc_cc,
 
 static int
 next_state_val(CClassNode* cc, CClassNode* asc_cc,
-	       OnigCodePoint *from, OnigCodePoint to,
-	       int* from_israw, int to_israw,
+	       OnigCodePoint *vs, OnigCodePoint v,
+	       int* vs_israw, int v_israw,
 	       enum CCVALTYPE intype, enum CCVALTYPE* type,
 	       enum CCSTATE* state, ScanEnv* env)
 {
@@ -4454,15 +4482,15 @@ next_state_val(CClassNode* cc, CClassNode* asc_cc,
   switch (*state) {
   case CCS_VALUE:
     if (*type == CCV_SB) {
-      BITSET_SET_BIT_CHKDUP(cc->bs, (int )(*from));
+      BITSET_SET_BIT_CHKDUP(cc->bs, (int )(*vs));
       if (IS_NOT_NULL(asc_cc))
-	BITSET_SET_BIT(asc_cc->bs, (int )(*from));
+	BITSET_SET_BIT(asc_cc->bs, (int )(*vs));
     }
     else if (*type == CCV_CODE_POINT) {
-      r = add_code_range(&(cc->mbuf), env, *from, *from);
+      r = add_code_range(&(cc->mbuf), env, *vs, *vs);
       if (r < 0) return r;
       if (IS_NOT_NULL(asc_cc)) {
-	r = add_code_range0(&(asc_cc->mbuf), env, *from, *from, 0);
+	r = add_code_range0(&(asc_cc->mbuf), env, *vs, *vs, 0);
 	if (r < 0) return r;
       }
     }
@@ -4471,43 +4499,51 @@ next_state_val(CClassNode* cc, CClassNode* asc_cc,
   case CCS_RANGE:
     if (intype == *type) {
       if (intype == CCV_SB) {
-	if (*from > 0xff || to > 0xff)
-	  return ONIGERR_INVALID_CODE_POINT_VALUE;
+        if (*vs > 0xff || v > 0xff)
+          return ONIGERR_INVALID_CODE_POINT_VALUE;
 
-	if (*from > to) {
+	if (*vs > v) {
 	  if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC))
 	    goto ccs_range_end;
 	  else
 	    return ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS;
 	}
-	bitset_set_range(env, cc->bs, (int )*from, (int )to);
+	bitset_set_range(env, cc->bs, (int )*vs, (int )v);
 	if (IS_NOT_NULL(asc_cc))
-	  bitset_set_range(env, asc_cc->bs, (int )*from, (int )to);
+	  bitset_set_range(env, asc_cc->bs, (int )*vs, (int )v);
       }
       else {
-	r = add_code_range(&(cc->mbuf), env, *from, to);
+	r = add_code_range(&(cc->mbuf), env, *vs, v);
 	if (r < 0) return r;
 	if (IS_NOT_NULL(asc_cc)) {
-	  r = add_code_range0(&(asc_cc->mbuf), env, *from, to, 0);
+	  r = add_code_range0(&(asc_cc->mbuf), env, *vs, v, 0);
 	  if (r < 0) return r;
 	}
       }
     }
     else {
-      if (*from > to) {
-	if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC))
-	  goto ccs_range_end;
-	else
-	  return ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS;
-      }
-      bitset_set_range(env, cc->bs, (int )*from, (int )(to < 0xff ? to : 0xff));
-      r = add_code_range(&(cc->mbuf), env, (OnigCodePoint )*from, to);
-      if (r < 0) return r;
-      if (IS_NOT_NULL(asc_cc)) {
-	bitset_set_range(env, asc_cc->bs, (int )*from, (int )(to < 0xff ? to : 0xff));
-	r = add_code_range0(&(asc_cc->mbuf), env, (OnigCodePoint )*from, to, 0);
+#if 0
+      if (intype == CCV_CODE_POINT && *type == CCV_SB) {
+#endif
+	if (*vs > v) {
+	  if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC))
+	    goto ccs_range_end;
+	  else
+	    return ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS;
+	}
+	bitset_set_range(env, cc->bs, (int )*vs, (int )(v < 0xff ? v : 0xff));
+	r = add_code_range(&(cc->mbuf), env, (OnigCodePoint )*vs, v);
 	if (r < 0) return r;
+	if (IS_NOT_NULL(asc_cc)) {
+	  bitset_set_range(env, asc_cc->bs, (int )*vs, (int )(v < 0xff ? v : 0xff));
+	  r = add_code_range0(&(asc_cc->mbuf), env, (OnigCodePoint )*vs, v, 0);
+	  if (r < 0) return r;
+	}
+#if 0
       }
+      else
+	return ONIGERR_MISMATCH_CODE_LENGTH_IN_CLASS_RANGE;
+#endif
     }
   ccs_range_end:
     *state = CCS_COMPLETE;
@@ -4522,9 +4558,9 @@ next_state_val(CClassNode* cc, CClassNode* asc_cc,
     break;
   }
 
-  *from_israw = to_israw;
-  *from       = to;
-  *type       = intype;
+  *vs_israw = v_israw;
+  *vs       = v;
+  *type     = intype;
   return 0;
 }
 
@@ -4568,11 +4604,8 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
   enum CCVALTYPE val_type, in_type;
   int val_israw, in_israw;
 
-  *np = *asc_np = NULL_NODE;
-  env->parse_depth++;
-  if (env->parse_depth > ParseDepthLimit)
-    return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
   prev_cc = asc_prev_cc = (CClassNode* )NULL;
+  *np = *asc_np = NULL_NODE;
   r = fetch_token_in_cc(tok, src, end, env);
   if (r == TK_CHAR && tok->u.c == '^' && tok->escaped == 0) {
     neg = 1;
@@ -4654,7 +4687,7 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
 	  goto err;
 	}
 
-	len = enclen(env->enc, buf, buf + i);
+	len = enclen(env->enc, buf, buf+i);
 	if (i < len) {
 	  r = ONIGERR_TOO_SHORT_MULTI_BYTE_STRING;
 	  goto err;
@@ -4662,8 +4695,7 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
 	else if (i > len) { /* fetch back */
 	  p = psave;
 	  for (i = 1; i < len; i++) {
-	    (void)fetch_token_in_cc(tok, &p, end, env);
-	    /* no need to check the retun value (already checked above) */
+	    r = fetch_token_in_cc(tok, &p, end, env);
 	  }
 	  fetched = 0;
 	}
@@ -4763,12 +4795,6 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
 	  CC_ESC_WARN(env, (UChar* )"-");
 	  goto range_end_val;
 	}
-
-	if (val_type == CCV_CLASS) {
-	  r = ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS;
-	  goto err;
-	}
-
 	state = CCS_RANGE;
       }
       else if (state == CCS_START) {
@@ -4922,17 +4948,16 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
 #define NEWLINE_CODE    0x0a
 
       if (ONIGENC_IS_CODE_NEWLINE(env->enc, NEWLINE_CODE)) {
-	if (ONIGENC_CODE_TO_MBCLEN(env->enc, NEWLINE_CODE) == 1)
-	  BITSET_SET_BIT_CHKDUP(cc->bs, NEWLINE_CODE);
-	else {
-	  r = add_code_range(&(cc->mbuf), env, NEWLINE_CODE, NEWLINE_CODE);
-	  if (r < 0) goto err;
-	}
+        if (ONIGENC_CODE_TO_MBCLEN(env->enc, NEWLINE_CODE) == 1)
+          BITSET_SET_BIT_CHKDUP(cc->bs, NEWLINE_CODE);
+        else {
+          r = add_code_range(&(cc->mbuf), env, NEWLINE_CODE, NEWLINE_CODE);
+          if (r < 0) goto err;
+        }
       }
     }
   }
   *src = p;
-  env->parse_depth--;
   return 0;
 
  err:
@@ -4993,14 +5018,6 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
     case '>':   /* (?>...) stop backtrack */
       *np = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
       break;
-    case '~':   /* (?~...) absent operator */
-      if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_TILDE_ABSENT)) {
-	*np = node_new_enclose(ENCLOSE_ABSENT);
-      }
-      else {
-	return ONIGERR_UNDEFINED_GROUP_OPTION;
-      }
-      break;
 
 #ifdef USE_NAMED_GROUP
     case '\'':
@@ -5011,20 +5028,18 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	return ONIGERR_UNDEFINED_GROUP_OPTION;
       break;
 
-# ifdef USE_CAPITAL_P_NAMED_GROUP
+#ifdef USE_CAPITAL_P_NAMED_GROUP
     case 'P':   /* (?P<name>...) */
-      if (!PEND &&
-	  IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP)) {
+      if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP)) {
 	PFETCH(c);
 	if (c == '<') goto named_group1;
       }
       return ONIGERR_UNDEFINED_GROUP_OPTION;
       break;
-# endif
+#endif
 #endif
 
     case '<':   /* look behind (?<=...), (?<!...) */
-      if (PEND) return ONIGERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS;
       PFETCH(c);
       if (c == '=')
 	*np = onig_node_new_anchor(ANCHOR_LOOK_BEHIND);
@@ -5042,9 +5057,7 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	named_group1:
 	  list_capture = 0;
 
-# ifdef USE_CAPTURE_HISTORY
 	named_group2:
-# endif
 	  name = p;
 	  r = fetch_name((OnigCodePoint )c, &p, end, &name_end, env, &num, 0);
 	  if (r < 0) return r;
@@ -5074,12 +5087,10 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 #endif
       break;
 
-#ifdef USE_CAPTURE_HISTORY
     case '@':
       if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_ATMARK_CAPTURE_HISTORY)) {
-# ifdef USE_NAMED_GROUP
-	if (!PEND &&
-	    IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP)) {
+#ifdef USE_NAMED_GROUP
+	if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP)) {
 	  PFETCH(c);
 	  if (c == '<' || c == '\'') {
 	    list_capture = 1;
@@ -5087,7 +5098,7 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	  }
 	  PUNFETCH;
 	}
-# endif
+#endif
 	*np = node_new_enclose_memory(env->option, 0);
 	CHECK_NULL_RETURN_MEMERR(*np);
 	num = scan_env_add_mem_entry(env);
@@ -5102,11 +5113,9 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	return ONIGERR_UNDEFINED_GROUP_OPTION;
       }
       break;
-#endif /* USE_CAPTURE_HISTORY */
 
     case '(':   /* conditional expression: (?(cond)yes), (?(cond)yes|no) */
-      if (!PEND &&
-	  IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LPAREN_CONDITION)) {
+      if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LPAREN_CONDITION)) {
 	UChar *name = NULL;
 	UChar *name_end;
 	PFETCH(c);
@@ -5124,29 +5133,36 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 #endif
 	  if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_STRICT_CHECK_BACKREF)) {
 	    if (num > env->num_mem ||
-		IS_NULL(SCANENV_MEM_NODES(env)[num]))
+	        IS_NULL(SCANENV_MEM_NODES(env)[num]))
 	    return ONIGERR_INVALID_BACKREF;
 	  }
 	}
 #ifdef USE_NAMED_GROUP
 	else if (c == '<' || c == '\'') {    /* (<name>), ('name') */
+	  int nums;
+	  int *backs;
+
 	  name = p;
-	  r = fetch_named_backref_token(c, tok, &p, end, env);
+	  r = fetch_name((OnigCodePoint )c, &p, end, &name_end, env, &num, 0);
 	  if (r < 0) return r;
-	  if (!PPEEK_IS(')')) return ONIGERR_UNDEFINED_GROUP_OPTION;
-	  PINC;
+	  PFETCH(c);
+	  if (c != ')') return ONIGERR_UNDEFINED_GROUP_OPTION;
 
-	  if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_USE_LEFT_MOST_NAMED_GROUP)) {
-	    num = tok->u.backref.ref1;
+	  nums = onig_name_to_group_numbers(env->reg, name, name_end, &backs);
+	  if (nums <= 0) {
+	    onig_scan_env_set_error_string(env,
+		     ONIGERR_UNDEFINED_NAME_REFERENCE, name, name_end);
+	    return ONIGERR_UNDEFINED_NAME_REFERENCE;
 	  }
-	  else {
-	    /* FIXME:
-	     * Use left most named group for now. This is the same as Perl.
-	     * However this should use the same strategy as normal back-
-	     * references on Ruby syntax; search right to left. */
-	    int len = tok->u.backref.num;
-	    num = len > 1 ? tok->u.backref.refs[0] : tok->u.backref.ref1;
+	  if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_STRICT_CHECK_BACKREF)) {
+	    int i;
+	    for (i = 0; i < nums; i++) {
+	      if (backs[i] > env->num_mem ||
+		  IS_NULL(SCANENV_MEM_NODES(env)[backs[i]]))
+	      return ONIGERR_INVALID_BACKREF;
+	    }
 	  }
+	  num = backs[0];       /* XXX: use left most named group as Perl */
 	}
 #endif
 	else
@@ -5171,7 +5187,7 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 #endif
 
     case '^':   /* loads default options */
-      if (!PEND && IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL)) {
+      if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL)) {
 	/* d-imsx */
 	ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
 	ONOFF(option, ONIG_OPTION_IGNORECASE, 1);
@@ -5181,7 +5197,7 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	PFETCH(c);
       }
 #if 0
-      else if (!PEND && IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) {
+      else if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) {
 	/* d-imx */
 	ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
 	ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 0);
@@ -5239,8 +5255,8 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 
 	  case 'a':     /* limits \d, \s, \w and POSIX brackets to ASCII range */
 	    if ((IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) ||
-		 IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
-		(neg == 0)) {
+	         IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
+	        (neg == 0)) {
 	      ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
 	      ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 1);
 	      ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 1);
@@ -5251,8 +5267,8 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 
 	  case 'u':
 	    if ((IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) ||
-		 IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
-		(neg == 0)) {
+	         IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
+	        (neg == 0)) {
 	      ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
 	      ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 1);
 	      ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 1);
@@ -5263,11 +5279,11 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 
 	  case 'd':
 	    if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) &&
-		(neg == 0)) {
+	        (neg == 0)) {
 	      ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
 	    }
 	    else if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY) &&
-		(neg == 0)) {
+	        (neg == 0)) {
 	      ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
 	      ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 0);
 	      ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 0);
@@ -5297,12 +5313,9 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
 	  else if (c == ':') {
 	    OnigOptionType prev = env->option;
 
-	    env->option = option;
+	    env->option     = option;
 	    r = fetch_token(tok, &p, end, env);
-	    if (r < 0) {
-	      env->option = prev;
-	      return r;
-	    }
+	    if (r < 0) return r;
 	    r = parse_subexp(&target, tok, term, &p, end, env);
 	    env->option = prev;
 	    if (r < 0) return r;
@@ -5417,29 +5430,29 @@ set_quantifier(Node* qnode, Node* target, int group, ScanEnv* env)
       int targetq_num = popular_quantifier_num(qnt);
 
 #ifdef USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
-      if (nestq_num >= 0 && targetq_num >= 0 &&
+      if (!IS_QUANTIFIER_BY_NUMBER(qn) && !IS_QUANTIFIER_BY_NUMBER(qnt) &&
 	  IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT)) {
-	switch (ReduceTypeTable[targetq_num][nestq_num]) {
-	case RQ_ASIS:
-	  break;
-
-	case RQ_DEL:
-	  if (onig_warn != onig_null_warn) {
-	    onig_syntax_warn(env, "regular expression has redundant nested repeat operator '%s'",
-		PopularQStr[targetq_num]);
-	  }
-	  goto warn_exit;
-	  break;
-
-	default:
-	  if (onig_warn != onig_null_warn) {
-	    onig_syntax_warn(env, "nested repeat operator '%s' and '%s' was replaced with '%s' in regular expression",
-		PopularQStr[targetq_num], PopularQStr[nestq_num],
-		ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
-	  }
-	  goto warn_exit;
-	  break;
-	}
+        switch (ReduceTypeTable[targetq_num][nestq_num]) {
+        case RQ_ASIS:
+          break;
+
+        case RQ_DEL:
+          if (onig_warn != onig_null_warn) {
+              onig_syntax_warn(env, "regular expression has redundant nested repeat operator '%s'",
+                               PopularQStr[targetq_num]);
+          }
+          goto warn_exit;
+          break;
+
+        default:
+          if (onig_warn != onig_null_warn) {
+              onig_syntax_warn(env, "nested repeat operator '%s' and '%s' was replaced with '%s' in regular expression",
+                               PopularQStr[targetq_num], PopularQStr[nestq_num],
+                               ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
+          }
+          goto warn_exit;
+          break;
+        }
       }
 
     warn_exit:
@@ -5469,6 +5482,85 @@ set_quantifier(Node* qnode, Node* target, int group, ScanEnv* env)
 }
 
 
+#ifdef USE_SHARED_CCLASS_TABLE
+
+#define THRESHOLD_RANGE_NUM_FOR_SHARE_CCLASS     8
+
+/* for ctype node hash table */
+
+typedef struct {
+  OnigEncoding enc;
+  int not;
+  int type;
+} type_cclass_key;
+
+static int type_cclass_cmp(type_cclass_key* x, type_cclass_key* y)
+{
+  if (x->type != y->type) return 1;
+  if (x->enc  != y->enc)  return 1;
+  if (x->not  != y->not)  return 1;
+  return 0;
+}
+
+static st_index_t type_cclass_hash(type_cclass_key* key)
+{
+  int i, val;
+  UChar *p;
+
+  val = 0;
+
+  p = (UChar* )&(key->enc);
+  for (i = 0; i < (int )sizeof(key->enc); i++) {
+    val = val * 997 + (int )*p++;
+  }
+
+  p = (UChar* )(&key->type);
+  for (i = 0; i < (int )sizeof(key->type); i++) {
+    val = val * 997 + (int )*p++;
+  }
+
+  val += key->not;
+  return val + (val >> 5);
+}
+
+static const struct st_hash_type type_type_cclass_hash = {
+    type_cclass_cmp,
+    type_cclass_hash,
+};
+
+static st_table* OnigTypeCClassTable;
+
+
+static int
+i_free_shared_class(type_cclass_key* key, Node* node, void* arg ARG_UNUSED)
+{
+  if (IS_NOT_NULL(node)) {
+    CClassNode* cc = NCCLASS(node);
+    if (IS_NOT_NULL(cc->mbuf)) xfree(cc->mbuf);
+    xfree(node);
+  }
+
+  if (IS_NOT_NULL(key)) xfree(key);
+  return ST_DELETE;
+}
+
+extern int
+onig_free_shared_cclass_table(void)
+{
+  /* THREAD_ATOMIC_START; */
+  if (IS_NOT_NULL(OnigTypeCClassTable)) {
+    onig_st_foreach(OnigTypeCClassTable, i_free_shared_class, 0);
+    onig_st_free_table(OnigTypeCClassTable);
+    OnigTypeCClassTable = NULL;
+  }
+  /* THREAD_ATOMIC_END; */
+
+  return 0;
+}
+
+#endif /* USE_SHARED_CCLASS_TABLE */
+
+
 #ifndef CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS
 static int
 clear_not_flag_cclass(CClassNode* cc, OnigEncoding enc)
@@ -5511,7 +5603,7 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[],
   CClassNode* cc;
   CClassNode* asc_cc;
   BitSetRef bs;
-  int add_flag, r;
+  int add_flag;
 
   iarg = (IApplyCaseFoldArg* )arg;
   env = iarg->env;
@@ -5538,8 +5630,7 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[],
 	(is_in == 0 &&  IS_NCCLASS_NOT(cc))) {
       if (add_flag) {
 	if (ONIGENC_MBC_MINLEN(env->enc) > 1 || *to >= SINGLE_BYTE_SIZE) {
-	  r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
-	  if (r < 0) return r;
+	  add_code_range0(&(cc->mbuf), env, *to, *to, 0);
 	}
 	else {
 	  BITSET_SET_BIT(bs, *to);
@@ -5551,8 +5642,7 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[],
       if (add_flag) {
 	if (ONIGENC_MBC_MINLEN(env->enc) > 1 || *to >= SINGLE_BYTE_SIZE) {
 	  if (IS_NCCLASS_NOT(cc)) clear_not_flag_cclass(cc, env->enc);
-	  r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
-	  if (r < 0) return r;
+	  add_code_range0(&(cc->mbuf), env, *to, *to, 0);
 	}
 	else {
 	  if (IS_NCCLASS_NOT(cc)) {
@@ -5642,7 +5732,7 @@ node_linebreak(Node** np, ScanEnv* env)
   Node* target1 = NULL;
   Node* target2 = NULL;
   CClassNode* cc;
-  int num1, num2, r;
+  int num1, num2;
   UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN * 2];
 
   /* \x0D\x0A */
@@ -5658,8 +5748,7 @@ node_linebreak(Node** np, ScanEnv* env)
   if (IS_NULL(right)) goto err;
   cc = NCCLASS(right);
   if (ONIGENC_MBC_MINLEN(env->enc) > 1) {
-    r = add_code_range(&(cc->mbuf), env, 0x0A, 0x0D);
-    if (r != 0) goto err;
+    add_code_range(&(cc->mbuf), env, 0x0A, 0x0D);
   }
   else {
     bitset_set_range(env, cc->bs, 0x0A, 0x0D);
@@ -5668,10 +5757,8 @@ node_linebreak(Node** np, ScanEnv* env)
   /* TODO: move this block to enc/unicode.c */
   if (ONIGENC_IS_UNICODE(env->enc)) {
     /* UTF-8, UTF-16BE/LE, UTF-32BE/LE */
-    r = add_code_range(&(cc->mbuf), env, 0x85, 0x85);
-    if (r != 0) goto err;
-    r = add_code_range(&(cc->mbuf), env, 0x2028, 0x2029);
-    if (r != 0) goto err;
+    add_code_range(&(cc->mbuf), env, 0x85, 0x85);
+    add_code_range(&(cc->mbuf), env, 0x2028, 0x2029);
   }
 
   /* ...|... */
@@ -5698,357 +5785,84 @@ node_linebreak(Node** np, ScanEnv* env)
 }
 
 static int
-propname2ctype(ScanEnv* env, const char* propname)
-{
-  UChar* name = (UChar* )propname;
-  UChar* name_end = name + strlen(propname);
-  int ctype = env->enc->property_name_to_ctype(ONIG_ENCODING_ASCII,
-      name, name_end);
-  if (ctype < 0) {
-    onig_scan_env_set_error_string(env, ctype, name, name_end);
-  }
-  return ctype;
-}
-
-static int
-add_property_to_cc(CClassNode* cc, const char* propname, int not, ScanEnv* env)
-{
-  int ctype = propname2ctype(env, propname);
-  if (ctype < 0) return ctype;
-  return add_ctype_to_cc(cc, ctype, not, 0, env);
-}
-
-/*
- * helper methods for node_extended_grapheme_cluster (/\X/)
- */
-static int
-create_property_node(Node **np, ScanEnv* env, const char* propname)
-{
-  int r;
-  CClassNode* cc;
-
-  *np = node_new_cclass();
-  if (IS_NULL(*np)) return ONIGERR_MEMORY;
-  cc = NCCLASS(*np);
-  r = add_property_to_cc(cc, propname, 0, env);
-  if (r != 0)
-    onig_node_free(*np);
-  return r;
-}
-
-static int
-quantify_node(Node **np, int lower, int upper)
-{
-  Node* tmp = node_new_quantifier(lower, upper, 0);
-  if (IS_NULL(tmp)) return ONIGERR_MEMORY;
-  NQTFR(tmp)->target = *np;
-  *np = tmp;
-  return 0;
-}
-
-static int
-quantify_property_node(Node **np, ScanEnv* env, const char* propname, char repetitions)
-{
-  int r;
-  int lower = 0;
-  int upper = REPEAT_INFINITE;
-
-  r = create_property_node(np, env, propname);
-  if (r != 0) return r;
-  switch (repetitions) {
-    case '?':  upper = 1;          break;
-    case '+':  lower = 1;          break;
-    case '*':                      break;
-    case '2':  lower = upper = 2;  break;
-    default :  return ONIGERR_PARSER_BUG;
-  }
-  return quantify_node(np, lower, upper);
-}
-
-#define LIST 0
-#define ALT  1
-
-/* IMPORTANT: Make sure node_array ends with NULL_NODE */
-static int
-create_node_from_array(int kind, Node **np, Node **node_array)
-{
-  Node* tmp = NULL_NODE;
-  int i = 0;
-
-  while (node_array[i] != NULL_NODE)  i++;
-  while (--i >= 0) {
-    *np = kind==LIST ? node_new_list(node_array[i], tmp)
-                     : onig_node_new_alt(node_array[i], tmp);
-    if (IS_NULL(*np)) {
-      while (i >= 0) {
-        onig_node_free(node_array[i]);
-        node_array[i--] = NULL_NODE;
-      }
-      onig_node_free(tmp);
-      return ONIGERR_MEMORY;
-    }
-    else
-      node_array[i] = NULL_NODE;
-    tmp = *np;
-  }
-  return 0;
-}
-
-#define R_ERR(call) r=(call);if(r!=0)goto err
-
-/* Memory layout for common node array:
- * The main purpose is to be able to easily free all leftover nodes
- * after an error. As a side effect, we share some memory.
- *
- * The layout is as shown below (each line corresponds to one call of
- * create_node_from_array()). Because create_node_from_array sets all
- * nodes of the source to NULL_NODE, we can overlap the target array
- * as long as we do not override the actual target location.
- *
- * Target       Array name          Index
- *
- *              node_array          0 1 2 3 4 5 6 7 8 9 A B C D E F
- * top_alts     alts[5]             0 1 2 3 4*
- * alts+1       list[4]                   0 1 2 3*
- * list+1       core_alts[7]                  0 1 2 3 4 5 6*
- * core_alts+0  H_list[4]                       0 1 2 3*
- * H_list+1     H_alt2[4]                           0 1 2 3*
- * h_alt2+1     H_list2[3]                              0 1 2*
- * core_alts+4  XP_list[4]                              0 1 2 3*
- * XP_list+1    Ex_list[4]                                  0 1 2 3*
- */
-#define NODE_COMMON_SIZE 16
-
-static int
 node_extended_grapheme_cluster(Node** np, ScanEnv* env)
 {
-  Node* tmp = NULL;
+  /* same as (?>\P{M}\p{M}*) */
   Node* np1 = NULL;
-  Node* top_alt = NULL;
+  Node* np2 = NULL;
+  Node* qn = NULL;
+  Node* list1 = NULL;
+  Node* list2 = NULL;
   int r = 0;
-  int num1;
-  int i;
-  int any_target_position;
-  UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN * 2];
-  OnigOptionType option;
-  /* node_common is function-global so that we can free all nodes
-   * in case of error. Unused slots are set to NULL_NODE at all times. */
-  Node *node_common[NODE_COMMON_SIZE];
-  Node **alts = node_common+0; /* size: 5 */
-
-  for (i=0; i<NODE_COMMON_SIZE; i++)
-    node_common[i] = NULL_NODE;
-
-  /* CRLF, common for both Unicode and non-Unicode */
-  /* \x0D\x0A */
-  r = ONIGENC_CODE_TO_MBC(env->enc, 0x0D, buf);
-  if (r < 0) goto err;
-  num1 = r;
-  r = ONIGENC_CODE_TO_MBC(env->enc, 0x0A, buf + num1);
-  if (r < 0) goto err;
-  alts[0] = node_new_str_raw(buf, buf + num1 + r);
-  if (IS_NULL(alts[0])) goto err;
 
 #ifdef USE_UNICODE_PROPERTIES
-  if (ONIGENC_IS_UNICODE(env->enc)) {  /* UTF-8, UTF-16BE/LE, UTF-32BE/LE */
-    CClassNode* cc;
-
-    if (propname2ctype(env, "Grapheme_Cluster_Break=Extend") < 0) goto err;
-    /* Unicode 11.0.0
-     *   CRLF     (already done)
-     * | [Control CR LF]
-     * | precore* core postcore*
-     * | .      (to catch invalid stuff, because this seems to be spec for String#grapheme_clusters) */
-
-    /* [Control CR LF]    (CR and LF are not in the spec, but this is a conformed fix) */
-    alts[1] = node_new_cclass();
-    if (IS_NULL(alts[1])) goto err;
-    cc = NCCLASS(alts[1]);
-    R_ERR(add_property_to_cc(cc, "Grapheme_Cluster_Break=Control", 0, env));
-    if (ONIGENC_MBC_MINLEN(env->enc) > 1) { /* UTF-16/UTF-32 */
-      R_ERR(add_code_range(&(cc->mbuf), env, 0x000A, 0x000A)); /* CR */
-      R_ERR(add_code_range(&(cc->mbuf), env, 0x000D, 0x000D)); /* LF */
-    }
-    else {
-      BITSET_SET_BIT(cc->bs, 0x0a);
-      BITSET_SET_BIT(cc->bs, 0x0d);
-    }
-
-    /* precore* core postcore* */
-    {
-      Node **list = alts + 3; /* size: 4 */
-
-      /* precore*; precore := Prepend */
-      R_ERR(quantify_property_node(list+0, env, "Grapheme_Cluster_Break=Prepend", '*'));
-
-      /* core := hangul-syllable
-       *       | ri-sequence
-       *       | xpicto-sequence
-       *       | [^Control CR LF] */
-      {
-        Node **core_alts = list + 2; /* size: 7 */
-
-        /* hangul-syllable :=
-         *     L* (V+ | LV V* | LVT) T*
-         *   | L+
-         *   | T+ */
-        /* hangul-syllable is an alternative (would be called H_alt)
-         * inside an alternative, but we flatten it into core_alts */
-
-        /* L* (V+ | LV V* | LVT) T* */
-        {
-          Node **H_list = core_alts + 1; /* size: 4 */
-          R_ERR(quantify_property_node(H_list+0, env, "Grapheme_Cluster_Break=L", '*'));
-
-          /* V+ | LV V* | LVT */
-          {
-            Node **H_alt2 = H_list + 2; /* size: 4 */
-            R_ERR(quantify_property_node(H_alt2+0, env, "Grapheme_Cluster_Break=V", '+'));
-
-            /* LV V* */
-            {
-              Node **H_list2 = H_alt2 + 2; /* size: 3 */
-
-              R_ERR(create_property_node(H_list2+0, env, "Grapheme_Cluster_Break=LV"));
-              R_ERR(quantify_property_node(H_list2+1, env, "Grapheme_Cluster_Break=V", '*'));
-              R_ERR(create_node_from_array(LIST, H_alt2+1, H_list2));
-            }
-
-            R_ERR(create_property_node(H_alt2+2, env, "Grapheme_Cluster_Break=LVT"));
-            R_ERR(create_node_from_array(ALT, H_list+1, H_alt2));
-          }
-
-          R_ERR(quantify_property_node(H_list+2, env, "Grapheme_Cluster_Break=T", '*'));
-          R_ERR(create_node_from_array(LIST, core_alts+0, H_list));
-        }
-
-        R_ERR(quantify_property_node(core_alts+1, env, "Grapheme_Cluster_Break=L", '+'));
-        R_ERR(quantify_property_node(core_alts+2, env, "Grapheme_Cluster_Break=T", '+'));
-        /* end of hangul-syllable */
-
-        /* ri-sequence := RI RI */
-        R_ERR(quantify_property_node(core_alts+3, env, "Regional_Indicator", '2'));
-
-        /* xpicto-sequence := \p{Extended_Pictographic} (Extend* ZWJ \p{Extended_Pictographic})* */
-        {
-          Node **XP_list = core_alts + 5; /* size: 3 */
-          R_ERR(create_property_node(XP_list+0, env, "Extended_Pictographic"));
-
-          /* (Extend* ZWJ \p{Extended_Pictographic})* */
-          {
-            Node **Ex_list = XP_list + 2; /* size: 4 */
-            /* assert(Ex_list+4 == node_common+NODE_COMMON_SIZE); */
-            R_ERR(quantify_property_node(Ex_list+0, env, "Grapheme_Cluster_Break=Extend", '*'));
-
-            /* ZWJ (ZERO WIDTH JOINER) */
-            r = ONIGENC_CODE_TO_MBC(env->enc, 0x200D, buf);
-            if (r < 0) goto err;
-            Ex_list[1] = node_new_str_raw(buf, buf + r);
-            if (IS_NULL(Ex_list[1])) goto err;
-
-            R_ERR(create_property_node(Ex_list+2, env, "Extended_Pictographic"));
-            R_ERR(create_node_from_array(LIST, XP_list+1, Ex_list));
-          }
-          R_ERR(quantify_node(XP_list+1, 0, REPEAT_INFINITE)); /* TODO: Check about node freeing */
-
-          R_ERR(create_node_from_array(LIST, core_alts+4, XP_list));
-        }
-
-        /* [^Control CR LF] */
-        core_alts[5] = node_new_cclass();
-        if (IS_NULL(core_alts[5])) goto err;
-        cc = NCCLASS(core_alts[5]);
-        if (ONIGENC_MBC_MINLEN(env->enc) > 1) { /* UTF-16/UTF-32 */
-          BBuf *inverted_buf = NULL;
-
-          /* TODO: fix false warning */
-          const int dup_not_warned = env->warnings_flag | ~ONIG_SYN_WARN_CC_DUP;
-          env->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
-
-          /* Start with a positive buffer and invert at the end.
-           * Otherwise, adding single-character ranges work the wrong way. */
-          R_ERR(add_property_to_cc(cc, "Grapheme_Cluster_Break=Control", 0, env));
-          R_ERR(add_code_range(&(cc->mbuf), env, 0x000A, 0x000A)); /* CR */
-          R_ERR(add_code_range(&(cc->mbuf), env, 0x000D, 0x000D)); /* LF */
-          R_ERR(not_code_range_buf(env->enc, cc->mbuf, &inverted_buf, env));
-          cc->mbuf = inverted_buf; /* TODO: check what to do with buffer before inversion */
-
-          env->warnings_flag &= dup_not_warned; /* TODO: fix false warning */
-        }
-        else {
-          R_ERR(add_property_to_cc(cc, "Grapheme_Cluster_Break=Control", 1, env));
-          BITSET_CLEAR_BIT(cc->bs, 0x0a);
-          BITSET_CLEAR_BIT(cc->bs, 0x0d);
-        }
-
-        R_ERR(create_node_from_array(ALT, list+1, core_alts));
-      }
+  if (ONIGENC_IS_UNICODE(env->enc)) {
+    /* UTF-8, UTF-16BE/LE, UTF-32BE/LE */
+    CClassNode* cc1;
+    CClassNode* cc2;
+    UChar* propname = (UChar* )"M";
+    int ctype = env->enc->property_name_to_ctype(ONIG_ENCODING_ASCII,
+	propname, propname + 1);
+    if (ctype >= 0) {
+      /* \P{M} */
+      np1 = node_new_cclass();
+      if (IS_NULL(np1)) goto err;
+      cc1 = NCCLASS(np1);
+      r = add_ctype_to_cc(cc1, ctype, 0, 0, env);
+      if (r != 0) goto err;
+      NCCLASS_SET_NOT(cc1);
 
-      /* postcore*; postcore = [Extend ZWJ SpacingMark] */
-      R_ERR(create_property_node(list+2, env, "Grapheme_Cluster_Break=Extend"));
-      cc = NCCLASS(list[2]);
-      R_ERR(add_property_to_cc(cc, "Grapheme_Cluster_Break=SpacingMark", 0, env));
-      R_ERR(add_code_range(&(cc->mbuf), env, 0x200D, 0x200D));
-      R_ERR(quantify_node(list+2, 0, REPEAT_INFINITE));
+      /* \p{M}* */
+      np2 = node_new_cclass();
+      if (IS_NULL(np2)) goto err;
+      cc2 = NCCLASS(np2);
+      r = add_ctype_to_cc(cc2, ctype, 0, 0, env);
+      if (r != 0) goto err;
 
-      R_ERR(create_node_from_array(LIST, alts+2, list));
+      qn = node_new_quantifier(0, REPEAT_INFINITE, 0);
+      if (IS_NULL(qn)) goto err;
+      NQTFR(qn)->target = np2;
+      np2 = NULL;
+
+      /* \P{M}\p{M}* */
+      list2 = node_new_list(qn, NULL_NODE);
+      if (IS_NULL(list2)) goto err;
+      qn = NULL;
+      list1 = node_new_list(np1, list2);
+      if (IS_NULL(list1)) goto err;
+      np1 = NULL;
+      list2 = NULL;
+
+      /* (?>...) */
+      *np = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
+      if (IS_NULL(*np)) goto err;
+      NENCLOSE(*np)->target = list1;
+      return ONIG_NORMAL;
     }
-
-    any_target_position = 3;
   }
-  else
 #endif /* USE_UNICODE_PROPERTIES */
-  {
-    any_target_position = 1;
-  }
+  if (IS_NULL(*np)) {
+    /* PerlSyntax: (?s:.), RubySyntax: (?m:.) */
+    OnigOptionType option;
+    np1 = node_new_anychar();
+    if (IS_NULL(np1)) goto err;
 
-  /* PerlSyntax: (?s:.), RubySyntax: (?m:.), common for both Unicode and non-Unicode */
-  /* Not in Unicode spec (UAX #29), but added to catch invalid stuff,
-   * because this is Ruby spec for String#grapheme_clusters. */
-  np1 = node_new_anychar();
-  if (IS_NULL(np1)) goto err;
-
-  option = env->option;
-  ONOFF(option, ONIG_OPTION_MULTILINE, 0);
-  tmp = node_new_option(option);
-  if (IS_NULL(tmp)) goto err;
-  NENCLOSE(tmp)->target = np1;
-  alts[any_target_position] = tmp;
-  np1 = NULL;
-
-  R_ERR(create_node_from_array(ALT, &top_alt, alts));
-
-  /* (?>): For efficiency, because there is no text piece
-   *       that is not in a grapheme cluster, and there is only one way
-   *       to split a string into grapheme clusters. */
-  tmp = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
-  if (IS_NULL(tmp)) goto err;
-  NENCLOSE(tmp)->target = top_alt;
-  np1 = tmp;
-
-#ifdef USE_UNICODE_PROPERTIES
-  if (ONIGENC_IS_UNICODE(env->enc)) {
-    /* Don't ignore case. */
     option = env->option;
-    ONOFF(option, ONIG_OPTION_IGNORECASE, 1);
+    ONOFF(option, ONIG_OPTION_MULTILINE, 0);
     *np = node_new_option(option);
     if (IS_NULL(*np)) goto err;
     NENCLOSE(*np)->target = np1;
   }
-  else
-#endif
-  {
-    *np = np1;
-  }
   return ONIG_NORMAL;
 
  err:
   onig_node_free(np1);
-  for (i=0; i<NODE_COMMON_SIZE; i++)
-    onig_node_free(node_common[i]);
+  onig_node_free(np2);
+  onig_node_free(qn);
+  onig_node_free(list1);
+  onig_node_free(list2);
   return (r == 0) ? ONIGERR_MEMORY : r;
 }
-#undef R_ERR
 
 static int
 countbits(unsigned int bits)
@@ -6079,7 +5893,7 @@ is_onechar_cclass(CClassNode* cc, OnigCodePoint* code)
       /* only one char found in the bbuf, save the code point. */
       c = data[0];
       if (((c < SINGLE_BYTE_SIZE) && BITSET_AT(cc->bs, c))) {
-	/* skip if c is included in the bitset */
+        /* skip if c is included in the bitset */
 	c = not_found;
       }
     }
@@ -6093,9 +5907,9 @@ is_onechar_cclass(CClassNode* cc, OnigCodePoint* code)
     Bits b1 = cc->bs[i];
     if (b1 != 0) {
       if (((b1 & (b1 - 1)) == 0) && (c == not_found)) {
-	c = BITS_IN_ROOM * i + countbits(b1 - 1);
+        c = BITS_IN_ROOM * i + countbits(b1 - 1);
       } else {
-	return 0;  /* the character class contains multiple chars */
+        return 0;  /* the character class contains multiple chars */
       }
     }
   }
@@ -6140,10 +5954,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
 
       env->option = NENCLOSE(*np)->option;
       r = fetch_token(tok, src, end, env);
-      if (r < 0) {
-	env->option = prev;
-	return r;
-      }
+      if (r < 0) return r;
       r = parse_subexp(&target, tok, term, src, end, env);
       env->option = prev;
       if (r < 0) {
@@ -6296,13 +6107,69 @@ parse_exp(Node** np, OnigToken* tok, int term,
 	{
 	  CClassNode* cc;
 
-	  *np = node_new_cclass();
-	  CHECK_NULL_RETURN_MEMERR(*np);
-	  cc = NCCLASS(*np);
-	  r = add_ctype_to_cc(cc, tok->u.prop.ctype, 0,
-	      IS_ASCII_RANGE(env->option), env);
-	  if (r != 0) return r;
-	  if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc);
+#ifdef USE_SHARED_CCLASS_TABLE
+          const OnigCodePoint *mbr;
+	  OnigCodePoint sb_out;
+
+          r = ONIGENC_GET_CTYPE_CODE_RANGE(env->enc, tok->u.prop.ctype,
+					   &sb_out, &mbr);
+          if (r == 0 &&
+              ! IS_ASCII_RANGE(env->option) &&
+              ONIGENC_CODE_RANGE_NUM(mbr)
+              >= THRESHOLD_RANGE_NUM_FOR_SHARE_CCLASS) {
+            type_cclass_key  key;
+            type_cclass_key* new_key;
+
+            key.enc  = env->enc;
+            key.not  = tok->u.prop.not;
+            key.type = tok->u.prop.ctype;
+
+            THREAD_ATOMIC_START;
+
+            if (IS_NULL(OnigTypeCClassTable)) {
+              OnigTypeCClassTable
+                = onig_st_init_table_with_size(&type_type_cclass_hash, 10);
+              if (IS_NULL(OnigTypeCClassTable)) {
+                THREAD_ATOMIC_END;
+                return ONIGERR_MEMORY;
+              }
+            }
+            else {
+              if (onig_st_lookup(OnigTypeCClassTable, (st_data_t )&key,
+                                 (st_data_t* )np)) {
+                THREAD_ATOMIC_END;
+                break;
+              }
+            }
+
+            *np = node_new_cclass_by_codepoint_range(tok->u.prop.not,
+						     sb_out, mbr);
+            if (IS_NULL(*np)) {
+              THREAD_ATOMIC_END;
+              return ONIGERR_MEMORY;
+            }
+
+            cc = NCCLASS(*np);
+            NCCLASS_SET_SHARE(cc);
+            new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));
+	    xmemcpy(new_key, &key, sizeof(type_cclass_key));
+            onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key,
+                               (st_data_t )*np);
+
+            THREAD_ATOMIC_END;
+          }
+          else {
+#endif
+            *np = node_new_cclass();
+            CHECK_NULL_RETURN_MEMERR(*np);
+            cc = NCCLASS(*np);
+            r = add_ctype_to_cc(cc, tok->u.prop.ctype, 0,
+			    IS_ASCII_RANGE(env->option), env);
+	    if (r != 0) return r;
+            if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc);
+#ifdef USE_SHARED_CCLASS_TABLE
+          }
+#endif
 	}
 	break;
 
@@ -6532,9 +6399,6 @@ parse_subexp(Node** top, OnigToken* tok, int term,
   Node *node, **headp;
 
   *top = NULL;
-  env->parse_depth++;
-  if (env->parse_depth > ParseDepthLimit)
-    return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
   r = parse_branch(&node, tok, term, src, end, env);
   if (r < 0) {
     onig_node_free(node);
@@ -6572,7 +6436,6 @@ parse_subexp(Node** top, OnigToken* tok, int term,
       return ONIGERR_PARSER_BUG;
   }
 
-  env->parse_depth--;
   return r;
 }
 
diff --git a/regparse.h b/regparse.h
index acdd3e2f5c..caf0790b1c 100644
--- a/regparse.h
+++ b/regparse.h
@@ -1,11 +1,11 @@
-#ifndef ONIGMO_REGPARSE_H
-#define ONIGMO_REGPARSE_H
+#ifndef ONIGURUMA_REGPARSE_H
+#define ONIGURUMA_REGPARSE_H
 /**********************************************************************
   regparse.h -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc 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
@@ -95,7 +95,6 @@ RUBY_SYMBOL_EXPORT_BEGIN
 #define ENCLOSE_OPTION           (1<<1)
 #define ENCLOSE_STOP_BACKTRACK   (1<<2)
 #define ENCLOSE_CONDITION        (1<<3)
-#define ENCLOSE_ABSENT           (1<<4)
 
 #define NODE_STR_MARGIN         16
 #define NODE_STR_BUF_SIZE       24  /* sizeof(CClassNode) - sizeof(int)*4 */
@@ -186,7 +185,7 @@ typedef struct {
   int target_empty_info;
   struct _Node* head_exact;
   struct _Node* next_head_exact;
-  int is_referred;     /* include called node. don't eliminate even if {0} */
+  int is_refered;     /* include called node. don't eliminate even if {0} */
 #ifdef USE_COMBINATION_EXPLOSION_CHECK
   int comb_exp_check_num;  /* 1,2,3...: check,  0: no check  */
 #endif
@@ -318,12 +317,9 @@ typedef struct {
   int curr_max_regnum;
   int has_recursion;
 #endif
-  unsigned int parse_depth;
   int warnings_flag;
-#ifdef RUBY
   const char* sourcefile;
   int sourceline;
-#endif
 } ScanEnv;
 
 
@@ -336,35 +332,36 @@ typedef struct {
   int new_val;
 } GroupNumRemap;
 
-extern int    onig_renumber_name_table(regex_t* reg, GroupNumRemap* map);
+extern int    onig_renumber_name_table P_((regex_t* reg, GroupNumRemap* map));
 #endif
 
-extern int    onig_strncmp(const UChar* s1, const UChar* s2, int n);
-extern void   onig_strcpy(UChar* dest, const UChar* src, const UChar* end);
-extern void   onig_scan_env_set_error_string(ScanEnv* env, int ecode, UChar* arg, UChar* arg_end);
-extern int    onig_scan_unsigned_number(UChar** src, const UChar* end, OnigEncoding enc);
-extern void   onig_reduce_nested_quantifier(Node* pnode, Node* cnode);
-extern void   onig_node_conv_to_str_node(Node* node, int raw);
-extern int    onig_node_str_cat(Node* node, const UChar* s, const UChar* end);
-extern int    onig_node_str_set(Node* node, const UChar* s, const UChar* end);
-extern void   onig_node_free(Node* node);
-extern Node*  onig_node_new_enclose(int type);
-extern Node*  onig_node_new_anchor(int type);
-extern Node*  onig_node_new_str(const UChar* s, const UChar* end);
-extern Node*  onig_node_new_list(Node* left, Node* right);
-extern Node*  onig_node_list_add(Node* list, Node* x);
-extern Node*  onig_node_new_alt(Node* left, Node* right);
-extern void   onig_node_str_clear(Node* node);
-extern int    onig_names_free(regex_t* reg);
-extern int    onig_parse_make_tree(Node** root, const UChar* pattern, const UChar* end, regex_t* reg, ScanEnv* env);
-extern int    onig_free_shared_cclass_table(void);
+extern int    onig_strncmp P_((const UChar* s1, const UChar* s2, int n));
+extern void   onig_strcpy P_((UChar* dest, const UChar* src, const UChar* end));
+extern void   onig_scan_env_set_error_string P_((ScanEnv* env, int ecode, UChar* arg, UChar* arg_end));
+extern int    onig_scan_unsigned_number P_((UChar** src, const UChar* end, OnigEncoding enc));
+extern void   onig_reduce_nested_quantifier P_((Node* pnode, Node* cnode));
+extern void   onig_node_conv_to_str_node P_((Node* node, int raw));
+extern int    onig_node_str_cat P_((Node* node, const UChar* s, const UChar* end));
+extern int    onig_node_str_set P_((Node* node, const UChar* s, const UChar* end));
+extern void   onig_node_free P_((Node* node));
+extern Node*  onig_node_new_enclose P_((int type));
+extern Node*  onig_node_new_anchor P_((int type));
+extern Node*  onig_node_new_str P_((const UChar* s, const UChar* end));
+extern Node*  onig_node_new_list P_((Node* left, Node* right));
+extern Node*  onig_node_list_add P_((Node* list, Node* x));
+extern Node*  onig_node_new_alt P_((Node* left, Node* right));
+extern void   onig_node_str_clear P_((Node* node));
+extern int    onig_free_node_list P_((void));
+extern int    onig_names_free P_((regex_t* reg));
+extern int    onig_parse_make_tree P_((Node** root, const UChar* pattern, const UChar* end, regex_t* reg, ScanEnv* env));
+extern int    onig_free_shared_cclass_table P_((void));
 
 #ifdef ONIG_DEBUG
-# ifdef USE_NAMED_GROUP
+#ifdef USE_NAMED_GROUP
 extern int onig_print_names(FILE*, regex_t*);
-# endif
+#endif
 #endif
 
 RUBY_SYMBOL_EXPORT_END
 
-#endif /* ONIGMO_REGPARSE_H */
+#endif /* ONIGURUMA_REGPARSE_H */
diff --git a/regsyntax.c b/regsyntax.c
index 657ffcd0f3..7cb98f2d46 100644
--- a/regsyntax.c
+++ b/regsyntax.c
@@ -3,7 +3,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2011-2012  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -229,7 +229,7 @@ const OnigSyntaxType OnigSyntaxPerl = {
   (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |
      ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |
      ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |
-     ONIG_SYN_OP_ESC_O_BRACE_OCTAL | ONIG_SYN_OP_ESC_C_CONTROL )
+     ONIG_SYN_OP_ESC_C_CONTROL )
    & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END )
   , ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE |
       ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |
@@ -248,8 +248,7 @@ const OnigSyntaxType OnigSyntaxPerl = {
       ONIG_SYN_OP2_ESC_K_NAMED_BACKREF )
   , ( SYN_GNU_REGEX_BV |
       ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME |
-      ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL |
-      ONIG_SYN_USE_LEFT_MOST_NAMED_GROUP )
+      ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL )
   , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_CAPTURE_GROUP )
   ,
   {
@@ -333,25 +332,25 @@ onig_set_syntax_options(OnigSyntaxType* syntax, OnigOptionType options)
 }
 
 extern unsigned int
-onig_get_syntax_op(const OnigSyntaxType* syntax)
+onig_get_syntax_op(OnigSyntaxType* syntax)
 {
   return syntax->op;
 }
 
 extern unsigned int
-onig_get_syntax_op2(const OnigSyntaxType* syntax)
+onig_get_syntax_op2(OnigSyntaxType* syntax)
 {
   return syntax->op2;
 }
 
 extern unsigned int
-onig_get_syntax_behavior(const OnigSyntaxType* syntax)
+onig_get_syntax_behavior(OnigSyntaxType* syntax)
 {
   return syntax->behavior;
 }
 
 extern OnigOptionType
-onig_get_syntax_options(const OnigSyntaxType* syntax)
+onig_get_syntax_options(OnigSyntaxType* syntax)
 {
   return syntax->options;
 }
diff --git a/ruby-runner.c b/ruby-runner.c
index c991178193..c16e7c6829 100644
--- a/ruby-runner.c
+++ b/ruby-runner.c
@@ -1,98 +1,35 @@
 #define _POSIX_C_SOURCE 200809L
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "ruby-runner.h"
-#include "ruby/config.h"
-
-#ifdef MAKE_MJIT_BUILD_DIR
-const char MJIT_HEADER[] = BUILDDIR "/" MJIT_MIN_HEADER;
-#else
 
 #define STRINGIZE(expr) STRINGIZE0(expr)
 #define STRINGIZE0(expr) #expr
 
-static void
-insert_env_path(const char *envname, const char *paths, size_t size, int prepend)
+int
+main(int argc, char **argv)
 {
-    const char *env = getenv(envname);
+    static const char builddir[] = BUILDDIR;
+    const char *libpath = getenv(LIBPATHENV);
     char c = 0;
-    size_t n = 0;
 
-    if (env) {
-	while ((c = *env) == PATH_SEP) ++env;
-	n = strlen(env);
-	while (n > 0 && env[n-1] == PATH_SEP) --n;
+    if (libpath) {
+	while ((c = *libpath) == PATH_SEP) ++libpath;
     }
     if (c) {
-	char *e = malloc(size+n+1);
-	size_t pos = 0;
-	if (prepend) {
-	    memcpy(e, paths, pos = size-1);
-	    e[pos++] = PATH_SEP;
-	}
-	memcpy(e+pos, env, n);
-	pos += n;
-	if (!prepend) {
-	    e[pos++] = PATH_SEP;
-	    memcpy(e+pos, paths, size-1);
-	    pos += size-1;
-	}
-	e[pos] = '\0';
-	env = e;
+	size_t n = strlen(libpath);
+	char *e = malloc(sizeof(builddir)+n+1);
+	memcpy(e, builddir, sizeof(builddir)-1);
+	e[sizeof(builddir)-1] = PATH_SEP;
+	memcpy(e+sizeof(builddir), libpath, n+1);
+	libpath = e;
     }
     else {
-	env = paths;
-    }
-    setenv(envname, env, 1);
-}
-
-#define EXTOUT_DIR BUILDDIR"/"EXTOUT
-int
-main(int argc, char **argv)
-{
-    static const char builddir[] = BUILDDIR;
-    static const char rubypath[] = BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME);
-    static const char rubylib[] =
-	ABS_SRCDIR"/lib"
-	PATH_SEPARATOR
-	EXTOUT_DIR"/common"
-	PATH_SEPARATOR
-	EXTOUT_DIR"/"ARCH
-	;
-#ifndef LOAD_RELATIVE
-    static const char mjit_build_dir[] = BUILDDIR"/mjit_build_dir."SOEXT;
-    struct stat stbuf;
-#endif
-    const size_t dirsize = sizeof(builddir);
-    const size_t namesize = sizeof(rubypath) - dirsize;
-    const char *rubyname = rubypath + dirsize;
-    char *arg0 = argv[0], *p;
-
-    insert_env_path(LIBPATHENV, builddir, dirsize, 1);
-    insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0);
-#ifndef LOAD_RELATIVE
-    if (PRELOADENV[0] && stat(mjit_build_dir, &stbuf) == 0) {
-        insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1);
-        setenv("MJIT_SEARCH_BUILD_DIR", "true", 0);
+	libpath = builddir;
     }
-#endif
-
-    if (!(p = strrchr(arg0, '/'))) p = arg0; else p++;
-    if (strlen(p) < namesize - 1) {
-	argv[0] = malloc(p - arg0 + namesize);
-	memcpy(argv[0], arg0, p - arg0);
-	p = argv[0] + (p - arg0);
-    }
-    memcpy(p, rubyname, namesize);
-
-    execv(rubypath, argv);
-    perror(rubypath);
+    setenv(LIBPATHENV, libpath, 1);
+    execv(BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME), argv);
     return -1;
 }
-
-#endif  /* MAKE_MJIT_BUILD_DIR */
diff --git a/ruby.c b/ruby.c
index a169141376..0e7dcc41b8 100644
--- a/ruby.c
+++ b/ruby.c
@@ -15,10 +15,8 @@
 #include <windows.h>
 #include <sys/cygwin.h>
 #endif
-#include "ruby/encoding.h"
-#include "ruby/thread.h"
-#include "ruby/version.h"
 #include "internal.h"
+#include "ruby/thread.h"
 #include "eval_intern.h"
 #include "dln.h"
 #include <stdio.h>
@@ -52,10 +50,6 @@
 
 #include "ruby/util.h"
 
-#include "mjit.h"
-
-void Init_ruby_description(void);
-
 #ifndef HAVE_STDLIB_H
 char *getenv();
 #endif
@@ -79,8 +73,6 @@ char *getenv();
     X(rubyopt) \
     SEP \
     X(frozen_string_literal) \
-    SEP \
-    X(jit) \
     /* END OF FEATURES */
 #define EACH_DEBUG_FEATURES(X, SEP) \
     X(frozen_string_literal) \
@@ -122,14 +114,21 @@ enum feature_flag_bits {
 enum dump_flag_bits {
     dump_version_v,
     EACH_DUMPS(DEFINE_DUMP, COMMA),
-    dump_exit_bits = (DUMP_BIT(yydebug) | DUMP_BIT(syntax) |
-		      DUMP_BIT(parsetree) | DUMP_BIT(parsetree_with_comment) |
-		      DUMP_BIT(insns))
+    dump_flag_count
 };
 
 typedef struct ruby_cmdline_options ruby_cmdline_options_t;
 
 struct ruby_cmdline_options {
+    int sflag, xflag;
+    int do_loop, do_print;
+    int do_line, do_split;
+    int do_search;
+    unsigned int features;
+    int verbose;
+    int safe_level;
+    unsigned int setids;
+    unsigned int dump;
     const char *script;
     VALUE script_name;
     VALUE e_script;
@@ -140,21 +139,7 @@ struct ruby_cmdline_options {
 	} enc;
     } src, ext, intern;
     VALUE req_list;
-    unsigned int features;
-    unsigned int dump;
-#if USE_MJIT
-    struct mjit_options mjit;
-#endif
-    int safe_level;
-    int sflag, xflag;
     unsigned int warning: 1;
-    unsigned int verbose: 1;
-    unsigned int do_loop: 1;
-    unsigned int do_print: 1;
-    unsigned int do_line: 1;
-    unsigned int do_split: 1;
-    unsigned int do_search: 1;
-    unsigned int setids: 2;
 };
 
 static void init_ids(ruby_cmdline_options_t *);
@@ -173,7 +158,6 @@ enum {
 	& ~FEATURE_BIT(gems)
 #endif
 	& ~FEATURE_BIT(frozen_string_literal)
-        & ~FEATURE_BIT(jit)
 	)
 };
 
@@ -186,16 +170,11 @@ cmdline_options_init(ruby_cmdline_options_t *opt)
     opt->ext.enc.index = -1;
     opt->intern.enc.index = -1;
     opt->features = DEFAULT_FEATURES;
-#ifdef MJIT_FORCE_ENABLE /* to use with: ./configure cppflags="-DMJIT_FORCE_ENABLE" */
-    opt->features |= FEATURE_BIT(jit);
-#endif
     return opt;
 }
 
-static rb_ast_t *load_file(VALUE parser, VALUE fname, VALUE f, int script,
-		       ruby_cmdline_options_t *opt);
-static VALUE open_load_file(VALUE fname_v, int *xflag);
-static void forbid_setid(const char *, const ruby_cmdline_options_t *);
+static NODE *load_file(VALUE, VALUE, int, ruby_cmdline_options_t *);
+static void forbid_setid(const char *, ruby_cmdline_options_t *);
 #define forbid_setid(s) forbid_setid((s), opt)
 
 static struct {
@@ -207,7 +186,7 @@ static void
 show_usage_line(const char *str, unsigned int namelen, unsigned int secondlen, int help)
 {
     const unsigned int w = 16;
-    const int wrap = help && namelen + secondlen - 1 > w;
+    const int wrap = help && namelen + secondlen - 2 > w;
     printf("  %.*s%-*.*s%-*s%s\n", namelen-1, str,
 	   (wrap ? 0 : w - namelen + 1),
 	   (help ? secondlen-1 : 0), str + namelen,
@@ -248,47 +227,26 @@ usage(const char *name, int help)
 	M("-s",		   "",			   "enable some switch parsing for switches after script name"),
 	M("-S",		   "",			   "look for the script using PATH environment variable"),
 	M("-T[level=1]",   "",			   "turn on tainting checks"),
-	M("-v",		   "",			   "print the version number, then turn on verbose mode"),
+	M("-v",		   ", --verbose",	   "print version number, then turn on verbose mode"),
 	M("-w",		   "",			   "turn warnings on for your script"),
 	M("-W[level=2]",   "",			   "set warning level; 0=silence, 1=medium, 2=verbose"),
 	M("-x[directory]", "",			   "strip off text before #!ruby line and perhaps cd to directory"),
-        M("--jit",         "",                     "enable JIT with default options (experimental)"),
-        M("--jit-[option]","",                     "enable JIT with an option (experimental)"),
 	M("-h",		   "",			   "show this message, --help for more info"),
     };
     static const struct message help_msg[] = {
-	M("--copyright",                            "", "print the copyright"),
-	M("--dump={insns|parsetree|...}[,...]",     "",
-          "dump debug information. see below for available dump list"),
-	M("--enable={gems|rubyopt|...}[,...]", ", --disable={gems|rubyopt|...}[,...]",
-	  "enable or disable features. see below for available features"),
-	M("--external-encoding=encoding",           ", --internal-encoding=encoding",
+	M("--copyright",                   "", "print the copyright"),
+	M("--enable=feature[,...]",	   ", --disable=feature[,...]",
+	  "enable or disable features"),
+	M("--external-encoding=encoding",  ", --internal-encoding=encoding",
 	  "specify the default external or internal character encoding"),
-	M("--verbose",                              "", "turn on verbose mode and disable script from stdin"),
-	M("--version",                              "", "print the version number, then exit"),
-	M("--help",			            "", "show this message, -h for short message"),
-    };
-    static const struct message dumps[] = {
-	M("insns",                  "", "instruction sequences"),
-	M("yydebug",                "", "yydebug of yacc parser generator"),
-	M("parsetree",              "", "AST"),
-	M("parsetree_with_comment", "", "AST with comments"),
+	M("--version",                     "", "print the version"),
+	M("--help",			   "", "show this message, -h for short message"),
     };
     static const struct message features[] = {
 	M("gems",    "",        "rubygems (default: "DEFAULT_RUBYGEMS_ENABLED")"),
 	M("did_you_mean", "",   "did_you_mean (default: "DEFAULT_RUBYGEMS_ENABLED")"),
 	M("rubyopt", "",        "RUBYOPT environment variable (default: enabled)"),
 	M("frozen-string-literal", "", "freeze all string literals (default: disabled)"),
-        M("jit", "",            "JIT compiler (default: disabled)"),
-    };
-    static const struct message mjit_options[] = {
-        M("--jit-warnings",      "", "Enable printing JIT warnings"),
-        M("--jit-debug",         "", "Enable JIT debugging (very slow)"),
-        M("--jit-wait",          "", "Wait until JIT compilation is finished everytime (for testing)"),
-        M("--jit-save-temps",    "", "Save JIT temporary files in $TMP or /tmp (for testing)"),
-        M("--jit-verbose=num",   "", "Print JIT logs of level num or less to stderr (default: 0)"),
-        M("--jit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 1000)"),
-        M("--jit-min-calls=num", "", "Number of calls to trigger JIT (for testing, default: 5)"),
     };
     int i;
     const int num = numberof(usage_msg) - (help ? 1 : 0);
@@ -302,15 +260,9 @@ usage(const char *name, int help)
 
     for (i = 0; i < numberof(help_msg); ++i)
 	SHOW(help_msg[i]);
-    puts("Dump List:");
-    for (i = 0; i < numberof(dumps); ++i)
-	SHOW(dumps[i]);
     puts("Features:");
     for (i = 0; i < numberof(features); ++i)
 	SHOW(features[i]);
-    puts("JIT options (experimental):");
-    for (i = 0; i < numberof(mjit_options); ++i)
-	SHOW(mjit_options[i]);
 }
 
 #define rubylib_path_new rb_str_new
@@ -469,8 +421,6 @@ str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to)
 				ECONV_UNDEF_REPLACE|ECONV_INVALID_REPLACE,
 				Qnil);
 }
-#else
-# define str_conv_enc(str, from, to) (str)
 #endif
 
 void ruby_init_loadpath_safe(int safe_level);
@@ -481,63 +431,18 @@ ruby_init_loadpath(void)
     ruby_init_loadpath_safe(0);
 }
 
-#if defined(LOAD_RELATIVE)
+#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR)
 static VALUE
-runtime_libruby_path(void)
+dladdr_path(const void* addr)
 {
-#if defined _WIN32 || defined __CYGWIN__
-    DWORD len = RSTRING_EMBED_LEN_MAX, ret;
-    VALUE path;
-    VALUE wsopath = rb_str_new(0, len*sizeof(WCHAR));
-    WCHAR *wlibpath;
-    char *libpath;
-
-    while (wlibpath = (WCHAR *)RSTRING_PTR(wsopath),
-	   ret = GetModuleFileNameW(libruby, wlibpath, len),
-	   (ret == len))
-    {
-	rb_str_modify_expand(wsopath, len*sizeof(WCHAR));
-	rb_str_set_len(wsopath, (len += len)*sizeof(WCHAR));
-    }
-    if (!ret || ret > len) rb_fatal("failed to get module file name");
-#if defined __CYGWIN__
-    {
-	const int win_to_posix = CCP_WIN_W_TO_POSIX | CCP_RELATIVE;
-	size_t newsize = cygwin_conv_path(win_to_posix, wlibpath, 0, 0);
-	if (!newsize) rb_fatal("failed to convert module path to cygwin");
-	path = rb_str_new(0, newsize);
-	libpath = RSTRING_PTR(path);
-	if (cygwin_conv_path(win_to_posix, wlibpath, libpath, newsize)) {
-	    rb_str_resize(path, 0);
-	}
-    }
-#else
-    {
-	DWORD i;
-	for (len = ret, i = 0; i < len; ++i) {
-	    if (wlibpath[i] == L'\\') {
-		wlibpath[i] = L'/';
-		ret = i+1;	/* chop after the last separator */
-	    }
-	}
-    }
-    len = WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, NULL, 0, NULL, NULL);
-    path = rb_utf8_str_new(0, len);
-    libpath = RSTRING_PTR(path);
-    WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, libpath, len, NULL, NULL);
-#endif
-    rb_str_resize(wsopath, 0);
-    return path;
-#elif defined(HAVE_DLADDR)
     Dl_info dli;
     VALUE fname, path;
-    const void* addr = (void *)(VALUE)expand_include_path;
 
-    if (!dladdr((void *)addr, &dli)) {
+    if (!dladdr(addr, &dli)) {
 	return rb_str_new(0, 0);
     }
 #ifdef __linux__
-    else if (origarg.argc > 0 && origarg.argv && dli.dli_fname == origarg.argv[0]) {
+    else if (dli.dli_fname == origarg.argv[0]) {
 	fname = rb_str_new_cstr("/proc/self/exe");
 	path = rb_readlink(fname, NULL);
     }
@@ -548,66 +453,102 @@ runtime_libruby_path(void)
     }
     rb_str_resize(fname, 0);
     return path;
-#else
-# error relative load path is not supported on this platform.
-#endif
 }
 #endif
 
 #define INITIAL_LOAD_PATH_MARK rb_intern_const("@gem_prelude_index")
 
-VALUE ruby_archlibdir_path, ruby_prefix_path;
-
 void
 ruby_init_loadpath_safe(int safe_level)
 {
-    VALUE load_path, archlibdir = 0;
+    VALUE load_path;
     ID id_initial_load_path_mark;
     const char *paths = ruby_initial_load_paths;
 #if defined LOAD_RELATIVE
-#if !defined ENABLE_MULTIARCH
-# define RUBY_ARCH_PATH ""
-#elif defined RUBY_ARCH
-# define RUBY_ARCH_PATH "/"RUBY_ARCH
-#else
-# define RUBY_ARCH_PATH "/"RUBY_PLATFORM
-#endif
+# if defined HAVE_DLADDR || defined __CYGWIN__ || defined _WIN32
+#   define VARIABLE_LIBPATH 1
+# else
+#   define VARIABLE_LIBPATH 0
+# endif
+# if VARIABLE_LIBPATH
     char *libpath;
     VALUE sopath;
+# else
+    char libpath[MAXPATHLEN + 1];
+# endif
     size_t baselen;
-    const char *p;
+    char *p;
 
-    sopath = runtime_libruby_path();
+#if defined _WIN32 || defined __CYGWIN__
+    {
+	DWORD len = RSTRING_EMBED_LEN_MAX, ret, i;
+	VALUE wsopath = rb_str_new(0, len*sizeof(WCHAR));
+	WCHAR *wlibpath;
+	while (wlibpath = (WCHAR *)RSTRING_PTR(wsopath),
+	       ret = GetModuleFileNameW(libruby, wlibpath, len),
+	       (ret == len))
+	{
+	    rb_str_modify_expand(wsopath, len*sizeof(WCHAR));
+	    rb_str_set_len(wsopath, (len += len)*sizeof(WCHAR));
+	}
+	if (!ret || ret > len) rb_fatal("failed to get module file name");
+	for (len = ret, i = 0; i < len; ++i) {
+	    if (wlibpath[i] == L'\\') {
+		wlibpath[i] = L'/';
+		ret = i+1;	/* chop after the last separator */
+	    }
+	}
+	len = WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, NULL, 0, NULL, NULL);
+	sopath = rb_utf8_str_new(0, len);
+	libpath = RSTRING_PTR(sopath);
+	WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, libpath, len, NULL, NULL);
+	rb_str_resize(wsopath, 0);
+    }
+#elif defined(HAVE_DLADDR)
+    sopath = dladdr_path((void *)(VALUE)expand_include_path);
     libpath = RSTRING_PTR(sopath);
+#endif
 
+#if !VARIABLE_LIBPATH
+    libpath[sizeof(libpath) - 1] = '\0';
+#endif
+#if defined DOSISH && !defined _WIN32
+    translit_char(libpath, '\\', '/');
+#elif defined __CYGWIN__
+    {
+	const int win_to_posix = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
+	size_t newsize = cygwin_conv_path(win_to_posix, libpath, 0, 0);
+	if (newsize > 0) {
+	    VALUE rubylib = rb_str_new(0, newsize);
+	    p = RSTRING_PTR(rubylib);
+	    if (cygwin_conv_path(win_to_posix, libpath, p, newsize) == 0) {
+		rb_str_resize(sopath, 0);
+		sopath = rubylib;
+		libpath = p;
+	    }
+	}
+    }
+#endif
     p = strrchr(libpath, '/');
     if (p) {
-	static const char libdir[] = "/"
+	static const char bindir[] = "/bin";
 #ifdef LIBDIR_BASENAME
-	    LIBDIR_BASENAME
+	static const char libdir[] = "/"LIBDIR_BASENAME;
 #else
-	    "lib"
+	static const char libdir[] = "/lib";
 #endif
-	    RUBY_ARCH_PATH;
-	const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir)
-	    - rb_strlen_lit(RUBY_ARCH_PATH) - 1;
-	static const char bindir[] = "/bin";
 	const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1;
-
-	const char *p2 = NULL;
+	const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1;
 
 #ifdef ENABLE_MULTIARCH
+	char *p2 = NULL;
+
       multiarch:
 #endif
 	if (p - libpath >= bindir_len && !STRNCASECMP(p - bindir_len, bindir, bindir_len)) {
 	    p -= bindir_len;
-	    archlibdir = rb_str_subseq(sopath, 0, p - libpath);
-	    rb_str_cat_cstr(archlibdir, libdir);
-	    OBJ_FREEZE_RAW(archlibdir);
 	}
 	else if (p - libpath >= libdir_len && !strncmp(p - libdir_len, libdir, libdir_len)) {
-	    archlibdir = rb_str_subseq(sopath, 0, (p2 ? p2 : p) - libpath);
-	    OBJ_FREEZE_RAW(archlibdir);
 	    p -= libdir_len;
 	}
 #ifdef ENABLE_MULTIARCH
@@ -621,25 +562,32 @@ ruby_init_loadpath_safe(int safe_level)
 	    p = p2;
 	}
 #endif
+#if !VARIABLE_LIBPATH
+	*p = 0;
+#endif
+    }
+#if !VARIABLE_LIBPATH
+    else {
+	strlcpy(libpath, ".", sizeof(libpath));
+	p = libpath + 1;
     }
     baselen = p - libpath;
+#define PREFIX_PATH() rb_str_new(libpath, baselen)
+#else
+    baselen = p - libpath;
     rb_str_resize(sopath, baselen);
     libpath = RSTRING_PTR(sopath);
 #define PREFIX_PATH() sopath
+#endif
+
 #define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
+
 #define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))
 #else
     const size_t exec_prefix_len = strlen(ruby_exec_prefix);
 #define RUBY_RELATIVE(path, len) rubylib_path_new((path), (len))
 #define PREFIX_PATH() RUBY_RELATIVE(ruby_exec_prefix, exec_prefix_len)
 #endif
-    rb_gc_register_address(&ruby_prefix_path);
-    ruby_prefix_path = PREFIX_PATH();
-    OBJ_FREEZE_RAW(ruby_prefix_path);
-    if (!archlibdir) archlibdir = ruby_prefix_path;
-    rb_gc_register_address(&ruby_archlibdir_path);
-    ruby_archlibdir_path = archlibdir;
-
     load_path = GET_VM()->load_path;
 
     if (safe_level == 0) {
@@ -655,7 +603,7 @@ ruby_init_loadpath_safe(int safe_level)
 	paths += len + 1;
     }
 
-    rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), ruby_prefix_path);
+    rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), rb_obj_freeze(PREFIX_PATH()));
 }
 
 
@@ -666,9 +614,11 @@ add_modules(VALUE *req_list, const char *mod)
     VALUE feature;
 
     if (!list) {
-	*req_list = list = rb_ary_tmp_new(0);
+	*req_list = list = rb_ary_new();
+	RBASIC_CLEAR_CLASS(list);
     }
-    feature = rb_str_cat_cstr(rb_str_tmp_new(0), mod);
+    feature = rb_str_new2(mod);
+    RBASIC_CLEAR_CLASS(feature);
     rb_ary_push(list, feature);
 }
 
@@ -770,15 +720,14 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
     char **argv, *p;
     const char *ap = 0;
     VALUE argstr, argary;
-    void *ptr;
 
     while (ISSPACE(*s)) s++;
     if (!*s) return;
-    argstr = rb_str_tmp_new((len = strlen(s)) + (envopt!=0));
+    argstr = rb_str_tmp_new((len = strlen(s)) + 2);
     argary = rb_str_tmp_new(0);
 
     p = RSTRING_PTR(argstr);
-    if (envopt) *p++ = ' ';
+    *p++ = ' ';
     memcpy(p, s, len + 1);
     ap = 0;
     rb_str_cat(argary, (char *)&ap, sizeof(ap));
@@ -793,10 +742,9 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
     argc = RSTRING_LEN(argary) / sizeof(ap);
     ap = 0;
     rb_str_cat(argary, (char *)&ap, sizeof(ap));
-    argv = ptr = ALLOC_N(char *, argc);
-    MEMMOVE(argv, RSTRING_PTR(argary), char *, argc);
+    argv = (char **)RSTRING_PTR(argary);
 
-    while ((i = proc_options(argc, argv, opt, envopt)) > 1 && envopt && (argc -= i) > 0) {
+    while ((i = proc_options(argc, argv, opt, envopt)) > 1 && (argc -= i) > 0) {
 	argv += i;
 	if (**argv != '-') {
 	    *--*argv = '-';
@@ -807,7 +755,6 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
 	}
     }
 
-    ruby_xfree(ptr);
     /* get rid of GC */
     rb_str_resize(argary, 0);
     rb_str_resize(argstr, 0);
@@ -901,18 +848,12 @@ disable_option(const char *str, int len, void *arg)
     feature_option(str, len, arg, 0U);
 }
 
-RUBY_EXTERN const int  ruby_patchlevel;
-int ruby_env_debug_option(const char *str, int len, void *arg);
-
 static void
 debug_option(const char *str, int len, void *arg)
 {
     static const char list[] = EACH_DEBUG_FEATURES(LITERAL_NAME_ELEMENT, ", ");
 #define SET_WHEN_DEBUG(bit) SET_WHEN(#bit, DEBUG_BIT(bit), str, len)
     EACH_DEBUG_FEATURES(SET_WHEN_DEBUG, ;);
-#ifdef RUBY_DEVEL
-    if (ruby_patchlevel < 0 && ruby_env_debug_option(str, len, 0)) return;
-#endif
     rb_warn("unknown argument for --debug: `%.*s'", len, str);
     rb_warn("debug features are [%.*s].", (int)strlen(list), list);
 }
@@ -950,39 +891,6 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
 #define set_source_encoding_once(opt, e, elen) \
     set_option_encoding_once("source", &(opt)->src.enc.name, (e), (elen))
 
-#if USE_MJIT
-static void
-setup_mjit_options(const char *s, struct mjit_options *mjit_opt)
-{
-    if (*s == 0) return;
-    else if (strcmp(s, "-warnings") == 0) {
-        mjit_opt->warnings = 1;
-    }
-    else if (strcmp(s, "-debug") == 0) {
-        mjit_opt->debug = 1;
-    }
-    else if (strcmp(s, "-wait") == 0) {
-        mjit_opt->wait = 1;
-    }
-    else if (strcmp(s, "-save-temps") == 0) {
-        mjit_opt->save_temps = 1;
-    }
-    else if (strncmp(s, "-verbose=", 9) == 0) {
-        mjit_opt->verbose = atoi(s + 9);
-    }
-    else if (strncmp(s, "-max-cache=", 11) == 0) {
-        mjit_opt->max_cache_size = atoi(s + 11);
-    }
-    else if (strncmp(s, "-min-calls=", 11) == 0) {
-        mjit_opt->min_calls = atoi(s + 11);
-    }
-    else {
-        rb_raise(rb_eRuntimeError,
-                 "invalid MJIT option `%s' (--help will show valid MJIT options)", s + 1);
-    }
-}
-#endif
-
 static long
 proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
 {
@@ -990,7 +898,7 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
     const char *s;
     int warning = opt->warning;
 
-    if (argc <= 0 || !argv)
+    if (argc == 0)
 	return 0;
 
     for (argc--, argv++; argc > 0; argc--, argv++) {
@@ -1140,7 +1048,6 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
 
 	  case 'x':
 	    if (envopt) goto noenvopt;
-	    forbid_setid("-x");
 	    opt->xflag = TRUE;
 	    s++;
 	    if (*s && chdir(s) < 0) {
@@ -1240,7 +1147,7 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
 		if (v > 0377)
 		    rb_rs = Qnil;
 		else if (v == 0 && numlen >= 2) {
-		    rb_rs = rb_str_new2("");
+		    rb_rs = rb_str_new2("\n\n");
 		}
 		else {
 		    c = v & 0xff;
@@ -1335,14 +1242,6 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
 		opt->verbose = 1;
 		ruby_verbose = Qtrue;
 	    }
-            else if (strncmp("jit", s, 3) == 0) {
-#if USE_MJIT
-                opt->features |= FEATURE_BIT(jit);
-                setup_mjit_options(s + 3, &opt->mjit);
-#else
-                rb_warn("MJIT support is disabled.");
-#endif
-            }
 	    else if (strcmp("yydebug", s) == 0) {
 		if (envopt) goto noenvopt_long;
 		opt->dump |= DUMP_BIT(yydebug);
@@ -1429,7 +1328,6 @@ opt_enc_index(VALUE enc_name)
 #define rb_progname      (GET_VM()->progname)
 #define rb_orig_progname (GET_VM()->orig_progname)
 VALUE rb_argv0;
-VALUE rb_e_script;
 
 static VALUE
 false_value(void)
@@ -1537,9 +1435,8 @@ rb_f_chomp(int argc, VALUE *argv)
 static VALUE
 process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 {
-    rb_ast_t *ast = 0;
+    NODE *tree = 0;
     VALUE parser;
-    VALUE script_name;
     const rb_iseq_t *iseq;
     rb_encoding *enc, *lenc;
 #if UTF8_PATH
@@ -1550,20 +1447,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     int i = (int)proc_options(argc, argv, opt, 0);
     rb_binding_t *toplevel_binding;
     const struct rb_block *base_block;
-    unsigned int dump = opt->dump & dump_exit_bits;
+
+    argc -= i;
+    argv += i;
 
     if (opt->dump & (DUMP_BIT(usage)|DUMP_BIT(help))) {
-	const char *const progname =
-	    (argc > 0 && argv && argv[0] ? argv[0] :
-	     origarg.argc > 0 && origarg.argv && origarg.argv[0] ? origarg.argv[0] :
-	     ruby_engine);
-	usage(progname, (opt->dump & DUMP_BIT(help)));
+	usage(origarg.argv[0], (opt->dump & DUMP_BIT(help)));
 	return Qtrue;
     }
 
-    argc -= i;
-    argv += i;
-
     if ((opt->features & FEATURE_BIT(rubyopt)) &&
 	opt->safe_level == 0 && (s = getenv("RUBYOPT"))) {
 	VALUE src_enc_name = opt->src.enc.name;
@@ -1583,15 +1475,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     if (opt->src.enc.name)
 	rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
 
-#if USE_MJIT
-    if (opt->features & FEATURE_BIT(jit)) {
-        opt->mjit.on = TRUE; /* set mjit.on for ruby_show_version() API and check to call mjit_init() */
-    }
-#endif
     if (opt->dump & (DUMP_BIT(version) | DUMP_BIT(version_v))) {
-#if USE_MJIT
-        mjit_opts.on = opt->mjit.on; /* used by ruby_show_version(). mjit_init() still can't be called here. */
-#endif
 	ruby_show_version();
 	if (opt->dump & DUMP_BIT(version)) return Qtrue;
     }
@@ -1601,7 +1485,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     }
 
     if (!opt->e_script) {
-	if (argc <= 0) {	/* no more args */
+	if (argc == 0) {	/* no more args */
 	    if (opt->verbose)
 		return Qtrue;
 	    opt->script = "-";
@@ -1627,9 +1511,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	    argc--;
 	    argv++;
 	}
-	if (opt->script[0] == '-' && !opt->script[1]) {
-	    forbid_setid("program input from stdin");
-	}
     }
 
     opt->script_name = rb_str_new_cstr(opt->script);
@@ -1643,14 +1524,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 
     ruby_gc_set_params(opt->safe_level);
     ruby_init_loadpath_safe(opt->safe_level);
-
-#if USE_MJIT
-    if (opt->mjit.on)
-        /* Using TMP_RUBY_PREFIX created by ruby_init_loadpath_safe(). */
-        mjit_init(&opt->mjit);
-#endif
-
-    Init_ruby_description();
     Init_enc();
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
@@ -1684,24 +1557,12 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	ienc = enc;
 #endif
     }
-    script_name = opt->script_name;
-    rb_enc_associate(opt->script_name,
-		     IF_UTF8_PATH(uenc = rb_utf8_encoding(), lenc));
-#if UTF8_PATH
-    if (uenc != lenc) {
-	opt->script_name = str_conv_enc(opt->script_name, uenc, lenc);
-	opt->script = RSTRING_PTR(opt->script_name);
-    }
-#endif
+    rb_enc_associate(opt->script_name, lenc);
     rb_obj_freeze(opt->script_name);
-    if (IF_UTF8_PATH(uenc != lenc, 1)) {
+    if (IF_UTF8_PATH((uenc = rb_utf8_encoding()) != lenc, 1)) {
 	long i;
-        rb_vm_t *vm = GET_VM();
-        VALUE load_path = vm->load_path;
+	VALUE load_path = GET_VM()->load_path;
 	const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
-        int modifiable = FALSE;
-
-        rb_get_expanded_load_path();
 	for (i = 0; i < RARRAY_LEN(load_path); ++i) {
 	    VALUE path = RARRAY_AREF(load_path, i);
 	    int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
@@ -1713,22 +1574,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	    path = rb_enc_associate(rb_str_dup(path), lenc);
 #endif
 	    if (mark) rb_ivar_set(path, id_initial_load_path_mark, path);
-            if (!modifiable) {
-                rb_ary_modify(load_path);
-                modifiable = TRUE;
-            }
 	    RARRAY_ASET(load_path, i, path);
 	}
-        if (modifiable) {
-            rb_ary_replace(vm->load_path_snapshot, load_path);
-        }
     }
     Init_ext();		/* load statically linked extensions before rubygems */
     if (opt->features & FEATURE_BIT(gems)) {
 	rb_define_module("Gem");
-	if (opt->features & FEATURE_BIT(did_you_mean)) {
-	    rb_define_module("DidYouMean");
-	}
+    }
+    if (opt->features & FEATURE_BIT(did_you_mean)) {
+	rb_define_module("DidYouMean");
     }
     ruby_init_prelude();
     if ((opt->features ^ DEFAULT_FEATURES) & COMPILATION_FEATURES) {
@@ -1741,6 +1595,12 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	rb_funcallv(rb_cISeq, rb_intern_const("compile_option="), 1, &option);
 #undef SET_COMPILE_OPTION
     }
+#if UTF8_PATH
+    if (uenc != lenc) {
+	opt->script_name = str_conv_enc(opt->script_name, uenc, lenc);
+	opt->script = RSTRING_PTR(opt->script_name);
+    }
+#endif
     ruby_set_argv(argc, argv);
     process_sflag(&opt->sflag);
 
@@ -1749,9 +1609,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     /* need to acquire env from toplevel_binding each time, since it
      * may update after eval() */
 
-    base_block = toplevel_context(toplevel_binding);
-    rb_parser_set_context(parser, base_block, TRUE);
-
     if (opt->e_script) {
 	VALUE progname = rb_progname;
 	rb_encoding *eenc;
@@ -1775,20 +1632,22 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	    require_libraries(&opt->req_list);
 	}
         ruby_set_script_name(progname);
-	rb_parser_set_options(parser, opt->do_print, opt->do_loop,
-			      opt->do_line, opt->do_split);
-	ast = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
+
+	base_block = toplevel_context(toplevel_binding);
+	rb_parser_set_context(parser, base_block, TRUE);
+	tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
     }
     else {
-	VALUE f;
-	f = open_load_file(script_name, &opt->xflag);
-	ast = load_file(parser, opt->script_name, f, 1, opt);
+	if (opt->script[0] == '-' && !opt->script[1]) {
+	    forbid_setid("program input from stdin");
+	}
+
+	base_block = toplevel_context(toplevel_binding);
+	rb_parser_set_context(parser, base_block, TRUE);
+	tree = load_file(parser, opt->script_name, 1, opt);
     }
     ruby_set_script_name(opt->script_name);
-    if (dump & DUMP_BIT(yydebug)) {
-	dump &= ~DUMP_BIT(yydebug);
-	if (!dump) return Qtrue;
-    }
+    if (opt->dump & DUMP_BIT(yydebug)) return Qtrue;
 
     if (opt->ext.enc.index >= 0) {
 	enc = rb_enc_from_index(opt->ext.enc.index);
@@ -1807,85 +1666,54 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 	rb_enc_set_default_internal(Qnil);
     rb_stdio_set_default_encoding();
 
-    if (!ast->body.root) {
-	rb_ast_dispose(ast);
-	return Qfalse;
-    }
+    if (!tree) return Qfalse;
 
     process_sflag(&opt->sflag);
     opt->xflag = 0;
 
-    if (dump & DUMP_BIT(syntax)) {
+    if (opt->dump & DUMP_BIT(syntax)) {
 	printf("Syntax OK\n");
-	dump &= ~DUMP_BIT(syntax);
-	if (!dump) return Qtrue;
+	return Qtrue;
     }
 
+    if (opt->do_print) {
+	tree = rb_parser_append_print(parser, tree);
+    }
     if (opt->do_loop) {
+	tree = rb_parser_while_loop(parser, tree, opt->do_line, opt->do_split);
 	rb_define_global_function("sub", rb_f_sub, -1);
 	rb_define_global_function("gsub", rb_f_gsub, -1);
 	rb_define_global_function("chop", rb_f_chop, 0);
 	rb_define_global_function("chomp", rb_f_chomp, -1);
     }
 
-    if (dump & (DUMP_BIT(parsetree)|DUMP_BIT(parsetree_with_comment))) {
-	rb_io_write(rb_stdout, rb_parser_dump_tree(ast->body.root, dump & DUMP_BIT(parsetree_with_comment)));
+    if (opt->dump & DUMP_BIT(parsetree) || opt->dump & DUMP_BIT(parsetree_with_comment)) {
+	rb_io_write(rb_stdout, rb_parser_dump_tree(tree, opt->dump & DUMP_BIT(parsetree_with_comment)));
 	rb_io_flush(rb_stdout);
-	dump &= ~DUMP_BIT(parsetree)&~DUMP_BIT(parsetree_with_comment);
-	if (!dump) {
-	    rb_ast_dispose(ast);
-	    return Qtrue;
-	}
+	return Qtrue;
     }
 
     {
 	VALUE path = Qnil;
 	if (!opt->e_script && strcmp(opt->script, "-")) {
-	    path = rb_realpath_internal(Qnil, script_name, 1);
-#if UTF8_PATH
-	    if (uenc != lenc) {
-		path = str_conv_enc(path, uenc, lenc);
-	    }
-#endif
-	    if (!ENCODING_GET(path)) { /* ASCII-8BIT */
-		rb_enc_copy(path, opt->script_name);
-	    }
+	    path = rb_realpath_internal(Qnil, opt->script_name, 1);
 	}
 	base_block = toplevel_context(toplevel_binding);
-	iseq = rb_iseq_new_main(&ast->body, opt->script_name, path, vm_block_iseq(base_block));
-	rb_ast_dispose(ast);
+	iseq = rb_iseq_new_main(tree, opt->script_name, path, vm_block_iseq(base_block));
     }
 
-    if (dump & DUMP_BIT(insns)) {
+    if (opt->dump & DUMP_BIT(insns)) {
 	rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq));
 	rb_io_flush(rb_stdout);
-	dump &= ~DUMP_BIT(insns);
-	if (!dump) return Qtrue;
+	return Qtrue;
     }
-    if (opt->dump & dump_exit_bits) return Qtrue;
 
     rb_define_readonly_boolean("$-p", opt->do_print);
     rb_define_readonly_boolean("$-l", opt->do_line);
     rb_define_readonly_boolean("$-a", opt->do_split);
 
-    if ((rb_e_script = opt->e_script) != 0) {
-        rb_gc_register_mark_object(opt->e_script);
-    }
-
     rb_set_safe_level(opt->safe_level);
 
-    {
-        rb_execution_context_t *ec = GET_EC();
-
-        if (opt->e_script) {
-            /* -e */
-            rb_exec_event_hook_script_compiled(ec, iseq, opt->e_script);
-        }
-        else {
-            /* file */
-            rb_exec_event_hook_script_compiled(ec, iseq, Qnil);
-        }
-    }
     return (VALUE)iseq;
 }
 
@@ -1894,7 +1722,7 @@ static void
 warn_cr_in_shebang(const char *str, long len)
 {
     if (str[len-1] == '\n' && str[len-2] == '\r') {
-	rb_warn("shebang line ending with \\r may cause problems");
+	rb_warn("shebang line ends with \\r may cause a problem");
     }
 }
 #else
@@ -1905,6 +1733,7 @@ struct load_file_arg {
     VALUE parser;
     VALUE fname;
     int script;
+    int xflag;
     ruby_cmdline_options_t *opt;
     VALUE f;
 };
@@ -1919,10 +1748,12 @@ load_file_internal(VALUE argp_v)
     ruby_cmdline_options_t *opt = argp->opt;
     VALUE f = argp->f;
     int line_start = 1;
-    rb_ast_t *ast = 0;
+    NODE *tree = 0;
     rb_encoding *enc;
     ID set_encoding;
+    int xflag = argp->xflag;
 
+    argp->script = 0;
     CONST_ID(set_encoding, "set_encoding");
     if (script) {
 	VALUE c = 1;		/* something not nil */
@@ -1936,9 +1767,11 @@ load_file_internal(VALUE argp_v)
 	enc = rb_ascii8bit_encoding();
 	rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
 
-	if (opt->xflag) {
+	if (xflag || opt->xflag) {
 	    line_start--;
 	  search_shebang:
+	    forbid_setid("-x");
+	    opt->xflag = FALSE;
 	    while (!NIL_P(line = rb_io_gets(f))) {
 		line_start++;
 		RSTRING_GETMEM(line, str, len);
@@ -1955,7 +1788,11 @@ load_file_internal(VALUE argp_v)
 	c = rb_io_getbyte(f);
 	if (c == INT2FIX('#')) {
 	    c = rb_io_getbyte(f);
-            if (c == INT2FIX('!') && !NIL_P(line = rb_io_gets(f))) {
+	    if (c == INT2FIX('!')) {
+		line = rb_io_gets(f);
+		if (NIL_P(line))
+		    return 0;
+
 		RSTRING_GETMEM(line, str, len);
 		warn_cr_in_shebang(str, len);
 		if ((p = strstr(str, ruby_engine)) == 0) {
@@ -1995,7 +1832,8 @@ load_file_internal(VALUE argp_v)
 	    rb_io_ungetbyte(f, c);
 	}
 	else {
-	    argp->f = f = Qnil;
+	    if (f != rb_stdin) rb_io_close(f);
+	    f = Qnil;
 	}
 	if (!(opt->dump & ~DUMP_BIT(version_v))) {
 	    ruby_set_script_name(opt->script_name);
@@ -2011,45 +1849,26 @@ load_file_internal(VALUE argp_v)
     else {
 	enc = rb_utf8_encoding();
     }
-    rb_parser_set_options(parser, opt->do_print, opt->do_loop,
-			  opt->do_line, opt->do_split);
     if (NIL_P(f)) {
 	f = rb_str_new(0, 0);
 	rb_enc_associate(f, enc);
 	return (VALUE)rb_parser_compile_string_path(parser, orig_fname, f, line_start);
     }
     rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
-    ast = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
+    tree = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
     rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
-    if (script && rb_parser_end_seen_p(parser)) {
-	/*
-	 * DATA is a File that contains the data section of the executed file.
-	 * To create a data section use <tt>__END__</tt>:
-	 *
-	 *   $ cat t.rb
-	 *   puts DATA.gets
-	 *   __END__
-	 *   hello world!
-	 *
-	 *   $ ruby t.rb
-	 *   hello world!
-	 */
-	rb_define_global_const("DATA", f);
-	argp->f = Qnil;
-    }
-    return (VALUE)ast;
+    if (script && rb_parser_end_seen_p(parser)) argp->script = script;
+    return (VALUE)tree;
 }
 
 static VALUE
 open_load_file(VALUE fname_v, int *xflag)
 {
-    const char *fname = (fname_v = rb_str_encode_ospath(fname_v),
-			 StringValueCStr(fname_v));
-    long flen = RSTRING_LEN(fname_v);
+    const char *fname = StringValueCStr(fname_v);
     VALUE f;
     int e;
 
-    if (flen == 1 && fname[0] == '-') {
+    if (RSTRING_LEN(fname_v) == 1 && fname[0] == '-') {
 	f = rb_stdin;
     }
     else {
@@ -2066,12 +1885,9 @@ open_load_file(VALUE fname_v, int *xflag)
 #endif
 	int mode = MODE_TO_LOAD;
 #if defined DOSISH || defined __CYGWIN__
-# define isdirsep(x) ((x) == '/' || (x) == '\\')
 	{
-	    static const char exeext[] = ".exe";
-	    enum {extlen = sizeof(exeext)-1};
-	    if (flen > extlen && !isdirsep(fname[flen-extlen-1]) &&
-		STRNCASECMP(fname+flen-extlen, exeext, extlen) == 0) {
+	    const char *ext = strrchr(fname, '.');
+	    if (ext && STRCASECMP(ext, ".exe") == 0) {
 		mode |= O_BINARY;
 		*xflag = 1;
 	    }
@@ -2079,13 +1895,7 @@ open_load_file(VALUE fname_v, int *xflag)
 #endif
 
 	if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
-	    e = errno;
-	    if (!rb_gc_for_fd(e)) {
-		rb_load_fail(fname_v, strerror(e));
-	    }
-	    if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
-		rb_load_fail(fname_v, strerror(errno));
-	    }
+	    rb_load_fail(fname_v, strerror(errno));
 	}
 	rb_update_max_fd(fd);
 
@@ -2099,20 +1909,22 @@ open_load_file(VALUE fname_v, int *xflag)
 #endif
 
 	e = ruby_is_fd_loadable(fd);
-	if (!e) {
-	    e = errno;
-	    (void)close(fd);
-	    rb_load_fail(fname_v, strerror(e));
+	if (e <= 0) {
+	    if (!e) {
+		e = errno;
+		(void)close(fd);
+		rb_load_fail(fname_v, strerror(e));
+	    }
+	    else {
+		/*
+		  We need to wait if FIFO is empty. It's FIFO's semantics.
+		  rb_thread_wait_fd() release GVL. So, it's safe.
+		*/
+		rb_thread_wait_fd(fd);
+	    }
 	}
 
 	f = rb_io_fdopen(fd, mode, fname);
-	if (e < 0) {
-	    /*
-	      We need to wait if FIFO is empty. It's FIFO's semantics.
-	      rb_thread_wait_fd() release GVL. So, it's safe.
-	    */
-	    rb_thread_wait_fd(fd);
-	}
     }
     return f;
 }
@@ -2123,23 +1935,39 @@ restore_load_file(VALUE arg)
     struct load_file_arg *argp = (struct load_file_arg *)arg;
     VALUE f = argp->f;
 
-    if (!NIL_P(f) && f != rb_stdin) {
+    if (argp->script) {
+	/*
+	 * DATA is a File that contains the data section of the executed file.
+	 * To create a data section use <tt>__END__</tt>:
+	 *
+	 *   $ cat t.rb
+	 *   puts DATA.gets
+	 *   __END__
+	 *   hello world!
+	 *
+	 *   $ ruby t.rb
+	 *   hello world!
+	 */
+	rb_define_global_const("DATA", f);
+    }
+    else if (f != rb_stdin) {
 	rb_io_close(f);
     }
     return Qnil;
 }
 
-static rb_ast_t *
-load_file(VALUE parser, VALUE fname, VALUE f, int script, ruby_cmdline_options_t *opt)
+static NODE *
+load_file(VALUE parser, VALUE fname, int script, ruby_cmdline_options_t *opt)
 {
     struct load_file_arg arg;
     arg.parser = parser;
     arg.fname = fname;
     arg.script = script;
     arg.opt = opt;
-    arg.f = f;
-    return (rb_ast_t *)rb_ensure(load_file_internal, (VALUE)&arg,
-			      restore_load_file, (VALUE)&arg);
+    arg.xflag = 0;
+    arg.f = open_load_file(rb_str_encode_ospath(fname), &arg.xflag);
+    return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg,
+			     restore_load_file, (VALUE)&arg);
 }
 
 void *
@@ -2152,15 +1980,17 @@ rb_load_file(const char *fname)
 void *
 rb_load_file_str(VALUE fname_v)
 {
-    return rb_parser_load_file(rb_parser_new(), fname_v);
+    ruby_cmdline_options_t opt;
+
+    return load_file(rb_parser_new(), fname_v, 0, cmdline_options_init(&opt));
 }
 
 void *
 rb_parser_load_file(VALUE parser, VALUE fname_v)
 {
     ruby_cmdline_options_t opt;
-    VALUE f = open_load_file(fname_v, &cmdline_options_init(&opt)->xflag);
-    return load_file(parser, fname_v, f, 0, &opt);
+
+    return load_file(parser, fname_v, 0, cmdline_options_init(&opt));
 }
 
 /*
@@ -2180,8 +2010,6 @@ proc_argv0(VALUE process)
     return rb_orig_progname;
 }
 
-static VALUE ruby_setproctitle(VALUE title);
-
 /*
  *  call-seq:
  *     Process.setproctitle(string)  -> string
@@ -2202,14 +2030,10 @@ static VALUE ruby_setproctitle(VALUE title);
 static VALUE
 proc_setproctitle(VALUE process, VALUE title)
 {
-    return ruby_setproctitle(title);
-}
+    StringValue(title);
+
+    setproctitle("%.*s", RSTRING_LENINT(title), RSTRING_PTR(title));
 
-static VALUE
-ruby_setproctitle(VALUE title)
-{
-    const char *ptr = StringValueCStr(title);
-    setproctitle("%.*s", RSTRING_LENINT(title), ptr);
     return title;
 }
 
@@ -2219,7 +2043,7 @@ set_arg0(VALUE val, ID id)
     if (origarg.argv == 0)
 	rb_raise(rb_eRuntimeError, "$0 not initialized");
 
-    rb_progname = rb_str_new_frozen(ruby_setproctitle(val));
+    rb_progname = rb_str_new_frozen(proc_setproctitle(rb_mProcess, val));
 }
 
 static inline VALUE
@@ -2227,9 +2051,7 @@ external_str_new_cstr(const char *p)
 {
 #if UTF8_PATH
     VALUE str = rb_utf8_str_new_cstr(p);
-    str = str_conv_enc(str, NULL, rb_default_external_encoding());
-    OBJ_TAINT_RAW(str);
-    return str;
+    return str_conv_enc(str, NULL, rb_default_external_encoding());
 #else
     return rb_external_str_new_cstr(p);
 #endif
@@ -2277,7 +2099,7 @@ init_ids(ruby_cmdline_options_t *opt)
 
 #undef forbid_setid
 static void
-forbid_setid(const char *s, const ruby_cmdline_options_t *opt)
+forbid_setid(const char *s, ruby_cmdline_options_t *opt)
 {
     if (opt->setids & 1)
         rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s);
@@ -2343,9 +2165,9 @@ ruby_set_argv(int argc, char **argv)
     VALUE av = rb_argv;
 
 #if defined(USE_DLN_A_OUT)
-    if (origarg.argc > 0 && origarg.argv)
+    if (origarg.argv)
 	dln_argv0 = origarg.argv[0];
-    else if (argc > 0 && argv)
+    else
 	dln_argv0 = argv[0];
 #endif
     rb_ary_clear(av);
@@ -2364,10 +2186,6 @@ ruby_process_options(int argc, char **argv)
     VALUE iseq;
     const char *script_name = (argc > 0 && argv[0]) ? argv[0] : ruby_engine;
 
-    if (!origarg.argv || origarg.argc <= 0) {
-	origarg.argc = argc;
-	origarg.argv = argv;
-    }
     ruby_script(script_name);  /* for the time being */
     rb_argv0 = rb_str_new4(rb_progname);
     rb_gc_register_mark_object(rb_argv0);
@@ -2410,25 +2228,23 @@ fill_standard_fds(void)
     }
 }
 
-/*! Initializes the process for libruby.
+/*! Initializes the process for ruby(1).
  *
  * This function assumes this process is ruby(1) and it has just started.
- * Usually programs that embed CRuby interpreter may not call this function,
- * and may do their own initialization.
- * argc and argv cannot be NULL.
+ * Usually programs that embeds CRuby interpreter should not call this function,
+ * and should do their own initialization.
  */
 void
 ruby_sysinit(int *argc, char ***argv)
 {
 #if defined(_WIN32)
+    void rb_w32_sysinit(int *argc, char ***argv);
     rb_w32_sysinit(argc, argv);
 #endif
-    if (*argc >= 0 && *argv) {
-	origarg.argc = *argc;
-	origarg.argv = *argv;
+    origarg.argc = *argc;
+    origarg.argv = *argv;
 #if defined(USE_DLN_A_OUT)
-	dln_argv0 = origarg.argv[0];
+    dln_argv0 = origarg.argv[0];
 #endif
-    }
     fill_standard_fds();
 }
diff --git a/ruby_assert.h b/ruby_assert.h
index 185d2e5f5f..3383e4fc6c 100644
--- a/ruby_assert.h
+++ b/ruby_assert.h
@@ -33,14 +33,8 @@ NORETURN(void rb_assert_failure(const char *, int, const char *, const char *));
 #define RUBY_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(!RUBY_NDEBUG+0, expr, #expr)
 #define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN(cond, expr, #expr)
 
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
-/* C89 compilers are required to support strings of only 509 chars. */
-/* can't use RUBY_ASSERT for such compilers. */
-#include <assert.h>
-#else
 #undef assert
 #define assert RUBY_ASSERT
-#endif
 
 #ifndef RUBY_NDEBUG
 # ifdef NDEBUG
diff --git a/ruby_atomic.h b/ruby_atomic.h
index 1b395cd23f..4bc9f37e0d 100644
--- a/ruby_atomic.h
+++ b/ruby_atomic.h
@@ -9,10 +9,10 @@ typedef unsigned int rb_atomic_t;
 # define ATOMIC_DEC(var) __atomic_fetch_sub(&(var), 1, __ATOMIC_SEQ_CST)
 # define ATOMIC_OR(var, val) __atomic_fetch_or(&(var), (val), __ATOMIC_SEQ_CST)
 # define ATOMIC_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
-# define ATOMIC_CAS(var, oldval, newval) RB_GNUC_EXTENSION_BLOCK( \
-   __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \
+# define ATOMIC_CAS(var, oldval, newval) \
+({ __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \
    __atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \
-   oldvaldup )
+   oldvaldup; })
 
 # define ATOMIC_SIZE_ADD(var, val) __atomic_fetch_add(&(var), (val), __ATOMIC_SEQ_CST)
 # define ATOMIC_SIZE_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST)
@@ -90,10 +90,6 @@ rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t new
 #  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
 # endif
 
-# ifdef InterlockedExchangePointer
-#   define 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;
@@ -150,15 +146,12 @@ ruby_atomic_size_exchange(size_t *ptr, size_t val)
 #ifndef ATOMIC_SIZE_INC
 # define ATOMIC_SIZE_INC(var) ATOMIC_INC(var)
 #endif
-
 #ifndef ATOMIC_SIZE_DEC
 # define ATOMIC_SIZE_DEC(var) ATOMIC_DEC(var)
 #endif
-
 #ifndef ATOMIC_SIZE_EXCHANGE
 # define ATOMIC_SIZE_EXCHANGE(var, val) ATOMIC_EXCHANGE(var, val)
 #endif
-
 #ifndef ATOMIC_SIZE_CAS
 # define ATOMIC_SIZE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val)
 #endif
@@ -167,7 +160,6 @@ ruby_atomic_size_exchange(size_t *ptr, size_t val)
 # ifndef ATOMIC_PTR_EXCHANGE
 #   define ATOMIC_PTR_EXCHANGE(var, val) ATOMIC_EXCHANGE(var, val)
 # endif
-
 # ifndef ATOMIC_PTR_CAS
 #   define ATOMIC_PTR_CAS(var, oldval, newval) ATOMIC_CAS(var, oldval, newval)
 # endif
@@ -175,7 +167,6 @@ ruby_atomic_size_exchange(size_t *ptr, size_t val)
 # ifndef ATOMIC_VALUE_EXCHANGE
 #   define ATOMIC_VALUE_EXCHANGE(var, val) ATOMIC_EXCHANGE(var, val)
 # endif
-
 # ifndef ATOMIC_VALUE_CAS
 #   define ATOMIC_VALUE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val)
 # endif
@@ -195,7 +186,6 @@ ruby_atomic_ptr_exchange(const void **ptr, const void *val)
 }
 # endif
 #endif
-
 #ifndef ATOMIC_PTR_CAS
 # if SIZEOF_VOIDP == SIZEOF_SIZE_T
 #   define ATOMIC_PTR_CAS(var, oldval, val) (void *)ATOMIC_SIZE_CAS(*(size_t *)&(var), (size_t)(oldval), (size_t)(val))
@@ -225,7 +215,6 @@ ruby_atomic_value_exchange(VALUE *ptr, VALUE val)
 }
 # endif
 #endif
-
 #ifndef ATOMIC_VALUE_CAS
 # if SIZEOF_VALUE == SIZEOF_SIZE_T
 #   define ATOMIC_VALUE_CAS(var, oldval, val) ATOMIC_SIZE_CAS(*(size_t *)&(var), (size_t)(oldval), (size_t)(val))
diff --git a/safe.c b/safe.c
index 68ec59689f..7aae978272 100644
--- a/safe.c
+++ b/safe.c
@@ -34,34 +34,25 @@ ruby_safe_level_2_warning(void)
 int
 rb_safe_level(void)
 {
-    return GET_VM()->safe_level_;
+    return GET_THREAD()->safe_level;
 }
 
 void
 rb_set_safe_level_force(int safe)
 {
-    GET_VM()->safe_level_ = safe;
+    GET_THREAD()->safe_level = safe;
 }
 
 void
 rb_set_safe_level(int level)
 {
-    rb_vm_t *vm = GET_VM();
+    rb_thread_t *th = GET_THREAD();
 
-    if (level > SAFE_LEVEL_MAX) {
-	rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
-    }
-    else if (level < 0) {
-	rb_raise(rb_eArgError, "$SAFE should be >= 0");
-    }
-    else {
-	int line;
-	const char *path = rb_source_location_cstr(&line);
-
-	if (0) fprintf(stderr, "%s:%d $SAFE %d -> %d\n",
-		       path ? path : "-", line, vm->safe_level_, level);
-
-	vm->safe_level_ = level;
+    if (level > th->safe_level) {
+	if (level > SAFE_LEVEL_MAX) {
+	    rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
+	}
+	th->safe_level = level;
     }
 }
 
@@ -75,7 +66,17 @@ static void
 safe_setter(VALUE val)
 {
     int level = NUM2INT(val);
-    rb_set_safe_level(level);
+    rb_thread_t *th = GET_THREAD();
+
+    if (level < th->safe_level) {
+	rb_raise(rb_eSecurityError,
+		 "tried to downgrade safe level from %d to %d",
+		 th->safe_level, level);
+    }
+    if (level > SAFE_LEVEL_MAX) {
+	rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
+    }
+    th->safe_level = level;
 }
 
 void
diff --git a/sample/cbreak.rb b/sample/cbreak.rb
index 7f1385cce3..76b534a76a 100644
--- a/sample/cbreak.rb
+++ b/sample/cbreak.rb
@@ -5,15 +5,15 @@ ECHO = 0x00000008
 TIOCGETP = 0x40067408
 TIOCSETP = 0x80067409
 
-def cbreak
+def cbreak ()
   set_cbreak(true)
 end
 
-def cooked
+def cooked ()
   set_cbreak(false)
 end
 
-def set_cbreak(on)
+def set_cbreak (on)
   tty = "\0" * 256
   STDIN.ioctl(TIOCGETP, tty)
   ttys = tty.unpack("C4 S")
@@ -30,7 +30,7 @@ end
 cbreak();
 
 print("this is no-echo line: ");
-readline().display
+readline().print
 cooked();
 print("this is echo line: ");
 readline()
diff --git a/sample/delegate.rb b/sample/delegate.rb
index dc7ea2a0af..918dc08877 100644
--- a/sample/delegate.rb
+++ b/sample/delegate.rb
@@ -1,6 +1,6 @@
 require 'delegate'
 
-class ExtArray < DelegateClass(Array)
+class ExtArray<DelegateClass(Array)
   def initialize()
     super([])
   end
diff --git a/sample/dir.rb b/sample/dir.rb
index 44733c2cf4..b627383946 100644
--- a/sample/dir.rb
+++ b/sample/dir.rb
@@ -3,7 +3,7 @@
 dirp = Dir.open(".")
 for f in dirp
   case f
-  when /\A\./, /~\z/, /\.o/
+  when /^\./, /~$/, /\.o/
     # do not print
   else
     print f, "\n"
diff --git a/sample/drb/dchats.rb b/sample/drb/dchats.rb
index 58af3cf005..c07f748e99 100644
--- a/sample/drb/dchats.rb
+++ b/sample/drb/dchats.rb
@@ -2,6 +2,7 @@
  distributed Ruby --- chat server
  	Copyright (c) 1999-2000 Masatoshi SEKI
 =end
+require 'thread'
 require 'drb/drb'
 
 class ChatEntry
diff --git a/sample/drb/dhasen.rb b/sample/drb/dhasen.rb
index 13ff38940e..9ab8534588 100644
--- a/sample/drb/dhasen.rb
+++ b/sample/drb/dhasen.rb
@@ -17,6 +17,7 @@
 
 require 'drb/drb'
 require 'chasen'
+require 'thread'
 
 class Dhasen
   include DRbUndumped
diff --git a/sample/drb/dlogd.rb b/sample/drb/dlogd.rb
index a87e660346..be364511dc 100644
--- a/sample/drb/dlogd.rb
+++ b/sample/drb/dlogd.rb
@@ -4,6 +4,7 @@
 =end
 
 require 'drb/drb'
+require 'thread'
 
 class Logger
   def initialize(fname)
diff --git a/sample/drb/dqueue.rb b/sample/drb/dqueue.rb
index a9afa8c858..1a405f5be5 100644
--- a/sample/drb/dqueue.rb
+++ b/sample/drb/dqueue.rb
@@ -3,6 +3,7 @@
  	Copyright (c) 1999-2000 Masatoshi SEKI
 =end
 
+require 'thread'
 require 'drb/drb'
 
 DRb.start_service(nil, Thread::Queue.new)
diff --git a/sample/drb/http0serv.rb b/sample/drb/http0serv.rb
index 1a58811fed..049f5a1de5 100644
--- a/sample/drb/http0serv.rb
+++ b/sample/drb/http0serv.rb
@@ -1,6 +1,7 @@
 require 'webrick'
 require 'drb/drb'
 require 'drb/http0'
+require 'thread'
 
 module DRb
   module HTTP0
diff --git a/sample/drb/name.rb b/sample/drb/name.rb
index a8ad28749d..30c902b8f7 100644
--- a/sample/drb/name.rb
+++ b/sample/drb/name.rb
@@ -35,6 +35,7 @@ How to play.
  | 2
 =end
 
+require 'thread.rb'
 require 'drb/drb'
 
 module DRbNamedObject
diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb
index 8be1542c06..9c10a34527 100644
--- a/sample/drb/old_tuplespace.rb
+++ b/sample/drb/old_tuplespace.rb
@@ -3,6 +3,8 @@
 # Copyright (c) 1999-2000 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
+require 'thread'
+
 class TupleSpace
   class Template
     def initialize(list)
diff --git a/sample/drb/ring_echo.rb b/sample/drb/ring_echo.rb
index c54628b54c..3b743cab8e 100644
--- a/sample/drb/ring_echo.rb
+++ b/sample/drb/ring_echo.rb
@@ -1,6 +1,7 @@
 require 'drb/drb'
 require 'drb/eq'
 require 'rinda/ring'
+require 'thread'
 
 class RingEcho
   include DRbUndumped
diff --git a/sample/drb/simpletuple.rb b/sample/drb/simpletuple.rb
index 4bb4b1cff9..bfbd86e665 100644
--- a/sample/drb/simpletuple.rb
+++ b/sample/drb/simpletuple.rb
@@ -3,6 +3,8 @@
 # Copyright (c) 1999-2000 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
+require 'thread'
+
 class SimpleTupleSpace
   def initialize
     @hash = {}
diff --git a/sample/dualstack-httpd.rb b/sample/dualstack-httpd.rb
index ab02e17aea..a6d4d3a2c2 100644
--- a/sample/dualstack-httpd.rb
+++ b/sample/dualstack-httpd.rb
@@ -3,6 +3,7 @@
 # The code demonstrates how a multi-protocol daemon should be written.
 
 require "socket"
+require "thread"
 
 port = 8888
 res = Socket.getaddrinfo(nil, port, nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
diff --git a/sample/export.rb b/sample/export.rb
index 2ab2e93f2e..949e5b10bf 100644
--- a/sample/export.rb
+++ b/sample/export.rb
@@ -30,7 +30,7 @@ f.printf "%s\n", Foo
 
 f.quux
 
-class Bar < Foo
+class Bar<Foo
   def quux
     super
     baz()
diff --git a/sample/fib.py b/sample/fib.py
index 90dc1e09ed..8318021d24 100644
--- a/sample/fib.py
+++ b/sample/fib.py
@@ -6,5 +6,5 @@ def fib(n):
   else:
     return fib(n-2)+fib(n-1)
 
-print(fib(20))
+print fib(20)
 
diff --git a/sample/iseq_loader.rb b/sample/iseq_loader.rb
index 8c271405d6..bb2d92ea77 100644
--- a/sample/iseq_loader.rb
+++ b/sample/iseq_loader.rb
@@ -41,7 +41,7 @@ class RubyVM::InstructionSequence
   at_exit{
     STDERR.puts "[ISEQ_LOADER] #{Process.pid} time: #{Time.now - LAUNCHED_TIME}, " +
                 "loaded: #{$ISEQ_LOADER_LOADED}, " +
-                "compiled: #{$ISEQ_LOADER_COMPILED}, " +
+                "compied: #{$ISEQ_LOADER_COMPILED}, " +
                 "ignored: #{$ISEQ_LOADER_IGNORED}"
   } if COMPILE_VERBOSE
 
@@ -141,11 +141,11 @@ class RubyVM::InstructionSequence
     end
 
     def read_compiled_iseq fname, iseq_key
-      File.open(iseq_key, 'rb'){|f| f.read}
+      open(iseq_key, 'rb'){|f| f.read}
     end
 
     def write_compiled_iseq fname, iseq_key, binary
-      File.open(iseq_key, 'wb'){|f| f.write(binary)}
+      open(iseq_key, 'wb'){|f| f.write(binary)}
     end
   end
 
diff --git a/sample/observ.rb b/sample/observ.rb
index a7ea45271d..061e3c6a10 100644
--- a/sample/observ.rb
+++ b/sample/observ.rb
@@ -1,5 +1,6 @@
 #! /usr/local/bin/ruby
 
+require "thread"
 require "observer"
 
 class Tick
diff --git a/sample/philos.rb b/sample/philos.rb
index c38aa4a1cc..622e58b4bf 100644
--- a/sample/philos.rb
+++ b/sample/philos.rb
@@ -1,6 +1,7 @@
 #
 # The Dining Philosophers - thread example
 #
+require "thread"
 
 srand
 #srand
diff --git a/sample/pty/expect_sample.rb b/sample/pty/expect_sample.rb
index 199d98b79c..2f87f21895 100644
--- a/sample/pty/expect_sample.rb
+++ b/sample/pty/expect_sample.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 # sample program of expect.rb
 #
@@ -24,17 +23,8 @@ PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
     username = 'guest'
   end
 
-  r_f.expect(/^Name.*: /) do
-    w_f.puts("ftp")
-  end
-  r_f.expect(/word:/) do
-    w_f.puts("#{username}@")
-  end
-  r_f.expect(/> /) do
-    w_f.puts("cd pub/ruby")
-  end
-  r_f.expect("> ") do
-    w_f.print "pass\n"
+  r_f.expect(/^(Name).*: |(word):|> /) do
+    w_f.puts($1 ? "ftp" : $2 ? "#{username}@" : "cd pub/ruby")
   end
   r_f.expect("> ") do
     w_f.print "dir\n"
diff --git a/sample/pty/script.rb b/sample/pty/script.rb
index c6659a4807..903a6f75bd 100644
--- a/sample/pty/script.rb
+++ b/sample/pty/script.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require 'pty'
 
 if ARGV.size == 0 then
@@ -35,3 +34,4 @@ PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
 end
 
 system "stty echo -raw lnext ^v"
+
diff --git a/sample/pty/shl.rb b/sample/pty/shl.rb
index 980748e8f5..cdaf8d7398 100644
--- a/sample/pty/shl.rb
+++ b/sample/pty/shl.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 #  old-fashioned 'shl' like program
 #  by A. Ito
@@ -11,40 +10,39 @@
 #     q        quit
 
 require 'pty'
-require 'io/console'
 
 $shells = []
+$n_shells = 0
 
 $r_pty = nil
 $w_pty = nil
 
 def writer
-  STDIN.raw!
+  system "stty -echo raw"
   begin
     while true
       c = STDIN.getc
-      if c == ?\C-z then
-        $reader.raise('Suspend')
+      if c == 26 then # C-z
+        $reader.raise(nil)
         return 'Suspend'
       end
       $w_pty.print c.chr
       $w_pty.flush
     end
   rescue
-    $reader.raise('Exit')
+    $reader.raise(nil)
     return 'Exit'
   ensure
-    STDIN.cooked!
+    system "stty echo -raw"
   end
 end
 
 $reader = Thread.new {
   while true
     begin
-      Thread.stop unless $r_pty
+      next if $r_pty.nil?
       c = $r_pty.getc
       if c.nil? then
-        Thread.main.raise('Exit')
         Thread.stop
       end
       print c.chr
@@ -61,14 +59,19 @@ $reader = Thread.new {
 while true
   print ">> "
   STDOUT.flush
-  n = nil
   case gets
   when /^c/i
-    $shells << PTY.spawn("/bin/csh")
-    n = -1
+    $shells[$n_shells] = PTY.spawn("/bin/csh")
+    $r_pty,$w_pty = $shells[$n_shells]
+    $n_shells += 1
+    $reader.run
+    if writer == 'Exit'
+      $n_shells -= 1
+      $shells[$n_shells] = nil
+    end
   when /^p/i
-    $shells.each_with_index do |s, i|
-      if s
+    for i in 0..$n_shells
+      unless $shells[i].nil?
         print i,"\n"
       end
     end
@@ -76,18 +79,14 @@ while true
     n = $1.to_i
     if $shells[n].nil?
       print "\##{i} doesn't exist\n"
-      n = nil
+    else
+      $r_pty,$w_pty = $shells[n]
+      $reader.run
+      if writer == 'Exit' then
+        $shells[n] = nil
+      end
     end
   when /^q/i
     exit
   end
-  if n
-    $r_pty, $w_pty, pid = $shells[n]
-    $reader.run
-    if writer == 'Exit' then
-      Process.wait(pid)
-      $shells[n] = nil
-      $shells.pop until $shells.empty? or $shells[-1]
-    end
-  end
 end
diff --git a/sample/ripper/ruby2html.rb b/sample/ripper/ruby2html.rb
index 1e6b3bf550..8f64f5a713 100644
--- a/sample/ripper/ruby2html.rb
+++ b/sample/ripper/ruby2html.rb
@@ -73,11 +73,7 @@ class ERB
 end
 
 def ruby2html(f, encoding, css, print_line_number)
-  if RUBY_VERSION >= '2.6'
-    erb = ERB.new(TEMPLATE, trim_mode: '>')
-  else
-    erb = ERB.new(TEMPLATE, nil, '>')
-  end
+  erb = ERB.new(TEMPLATE, nil, '>')
   erb.filename = __FILE__
   erb.lineno = TEMPLATE_LINE
   erb.result(binding())
diff --git a/sample/test.rb b/sample/test.rb
index 65dd9abd10..beb310dfaf 100755
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -1,2 +1,2 @@
-# backward compatibility for chkbuild
+# backword compatibility for chkbuild
 require_relative '../basictest/test'
diff --git a/sample/timeout.rb b/sample/timeout.rb
index ad4459aff0..8d25d72a76 100644
--- a/sample/timeout.rb
+++ b/sample/timeout.rb
@@ -1,31 +1,31 @@
 require 'timeout'
 
 def progress(n = 5)
-  n.times {|i| print i; STDOUT.flush; sleep 1}
+  n.times {|i| print i; STDOUT.flush; sleep 1; i+= 1}
   puts "never reach"
 end
 
-p Timeout.timeout(5) {
+p timeout(5) {
   45
 }
-p Timeout.timeout(5, Timeout::Error) {
+p timeout(5, Timeout::Error) {
   45
 }
-p Timeout.timeout(nil) {
+p timeout(nil) {
   54
 }
-p Timeout.timeout(0) {
+p timeout(0) {
   54
 }
 begin
-  Timeout.timeout(5) {progress}
+  timeout(5) {progress}
 rescue => e
   puts e.message
 end
 begin
-  Timeout.timeout(3) {
+  timeout(3) {
     begin
-      Timeout.timeout(5) {progress}
+      timeout(5) {progress}
     rescue => e
       puts "never reach"
     end
@@ -36,7 +36,7 @@ end
 class MyTimeout < StandardError
 end
 begin
-  Timeout.timeout(2, MyTimeout) {progress}
+  timeout(2, MyTimeout) {progress}
 rescue MyTimeout => e
   puts e.message
 end
diff --git a/sample/trick2013/kinaba/remarks.markdown b/sample/trick2013/kinaba/remarks.markdown
index 73a4ea9875..a454a5f0a1 100644
--- a/sample/trick2013/kinaba/remarks.markdown
+++ b/sample/trick2013/kinaba/remarks.markdown
@@ -16,7 +16,7 @@ The program contains each ASCII character from 0x20 ' ' to 0x7e '~' exactly once
 
 ### Internals
 
-The algorithm is the obvious loop "32.upto(126){|x| putc x}".
+The algorthim is the obvious loop "32.upto(126){|x| putc x}".
 
 It is not so hard to transform it to use each character *at most once*. The only slight difficulty comes from the constraint that we cannot "declare and then use" variables, because then the code will contain the variable name twice. This restriction is worked around by the $. global variable, the best friend of Ruby golfers.
 
diff --git a/sample/trick2013/mame/music-box.mp4 b/sample/trick2013/mame/music-box.mp4
new file mode 100644
index 0000000000..6d1e87c01c
--- /dev/null
+++ b/sample/trick2013/mame/music-box.mp4
diff --git a/sample/trick2013/yhara/entry.rb b/sample/trick2013/yhara/entry.rb
index ce125ed3df..a2deb54399 100644
--- a/sample/trick2013/yhara/entry.rb
+++ b/sample/trick2013/yhara/entry.rb
@@ -2,7 +2,7 @@ def _(&b)$><<->(x){x ? (String===x ?x.upcase:
 (Class===x ? x : x.class).name[$a?0:($a=5)]):
 " "}[ begin b[];rescue Exception;$!;end ] end
 
-_ {                  yield                  }
+_ {                 return                  }
 _ {            method(:p).unbind            }
 _ {                eval "{ "                }
 _ {           Thread.current.join           }
diff --git a/sample/trick2015/ksk_1/remarks.markdown b/sample/trick2015/ksk_1/remarks.markdown
index a0b8bbcdcc..b822dc55c8 100644
--- a/sample/trick2015/ksk_1/remarks.markdown
+++ b/sample/trick2015/ksk_1/remarks.markdown
@@ -110,7 +110,7 @@ is simply `/=/` and removing a padding `",,,,,"`.  The program no
 longer terminates, though.
 
 
-### Limitation
+### Limination
 
 The implementation requires to manipulate long strings even for some
 small starting numbers.  For example, starting from 1,819, the number
diff --git a/sample/trick2018/01-kinaba/authors.markdown b/sample/trick2018/01-kinaba/authors.markdown
deleted file mode 100644
index d0df0b379d..0000000000
--- a/sample/trick2018/01-kinaba/authors.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-* kinaba
-  * twitter.com/kinaba
-  * cctld: jp
diff --git a/sample/trick2018/01-kinaba/entry.rb b/sample/trick2018/01-kinaba/entry.rb
deleted file mode 100644
index eb8284d5ab..0000000000
--- a/sample/trick2018/01-kinaba/entry.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-alias    BEGIN    for      unless   def      class
-super    true     or       return   defined? next
-break    while    begin    undef    do       end
-rescue   then     retry    else     undef    module
-nil      ensure   case     if       yield    __LINE__
-self     and      redo     elsif    not      __FILE__
-alias    END      in       end      when     __ENCODING__
-end      until    false    end
diff --git a/sample/trick2018/01-kinaba/remarks.markdown b/sample/trick2018/01-kinaba/remarks.markdown
deleted file mode 100644
index a1a05bfd73..0000000000
--- a/sample/trick2018/01-kinaba/remarks.markdown
+++ /dev/null
@@ -1,55 +0,0 @@
-### Remarks
-
-Just run it with no argument:
-
-    ruby entry.rb
-
-(Anyway it is just a no-op program. The above command only verifies
-that entry.rb is a valid Ruby program.)
-
-I confirmed the following implementations/platforms:
-
-* ruby 2.5.0p0 (2017-12-25 revision 61468) [x64-mingw32]
-
-### Description
-
-First, look at
-
-https://docs.ruby-lang.org/ja/latest/doc/spec=2flexical.html#reserved
-
-and then, look at entry.rb.
-
-The source code of entry.rb consists only of reserved words of Ruby,
-and all the reserved words are used in the code, in a way that the code
-forms a valid Ruby program. No compile error, no warning, or no runtime error.
-
-
-### Internals
-
-Difficult (and interesting) points of the theme are:
-
-* Since many of the reserved words define program structures, we cannot
-  use them independently. For instance, `retry` must be inside `rescue`,
-  or `break`/`next`/`redo` must be inside a looping construct.
-  Or, jump-out statements cannot occur at a position that requires a
-  value; `if return then true end` is a "void value expression" syntax error.
-* Inserting newlines for each 6 word (to match with the spec html) is also
-  an interseting challenge, since Ruby is sensitive to newlines.
-
-Tricks used in the code are:
-
-* def/alias/undef can take even reserved words as parameters.
-  That is, `def class ... end` defines a method named `class`.
-  The feature is crucial since otherwise `BEGIN` etc inevitably
-  introduces non-reserved tokens (like `{}`).
-* `defined?` can take some reserved words too (which I didn't know
-  until trying to write this program.)
-* "void value expression" can be avoided by using `or` or `and`.
-  `if begin return end then true end` is a syntax error, but
-  `if begin false or return end then true end` is not.
-
-
-### Limitation
-
-Sad to say that it's not a "perfect pangram".
-It uses 'alias' and 'undef' twice, and 'end' 4 times.
diff --git a/sample/trick2018/02-mame/authors.markdown b/sample/trick2018/02-mame/authors.markdown
deleted file mode 100644
index 0e420fdf5d..0000000000
--- a/sample/trick2018/02-mame/authors.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-* Yusuke Endoh
-  * mame@ruby-lang.org
-  * cctld: jp
diff --git a/sample/trick2018/02-mame/entry.rb b/sample/trick2018/02-mame/entry.rb
deleted file mode 100644
index cc4ef9cbc4..0000000000
--- a/sample/trick2018/02-mame/entry.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-'';eval(r=%q(->z{r="'';eval(r=\
-%q(#{r}))[%q`#{z}`]";i=-040;30.
-times{|n|(15+n%2*15-n/2).times{
-r<<r[i+=(1.-n&2)*(32-n%2*31)]}}
-i=r[524,0]=?\0;eval(r[479..-1])
-c['"']}))[%q`GFEDCBA"+"[e\"'"'t
-kE*;;\";"  TRICK2018  ";tb,;{{r
-2E0$ob[us@*0)[90,336])_#i\n}s#i
-0H}>["t]];};o[1,?\n*8];ex"-}eac
-1Hl<1[-1]*2*t=n%2];o[14-n,0)mvk
-8M$<4,?\n];15.times{|n|;o[35ie2
-!Pss.slice!(0,1)+x;sleep(0.0t;0
-'W=%q"<<95<<$s<<95;o=->n,x{n.'1
-;@[2]}|\e../,%@s="'%trick2018!8
-eval$s=%q_eval($s.gsub!(/#{%@`]
diff --git a/sample/trick2018/02-mame/remarks.markdown b/sample/trick2018/02-mame/remarks.markdown
deleted file mode 100644
index 88b32c205a..0000000000
--- a/sample/trick2018/02-mame/remarks.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
-This program quines with animation.
-
-```
-$ ruby entry.rb
-```
-
-Of course, the output is executable.
-
-```
-$ ruby entry.rb > output
-$ ruby output
-```
-
-Note, we don't cheat.  This program uses escape sequences just for moving the cursor.  It doesn't use attribution change nor overwrite to hide any code.
-
-The program is crafted so that it works in two ways; it works as a normal program text, and, it also works when it is rearranged in a spiral order.  Some parts of the code are actually overlapped.
diff --git a/sample/trick2018/03-tompng/Gemfile b/sample/trick2018/03-tompng/Gemfile
deleted file mode 100644
index a24ff779dc..0000000000
--- a/sample/trick2018/03-tompng/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'chunky_png'
diff --git a/sample/trick2018/03-tompng/Gemfile.lock b/sample/trick2018/03-tompng/Gemfile.lock
deleted file mode 100644
index 467f5c3495..0000000000
--- a/sample/trick2018/03-tompng/Gemfile.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    chunky_png (1.3.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  chunky_png
-
-BUNDLED WITH
-   1.16.1
diff --git a/sample/trick2018/03-tompng/authors.markdown b/sample/trick2018/03-tompng/authors.markdown
deleted file mode 100644
index 26ebe24da6..0000000000
--- a/sample/trick2018/03-tompng/authors.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-* Tomoya Ishida (tompng)
-  * tomoyapenguin@gmail.com
-  * cctld: jp
diff --git a/sample/trick2018/03-tompng/entry.rb b/sample/trick2018/03-tompng/entry.rb
deleted file mode 100644
index 26416c7019..0000000000
--- a/sample/trick2018/03-tompng/entry.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-X=[];class String def-@;replace ?-+self end;def-a;X.reject!{|x|x.
-__id__==__id__};a.replace(self+?-+a) end end;at_exit{eval C=(Zlib
-.inflate((X*?-).tr(?-,'').tr('q-z','0-9').to_i(26).digits(0x100).
-pack'C*'))};def method_missing n;(X<<n.to_s)[-1]end;require'zlib'
-fzygtoxyzgntmdmuwvfoffbpmvzojpkhczvjvjdbtscnldwbdoprackddovivvmkz
-ponzmosvtjciwkgaslscxxxwudeesmmqpfhislxuxnnypulxstzgobyaekqqhbjcg
-mvko------------ddkeys----eivhnccaqyiw---bzyccmt-----------ymtnge
-jwhi--------------pjxf------mdarbtumnv---qasda--------------gmwdt
-wrtk---qtpzgnce----fsl-------fkgzgtbpp---gwnm----pxkpqkdiw---owga
-momz---yjjvpnvar---zeo---v-----duvalwu---nsqt---waofemwakivnyqkjd
-fzag---uhvusmkl----kzb---rhc----iutzjr---mqlh---ayijpwativpweaato
-xexs--------------rvgv---pjdz-----lkkg---uiaw---lovitupw-----fwmn
-kfru------------jvjpgv---jskycf----pal---gbuf---hfdnywog-----iuca
-pntn---apmkqroeuzwuwkw---gqnmgof-----b---hlpl---vkkyhfyrqfr--jwrl
-kmdb---dhspujhmtgrkccu---uonfummdt-------rqfw----bpiactehwp--fncq
-yzvz---gdaxebplhfndran---ytfmviryeh------hqwkl---------------nced
-bibu---fnkdthgldhkxxjg---rwnmpudhbqin----gucoyki------------hfura
-cqdgqpyzqfzknvdjoxxhpjulwwyebtocxdrvklbuviwwcatlmdosxfvwntzbijguy
-iglrvvzlxerflupxvsyujfacuwhrvmnecgtewtqkhtdggcltejiyqcluclkycwvzg
-vvxfysvttfbeglvrlngntdngzyhqrmltazwdydxrsvjploembhgxdvfmmhepbschm
-brn--iqrcdb--evv----tqp------lg--uein-wzut--mr------wkh------foqz
-zsf--srjnjp--ampb--pfio--hgtekx--rrr---fwd--jn--xqkezcz--vsb--nya
-khrc--evlr--oioxs--mqce--bqfmag--bwz---xda--qw--jnuzelr--qzi--itx
-mdxd--duso--wxbot--nmon--ugnbdpc--a--c--e--hlg--twxndre--tby--rhg
-evhbn--zb--dtxmiz--dpia------vie--h--i--t--shh------kfn------owna
-ealmt--kb--scxdjy--smvl--dqmgebk--t--s--t--gfd--updcbnc--rh--dwwp
-dvpnxb----wpljjdy--kolc--qflyleok---xkv---usbj--jhrawbn--ewx--bgf
-eaqwrw----ejwxhet--dice--eoczconm---urz---rqyp--hovvvfc--bskj--el
-aocjcts--jtumwxm----mgy------xpaoq-jtwqr-aipay------dhy--iync--hk
-sckddmvuvvuhhqstumaykvczaaujrumqbbqsdvdycplyrlkkojlxnkrhbbrmnjxyf
-cdtcmpfmjvthwkpzucbblttgumomlxnxwjeypfeagaukfzeokzxjebkpigcvlqnso
diff --git a/sample/trick2018/03-tompng/output.txt b/sample/trick2018/03-tompng/output.txt
deleted file mode 100644
index ed9a4079cc..0000000000
--- a/sample/trick2018/03-tompng/output.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-undef p;X=[];class String def-@;replace ?-+dup end;def-a;X.reject!{|x|x.__id__==__id__};a.replace(self+?-+a) end end;at_exit{eval C=
-(Zlib.inflate (X*?-).tr(?-,'').tr('q-z','0-9').to_i(26).digits(256).pack'C*')};def method_missing n;(X<<n.to_s)[-1]end;require'zlib'
-gmlztzdculbtzgtjfetuh---k--htf----d-----------------------------------------------------g-b-----s--t-g--------jmuwescmgchftikfjafccs
-ivchcveidpvxdabnvwyga-f--v-------xf----------------------------------------------------q-v---l-------q---------liiNeawriayymwooxgxqw
-rfosepqsmojseyezmwbhi--------------ew--------------------------------------------------m---k-r-----------vwu--hiotltdmczwyjmlvbyfqwq
-uvvykqdjednoqgtcmtfbzs---------f----o--------------------------------------------------t--a------m----x---f-----dldzsakyofetfozfpmrq
-geusutariiiNiulkjbwlm-----d------------------------------------------------------------j---------o---------x--j-uitzrgwpupwhvendhyno
-uubvnssiywkklwwdufhhi-rw----k---v-------------------------------------------------------sty-----yg---l---c-v----wkffpskpumolqmkeryzg
-zrxdaiposwybbzgxdnegh-----g-----ma--n---------------------------------------------------------j----n--b-n-------yqavmscswdogpcgopygt
-axiqfswlhzeamvymdnteo---q-q-w--------------------------fhrmj-----------------hkou-----------f-----d----u-o------evcuxxegekfgivzzujan
-nslioftsvqvtkeigvfgwr-------------lyco-----------------igyvg-----------------okuk---------m--b-u--d--y------s---dadjrlykfhtermzfyktu
-btoxzfpPicxxfligbivvf--------h----yrat---------------------------------------vjwd---------------------d-ki--o--tyqosehopkwttigwwfskp
-komzvnyrvkjcjwbmdwdkp----------vxphiNdtawn--xms-saketo--jnld----ezulntdaz----nzna-----vhjwt------h----x--x--o--saxxsrkgktqotaluylbkk
-sclegratyaarmgmepheml----------hwgglhlrfcx--znvmpfsgjx-onhju---gtxsmzqprlt---mjzy---frhdk-------------v---mj----dzjujmbgldfwoybgicwu
-tfhgnhlzxlwtdtkgzlaca-------------gmex------arlm--------rvmh-ajtgf-----pqal--wcux-zatyi-------------------------xnluwybcugjclmablshn
-tnjohqtqzivgmyutrssil-------------lcwq------jrf--------gcaii-maie------------vvnfjfqwo--------------------------filivosyhkxcvuwdibwj
-tyxjiopiFqypvwdzoatuq-------------tdln------cnx---------ffuf-ajvq------------tyyypglpzmj------------------------vtqzwewqdsijrbymvpwn
-niNffphoehukpvvmzvhyd-------------ahqd------nfr---------jeqk--toap-----mxhyg-tedv---otrwy-----------------------mjxnrktackwxwiajdnuc
-kkxhuwbvibpvgvcampadi-------------ebmencqz--obf--------wfprz---qmrotkijiqv---ggfp-----hlzw----------------------kastwdpxiyftmypuxbtu
-xetudmwzpomktgnjkcsyc---------------fwpdx---xb----j-----se-k------tllakc-----gjoo-------we------mic---lktk------ubtnrxvrjzuqlrfrsnmf
-okdvfvcdbdqkckjialskk---------------------------v---u-------l----------------------------------z--q--qfg--------aaliNbxbjjpxebboneye
-kcbkjmdclwnfawtfnwkeq----------------------------------j---y-------------------------------a---jmbyo-sgef--gf---extljbozuoofgyvsilct
-xzoqmsqgzjxxpjqwkjkdd------------------------o--------m-------f---------------------------------n--de-ajz-rzv---fhnpbkrwdxoozpxeaxaf
-mbcwxuiqdwcmadheiykaa-----------------------q-f------l---i---------------------------------r----zf---k--y---fi--dcnycheytylcgnioauee
-yekiNacriqoevtdjerqbp----------------------------w---yy-----my----------------------------ko--mnbpskr--c-----j--ozyqpbfovhbhyoprzgqr
-czwtuopxkdbphocfawvbk--------------------------q-s----j--b---------------------------------hd-xsb----bfiNp--w---fmwuvfambdqvxtzldwmh
-xysnyrseydlkjcwfbsjnr-------------------------d-d-------------------------------------------f-enpss---qllpwr----almsdidvjwoigvldfqoa
-lrpbixjpofxocxlflscpo------------------------------q-fyu--z-------------------------------------kfd-z---n-------bqxurujnxzurrdgcojks
-jetyfdkcekckxbyosbfws-------------wdfhgwuvejjmf-----sxjubpvgcsl-------tnmixpv---------eurabjsdvstfv-------------qcyiqhonwoyixqeonfvp
-mopPhywsozohitutgmmrb------------zxwtxe--riedeo---mspgpnv--pimlh------jhtzajk--------qqovvq---ldbrh-------------xtooxpayonpcvvtmvpra
-vvuyiunpoeagdzqjecsub------------klrw------snrc---rrct------aajom--------nsyk--------peea-------azq-------------iNjefdkfhnagjicqwmsm
-mbwwbfgehhbdmvvlflmee---------------------hkejn---jtbo-------jdtje-------jcei---------afyz-----smtc-------------kksvfjyuaqtohxiohhlz
-dvfmfrzcmnsfruhqgjuxz------------------dfxdnlk----kkra-------xmmtf-------jwkw----------rdoozxtcho---------------bbwwferxwnnmdzcniicv
-mfneisdlyeqwynldjgonj----------------jgrjvc-------uxga-------ghnpr-------sers--------scbknx----gmjo-------------moedtnlbflhtlkjibrqk
-gobwqshnpbdcpjmjaeczr--------------iscsxs---------zfpo-------hhfwy-------qbba-------vhlxc-------ntod------------ndwzdomaptumzejiwqbn
-snucynymvfpnadyqkzfcv-------------ggze------------kuvfs-----zuhod--------mylo-------jhwyp-----z-pywd------------dqfmpnevmtqcikbrilto
-aotyxkipebdkassogpcbl-----------wgackesmvvsrihhd---orzndjndlzpb----------eobf-------kkayixzyotqfafa-w-----------mjjxoomwdglwvccozzut
-rthesuszfwycsqqrtxlot-----------ejcqlhriilqbtrys------lwbkzmvp-----------zzwm-------l--qijwfllndzb-ik-----------mmokqomjepdcotnsiNig
-nloryyoswwdmefywnnuhph------------------------------------------------------r--r-nd-----h--x--------------------hlgzeqqslwxgtjgghquf
-nssngjtiudsrvfuxjzclhjhj----------------------------------------------------------t----------------k-f-mp-------obhyehqebtpjbkeepqzt
-ezogzsimfynqmkteaipejo-g-yser-----------------------------------------------e------h-------------i---y----------qpgcqnltivmmsximbbsy
-wtjjolwyoselcumgklqwpldkl-ulm-m---------------------------------------------------------------q---u-f--l--------buixfiitufktsqdtnrei
-tgrtitcewseetlpeuuujb-osdokjozc------------------------------------------n---d-----f--------g--------q--g-------jyyqtezuzmcxgpcwuwfx
-dpPayqmzxrwhbswwalygfurtkruw-u-k---------------------------------------------d---h------i----------c----i-------ulowcddvjbxthqlxjzbe
diff --git a/sample/trick2018/03-tompng/remarks.markdown b/sample/trick2018/03-tompng/remarks.markdown
deleted file mode 100644
index fe9eec5989..0000000000
--- a/sample/trick2018/03-tompng/remarks.markdown
+++ /dev/null
@@ -1,19 +0,0 @@
-### Remarks
-
-Bundle install
-    this program depends on `gem chunky_png`
-
-Run it with the following command:
-    bundle exec ruby entry.rb trick.png
-    bundle exec ruby entry.rb [other png file]
-
-I confirmed the following implementations/platforms:
-
-* ruby 2.5.0p0 (2017-12-25 revision 61468) [x86_64-darwin16]
-* ruby 2.4.0p0 (2016-12-24 revision 57164) [x86_64-darwin16]
-
-### Description
-
-This program is a png image viewer.
-The output is an asciiart of the given png file,
-and it is also a source code of the png viewer itself.
diff --git a/sample/trick2018/03-tompng/trick.png b/sample/trick2018/03-tompng/trick.png
deleted file mode 100644
index d4bb0bd7c3..0000000000
--- a/sample/trick2018/03-tompng/trick.png
+++ /dev/null
diff --git a/sample/trick2018/04-colin/authors.markdown b/sample/trick2018/04-colin/authors.markdown
deleted file mode 100644
index a846d12535..0000000000
--- a/sample/trick2018/04-colin/authors.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-* Colin Fulton
-  * justcolin@gmail.com
-  * cctld: us
diff --git a/sample/trick2018/04-colin/entry.rb b/sample/trick2018/04-colin/entry.rb
deleted file mode 100644
index 442a8ea3a8..0000000000
--- a/sample/trick2018/04-colin/entry.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2018. Available for use under the terms of the MIT License.
-$🚀=0;def 🤔 🏷,🤔=0,&b;puts ' '*$🚀+(🤔 ?"":"🚫 ")+🏷;$🚀+=4;b&.[];$🚀-=4;end
diff --git a/sample/trick2018/04-colin/remarks.markdown b/sample/trick2018/04-colin/remarks.markdown
deleted file mode 100644
index 5f4f1a8dfe..0000000000
--- a/sample/trick2018/04-colin/remarks.markdown
+++ /dev/null
@@ -1,62 +0,0 @@
-### Remarks
-
-Create a Ruby file that requires entry.rb with a series of test in it the run the file using ruby:
-
-```
-ruby name_of_test_file.rb
-```
-
-To create a test, call 🤔 with two arguments. The first is a string describing what this tests, the second argument is the test assertion. If the assertion is truthy, the test passes. If the assertion is falsy, the test fails.
-
-```
-string_1 = "Hello world!"
-string_2 = "This is not the same!"
-
-🤔 "The two strings are equal",
-  string_1 == string_2
-```
-
-To create a group of tests under a label, call 🤔 with a string describing the group and a block containing the tests in that group.
-
-```
-🤔 "This is a group of tests" do
-  # Add other groups and/or tests here.
-end
-```
-
-Here is an example:
-
-```
-require './entry'
-
-🤔 "Math" do
-  🤔 "Addition" do
-    🤔 "One plus one equals two.",
-      1+1 == 2
-    🤔 "One plus one equals eleven. (This should fail.)",
-      1+1 == 11
-  end
-
-  🤔 "Subtraction" do
-    🤔 "One minus one equals zero.",
-      1-1 == 0
-    🤔 "Ten minus one equal nine.",
-      10-1 == 9
-  end
-end
-```
-
-It has been tested with the following Ruby versions:
-
-* ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
-* ruby 2.3.0p0 (2015-12-25 revision 53290) [x86_64-darwin15]
-* If you replace `b&.[]` with `b&&b[]` it will work with ruby 2.0.0 as well, but it will be one character longer.
-
-
-### Description
-
-The goal was to create a testing library where the test files looked good and the output looked good in as few characters as possible. The result is 68 characters and has one method to handle everything.
-
-### Limitation
-
-Your terminal program must support Unicode characters for the test output to look correct. If your terminal does not support Unicode, simply replace the 🚫 in the code with whatever character you want to prefix failing tests.
diff --git a/sample/trick2018/05-tompng/authors.markdown b/sample/trick2018/05-tompng/authors.markdown
deleted file mode 100644
index 26ebe24da6..0000000000
--- a/sample/trick2018/05-tompng/authors.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-* Tomoya Ishida (tompng)
-  * tomoyapenguin@gmail.com
-  * cctld: jp
diff --git a/sample/trick2018/05-tompng/entry.rb b/sample/trick2018/05-tompng/entry.rb
deleted file mode 100644
index 31522b6de2..0000000000
--- a/sample/trick2018/05-tompng/entry.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-                                                    X=[];def self.method_missing n;n.to_s.chars;end
-                                               l=[];def l.-a;X<<a=[nil,*a];a;end;def l.+a;self-a;end
-                                           class Array;def-@;[]-self;end;def-a;replace [*self,nil,*a
-                                 ]end;alias +@ -@;alias + -;end;def gen3d f;yield;b=['solid obj'];w,
-                 h=X[0].size,X.size;X<<[];a=->r,z,dr,dz{;r-=w/2.0;z*=2;r2,z2=r+dr,z+dz*2;if r>0||r2>
-                 0;r=[0,r].max;r2=[0,r2].max;16.times{|i|m=Math;p=m::PI/8;;c,s=m.cos(t=i*p),m.sin(t)
-                 c2,s2=m.cos(t=(i+1)*p),m.sin(t);t-=p/2;[[0,1,2],[0,2,3]].map{|a|b.push [:facet,'n'+
-               +                 'ormal',dz*m.cos(t),dz*m.sin(t),-dr]*' ','outer loop',a.map{|i|'v'+
-              ++                           "ertex #{[[r*c,r*s,z],[r*c2,r*s2,z],[r2*c2,r2*s2,z2],[r2*
-              +c,                              r2*s,z2]][i]*' '}"},:endloop,:endfacet}}end};(0...h).
-             map{|                                  y|w.times{|x|[X[y-1][x]||a[x,y,1,0],X[y+1][x]||
-           a[x+1,y+
-          1,-1,0],X[
-         y][x-+1]||a[
-        x,y+1,0,-1],X[y
-       ][x++1]||a[x+1,y,
-       0,1]]if X[y][x]}}
-       s=[b,'end'+b[0]]*
-        $/;File.write(f,
-         s);X.replace(
-            []);end
-
-gen3d 'wine_glass.stl' do
-  l--ww------------------ww--l
-  l--ww------------------ww--l
-  l--ww++++++++++++++++++ww--l
-  l--ww++++++++++++++++++ww--l
-  l--ww++++++++++++++++++ww--l
-  l--ww++++++++++++++++++ww--l
-  l---ww++++++++++++++++ww---l
-  l----www++++++++++++www----l
-  l------www++++++++www------l
-  l--------wwwwwwwwww--------l
-  l-----------wwww-----------l
-  l------------ww------------l
-  l------------ww------------l
-  l------------ww------------l
-  l-----------wwww-----------l
-  l---------wwwwwwww---------l
-  l----wwwwwwwwwwwwwwwwww----l
-end
diff --git a/sample/trick2018/05-tompng/preview_of_output.png b/sample/trick2018/05-tompng/preview_of_output.png
deleted file mode 100644
index db511ee2f3..0000000000
--- a/sample/trick2018/05-tompng/preview_of_output.png
+++ /dev/null
diff --git a/sample/trick2018/05-tompng/remarks.markdown b/sample/trick2018/05-tompng/remarks.markdown
deleted file mode 100644
index 17be56b61f..0000000000
--- a/sample/trick2018/05-tompng/remarks.markdown
+++ /dev/null
@@ -1,31 +0,0 @@
-### Remarks
-
-Just run it with no argument:
-
-    ruby entry.rb
-
-I confirmed the following implementations/platforms:
-
-* ruby 2.5.0p0 (2017-12-25 revision 61468) [x86_64-darwin16]
-* ruby 2.4.0p0 (2016-12-24 revision 57164) [x86_64-darwin16]
-* ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin16]
-
-### Description
-
-This program will generate `wine_glass.stl`, a 3D data file(STL format) of a wine glass.
-You can change the shape by modifying the DSL part.
-For sake cup:
-```ruby
-gen3d 'ochoko.stl' do
-  l------------------------l
-  l-ww------------------ww-l
-  l-ww------------------ww-l
-  l-ww++++++++++++++++++ww-l
-  l-ww++++++++++++++++++ww-l
-  l--ww++++++++++++++++ww--l
-  l---wwww++++++++++wwww---l
-  l----wwwwwwwwwwwwwwww----l
-  l----www----------www----l
-end
-```
-`+` and `-` are the same meaning(just for apperance)
diff --git a/sample/trick2018/README.md b/sample/trick2018/README.md
deleted file mode 100644
index 345500b00a..0000000000
--- a/sample/trick2018/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-This directory contains the award-winning entries of
-the 3rd Transcendental Ruby Imbroglio Contest for rubyKaigi (TRICK 2018).
-
-THESE ARE BAD EXAMPLES!  You must NOT use them as a sample code.
-
-* 01-kinaba/entry.rb: "Most reserved" - **Gold award**
-* 02-mame/entry.rb: "Best spiral" - **Silver award**
-* 03-tompng/entry.rb: "Best png viewer" - **Bronze award**
-* 04-colin/entry.rb: "Best one-liner" - 4th prize
-* 05-tompng/entry.rb: "Most three-dimensional" - 5th prize
-
-These files are licensed under MIT license.
-
-For the contest outline and other winning entries, see:
-
-https://github.com/tric/trick2018
diff --git a/signal.c b/signal.c
index 631fdae4e0..32c7c2a099 100644
--- a/signal.c
+++ b/signal.c
@@ -41,6 +41,13 @@
 # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
 #endif
 
+#if defined(__native_client__) && defined(NACL_NEWLIB)
+# include "nacl/signal.h"
+#endif
+
+extern ID ruby_static_id_signo;
+#define id_signo ruby_static_id_signo
+
 #ifdef NEED_RUBY_ATOMIC_OPS
 rb_atomic_t
 ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val)
@@ -62,11 +69,12 @@ ruby_atomic_compare_and_swap(rb_atomic_t *ptr, rb_atomic_t cmp,
 }
 #endif
 
-#define FOREACH_SIGNAL(sig, offset) \
-    for (sig = siglist + (offset); sig < siglist + numberof(siglist); ++sig)
-enum { LONGEST_SIGNAME = 7 }; /* MIGRATE and RETRACT */
+#ifndef NSIG
+# define NSIG (_SIGMAX + 1)      /* For QNX */
+#endif
+
 static const struct signals {
-    char signm[LONGEST_SIGNAME + 1];
+    const char *signm;
     int  signo;
 } siglist [] = {
     {"EXIT", 0},
@@ -128,9 +136,15 @@ static const struct signals {
 #ifdef SIGCONT
     {"CONT", SIGCONT},
 #endif
-#if RUBY_SIGCHLD
-    {"CHLD", RUBY_SIGCHLD },
-    {"CLD", RUBY_SIGCHLD },
+#ifdef SIGCHLD
+    {"CHLD", SIGCHLD},
+#endif
+#ifdef SIGCLD
+    {"CLD", SIGCLD},
+#else
+# ifdef SIGCHLD
+    {"CLD", SIGCHLD},
+# endif
 #endif
 #ifdef SIGTTIN
     {"TTIN", SIGTTIN},
@@ -195,81 +209,20 @@ static const struct signals {
 #ifdef SIGINFO
     {"INFO", SIGINFO},
 #endif
+    {NULL, 0}
 };
 
 static const char signame_prefix[3] = "SIG";
-static const int signame_prefix_len = (int)sizeof(signame_prefix);
 
 static int
-signm2signo(VALUE *sig_ptr, int negative, int exit, int *prefix_ptr)
+signm2signo(const char *nm)
 {
     const struct signals *sigs;
-    VALUE vsig = *sig_ptr;
-    const char *nm;
-    long len, nmlen;
-    int prefix = 0;
-
-    if (RB_SYMBOL_P(vsig)) {
-	*sig_ptr = vsig = rb_sym2str(vsig);
-    }
-    else if (!RB_TYPE_P(vsig, T_STRING)) {
-	VALUE str = rb_check_string_type(vsig);
-	if (NIL_P(str)) {
-	    rb_raise(rb_eArgError, "bad signal type %s",
-		     rb_obj_classname(vsig));
-	}
-	*sig_ptr = vsig = str;
-    }
-
-    rb_must_asciicompat(vsig);
-    RSTRING_GETMEM(vsig, nm, len);
-    if (memchr(nm, '\0', len)) {
-	rb_raise(rb_eArgError, "signal name with null byte");
-    }
-
-    if (len > 0 && nm[0] == '-') {
-	if (!negative)
-	    rb_raise(rb_eArgError, "negative signal name: % "PRIsVALUE, vsig);
-	prefix = 1;
-    }
-    else {
-	negative = 0;
-    }
-    if (len >= prefix + signame_prefix_len) {
-	if (memcmp(nm + prefix, signame_prefix, sizeof(signame_prefix)) == 0)
-	    prefix += signame_prefix_len;
-    }
-    if (len <= (long)prefix) {
-      unsupported:
-	if (prefix == signame_prefix_len) {
-	    prefix = 0;
-	}
-	else if (prefix > signame_prefix_len) {
-	    prefix -= signame_prefix_len;
-	    len -= prefix;
-	    vsig = rb_str_subseq(vsig, prefix, len);
-	    prefix = 0;
-	}
-	else {
-	    len -= prefix;
-	    vsig = rb_str_subseq(vsig, prefix, len);
-	    prefix = signame_prefix_len;
-	}
-	rb_raise(rb_eArgError, "unsupported signal `%.*s%"PRIsVALUE"'",
-		 prefix, signame_prefix, vsig);
-    }
 
-    if (prefix_ptr) *prefix_ptr = prefix;
-    nmlen = len - prefix;
-    nm += prefix;
-    if (nmlen > LONGEST_SIGNAME) goto unsupported;
-    FOREACH_SIGNAL(sigs, !exit) {
-	if (memcmp(sigs->signm, nm, nmlen) == 0 &&
-	    sigs->signm[nmlen] == '\0') {
-	    return negative ? -sigs->signo : sigs->signo;
-	}
-    }
-    goto unsupported;
+    for (sigs = siglist; sigs->signm; sigs++)
+	if (strcmp(sigs->signm, nm) == 0)
+	    return sigs->signo;
+    return 0;
 }
 
 static const char*
@@ -277,19 +230,17 @@ signo2signm(int no)
 {
     const struct signals *sigs;
 
-    FOREACH_SIGNAL(sigs, 0) {
+    for (sigs = siglist; sigs->signm; sigs++)
 	if (sigs->signo == no)
 	    return sigs->signm;
-    }
     return 0;
 }
 
 /*
  * call-seq:
- *     Signal.signame(signo)  ->  string or nil
+ *     Signal.signame(signo)  ->  string
  *
- *  Convert signal number to signal name.
- *  Returns +nil+ if the signo is an invalid signal number.
+ *  convert signal number to signal name
  *
  *     Signal.trap("INT") { |signo| puts Signal.signame(signo) }
  *     Process.kill("INT", 0)
@@ -339,6 +290,7 @@ esignal_init(int argc, VALUE *argv, VALUE self)
     int argnum = 1;
     VALUE sig = Qnil;
     int signo;
+    const char *signm;
 
     if (argc > 0) {
 	sig = rb_check_to_integer(argv[0], "to_int");
@@ -359,11 +311,19 @@ esignal_init(int argc, VALUE *argv, VALUE self)
 	}
     }
     else {
-	int prefix;
-	signo = signm2signo(&sig, FALSE, FALSE, &prefix);
-	if (prefix != signame_prefix_len) {
-	    sig = rb_str_append(rb_str_new_cstr("SIG"), sig);
+	int len = sizeof(signame_prefix);
+	if (SYMBOL_P(sig)) sig = rb_sym2str(sig); else StringValue(sig);
+	signm = RSTRING_PTR(sig);
+	if (strncmp(signm, signame_prefix, len) == 0) {
+	    signm += len;
+	    len = 0;
 	}
+	signo = signm2signo(signm);
+	if (!signo) {
+	    rb_raise(rb_eArgError, "unsupported name `%.*s%"PRIsVALUE"'",
+		     len, signame_prefix, sig);
+	}
+	sig = rb_sprintf("SIG%s", signm);
     }
     rb_call_super(1, &sig);
     rb_ivar_set(self, id_signo, INT2NUM(signo));
@@ -391,21 +351,13 @@ interrupt_init(int argc, VALUE *argv, VALUE self)
     VALUE args[2];
 
     args[0] = INT2FIX(SIGINT);
-    args[1] = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
+    rb_scan_args(argc, argv, "01", &args[1]);
     return rb_call_super(2, args);
 }
 
-#include "debug_counter.h"
-void rb_malloc_info_show_results(void); /* gc.c */
-
 void
 ruby_default_signal(int sig)
 {
-#if USE_DEBUG_COUNTER
-    rb_debug_counter_show_results("killed by signal.");
-#endif
-    rb_malloc_info_show_results();
-
     signal(sig, SIG_DFL);
     raise(sig);
 }
@@ -456,18 +408,51 @@ rb_f_kill(int argc, const VALUE *argv)
 #ifndef HAVE_KILLPG
 #define killpg(pg, sig) kill(-(pg), (sig))
 #endif
+    int negative = 0;
     int sig;
     int i;
     VALUE str;
+    const char *s;
 
     rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
 
-    if (FIXNUM_P(argv[0])) {
+    switch (TYPE(argv[0])) {
+      case T_FIXNUM:
 	sig = FIX2INT(argv[0]);
-    }
-    else {
+	break;
+
+      case T_SYMBOL:
+	str = rb_sym2str(argv[0]);
+	goto str_signal;
+
+      case T_STRING:
 	str = argv[0];
-	sig = signm2signo(&str, TRUE, FALSE, NULL);
+      str_signal:
+	s = RSTRING_PTR(str);
+	if (s[0] == '-') {
+	    negative++;
+	    s++;
+	}
+	if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0)
+	    s += 3;
+	if ((sig = signm2signo(s)) == 0) {
+	    long ofs = s - RSTRING_PTR(str);
+	    if (ofs) str = rb_str_subseq(str, ofs, RSTRING_LEN(str)-ofs);
+	    rb_raise(rb_eArgError, "unsupported name `SIG%"PRIsVALUE"'", str);
+	}
+
+	if (negative)
+	    sig = -sig;
+	break;
+
+      default:
+	str = rb_check_string_type(argv[0]);
+	if (!NIL_P(str)) {
+	    goto str_signal;
+	}
+	rb_raise(rb_eArgError, "bad signal type %s",
+		 rb_obj_classname(argv[0]));
+	break;
     }
 
     if (argc <= 1) return INT2FIX(0);
@@ -509,7 +494,7 @@ rb_f_kill(int argc, const VALUE *argv)
 #ifdef SIGSTOP
 		  case SIGSTOP:
 #endif
-		    kill(pid, sig);
+		    ruby_kill(pid, sig);
 		    break;
 		  default:
 		    t = signal_ignored(sig);
@@ -539,9 +524,6 @@ static struct {
     rb_atomic_t cnt[RUBY_NSIG];
     rb_atomic_t size;
 } signal_buff;
-#if RUBY_SIGCHLD
-volatile unsigned int ruby_nocldwait;
-#endif
 
 #ifdef __dietlibc__
 #define sighandler_t sh_t
@@ -561,7 +543,7 @@ typedef RETSIGTYPE ruby_sigaction_t(int);
 #endif
 
 #ifdef USE_SIGALTSTACK
-static int
+int
 rb_sigaltstack_size(void)
 {
     /* XXX: BSD_vfprintf() uses >1500KiB stack and x86-64 need >5KiB stack. */
@@ -584,18 +566,19 @@ rb_sigaltstack_size(void)
 }
 
 /* alternate stack for SIGSEGV */
-void *
-rb_register_sigaltstack(void)
+void
+rb_register_sigaltstack(rb_thread_t *th)
 {
     stack_t newSS, oldSS;
 
+    if (!th->altstack)
+	rb_bug("rb_register_sigaltstack: th->altstack not initialized\n");
+
+    newSS.ss_sp = th->altstack;
     newSS.ss_size = rb_sigaltstack_size();
-    newSS.ss_sp = xmalloc(newSS.ss_size);
     newSS.ss_flags = 0;
 
     sigaltstack(&newSS, &oldSS); /* ignore error. */
-
-    return newSS.ss_sp;
 }
 #endif /* USE_SIGALTSTACK */
 
@@ -625,25 +608,10 @@ ruby_signal(int signum, sighandler_t handler)
 #endif
 
     switch (signum) {
-#if RUBY_SIGCHLD
-      case RUBY_SIGCHLD:
-	if (handler == SIG_IGN) {
-	    ruby_nocldwait = 1;
-# ifdef USE_SIGALTSTACK
-	    if (sigact.sa_flags & SA_SIGINFO) {
-		sigact.sa_sigaction = (ruby_sigaction_t*)sighandler;
-	    }
-	    else {
-		sigact.sa_handler = sighandler;
-	    }
-# else
-	    sigact.sa_handler = handler;
-	    sigact.sa_flags = 0;
-# endif
-	}
-	else {
-	    ruby_nocldwait = 0;
-	}
+#ifdef SA_NOCLDWAIT
+      case SIGCHLD:
+	if (handler == SIG_IGN)
+	    sigact.sa_flags |= SA_NOCLDWAIT;
 	break;
 #endif
 #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
@@ -660,11 +628,9 @@ ruby_signal(int signum, sighandler_t handler)
 	return SIG_ERR;
     }
     if (old.sa_flags & SA_SIGINFO)
-	handler = (sighandler_t)old.sa_sigaction;
+	return (sighandler_t)old.sa_sigaction;
     else
-	handler = old.sa_handler;
-    ASSUME(handler != SIG_ERR);
-    return handler;
+	return old.sa_handler;
 }
 
 sighandler_t
@@ -724,35 +690,13 @@ signal_enque(int sig)
     ATOMIC_INC(signal_buff.size);
 }
 
-#if RUBY_SIGCHLD
-static rb_atomic_t sigchld_hit;
-/* destructive getter than simple predicate */
-# define GET_SIGCHLD_HIT() ATOMIC_EXCHANGE(sigchld_hit, 0)
-#else
-# define GET_SIGCHLD_HIT() 0
-#endif
-
 static RETSIGTYPE
 sighandler(int sig)
 {
     int old_errnum = errno;
 
-    /* the VM always needs to handle SIGCHLD for rb_waitpid */
-    if (sig == RUBY_SIGCHLD) {
-#if RUBY_SIGCHLD
-        rb_vm_t *vm = GET_VM();
-        ATOMIC_EXCHANGE(sigchld_hit, 1);
-
-        /* avoid spurious wakeup in main thread iff nobody uses trap(:CHLD) */
-        if (vm && ACCESS_ONCE(VALUE, vm->trap_list.cmd[sig])) {
-            signal_enque(sig);
-        }
-#endif
-    }
-    else {
-        signal_enque(sig);
-    }
-    rb_thread_wakeup_timer_thread(sig);
+    signal_enque(sig);
+    rb_thread_wakeup_timer_thread();
 #if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
     ruby_signal(sig, sighandler);
 #endif
@@ -816,7 +760,7 @@ static const char *received_signal;
 #endif
 
 #if defined(USE_SIGALTSTACK) || defined(_WIN32)
-NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
+NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
 # if defined __HAIKU__
 #   define USE_UCONTEXT_REG 1
 # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
@@ -827,112 +771,74 @@ NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
 # elif defined __FreeBSD__
 #   define USE_UCONTEXT_REG 1
 # endif
-#if defined(HAVE_PTHREAD_SIGMASK)
-# define ruby_sigunmask pthread_sigmask
-#elif defined(HAVE_SIGPROCMASK)
-# define ruby_sigunmask sigprocmask
-#endif
-static void
-reset_sigmask(int sig)
-{
-#if defined(ruby_sigunmask)
-    sigset_t mask;
-#endif
-    clear_received_signal();
-#if defined(ruby_sigunmask)
-    sigemptyset(&mask);
-    sigaddset(&mask, sig);
-    if (ruby_sigunmask(SIG_UNBLOCK, &mask, NULL)) {
-	rb_bug_errno(STRINGIZE(ruby_sigunmask)":unblock", errno);
-    }
-#endif
-}
-
 # ifdef USE_UCONTEXT_REG
 static void
-check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx)
+check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx)
 {
     const DEFINE_MCONTEXT_PTR(mctx, ctx);
 # if defined __linux__
 #   if defined REG_RSP
     const greg_t sp = mctx->gregs[REG_RSP];
-    const greg_t bp = mctx->gregs[REG_RBP];
 #   else
     const greg_t sp = mctx->gregs[REG_ESP];
-    const greg_t bp = mctx->gregs[REG_EBP];
 #   endif
 # elif defined __APPLE__
-#   if __DARWIN_UNIX03
-#     define MCTX_SS_REG(reg) __ss.__##reg
-#   else
-#     define MCTX_SS_REG(reg) ss.reg
-#   endif
 #   if defined(__LP64__)
-    const uintptr_t sp = mctx->MCTX_SS_REG(rsp);
-    const uintptr_t bp = mctx->MCTX_SS_REG(rbp);
+    const uintptr_t sp = mctx->__ss.__rsp;
 #   else
-    const uintptr_t sp = mctx->MCTX_SS_REG(esp);
-    const uintptr_t bp = mctx->MCTX_SS_REG(ebp);
+    const uintptr_t sp = mctx->__ss.__esp;
 #   endif
 # elif defined __FreeBSD__
 #   if defined(__amd64__)
     const __register_t sp = mctx->mc_rsp;
-    const __register_t bp = mctx->mc_rbp;
 #   else
     const __register_t sp = mctx->mc_esp;
-    const __register_t bp = mctx->mc_ebp;
 #   endif
 # elif defined __HAIKU__
 #   if defined(__amd64__)
     const unsigned long sp = mctx->rsp;
-    const unsigned long bp = mctx->rbp;
 #   else
     const unsigned long sp = mctx->esp;
-    const unsigned long bp = mctx->ebp;
 #   endif
 # endif
     enum {pagesize = 4096};
     const uintptr_t sp_page = (uintptr_t)sp / pagesize;
-    const uintptr_t bp_page = (uintptr_t)bp / pagesize;
     const uintptr_t fault_page = addr / pagesize;
 
     /* SP in ucontext is not decremented yet when `push` failed, so
      * the fault page can be the next. */
-    if (sp_page == fault_page || sp_page == fault_page + 1 ||
-        (sp_page <= fault_page && fault_page <= bp_page)) {
-	rb_execution_context_t *ec = GET_EC();
-	int crit = FALSE;
-	if ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) {
+    if (sp_page == fault_page || sp_page == fault_page + 1) {
+	rb_thread_t *th = ruby_current_thread;
+	if ((uintptr_t)th->tag->buf / pagesize == sp_page) {
 	    /* drop the last tag if it is close to the fault,
 	     * otherwise it can cause stack overflow again at the same
 	     * place. */
-	    ec->tag = ec->tag->prev;
-	    crit = TRUE;
+	    th->tag = th->tag->prev;
 	}
-	reset_sigmask(sig);
-	rb_ec_stack_overflow(ec, crit);
+	clear_received_signal();
+	ruby_thread_stack_overflow(th);
     }
 }
 # else
 static void
-check_stack_overflow(int sig, const void *addr)
+check_stack_overflow(const void *addr)
 {
     int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = ruby_current_thread;
     if (ruby_stack_overflowed_p(th, addr)) {
-	reset_sigmask(sig);
-	rb_ec_stack_overflow(th->ec, FALSE);
+	clear_received_signal();
+	ruby_thread_stack_overflow(th);
     }
 }
 # endif
 # ifdef _WIN32
-#   define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, 0)
+#   define CHECK_STACK_OVERFLOW() check_stack_overflow(0)
 # else
 #   define FAULT_ADDRESS info->si_addr
 #   ifdef USE_UCONTEXT_REG
-#     define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, (uintptr_t)FAULT_ADDRESS, ctx)
+#     define CHECK_STACK_OVERFLOW() check_stack_overflow((uintptr_t)FAULT_ADDRESS, ctx)
 #   else
-#     define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, FAULT_ADDRESS)
+#     define CHECK_STACK_OVERFLOW() check_stack_overflow(FAULT_ADDRESS)
 #   endif
 #   define MESSAGE_FAULT_ADDRESS " at %p", FAULT_ADDRESS
 # endif
@@ -950,9 +856,6 @@ NOINLINE(static void check_reserved_signal_(const char *name, size_t name_len));
 #define check_reserved_signal(name) check_reserved_signal_(name, sizeof(name)-1)
 
 #ifdef SIGBUS
-
-NORETURN(static ruby_sigaction_t sigbus);
-
 static RETSIGTYPE
 sigbus(int sig SIGINFO_ARG)
 {
@@ -970,8 +873,6 @@ sigbus(int sig SIGINFO_ARG)
 }
 #endif
 
-NORETURN(static void ruby_abort(void));
-
 static void
 ruby_abort(void)
 {
@@ -987,9 +888,6 @@ ruby_abort(void)
 }
 
 #ifdef SIGSEGV
-
-NORETURN(static ruby_sigaction_t sigsegv);
-
 static RETSIGTYPE
 sigsegv(int sig SIGINFO_ARG)
 {
@@ -1000,9 +898,6 @@ sigsegv(int sig SIGINFO_ARG)
 #endif
 
 #ifdef SIGILL
-
-NORETURN(static ruby_sigaction_t sigill);
-
 static RETSIGTYPE
 sigill(int sig SIGINFO_ARG)
 {
@@ -1057,12 +952,12 @@ sig_do_nothing(int sig)
 }
 #endif
 
-static int
+static void
 signal_exec(VALUE cmd, int safe, int sig)
 {
-    rb_execution_context_t *ec = GET_EC();
-    volatile rb_atomic_t old_interrupt_mask = ec->interrupt_mask;
-    enum ruby_tag_type state;
+    rb_thread_t *cur_th = GET_THREAD();
+    volatile unsigned long old_interrupt_mask = cur_th->interrupt_mask;
+    int state;
 
     /*
      * workaround the following race:
@@ -1071,54 +966,42 @@ signal_exec(VALUE cmd, int safe, int sig)
      * 3. rb_signal_exec runs on queued signal
      */
     if (IMMEDIATE_P(cmd))
-	return FALSE;
+	return;
 
-    ec->interrupt_mask |= TRAP_INTERRUPT_MASK;
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+    cur_th->interrupt_mask |= TRAP_INTERRUPT_MASK;
+    TH_PUSH_TAG(cur_th);
+    if ((state = EXEC_TAG()) == 0) {
 	VALUE signum = INT2NUM(sig);
 	rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe);
     }
-    EC_POP_TAG();
-    ec = GET_EC();
-    ec->interrupt_mask = old_interrupt_mask;
+    TH_POP_TAG();
+    cur_th = GET_THREAD();
+    cur_th->interrupt_mask = old_interrupt_mask;
 
     if (state) {
 	/* XXX: should be replaced with rb_threadptr_pending_interrupt_enque() */
-	EC_JUMP_TAG(ec, state);
+	TH_JUMP_TAG(cur_th, state);
     }
-    return TRUE;
 }
 
 void
 rb_trap_exit(void)
 {
     rb_vm_t *vm = GET_VM();
-    VALUE trap_exit = vm->trap_list.cmd[0];
+    VALUE trap_exit = vm->trap_list[0].cmd;
 
     if (trap_exit) {
-	vm->trap_list.cmd[0] = 0;
-	signal_exec(trap_exit, vm->trap_list.safe[0], 0);
+	vm->trap_list[0].cmd = 0;
+	signal_exec(trap_exit, vm->trap_list[0].safe, 0);
     }
 }
 
-void ruby_waitpid_all(rb_vm_t *); /* process.c */
-
 void
-ruby_sigchld_handler(rb_vm_t *vm)
-{
-    if (SIGCHLD_LOSSY || GET_SIGCHLD_HIT()) {
-        ruby_waitpid_all(vm);
-    }
-}
-
-/* returns true if a trap handler was run, false otherwise */
-int
 rb_signal_exec(rb_thread_t *th, int sig)
 {
     rb_vm_t *vm = GET_VM();
-    VALUE cmd = vm->trap_list.cmd[sig];
-    int safe = vm->trap_list.safe[sig];
+    VALUE cmd = vm->trap_list[sig].cmd;
+    int safe = vm->trap_list[sig].safe;
 
     if (cmd == 0) {
 	switch (sig) {
@@ -1151,9 +1034,8 @@ rb_signal_exec(rb_thread_t *th, int sig)
 	rb_threadptr_signal_exit(th);
     }
     else {
-	return signal_exec(cmd, safe, sig);
+	signal_exec(cmd, safe, sig);
     }
-    return FALSE;
 }
 
 static sighandler_t
@@ -1180,9 +1062,6 @@ default_handler(int sig)
 #ifdef SIGUSR2
       case SIGUSR2:
 #endif
-#if RUBY_SIGCHLD
-      case RUBY_SIGCHLD:
-#endif
         func = sighandler;
         break;
 #ifdef SIGBUS
@@ -1240,9 +1119,6 @@ trap_handler(VALUE *cmd, int sig)
 		break;
               case 14:
 		if (memcmp(cptr, "SYSTEM_DEFAULT", 14) == 0) {
-                    if (sig == RUBY_SIGCHLD) {
-                        goto sig_dfl;
-                    }
                     func = SIG_DFL;
                     *cmd = 0;
 		}
@@ -1288,15 +1164,33 @@ static int
 trap_signm(VALUE vsig)
 {
     int sig = -1;
+    const char *s;
 
-    if (FIXNUM_P(vsig)) {
+    switch (TYPE(vsig)) {
+      case T_FIXNUM:
 	sig = FIX2INT(vsig);
 	if (sig < 0 || sig >= NSIG) {
 	    rb_raise(rb_eArgError, "invalid signal number (%d)", sig);
 	}
-    }
-    else {
-	sig = signm2signo(&vsig, FALSE, TRUE, NULL);
+	break;
+
+      case T_SYMBOL:
+	vsig = rb_sym2str(vsig);
+	s = RSTRING_PTR(vsig);
+	goto str_signal;
+
+      default:
+	s = StringValuePtr(vsig);
+
+      str_signal:
+	if (strncmp(signame_prefix, s, sizeof(signame_prefix)) == 0)
+	    s += 3;
+	sig = signm2signo(s);
+	if (sig == 0 && strcmp(s, "EXIT") != 0) {
+	    long ofs = s - RSTRING_PTR(vsig);
+	    if (ofs) vsig = rb_str_subseq(vsig, ofs, RSTRING_LEN(vsig)-ofs);
+	    rb_raise(rb_eArgError, "unsupported signal SIG%"PRIsVALUE"", vsig);
+	}
     }
     return sig;
 }
@@ -1309,7 +1203,7 @@ trap(int sig, sighandler_t func, VALUE command)
     rb_vm_t *vm = GET_VM();
 
     /*
-     * Be careful. ruby_signal() and trap_list.cmd[sig] must be changed
+     * Be careful. ruby_signal() and trap_list[sig].cmd must be changed
      * atomically. In current implementation, we only need to don't call
      * RUBY_VM_CHECK_INTS().
      */
@@ -1320,7 +1214,7 @@ trap(int sig, sighandler_t func, VALUE command)
 	oldfunc = ruby_signal(sig, func);
 	if (oldfunc == SIG_ERR) rb_sys_fail_str(rb_signo2signm(sig));
     }
-    oldcmd = vm->trap_list.cmd[sig];
+    oldcmd = vm->trap_list[sig].cmd;
     switch (oldcmd) {
       case 0:
       case Qtrue:
@@ -1336,8 +1230,8 @@ trap(int sig, sighandler_t func, VALUE command)
 	break;
     }
 
-    ACCESS_ONCE(VALUE, vm->trap_list.cmd[sig]) = command;
-    vm->trap_list.safe[sig] = rb_safe_level();
+    vm->trap_list[sig].cmd = command;
+    vm->trap_list[sig].safe = rb_safe_level();
 
     return oldcmd;
 }
@@ -1452,18 +1346,12 @@ sig_list(void)
     VALUE h = rb_hash_new();
     const struct signals *sigs;
 
-    FOREACH_SIGNAL(sigs, 0) {
+    for (sigs = siglist; sigs->signm; sigs++) {
 	rb_hash_aset(h, rb_fstring_cstr(sigs->signm), INT2FIX(sigs->signo));
     }
     return h;
 }
 
-#define INSTALL_SIGHANDLER(cond, signame, signum) do {	\
-	static const char failed[] = "failed to install "signame" handler"; \
-	if (!(cond)) break; \
-	if (reserved_signal_p(signum)) rb_bug(failed); \
-	perror(failed); \
-    } while (0)
 static int
 install_sighandler(int signum, sighandler_t handler)
 {
@@ -1477,27 +1365,29 @@ install_sighandler(int signum, sighandler_t handler)
     }
     return 0;
 }
+#ifndef __native_client__
+#  define install_sighandler(signum, handler) (install_sighandler(signum, handler) ? rb_bug(#signum) : (void)0)
+#endif
 
-#  define install_sighandler(signum, handler) \
-    INSTALL_SIGHANDLER(install_sighandler(signum, handler), #signum, signum)
-
-#if RUBY_SIGCHLD
+#if defined(SIGCLD) || defined(SIGCHLD)
 static int
 init_sigchld(int sig)
 {
     sighandler_t oldfunc;
-    sighandler_t func = sighandler;
 
     oldfunc = ruby_signal(sig, SIG_DFL);
     if (oldfunc == SIG_ERR) return -1;
-    ruby_signal(sig, func);
-    ACCESS_ONCE(VALUE, GET_VM()->trap_list.cmd[sig]) = 0;
-
+    if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) {
+	ruby_signal(sig, oldfunc);
+    }
+    else {
+	GET_VM()->trap_list[sig].cmd = 0;
+    }
     return 0;
 }
-
-#    define init_sigchld(signum) \
-    INSTALL_SIGHANDLER(init_sigchld(signum), #signum, signum)
+#  ifndef __native_client__
+#    define init_sigchld(signum) (init_sigchld(signum) ? rb_bug(#signum) : (void)0)
+#  endif
 #endif
 
 void
@@ -1513,6 +1403,9 @@ ruby_sig_finalize(void)
 
 
 int ruby_enable_coredump = 0;
+#ifndef RUBY_DEBUG_ENV
+#define ruby_enable_coredump 0
+#endif
 
 /*
  * Many operating systems allow signals to be sent to running
@@ -1597,7 +1490,9 @@ Init_signal(void)
 	install_sighandler(SIGILL, (sighandler_t)sigill);
 #endif
 #ifdef SIGSEGV
-	RB_ALTSTACK_INIT(GET_VM()->main_altstack);
+# ifdef USE_SIGALTSTACK
+	rb_register_sigaltstack(GET_THREAD());
+# endif
 	install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
 #endif
     }
@@ -1608,55 +1503,11 @@ Init_signal(void)
     install_sighandler(SIGSYS, sig_do_nothing);
 #endif
 
-#if RUBY_SIGCHLD
-    init_sigchld(RUBY_SIGCHLD);
+#if defined(SIGCLD)
+    init_sigchld(SIGCLD);
+#elif defined(SIGCHLD)
+    init_sigchld(SIGCHLD);
 #endif
 
     rb_enable_interrupt();
 }
-
-#if defined(HAVE_GRANTPT)
-extern int grantpt(int);
-#else
-static int
-fake_grantfd(int masterfd)
-{
-    errno = ENOSYS;
-    return -1;
-}
-#define grantpt(fd) fake_grantfd(fd)
-#endif
-
-int
-rb_grantpt(int masterfd)
-{
-    if (RUBY_SIGCHLD) {
-        rb_vm_t *vm = GET_VM();
-        int ret, e;
-
-        /*
-         * Prevent waitpid calls from Ruby by taking waitpid_lock.
-         * Pedantically, grantpt(3) is undefined if a non-default
-         * SIGCHLD handler is defined, but preventing conflicting
-         * waitpid calls ought to be sufficient.
-         *
-         * We could install the default sighandler temporarily, but that
-         * could cause SIGCHLD to be missed by other threads.  Blocking
-         * SIGCHLD won't work here, either, unless we stop and restart
-         * timer-thread (as only timer-thread sees SIGCHLD), but that
-         * seems like overkill.
-         */
-        rb_nativethread_lock_lock(&vm->waitpid_lock);
-        {
-            ret = grantpt(masterfd); /* may spawn `pt_chown' and wait on it */
-            if (ret < 0) e = errno;
-        }
-        rb_nativethread_lock_unlock(&vm->waitpid_lock);
-
-        if (ret < 0) errno = e;
-        return ret;
-    }
-    else {
-        return grantpt(masterfd);
-    }
-}
diff --git a/siphash.c b/siphash.c
index 153d2c690a..0df96f8320 100644
--- a/siphash.c
+++ b/siphash.c
@@ -386,15 +386,16 @@ sip_hash_dump(sip_hash *h)
 }
 #endif /* SIP_HASH_STREAMING */
 
-#define SIP_ROUND(m, v0, v1, v2, v3)	\
+#define SIP_2_ROUND(m, v0, v1, v2, v3)	\
 do {					\
     XOR64_TO((v3), (m));		\
     SIP_COMPRESS(v0, v1, v2, v3);	\
+    SIP_COMPRESS(v0, v1, v2, v3);	\
     XOR64_TO((v0), (m));		\
 } while (0)
 
 uint64_t
-sip_hash13(const uint8_t key[16], const uint8_t *data, size_t len)
+sip_hash24(const uint8_t key[16], const uint8_t *data, size_t len)
 {
     uint64_t k0, k1;
     uint64_t v0, v1, v2, v3;
@@ -414,13 +415,13 @@ sip_hash13(const uint8_t key[16], const uint8_t *data, size_t len)
         uint64_t *data64 = (uint64_t *)data;
         while (data64 != (uint64_t *) end) {
 	    m = *data64++;
-	    SIP_ROUND(m, v0, v1, v2, v3);
+	    SIP_2_ROUND(m, v0, v1, v2, v3);
         }
     }
 #else
     for (; data != end; data += sizeof(uint64_t)) {
 	m = U8TO64_LE(data);
-	SIP_ROUND(m, v0, v1, v2, v3);
+	SIP_2_ROUND(m, v0, v1, v2, v3);
     }
 #endif
 
@@ -467,13 +468,14 @@ sip_hash13(const uint8_t key[16], const uint8_t *data, size_t len)
 	    break;
     }
 
-    SIP_ROUND(last, v0, v1, v2, v3);
+    SIP_2_ROUND(last, v0, v1, v2, v3);
 
     XOR64_INT(v2, 0xff);
 
     SIP_COMPRESS(v0, v1, v2, v3);
     SIP_COMPRESS(v0, v1, v2, v3);
     SIP_COMPRESS(v0, v1, v2, v3);
+    SIP_COMPRESS(v0, v1, v2, v3);
 
     XOR64_TO(v0, v1);
     XOR64_TO(v0, v2);
diff --git a/siphash.h b/siphash.h
index f49bc511b1..3f3988408b 100644
--- a/siphash.h
+++ b/siphash.h
@@ -43,6 +43,6 @@ int sip_hash_digest_integer(sip_hash *h, const uint8_t *data, size_t data_len, u
 void sip_hash_free(sip_hash *h);
 void sip_hash_dump(sip_hash *h);
 
-NO_SANITIZE("unsigned-integer-overflow", uint64_t sip_hash13(const uint8_t key[16], const uint8_t *data, size_t len));
+uint64_t sip_hash24(const uint8_t key[16], const uint8_t *data, size_t len);
 
 #endif
diff --git a/sparc.c b/sparc.c
index 7f3a70fd0e..dc3779035f 100644
--- a/sparc.c
+++ b/sparc.c
@@ -26,7 +26,7 @@ rb_sparc_flush_register_windows(void)
     __volatile__
 #endif
 
-/* This condition should be in sync with one in configure.ac */
+/* This condition should be in sync with one in configure.in */
 #if defined(__sparcv9) || defined(__sparc_v9__) || defined(__arch64__)
 # ifdef __GNUC__
     ("flushw" : : : "%o7")
diff --git a/spec/README b/spec/README
new file mode 100644
index 0000000000..9821404697
--- /dev/null
+++ b/spec/README
@@ -0,0 +1,31 @@
+= RubySpec
+
+RubySpec (http://rubyspec.org) provides the annotation of the Ruby
+implementation in an executable format.  The make task
+`update-rubyspec' retrieves the specification and puts it into this
+directory.
+
+== Directory structure
+ spec
+  +-- mspec            driver library for executing the specification.
+  +-- rubyspec
+       +-- core        specification for core libraries
+       |    +-- array
+       |    +-- bignum
+       |    +-- ...
+       |
+       +-- fixtures    example classes for writing specs
+       +-- language    specification for Ruby language itself
+       +-- library     specification for standard libraries
+            +-- addrev
+            +-- ...
+
+== How to run
+:make target
+  verifies all specs.
+   $ make test-rubyspec
+:mspec command
+  verifies the specified spec.
+   $ mspec {language|core|library}
+   or
+   $ mspec spec/path/to/some_spec.rb
diff --git a/spec/README.md b/spec/README.md
deleted file mode 100644
index 59c2c605c5..0000000000
--- a/spec/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# spec/bundler
-
-spec/bundler is rspec examples for bundler library(lib/bundler.rb, lib/bundler/*).
-
-## Running spec/bundler
-
-To run rspec for bundler:
-```bash
-make test-bundler
-```
-
-# spec/ruby
-
-ruby/spec (https://github.com/ruby/spec/) is
-a test suite for the Ruby language.
-
-Once a month, @eregon merges the in-tree copy under spec/ruby
-with the upstream repository, preserving the commits and history.
-The same happens for other implementations such as JRuby and TruffleRuby.
-
-Feel welcome to modify the in-tree spec/ruby.
-This is the purpose of the in-tree copy,
-to facilitate contributions to ruby/spec for MRI developers.
-
-New features, additional tests for existing features and
-regressions tests are all welcome in ruby/spec.
-There is very little behavior that is implementation-specific,
-as in the end user programs tend to rely on every behavior MRI exhibits.
-In other words: If adding a spec might reveal a bug in
-another implementation, then it is worth adding it.
-Currently, the only module which is MRI-specific is `RubyVM`.
-
-Version guards (`ruby_version_is`) must be added for new features or features
-which change behavior or are removed. See `spec/ruby/CONTRIBUTING.md` for details.
-
-To verify specs are compatible with older Ruby versions:
-```
-cd spec/ruby
-$RUBY_MANAGER use 2.3.7
-../mspec/bin/mspec -j
-```
-
-## Running ruby/spec
-
-To run all specs:
-```bash
-make test-spec
-```
-
-Extra arguments can be added via `MSPECOPT`.
-For instance, to show the help:
-```bash
-make test-spec MSPECOPT=-h
-```
-
-You can also run the specs in parallel, which is currently experimental.
-It takes around 10s instead of 60s on a quad-core laptop.
-```bash
-make test-spec MSPECOPT=-j
-```
-
-To run a specific test, add its path to the command:
-```bash
-make test-spec MSPECOPT=spec/ruby/language/for_spec.rb
-```
-
-If ruby trunk is your current `ruby` in `$PATH`, you can also run `mspec` directly:
-```bash
-# change ruby to trunk
-ruby -v # => trunk
-spec/mspec/bin/mspec spec/ruby/language/for_spec.rb
-```
-
-## ruby/spec and test/
-
-The main difference between a "spec" under spec/ruby and
-a test under test/ is that specs are documenting what they test.
-This is extremely valuable when reading these tests, as it
-helps to quickly understand what specific behavior is tested,
-and how a method should behave. Basic English is fine for spec descriptions.
-Specs also tend to have few expectations (assertions) per spec,
-as they specify one aspect of the behavior and not everything at once.
-Beyond that, the syntax is slightly different but it does the same thing:
-`assert_equal 3, 1+2` is just `(1+2).should == 3`.
-
-Example:
-
-```ruby
-describe "The for expression" do
-  it "iterates over an Enumerable passing each element to the block" do
-    j = 0
-    for i in 1..3
-      j += i
-    end
-    j.should == 6
-  end
-end
-```
-
-For more details, see spec/ruby/CONTRIBUTING.md.
diff --git a/spec/bundler/bundler/bundler_spec.rb b/spec/bundler/bundler/bundler_spec.rb
deleted file mode 100644
index 194d6752b2..0000000000
--- a/spec/bundler/bundler/bundler_spec.rb
+++ /dev/null
@@ -1,490 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require "bundler"
-require "tmpdir"
-
-RSpec.describe Bundler do
-  describe "#load_gemspec_uncached" do
-    let(:app_gemspec_path) { tmp("test.gemspec") }
-    subject { Bundler.load_gemspec_uncached(app_gemspec_path) }
-
-    context "with incorrect YAML file" do
-      before do
-        File.open(app_gemspec_path, "wb") do |f|
-          f.write strip_whitespace(<<-GEMSPEC)
-            ---
-              {:!00 ao=gu\g1= 7~f
-          GEMSPEC
-        end
-      end
-
-      it "catches YAML syntax errors" do
-        expect { subject }.to raise_error(Bundler::GemspecError, /error while loading `test.gemspec`/)
-      end
-
-      context "on Rubies with a settable YAML engine", :if => defined?(YAML::ENGINE) do
-        context "with Syck as YAML::Engine" do
-          it "raises a GemspecError after YAML load throws ArgumentError" do
-            orig_yamler = YAML::ENGINE.yamler
-            YAML::ENGINE.yamler = "syck"
-
-            expect { subject }.to raise_error(Bundler::GemspecError)
-
-            YAML::ENGINE.yamler = orig_yamler
-          end
-        end
-
-        context "with Psych as YAML::Engine" do
-          it "raises a GemspecError after YAML load throws Psych::SyntaxError" do
-            orig_yamler = YAML::ENGINE.yamler
-            YAML::ENGINE.yamler = "psych"
-
-            expect { subject }.to raise_error(Bundler::GemspecError)
-
-            YAML::ENGINE.yamler = orig_yamler
-          end
-        end
-      end
-    end
-
-    context "with correct YAML file", :if => defined?(Encoding) do
-      it "can load a gemspec with unicode characters with default ruby encoding" do
-        # spec_helper forces the external encoding to UTF-8 but that's not the
-        # default until Ruby 2.0
-        verbose = $VERBOSE
-        $VERBOSE = false
-        encoding = Encoding.default_external
-        Encoding.default_external = "ASCII"
-        $VERBOSE = verbose
-
-        File.open(app_gemspec_path, "wb") do |file|
-          file.puts <<-GEMSPEC.gsub(/^\s+/, "")
-            # -*- encoding: utf-8 -*-
-            Gem::Specification.new do |gem|
-              gem.author = "André the Giant"
-            end
-          GEMSPEC
-        end
-
-        expect(subject.author).to eq("André the Giant")
-
-        verbose = $VERBOSE
-        $VERBOSE = false
-        Encoding.default_external = encoding
-        $VERBOSE = verbose
-      end
-    end
-
-    it "sets loaded_from" do
-      app_gemspec_path.open("w") do |f|
-        f.puts <<-GEMSPEC
-          Gem::Specification.new do |gem|
-            gem.name = "validated"
-          end
-        GEMSPEC
-      end
-
-      expect(subject.loaded_from).to eq(app_gemspec_path.expand_path.to_s)
-    end
-
-    context "validate is true" do
-      subject { Bundler.load_gemspec_uncached(app_gemspec_path, true) }
-
-      it "validates the specification" do
-        app_gemspec_path.open("w") do |f|
-          f.puts <<-GEMSPEC
-            Gem::Specification.new do |gem|
-              gem.name = "validated"
-            end
-          GEMSPEC
-        end
-        expect(Bundler.rubygems).to receive(:validate).with have_attributes(:name => "validated")
-        subject
-      end
-    end
-
-    context "with gemspec containing local variables" do
-      before do
-        File.open(app_gemspec_path, "wb") do |f|
-          f.write strip_whitespace(<<-GEMSPEC)
-            must_not_leak = true
-            Gem::Specification.new do |gem|
-              gem.name = "leak check"
-            end
-          GEMSPEC
-        end
-      end
-
-      it "should not pollute the TOPLEVEL_BINDING" do
-        subject
-        expect(TOPLEVEL_BINDING.eval("local_variables")).to_not include(:must_not_leak)
-      end
-    end
-  end
-
-  describe "#which" do
-    let(:executable) { "executable" }
-    let(:path) { %w[/a /b c ../d /e] }
-    let(:expected) { "executable" }
-
-    before do
-      ENV["PATH"] = path.join(File::PATH_SEPARATOR)
-
-      allow(File).to receive(:file?).and_return(false)
-      allow(File).to receive(:executable?).and_return(false)
-      if expected
-        expect(File).to receive(:file?).with(expected).and_return(true)
-        expect(File).to receive(:executable?).with(expected).and_return(true)
-      end
-    end
-
-    subject { described_class.which(executable) }
-
-    shared_examples_for "it returns the correct executable" do
-      it "returns the expected file" do
-        expect(subject).to eq(expected)
-      end
-    end
-
-    it_behaves_like "it returns the correct executable"
-
-    context "when the executable in inside a quoted path" do
-      let(:expected) { "/e/executable" }
-      it_behaves_like "it returns the correct executable"
-    end
-
-    context "when the executable is not found" do
-      let(:expected) { nil }
-      it_behaves_like "it returns the correct executable"
-    end
-  end
-
-  describe "configuration" do
-    context "disable_shared_gems" do
-      it "should unset GEM_PATH with empty string" do
-        env = {}
-        expect(Bundler).to receive(:use_system_gems?).and_return(false)
-        Bundler.send(:configure_gem_path, env)
-        expect(env.keys).to include("GEM_PATH")
-        expect(env["GEM_PATH"]).to eq ""
-      end
-    end
-  end
-
-  describe "#rm_rf" do
-    context "the directory is world writable" do
-      let(:bundler_ui) { Bundler.ui }
-      it "should raise a friendly error" do
-        allow(File).to receive(:exist?).and_return(true)
-        allow(bundler_fileutils).to receive(:remove_entry_secure).and_raise(ArgumentError)
-        allow(File).to receive(:world_writable?).and_return(true)
-        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 http://ruby-doc.org/stdlib-2.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
-EOF
-        expect(bundler_ui).to receive(:warn).with(message)
-        expect { Bundler.send(:rm_rf, bundled_app) }.to raise_error(Bundler::PathError)
-      end
-    end
-  end
-
-  describe "#mkdir_p" do
-    it "creates a folder at the given path" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      Bundler.mkdir_p(bundled_app.join("foo", "bar"))
-      expect(bundled_app.join("foo", "bar")).to exist
-    end
-
-    context "when mkdir_p requires sudo" do
-      it "creates a new folder using sudo" do
-        expect(Bundler).to receive(:requires_sudo?).and_return(true)
-        expect(Bundler).to receive(:sudo).and_return true
-        Bundler.mkdir_p(bundled_app.join("foo"))
-      end
-    end
-
-    context "with :no_sudo option" do
-      it "forces mkdir_p to not use sudo" do
-        expect(Bundler).to receive(:requires_sudo?).and_return(true)
-        expect(Bundler).to_not receive(:sudo)
-        Bundler.mkdir_p(bundled_app.join("foo"), :no_sudo => true)
-      end
-    end
-  end
-
-  describe "#user_home" do
-    context "home directory is set" do
-      it "should return the user home" do
-        path = "/home/oggy"
-        allow(Bundler.rubygems).to receive(:user_home).and_return(path)
-        allow(File).to receive(:directory?).with(path).and_return true
-        allow(File).to receive(:writable?).with(path).and_return true
-        expect(Bundler.user_home).to eq(Pathname(path))
-      end
-
-      context "is not a directory" do
-        it "should issue a warning and return a temporary user home" do
-          path = "/home/oggy"
-          allow(Bundler.rubygems).to receive(:user_home).and_return(path)
-          allow(File).to receive(:directory?).with(path).and_return false
-          allow(Etc).to receive(:getlogin).and_return("USER")
-          allow(Dir).to receive(:tmpdir).and_return("/TMP")
-          allow(FileTest).to receive(:exist?).with("/TMP/bundler/home").and_return(true)
-          expect(FileUtils).to receive(:mkpath).with("/TMP/bundler/home/USER")
-          message = <<EOF
-`/home/oggy` is not a directory.
-Bundler will use `/TMP/bundler/home/USER' as your home directory temporarily.
-EOF
-          expect(Bundler.ui).to receive(:warn).with(message)
-          expect(Bundler.user_home).to eq(Pathname("/TMP/bundler/home/USER"))
-        end
-      end
-
-      context "is not writable" do
-        let(:path) { "/home/oggy" }
-        let(:dotbundle) { "/home/oggy/.bundle" }
-
-        it "should issue a warning and return a temporary user home" do
-          allow(Bundler.rubygems).to receive(:user_home).and_return(path)
-          allow(File).to receive(:directory?).with(path).and_return true
-          allow(File).to receive(:writable?).with(path).and_return false
-          allow(File).to receive(:directory?).with(dotbundle).and_return false
-          allow(Etc).to receive(:getlogin).and_return("USER")
-          allow(Dir).to receive(:tmpdir).and_return("/TMP")
-          allow(FileTest).to receive(:exist?).with("/TMP/bundler/home").and_return(true)
-          expect(FileUtils).to receive(:mkpath).with("/TMP/bundler/home/USER")
-          message = <<EOF
-`/home/oggy` is not writable.
-Bundler will use `/TMP/bundler/home/USER' as your home directory temporarily.
-EOF
-          expect(Bundler.ui).to receive(:warn).with(message)
-          expect(Bundler.user_home).to eq(Pathname("/TMP/bundler/home/USER"))
-        end
-
-        context ".bundle exists and have correct permissions" do
-          it "should return the user home" do
-            allow(Bundler.rubygems).to receive(:user_home).and_return(path)
-            allow(File).to receive(:directory?).with(path).and_return true
-            allow(File).to receive(:writable?).with(path).and_return false
-            allow(File).to receive(:directory?).with(dotbundle).and_return true
-            allow(File).to receive(:writable?).with(dotbundle).and_return true
-            expect(Bundler.user_home).to eq(Pathname(path))
-          end
-        end
-      end
-    end
-
-    context "home directory is not set" do
-      it "should issue warning and return a temporary user home" do
-        allow(Bundler.rubygems).to receive(:user_home).and_return(nil)
-        allow(Etc).to receive(:getlogin).and_return("USER")
-        allow(Dir).to receive(:tmpdir).and_return("/TMP")
-        allow(FileTest).to receive(:exist?).with("/TMP/bundler/home").and_return(true)
-        expect(FileUtils).to receive(:mkpath).with("/TMP/bundler/home/USER")
-        message = <<EOF
-Your home directory is not set.
-Bundler will use `/TMP/bundler/home/USER' as your home directory temporarily.
-EOF
-        expect(Bundler.ui).to receive(:warn).with(message)
-        expect(Bundler.user_home).to eq(Pathname("/TMP/bundler/home/USER"))
-      end
-    end
-  end
-
-  describe "#tmp_home_path" do
-    it "should create temporary user home" do
-      allow(Dir).to receive(:tmpdir).and_return("/TMP")
-      allow(FileTest).to receive(:exist?).with("/TMP/bundler/home").and_return(false)
-      expect(FileUtils).to receive(:mkpath).once.ordered.with("/TMP/bundler/home")
-      expect(FileUtils).to receive(:mkpath).once.ordered.with("/TMP/bundler/home/USER")
-      expect(File).to receive(:chmod).with(0o777, "/TMP/bundler/home")
-      expect(Bundler.tmp_home_path("USER", "")).to eq(Pathname("/TMP/bundler/home/USER"))
-    end
-  end
-
-  describe "#requires_sudo?" do
-    let!(:tmpdir) { Dir.mktmpdir }
-    let(:bundle_path) { Pathname("#{tmpdir}/bundle") }
-
-    def clear_cached_requires_sudo
-      # Private in ruby 1.8.7
-      return unless Bundler.instance_variable_defined?(:@requires_sudo_ran)
-      Bundler.send(:remove_instance_variable, :@requires_sudo_ran)
-      Bundler.send(:remove_instance_variable, :@requires_sudo)
-    end
-
-    before do
-      clear_cached_requires_sudo
-      allow(Bundler).to receive(:which).with("sudo").and_return("/usr/bin/sudo")
-      allow(Bundler).to receive(:bundle_path).and_return(bundle_path)
-    end
-
-    after do
-      FileUtils.rm_rf(tmpdir)
-      clear_cached_requires_sudo
-    end
-
-    subject { Bundler.requires_sudo? }
-
-    context "bundle_path doesn't exist" do
-      it { should be false }
-
-      context "and parent dir can't be written" do
-        before do
-          FileUtils.chmod(0o500, tmpdir)
-        end
-
-        it { should be true }
-      end
-
-      context "with unwritable files in a parent dir" do
-        # Regression test for https://github.com/bundler/bundler/pull/6316
-        # It doesn't matter if there are other unwritable files so long as
-        # bundle_path can be created
-        before do
-          file = File.join(tmpdir, "unrelated_file")
-          FileUtils.touch(file)
-          FileUtils.chmod(0o400, file)
-        end
-
-        it { should be false }
-      end
-    end
-
-    context "bundle_path exists" do
-      before do
-        FileUtils.mkdir_p(bundle_path)
-      end
-
-      it { should be false }
-
-      context "and is unwritable" do
-        before do
-          FileUtils.chmod(0o500, bundle_path)
-        end
-
-        it { should be true }
-      end
-    end
-  end
-
-  describe "#requires_sudo?" do
-    before do
-      allow(Bundler).to receive(:which).with("sudo").and_return("/usr/bin/sudo")
-      FileUtils.mkdir_p("tmp/vendor/bundle")
-      FileUtils.mkdir_p("tmp/vendor/bin_dir")
-    end
-    after do
-      FileUtils.rm_rf("tmp/vendor/bundle")
-      FileUtils.rm_rf("tmp/vendor/bin_dir")
-      if Bundler.respond_to?(:remove_instance_variable)
-        Bundler.remove_instance_variable(:@requires_sudo_ran)
-        Bundler.remove_instance_variable(:@requires_sudo)
-      else
-        # TODO: Remove these code when Bundler drops Ruby 1.8.7 support
-        Bundler.send(:remove_instance_variable, :@requires_sudo_ran)
-        Bundler.send(:remove_instance_variable, :@requires_sudo)
-      end
-    end
-    context "writable paths" do
-      it "should return false and display nothing" do
-        allow(Bundler).to receive(:bundle_path).and_return(Pathname("tmp/vendor/bundle"))
-        expect(Bundler.ui).to_not receive(:warn)
-        expect(Bundler.requires_sudo?).to eq(false)
-      end
-    end
-    context "unwritable paths" do
-      before do
-        FileUtils.touch("tmp/vendor/bundle/unwritable1.txt")
-        FileUtils.touch("tmp/vendor/bundle/unwritable2.txt")
-        FileUtils.touch("tmp/vendor/bin_dir/unwritable3.txt")
-        FileUtils.chmod(0o400, "tmp/vendor/bundle/unwritable1.txt")
-        FileUtils.chmod(0o400, "tmp/vendor/bundle/unwritable2.txt")
-        FileUtils.chmod(0o400, "tmp/vendor/bin_dir/unwritable3.txt")
-      end
-      it "should return true and display warn message" do
-        allow(Bundler).to receive(:bundle_path).and_return(Pathname("tmp/vendor/bundle"))
-        bin_dir = Pathname("tmp/vendor/bin_dir/")
-
-        # allow File#writable? to be called with args other than the stubbed on below
-        allow(File).to receive(:writable?).and_call_original
-
-        # fake make the directory unwritable
-        allow(File).to receive(:writable?).with(bin_dir).and_return(false)
-        allow(Bundler).to receive(:system_bindir).and_return(Pathname("tmp/vendor/bin_dir/"))
-        message = <<-MESSAGE.chomp
-Following files may not be writable, so sudo is needed:
-  tmp/vendor/bin_dir/
-  tmp/vendor/bundle/unwritable1.txt
-  tmp/vendor/bundle/unwritable2.txt
-MESSAGE
-        expect(Bundler.ui).to receive(:warn).with(message)
-        expect(Bundler.requires_sudo?).to eq(true)
-      end
-    end
-  end
-
-  context "user cache dir" do
-    let(:home_path)                  { Pathname.new(ENV["HOME"]) }
-
-    let(:xdg_data_home)              { home_path.join(".local") }
-    let(:xdg_cache_home)             { home_path.join(".cache") }
-    let(:xdg_config_home)            { home_path.join(".config") }
-
-    let(:bundle_user_home_default)   { home_path.join(".bundle") }
-    let(:bundle_user_home_custom)    { xdg_data_home.join("bundle") }
-
-    let(:bundle_user_cache_default)  { bundle_user_home_default.join("cache") }
-    let(:bundle_user_cache_custom)   { xdg_cache_home.join("bundle") }
-
-    let(:bundle_user_config_default) { bundle_user_home_default.join("config") }
-    let(:bundle_user_config_custom)  { xdg_config_home.join("bundle") }
-
-    let(:bundle_user_plugin_default) { bundle_user_home_default.join("plugin") }
-    let(:bundle_user_plugin_custom)  { xdg_data_home.join("bundle").join("plugin") }
-
-    describe "#user_bundle_path" do
-      before do
-        allow(Bundler.rubygems).to receive(:user_home).and_return(home_path)
-      end
-
-      it "should use the default home path" do
-        expect(Bundler.user_bundle_path).to           eq(bundle_user_home_default)
-        expect(Bundler.user_bundle_path("home")).to   eq(bundle_user_home_default)
-        expect(Bundler.user_bundle_path("cache")).to  eq(bundle_user_cache_default)
-        expect(Bundler.user_cache).to                 eq(bundle_user_cache_default)
-        expect(Bundler.user_bundle_path("config")).to eq(bundle_user_config_default)
-        expect(Bundler.user_bundle_path("plugin")).to eq(bundle_user_plugin_default)
-      end
-
-      it "should use custom home path as root for other paths" do
-        ENV["BUNDLE_USER_HOME"] = bundle_user_home_custom.to_s
-        expect(Bundler.user_bundle_path).to           eq(bundle_user_home_custom)
-        expect(Bundler.user_bundle_path("home")).to   eq(bundle_user_home_custom)
-        expect(Bundler.user_bundle_path("cache")).to  eq(bundle_user_home_custom.join("cache"))
-        expect(Bundler.user_cache).to                 eq(bundle_user_home_custom.join("cache"))
-        expect(Bundler.user_bundle_path("config")).to eq(bundle_user_home_custom.join("config"))
-        expect(Bundler.user_bundle_path("plugin")).to eq(bundle_user_home_custom.join("plugin"))
-      end
-
-      it "should use all custom paths, except home" do
-        ENV.delete("BUNDLE_USER_HOME")
-        ENV["BUNDLE_USER_CACHE"]  = bundle_user_cache_custom.to_s
-        ENV["BUNDLE_USER_CONFIG"] = bundle_user_config_custom.to_s
-        ENV["BUNDLE_USER_PLUGIN"] = bundle_user_plugin_custom.to_s
-        expect(Bundler.user_bundle_path).to           eq(bundle_user_home_default)
-        expect(Bundler.user_bundle_path("home")).to   eq(bundle_user_home_default)
-        expect(Bundler.user_bundle_path("cache")).to  eq(bundle_user_cache_custom)
-        expect(Bundler.user_cache).to                 eq(bundle_user_cache_custom)
-        expect(Bundler.user_bundle_path("config")).to eq(bundle_user_config_custom)
-        expect(Bundler.user_bundle_path("plugin")).to eq(bundle_user_plugin_custom)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/cli_spec.rb b/spec/bundler/bundler/cli_spec.rb
deleted file mode 100644
index c82d46587e..0000000000
--- a/spec/bundler/bundler/cli_spec.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/cli"
-
-RSpec.describe "bundle executable" do
-  it "returns non-zero exit status when passed unrecognized options" do
-    bundle "--invalid_argument"
-    expect(exitstatus).to_not be_zero if exitstatus
-  end
-
-  it "returns non-zero exit status when passed unrecognized task" do
-    bundle "unrecognized-task"
-    expect(exitstatus).to_not be_zero if exitstatus
-  end
-
-  it "looks for a binary and executes it if it's named bundler-<task>" do
-    File.open(tmp("bundler-testtasks"), "w", 0o755) do |f|
-      ruby = ENV["BUNDLE_RUBY"] || "/usr/bin/env ruby"
-      f.puts "#!#{ruby}\nputs 'Hello, world'\n"
-    end
-
-    with_path_added(tmp) do
-      bundle "testtasks"
-    end
-
-    expect(exitstatus).to be_zero if exitstatus
-    expect(out).to eq("Hello, world")
-  end
-
-  context "with no arguments" do
-    it "prints a concise help message", :bundler => "2" do
-      bundle! ""
-      expect(last_command.stderr).to be_empty
-      expect(last_command.stdout).to include("Bundler version #{Bundler::VERSION}").
-        and include("\n\nBundler commands:\n\n").
-        and include("\n\n  Primary commands:\n").
-        and include("\n\n  Utilities:\n").
-        and include("\n\nOptions:\n")
-    end
-  end
-
-  context "when ENV['BUNDLE_GEMFILE'] is set to an empty string" do
-    it "ignores it" do
-      gemfile bundled_app("Gemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle :install, :env => { "BUNDLE_GEMFILE" => "" }
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  context "when ENV['RUBYGEMS_GEMDEPS'] is set" do
-    it "displays a warning" do
-      gemfile bundled_app("Gemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle :install, :env => { "RUBYGEMS_GEMDEPS" => "foo" }
-      expect(out).to include("RUBYGEMS_GEMDEPS")
-      expect(out).to include("conflict with Bundler")
-
-      bundle :install, :env => { "RUBYGEMS_GEMDEPS" => "" }
-      expect(out).not_to include("RUBYGEMS_GEMDEPS")
-    end
-  end
-
-  context "with --verbose" do
-    it "prints the running command" do
-      gemfile ""
-      bundle! "info bundler", :verbose => true
-      expect(last_command.stdout).to start_with("Running `bundle info bundler --verbose` with bundler #{Bundler::VERSION}")
-    end
-
-    it "doesn't print defaults" do
-      install_gemfile! "", :verbose => true
-      expect(last_command.stdout).to start_with("Running `bundle install --retry 0 --verbose` with bundler #{Bundler::VERSION}")
-    end
-
-    it "doesn't print defaults" do
-      install_gemfile! "", :verbose => true
-      expect(last_command.stdout).to start_with("Running `bundle install --retry 0 --verbose` with bundler #{Bundler::VERSION}")
-    end
-  end
-
-  describe "printing the outdated warning" do
-    shared_examples_for "no warning" do
-      it "prints no warning" do
-        bundle "fail"
-        expect(last_command.stdboth).to eq("Could not find command \"fail\".")
-      end
-    end
-
-    let(:bundler_version) { "1.1" }
-    let(:latest_version) { nil }
-    before do
-      bundle! "config --global disable_version_check false"
-
-      simulate_bundler_version(bundler_version)
-      if latest_version
-        info_path = home(".bundle/cache/compact_index/rubygems.org.443.29b0360b937aa4d161703e6160654e47/info/bundler")
-        info_path.parent.mkpath
-        info_path.open("w") {|f| f.write "#{latest_version}\n" }
-      end
-    end
-
-    context "when there is no latest version" do
-      include_examples "no warning"
-    end
-
-    context "when the latest version is equal to the current version" do
-      let(:latest_version) { bundler_version }
-      include_examples "no warning"
-    end
-
-    context "when the latest version is less than the current version" do
-      let(:latest_version) { "0.9" }
-      include_examples "no warning"
-    end
-
-    context "when the latest version is greater than the current version" do
-      let(:latest_version) { "222.0" }
-      it "prints the version warning" do
-        bundle "fail"
-        expect(last_command.stdout).to start_with(<<-EOS.strip)
-The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
-To install the latest version, run `gem install bundler`
-        EOS
-      end
-
-      context "and disable_version_check is set" do
-        before { bundle! "config disable_version_check true" }
-        include_examples "no warning"
-      end
-
-      context "running a parseable command" do
-        it "prints no warning" do
-          bundle! "config --parseable foo"
-          expect(last_command.stdboth).to eq ""
-
-          bundle "platform --ruby"
-          expect(last_command.stdboth).to eq "Could not locate Gemfile"
-        end
-      end
-
-      context "and is a pre-release" do
-        let(:latest_version) { "222.0.0.pre.4" }
-        it "prints the version warning" do
-          bundle "fail"
-          expect(last_command.stdout).to start_with(<<-EOS.strip)
-The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
-To install the latest version, run `gem install bundler --pre`
-          EOS
-        end
-      end
-    end
-  end
-end
-
-RSpec.describe "bundler executable" do
-  it "shows the bundler version just as the `bundle` executable does", :bundler => "< 2" do
-    bundler "--version"
-    expect(out).to eq("Bundler version #{Bundler::VERSION}")
-  end
-
-  it "shows the bundler version just as the `bundle` executable does", :bundler => "2" do
-    bundler "--version"
-    expect(out).to eq(Bundler::VERSION)
-  end
-end
diff --git a/spec/bundler/bundler/compact_index_client/updater_spec.rb b/spec/bundler/bundler/compact_index_client/updater_spec.rb
deleted file mode 100644
index fd554a7b0d..0000000000
--- a/spec/bundler/bundler/compact_index_client/updater_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "net/http"
-require "bundler/compact_index_client"
-require "bundler/compact_index_client/updater"
-
-RSpec.describe Bundler::CompactIndexClient::Updater do
-  let(:fetcher) { double(:fetcher) }
-  let(:local_path) { Pathname("/tmp/localpath") }
-  let(:remote_path) { double(:remote_path) }
-
-  subject(:updater) { described_class.new(fetcher) }
-
-  context "when the ETag header is missing" do
-    # Regression test for https://github.com/bundler/bundler/issues/5463
-
-    let(:response) { double(:response, :body => "") }
-
-    it "MisMatchedChecksumError is raised" do
-      # Twice: #update retries on failure
-      expect(response).to receive(:[]).with("Content-Encoding").twice { "" }
-      expect(response).to receive(:[]).with("ETag").twice { nil }
-      expect(fetcher).to receive(:call).twice { response }
-
-      expect do
-        updater.update(local_path, remote_path)
-      end.to raise_error(Bundler::CompactIndexClient::Updater::MisMatchedChecksumError)
-    end
-  end
-
-  context "when the download is corrupt" do
-    let(:response) { double(:response, :body => "") }
-
-    it "raises HTTPError" do
-      expect(response).to receive(:[]).with("Content-Encoding") { "gzip" }
-      expect(fetcher).to receive(:call) { response }
-
-      expect do
-        updater.update(local_path, remote_path)
-      end.to raise_error(Bundler::HTTPError)
-    end
-  end
-
-  context "when bundler doesn't have permissions on Dir.tmpdir" do
-    let(:response) { double(:response, :body => "") }
-
-    it "Errno::EACCES is raised" do
-      allow(Dir).to receive(:mktmpdir) { raise Errno::EACCES }
-
-      expect do
-        updater.update(local_path, remote_path)
-      end.to raise_error(Bundler::PermissionError)
-    end
-  end
-end
diff --git a/spec/bundler/bundler/definition_spec.rb b/spec/bundler/bundler/definition_spec.rb
deleted file mode 100644
index ceb7b4bf05..0000000000
--- a/spec/bundler/bundler/definition_spec.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/definition"
-
-RSpec.describe Bundler::Definition do
-  describe "#lock" do
-    before do
-      allow(Bundler).to receive(:settings) { Bundler::Settings.new(".") }
-      allow(Bundler::SharedHelpers).to receive(:find_gemfile) { Pathname.new("Gemfile") }
-      allow(Bundler).to receive(:ui) { double("UI", :info => "", :debug => "") }
-    end
-    context "when it's not possible to write to the file" do
-      subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
-
-      it "raises an PermissionError with explanation" do
-        allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with("Gemfile.lock", "wb").
-          and_raise(Errno::EACCES)
-        expect { subject.lock("Gemfile.lock") }.
-          to raise_error(Bundler::PermissionError, /Gemfile\.lock/)
-      end
-    end
-    context "when a temporary resource access issue occurs" do
-      subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
-
-      it "raises a TemporaryResourceError with explanation" do
-        allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with("Gemfile.lock", "wb").
-          and_raise(Errno::EAGAIN)
-        expect { subject.lock("Gemfile.lock") }.
-          to raise_error(Bundler::TemporaryResourceError, /temporarily unavailable/)
-      end
-    end
-  end
-
-  describe "detects changes" do
-    it "for a path gem with changes", :bundler => "< 2" do
-      build_lib "foo", "1.0", :path => lib_path("foo")
-
-      install_gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
-      end
-
-      bundle :install, :env => { "DEBUG" => 1 }
-
-      expect(out).to match(/re-resolving dependencies/)
-      lockfile_should_be <<-G
-        PATH
-          remote: #{lib_path("foo")}
-          specs:
-            foo (1.0)
-              rack (= 1.0)
-
-        GEM
-          remote: file://localhost#{gem_repo1}/
-          specs:
-            rack (1.0.0)
-
-        PLATFORMS
-          ruby
-
-        DEPENDENCIES
-          foo!
-
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      G
-    end
-
-    it "for a path gem with changes", :bundler => "2" do
-      build_lib "foo", "1.0", :path => lib_path("foo")
-
-      install_gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
-      end
-
-      bundle :install, :env => { "DEBUG" => 1 }
-
-      expect(out).to match(/re-resolving dependencies/)
-      lockfile_should_be <<-G
-        GEM
-          remote: file://localhost#{gem_repo1}/
-          specs:
-            rack (1.0.0)
-
-        PATH
-          remote: #{lib_path("foo")}
-          specs:
-            foo (1.0)
-              rack (= 1.0)
-
-        PLATFORMS
-          #{lockfile_platforms}
-
-        DEPENDENCIES
-          foo!
-
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      G
-    end
-
-    it "for a path gem with deps and no changes", :bundler => "< 2" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
-        s.add_development_dependency "net-ssh", "1.0"
-      end
-
-      install_gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      bundle :check, :env => { "DEBUG" => 1 }
-
-      expect(out).to match(/using resolution from the lockfile/)
-      lockfile_should_be <<-G
-        PATH
-          remote: #{lib_path("foo")}
-          specs:
-            foo (1.0)
-              rack (= 1.0)
-
-        GEM
-          remote: file://localhost#{gem_repo1}/
-          specs:
-            rack (1.0.0)
-
-        PLATFORMS
-          ruby
-
-        DEPENDENCIES
-          foo!
-
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      G
-    end
-
-    it "for a path gem with deps and no changes", :bundler => "2" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
-        s.add_development_dependency "net-ssh", "1.0"
-      end
-
-      install_gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      bundle :check, :env => { "DEBUG" => 1 }
-
-      expect(out).to match(/using resolution from the lockfile/)
-      lockfile_should_be <<-G
-        GEM
-          remote: file://localhost#{gem_repo1}/
-          specs:
-            rack (1.0.0)
-
-        PATH
-          remote: #{lib_path("foo")}
-          specs:
-            foo (1.0)
-              rack (= 1.0)
-
-        PLATFORMS
-          #{lockfile_platforms}
-
-        DEPENDENCIES
-          foo!
-
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      G
-    end
-
-    it "for a rubygems gem" do
-      install_gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "foo"
-      G
-
-      bundle :check, :env => { "DEBUG" => 1 }
-
-      expect(out).to match(/using resolution from the lockfile/)
-      lockfile_should_be <<-G
-        GEM
-          remote: file://localhost#{gem_repo1}/
-          specs:
-            foo (1.0)
-
-        PLATFORMS
-          #{lockfile_platforms}
-
-        DEPENDENCIES
-          foo
-
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      G
-    end
-  end
-
-  describe "initialize" do
-    context "gem version promoter" do
-      context "with lockfile" do
-        before do
-          install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "foo"
-          G
-        end
-
-        it "should get a locked specs list when updating all" do
-          definition = Bundler::Definition.new(bundled_app("Gemfile.lock"), [], Bundler::SourceList.new, true)
-          locked_specs = definition.gem_version_promoter.locked_specs
-          expect(locked_specs.to_a.map(&:name)).to eq ["foo"]
-          expect(definition.instance_variable_get("@locked_specs").empty?).to eq true
-        end
-      end
-
-      context "without gemfile or lockfile" do
-        it "should not attempt to parse empty lockfile contents" do
-          definition = Bundler::Definition.new(nil, [], mock_source_list, true)
-          expect(definition.gem_version_promoter.locked_specs.to_a).to eq []
-        end
-      end
-
-      context "eager unlock" do
-        let(:source_list) do
-          Bundler::SourceList.new.tap do |source_list|
-            source_list.global_rubygems_source = "file://#{gem_repo4}"
-          end
-        end
-
-        before do
-          gemfile <<-G
-            source "file://#{gem_repo4}"
-            gem 'isolated_owner'
-
-            gem 'shared_owner_a'
-            gem 'shared_owner_b'
-          G
-
-          lockfile <<-L
-            GEM
-              remote: file://#{gem_repo4}
-              specs:
-                isolated_dep (2.0.1)
-                isolated_owner (1.0.1)
-                  isolated_dep (~> 2.0)
-                shared_dep (5.0.1)
-                shared_owner_a (3.0.1)
-                  shared_dep (~> 5.0)
-                shared_owner_b (4.0.1)
-                  shared_dep (~> 5.0)
-
-            PLATFORMS
-              ruby
-
-            DEPENDENCIES
-              shared_owner_a
-              shared_owner_b
-              isolated_owner
-
-            BUNDLED WITH
-               1.13.0
-          L
-        end
-
-        it "should not eagerly unlock shared dependency with bundle install conservative updating behavior" do
-          updated_deps_in_gemfile = [Bundler::Dependency.new("isolated_owner", ">= 0"),
-                                     Bundler::Dependency.new("shared_owner_a", "3.0.2"),
-                                     Bundler::Dependency.new("shared_owner_b", ">= 0")]
-          unlock_hash_for_bundle_install = {}
-          definition = Bundler::Definition.new(
-            bundled_app("Gemfile.lock"),
-            updated_deps_in_gemfile,
-            source_list,
-            unlock_hash_for_bundle_install
-          )
-          locked = definition.send(:converge_locked_specs).map(&:name)
-          expect(locked).to include "shared_dep"
-        end
-
-        it "should not eagerly unlock shared dependency with bundle update conservative updating behavior" do
-          updated_deps_in_gemfile = [Bundler::Dependency.new("isolated_owner", ">= 0"),
-                                     Bundler::Dependency.new("shared_owner_a", ">= 0"),
-                                     Bundler::Dependency.new("shared_owner_b", ">= 0")]
-          definition = Bundler::Definition.new(
-            bundled_app("Gemfile.lock"),
-            updated_deps_in_gemfile,
-            source_list,
-            :gems => ["shared_owner_a"], :lock_shared_dependencies => true
-          )
-          locked = definition.send(:converge_locked_specs).map(&:name)
-          expect(locked).to eq %w[isolated_dep isolated_owner shared_dep shared_owner_b]
-          expect(locked.include?("shared_dep")).to be_truthy
-        end
-      end
-    end
-  end
-
-  describe "find_resolved_spec" do
-    it "with no platform set in SpecSet" do
-      ss = Bundler::SpecSet.new([build_stub_spec("a", "1.0"), build_stub_spec("b", "1.0")])
-      dfn = Bundler::Definition.new(nil, [], mock_source_list, true)
-      dfn.instance_variable_set("@specs", ss)
-      found = dfn.find_resolved_spec(build_spec("a", "0.9", "ruby").first)
-      expect(found.name).to eq "a"
-      expect(found.version.to_s).to eq "1.0"
-    end
-  end
-
-  describe "find_indexed_specs" do
-    it "with no platform set in indexed specs" do
-      index = Bundler::Index.new
-      %w[1.0.0 1.0.1 1.1.0].each {|v| index << build_stub_spec("foo", v) }
-
-      dfn = Bundler::Definition.new(nil, [], mock_source_list, true)
-      dfn.instance_variable_set("@index", index)
-      found = dfn.find_indexed_specs(build_spec("foo", "0.9", "ruby").first)
-      expect(found.length).to eq 3
-    end
-  end
-
-  def build_stub_spec(name, version)
-    Bundler::StubSpecification.new(name, version, nil, nil)
-  end
-
-  def mock_source_list
-    Class.new do
-      def all_sources
-        []
-      end
-
-      def path_sources
-        []
-      end
-
-      def rubygems_remotes
-        []
-      end
-
-      def replace_sources!(arg)
-        nil
-      end
-    end.new
-  end
-end
diff --git a/spec/bundler/bundler/dep_proxy_spec.rb b/spec/bundler/bundler/dep_proxy_spec.rb
deleted file mode 100644
index 0f8d6b1076..0000000000
--- a/spec/bundler/bundler/dep_proxy_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::DepProxy do
-  let(:dep) { Bundler::Dependency.new("rake", ">= 0") }
-  subject { described_class.new(dep, Gem::Platform::RUBY) }
-  let(:same) { subject }
-  let(:other) { subject.dup }
-  let(:different) { described_class.new(dep, Gem::Platform::JAVA) }
-
-  describe "#eql?" do
-    it { expect(subject.eql?(same)).to be true }
-    it { expect(subject.eql?(other)).to be true }
-    it { expect(subject.eql?(different)).to be false }
-    it { expect(subject.eql?(nil)).to be false }
-    it { expect(subject.eql?("foobar")).to be false }
-  end
-
-  describe "#hash" do
-    it { expect(subject.hash).to eq(same.hash) }
-    it { expect(subject.hash).to eq(other.hash) }
-  end
-end
diff --git a/spec/bundler/bundler/dsl_spec.rb b/spec/bundler/bundler/dsl_spec.rb
deleted file mode 100644
index 89528eb745..0000000000
--- a/spec/bundler/bundler/dsl_spec.rb
+++ /dev/null
@@ -1,305 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Dsl do
-  before do
-    @rubygems = double("rubygems")
-    allow(Bundler::Source::Rubygems).to receive(:new) { @rubygems }
-  end
-
-  describe "#git_source" do
-    it "registers custom hosts" do
-      subject.git_source(:example) {|repo_name| "git@git.example.com:#{repo_name}.git" }
-      subject.git_source(:foobar) {|repo_name| "git@foobar.com:#{repo_name}.git" }
-      subject.gem("dobry-pies", :example => "strzalek/dobry-pies")
-      example_uri = "git@git.example.com:strzalek/dobry-pies.git"
-      expect(subject.dependencies.first.source.uri).to eq(example_uri)
-    end
-
-    it "raises exception on invalid hostname" do
-      expect do
-        subject.git_source(:group) {|repo_name| "git@git.example.com:#{repo_name}.git" }
-      end.to raise_error(Bundler::InvalidOption)
-    end
-
-    it "expects block passed" do
-      expect { subject.git_source(:example) }.to raise_error(Bundler::InvalidOption)
-    end
-
-    context "github_https feature flag" do
-      it "is true when github.https is true" do
-        bundle "config github.https true"
-        expect(Bundler.feature_flag.github_https?).to eq "true"
-      end
-    end
-
-    context "default hosts (git, gist)", :bundler => "< 2" do
-      context "when github.https config is true" do
-        before { bundle "config github.https true" }
-        it "converts :github to :git using https" do
-          subject.gem("sparks", :github => "indirect/sparks")
-          github_uri = "https://github.com/indirect/sparks.git"
-          expect(subject.dependencies.first.source.uri).to eq(github_uri)
-        end
-      end
-
-      it "converts :github to :git" do
-        subject.gem("sparks", :github => "indirect/sparks")
-        github_uri = "git://github.com/indirect/sparks.git"
-        expect(subject.dependencies.first.source.uri).to eq(github_uri)
-      end
-
-      it "converts numeric :gist to :git" do
-        subject.gem("not-really-a-gem", :gist => 2_859_988)
-        github_uri = "https://gist.github.com/2859988.git"
-        expect(subject.dependencies.first.source.uri).to eq(github_uri)
-      end
-
-      it "converts :gist to :git" do
-        subject.gem("not-really-a-gem", :gist => "2859988")
-        github_uri = "https://gist.github.com/2859988.git"
-        expect(subject.dependencies.first.source.uri).to eq(github_uri)
-      end
-
-      it "converts 'rails' to 'rails/rails'" do
-        subject.gem("rails", :github => "rails")
-        github_uri = "git://github.com/rails/rails.git"
-        expect(subject.dependencies.first.source.uri).to eq(github_uri)
-      end
-
-      it "converts :bitbucket to :git" do
-        subject.gem("not-really-a-gem", :bitbucket => "mcorp/flatlab-rails")
-        bitbucket_uri = "https://mcorp@bitbucket.org/mcorp/flatlab-rails.git"
-        expect(subject.dependencies.first.source.uri).to eq(bitbucket_uri)
-      end
-
-      it "converts 'mcorp' to 'mcorp/mcorp'" do
-        subject.gem("not-really-a-gem", :bitbucket => "mcorp")
-        bitbucket_uri = "https://mcorp@bitbucket.org/mcorp/mcorp.git"
-        expect(subject.dependencies.first.source.uri).to eq(bitbucket_uri)
-      end
-    end
-
-    context "default git sources", :bundler => "2" do
-      it "has none" do
-        expect(subject.instance_variable_get(:@git_sources)).to eq({})
-      end
-    end
-  end
-
-  describe "#method_missing" do
-    it "raises an error for unknown DSL methods" do
-      expect(Bundler).to receive(:read_file).with(bundled_app("Gemfile").to_s).
-        and_return("unknown")
-
-      error_msg = "There was an error parsing `Gemfile`: Undefined local variable or method `unknown' for Gemfile. Bundler cannot continue."
-      expect { subject.eval_gemfile("Gemfile") }.
-        to raise_error(Bundler::GemfileError, Regexp.new(error_msg))
-    end
-  end
-
-  describe "#eval_gemfile" do
-    it "handles syntax errors with a useful message" do
-      expect(Bundler).to receive(:read_file).with(bundled_app("Gemfile").to_s).and_return("}")
-      expect { subject.eval_gemfile("Gemfile") }.
-        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: (syntax error, unexpected tSTRING_DEND|(compile error - )?syntax error, unexpected '\}'). Bundler cannot continue./)
-    end
-
-    it "distinguishes syntax errors from evaluation errors" do
-      expect(Bundler).to receive(:read_file).with(bundled_app("Gemfile").to_s).and_return(
-        "ruby '2.1.5', :engine => 'ruby', :engine_version => '1.2.4'"
-      )
-      expect { subject.eval_gemfile("Gemfile") }.
-        to raise_error(Bundler::GemfileError, /There was an error evaluating `Gemfile`: ruby_version must match the :engine_version for MRI/)
-    end
-  end
-
-  describe "#gem" do
-    [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25, :mri, :mri_18, :mri_19,
-     :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :mri_25, :jruby, :rbx, :truffleruby].each do |platform|
-      it "allows #{platform} as a valid platform" do
-        subject.gem("foo", :platform => platform)
-      end
-    end
-
-    it "rejects invalid platforms" do
-      expect { subject.gem("foo", :platform => :bogus) }.
-        to raise_error(Bundler::GemfileError, /is not a valid platform/)
-    end
-
-    it "rejects empty gem name" do
-      expect { subject.gem("") }.
-        to raise_error(Bundler::GemfileError, /an empty gem name is not valid/)
-    end
-
-    it "rejects with a leading space in the name" do
-      expect { subject.gem(" foo") }.
-        to raise_error(Bundler::GemfileError, /' foo' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a trailing space in the name" do
-      expect { subject.gem("foo ") }.
-        to raise_error(Bundler::GemfileError, /'foo ' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a space in the gem name" do
-      expect { subject.gem("fo o") }.
-        to raise_error(Bundler::GemfileError, /'fo o' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a tab in the gem name" do
-      expect { subject.gem("fo\to") }.
-        to raise_error(Bundler::GemfileError, /'fo\to' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a newline in the gem name" do
-      expect { subject.gem("fo\no") }.
-        to raise_error(Bundler::GemfileError, /'fo\no' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a carriage return in the gem name" do
-      expect { subject.gem("fo\ro") }.
-        to raise_error(Bundler::GemfileError, /'fo\ro' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects with a form feed in the gem name" do
-      expect { subject.gem("fo\fo") }.
-        to raise_error(Bundler::GemfileError, /'fo\fo' is not a valid gem name because it contains whitespace/)
-    end
-
-    it "rejects symbols as gem name" do
-      expect { subject.gem(:foo) }.
-        to raise_error(Bundler::GemfileError, /You need to specify gem names as Strings. Use 'gem "foo"' instead/)
-    end
-
-    it "rejects branch option on non-git gems" do
-      expect { subject.gem("foo", :branch => "test") }.
-        to raise_error(Bundler::GemfileError, /The `branch` option for `gem 'foo'` is not allowed. Only gems with a git source can specify a branch/)
-    end
-
-    it "allows specifying a branch on git gems" do
-      subject.gem("foo", :branch => "test", :git => "http://mytestrepo")
-      dep = subject.dependencies.last
-      expect(dep.name).to eq "foo"
-    end
-
-    it "allows specifying a branch on git gems with a git_source" do
-      subject.git_source(:test_source) {|n| "https://github.com/#{n}" }
-      subject.gem("foo", :branch => "test", :test_source => "bundler/bundler")
-      dep = subject.dependencies.last
-      expect(dep.name).to eq "foo"
-    end
-  end
-
-  describe "#gemspec" do
-    let(:spec) do
-      Gem::Specification.new do |gem|
-        gem.name = "example"
-        gem.platform = platform
-      end
-    end
-
-    before do
-      allow(Dir).to receive(:[]).and_return(["spec_path"])
-      allow(Bundler).to receive(:load_gemspec).with("spec_path").and_return(spec)
-      allow(Bundler).to receive(:default_gemfile).and_return(Pathname.new("./Gemfile"))
-    end
-
-    context "with a ruby platform" do
-      let(:platform) { "ruby" }
-
-      it "keeps track of the ruby platforms in the dependency" do
-        subject.gemspec
-        expect(subject.dependencies.last.platforms).to eq(Bundler::Dependency::REVERSE_PLATFORM_MAP[Gem::Platform::RUBY])
-      end
-    end
-
-    context "with a jruby platform" do
-      let(:platform) { "java" }
-
-      it "keeps track of the jruby platforms in the dependency" do
-        allow(Gem::Platform).to receive(:local).and_return(java)
-        subject.gemspec
-        expect(subject.dependencies.last.platforms).to eq(Bundler::Dependency::REVERSE_PLATFORM_MAP[Gem::Platform::JAVA])
-      end
-    end
-  end
-
-  context "can bundle groups of gems with" do
-    # git "https://github.com/rails/rails.git" do
-    #   gem "railties"
-    #   gem "action_pack"
-    #   gem "active_model"
-    # end
-    describe "#git" do
-      it "from a single repo" do
-        rails_gems = %w[railties action_pack active_model]
-        subject.git "https://github.com/rails/rails.git" do
-          rails_gems.each {|rails_gem| subject.send :gem, rails_gem }
-        end
-        expect(subject.dependencies.map(&:name)).to match_array rails_gems
-      end
-    end
-
-    # github 'spree' do
-    #   gem 'spree_core'
-    #   gem 'spree_api'
-    #   gem 'spree_backend'
-    # end
-    describe "#github", :bundler => "< 2" do
-      it "from github" do
-        spree_gems = %w[spree_core spree_api spree_backend]
-        subject.github "spree" do
-          spree_gems.each {|spree_gem| subject.send :gem, spree_gem }
-        end
-
-        subject.dependencies.each do |d|
-          expect(d.source.uri).to eq("git://github.com/spree/spree.git")
-        end
-      end
-    end
-
-    describe "#github", :bundler => "2" do
-      it "from github" do
-        expect do
-          spree_gems = %w[spree_core spree_api spree_backend]
-          subject.github "spree" do
-            spree_gems.each {|spree_gem| subject.send :gem, spree_gem }
-          end
-        end.to raise_error(Bundler::DeprecatedError, /github method has been removed/)
-      end
-    end
-  end
-
-  describe "syntax errors" do
-    it "will raise a Bundler::GemfileError" do
-      gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
-      expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
-        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`:( compile error -)? unknown regexp options - trg. Bundler cannot continue./)
-    end
-  end
-
-  describe "Runtime errors", :unless => Bundler.current_ruby.on_18? do
-    it "will raise a Bundler::GemfileError" do
-      gemfile "s = 'foo'.freeze; s.strip!"
-      expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
-        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: can't modify frozen String. Bundler cannot continue./i)
-    end
-  end
-
-  describe "#with_source" do
-    context "if there was a rubygem source already defined" do
-      it "restores it after it's done" do
-        other_source = double("other-source")
-        allow(Bundler::Source::Rubygems).to receive(:new).and_return(other_source)
-        allow(Bundler).to receive(:default_gemfile).and_return(Pathname.new("./Gemfile"))
-
-        subject.source("https://other-source.org") do
-          subject.gem("dobry-pies", :path => "foo")
-          subject.gem("foo")
-        end
-
-        expect(subject.dependencies.last.source).to eq(other_source)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/endpoint_specification_spec.rb b/spec/bundler/bundler/endpoint_specification_spec.rb
deleted file mode 100644
index a9371f6617..0000000000
--- a/spec/bundler/bundler/endpoint_specification_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::EndpointSpecification do
-  let(:name)         { "foo" }
-  let(:version)      { "1.0.0" }
-  let(:platform)     { Gem::Platform::RUBY }
-  let(:dependencies) { [] }
-  let(:metadata)     { nil }
-
-  subject(:spec) { described_class.new(name, version, platform, dependencies, metadata) }
-
-  describe "#build_dependency" do
-    let(:name)           { "foo" }
-    let(:requirement1)   { "~> 1.1" }
-    let(:requirement2)   { ">= 1.1.7" }
-
-    it "should return a Gem::Dependency" do
-      expect(subject.send(:build_dependency, name, [requirement1, requirement2])).
-        to eq(Gem::Dependency.new(name, requirement1, requirement2))
-    end
-
-    context "when an ArgumentError occurs" do
-      before do
-        allow(Gem::Dependency).to receive(:new).with(name, [requirement1, requirement2]) {
-          raise ArgumentError.new("Some error occurred")
-        }
-      end
-
-      it "should raise the original error" do
-        expect { subject.send(:build_dependency, name, [requirement1, requirement2]) }.to raise_error(
-          ArgumentError, "Some error occurred"
-        )
-      end
-    end
-
-    context "when there is an ill formed requirement" do
-      before do
-        allow(Gem::Dependency).to receive(:new).with(name, [requirement1, requirement2]) {
-          raise ArgumentError.new("Ill-formed requirement [\"#<YAML::Syck::DefaultKey")
-        }
-        # Eliminate extra line break in rspec output due to `puts` in `#build_dependency`
-        allow(subject).to receive(:puts) {}
-      end
-
-      it "should raise a Bundler::GemspecError with invalid gemspec message" do
-        expect { subject.send(:build_dependency, name, [requirement1, requirement2]) }.to raise_error(
-          Bundler::GemspecError, /Unfortunately, the gem foo \(1\.0\.0\) has an invalid gemspec/
-        )
-      end
-    end
-  end
-
-  describe "#parse_metadata" do
-    context "when the metadata has malformed requirements" do
-      let(:metadata) { { "rubygems" => ">\n" } }
-      it "raises a helpful error message" do
-        expect { subject }.to raise_error(
-          Bundler::GemspecError,
-          a_string_including("There was an error parsing the metadata for the gem foo (1.0.0)").
-            and(a_string_including('The metadata was {"rubygems"=>">\n"}'))
-        )
-      end
-    end
-  end
-
-  it "supports equality comparison" do
-    other_spec = described_class.new("bar", version, platform, dependencies, metadata)
-    expect(spec).to eql(spec)
-    expect(spec).to_not eql(other_spec)
-  end
-end
diff --git a/spec/bundler/bundler/env_spec.rb b/spec/bundler/bundler/env_spec.rb
deleted file mode 100644
index 20bd38b021..0000000000
--- a/spec/bundler/bundler/env_spec.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/settings"
-
-RSpec.describe Bundler::Env do
-  let(:git_proxy_stub) { Bundler::Source::Git::GitProxy.new(nil, nil, nil) }
-
-  describe "#report" do
-    it "prints the environment" do
-      out = described_class.report
-
-      expect(out).to include("Environment")
-      expect(out).to include(Bundler::VERSION)
-      expect(out).to include(Gem::VERSION)
-      expect(out).to include(described_class.send(:ruby_version))
-      expect(out).to include(described_class.send(:git_version))
-      expect(out).to include(OpenSSL::OPENSSL_VERSION)
-    end
-
-    context "when there is a Gemfile and a lockfile and print_gemfile is true" do
-      before do
-        gemfile "gem 'rack', '1.0.0'"
-
-        lockfile <<-L
-          GEM
-            remote: file:#{gem_repo1}/
-            specs:
-              rack (1.0.0)
-
-          DEPENDENCIES
-            rack
-
-          BUNDLED WITH
-             1.10.0
-        L
-      end
-
-      let(:output) { described_class.report(:print_gemfile => true) }
-
-      it "prints the Gemfile" do
-        expect(output).to include("Gemfile")
-        expect(output).to include("'rack', '1.0.0'")
-      end
-
-      it "prints the lockfile" do
-        expect(output).to include("Gemfile.lock")
-        expect(output).to include("rack (1.0.0)")
-      end
-    end
-
-    context "when there no Gemfile and print_gemfile is true" do
-      let(:output) { described_class.report(:print_gemfile => true) }
-
-      it "prints the environment" do
-        expect(output).to start_with("## Environment")
-      end
-    end
-
-    context "when Gemfile contains a gemspec and print_gemspecs is true" do
-      let(:gemspec) do
-        strip_whitespace(<<-GEMSPEC)
-          Gem::Specification.new do |gem|
-            gem.name = "foo"
-            gem.author = "Fumofu"
-          end
-        GEMSPEC
-      end
-
-      before do
-        gemfile("gemspec")
-
-        File.open(bundled_app.join("foo.gemspec"), "wb") do |f|
-          f.write(gemspec)
-        end
-      end
-
-      it "prints the gemspec" do
-        output = described_class.report(:print_gemspecs => true)
-
-        expect(output).to include("foo.gemspec")
-        expect(output).to include(gemspec)
-      end
-    end
-
-    context "when eval_gemfile is used" do
-      it "prints all gemfiles" do
-        create_file "other/Gemfile-other", "gem 'rack'"
-        create_file "other/Gemfile", "eval_gemfile 'Gemfile-other'"
-        create_file "Gemfile-alt", <<-G
-          source "file:#{gem_repo1}"
-          eval_gemfile "other/Gemfile"
-        G
-        gemfile "eval_gemfile #{File.expand_path("Gemfile-alt").dump}"
-
-        output = described_class.report(:print_gemspecs => true)
-        expect(output).to include(strip_whitespace(<<-ENV))
-          ## Gemfile
-
-          ### Gemfile
-
-          ```ruby
-          eval_gemfile #{File.expand_path("Gemfile-alt").dump}
-          ```
-
-          ### Gemfile-alt
-
-          ```ruby
-          source "file:#{gem_repo1}"
-          eval_gemfile "other/Gemfile"
-          ```
-
-          ### other/Gemfile
-
-          ```ruby
-          eval_gemfile 'Gemfile-other'
-          ```
-
-          ### other/Gemfile-other
-
-          ```ruby
-          gem 'rack'
-          ```
-
-          ### Gemfile.lock
-
-          ```
-          <No #{bundled_app("Gemfile.lock")} found>
-          ```
-        ENV
-      end
-    end
-
-    context "when the git version is OS specific" do
-      it "includes OS specific information with the version number" do
-        expect(git_proxy_stub).to receive(:git).with("--version").
-          and_return("git version 1.2.3 (Apple Git-BS)")
-        expect(Bundler::Source::Git::GitProxy).to receive(:new).and_return(git_proxy_stub)
-
-        expect(described_class.report).to include("Git         1.2.3 (Apple Git-BS)")
-      end
-    end
-  end
-
-  describe ".version_of", :ruby_repo do
-    let(:parsed_version) { described_class.send(:version_of, "ruby") }
-
-    it "strips version of new line characters" do
-      expect(parsed_version).to_not include("\n")
-    end
-  end
-end
diff --git a/spec/bundler/bundler/environment_preserver_spec.rb b/spec/bundler/bundler/environment_preserver_spec.rb
deleted file mode 100644
index 530ca6f835..0000000000
--- a/spec/bundler/bundler/environment_preserver_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::EnvironmentPreserver do
-  let(:preserver) { described_class.new(env, ["foo"]) }
-
-  describe "#backup" do
-    let(:env) { { "foo" => "my-foo", "bar" => "my-bar" } }
-    subject { preserver.backup }
-
-    it "should create backup entries" do
-      expect(subject["BUNDLER_ORIG_foo"]).to eq("my-foo")
-    end
-
-    it "should keep the original entry" do
-      expect(subject["foo"]).to eq("my-foo")
-    end
-
-    it "should not create backup entries for unspecified keys" do
-      expect(subject.key?("BUNDLER_ORIG_bar")).to eq(false)
-    end
-
-    it "should not affect the original env" do
-      subject
-      expect(env.keys.sort).to eq(%w[bar foo])
-    end
-
-    context "when a key is empty" do
-      let(:env) { { "foo" => "" } }
-
-      it "should not create backup entries" do
-        expect(subject).not_to have_key "BUNDLER_ORIG_foo"
-      end
-    end
-
-    context "when an original key is set" do
-      let(:env) { { "foo" => "my-foo", "BUNDLER_ORIG_foo" => "orig-foo" } }
-
-      it "should keep the original value in the BUNDLER_ORIG_ variable" do
-        expect(subject["BUNDLER_ORIG_foo"]).to eq("orig-foo")
-      end
-
-      it "should keep the variable" do
-        expect(subject["foo"]).to eq("my-foo")
-      end
-    end
-  end
-
-  describe "#restore" do
-    subject { preserver.restore }
-
-    context "when an original key is set" do
-      let(:env) { { "foo" => "my-foo", "BUNDLER_ORIG_foo" => "orig-foo" } }
-
-      it "should restore the original value" do
-        expect(subject["foo"]).to eq("orig-foo")
-      end
-
-      it "should delete the backup value" do
-        expect(subject.key?("BUNDLER_ORIG_foo")).to eq(false)
-      end
-    end
-
-    context "when no original key is set" do
-      let(:env) { { "foo" => "my-foo" } }
-
-      it "should keep the current value" do
-        expect(subject["foo"]).to eq("my-foo")
-      end
-    end
-
-    context "when the original key is empty" do
-      let(:env) { { "foo" => "my-foo", "BUNDLER_ORIG_foo" => "" } }
-
-      it "should keep the current value" do
-        expect(subject["foo"]).to eq("my-foo")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher/base_spec.rb b/spec/bundler/bundler/fetcher/base_spec.rb
deleted file mode 100644
index df1245d44d..0000000000
--- a/spec/bundler/bundler/fetcher/base_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Fetcher::Base do
-  let(:downloader)  { double(:downloader) }
-  let(:remote)      { double(:remote) }
-  let(:display_uri) { "http://sample_uri.com" }
-
-  class TestClass < described_class; end
-
-  subject { TestClass.new(downloader, remote, display_uri) }
-
-  describe "#initialize" do
-    context "with the abstract Base class" do
-      it "should raise an error" do
-        expect { described_class.new(downloader, remote, display_uri) }.to raise_error(RuntimeError, "Abstract class")
-      end
-    end
-
-    context "with a class that inherits the Base class" do
-      it "should set the passed attributes" do
-        expect(subject.downloader).to eq(downloader)
-        expect(subject.remote).to eq(remote)
-        expect(subject.display_uri).to eq("http://sample_uri.com")
-      end
-    end
-  end
-
-  describe "#remote_uri" do
-    let(:remote_uri_obj) { double(:remote_uri_obj) }
-
-    before { allow(remote).to receive(:uri).and_return(remote_uri_obj) }
-
-    it "should return the remote's uri" do
-      expect(subject.remote_uri).to eq(remote_uri_obj)
-    end
-  end
-
-  describe "#fetch_uri" do
-    let(:remote_uri_obj) { URI("http://rubygems.org") }
-
-    before { allow(subject).to receive(:remote_uri).and_return(remote_uri_obj) }
-
-    context "when the remote uri's host is rubygems.org" do
-      it "should create a copy of the remote uri with index.rubygems.org as the host" do
-        fetched_uri = subject.fetch_uri
-        expect(fetched_uri.host).to eq("index.rubygems.org")
-        expect(fetched_uri).to_not be(remote_uri_obj)
-      end
-    end
-
-    context "when the remote uri's host is not rubygems.org" do
-      let(:remote_uri_obj) { URI("http://otherhost.org") }
-
-      it "should return the remote uri" do
-        expect(subject.fetch_uri).to eq(URI("http://otherhost.org"))
-      end
-    end
-
-    it "memoizes the fetched uri" do
-      expect(remote_uri_obj).to receive(:host).once
-      2.times { subject.fetch_uri }
-    end
-  end
-
-  describe "#available?" do
-    it "should return whether the api is available" do
-      expect(subject.available?).to be_truthy
-    end
-  end
-
-  describe "#api_fetcher?" do
-    it "should return false" do
-      expect(subject.api_fetcher?).to be_falsey
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher/compact_index_spec.rb b/spec/bundler/bundler/fetcher/compact_index_spec.rb
deleted file mode 100644
index e0f58766ea..0000000000
--- a/spec/bundler/bundler/fetcher/compact_index_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Fetcher::CompactIndex do
-  let(:downloader)  { double(:downloader) }
-  let(:display_uri) { URI("http://sampleuri.com") }
-  let(:remote)      { double(:remote, :cache_slug => "lsjdf", :uri => display_uri) }
-  let(:compact_index) { described_class.new(downloader, remote, display_uri) }
-
-  before do
-    allow(compact_index).to receive(:log_specs) {}
-  end
-
-  describe "#specs_for_names" do
-    it "has only one thread open at the end of the run" do
-      compact_index.specs_for_names(["lskdjf"])
-
-      thread_count = Thread.list.count {|thread| thread.status == "run" }
-      expect(thread_count).to eq 1
-    end
-
-    it "calls worker#stop during the run" do
-      expect_any_instance_of(Bundler::Worker).to receive(:stop).at_least(:once)
-
-      compact_index.specs_for_names(["lskdjf"])
-    end
-
-    describe "#available?" do
-      before do
-        allow(compact_index).to receive(:compact_index_client).
-          and_return(double(:compact_index_client, :update_and_parse_checksums! => true))
-      end
-
-      it "returns true" do
-        expect(compact_index).to be_available
-      end
-
-      context "when OpenSSL is not available" do
-        before do
-          allow(compact_index).to receive(:require).with("openssl").and_raise(LoadError)
-        end
-
-        it "returns true" do
-          expect(compact_index).to be_available
-        end
-      end
-
-      context "when OpenSSL is FIPS-enabled", :ruby => ">= 2.0.0" do
-        def remove_cached_md5_availability
-          return unless Bundler::SharedHelpers.instance_variable_defined?(:@md5_available)
-          Bundler::SharedHelpers.remove_instance_variable(:@md5_available)
-        end
-
-        before do
-          remove_cached_md5_availability
-          stub_const("OpenSSL::OPENSSL_FIPS", true)
-        end
-
-        after { remove_cached_md5_availability }
-
-        context "when FIPS-mode is active" do
-          before do
-            allow(OpenSSL::Digest::MD5).to receive(:digest).
-              and_raise(OpenSSL::Digest::DigestError)
-          end
-
-          it "returns false" do
-            expect(compact_index).to_not be_available
-          end
-        end
-
-        it "returns true" do
-          expect(compact_index).to be_available
-        end
-      end
-    end
-
-    context "logging" do
-      before { allow(compact_index).to receive(:log_specs).and_call_original }
-
-      context "with debug on" do
-        before do
-          allow(Bundler).to receive_message_chain(:ui, :debug?).and_return(true)
-        end
-
-        it "should log at info level" do
-          expect(Bundler).to receive_message_chain(:ui, :debug).with('Looking up gems ["lskdjf"]')
-          compact_index.specs_for_names(["lskdjf"])
-        end
-      end
-
-      context "with debug off" do
-        before do
-          allow(Bundler).to receive_message_chain(:ui, :debug?).and_return(false)
-        end
-
-        it "should log at info level" do
-          expect(Bundler).to receive_message_chain(:ui, :info).with(".", false)
-          compact_index.specs_for_names(["lskdjf"])
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher/dependency_spec.rb b/spec/bundler/bundler/fetcher/dependency_spec.rb
deleted file mode 100644
index 081fdff34d..0000000000
--- a/spec/bundler/bundler/fetcher/dependency_spec.rb
+++ /dev/null
@@ -1,287 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Fetcher::Dependency do
-  let(:downloader)  { double(:downloader) }
-  let(:remote)      { double(:remote, :uri => URI("http://localhost:5000")) }
-  let(:display_uri) { "http://sample_uri.com" }
-
-  subject { described_class.new(downloader, remote, display_uri) }
-
-  describe "#available?" do
-    let(:dependency_api_uri) { double(:dependency_api_uri) }
-    let(:fetched_spec)       { double(:fetched_spec) }
-
-    before do
-      allow(subject).to receive(:dependency_api_uri).and_return(dependency_api_uri)
-      allow(downloader).to receive(:fetch).with(dependency_api_uri).and_return(fetched_spec)
-    end
-
-    it "should be truthy" do
-      expect(subject.available?).to be_truthy
-    end
-
-    context "when there is no network access" do
-      before do
-        allow(downloader).to receive(:fetch).with(dependency_api_uri) {
-          raise Bundler::Fetcher::NetworkDownError.new("Network Down Message")
-        }
-      end
-
-      it "should raise an HTTPError with the original message" do
-        expect { subject.available? }.to raise_error(Bundler::HTTPError, "Network Down Message")
-      end
-    end
-
-    context "when authentication is required" do
-      let(:remote_uri) { "http://remote_uri.org" }
-
-      before do
-        allow(downloader).to receive(:fetch).with(dependency_api_uri) {
-          raise Bundler::Fetcher::AuthenticationRequiredError.new(remote_uri)
-        }
-      end
-
-      it "should raise the original error" do
-        expect { subject.available? }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
-          %r{Authentication is required for http://remote_uri.org})
-      end
-    end
-
-    context "when there is an http error" do
-      before { allow(downloader).to receive(:fetch).with(dependency_api_uri) { raise Bundler::HTTPError.new } }
-
-      it "should be falsey" do
-        expect(subject.available?).to be_falsey
-      end
-    end
-  end
-
-  describe "#api_fetcher?" do
-    it "should return true" do
-      expect(subject.api_fetcher?).to be_truthy
-    end
-  end
-
-  describe "#specs" do
-    let(:gem_names)            { %w[foo bar] }
-    let(:full_dependency_list) { ["bar"] }
-    let(:last_spec_list)       { [["boulder", gem_version1, "ruby", resque]] }
-    let(:fail_errors)          { double(:fail_errors) }
-    let(:bundler_retry)        { double(:bundler_retry) }
-    let(:gem_version1)         { double(:gem_version1) }
-    let(:resque)               { double(:resque) }
-    let(:remote_uri)           { "http://remote-uri.org" }
-
-    before do
-      stub_const("Bundler::Fetcher::FAIL_ERRORS", fail_errors)
-      allow(Bundler::Retry).to receive(:new).with("dependency api", fail_errors).and_return(bundler_retry)
-      allow(bundler_retry).to receive(:attempts) {|&block| block.call }
-      allow(subject).to receive(:log_specs) {}
-      allow(subject).to receive(:remote_uri).and_return(remote_uri)
-      allow(Bundler).to receive_message_chain(:ui, :debug?)
-      allow(Bundler).to receive_message_chain(:ui, :info)
-      allow(Bundler).to receive_message_chain(:ui, :debug)
-    end
-
-    context "when there are given gem names that are not in the full dependency list" do
-      let(:spec_list)        { [["top", gem_version2, "ruby", faraday]] }
-      let(:deps_list)        { [] }
-      let(:dependency_specs) { [spec_list, deps_list] }
-      let(:gem_version2)     { double(:gem_version2) }
-      let(:faraday)          { double(:faraday) }
-
-      before { allow(subject).to receive(:dependency_specs).with(["foo"]).and_return(dependency_specs) }
-
-      it "should return a hash with the remote_uri and the list of specs" do
-        expect(subject.specs(gem_names, full_dependency_list, last_spec_list)).to eq([
-          ["top", gem_version2, "ruby", faraday],
-          ["boulder", gem_version1, "ruby", resque],
-        ])
-      end
-    end
-
-    context "when all given gem names are in the full dependency list" do
-      let(:gem_names)            { ["foo"] }
-      let(:full_dependency_list) { %w[foo bar] }
-      let(:last_spec_list)       { ["boulder"] }
-
-      it "should return a hash with the remote_uri and the last spec list" do
-        expect(subject.specs(gem_names, full_dependency_list, last_spec_list)).to eq(["boulder"])
-      end
-    end
-
-    context "logging" do
-      before { allow(subject).to receive(:log_specs).and_call_original }
-
-      context "with debug on" do
-        before do
-          allow(Bundler).to receive_message_chain(:ui, :debug?).and_return(true)
-          allow(subject).to receive(:dependency_specs).with(["foo"]).and_return([[], []])
-        end
-
-        it "should log the query list at debug level" do
-          expect(Bundler).to receive_message_chain(:ui, :debug).with("Query List: [\"foo\"]")
-          expect(Bundler).to receive_message_chain(:ui, :debug).with("Query List: []")
-          subject.specs(gem_names, full_dependency_list, last_spec_list)
-        end
-      end
-
-      context "with debug off" do
-        before do
-          allow(Bundler).to receive_message_chain(:ui, :debug?).and_return(false)
-          allow(subject).to receive(:dependency_specs).with(["foo"]).and_return([[], []])
-        end
-
-        it "should log at info level" do
-          expect(Bundler).to receive_message_chain(:ui, :info).with(".", false)
-          expect(Bundler).to receive_message_chain(:ui, :info).with(".", false)
-          subject.specs(gem_names, full_dependency_list, last_spec_list)
-        end
-      end
-    end
-
-    shared_examples_for "the error is properly handled" do
-      it "should return nil" do
-        expect(subject.specs(gem_names, full_dependency_list, last_spec_list)).to be_nil
-      end
-
-      context "debug logging is not on" do
-        before { allow(Bundler).to receive_message_chain(:ui, :debug?).and_return(false) }
-
-        it "should log a new line to info" do
-          expect(Bundler).to receive_message_chain(:ui, :info).with("")
-          subject.specs(gem_names, full_dependency_list, last_spec_list)
-        end
-      end
-    end
-
-    shared_examples_for "the error suggests retrying with the full index" do
-      it "should log the inability to fetch from API at debug level" do
-        expect(Bundler).to receive_message_chain(:ui, :debug).with("could not fetch from the dependency API\nit's suggested to retry using the full index via `bundle install --full-index`")
-        subject.specs(gem_names, full_dependency_list, last_spec_list)
-      end
-    end
-
-    context "when an HTTPError occurs" do
-      before { allow(subject).to receive(:dependency_specs) { raise Bundler::HTTPError.new } }
-
-      it_behaves_like "the error is properly handled"
-      it_behaves_like "the error suggests retrying with the full index"
-    end
-
-    context "when a GemspecError occurs" do
-      before { allow(subject).to receive(:dependency_specs) { raise Bundler::GemspecError.new } }
-
-      it_behaves_like "the error is properly handled"
-      it_behaves_like "the error suggests retrying with the full index"
-    end
-
-    context "when a MarshalError occurs" do
-      before { allow(subject).to receive(:dependency_specs) { raise Bundler::MarshalError.new } }
-
-      it_behaves_like "the error is properly handled"
-
-      it "should log the inability to fetch from API and mention retrying" do
-        expect(Bundler).to receive_message_chain(:ui, :debug).with("could not fetch from the dependency API, trying the full index")
-        subject.specs(gem_names, full_dependency_list, last_spec_list)
-      end
-    end
-  end
-
-  describe "#dependency_specs" do
-    let(:gem_names)                { [%w[foo bar], %w[bundler rubocop]] }
-    let(:gem_list)                 { double(:gem_list) }
-    let(:formatted_specs_and_deps) { double(:formatted_specs_and_deps) }
-
-    before do
-      allow(subject).to receive(:unmarshalled_dep_gems).with(gem_names).and_return(gem_list)
-      allow(subject).to receive(:get_formatted_specs_and_deps).with(gem_list).and_return(formatted_specs_and_deps)
-    end
-
-    it "should log the query list at debug level" do
-      expect(Bundler).to receive_message_chain(:ui, :debug).with(
-        "Query Gemcutter Dependency Endpoint API: foo,bar,bundler,rubocop"
-      )
-      subject.dependency_specs(gem_names)
-    end
-
-    it "should return formatted specs and a unique list of dependencies" do
-      expect(subject.dependency_specs(gem_names)).to eq(formatted_specs_and_deps)
-    end
-  end
-
-  describe "#unmarshalled_dep_gems" do
-    let(:gem_names)         { [%w[foo bar], %w[bundler rubocop]] }
-    let(:dep_api_uri)       { double(:dep_api_uri) }
-    let(:unmarshalled_gems) { double(:unmarshalled_gems) }
-    let(:fetch_response)    { double(:fetch_response, :body => double(:body)) }
-    let(:rubygems_limit)    { 50 }
-
-    before { allow(subject).to receive(:dependency_api_uri).with(gem_names).and_return(dep_api_uri) }
-
-    it "should fetch dependencies from RubyGems and unmarshal them" do
-      expect(gem_names).to receive(:each_slice).with(rubygems_limit).and_call_original
-      expect(downloader).to receive(:fetch).with(dep_api_uri).and_return(fetch_response)
-      expect(Bundler).to receive(:load_marshal).with(fetch_response.body).and_return([unmarshalled_gems])
-      expect(subject.unmarshalled_dep_gems(gem_names)).to eq([unmarshalled_gems])
-    end
-  end
-
-  describe "#get_formatted_specs_and_deps" do
-    let(:gem_list) do
-      [
-        {
-          :dependencies => {
-            "resque" => "req3,req4",
-          },
-          :name => "typhoeus",
-          :number => "1.0.1",
-          :platform => "ruby",
-        },
-        {
-          :dependencies => {
-            "faraday" => "req1,req2",
-          },
-          :name => "grape",
-          :number => "2.0.2",
-          :platform => "jruby",
-        },
-      ]
-    end
-
-    it "should return formatted specs and a unique list of dependencies" do
-      spec_list, deps_list = subject.get_formatted_specs_and_deps(gem_list)
-      expect(spec_list).to eq([["typhoeus", "1.0.1", "ruby", [["resque", ["req3,req4"]]]],
-                               ["grape", "2.0.2", "jruby", [["faraday", ["req1,req2"]]]]])
-      expect(deps_list).to eq(%w[resque faraday])
-    end
-  end
-
-  describe "#dependency_api_uri" do
-    let(:uri) { URI("http://gem-api.com") }
-
-    context "with gem names" do
-      let(:gem_names) { %w[foo bar bundler rubocop] }
-
-      before { allow(subject).to receive(:fetch_uri).and_return(uri) }
-
-      it "should return an api calling uri with the gems in the query" do
-        expect(subject.dependency_api_uri(gem_names).to_s).to eq(
-          "http://gem-api.com/api/v1/dependencies?gems=bar%2Cbundler%2Cfoo%2Crubocop"
-        )
-      end
-    end
-
-    context "with no gem names" do
-      let(:gem_names) { [] }
-
-      before { allow(subject).to receive(:fetch_uri).and_return(uri) }
-
-      it "should return an api calling uri with no query" do
-        expect(subject.dependency_api_uri(gem_names).to_s).to eq(
-          "http://gem-api.com/api/v1/dependencies"
-        )
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher/downloader_spec.rb b/spec/bundler/bundler/fetcher/downloader_spec.rb
deleted file mode 100644
index c9b4fa662a..0000000000
--- a/spec/bundler/bundler/fetcher/downloader_spec.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Fetcher::Downloader do
-  let(:connection)     { double(:connection) }
-  let(:redirect_limit) { 5 }
-  let(:uri)            { URI("http://www.uri-to-fetch.com/api/v2/endpoint") }
-  let(:options)        { double(:options) }
-
-  subject { described_class.new(connection, redirect_limit) }
-
-  describe "fetch" do
-    let(:counter)      { 0 }
-    let(:httpv)        { "1.1" }
-    let(:http_response) { double(:response) }
-
-    before do
-      allow(subject).to receive(:request).with(uri, options).and_return(http_response)
-      allow(http_response).to receive(:body).and_return("Body with info")
-    end
-
-    context "when the # requests counter is greater than the redirect limit" do
-      let(:counter) { redirect_limit + 1 }
-
-      it "should raise a Bundler::HTTPError specifying too many redirects" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::HTTPError, "Too many redirects")
-      end
-    end
-
-    context "logging" do
-      let(:http_response) { Net::HTTPSuccess.new("1.1", 200, "Success") }
-
-      it "should log the HTTP response code and message to debug" do
-        expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP 200 Success #{uri}")
-        subject.fetch(uri, options, counter)
-      end
-    end
-
-    context "when the request response is a Net::HTTPRedirection" do
-      let(:http_response) { Net::HTTPRedirection.new(httpv, 308, "Moved") }
-
-      before { http_response["location"] = "http://www.redirect-uri.com/api/v2/endpoint" }
-
-      it "should try to fetch the redirect uri and iterate the # requests counter" do
-        expect(subject).to receive(:fetch).with(URI("http://www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
-        expect(subject).to receive(:fetch).with(URI("http://www.redirect-uri.com/api/v2/endpoint"), options, 1)
-        subject.fetch(uri, options, counter)
-      end
-
-      context "when the redirect uri and original uri are the same" do
-        let(:uri) { URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
-
-        before { http_response["location"] = "ssh://www.uri-to-fetch.com/api/v1/endpoint" }
-
-        it "should set the same user and password for the redirect uri" do
-          expect(subject).to receive(:fetch).with(URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
-          expect(subject).to receive(:fetch).with(URI("ssh://username:password@www.uri-to-fetch.com/api/v1/endpoint"), options, 1)
-          subject.fetch(uri, options, counter)
-        end
-      end
-    end
-
-    context "when the request response is a Net::HTTPSuccess" do
-      let(:http_response) { Net::HTTPSuccess.new("1.1", 200, "Success") }
-
-      it "should return the response body" do
-        expect(subject.fetch(uri, options, counter)).to eq(http_response)
-      end
-    end
-
-    context "when the request response is a Net::HTTPRequestEntityTooLarge" do
-      let(:http_response) { Net::HTTPRequestEntityTooLarge.new("1.1", 413, "Too Big") }
-
-      it "should raise a Bundler::Fetcher::FallbackError with the response body" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::FallbackError, "Body with info")
-      end
-    end
-
-    context "when the request response is a Net::HTTPUnauthorized" do
-      let(:http_response) { Net::HTTPUnauthorized.new("1.1", 401, "Unauthorized") }
-
-      it "should raise a Bundler::Fetcher::AuthenticationRequiredError with the uri host" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
-          /Authentication is required for www.uri-to-fetch.com/)
-      end
-    end
-
-    context "when the request response is a Net::HTTPNotFound" do
-      let(:http_response) { Net::HTTPNotFound.new("1.1", 404, "Not Found") }
-
-      it "should raise a Bundler::Fetcher::FallbackError with Net::HTTPNotFound" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::FallbackError, "Net::HTTPNotFound")
-      end
-    end
-
-    context "when the request response is some other type" do
-      let(:http_response) { Net::HTTPBadGateway.new("1.1", 500, "Fatal Error") }
-
-      it "should raise a Bundler::HTTPError with the response class and body" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::HTTPError, "Net::HTTPBadGateway: Body with info")
-      end
-    end
-  end
-
-  describe "request" do
-    let(:net_http_get) { double(:net_http_get) }
-    let(:response)     { double(:response) }
-
-    before do
-      allow(Net::HTTP::Get).to receive(:new).with("/api/v2/endpoint", options).and_return(net_http_get)
-      allow(connection).to receive(:request).with(uri, net_http_get).and_return(response)
-    end
-
-    it "should log the HTTP GET request to debug" do
-      expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP GET http://www.uri-to-fetch.com/api/v2/endpoint")
-      subject.request(uri, options)
-    end
-
-    context "when there is a user provided in the request" do
-      context "and there is also a password provided" do
-        context "that contains cgi escaped characters" do
-          let(:uri) { URI("http://username:password%24@www.uri-to-fetch.com/api/v2/endpoint") }
-
-          it "should request basic authentication with the username and password" do
-            expect(net_http_get).to receive(:basic_auth).with("username", "password$")
-            subject.request(uri, options)
-          end
-        end
-
-        context "that is all unescaped characters" do
-          let(:uri) { URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
-          it "should request basic authentication with the username and proper cgi compliant password" do
-            expect(net_http_get).to receive(:basic_auth).with("username", "password")
-            subject.request(uri, options)
-          end
-        end
-      end
-
-      context "and there is no password provided" do
-        let(:uri) { URI("http://username@www.uri-to-fetch.com/api/v2/endpoint") }
-
-        it "should request basic authentication with just the user" do
-          expect(net_http_get).to receive(:basic_auth).with("username", nil)
-          subject.request(uri, options)
-        end
-      end
-
-      context "that contains cgi escaped characters" do
-        let(:uri) { URI("http://username%24@www.uri-to-fetch.com/api/v2/endpoint") }
-
-        it "should request basic authentication with the proper cgi compliant password user" do
-          expect(net_http_get).to receive(:basic_auth).with("username$", nil)
-          subject.request(uri, options)
-        end
-      end
-    end
-
-    context "when the request response causes a NoMethodError" do
-      before { allow(connection).to receive(:request).with(uri, net_http_get) { raise NoMethodError.new(message) } }
-
-      context "and the error message is about use_ssl=" do
-        let(:message) { "undefined method 'use_ssl='" }
-
-        it "should raise a LoadError about openssl" do
-          expect { subject.request(uri, options) }.to raise_error(LoadError, "cannot load such file -- openssl")
-        end
-      end
-
-      context "and the error message is not about use_ssl=" do
-        let(:message) { "undefined method 'undefined_method_call'" }
-
-        it "should raise the original NoMethodError" do
-          expect { subject.request(uri, options) }.to raise_error(NoMethodError, "undefined method 'undefined_method_call'")
-        end
-      end
-    end
-
-    context "when the request response causes a OpenSSL::SSL::SSLError" do
-      before { allow(connection).to receive(:request).with(uri, net_http_get) { raise OpenSSL::SSL::SSLError.new } }
-
-      it "should raise a LoadError about openssl" do
-        expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::CertificateFailureError,
-          %r{Could not verify the SSL certificate for http://www.uri-to-fetch.com/api/v2/endpoint})
-      end
-    end
-
-    context "when the request response causes an error included in HTTP_ERRORS" do
-      let(:message) { nil }
-      let(:error)   { RuntimeError.new(message) }
-
-      before do
-        stub_const("Bundler::Fetcher::HTTP_ERRORS", [RuntimeError])
-        allow(connection).to receive(:request).with(uri, net_http_get) { raise error }
-      end
-
-      it "should trace log the error" do
-        allow(Bundler).to receive_message_chain(:ui, :debug)
-        expect(Bundler).to receive_message_chain(:ui, :trace).with(error)
-        expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError)
-      end
-
-      context "when error message is about the host being down" do
-        let(:message) { "host down: http://www.uri-to-fetch.com" }
-
-        it "should raise a Bundler::Fetcher::NetworkDownError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
-            /Could not reach host www.uri-to-fetch.com/)
-        end
-      end
-
-      context "when error message is about getaddrinfo issues" do
-        let(:message) { "getaddrinfo: nodename nor servname provided for http://www.uri-to-fetch.com" }
-
-        it "should raise a Bundler::Fetcher::NetworkDownError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
-            /Could not reach host www.uri-to-fetch.com/)
-        end
-      end
-
-      context "when error message is about neither host down or getaddrinfo" do
-        let(:message) { "other error about network" }
-
-        it "should raise a Bundler::HTTPError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-            "Network error while fetching http://www.uri-to-fetch.com/api/v2/endpoint (other error about network)")
-        end
-
-        context "when the there are credentials provided in the request" do
-          let(:uri) { URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
-          before do
-            allow(net_http_get).to receive(:basic_auth).with("username", "password")
-          end
-
-          it "should raise a Bundler::HTTPError that doesn't contain the password" do
-            expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-              "Network error while fetching http://username@www.uri-to-fetch.com/api/v2/endpoint (other error about network)")
-          end
-        end
-      end
-
-      context "when error message is about no route to host" do
-        let(:message) { "Failed to open TCP connection to www.uri-to-fetch.com:443 " }
-
-        it "should raise a Bundler::Fetcher::HTTPError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-            "Network error while fetching http://www.uri-to-fetch.com/api/v2/endpoint (#{message})")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher/index_spec.rb b/spec/bundler/bundler/fetcher/index_spec.rb
deleted file mode 100644
index 0cf0ae764e..0000000000
--- a/spec/bundler/bundler/fetcher/index_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Fetcher::Index do
-  let(:downloader)  { nil }
-  let(:remote)      { nil }
-  let(:display_uri) { "http://sample_uri.com" }
-  let(:rubygems)    { double(:rubygems) }
-  let(:gem_names)   { %w[foo bar] }
-
-  subject { described_class.new(downloader, remote, display_uri) }
-
-  before { allow(Bundler).to receive(:rubygems).and_return(rubygems) }
-
-  it "fetches and returns the list of remote specs" do
-    expect(rubygems).to receive(:fetch_all_remote_specs) { nil }
-    subject.specs(gem_names)
-  end
-
-  context "error handling" do
-    shared_examples_for "the error is properly handled" do
-      let(:remote_uri) { URI("http://remote-uri.org") }
-      before do
-        allow(subject).to receive(:remote_uri).and_return(remote_uri)
-      end
-
-      context "when certificate verify failed" do
-        let(:error_message) { "certificate verify failed" }
-
-        it "should raise a Bundler::Fetcher::CertificateFailureError" do
-          expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::CertificateFailureError,
-            %r{Could not verify the SSL certificate for http://sample_uri.com})
-        end
-      end
-
-      context "when a 401 response occurs" do
-        let(:error_message) { "401" }
-
-        it "should raise a Bundler::Fetcher::AuthenticationRequiredError" do
-          expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
-            %r{Authentication is required for http://remote-uri.org})
-        end
-      end
-
-      context "when a 403 response occurs" do
-        let(:error_message) { "403" }
-
-        before do
-          allow(remote_uri).to receive(:userinfo).and_return(userinfo)
-        end
-
-        context "and there was userinfo" do
-          let(:userinfo) { double(:userinfo) }
-
-          it "should raise a Bundler::Fetcher::BadAuthenticationError" do
-            expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::BadAuthenticationError,
-              %r{Bad username or password for http://remote-uri.org})
-          end
-        end
-
-        context "and there was no userinfo" do
-          let(:userinfo) { nil }
-
-          it "should raise a Bundler::Fetcher::AuthenticationRequiredError" do
-            expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
-              %r{Authentication is required for http://remote-uri.org})
-          end
-        end
-      end
-
-      context "any other message is returned" do
-        let(:error_message) { "You get an error, you get an error!" }
-
-        before { allow(Bundler).to receive(:ui).and_return(double(:trace => nil)) }
-
-        it "should raise a Bundler::HTTPError" do
-          expect { subject.specs(gem_names) }.to raise_error(Bundler::HTTPError, "Could not fetch specs from http://sample_uri.com")
-        end
-      end
-    end
-
-    context "when a Gem::RemoteFetcher::FetchError occurs" do
-      before { allow(rubygems).to receive(:fetch_all_remote_specs) { raise Gem::RemoteFetcher::FetchError.new(error_message, nil) } }
-
-      it_behaves_like "the error is properly handled"
-    end
-
-    context "when a OpenSSL::SSL::SSLError occurs" do
-      before { allow(rubygems).to receive(:fetch_all_remote_specs) { raise OpenSSL::SSL::SSLError.new(error_message) } }
-
-      it_behaves_like "the error is properly handled"
-    end
-
-    context "when a Net::HTTPFatalError occurs" do
-      before { allow(rubygems).to receive(:fetch_all_remote_specs) { raise Net::HTTPFatalError.new(error_message, 404) } }
-
-      it_behaves_like "the error is properly handled"
-    end
-  end
-end
diff --git a/spec/bundler/bundler/fetcher_spec.rb b/spec/bundler/bundler/fetcher_spec.rb
deleted file mode 100644
index 184b9efa64..0000000000
--- a/spec/bundler/bundler/fetcher_spec.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/fetcher"
-
-RSpec.describe Bundler::Fetcher do
-  let(:uri) { URI("https://example.com") }
-  let(:remote) { double("remote", :uri => uri, :original_uri => nil) }
-
-  subject(:fetcher) { Bundler::Fetcher.new(remote) }
-
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new("root") }
-  end
-
-  describe "#connection" do
-    context "when Gem.configuration doesn't specify http_proxy" do
-      it "specify no http_proxy" do
-        expect(fetcher.http_proxy).to be_nil
-      end
-      it "consider environment vars when determine proxy" do
-        with_env_vars("HTTP_PROXY" => "http://proxy-example.com") do
-          expect(fetcher.http_proxy).to match("http://proxy-example.com")
-        end
-      end
-    end
-    context "when Gem.configuration specifies http_proxy " do
-      let(:proxy) { "http://proxy-example2.com" }
-      before do
-        allow(Bundler.rubygems.configuration).to receive(:[]).with(:http_proxy).and_return(proxy)
-      end
-      it "consider Gem.configuration when determine proxy" do
-        expect(fetcher.http_proxy).to match("http://proxy-example2.com")
-      end
-      it "consider Gem.configuration when determine proxy" do
-        with_env_vars("HTTP_PROXY" => "http://proxy-example.com") do
-          expect(fetcher.http_proxy).to match("http://proxy-example2.com")
-        end
-      end
-      context "when the proxy is :no_proxy" do
-        let(:proxy) { :no_proxy }
-        it "does not set a proxy" do
-          expect(fetcher.http_proxy).to be_nil
-        end
-      end
-    end
-
-    context "when a rubygems source mirror is set" do
-      let(:orig_uri) { URI("http://zombo.com") }
-      let(:remote_with_mirror) do
-        double("remote", :uri => uri, :original_uri => orig_uri, :anonymized_uri => uri)
-      end
-
-      let(:fetcher) { Bundler::Fetcher.new(remote_with_mirror) }
-
-      it "sets the 'X-Gemfile-Source' header containing the original source" do
-        expect(
-          fetcher.send(:connection).override_headers["X-Gemfile-Source"]
-        ).to eq("http://zombo.com")
-      end
-    end
-
-    context "when there is no rubygems source mirror set" do
-      let(:remote_no_mirror) do
-        double("remote", :uri => uri, :original_uri => nil, :anonymized_uri => uri)
-      end
-
-      let(:fetcher) { Bundler::Fetcher.new(remote_no_mirror) }
-
-      it "does not set the 'X-Gemfile-Source' header" do
-        expect(fetcher.send(:connection).override_headers["X-Gemfile-Source"]).to be_nil
-      end
-    end
-
-    context "when there are proxy environment variable(s) set" do
-      it "consider http_proxy" do
-        with_env_vars("HTTP_PROXY" => "http://proxy-example3.com") do
-          expect(fetcher.http_proxy).to match("http://proxy-example3.com")
-        end
-      end
-      it "consider no_proxy" do
-        with_env_vars("HTTP_PROXY" => "http://proxy-example4.com", "NO_PROXY" => ".example.com,.example.net") do
-          expect(
-            fetcher.send(:connection).no_proxy
-          ).to eq([".example.com", ".example.net"])
-        end
-      end
-    end
-
-    context "when no ssl configuration is set" do
-      it "no cert" do
-        expect(fetcher.send(:connection).cert).to be_nil
-        expect(fetcher.send(:connection).key).to be_nil
-      end
-    end
-
-    context "when bunder ssl ssl configuration is set" do
-      before do
-        cert = File.join(Spec::Path.tmpdir, "cert")
-        File.open(cert, "w") {|f| f.write "PEM" }
-        allow(Bundler.settings).to receive(:[]).and_return(nil)
-        allow(Bundler.settings).to receive(:[]).with(:ssl_client_cert).and_return(cert)
-        expect(OpenSSL::X509::Certificate).to receive(:new).with("PEM").and_return("cert")
-        expect(OpenSSL::PKey::RSA).to receive(:new).with("PEM").and_return("key")
-      end
-      after do
-        FileUtils.rm File.join(Spec::Path.tmpdir, "cert")
-      end
-      it "use bundler configuration" do
-        expect(fetcher.send(:connection).cert).to eq("cert")
-        expect(fetcher.send(:connection).key).to eq("key")
-      end
-    end
-
-    context "when gem ssl configuration is set" do
-      before do
-        allow(Bundler.rubygems.configuration).to receive_messages(
-          :http_proxy => nil,
-          :ssl_client_cert => "cert",
-          :ssl_ca_cert => "ca"
-        )
-        expect(File).to receive(:read).and_return("")
-        expect(OpenSSL::X509::Certificate).to receive(:new).and_return("cert")
-        expect(OpenSSL::PKey::RSA).to receive(:new).and_return("key")
-        store = double("ca store")
-        expect(store).to receive(:add_file)
-        expect(OpenSSL::X509::Store).to receive(:new).and_return(store)
-      end
-      it "use gem configuration" do
-        expect(fetcher.send(:connection).cert).to eq("cert")
-        expect(fetcher.send(:connection).key).to eq("key")
-      end
-    end
-  end
-
-  describe "#user_agent" do
-    it "builds user_agent with current ruby version and Bundler settings" do
-      allow(Bundler.settings).to receive(:all).and_return(%w[foo bar])
-      expect(fetcher.user_agent).to match(%r{bundler/(\d.)})
-      expect(fetcher.user_agent).to match(%r{rubygems/(\d.)})
-      expect(fetcher.user_agent).to match(%r{ruby/(\d.)})
-      expect(fetcher.user_agent).to match(%r{options/foo,bar})
-    end
-
-    describe "include CI information" do
-      it "from one CI" do
-        with_env_vars("JENKINS_URL" => "foo") do
-          ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
-          expect(ci_part).to match("jenkins")
-        end
-      end
-
-      it "from many CI" do
-        with_env_vars("TRAVIS" => "foo", "CI_NAME" => "my_ci") do
-          ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
-          expect(ci_part).to match("travis")
-          expect(ci_part).to match("my_ci")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/friendly_errors_spec.rb b/spec/bundler/bundler/friendly_errors_spec.rb
deleted file mode 100644
index 2a1be491ef..0000000000
--- a/spec/bundler/bundler/friendly_errors_spec.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler"
-require "bundler/friendly_errors"
-require "cgi"
-
-RSpec.describe Bundler, "friendly errors" do
-  context "with invalid YAML in .gemrc" do
-    before do
-      File.open(Gem.configuration.config_file_name, "w") do |f|
-        f.write "invalid: yaml: hah"
-      end
-    end
-
-    after do
-      FileUtils.rm(Gem.configuration.config_file_name)
-    end
-
-    it "reports a relevant friendly error message", :ruby => ">= 1.9", :rubygems => "< 2.5.0" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle :install, :env => { "DEBUG" => true }
-
-      expect(out).to include("Your RubyGems configuration")
-      expect(out).to include("invalid YAML syntax")
-      expect(out).to include("Psych::SyntaxError")
-      expect(out).not_to include("ERROR REPORT TEMPLATE")
-      expect(exitstatus).to eq(25) if exitstatus
-    end
-
-    it "reports a relevant friendly error message", :ruby => ">= 1.9", :rubygems => ">= 2.5.0" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle :install, :env => { "DEBUG" => true }
-
-      expect(last_command.stderr).to include("Failed to load #{home(".gemrc")}")
-      expect(exitstatus).to eq(0) if exitstatus
-    end
-  end
-
-  it "calls log_error in case of exception" do
-    exception = Exception.new
-    expect(Bundler::FriendlyErrors).to receive(:exit_status).with(exception).and_return(1)
-    expect do
-      Bundler.with_friendly_errors do
-        raise exception
-      end
-    end.to raise_error(SystemExit)
-  end
-
-  it "calls exit_status on exception" do
-    exception = Exception.new
-    expect(Bundler::FriendlyErrors).to receive(:log_error).with(exception)
-    expect do
-      Bundler.with_friendly_errors do
-        raise exception
-      end
-    end.to raise_error(SystemExit)
-  end
-
-  describe "#log_error" do
-    shared_examples "Bundler.ui receive error" do |error, message|
-      it "" do
-        expect(Bundler.ui).to receive(:error).with(message || error.message)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    shared_examples "Bundler.ui receive trace" do |error|
-      it "" do
-        expect(Bundler.ui).to receive(:trace).with(error)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    context "YamlSyntaxError" do
-      it_behaves_like "Bundler.ui receive error", Bundler::YamlSyntaxError.new(StandardError.new, "sample_message")
-
-      it "Bundler.ui receive trace" do
-        std_error = StandardError.new
-        exception = Bundler::YamlSyntaxError.new(std_error, "sample_message")
-        expect(Bundler.ui).to receive(:trace).with(std_error)
-        Bundler::FriendlyErrors.log_error(exception)
-      end
-    end
-
-    context "Dsl::DSLError, GemspecError" do
-      it_behaves_like "Bundler.ui receive error", Bundler::Dsl::DSLError.new("description", "dsl_path", "backtrace")
-      it_behaves_like "Bundler.ui receive error", Bundler::GemspecError.new
-    end
-
-    context "GemRequireError" do
-      let(:orig_error) { StandardError.new }
-      let(:error) { Bundler::GemRequireError.new(orig_error, "sample_message") }
-
-      before do
-        allow(orig_error).to receive(:backtrace).and_return([])
-      end
-
-      it "Bundler.ui receive error" do
-        expect(Bundler.ui).to receive(:error).with(error.message)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-
-      it "writes to Bundler.ui.trace" do
-        expect(Bundler.ui).to receive(:trace).with(orig_error, nil, true)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    context "BundlerError" do
-      it "Bundler.ui receive error" do
-        error = Bundler::BundlerError.new
-        expect(Bundler.ui).to receive(:error).with(error.message, :wrap => true)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-      it_behaves_like "Bundler.ui receive trace", Bundler::BundlerError.new
-    end
-
-    context "Thor::Error" do
-      it_behaves_like "Bundler.ui receive error", Bundler::Thor::Error.new
-    end
-
-    context "LoadError" do
-      let(:error) { LoadError.new("cannot load such file -- openssl") }
-
-      it "Bundler.ui receive error" do
-        expect(Bundler.ui).to receive(:error).with("\nCould not load OpenSSL.")
-        Bundler::FriendlyErrors.log_error(error)
-      end
-
-      it "Bundler.ui receive warn" do
-        expect(Bundler.ui).to receive(:warn).with(any_args, :wrap => true)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-
-      it "Bundler.ui receive trace" do
-        expect(Bundler.ui).to receive(:trace).with(error)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    context "Interrupt" do
-      it "Bundler.ui receive error" do
-        expect(Bundler.ui).to receive(:error).with("\nQuitting...")
-        Bundler::FriendlyErrors.log_error(Interrupt.new)
-      end
-      it_behaves_like "Bundler.ui receive trace", Interrupt.new
-    end
-
-    context "Gem::InvalidSpecificationException" do
-      it "Bundler.ui receive error" do
-        error = Gem::InvalidSpecificationException.new
-        expect(Bundler.ui).to receive(:error).with(error.message, :wrap => true)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    context "SystemExit" do
-      # Does nothing
-    end
-
-    context "Java::JavaLang::OutOfMemoryError" do
-      module Java
-        module JavaLang
-          class OutOfMemoryError < StandardError; end
-        end
-      end
-
-      it "Bundler.ui receive error" do
-        error = Java::JavaLang::OutOfMemoryError.new
-        expect(Bundler.ui).to receive(:error).with(/JVM has run out of memory/)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-
-    context "unexpected error" do
-      it "calls request_issue_report_for with error" do
-        error = StandardError.new
-        expect(Bundler::FriendlyErrors).to receive(:request_issue_report_for).with(error)
-        Bundler::FriendlyErrors.log_error(error)
-      end
-    end
-  end
-
-  describe "#exit_status" do
-    it "calls status_code for BundlerError" do
-      error = Bundler::BundlerError.new
-      expect(error).to receive(:status_code).and_return("sample_status_code")
-      expect(Bundler::FriendlyErrors.exit_status(error)).to eq("sample_status_code")
-    end
-
-    it "returns 15 for Thor::Error" do
-      error = Bundler::Thor::Error.new
-      expect(Bundler::FriendlyErrors.exit_status(error)).to eq(15)
-    end
-
-    it "calls status for SystemExit" do
-      error = SystemExit.new
-      expect(error).to receive(:status).and_return("sample_status")
-      expect(Bundler::FriendlyErrors.exit_status(error)).to eq("sample_status")
-    end
-
-    it "returns 1 in other cases" do
-      error = StandardError.new
-      expect(Bundler::FriendlyErrors.exit_status(error)).to eq(1)
-    end
-  end
-
-  describe "#request_issue_report_for" do
-    it "calls relevant methods for Bundler.ui" do
-      expect(Bundler.ui).to receive(:info)
-      expect(Bundler.ui).to receive(:error)
-      expect(Bundler.ui).to receive(:warn)
-      Bundler::FriendlyErrors.request_issue_report_for(StandardError.new)
-    end
-
-    it "includes error class, message and backlog" do
-      error = StandardError.new
-      allow(Bundler::FriendlyErrors).to receive(:issues_url).and_return("")
-
-      expect(error).to receive(:class).at_least(:once)
-      expect(error).to receive(:message).at_least(:once)
-      expect(error).to receive(:backtrace).at_least(:once)
-      Bundler::FriendlyErrors.request_issue_report_for(error)
-    end
-  end
-
-  describe "#issues_url" do
-    it "generates a search URL for the exception message" do
-      exception = Exception.new("Exception message")
-
-      expect(Bundler::FriendlyErrors.issues_url(exception)).to eq("https://github.com/bundler/bundler/search?q=Exception+message&type=Issues")
-    end
-
-    it "generates a search URL for only the first line of a multi-line exception message" do
-      exception = Exception.new(<<END)
-First line of the exception message
-Second line of the exception message
-END
-
-      expect(Bundler::FriendlyErrors.issues_url(exception)).to eq("https://github.com/bundler/bundler/search?q=First+line+of+the+exception+message&type=Issues")
-    end
-
-    it "generates the url without colons" do
-      exception = Exception.new(<<END)
-Exception ::: with ::: colons :::
-END
-      issues_url = Bundler::FriendlyErrors.issues_url(exception)
-      expect(issues_url).not_to include("%3A")
-      expect(issues_url).to eq("https://github.com/bundler/bundler/search?q=#{CGI.escape("Exception     with     colons    ")}&type=Issues")
-    end
-
-    it "removes information after - for Errono::EACCES" do
-      exception = Exception.new(<<END)
-Errno::EACCES: Permission denied @ dir_s_mkdir - /Users/foo/bar/
-END
-      allow(exception).to receive(:is_a?).with(Errno).and_return(true)
-      issues_url = Bundler::FriendlyErrors.issues_url(exception)
-      expect(issues_url).not_to include("/Users/foo/bar")
-      expect(issues_url).to eq("https://github.com/bundler/bundler/search?q=#{CGI.escape("Errno  EACCES  Permission denied @ dir_s_mkdir ")}&type=Issues")
-    end
-  end
-end
diff --git a/spec/bundler/bundler/gem_helper_spec.rb b/spec/bundler/bundler/gem_helper_spec.rb
deleted file mode 100644
index a627129fe3..0000000000
--- a/spec/bundler/bundler/gem_helper_spec.rb
+++ /dev/null
@@ -1,351 +0,0 @@
-# frozen_string_literal: true
-
-require "rake"
-require "bundler/gem_helper"
-
-RSpec.describe Bundler::GemHelper do
-  let(:app_name) { "lorem__ipsum" }
-  let(:app_path) { bundled_app app_name }
-  let(:app_gemspec_path) { app_path.join("#{app_name}.gemspec") }
-
-  before(:each) do
-    global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
-    bundle "gem #{app_name}"
-  end
-
-  context "determining gemspec" do
-    subject { Bundler::GemHelper.new(app_path) }
-
-    context "fails" do
-      it "when there is no gemspec" do
-        FileUtils.rm app_gemspec_path
-        expect { subject }.to raise_error(/Unable to determine name/)
-      end
-
-      it "when there are two gemspecs and the name isn't specified" do
-        FileUtils.touch app_path.join("#{app_name}-2.gemspec")
-        expect { subject }.to raise_error(/Unable to determine name/)
-      end
-    end
-
-    context "interpolates the name" do
-      before do
-        # Remove exception that prevents public pushes on older RubyGems versions
-        if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.0")
-          content = File.read(app_gemspec_path)
-          content.sub!(/raise "RubyGems 2\.0 or newer.*/, "")
-          File.open(app_gemspec_path, "w") {|f| f.write(content) }
-        end
-      end
-
-      it "when there is only one gemspec" do
-        expect(subject.gemspec.name).to eq(app_name)
-      end
-
-      it "for a hidden gemspec" do
-        FileUtils.mv app_gemspec_path, app_path.join(".gemspec")
-        expect(subject.gemspec.name).to eq(app_name)
-      end
-    end
-
-    it "handles namespaces and converts them to CamelCase" do
-      bundle "gem #{app_name}-foo_bar"
-      underscore_path = bundled_app "#{app_name}-foo_bar"
-
-      lib = underscore_path.join("lib/#{app_name}/foo_bar.rb").read
-      expect(lib).to include("module LoremIpsum")
-      expect(lib).to include("module FooBar")
-    end
-  end
-
-  context "gem management" do
-    def mock_confirm_message(message)
-      expect(Bundler.ui).to receive(:confirm).with(message)
-    end
-
-    def mock_build_message(name, version)
-      message = "#{name} #{version} built to pkg/#{name}-#{version}.gem."
-      mock_confirm_message message
-    end
-
-    subject! { Bundler::GemHelper.new(app_path) }
-    let(:app_version) { "0.1.0" }
-    let(:app_gem_dir) { app_path.join("pkg") }
-    let(:app_gem_path) { app_gem_dir.join("#{app_name}-#{app_version}.gem") }
-    let(:app_gemspec_content) { remove_push_guard(File.read(app_gemspec_path)) }
-
-    before(:each) do
-      content = app_gemspec_content.gsub("TODO: ", "")
-      content.sub!(/homepage\s+= ".*"/, 'homepage = ""')
-      content.gsub!(/spec\.metadata.+\n/, "")
-      File.open(app_gemspec_path, "w") {|file| file << content }
-    end
-
-    def remove_push_guard(gemspec_content)
-      # Remove exception that prevents public pushes on older RubyGems versions
-      if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.0")
-        gemspec_content.sub!(/raise "RubyGems 2\.0 or newer.*/, "")
-      end
-      gemspec_content
-    end
-
-    it "uses a shell UI for output" do
-      expect(Bundler.ui).to be_a(Bundler::UI::Shell)
-    end
-
-    describe "#install" do
-      let!(:rake_application) { Rake.application }
-
-      before(:each) do
-        Rake.application = Rake::Application.new
-      end
-
-      after(:each) do
-        Rake.application = rake_application
-      end
-
-      context "defines Rake tasks" do
-        let(:task_names) do
-          %w[build install release release:guard_clean
-             release:source_control_push release:rubygem_push]
-        end
-
-        context "before installation" do
-          it "raises an error with appropriate message" do
-            task_names.each do |name|
-              expect { Rake.application[name] }.
-                to raise_error(/^Don't know how to build task '#{name}'/)
-            end
-          end
-        end
-
-        context "after installation" do
-          before do
-            subject.install
-          end
-
-          it "adds Rake tasks successfully" do
-            task_names.each do |name|
-              expect { Rake.application[name] }.not_to raise_error
-              expect(Rake.application[name]).to be_instance_of Rake::Task
-            end
-          end
-
-          it "provides a way to access the gemspec object" do
-            expect(subject.gemspec.name).to eq(app_name)
-          end
-        end
-      end
-    end
-
-    describe "#build_gem" do
-      context "when build failed" do
-        it "raises an error with appropriate message" do
-          # break the gemspec by adding back the TODOs
-          File.open(app_gemspec_path, "w") {|file| file << app_gemspec_content }
-          expect { subject.build_gem }.to raise_error(/TODO/)
-        end
-      end
-
-      context "when build was successful" do
-        it "creates .gem file" do
-          mock_build_message app_name, app_version
-          subject.build_gem
-          expect(app_gem_path).to exist
-        end
-      end
-    end
-
-    describe "#install_gem" do
-      context "when installation was successful" do
-        it "gem is installed" do
-          mock_build_message app_name, app_version
-          mock_confirm_message "#{app_name} (#{app_version}) installed."
-          subject.install_gem(nil, :local)
-          expect(app_gem_path).to exist
-          gem_command! :list
-          expect(out).to include("#{app_name} (#{app_version})")
-        end
-      end
-
-      context "when installation fails" do
-        it "raises an error with appropriate message" do
-          # create empty gem file in order to simulate install failure
-          allow(subject).to receive(:build_gem) do
-            FileUtils.mkdir_p(app_gem_dir)
-            FileUtils.touch app_gem_path
-            app_gem_path
-          end
-          expect { subject.install_gem }.to raise_error(/Couldn't install gem/)
-        end
-      end
-    end
-
-    describe "rake release" do
-      let!(:rake_application) { Rake.application }
-
-      before(:each) do
-        Rake.application = Rake::Application.new
-        subject.install
-      end
-
-      after(:each) do
-        Rake.application = rake_application
-      end
-
-      before do
-        Dir.chdir(app_path) do
-          `git init`
-          `git config user.email "you@example.com"`
-          `git config user.name "name"`
-          `git config push.default simple`
-        end
-
-        # silence messages
-        allow(Bundler.ui).to receive(:confirm)
-        allow(Bundler.ui).to receive(:error)
-      end
-
-      context "fails" do
-        it "when there are unstaged files" do
-          expect { Rake.application["release"].invoke }.
-            to raise_error("There are files that need to be committed first.")
-        end
-
-        it "when there are uncommitted files" do
-          Dir.chdir(app_path) { `git add .` }
-          expect { Rake.application["release"].invoke }.
-            to raise_error("There are files that need to be committed first.")
-        end
-
-        it "when there is no git remote" do
-          Dir.chdir(app_path) { `git commit -a -m "initial commit"` }
-          expect { Rake.application["release"].invoke }.to raise_error(RuntimeError)
-        end
-      end
-
-      context "succeeds" do
-        before do
-          Dir.chdir(gem_repo1) { `git init --bare` }
-          Dir.chdir(app_path) do
-            `git remote add origin file://#{gem_repo1}`
-            `git commit -a -m "initial commit"`
-          end
-        end
-
-        it "on releasing" do
-          mock_build_message app_name, app_version
-          mock_confirm_message "Tagged v#{app_version}."
-          mock_confirm_message "Pushed git commits and tags."
-          expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
-
-          Dir.chdir(app_path) { sys_exec("git push -u origin master") }
-
-          Rake.application["release"].invoke
-        end
-
-        it "even if tag already exists" do
-          mock_build_message app_name, app_version
-          mock_confirm_message "Tag v#{app_version} has already been created."
-          expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
-
-          Dir.chdir(app_path) do
-            `git tag -a -m \"Version #{app_version}\" v#{app_version}`
-          end
-
-          Rake.application["release"].invoke
-        end
-      end
-    end
-
-    describe "release:rubygem_push" do
-      let!(:rake_application) { Rake.application }
-
-      before(:each) do
-        Rake.application = Rake::Application.new
-        subject.install
-        allow(subject).to receive(:sh)
-      end
-
-      after(:each) do
-        Rake.application = rake_application
-      end
-
-      before do
-        Dir.chdir(app_path) do
-          `git init`
-          `git config user.email "you@example.com"`
-          `git config user.name "name"`
-          `git config push.default simple`
-        end
-
-        # silence messages
-        allow(Bundler.ui).to receive(:confirm)
-        allow(Bundler.ui).to receive(:error)
-
-        credentials = double("credentials", "file?" => true)
-        allow(Bundler.user_home).to receive(:join).
-          with(".gem/credentials").and_return(credentials)
-      end
-
-      describe "success messaging" do
-        context "No allowed_push_host set" do
-          before do
-            allow(subject).to receive(:allowed_push_host).and_return(nil)
-          end
-
-          around do |example|
-            orig_host = ENV["RUBYGEMS_HOST"]
-            ENV["RUBYGEMS_HOST"] = rubygems_host_env
-
-            example.run
-
-            ENV["RUBYGEMS_HOST"] = orig_host
-          end
-
-          context "RUBYGEMS_HOST env var is set" do
-            let(:rubygems_host_env) { "https://custom.env.gemhost.com" }
-
-            it "should report successful push to the host from the environment" do
-              mock_confirm_message "Pushed #{app_name} #{app_version} to #{rubygems_host_env}"
-
-              Rake.application["release:rubygem_push"].invoke
-            end
-          end
-
-          context "RUBYGEMS_HOST env var is not set" do
-            let(:rubygems_host_env) { nil }
-
-            it "should report successful push to rubygems.org" do
-              mock_confirm_message "Pushed #{app_name} #{app_version} to rubygems.org"
-
-              Rake.application["release:rubygem_push"].invoke
-            end
-          end
-
-          context "RUBYGEMS_HOST env var is an empty string" do
-            let(:rubygems_host_env) { "" }
-
-            it "should report successful push to rubygems.org" do
-              mock_confirm_message "Pushed #{app_name} #{app_version} to rubygems.org"
-
-              Rake.application["release:rubygem_push"].invoke
-            end
-          end
-        end
-
-        context "allowed_push_host set in gemspec" do
-          before do
-            allow(subject).to receive(:allowed_push_host).and_return("https://my.gemhost.com")
-          end
-
-          it "should report successful push to the allowed gem host" do
-            mock_confirm_message "Pushed #{app_name} #{app_version} to https://my.gemhost.com"
-
-            Rake.application["release:rubygem_push"].invoke
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/gem_version_promoter_spec.rb b/spec/bundler/bundler/gem_version_promoter_spec.rb
deleted file mode 100644
index 01e0232fba..0000000000
--- a/spec/bundler/bundler/gem_version_promoter_spec.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::GemVersionPromoter do
-  context "conservative resolver" do
-    def versions(result)
-      result.flatten.map(&:version).map(&:to_s)
-    end
-
-    def make_instance(*args)
-      @gvp = Bundler::GemVersionPromoter.new(*args).tap do |gvp|
-        gvp.class.class_eval { public :filter_dep_specs, :sort_dep_specs }
-      end
-    end
-
-    def unlocking(options)
-      make_instance(Bundler::SpecSet.new([]), ["foo"]).tap do |p|
-        p.level = options[:level] if options[:level]
-        p.strict = options[:strict] if options[:strict]
-      end
-    end
-
-    def keep_locked(options)
-      make_instance(Bundler::SpecSet.new([]), ["bar"]).tap do |p|
-        p.level = options[:level] if options[:level]
-        p.strict = options[:strict] if options[:strict]
-      end
-    end
-
-    def build_spec_groups(name, versions)
-      versions.map do |v|
-        Bundler::Resolver::SpecGroup.new(build_spec(name, v))
-      end
-    end
-
-    # Rightmost (highest array index) in result is most preferred.
-    # Leftmost (lowest array index) in result is least preferred.
-    # `build_spec_groups` has all versions of gem in index.
-    # `build_spec` is the version currently in the .lock file.
-    #
-    # In default (not strict) mode, all versions in the index will
-    # be returned, allowing Bundler the best chance to resolve all
-    # dependencies, but sometimes resulting in upgrades that some
-    # would not consider conservative.
-    context "filter specs (strict) level patch" do
-      it "when keeping build_spec, keep current, next release" do
-        keep_locked(:level => :patch)
-        res = @gvp.filter_dep_specs(
-          build_spec_groups("foo", %w[1.7.8 1.7.9 1.8.0]),
-          build_spec("foo", "1.7.8").first
-        )
-        expect(versions(res)).to eq %w[1.7.9 1.7.8]
-      end
-
-      it "when unlocking prefer next release first" do
-        unlocking(:level => :patch)
-        res = @gvp.filter_dep_specs(
-          build_spec_groups("foo", %w[1.7.8 1.7.9 1.8.0]),
-          build_spec("foo", "1.7.8").first
-        )
-        expect(versions(res)).to eq %w[1.7.8 1.7.9]
-      end
-
-      it "when unlocking keep current when already at latest release" do
-        unlocking(:level => :patch)
-        res = @gvp.filter_dep_specs(
-          build_spec_groups("foo", %w[1.7.9 1.8.0 2.0.0]),
-          build_spec("foo", "1.7.9").first
-        )
-        expect(versions(res)).to eq %w[1.7.9]
-      end
-    end
-
-    context "filter specs (strict) level minor" do
-      it "when unlocking favor next releases, remove minor and major increases" do
-        unlocking(:level => :minor)
-        res = @gvp.filter_dep_specs(
-          build_spec_groups("foo", %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.0 2.0.1]),
-          build_spec("foo", "0.2.0").first
-        )
-        expect(versions(res)).to eq %w[0.2.0 0.3.0 0.3.1 0.9.0]
-      end
-
-      it "when keep locked, keep current, then favor next release, remove minor and major increases" do
-        keep_locked(:level => :minor)
-        res = @gvp.filter_dep_specs(
-          build_spec_groups("foo", %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.0 2.0.1]),
-          build_spec("foo", "0.2.0").first
-        )
-        expect(versions(res)).to eq %w[0.3.0 0.3.1 0.9.0 0.2.0]
-      end
-    end
-
-    context "sort specs (not strict) level patch" do
-      it "when not unlocking, same order but make sure build_spec version is most preferred to stay put" do
-        keep_locked(:level => :patch)
-        res = @gvp.sort_dep_specs(
-          build_spec_groups("foo", %w[1.5.4 1.6.5 1.7.6 1.7.7 1.7.8 1.7.9 1.8.0 1.8.1 2.0.0 2.0.1]),
-          build_spec("foo", "1.7.7").first
-        )
-        expect(versions(res)).to eq %w[1.5.4 1.6.5 1.7.6 2.0.0 2.0.1 1.8.0 1.8.1 1.7.8 1.7.9 1.7.7]
-      end
-
-      it "when unlocking favor next release, then current over minor increase" do
-        unlocking(:level => :patch)
-        res = @gvp.sort_dep_specs(
-          build_spec_groups("foo", %w[1.7.7 1.7.8 1.7.9 1.8.0]),
-          build_spec("foo", "1.7.8").first
-        )
-        expect(versions(res)).to eq %w[1.7.7 1.8.0 1.7.8 1.7.9]
-      end
-
-      it "when unlocking do proper integer comparison, not string" do
-        unlocking(:level => :patch)
-        res = @gvp.sort_dep_specs(
-          build_spec_groups("foo", %w[1.7.7 1.7.8 1.7.9 1.7.15 1.8.0]),
-          build_spec("foo", "1.7.8").first
-        )
-        expect(versions(res)).to eq %w[1.7.7 1.8.0 1.7.8 1.7.9 1.7.15]
-      end
-
-      it "leave current when unlocking but already at latest release" do
-        unlocking(:level => :patch)
-        res = @gvp.sort_dep_specs(
-          build_spec_groups("foo", %w[1.7.9 1.8.0 2.0.0]),
-          build_spec("foo", "1.7.9").first
-        )
-        expect(versions(res)).to eq %w[2.0.0 1.8.0 1.7.9]
-      end
-    end
-
-    context "sort specs (not strict) level minor" do
-      it "when unlocking favor next release, then minor increase over current" do
-        unlocking(:level => :minor)
-        res = @gvp.sort_dep_specs(
-          build_spec_groups("foo", %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.0 2.0.1]),
-          build_spec("foo", "0.2.0").first
-        )
-        expect(versions(res)).to eq %w[2.0.0 2.0.1 1.0.0 0.2.0 0.3.0 0.3.1 0.9.0]
-      end
-    end
-
-    context "level error handling" do
-      subject { Bundler::GemVersionPromoter.new }
-
-      it "should raise if not major, minor or patch is passed" do
-        expect { subject.level = :minjor }.to raise_error ArgumentError
-      end
-
-      it "should raise if invalid classes passed" do
-        [123, nil].each do |value|
-          expect { subject.level = value }.to raise_error ArgumentError
-        end
-      end
-
-      it "should accept major, minor patch symbols" do
-        [:major, :minor, :patch].each do |value|
-          subject.level = value
-          expect(subject.level).to eq value
-        end
-      end
-
-      it "should accept major, minor patch strings" do
-        %w[major minor patch].each do |value|
-          subject.level = value
-          expect(subject.level).to eq value.to_sym
-        end
-      end
-    end
-
-    context "debug output" do
-      it "should not kerblooie on its own debug output" do
-        gvp = unlocking(:level => :patch)
-        dep = Bundler::DepProxy.new(dep("foo", "1.2.0").first, "ruby")
-        result = gvp.send(:debug_format_result, dep, build_spec_groups("foo", %w[1.2.0 1.3.0]))
-        expect(result.class).to eq Array
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/index_spec.rb b/spec/bundler/bundler/index_spec.rb
deleted file mode 100644
index 0f3f6e4944..0000000000
--- a/spec/bundler/bundler/index_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Index do
-  let(:specs) { [] }
-  subject { described_class.build {|i| i.use(specs) } }
-
-  context "specs with a nil platform" do
-    let(:spec) do
-      Gem::Specification.new do |s|
-        s.name = "json"
-        s.version = "1.8.3"
-        allow(s).to receive(:platform).and_return(nil)
-      end
-    end
-    let(:specs) { [spec] }
-
-    describe "#search_by_spec" do
-      it "finds the spec when a nil platform is specified" do
-        expect(subject.search(spec)).to eq([spec])
-      end
-
-      it "finds the spec when a ruby platform is specified" do
-        query = spec.dup.tap {|s| s.platform = "ruby" }
-        expect(subject.search(query)).to eq([spec])
-      end
-    end
-  end
-
-  context "with specs that include development dependencies" do
-    let(:specs) { [*build_spec("a", "1.0.0") {|s| s.development("b", "~> 1.0") }] }
-
-    it "does not include b in #dependency_names" do
-      expect(subject.dependency_names).not_to include("b")
-    end
-  end
-end
diff --git a/spec/bundler/bundler/installer/gem_installer_spec.rb b/spec/bundler/bundler/installer/gem_installer_spec.rb
deleted file mode 100644
index 7340a3acc0..0000000000
--- a/spec/bundler/bundler/installer/gem_installer_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/installer/gem_installer"
-
-RSpec.describe Bundler::GemInstaller do
-  let(:installer) { instance_double("Installer") }
-  let(:spec_source) { instance_double("SpecSource") }
-  let(:spec) { instance_double("Specification", :name => "dummy", :version => "0.0.1", :loaded_from => "dummy", :source => spec_source) }
-
-  subject { described_class.new(spec, installer) }
-
-  context "spec_settings is nil" do
-    it "invokes install method with empty build_args", :rubygems => ">= 2" do
-      allow(spec_source).to receive(:install).with(spec, :force => false, :ensure_builtin_gems_cached => false, :build_args => [])
-      subject.install_from_spec
-    end
-  end
-
-  context "spec_settings is build option" do
-    it "invokes install method with build_args", :rubygems => ">= 2" do
-      allow(Bundler.settings).to receive(:[]).with(:bin)
-      allow(Bundler.settings).to receive(:[]).with(:inline)
-      allow(Bundler.settings).to receive(:[]).with(:forget_cli_options)
-      allow(Bundler.settings).to receive(:[]).with("build.dummy").and_return("--with-dummy-config=dummy")
-      expect(spec_source).to receive(:install).with(spec, :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy"])
-      subject.install_from_spec
-    end
-  end
-end
diff --git a/spec/bundler/bundler/installer/parallel_installer_spec.rb b/spec/bundler/bundler/installer/parallel_installer_spec.rb
deleted file mode 100644
index ace5c1a23a..0000000000
--- a/spec/bundler/bundler/installer/parallel_installer_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/installer/parallel_installer"
-
-RSpec.describe Bundler::ParallelInstaller do
-  let(:installer) { instance_double("Installer") }
-  let(:all_specs) { [] }
-  let(:size) { 1 }
-  let(:standalone) { false }
-  let(:force) { false }
-
-  subject { described_class.new(installer, all_specs, size, standalone, force) }
-
-  context "when dependencies that are not on the overall installation list are the only ones not installed" do
-    let(:all_specs) do
-      [
-        build_spec("alpha", "1.0") {|s| s.runtime "a", "1" },
-      ].flatten
-    end
-
-    it "prints a warning" do
-      expect(Bundler.ui).to receive(:warn).with(<<-W.strip)
-Your lockfile was created by an old Bundler that left some things out.
-You can fix this by adding the missing gems to your Gemfile, running bundle install, and then removing the gems from your Gemfile.
-The missing gems are:
-* a depended upon by alpha
-      W
-      subject.check_for_corrupt_lockfile
-    end
-
-    context "when size > 1" do
-      let(:size) { 500 }
-
-      it "prints a warning and sets size to 1" do
-        expect(Bundler.ui).to receive(:warn).with(<<-W.strip)
-Your lockfile was created by an old Bundler that left some things out.
-Because of the missing DEPENDENCIES, we can only install gems one at a time, instead of installing 500 at a time.
-You can fix this by adding the missing gems to your Gemfile, running bundle install, and then removing the gems from your Gemfile.
-The missing gems are:
-* a depended upon by alpha
-        W
-        subject.check_for_corrupt_lockfile
-        expect(subject.size).to eq(1)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/installer/spec_installation_spec.rb b/spec/bundler/bundler/installer/spec_installation_spec.rb
deleted file mode 100644
index a9cf09a372..0000000000
--- a/spec/bundler/bundler/installer/spec_installation_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/installer/parallel_installer"
-
-RSpec.describe Bundler::ParallelInstaller::SpecInstallation do
-  let!(:dep) do
-    a_spec = Object.new
-    def a_spec.name
-      "I like tests"
-    end
-    a_spec
-  end
-
-  describe "#ready_to_enqueue?" do
-    context "when in enqueued state" do
-      it "is falsey" do
-        spec = described_class.new(dep)
-        spec.state = :enqueued
-        expect(spec.ready_to_enqueue?).to be_falsey
-      end
-    end
-
-    context "when in installed state" do
-      it "returns falsey" do
-        spec = described_class.new(dep)
-        spec.state = :installed
-        expect(spec.ready_to_enqueue?).to be_falsey
-      end
-    end
-
-    it "returns truthy" do
-      spec = described_class.new(dep)
-      expect(spec.ready_to_enqueue?).to be_truthy
-    end
-  end
-
-  describe "#dependencies_installed?" do
-    context "when all dependencies are installed" do
-      it "returns true" do
-        dependencies = []
-        dependencies << instance_double("SpecInstallation", :spec => "alpha", :name => "alpha", :installed? => true, :all_dependencies => [], :type => :production)
-        dependencies << instance_double("SpecInstallation", :spec => "beta", :name => "beta", :installed? => true, :all_dependencies => [], :type => :production)
-        all_specs = dependencies + [instance_double("SpecInstallation", :spec => "gamma", :name => "gamma", :installed? => false, :all_dependencies => [], :type => :production)]
-        spec = described_class.new(dep)
-        allow(spec).to receive(:all_dependencies).and_return(dependencies)
-        expect(spec.dependencies_installed?(all_specs)).to be_truthy
-      end
-    end
-
-    context "when all dependencies are not installed" do
-      it "returns false" do
-        dependencies = []
-        dependencies << instance_double("SpecInstallation", :spec => "alpha", :name => "alpha", :installed? => false, :all_dependencies => [], :type => :production)
-        dependencies << instance_double("SpecInstallation", :spec => "beta", :name => "beta", :installed? => true, :all_dependencies => [], :type => :production)
-        all_specs = dependencies + [instance_double("SpecInstallation", :spec => "gamma", :name => "gamma", :installed? => false, :all_dependencies => [], :type => :production)]
-        spec = described_class.new(dep)
-        allow(spec).to receive(:all_dependencies).and_return(dependencies)
-        expect(spec.dependencies_installed?(all_specs)).to be_falsey
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/lockfile_parser_spec.rb b/spec/bundler/bundler/lockfile_parser_spec.rb
deleted file mode 100644
index 3a6d61336f..0000000000
--- a/spec/bundler/bundler/lockfile_parser_spec.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/lockfile_parser"
-
-RSpec.describe Bundler::LockfileParser do
-  let(:lockfile_contents) { strip_whitespace(<<-L) }
-    GIT
-      remote: https://github.com/alloy/peiji-san.git
-      revision: eca485d8dc95f12aaec1a434b49d295c7e91844b
-      specs:
-        peiji-san (1.2.0)
-
-    GEM
-      remote: https://rubygems.org/
-      specs:
-        rake (10.3.2)
-
-    PLATFORMS
-      ruby
-
-    DEPENDENCIES
-      peiji-san!
-      rake
-
-    RUBY VERSION
-       ruby 2.1.3p242
-
-    BUNDLED WITH
-       1.12.0.rc.2
-  L
-
-  describe ".sections_in_lockfile" do
-    it "returns the attributes" do
-      attributes = described_class.sections_in_lockfile(lockfile_contents)
-      expect(attributes).to contain_exactly(
-        "BUNDLED WITH", "DEPENDENCIES", "GEM", "GIT", "PLATFORMS", "RUBY VERSION"
-      )
-    end
-  end
-
-  describe ".unknown_sections_in_lockfile" do
-    let(:lockfile_contents) { strip_whitespace(<<-L) }
-      UNKNOWN ATTR
-
-      UNKNOWN ATTR 2
-        random contents
-    L
-
-    it "returns the unknown attributes" do
-      attributes = described_class.unknown_sections_in_lockfile(lockfile_contents)
-      expect(attributes).to contain_exactly("UNKNOWN ATTR", "UNKNOWN ATTR 2")
-    end
-  end
-
-  describe ".sections_to_ignore" do
-    subject { described_class.sections_to_ignore(base_version) }
-
-    context "with a nil base version" do
-      let(:base_version) { nil }
-
-      it "returns the same as > 1.0" do
-        expect(subject).to contain_exactly(
-          described_class::BUNDLED, described_class::RUBY, described_class::PLUGIN
-        )
-      end
-    end
-
-    context "with a prerelease base version" do
-      let(:base_version) { Gem::Version.create("1.11.0.rc.1") }
-
-      it "returns the same as for the release version" do
-        expect(subject).to contain_exactly(
-          described_class::RUBY, described_class::PLUGIN
-        )
-      end
-    end
-
-    context "with a current version" do
-      let(:base_version) { Gem::Version.create(Bundler::VERSION) }
-
-      it "returns an empty array" do
-        expect(subject).to eq([])
-      end
-    end
-
-    context "with a future version" do
-      let(:base_version) { Gem::Version.create("5.5.5") }
-
-      it "returns an empty array" do
-        expect(subject).to eq([])
-      end
-    end
-  end
-
-  describe "#initialize" do
-    before { allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app("gems.rb")) }
-    subject { described_class.new(lockfile_contents) }
-
-    let(:sources) do
-      [Bundler::Source::Git.new("uri" => "https://github.com/alloy/peiji-san.git", "revision" => "eca485d8dc95f12aaec1a434b49d295c7e91844b"),
-       Bundler::Source::Rubygems.new("remotes" => ["https://rubygems.org"])]
-    end
-    let(:dependencies) do
-      {
-        "peiji-san" => Bundler::Dependency.new("peiji-san", ">= 0"),
-        "rake" => Bundler::Dependency.new("rake", ">= 0"),
-      }
-    end
-    let(:specs) do
-      [
-        Bundler::LazySpecification.new("peiji-san", v("1.2.0"), rb),
-        Bundler::LazySpecification.new("rake", v("10.3.2"), rb),
-      ]
-    end
-    let(:platforms) { [rb] }
-    let(:bundler_version) { Gem::Version.new("1.12.0.rc.2") }
-    let(:ruby_version) { "ruby 2.1.3p242" }
-
-    shared_examples_for "parsing" do
-      it "parses correctly" do
-        expect(subject.sources).to eq sources
-        expect(subject.dependencies).to eq dependencies
-        expect(subject.specs).to eq specs
-        expect(Hash[subject.specs.map {|s| [s, s.dependencies] }]).to eq Hash[subject.specs.map {|s| [s, s.dependencies] }]
-        expect(subject.platforms).to eq platforms
-        expect(subject.bundler_version).to eq bundler_version
-        expect(subject.ruby_version).to eq ruby_version
-      end
-    end
-
-    include_examples "parsing"
-
-    context "when an extra section is at the end" do
-      let(:lockfile_contents) { super() + "\n\nFOO BAR\n  baz\n   baa\n    qux\n" }
-      include_examples "parsing"
-    end
-
-    context "when an extra section is at the start" do
-      let(:lockfile_contents) { "FOO BAR\n  baz\n   baa\n    qux\n\n" + super() }
-      include_examples "parsing"
-    end
-
-    context "when an extra section is in the middle" do
-      let(:lockfile_contents) { super().split(/(?=GEM)/).insert(1, "FOO BAR\n  baz\n   baa\n    qux\n\n").join }
-      include_examples "parsing"
-    end
-
-    context "when a dependency has options" do
-      let(:lockfile_contents) { super().sub("peiji-san!", "peiji-san!\n    foo: bar") }
-      include_examples "parsing"
-    end
-  end
-end
diff --git a/spec/bundler/bundler/mirror_spec.rb b/spec/bundler/bundler/mirror_spec.rb
deleted file mode 100644
index acd0895f2f..0000000000
--- a/spec/bundler/bundler/mirror_spec.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/mirror"
-
-RSpec.describe Bundler::Settings::Mirror do
-  let(:mirror) { Bundler::Settings::Mirror.new }
-
-  it "returns zero when fallback_timeout is not set" do
-    expect(mirror.fallback_timeout).to eq(0)
-  end
-
-  it "takes a number as a fallback_timeout" do
-    mirror.fallback_timeout = 1
-    expect(mirror.fallback_timeout).to eq(1)
-  end
-
-  it "takes truthy as a default fallback timeout" do
-    mirror.fallback_timeout = true
-    expect(mirror.fallback_timeout).to eq(0.1)
-  end
-
-  it "takes falsey as a zero fallback timeout" do
-    mirror.fallback_timeout = false
-    expect(mirror.fallback_timeout).to eq(0)
-  end
-
-  it "takes a string with 'true' as a default fallback timeout" do
-    mirror.fallback_timeout = "true"
-    expect(mirror.fallback_timeout).to eq(0.1)
-  end
-
-  it "takes a string with 'false' as a zero fallback timeout" do
-    mirror.fallback_timeout = "false"
-    expect(mirror.fallback_timeout).to eq(0)
-  end
-
-  it "takes a string for the uri but returns an uri object" do
-    mirror.uri = "http://localhost:9292"
-    expect(mirror.uri).to eq(URI("http://localhost:9292"))
-  end
-
-  it "takes an uri object for the uri" do
-    mirror.uri = URI("http://localhost:9293")
-    expect(mirror.uri).to eq(URI("http://localhost:9293"))
-  end
-
-  context "without a uri" do
-    it "invalidates the mirror" do
-      mirror.validate!
-      expect(mirror.valid?).to be_falsey
-    end
-  end
-
-  context "with an uri" do
-    before { mirror.uri = "http://localhost:9292" }
-
-    context "without a fallback timeout" do
-      it "is not valid by default" do
-        expect(mirror.valid?).to be_falsey
-      end
-
-      context "when probed" do
-        let(:probe) { double }
-
-        context "with a replying mirror" do
-          before do
-            allow(probe).to receive(:replies?).and_return(true)
-            mirror.validate!(probe)
-          end
-
-          it "is valid" do
-            expect(mirror.valid?).to be_truthy
-          end
-        end
-
-        context "with a non replying mirror" do
-          before do
-            allow(probe).to receive(:replies?).and_return(false)
-            mirror.validate!(probe)
-          end
-
-          it "is still valid" do
-            expect(mirror.valid?).to be_truthy
-          end
-        end
-      end
-    end
-
-    context "with a fallback timeout" do
-      before { mirror.fallback_timeout = 1 }
-
-      it "is not valid by default" do
-        expect(mirror.valid?).to be_falsey
-      end
-
-      context "when probed" do
-        let(:probe) { double }
-
-        context "with a replying mirror" do
-          before do
-            allow(probe).to receive(:replies?).and_return(true)
-            mirror.validate!(probe)
-          end
-
-          it "is valid" do
-            expect(mirror.valid?).to be_truthy
-          end
-
-          it "is validated only once" do
-            allow(probe).to receive(:replies?).and_raise("Only once!")
-            mirror.validate!(probe)
-            expect(mirror.valid?).to be_truthy
-          end
-        end
-
-        context "with a non replying mirror" do
-          before do
-            allow(probe).to receive(:replies?).and_return(false)
-            mirror.validate!(probe)
-          end
-
-          it "is not valid" do
-            expect(mirror.valid?).to be_falsey
-          end
-
-          it "is validated only once" do
-            allow(probe).to receive(:replies?).and_raise("Only once!")
-            mirror.validate!(probe)
-            expect(mirror.valid?).to be_falsey
-          end
-        end
-      end
-    end
-
-    describe "#==" do
-      it "returns true if uri and fallback timeout are the same" do
-        uri = "https://ruby.taobao.org"
-        mirror = Bundler::Settings::Mirror.new(uri, 1)
-        another_mirror = Bundler::Settings::Mirror.new(uri, 1)
-
-        expect(mirror == another_mirror).to be true
-      end
-    end
-  end
-end
-
-RSpec.describe Bundler::Settings::Mirrors do
-  let(:localhost_uri) { URI("http://localhost:9292") }
-
-  context "with a just created mirror" do
-    let(:mirrors) do
-      probe = double
-      allow(probe).to receive(:replies?).and_return(true)
-      Bundler::Settings::Mirrors.new(probe)
-    end
-
-    it "returns a mirror that contains the source uri for an unknown uri" do
-      mirror = mirrors.for("http://rubygems.org/")
-      expect(mirror).to eq(Bundler::Settings::Mirror.new("http://rubygems.org/"))
-    end
-
-    it "parses a mirror key and returns a mirror for the parsed uri" do
-      mirrors.parse("mirror.http://rubygems.org/", localhost_uri)
-      expect(mirrors.for("http://rubygems.org/").uri).to eq(localhost_uri)
-    end
-
-    it "parses a relative mirror key and returns a mirror for the parsed http uri" do
-      mirrors.parse("mirror.rubygems.org", localhost_uri)
-      expect(mirrors.for("http://rubygems.org/").uri).to eq(localhost_uri)
-    end
-
-    it "parses a relative mirror key and returns a mirror for the parsed https uri" do
-      mirrors.parse("mirror.rubygems.org", localhost_uri)
-      expect(mirrors.for("https://rubygems.org/").uri).to eq(localhost_uri)
-    end
-
-    context "with a uri parsed already" do
-      before { mirrors.parse("mirror.http://rubygems.org/", localhost_uri) }
-
-      it "takes a mirror fallback_timeout and assigns the timeout" do
-        mirrors.parse("mirror.http://rubygems.org.fallback_timeout", "2")
-        expect(mirrors.for("http://rubygems.org/").fallback_timeout).to eq(2)
-      end
-
-      it "parses a 'true' fallback timeout and sets the default timeout" do
-        mirrors.parse("mirror.http://rubygems.org.fallback_timeout", "true")
-        expect(mirrors.for("http://rubygems.org/").fallback_timeout).to eq(0.1)
-      end
-
-      it "parses a 'false' fallback timeout and sets it to zero" do
-        mirrors.parse("mirror.http://rubygems.org.fallback_timeout", "false")
-        expect(mirrors.for("http://rubygems.org/").fallback_timeout).to eq(0)
-      end
-    end
-  end
-
-  context "with a mirror prober that replies on time" do
-    let(:mirrors) do
-      probe = double
-      allow(probe).to receive(:replies?).and_return(true)
-      Bundler::Settings::Mirrors.new(probe)
-    end
-
-    context "with a default fallback_timeout for rubygems.org" do
-      before do
-        mirrors.parse("mirror.http://rubygems.org/", localhost_uri)
-        mirrors.parse("mirror.http://rubygems.org.fallback_timeout", "true")
-      end
-
-      it "returns localhost" do
-        expect(mirrors.for("http://rubygems.org").uri).to eq(localhost_uri)
-      end
-    end
-
-    context "with a mirror for all" do
-      before do
-        mirrors.parse("mirror.all", localhost_uri)
-      end
-
-      context "without a fallback timeout" do
-        it "returns localhost uri for rubygems" do
-          expect(mirrors.for("http://rubygems.org").uri).to eq(localhost_uri)
-        end
-
-        it "returns localhost for any other url" do
-          expect(mirrors.for("http://whatever.com/").uri).to eq(localhost_uri)
-        end
-      end
-      context "with a fallback timeout" do
-        before { mirrors.parse("mirror.all.fallback_timeout", "1") }
-
-        it "returns localhost uri for rubygems" do
-          expect(mirrors.for("http://rubygems.org").uri).to eq(localhost_uri)
-        end
-
-        it "returns localhost for any other url" do
-          expect(mirrors.for("http://whatever.com/").uri).to eq(localhost_uri)
-        end
-      end
-    end
-  end
-
-  context "with a mirror prober that does not reply on time" do
-    let(:mirrors) do
-      probe = double
-      allow(probe).to receive(:replies?).and_return(false)
-      Bundler::Settings::Mirrors.new(probe)
-    end
-
-    context "with a localhost mirror for all" do
-      before { mirrors.parse("mirror.all", localhost_uri) }
-
-      context "without a fallback timeout" do
-        it "returns localhost" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(localhost_uri)
-        end
-      end
-
-      context "with a fallback timeout" do
-        before { mirrors.parse("mirror.all.fallback_timeout", "true") }
-
-        it "returns the source uri, not localhost" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(URI("http://whatever.com/"))
-        end
-      end
-    end
-
-    context "with localhost as a mirror for rubygems.org" do
-      before { mirrors.parse("mirror.http://rubygems.org/", localhost_uri) }
-
-      context "without a fallback timeout" do
-        it "returns the uri that is not mirrored" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(URI("http://whatever.com/"))
-        end
-
-        it "returns localhost for rubygems.org" do
-          expect(mirrors.for("http://rubygems.org/").uri).to eq(localhost_uri)
-        end
-      end
-
-      context "with a fallback timeout" do
-        before { mirrors.parse("mirror.http://rubygems.org/.fallback_timeout", "true") }
-
-        it "returns the uri that is not mirrored" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(URI("http://whatever.com/"))
-        end
-
-        it "returns rubygems.org for rubygems.org" do
-          expect(mirrors.for("http://rubygems.org/").uri).to eq(URI("http://rubygems.org/"))
-        end
-      end
-    end
-  end
-end
-
-RSpec.describe Bundler::Settings::TCPSocketProbe do
-  let(:probe) { Bundler::Settings::TCPSocketProbe.new }
-
-  context "with a listening TCP Server" do
-    def with_server_and_mirror
-      server = TCPServer.new("127.0.0.1", 0)
-      mirror = Bundler::Settings::Mirror.new("http://localhost:#{server.addr[1]}", 1)
-      yield server, mirror
-      server.close unless server.closed?
-    end
-
-    it "probes the server correctly", :ruby_repo do
-      with_server_and_mirror do |server, mirror|
-        expect(server.closed?).to be_falsey
-        expect(probe.replies?(mirror)).to be_truthy
-      end
-    end
-
-    it "probes falsey when the server is down" do
-      with_server_and_mirror do |server, mirror|
-        server.close
-        expect(probe.replies?(mirror)).to be_falsey
-      end
-    end
-  end
-
-  context "with an invalid mirror" do
-    let(:mirror) { Bundler::Settings::Mirror.new("http://127.0.0.127:9292", true) }
-
-    it "fails with a timeout when there is nothing to tcp handshake" do
-      expect(probe.replies?(mirror)).to be_falsey
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/api/source_spec.rb b/spec/bundler/bundler/plugin/api/source_spec.rb
deleted file mode 100644
index 2c50ff56a4..0000000000
--- a/spec/bundler/bundler/plugin/api/source_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::API::Source do
-  let(:uri) { "uri://to/test" }
-  let(:type) { "spec_type" }
-
-  subject(:source) do
-    klass = Class.new
-    klass.send :include, Bundler::Plugin::API::Source
-    klass.new("uri" => uri, "type" => type)
-  end
-
-  describe "attributes" do
-    it "allows access to uri" do
-      expect(source.uri).to eq("uri://to/test")
-    end
-
-    it "allows access to name" do
-      expect(source.name).to eq("spec_type at uri://to/test")
-    end
-  end
-
-  context "post_install" do
-    let(:installer) { double(:installer) }
-
-    before do
-      allow(Bundler::Source::Path::Installer).to receive(:new) { installer }
-    end
-
-    it "calls Path::Installer's post_install" do
-      expect(installer).to receive(:post_install).once
-
-      source.post_install(double(:spec))
-    end
-  end
-
-  context "install_path" do
-    let(:uri) { "uri://to/a/repository-name" }
-    let(:hash) { Digest(:SHA1).hexdigest(uri) }
-    let(:install_path) { Pathname.new "/bundler/install/path" }
-
-    before do
-      allow(Bundler).to receive(:install_path) { install_path }
-    end
-
-    it "returns basename with uri_hash" do
-      expected = Pathname.new "#{install_path}/repository-name-#{hash[0..11]}"
-      expect(source.install_path).to eq(expected)
-    end
-  end
-
-  context "to_lock" do
-    it "returns the string with remote and type" do
-      expected = strip_whitespace <<-L
-        PLUGIN SOURCE
-          remote: #{uri}
-          type: #{type}
-          specs:
-      L
-
-      expect(source.to_lock).to eq(expected)
-    end
-
-    context "with additional options to lock" do
-      before do
-        allow(source).to receive(:options_to_lock) { { "first" => "option" } }
-      end
-
-      it "includes them" do
-        expected = strip_whitespace <<-L
-          PLUGIN SOURCE
-            remote: #{uri}
-            type: #{type}
-            first: option
-            specs:
-        L
-
-        expect(source.to_lock).to eq(expected)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/api_spec.rb b/spec/bundler/bundler/plugin/api_spec.rb
deleted file mode 100644
index 58fb908572..0000000000
--- a/spec/bundler/bundler/plugin/api_spec.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::API do
-  context "plugin declarations" do
-    before do
-      stub_const "UserPluginClass", Class.new(Bundler::Plugin::API)
-    end
-
-    describe "#command" do
-      it "declares a command plugin with same class as handler" do
-        expect(Bundler::Plugin).
-          to receive(:add_command).with("meh", UserPluginClass).once
-
-        UserPluginClass.command "meh"
-      end
-
-      it "accepts another class as argument that handles the command" do
-        stub_const "NewClass", Class.new
-        expect(Bundler::Plugin).to receive(:add_command).with("meh", NewClass).once
-
-        UserPluginClass.command "meh", NewClass
-      end
-    end
-
-    describe "#source" do
-      it "declares a source plugin with same class as handler" do
-        expect(Bundler::Plugin).
-          to receive(:add_source).with("a_source", UserPluginClass).once
-
-        UserPluginClass.source "a_source"
-      end
-
-      it "accepts another class as argument that handles the command" do
-        stub_const "NewClass", Class.new
-        expect(Bundler::Plugin).to receive(:add_source).with("a_source", NewClass).once
-
-        UserPluginClass.source "a_source", NewClass
-      end
-    end
-
-    describe "#hook" do
-      it "accepts a block and passes it to Plugin module" do
-        foo = double("tester")
-        expect(foo).to receive(:called)
-
-        expect(Bundler::Plugin).to receive(:add_hook).with("post-foo").and_yield
-
-        Bundler::Plugin::API.hook("post-foo") { foo.called }
-      end
-    end
-  end
-
-  context "bundler interfaces provided" do
-    before do
-      stub_const "UserPluginClass", Class.new(Bundler::Plugin::API)
-    end
-
-    subject(:api) { UserPluginClass.new }
-
-    # A test of delegation
-    it "provides the Bundler's functions" do
-      expect(Bundler).to receive(:an_unknown_function).once
-
-      api.an_unknown_function
-    end
-
-    it "includes Bundler::SharedHelpers' functions" do
-      expect(Bundler::SharedHelpers).to receive(:an_unknown_helper).once
-
-      api.an_unknown_helper
-    end
-
-    context "#tmp" do
-      it "provides a tmp dir" do
-        expect(api.tmp("mytmp")).to be_directory
-      end
-
-      it "accepts multiple names for suffix" do
-        expect(api.tmp("myplugin", "download")).to be_directory
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/dsl_spec.rb b/spec/bundler/bundler/plugin/dsl_spec.rb
deleted file mode 100644
index be23db3bba..0000000000
--- a/spec/bundler/bundler/plugin/dsl_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::DSL do
-  DSL = Bundler::Plugin::DSL
-
-  subject(:dsl) { Bundler::Plugin::DSL.new }
-
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new "/" }
-  end
-
-  describe "it ignores only the methods defined in Bundler::Dsl" do
-    it "doesn't raises error for Dsl methods" do
-      expect { dsl.install_if }.not_to raise_error
-    end
-
-    it "raises error for other methods" do
-      expect { dsl.no_method }.to raise_error(DSL::PluginGemfileError)
-    end
-  end
-
-  describe "source block" do
-    it "adds #source with :type to list and also inferred_plugins list" do
-      expect(dsl).to receive(:plugin).with("bundler-source-news").once
-
-      dsl.source("some_random_url", :type => "news") {}
-
-      expect(dsl.inferred_plugins).to eq(["bundler-source-news"])
-    end
-
-    it "registers a source type plugin only once for multiple declataions" do
-      expect(dsl).to receive(:plugin).with("bundler-source-news").and_call_original.once
-
-      dsl.source("some_random_url", :type => "news") {}
-      dsl.source("another_random_url", :type => "news") {}
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/events_spec.rb b/spec/bundler/bundler/plugin/events_spec.rb
deleted file mode 100644
index b09e915682..0000000000
--- a/spec/bundler/bundler/plugin/events_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::Events do
-  context "plugin events" do
-    describe "#define" do
-      it "raises when redefining a constant" do
-        expect do
-          Bundler::Plugin::Events.send(:define, :GEM_BEFORE_INSTALL_ALL, "another-value")
-        end.to raise_error(ArgumentError)
-      end
-
-      it "can define a new constant" do
-        Bundler::Plugin::Events.send(:define, :NEW_CONSTANT, "value")
-        expect(Bundler::Plugin::Events::NEW_CONSTANT).to eq("value")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/index_spec.rb b/spec/bundler/bundler/plugin/index_spec.rb
deleted file mode 100644
index ca3476ea2a..0000000000
--- a/spec/bundler/bundler/plugin/index_spec.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::Index do
-  Index = Bundler::Plugin::Index
-
-  before do
-    gemfile ""
-    path = lib_path(plugin_name)
-    index.register_plugin("new-plugin", path.to_s, [path.join("lib").to_s], commands, sources, hooks)
-  end
-
-  let(:plugin_name) { "new-plugin" }
-  let(:commands) { [] }
-  let(:sources) { [] }
-  let(:hooks) { [] }
-
-  subject(:index) { Index.new }
-
-  describe "#register plugin" do
-    it "is available for retrieval" do
-      expect(index.plugin_path(plugin_name)).to eq(lib_path(plugin_name))
-    end
-
-    it "load_paths is available for retrival" do
-      expect(index.load_paths(plugin_name)).to eq([lib_path(plugin_name).join("lib").to_s])
-    end
-
-    it "is persistent" do
-      new_index = Index.new
-      expect(new_index.plugin_path(plugin_name)).to eq(lib_path(plugin_name))
-    end
-
-    it "load_paths are persistent" do
-      new_index = Index.new
-      expect(new_index.load_paths(plugin_name)).to eq([lib_path(plugin_name).join("lib").to_s])
-    end
-  end
-
-  describe "commands" do
-    let(:commands) { ["newco"] }
-
-    it "returns the plugins name on query" do
-      expect(index.command_plugin("newco")).to eq(plugin_name)
-    end
-
-    it "raises error on conflict" do
-      expect do
-        index.register_plugin("aplugin", lib_path("aplugin").to_s, lib_path("aplugin").join("lib").to_s, ["newco"], [], [])
-      end.to raise_error(Index::CommandConflict)
-    end
-
-    it "is persistent" do
-      new_index = Index.new
-      expect(new_index.command_plugin("newco")).to eq(plugin_name)
-    end
-  end
-
-  describe "source" do
-    let(:sources) { ["new_source"] }
-
-    it "returns the plugins name on query" do
-      expect(index.source_plugin("new_source")).to eq(plugin_name)
-    end
-
-    it "raises error on conflict" do
-      expect do
-        index.register_plugin("aplugin", lib_path("aplugin").to_s, lib_path("aplugin").join("lib").to_s, [], ["new_source"], [])
-      end.to raise_error(Index::SourceConflict)
-    end
-
-    it "is persistent" do
-      new_index = Index.new
-      expect(new_index.source_plugin("new_source")).to eq(plugin_name)
-    end
-  end
-
-  describe "hook" do
-    let(:hooks) { ["after-bar"] }
-
-    it "returns the plugins name on query" do
-      expect(index.hook_plugins("after-bar")).to include(plugin_name)
-    end
-
-    it "is persistent" do
-      new_index = Index.new
-      expect(new_index.hook_plugins("after-bar")).to eq([plugin_name])
-    end
-
-    context "that are not registered", :focused do
-      let(:file) { double("index-file") }
-
-      before do
-        index.hook_plugins("not-there")
-        allow(File).to receive(:open).and_yield(file)
-      end
-
-      it "should not save it with next registered hook" do
-        expect(file).to receive(:puts) do |content|
-          expect(content).not_to include("not-there")
-        end
-
-        index.register_plugin("aplugin", lib_path("aplugin").to_s, lib_path("aplugin").join("lib").to_s, [], [], [])
-      end
-    end
-  end
-
-  describe "global index" do
-    before do
-      Dir.chdir(tmp) do
-        Bundler::Plugin.reset!
-        path = lib_path("gplugin")
-        index.register_plugin("gplugin", path.to_s, [path.join("lib").to_s], [], ["glb_source"], [])
-      end
-    end
-
-    it "skips sources" do
-      new_index = Index.new
-      expect(new_index.source_plugin("glb_source")).to be_falsy
-    end
-  end
-
-  describe "after conflict" do
-    let(:commands) { ["foo"] }
-    let(:sources) { ["bar"] }
-    let(:hooks) { ["hoook"] }
-
-    shared_examples "it cleans up" do
-      it "the path" do
-        expect(index.installed?("cplugin")).to be_falsy
-      end
-
-      it "the command" do
-        expect(index.command_plugin("xfoo")).to be_falsy
-      end
-
-      it "the source" do
-        expect(index.source_plugin("xbar")).to be_falsy
-      end
-
-      it "the hook" do
-        expect(index.hook_plugins("xhoook")).to be_empty
-      end
-    end
-
-    context "on command conflict it cleans up" do
-      before do
-        expect do
-          path = lib_path("cplugin")
-          index.register_plugin("cplugin", path.to_s, [path.join("lib").to_s], ["foo"], ["xbar"], ["xhoook"])
-        end.to raise_error(Index::CommandConflict)
-      end
-
-      include_examples "it cleans up"
-    end
-
-    context "on source conflict it cleans up" do
-      before do
-        expect do
-          path = lib_path("cplugin")
-          index.register_plugin("cplugin", path.to_s, [path.join("lib").to_s], ["xfoo"], ["bar"], ["xhoook"])
-        end.to raise_error(Index::SourceConflict)
-      end
-
-      include_examples "it cleans up"
-    end
-
-    context "on command and source conflict it cleans up" do
-      before do
-        expect do
-          path = lib_path("cplugin")
-          index.register_plugin("cplugin", path.to_s, [path.join("lib").to_s], ["foo"], ["bar"], ["xhoook"])
-        end.to raise_error(Index::CommandConflict)
-      end
-
-      include_examples "it cleans up"
-    end
-  end
-
-  describe "readonly disk without home" do
-    it "ignores being unable to create temp home dir" do
-      expect_any_instance_of(Bundler::Plugin::Index).to receive(:global_index_file).
-        and_raise(Bundler::GenericSystemCallError.new("foo", "bar"))
-      Bundler::Plugin::Index.new
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/installer_spec.rb b/spec/bundler/bundler/plugin/installer_spec.rb
deleted file mode 100644
index f8bf8450c9..0000000000
--- a/spec/bundler/bundler/plugin/installer_spec.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::Installer do
-  subject(:installer) { Bundler::Plugin::Installer.new }
-
-  before do
-    # allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(Pathname.new("/Gemfile"))
-  end
-
-  describe "cli install" do
-    it "uses Gem.sources when non of the source is provided" do
-      sources = double(:sources)
-      Bundler.settings # initialize it before we have to touch rubygems.ext_lock
-      allow(Bundler).to receive_message_chain("rubygems.sources") { sources }
-
-      allow(installer).to receive(:install_rubygems).
-        with("new-plugin", [">= 0"], sources).once
-
-      installer.install("new-plugin", {})
-    end
-
-    describe "with mocked installers" do
-      let(:spec) { double(:spec) }
-      it "returns the installed spec after installing git plugins" do
-        allow(installer).to receive(:install_git).
-          and_return("new-plugin" => spec)
-
-        expect(installer.install(["new-plugin"], :git => "https://some.ran/dom")).
-          to eq("new-plugin" => spec)
-      end
-
-      it "returns the installed spec after installing rubygems plugins" do
-        allow(installer).to receive(:install_rubygems).
-          and_return("new-plugin" => spec)
-
-        expect(installer.install(["new-plugin"], :source => "https://some.ran/dom")).
-          to eq("new-plugin" => spec)
-      end
-    end
-
-    describe "with actual installers" do
-      before do
-        build_repo2 do
-          build_plugin "re-plugin"
-          build_plugin "ma-plugin"
-        end
-      end
-
-      context "git plugins" do
-        before do
-          build_git "ga-plugin", :path => lib_path("ga-plugin") do |s|
-            s.write "plugins.rb"
-          end
-        end
-
-        let(:result) do
-          installer.install(["ga-plugin"], :git => "file://#{lib_path("ga-plugin")}")
-        end
-
-        it "returns the installed spec after installing" do
-          spec = result["ga-plugin"]
-          expect(spec.full_name).to eq "ga-plugin-1.0"
-        end
-
-        it "has expected full gem path" do
-          rev = revision_for(lib_path("ga-plugin"))
-          expect(result["ga-plugin"].full_gem_path).
-            to eq(Bundler::Plugin.root.join("bundler", "gems", "ga-plugin-#{rev[0..11]}").to_s)
-        end
-      end
-
-      context "rubygems plugins" do
-        let(:result) do
-          installer.install(["re-plugin"], :source => "file://#{gem_repo2}")
-        end
-
-        it "returns the installed spec after installing " do
-          expect(result["re-plugin"]).to be_kind_of(Bundler::RemoteSpecification)
-        end
-
-        it "has expected full_gem)path" do
-          expect(result["re-plugin"].full_gem_path).
-            to eq(global_plugin_gem("re-plugin-1.0").to_s)
-        end
-      end
-
-      context "multiple plugins" do
-        let(:result) do
-          installer.install(["re-plugin", "ma-plugin"], :source => "file://#{gem_repo2}")
-        end
-
-        it "returns the installed spec after installing " do
-          expect(result["re-plugin"]).to be_kind_of(Bundler::RemoteSpecification)
-          expect(result["ma-plugin"]).to be_kind_of(Bundler::RemoteSpecification)
-        end
-
-        it "has expected full_gem)path" do
-          expect(result["re-plugin"].full_gem_path).to eq(global_plugin_gem("re-plugin-1.0").to_s)
-          expect(result["ma-plugin"].full_gem_path).to eq(global_plugin_gem("ma-plugin-1.0").to_s)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin/source_list_spec.rb b/spec/bundler/bundler/plugin/source_list_spec.rb
deleted file mode 100644
index 64a1233dd1..0000000000
--- a/spec/bundler/bundler/plugin/source_list_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin::SourceList do
-  SourceList = Bundler::Plugin::SourceList
-
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new "/" }
-  end
-
-  subject(:source_list) { SourceList.new }
-
-  describe "adding sources uses classes for plugin" do
-    it "uses Plugin::Installer::Rubygems for rubygems sources" do
-      source = source_list.
-        add_rubygems_source("remotes" => ["https://existing-rubygems.org"])
-      expect(source).to be_instance_of(Bundler::Plugin::Installer::Rubygems)
-    end
-
-    it "uses Plugin::Installer::Git for git sources" do
-      source = source_list.
-        add_git_source("uri" => "git://existing-git.org/path.git")
-      expect(source).to be_instance_of(Bundler::Plugin::Installer::Git)
-    end
-  end
-end
diff --git a/spec/bundler/bundler/plugin_spec.rb b/spec/bundler/bundler/plugin_spec.rb
deleted file mode 100644
index 9266fad1eb..0000000000
--- a/spec/bundler/bundler/plugin_spec.rb
+++ /dev/null
@@ -1,309 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Plugin do
-  Plugin = Bundler::Plugin
-
-  let(:installer) { double(:installer) }
-  let(:index) { double(:index) }
-  let(:spec) { double(:spec) }
-  let(:spec2) { double(:spec2) }
-
-  before do
-    build_lib "new-plugin", :path => lib_path("new-plugin") do |s|
-      s.write "plugins.rb"
-    end
-
-    build_lib "another-plugin", :path => lib_path("another-plugin") do |s|
-      s.write "plugins.rb"
-    end
-
-    allow(spec).to receive(:full_gem_path).
-      and_return(lib_path("new-plugin").to_s)
-    allow(spec).to receive(:load_paths).
-      and_return([lib_path("new-plugin").join("lib").to_s])
-
-    allow(spec2).to receive(:full_gem_path).
-      and_return(lib_path("another-plugin").to_s)
-    allow(spec2).to receive(:load_paths).
-      and_return([lib_path("another-plugin").join("lib").to_s])
-
-    allow(Plugin::Installer).to receive(:new) { installer }
-    allow(Plugin).to receive(:index) { index }
-    allow(index).to receive(:register_plugin)
-  end
-
-  describe "install command" do
-    let(:opts) { { "version" => "~> 1.0", "source" => "foo" } }
-
-    before do
-      allow(installer).to receive(:install).with(["new-plugin"], opts) do
-        { "new-plugin" => spec }
-      end
-    end
-
-    it "passes the name and options to installer" do
-      allow(installer).to receive(:install).with(["new-plugin"], opts) do
-        { "new-plugin" => spec }
-      end.once
-
-      subject.install ["new-plugin"], opts
-    end
-
-    it "validates the installed plugin" do
-      allow(subject).
-        to receive(:validate_plugin!).with(lib_path("new-plugin")).once
-
-      subject.install ["new-plugin"], opts
-    end
-
-    it "registers the plugin with index" do
-      allow(index).to receive(:register_plugin).
-        with("new-plugin", lib_path("new-plugin").to_s, [lib_path("new-plugin").join("lib").to_s], []).once
-      subject.install ["new-plugin"], opts
-    end
-
-    context "multiple plugins" do
-      it do
-        allow(installer).to receive(:install).
-          with(["new-plugin", "another-plugin"], opts) do
-          {
-            "new-plugin" => spec,
-            "another-plugin" => spec2,
-          }
-        end.once
-
-        allow(subject).to receive(:validate_plugin!).twice
-        allow(index).to receive(:register_plugin).twice
-        subject.install ["new-plugin", "another-plugin"], opts
-      end
-    end
-  end
-
-  describe "evaluate gemfile for plugins" do
-    let(:definition) { double("definition") }
-    let(:builder) { double("builder") }
-    let(:gemfile) { bundled_app("Gemfile") }
-
-    before do
-      allow(Plugin::DSL).to receive(:new) { builder }
-      allow(builder).to receive(:eval_gemfile).with(gemfile)
-      allow(builder).to receive(:to_definition) { definition }
-      allow(builder).to receive(:inferred_plugins) { [] }
-    end
-
-    it "doesn't calls installer without any plugins" do
-      allow(definition).to receive(:dependencies) { [] }
-      allow(installer).to receive(:install_definition).never
-
-      subject.gemfile_install(gemfile)
-    end
-
-    context "with dependencies" do
-      let(:plugin_specs) do
-        {
-          "new-plugin" => spec,
-          "another-plugin" => spec2,
-        }
-      end
-
-      before do
-        allow(index).to receive(:installed?) { nil }
-        allow(definition).to receive(:dependencies) { [Bundler::Dependency.new("new-plugin", ">=0"), Bundler::Dependency.new("another-plugin", ">=0")] }
-        allow(installer).to receive(:install_definition) { plugin_specs }
-      end
-
-      it "should validate and register the plugins" do
-        expect(subject).to receive(:validate_plugin!).twice
-        expect(subject).to receive(:register_plugin).twice
-
-        subject.gemfile_install(gemfile)
-      end
-
-      it "should pass the optional plugins to #register_plugin" do
-        allow(builder).to receive(:inferred_plugins) { ["another-plugin"] }
-
-        expect(subject).to receive(:register_plugin).
-          with("new-plugin", spec, false).once
-
-        expect(subject).to receive(:register_plugin).
-          with("another-plugin", spec2, true).once
-
-        subject.gemfile_install(gemfile)
-      end
-    end
-  end
-
-  describe "#command?" do
-    it "returns true value for commands in index" do
-      allow(index).
-        to receive(:command_plugin).with("newcommand") { "my-plugin" }
-      result = subject.command? "newcommand"
-      expect(result).to be_truthy
-    end
-
-    it "returns false value for commands not in index" do
-      allow(index).to receive(:command_plugin).with("newcommand") { nil }
-      result = subject.command? "newcommand"
-      expect(result).to be_falsy
-    end
-  end
-
-  describe "#exec_command" do
-    it "raises UndefinedCommandError when command is not found" do
-      allow(index).to receive(:command_plugin).with("newcommand") { nil }
-      expect { subject.exec_command("newcommand", []) }.
-        to raise_error(Plugin::UndefinedCommandError)
-    end
-  end
-
-  describe "#source?" do
-    it "returns true value for sources in index" do
-      allow(index).
-        to receive(:command_plugin).with("foo-source") { "my-plugin" }
-      result = subject.command? "foo-source"
-      expect(result).to be_truthy
-    end
-
-    it "returns false value for source not in index" do
-      allow(index).to receive(:command_plugin).with("foo-source") { nil }
-      result = subject.command? "foo-source"
-      expect(result).to be_falsy
-    end
-  end
-
-  describe "#source" do
-    it "raises UnknownSourceError when source is not found" do
-      allow(index).to receive(:source_plugin).with("bar") { nil }
-      expect { subject.source("bar") }.
-        to raise_error(Plugin::UnknownSourceError)
-    end
-
-    it "loads the plugin, if not loaded" do
-      allow(index).to receive(:source_plugin).with("foo-bar") { "plugin_name" }
-
-      expect(subject).to receive(:load_plugin).with("plugin_name")
-      subject.source("foo-bar")
-    end
-
-    it "returns the class registered with #add_source" do
-      allow(index).to receive(:source_plugin).with("foo") { "plugin_name" }
-      stub_const "NewClass", Class.new
-
-      subject.add_source("foo", NewClass)
-      expect(subject.source("foo")).to be(NewClass)
-    end
-  end
-
-  describe "#source_from_lock" do
-    it "returns instance of registered class initialized with locked opts" do
-      opts = { "type" => "l_source", "remote" => "xyz", "other" => "random" }
-      allow(index).to receive(:source_plugin).with("l_source") { "plugin_name" }
-
-      stub_const "SClass", Class.new
-      s_instance = double(:s_instance)
-      subject.add_source("l_source", SClass)
-
-      expect(SClass).to receive(:new).
-        with(hash_including("type" => "l_source", "uri" => "xyz", "other" => "random")) { s_instance }
-      expect(subject.source_from_lock(opts)).to be(s_instance)
-    end
-  end
-
-  describe "#root" do
-    context "in app dir" do
-      before do
-        gemfile ""
-      end
-
-      it "returns plugin dir in app .bundle path" do
-        expect(subject.root).to eq(bundled_app.join(".bundle/plugin"))
-      end
-    end
-
-    context "outside app dir" do
-      it "returns plugin dir in global bundle path" do
-        Dir.chdir tmp
-        expect(subject.root).to eq(home.join(".bundle/plugin"))
-      end
-    end
-  end
-
-  describe "#add_hook" do
-    it "raises an ArgumentError on an unregistered event" do
-      ran = false
-      expect do
-        Plugin.add_hook("unregistered-hook") { ran = true }
-      end.to raise_error(ArgumentError)
-      expect(ran).to be(false)
-    end
-  end
-
-  describe "#hook" do
-    before do
-      path = lib_path("foo-plugin")
-      build_lib "foo-plugin", :path => path do |s|
-        s.write "plugins.rb", code
-      end
-
-      Bundler::Plugin::Events.send(:reset)
-      Bundler::Plugin::Events.send(:define, :EVENT_1, "event-1")
-      Bundler::Plugin::Events.send(:define, :EVENT_2, "event-2")
-
-      allow(index).to receive(:hook_plugins).with(Bundler::Plugin::Events::EVENT_1).
-        and_return(["foo-plugin"])
-      allow(index).to receive(:hook_plugins).with(Bundler::Plugin::Events::EVENT_2).
-        and_return(["foo-plugin"])
-      allow(index).to receive(:plugin_path).with("foo-plugin").and_return(path)
-      allow(index).to receive(:load_paths).with("foo-plugin").and_return([])
-    end
-
-    let(:code) { <<-RUBY }
-      Bundler::Plugin::API.hook("event-1") { puts "hook for event 1" }
-    RUBY
-
-    it "raises an ArgumentError on an unregistered event" do
-      expect do
-        Plugin.hook("unregistered-hook")
-      end.to raise_error(ArgumentError)
-    end
-
-    it "executes the hook" do
-      out = capture(:stdout) do
-        Plugin.hook(Bundler::Plugin::Events::EVENT_1)
-      end.strip
-
-      expect(out).to eq("hook for event 1")
-    end
-
-    context "single plugin declaring more than one hook" do
-      let(:code) { <<-RUBY }
-        Bundler::Plugin::API.hook(Bundler::Plugin::Events::EVENT_1) {}
-        Bundler::Plugin::API.hook(Bundler::Plugin::Events::EVENT_2) {}
-        puts "loaded"
-      RUBY
-
-      it "evals plugins.rb once" do
-        out = capture(:stdout) do
-          Plugin.hook(Bundler::Plugin::Events::EVENT_1)
-          Plugin.hook(Bundler::Plugin::Events::EVENT_2)
-        end.strip
-
-        expect(out).to eq("loaded")
-      end
-    end
-
-    context "a block is passed" do
-      let(:code) { <<-RUBY }
-        Bundler::Plugin::API.hook(Bundler::Plugin::Events::EVENT_1) { |&blk| blk.call }
-      RUBY
-
-      it "is passed to the hook" do
-        out = capture(:stdout) do
-          Plugin.hook(Bundler::Plugin::Events::EVENT_1) { puts "win" }
-        end.strip
-
-        expect(out).to eq("win")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/psyched_yaml_spec.rb b/spec/bundler/bundler/psyched_yaml_spec.rb
deleted file mode 100644
index d5d68c5cc3..0000000000
--- a/spec/bundler/bundler/psyched_yaml_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/psyched_yaml"
-
-RSpec.describe "Bundler::YamlLibrarySyntaxError" do
-  it "is raised on YAML parse errors" do
-    expect { YAML.parse "{foo" }.to raise_error(Bundler::YamlLibrarySyntaxError)
-  end
-end
diff --git a/spec/bundler/bundler/remote_specification_spec.rb b/spec/bundler/bundler/remote_specification_spec.rb
deleted file mode 100644
index 8115e026d8..0000000000
--- a/spec/bundler/bundler/remote_specification_spec.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::RemoteSpecification do
-  let(:name)         { "foo" }
-  let(:version)      { Gem::Version.new("1.0.0") }
-  let(:platform)     { Gem::Platform::RUBY }
-  let(:spec_fetcher) { double(:spec_fetcher) }
-
-  subject { described_class.new(name, version, platform, spec_fetcher) }
-
-  it "is Comparable" do
-    expect(described_class.ancestors).to include(Comparable)
-  end
-
-  it "can match platforms" do
-    expect(described_class.ancestors).to include(Bundler::MatchPlatform)
-  end
-
-  describe "#fetch_platform" do
-    let(:remote_spec) { double(:remote_spec, :platform => "jruby") }
-
-    before { allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec) }
-
-    it "should return the spec platform" do
-      expect(subject.fetch_platform).to eq("jruby")
-    end
-  end
-
-  describe "#full_name" do
-    context "when platform is ruby" do
-      it "should return the spec name and version" do
-        expect(subject.full_name).to eq("foo-1.0.0")
-      end
-    end
-
-    context "when platform is nil" do
-      let(:platform) { nil }
-
-      it "should return the spec name and version" do
-        expect(subject.full_name).to eq("foo-1.0.0")
-      end
-    end
-
-    context "when platform is a non-ruby platform" do
-      let(:platform) { "jruby" }
-
-      it "should return the spec name, version, and platform" do
-        expect(subject.full_name).to eq("foo-1.0.0-jruby")
-      end
-    end
-  end
-
-  describe "#<=>" do
-    let(:other_name)         { name }
-    let(:other_version)      { version }
-    let(:other_platform)     { platform }
-    let(:other_spec_fetcher) { spec_fetcher }
-
-    shared_examples_for "a comparison" do
-      context "which exactly matches" do
-        it "returns 0" do
-          expect(subject <=> other).to eq(0)
-        end
-      end
-
-      context "which is different by name" do
-        let(:other_name) { "a" }
-        it "returns 1" do
-          expect(subject <=> other).to eq(1)
-        end
-      end
-
-      context "which has a lower version" do
-        let(:other_version) { Gem::Version.new("0.9.0") }
-        it "returns 1" do
-          expect(subject <=> other).to eq(1)
-        end
-      end
-
-      context "which has a higher version" do
-        let(:other_version) { Gem::Version.new("1.1.0") }
-        it "returns -1" do
-          expect(subject <=> other).to eq(-1)
-        end
-      end
-
-      context "which has a different platform" do
-        let(:other_platform) { Gem::Platform.new("x86-mswin32") }
-        it "returns -1" do
-          expect(subject <=> other).to eq(-1)
-        end
-      end
-    end
-
-    context "comparing another Bundler::RemoteSpecification" do
-      let(:other) do
-        Bundler::RemoteSpecification.new(other_name, other_version,
-          other_platform, nil)
-      end
-
-      it_should_behave_like "a comparison"
-    end
-
-    context "comparing a Gem::Specification" do
-      let(:other) do
-        Gem::Specification.new(other_name, other_version).tap do |s|
-          s.platform = other_platform
-        end
-      end
-
-      it_should_behave_like "a comparison"
-    end
-
-    context "comparing a non sortable object" do
-      let(:other) { Object.new }
-      let(:remote_spec) { double(:remote_spec, :platform => "jruby") }
-
-      before do
-        allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec)
-        allow(remote_spec).to receive(:<=>).and_return(nil)
-      end
-
-      it "should use default object comparison" do
-        expect(subject <=> other).to eq(nil)
-      end
-    end
-  end
-
-  describe "#__swap__" do
-    let(:spec) { double(:spec, :dependencies => []) }
-    let(:new_spec) { double(:new_spec, :dependencies => [], :runtime_dependencies => []) }
-
-    before { subject.instance_variable_set(:@_remote_specification, spec) }
-
-    it "should replace remote specification with the passed spec" do
-      expect(subject.instance_variable_get(:@_remote_specification)).to be(spec)
-      subject.__swap__(new_spec)
-      expect(subject.instance_variable_get(:@_remote_specification)).to be(new_spec)
-    end
-  end
-
-  describe "#sort_obj" do
-    context "when platform is ruby" do
-      it "should return a sorting delegate array with name, version, and -1" do
-        expect(subject.sort_obj).to match_array(["foo", version, -1])
-      end
-    end
-
-    context "when platform is not ruby" do
-      let(:platform) { "jruby" }
-
-      it "should return a sorting delegate array with name, version, and 1" do
-        expect(subject.sort_obj).to match_array(["foo", version, 1])
-      end
-    end
-  end
-
-  describe "method missing" do
-    context "and is present in Gem::Specification" do
-      let(:remote_spec) { double(:remote_spec, :authors => "abcd") }
-
-      before do
-        allow(subject).to receive(:_remote_specification).and_return(remote_spec)
-        expect(subject.methods.map(&:to_sym)).not_to include(:authors)
-      end
-
-      it "should send through to Gem::Specification" do
-        expect(subject.authors).to eq("abcd")
-      end
-    end
-  end
-
-  describe "respond to missing?" do
-    context "and is present in Gem::Specification" do
-      let(:remote_spec) { double(:remote_spec, :authors => "abcd") }
-
-      before do
-        allow(subject).to receive(:_remote_specification).and_return(remote_spec)
-        expect(subject.methods.map(&:to_sym)).not_to include(:authors)
-      end
-
-      it "should send through to Gem::Specification" do
-        expect(subject.respond_to?(:authors)).to be_truthy
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/retry_spec.rb b/spec/bundler/bundler/retry_spec.rb
deleted file mode 100644
index b893580d72..0000000000
--- a/spec/bundler/bundler/retry_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Retry do
-  it "return successful result if no errors" do
-    attempts = 0
-    result = Bundler::Retry.new(nil, nil, 3).attempt do
-      attempts += 1
-      :success
-    end
-    expect(result).to eq(:success)
-    expect(attempts).to eq(1)
-  end
-
-  it "returns the first valid result" do
-    jobs = [proc { raise "foo" }, proc { :bar }, proc { raise "foo" }]
-    attempts = 0
-    result = Bundler::Retry.new(nil, nil, 3).attempt do
-      attempts += 1
-      jobs.shift.call
-    end
-    expect(result).to eq(:bar)
-    expect(attempts).to eq(2)
-  end
-
-  it "raises the last error" do
-    errors = [StandardError, StandardError, StandardError, Bundler::GemfileNotFound]
-    attempts = 0
-    expect do
-      Bundler::Retry.new(nil, nil, 3).attempt do
-        attempts += 1
-        raise errors.shift
-      end
-    end.to raise_error(Bundler::GemfileNotFound)
-    expect(attempts).to eq(4)
-  end
-
-  it "raises exceptions" do
-    error = Bundler::GemfileNotFound
-    attempts = 0
-    expect do
-      Bundler::Retry.new(nil, error).attempt do
-        attempts += 1
-        raise error
-      end
-    end.to raise_error(error)
-    expect(attempts).to eq(1)
-  end
-
-  context "logging" do
-    let(:error)           { Bundler::GemfileNotFound }
-    let(:failure_message) { "Retrying test due to error (2/2): #{error} #{error}" }
-
-    context "with debugging on" do
-      it "print error message with newline" do
-        allow(Bundler.ui).to receive(:debug?).and_return(true)
-        expect(Bundler.ui).to_not receive(:info)
-        expect(Bundler.ui).to receive(:warn).with(failure_message, true)
-
-        expect do
-          Bundler::Retry.new("test", [], 1).attempt do
-            raise error
-          end
-        end.to raise_error(error)
-      end
-    end
-
-    context "with debugging off" do
-      it "print error message with newlines" do
-        allow(Bundler.ui).to  receive(:debug?).and_return(false)
-        expect(Bundler.ui).to receive(:info).with("").twice
-        expect(Bundler.ui).to receive(:warn).with(failure_message, false)
-
-        expect do
-          Bundler::Retry.new("test", [], 1).attempt do
-            raise error
-          end
-        end.to raise_error(error)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/ruby_dsl_spec.rb b/spec/bundler/bundler/ruby_dsl_spec.rb
deleted file mode 100644
index bc1ca98457..0000000000
--- a/spec/bundler/bundler/ruby_dsl_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/ruby_dsl"
-
-RSpec.describe Bundler::RubyDsl do
-  class MockDSL
-    include Bundler::RubyDsl
-
-    attr_reader :ruby_version
-  end
-
-  let(:dsl) { MockDSL.new }
-  let(:ruby_version) { "2.0.0" }
-  let(:version) { "2.0.0" }
-  let(:engine) { "jruby" }
-  let(:engine_version) { "9000" }
-  let(:patchlevel) { "100" }
-  let(:options) do
-    { :patchlevel => patchlevel,
-      :engine => engine,
-      :engine_version => engine_version }
-  end
-
-  let(:invoke) do
-    proc do
-      args = Array(ruby_version) + [options]
-      dsl.ruby(*args)
-    end
-  end
-
-  subject do
-    invoke.call
-    dsl.ruby_version
-  end
-
-  describe "#ruby_version" do
-    shared_examples_for "it stores the ruby version" do
-      it "stores the version" do
-        expect(subject.versions).to eq(Array(ruby_version))
-        expect(subject.gem_version.version).to eq(version)
-      end
-
-      it "stores the engine details" do
-        expect(subject.engine).to eq(engine)
-        expect(subject.engine_versions).to eq(Array(engine_version))
-      end
-
-      it "stores the patchlevel" do
-        expect(subject.patchlevel).to eq(patchlevel)
-      end
-    end
-
-    context "with a plain version" do
-      it_behaves_like "it stores the ruby version"
-    end
-
-    context "with a single requirement" do
-      let(:ruby_version) { ">= 2.0.0" }
-      it_behaves_like "it stores the ruby version"
-    end
-
-    context "with two requirements in the same string" do
-      let(:ruby_version) { ">= 2.0.0, < 3.0" }
-      it "raises an error" do
-        expect { subject }.to raise_error(ArgumentError)
-      end
-    end
-
-    context "with two requirements" do
-      let(:ruby_version) { ["~> 2.0.0", "> 2.0.1"] }
-      it_behaves_like "it stores the ruby version"
-    end
-
-    context "with multiple engine versions" do
-      let(:engine_version) { ["> 200", "< 300"] }
-      it_behaves_like "it stores the ruby version"
-    end
-
-    context "with no options hash" do
-      let(:invoke) { proc { dsl.ruby(ruby_version) } }
-
-      let(:patchlevel) { nil }
-      let(:engine) { "ruby" }
-      let(:engine_version) { version }
-
-      it_behaves_like "it stores the ruby version"
-
-      context "and with multiple requirements" do
-        let(:ruby_version) { ["~> 2.0.0", "> 2.0.1"] }
-        let(:engine_version) { ruby_version }
-        it_behaves_like "it stores the ruby version"
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/ruby_version_spec.rb b/spec/bundler/bundler/ruby_version_spec.rb
deleted file mode 100644
index 46a1b2918b..0000000000
--- a/spec/bundler/bundler/ruby_version_spec.rb
+++ /dev/null
@@ -1,524 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/ruby_version"
-
-RSpec.describe "Bundler::RubyVersion and its subclasses" do
-  let(:version)              { "2.0.0" }
-  let(:patchlevel)           { "645" }
-  let(:engine)               { "jruby" }
-  let(:engine_version)       { "2.0.1" }
-
-  describe Bundler::RubyVersion do
-    subject { Bundler::RubyVersion.new(version, patchlevel, engine, engine_version) }
-
-    let(:ruby_version)         { subject }
-    let(:other_version)        { version }
-    let(:other_patchlevel)     { patchlevel }
-    let(:other_engine)         { engine }
-    let(:other_engine_version) { engine_version }
-    let(:other_ruby_version)   { Bundler::RubyVersion.new(other_version, other_patchlevel, other_engine, other_engine_version) }
-
-    describe "#initialize" do
-      context "no engine is passed" do
-        let(:engine) { nil }
-
-        it "should set ruby as the engine" do
-          expect(subject.engine).to eq("ruby")
-        end
-      end
-
-      context "no engine_version is passed" do
-        let(:engine_version) { nil }
-
-        it "should set engine version as the passed version" do
-          expect(subject.engine_versions).to eq(["2.0.0"])
-        end
-      end
-
-      context "with engine in symbol" do
-        let(:engine) { :jruby }
-
-        it "should coerce engine to string" do
-          expect(subject.engine).to eq("jruby")
-        end
-      end
-
-      context "is called with multiple requirements" do
-        let(:version) { ["<= 2.0.0", "> 1.9.3"] }
-        let(:engine_version) { nil }
-
-        it "sets the versions" do
-          expect(subject.versions).to eq(version)
-        end
-
-        it "sets the engine versions" do
-          expect(subject.engine_versions).to eq(version)
-        end
-      end
-
-      context "is called with multiple engine requirements" do
-        let(:engine_version) { [">= 2.0", "< 2.3"] }
-
-        it "sets the engine versions" do
-          expect(subject.engine_versions).to eq(engine_version)
-        end
-      end
-    end
-
-    describe ".from_string" do
-      shared_examples_for "returning" do
-        it "returns the original RubyVersion" do
-          expect(described_class.from_string(subject.to_s)).to eq(subject)
-        end
-      end
-
-      include_examples "returning"
-
-      context "no patchlevel" do
-        let(:patchlevel) { nil }
-
-        include_examples "returning"
-      end
-
-      context "engine is ruby" do
-        let(:engine) { "ruby" }
-        let(:engine_version) { version }
-
-        include_examples "returning"
-      end
-
-      context "with multiple requirements" do
-        let(:engine_version) { ["> 9", "< 11"] }
-        let(:version) { ["> 8", "< 10"] }
-        let(:patchlevel) { nil }
-
-        it "returns nil" do
-          expect(described_class.from_string(subject.to_s)).to be_nil
-        end
-      end
-    end
-
-    describe "#to_s" do
-      it "should return info string with the ruby version, patchlevel, engine, and engine version" do
-        expect(subject.to_s).to eq("ruby 2.0.0p645 (jruby 2.0.1)")
-      end
-
-      context "no patchlevel" do
-        let(:patchlevel) { nil }
-
-        it "should return info string with the version, engine, and engine version" do
-          expect(subject.to_s).to eq("ruby 2.0.0 (jruby 2.0.1)")
-        end
-      end
-
-      context "engine is ruby" do
-        let(:engine) { "ruby" }
-
-        it "should return info string with the ruby version and patchlevel" do
-          expect(subject.to_s).to eq("ruby 2.0.0p645")
-        end
-      end
-
-      context "with multiple requirements" do
-        let(:engine_version) { ["> 9", "< 11"] }
-        let(:version) { ["> 8", "< 10"] }
-        let(:patchlevel) { nil }
-
-        it "should return info string with all requirements" do
-          expect(subject.to_s).to eq("ruby > 8, < 10 (jruby > 9, < 11)")
-        end
-      end
-    end
-
-    describe "#==" do
-      shared_examples_for "two ruby versions are not equal" do
-        it "should return false" do
-          expect(subject).to_not eq(other_ruby_version)
-        end
-      end
-
-      context "the versions, pathlevels, engines, and engine_versions match" do
-        it "should return true" do
-          expect(subject).to eq(other_ruby_version)
-        end
-      end
-
-      context "the versions do not match" do
-        let(:other_version) { "1.21.6" }
-
-        it_behaves_like "two ruby versions are not equal"
-      end
-
-      context "the patchlevels do not match" do
-        let(:other_patchlevel) { "21" }
-
-        it_behaves_like "two ruby versions are not equal"
-      end
-
-      context "the engines do not match" do
-        let(:other_engine) { "ruby" }
-
-        it_behaves_like "two ruby versions are not equal"
-      end
-
-      context "the engine versions do not match" do
-        let(:other_engine_version) { "1.11.2" }
-
-        it_behaves_like "two ruby versions are not equal"
-      end
-    end
-
-    describe "#host" do
-      before do
-        allow(RbConfig::CONFIG).to receive(:[]).with("host_cpu").and_return("x86_64")
-        allow(RbConfig::CONFIG).to receive(:[]).with("host_vendor").and_return("apple")
-        allow(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return("darwin14.5.0")
-      end
-
-      it "should return an info string with the host cpu, vendor, and os" do
-        expect(subject.host).to eq("x86_64-apple-darwin14.5.0")
-      end
-
-      it "memoizes the info string with the host cpu, vendor, and os" do
-        expect(RbConfig::CONFIG).to receive(:[]).with("host_cpu").once.and_call_original
-        expect(RbConfig::CONFIG).to receive(:[]).with("host_vendor").once.and_call_original
-        expect(RbConfig::CONFIG).to receive(:[]).with("host_os").once.and_call_original
-        2.times { ruby_version.host }
-      end
-    end
-
-    describe "#gem_version" do
-      let(:gem_version) { "2.0.0" }
-      let(:gem_version_obj) { Gem::Version.new(gem_version) }
-
-      shared_examples_for "it parses the version from the requirement string" do |version|
-        let(:version) { version }
-        it "should return the underlying version" do
-          expect(ruby_version.gem_version).to eq(gem_version_obj)
-          expect(ruby_version.gem_version.version).to eq(gem_version)
-        end
-      end
-
-      it_behaves_like "it parses the version from the requirement string", "2.0.0"
-      it_behaves_like "it parses the version from the requirement string", ">= 2.0.0"
-      it_behaves_like "it parses the version from the requirement string", "~> 2.0.0"
-      it_behaves_like "it parses the version from the requirement string", "< 2.0.0"
-      it_behaves_like "it parses the version from the requirement string", "= 2.0.0"
-      it_behaves_like "it parses the version from the requirement string", ["> 2.0.0", "< 2.4.5"]
-    end
-
-    describe "#diff" do
-      let(:engine) { "ruby" }
-
-      shared_examples_for "there is a difference in the engines" do
-        it "should return a tuple with :engine and the two different engines" do
-          expect(ruby_version.diff(other_ruby_version)).to eq([:engine, engine, other_engine])
-        end
-      end
-
-      shared_examples_for "there is a difference in the versions" do
-        it "should return a tuple with :version and the two different versions" do
-          expect(ruby_version.diff(other_ruby_version)).to eq([:version, Array(version).join(", "), Array(other_version).join(", ")])
-        end
-      end
-
-      shared_examples_for "there is a difference in the engine versions" do
-        it "should return a tuple with :engine_version and the two different engine versions" do
-          expect(ruby_version.diff(other_ruby_version)).to eq([:engine_version, Array(engine_version).join(", "), Array(other_engine_version).join(", ")])
-        end
-      end
-
-      shared_examples_for "there is a difference in the patchlevels" do
-        it "should return a tuple with :patchlevel and the two different patchlevels" do
-          expect(ruby_version.diff(other_ruby_version)).to eq([:patchlevel, patchlevel, other_patchlevel])
-        end
-      end
-
-      shared_examples_for "there are no differences" do
-        it "should return nil" do
-          expect(ruby_version.diff(other_ruby_version)).to be_nil
-        end
-      end
-
-      context "all things match exactly" do
-        it_behaves_like "there are no differences"
-      end
-
-      context "detects engine discrepancies first" do
-        let(:other_version)        { "2.0.1" }
-        let(:other_patchlevel)     { "643" }
-        let(:other_engine)         { "rbx" }
-        let(:other_engine_version) { "2.0.0" }
-
-        it_behaves_like "there is a difference in the engines"
-      end
-
-      context "detects version discrepancies second" do
-        let(:other_version)        { "2.0.1" }
-        let(:other_patchlevel)     { "643" }
-        let(:other_engine_version) { "2.0.0" }
-
-        it_behaves_like "there is a difference in the versions"
-      end
-
-      context "detects version discrepancies with multiple requirements second" do
-        let(:other_version)        { "2.0.1" }
-        let(:other_patchlevel)     { "643" }
-        let(:other_engine_version) { "2.0.0" }
-
-        let(:version) { ["> 2.0.0", "< 1.0.0"] }
-
-        it_behaves_like "there is a difference in the versions"
-      end
-
-      context "detects engine version discrepancies third" do
-        let(:other_patchlevel)     { "643" }
-        let(:other_engine_version) { "2.0.0" }
-
-        it_behaves_like "there is a difference in the engine versions"
-      end
-
-      context "detects engine version discrepancies with multiple requirements third" do
-        let(:other_patchlevel)     { "643" }
-        let(:other_engine_version) { "2.0.0" }
-
-        let(:engine_version) { ["> 2.0.0", "< 1.0.0"] }
-
-        it_behaves_like "there is a difference in the engine versions"
-      end
-
-      context "detects patchlevel discrepancies last" do
-        let(:other_patchlevel) { "643" }
-
-        it_behaves_like "there is a difference in the patchlevels"
-      end
-
-      context "successfully matches gem requirements" do
-        let(:version)              { ">= 2.0.0" }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { "2.0.0" }
-        let(:other_patchlevel)     { "642" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.0.5" }
-
-        it_behaves_like "there are no differences"
-      end
-
-      context "successfully matches multiple gem requirements" do
-        let(:version)              { [">= 2.0.0", "< 2.4.5"] }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { ["~> 2.0.1", "< 2.4.5"] }
-        let(:other_version)        { "2.0.0" }
-        let(:other_patchlevel)     { "642" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.0.5" }
-
-        it_behaves_like "there are no differences"
-      end
-
-      context "successfully detects bad gem requirements with versions with multiple requirements" do
-        let(:version)              { ["~> 2.0.0", "< 2.0.5"] }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { "2.0.5" }
-        let(:other_patchlevel)     { "642" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.0.5" }
-
-        it_behaves_like "there is a difference in the versions"
-      end
-
-      context "successfully detects bad gem requirements with versions" do
-        let(:version)              { "~> 2.0.0" }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { "2.1.0" }
-        let(:other_patchlevel)     { "642" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.0.5" }
-
-        it_behaves_like "there is a difference in the versions"
-      end
-
-      context "successfully detects bad gem requirements with patchlevels" do
-        let(:version)              { ">= 2.0.0" }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { "2.0.0" }
-        let(:other_patchlevel)     { "645" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.0.5" }
-
-        it_behaves_like "there is a difference in the patchlevels"
-      end
-
-      context "successfully detects bad gem requirements with engine versions" do
-        let(:version)              { ">= 2.0.0" }
-        let(:patchlevel)           { "< 643" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { "2.0.0" }
-        let(:other_patchlevel)     { "642" }
-        let(:other_engine)         { "ruby" }
-        let(:other_engine_version) { "2.1.0" }
-
-        it_behaves_like "there is a difference in the engine versions"
-      end
-
-      context "with a patchlevel of -1" do
-        let(:version)              { ">= 2.0.0" }
-        let(:patchlevel)           { "-1" }
-        let(:engine)               { "ruby" }
-        let(:engine_version)       { "~> 2.0.1" }
-        let(:other_version)        { version }
-        let(:other_engine)         { engine }
-        let(:other_engine_version) { engine_version }
-
-        context "and comparing with another patchlevel of -1" do
-          let(:other_patchlevel) { patchlevel }
-
-          it_behaves_like "there are no differences"
-        end
-
-        context "and comparing with a patchlevel that is not -1" do
-          let(:other_patchlevel)     { "642" }
-
-          it_behaves_like "there is a difference in the patchlevels"
-        end
-      end
-    end
-
-    describe "#system" do
-      subject { Bundler::RubyVersion.system }
-
-      let(:bundler_system_ruby_version) { subject }
-
-      before do
-        Bundler::RubyVersion.instance_variable_set("@ruby_version", nil)
-      end
-
-      it "should return an instance of Bundler::RubyVersion" do
-        expect(subject).to be_kind_of(Bundler::RubyVersion)
-      end
-
-      it "memoizes the instance of Bundler::RubyVersion" do
-        expect(Bundler::RubyVersion).to receive(:new).once.and_call_original
-        2.times { subject }
-      end
-
-      describe "#version" do
-        it "should return a copy of the value of RUBY_VERSION" do
-          expect(subject.versions).to eq([RUBY_VERSION])
-          expect(subject.versions.first).to_not be(RUBY_VERSION)
-        end
-      end
-
-      describe "#engine" do
-        context "RUBY_ENGINE is defined" do
-          before { stub_const("RUBY_ENGINE", "jruby") }
-          before { stub_const("JRUBY_VERSION", "2.1.1") }
-
-          it "should return a copy of the value of RUBY_ENGINE" do
-            expect(subject.engine).to eq("jruby")
-            expect(subject.engine).to_not be(RUBY_ENGINE)
-          end
-        end
-
-        context "RUBY_ENGINE is not defined" do
-          before { stub_const("RUBY_ENGINE", nil) }
-
-          it "should return the string 'ruby'" do
-            expect(subject.engine).to eq("ruby")
-          end
-        end
-      end
-
-      describe "#engine_version" do
-        context "engine is ruby" do
-          before do
-            stub_const("RUBY_VERSION", "2.2.4")
-            stub_const("RUBY_ENGINE", "ruby")
-          end
-
-          it "should return a copy of the value of RUBY_VERSION" do
-            expect(bundler_system_ruby_version.engine_versions).to eq(["2.2.4"])
-            expect(bundler_system_ruby_version.engine_versions.first).to_not be(RUBY_VERSION)
-          end
-        end
-
-        context "engine is rbx" do
-          before do
-            stub_const("RUBY_ENGINE", "rbx")
-            stub_const("Rubinius::VERSION", "2.0.0")
-          end
-
-          it "should return a copy of the value of Rubinius::VERSION" do
-            expect(bundler_system_ruby_version.engine_versions).to eq(["2.0.0"])
-            expect(bundler_system_ruby_version.engine_versions.first).to_not be(Rubinius::VERSION)
-          end
-        end
-
-        context "engine is jruby" do
-          before do
-            stub_const("RUBY_ENGINE", "jruby")
-            stub_const("JRUBY_VERSION", "2.1.1")
-          end
-
-          it "should return a copy of the value of JRUBY_VERSION" do
-            expect(subject.engine_versions).to eq(["2.1.1"])
-            expect(bundler_system_ruby_version.engine_versions.first).to_not be(JRUBY_VERSION)
-          end
-        end
-
-        context "engine is some other ruby engine" do
-          before do
-            stub_const("RUBY_ENGINE", "not_supported_ruby_engine")
-            stub_const("RUBY_ENGINE_VERSION", "1.2.3")
-          end
-
-          it "returns RUBY_ENGINE_VERSION" do
-            expect(bundler_system_ruby_version.engine_versions).to eq(["1.2.3"])
-          end
-        end
-      end
-
-      describe "#patchlevel" do
-        it "should return a string with the value of RUBY_PATCHLEVEL" do
-          expect(subject.patchlevel).to eq(RUBY_PATCHLEVEL.to_s)
-        end
-      end
-    end
-
-    describe "#to_gem_version_with_patchlevel" do
-      shared_examples_for "the patchlevel is omitted" do
-        it "does not include a patch level" do
-          expect(subject.to_gem_version_with_patchlevel.to_s).to eq(version)
-        end
-      end
-
-      context "with nil patch number" do
-        let(:patchlevel) { nil }
-
-        it_behaves_like "the patchlevel is omitted"
-      end
-
-      context "with negative patch number" do
-        let(:patchlevel) { -1 }
-
-        it_behaves_like "the patchlevel is omitted"
-      end
-
-      context "with a valid patch number" do
-        it "uses the specified patchlevel as patchlevel" do
-          expect(subject.to_gem_version_with_patchlevel.to_s).to eq("#{version}.#{patchlevel}")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/rubygems_integration_spec.rb b/spec/bundler/bundler/rubygems_integration_spec.rb
deleted file mode 100644
index b1b15d9e5d..0000000000
--- a/spec/bundler/bundler/rubygems_integration_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::RubygemsIntegration do
-  it "uses the same chdir lock as rubygems", :rubygems => "2.1" do
-    expect(Bundler.rubygems.ext_lock).to eq(Gem::Ext::Builder::CHDIR_MONITOR)
-  end
-
-  context "#validate" do
-    let(:spec) do
-      Gem::Specification.new do |s|
-        s.name = "to-validate"
-        s.version = "1.0.0"
-        s.loaded_from = __FILE__
-      end
-    end
-    subject { Bundler.rubygems.validate(spec) }
-
-    it "skips overly-strict gemspec validation", :rubygems => "< 1.7" do
-      expect(spec).to_not receive(:validate)
-      subject
-    end
-
-    it "validates with packaging mode disabled", :rubygems => "1.7" do
-      expect(spec).to receive(:validate).with(false)
-      subject
-    end
-
-    it "should set a summary to avoid an overly-strict error", :rubygems => "~> 1.7.0" do
-      spec.summary = nil
-      expect { subject }.not_to raise_error
-      expect(spec.summary).to eq("")
-    end
-
-    context "with an invalid spec" do
-      before do
-        expect(spec).to receive(:validate).with(false).
-          and_raise(Gem::InvalidSpecificationException.new("TODO is not an author"))
-      end
-
-      it "should raise a Gem::InvalidSpecificationException and produce a helpful warning message",
-        :rubygems => "1.7" do
-        expect { subject }.to raise_error(Gem::InvalidSpecificationException,
-          "The gemspec at #{__FILE__} is not valid. "\
-          "Please fix this gemspec.\nThe validation error was 'TODO is not an author'\n")
-      end
-    end
-  end
-
-  describe "#configuration" do
-    it "handles Gem::SystemExitException errors" do
-      allow(Gem).to receive(:configuration) { raise Gem::SystemExitException.new(1) }
-      expect { Bundler.rubygems.configuration }.to raise_error(Gem::SystemExitException)
-    end
-  end
-
-  describe "#download_gem", :rubygems => ">= 2.0" do
-    let(:bundler_retry) { double(Bundler::Retry) }
-    let(:retry) { double("Bundler::Retry") }
-    let(:uri) {  URI.parse("https://foo.bar") }
-    let(:path) { Gem.path.first }
-    let(:spec) do
-      spec = Bundler::RemoteSpecification.new("Foo", Gem::Version.new("2.5.2"),
-        Gem::Platform::RUBY, nil)
-      spec.remote = Bundler::Source::Rubygems::Remote.new(uri.to_s)
-      spec
-    end
-    let(:fetcher) { double("gem_remote_fetcher") }
-
-    it "successfully downloads gem with retries" do
-      expect(Bundler.rubygems).to receive(:gem_remote_fetcher).and_return(fetcher)
-      expect(fetcher).to receive(:headers=).with("X-Gemfile-Source" => "https://foo.bar")
-      expect(Bundler::Retry).to receive(:new).with("download gem from #{uri}/").
-        and_return(bundler_retry)
-      expect(bundler_retry).to receive(:attempts).and_yield
-      expect(fetcher).to receive(:download).with(spec, uri, path)
-
-      Bundler.rubygems.download_gem(spec, uri, path)
-    end
-  end
-
-  describe "#fetch_all_remote_specs", :rubygems => ">= 2.0" do
-    let(:uri) { URI("https://example.com") }
-    let(:fetcher) { double("gem_remote_fetcher") }
-    let(:specs_response) { Marshal.dump(["specs"]) }
-    let(:prerelease_specs_response) { Marshal.dump(["prerelease_specs"]) }
-
-    context "when a rubygems source mirror is set" do
-      let(:orig_uri) { URI("http://zombo.com") }
-      let(:remote_with_mirror) { double("remote", :uri => uri, :original_uri => orig_uri) }
-
-      it "sets the 'X-Gemfile-Source' header containing the original source" do
-        expect(Bundler.rubygems).to receive(:gem_remote_fetcher).twice.and_return(fetcher)
-        expect(fetcher).to receive(:headers=).with("X-Gemfile-Source" => "http://zombo.com").twice
-        expect(fetcher).to receive(:fetch_path).with(uri + "specs.4.8.gz").and_return(specs_response)
-        expect(fetcher).to receive(:fetch_path).with(uri + "prerelease_specs.4.8.gz").and_return(prerelease_specs_response)
-        result = Bundler.rubygems.fetch_all_remote_specs(remote_with_mirror)
-        expect(result).to eq(%w[specs prerelease_specs])
-      end
-    end
-
-    context "when there is no rubygems source mirror set" do
-      let(:remote_no_mirror) { double("remote", :uri => uri, :original_uri => nil) }
-
-      it "does not set the 'X-Gemfile-Source' header" do
-        expect(Bundler.rubygems).to receive(:gem_remote_fetcher).twice.and_return(fetcher)
-        expect(fetcher).to_not receive(:headers=)
-        expect(fetcher).to receive(:fetch_path).with(uri + "specs.4.8.gz").and_return(specs_response)
-        expect(fetcher).to receive(:fetch_path).with(uri + "prerelease_specs.4.8.gz").and_return(prerelease_specs_response)
-        result = Bundler.rubygems.fetch_all_remote_specs(remote_no_mirror)
-        expect(result).to eq(%w[specs prerelease_specs])
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/settings/validator_spec.rb b/spec/bundler/bundler/settings/validator_spec.rb
deleted file mode 100644
index e4ffd89435..0000000000
--- a/spec/bundler/bundler/settings/validator_spec.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Settings::Validator do
-  describe ".validate!" do
-    def validate!(key, value, settings)
-      transformed_key = Bundler.settings.key_for(key)
-      if value.nil?
-        settings.delete(transformed_key)
-      else
-        settings[transformed_key] = value
-      end
-      described_class.validate!(key, value, settings)
-      settings
-    end
-
-    it "path and path.system are mutually exclusive" do
-      expect(validate!("path", "bundle", {})).to eq("BUNDLE_PATH" => "bundle")
-      expect(validate!("path", "bundle", "BUNDLE_PATH__SYSTEM" => false)).to eq("BUNDLE_PATH" => "bundle")
-      expect(validate!("path", "bundle", "BUNDLE_PATH__SYSTEM" => true)).to eq("BUNDLE_PATH" => "bundle")
-      expect(validate!("path", nil, "BUNDLE_PATH__SYSTEM" => true)).to eq("BUNDLE_PATH__SYSTEM" => true)
-      expect(validate!("path", nil, "BUNDLE_PATH__SYSTEM" => false)).to eq("BUNDLE_PATH__SYSTEM" => false)
-      expect(validate!("path", nil, {})).to eq({})
-
-      expect(validate!("path.system", true, "BUNDLE_PATH" => "bundle")).to eq("BUNDLE_PATH__SYSTEM" => true)
-      expect(validate!("path.system", false, "BUNDLE_PATH" => "bundle")).to eq("BUNDLE_PATH" => "bundle", "BUNDLE_PATH__SYSTEM" => false)
-      expect(validate!("path.system", nil, "BUNDLE_PATH" => "bundle")).to eq("BUNDLE_PATH" => "bundle")
-      expect(validate!("path.system", true, {})).to eq("BUNDLE_PATH__SYSTEM" => true)
-      expect(validate!("path.system", false, {})).to eq("BUNDLE_PATH__SYSTEM" => false)
-      expect(validate!("path.system", nil, {})).to eq({})
-    end
-
-    it "a group cannot be in both `with` & `without` simultaneously" do
-      expect do
-        validate!("with", "", {})
-        validate!("with", nil, {})
-        validate!("with", "", "BUNDLE_WITHOUT" => "a")
-        validate!("with", nil, "BUNDLE_WITHOUT" => "a")
-        validate!("with", "b:c", "BUNDLE_WITHOUT" => "a")
-
-        validate!("without", "", {})
-        validate!("without", nil, {})
-        validate!("without", "", "BUNDLE_WITH" => "a")
-        validate!("without", nil, "BUNDLE_WITH" => "a")
-        validate!("without", "b:c", "BUNDLE_WITH" => "a")
-      end.not_to raise_error
-
-      expect { validate!("with", "b:c", "BUNDLE_WITHOUT" => "c:d") }.to raise_error Bundler::InvalidOption, strip_whitespace(<<-EOS).strip
-        Setting `with` to "b:c" failed:
-         - a group cannot be in both `with` & `without` simultaneously
-         - `without` is current set to [:c, :d]
-         - the `c` groups conflict
-      EOS
-
-      expect { validate!("without", "b:c", "BUNDLE_WITH" => "c:d") }.to raise_error Bundler::InvalidOption, strip_whitespace(<<-EOS).strip
-        Setting `without` to "b:c" failed:
-         - a group cannot be in both `with` & `without` simultaneously
-         - `with` is current set to [:c, :d]
-         - the `c` groups conflict
-      EOS
-    end
-  end
-
-  describe described_class::Rule do
-    let(:keys) { %w[key] }
-    let(:description) { "rule description" }
-    let(:validate) { proc { raise "validate called!" } }
-    subject(:rule) { described_class.new(keys, description, &validate) }
-
-    describe "#validate!" do
-      it "calls the block" do
-        expect { rule.validate!("key", nil, {}) }.to raise_error(RuntimeError, /validate called!/)
-      end
-    end
-
-    describe "#fail!" do
-      it "raises with a helpful message" do
-        expect { subject.fail!("key", "value", "reason1", "reason2") }.to raise_error Bundler::InvalidOption, strip_whitespace(<<-EOS).strip
-          Setting `key` to "value" failed:
-           - rule description
-           - reason1
-           - reason2
-        EOS
-      end
-    end
-
-    describe "#set" do
-      it "works when the value has not changed" do
-        allow(Bundler.ui).to receive(:info).never
-
-        subject.set({}, "key", nil)
-        subject.set({ "BUNDLE_KEY" => "value" }, "key", "value")
-      end
-
-      it "prints out when the value is changing" do
-        settings = {}
-
-        expect(Bundler.ui).to receive(:info).with("Setting `key` to \"value\", since rule description, reason1")
-        subject.set(settings, "key", "value", "reason1")
-        expect(settings).to eq("BUNDLE_KEY" => "value")
-
-        expect(Bundler.ui).to receive(:info).with("Setting `key` to \"value2\", since rule description, reason2")
-        subject.set(settings, "key", "value2", "reason2")
-        expect(settings).to eq("BUNDLE_KEY" => "value2")
-
-        expect(Bundler.ui).to receive(:info).with("Setting `key` to nil, since rule description, reason3")
-        subject.set(settings, "key", nil, "reason3")
-        expect(settings).to eq({})
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/settings_spec.rb b/spec/bundler/bundler/settings_spec.rb
deleted file mode 100644
index 1a31493e20..0000000000
--- a/spec/bundler/bundler/settings_spec.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/settings"
-
-RSpec.describe Bundler::Settings do
-  subject(:settings) { described_class.new(bundled_app) }
-
-  describe "#set_local" do
-    context "when the local config file is not found" do
-      subject(:settings) { described_class.new(nil) }
-
-      it "raises a GemfileNotFound error with explanation" do
-        expect { subject.set_local("foo", "bar") }.
-          to raise_error(Bundler::GemfileNotFound, "Could not locate Gemfile")
-      end
-    end
-  end
-
-  describe "load_config" do
-    let(:hash) do
-      {
-        "build.thrift" => "--with-cppflags=-D_FORTIFY_SOURCE=0",
-        "build.libv8" => "--with-system-v8",
-        "build.therubyracer" => "--with-v8-dir",
-        "build.pg" => "--with-pg-config=/usr/local/Cellar/postgresql92/9.2.8_1/bin/pg_config",
-        "gem.coc" => "false",
-        "gem.mit" => "false",
-        "gem.test" => "minitest",
-        "thingy" => <<-EOS.tr("\n", " "),
---asdf --fdsa --ty=oh man i hope this doesnt break bundler because
-that would suck --ehhh=oh geez it looks like i might have broken bundler somehow
---very-important-option=DontDeleteRoo
---very-important-option=DontDeleteRoo
---very-important-option=DontDeleteRoo
---very-important-option=DontDeleteRoo
-        EOS
-        "xyz" => "zyx",
-      }
-    end
-
-    before do
-      hash.each do |key, value|
-        settings.set_local key, value
-      end
-    end
-
-    it "can load the config" do
-      loaded = settings.send(:load_config, bundled_app("config"))
-      expected = Hash[hash.map do |k, v|
-        [settings.send(:key_for, k), v.to_s]
-      end]
-      expect(loaded).to eq(expected)
-    end
-
-    context "when BUNDLE_IGNORE_CONFIG is set" do
-      before { ENV["BUNDLE_IGNORE_CONFIG"] = "TRUE" }
-
-      it "ignores the config" do
-        loaded = settings.send(:load_config, bundled_app("config"))
-        expect(loaded).to eq({})
-      end
-    end
-  end
-
-  describe "#global_config_file" do
-    context "when $HOME is not accessible" do
-      context "when $TMPDIR is not writable" do
-        it "does not raise" do
-          expect(Bundler.rubygems).to receive(:user_home).twice.and_return(nil)
-          expect(FileUtils).to receive(:mkpath).twice.with(File.join(Dir.tmpdir, "bundler", "home")).and_raise(Errno::EROFS, "Read-only file system @ dir_s_mkdir - /tmp/bundler")
-
-          expect(subject.send(:global_config_file)).to be_nil
-        end
-      end
-    end
-  end
-
-  describe "#[]" do
-    context "when the local config file is not found" do
-      subject(:settings) { described_class.new }
-
-      it "does not raise" do
-        expect do
-          subject["foo"]
-        end.not_to raise_error
-      end
-    end
-
-    context "when not set" do
-      context "when default value present" do
-        it "retrieves value" do
-          expect(settings[:retry]).to be 3
-        end
-      end
-
-      it "returns nil" do
-        expect(settings[:buttermilk]).to be nil
-      end
-    end
-
-    context "when is boolean" do
-      it "returns a boolean" do
-        settings.set_local :frozen, "true"
-        expect(settings[:frozen]).to be true
-      end
-      context "when specific gem is configured" do
-        it "returns a boolean" do
-          settings.set_local "ignore_messages.foobar", "true"
-          expect(settings["ignore_messages.foobar"]).to be true
-        end
-      end
-    end
-
-    context "when is number" do
-      it "returns a number" do
-        settings.set_local :ssl_verify_mode, "1"
-        expect(settings[:ssl_verify_mode]).to be 1
-      end
-    end
-
-    context "when it's not possible to write to the file" do
-      it "raises an PermissionError with explanation" do
-        expect(bundler_fileutils).to receive(:mkdir_p).with(settings.send(:local_config_file).dirname).
-          and_raise(Errno::EACCES)
-        expect { settings.set_local :frozen, "1" }.
-          to raise_error(Bundler::PermissionError, /config/)
-      end
-    end
-  end
-
-  describe "#temporary" do
-    it "reset after used" do
-      Bundler.settings.set_local :no_install, true
-
-      Bundler.settings.temporary(:no_install => false) do
-        expect(Bundler.settings[:no_install]).to eq false
-      end
-
-      expect(Bundler.settings[:no_install]).to eq true
-    end
-
-    it "returns the return value of the block" do
-      ret = Bundler.settings.temporary({}) { :ret }
-      expect(ret).to eq :ret
-    end
-
-    context "when called without a block" do
-      it "leaves the setting changed" do
-        Bundler.settings.temporary(:foo => :random)
-        expect(Bundler.settings[:foo]).to eq "random"
-      end
-
-      it "returns nil" do
-        expect(Bundler.settings.temporary(:foo => :bar)).to be_nil
-      end
-    end
-  end
-
-  describe "#set_global" do
-    context "when it's not possible to write to the file" do
-      it "raises an PermissionError with explanation" do
-        expect(bundler_fileutils).to receive(:mkdir_p).with(settings.send(:global_config_file).dirname).
-          and_raise(Errno::EACCES)
-        expect { settings.set_global(:frozen, "1") }.
-          to raise_error(Bundler::PermissionError, %r{\.bundle/config})
-      end
-    end
-  end
-
-  describe "#pretty_values_for" do
-    it "prints the converted value rather than the raw string" do
-      bool_key = described_class::BOOL_KEYS.first
-      settings.set_local(bool_key, "false")
-      expect(subject.pretty_values_for(bool_key)).to eq [
-        "Set for your local app (#{bundled_app("config")}): false",
-      ]
-    end
-  end
-
-  describe "#mirror_for" do
-    let(:uri) { URI("https://rubygems.org/") }
-
-    context "with no configured mirror" do
-      it "returns the original URI" do
-        expect(settings.mirror_for(uri)).to eq(uri)
-      end
-
-      it "converts a string parameter to a URI" do
-        expect(settings.mirror_for("https://rubygems.org/")).to eq(uri)
-      end
-    end
-
-    context "with a configured mirror" do
-      let(:mirror_uri) { URI("https://rubygems-mirror.org/") }
-
-      before { settings.set_local "mirror.https://rubygems.org/", mirror_uri.to_s }
-
-      it "returns the mirror URI" do
-        expect(settings.mirror_for(uri)).to eq(mirror_uri)
-      end
-
-      it "converts a string parameter to a URI" do
-        expect(settings.mirror_for("https://rubygems.org/")).to eq(mirror_uri)
-      end
-
-      it "normalizes the URI" do
-        expect(settings.mirror_for("https://rubygems.org")).to eq(mirror_uri)
-      end
-
-      it "is case insensitive" do
-        expect(settings.mirror_for("HTTPS://RUBYGEMS.ORG/")).to eq(mirror_uri)
-      end
-
-      context "with a file URI" do
-        let(:mirror_uri) { URI("file:/foo/BAR/baz/qUx/") }
-
-        it "returns the mirror URI" do
-          expect(settings.mirror_for(uri)).to eq(mirror_uri)
-        end
-
-        it "converts a string parameter to a URI" do
-          expect(settings.mirror_for("file:/foo/BAR/baz/qUx/")).to eq(mirror_uri)
-        end
-
-        it "normalizes the URI" do
-          expect(settings.mirror_for("file:/foo/BAR/baz/qUx")).to eq(mirror_uri)
-        end
-      end
-    end
-  end
-
-  describe "#credentials_for" do
-    let(:uri) { URI("https://gemserver.example.org/") }
-    let(:credentials) { "username:password" }
-
-    context "with no configured credentials" do
-      it "returns nil" do
-        expect(settings.credentials_for(uri)).to be_nil
-      end
-    end
-
-    context "with credentials configured by URL" do
-      before { settings.set_local "https://gemserver.example.org/", credentials }
-
-      it "returns the configured credentials" do
-        expect(settings.credentials_for(uri)).to eq(credentials)
-      end
-    end
-
-    context "with credentials configured by hostname" do
-      before { settings.set_local "gemserver.example.org", credentials }
-
-      it "returns the configured credentials" do
-        expect(settings.credentials_for(uri)).to eq(credentials)
-      end
-    end
-  end
-
-  describe "URI normalization" do
-    it "normalizes HTTP URIs in credentials configuration" do
-      settings.set_local "http://gemserver.example.org", "username:password"
-      expect(settings.all).to include("http://gemserver.example.org/")
-    end
-
-    it "normalizes HTTPS URIs in credentials configuration" do
-      settings.set_local "https://gemserver.example.org", "username:password"
-      expect(settings.all).to include("https://gemserver.example.org/")
-    end
-
-    it "normalizes HTTP URIs in mirror configuration" do
-      settings.set_local "mirror.http://rubygems.org", "http://rubygems-mirror.org"
-      expect(settings.all).to include("mirror.http://rubygems.org/")
-    end
-
-    it "normalizes HTTPS URIs in mirror configuration" do
-      settings.set_local "mirror.https://rubygems.org", "http://rubygems-mirror.org"
-      expect(settings.all).to include("mirror.https://rubygems.org/")
-    end
-
-    it "does not normalize other config keys that happen to contain 'http'" do
-      settings.set_local "local.httparty", home("httparty")
-      expect(settings.all).to include("local.httparty")
-    end
-
-    it "does not normalize other config keys that happen to contain 'https'" do
-      settings.set_local "local.httpsmarty", home("httpsmarty")
-      expect(settings.all).to include("local.httpsmarty")
-    end
-
-    it "reads older keys without trailing slashes" do
-      settings.set_local "mirror.https://rubygems.org", "http://rubygems-mirror.org"
-      expect(settings.mirror_for("https://rubygems.org/")).to eq(
-        URI("http://rubygems-mirror.org/")
-      )
-    end
-
-    it "normalizes URIs with a fallback_timeout option" do
-      settings.set_local "mirror.https://rubygems.org/.fallback_timeout", "true"
-      expect(settings.all).to include("mirror.https://rubygems.org/.fallback_timeout")
-    end
-
-    it "normalizes URIs with a fallback_timeout option without a trailing slash" do
-      settings.set_local "mirror.https://rubygems.org.fallback_timeout", "true"
-      expect(settings.all).to include("mirror.https://rubygems.org/.fallback_timeout")
-    end
-  end
-
-  describe "BUNDLE_ keys format" do
-    let(:settings) { described_class.new(bundled_app(".bundle")) }
-
-    it "converts older keys without double dashes" do
-      config("BUNDLE_MY__PERSONAL.RACK" => "~/Work/git/rack")
-      expect(settings["my.personal.rack"]).to eq("~/Work/git/rack")
-    end
-
-    it "converts older keys without trailing slashes and double dashes" do
-      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS.ORG" => "http://rubygems-mirror.org")
-      expect(settings["mirror.https://rubygems.org/"]).to eq("http://rubygems-mirror.org")
-    end
-
-    it "reads newer keys format properly" do
-      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://rubygems-mirror.org")
-      expect(settings["mirror.https://rubygems.org/"]).to eq("http://rubygems-mirror.org")
-    end
-  end
-end
diff --git a/spec/bundler/bundler/shared_helpers_spec.rb b/spec/bundler/bundler/shared_helpers_spec.rb
deleted file mode 100644
index fcac37b398..0000000000
--- a/spec/bundler/bundler/shared_helpers_spec.rb
+++ /dev/null
@@ -1,513 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::SharedHelpers do
-  let(:ext_lock_double) { double(:ext_lock) }
-
-  before do
-    allow(Bundler.rubygems).to receive(:ext_lock).and_return(ext_lock_double)
-    allow(ext_lock_double).to receive(:synchronize) {|&block| block.call }
-  end
-
-  subject { Bundler::SharedHelpers }
-
-  describe "#default_gemfile" do
-    before { ENV["BUNDLE_GEMFILE"] = "/path/Gemfile" }
-
-    context "Gemfile is present" do
-      let(:expected_gemfile_path) { Pathname.new("/path/Gemfile") }
-
-      it "returns the Gemfile path" do
-        expect(subject.default_gemfile).to eq(expected_gemfile_path)
-      end
-    end
-
-    context "Gemfile is not present" do
-      before { ENV["BUNDLE_GEMFILE"] = nil }
-
-      it "raises a GemfileNotFound error" do
-        expect { subject.default_gemfile }.to raise_error(
-          Bundler::GemfileNotFound, "Could not locate Gemfile"
-        )
-      end
-    end
-
-    context "Gemfile is not an absolute path" do
-      before { ENV["BUNDLE_GEMFILE"] = "Gemfile" }
-
-      let(:expected_gemfile_path) { Pathname.new("Gemfile").expand_path }
-
-      it "returns the Gemfile path" do
-        expect(subject.default_gemfile).to eq(expected_gemfile_path)
-      end
-    end
-  end
-
-  describe "#default_lockfile" do
-    context "gemfile is gems.rb" do
-      let(:gemfile_path)           { Pathname.new("/path/gems.rb") }
-      let(:expected_lockfile_path) { Pathname.new("/path/gems.locked") }
-
-      before { allow(subject).to receive(:default_gemfile).and_return(gemfile_path) }
-
-      it "returns the gems.locked path" do
-        expect(subject.default_lockfile).to eq(expected_lockfile_path)
-      end
-    end
-
-    context "is a regular Gemfile" do
-      let(:gemfile_path)           { Pathname.new("/path/Gemfile") }
-      let(:expected_lockfile_path) { Pathname.new("/path/Gemfile.lock") }
-
-      before { allow(subject).to receive(:default_gemfile).and_return(gemfile_path) }
-
-      it "returns the lock file path" do
-        expect(subject.default_lockfile).to eq(expected_lockfile_path)
-      end
-    end
-  end
-
-  describe "#default_bundle_dir" do
-    context ".bundle does not exist" do
-      it "returns nil" do
-        expect(subject.default_bundle_dir).to be_nil
-      end
-    end
-
-    context ".bundle is global .bundle" do
-      let(:global_rubygems_dir) { Pathname.new("#{bundled_app}") }
-
-      before do
-        Dir.mkdir ".bundle"
-        allow(Bundler.rubygems).to receive(:user_home).and_return(global_rubygems_dir)
-      end
-
-      it "returns nil" do
-        expect(subject.default_bundle_dir).to be_nil
-      end
-    end
-
-    context ".bundle is not global .bundle" do
-      let(:global_rubygems_dir)      { Pathname.new("/path/rubygems") }
-      let(:expected_bundle_dir_path) { Pathname.new("#{bundled_app}/.bundle") }
-
-      before do
-        Dir.mkdir ".bundle"
-        allow(Bundler.rubygems).to receive(:user_home).and_return(global_rubygems_dir)
-      end
-
-      it "returns the .bundle path" do
-        expect(subject.default_bundle_dir).to eq(expected_bundle_dir_path)
-      end
-    end
-  end
-
-  describe "#in_bundle?" do
-    it "calls the find_gemfile method" do
-      expect(subject).to receive(:find_gemfile)
-      subject.in_bundle?
-    end
-
-    shared_examples_for "correctly determines whether to return a Gemfile path" do
-      context "currently in directory with a Gemfile" do
-        before { File.new("Gemfile", "w") }
-
-        it "returns path of the bundle Gemfile" do
-          expect(subject.in_bundle?).to eq("#{bundled_app}/Gemfile")
-        end
-      end
-
-      context "currently in directory without a Gemfile" do
-        it "returns nil" do
-          expect(subject.in_bundle?).to be_nil
-        end
-      end
-    end
-
-    context "ENV['BUNDLE_GEMFILE'] set" do
-      before { ENV["BUNDLE_GEMFILE"] = "/path/Gemfile" }
-
-      it "returns ENV['BUNDLE_GEMFILE']" do
-        expect(subject.in_bundle?).to eq("/path/Gemfile")
-      end
-    end
-
-    context "ENV['BUNDLE_GEMFILE'] not set" do
-      before { ENV["BUNDLE_GEMFILE"] = nil }
-
-      it_behaves_like "correctly determines whether to return a Gemfile path"
-    end
-
-    context "ENV['BUNDLE_GEMFILE'] is blank" do
-      before { ENV["BUNDLE_GEMFILE"] = "" }
-
-      it_behaves_like "correctly determines whether to return a Gemfile path"
-    end
-  end
-
-  describe "#chdir" do
-    let(:op_block) { proc { Dir.mkdir "nested_dir" } }
-
-    before { Dir.mkdir "chdir_test_dir" }
-
-    it "executes the passed block while in the specified directory" do
-      subject.chdir("chdir_test_dir", &op_block)
-      expect(Pathname.new("chdir_test_dir/nested_dir")).to exist
-    end
-  end
-
-  describe "#pwd" do
-    it "returns the current absolute path" do
-      expect(subject.pwd).to eq(bundled_app)
-    end
-  end
-
-  describe "#with_clean_git_env" do
-    let(:with_clean_git_env_block) { proc { Dir.mkdir "with_clean_git_env_test_dir" } }
-
-    before do
-      ENV["GIT_DIR"] = "ORIGINAL_ENV_GIT_DIR"
-      ENV["GIT_WORK_TREE"] = "ORIGINAL_ENV_GIT_WORK_TREE"
-    end
-
-    it "executes the passed block" do
-      subject.with_clean_git_env(&with_clean_git_env_block)
-      expect(Pathname.new("with_clean_git_env_test_dir")).to exist
-    end
-
-    context "when a block is passed" do
-      let(:with_clean_git_env_block) do
-        proc do
-          Dir.mkdir "git_dir_test_dir" unless ENV["GIT_DIR"].nil?
-          Dir.mkdir "git_work_tree_test_dir" unless ENV["GIT_WORK_TREE"].nil?
-        end end
-
-      it "uses a fresh git env for execution" do
-        subject.with_clean_git_env(&with_clean_git_env_block)
-        expect(Pathname.new("git_dir_test_dir")).to_not exist
-        expect(Pathname.new("git_work_tree_test_dir")).to_not exist
-      end
-    end
-
-    context "passed block does not throw errors" do
-      let(:with_clean_git_env_block) do
-        proc do
-          ENV["GIT_DIR"] = "NEW_ENV_GIT_DIR"
-          ENV["GIT_WORK_TREE"] = "NEW_ENV_GIT_WORK_TREE"
-        end end
-
-      it "restores the git env after" do
-        subject.with_clean_git_env(&with_clean_git_env_block)
-        expect(ENV["GIT_DIR"]).to eq("ORIGINAL_ENV_GIT_DIR")
-        expect(ENV["GIT_WORK_TREE"]).to eq("ORIGINAL_ENV_GIT_WORK_TREE")
-      end
-    end
-
-    context "passed block throws errors" do
-      let(:with_clean_git_env_block) do
-        proc do
-          ENV["GIT_DIR"] = "NEW_ENV_GIT_DIR"
-          ENV["GIT_WORK_TREE"] = "NEW_ENV_GIT_WORK_TREE"
-          raise RuntimeError.new
-        end end
-
-      it "restores the git env after" do
-        expect { subject.with_clean_git_env(&with_clean_git_env_block) }.to raise_error(RuntimeError)
-        expect(ENV["GIT_DIR"]).to eq("ORIGINAL_ENV_GIT_DIR")
-        expect(ENV["GIT_WORK_TREE"]).to eq("ORIGINAL_ENV_GIT_WORK_TREE")
-      end
-    end
-  end
-
-  describe "#set_bundle_environment" do
-    before do
-      ENV["BUNDLE_GEMFILE"] = "Gemfile"
-    end
-
-    shared_examples_for "ENV['PATH'] gets set correctly" do
-      before { Dir.mkdir ".bundle" }
-
-      it "ensures bundle bin path is in ENV['PATH']" do
-        subject.set_bundle_environment
-        paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-        expect(paths).to include("#{Bundler.bundle_path}/bin")
-      end
-    end
-
-    shared_examples_for "ENV['RUBYOPT'] gets set correctly" do
-      it "ensures -rbundler/setup is at the beginning of ENV['RUBYOPT']" do
-        subject.set_bundle_environment
-        expect(ENV["RUBYOPT"].split(" ")).to start_with("-rbundler/setup")
-      end
-    end
-
-    shared_examples_for "ENV['RUBYLIB'] gets set correctly" do
-      let(:ruby_lib_path) { "stubbed_ruby_lib_dir" }
-
-      before do
-        allow(Bundler::SharedHelpers).to receive(:bundler_ruby_lib).and_return(ruby_lib_path)
-      end
-
-      it "ensures bundler's ruby version lib path is in ENV['RUBYLIB']" do
-        subject.set_bundle_environment
-        paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-        expect(paths).to include(ruby_lib_path)
-      end
-    end
-
-    it "calls the appropriate set methods" do
-      expect(subject).to receive(:set_path)
-      expect(subject).to receive(:set_rubyopt)
-      expect(subject).to receive(:set_rubylib)
-      subject.set_bundle_environment
-    end
-
-    it "ignores if bundler_ruby_lib is same as rubylibdir" do
-      allow(Bundler::SharedHelpers).to receive(:bundler_ruby_lib).and_return(RbConfig::CONFIG["rubylibdir"])
-
-      subject.set_bundle_environment
-
-      paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-      expect(paths.count(RbConfig::CONFIG["rubylibdir"])).to eq(0)
-    end
-
-    it "exits if bundle path contains the unix-like path separator" do
-      if Gem.respond_to?(:path_separator)
-        allow(Gem).to receive(:path_separator).and_return(":")
-      else
-        stub_const("File::PATH_SEPARATOR", ":".freeze)
-      end
-      allow(Bundler).to receive(:bundle_path) { Pathname.new("so:me/dir/bin") }
-      expect { subject.send(:validate_bundle_path) }.to raise_error(
-        Bundler::PathError,
-        "Your bundle path contains text matching \":\", 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 \":\".\nYour current bundle " \
-        "path is '#{Bundler.bundle_path}'."
-      )
-    end
-
-    context "with a jruby path_separator regex", :ruby => "1.9" do
-      # In versions of jruby that supported ruby 1.8, the path separator was the standard File::PATH_SEPARATOR
-      let(:regex) { Regexp.new("(?<!jar:file|jar|file|classpath|uri:classloader|uri|http|https):") }
-      it "does not exit if bundle path is the standard uri path" do
-        allow(Bundler.rubygems).to receive(:path_separator).and_return(regex)
-        allow(Bundler).to receive(:bundle_path) { Pathname.new("uri:classloader:/WEB-INF/gems") }
-        expect { subject.send(:validate_bundle_path) }.not_to raise_error
-      end
-
-      it "exits if bundle path contains another directory" do
-        allow(Bundler.rubygems).to receive(:path_separator).and_return(regex)
-        allow(Bundler).to receive(:bundle_path) {
-          Pathname.new("uri:classloader:/WEB-INF/gems:other/dir")
-        }
-
-        expect { subject.send(:validate_bundle_path) }.to raise_error(
-          Bundler::PathError,
-          "Your bundle path contains text matching " \
-          "/(?<!jar:file|jar|file|classpath|uri:classloader|uri|http|https):/, 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 " \
-          "/(?<!jar:file|jar|file|classpath|uri:classloader|uri|http|https):/." \
-          "\nYour current bundle path is '#{Bundler.bundle_path}'."
-        )
-      end
-    end
-
-    context "ENV['PATH'] does not exist" do
-      before { ENV.delete("PATH") }
-
-      it_behaves_like "ENV['PATH'] gets set correctly"
-    end
-
-    context "ENV['PATH'] is empty" do
-      before { ENV["PATH"] = "" }
-
-      it_behaves_like "ENV['PATH'] gets set correctly"
-    end
-
-    context "ENV['PATH'] exists" do
-      before { ENV["PATH"] = "/some_path/bin" }
-
-      it_behaves_like "ENV['PATH'] gets set correctly"
-    end
-
-    context "ENV['PATH'] already contains the bundle bin path" do
-      let(:bundle_path) { "#{Bundler.bundle_path}/bin" }
-
-      before do
-        ENV["PATH"] = bundle_path
-      end
-
-      it_behaves_like "ENV['PATH'] gets set correctly"
-
-      it "ENV['PATH'] should only contain one instance of bundle bin path" do
-        subject.set_bundle_environment
-        paths = (ENV["PATH"]).split(File::PATH_SEPARATOR)
-        expect(paths.count(bundle_path)).to eq(1)
-      end
-    end
-
-    context "ENV['RUBYOPT'] does not exist" do
-      before { ENV.delete("RUBYOPT") }
-
-      it_behaves_like "ENV['RUBYOPT'] gets set correctly"
-    end
-
-    context "ENV['RUBYOPT'] exists without -rbundler/setup" do
-      before { ENV["RUBYOPT"] = "-I/some_app_path/lib" }
-
-      it_behaves_like "ENV['RUBYOPT'] gets set correctly"
-    end
-
-    context "ENV['RUBYOPT'] exists and contains -rbundler/setup" do
-      before { ENV["RUBYOPT"] = "-rbundler/setup" }
-
-      it_behaves_like "ENV['RUBYOPT'] gets set correctly"
-    end
-
-    context "ENV['RUBYLIB'] does not exist" do
-      before { ENV.delete("RUBYLIB") }
-
-      it_behaves_like "ENV['RUBYLIB'] gets set correctly"
-    end
-
-    context "ENV['RUBYLIB'] is empty" do
-      before { ENV["PATH"] = "" }
-
-      it_behaves_like "ENV['RUBYLIB'] gets set correctly"
-    end
-
-    context "ENV['RUBYLIB'] exists" do
-      before { ENV["PATH"] = "/some_path/bin" }
-
-      it_behaves_like "ENV['RUBYLIB'] gets set correctly"
-    end
-
-    context "bundle executable in ENV['BUNDLE_BIN_PATH'] does not exist" do
-      before { ENV["BUNDLE_BIN_PATH"] = "/does/not/exist" }
-      before { Bundler.rubygems.replace_bin_path [], [] }
-
-      it "sets BUNDLE_BIN_PATH to the bundle executable file" do
-        subject.set_bundle_environment
-        bundle_exe = ruby_core? ? "../../../../exe/bundle" : "../../../exe/bundle"
-        expect(ENV["BUNDLE_BIN_PATH"]).to eq(File.expand_path(bundle_exe, __FILE__))
-      end
-    end
-
-    context "ENV['RUBYLIB'] already contains the bundler's ruby version lib path" do
-      let(:ruby_lib_path) { "stubbed_ruby_lib_dir" }
-
-      before do
-        ENV["RUBYLIB"] = ruby_lib_path
-      end
-
-      it_behaves_like "ENV['RUBYLIB'] gets set correctly"
-
-      it "ENV['RUBYLIB'] should only contain one instance of bundler's ruby version lib path" do
-        subject.set_bundle_environment
-        paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-        expect(paths.count(ruby_lib_path)).to eq(1)
-      end
-    end
-  end
-
-  describe "#filesystem_access" do
-    context "system has proper permission access" do
-      let(:file_op_block) { proc {|path| FileUtils.mkdir_p(path) } }
-
-      it "performs the operation in the passed block" do
-        subject.filesystem_access("./test_dir", &file_op_block)
-        expect(Pathname.new("test_dir")).to exist
-      end
-    end
-
-    context "system throws Errno::EACESS" do
-      let(:file_op_block) { proc {|_path| raise Errno::EACCES } }
-
-      it "raises a PermissionError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::PermissionError
-        )
-      end
-    end
-
-    context "system throws Errno::EAGAIN" do
-      let(:file_op_block) { proc {|_path| raise Errno::EAGAIN } }
-
-      it "raises a TemporaryResourceError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::TemporaryResourceError
-        )
-      end
-    end
-
-    context "system throws Errno::EPROTO" do
-      let(:file_op_block) { proc {|_path| raise Errno::EPROTO } }
-
-      it "raises a VirtualProtocolError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::VirtualProtocolError
-        )
-      end
-    end
-
-    context "system throws Errno::ENOTSUP", :ruby => "1.9" do
-      let(:file_op_block) { proc {|_path| raise Errno::ENOTSUP } }
-
-      it "raises a OperationNotSupportedError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::OperationNotSupportedError
-        )
-      end
-    end
-
-    context "system throws Errno::ENOSPC" do
-      let(:file_op_block) { proc {|_path| raise Errno::ENOSPC } }
-
-      it "raises a NoSpaceOnDeviceError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::NoSpaceOnDeviceError
-        )
-      end
-    end
-
-    context "system throws an unhandled SystemCallError" do
-      let(:error) { SystemCallError.new("Shields down", 1337) }
-      let(:file_op_block) { proc {|_path| raise error } }
-
-      it "raises a GenericSystemCallError" do
-        expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::GenericSystemCallError, /error accessing.+underlying.+Shields down/m
-        )
-      end
-    end
-  end
-
-  describe "#const_get_safely" do
-    module TargetNamespace
-      VALID_CONSTANT = 1
-    end
-
-    context "when the namespace does have the requested constant" do
-      it "returns the value of the requested constant" do
-        expect(subject.const_get_safely(:VALID_CONSTANT, TargetNamespace)).to eq(1)
-      end
-    end
-
-    context "when the requested constant is passed as a string" do
-      it "returns the value of the requested constant" do
-        expect(subject.const_get_safely("VALID_CONSTANT", TargetNamespace)).to eq(1)
-      end
-    end
-
-    context "when the namespace does not have the requested constant" do
-      it "returns nil" do
-        expect(subject.const_get_safely("INVALID_CONSTANT", TargetNamespace)).to be_nil
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source/git/git_proxy_spec.rb b/spec/bundler/bundler/source/git/git_proxy_spec.rb
deleted file mode 100644
index 3a29c97461..0000000000
--- a/spec/bundler/bundler/source/git/git_proxy_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Source::Git::GitProxy do
-  let(:path) { Pathname("path") }
-  let(:uri) { "https://github.com/bundler/bundler.git" }
-  let(:ref) { "HEAD" }
-  let(:revision) { nil }
-  let(:git_source) { nil }
-  subject { described_class.new(path, uri, ref, revision, git_source) }
-
-  context "with configured credentials" do
-    it "adds username and password to URI" do
-      Bundler.settings.temporary(uri => "u:p")
-      expect(subject).to receive(:git_retry).with(match("https://u:p@github.com/bundler/bundler.git"))
-      subject.checkout
-    end
-
-    it "adds username and password to URI for host" do
-      Bundler.settings.temporary("github.com" => "u:p")
-      expect(subject).to receive(:git_retry).with(match("https://u:p@github.com/bundler/bundler.git"))
-      subject.checkout
-    end
-
-    it "does not add username and password to mismatched URI" do
-      Bundler.settings.temporary("https://u:p@github.com/bundler/bundler-mismatch.git" => "u:p")
-      expect(subject).to receive(:git_retry).with(match(uri))
-      subject.checkout
-    end
-
-    it "keeps original userinfo" do
-      Bundler.settings.temporary("github.com" => "u:p")
-      original = "https://orig:info@github.com/bundler/bundler.git"
-      subject = described_class.new(Pathname("path"), original, "HEAD")
-      expect(subject).to receive(:git_retry).with(match(original))
-      subject.checkout
-    end
-  end
-
-  describe "#version" do
-    context "with a normal version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3")
-      end
-
-      it "returns the git version number" do
-        expect(subject.version).to eq("1.2.3")
-      end
-
-      it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
-      end
-    end
-
-    context "with a OSX version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3 (Apple Git-BS)")
-      end
-
-      it "strips out OSX specific additions in the version string" do
-        expect(subject.version).to eq("1.2.3")
-      end
-
-      it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
-      end
-    end
-
-    context "with a msysgit version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3.msysgit.0")
-      end
-
-      it "strips out msysgit specific additions in the version string" do
-        expect(subject.version).to eq("1.2.3")
-      end
-
-      it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
-      end
-    end
-  end
-
-  describe "#full_version" do
-    context "with a normal version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3")
-      end
-
-      it "returns the git version number" do
-        expect(subject.full_version).to eq("1.2.3")
-      end
-    end
-
-    context "with a OSX version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3 (Apple Git-BS)")
-      end
-
-      it "does not strip out OSX specific additions in the version string" do
-        expect(subject.full_version).to eq("1.2.3 (Apple Git-BS)")
-      end
-    end
-
-    context "with a msysgit version number" do
-      before do
-        expect(subject).to receive(:git).with("--version").
-          and_return("git version 1.2.3.msysgit.0")
-      end
-
-      it "does not strip out msysgit specific additions in the version string" do
-        expect(subject.full_version).to eq("1.2.3.msysgit.0")
-      end
-    end
-  end
-
-  describe "#copy_to" do
-    let(:destination) { tmpdir("copy_to_path") }
-    let(:submodules) { false }
-
-    context "when given a SHA as a revision" do
-      let(:revision) { "abcd" * 10 }
-
-      it "fails gracefully when resetting to the revision fails" do
-        expect(subject).to receive(:git_retry).with(start_with("clone ")) { destination.mkpath }
-        expect(subject).to receive(:git_retry).with(start_with("fetch "))
-        expect(subject).to receive(:git).with("reset --hard #{revision}").and_raise(Bundler::Source::Git::GitCommandError, "command")
-        expect(subject).not_to receive(:git)
-
-        expect { subject.copy_to(destination, submodules) }.
-          to raise_error(Bundler::Source::Git::MissingGitRevisionError,
-            "Revision #{revision} does not exist in the repository #{uri}. Maybe you misspelled it?")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source/git_spec.rb b/spec/bundler/bundler/source/git_spec.rb
deleted file mode 100644
index f7475a35aa..0000000000
--- a/spec/bundler/bundler/source/git_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Source::Git do
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new("root") }
-  end
-
-  let(:uri) { "https://github.com/foo/bar.git" }
-  let(:options) do
-    { "uri" => uri }
-  end
-
-  subject { described_class.new(options) }
-
-  describe "#to_s" do
-    it "returns a description" do
-      expect(subject.to_s).to eq "https://github.com/foo/bar.git (at master)"
-    end
-
-    context "when the URI contains credentials" do
-      let(:uri) { "https://my-secret-token:x-oauth-basic@github.com/foo/bar.git" }
-
-      it "filters credentials" do
-        expect(subject.to_s).to eq "https://x-oauth-basic@github.com/foo/bar.git (at master)"
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source/path_spec.rb b/spec/bundler/bundler/source/path_spec.rb
deleted file mode 100644
index 1d13e03ec1..0000000000
--- a/spec/bundler/bundler/source/path_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Source::Path do
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new("root") }
-  end
-
-  describe "#eql?" do
-    subject { described_class.new("path" => "gems/a") }
-
-    context "with two equivalent relative paths from different roots" do
-      let(:a_gem_opts) { { "path" => "../gems/a", "root_path" => Bundler.root.join("nested") } }
-      let(:a_gem)      { described_class.new a_gem_opts }
-
-      it "returns true" do
-        expect(subject).to eq a_gem
-      end
-    end
-
-    context "with the same (but not equivalent) relative path from different roots" do
-      subject { described_class.new("path" => "gems/a") }
-
-      let(:a_gem_opts) { { "path" => "gems/a", "root_path" => Bundler.root.join("nested") } }
-      let(:a_gem)      { described_class.new a_gem_opts }
-
-      it "returns false" do
-        expect(subject).to_not eq a_gem
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source/rubygems/remote_spec.rb b/spec/bundler/bundler/source/rubygems/remote_spec.rb
deleted file mode 100644
index 9a7ab42128..0000000000
--- a/spec/bundler/bundler/source/rubygems/remote_spec.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/source/rubygems/remote"
-
-RSpec.describe Bundler::Source::Rubygems::Remote do
-  def remote(uri)
-    Bundler::Source::Rubygems::Remote.new(uri)
-  end
-
-  before do
-    allow(Digest(:MD5)).to receive(:hexdigest).with(duck_type(:to_s)) {|string| "MD5HEX(#{string})" }
-  end
-
-  let(:uri_no_auth) { URI("https://gems.example.com") }
-  let(:uri_with_auth) { URI("https://#{credentials}@gems.example.com") }
-  let(:credentials) { "username:password" }
-
-  context "when the original URI has no credentials" do
-    describe "#uri" do
-      it "returns the original URI" do
-        expect(remote(uri_no_auth).uri).to eq(uri_no_auth)
-      end
-
-      it "applies configured credentials" do
-        Bundler.settings.temporary(uri_no_auth.to_s => credentials)
-        expect(remote(uri_no_auth).uri).to eq(uri_with_auth)
-      end
-    end
-
-    describe "#anonymized_uri" do
-      it "returns the original URI" do
-        expect(remote(uri_no_auth).anonymized_uri).to eq(uri_no_auth)
-      end
-
-      it "does not apply given credentials" do
-        Bundler.settings.temporary(uri_no_auth.to_s => credentials)
-        expect(remote(uri_no_auth).anonymized_uri).to eq(uri_no_auth)
-      end
-    end
-
-    describe "#cache_slug" do
-      it "returns the correct slug" do
-        expect(remote(uri_no_auth).cache_slug).to eq("gems.example.com.443.MD5HEX(gems.example.com.443./)")
-      end
-
-      it "only applies the given user" do
-        Bundler.settings.temporary(uri_no_auth.to_s => credentials)
-        expect(remote(uri_no_auth).cache_slug).to eq("gems.example.com.username.443.MD5HEX(gems.example.com.username.443./)")
-      end
-    end
-  end
-
-  context "when the original URI has a username and password" do
-    describe "#uri" do
-      it "returns the original URI" do
-        expect(remote(uri_with_auth).uri).to eq(uri_with_auth)
-      end
-
-      it "does not apply configured credentials" do
-        Bundler.settings.temporary(uri_no_auth.to_s => "other:stuff")
-        expect(remote(uri_with_auth).uri).to eq(uri_with_auth)
-      end
-    end
-
-    describe "#anonymized_uri" do
-      it "returns the URI without username and password" do
-        expect(remote(uri_with_auth).anonymized_uri).to eq(uri_no_auth)
-      end
-
-      it "does not apply given credentials" do
-        Bundler.settings.temporary(uri_no_auth.to_s => "other:stuff")
-        expect(remote(uri_with_auth).anonymized_uri).to eq(uri_no_auth)
-      end
-    end
-
-    describe "#cache_slug" do
-      it "returns the correct slug" do
-        expect(remote(uri_with_auth).cache_slug).to eq("gems.example.com.username.443.MD5HEX(gems.example.com.username.443./)")
-      end
-
-      it "does not apply given credentials" do
-        Bundler.settings.temporary(uri_with_auth.to_s => credentials)
-        expect(remote(uri_with_auth).cache_slug).to eq("gems.example.com.username.443.MD5HEX(gems.example.com.username.443./)")
-      end
-    end
-  end
-
-  context "when the original URI has only a username" do
-    let(:uri) { URI("https://SeCrEt-ToKeN@gem.fury.io/me/") }
-
-    describe "#anonymized_uri" do
-      it "returns the URI without username and password" do
-        expect(remote(uri).anonymized_uri).to eq(URI("https://gem.fury.io/me/"))
-      end
-    end
-
-    describe "#cache_slug" do
-      it "returns the correct slug" do
-        expect(remote(uri).cache_slug).to eq("gem.fury.io.SeCrEt-ToKeN.443.MD5HEX(gem.fury.io.SeCrEt-ToKeN.443./me/)")
-      end
-    end
-  end
-
-  context "when a mirror with inline credentials is configured for the URI" do
-    let(:uri) { URI("https://rubygems.org/") }
-    let(:mirror_uri_with_auth) { URI("https://username:password@rubygems-mirror.org/") }
-    let(:mirror_uri_no_auth) { URI("https://rubygems-mirror.org/") }
-
-    before { Bundler.settings.set_local("mirror.https://rubygems.org/", mirror_uri_with_auth.to_s) }
-
-    specify "#uri returns the mirror URI with credentials" do
-      expect(remote(uri).uri).to eq(mirror_uri_with_auth)
-    end
-
-    specify "#anonymized_uri returns the mirror URI without credentials" do
-      expect(remote(uri).anonymized_uri).to eq(mirror_uri_no_auth)
-    end
-
-    specify "#original_uri returns the original source" do
-      expect(remote(uri).original_uri).to eq(uri)
-    end
-
-    specify "#cache_slug returns the correct slug" do
-      expect(remote(uri).cache_slug).to eq("rubygems.org.443.MD5HEX(rubygems.org.443./)")
-    end
-  end
-
-  context "when a mirror with configured credentials is configured for the URI" do
-    let(:uri) { URI("https://rubygems.org/") }
-    let(:mirror_uri_with_auth) { URI("https://#{credentials}@rubygems-mirror.org/") }
-    let(:mirror_uri_no_auth) { URI("https://rubygems-mirror.org/") }
-
-    before do
-      Bundler.settings.temporary("mirror.https://rubygems.org/" => mirror_uri_no_auth.to_s)
-      Bundler.settings.temporary(mirror_uri_no_auth.to_s => credentials)
-    end
-
-    specify "#uri returns the mirror URI with credentials" do
-      expect(remote(uri).uri).to eq(mirror_uri_with_auth)
-    end
-
-    specify "#anonymized_uri returns the mirror URI without credentials" do
-      expect(remote(uri).anonymized_uri).to eq(mirror_uri_no_auth)
-    end
-
-    specify "#original_uri returns the original source" do
-      expect(remote(uri).original_uri).to eq(uri)
-    end
-
-    specify "#cache_slug returns the original source" do
-      expect(remote(uri).cache_slug).to eq("rubygems.org.443.MD5HEX(rubygems.org.443./)")
-    end
-  end
-
-  context "when there is no mirror set" do
-    describe "#original_uri" do
-      it "is not set" do
-        expect(remote(uri_no_auth).original_uri).to be_nil
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source/rubygems_spec.rb b/spec/bundler/bundler/source/rubygems_spec.rb
deleted file mode 100644
index 7c457a7265..0000000000
--- a/spec/bundler/bundler/source/rubygems_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Source::Rubygems do
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new("root") }
-  end
-
-  describe "caches" do
-    it "includes Bundler.app_cache" do
-      expect(subject.caches).to include(Bundler.app_cache)
-    end
-
-    it "includes GEM_PATH entries" do
-      Gem.path.each do |path|
-        expect(subject.caches).to include(File.expand_path("#{path}/cache"))
-      end
-    end
-
-    it "is an array of strings or pathnames" do
-      subject.caches.each do |cache|
-        expect([String, Pathname]).to include(cache.class)
-      end
-    end
-  end
-
-  describe "#add_remote" do
-    context "when the source is an HTTP(s) URI with no host" do
-      it "raises error" do
-        expect { subject.add_remote("https:rubygems.org") }.to raise_error(ArgumentError)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source_list_spec.rb b/spec/bundler/bundler/source_list_spec.rb
deleted file mode 100644
index ce3353012c..0000000000
--- a/spec/bundler/bundler/source_list_spec.rb
+++ /dev/null
@@ -1,463 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::SourceList do
-  before do
-    allow(Bundler).to receive(:root) { Pathname.new "./tmp/bundled_app" }
-
-    stub_const "ASourcePlugin", Class.new(Bundler::Plugin::API)
-    ASourcePlugin.source "new_source"
-    allow(Bundler::Plugin).to receive(:source?).with("new_source").and_return(true)
-  end
-
-  subject(:source_list) { Bundler::SourceList.new }
-
-  let(:rubygems_aggregate) { Bundler::Source::Rubygems.new }
-  let(:metadata_source) { Bundler::Source::Metadata.new }
-
-  describe "adding sources" do
-    before do
-      source_list.add_path_source("path" => "/existing/path/to/gem")
-      source_list.add_git_source("uri" => "git://existing-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://existing-rubygems.org"])
-      source_list.add_plugin_source("new_source", "uri" => "https://some.url/a")
-    end
-
-    describe "#add_path_source" do
-      before do
-        @duplicate = source_list.add_path_source("path" => "/path/to/gem")
-        @new_source = source_list.add_path_source("path" => "/path/to/gem")
-      end
-
-      it "returns the new path source" do
-        expect(@new_source).to be_instance_of(Bundler::Source::Path)
-      end
-
-      it "passes the provided options to the new source" do
-        expect(@new_source.options).to eq("path" => "/path/to/gem")
-      end
-
-      it "adds the source to the beginning of path_sources" do
-        expect(source_list.path_sources.first).to equal(@new_source)
-      end
-
-      it "removes existing duplicates" do
-        expect(source_list.path_sources).not_to include equal(@duplicate)
-      end
-    end
-
-    describe "#add_git_source" do
-      before do
-        @duplicate = source_list.add_git_source("uri" => "git://host/path.git")
-        @new_source = source_list.add_git_source("uri" => "git://host/path.git")
-      end
-
-      it "returns the new git source" do
-        expect(@new_source).to be_instance_of(Bundler::Source::Git)
-      end
-
-      it "passes the provided options to the new source" do
-        @new_source = source_list.add_git_source("uri" => "git://host/path.git")
-        expect(@new_source.options).to eq("uri" => "git://host/path.git")
-      end
-
-      it "adds the source to the beginning of git_sources" do
-        @new_source = source_list.add_git_source("uri" => "git://host/path.git")
-        expect(source_list.git_sources.first).to equal(@new_source)
-      end
-
-      it "removes existing duplicates" do
-        @duplicate = source_list.add_git_source("uri" => "git://host/path.git")
-        @new_source = source_list.add_git_source("uri" => "git://host/path.git")
-        expect(source_list.git_sources).not_to include equal(@duplicate)
-      end
-
-      context "with the git: protocol" do
-        let(:msg) do
-          "The git source `git://existing-git.org/path.git` " \
-          "uses the `git` protocol, which transmits data without encryption. " \
-          "Disable this warning with `bundle config git.allow_insecure true`, " \
-          "or switch to the `https` protocol to keep your data secure."
-        end
-
-        it "warns about git protocols" do
-          expect(Bundler.ui).to receive(:warn).with(msg)
-          source_list.add_git_source("uri" => "git://existing-git.org/path.git")
-        end
-
-        it "ignores git protocols on request" do
-          Bundler.settings.temporary(:"git.allow_insecure" => true)
-          expect(Bundler.ui).to_not receive(:warn).with(msg)
-          source_list.add_git_source("uri" => "git://existing-git.org/path.git")
-        end
-      end
-    end
-
-    describe "#add_rubygems_source" do
-      before do
-        @duplicate = source_list.add_rubygems_source("remotes" => ["https://rubygems.org/"])
-        @new_source = source_list.add_rubygems_source("remotes" => ["https://rubygems.org/"])
-      end
-
-      it "returns the new rubygems source" do
-        expect(@new_source).to be_instance_of(Bundler::Source::Rubygems)
-      end
-
-      it "passes the provided options to the new source" do
-        expect(@new_source.options).to eq("remotes" => ["https://rubygems.org/"])
-      end
-
-      it "adds the source to the beginning of rubygems_sources" do
-        expect(source_list.rubygems_sources.first).to equal(@new_source)
-      end
-
-      it "removes duplicates" do
-        expect(source_list.rubygems_sources).not_to include equal(@duplicate)
-      end
-    end
-
-    describe "#add_rubygems_remote", :bundler => "< 2" do
-      let!(:returned_source) { source_list.add_rubygems_remote("https://rubygems.org/") }
-
-      it "returns the aggregate rubygems source" do
-        expect(returned_source).to be_instance_of(Bundler::Source::Rubygems)
-      end
-
-      it "adds the provided remote to the beginning of the aggregate source" do
-        source_list.add_rubygems_remote("https://othersource.org")
-        expect(returned_source.remotes).to eq [
-          URI("https://othersource.org/"),
-          URI("https://rubygems.org/"),
-        ]
-      end
-    end
-
-    describe "#add_plugin_source" do
-      before do
-        @duplicate = source_list.add_plugin_source("new_source", "uri" => "http://host/path.")
-        @new_source = source_list.add_plugin_source("new_source", "uri" => "http://host/path.")
-      end
-
-      it "returns the new plugin source" do
-        expect(@new_source).to be_a(Bundler::Plugin::API::Source)
-      end
-
-      it "passes the provided options to the new source" do
-        expect(@new_source.options).to eq("uri" => "http://host/path.")
-      end
-
-      it "adds the source to the beginning of git_sources" do
-        expect(source_list.plugin_sources.first).to equal(@new_source)
-      end
-
-      it "removes existing duplicates" do
-        expect(source_list.plugin_sources).not_to include equal(@duplicate)
-      end
-    end
-  end
-
-  describe "#all_sources" do
-    it "includes the aggregate rubygems source when rubygems sources have been added" do
-      source_list.add_git_source("uri" => "git://host/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://rubygems.org"])
-      source_list.add_path_source("path" => "/path/to/gem")
-      source_list.add_plugin_source("new_source", "uri" => "https://some.url/a")
-
-      expect(source_list.all_sources).to include rubygems_aggregate
-    end
-
-    it "includes the aggregate rubygems source when no rubygems sources have been added" do
-      source_list.add_git_source("uri" => "git://host/path.git")
-      source_list.add_path_source("path" => "/path/to/gem")
-      source_list.add_plugin_source("new_source", "uri" => "https://some.url/a")
-
-      expect(source_list.all_sources).to include rubygems_aggregate
-    end
-
-    it "returns sources of the same type in the reverse order that they were added" do
-      source_list.add_git_source("uri" => "git://third-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://fifth-rubygems.org"])
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_plugin_source("new_source", "uri" => "https://some.url/b")
-      source_list.add_rubygems_source("remotes" => ["https://fourth-rubygems.org"])
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://third-rubygems.org"])
-      source_list.add_plugin_source("new_source", "uri" => "https://some.o.url/")
-      source_list.add_git_source("uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://second-rubygems.org"])
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_plugin_source("new_source", "uri" => "https://some.url/c")
-      source_list.add_rubygems_source("remotes" => ["https://first-rubygems.org"])
-      source_list.add_git_source("uri" => "git://first-git.org/path.git")
-
-      expect(source_list.all_sources).to eq [
-        Bundler::Source::Path.new("path" => "/first/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/second/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/third/path/to/gem"),
-        Bundler::Source::Git.new("uri" => "git://first-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://second-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://third-git.org/path.git"),
-        ASourcePlugin.new("uri" => "https://some.url/c"),
-        ASourcePlugin.new("uri" => "https://some.o.url/"),
-        ASourcePlugin.new("uri" => "https://some.url/b"),
-        Bundler::Source::Rubygems.new("remotes" => ["https://first-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://second-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://third-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://fourth-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://fifth-rubygems.org"]),
-        rubygems_aggregate,
-        metadata_source,
-      ]
-    end
-  end
-
-  describe "#path_sources" do
-    it "returns an empty array when no path sources have been added" do
-      source_list.add_rubygems_remote("https://rubygems.org")
-      source_list.add_git_source("uri" => "git://host/path.git")
-      expect(source_list.path_sources).to be_empty
-    end
-
-    it "returns path sources in the reverse order that they were added" do
-      source_list.add_git_source("uri" => "git://third-git.org/path.git")
-      source_list.add_rubygems_remote("https://fifth-rubygems.org")
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_rubygems_remote("https://fourth-rubygems.org")
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_remote("https://third-rubygems.org")
-      source_list.add_git_source("uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_remote("https://second-rubygems.org")
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_rubygems_remote("https://first-rubygems.org")
-      source_list.add_git_source("uri" => "git://first-git.org/path.git")
-
-      expect(source_list.path_sources).to eq [
-        Bundler::Source::Path.new("path" => "/first/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/second/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/third/path/to/gem"),
-      ]
-    end
-  end
-
-  describe "#git_sources" do
-    it "returns an empty array when no git sources have been added" do
-      source_list.add_rubygems_remote("https://rubygems.org")
-      source_list.add_path_source("path" => "/path/to/gem")
-
-      expect(source_list.git_sources).to be_empty
-    end
-
-    it "returns git sources in the reverse order that they were added" do
-      source_list.add_git_source("uri" => "git://third-git.org/path.git")
-      source_list.add_rubygems_remote("https://fifth-rubygems.org")
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_rubygems_remote("https://fourth-rubygems.org")
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_remote("https://third-rubygems.org")
-      source_list.add_git_source("uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_remote("https://second-rubygems.org")
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_rubygems_remote("https://first-rubygems.org")
-      source_list.add_git_source("uri" => "git://first-git.org/path.git")
-
-      expect(source_list.git_sources).to eq [
-        Bundler::Source::Git.new("uri" => "git://first-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://second-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://third-git.org/path.git"),
-      ]
-    end
-  end
-
-  describe "#plugin_sources" do
-    it "returns an empty array when no plugin sources have been added" do
-      source_list.add_rubygems_remote("https://rubygems.org")
-      source_list.add_path_source("path" => "/path/to/gem")
-
-      expect(source_list.plugin_sources).to be_empty
-    end
-
-    it "returns plugin sources in the reverse order that they were added" do
-      source_list.add_plugin_source("new_source", "uri" => "https://third-git.org/path.git")
-      source_list.add_git_source("https://new-git.org")
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_rubygems_remote("https://fourth-rubygems.org")
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_remote("https://third-rubygems.org")
-      source_list.add_plugin_source("new_source", "uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_remote("https://second-rubygems.org")
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_rubygems_remote("https://first-rubygems.org")
-      source_list.add_plugin_source("new_source", "uri" => "git://first-git.org/path.git")
-
-      expect(source_list.plugin_sources).to eq [
-        ASourcePlugin.new("uri" => "git://first-git.org/path.git"),
-        ASourcePlugin.new("uri" => "git://second-git.org/path.git"),
-        ASourcePlugin.new("uri" => "https://third-git.org/path.git"),
-      ]
-    end
-  end
-
-  describe "#rubygems_sources" do
-    it "includes the aggregate rubygems source when rubygems sources have been added" do
-      source_list.add_git_source("uri" => "git://host/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://rubygems.org"])
-      source_list.add_path_source("path" => "/path/to/gem")
-
-      expect(source_list.rubygems_sources).to include rubygems_aggregate
-    end
-
-    it "returns only the aggregate rubygems source when no rubygems sources have been added" do
-      source_list.add_git_source("uri" => "git://host/path.git")
-      source_list.add_path_source("path" => "/path/to/gem")
-
-      expect(source_list.rubygems_sources).to eq [rubygems_aggregate]
-    end
-
-    it "returns rubygems sources in the reverse order that they were added" do
-      source_list.add_git_source("uri" => "git://third-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://fifth-rubygems.org"])
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://fourth-rubygems.org"])
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://third-rubygems.org"])
-      source_list.add_git_source("uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://second-rubygems.org"])
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://first-rubygems.org"])
-      source_list.add_git_source("uri" => "git://first-git.org/path.git")
-
-      expect(source_list.rubygems_sources).to eq [
-        Bundler::Source::Rubygems.new("remotes" => ["https://first-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://second-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://third-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://fourth-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://fifth-rubygems.org"]),
-        rubygems_aggregate,
-      ]
-    end
-  end
-
-  describe "#get" do
-    context "when it includes an equal source" do
-      let(:rubygems_source) { Bundler::Source::Rubygems.new("remotes" => ["https://rubygems.org"]) }
-      before { @equal_source = source_list.add_rubygems_remote("https://rubygems.org") }
-
-      it "returns the equal source" do
-        expect(source_list.get(rubygems_source)).to be @equal_source
-      end
-    end
-
-    context "when it does not include an equal source" do
-      let(:path_source) { Bundler::Source::Path.new("path" => "/path/to/gem") }
-
-      it "returns nil" do
-        expect(source_list.get(path_source)).to be_nil
-      end
-    end
-  end
-
-  describe "#lock_sources" do
-    before do
-      source_list.add_git_source("uri" => "git://third-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://duplicate-rubygems.org"])
-      source_list.add_plugin_source("new_source", "uri" => "https://third-bar.org/foo")
-      source_list.add_path_source("path" => "/third/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://third-rubygems.org"])
-      source_list.add_path_source("path" => "/second/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://second-rubygems.org"])
-      source_list.add_git_source("uri" => "git://second-git.org/path.git")
-      source_list.add_rubygems_source("remotes" => ["https://first-rubygems.org"])
-      source_list.add_plugin_source("new_source", "uri" => "https://second-plugin.org/random")
-      source_list.add_path_source("path" => "/first/path/to/gem")
-      source_list.add_rubygems_source("remotes" => ["https://duplicate-rubygems.org"])
-      source_list.add_git_source("uri" => "git://first-git.org/path.git")
-    end
-
-    it "combines the rubygems sources into a single instance, removing duplicate remotes from the end", :bundler => "< 2" do
-      expect(source_list.lock_sources).to eq [
-        Bundler::Source::Git.new("uri" => "git://first-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://second-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://third-git.org/path.git"),
-        ASourcePlugin.new("uri" => "https://second-plugin.org/random"),
-        ASourcePlugin.new("uri" => "https://third-bar.org/foo"),
-        Bundler::Source::Path.new("path" => "/first/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/second/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/third/path/to/gem"),
-        Bundler::Source::Rubygems.new("remotes" => [
-          "https://duplicate-rubygems.org",
-          "https://first-rubygems.org",
-          "https://second-rubygems.org",
-          "https://third-rubygems.org",
-        ]),
-      ]
-    end
-
-    it "returns all sources, without combining rubygems sources", :bundler => "2" do
-      expect(source_list.lock_sources).to eq [
-        Bundler::Source::Rubygems.new,
-        Bundler::Source::Rubygems.new("remotes" => ["https://duplicate-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://first-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://second-rubygems.org"]),
-        Bundler::Source::Rubygems.new("remotes" => ["https://third-rubygems.org"]),
-        Bundler::Source::Git.new("uri" => "git://first-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://second-git.org/path.git"),
-        Bundler::Source::Git.new("uri" => "git://third-git.org/path.git"),
-        Bundler::Source::Path.new("path" => "/first/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/second/path/to/gem"),
-        Bundler::Source::Path.new("path" => "/third/path/to/gem"),
-        ASourcePlugin.new("uri" => "https://second-plugin.org/random"),
-        ASourcePlugin.new("uri" => "https://third-bar.org/foo"),
-      ]
-    end
-  end
-
-  describe "replace_sources!" do
-    let(:existing_locked_source) { Bundler::Source::Path.new("path" => "/existing/path") }
-    let(:removed_locked_source)  { Bundler::Source::Path.new("path" => "/removed/path") }
-
-    let(:locked_sources) { [existing_locked_source, removed_locked_source] }
-
-    before do
-      @existing_source = source_list.add_path_source("path" => "/existing/path")
-      @new_source = source_list.add_path_source("path" => "/new/path")
-      source_list.replace_sources!(locked_sources)
-    end
-
-    it "maintains the order and number of sources" do
-      expect(source_list.path_sources).to eq [@new_source, @existing_source]
-    end
-
-    it "retains the same instance of the new source" do
-      expect(source_list.path_sources[0]).to be @new_source
-    end
-
-    it "replaces the instance of the existing source" do
-      expect(source_list.path_sources[1]).to be existing_locked_source
-    end
-  end
-
-  describe "#cached!" do
-    let(:rubygems_source) { source_list.add_rubygems_source("remotes" => ["https://rubygems.org"]) }
-    let(:git_source)      { source_list.add_git_source("uri" => "git://host/path.git") }
-    let(:path_source)     { source_list.add_path_source("path" => "/path/to/gem") }
-
-    it "calls #cached! on all the sources" do
-      expect(rubygems_source).to receive(:cached!)
-      expect(git_source).to receive(:cached!)
-      expect(path_source).to receive(:cached!)
-      source_list.cached!
-    end
-  end
-
-  describe "#remote!" do
-    let(:rubygems_source) { source_list.add_rubygems_source("remotes" => ["https://rubygems.org"]) }
-    let(:git_source)      { source_list.add_git_source("uri" => "git://host/path.git") }
-    let(:path_source)     { source_list.add_path_source("path" => "/path/to/gem") }
-
-    it "calls #remote! on all the sources" do
-      expect(rubygems_source).to receive(:remote!)
-      expect(git_source).to receive(:remote!)
-      expect(path_source).to receive(:remote!)
-      source_list.remote!
-    end
-  end
-end
diff --git a/spec/bundler/bundler/source_spec.rb b/spec/bundler/bundler/source_spec.rb
deleted file mode 100644
index 9ef8e7e50f..0000000000
--- a/spec/bundler/bundler/source_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::Source do
-  class ExampleSource < Bundler::Source
-  end
-
-  subject { ExampleSource.new }
-
-  describe "#unmet_deps" do
-    let(:specs) { double(:specs) }
-    let(:unmet_dependency_names) { double(:unmet_dependency_names) }
-
-    before do
-      allow(subject).to receive(:specs).and_return(specs)
-      allow(specs).to receive(:unmet_dependency_names).and_return(unmet_dependency_names)
-    end
-
-    it "should return the names of unmet dependencies" do
-      expect(subject.unmet_deps).to eq(unmet_dependency_names)
-    end
-  end
-
-  describe "#version_message" do
-    let(:spec) { double(:spec, :name => "nokogiri", :version => ">= 1.6", :platform => rb) }
-
-    shared_examples_for "the lockfile specs are not relevant" do
-      it "should return a string with the spec name and version" do
-        expect(subject.version_message(spec)).to eq("nokogiri >= 1.6")
-      end
-    end
-
-    context "when there are locked gems" do
-      let(:locked_gems) { double(:locked_gems) }
-
-      before { allow(Bundler).to receive(:locked_gems).and_return(locked_gems) }
-
-      context "that contain the relevant gem spec" do
-        before do
-          specs = double(:specs)
-          allow(locked_gems).to receive(:specs).and_return(specs)
-          allow(specs).to receive(:find).and_return(locked_gem)
-        end
-
-        context "without a version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => nil) }
-
-          it_behaves_like "the lockfile specs are not relevant"
-        end
-
-        context "with the same version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => ">= 1.6") }
-
-          it_behaves_like "the lockfile specs are not relevant"
-        end
-
-        context "with a different version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "< 1.5") }
-
-          context "with color" do
-            before { Bundler.ui = Bundler::UI::Shell.new }
-
-            it "should return a string with the spec name and version and locked spec version" do
-              expect(subject.version_message(spec)).to eq("nokogiri >= 1.6\e[32m (was < 1.5)\e[0m")
-            end
-          end
-
-          context "without color" do
-            it "should return a string with the spec name and version and locked spec version" do
-              expect(subject.version_message(spec)).to eq("nokogiri >= 1.6 (was < 1.5)")
-            end
-          end
-        end
-
-        context "with a more recent version" do
-          let(:spec) { double(:spec, :name => "nokogiri", :version => "1.6.1", :platform => rb) }
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
-
-          context "with color" do
-            before { Bundler.ui = Bundler::UI::Shell.new }
-
-            it "should return a string with the locked spec version in yellow" do
-              expect(subject.version_message(spec)).to eq("nokogiri 1.6.1\e[33m (was 1.7.0)\e[0m")
-            end
-          end
-        end
-
-        context "with an older version" do
-          let(:spec) { double(:spec, :name => "nokogiri", :version => "1.7.1", :platform => rb) }
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
-
-          context "with color" do
-            before { Bundler.ui = Bundler::UI::Shell.new }
-
-            it "should return a string with the locked spec version in green" do
-              expect(subject.version_message(spec)).to eq("nokogiri 1.7.1\e[32m (was 1.7.0)\e[0m")
-            end
-          end
-        end
-      end
-
-      context "that do not contain the relevant gem spec" do
-        before do
-          specs = double(:specs)
-          allow(locked_gems).to receive(:specs).and_return(specs)
-          allow(specs).to receive(:find).and_return(nil)
-        end
-
-        it_behaves_like "the lockfile specs are not relevant"
-      end
-    end
-
-    context "when there are no locked gems" do
-      before { allow(Bundler).to receive(:locked_gems).and_return(nil) }
-
-      it_behaves_like "the lockfile specs are not relevant"
-    end
-  end
-
-  describe "#can_lock?" do
-    context "when the passed spec's source is equivalent" do
-      let(:spec) { double(:spec, :source => subject) }
-
-      it "should return true" do
-        expect(subject.can_lock?(spec)).to be_truthy
-      end
-    end
-
-    context "when the passed spec's source is not equivalent" do
-      let(:spec) { double(:spec, :source => double(:other_source)) }
-
-      it "should return false" do
-        expect(subject.can_lock?(spec)).to be_falsey
-      end
-    end
-  end
-
-  describe "#include?" do
-    context "when the passed source is equivalent" do
-      let(:source) { subject }
-
-      it "should return true" do
-        expect(subject).to include(source)
-      end
-    end
-
-    context "when the passed source is not equivalent" do
-      let(:source) { double(:source) }
-
-      it "should return false" do
-        expect(subject).to_not include(source)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/spec_set_spec.rb b/spec/bundler/bundler/spec_set_spec.rb
deleted file mode 100644
index 6fedd38b50..0000000000
--- a/spec/bundler/bundler/spec_set_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::SpecSet do
-  let(:specs) do
-    [
-      build_spec("a", "1.0"),
-      build_spec("b", "1.0"),
-      build_spec("c", "1.1") do |s|
-        s.dep "a", "< 2.0"
-        s.dep "e", "> 0"
-      end,
-      build_spec("d", "2.0") do |s|
-        s.dep "a", "1.0"
-        s.dep "c", "~> 1.0"
-      end,
-      build_spec("e", "1.0.0.pre.1"),
-    ].flatten
-  end
-
-  subject { described_class.new(specs) }
-
-  context "enumerable methods" do
-    it "has a length" do
-      expect(subject.length).to eq(5)
-    end
-
-    it "has a size" do
-      expect(subject.size).to eq(5)
-    end
-  end
-
-  describe "#find_by_name_and_platform" do
-    let(:platform) { Gem::Platform.new("universal-darwin-64") }
-    let(:platform_spec) { build_spec("b", "2.0", platform).first }
-    let(:specs) do
-      [
-        build_spec("a", "1.0"),
-        platform_spec,
-      ].flatten
-    end
-
-    it "finds spec with given name and platform" do
-      spec = described_class.new(specs).find_by_name_and_platform("b", platform)
-      expect(spec).to eq platform_spec
-    end
-  end
-
-  describe "#merge" do
-    let(:other_specs) do
-      [
-        build_spec("f", "1.0"),
-        build_spec("g", "2.0"),
-      ].flatten
-    end
-
-    let(:other_spec_set) { described_class.new(other_specs) }
-
-    it "merges the items in each gemspec" do
-      new_spec_set = subject.merge(other_spec_set)
-      specs = new_spec_set.to_a.map(&:full_name)
-      expect(specs).to include("a-1.0")
-      expect(specs).to include("f-1.0")
-    end
-  end
-
-  describe "#to_a" do
-    it "returns the specs in order" do
-      expect(subject.to_a.map(&:full_name)).to eq %w[
-        a-1.0
-        b-1.0
-        e-1.0.0.pre.1
-        c-1.1
-        d-2.0
-      ]
-    end
-  end
-end
diff --git a/spec/bundler/bundler/ssl_certs/certificate_manager_spec.rb b/spec/bundler/bundler/ssl_certs/certificate_manager_spec.rb
deleted file mode 100644
index 56606a830f..0000000000
--- a/spec/bundler/bundler/ssl_certs/certificate_manager_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/ssl_certs/certificate_manager"
-
-RSpec.describe Bundler::SSLCerts::CertificateManager do
-  let(:rubygems_path)      { root }
-  let(:stub_cert)          { File.join(root.to_s, "lib", "rubygems", "ssl_certs", "rubygems.org", "ssl-cert.pem") }
-  let(:rubygems_certs_dir) { File.join(root.to_s, "lib", "rubygems", "ssl_certs", "rubygems.org") }
-
-  subject { described_class.new(rubygems_path) }
-
-  # Pretend bundler root is rubygems root
-  before do
-    # Backing up rubygems ceriticates
-    FileUtils.mv(rubygems_certs_dir, rubygems_certs_dir + ".back") if ruby_core?
-
-    FileUtils.mkdir_p(rubygems_certs_dir)
-    FileUtils.touch(stub_cert)
-  end
-
-  after do
-    FileUtils.rm_rf(rubygems_certs_dir)
-
-    # Restore rubygems certificates
-    FileUtils.mv(rubygems_certs_dir + ".back", rubygems_certs_dir) if ruby_core?
-  end
-
-  describe "#update_from" do
-    let(:cert_manager) { double(:cert_manager) }
-
-    before { allow(described_class).to receive(:new).with(rubygems_path).and_return(cert_manager) }
-
-    it "should update the certs through a new certificate manager" do
-      allow(cert_manager).to receive(:update!)
-      expect(described_class.update_from!(rubygems_path)).to be_nil
-    end
-  end
-
-  describe "#initialize" do
-    it "should set bundler_cert_path as path of the subdir with bundler ssl certs" do
-      expect(subject.bundler_cert_path).to eq(File.join(root, "lib/bundler/ssl_certs"))
-    end
-
-    it "should set bundler_certs as the paths of the bundler ssl certs" do
-      expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem"))
-      expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem"))
-    end
-
-    context "when rubygems_path is not nil" do
-      it "should set rubygems_certs" do
-        expect(subject.rubygems_certs).to include(File.join(root, "lib", "rubygems", "ssl_certs", "rubygems.org", "ssl-cert.pem"))
-      end
-    end
-  end
-
-  describe "#up_to_date?" do
-    context "when bundler certs and rubygems certs are the same" do
-      before do
-        bundler_certs = Dir[File.join(root.to_s, "lib", "bundler", "ssl_certs", "**", "*.pem")]
-        FileUtils.rm(stub_cert)
-        FileUtils.cp(bundler_certs, rubygems_certs_dir)
-      end
-
-      it "should return true" do
-        expect(subject).to be_up_to_date
-      end
-    end
-
-    context "when bundler certs and rubygems certs are not the same" do
-      it "should return false" do
-        expect(subject).to_not be_up_to_date
-      end
-    end
-  end
-
-  describe "#update!" do
-    context "when certificate manager is not up to date" do
-      before do
-        allow(subject).to receive(:up_to_date?).and_return(false)
-        allow(bundler_fileutils).to receive(:rm)
-        allow(bundler_fileutils).to receive(:cp)
-      end
-
-      it "should remove the current bundler certs" do
-        expect(bundler_fileutils).to receive(:rm).with(subject.bundler_certs)
-        subject.update!
-      end
-
-      it "should copy the rubygems certs into bundler certs" do
-        expect(bundler_fileutils).to receive(:cp).with(subject.rubygems_certs, subject.bundler_cert_path)
-        subject.update!
-      end
-
-      it "should return nil" do
-        expect(subject.update!).to be_nil
-      end
-    end
-
-    context "when certificate manager is up to date" do
-      before { allow(subject).to receive(:up_to_date?).and_return(true) }
-
-      it "should return nil" do
-        expect(subject.update!).to be_nil
-      end
-    end
-  end
-
-  describe "#connect_to" do
-    let(:host)                 { "http://www.host.com" }
-    let(:http)                 { Net::HTTP.new(host, 443) }
-    let(:cert_store)           { OpenSSL::X509::Store.new }
-    let(:http_header_response) { double(:http_header_response) }
-
-    before do
-      allow(Net::HTTP).to receive(:new).with(host, 443).and_return(http)
-      allow(OpenSSL::X509::Store).to receive(:new).and_return(cert_store)
-      allow(http).to receive(:head).with("/").and_return(http_header_response)
-    end
-
-    it "should use ssl for the http request" do
-      expect(http).to receive(:use_ssl=).with(true)
-      subject.connect_to(host)
-    end
-
-    it "use verify peer mode" do
-      expect(http).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-      subject.connect_to(host)
-    end
-
-    it "set its cert store as a OpenSSL::X509::Store populated with bundler certs" do
-      expect(cert_store).to receive(:add_file).at_least(:once)
-      expect(http).to receive(:cert_store=).with(cert_store)
-      subject.connect_to(host)
-    end
-
-    it "return the headers of the request response" do
-      expect(subject.connect_to(host)).to eq(http_header_response)
-    end
-  end
-end
diff --git a/spec/bundler/bundler/stub_specification_spec.rb b/spec/bundler/bundler/stub_specification_spec.rb
deleted file mode 100644
index 5521d83769..0000000000
--- a/spec/bundler/bundler/stub_specification_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::StubSpecification do
-  let(:gemspec) do
-    Gem::Specification.new do |s|
-      s.name = "gemname"
-      s.version = "1.0.0"
-      s.loaded_from = __FILE__
-    end
-  end
-
-  let(:with_bundler_stub_spec) do
-    described_class.from_stub(gemspec)
-  end
-
-  if Bundler.rubygems.provides?(">= 2.1")
-    describe "#from_stub" do
-      it "returns the same stub if already a Bundler::StubSpecification" do
-        stub = described_class.from_stub(with_bundler_stub_spec)
-        expect(stub).to be(with_bundler_stub_spec)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/ui/shell_spec.rb b/spec/bundler/bundler/ui/shell_spec.rb
deleted file mode 100644
index 951a446aff..0000000000
--- a/spec/bundler/bundler/ui/shell_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::UI::Shell do
-  subject { described_class.new }
-
-  before { subject.level = "debug" }
-
-  describe "#info" do
-    before { subject.level = "info" }
-    it "prints to stdout" do
-      expect { subject.info("info") }.to output("info\n").to_stdout
-    end
-  end
-
-  describe "#confirm" do
-    before { subject.level = "confirm" }
-    it "prints to stdout" do
-      expect { subject.confirm("confirm") }.to output("confirm\n").to_stdout
-    end
-  end
-
-  describe "#warn" do
-    before { subject.level = "warn" }
-    it "prints to stdout", :bundler => "< 2" do
-      expect { subject.warn("warning") }.to output("warning\n").to_stdout
-    end
-
-    it "prints to stderr", :bundler => "2" do
-      expect { subject.warn("warning") }.to output("warning\n").to_stderr
-    end
-
-    context "when stderr flag is enabled" do
-      before { Bundler.settings.temporary(:error_on_stderr => true) }
-      it "prints to stderr" do
-        expect { subject.warn("warning!") }.to output("warning!\n").to_stderr
-      end
-    end
-  end
-
-  describe "#debug" do
-    it "prints to stdout" do
-      expect { subject.debug("debug") }.to output("debug\n").to_stdout
-    end
-  end
-
-  describe "#error" do
-    before { subject.level = "error" }
-
-    it "prints to stdout", :bundler => "< 2" do
-      expect { subject.error("error!!!") }.to output("error!!!\n").to_stdout
-    end
-
-    it "prints to stderr", :bundler => "2" do
-      expect { subject.error("error!!!") }.to output("error!!!\n").to_stderr
-    end
-
-    context "when stderr flag is enabled" do
-      before { Bundler.settings.temporary(:error_on_stderr => true) }
-      it "prints to stderr" do
-        expect { subject.error("error!!!") }.to output("error!!!\n").to_stderr
-      end
-
-      context "when stderr is closed" do
-        it "doesn't report anything" do
-          output = capture(:stderr, :closed => true) do
-            subject.error("Something went wrong")
-          end
-          expect(output).to_not eq("Something went wrong\n")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/ui_spec.rb b/spec/bundler/bundler/ui_spec.rb
deleted file mode 100644
index 6ef8729277..0000000000
--- a/spec/bundler/bundler/ui_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::UI do
-  describe Bundler::UI::Silent do
-    it "has the same instance methods as Shell", :ruby => ">= 1.9" do
-      shell = Bundler::UI::Shell
-      methods = proc do |cls|
-        cls.instance_methods.map do |i|
-          m = shell.instance_method(i)
-          [i, m.parameters]
-        end.sort_by(&:first)
-      end
-      expect(methods.call(described_class)).to eq(methods.call(shell))
-    end
-
-    it "has the same instance class as Shell", :ruby => ">= 1.9" do
-      shell = Bundler::UI::Shell
-      methods = proc do |cls|
-        cls.methods.map do |i|
-          m = shell.method(i)
-          [i, m.parameters]
-        end.sort_by(&:first)
-      end
-      expect(methods.call(described_class)).to eq(methods.call(shell))
-    end
-  end
-
-  describe Bundler::UI::Shell do
-    let(:options) { {} }
-    subject { described_class.new(options) }
-    describe "debug?" do
-      it "returns a boolean" do
-        subject.level = :debug
-        expect(subject.debug?).to eq(true)
-
-        subject.level = :error
-        expect(subject.debug?).to eq(false)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/uri_credentials_filter_spec.rb b/spec/bundler/bundler/uri_credentials_filter_spec.rb
deleted file mode 100644
index fe52d16306..0000000000
--- a/spec/bundler/bundler/uri_credentials_filter_spec.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Bundler::URICredentialsFilter do
-  subject { described_class }
-
-  describe "#credential_filtered_uri" do
-    shared_examples_for "original type of uri is maintained" do
-      it "maintains same type for return value as uri input type" do
-        expect(subject.credential_filtered_uri(uri)).to be_kind_of(uri.class)
-      end
-    end
-
-    shared_examples_for "sensitive credentials in uri are filtered out" do
-      context "authentication using oauth credentials" do
-        context "specified via 'x-oauth-basic'" do
-          let(:credentials) { "oauth_token:x-oauth-basic@" }
-
-          it "returns the uri without the oauth token" do
-            expect(subject.credential_filtered_uri(uri).to_s).to eq(URI("https://x-oauth-basic@github.com/company/private-repo").to_s)
-          end
-
-          it_behaves_like "original type of uri is maintained"
-        end
-
-        context "specified via 'x'" do
-          let(:credentials) { "oauth_token:x@" }
-
-          it "returns the uri without the oauth token" do
-            expect(subject.credential_filtered_uri(uri).to_s).to eq(URI("https://x@github.com/company/private-repo").to_s)
-          end
-
-          it_behaves_like "original type of uri is maintained"
-        end
-      end
-
-      context "authentication using login credentials" do
-        let(:credentials) { "username1:hunter3@" }
-
-        it "returns the uri without the password" do
-          expect(subject.credential_filtered_uri(uri).to_s).to eq(URI("https://username1@github.com/company/private-repo").to_s)
-        end
-
-        it_behaves_like "original type of uri is maintained"
-      end
-
-      context "authentication without credentials" do
-        let(:credentials) { "" }
-
-        it "returns the same uri" do
-          expect(subject.credential_filtered_uri(uri).to_s).to eq(uri.to_s)
-        end
-
-        it_behaves_like "original type of uri is maintained"
-      end
-    end
-
-    context "uri is a uri object" do
-      let(:uri) { URI("https://#{credentials}github.com/company/private-repo") }
-
-      it_behaves_like "sensitive credentials in uri are filtered out"
-    end
-
-    context "uri is a uri string" do
-      let(:uri) { "https://#{credentials}github.com/company/private-repo" }
-
-      it_behaves_like "sensitive credentials in uri are filtered out"
-    end
-
-    context "uri is a non-uri format string (ex. path)" do
-      let(:uri) { "/path/to/repo" }
-
-      it "returns the same uri" do
-        expect(subject.credential_filtered_uri(uri).to_s).to eq(uri.to_s)
-      end
-
-      it_behaves_like "original type of uri is maintained"
-    end
-
-    context "uri is nil" do
-      let(:uri) { nil }
-
-      it "returns nil" do
-        expect(subject.credential_filtered_uri(uri)).to be_nil
-      end
-
-      it_behaves_like "original type of uri is maintained"
-    end
-  end
-
-  describe "#credential_filtered_string" do
-    let(:str_to_filter) { "This is a git message containing a uri #{uri}!" }
-    let(:credentials)   { "" }
-    let(:uri)           { URI("https://#{credentials}github.com/company/private-repo") }
-
-    context "with a uri that contains credentials" do
-      let(:credentials) { "oauth_token:x-oauth-basic@" }
-
-      it "returns the string without the sensitive credentials" do
-        expect(subject.credential_filtered_string(str_to_filter, uri)).to eq(
-          "This is a git message containing a uri https://x-oauth-basic@github.com/company/private-repo!"
-        )
-      end
-    end
-
-    context "that does not contains credentials" do
-      it "returns the same string" do
-        expect(subject.credential_filtered_string(str_to_filter, uri)).to eq(str_to_filter)
-      end
-    end
-
-    context "string to filter is nil" do
-      let(:str_to_filter) { nil }
-
-      it "returns nil" do
-        expect(subject.credential_filtered_string(str_to_filter, uri)).to be_nil
-      end
-    end
-
-    context "uri to filter out is nil" do
-      let(:uri) { nil }
-
-      it "returns the same string" do
-        expect(subject.credential_filtered_string(str_to_filter, uri)).to eq(str_to_filter)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/vendored_persistent_spec.rb b/spec/bundler/bundler/vendored_persistent_spec.rb
deleted file mode 100644
index 338431c4a6..0000000000
--- a/spec/bundler/bundler/vendored_persistent_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require "bundler/vendored_persistent"
-
-RSpec.describe Bundler::PersistentHTTP do
-  describe "#warn_old_tls_version_rubygems_connection" do
-    let(:uri) { "https://index.rubygems.org" }
-    let(:connection) { instance_double(subject.http_class) }
-    let(:tls_version) { "TLSv1.2" }
-    let(:socket) { double("Socket") }
-    let(:socket_io) { double("SocketIO") }
-
-    before do
-      allow(connection).to receive(:use_ssl?).and_return(!tls_version.nil?)
-      allow(socket).to receive(:io).and_return(socket_io)
-      connection.instance_variable_set(:@socket, socket)
-
-      if tls_version
-        allow(socket_io).to receive(:ssl_version).and_return(tls_version)
-      end
-    end
-
-    shared_examples_for "does not warn" do
-      it "does not warn" do
-        allow(Bundler.ui).to receive(:warn).never
-        subject.warn_old_tls_version_rubygems_connection(URI(uri), connection)
-      end
-    end
-
-    shared_examples_for "does warn" do |*expected|
-      it "warns" do
-        expect(Bundler.ui).to receive(:warn).with(*expected)
-        subject.warn_old_tls_version_rubygems_connection(URI(uri), connection)
-      end
-    end
-
-    context "an HTTPS uri with TLSv1.2" do
-      include_examples "does not warn"
-    end
-
-    context "without SSL" do
-      let(:tls_version) { nil }
-
-      include_examples "does not warn"
-    end
-
-    context "without a socket" do
-      let(:socket) { nil }
-
-      include_examples "does not warn"
-    end
-
-    context "with a different TLD" do
-      let(:uri) { "https://foo.bar" }
-      include_examples "does not warn"
-
-      context "and an outdated TLS version" do
-        let(:tls_version) { "TLSv1" }
-        include_examples "does not warn"
-      end
-    end
-
-    context "with a nonsense TLS version" do
-      let(:tls_version) { "BlahBlah2.0Blah" }
-      include_examples "does not warn"
-    end
-
-    context "with an outdated TLS version" do
-      let(:tls_version) { "TLSv1" }
-      include_examples "does 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
diff --git a/spec/bundler/bundler/version_ranges_spec.rb b/spec/bundler/bundler/version_ranges_spec.rb
deleted file mode 100644
index ccbb9285d5..0000000000
--- a/spec/bundler/bundler/version_ranges_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/version_ranges"
-
-RSpec.describe Bundler::VersionRanges do
-  describe ".empty?" do
-    shared_examples_for "empty?" do |exp, *req|
-      it "returns #{exp} for #{req}" do
-        r = Gem::Requirement.new(*req)
-        ranges = described_class.for(r)
-        expect(described_class.empty?(*ranges)).to eq(exp), "expected `#{r}` #{exp ? "" : "not "}to be empty"
-      end
-    end
-
-    include_examples "empty?", false
-    include_examples "empty?", false, "!= 1"
-    include_examples "empty?", false, "!= 1", "= 2"
-    include_examples "empty?", false, "!= 1", "> 1"
-    include_examples "empty?", false, "!= 1", ">= 1"
-    include_examples "empty?", false, "= 1", ">= 0.1", "<= 1.1"
-    include_examples "empty?", false, "= 1", ">= 1", "<= 1"
-    include_examples "empty?", false, "= 1", "~> 1"
-    include_examples "empty?", false, ">= 0.z", "= 0"
-    include_examples "empty?", false, ">= 0"
-    include_examples "empty?", false, ">= 1.0.0", "< 2.0.0"
-    include_examples "empty?", false, "~> 1"
-    include_examples "empty?", false, "~> 2.0", "~> 2.1"
-    include_examples "empty?", true, "!= 1", "< 2", "> 2"
-    include_examples "empty?", true, "!= 1", "<= 1", ">= 1"
-    include_examples "empty?", true, "< 2", "> 2"
-    include_examples "empty?", true, "= 1", "!= 1"
-    include_examples "empty?", true, "= 1", "= 2"
-    include_examples "empty?", true, "= 1", "~> 2"
-    include_examples "empty?", true, ">= 0", "<= 0.a"
-    include_examples "empty?", true, "~> 2.0", "~> 3"
-  end
-end
diff --git a/spec/bundler/bundler/worker_spec.rb b/spec/bundler/bundler/worker_spec.rb
deleted file mode 100644
index 2e5642709d..0000000000
--- a/spec/bundler/bundler/worker_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/worker"
-
-RSpec.describe Bundler::Worker do
-  let(:size) { 5 }
-  let(:name) { "Spec Worker" }
-  let(:function) { proc {|object, worker_number| [object, worker_number] } }
-  subject { described_class.new(size, name, function) }
-
-  after { subject.stop }
-
-  describe "#initialize" do
-    context "when Thread.start raises ThreadError" do
-      it "raises when no threads can be created" do
-        allow(Thread).to receive(:start).and_raise(ThreadError, "error creating thread")
-
-        expect { subject.enq "a" }.to raise_error(Bundler::ThreadCreationError, "Failed to create threads for the Spec Worker worker: error creating thread")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/bundler/yaml_serializer_spec.rb b/spec/bundler/bundler/yaml_serializer_spec.rb
deleted file mode 100644
index 1241c74bbf..0000000000
--- a/spec/bundler/bundler/yaml_serializer_spec.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/yaml_serializer"
-
-RSpec.describe Bundler::YAMLSerializer do
-  subject(:serializer) { Bundler::YAMLSerializer }
-
-  describe "#dump" do
-    it "works for simple hash" do
-      hash = { "Q" => "Where does Thursday come before Wednesday? In the dictionary. :P" }
-
-      expected = strip_whitespace <<-YAML
-          ---
-          Q: "Where does Thursday come before Wednesday? In the dictionary. :P"
-      YAML
-
-      expect(serializer.dump(hash)).to eq(expected)
-    end
-
-    it "handles nested hash" do
-      hash = {
-        "nice-one" => {
-          "read_ahead" => "All generalizations are false, including this one",
-        },
-      }
-
-      expected = strip_whitespace <<-YAML
-          ---
-          nice-one:
-            read_ahead: "All generalizations are false, including this one"
-      YAML
-
-      expect(serializer.dump(hash)).to eq(expected)
-    end
-
-    it "array inside an hash" do
-      hash = {
-        "nested_hash" => {
-          "contains_array" => [
-            "Jack and Jill went up the hill",
-            "To fetch a pail of water.",
-            "Jack fell down and broke his crown,",
-            "And Jill came tumbling after.",
-          ],
-        },
-      }
-
-      expected = strip_whitespace <<-YAML
-        ---
-        nested_hash:
-          contains_array:
-          - "Jack and Jill went up the hill"
-          - "To fetch a pail of water."
-          - "Jack fell down and broke his crown,"
-          - "And Jill came tumbling after."
-      YAML
-
-      expect(serializer.dump(hash)).to eq(expected)
-    end
-  end
-
-  describe "#load" do
-    it "works for simple hash" do
-      yaml = strip_whitespace <<-YAML
-        ---
-        Jon: "Air is free dude!"
-        Jack: "Yes.. until you buy a bag of chips!"
-      YAML
-
-      hash = {
-        "Jon" => "Air is free dude!",
-        "Jack" => "Yes.. until you buy a bag of chips!",
-      }
-
-      expect(serializer.load(yaml)).to eq(hash)
-    end
-
-    it "works for nested hash" do
-      yaml = strip_whitespace <<-YAML
-        ---
-        baa:
-          baa: "black sheep"
-          have: "you any wool?"
-          yes: "merry have I"
-        three: "bags full"
-      YAML
-
-      hash = {
-        "baa" => {
-          "baa" => "black sheep",
-          "have" => "you any wool?",
-          "yes" => "merry have I",
-        },
-        "three" => "bags full",
-      }
-
-      expect(serializer.load(yaml)).to eq(hash)
-    end
-
-    it "handles colon in key/value" do
-      yaml = strip_whitespace <<-YAML
-        BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/: http://rubygems-mirror.org
-      YAML
-
-      expect(serializer.load(yaml)).to eq("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://rubygems-mirror.org")
-    end
-
-    it "handles arrays inside hashes" do
-      yaml = strip_whitespace <<-YAML
-        ---
-        nested_hash:
-          contains_array:
-          - "Why shouldn't you write with a broken pencil?"
-          - "Because it's pointless!"
-      YAML
-
-      hash = {
-        "nested_hash" => {
-          "contains_array" => [
-            "Why shouldn't you write with a broken pencil?",
-            "Because it's pointless!",
-          ],
-        },
-      }
-
-      expect(serializer.load(yaml)).to eq(hash)
-    end
-
-    it "handles windows-style CRLF line endings" do
-      yaml = strip_whitespace(<<-YAML).gsub("\n", "\r\n")
-        ---
-        nested_hash:
-          contains_array:
-          - "Why shouldn't you write with a broken pencil?"
-          - "Because it's pointless!"
-          - oh so silly
-      YAML
-
-      hash = {
-        "nested_hash" => {
-          "contains_array" => [
-            "Why shouldn't you write with a broken pencil?",
-            "Because it's pointless!",
-            "oh so silly",
-          ],
-        },
-      }
-
-      expect(serializer.load(yaml)).to eq(hash)
-    end
-  end
-
-  describe "against yaml lib" do
-    let(:hash) do
-      {
-        "a_joke" => {
-          "my-stand" => "I can totally keep secrets",
-          "but" => "The people I tell them to can't :P",
-          "wouldn't it be funny if this string were empty?" => "",
-        },
-        "more" => {
-          "first" => [
-            "Can a kangaroo jump higher than a house?",
-            "Of course, a house doesn't jump at all.",
-          ],
-          "second" => [
-            "What did the sea say to the sand?",
-            "Nothing, it simply waved.",
-          ],
-          "array with empty string" => [""],
-        },
-        "sales" => {
-          "item" => "A Parachute",
-          "description" => "Only used once, never opened.",
-        },
-        "one-more" => "I'd tell you a chemistry joke but I know I wouldn't get a reaction.",
-      }
-    end
-
-    context "#load" do
-      it "retrieves the original hash" do
-        require "yaml"
-        expect(serializer.load(YAML.dump(hash))).to eq(hash)
-      end
-    end
-
-    context "#dump" do
-      it "retrieves the original hash" do
-        require "yaml"
-        expect(YAML.load(serializer.dump(hash))).to eq(hash)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/cache/cache_path_spec.rb b/spec/bundler/cache/cache_path_spec.rb
deleted file mode 100644
index 69d3809964..0000000000
--- a/spec/bundler/cache/cache_path_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle package" do
-  before do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-  end
-
-  context "with --cache-path" do
-    it "caches gems at given path" do
-      bundle :package, "cache-path" => "vendor/cache-foo"
-      expect(bundled_app("vendor/cache-foo/rack-1.0.0.gem")).to exist
-    end
-  end
-
-  context "with config cache_path" do
-    it "caches gems at given path" do
-      bundle "config cache_path vendor/cache-foo"
-      bundle :package
-      expect(bundled_app("vendor/cache-foo/rack-1.0.0.gem")).to exist
-    end
-  end
-
-  context "with absolute --cache-path" do
-    it "caches gems at given path" do
-      bundle :package, "cache-path" => "/tmp/cache-foo"
-      expect(bundled_app("/tmp/cache-foo/rack-1.0.0.gem")).to exist
-    end
-  end
-end
diff --git a/spec/bundler/cache/gems_spec.rb b/spec/bundler/cache/gems_spec.rb
deleted file mode 100644
index 4a0b953830..0000000000
--- a/spec/bundler/cache/gems_spec.rb
+++ /dev/null
@@ -1,304 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle cache" do
-  shared_examples_for "when there are only gemsources" do
-    before :each do
-      gemfile <<-G
-        gem 'rack'
-      G
-
-      system_gems "rack-1.0.0", :path => :bundle_path
-      bundle! :cache
-    end
-
-    it "copies the .gem file to vendor/cache" do
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-    end
-
-    it "uses the cache as a source when installing gems" do
-      build_gem "omg", :path => bundled_app("vendor/cache")
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "omg"
-      G
-
-      expect(the_bundle).to include_gems "omg 1.0.0"
-    end
-
-    it "uses the cache as a source when installing gems with --local" do
-      system_gems [], :path => :bundle_path
-      bundle "install --local"
-
-      expect(the_bundle).to include_gems("rack 1.0.0")
-    end
-
-    it "does not reinstall gems from the cache if they exist on the system" do
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "RACK = 'FAIL'"
-      end
-
-      install_gemfile <<-G
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems("rack 1.0.0")
-    end
-
-    it "does not reinstall gems from the cache if they exist in the bundle" do
-      system_gems "rack-1.0.0", :path => :bundle_path
-
-      gemfile <<-G
-        gem "rack"
-      G
-
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "RACK = 'FAIL'"
-      end
-
-      bundle! :install, :local => true
-      expect(the_bundle).to include_gems("rack 1.0.0")
-    end
-
-    it "creates a lockfile" do
-      cache_gems "rack-1.0.0"
-
-      gemfile <<-G
-        gem "rack"
-      G
-
-      bundle "cache"
-
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-  end
-
-  context "using system gems" do
-    before { bundle! "config path.system true" }
-    it_behaves_like "when there are only gemsources"
-  end
-
-  context "installing into a local path" do
-    before { bundle! "config path ./.bundle" }
-    it_behaves_like "when there are only gemsources"
-  end
-
-  describe "when there is a built-in gem", :ruby => "2.0" do
-    before :each do
-      build_repo2 do
-        build_gem "builtin_gem", "1.0.2"
-      end
-
-      build_gem "builtin_gem", "1.0.2", :to_system => true do |s|
-        s.summary = "This builtin_gem is bundled with Ruby"
-      end
-
-      FileUtils.rm("#{system_gem_path}/cache/builtin_gem-1.0.2.gem")
-    end
-
-    it "uses builtin gems when installing to system gems" do
-      bundle! "config path.system true"
-      install_gemfile %(gem 'builtin_gem', '1.0.2')
-      expect(the_bundle).to include_gems("builtin_gem 1.0.2")
-    end
-
-    it "caches remote and builtin gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'builtin_gem', '1.0.2'
-        gem 'rack', '1.0.0'
-      G
-
-      bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-      expect(bundled_app("vendor/cache/builtin_gem-1.0.2.gem")).to exist
-    end
-
-    it "doesn't make remote request after caching the gem" do
-      build_gem "builtin_gem_2", "1.0.2", :path => bundled_app("vendor/cache") do |s|
-        s.summary = "This builtin_gem is bundled with Ruby"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'builtin_gem_2', '1.0.2'
-      G
-
-      bundle "install --local"
-      expect(the_bundle).to include_gems("builtin_gem_2 1.0.2")
-    end
-
-    it "errors if the builtin gem isn't available to cache" do
-      bundle! "config path.system true"
-
-      install_gemfile <<-G
-        gem 'builtin_gem', '1.0.2'
-      G
-
-      bundle :cache
-      expect(exitstatus).to_not eq(0) if exitstatus
-      expect(out).to include("builtin_gem-1.0.2 is built in to Ruby, and can't be cached")
-    end
-  end
-
-  describe "when there are also git sources" do
-    before do
-      build_git "foo"
-      system_gems "rack-1.0.0"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        git "#{lib_path("foo-1.0")}" do
-          gem 'foo'
-        end
-        gem 'rack'
-      G
-    end
-
-    it "still works" do
-      bundle :cache
-
-      system_gems []
-      bundle "install --local"
-
-      expect(the_bundle).to include_gems("rack 1.0.0", "foo 1.0")
-    end
-
-    it "should not explode if the lockfile is not present" do
-      FileUtils.rm(bundled_app("Gemfile.lock"))
-
-      bundle :cache
-
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-  end
-
-  describe "when previously cached" do
-    before :each do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-        gem "actionpack"
-      G
-      bundle :cache
-      expect(cached_gem("rack-1.0.0")).to exist
-      expect(cached_gem("actionpack-2.3.2")).to exist
-      expect(cached_gem("activesupport-2.3.2")).to exist
-    end
-
-    it "re-caches during install" do
-      cached_gem("rack-1.0.0").rmtree
-      bundle :install
-      expect(out).to include("Updating files in vendor/cache")
-      expect(cached_gem("rack-1.0.0")).to exist
-    end
-
-    it "adds and removes when gems are updated" do
-      update_repo2
-      bundle "update", :all => bundle_update_requires_all?
-      expect(cached_gem("rack-1.2")).to exist
-      expect(cached_gem("rack-1.0.0")).not_to exist
-    end
-
-    it "adds new gems and dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails"
-      G
-      expect(cached_gem("rails-2.3.2")).to exist
-      expect(cached_gem("activerecord-2.3.2")).to exist
-    end
-
-    it "removes .gems for removed gems and dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-      expect(cached_gem("rack-1.0.0")).to exist
-      expect(cached_gem("actionpack-2.3.2")).not_to exist
-      expect(cached_gem("activesupport-2.3.2")).not_to exist
-    end
-
-    it "removes .gems when gem changes to git source" do
-      build_git "rack"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack", :git => "#{lib_path("rack-1.0")}"
-        gem "actionpack"
-      G
-      expect(cached_gem("rack-1.0.0")).not_to exist
-      expect(cached_gem("actionpack-2.3.2")).to exist
-      expect(cached_gem("activesupport-2.3.2")).to exist
-    end
-
-    it "doesn't remove gems that are for another platform" do
-      simulate_platform "java" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-
-        bundle :cache
-        expect(cached_gem("platform_specific-1.0-java")).to exist
-      end
-
-      simulate_new_machine
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "platform_specific"
-      G
-
-      expect(cached_gem("platform_specific-1.0-#{Bundler.local_platform}")).to exist
-      expect(cached_gem("platform_specific-1.0-java")).to exist
-    end
-
-    it "doesn't remove gems with mismatched :rubygems_version or :date" do
-      cached_gem("rack-1.0.0").rmtree
-      build_gem "rack", "1.0.0",
-        :path => bundled_app("vendor/cache"),
-        :rubygems_version => "1.3.2"
-      simulate_new_machine
-
-      bundle :install
-      expect(cached_gem("rack-1.0.0")).to exist
-    end
-
-    it "handles directories and non .gem files in the cache" do
-      bundled_app("vendor/cache/foo").mkdir
-      File.open(bundled_app("vendor/cache/bar"), "w") {|f| f.write("not a gem") }
-      bundle :cache
-    end
-
-    it "does not say that it is removing gems when it isn't actually doing so" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      bundle "cache"
-      bundle "install"
-      expect(out).not_to match(/removing/i)
-    end
-
-    it "does not warn about all if it doesn't have any git/path dependency" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      bundle "cache"
-      expect(out).not_to match(/\-\-all/)
-    end
-
-    it "should install gems with the name bundler in them (that aren't bundler)" do
-      build_gem "foo-bundler", "1.0",
-        :path => bundled_app("vendor/cache")
-
-      install_gemfile <<-G
-        gem "foo-bundler"
-      G
-
-      expect(the_bundle).to include_gems "foo-bundler 1.0"
-    end
-  end
-end
diff --git a/spec/bundler/cache/git_spec.rb b/spec/bundler/cache/git_spec.rb
deleted file mode 100644
index 33387dbbb2..0000000000
--- a/spec/bundler/cache/git_spec.rb
+++ /dev/null
@@ -1,214 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "git base name" do
-  it "base_name should strip private repo uris" do
-    source = Bundler::Source::Git.new("uri" => "git@github.com:bundler.git")
-    expect(source.send(:base_name)).to eq("bundler")
-  end
-
-  it "base_name should strip network share paths" do
-    source = Bundler::Source::Git.new("uri" => "//MachineName/ShareFolder")
-    expect(source.send(:base_name)).to eq("ShareFolder")
-  end
-end
-
-%w[cache package].each do |cmd|
-  RSpec.describe "bundle #{cmd} with git" do
-    it "copies repository to vendor cache and uses it" do
-      git = build_git "foo"
-      ref = git.ref_for("master", 11)
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
-
-      FileUtils.rm_rf lib_path("foo-1.0")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "copies repository to vendor cache and uses it even when installed with bundle --path" do
-      git = build_git "foo"
-      ref = git.ref_for("master", 11)
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle "install --path vendor/bundle"
-      bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
-
-      FileUtils.rm_rf lib_path("foo-1.0")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "runs twice without exploding" do
-      build_git "foo"
-
-      install_gemfile! <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-      bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(last_command.stdout).to include "Updating files in vendor/cache"
-      FileUtils.rm_rf lib_path("foo-1.0")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "tracks updates" do
-      git = build_git "foo"
-      old_ref = git.ref_for("master", 11)
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      update_git "foo" do |s|
-        s.write "lib/foo.rb", "puts :CACHE"
-      end
-
-      ref = git.ref_for("master", 11)
-      expect(ref).not_to eq(old_ref)
-
-      bundle! "update", :all => bundle_update_requires_all?
-      bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
-      expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
-
-      FileUtils.rm_rf lib_path("foo-1.0")
-      run! "require 'foo'"
-      expect(out).to eq("CACHE")
-    end
-
-    it "tracks updates when specifying the gem" do
-      git = build_git "foo"
-      old_ref = git.ref_for("master", 11)
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle! cmd, forgotten_command_line_options([:all, :cache_all] => true)
-
-      update_git "foo" do |s|
-        s.write "lib/foo.rb", "puts :CACHE"
-      end
-
-      ref = git.ref_for("master", 11)
-      expect(ref).not_to eq(old_ref)
-
-      bundle "update foo"
-
-      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
-      expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
-
-      FileUtils.rm_rf lib_path("foo-1.0")
-      run "require 'foo'"
-      expect(out).to eq("CACHE")
-    end
-
-    it "uses the local repository to generate the cache" do
-      git = build_git "foo"
-      ref = git.ref_for("master", 11)
-
-      gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-invalid")}', :branch => :master
-      G
-
-      bundle %(config local.foo #{lib_path("foo-1.0")})
-      bundle "install"
-      bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(bundled_app("vendor/cache/foo-invalid-#{ref}")).to exist
-
-      # Updating the local still uses the local.
-      update_git "foo" do |s|
-        s.write "lib/foo.rb", "puts :LOCAL"
-      end
-
-      run "require 'foo'"
-      expect(out).to eq("LOCAL")
-    end
-
-    it "copies repository to vendor cache, including submodules" do
-      build_git "submodule", "1.0"
-
-      git = build_git "has_submodule", "1.0" do |s|
-        s.add_dependency "submodule"
-      end
-
-      Dir.chdir(lib_path("has_submodule-1.0")) do
-        sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0"
-        `git commit -m "submodulator"`
-      end
-
-      install_gemfile <<-G
-        git "#{lib_path("has_submodule-1.0")}", :submodules => true do
-          gem "has_submodule"
-        end
-      G
-
-      ref = git.ref_for("master", 11)
-      bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist
-      expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0")).to exist
-      expect(the_bundle).to include_gems "has_submodule 1.0"
-    end
-
-    it "displays warning message when detecting git repo in Gemfile", :bundler => "< 2" do
-      build_git "foo"
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle "#{cmd}"
-
-      expect(out).to include("Your Gemfile contains path and git dependencies.")
-    end
-
-    it "does not display warning message if cache_all is set in bundle config" do
-      build_git "foo"
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      bundle cmd
-
-      expect(out).not_to include("Your Gemfile contains path and git dependencies.")
-    end
-
-    it "caches pre-evaluated gemspecs" do
-      git = build_git "foo"
-
-      # Insert a gemspec method that shells out
-      spec_lines = lib_path("foo-1.0/foo.gemspec").read.split("\n")
-      spec_lines.insert(-2, "s.description = `echo bob`")
-      update_git("foo") {|s| s.write "foo.gemspec", spec_lines.join("\n") }
-
-      install_gemfile <<-G
-        gem "foo", :git => '#{lib_path("foo-1.0")}'
-      G
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-
-      ref = git.ref_for("master", 11)
-      gemspec = bundled_app("vendor/cache/foo-1.0-#{ref}/foo.gemspec").read
-      expect(gemspec).to_not match("`echo bob`")
-    end
-  end
-end
diff --git a/spec/bundler/cache/path_spec.rb b/spec/bundler/cache/path_spec.rb
deleted file mode 100644
index 8c6a843476..0000000000
--- a/spec/bundler/cache/path_spec.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-%w[cache package].each do |cmd|
-  RSpec.describe "bundle #{cmd} with path" do
-    it "is no-op when the path is within the bundle" do
-      build_lib "foo", :path => bundled_app("lib/foo")
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{bundled_app("lib/foo")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "copies when the path is outside the bundle " do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/foo-1.0")).to exist
-      expect(bundled_app("vendor/cache/foo-1.0/.bundlecache")).to be_file
-
-      FileUtils.rm_rf lib_path("foo-1.0")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "copies when the path is outside the bundle and the paths intersect" do
-      libname = File.basename(Dir.pwd) + "_gem"
-      libpath = File.join(File.dirname(Dir.pwd), libname)
-
-      build_lib libname, :path => libpath
-
-      install_gemfile <<-G
-        gem "#{libname}", :path => '#{libpath}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/#{libname}")).to exist
-      expect(bundled_app("vendor/cache/#{libname}/.bundlecache")).to be_file
-
-      FileUtils.rm_rf libpath
-      expect(the_bundle).to include_gems "#{libname} 1.0"
-    end
-
-    it "updates the path on each cache" do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-
-      build_lib "foo" do |s|
-        s.write "lib/foo.rb", "puts :CACHE"
-      end
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-
-      expect(bundled_app("vendor/cache/foo-1.0")).to exist
-      FileUtils.rm_rf lib_path("foo-1.0")
-
-      run "require 'foo'"
-      expect(out).to eq("CACHE")
-    end
-
-    it "removes stale entries cache" do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-
-      install_gemfile <<-G
-        gem "bar", :path => '#{lib_path("bar-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/bar-1.0")).not_to exist
-    end
-
-    it "raises a warning without --all", :bundler => "< 2" do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd
-      expect(out).to match(/please pass the \-\-all flag/)
-      expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
-    end
-
-    it "stores the given flag" do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      build_lib "bar"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-        gem "bar", :path => '#{lib_path("bar-1.0")}'
-      G
-
-      bundle cmd
-      expect(bundled_app("vendor/cache/bar-1.0")).to exist
-    end
-
-    it "can rewind chosen configuration" do
-      build_lib "foo"
-
-      install_gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-      G
-
-      bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
-      build_lib "baz"
-
-      gemfile <<-G
-        gem "foo", :path => '#{lib_path("foo-1.0")}'
-        gem "baz", :path => '#{lib_path("baz-1.0")}'
-      G
-
-      bundle "#{cmd} --no-all"
-      expect(bundled_app("vendor/cache/baz-1.0")).not_to exist
-    end
-  end
-end
diff --git a/spec/bundler/cache/platform_spec.rb b/spec/bundler/cache/platform_spec.rb
deleted file mode 100644
index c0622a3c94..0000000000
--- a/spec/bundler/cache/platform_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle cache with multiple platforms" do
-  before :each do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      platforms :mri, :rbx do
-        gem "rack", "1.0.0"
-      end
-
-      platforms :jruby do
-        gem "activesupport", "2.3.5"
-      end
-    G
-
-    lockfile <<-G
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          rack (1.0.0)
-          activesupport (2.3.5)
-
-      PLATFORMS
-        ruby
-        java
-
-      DEPENDENCIES
-        rack (1.0.0)
-        activesupport (2.3.5)
-    G
-
-    cache_gems "rack-1.0.0", "activesupport-2.3.5"
-  end
-
-  it "ensures that a successful bundle install does not delete gems for other platforms" do
-    bundle! "install"
-
-    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-    expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
-  end
-
-  it "ensures that a successful bundle update does not delete gems for other platforms" do
-    bundle! "update", :all => bundle_update_requires_all?
-
-    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-    expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
-  end
-end
diff --git a/spec/bundler/commands/add_spec.rb b/spec/bundler/commands/add_spec.rb
deleted file mode 100644
index 9f11adbcf8..0000000000
--- a/spec/bundler/commands/add_spec.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle add" do
-  before :each do
-    build_repo2 do
-      build_gem "foo", "1.1"
-      build_gem "foo", "2.0"
-      build_gem "baz", "1.2.3"
-      build_gem "bar", "0.12.3"
-      build_gem "cat", "0.12.3.pre"
-      build_gem "dog", "1.1.3.pre"
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "weakling", "~> 0.0.1"
-    G
-  end
-
-  context "when no gems are specified" do
-    it "shows error" do
-      bundle "add"
-
-      expect(last_command.bundler_err).to include("Please specify gems to add")
-    end
-  end
-
-  describe "without version specified" do
-    it "version requirement becomes ~> major.minor.patch when resolved version is < 1.0" do
-      bundle "add 'bar'"
-      expect(bundled_app("Gemfile").read).to match(/gem "bar", "~> 0.12.3"/)
-      expect(the_bundle).to include_gems "bar 0.12.3"
-    end
-
-    it "version requirement becomes ~> major.minor when resolved version is > 1.0" do
-      bundle "add 'baz'"
-      expect(bundled_app("Gemfile").read).to match(/gem "baz", "~> 1.2"/)
-      expect(the_bundle).to include_gems "baz 1.2.3"
-    end
-
-    it "version requirement becomes ~> major.minor.patch.pre when resolved version is < 1.0" do
-      bundle "add 'cat'"
-      expect(bundled_app("Gemfile").read).to match(/gem "cat", "~> 0.12.3.pre"/)
-      expect(the_bundle).to include_gems "cat 0.12.3.pre"
-    end
-
-    it "version requirement becomes ~> major.minor.pre when resolved version is > 1.0.pre" do
-      bundle "add 'dog'"
-      expect(bundled_app("Gemfile").read).to match(/gem "dog", "~> 1.1.pre"/)
-      expect(the_bundle).to include_gems "dog 1.1.3.pre"
-    end
-  end
-
-  describe "with --version" do
-    it "adds dependency of specified version and runs install" do
-      bundle "add 'foo' --version='~> 1.0'"
-      expect(bundled_app("Gemfile").read).to match(/gem "foo", "~> 1.0"/)
-      expect(the_bundle).to include_gems "foo 1.1"
-    end
-
-    it "adds multiple version constraints when specified" do
-      requirements = ["< 3.0", "> 1.0"]
-      bundle "add 'foo' --version='#{requirements.join(", ")}'"
-      expect(bundled_app("Gemfile").read).to match(/gem "foo", #{Gem::Requirement.new(requirements).as_list.map(&:dump).join(', ')}/)
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with --group" do
-    it "adds dependency for the specified group" do
-      bundle "add 'foo' --group='development'"
-      expect(bundled_app("Gemfile").read).to match(/gem "foo", "~> 2.0", :group => :development/)
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-
-    it "adds dependency to more than one group" do
-      bundle "add 'foo' --group='development, test'"
-      expect(bundled_app("Gemfile").read).to match(/gem "foo", "~> 2.0", :groups => \[:development, :test\]/)
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with --source" do
-    it "adds dependency with specified source" do
-      bundle "add 'foo' --source='file://#{gem_repo2}'"
-
-      expect(bundled_app("Gemfile").read).to match(%r{gem "foo", "~> 2.0", :source => "file:\/\/#{gem_repo2}"})
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with --skip-install" do
-    it "adds gem to Gemfile but is not installed" do
-      bundle "add foo --skip-install --version=2.0"
-
-      expect(bundled_app("Gemfile").read).to match(/gem "foo", "= 2.0"/)
-      expect(the_bundle).to_not include_gems "foo 2.0"
-    end
-  end
-
-  it "using combination of short form options works like long form" do
-    bundle "add 'foo' -s='file://#{gem_repo2}' -g='development' -v='~>1.0'"
-    expect(bundled_app("Gemfile").read).to include %(gem "foo", "~> 1.0", :group => :development, :source => "file://#{gem_repo2}")
-    expect(the_bundle).to include_gems "foo 1.1"
-  end
-
-  it "shows error message when version is not formatted correctly" do
-    bundle "add 'foo' -v='~>1 . 0'"
-    expect(out).to match("Invalid gem requirement pattern '~>1 . 0'")
-  end
-
-  it "shows error message when gem cannot be found" do
-    bundle "add 'werk_it'"
-    expect(out).to match("Could not find gem 'werk_it' in")
-
-    bundle "add 'werk_it' -s='file://#{gem_repo2}'"
-    expect(out).to match("Could not find gem 'werk_it' in rubygems repository")
-  end
-
-  it "shows error message when source cannot be reached" do
-    bundle "add 'baz' --source='http://badhostasdf'"
-    expect(out).to include("Could not reach host badhostasdf. Check your network connection and try again.")
-
-    bundle "add 'baz' --source='file://does/not/exist'"
-    expect(out).to include("Could not fetch specs from file://does/not/exist/")
-  end
-
-  describe "with --optimistic" do
-    it "adds optimistic version" do
-      bundle! "add 'foo' --optimistic"
-      expect(bundled_app("Gemfile").read).to include %(gem "foo", ">= 2.0")
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with --strict option" do
-    it "adds strict version" do
-      bundle! "add 'foo' --strict"
-      expect(bundled_app("Gemfile").read).to include %(gem "foo", "= 2.0")
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with no option" do
-    it "adds pessimistic version" do
-      bundle! "add 'foo'"
-      expect(bundled_app("Gemfile").read).to include %(gem "foo", "~> 2.0")
-      expect(the_bundle).to include_gems "foo 2.0"
-    end
-  end
-
-  describe "with --optimistic and --strict" do
-    it "throws error" do
-      bundle "add 'foo' --strict --optimistic"
-
-      expect(out).to include("You can not specify `--strict` and `--optimistic` at the same time")
-    end
-  end
-
-  context "multiple gems" do
-    it "adds multiple gems to gemfile" do
-      bundle! "add bar baz"
-
-      expect(bundled_app("Gemfile").read).to match(/gem "bar", "~> 0.12.3"/)
-      expect(bundled_app("Gemfile").read).to match(/gem "baz", "~> 1.2"/)
-    end
-
-    it "throws error if any of the specified gems are present in the gemfile with different version" do
-      bundle "add weakling bar"
-
-      expect(out).to include("You cannot specify the same gem twice with different version requirements")
-      expect(out).to include("You specified: weakling (~> 0.0.1) and weakling (>= 0).")
-    end
-  end
-
-  describe "when a gem is added which is already specified in Gemfile with version" do
-    it "shows an error when added with different version requirement" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack", "1.0"
-      G
-
-      bundle "add 'rack' --version=1.1"
-
-      expect(out).to include("You cannot specify the same gem twice with different version requirements")
-      expect(out).to include("If you want to update the gem version, run `bundle update rack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
-    end
-
-    it "shows error when added without version requirements" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack", "1.0"
-      G
-
-      bundle "add 'rack'"
-
-      expect(out).to include("Gem already added.")
-      expect(out).to include("You cannot specify the same gem twice with different version requirements")
-      expect(out).not_to include("If you want to update the gem version, run `bundle update rack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
-    end
-  end
-
-  describe "when a gem is added which is already specified in Gemfile without version" do
-    it "shows an error when added with different version requirement" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-
-      bundle "add 'rack' --version=1.1"
-
-      expect(out).to include("You cannot specify the same gem twice with different version requirements")
-      expect(out).to include("If you want to update the gem version, run `bundle update rack`.")
-      expect(out).not_to include("You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
-    end
-  end
-end
diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb
deleted file mode 100644
index 6a705d3423..0000000000
--- a/spec/bundler/commands/binstubs_spec.rb
+++ /dev/null
@@ -1,453 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle binstubs <gem>" do
-  context "when the gem exists in the lockfile" do
-    it "sets up the binstub" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "binstubs rack"
-
-      expect(bundled_app("bin/rackup")).to exist
-    end
-
-    it "does not install other binstubs" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rails"
-      G
-
-      bundle "binstubs rails"
-
-      expect(bundled_app("bin/rackup")).not_to exist
-      expect(bundled_app("bin/rails")).to exist
-    end
-
-    it "does install multiple binstubs" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rails"
-      G
-
-      bundle "binstubs rails rack"
-
-      expect(bundled_app("bin/rackup")).to exist
-      expect(bundled_app("bin/rails")).to exist
-    end
-
-    it "allows installing all binstubs" do
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-
-      bundle! :binstubs, :all => true
-
-      expect(bundled_app("bin/rails")).to exist
-      expect(bundled_app("bin/rake")).to exist
-    end
-
-    it "displays an error when used without any gem" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "binstubs"
-      expect(exitstatus).to eq(1) if exitstatus
-      expect(out).to include("`bundle binstubs` needs at least one gem to run.")
-    end
-
-    it "displays an error when used with --all and gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "binstubs rack", :all => true
-      expect(last_command).to be_failure
-      expect(last_command.bundler_err).to include("Cannot specify --all with specific gems")
-    end
-
-    context "when generating bundle binstub outside bundler" do
-      it "should abort" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack"
-
-        File.open("bin/bundle", "wb") do |file|
-          file.print "OMG"
-        end
-
-        sys_exec "bin/rackup"
-
-        expect(last_command.stderr).to include("was not generated by Bundler")
-      end
-    end
-
-    context "the bundle binstub" do
-      before do
-        if system_bundler_version == :bundler
-          system_gems :bundler
-        elsif system_bundler_version
-          build_repo4 do
-            build_gem "bundler", system_bundler_version do |s|
-              s.executables = "bundle"
-              s.bindir = "exe"
-              s.write "exe/bundle", "puts %(system bundler #{system_bundler_version}\\n\#{ARGV.inspect})"
-            end
-          end
-          system_gems "bundler-#{system_bundler_version}", :gem_repo => gem_repo4
-        end
-        build_repo2 do
-          build_gem "prints_loaded_gems", "1.0" do |s|
-            s.executables = "print_loaded_gems"
-            s.bindir = "exe"
-            s.write "exe/print_loaded_gems", <<-R
-              specs = Gem.loaded_specs.values.reject {|s| Bundler.rubygems.spec_default_gem?(s) }
-              puts specs.map(&:full_name).sort.inspect
-            R
-          end
-        end
-        install_gemfile! <<-G
-          source "file://#{gem_repo2}"
-          gem "rack"
-          gem "prints_loaded_gems"
-        G
-        bundle! "binstubs bundler rack prints_loaded_gems"
-      end
-
-      # When environment has a same version of bundler as default gems.
-      # `system_gems "bundler-x.y.z"` will detect system binstub.
-      # We need to avoid it by virtual version of bundler.
-      let(:system_bundler_version) { Gem::Version.new(Bundler::VERSION).bump.to_s }
-
-      context "when system bundler was used" do
-        # Support master branch of bundler
-        if ENV["BUNDLER_SPEC_SUB_VERSION"]
-          let(:system_bundler_version) { Bundler::VERSION }
-        end
-        it "runs bundler" do
-          sys_exec! "#{bundled_app("bin/bundle")} install"
-          expect(out).to eq %(system bundler #{system_bundler_version}\n["install"])
-        end
-      end
-
-      context "when BUNDLER_VERSION is set" do
-        let(:system_bundler_version) { Bundler::VERSION }
-
-        it "runs the correct version of bundler" do
-          sys_exec "BUNDLER_VERSION='999.999.999' #{bundled_app("bin/bundle")} install"
-          expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-        end
-      end
-
-      context "when a lockfile exists with a locked bundler version" do
-        let(:system_bundler_version) { Bundler::VERSION }
-
-        it "runs the correct version of bundler when the version is newer" do
-          lockfile lockfile.gsub(system_bundler_version, "999.999.999")
-          sys_exec "#{bundled_app("bin/bundle")} install"
-          expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-        end
-
-        it "runs the correct version of bundler when the version is older" do
-          simulate_bundler_version "55"
-          lockfile lockfile.gsub(system_bundler_version, "44.0")
-          sys_exec "#{bundled_app("bin/bundle")} install"
-          expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (44.0) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '44.0'`")
-        end
-
-        it "runs the correct version of bundler when the version is a pre-release" do
-          simulate_bundler_version "55"
-          lockfile lockfile.gsub(system_bundler_version, "2.12.0.a")
-          sys_exec "#{bundled_app("bin/bundle")} install"
-          expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (2.12.0.a) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '2.12.0.a'`")
-        end
-      end
-
-      context "when update --bundler is called" do
-        before { lockfile.gsub(system_bundler_version, "1.1.1") }
-
-        it "calls through to the latest bundler version" do
-          sys_exec! "#{bundled_app("bin/bundle")} update --bundler"
-          expect(last_command.stdout).to eq %(system bundler #{system_bundler_version}\n["update", "--bundler"])
-        end
-
-        it "calls through to the explicit bundler version" do
-          sys_exec "#{bundled_app("bin/bundle")} update --bundler=999.999.999"
-          expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-        end
-      end
-
-      context "without a lockfile" do
-        it "falls back to the latest installed bundler" do
-          FileUtils.rm bundled_app("Gemfile.lock")
-          sys_exec! bundled_app("bin/bundle").to_s
-          expect(out).to eq "system bundler #{system_bundler_version}\n[]"
-        end
-      end
-
-      context "using another binstub" do
-        let(:system_bundler_version) { :bundler }
-        it "loads all gems" do
-          sys_exec! bundled_app("bin/print_loaded_gems").to_s
-          # RG < 2.0.14 didn't have a `Gem::Specification#default_gem?`
-          # This is dirty detection for old RG versions.
-          if File.dirname(Bundler.load.specs["bundler"][0].loaded_from) =~ %r{specifications/default}
-            expect(out).to eq %(["prints_loaded_gems-1.0", "rack-1.2"])
-          else
-            expect(out).to eq %(["bundler-#{Bundler::VERSION}", "prints_loaded_gems-1.0", "rack-1.2"])
-          end
-        end
-
-        context "when requesting a different bundler version" do
-          before { lockfile lockfile.gsub(Bundler::VERSION, "999.999.999") }
-
-          it "attempts to load that version", :ruby_repo do
-            sys_exec bundled_app("bin/rackup").to_s
-            expect(exitstatus).to eq(42) if exitstatus
-            expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-          end
-        end
-      end
-    end
-
-    it "installs binstubs from git gems" do
-      FileUtils.mkdir_p(lib_path("foo/bin"))
-      FileUtils.touch(lib_path("foo/bin/foo"))
-      build_git "foo", "1.0", :path => lib_path("foo") do |s|
-        s.executables = %w[foo]
-      end
-      install_gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo")}"
-      G
-
-      bundle "binstubs foo"
-
-      expect(bundled_app("bin/foo")).to exist
-    end
-
-    it "installs binstubs from path gems" do
-      FileUtils.mkdir_p(lib_path("foo/bin"))
-      FileUtils.touch(lib_path("foo/bin/foo"))
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.executables = %w[foo]
-      end
-      install_gemfile <<-G
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      bundle "binstubs foo"
-
-      expect(bundled_app("bin/foo")).to exist
-    end
-
-    it "sets correct permissions for binstubs" do
-      with_umask(0o002) do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack"
-        binary = bundled_app("bin/rackup")
-        expect(File.stat(binary).mode.to_s(8)).to eq("100775")
-      end
-    end
-
-    context "when using --shebang" do
-      it "sets the specified shebang for the the binstub" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack --shebang jruby"
-
-        expect(File.open("bin/rackup").gets).to eq("#!/usr/bin/env jruby\n")
-      end
-    end
-  end
-
-  context "when the gem doesn't exist" do
-    it "displays an error with correct status" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-      G
-
-      bundle "binstubs doesnt_exist"
-
-      expect(exitstatus).to eq(7) if exitstatus
-      expect(out).to include("Could not find gem 'doesnt_exist'.")
-    end
-  end
-
-  context "--path" do
-    it "sets the binstubs dir" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "binstubs rack --path exec"
-
-      expect(bundled_app("exec/rackup")).to exist
-    end
-
-    it "setting is saved for bundle install", :bundler => "< 2" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rails"
-      G
-
-      bundle! "binstubs rack", forgotten_command_line_options([:path, :bin] => "exec")
-      bundle! :install
-
-      expect(bundled_app("exec/rails")).to exist
-    end
-  end
-
-  context "with --standalone option" do
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    it "generates a standalone binstub" do
-      bundle! "binstubs rack --standalone"
-      expect(bundled_app("bin/rackup")).to exist
-    end
-
-    it "generates a binstub that does not depend on rubygems or bundler" do
-      bundle! "binstubs rack --standalone"
-      expect(File.read(bundled_app("bin/rackup"))).to_not include("Gem.bin_path")
-    end
-
-    context "when specified --path option" do
-      it "generates a standalone binstub at the given path" do
-        bundle! "binstubs rack --standalone --path foo"
-        expect(bundled_app("foo/rackup")).to exist
-      end
-    end
-  end
-
-  context "when the bin already exists" do
-    it "doesn't overwrite and warns" do
-      FileUtils.mkdir_p(bundled_app("bin"))
-      File.open(bundled_app("bin/rackup"), "wb") do |file|
-        file.print "OMG"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "binstubs rack"
-
-      expect(bundled_app("bin/rackup")).to exist
-      expect(File.read(bundled_app("bin/rackup"))).to eq("OMG")
-      expect(out).to include("Skipped rackup")
-      expect(out).to include("overwrite skipped stubs, use --force")
-    end
-
-    context "when using --force" do
-      it "overwrites the binstub" do
-        FileUtils.mkdir_p(bundled_app("bin"))
-        File.open(bundled_app("bin/rackup"), "wb") do |file|
-          file.print "OMG"
-        end
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack --force"
-
-        expect(bundled_app("bin/rackup")).to exist
-        expect(File.read(bundled_app("bin/rackup"))).not_to eq("OMG")
-      end
-    end
-  end
-
-  context "when the gem has no bins" do
-    it "suggests child gems if they have bins" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack-obama"
-      G
-
-      bundle "binstubs rack-obama"
-      expect(out).to include("rack-obama has no executables")
-      expect(out).to include("rack has: rackup")
-    end
-
-    it "works if child gems don't have bins" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "actionpack"
-      G
-
-      bundle "binstubs actionpack"
-      expect(out).to include("no executables for the gem actionpack")
-    end
-
-    it "works if the gem has development dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "with_development_dependency"
-      G
-
-      bundle "binstubs with_development_dependency"
-      expect(out).to include("no executables for the gem with_development_dependency")
-    end
-  end
-
-  context "when BUNDLE_INSTALL is specified" do
-    it "performs an automatic bundle install" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "config auto_install 1"
-      bundle "binstubs rack"
-      expect(out).to include("Installing rack 1.0.0")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "does nothing when already up to date" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "config auto_install 1"
-      bundle "binstubs rack", :env => { "BUNDLE_INSTALL" => 1 }
-      expect(out).not_to include("Installing rack 1.0.0")
-    end
-  end
-end
diff --git a/spec/bundler/commands/check_spec.rb b/spec/bundler/commands/check_spec.rb
deleted file mode 100644
index f2af446fbf..0000000000
--- a/spec/bundler/commands/check_spec.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle check" do
-  it "returns success when the Gemfile is satisfied" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    bundle :check
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "works with the --gemfile flag when not in the directory" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    Dir.chdir tmp
-    bundle "check --gemfile bundled_app/Gemfile"
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "creates a Gemfile.lock by default if one does not exist" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    FileUtils.rm("Gemfile.lock")
-
-    bundle "check"
-
-    expect(bundled_app("Gemfile.lock")).to exist
-  end
-
-  it "does not create a Gemfile.lock if --dry-run was passed" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    FileUtils.rm("Gemfile.lock")
-
-    bundle "check --dry-run"
-
-    expect(bundled_app("Gemfile.lock")).not_to exist
-  end
-
-  it "prints a generic error if the missing gems are unresolvable" do
-    system_gems ["rails-2.3.2"]
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    bundle :check
-    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
-  end
-
-  it "prints a generic error if a Gemfile.lock does not exist and a toplevel dependency does not exist" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    bundle :check
-    expect(exitstatus).to be > 0 if exitstatus
-    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
-  end
-
-  it "prints a generic message if you changed your lockfile" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'rails'
-    G
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'rails_fail'
-    G
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-      gem "rails_fail"
-    G
-
-    bundle :check
-    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
-  end
-
-  it "remembers --without option from install", :bundler => "< 2" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      group :foo do
-        gem "rack"
-      end
-    G
-
-    bundle! "install --without foo"
-    bundle! "check"
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "uses the without setting" do
-    bundle! "config without foo"
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      group :foo do
-        gem "rack"
-      end
-    G
-
-    bundle! "check"
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "ensures that gems are actually installed and not just cached" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack", :group => :foo
-    G
-
-    bundle :install, forgotten_command_line_options(:without => "foo")
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-
-    bundle "check"
-    expect(out).to include("* rack (1.0.0)")
-    expect(exitstatus).to eq(1) if exitstatus
-  end
-
-  it "ignores missing gems restricted to other platforms" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      platforms :#{not_local_tag} do
-        gem "activesupport"
-      end
-    G
-
-    system_gems "rack-1.0.0", :path => :bundle_path
-
-    lockfile <<-G
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          activesupport (2.3.5)
-          rack (1.0.0)
-
-      PLATFORMS
-        #{local}
-        #{not_local}
-
-      DEPENDENCIES
-        rack
-        activesupport
-    G
-
-    bundle :check
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "works with env conditionals" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      env :NOT_GOING_TO_BE_SET do
-        gem "activesupport"
-      end
-    G
-
-    system_gems "rack-1.0.0", :path => :bundle_path
-
-    lockfile <<-G
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          activesupport (2.3.5)
-          rack (1.0.0)
-
-      PLATFORMS
-        #{local}
-        #{not_local}
-
-      DEPENDENCIES
-        rack
-        activesupport
-    G
-
-    bundle :check
-    expect(out).to include("The Gemfile's dependencies are satisfied")
-  end
-
-  it "outputs an error when the default Gemfile is not found" do
-    bundle :check
-    expect(exitstatus).to eq(10) if exitstatus
-    expect(out).to include("Could not locate Gemfile")
-  end
-
-  it "does not output fatal error message" do
-    bundle :check
-    expect(exitstatus).to eq(10) if exitstatus
-    expect(out).not_to include("Unfortunately, a fatal error has occurred. ")
-  end
-
-  it "should not crash when called multiple times on a new machine" do
-    gemfile <<-G
-      gem 'rails', '3.0.0.beta3'
-      gem 'paperclip', :git => 'git://github.com/thoughtbot/paperclip.git'
-    G
-
-    simulate_new_machine
-    bundle "check"
-    last_out = out
-    3.times do
-      bundle :check
-      expect(out).to eq(last_out)
-    end
-  end
-
-  it "fails when there's no lock file and frozen is set" do
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gem "foo"
-    G
-
-    bundle! "install", forgotten_command_line_options(:deployment => true)
-    FileUtils.rm(bundled_app("Gemfile.lock"))
-
-    bundle :check
-    expect(last_command).to be_failure
-  end
-
-  context "--path", :bundler => "< 2" do
-    before do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-      bundle "install --path vendor/bundle"
-
-      FileUtils.rm_rf(bundled_app(".bundle"))
-    end
-
-    it "returns success" do
-      bundle! "check --path vendor/bundle"
-      expect(out).to include("The Gemfile's dependencies are satisfied")
-    end
-
-    it "should write to .bundle/config", :bundler => "< 2" do
-      bundle "check --path vendor/bundle"
-      bundle! "check"
-    end
-  end
-
-  context "--path vendor/bundle after installing gems in the default directory" do
-    it "returns false" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-
-      bundle "check --path vendor/bundle"
-      expect(exitstatus).to eq(1) if exitstatus
-      expect(out).to match(/The following gems are missing/)
-    end
-  end
-
-  describe "when locked" do
-    before :each do
-      system_gems "rack-1.0.0"
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "1.0"
-      G
-    end
-
-    it "returns success when the Gemfile is satisfied" do
-      bundle :install
-      bundle :check
-      expect(exitstatus).to eq(0) if exitstatus
-      expect(out).to include("The Gemfile's dependencies are satisfied")
-    end
-
-    it "shows what is missing with the current Gemfile if it is not satisfied" do
-      simulate_new_machine
-      bundle :check
-      expect(out).to match(/The following gems are missing/)
-      expect(out).to include("* rack (1.0")
-    end
-  end
-
-  describe "BUNDLED WITH" do
-    def lock_with(bundler_version = nil)
-      lock = <<-L
-        GEM
-          remote: file:#{gem_repo1}/
-          specs:
-            rack (1.0.0)
-
-        PLATFORMS
-          #{lockfile_platforms}
-
-        DEPENDENCIES
-          rack
-      L
-
-      if bundler_version
-        lock += "\n        BUNDLED WITH\n           #{bundler_version}\n"
-      end
-
-      lock
-    end
-
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    context "is not present" do
-      it "does not change the lock" do
-        lockfile lock_with(nil)
-        bundle :check
-        lockfile_should_be lock_with(nil)
-      end
-    end
-
-    context "is newer" do
-      it "does not change the lock but warns" do
-        lockfile lock_with(Bundler::VERSION.succ)
-        bundle! :check
-        expect(last_command.bundler_err).to include("the running version of Bundler (#{Bundler::VERSION}) is older than the version that created the lockfile (#{Bundler::VERSION.succ})")
-        lockfile_should_be lock_with(Bundler::VERSION.succ)
-      end
-    end
-
-    context "is older" do
-      it "does not change the lock" do
-        lockfile lock_with("1.10.1")
-        bundle :check
-        lockfile_should_be lock_with("1.10.1")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
deleted file mode 100644
index 37cbeeb4e7..0000000000
--- a/spec/bundler/commands/clean_spec.rb
+++ /dev/null
@@ -1,771 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle clean" do
-  def should_have_gems(*gems)
-    gems.each do |g|
-      expect(vendored_gems("gems/#{g}")).to exist
-      expect(vendored_gems("specifications/#{g}.gemspec")).to exist
-      expect(vendored_gems("cache/#{g}.gem")).to exist
-    end
-  end
-
-  def should_not_have_gems(*gems)
-    gems.each do |g|
-      expect(vendored_gems("gems/#{g}")).not_to exist
-      expect(vendored_gems("specifications/#{g}.gemspec")).not_to exist
-      expect(vendored_gems("cache/#{g}.gem")).not_to exist
-    end
-  end
-
-  it "removes unused gems that are different" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-    G
-    bundle! "install"
-
-    bundle! :clean
-
-    expect(out).to include("Removing foo (1.0)")
-
-    should_have_gems "thin-1.0", "rack-1.0.0"
-    should_not_have_gems "foo-1.0"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "removes old version of gem if unused" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "0.9.1"
-      gem "foo"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      gem "foo"
-    G
-    bundle "install"
-
-    bundle :clean
-
-    expect(out).to include("Removing rack (0.9.1)")
-
-    should_have_gems "foo-1.0", "rack-1.0.0"
-    should_not_have_gems "rack-0.9.1"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "removes new version of gem if unused" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      gem "foo"
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "0.9.1"
-      gem "foo"
-    G
-    bundle! "update rack"
-
-    bundle! :clean
-
-    expect(out).to include("Removing rack (1.0.0)")
-
-    should_have_gems "foo-1.0", "rack-0.9.1"
-    should_not_have_gems "rack-1.0.0"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "removes gems in bundle without groups" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "foo"
-
-      group :test_group do
-        gem "rack", "1.0.0"
-      end
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-    bundle "install", forgotten_command_line_options(:without => "test_group")
-    bundle :clean
-
-    expect(out).to include("Removing rack (1.0.0)")
-
-    should_have_gems "foo-1.0"
-    should_not_have_gems "rack-1.0.0"
-
-    expect(vendored_gems("bin/rackup")).to_not exist
-  end
-
-  it "does not remove cached git dir if it's being used" do
-    build_git "foo"
-    revision = revision_for(lib_path("foo-1.0"))
-    git_path = lib_path("foo-1.0")
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      git "#{git_path}", :ref => "#{revision}" do
-        gem "foo"
-      end
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    bundle :clean
-
-    digest = Digest(:SHA1).hexdigest(git_path.to_s)
-    cache_path = Bundler::VERSION.start_with?("1.") ? vendored_gems("cache/bundler/git/foo-1.0-#{digest}") : home(".bundle/cache/git/foo-1.0-#{digest}")
-    expect(cache_path).to exist
-  end
-
-  it "removes unused git gems" do
-    build_git "foo", :path => lib_path("foo")
-    git_path = lib_path("foo")
-    revision = revision_for(git_path)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      git "#{git_path}", :ref => "#{revision}" do
-        gem "foo"
-      end
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-    G
-    bundle "install"
-
-    bundle :clean
-
-    expect(out).to include("Removing foo (#{revision[0..11]})")
-
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
-    expect(vendored_gems("bundler/gems/foo-#{revision[0..11]}")).not_to exist
-    digest = Digest(:SHA1).hexdigest(git_path.to_s)
-    expect(vendored_gems("cache/bundler/git/foo-#{digest}")).not_to exist
-
-    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "removes old git gems" do
-    build_git "foo-bar", :path => lib_path("foo-bar")
-    revision = revision_for(lib_path("foo-bar"))
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      git "#{lib_path("foo-bar")}" do
-        gem "foo-bar"
-      end
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    update_git "foo", :path => lib_path("foo-bar")
-    revision2 = revision_for(lib_path("foo-bar"))
-
-    bundle! "update", :all => bundle_update_requires_all?
-    bundle! :clean
-
-    expect(out).to include("Removing foo-bar (#{revision[0..11]})")
-
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
-    expect(vendored_gems("bundler/gems/foo-bar-#{revision[0..11]}")).not_to exist
-    expect(vendored_gems("bundler/gems/foo-bar-#{revision2[0..11]}")).to exist
-
-    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "does not remove nested gems in a git repo" do
-    build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
-    build_git "rails", "3.0", :path => lib_path("rails") do |s|
-      s.add_dependency "activesupport", "= 3.0"
-    end
-    revision = revision_for(lib_path("rails"))
-
-    gemfile <<-G
-      gem "activesupport", :git => "#{lib_path("rails")}", :ref => '#{revision}'
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-    bundle :clean
-    expect(out).to include("")
-
-    expect(vendored_gems("bundler/gems/rails-#{revision[0..11]}")).to exist
-  end
-
-  it "does not remove git sources that are in without groups" do
-    build_git "foo", :path => lib_path("foo")
-    git_path = lib_path("foo")
-    revision = revision_for(git_path)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-      group :test do
-        git "#{git_path}", :ref => "#{revision}" do
-          gem "foo"
-        end
-      end
-    G
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :without => "test")
-
-    bundle :clean
-
-    expect(out).to include("")
-    expect(vendored_gems("bundler/gems/foo-#{revision[0..11]}")).to exist
-    digest = Digest(:SHA1).hexdigest(git_path.to_s)
-    expect(vendored_gems("cache/bundler/git/foo-#{digest}")).to_not exist
-  end
-
-  it "does not blow up when using without groups" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-
-      group :development do
-        gem "foo"
-      end
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :without => "development")
-
-    bundle :clean
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-
-  it "displays an error when used without --path" do
-    bundle! "config path.system true"
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-    G
-
-    bundle :clean
-
-    expect(exitstatus).to eq(15) if exitstatus
-    expect(out).to include("--force")
-  end
-
-  # handling bundle clean upgrade path from the pre's
-  it "removes .gem/.gemspec file even if there's no corresponding gem dir" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "foo"
-    G
-    bundle "install"
-
-    FileUtils.rm(vendored_gems("bin/rackup"))
-    FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
-    FileUtils.rm_rf(vendored_gems("gems/rack-1.0.0"))
-
-    bundle :clean
-
-    should_not_have_gems "thin-1.0", "rack-1.0"
-    should_have_gems "foo-1.0"
-
-    expect(vendored_gems("bin/rackup")).not_to exist
-  end
-
-  it "does not call clean automatically when using system gems" do
-    bundle! "config path.system true"
-
-    bundle! :config
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "rack"
-    G
-
-    bundle! "info thin"
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-
-    sys_exec! "gem list"
-    expect(out).to include("rack (1.0.0)").and include("thin (1.0)")
-  end
-
-  it "--clean should override the bundle setting on install", :bundler => "< 2" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "rack"
-    G
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => true)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-    bundle "install"
-
-    should_have_gems "rack-1.0.0"
-    should_not_have_gems "thin-1.0"
-  end
-
-  it "--clean should override the bundle setting on update", :bundler => "< 2" do
-    build_repo2
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "foo"
-    G
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => true)
-
-    update_repo2 do
-      build_gem "foo", "1.0.1"
-    end
-
-    bundle! "update", :all => bundle_update_requires_all?
-
-    should_have_gems "foo-1.0.1"
-    should_not_have_gems "foo-1.0"
-  end
-
-  it "automatically cleans when path has not been set", :bundler => "2" do
-    build_repo2
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo2}"
-
-      gem "foo"
-    G
-
-    update_repo2 do
-      build_gem "foo", "1.0.1"
-    end
-
-    bundle! "update", :all => true
-
-    files = Pathname.glob(bundled_app(".bundle", Bundler.ruby_scope, "*", "*"))
-    files.map! {|f| f.to_s.sub(bundled_app(".bundle", Bundler.ruby_scope).to_s, "") }
-    expect(files.sort).to eq %w[
-      /cache/foo-1.0.1.gem
-      /gems/foo-1.0.1
-      /specifications/foo-1.0.1.gemspec
-    ]
-  end
-
-  it "does not clean automatically on --path" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "rack"
-    G
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-    bundle "install"
-
-    should_have_gems "rack-1.0.0", "thin-1.0"
-  end
-
-  it "does not clean on bundle update with --path" do
-    build_repo2
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "foo"
-    G
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    update_repo2 do
-      build_gem "foo", "1.0.1"
-    end
-
-    bundle! :update, :all => bundle_update_requires_all?
-    should_have_gems "foo-1.0", "foo-1.0.1"
-  end
-
-  it "does not clean on bundle update when using --system" do
-    bundle! "config path.system true"
-
-    build_repo2
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "foo"
-    G
-    bundle! "install"
-
-    update_repo2 do
-      build_gem "foo", "1.0.1"
-    end
-    bundle! :update, :all => bundle_update_requires_all?
-
-    sys_exec! "gem list"
-    expect(out).to include("foo (1.0.1, 1.0)")
-  end
-
-  it "cleans system gems when --force is used" do
-    bundle! "config path.system true"
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "foo"
-      gem "rack"
-    G
-    bundle :install
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-    bundle :install
-    bundle "clean --force"
-
-    expect(out).to include("Removing foo (1.0)")
-    sys_exec "gem list"
-    expect(out).not_to include("foo (1.0)")
-    expect(out).to include("rack (1.0.0)")
-  end
-
-  describe "when missing permissions" do
-    before { ENV["BUNDLE_PATH__SYSTEM"] = "true" }
-    let(:system_cache_path) { system_gem_path("cache") }
-    after do
-      FileUtils.chmod(0o755, system_cache_path)
-    end
-    it "returns a helpful error message" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "foo"
-        gem "rack"
-      G
-      bundle :install
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack"
-      G
-      bundle :install
-
-      FileUtils.chmod(0o500, system_cache_path)
-
-      bundle :clean, :force => true
-
-      expect(out).to include(system_gem_path.to_s)
-      expect(out).to include("grant write permissions")
-
-      sys_exec "gem list"
-      expect(out).to include("foo (1.0)")
-      expect(out).to include("rack (1.0.0)")
-    end
-  end
-
-  it "cleans git gems with a 7 length git revision" do
-    build_git "foo"
-    revision = revision_for(lib_path("foo-1.0"))
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "foo", :git => "#{lib_path("foo-1.0")}"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    # mimic 7 length git revisions in Gemfile.lock
-    gemfile_lock = File.read(bundled_app("Gemfile.lock")).split("\n")
-    gemfile_lock.each_with_index do |line, index|
-      gemfile_lock[index] = line[0..(11 + 7)] if line.include?("  revision:")
-    end
-    File.open(bundled_app("Gemfile.lock"), "w") do |file|
-      file.print gemfile_lock.join("\n")
-    end
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    bundle :clean
-
-    expect(out).not_to include("Removing foo (1.0 #{revision[0..6]})")
-
-    expect(vendored_gems("bundler/gems/foo-1.0-#{revision[0..6]}")).to exist
-  end
-
-  it "when using --force on system gems, it doesn't remove binaries" do
-    bundle! "config path.system true"
-
-    build_repo2
-    update_repo2 do
-      build_gem "bindir" do |s|
-        s.bindir = "exe"
-        s.executables = "foo"
-      end
-    end
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "bindir"
-    G
-    bundle :install
-
-    bundle "clean --force"
-
-    sys_exec "foo"
-
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(out).to eq("1.0")
-  end
-
-  it "doesn't blow up on path gems without a .gempsec" do
-    relative_path = "vendor/private_gems/bar-1.0"
-    absolute_path = bundled_app(relative_path)
-    FileUtils.mkdir_p("#{absolute_path}/lib/bar")
-    File.open("#{absolute_path}/lib/bar/bar.rb", "wb") do |file|
-      file.puts "module Bar; end"
-    end
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "foo"
-      gem "bar", "1.0", :path => "#{relative_path}"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-    bundle! :clean
-  end
-
-  it "doesn't remove gems in dry-run mode with path set" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-    G
-
-    bundle :install
-
-    bundle "clean --dry-run"
-
-    expect(out).not_to include("Removing foo (1.0)")
-    expect(out).to include("Would have removed foo (1.0)")
-
-    should_have_gems "thin-1.0", "rack-1.0.0", "foo-1.0"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "doesn't remove gems in dry-run mode with no path set" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-    G
-
-    bundle :install
-
-    bundle "configuration --delete path"
-
-    bundle "clean --dry-run"
-
-    expect(out).not_to include("Removing foo (1.0)")
-    expect(out).to include("Would have removed foo (1.0)")
-
-    should_have_gems "thin-1.0", "rack-1.0.0", "foo-1.0"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "doesn't store dry run as a config setting" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-    bundle "config dry_run false"
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-    G
-
-    bundle :install
-
-    bundle "clean"
-
-    expect(out).to include("Removing foo (1.0)")
-    expect(out).not_to include("Would have removed foo (1.0)")
-
-    should_have_gems "thin-1.0", "rack-1.0.0"
-    should_not_have_gems "foo-1.0"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "foo"
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle", :clean => false)
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "weakling"
-    G
-
-    bundle! "config auto_install 1"
-    bundle! :clean
-    expect(out).to include("Installing weakling 0.0.3")
-    should_have_gems "thin-1.0", "rack-1.0.0", "weakling-0.0.3"
-    should_not_have_gems "foo-1.0"
-  end
-
-  it "doesn't remove extensions artifacts from bundled git gems after clean", :ruby_repo, :rubygems => "2.2" do
-    build_git "very_simple_git_binary", &:add_c_extension
-
-    revision = revision_for(lib_path("very_simple_git_binary-1.0"))
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}", :ref => "#{revision}"
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle")
-    expect(vendored_gems("bundler/gems/extensions")).to exist
-    expect(vendored_gems("bundler/gems/very_simple_git_binary-1.0-#{revision[0..11]}")).to exist
-
-    bundle! :clean
-    expect(out).to eq("")
-
-    expect(vendored_gems("bundler/gems/extensions")).to exist
-    expect(vendored_gems("bundler/gems/very_simple_git_binary-1.0-#{revision[0..11]}")).to exist
-  end
-
-  it "removes extension directories", :ruby_repo, :rubygems => "2.2" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "very_simple_binary"
-      gem "simple_binary"
-    G
-
-    bundle! "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-    very_simple_binary_extensions_dir =
-      Pathname.glob("#{vendored_gems}/extensions/*/*/very_simple_binary-1.0").first
-
-    simple_binary_extensions_dir =
-      Pathname.glob("#{vendored_gems}/extensions/*/*/simple_binary-1.0").first
-
-    expect(very_simple_binary_extensions_dir).to exist
-    expect(simple_binary_extensions_dir).to exist
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "thin"
-      gem "simple_binary"
-    G
-
-    bundle! "install"
-    bundle! :clean
-    expect(out).to eq("Removing very_simple_binary (1.0)")
-
-    expect(very_simple_binary_extensions_dir).not_to exist
-    expect(simple_binary_extensions_dir).to exist
-  end
-end
diff --git a/spec/bundler/commands/config_spec.rb b/spec/bundler/commands/config_spec.rb
deleted file mode 100644
index 9e49357465..0000000000
--- a/spec/bundler/commands/config_spec.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ".bundle/config" do
-  before :each do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack", "1.0.0"
-    G
-  end
-
-  describe "config" do
-    before { bundle "config foo bar" }
-
-    it "prints a detailed report of local and user configuration" do
-      bundle "config"
-
-      expect(out).to include("Settings are listed in order of priority. The top value will be used")
-      expect(out).to include("foo\nSet for the current user")
-      expect(out).to include(": \"bar\"")
-    end
-
-    context "given --parseable flag" do
-      it "prints a minimal report of local and user configuration" do
-        bundle "config --parseable"
-        expect(out).to include("foo=bar")
-      end
-
-      context "with global config" do
-        it "prints config assigned to local scope" do
-          bundle "config --local foo bar2"
-          bundle "config --parseable"
-          expect(out).to include("foo=bar2")
-        end
-      end
-
-      context "with env overwrite" do
-        it "prints config with env" do
-          bundle "config --parseable", :env => { "BUNDLE_FOO" => "bar3" }
-          expect(out).to include("foo=bar3")
-        end
-      end
-    end
-  end
-
-  describe "BUNDLE_APP_CONFIG" do
-    it "can be moved with an environment variable" do
-      ENV["BUNDLE_APP_CONFIG"] = tmp("foo/bar").to_s
-      bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-      expect(bundled_app(".bundle")).not_to exist
-      expect(tmp("foo/bar/config")).to exist
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "can provide a relative path with the environment variable" do
-      FileUtils.mkdir_p bundled_app("omg")
-      Dir.chdir bundled_app("omg")
-
-      ENV["BUNDLE_APP_CONFIG"] = "../foo"
-      bundle "install", forgotten_command_line_options(:path => "vendor/bundle")
-
-      expect(bundled_app(".bundle")).not_to exist
-      expect(bundled_app("../foo/config")).to exist
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  describe "global" do
-    before(:each) { bundle :install }
-
-    it "is the default" do
-      bundle "config foo global"
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("global")
-    end
-
-    it "can also be set explicitly" do
-      bundle! "config --global foo global"
-      run! "puts Bundler.settings[:foo]"
-      expect(out).to eq("global")
-    end
-
-    it "has lower precedence than local" do
-      bundle "config --local  foo local"
-
-      bundle "config --global foo global"
-      expect(out).to match(/Your application has set foo to "local"/)
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("local")
-    end
-
-    it "has lower precedence than env" do
-      begin
-        ENV["BUNDLE_FOO"] = "env"
-
-        bundle "config --global foo global"
-        expect(out).to match(/You have a bundler environment variable for foo set to "env"/)
-
-        run "puts Bundler.settings[:foo]"
-        expect(out).to eq("env")
-      ensure
-        ENV.delete("BUNDLE_FOO")
-      end
-    end
-
-    it "can be deleted" do
-      bundle "config --global foo global"
-      bundle "config --delete foo"
-
-      run "puts Bundler.settings[:foo] == nil"
-      expect(out).to eq("true")
-    end
-
-    it "warns when overriding" do
-      bundle "config --global foo previous"
-      bundle "config --global foo global"
-      expect(out).to match(/You are replacing the current global value of foo/)
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("global")
-    end
-
-    it "does not warn when using the same value twice" do
-      bundle "config --global foo value"
-      bundle "config --global foo value"
-      expect(out).not_to match(/You are replacing the current global value of foo/)
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("value")
-    end
-
-    it "expands the path at time of setting" do
-      bundle "config --global local.foo .."
-      run "puts Bundler.settings['local.foo']"
-      expect(out).to eq(File.expand_path(Dir.pwd + "/.."))
-    end
-
-    it "saves with parseable option" do
-      bundle "config --global --parseable foo value"
-      expect(out).to eq("foo=value")
-      run "puts Bundler.settings['foo']"
-      expect(out).to eq("value")
-    end
-
-    context "when replacing a current value with the parseable flag" do
-      before { bundle "config --global foo value" }
-      it "prints the current value in a parseable format" do
-        bundle "config --global --parseable foo value2"
-        expect(out).to eq "foo=value2"
-        run "puts Bundler.settings['foo']"
-        expect(out).to eq("value2")
-      end
-    end
-  end
-
-  describe "local" do
-    before(:each) { bundle :install }
-
-    it "can also be set explicitly" do
-      bundle "config --local foo local"
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("local")
-    end
-
-    it "has higher precedence than env" do
-      begin
-        ENV["BUNDLE_FOO"] = "env"
-        bundle "config --local foo local"
-
-        run "puts Bundler.settings[:foo]"
-        expect(out).to eq("local")
-      ensure
-        ENV.delete("BUNDLE_FOO")
-      end
-    end
-
-    it "can be deleted" do
-      bundle "config --local foo local"
-      bundle "config --delete foo"
-
-      run "puts Bundler.settings[:foo] == nil"
-      expect(out).to eq("true")
-    end
-
-    it "warns when overriding" do
-      bundle "config --local foo previous"
-      bundle "config --local foo local"
-      expect(out).to match(/You are replacing the current local value of foo/)
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("local")
-    end
-
-    it "expands the path at time of setting" do
-      bundle "config --local local.foo .."
-      run "puts Bundler.settings['local.foo']"
-      expect(out).to eq(File.expand_path(Dir.pwd + "/.."))
-    end
-
-    it "can be deleted with parseable option" do
-      bundle "config --local foo value"
-      bundle "config --delete --parseable foo"
-      expect(out).to eq ""
-      run "puts Bundler.settings['foo'] == nil"
-      expect(out).to eq("true")
-    end
-  end
-
-  describe "env" do
-    before(:each) { bundle :install }
-
-    it "can set boolean properties via the environment" do
-      ENV["BUNDLE_FROZEN"] = "true"
-
-      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
-      expect(out).to eq("true")
-    end
-
-    it "can set negative boolean properties via the environment" do
-      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
-      expect(out).to eq("false")
-
-      ENV["BUNDLE_FROZEN"] = "false"
-
-      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
-      expect(out).to eq("false")
-
-      ENV["BUNDLE_FROZEN"] = "0"
-
-      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
-      expect(out).to eq("false")
-
-      ENV["BUNDLE_FROZEN"] = ""
-
-      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
-      expect(out).to eq("false")
-    end
-
-    it "can set properties with periods via the environment" do
-      ENV["BUNDLE_FOO__BAR"] = "baz"
-
-      run "puts Bundler.settings['foo.bar']"
-      expect(out).to eq("baz")
-    end
-  end
-
-  describe "parseable option" do
-    it "prints an empty string" do
-      bundle "config foo --parseable"
-
-      expect(out).to eq ""
-    end
-
-    it "only prints the value of the config" do
-      bundle "config foo local"
-      bundle "config foo --parseable"
-
-      expect(out).to eq "foo=local"
-    end
-
-    it "can print global config" do
-      bundle "config --global bar value"
-      bundle "config bar --parseable"
-
-      expect(out).to eq "bar=value"
-    end
-
-    it "prefers local config over global" do
-      bundle "config --local bar value2"
-      bundle "config --global bar value"
-      bundle "config bar --parseable"
-
-      expect(out).to eq "bar=value2"
-    end
-  end
-
-  describe "gem mirrors" do
-    before(:each) { bundle :install }
-
-    it "configures mirrors using keys with `mirror.`" do
-      bundle "config --local mirror.http://gems.example.org http://gem-mirror.example.org"
-      run(<<-E)
-Bundler.settings.gem_mirrors.each do |k, v|
-  puts "\#{k} => \#{v}"
-end
-E
-      expect(out).to eq("http://gems.example.org/ => http://gem-mirror.example.org/")
-    end
-  end
-
-  describe "quoting" do
-    before(:each) { gemfile "# no gems" }
-    let(:long_string) do
-      "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib " \
-      "--with-xslt-dir=/usr/pkg"
-    end
-
-    it "saves quotes" do
-      bundle "config foo something\\'"
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("something'")
-    end
-
-    it "doesn't return quotes around values", :ruby => "1.9" do
-      bundle "config foo '1'"
-      run "puts Bundler.settings.send(:global_config_file).read"
-      expect(out).to include('"1"')
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq("1")
-    end
-
-    it "doesn't duplicate quotes around values", :if => (RUBY_VERSION >= "2.1") do
-      bundled_app(".bundle").mkpath
-      File.open(bundled_app(".bundle/config"), "w") do |f|
-        f.write 'BUNDLE_FOO: "$BUILD_DIR"'
-      end
-
-      bundle "config bar baz"
-      run "puts Bundler.settings.send(:local_config_file).read"
-
-      # Starting in Ruby 2.1, YAML automatically adds double quotes
-      # around some values, including $ and newlines.
-      expect(out).to include('BUNDLE_FOO: "$BUILD_DIR"')
-    end
-
-    it "doesn't duplicate quotes around long wrapped values" do
-      bundle "config foo #{long_string}"
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq(long_string)
-
-      bundle "config bar baz"
-
-      run "puts Bundler.settings[:foo]"
-      expect(out).to eq(long_string)
-    end
-  end
-
-  describe "very long lines" do
-    before(:each) { bundle :install }
-
-    let(:long_string) do
-      "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib " \
-      "--with-xslt-dir=/usr/pkg"
-    end
-
-    let(:long_string_without_special_characters) do
-      "here is quite a long string that will wrap to a second line but will not be " \
-      "surrounded by quotes"
-    end
-
-    it "doesn't wrap values" do
-      bundle "config foo #{long_string}"
-      run "puts Bundler.settings[:foo]"
-      expect(out).to match(long_string)
-    end
-
-    it "can read wrapped unquoted values" do
-      bundle "config foo #{long_string_without_special_characters}"
-      run "puts Bundler.settings[:foo]"
-      expect(out).to match(long_string_without_special_characters)
-    end
-  end
-end
-
-RSpec.describe "setting gemfile via config" do
-  context "when only the non-default Gemfile exists" do
-    it "persists the gemfile location to .bundle/config" do
-      File.open(bundled_app("NotGemfile"), "w") do |f|
-        f.write <<-G
-          source "file://#{gem_repo1}"
-          gem 'rack'
-        G
-      end
-
-      bundle "config --local gemfile #{bundled_app("NotGemfile")}"
-      expect(File.exist?(".bundle/config")).to eq(true)
-
-      bundle "config"
-      expect(out).to include("NotGemfile")
-    end
-  end
-end
diff --git a/spec/bundler/commands/console_spec.rb b/spec/bundler/commands/console_spec.rb
deleted file mode 100644
index 9bf66e8f5b..0000000000
--- a/spec/bundler/commands/console_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle console", :bundler => "< 2" do
-  before :each do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      gem "activesupport", :group => :test
-      gem "rack_middleware", :group => :development
-    G
-  end
-
-  it "starts IRB with the default group loaded" do
-    bundle "console" do |input, _, _|
-      input.puts("puts RACK")
-      input.puts("exit")
-    end
-    expect(out).to include("0.9.1")
-  end
-
-  it "uses IRB as default console" do
-    bundle "console" do |input, _, _|
-      input.puts("__method__")
-      input.puts("exit")
-    end
-    expect(out).to include(":irb_binding")
-  end
-
-  it "starts another REPL if configured as such" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "pry"
-    G
-    bundle "config console pry"
-
-    bundle "console" do |input, _, _|
-      input.puts("__method__")
-      input.puts("exit")
-    end
-    expect(out).to include(":__pry__")
-  end
-
-  it "falls back to IRB if the other REPL isn't available" do
-    bundle "config console pry"
-    # make sure pry isn't there
-
-    bundle "console" do |input, _, _|
-      input.puts("__method__")
-      input.puts("exit")
-    end
-    expect(out).to include(":irb_binding")
-  end
-
-  it "doesn't load any other groups" do
-    bundle "console" do |input, _, _|
-      input.puts("puts ACTIVESUPPORT")
-      input.puts("exit")
-    end
-    expect(out).to include("NameError")
-  end
-
-  describe "when given a group" do
-    it "loads the given group" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts ACTIVESUPPORT")
-        input.puts("exit")
-      end
-      expect(out).to include("2.3.5")
-    end
-
-    it "loads the default group" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts RACK")
-        input.puts("exit")
-      end
-      expect(out).to include("0.9.1")
-    end
-
-    it "doesn't load other groups" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts RACK_MIDDLEWARE")
-        input.puts("exit")
-      end
-      expect(out).to include("NameError")
-    end
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      gem "activesupport", :group => :test
-      gem "rack_middleware", :group => :development
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle :console do |input, _, _|
-      input.puts("puts 'hello'")
-      input.puts("exit")
-    end
-    expect(out).to include("Installing foo 1.0")
-    expect(out).to include("hello")
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-end
diff --git a/spec/bundler/commands/doctor_spec.rb b/spec/bundler/commands/doctor_spec.rb
deleted file mode 100644
index 5260e6cb36..0000000000
--- a/spec/bundler/commands/doctor_spec.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require "find"
-require "stringio"
-require "bundler/cli"
-require "bundler/cli/doctor"
-
-RSpec.describe "bundle doctor" do
-  before(:each) do
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-
-    @stdout = StringIO.new
-
-    [:error, :warn].each do |method|
-      allow(Bundler.ui).to receive(method).and_wrap_original do |m, message|
-        m.call message
-        @stdout.puts message
-      end
-    end
-  end
-
-  context "when all files in home are readable/writable" do
-    before(:each) do
-      stat = double("stat")
-      unwritable_file = double("file")
-      allow(Find).to receive(:find).with(Bundler.home.to_s) { [unwritable_file] }
-      allow(File).to receive(:stat).with(unwritable_file) { stat }
-      allow(stat).to receive(:uid) { Process.uid }
-      allow(File).to receive(:writable?).with(unwritable_file) { true }
-      allow(File).to receive(:readable?).with(unwritable_file) { true }
-    end
-
-    it "exits with no message if the installed gem has no C extensions" do
-      expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
-      expect(@stdout.string).to be_empty
-    end
-
-    it "exits with no message if the installed gem's C extension dylib breakage is fine" do
-      doctor = Bundler::CLI::Doctor.new({})
-      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/rack/rack.bundle"]
-      expect(doctor).to receive(:dylibs).exactly(2).times.and_return ["/usr/lib/libSystem.dylib"]
-      allow(File).to receive(:exist?).and_call_original
-      allow(File).to receive(:exist?).with("/usr/lib/libSystem.dylib").and_return(true)
-      expect { doctor.run }.not_to(raise_error, @stdout.string)
-      expect(@stdout.string).to be_empty
-    end
-
-    it "exits with a message if one of the linked libraries is missing" do
-      doctor = Bundler::CLI::Doctor.new({})
-      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/rack/rack.bundle"]
-      expect(doctor).to receive(:dylibs).exactly(2).times.and_return ["/usr/local/opt/icu4c/lib/libicui18n.57.1.dylib"]
-      allow(File).to receive(:exist?).and_call_original
-      allow(File).to receive(:exist?).with("/usr/local/opt/icu4c/lib/libicui18n.57.1.dylib").and_return(false)
-      expect { doctor.run }.to raise_error(Bundler::ProductionError, strip_whitespace(<<-E).strip), @stdout.string
-        The following gems are missing OS dependencies:
-         * bundler: /usr/local/opt/icu4c/lib/libicui18n.57.1.dylib
-         * rack: /usr/local/opt/icu4c/lib/libicui18n.57.1.dylib
-      E
-    end
-  end
-
-  context "when home contains files that are not readable/writable" do
-    before(:each) do
-      @stat = double("stat")
-      @unwritable_file = double("file")
-      allow(Find).to receive(:find).with(Bundler.home.to_s) { [@unwritable_file] }
-      allow(File).to receive(:stat).with(@unwritable_file) { @stat }
-    end
-
-    it "exits with an error if home contains files that are not readable/writable" do
-      allow(@stat).to receive(:uid) { Process.uid }
-      allow(File).to receive(:writable?).with(@unwritable_file) { false }
-      allow(File).to receive(:readable?).with(@unwritable_file) { false }
-      expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
-      expect(@stdout.string).to include(
-        "Files exist in the Bundler home that are not readable/writable by the current user. These files are:\n - #{@unwritable_file}"
-      )
-      expect(@stdout.string).not_to include("No issues")
-    end
-
-    context "when home contains files that are not owned by the current process" do
-      before(:each) do
-        allow(@stat).to receive(:uid) { 0o0000 }
-      end
-
-      it "exits with an error if home contains files that are not readable/writable and are not owned by the current user" do
-        allow(File).to receive(:writable?).with(@unwritable_file) { false }
-        allow(File).to receive(:readable?).with(@unwritable_file) { false }
-        expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
-        expect(@stdout.string).to include(
-          "Files exist in the Bundler home that are owned by another user, and are not readable/writable. These files are:\n - #{@unwritable_file}"
-        )
-        expect(@stdout.string).not_to include("No issues")
-      end
-
-      it "exits with a warning if home contains files that are read/write but not owned by current user" do
-        allow(File).to receive(:writable?).with(@unwritable_file) { true }
-        allow(File).to receive(:readable?).with(@unwritable_file) { true }
-        expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
-        expect(@stdout.string).to include(
-          "Files exist in the Bundler home that are owned by another user, but are still readable/writable. These files are:\n - #{@unwritable_file}"
-        )
-        expect(@stdout.string).not_to include("No issues")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
deleted file mode 100644
index 6835305d55..0000000000
--- a/spec/bundler/commands/exec_spec.rb
+++ /dev/null
@@ -1,858 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle exec" do
-  let(:system_gems_to_install) { %w[rack-1.0.0 rack-0.9.1] }
-  before :each do
-    system_gems(system_gems_to_install, :path => :bundle_path)
-  end
-
-  it "works with --gemfile flag" do
-    create_file "CustomGemfile", <<-G
-      gem "rack", "1.0.0"
-    G
-
-    bundle "exec --gemfile CustomGemfile rackup"
-    expect(out).to eq("1.0.0")
-  end
-
-  it "activates the correct gem" do
-    gemfile <<-G
-      gem "rack", "0.9.1"
-    G
-
-    bundle "exec rackup"
-    expect(out).to eq("0.9.1")
-  end
-
-  it "works when the bins are in ~/.bundle" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    bundle "exec rackup"
-    expect(out).to eq("1.0.0")
-  end
-
-  it "works when running from a random directory", :ruby_repo do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    bundle "exec 'cd #{tmp("gems")} && rackup'", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-
-    expect(out).to include("1.0.0")
-  end
-
-  it "works when exec'ing something else" do
-    install_gemfile 'gem "rack"'
-    bundle "exec echo exec"
-    expect(out).to eq("exec")
-  end
-
-  it "works when exec'ing to ruby" do
-    install_gemfile 'gem "rack"'
-    bundle "exec ruby -e 'puts %{hi}'", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-    expect(out).to eq("hi")
-  end
-
-  it "accepts --verbose" do
-    install_gemfile 'gem "rack"'
-    bundle "exec --verbose echo foobar"
-    expect(out).to eq("foobar")
-  end
-
-  it "passes --verbose to command if it is given after the command" do
-    install_gemfile 'gem "rack"'
-    bundle "exec echo --verbose"
-    expect(out).to eq("--verbose")
-  end
-
-  it "handles --keep-file-descriptors" do
-    require "tempfile"
-
-    command = Tempfile.new("io-test")
-    command.sync = true
-    command.write <<-G
-      if ARGV[0]
-        IO.for_fd(ARGV[0].to_i)
-      else
-        require 'tempfile'
-        io = Tempfile.new("io-test-fd")
-        args = %W[#{Gem.ruby} -I#{lib} #{bindir.join("bundle")} exec --keep-file-descriptors #{Gem.ruby} #{command.path} \#{io.to_i}]
-        args << { io.to_i => io } if RUBY_VERSION >= "2.0"
-        exec(*args)
-      end
-    G
-
-    install_gemfile ""
-    with_env_vars "RUBYOPT" => "-r#{spec_dir.join("support/hax")}" do
-      sys_exec "#{Gem.ruby} #{command.path}"
-    end
-
-    if Bundler.current_ruby.ruby_2?
-      expect(out).to eq("")
-    else
-      expect(out).to eq("Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec.")
-    end
-
-    expect(err).to lack_errors
-  end
-
-  it "accepts --keep-file-descriptors" do
-    install_gemfile ""
-    bundle "exec --keep-file-descriptors echo foobar"
-
-    expect(err).to lack_errors
-  end
-
-  it "can run a command named --verbose" do
-    install_gemfile 'gem "rack"'
-    File.open("--verbose", "w") do |f|
-      f.puts "#!/bin/sh"
-      f.puts "echo foobar"
-    end
-    File.chmod(0o744, "--verbose")
-    with_path_as(".") do
-      bundle "exec -- --verbose"
-    end
-    expect(out).to eq("foobar")
-  end
-
-  it "handles different versions in different bundles" do
-    build_repo2 do
-      build_gem "rack_two", "1.0.0" do |s|
-        s.executables = "rackup"
-      end
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack", "0.9.1"
-    G
-
-    Dir.chdir bundled_app2 do
-      install_gemfile bundled_app2("Gemfile"), <<-G
-        source "file://#{gem_repo2}"
-        gem "rack_two", "1.0.0"
-      G
-    end
-
-    bundle! "exec rackup"
-
-    expect(out).to eq("0.9.1")
-
-    Dir.chdir bundled_app2 do
-      bundle! "exec rackup"
-      expect(out).to eq("1.0.0")
-    end
-  end
-
-  it "handles gems installed with --without" do
-    install_gemfile <<-G, forgotten_command_line_options(:without => "middleware")
-      source "file://#{gem_repo1}"
-      gem "rack" # rack 0.9.1 and 1.0 exist
-
-      group :middleware do
-        gem "rack_middleware" # rack_middleware depends on rack 0.9.1
-      end
-    G
-
-    bundle "exec rackup"
-
-    expect(out).to eq("0.9.1")
-    expect(the_bundle).not_to include_gems "rack_middleware 1.0"
-  end
-
-  it "does not duplicate already exec'ed RUBYOPT" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    rubyopt = ENV["RUBYOPT"]
-    rubyopt = "-rbundler/setup #{rubyopt}"
-
-    bundle "exec 'echo $RUBYOPT'"
-    expect(out).to have_rubyopts(rubyopt)
-
-    bundle "exec 'echo $RUBYOPT'", :env => { "RUBYOPT" => rubyopt }
-    expect(out).to have_rubyopts(rubyopt)
-  end
-
-  it "does not duplicate already exec'ed RUBYLIB" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    rubylib = ENV["RUBYLIB"]
-    rubylib = "#{rubylib}".split(File::PATH_SEPARATOR).unshift "#{bundler_path}"
-    rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
-
-    bundle "exec 'echo $RUBYLIB'"
-    expect(out).to include(rubylib)
-
-    bundle "exec 'echo $RUBYLIB'", :env => { "RUBYLIB" => rubylib }
-    expect(out).to include(rubylib)
-  end
-
-  it "errors nicely when the argument doesn't exist" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    bundle "exec foobarbaz"
-    expect(exitstatus).to eq(127) if exitstatus
-    expect(out).to include("bundler: command not found: foobarbaz")
-    expect(out).to include("Install missing gem executables with `bundle install`")
-  end
-
-  it "errors nicely when the argument is not executable" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    bundle "exec touch foo"
-    bundle "exec ./foo"
-    expect(exitstatus).to eq(126) if exitstatus
-    expect(out).to include("bundler: not executable: ./foo")
-  end
-
-  it "errors nicely when no arguments are passed" do
-    install_gemfile <<-G
-      gem "rack"
-    G
-
-    bundle "exec"
-    expect(exitstatus).to eq(128) if exitstatus
-    expect(out).to include("bundler: exec needs a command to run")
-  end
-
-  it "raises a helpful error when exec'ing to something outside of the bundle", :ruby_repo, :rubygems => ">= 2.5.2" do
-    bundle! "config clean false" # want to keep the rackup binstub
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gem "with_license"
-    G
-    [true, false].each do |l|
-      bundle! "config disable_exec_load #{l}"
-      bundle "exec rackup"
-      expect(last_command.stderr).to include "can't find executable rackup for gem rack. rack is not currently included in the bundle, perhaps you meant to add it to your Gemfile?"
-    end
-  end
-
-  # Different error message on old RG versions (before activate_bin_path) because they
-  # called `Kernel#gem` directly
-  it "raises a helpful error when exec'ing to something outside of the bundle", :rubygems => "< 2.5.2" do
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gem "with_license"
-    G
-    [true, false].each do |l|
-      bundle! "config disable_exec_load #{l}"
-      bundle "exec rackup", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-      expect(last_command.stderr).to include "rack is not part of the bundle. Add it to your Gemfile."
-    end
-  end
-
-  describe "with help flags" do
-    each_prefix = proc do |string, &blk|
-      1.upto(string.length) {|l| blk.call(string[0, l]) }
-    end
-    each_prefix.call("exec") do |exec|
-      describe "when #{exec} is used" do
-        before(:each) do
-          install_gemfile <<-G
-            gem "rack"
-          G
-
-          create_file("print_args", <<-'RUBY')
-            #!/usr/bin/env ruby
-            puts "args: #{ARGV.inspect}"
-          RUBY
-          bundled_app("print_args").chmod(0o755)
-        end
-
-        it "shows executable's man page when --help is after the executable" do
-          bundle "#{exec} print_args --help"
-          expect(out).to eq('args: ["--help"]')
-        end
-
-        it "shows executable's man page when --help is after the executable and an argument" do
-          bundle "#{exec} print_args foo --help"
-          expect(out).to eq('args: ["foo", "--help"]')
-
-          bundle "#{exec} print_args foo bar --help"
-          expect(out).to eq('args: ["foo", "bar", "--help"]')
-
-          bundle "#{exec} print_args foo --help bar"
-          expect(out).to eq('args: ["foo", "--help", "bar"]')
-        end
-
-        it "shows executable's man page when the executable has a -" do
-          FileUtils.mv(bundled_app("print_args"), bundled_app("docker-template"))
-          bundle "#{exec} docker-template build discourse --help"
-          expect(out).to eq('args: ["build", "discourse", "--help"]')
-        end
-
-        it "shows executable's man page when --help is after another flag" do
-          bundle "#{exec} print_args --bar --help"
-          expect(out).to eq('args: ["--bar", "--help"]')
-        end
-
-        it "uses executable's original behavior for -h" do
-          bundle "#{exec} print_args -h"
-          expect(out).to eq('args: ["-h"]')
-        end
-
-        it "shows bundle-exec's man page when --help is between exec and the executable" do
-          with_fake_man do
-            bundle "#{exec} --help cat"
-          end
-          expect(out).to include(%(["#{root}/man/bundle-exec.1"]))
-        end
-
-        it "shows bundle-exec's man page when --help is before exec" do
-          with_fake_man do
-            bundle "--help #{exec}"
-          end
-          expect(out).to include(%(["#{root}/man/bundle-exec.1"]))
-        end
-
-        it "shows bundle-exec's man page when -h is before exec" do
-          with_fake_man do
-            bundle "-h #{exec}"
-          end
-          expect(out).to include(%(["#{root}/man/bundle-exec.1"]))
-        end
-
-        it "shows bundle-exec's man page when --help is after exec" do
-          with_fake_man do
-            bundle "#{exec} --help"
-          end
-          expect(out).to include(%(["#{root}/man/bundle-exec.1"]))
-        end
-
-        it "shows bundle-exec's man page when -h is after exec" do
-          with_fake_man do
-            bundle "#{exec} -h"
-          end
-          expect(out).to include(%(["#{root}/man/bundle-exec.1"]))
-        end
-      end
-    end
-  end
-
-  describe "with gem executables" do
-    describe "run from a random directory", :ruby_repo do
-      before(:each) do
-        install_gemfile <<-G
-          gem "rack"
-        G
-      end
-
-      it "works when unlocked" do
-        bundle "exec 'cd #{tmp("gems")} && rackup'", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-        expect(out).to eq("1.0.0")
-        expect(out).to include("1.0.0")
-      end
-
-      it "works when locked" do
-        expect(the_bundle).to be_locked
-        bundle "exec 'cd #{tmp("gems")} && rackup'", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-        expect(out).to include("1.0.0")
-      end
-    end
-
-    describe "from gems bundled via :path" do
-      before(:each) do
-        build_lib "fizz", :path => home("fizz") do |s|
-          s.executables = "fizz"
-        end
-
-        install_gemfile <<-G
-          gem "fizz", :path => "#{File.expand_path(home("fizz"))}"
-        G
-      end
-
-      it "works when unlocked" do
-        bundle "exec fizz"
-        expect(out).to eq("1.0")
-      end
-
-      it "works when locked" do
-        expect(the_bundle).to be_locked
-
-        bundle "exec fizz"
-        expect(out).to eq("1.0")
-      end
-    end
-
-    describe "from gems bundled via :git" do
-      before(:each) do
-        build_git "fizz_git" do |s|
-          s.executables = "fizz_git"
-        end
-
-        install_gemfile <<-G
-          gem "fizz_git", :git => "#{lib_path("fizz_git-1.0")}"
-        G
-      end
-
-      it "works when unlocked" do
-        bundle "exec fizz_git"
-        expect(out).to eq("1.0")
-      end
-
-      it "works when locked" do
-        expect(the_bundle).to be_locked
-        bundle "exec fizz_git"
-        expect(out).to eq("1.0")
-      end
-    end
-
-    describe "from gems bundled via :git with no gemspec" do
-      before(:each) do
-        build_git "fizz_no_gemspec", :gemspec => false do |s|
-          s.executables = "fizz_no_gemspec"
-        end
-
-        install_gemfile <<-G
-          gem "fizz_no_gemspec", "1.0", :git => "#{lib_path("fizz_no_gemspec-1.0")}"
-        G
-      end
-
-      it "works when unlocked" do
-        bundle "exec fizz_no_gemspec"
-        expect(out).to eq("1.0")
-      end
-
-      it "works when locked" do
-        expect(the_bundle).to be_locked
-        bundle "exec fizz_no_gemspec"
-        expect(out).to eq("1.0")
-      end
-    end
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack", "0.9.1"
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle "exec rackup"
-    expect(out).to include("Installing foo 1.0")
-  end
-
-  describe "with gems bundled via :path with invalid gemspecs", :ruby_repo do
-    it "outputs the gemspec validation errors", :rubygems => ">= 1.7.2" do
-      build_lib "foo"
-
-      gemspec = lib_path("foo-1.0").join("foo.gemspec").to_s
-      File.open(gemspec, "w") do |f|
-        f.write <<-G
-          Gem::Specification.new do |s|
-            s.name    = 'foo'
-            s.version = '1.0'
-            s.summary = 'TODO: Add summary'
-            s.authors = 'Me'
-          end
-        G
-      end
-
-      install_gemfile <<-G
-        gem "foo", :path => "#{lib_path("foo-1.0")}"
-      G
-
-      bundle "exec irb"
-
-      expect(err).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid")
-      expect(err).to match('"TODO" is not a summary')
-    end
-  end
-
-  describe "with gems bundled for deployment" do
-    it "works when calling bundler from another script" do
-      gemfile <<-G
-      module Monkey
-        def bin_path(a,b,c)
-          raise Gem::GemNotFoundException.new('Fail')
-        end
-      end
-      Bundler.rubygems.extend(Monkey)
-      G
-      bundle "install --deployment"
-      bundle "exec ruby -e '`#{bindir.join("bundler")} -v`; puts $?.success?'", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-      expect(out).to match("true")
-    end
-  end
-
-  context "`load`ing a ruby file instead of `exec`ing" do
-    let(:path) { bundled_app("ruby_executable") }
-    let(:shebang) { "#!/usr/bin/env ruby" }
-    let(:executable) { <<-RUBY.gsub(/^ */, "").strip }
-      #{shebang}
-
-      require "rack"
-      puts "EXEC: \#{caller.grep(/load/).empty? ? 'exec' : 'load'}"
-      puts "ARGS: \#{$0} \#{ARGV.join(' ')}"
-      puts "RACK: \#{RACK}"
-      process_title = `ps -o args -p \#{Process.pid}`.split("\n", 2).last.strip
-      puts "PROCESS: \#{process_title}"
-    RUBY
-
-    before do
-      path.open("w") {|f| f << executable }
-      path.chmod(0o755)
-
-      install_gemfile <<-G
-        gem "rack"
-      G
-    end
-
-    let(:exec) { "EXEC: load" }
-    let(:args) { "ARGS: #{path} arg1 arg2" }
-    let(:rack) { "RACK: 1.0.0" }
-    let(:process) do
-      title = "PROCESS: #{path}"
-      title += " arg1 arg2" if RUBY_VERSION >= "2.1"
-      title
-    end
-    let(:exit_code) { 0 }
-    let(:expected) { [exec, args, rack, process].join("\n") }
-    let(:expected_err) { "" }
-
-    subject { bundle "exec #{path} arg1 arg2", :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" } }
-
-    shared_examples_for "it runs" do
-      it "like a normally executed executable" do
-        subject
-        expect(exitstatus).to eq(exit_code) if exitstatus
-        expect(last_command.stderr).to eq(expected_err)
-        expect(last_command.stdout).to eq(expected)
-      end
-    end
-
-    it_behaves_like "it runs"
-
-    context "the executable exits explicitly" do
-      let(:executable) { super() << "\nexit #{exit_code}\nputs 'POST_EXIT'\n" }
-
-      context "with exit 0" do
-        it_behaves_like "it runs"
-      end
-
-      context "with exit 99" do
-        let(:exit_code) { 99 }
-        it_behaves_like "it runs"
-      end
-    end
-
-    context "the executable exits by SignalException" do
-      let(:executable) do
-        ex = super()
-        ex << "\n"
-        if LessThanProc.with(RUBY_VERSION).call("1.9")
-          # Ruby < 1.9 needs a flush for a exit by signal, later
-          # rubies do not
-          ex << "STDOUT.flush\n"
-        end
-        ex << "raise SignalException, 'SIGTERM'\n"
-        ex
-      end
-      let(:expected_err) { ENV["TRAVIS"] ? "Terminated" : "" }
-      let(:exit_code) do
-        # signal mask 128 + plus signal 15 -> TERM
-        # this is specified by C99
-        128 + 15
-      end
-      it_behaves_like "it runs"
-    end
-
-    context "the executable is empty", :bundler => "< 2" do
-      let(:executable) { "" }
-
-      let(:exit_code) { 0 }
-      let(:expected) { "#{path} is empty" }
-      let(:expected_err) { "" }
-      if LessThanProc.with(RUBY_VERSION).call("1.9")
-        # Kernel#exec in ruby < 1.9 will raise Errno::ENOEXEC if the command content is empty,
-        # even if the command is set as an executable.
-        pending "Kernel#exec is different"
-      else
-        it_behaves_like "it runs"
-      end
-    end
-
-    context "the executable is empty", :bundler => "2" do
-      let(:executable) { "" }
-
-      let(:exit_code) { 0 }
-      let(:expected_err) { "#{path} is empty" }
-      let(:expected) { "" }
-      it_behaves_like "it runs"
-    end
-
-    context "the executable raises", :bundler => "< 2" do
-      let(:executable) { super() << "\nraise 'ERROR'" }
-      let(:exit_code) { 1 }
-      let(:expected) { super() << "\nbundler: failed to load command: #{path} (#{path})" }
-      let(:expected_err) do
-        "RuntimeError: ERROR\n  #{path}:10" +
-          (Bundler.current_ruby.ruby_18? ? "" : ":in `<top (required)>'")
-      end
-      it_behaves_like "it runs"
-    end
-
-    context "the executable raises", :bundler => "2" do
-      let(:executable) { super() << "\nraise 'ERROR'" }
-      let(:exit_code) { 1 }
-      let(:expected_err) do
-        "bundler: failed to load command: #{path} (#{path})" \
-        "\nRuntimeError: ERROR\n  #{path}:10:in `<top (required)>'"
-      end
-      it_behaves_like "it runs"
-    end
-
-    context "the executable raises an error without a backtrace", :bundler => "< 2" do
-      let(:executable) { super() << "\nclass Err < Exception\ndef backtrace; end;\nend\nraise Err" }
-      let(:exit_code) { 1 }
-      let(:expected) { super() << "\nbundler: failed to load command: #{path} (#{path})" }
-      let(:expected_err) { "Err: Err" }
-
-      it_behaves_like "it runs"
-    end
-
-    context "the executable raises an error without a backtrace", :bundler => "2" do
-      let(:executable) { super() << "\nclass Err < Exception\ndef backtrace; end;\nend\nraise Err" }
-      let(:exit_code) { 1 }
-      let(:expected_err) { "bundler: failed to load command: #{path} (#{path})\nErr: Err" }
-      let(:expected) { super() }
-
-      it_behaves_like "it runs"
-    end
-
-    context "when the file uses the current ruby shebang", :ruby_repo do
-      let(:shebang) { "#!#{Gem.ruby}" }
-      it_behaves_like "it runs"
-    end
-
-    context "when Bundler.setup fails", :bundler => "< 2" do
-      before do
-        gemfile <<-G
-          gem 'rack', '2'
-        G
-        ENV["BUNDLER_FORCE_TTY"] = "true"
-      end
-
-      let(:exit_code) { Bundler::GemNotFound.new.status_code }
-      let(:expected) { <<-EOS.strip }
-\e[31mCould not find gem 'rack (= 2)' in any of the gem sources listed in your Gemfile.\e[0m
-\e[33mRun `bundle install` to install missing gems.\e[0m
-      EOS
-
-      it_behaves_like "it runs"
-    end
-
-    context "when Bundler.setup fails", :bundler => "2" do
-      before do
-        gemfile <<-G
-          gem 'rack', '2'
-        G
-        ENV["BUNDLER_FORCE_TTY"] = "true"
-      end
-
-      let(:exit_code) { Bundler::GemNotFound.new.status_code }
-      let(:expected) { <<-EOS.strip }
-\e[31mCould not find gem 'rack (= 2)' in locally installed gems.
-The source contains 'rack' at: 1.0.0\e[0m
-\e[33mRun `bundle install` to install missing gems.\e[0m
-      EOS
-
-      it_behaves_like "it runs"
-    end
-
-    context "when the executable exits non-zero via at_exit" do
-      let(:executable) { super() + "\n\nat_exit { $! ? raise($!) : exit(1) }" }
-      let(:exit_code) { 1 }
-
-      it_behaves_like "it runs"
-    end
-
-    context "when disable_exec_load is set" do
-      let(:exec) { "EXEC: exec" }
-      let(:process) { "PROCESS: ruby #{path} arg1 arg2" }
-
-      before do
-        bundle "config disable_exec_load true"
-      end
-
-      it_behaves_like "it runs"
-    end
-
-    context "regarding $0 and __FILE__" do
-      let(:executable) { super() + <<-'RUBY' }
-
-        puts "$0: #{$0.inspect}"
-        puts "__FILE__: #{__FILE__.inspect}"
-      RUBY
-
-      let(:expected) { super() + <<-EOS.chomp }
-
-$0: #{path.to_s.inspect}
-__FILE__: #{path.to_s.inspect}
-      EOS
-
-      it_behaves_like "it runs"
-
-      context "when the path is relative" do
-        let(:path) { super().relative_path_from(bundled_app) }
-
-        if LessThanProc.with(RUBY_VERSION).call("1.9")
-          pending "relative paths have ./ __FILE__"
-        else
-          it_behaves_like "it runs"
-        end
-      end
-
-      context "when the path is relative with a leading ./" do
-        let(:path) { Pathname.new("./#{super().relative_path_from(Pathname.pwd)}") }
-
-        if LessThanProc.with(RUBY_VERSION).call("< 1.9")
-          pending "relative paths with ./ have absolute __FILE__"
-        else
-          it_behaves_like "it runs"
-        end
-      end
-    end
-
-    context "signal handling" do
-      let(:test_signals) do
-        open3_reserved_signals = %w[CHLD CLD PIPE]
-        reserved_signals = %w[SEGV BUS ILL FPE VTALRM KILL STOP EXIT]
-        bundler_signals = %w[INT]
-
-        Signal.list.keys - (bundler_signals + reserved_signals + open3_reserved_signals)
-      end
-
-      context "signals being trapped by bundler" do
-        let(:executable) { strip_whitespace <<-RUBY }
-          #{shebang}
-          begin
-            Thread.new do
-              puts 'Started' # For process sync
-              STDOUT.flush
-              sleep 1 # ignore quality_spec
-              raise "Didn't receive INT at all"
-            end.join
-          rescue Interrupt
-            puts "foo"
-          end
-        RUBY
-
-        it "receives the signal", :ruby => ">= 1.9.3" do
-          bundle!("exec #{path}") do |_, o, thr|
-            o.gets # Consumes 'Started' and ensures that thread has started
-            Process.kill("INT", thr.pid)
-          end
-
-          expect(out).to eq("foo")
-        end
-      end
-
-      context "signals not being trapped by bunder" do
-        let(:executable) { strip_whitespace <<-RUBY }
-          #{shebang}
-
-          signals = #{test_signals.inspect}
-          result = signals.map do |sig|
-            Signal.trap(sig, "IGNORE")
-          end
-          puts result.select { |ret| ret == "IGNORE" }.count
-        RUBY
-
-        it "makes sure no unexpected signals are restored to DEFAULT" do
-          test_signals.each do |n|
-            Signal.trap(n, "IGNORE")
-          end
-
-          bundle!("exec #{path}")
-
-          expect(out).to eq(test_signals.count.to_s)
-        end
-      end
-    end
-  end
-
-  context "nested bundle exec" do
-    let(:system_gems_to_install) { super() << :bundler }
-
-    context "with shared gems disabled" do
-      before do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-        bundle :install, :system_bundler => true, :path => "vendor/bundler"
-      end
-
-      it "overrides disable_shared_gems so bundler can be found" do
-        skip "bundler 1.16.x is not support with Ruby 2.6 on Travis CI" if RUBY_VERSION >= "2.6"
-
-        file = bundled_app("file_that_bundle_execs.rb")
-        create_file(file, <<-RB)
-          #!#{Gem.ruby}
-          puts `bundle exec echo foo`
-        RB
-        file.chmod(0o777)
-        bundle! "exec #{file}", :system_bundler => true
-        expect(out).to eq("foo")
-      end
-    end
-
-    context "with a system gem that shadows a default gem" do
-      let(:openssl_version) { "99.9.9" }
-      let(:expected) { ruby "gem 'openssl', '< 999999'; require 'openssl'; puts OpenSSL::VERSION", :artifice => nil }
-
-      it "only leaves the default gem in the stdlib available" do
-        skip "openssl isn't a default gem" if expected.empty?
-
-        install_gemfile! "" # must happen before installing the broken system gem
-
-        build_repo4 do
-          build_gem "openssl", openssl_version do |s|
-            s.write("lib/openssl.rb", <<-RB)
-              raise "custom openssl should not be loaded, it's not in the gemfile!"
-            RB
-          end
-        end
-
-        system_gems(:bundler, "openssl-#{openssl_version}", :gem_repo => gem_repo4)
-
-        file = bundled_app("require_openssl.rb")
-        create_file(file, <<-RB)
-          #!/usr/bin/env ruby
-          require "openssl"
-          puts OpenSSL::VERSION
-          warn Gem.loaded_specs.values.map(&:full_name)
-        RB
-        file.chmod(0o777)
-
-        aggregate_failures do
-          expect(bundle!("exec #{file}", :artifice => nil)).to eq(expected)
-          expect(bundle!("exec bundle exec #{file}", :artifice => nil)).to eq(expected)
-          expect(bundle!("exec ruby #{file}", :artifice => nil)).to eq(expected)
-          # Ignore expectaion for default bundler gem conflict.
-          unless ENV["BUNDLER_SPEC_SUB_VERSION"]
-            expect(run!(file.read, :artifice => nil)).to eq(expected)
-          end
-        end
-
-        # sanity check that we get the newer, custom version without bundler
-        sys_exec("#{Gem.ruby} #{file}")
-        expect(last_command.stderr).to include("custom openssl should not be loaded")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/commands/help_spec.rb b/spec/bundler/commands/help_spec.rb
deleted file mode 100644
index 56b1b6f722..0000000000
--- a/spec/bundler/commands/help_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle help" do
-  # RubyGems 1.4+ no longer load gem plugins so this test is no longer needed
-  it "complains if older versions of bundler are installed", :rubygems => "< 1.4" do
-    system_gems "bundler-0.8.1"
-
-    bundle "help"
-    expect(err).to include("older than 0.9")
-    expect(err).to include("running `gem cleanup bundler`.")
-  end
-
-  it "uses mann when available" do
-    with_fake_man do
-      bundle "help gemfile"
-    end
-    expect(out).to eq(%(["#{root}/man/gemfile.5"]))
-  end
-
-  it "prefixes bundle commands with bundle- when finding the groff files" do
-    with_fake_man do
-      bundle "help install"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle-install.1"]))
-  end
-
-  it "simply outputs the txt file when there is no man on the path" do
-    with_path_as("") do
-      bundle "help install"
-    end
-    expect(out).to match(/BUNDLE-INSTALL/)
-  end
-
-  it "still outputs the old help for commands that do not have man pages yet" do
-    bundle "help version"
-    expect(out).to include("Prints the bundler's version information")
-  end
-
-  it "looks for a binary and executes it with --help option if it's named bundler-<task>" do
-    File.open(tmp("bundler-testtasks"), "w", 0o755) do |f|
-      f.puts "#!/usr/bin/env ruby\nputs ARGV.join(' ')\n"
-    end
-
-    with_path_added(tmp) do
-      bundle "help testtasks"
-    end
-
-    expect(exitstatus).to be_zero if exitstatus
-    expect(out).to eq("--help")
-  end
-
-  it "is called when the --help flag is used after the command" do
-    with_fake_man do
-      bundle "install --help"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle-install.1"]))
-  end
-
-  it "is called when the --help flag is used before the command" do
-    with_fake_man do
-      bundle "--help install"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle-install.1"]))
-  end
-
-  it "is called when the -h flag is used before the command" do
-    with_fake_man do
-      bundle "-h install"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle-install.1"]))
-  end
-
-  it "is called when the -h flag is used after the command" do
-    with_fake_man do
-      bundle "install -h"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle-install.1"]))
-  end
-
-  it "has helpful output when using --help flag for a non-existent command" do
-    with_fake_man do
-      bundle "instill -h"
-    end
-    expect(out).to include('Could not find command "instill".')
-  end
-
-  it "is called when only using the --help flag" do
-    with_fake_man do
-      bundle "--help"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle.1"]))
-
-    with_fake_man do
-      bundle "-h"
-    end
-    expect(out).to eq(%(["#{root}/man/bundle.1"]))
-  end
-end
diff --git a/spec/bundler/commands/info_spec.rb b/spec/bundler/commands/info_spec.rb
deleted file mode 100644
index a9ab8fc210..0000000000
--- a/spec/bundler/commands/info_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle info" do
-  context "info from specific gem in gemfile" do
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-    end
-
-    it "prints information about the current gem" do
-      bundle "info rails"
-      expect(out).to include "* rails (2.3.2)
-\tSummary: This is just a fake gem for testing
-\tHomepage: http://example.com"
-      expect(out).to match(%r{Path\: .*\/rails\-2\.3\.2})
-    end
-
-    context "given a gem that is not installed" do
-      it "prints missing gem error" do
-        bundle "info foo"
-        expect(out).to eq "Could not find gem 'foo'."
-      end
-    end
-
-    context "given a default gem shippped in ruby", :ruby_repo do
-      it "prints information about the default gem", :if => (RUBY_VERSION >= "2.0") do
-        bundle "info rdoc"
-        expect(out).to include("* rdoc")
-        expect(out).to include("Default Gem: yes")
-      end
-    end
-
-    context "when gem does not have homepage" do
-      before do
-        build_repo1 do
-          build_gem "rails", "2.3.2" do |s|
-            s.executables = "rails"
-            s.summary = "Just another test gem"
-          end
-        end
-      end
-
-      it "excludes the homepage field from the output" do
-        expect(out).to_not include("Homepage:")
-      end
-    end
-
-    context "given --path option" do
-      it "prints the path to the gem" do
-        bundle "info rails"
-        expect(out).to match(%r{.*\/rails\-2\.3\.2})
-      end
-    end
-  end
-end
diff --git a/spec/bundler/commands/init_spec.rb b/spec/bundler/commands/init_spec.rb
deleted file mode 100644
index 9b5bd95814..0000000000
--- a/spec/bundler/commands/init_spec.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle init" do
-  it "generates a Gemfile", :bundler => "< 2" do
-    bundle! :init
-    expect(out).to include("Writing new Gemfile")
-    expect(bundled_app("Gemfile")).to be_file
-  end
-
-  it "generates a gems.rb", :bundler => "2" do
-    bundle! :init
-    expect(out).to include("Writing new gems.rb")
-    expect(bundled_app("gems.rb")).to be_file
-  end
-
-  context "when a Gemfile already exists", :bundler => "< 2" do
-    before do
-      create_file "Gemfile", <<-G
-        gem "rails"
-      G
-    end
-
-    it "does not change existing Gemfiles" do
-      expect { bundle :init }.not_to change { File.read(bundled_app("Gemfile")) }
-    end
-
-    it "notifies the user that an existing Gemfile already exists" do
-      bundle :init
-      expect(out).to include("Gemfile already exists")
-    end
-  end
-
-  context "when gems.rb already exists", :bundler => ">= 2" do
-    before do
-      create_file("gems.rb", <<-G)
-        gem "rails"
-      G
-    end
-
-    it "does not change existing Gemfiles" do
-      expect { bundle :init }.not_to change { File.read(bundled_app("gems.rb")) }
-    end
-
-    it "notifies the user that an existing gems.rb already exists" do
-      bundle :init
-      expect(out).to include("gems.rb already exists")
-    end
-  end
-
-  context "when a Gemfile exists in a parent directory", :bundler => "< 2" do
-    let(:subdir) { "child_dir" }
-
-    it "lets users generate a Gemfile in a child directory" do
-      bundle! :init
-
-      FileUtils.mkdir bundled_app(subdir)
-
-      Dir.chdir bundled_app(subdir) do
-        bundle! :init
-      end
-
-      expect(out).to include("Writing new Gemfile")
-      expect(bundled_app("#{subdir}/Gemfile")).to be_file
-    end
-  end
-
-  context "when the dir is not writable by the current user" do
-    let(:subdir) { "child_dir" }
-
-    it "notifies the user that it can not write to it" do
-      FileUtils.mkdir bundled_app(subdir)
-      # chmod a-w it
-      mode = File.stat(bundled_app(subdir)).mode ^ 0o222
-      FileUtils.chmod mode, bundled_app(subdir)
-
-      Dir.chdir bundled_app(subdir) do
-        bundle :init
-      end
-
-      expect(out).to include("directory is not writable")
-      expect(Dir[bundled_app("#{subdir}/*")]).to be_empty
-    end
-  end
-
-  context "when a gems.rb file exists in a parent directory", :bundler => ">= 2" do
-    let(:subdir) { "child_dir" }
-
-    it "lets users generate a Gemfile in a child directory" do
-      bundle! :init
-
-      FileUtils.mkdir bundled_app(subdir)
-
-      Dir.chdir bundled_app(subdir) do
-        bundle! :init
-      end
-
-      expect(out).to include("Writing new gems.rb")
-      expect(bundled_app("#{subdir}/gems.rb")).to be_file
-    end
-  end
-
-  context "given --gemspec option", :bundler => "< 2" do
-    let(:spec_file) { tmp.join("test.gemspec") }
-
-    it "should generate from an existing gemspec" do
-      File.open(spec_file, "w") do |file|
-        file << <<-S
-          Gem::Specification.new do |s|
-          s.name = 'test'
-          s.add_dependency 'rack', '= 1.0.1'
-          s.add_development_dependency 'rspec', '1.2'
-          end
-        S
-      end
-
-      bundle :init, :gemspec => spec_file
-
-      gemfile = if Bundler::VERSION[0, 2] == "1."
-        bundled_app("Gemfile").read
-      else
-        bundled_app("gems.rb").read
-      end
-      expect(gemfile).to match(%r{source 'https://rubygems.org'})
-      expect(gemfile.scan(/gem "rack", "= 1.0.1"/).size).to eq(1)
-      expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
-      expect(gemfile.scan(/group :development/).size).to eq(1)
-    end
-
-    context "when gemspec file is invalid" do
-      it "notifies the user that specification is invalid" do
-        File.open(spec_file, "w") do |file|
-          file << <<-S
-            Gem::Specification.new do |s|
-            s.name = 'test'
-            s.invalid_method_name
-            end
-          S
-        end
-
-        bundle :init, :gemspec => spec_file
-        expect(last_command.bundler_err).to include("There was an error while loading `test.gemspec`")
-      end
-    end
-  end
-
-  context "when init_gems_rb setting is enabled" do
-    before { bundle "config init_gems_rb true" }
-
-    context "given --gemspec option", :bundler => "< 2" do
-      let(:spec_file) { tmp.join("test.gemspec") }
-
-      before do
-        File.open(spec_file, "w") do |file|
-          file << <<-S
-            Gem::Specification.new do |s|
-            s.name = 'test'
-            s.add_dependency 'rack', '= 1.0.1'
-            s.add_development_dependency 'rspec', '1.2'
-            end
-          S
-        end
-      end
-
-      it "should generate from an existing gemspec" do
-        bundle :init, :gemspec => spec_file
-
-        gemfile = bundled_app("gems.rb").read
-        expect(gemfile).to match(%r{source 'https://rubygems.org'})
-        expect(gemfile.scan(/gem "rack", "= 1.0.1"/).size).to eq(1)
-        expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
-        expect(gemfile.scan(/group :development/).size).to eq(1)
-      end
-
-      it "prints message to user" do
-        bundle :init, :gemspec => spec_file
-
-        expect(out).to include("Writing new gems.rb")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/commands/inject_spec.rb b/spec/bundler/commands/inject_spec.rb
deleted file mode 100644
index b7ffc89a34..0000000000
--- a/spec/bundler/commands/inject_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle inject", :bundler => "< 2" do
-  before :each do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-  end
-
-  context "without a lockfile" do
-    it "locks with the injected gems" do
-      expect(bundled_app("Gemfile.lock")).not_to exist
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
-    end
-  end
-
-  context "with a lockfile" do
-    before do
-      bundle "install"
-    end
-
-    it "adds the injected gems to the Gemfile" do
-      expect(bundled_app("Gemfile").read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app("Gemfile").read).to match(/rack-obama/)
-    end
-
-    it "locks with the injected gems" do
-      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
-    end
-  end
-
-  context "with injected gems already in the Gemfile" do
-    it "doesn't add existing gems" do
-      bundle "inject 'rack' '> 0'"
-      expect(out).to match(/cannot specify the same gem twice/i)
-    end
-  end
-
-  context "incorrect arguments" do
-    it "fails when more than 2 arguments are passed" do
-      bundle "inject gem_name 1 v"
-      expect(out).to eq(<<-E.strip)
-ERROR: "bundle inject" was called with arguments ["gem_name", "1", "v"]
-Usage: "bundle inject GEM VERSION"
-      E
-    end
-  end
-
-  context "with source option" do
-    it "add gem with source option in gemfile" do
-      bundle "inject 'foo' '>0' --source file://#{gem_repo1}"
-      gemfile = bundled_app("Gemfile").read
-      str = "gem \"foo\", \"> 0\", :source => \"file://#{gem_repo1}\""
-      expect(gemfile).to include str
-    end
-  end
-
-  context "with group option" do
-    it "add gem with group option in gemfile" do
-      bundle "inject 'rack-obama' '>0' --group=development"
-      gemfile = bundled_app("Gemfile").read
-      str = "gem \"rack-obama\", \"> 0\", :group => :development"
-      expect(gemfile).to include str
-    end
-
-    it "add gem with multiple groups in gemfile" do
-      bundle "inject 'rack-obama' '>0' --group=development,test"
-      gemfile = bundled_app("Gemfile").read
-      str = "gem \"rack-obama\", \"> 0\", :groups => [:development, :test]"
-      expect(gemfile).to include str
-    end
-  end
-
-  context "when frozen" do
-    before do
-      bundle "install"
-      if Bundler.feature_flag.bundler_2_mode?
-        bundle! "config --local deployment true"
-      else
-        bundle! "config --local frozen true"
-      end
-    end
-
-    it "injects anyway" do
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app("Gemfile").read).to match(/rack-obama/)
-    end
-
-    it "locks with the injected gems" do
-      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
-    end
-
-    it "restores frozen afterwards" do
-      bundle "inject 'rack-obama' '> 0'"
-      config = YAML.load(bundled_app(".bundle/config").read)
-      expect(config["BUNDLE_DEPLOYMENT"] || config["BUNDLE_FROZEN"]).to eq("true")
-    end
-
-    it "doesn't allow Gemfile changes" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack-obama"
-      G
-      bundle "inject 'rack' '> 0'"
-      expect(out).to match(/trying to install in deployment mode after changing/)
-
-      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
-    end
-  end
-end
diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb
deleted file mode 100644
index 394f672fef..0000000000
--- a/spec/bundler/commands/install_spec.rb
+++ /dev/null
@@ -1,587 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with gem sources" do
-  describe "the simple case" do
-    it "prints output and returns if no dependencies are specified" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-      G
-
-      bundle :install
-      expect(out).to match(/no dependencies/)
-    end
-
-    it "does not make a lockfile if the install fails" do
-      install_gemfile <<-G
-        raise StandardError, "FAIL"
-      G
-
-      expect(last_command.bundler_err).to include('StandardError, "FAIL"')
-      expect(bundled_app("Gemfile.lock")).not_to exist
-    end
-
-    it "creates a Gemfile.lock" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-
-    it "does not create ./.bundle by default", :bundler => "< 2" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle! :install # can't use install_gemfile since it sets retry
-      expect(bundled_app(".bundle")).not_to exist
-    end
-
-    it "does not create ./.bundle by default when installing to system gems" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle! :install, :env => { "BUNDLE_PATH__SYSTEM" => true } # can't use install_gemfile since it sets retry
-      expect(bundled_app(".bundle")).not_to exist
-    end
-
-    it "creates lock files based on the Gemfile name" do
-      gemfile bundled_app("OmgFile"), <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "1.0"
-      G
-
-      bundle "install --gemfile OmgFile"
-
-      expect(bundled_app("OmgFile.lock")).to exist
-    end
-
-    it "doesn't delete the lockfile if one already exists" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      lockfile = File.read(bundled_app("Gemfile.lock"))
-
-      install_gemfile <<-G
-        raise StandardError, "FAIL"
-      G
-
-      expect(File.read(bundled_app("Gemfile.lock"))).to eq(lockfile)
-    end
-
-    it "does not touch the lockfile if nothing changed" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      expect { run "1" }.not_to change { File.mtime(bundled_app("Gemfile.lock")) }
-    end
-
-    it "fetches gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      expect(default_bundle_path("gems/rack-1.0.0")).to exist
-      expect(the_bundle).to include_gems("rack 1.0.0")
-    end
-
-    it "fetches gems when multiple versions are specified" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack', "> 0.9", "< 1.0"
-      G
-
-      expect(default_bundle_path("gems/rack-0.9.1")).to exist
-      expect(the_bundle).to include_gems("rack 0.9.1")
-    end
-
-    it "fetches gems when multiple versions are specified take 2" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack', "< 1.0", "> 0.9"
-      G
-
-      expect(default_bundle_path("gems/rack-0.9.1")).to exist
-      expect(the_bundle).to include_gems("rack 0.9.1")
-    end
-
-    it "raises an appropriate error when gems are specified using symbols" do
-      install_gemfile(<<-G)
-        source "file://#{gem_repo1}"
-        gem :rack
-      G
-      expect(exitstatus).to eq(4) if exitstatus
-    end
-
-    it "pulls in dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-
-      expect(the_bundle).to include_gems "actionpack 2.3.2", "rails 2.3.2"
-    end
-
-    it "does the right version" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "0.9.1"
-      G
-
-      expect(the_bundle).to include_gems "rack 0.9.1"
-    end
-
-    it "does not install the development dependency" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "with_development_dependency"
-      G
-
-      expect(the_bundle).to include_gems("with_development_dependency 1.0.0").
-        and not_include_gems("activesupport 2.3.5")
-    end
-
-    it "resolves correctly" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activemerchant"
-        gem "rails"
-      G
-
-      expect(the_bundle).to include_gems "activemerchant 1.0", "activesupport 2.3.2", "actionpack 2.3.2"
-    end
-
-    it "activates gem correctly according to the resolved gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activesupport", "2.3.5"
-      G
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activemerchant"
-        gem "rails"
-      G
-
-      expect(the_bundle).to include_gems "activemerchant 1.0", "activesupport 2.3.2", "actionpack 2.3.2"
-    end
-
-    it "does not reinstall any gem that is already available locally" do
-      system_gems "activesupport-2.3.2", :path => :bundle_path
-
-      build_repo2 do
-        build_gem "activesupport", "2.3.2" do |s|
-          s.write "lib/activesupport.rb", "ACTIVESUPPORT = 'fail'"
-        end
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activerecord", "2.3.2"
-      G
-
-      expect(the_bundle).to include_gems "activesupport 2.3.2"
-    end
-
-    it "works when the gemfile specifies gems that only exist in the system" do
-      build_gem "foo", :to_bundle => true
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "foo"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "foo 1.0.0"
-    end
-
-    it "prioritizes local gems over remote gems" do
-      build_gem "rack", "1.0.0", :to_bundle => true do |s|
-        s.add_dependency "activesupport", "2.3.5"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
-    end
-
-    describe "with a gem that installs multiple platforms" do
-      it "installs gems for the local platform as first choice" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 #{Bundler.local_platform}")
-      end
-
-      it "falls back on plain ruby" do
-        simulate_platform "foo-bar-baz"
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 RUBY")
-      end
-
-      it "installs gems for java" do
-        simulate_platform "java"
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 JAVA")
-      end
-
-      it "installs gems for windows" do
-        simulate_platform mswin
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 MSWIN")
-      end
-    end
-
-    describe "doing bundle install foo" do
-      before do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-      end
-
-      it "works" do
-        bundle "install", forgotten_command_line_options(:path => "vendor")
-        expect(the_bundle).to include_gems "rack 1.0"
-      end
-
-      it "allows running bundle install --system without deleting foo", :bundler => "< 2" do
-        bundle "install", forgotten_command_line_options(:path => "vendor")
-        bundle "install", forgotten_command_line_options(:system => true)
-        FileUtils.rm_rf(bundled_app("vendor"))
-        expect(the_bundle).to include_gems "rack 1.0"
-      end
-
-      it "allows running bundle install --system after deleting foo", :bundler => "< 2" do
-        bundle "install", forgotten_command_line_options(:path => "vendor")
-        FileUtils.rm_rf(bundled_app("vendor"))
-        bundle "install", forgotten_command_line_options(:system => true)
-        expect(the_bundle).to include_gems "rack 1.0"
-      end
-    end
-
-    it "finds gems in multiple sources", :bundler => "< 2" do
-      build_repo2
-      update_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        source "file://#{gem_repo2}"
-
-        gem "activesupport", "1.2.3"
-        gem "rack", "1.2"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.2", "activesupport 1.2.3"
-    end
-
-    it "gives a useful error if no sources are set" do
-      install_gemfile <<-G
-        gem "rack"
-      G
-
-      bundle :install
-      expect(out).to include("Your Gemfile has no gem server sources")
-    end
-
-    it "creates a Gemfile.lock on a blank Gemfile" do
-      install_gemfile <<-G
-      G
-
-      expect(File.exist?(bundled_app("Gemfile.lock"))).to eq(true)
-    end
-
-    context "throws a warning if a gem is added twice in Gemfile" do
-      it "without version requirements" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "rack"
-          gem "rack"
-        G
-
-        expect(out).to include("Your Gemfile lists the gem rack (>= 0) more than once.")
-        expect(out).to include("Remove any duplicate entries and specify the gem only once (per group).")
-        expect(out).to include("While it's not a problem now, it could cause errors if you change the version of one of them later.")
-      end
-
-      it "with same versions" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "rack", "1.0"
-          gem "rack", "1.0"
-        G
-
-        expect(out).to include("Your Gemfile lists the gem rack (= 1.0) more than once.")
-        expect(out).to include("Remove any duplicate entries and specify the gem only once (per group).")
-        expect(out).to include("While it's not a problem now, it could cause errors if you change the version of one of them later.")
-      end
-    end
-
-    context "throws an error if a gem is added twice in Gemfile" do
-      it "when version of one dependency is not specified" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "rack"
-          gem "rack", "1.0"
-        G
-
-        expect(out).to include("You cannot specify the same gem twice with different version requirements")
-        expect(out).to include("You specified: rack (>= 0) and rack (= 1.0).")
-      end
-
-      it "when different versions of both dependencies are specified" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "rack", "1.0"
-          gem "rack", "1.1"
-        G
-
-        expect(out).to include("You cannot specify the same gem twice with different version requirements")
-        expect(out).to include("You specified: rack (= 1.0) and rack (= 1.1).")
-      end
-    end
-
-    it "gracefully handles error when rubygems server is unavailable" do
-      install_gemfile <<-G, :artifice => nil
-        source "file://#{gem_repo1}"
-        source "http://localhost:9384" do
-          gem 'foo'
-        end
-      G
-
-      bundle :install, :artifice => nil
-      expect(out).to include("Could not fetch specs from http://localhost:9384/")
-      expect(out).not_to include("file://")
-    end
-
-    it "fails gracefully when downloading an invalid specification from the full index", :rubygems => "2.5" do
-      build_repo2 do
-        build_gem "ajp-rails", "0.0.0", :gemspec => false, :skip_validation => true do |s|
-          bad_deps = [["ruby-ajp", ">= 0.2.0"], ["rails", ">= 0.14"]]
-          s.
-            instance_variable_get(:@spec).
-            instance_variable_set(:@dependencies, bad_deps)
-
-          raise "failed to set bad deps" unless s.dependencies == bad_deps
-        end
-        build_gem "ruby-ajp", "1.0.0"
-      end
-
-      install_gemfile <<-G, :full_index => true
-        source "file:\/\/localhost#{gem_repo2}"
-
-        gem "ajp-rails", "0.0.0"
-      G
-
-      expect(last_command.stdboth).not_to match(/Error Report/i)
-      expect(last_command.bundler_err).to include("An error occurred while installing ajp-rails (0.0.0), and Bundler cannot continue.").
-        and include(normalize_uri_file("Make sure that `gem install ajp-rails -v '0.0.0' --source 'file://localhost#{gem_repo2}/'` succeeds before bundling."))
-    end
-
-    it "doesn't blow up when the local .bundle/config is empty" do
-      FileUtils.mkdir_p(bundled_app(".bundle"))
-      FileUtils.touch(bundled_app(".bundle/config"))
-
-      install_gemfile(<<-G)
-        source "file://#{gem_repo1}"
-
-        gem 'foo'
-      G
-      expect(exitstatus).to eq(0) if exitstatus
-    end
-
-    it "doesn't blow up when the global .bundle/config is empty" do
-      FileUtils.mkdir_p("#{Bundler.rubygems.user_home}/.bundle")
-      FileUtils.touch("#{Bundler.rubygems.user_home}/.bundle/config")
-
-      install_gemfile(<<-G)
-        source "file://#{gem_repo1}"
-
-        gem 'foo'
-      G
-      expect(exitstatus).to eq(0) if exitstatus
-    end
-  end
-
-  describe "Ruby version in Gemfile.lock" do
-    include Bundler::GemHelpers
-
-    context "and using an unsupported Ruby version" do
-      it "prints an error" do
-        install_gemfile <<-G
-          ::RUBY_VERSION = '2.0.1'
-          ruby '~> 2.2'
-        G
-        expect(out).to include("Your Ruby version is 2.0.1, but your Gemfile specified ~> 2.2")
-      end
-    end
-
-    context "and using a supported Ruby version" do
-      before do
-        install_gemfile <<-G
-          ::RUBY_VERSION = '2.1.3'
-          ::RUBY_PATCHLEVEL = 100
-          ruby '~> 2.1.0'
-        G
-      end
-
-      it "writes current Ruby version to Gemfile.lock" do
-        lockfile_should_be <<-L
-         GEM
-           specs:
-
-         PLATFORMS
-           #{lockfile_platforms}
-
-         DEPENDENCIES
-
-         RUBY VERSION
-            ruby 2.1.3p100
-
-         BUNDLED WITH
-            #{Bundler::VERSION}
-        L
-      end
-
-      it "updates Gemfile.lock with updated incompatible ruby version" do
-        install_gemfile <<-G
-          ::RUBY_VERSION = '2.2.3'
-          ::RUBY_PATCHLEVEL = 100
-          ruby '~> 2.2.0'
-        G
-
-        lockfile_should_be <<-L
-         GEM
-           specs:
-
-         PLATFORMS
-           #{lockfile_platforms}
-
-         DEPENDENCIES
-
-         RUBY VERSION
-            ruby 2.2.3p100
-
-         BUNDLED WITH
-            #{Bundler::VERSION}
-        L
-      end
-    end
-  end
-
-  describe "when Bundler root contains regex chars" do
-    before do
-      root_dir = tmp("foo[]bar")
-
-      FileUtils.mkdir_p(root_dir)
-      in_app_root_custom(root_dir)
-    end
-
-    it "doesn't blow up" do
-      build_lib "foo"
-      gemfile = <<-G
-        gem 'foo', :path => "#{lib_path("foo-1.0")}"
-      G
-      File.open("Gemfile", "w") do |file|
-        file.puts gemfile
-      end
-
-      bundle :install
-
-      expect(exitstatus).to eq(0) if exitstatus
-    end
-  end
-
-  describe "when requesting a quiet install via --quiet" do
-    it "should be quiet" do
-      gemfile <<-G
-        gem 'rack'
-      G
-
-      bundle :install, :quiet => true
-      expect(out).to include("Could not find gem 'rack'")
-      expect(out).to_not include("Your Gemfile has no gem server sources")
-    end
-  end
-
-  describe "when bundle path does not have write access" do
-    before do
-      FileUtils.mkdir_p(bundled_app("vendor"))
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-    end
-
-    it "should display a proper message to explain the problem" do
-      FileUtils.chmod(0o500, bundled_app("vendor"))
-
-      bundle :install, forgotten_command_line_options(:path => "vendor")
-      expect(out).to include(bundled_app("vendor").to_s)
-      expect(out).to include("grant write permissions")
-    end
-  end
-
-  context "after installing with --standalone" do
-    before do
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      forgotten_command_line_options(:path => "bundle")
-      bundle! "install", :standalone => true
-    end
-
-    it "includes the standalone path" do
-      bundle! "binstubs rack", :standalone => true
-      standalone_line = File.read(bundled_app("bin/rackup")).each_line.find {|line| line.include? "$:.unshift" }.strip
-      expect(standalone_line).to eq %($:.unshift File.expand_path "../../bundle", path.realpath)
-    end
-  end
-
-  describe "when bundle install is executed with unencoded authentication" do
-    before do
-      gemfile <<-G
-        source 'https://rubygems.org/'
-        gem "."
-      G
-    end
-
-    it "should display a helpful messag explaining how to fix it" do
-      bundle :install, :env => { "BUNDLE_RUBYGEMS__ORG" => "user:pass{word" }
-      expect(exitstatus).to eq(17) if exitstatus
-      expect(out).to eq("Please CGI escape your usernames and passwords before " \
-                        "setting them for authentication.")
-    end
-  end
-end
diff --git a/spec/bundler/commands/issue_spec.rb b/spec/bundler/commands/issue_spec.rb
deleted file mode 100644
index 04c575130e..0000000000
--- a/spec/bundler/commands/issue_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle issue" do
-  it "exits with a message" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-
-    bundle "issue"
-    expect(out).to include "Did you find an issue with Bundler?"
-    expect(out).to include "## Environment"
-    expect(out).to include "## Gemfile"
-    expect(out).to include "## Bundle Doctor"
-  end
-end
diff --git a/spec/bundler/commands/licenses_spec.rb b/spec/bundler/commands/licenses_spec.rb
deleted file mode 100644
index d61d3492f3..0000000000
--- a/spec/bundler/commands/licenses_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle licenses" do
-  before :each do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-      gem "with_license"
-    G
-  end
-
-  it "prints license information for all gems in the bundle" do
-    bundle "licenses"
-
-    loaded_bundler_spec = Bundler.load.specs["bundler"]
-    expected = if !loaded_bundler_spec.empty?
-      loaded_bundler_spec[0].license
-    else
-      "Unknown"
-    end
-
-    expect(out).to include("bundler: #{expected}")
-    expect(out).to include("with_license: MIT")
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-      gem "with_license"
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle :licenses
-    expect(out).to include("Installing foo 1.0")
-  end
-end
diff --git a/spec/bundler/commands/list_spec.rb b/spec/bundler/commands/list_spec.rb
deleted file mode 100644
index 5305176c65..0000000000
--- a/spec/bundler/commands/list_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle list", :bundler => "2" do
-  before do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-      gem "rspec", :group => [:test]
-    G
-  end
-
-  context "with name-only and paths option" do
-    it "raises an error" do
-      bundle "list --name-only --paths"
-
-      expect(out).to eq "The `--name-only` and `--paths` options cannot be used together"
-    end
-  end
-
-  context "with without-group and only-group option" do
-    it "raises an error" do
-      bundle "list --without-group dev --only-group test"
-
-      expect(out).to eq "The `--only-group` and `--without-group` options cannot be used together"
-    end
-  end
-
-  describe "with without-group option" do
-    context "when group is present" do
-      it "prints the gems not in the specified group" do
-        bundle! "list --without-group test"
-
-        expect(out).to include("  * rack (1.0.0)")
-        expect(out).not_to include("  * rspec (1.2.7)")
-      end
-    end
-
-    context "when group is not found" do
-      it "raises an error" do
-        bundle "list --without-group random"
-
-        expect(out).to eq "`random` group could not be found."
-      end
-    end
-  end
-
-  describe "with only-group option" do
-    context "when group is present" do
-      it "prints the gems in the specified group" do
-        bundle! "list --only-group default"
-
-        expect(out).to include("  * rack (1.0.0)")
-        expect(out).not_to include("  * rspec (1.2.7)")
-      end
-    end
-
-    context "when group is not found" do
-      it "raises an error" do
-        bundle "list --only-group random"
-
-        expect(out).to eq "`random` group could not be found."
-      end
-    end
-  end
-
-  context "with name-only option" do
-    it "prints only the name of the gems in the bundle" do
-      bundle "list --name-only"
-
-      expect(out).to include("rack")
-      expect(out).to include("rspec")
-    end
-  end
-
-  context "with paths option" do
-    before do
-      build_repo2 do
-        build_gem "bar"
-      end
-
-      build_git "git_test", "1.0.0", :path => lib_path("git_test")
-
-      build_lib("gemspec_test", :path => tmp.join("gemspec_test")) do |s|
-        s.write("Gemfile", "source :rubygems\ngemspec")
-        s.add_dependency "bar", "=1.0.0"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-        gem "rails"
-        gem "git_test", :git => "#{lib_path("git_test")}"
-        gemspec :path => "#{tmp.join("gemspec_test")}"
-      G
-
-      bundle! "install"
-    end
-
-    it "prints the path of each gem in the bundle" do
-      bundle "list --paths"
-      expect(out).to match(%r{.*\/rails\-2\.3\.2})
-      expect(out).to match(%r{.*\/rack\-1\.2})
-      expect(out).to match(%r{.*\/git_test\-\w})
-      expect(out).to match(%r{.*\/gemspec_test})
-    end
-  end
-
-  context "when no gems are in the gemfile" do
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-      G
-    end
-
-    it "prints message saying no gems are in the bundle" do
-      bundle "list"
-      expect(out).to include("No gems in the Gemfile")
-    end
-  end
-
-  it "lists gems installed in the bundle" do
-    bundle "list"
-    expect(out).to include("  * rack (1.0.0)")
-  end
-
-  it "aliases the ls command to list" do
-    bundle "ls"
-    expect(out).to include("Gems included by the bundle")
-  end
-end
diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb
deleted file mode 100644
index 0b77605f01..0000000000
--- a/spec/bundler/commands/lock_spec.rb
+++ /dev/null
@@ -1,322 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle lock" do
-  def strip_lockfile(lockfile)
-    strip_whitespace(lockfile).sub(/\n\Z/, "")
-  end
-
-  def read_lockfile(file = "Gemfile.lock")
-    strip_lockfile bundled_app(file).read
-  end
-
-  let(:repo) { gem_repo1 }
-
-  before :each do
-    gemfile <<-G
-      source "file://localhost#{repo}"
-      gem "rails"
-      gem "with_license"
-      gem "foo"
-    G
-
-    @lockfile = strip_lockfile(normalize_uri_file(<<-L))
-      GEM
-        remote: file://localhost#{repo}/
-        specs:
-          actionmailer (2.3.2)
-            activesupport (= 2.3.2)
-          actionpack (2.3.2)
-            activesupport (= 2.3.2)
-          activerecord (2.3.2)
-            activesupport (= 2.3.2)
-          activeresource (2.3.2)
-            activesupport (= 2.3.2)
-          activesupport (2.3.2)
-          foo (1.0)
-          rails (2.3.2)
-            actionmailer (= 2.3.2)
-            actionpack (= 2.3.2)
-            activerecord (= 2.3.2)
-            activeresource (= 2.3.2)
-            rake (= 10.0.2)
-          rake (10.0.2)
-          with_license (1.0)
-
-      PLATFORMS
-        #{lockfile_platforms}
-
-      DEPENDENCIES
-        foo
-        rails
-        with_license
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
-  end
-
-  it "prints a lockfile when there is no existing lockfile with --print" do
-    bundle "lock --print"
-
-    expect(out).to eq(@lockfile)
-  end
-
-  it "prints a lockfile when there is an existing lockfile with --print" do
-    lockfile @lockfile
-
-    bundle "lock --print"
-
-    expect(out).to eq(@lockfile)
-  end
-
-  it "writes a lockfile when there is no existing lockfile" do
-    bundle "lock"
-
-    expect(read_lockfile).to eq(@lockfile)
-  end
-
-  it "writes a lockfile when there is an outdated lockfile using --update" do
-    lockfile @lockfile.gsub("2.3.2", "2.3.1")
-
-    bundle! "lock --update"
-
-    expect(read_lockfile).to eq(@lockfile)
-  end
-
-  it "does not fetch remote specs when using the --local option" do
-    bundle "lock --update --local"
-
-    expect(out).to match(/sources listed in your Gemfile|installed locally/)
-  end
-
-  it "writes to a custom location using --lockfile" do
-    bundle "lock --lockfile=lock"
-
-    expect(out).to match(/Writing lockfile to.+lock/)
-    expect(read_lockfile "lock").to eq(@lockfile)
-    expect { read_lockfile }.to raise_error(Errno::ENOENT)
-  end
-
-  it "writes to custom location using --lockfile when a default lockfile is present" do
-    bundle "install"
-    bundle "lock --lockfile=lock"
-
-    expect(out).to match(/Writing lockfile to.+lock/)
-    expect(read_lockfile("lock")).to eq(@lockfile)
-  end
-
-  it "update specific gems using --update" do
-    lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub("10.0.2", "10.0.1")
-
-    bundle "lock --update rails rake"
-
-    expect(read_lockfile).to eq(@lockfile)
-  end
-
-  it "errors when updating a missing specific gems using --update" do
-    lockfile @lockfile
-
-    bundle "lock --update blahblah"
-    expect(out).to eq("Could not find gem 'blahblah'.")
-
-    expect(read_lockfile).to eq(@lockfile)
-  end
-
-  # see update_spec for more coverage on same options. logic is shared so it's not necessary
-  # to repeat coverage here.
-  context "conservative updates" do
-    before do
-      build_repo4 do
-        build_gem "foo", %w[1.4.3 1.4.4] do |s|
-          s.add_dependency "bar", "~> 2.0"
-        end
-        build_gem "foo", %w[1.4.5 1.5.0] do |s|
-          s.add_dependency "bar", "~> 2.1"
-        end
-        build_gem "foo", %w[1.5.1] do |s|
-          s.add_dependency "bar", "~> 3.0"
-        end
-        build_gem "bar", %w[2.0.3 2.0.4 2.0.5 2.1.0 2.1.1 3.0.0]
-        build_gem "qux", %w[1.0.0 1.0.1 1.1.0 2.0.0]
-      end
-
-      # establish a lockfile set to 1.4.3
-      install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'foo', '1.4.3'
-        gem 'bar', '2.0.3'
-        gem 'qux', '1.0.0'
-      G
-
-      # remove 1.4.3 requirement and bar altogether
-      # to setup update specs below
-      gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'foo'
-        gem 'qux'
-      G
-    end
-
-    it "single gem updates dependent gem to minor" do
-      bundle "lock --update foo --patch"
-
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.4.5 bar-2.1.1 qux-1.0.0].sort)
-    end
-
-    it "minor preferred with strict" do
-      bundle "lock --update --minor --strict"
-
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.5.0 bar-2.1.1 qux-1.1.0].sort)
-    end
-  end
-
-  it "supports adding new platforms" do
-    bundle! "lock --add-platform java x86-mingw32"
-
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array(local_platforms.unshift(java, mingw).uniq)
-  end
-
-  it "supports adding the `ruby` platform" do
-    bundle! "lock --add-platform ruby"
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array(local_platforms.unshift("ruby").uniq)
-  end
-
-  it "warns when adding an unknown platform" do
-    bundle "lock --add-platform foobarbaz"
-    expect(out).to include("The platform `foobarbaz` is unknown to RubyGems and adding it will likely lead to resolution errors")
-  end
-
-  it "allows removing platforms" do
-    bundle! "lock --add-platform java x86-mingw32"
-
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array(local_platforms.unshift(java, mingw).uniq)
-
-    bundle! "lock --remove-platform java"
-
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array(local_platforms.unshift(mingw).uniq)
-  end
-
-  it "errors when removing all platforms" do
-    bundle "lock --remove-platform #{local_platforms.join(" ")}"
-    expect(last_command.bundler_err).to include("Removing all platforms from the bundle is not allowed")
-  end
-
-  # from https://github.com/bundler/bundler/issues/4896
-  it "properly adds platforms when platform requirements come from different dependencies" do
-    build_repo4 do
-      build_gem "ffi", "1.9.14"
-      build_gem "ffi", "1.9.14" do |s|
-        s.platform = mingw
-      end
-
-      build_gem "gssapi", "0.1"
-      build_gem "gssapi", "0.2"
-      build_gem "gssapi", "0.3"
-      build_gem "gssapi", "1.2.0" do |s|
-        s.add_dependency "ffi", ">= 1.0.1"
-      end
-
-      build_gem "mixlib-shellout", "2.2.6"
-      build_gem "mixlib-shellout", "2.2.6" do |s|
-        s.platform = "universal-mingw32"
-        s.add_dependency "win32-process", "~> 0.8.2"
-      end
-
-      # we need all these versions to get the sorting the same as it would be
-      # pulling from rubygems.org
-      %w[0.8.3 0.8.2 0.8.1 0.8.0].each do |v|
-        build_gem "win32-process", v do |s|
-          s.add_dependency "ffi", ">= 1.0.0"
-        end
-      end
-    end
-
-    gemfile <<-G
-      source "file://localhost#{gem_repo4}"
-
-      gem "mixlib-shellout"
-      gem "gssapi"
-    G
-
-    simulate_platform(mingw) { bundle! :lock }
-
-    expect(the_bundle.lockfile).to read_as(normalize_uri_file(strip_whitespace(<<-G)))
-      GEM
-        remote: file://localhost#{gem_repo4}/
-        specs:
-          ffi (1.9.14-x86-mingw32)
-          gssapi (1.2.0)
-            ffi (>= 1.0.1)
-          mixlib-shellout (2.2.6-universal-mingw32)
-            win32-process (~> 0.8.2)
-          win32-process (0.8.3)
-            ffi (>= 1.0.0)
-
-      PLATFORMS
-        x86-mingw32
-
-      DEPENDENCIES
-        gssapi
-        mixlib-shellout
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    G
-
-    simulate_platform(rb) { bundle! :lock }
-
-    expect(the_bundle.lockfile).to read_as(normalize_uri_file(strip_whitespace(<<-G)))
-      GEM
-        remote: file://localhost#{gem_repo4}/
-        specs:
-          ffi (1.9.14)
-          ffi (1.9.14-x86-mingw32)
-          gssapi (1.2.0)
-            ffi (>= 1.0.1)
-          mixlib-shellout (2.2.6)
-          mixlib-shellout (2.2.6-universal-mingw32)
-            win32-process (~> 0.8.2)
-          win32-process (0.8.3)
-            ffi (>= 1.0.0)
-
-      PLATFORMS
-        ruby
-        x86-mingw32
-
-      DEPENDENCIES
-        gssapi
-        mixlib-shellout
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    G
-  end
-
-  context "when an update is available" do
-    let(:repo) { gem_repo2 }
-
-    before do
-      lockfile(@lockfile)
-      build_repo2 do
-        build_gem "foo", "2.0"
-      end
-    end
-
-    it "does not implicitly update" do
-      bundle! "lock"
-
-      expect(read_lockfile).to eq(@lockfile)
-    end
-
-    it "accounts for changes in the gemfile" do
-      gemfile gemfile.gsub('"foo"', '"foo", "2.0"')
-      bundle! "lock"
-
-      expect(read_lockfile).to eq(@lockfile.sub("foo (1.0)", "foo (2.0)").sub(/foo$/, "foo (= 2.0)"))
-    end
-  end
-end
diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
deleted file mode 100644
index e6d6e19122..0000000000
--- a/spec/bundler/commands/newgem_spec.rb
+++ /dev/null
@@ -1,912 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle gem" do
-  def reset!
-    super
-    global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
-  end
-
-  def remove_push_guard(gem_name)
-    # Remove exception that prevents public pushes on older RubyGems versions
-    if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.0")
-      path = "#{gem_name}/#{gem_name}.gemspec"
-      content = File.read(path).sub(/raise "RubyGems 2\.0 or newer.*/, "")
-      File.open(path, "w") {|f| f.write(content) }
-    end
-  end
-
-  def execute_bundle_gem(gem_name, flag = "", to_remove_push_guard = true)
-    bundle! "gem #{gem_name} #{flag}"
-    remove_push_guard(gem_name) if to_remove_push_guard
-    # reset gemspec cache for each test because of commit 3d4163a
-    Bundler.clear_gemspec_cache
-  end
-
-  def gem_skeleton_assertions(gem_name)
-    expect(bundled_app("#{gem_name}/#{gem_name}.gemspec")).to exist
-    expect(bundled_app("#{gem_name}/README.md")).to exist
-    expect(bundled_app("#{gem_name}/Gemfile")).to exist
-    expect(bundled_app("#{gem_name}/Rakefile")).to exist
-    expect(bundled_app("#{gem_name}/lib/test/gem.rb")).to exist
-    expect(bundled_app("#{gem_name}/lib/test/gem/version.rb")).to exist
-  end
-
-  before do
-    git_config_content = <<-EOF
-    [user]
-      name = "Bundler User"
-      email = user@example.com
-    [github]
-      user = bundleuser
-    EOF
-    @git_config_location = ENV["GIT_CONFIG"]
-    path = "#{File.expand_path(tmp, File.dirname(__FILE__))}/test_git_config.txt"
-    File.open(path, "w") {|f| f.write(git_config_content) }
-    ENV["GIT_CONFIG"] = path
-  end
-
-  after do
-    FileUtils.rm(ENV["GIT_CONFIG"]) if File.exist?(ENV["GIT_CONFIG"])
-    ENV["GIT_CONFIG"] = @git_config_location
-  end
-
-  shared_examples_for "git config is present" do
-    context "git config user.{name,email} present" do
-      it "sets gemspec author to git user.name if available" do
-        expect(generated_gem.gemspec.authors.first).to eq("Bundler User")
-      end
-
-      it "sets gemspec email to git user.email if available" do
-        expect(generated_gem.gemspec.email.first).to eq("user@example.com")
-      end
-    end
-  end
-
-  shared_examples_for "git config is absent" do
-    it "sets gemspec author to default message if git user.name is not set or empty" do
-      expect(generated_gem.gemspec.authors.first).to eq("TODO: Write your name")
-    end
-
-    it "sets gemspec email to default message if git user.email is not set or empty" do
-      expect(generated_gem.gemspec.email.first).to eq("TODO: Write your email address")
-    end
-  end
-
-  shared_examples_for "--mit flag" do
-    before do
-      execute_bundle_gem(gem_name, "--mit")
-    end
-    it "generates a gem skeleton with MIT license" do
-      gem_skeleton_assertions(gem_name)
-      expect(bundled_app("test-gem/LICENSE.txt")).to exist
-      skel = Bundler::GemHelper.new(bundled_app(gem_name).to_s)
-      expect(skel.gemspec.license).to eq("MIT")
-    end
-  end
-
-  shared_examples_for "--no-mit flag" do
-    before do
-      execute_bundle_gem(gem_name, "--no-mit")
-    end
-    it "generates a gem skeleton without MIT license" do
-      gem_skeleton_assertions(gem_name)
-      expect(bundled_app("test-gem/LICENSE.txt")).to_not exist
-    end
-  end
-
-  shared_examples_for "--coc flag" do
-    before do
-      execute_bundle_gem(gem_name, "--coc", false)
-    end
-    it "generates a gem skeleton with MIT license" do
-      gem_skeleton_assertions(gem_name)
-      expect(bundled_app("test-gem/CODE_OF_CONDUCT.md")).to exist
-    end
-
-    describe "README additions" do
-      it "generates the README with a section for the Code of Conduct" do
-        expect(bundled_app("test-gem/README.md").read).to include("## Code of Conduct")
-        expect(bundled_app("test-gem/README.md").read).to include("https://github.com/bundleuser/#{gem_name}/blob/master/CODE_OF_CONDUCT.md")
-      end
-    end
-  end
-
-  shared_examples_for "--no-coc flag" do
-    before do
-      execute_bundle_gem(gem_name, "--no-coc", false)
-    end
-    it "generates a gem skeleton without Code of Conduct" do
-      gem_skeleton_assertions(gem_name)
-      expect(bundled_app("test-gem/CODE_OF_CONDUCT.md")).to_not exist
-    end
-
-    describe "README additions" do
-      it "generates the README without a section for the Code of Conduct" do
-        expect(bundled_app("test-gem/README.md").read).not_to include("## Code of Conduct")
-        expect(bundled_app("test-gem/README.md").read).not_to include("https://github.com/bundleuser/#{gem_name}/blob/master/CODE_OF_CONDUCT.md")
-      end
-    end
-  end
-
-  context "README.md" do
-    let(:gem_name) { "test_gem" }
-    let(:generated_gem) { Bundler::GemHelper.new(bundled_app(gem_name).to_s) }
-
-    context "git config github.user present" do
-      before do
-        execute_bundle_gem(gem_name)
-      end
-
-      it "contribute URL set to git username" do
-        expect(bundled_app("test_gem/README.md").read).not_to include("[USERNAME]")
-        expect(bundled_app("test_gem/README.md").read).to include("github.com/bundleuser")
-      end
-    end
-
-    context "git config github.user is absent" do
-      before do
-        sys_exec("git config --unset github.user")
-        reset!
-        in_app_root
-        bundle "gem #{gem_name}"
-        remove_push_guard(gem_name)
-      end
-
-      it "contribute URL set to [USERNAME]" do
-        expect(bundled_app("test_gem/README.md").read).to include("[USERNAME]")
-        expect(bundled_app("test_gem/README.md").read).not_to include("github.com/bundleuser")
-      end
-    end
-  end
-
-  it "creates a new git repository" do
-    in_app_root
-    bundle "gem test_gem"
-    expect(bundled_app("test_gem/.git")).to exist
-  end
-
-  context "when git is not available" do
-    let(:gem_name) { "test_gem" }
-
-    # This spec cannot have `git` available in the test env
-    before do
-      load_paths = [lib, spec]
-      load_path_str = "-I#{load_paths.join(File::PATH_SEPARATOR)}"
-
-      sys_exec "PATH=\"\" #{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}"
-    end
-
-    it "creates the gem without the need for git" do
-      expect(bundled_app("#{gem_name}/README.md")).to exist
-    end
-
-    it "doesn't create a git repo" do
-      expect(bundled_app("#{gem_name}/.git")).to_not exist
-    end
-
-    it "doesn't create a .gitignore file" do
-      expect(bundled_app("#{gem_name}/.gitignore")).to_not exist
-    end
-  end
-
-  it "generates a valid gemspec" do
-    in_app_root
-    bundle! "gem newgem --bin"
-
-    process_file(bundled_app("newgem", "newgem.gemspec")) do |line|
-      # Simulate replacing TODOs with real values
-      case line
-      when /spec\.metadata\["(?:allowed_push_host|homepage_uri|source_code_uri|changelog_uri)"\]/, /spec\.homepage/
-        line.gsub(/\=.*$/, "= 'http://example.org'")
-      when /spec\.summary/
-        line.gsub(/\=.*$/, "= %q{A short summary of my new gem.}")
-      when /spec\.description/
-        line.gsub(/\=.*$/, "= %q{A longer description of my new gem.}")
-      # Remove exception that prevents public pushes on older RubyGems versions
-      when /raise "RubyGems 2.0 or newer/
-        line.gsub(/.*/, "") if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.0")
-      else
-        line
-      end
-    end
-
-    Dir.chdir(bundled_app("newgem")) do
-      gems = ["rake-10.0.2", :bundler]
-      # for Ruby core repository, Ruby 2.6+ has bundler as standard library.
-      gems.delete(:bundler) if ruby_core?
-      system_gems gems, :path => :bundle_path
-      bundle! "exec rake build"
-    end
-
-    expect(last_command.stdboth).not_to include("ERROR")
-  end
-
-  context "gem naming with relative paths" do
-    before do
-      reset!
-      in_app_root
-    end
-
-    it "resolves ." do
-      create_temporary_dir("tmp")
-
-      bundle "gem ."
-
-      expect(bundled_app("tmp/lib/tmp.rb")).to exist
-    end
-
-    it "resolves .." do
-      create_temporary_dir("temp/empty_dir")
-
-      bundle "gem .."
-
-      expect(bundled_app("temp/lib/temp.rb")).to exist
-    end
-
-    it "resolves relative directory" do
-      create_temporary_dir("tmp/empty/tmp")
-
-      bundle "gem ../../empty"
-
-      expect(bundled_app("tmp/empty/lib/empty.rb")).to exist
-    end
-
-    def create_temporary_dir(dir)
-      FileUtils.mkdir_p(dir)
-      Dir.chdir(dir)
-    end
-  end
-
-  context "gem naming with underscore" do
-    let(:gem_name) { "test_gem" }
-
-    before do
-      execute_bundle_gem(gem_name)
-    end
-
-    let(:generated_gem) { Bundler::GemHelper.new(bundled_app(gem_name).to_s) }
-
-    it "generates a gem skeleton" do
-      expect(bundled_app("test_gem/test_gem.gemspec")).to exist
-      expect(bundled_app("test_gem/Gemfile")).to exist
-      expect(bundled_app("test_gem/Rakefile")).to exist
-      expect(bundled_app("test_gem/lib/test_gem.rb")).to exist
-      expect(bundled_app("test_gem/lib/test_gem/version.rb")).to exist
-      expect(bundled_app("test_gem/.gitignore")).to exist
-
-      expect(bundled_app("test_gem/bin/setup")).to exist
-      expect(bundled_app("test_gem/bin/console")).to exist
-      expect(bundled_app("test_gem/bin/setup")).to be_executable
-      expect(bundled_app("test_gem/bin/console")).to be_executable
-    end
-
-    it "starts with version 0.1.0" do
-      expect(bundled_app("test_gem/lib/test_gem/version.rb").read).to match(/VERSION = "0.1.0"/)
-    end
-
-    it "does not nest constants" do
-      expect(bundled_app("test_gem/lib/test_gem/version.rb").read).to match(/module TestGem/)
-      expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(/module TestGem/)
-    end
-
-    it_should_behave_like "git config is present"
-
-    context "git config user.{name,email} is not set" do
-      before do
-        `git config --unset user.name`
-        `git config --unset user.email`
-        reset!
-        in_app_root
-        bundle "gem #{gem_name}"
-        remove_push_guard(gem_name)
-      end
-
-      it_should_behave_like "git config is absent"
-    end
-
-    it "sets gemspec metadata['allowed_push_host']", :rubygems => "2.0" do
-      expect(generated_gem.gemspec.metadata["allowed_push_host"]).
-        to match(/mygemserver\.com/)
-    end
-
-    it "requires the version file" do
-      expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(%r{require "test_gem/version"})
-    end
-
-    it "creates a base error class" do
-      expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(/class Error < StandardError; end$/)
-    end
-
-    it "runs rake without problems" do
-      system_gems ["rake-10.0.2"]
-
-      rakefile = strip_whitespace <<-RAKEFILE
-        task :default do
-          puts 'SUCCESS'
-        end
-      RAKEFILE
-      File.open(bundled_app("test_gem/Rakefile"), "w") do |file|
-        file.puts rakefile
-      end
-
-      Dir.chdir(bundled_app(gem_name)) do
-        sys_exec(rake)
-        expect(out).to include("SUCCESS")
-      end
-    end
-
-    context "--exe parameter set" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --exe"
-      end
-
-      it "builds exe skeleton" do
-        expect(bundled_app("test_gem/exe/test_gem")).to exist
-      end
-
-      it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/exe/test_gem").read).to match(/require "test_gem"/)
-      end
-    end
-
-    context "--bin parameter set" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --bin"
-      end
-
-      it "builds exe skeleton" do
-        expect(bundled_app("test_gem/exe/test_gem")).to exist
-      end
-
-      it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/exe/test_gem").read).to match(/require "test_gem"/)
-      end
-    end
-
-    context "no --test parameter" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name}"
-      end
-
-      it "doesn't create any spec/test file" do
-        expect(bundled_app("test_gem/.rspec")).to_not exist
-        expect(bundled_app("test_gem/spec/test_gem_spec.rb")).to_not exist
-        expect(bundled_app("test_gem/spec/spec_helper.rb")).to_not exist
-        expect(bundled_app("test_gem/test/test_test_gem.rb")).to_not exist
-        expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
-      end
-    end
-
-    context "--test parameter set to rspec" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test=rspec"
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test_gem/.rspec")).to exist
-        expect(bundled_app("test_gem/spec/test_gem_spec.rb")).to exist
-        expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
-      end
-
-      it "depends on a specific version of rspec", :rubygems => ">= 1.8.1" do
-        remove_push_guard(gem_name)
-        rspec_dep = generated_gem.gemspec.development_dependencies.find {|d| d.name == "rspec" }
-        expect(rspec_dep).to be_specific
-      end
-
-      it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/spec/spec_helper.rb").read).to include(%(require "test_gem"))
-      end
-
-      it "creates a default test which fails" do
-        expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to include("expect(false).to eq(true)")
-      end
-    end
-
-    context "gem.test setting set to rspec" do
-      before do
-        reset!
-        in_app_root
-        bundle "config gem.test rspec"
-        bundle "gem #{gem_name}"
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test_gem/.rspec")).to exist
-        expect(bundled_app("test_gem/spec/test_gem_spec.rb")).to exist
-        expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
-      end
-    end
-
-    context "gem.test setting set to rspec and --test is set to minitest" do
-      before do
-        reset!
-        in_app_root
-        bundle "config gem.test rspec"
-        bundle "gem #{gem_name} --test=minitest"
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test_gem/test/test_gem_test.rb")).to exist
-        expect(bundled_app("test_gem/test/test_helper.rb")).to exist
-      end
-    end
-
-    context "--test parameter set to minitest" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test=minitest"
-      end
-
-      it "depends on a specific version of minitest", :rubygems => ">= 1.8.1" do
-        remove_push_guard(gem_name)
-        rspec_dep = generated_gem.gemspec.development_dependencies.find {|d| d.name == "minitest" }
-        expect(rspec_dep).to be_specific
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test_gem/test/test_gem_test.rb")).to exist
-        expect(bundled_app("test_gem/test/test_helper.rb")).to exist
-      end
-
-      it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/test/test_helper.rb").read).to include(%(require "test_gem"))
-      end
-
-      it "requires 'minitest_helper'" do
-        expect(bundled_app("test_gem/test/test_gem_test.rb").read).to include(%(require "test_helper"))
-      end
-
-      it "creates a default test which fails" do
-        expect(bundled_app("test_gem/test/test_gem_test.rb").read).to include("assert false")
-      end
-    end
-
-    context "gem.test setting set to minitest" do
-      before do
-        reset!
-        in_app_root
-        bundle "config gem.test minitest"
-        bundle "gem #{gem_name}"
-      end
-
-      it "creates a default rake task to run the test suite" do
-        rakefile = strip_whitespace <<-RAKEFILE
-          require "bundler/gem_tasks"
-          require "rake/testtask"
-
-          Rake::TestTask.new(:test) do |t|
-            t.libs << "test"
-            t.libs << "lib"
-            t.test_files = FileList["test/**/*_test.rb"]
-          end
-
-          task :default => :test
-        RAKEFILE
-
-        expect(bundled_app("test_gem/Rakefile").read).to eq(rakefile)
-      end
-    end
-
-    context "--test with no arguments" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test"
-      end
-
-      it "defaults to rspec" do
-        expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
-        expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
-      end
-
-      it "creates a .travis.yml file to test the library against the current Ruby version on Travis CI" do
-        expect(bundled_app("test_gem/.travis.yml").read).to match(/- #{RUBY_VERSION}/)
-      end
-    end
-
-    context "--edit option" do
-      it "opens the generated gemspec in the user's text editor" do
-        reset!
-        in_app_root
-        output = bundle "gem #{gem_name} --edit=echo"
-        gemspec_path = File.join(Dir.pwd, gem_name, "#{gem_name}.gemspec")
-        expect(output).to include("echo \"#{gemspec_path}\"")
-      end
-    end
-  end
-
-  context "testing --mit and --coc options against bundle config settings" do
-    let(:gem_name) { "test-gem" }
-
-    context "with mit option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__MIT" => "true", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
-      end
-      after { reset! }
-      it_behaves_like "--mit flag"
-      it_behaves_like "--no-mit flag"
-    end
-
-    context "with mit option in bundle config settings set to false" do
-      it_behaves_like "--mit flag"
-      it_behaves_like "--no-mit flag"
-    end
-
-    context "with coc option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "true"
-      end
-      after { reset! }
-      it_behaves_like "--coc flag"
-      it_behaves_like "--no-coc flag"
-    end
-
-    context "with coc option in bundle config settings set to false" do
-      it_behaves_like "--coc flag"
-      it_behaves_like "--no-coc flag"
-    end
-  end
-
-  context "gem naming with dashed" do
-    let(:gem_name) { "test-gem" }
-
-    before do
-      execute_bundle_gem(gem_name)
-    end
-
-    let(:generated_gem) { Bundler::GemHelper.new(bundled_app(gem_name).to_s) }
-
-    it "generates a gem skeleton" do
-      expect(bundled_app("test-gem/test-gem.gemspec")).to exist
-      expect(bundled_app("test-gem/Gemfile")).to exist
-      expect(bundled_app("test-gem/Rakefile")).to exist
-      expect(bundled_app("test-gem/lib/test/gem.rb")).to exist
-      expect(bundled_app("test-gem/lib/test/gem/version.rb")).to exist
-    end
-
-    it "starts with version 0.1.0" do
-      expect(bundled_app("test-gem/lib/test/gem/version.rb").read).to match(/VERSION = "0.1.0"/)
-    end
-
-    it "nests constants so they work" do
-      expect(bundled_app("test-gem/lib/test/gem/version.rb").read).to match(/module Test\n  module Gem/)
-      expect(bundled_app("test-gem/lib/test/gem.rb").read).to match(/module Test\n  module Gem/)
-    end
-
-    it_should_behave_like "git config is present"
-
-    context "git config user.{name,email} is not set" do
-      before do
-        `git config --unset user.name`
-        `git config --unset user.email`
-        reset!
-        in_app_root
-        bundle "gem #{gem_name}"
-        remove_push_guard(gem_name)
-      end
-
-      it_should_behave_like "git config is absent"
-    end
-
-    it "requires the version file" do
-      expect(bundled_app("test-gem/lib/test/gem.rb").read).to match(%r{require "test/gem/version"})
-    end
-
-    it "runs rake without problems" do
-      system_gems ["rake-10.0.2"]
-
-      rakefile = strip_whitespace <<-RAKEFILE
-        task :default do
-          puts 'SUCCESS'
-        end
-      RAKEFILE
-      File.open(bundled_app("test-gem/Rakefile"), "w") do |file|
-        file.puts rakefile
-      end
-
-      Dir.chdir(bundled_app(gem_name)) do
-        sys_exec(rake)
-        expect(out).to include("SUCCESS")
-      end
-    end
-
-    context "--bin parameter set" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --bin"
-      end
-
-      it "builds bin skeleton" do
-        expect(bundled_app("test-gem/exe/test-gem")).to exist
-      end
-
-      it "requires 'test/gem'" do
-        expect(bundled_app("test-gem/exe/test-gem").read).to match(%r{require "test/gem"})
-      end
-    end
-
-    context "no --test parameter" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name}"
-      end
-
-      it "doesn't create any spec/test file" do
-        expect(bundled_app("test-gem/.rspec")).to_not exist
-        expect(bundled_app("test-gem/spec/test/gem_spec.rb")).to_not exist
-        expect(bundled_app("test-gem/spec/spec_helper.rb")).to_not exist
-        expect(bundled_app("test-gem/test/test_test/gem.rb")).to_not exist
-        expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
-      end
-    end
-
-    context "--test parameter set to rspec" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test=rspec"
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test-gem/.rspec")).to exist
-        expect(bundled_app("test-gem/spec/test/gem_spec.rb")).to exist
-        expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
-      end
-
-      it "requires 'test/gem'" do
-        expect(bundled_app("test-gem/spec/spec_helper.rb").read).to include(%(require "test/gem"))
-      end
-
-      it "creates a default test which fails" do
-        expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to include("expect(false).to eq(true)")
-      end
-
-      it "creates a default rake task to run the specs" do
-        rakefile = strip_whitespace <<-RAKEFILE
-          require "bundler/gem_tasks"
-          require "rspec/core/rake_task"
-
-          RSpec::Core::RakeTask.new(:spec)
-
-          task :default => :spec
-        RAKEFILE
-
-        expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
-      end
-    end
-
-    context "--test parameter set to minitest" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test=minitest"
-      end
-
-      it "builds spec skeleton" do
-        expect(bundled_app("test-gem/test/test/gem_test.rb")).to exist
-        expect(bundled_app("test-gem/test/test_helper.rb")).to exist
-      end
-
-      it "requires 'test/gem'" do
-        expect(bundled_app("test-gem/test/test_helper.rb").read).to match(%r{require "test/gem"})
-      end
-
-      it "requires 'test_helper'" do
-        expect(bundled_app("test-gem/test/test/gem_test.rb").read).to match(/require "test_helper"/)
-      end
-
-      it "creates a default test which fails" do
-        expect(bundled_app("test-gem/test/test/gem_test.rb").read).to match(/assert false/)
-      end
-
-      it "creates a default rake task to run the test suite" do
-        rakefile = strip_whitespace <<-RAKEFILE
-          require "bundler/gem_tasks"
-          require "rake/testtask"
-
-          Rake::TestTask.new(:test) do |t|
-            t.libs << "test"
-            t.libs << "lib"
-            t.test_files = FileList["test/**/*_test.rb"]
-          end
-
-          task :default => :test
-        RAKEFILE
-
-        expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
-      end
-    end
-
-    context "--test with no arguments" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem #{gem_name} --test"
-      end
-
-      it "defaults to rspec" do
-        expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
-        expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
-      end
-    end
-
-    context "--ext parameter set" do
-      before do
-        reset!
-        in_app_root
-        bundle "gem test_gem --ext"
-      end
-
-      it "builds ext skeleton" do
-        expect(bundled_app("test_gem/ext/test_gem/extconf.rb")).to exist
-        expect(bundled_app("test_gem/ext/test_gem/test_gem.h")).to exist
-        expect(bundled_app("test_gem/ext/test_gem/test_gem.c")).to exist
-      end
-
-      it "includes rake-compiler" do
-        expect(bundled_app("test_gem/test_gem.gemspec").read).to include('spec.add_development_dependency "rake-compiler"')
-      end
-
-      it "depends on compile task for build" do
-        rakefile = strip_whitespace <<-RAKEFILE
-          require "bundler/gem_tasks"
-          require "rake/extensiontask"
-
-          task :build => :compile
-
-          Rake::ExtensionTask.new("test_gem") do |ext|
-            ext.lib_dir = "lib/test_gem"
-          end
-
-          task :default => [:clobber, :compile, :spec]
-        RAKEFILE
-
-        expect(bundled_app("test_gem/Rakefile").read).to eq(rakefile)
-      end
-    end
-  end
-
-  describe "uncommon gem names" do
-    it "can deal with two dashes" do
-      bundle "gem a--a"
-      Bundler.clear_gemspec_cache
-
-      expect(bundled_app("a--a/a--a.gemspec")).to exist
-    end
-
-    it "fails gracefully with a ." do
-      bundle "gem foo.gemspec"
-      expect(last_command.bundler_err).to end_with("Invalid gem name foo.gemspec -- `Foo.gemspec` is an invalid constant name")
-    end
-
-    it "fails gracefully with a ^" do
-      bundle "gem ^"
-      expect(last_command.bundler_err).to end_with("Invalid gem name ^ -- `^` is an invalid constant name")
-    end
-
-    it "fails gracefully with a space" do
-      bundle "gem 'foo bar'"
-      expect(last_command.bundler_err).to end_with("Invalid gem name foo bar -- `Foo bar` is an invalid constant name")
-    end
-
-    it "fails gracefully when multiple names are passed" do
-      bundle "gem foo bar baz"
-      expect(last_command.bundler_err).to eq(<<-E.strip)
-ERROR: "bundle gem" was called with arguments ["foo", "bar", "baz"]
-Usage: "bundle gem NAME [OPTIONS]"
-      E
-    end
-  end
-
-  describe "#ensure_safe_gem_name" do
-    before do
-      bundle "gem #{subject}"
-    end
-    after do
-      Bundler.clear_gemspec_cache
-    end
-
-    context "with an existing const name" do
-      subject { "gem" }
-      it { expect(out).to include("Invalid gem name #{subject}") }
-    end
-
-    context "with an existing hyphenated const name" do
-      subject { "gem-specification" }
-      it { expect(out).to include("Invalid gem name #{subject}") }
-    end
-
-    context "starting with an existing const name" do
-      subject { "gem-somenewconstantname" }
-      it { expect(out).not_to include("Invalid gem name #{subject}") }
-    end
-
-    context "ending with an existing const name" do
-      subject { "somenewconstantname-gem" }
-      it { expect(out).not_to include("Invalid gem name #{subject}") }
-    end
-  end
-
-  context "on first run" do
-    before do
-      in_app_root
-    end
-
-    it "asks about test framework" do
-      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__COC" => "false"
-
-      bundle "gem foobar" do |input, _, _|
-        input.puts "rspec"
-      end
-
-      expect(bundled_app("foobar/spec/spec_helper.rb")).to exist
-      rakefile = strip_whitespace <<-RAKEFILE
-        require "bundler/gem_tasks"
-        require "rspec/core/rake_task"
-
-        RSpec::Core::RakeTask.new(:spec)
-
-        task :default => :spec
-      RAKEFILE
-
-      expect(bundled_app("foobar/Rakefile").read).to eq(rakefile)
-      expect(bundled_app("foobar/foobar.gemspec").read).to include('spec.add_development_dependency "rspec"')
-    end
-
-    it "asks about MIT license" do
-      global_config "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
-
-      bundle :config
-
-      bundle "gem foobar" do |input, _, _|
-        input.puts "yes"
-      end
-
-      expect(bundled_app("foobar/LICENSE.txt")).to exist
-    end
-
-    it "asks about CoC" do
-      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false"
-
-      bundle "gem foobar" do |input, _, _|
-        input.puts "yes"
-      end
-
-      expect(bundled_app("foobar/CODE_OF_CONDUCT.md")).to exist
-    end
-  end
-
-  context "on conflicts with a previously created file" do
-    it "should fail gracefully" do
-      in_app_root do
-        FileUtils.touch("conflict-foobar")
-      end
-      bundle "gem conflict-foobar"
-      expect(last_command.bundler_err).to include("Errno::ENOTDIR")
-      expect(exitstatus).to eql(32) if exitstatus
-    end
-  end
-
-  context "on conflicts with a previously created directory" do
-    it "should succeed" do
-      in_app_root do
-        FileUtils.mkdir_p("conflict-foobar/Gemfile")
-      end
-      bundle! "gem conflict-foobar"
-      expect(last_command.stdout).to include("file_clash  conflict-foobar/Gemfile").
-        and include "Initializing git repo in #{bundled_app("conflict-foobar")}"
-    end
-  end
-end
diff --git a/spec/bundler/commands/open_spec.rb b/spec/bundler/commands/open_spec.rb
deleted file mode 100644
index 5cab846fb5..0000000000
--- a/spec/bundler/commands/open_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle open" do
-  before :each do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-  end
-
-  it "opens the gem with BUNDLER_EDITOR as highest priority" do
-    bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-    expect(out).to include("bundler_editor #{default_bundle_path("gems", "rails-2.3.2")}")
-  end
-
-  it "opens the gem with VISUAL as 2nd highest priority" do
-    bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "" }
-    expect(out).to include("visual #{default_bundle_path("gems", "rails-2.3.2")}")
-  end
-
-  it "opens the gem with EDITOR as 3rd highest priority" do
-    bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to include("editor #{default_bundle_path("gems", "rails-2.3.2")}")
-  end
-
-  it "complains if no EDITOR is set" do
-    bundle "open rails", :env => { "EDITOR" => "", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to eq("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
-  end
-
-  it "complains if gem not in bundle" do
-    bundle "open missing", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to match(/could not find gem 'missing'/i)
-  end
-
-  it "does not blow up if the gem to open does not have a Gemfile" do
-    git = build_git "foo"
-    ref = git.ref_for("master", 11)
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'foo', :git => "#{lib_path("foo-1.0")}"
-    G
-
-    bundle "open foo", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to match("editor #{default_bundle_path.join("bundler/gems/foo-1.0-#{ref}")}")
-  end
-
-  it "suggests alternatives for similar-sounding gems" do
-    bundle "open Rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to match(/did you mean rails\?/i)
-  end
-
-  it "opens the gem with short words" do
-    bundle "open rec", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-
-    expect(out).to include("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2")}")
-  end
-
-  it "select the gem from many match gems" do
-    env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-    bundle "open active", :env => env do |input, _, _|
-      input.puts "2"
-    end
-
-    expect(out).to match(/bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}\z/)
-  end
-
-  it "allows selecting exit from many match gems" do
-    env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-    bundle! "open active", :env => env do |input, _, _|
-      input.puts "0"
-    end
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).to include("Installing foo 1.0")
-  end
-
-  it "opens the editor with a clean env" do
-    bundle "open", :env => { "EDITOR" => "sh -c 'env'", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-    expect(out).not_to include("BUNDLE_GEMFILE=")
-  end
-end
diff --git a/spec/bundler/commands/outdated_spec.rb b/spec/bundler/commands/outdated_spec.rb
deleted file mode 100644
index fc1f1772e7..0000000000
--- a/spec/bundler/commands/outdated_spec.rb
+++ /dev/null
@@ -1,782 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle outdated" do
-  before :each do
-    build_repo2 do
-      build_git "foo", :path => lib_path("foo")
-      build_git "zebra", :path => lib_path("zebra")
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "zebra", :git => "#{lib_path("zebra")}"
-      gem "foo", :git => "#{lib_path("foo")}"
-      gem "activesupport", "2.3.5"
-      gem "weakling", "~> 0.0.1"
-      gem "duradura", '7.0'
-      gem "terranova", '8'
-    G
-  end
-
-  describe "with no arguments" do
-    it "returns a sorted list of outdated gems" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        build_gem "weakling", "0.2"
-        update_git "foo", :path => lib_path("foo")
-        update_git "zebra", :path => lib_path("zebra")
-      end
-
-      bundle "outdated"
-
-      expect(out).to include("activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)")
-      expect(out).to include("weakling (newest 0.2, installed 0.0.3, requested ~> 0.0.1)")
-      expect(out).to include("foo (newest 1.0")
-
-      # Gem names are one per-line, between "*" and their parenthesized version.
-      gem_list = out.split("\n").map {|g| g[/\* (.*) \(/, 1] }.compact
-      expect(gem_list).to eq(gem_list.sort)
-    end
-
-    it "returns non zero exit status if outdated gems present" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
-      end
-
-      bundle "outdated"
-
-      expect(exitstatus).to_not be_zero if exitstatus
-    end
-
-    it "returns success exit status if no outdated gems present" do
-      bundle "outdated"
-
-      expect(exitstatus).to be_zero if exitstatus
-    end
-
-    it "adds gem group to dependency output when repo is updated" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        group :development, :test do
-          gem 'activesupport', '2.3.5'
-        end
-      G
-
-      update_repo2 { build_gem "activesupport", "3.0" }
-
-      bundle "outdated --verbose"
-      expect(out).to include("activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5) in groups \"development, test\"")
-    end
-  end
-
-  describe "with --group option" do
-    def test_group_option(group = nil, gems_list_size = 1)
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "weakling", "~> 0.0.1"
-        gem "terranova", '8'
-        group :development, :test do
-          gem "duradura", '7.0'
-          gem 'activesupport', '2.3.5'
-        end
-      G
-
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        build_gem "terranova", "9"
-        build_gem "duradura", "8.0"
-      end
-
-      bundle "outdated --group #{group}"
-
-      # Gem names are one per-line, between "*" and their parenthesized version.
-      gem_list = out.split("\n").map {|g| g[/\* (.*) \(/, 1] }.compact
-      expect(gem_list).to eq(gem_list.sort)
-      expect(gem_list.size).to eq gems_list_size
-    end
-
-    it "not outdated gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "weakling", "~> 0.0.1"
-        gem "terranova", '8'
-        group :development, :test do
-          gem 'activesupport', '2.3.5'
-          gem "duradura", '7.0'
-        end
-      G
-
-      bundle "outdated --group"
-      expect(out).to include("Bundle up to date!")
-    end
-
-    it "returns a sorted list of outdated gems from one group => 'default'" do
-      test_group_option("default")
-
-      expect(out).to include("===== Group default =====")
-      expect(out).to include("terranova (")
-
-      expect(out).not_to include("===== Group development, test =====")
-      expect(out).not_to include("activesupport")
-      expect(out).not_to include("duradura")
-    end
-
-    it "returns a sorted list of outdated gems from one group => 'development'" do
-      test_group_option("development", 2)
-
-      expect(out).not_to include("===== Group default =====")
-      expect(out).not_to include("terranova (")
-
-      expect(out).to include("===== Group development, test =====")
-      expect(out).to include("activesupport")
-      expect(out).to include("duradura")
-    end
-  end
-
-  describe "with --groups option" do
-    it "not outdated gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "weakling", "~> 0.0.1"
-        gem "terranova", '8'
-        group :development, :test do
-          gem 'activesupport', '2.3.5'
-          gem "duradura", '7.0'
-        end
-      G
-
-      bundle "outdated --groups"
-      expect(out).to include("Bundle up to date!")
-    end
-
-    it "returns a sorted list of outdated gems by groups" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "weakling", "~> 0.0.1"
-        gem "terranova", '8'
-        group :development, :test do
-          gem 'activesupport', '2.3.5'
-          gem "duradura", '7.0'
-        end
-      G
-
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        build_gem "terranova", "9"
-        build_gem "duradura", "8.0"
-      end
-
-      bundle "outdated --groups"
-      expect(out).to include("===== Group default =====")
-      expect(out).to include("terranova (newest 9, installed 8, requested = 8)")
-      expect(out).to include("===== Group development, test =====")
-      expect(out).to include("activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)")
-      expect(out).to include("duradura (newest 8.0, installed 7.0, requested = 7.0)")
-
-      expect(out).not_to include("weakling (")
-
-      # TODO: check gems order inside the group
-    end
-  end
-
-  describe "with --local option" do
-    it "uses local cache to return a list of outdated gems" do
-      update_repo2 do
-        build_gem "activesupport", "2.3.4"
-      end
-
-      bundle! "config clean false"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport", "2.3.4"
-      G
-
-      bundle "outdated --local"
-
-      expect(out).to include("activesupport (newest 2.3.5, installed 2.3.4, requested = 2.3.4)")
-    end
-
-    it "doesn't hit repo2" do
-      FileUtils.rm_rf(gem_repo2)
-
-      bundle "outdated --local"
-      expect(out).not_to match(/Fetching (gem|version|dependency) metadata from/)
-    end
-  end
-
-  shared_examples_for "a minimal output is desired" do
-    context "and gems are outdated" do
-      before do
-        update_repo2 do
-          build_gem "activesupport", "3.0"
-          build_gem "weakling", "0.2"
-        end
-      end
-
-      it "outputs a sorted list of outdated gems with a more minimal format" do
-        minimal_output = "activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)\n" \
-                         "weakling (newest 0.2, installed 0.0.3, requested ~> 0.0.1)"
-        subject
-        expect(out).to eq(minimal_output)
-      end
-    end
-
-    context "and no gems are outdated" do
-      it "has empty output" do
-        subject
-        expect(out).to eq("")
-      end
-    end
-  end
-
-  describe "with --parseable option" do
-    subject { bundle "outdated --parseable" }
-
-    it_behaves_like "a minimal output is desired"
-  end
-
-  describe "with aliased --porcelain option" do
-    subject { bundle "outdated --porcelain" }
-
-    it_behaves_like "a minimal output is desired"
-  end
-
-  describe "with specified gems" do
-    it "returns list of outdated gems" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
-      end
-
-      bundle "outdated foo"
-      expect(out).not_to include("activesupport (newest")
-      expect(out).to include("foo (newest 1.0")
-    end
-  end
-
-  describe "pre-release gems" do
-    context "without the --pre option" do
-      it "ignores pre-release versions" do
-        update_repo2 do
-          build_gem "activesupport", "3.0.0.beta"
-        end
-
-        bundle "outdated"
-        expect(out).not_to include("activesupport (3.0.0.beta > 2.3.5)")
-      end
-    end
-
-    context "with the --pre option" do
-      it "includes pre-release versions" do
-        update_repo2 do
-          build_gem "activesupport", "3.0.0.beta"
-        end
-
-        bundle "outdated --pre"
-        expect(out).to include("activesupport (newest 3.0.0.beta, installed 2.3.5, requested = 2.3.5)")
-      end
-    end
-
-    context "when current gem is a pre-release" do
-      it "includes the gem" do
-        update_repo2 do
-          build_gem "activesupport", "3.0.0.beta.1"
-          build_gem "activesupport", "3.0.0.beta.2"
-        end
-
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport", "3.0.0.beta.1"
-        G
-
-        bundle "outdated"
-        expect(out).to include("(newest 3.0.0.beta.2, installed 3.0.0.beta.1, requested = 3.0.0.beta.1)")
-      end
-    end
-  end
-
-  describe "with --strict option" do
-    it "only reports gems that have a newer version that matches the specified dependency version requirements" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-        build_gem "weakling", "0.0.5"
-      end
-
-      bundle "outdated --strict"
-
-      expect(out).to_not include("activesupport (newest")
-      expect(out).to include("(newest 0.0.5, installed 0.0.3, requested ~> 0.0.1)")
-    end
-
-    it "only reports gem dependencies when they can actually be updated" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack_middleware", "1.0"
-      G
-
-      bundle "outdated --strict"
-
-      expect(out).to_not include("rack (1.2")
-    end
-
-    describe "and filter options" do
-      it "only reports gems that match requirement and patch filter level" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport", "~> 2.3"
-          gem "weakling", ">= 0.0.1"
-        G
-
-        update_repo2 do
-          build_gem "activesupport", %w[2.4.0 3.0.0]
-          build_gem "weakling", "0.0.5"
-        end
-
-        bundle "outdated --strict --filter-patch"
-
-        expect(out).to_not include("activesupport (newest")
-        expect(out).to include("(newest 0.0.5, installed 0.0.3")
-      end
-
-      it "only reports gems that match requirement and minor filter level" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport", "~> 2.3"
-          gem "weakling", ">= 0.0.1"
-        G
-
-        update_repo2 do
-          build_gem "activesupport", %w[2.3.9]
-          build_gem "weakling", "0.1.5"
-        end
-
-        bundle "outdated --strict --filter-minor"
-
-        expect(out).to_not include("activesupport (newest")
-        expect(out).to include("(newest 0.1.5, installed 0.0.3")
-      end
-
-      it "only reports gems that match requirement and major filter level" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport", "~> 2.3"
-          gem "weakling", ">= 0.0.1"
-        G
-
-        update_repo2 do
-          build_gem "activesupport", %w[2.4.0 2.5.0]
-          build_gem "weakling", "1.1.5"
-        end
-
-        bundle "outdated --strict --filter-major"
-
-        expect(out).to_not include("activesupport (newest")
-        expect(out).to include("(newest 1.1.5, installed 0.0.3")
-      end
-    end
-  end
-
-  describe "with invalid gem name" do
-    it "returns could not find gem name" do
-      bundle "outdated invalid_gem_name"
-      expect(out).to include("Could not find gem 'invalid_gem_name'.")
-    end
-
-    it "returns non-zero exit code" do
-      bundle "outdated invalid_gem_name"
-      expect(exitstatus).to_not be_zero if exitstatus
-    end
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack", "0.9.1"
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle :outdated
-    expect(out).to include("Installing foo 1.0")
-  end
-
-  context "after bundle install --deployment", :bundler => "< 2" do
-    before do
-      install_gemfile <<-G, forgotten_command_line_options(:deployment => true)
-        source "file://#{gem_repo2}"
-
-        gem "rack"
-        gem "foo"
-      G
-    end
-
-    it "outputs a helpful message about being in deployment mode" do
-      update_repo2 { build_gem "activesupport", "3.0" }
-
-      bundle "outdated"
-      expect(last_command).to be_failure
-      expect(out).to include("You are trying to check outdated gems in deployment mode.")
-      expect(out).to include("Run `bundle outdated` elsewhere.")
-      expect(out).to include("If this is a development machine, remove the ")
-      expect(out).to include("Gemfile freeze\nby running `bundle install --no-deployment`.")
-    end
-  end
-
-  context "after bundle config deployment true" do
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "rack"
-        gem "foo"
-      G
-      bundle! "config deployment true"
-    end
-
-    it "outputs a helpful message about being in deployment mode" do
-      update_repo2 { build_gem "activesupport", "3.0" }
-
-      bundle "outdated"
-      expect(last_command).to be_failure
-      expect(out).to include("You are trying to check outdated gems in deployment mode.")
-      expect(out).to include("Run `bundle outdated` elsewhere.")
-      expect(out).to include("If this is a development machine, remove the ")
-      expect(out).to include("Gemfile freeze\nby running `bundle config --delete deployment`.")
-    end
-  end
-
-  context "update available for a gem on a different platform" do
-    before do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "laduradura", '= 5.15.2'
-      G
-    end
-
-    it "reports that no updates are available" do
-      bundle "outdated"
-      expect(out).to include("Bundle up to date!")
-    end
-  end
-
-  context "update available for a gem on the same platform while multiple platforms used for gem" do
-    it "reports that updates are available if the Ruby platform is used" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "laduradura", '= 5.15.2', :platforms => [:ruby, :jruby]
-      G
-
-      bundle "outdated"
-      expect(out).to include("Bundle up to date!")
-    end
-
-    it "reports that updates are available if the JRuby platform is used" do
-      simulate_ruby_engine "jruby", "1.6.7" do
-        simulate_platform "jruby" do
-          install_gemfile <<-G
-            source "file://#{gem_repo2}"
-            gem "laduradura", '= 5.15.2', :platforms => [:ruby, :jruby]
-          G
-
-          bundle "outdated"
-          expect(out).to include("Outdated gems included in the bundle:")
-          expect(out).to include("laduradura (newest 5.15.3, installed 5.15.2, requested = 5.15.2)")
-        end
-      end
-    end
-  end
-
-  shared_examples_for "version update is detected" do
-    it "reports that a gem has a newer version" do
-      subject
-      expect(out).to include("Outdated gems included in the bundle:")
-      expect(out).to include("activesupport (newest")
-      expect(out).to_not include("ERROR REPORT TEMPLATE")
-    end
-  end
-
-  shared_examples_for "major version updates are detected" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "3.3.5"
-        build_gem "weakling", "0.8.0"
-      end
-    end
-
-    it_behaves_like "version update is detected"
-  end
-
-  context "when on a new machine" do
-    before do
-      simulate_new_machine
-
-      update_git "foo", :path => lib_path("foo")
-      update_repo2 do
-        build_gem "activesupport", "3.3.5"
-        build_gem "weakling", "0.8.0"
-      end
-    end
-
-    subject { bundle "outdated" }
-    it_behaves_like "version update is detected"
-  end
-
-  shared_examples_for "minor version updates are detected" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "2.7.5"
-        build_gem "weakling", "2.0.1"
-      end
-    end
-
-    it_behaves_like "version update is detected"
-  end
-
-  shared_examples_for "patch version updates are detected" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "2.3.7"
-        build_gem "weakling", "0.3.1"
-      end
-    end
-
-    it_behaves_like "version update is detected"
-  end
-
-  shared_examples_for "no version updates are detected" do
-    it "does not detect any version updates" do
-      subject
-      expect(out).to include("updates to display.")
-      expect(out).to_not include("ERROR REPORT TEMPLATE")
-      expect(out).to_not include("activesupport (newest")
-      expect(out).to_not include("weakling (newest")
-    end
-  end
-
-  shared_examples_for "major version is ignored" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "3.3.5"
-        build_gem "weakling", "1.0.1"
-      end
-    end
-
-    it_behaves_like "no version updates are detected"
-  end
-
-  shared_examples_for "minor version is ignored" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "2.4.5"
-        build_gem "weakling", "0.3.1"
-      end
-    end
-
-    it_behaves_like "no version updates are detected"
-  end
-
-  shared_examples_for "patch version is ignored" do
-    before do
-      update_repo2 do
-        build_gem "activesupport", "2.3.6"
-        build_gem "weakling", "0.0.4"
-      end
-    end
-
-    it_behaves_like "no version updates are detected"
-  end
-
-  describe "with --filter-major option" do
-    subject { bundle "outdated --filter-major" }
-
-    it_behaves_like "major version updates are detected"
-    it_behaves_like "minor version is ignored"
-    it_behaves_like "patch version is ignored"
-  end
-
-  describe "with --filter-minor option" do
-    subject { bundle "outdated --filter-minor" }
-
-    it_behaves_like "minor version updates are detected"
-    it_behaves_like "major version is ignored"
-    it_behaves_like "patch version is ignored"
-  end
-
-  describe "with --filter-patch option" do
-    subject { bundle "outdated --filter-patch" }
-
-    it_behaves_like "patch version updates are detected"
-    it_behaves_like "major version is ignored"
-    it_behaves_like "minor version is ignored"
-  end
-
-  describe "with --filter-minor --filter-patch options" do
-    subject { bundle "outdated --filter-minor --filter-patch" }
-
-    it_behaves_like "minor version updates are detected"
-    it_behaves_like "patch version updates are detected"
-    it_behaves_like "major version is ignored"
-  end
-
-  describe "with --filter-major --filter-minor options" do
-    subject { bundle "outdated --filter-major --filter-minor" }
-
-    it_behaves_like "major version updates are detected"
-    it_behaves_like "minor version updates are detected"
-    it_behaves_like "patch version is ignored"
-  end
-
-  describe "with --filter-major --filter-patch options" do
-    subject { bundle "outdated --filter-major --filter-patch" }
-
-    it_behaves_like "major version updates are detected"
-    it_behaves_like "patch version updates are detected"
-    it_behaves_like "minor version is ignored"
-  end
-
-  describe "with --filter-major --filter-minor --filter-patch options" do
-    subject { bundle "outdated --filter-major --filter-minor --filter-patch" }
-
-    it_behaves_like "major version updates are detected"
-    it_behaves_like "minor version updates are detected"
-    it_behaves_like "patch version updates are detected"
-  end
-
-  context "conservative updates" do
-    context "without update-strict" do
-      before do
-        build_repo4 do
-          build_gem "patch", %w[1.0.0 1.0.1]
-          build_gem "minor", %w[1.0.0 1.0.1 1.1.0]
-          build_gem "major", %w[1.0.0 1.0.1 1.1.0 2.0.0]
-        end
-
-        # establish a lockfile set to 1.0.0
-        install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'patch', '1.0.0'
-        gem 'minor', '1.0.0'
-        gem 'major', '1.0.0'
-        G
-
-        # remove 1.4.3 requirement and bar altogether
-        # to setup update specs below
-        gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'patch'
-        gem 'minor'
-        gem 'major'
-        G
-      end
-
-      it "shows nothing when patching and filtering to minor" do
-        bundle "outdated --patch --filter-minor"
-
-        expect(out).to include("No minor updates to display.")
-        expect(out).not_to include("patch (newest")
-        expect(out).not_to include("minor (newest")
-        expect(out).not_to include("major (newest")
-      end
-
-      it "shows all gems when patching and filtering to patch" do
-        bundle "outdated --patch --filter-patch"
-
-        expect(out).to include("patch (newest 1.0.1")
-        expect(out).to include("minor (newest 1.0.1")
-        expect(out).to include("major (newest 1.0.1")
-      end
-
-      it "shows minor and major when updating to minor and filtering to patch and minor" do
-        bundle "outdated --minor --filter-minor"
-
-        expect(out).not_to include("patch (newest")
-        expect(out).to include("minor (newest 1.1.0")
-        expect(out).to include("major (newest 1.1.0")
-      end
-
-      it "shows minor when updating to major and filtering to minor with parseable" do
-        bundle "outdated --major --filter-minor --parseable"
-
-        expect(out).not_to include("patch (newest")
-        expect(out).to include("minor (newest")
-        expect(out).not_to include("major (newest")
-      end
-    end
-
-    context "with update-strict" do
-      before do
-        build_repo4 do
-          build_gem "foo", %w[1.4.3 1.4.4] do |s|
-            s.add_dependency "bar", "~> 2.0"
-          end
-          build_gem "foo", %w[1.4.5 1.5.0] do |s|
-            s.add_dependency "bar", "~> 2.1"
-          end
-          build_gem "foo", %w[1.5.1] do |s|
-            s.add_dependency "bar", "~> 3.0"
-          end
-          build_gem "bar", %w[2.0.3 2.0.4 2.0.5 2.1.0 2.1.1 3.0.0]
-          build_gem "qux", %w[1.0.0 1.1.0 2.0.0]
-        end
-
-        # establish a lockfile set to 1.4.3
-        install_gemfile <<-G
-          source "file://#{gem_repo4}"
-          gem 'foo', '1.4.3'
-          gem 'bar', '2.0.3'
-          gem 'qux', '1.0.0'
-        G
-
-        # remove 1.4.3 requirement and bar altogether
-        # to setup update specs below
-        gemfile <<-G
-          source "file://#{gem_repo4}"
-          gem 'foo'
-          gem 'qux'
-        G
-      end
-
-      it "shows gems with update-strict updating to patch and filtering to patch" do
-        bundle "outdated --patch --update-strict --filter-patch"
-
-        expect(out).to include("foo (newest 1.4.4")
-        expect(out).to include("bar (newest 2.0.5")
-        expect(out).not_to include("qux (newest")
-      end
-    end
-  end
-
-  describe "with --only-explicit" do
-    it "does not report outdated dependent gems" do
-      build_repo4 do
-        build_gem "weakling", %w[0.2 0.3] do |s|
-          s.add_dependency "bar", "~> 2.1"
-        end
-        build_gem "bar", %w[2.1 2.2]
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'weakling', '0.2'
-        gem 'bar', '2.1'
-      G
-
-      gemfile  <<-G
-        source "file://#{gem_repo4}"
-        gem 'weakling'
-      G
-
-      bundle "outdated --only-explicit"
-
-      expect(out).to include("weakling (newest 0.3")
-      expect(out).not_to include("bar (newest 2.2")
-    end
-  end
-end
diff --git a/spec/bundler/commands/package_spec.rb b/spec/bundler/commands/package_spec.rb
deleted file mode 100644
index 6351909bc7..0000000000
--- a/spec/bundler/commands/package_spec.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle package" do
-  context "with --gemfile" do
-    it "finds the gemfile" do
-      gemfile bundled_app("NotGemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle "package --gemfile=NotGemfile"
-
-      ENV["BUNDLE_GEMFILE"] = "NotGemfile"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  context "with --all" do
-    context "without a gemspec" do
-      it "caches all dependencies except bundler itself" do
-        gemfile <<-D
-          source "file://#{gem_repo1}"
-          gem 'rack'
-          gem 'bundler'
-        D
-
-        bundle :package, forgotten_command_line_options([:all, :cache_all] => true)
-
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
-      end
-    end
-
-    context "with a gemspec" do
-      context "that has the same name as the gem" do
-        before do
-          File.open(bundled_app("mygem.gemspec"), "w") do |f|
-            f.write <<-G
-              Gem::Specification.new do |s|
-                s.name = "mygem"
-                s.version = "0.1.1"
-                s.summary = ""
-                s.authors = ["gem author"]
-                s.add_development_dependency "nokogiri", "=1.4.2"
-              end
-            G
-          end
-        end
-
-        it "caches all dependencies except bundler and the gemspec specified gem" do
-          gemfile <<-D
-            source "file://#{gem_repo1}"
-            gem 'rack'
-            gemspec
-          D
-
-          bundle! :package, forgotten_command_line_options([:all, :cache_all] => true)
-
-          expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-          expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
-          expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
-          expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
-        end
-      end
-
-      context "that has a different name as the gem" do
-        before do
-          File.open(bundled_app("mygem_diffname.gemspec"), "w") do |f|
-            f.write <<-G
-              Gem::Specification.new do |s|
-                s.name = "mygem"
-                s.version = "0.1.1"
-                s.summary = ""
-                s.authors = ["gem author"]
-                s.add_development_dependency "nokogiri", "=1.4.2"
-              end
-            G
-          end
-        end
-
-        it "caches all dependencies except bundler and the gemspec specified gem" do
-          gemfile <<-D
-            source "file://#{gem_repo1}"
-            gem 'rack'
-            gemspec
-          D
-
-          bundle! :package, forgotten_command_line_options([:all, :cache_all] => true)
-
-          expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-          expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
-          expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
-          expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
-        end
-      end
-    end
-
-    context "with multiple gemspecs" do
-      before do
-        File.open(bundled_app("mygem.gemspec"), "w") do |f|
-          f.write <<-G
-            Gem::Specification.new do |s|
-              s.name = "mygem"
-              s.version = "0.1.1"
-              s.summary = ""
-              s.authors = ["gem author"]
-              s.add_development_dependency "nokogiri", "=1.4.2"
-            end
-          G
-        end
-        File.open(bundled_app("mygem_client.gemspec"), "w") do |f|
-          f.write <<-G
-            Gem::Specification.new do |s|
-              s.name = "mygem_test"
-              s.version = "0.1.1"
-              s.summary = ""
-              s.authors = ["gem author"]
-              s.add_development_dependency "weakling", "=0.0.3"
-            end
-          G
-        end
-      end
-
-      it "caches all dependencies except bundler and the gemspec specified gems" do
-        gemfile <<-D
-          source "file://#{gem_repo1}"
-          gem 'rack'
-          gemspec :name => 'mygem'
-          gemspec :name => 'mygem_test'
-        D
-
-        bundle! :package, forgotten_command_line_options([:all, :cache_all] => true)
-
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
-        expect(bundled_app("vendor/cache/weakling-0.0.3.gem")).to exist
-        expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
-        expect(bundled_app("vendor/cache/mygem_test-0.1.1.gem")).to_not exist
-        expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
-      end
-    end
-  end
-
-  context "with --path", :bundler => "< 2" do
-    it "sets root directory for gems" do
-      gemfile <<-D
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      D
-
-      bundle! :package, forgotten_command_line_options(:path => bundled_app("test"))
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(bundled_app("test/vendor/cache/")).to exist
-    end
-  end
-
-  context "with --no-install" do
-    it "puts the gems in vendor/cache but does not install them" do
-      gemfile <<-D
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      D
-
-      bundle! "package --no-install"
-
-      expect(the_bundle).not_to include_gems "rack 1.0.0"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-    end
-
-    it "does not prevent installing gems with bundle install" do
-      gemfile <<-D
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      D
-
-      bundle! "package --no-install"
-      bundle! "install"
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  context "with --all-platforms" do
-    it "puts the gems in vendor/cache even for other rubies", :ruby => "2.1" do
-      gemfile <<-D
-        source "file://#{gem_repo1}"
-        gem 'rack', :platforms => :ruby_19
-      D
-
-      bundle "package --all-platforms"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-    end
-  end
-
-  context "with --frozen" do
-    before do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      bundle "install"
-    end
-
-    subject { bundle :package, forgotten_command_line_options(:frozen => true) }
-
-    it "tries to install with frozen" do
-      bundle! "config deployment true"
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-      subject
-      expect(exitstatus).to eq(16) if exitstatus
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama")
-      bundle "env"
-      expect(out).to include("frozen").or include("deployment")
-    end
-  end
-end
-
-RSpec.describe "bundle install with gem sources" do
-  describe "when cached and locked" do
-    it "does not hit the remote at all" do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-
-      bundle :pack
-      simulate_new_machine
-      FileUtils.rm_rf gem_repo2
-
-      bundle "install --local"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "does not hit the remote at all" do
-      build_repo2
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-
-      bundle! :pack
-      simulate_new_machine
-      FileUtils.rm_rf gem_repo2
-
-      bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "does not reinstall already-installed gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      bundle :pack
-
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "raise 'omg'"
-      end
-
-      bundle :install
-      expect(err).to lack_errors
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    it "ignores cached gems for the wrong platform" do
-      simulate_platform "java" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-        bundle :pack
-      end
-
-      simulate_new_machine
-
-      simulate_platform "ruby" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "platform_specific"
-        G
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 RUBY")
-      end
-    end
-
-    it "does not update the cache if --no-cache is passed" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      bundled_app("vendor/cache").mkpath
-      expect(bundled_app("vendor/cache").children).to be_empty
-
-      bundle "install --no-cache"
-      expect(bundled_app("vendor/cache").children).to be_empty
-    end
-  end
-end
diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb
deleted file mode 100644
index 0bfc37560a..0000000000
--- a/spec/bundler/commands/pristine_spec.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/vendored_fileutils"
-
-RSpec.describe "bundle pristine", :ruby_repo do
-  before :each do
-    build_lib "baz", :path => bundled_app do |s|
-      s.version = "1.0.0"
-      s.add_development_dependency "baz-dev", "=1.0.0"
-    end
-
-    build_repo2 do
-      build_gem "weakling"
-      build_gem "baz-dev", "1.0.0"
-      build_gem "very_simple_binary", &:add_c_extension
-      build_git "foo", :path => lib_path("foo")
-      build_git "git_with_ext", :path => lib_path("git_with_ext"), &:add_c_extension
-      build_lib "bar", :path => lib_path("bar")
-    end
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo2}"
-      gem "weakling"
-      gem "very_simple_binary"
-      gem "foo", :git => "#{lib_path("foo")}"
-      gem "git_with_ext", :git => "#{lib_path("git_with_ext")}"
-      gem "bar", :path => "#{lib_path("bar")}"
-
-      gemspec
-    G
-  end
-
-  context "when sourced from RubyGems" do
-    it "reverts using cached .gem file" do
-      spec = Bundler.definition.specs["weakling"].first
-      changes_txt = Pathname.new(spec.full_gem_path).join("lib/changes.txt")
-
-      FileUtils.touch(changes_txt)
-      expect(changes_txt).to be_file
-
-      bundle "pristine"
-      expect(changes_txt).to_not be_file
-    end
-
-    it "does not delete the bundler gem" do
-      ENV["BUNDLER_SPEC_KEEP_DEFAULT_BUNDLER_GEM"] = "true"
-      system_gems :bundler
-      bundle! "install"
-      bundle! "pristine", :system_bundler => true
-      bundle! "-v", :system_bundler => true
-
-      expected = if Bundler::VERSION < "2.0"
-        "Bundler version"
-      else
-        Bundler::VERSION
-      end
-
-      expect(out).to start_with(expected)
-    end
-  end
-
-  context "when sourced from git repo" do
-    it "reverts by resetting to current revision`" do
-      spec = Bundler.definition.specs["foo"].first
-      changed_file = Pathname.new(spec.full_gem_path).join("lib/foo.rb")
-      diff = "#Pristine spec changes"
-
-      File.open(changed_file, "a") {|f| f.puts diff }
-      expect(File.read(changed_file)).to include(diff)
-
-      bundle! "pristine"
-      expect(File.read(changed_file)).to_not include(diff)
-    end
-
-    it "removes added files" do
-      spec = Bundler.definition.specs["foo"].first
-      changes_txt = Pathname.new(spec.full_gem_path).join("lib/changes.txt")
-
-      FileUtils.touch(changes_txt)
-      expect(changes_txt).to be_file
-
-      bundle! "pristine"
-      expect(changes_txt).not_to be_file
-    end
-  end
-
-  context "when sourced from gemspec" do
-    it "displays warning and ignores changes when sourced from gemspec" do
-      spec = Bundler.definition.specs["baz"].first
-      changed_file = Pathname.new(spec.full_gem_path).join("lib/baz.rb")
-      diff = "#Pristine spec changes"
-
-      File.open(changed_file, "a") {|f| f.puts diff }
-      expect(File.read(changed_file)).to include(diff)
-
-      bundle "pristine"
-      expect(File.read(changed_file)).to include(diff)
-      expect(out).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is sourced from local path.")
-    end
-
-    it "reinstall gemspec dependency" do
-      spec = Bundler.definition.specs["baz-dev"].first
-      changed_file = Pathname.new(spec.full_gem_path).join("lib/baz-dev.rb")
-      diff = "#Pristine spec changes"
-
-      File.open(changed_file, "a") {|f| f.puts "#Pristine spec changes" }
-      expect(File.read(changed_file)).to include(diff)
-
-      bundle "pristine"
-      expect(File.read(changed_file)).to_not include(diff)
-    end
-  end
-
-  context "when sourced from path" do
-    it "displays warning and ignores changes when sourced from local path" do
-      spec = Bundler.definition.specs["bar"].first
-      changes_txt = Pathname.new(spec.full_gem_path).join("lib/changes.txt")
-      FileUtils.touch(changes_txt)
-      expect(changes_txt).to be_file
-      bundle "pristine"
-      expect(out).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is sourced from local path.")
-      expect(changes_txt).to be_file
-    end
-  end
-
-  context "when passing a list of gems to pristine" do
-    it "resets them" do
-      foo = Bundler.definition.specs["foo"].first
-      foo_changes_txt = Pathname.new(foo.full_gem_path).join("lib/changes.txt")
-      FileUtils.touch(foo_changes_txt)
-      expect(foo_changes_txt).to be_file
-
-      bar = Bundler.definition.specs["bar"].first
-      bar_changes_txt = Pathname.new(bar.full_gem_path).join("lib/changes.txt")
-      FileUtils.touch(bar_changes_txt)
-      expect(bar_changes_txt).to be_file
-
-      weakling = Bundler.definition.specs["weakling"].first
-      weakling_changes_txt = Pathname.new(weakling.full_gem_path).join("lib/changes.txt")
-      FileUtils.touch(weakling_changes_txt)
-      expect(weakling_changes_txt).to be_file
-
-      bundle! "pristine foo bar weakling"
-
-      expect(out).to include("Cannot pristine bar (1.0). Gem is sourced from local path.").
-        and include("Installing weakling 1.0")
-
-      expect(weakling_changes_txt).not_to be_file
-      expect(foo_changes_txt).not_to be_file
-      expect(bar_changes_txt).to be_file
-    end
-
-    it "raises when one of them is not in the lockfile" do
-      bundle "pristine abcabcabc"
-      expect(out).to include("Could not find gem 'abcabcabc'.")
-    end
-  end
-
-  context "when a build config exists for one of the gems" do
-    let(:very_simple_binary) { Bundler.definition.specs["very_simple_binary"].first }
-    let(:c_ext_dir)          { Pathname.new(very_simple_binary.full_gem_path).join("ext") }
-    let(:build_opt)          { "--with-ext-lib=#{c_ext_dir}" }
-    before { bundle "config build.very_simple_binary -- #{build_opt}" }
-
-    # This just verifies that the generated Makefile from the c_ext gem makes
-    # use of the build_args from the bundle config
-    it "applies the config when installing the gem" do
-      bundle! "pristine"
-
-      makefile_contents = File.read(c_ext_dir.join("Makefile").to_s)
-      expect(makefile_contents).to match(/libpath =.*#{c_ext_dir}/)
-      expect(makefile_contents).to match(/LIBPATH =.*-L#{c_ext_dir}/)
-    end
-  end
-
-  context "when a build config exists for a git sourced gem" do
-    let(:git_with_ext) { Bundler.definition.specs["git_with_ext"].first }
-    let(:c_ext_dir)          { Pathname.new(git_with_ext.full_gem_path).join("ext") }
-    let(:build_opt)          { "--with-ext-lib=#{c_ext_dir}" }
-    before { bundle "config build.git_with_ext -- #{build_opt}" }
-
-    # This just verifies that the generated Makefile from the c_ext gem makes
-    # use of the build_args from the bundle config
-    it "applies the config when installing the gem" do
-      bundle! "pristine"
-
-      makefile_contents = File.read(c_ext_dir.join("Makefile").to_s)
-      expect(makefile_contents).to match(/libpath =.*#{c_ext_dir}/)
-      expect(makefile_contents).to match(/LIBPATH =.*-L#{c_ext_dir}/)
-    end
-  end
-end
diff --git a/spec/bundler/commands/remove_spec.rb b/spec/bundler/commands/remove_spec.rb
deleted file mode 100644
index faeb654b14..0000000000
--- a/spec/bundler/commands/remove_spec.rb
+++ /dev/null
@@ -1,583 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle remove" do
-  context "when no gems are specified" do
-    it "throws error" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-      G
-
-      bundle "remove"
-
-      expect(out).to include("Please specify gems to remove.")
-    end
-  end
-
-  context "when --install flag is specified" do
-    it "removes gems from .bundle" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack"
-      G
-
-      bundle! "remove rack --install"
-
-      expect(out).to include("rack was removed.")
-      expect(the_bundle).to_not include_gems "rack"
-    end
-  end
-
-  describe "remove single gem from gemfile" do
-    context "when gem is present in gemfile" do
-      it "shows success for removed gem" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          gem "rack"
-        G
-
-        bundle! "remove rack"
-
-        expect(out).to include("rack was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when gem is not present in gemfile" do
-      it "shows warning for gem that could not be removed" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-        G
-
-        bundle "remove rack"
-
-        expect(out).to include("`rack` is not specified in #{bundled_app("Gemfile")} so it could not be removed.")
-      end
-    end
-  end
-
-  describe "remove mutiple gems from gemfile" do
-    context "when all gems are present in gemfile" do
-      it "shows success fir all removed gems" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          gem "rack"
-          gem "rails"
-        G
-
-        bundle! "remove rack rails"
-
-        expect(out).to include("rack was removed.")
-        expect(out).to include("rails was removed.")
-        gemfile_should_be <<-G
-        source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when some gems are not present in the gemfile" do
-      it "shows warning for those not present and success for those that can be removed" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          gem "rails"
-          gem "minitest"
-          gem "rspec"
-        G
-
-        bundle "remove rails rack minitest"
-
-        expect(out).to include("`rack` is not specified in #{bundled_app("Gemfile")} so it could not be removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          gem "rails"
-          gem "minitest"
-          gem "rspec"
-        G
-      end
-    end
-  end
-
-  context "with inline groups" do
-    it "removes the specified gem" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack", :group => [:dev]
-      G
-
-      bundle! "remove rack"
-
-      expect(out).to include("rack was removed.")
-      gemfile_should_be <<-G
-        source "file://#{gem_repo1}"
-      G
-    end
-  end
-
-  describe "with group blocks" do
-    context "when single group block with gem to be removed is present" do
-      it "removes the group block" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            gem "rspec"
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when an empty block is also present" do
-      it "removes all empty blocks" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            gem "rspec"
-          end
-
-          group :dev do
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when the gem belongs to mutiple groups" do
-      it "removes the groups" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test, :serioustest do
-            gem "rspec"
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when the gem is present in mutiple groups" do
-      it "removes all empty blocks" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :one do
-            gem "rspec"
-          end
-
-          group :two do
-            gem "rspec"
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-  end
-
-  describe "nested group blocks" do
-    context "when all the groups will be empty after removal" do
-      it "removes the empty nested blocks" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            group :serioustest do
-              gem "rspec"
-            end
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-        G
-      end
-    end
-
-    context "when outer group will not be empty after removal" do
-      it "removes only empty blocks" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            gem "rack-test"
-
-            group :serioustest do
-              gem "rspec"
-            end
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            gem "rack-test"
-
-          end
-        G
-      end
-    end
-
-    context "when inner group will not be empty after removal" do
-      it "removes only empty blocks" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            group :serioustest do
-              gem "rspec"
-              gem "rack-test"
-            end
-          end
-        G
-
-        bundle! "remove rspec"
-
-        expect(out).to include("rspec was removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          group :test do
-            group :serioustest do
-              gem "rack-test"
-            end
-          end
-        G
-      end
-    end
-  end
-
-  describe "arbitrary gemfile" do
-    context "when mutiple gems are present in same line" do
-      it "shows warning for gems not removed" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"; gem "rails"
-        G
-
-        bundle "remove rails"
-
-        if Gem::VERSION >= "1.6.0"
-          expect(out).to include("Gems could not be removed. rack (>= 0) would also have been removed.")
-        else
-          expect(out).to include("Gems could not be removed. rack (>= 0, runtime) would also have been removed.")
-        end
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"; gem "rails"
-        G
-      end
-    end
-
-    context "when some gems could not be removed" do
-      it "shows warning for gems not removed and success for those removed" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem"rack"
-          gem"rspec"
-          gem "rails"
-          gem "minitest"
-        G
-
-        bundle! "remove rails rack rspec minitest"
-
-        expect(out).to include("rails was removed.")
-        expect(out).to include("minitest was removed.")
-        expect(out).to include("rack, rspec could not be removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-          gem"rack"
-          gem"rspec"
-        G
-      end
-    end
-  end
-
-  context "with sources" do
-    before do
-      build_repo gem_repo3 do
-        build_gem "rspec"
-      end
-    end
-
-    it "removes gems and empty source blocks" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack"
-
-        source "file://#{gem_repo3}" do
-          gem "rspec"
-        end
-      G
-
-      bundle! "install"
-
-      bundle! "remove rspec"
-
-      expect(out).to include("rspec was removed.")
-      gemfile_should_be <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack"
-      G
-    end
-  end
-
-  describe "with eval_gemfile" do
-    context "when gems are present in both gemfiles" do
-      it "removes the gems" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-
-          gem "rack"
-        G
-
-        bundle! "remove rack"
-
-        expect(out).to include("rack was removed.")
-      end
-    end
-
-    context "when gems are present in other gemfile" do
-      it "removes the gems" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-        G
-
-        bundle! "remove rack"
-
-        expect(bundled_app("Gemfile-other").read).to_not include("gem \"rack\"")
-        expect(out).to include("rack was removed.")
-      end
-    end
-
-    context "when gems to be removed are not specified in any of the gemfiles" do
-      it "throws error for the gems not present" do
-        # an empty gemfile
-        # indicating the gem is not present in the gemfile
-        create_file "Gemfile-other", <<-G
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-        G
-
-        bundle "remove rack"
-
-        expect(out).to include("`rack` is not specified in #{bundled_app("Gemfile")} so it could not be removed.")
-      end
-    end
-
-    context "when the gem is present in parent file but not in gemfile specified by eval_gemfile" do
-      it "removes the gem" do
-        create_file "Gemfile-other", <<-G
-          gem "rails"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-          gem "rack"
-        G
-
-        bundle "remove rack"
-
-        expect(out).to include("rack was removed.")
-        expect(out).to include("`rack` is not specified in #{bundled_app("Gemfile-other")} so it could not be removed.")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-        G
-      end
-    end
-
-    context "when gems can not be removed from other gemfile" do
-      it "shows error" do
-        create_file "Gemfile-other", <<-G
-          gem "rails"; gem "rack"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-          gem "rack"
-        G
-
-        bundle "remove rack"
-
-        expect(out).to include("rack was removed.")
-        if Gem::VERSION >= "1.6.0"
-          expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
-        else
-          expect(out).to include("Gems could not be removed. rails (>= 0, runtime) would also have been removed.")
-        end
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-        G
-      end
-    end
-
-    context "when gems could not be removed from parent gemfile" do
-      it "shows error" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-          gem "rails"; gem "rack"
-        G
-
-        bundle "remove rack"
-
-        if Gem::VERSION >= "1.6.0"
-          expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
-        else
-          expect(out).to include("Gems could not be removed. rails (>= 0, runtime) would also have been removed.")
-        end
-        expect(bundled_app("Gemfile-other").read).to include("gem \"rack\"")
-        gemfile_should_be <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-          gem "rails"; gem "rack"
-        G
-      end
-    end
-
-    context "when gem present in gemfiles but could not be removed from one from one of them" do
-      it "removes gem which can be removed and shows warning for file from which it can not be removed" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
-        G
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-
-          eval_gemfile "Gemfile-other"
-          gem"rack"
-        G
-
-        bundle! "remove rack"
-
-        expect(out).to include("rack was removed.")
-        expect(bundled_app("Gemfile-other").read).to_not include("gem \"rack\"")
-      end
-    end
-  end
-
-  context "with install_if" do
-    it "removes gems inside blocks and empty blocks" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        install_if(lambda { false }) do
-          gem "rack"
-        end
-      G
-
-      bundle! "remove rack"
-
-      expect(out).to include("rack was removed.")
-      gemfile_should_be <<-G
-        source "file://#{gem_repo1}"
-      G
-    end
-  end
-
-  context "with env" do
-    it "removes gems inside blocks and empty blocks" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        env "BUNDLER_TEST" do
-          gem "rack"
-        end
-      G
-
-      bundle! "remove rack"
-
-      expect(out).to include("rack was removed.")
-      gemfile_should_be <<-G
-        source "file://#{gem_repo1}"
-      G
-    end
-  end
-
-  context "with gemspec" do
-    it "should not remove the gem" do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
-        s.write("foo.gemspec", "")
-        s.add_dependency "rack"
-      end
-
-      install_gemfile(<<-G)
-        source "file://#{gem_repo1}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-      G
-
-      bundle! "remove foo"
-
-      expect(out).to include("foo could not be removed.")
-    end
-  end
-end
diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb
deleted file mode 100644
index efbe4b13fb..0000000000
--- a/spec/bundler/commands/show_spec.rb
+++ /dev/null
@@ -1,244 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle show", :bundler => "< 2", :ruby => ">= 2.0" do
-  context "with a standard Gemfile" do
-    before :each do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-    end
-
-    it "creates a Gemfile.lock if one did not exist" do
-      FileUtils.rm("Gemfile.lock")
-
-      bundle "show"
-
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-
-    it "creates a Gemfile.lock when invoked with a gem name" do
-      FileUtils.rm("Gemfile.lock")
-
-      bundle "show rails"
-
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-
-    it "prints path if gem exists in bundle" do
-      bundle "show rails"
-      expect(out).to eq(default_bundle_path("gems", "rails-2.3.2").to_s)
-    end
-
-    context "when show command deprecation is enabled" do
-      before { bundle "config major_deprecations yes" }
-
-      it "prints path if gem exists in bundle" do
-        bundle "show rails"
-        expect(out).to eq(
-          "[DEPRECATED FOR 2.0] use `bundle info rails` instead of `bundle show rails`\n" +
-          default_bundle_path("gems", "rails-2.3.2").to_s
-        )
-      end
-
-      it "prints the path to the running bundler" do
-        bundle "show bundler"
-        expect(out).to eq(
-          "[DEPRECATED FOR 2.0] use `bundle info bundler` instead of `bundle show bundler`\n" +
-          root.to_s
-        )
-      end
-
-      it "prints path if gem exists in bundle (with --paths option)" do
-        bundle "show rails --paths"
-        expect(out).to eq(
-          "[DEPRECATED FOR 2.0] use `bundle info rails --path` instead of `bundle show rails --paths`\n" +
-          default_bundle_path("gems", "rails-2.3.2").to_s
-        )
-      end
-
-      it "prints path of all gems in bundle sorted by name" do
-        bundle "show --paths"
-
-        expect(out).to include(default_bundle_path("gems", "rake-10.0.2").to_s)
-        expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
-
-        out_lines = out.split("\n")
-        expect(out_lines[0]).to eq("[DEPRECATED FOR 2.0] use `bundle list` instead of `bundle show --paths`")
-
-        # Gem names are the last component of their path.
-        gem_list = out_lines[1..-1].map {|p| p.split("/").last }
-        expect(gem_list).to eq(gem_list.sort)
-      end
-    end
-
-    it "prints path if gem exists in bundle (with --paths option)" do
-      bundle "show rails --paths"
-      expect(out).to eq(default_bundle_path("gems", "rails-2.3.2").to_s)
-    end
-
-    it "warns if path no longer exists on disk" do
-      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
-
-      bundle "show rails"
-
-      expect(out).to match(/has been deleted/i).
-        and include(default_bundle_path("gems", "rails-2.3.2").to_s)
-    end
-
-    it "prints the path to the running bundler" do
-      bundle "show bundler"
-      expect(out).to eq(root.to_s)
-    end
-
-    it "complains if gem not in bundle" do
-      bundle "show missing"
-      expect(out).to match(/could not find gem 'missing'/i)
-    end
-
-    it "prints path of all gems in bundle sorted by name" do
-      bundle "show --paths"
-
-      expect(out).to include(default_bundle_path("gems", "rake-10.0.2").to_s)
-      expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
-
-      # Gem names are the last component of their path.
-      gem_list = out.split.map {|p| p.split("/").last }
-      expect(gem_list).to eq(gem_list.sort)
-    end
-
-    it "prints summary of gems" do
-      bundle "show --verbose"
-
-      loaded_bundler_spec = Bundler.load.specs["bundler"]
-      expected = if !loaded_bundler_spec.empty?
-        loaded_bundler_spec[0].homepage
-      else
-        "No website available."
-      end
-
-      expect(out).to include("* actionmailer (2.3.2)")
-      expect(out).to include("\tSummary:  This is just a fake gem for testing")
-      expect(out).to include("\tHomepage: #{expected}")
-      expect(out).to include("\tStatus:   Up to date")
-    end
-  end
-
-  context "with a git repo in the Gemfile" do
-    before :each do
-      @git = build_git "foo", "1.0"
-    end
-
-    it "prints out git info" do
-      install_gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-      expect(the_bundle).to include_gems "foo 1.0"
-
-      bundle :show
-      expect(out).to include("foo (1.0 #{@git.ref_for("master", 6)}")
-    end
-
-    it "prints out branch names other than master" do
-      update_git "foo", :branch => "omg" do |s|
-        s.write "lib/foo.rb", "FOO = '1.0.omg'"
-      end
-      @revision = revision_for(lib_path("foo-1.0"))[0...6]
-
-      install_gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "omg"
-      G
-      expect(the_bundle).to include_gems "foo 1.0.omg"
-
-      bundle :show
-      expect(out).to include("foo (1.0 #{@git.ref_for("omg", 6)}")
-    end
-
-    it "doesn't print the branch when tied to a ref" do
-      sha = revision_for(lib_path("foo-1.0"))
-      install_gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{sha}"
-      G
-
-      bundle :show
-      expect(out).to include("foo (1.0 #{sha[0..6]})")
-    end
-
-    it "handles when a version is a '-' prerelease", :rubygems => "2.1" do
-      @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo"))
-      install_gemfile <<-G
-        gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}"
-      G
-      expect(the_bundle).to include_gems "foo 1.0.0.pre.beta.1"
-
-      bundle! :show
-      expect(out).to include("foo (1.0.0.pre.beta.1")
-    end
-  end
-
-  context "in a fresh gem in a blank git repo" do
-    before :each do
-      build_git "foo", :path => lib_path("foo")
-      in_app_root_custom lib_path("foo")
-      File.open("Gemfile", "w") {|f| f.puts "gemspec" }
-      sys_exec "rm -rf .git && git init"
-    end
-
-    it "does not output git errors" do
-      bundle :show
-      expect(err).to lack_errors
-    end
-  end
-
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "foo"
-    G
-
-    bundle "config auto_install 1"
-    bundle :show
-    expect(out).to include("Installing foo 1.0")
-  end
-
-  context "with an invalid regexp for gem name" do
-    it "does not find the gem" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-
-      invalid_regexp = "[]"
-
-      bundle "show #{invalid_regexp}"
-      expect(out).to include("Could not find gem '#{invalid_regexp}'.")
-    end
-  end
-
-  context "--outdated option" do
-    # Regression test for https://github.com/bundler/bundler/issues/5375
-    before do
-      build_repo2
-    end
-
-    it "doesn't update gems to newer versions" do
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "rails"
-      G
-
-      expect(the_bundle).to include_gem("rails 2.3.2")
-
-      update_repo2 do
-        build_gem "rails", "3.0.0" do |s|
-          s.executables = "rails"
-        end
-      end
-
-      bundle! "show --outdated"
-
-      bundle! "install"
-      expect(the_bundle).to include_gem("rails 2.3.2")
-    end
-  end
-end
diff --git a/spec/bundler/commands/update_spec.rb b/spec/bundler/commands/update_spec.rb
deleted file mode 100644
index 6eb49d3acd..0000000000
--- a/spec/bundler/commands/update_spec.rb
+++ /dev/null
@@ -1,943 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle update" do
-  before :each do
-    build_repo2
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "activesupport"
-      gem "rack-obama"
-    G
-  end
-
-  describe "with no arguments", :bundler => "< 2" do
-    it "updates the entire bundle" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-      end
-
-      bundle "update"
-      expect(out).to include("Bundle updated!")
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
-    end
-
-    it "doesn't delete the Gemfile.lock file if something goes wrong" do
-      gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport"
-        gem "rack-obama"
-        exit!
-      G
-      bundle "update"
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-  end
-
-  describe "with --all", :bundler => "2" do
-    it "updates the entire bundle" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-      end
-
-      bundle! "update", :all => true
-      expect(out).to include("Bundle updated!")
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
-    end
-
-    it "doesn't delete the Gemfile.lock file if something goes wrong" do
-      gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport"
-        gem "rack-obama"
-        exit!
-      G
-      bundle "update", :all => true
-      expect(bundled_app("Gemfile.lock")).to exist
-    end
-  end
-
-  describe "with --gemfile" do
-    it "creates lock files based on the Gemfile name" do
-      gemfile bundled_app("OmgFile"), <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "1.0"
-      G
-
-      bundle! "update --gemfile OmgFile", :all => bundle_update_requires_all?
-
-      expect(bundled_app("OmgFile.lock")).to exist
-    end
-  end
-
-  context "when update_requires_all_flag is set" do
-    before { bundle! "config update_requires_all_flag true" }
-
-    it "errors when passed nothing" do
-      install_gemfile! ""
-      bundle :update
-      expect(out).to eq("To update everything, pass the `--all` flag.")
-    end
-
-    it "errors when passed --all and another option" do
-      install_gemfile! ""
-      bundle "update --all foo"
-      expect(out).to eq("Cannot specify --all along with specific options.")
-    end
-
-    it "updates everything when passed --all" do
-      install_gemfile! ""
-      bundle "update --all"
-      expect(out).to include("Bundle updated!")
-    end
-  end
-
-  describe "--quiet argument" do
-    it "hides UI messages" do
-      bundle "update --quiet"
-      expect(out).not_to include("Bundle updated!")
-    end
-  end
-
-  describe "with a top level dependency" do
-    it "unlocks all child dependencies that are unrelated to other locked dependencies" do
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-      end
-
-      bundle "update rack-obama"
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 2.3.5"
-    end
-  end
-
-  describe "with an unknown dependency" do
-    it "should inform the user" do
-      bundle "update halting-problem-solver"
-      expect(out).to include "Could not find gem 'halting-problem-solver'"
-    end
-    it "should suggest alternatives" do
-      bundle "update active-support"
-      expect(out).to include "Did you mean activesupport?"
-    end
-  end
-
-  describe "with a child dependency" do
-    it "should update the child dependency" do
-      update_repo2
-      bundle "update rack"
-      expect(the_bundle).to include_gems "rack 1.2"
-    end
-  end
-
-  describe "when a possible resolve requires an older version of a locked gem" do
-    context "and only_update_to_newer_versions is set" do
-      before do
-        bundle! "config only_update_to_newer_versions true"
-      end
-
-      it "does not go to an older version" do
-        build_repo4 do
-          build_gem "tilt", "2.0.8"
-          build_gem "slim", "3.0.9" do |s|
-            s.add_dependency "tilt", [">= 1.3.3", "< 2.1"]
-          end
-          build_gem "slim_lint", "0.16.1" do |s|
-            s.add_dependency "slim", [">= 3.0", "< 5.0"]
-          end
-          build_gem "slim-rails", "0.2.1" do |s|
-            s.add_dependency "slim", ">= 0.9.2"
-          end
-          build_gem "slim-rails", "3.1.3" do |s|
-            s.add_dependency "slim", "~> 3.0"
-          end
-        end
-
-        install_gemfile! <<-G
-          source "file:#{gem_repo4}"
-          gem "slim-rails"
-          gem "slim_lint"
-        G
-
-        expect(the_bundle).to include_gems("slim 3.0.9", "slim-rails 3.1.3", "slim_lint 0.16.1")
-
-        update_repo4 do
-          build_gem "slim", "4.0.0" do |s|
-            s.add_dependency "tilt", [">= 2.0.6", "< 2.1"]
-          end
-        end
-
-        bundle! "update", :all => bundle_update_requires_all?
-
-        expect(the_bundle).to include_gems("slim 3.0.9", "slim-rails 3.1.3", "slim_lint 0.16.1")
-      end
-
-      it "should still downgrade if forced by the Gemfile" do
-        build_repo4 do
-          build_gem "a"
-          build_gem "b", "1.0"
-          build_gem "b", "2.0"
-        end
-
-        install_gemfile! <<-G
-          source "file:#{gem_repo4}"
-          gem "a"
-          gem "b"
-        G
-
-        expect(the_bundle).to include_gems("a 1.0", "b 2.0")
-
-        gemfile <<-G
-          source "file://#{gem_repo4}"
-          gem "a"
-          gem "b", "1.0"
-        G
-
-        bundle! "update b"
-
-        expect(the_bundle).to include_gems("a 1.0", "b 1.0")
-      end
-    end
-  end
-
-  describe "with --local option" do
-    it "doesn't hit repo2" do
-      FileUtils.rm_rf(gem_repo2)
-
-      bundle "update --local --all"
-      expect(out).not_to include("Fetching source index")
-    end
-  end
-
-  describe "with --group option" do
-    it "should update only specified group gems" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport", :group => :development
-        gem "rack"
-      G
-      update_repo2 do
-        build_gem "activesupport", "3.0"
-      end
-      bundle "update --group development"
-      expect(the_bundle).to include_gems "activesupport 3.0"
-      expect(the_bundle).not_to include_gems "rack 1.2"
-    end
-
-    context "when conservatively updating a group with non-group sub-deps" do
-      it "should update only specified group gems" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activemerchant", :group => :development
-          gem "activesupport"
-        G
-        update_repo2 do
-          build_gem "activemerchant", "2.0"
-          build_gem "activesupport", "3.0"
-        end
-        bundle "update --conservative --group development"
-        expect(the_bundle).to include_gems "activemerchant 2.0"
-        expect(the_bundle).not_to include_gems "activesupport 3.0"
-      end
-    end
-
-    context "when there is a source with the same name as a gem in a group" do
-      before :each do
-        build_git "foo", :path => lib_path("activesupport")
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport", :group => :development
-          gem "foo", :git => "#{lib_path("activesupport")}"
-        G
-      end
-
-      it "should not update the gems from that source" do
-        update_repo2 { build_gem "activesupport", "3.0" }
-        update_git "foo", "2.0", :path => lib_path("activesupport")
-
-        bundle "update --group development"
-        expect(the_bundle).to include_gems "activesupport 3.0"
-        expect(the_bundle).not_to include_gems "foo 2.0"
-      end
-    end
-
-    context "when bundler itself is a transitive dependency" do
-      it "executes without error" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "activesupport", :group => :development
-          gem "rack"
-        G
-        update_repo2 do
-          build_gem "activesupport", "3.0"
-        end
-        bundle "update --group development"
-        expect(the_bundle).to include_gems "activesupport 2.3.5"
-        expect(the_bundle).to include_gems "bundler #{Bundler::VERSION}"
-        expect(the_bundle).not_to include_gems "rack 1.2"
-      end
-    end
-  end
-
-  describe "in a frozen bundle" do
-    it "should fail loudly", :bundler => "< 2" do
-      bundle! "install --deployment"
-      bundle "update", :all => bundle_update_requires_all?
-
-      expect(last_command).to be_failure
-      expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m)
-      expect(out).to match(/freeze \nby running `bundle install --no-deployment`./m)
-    end
-
-    it "should suggest different command when frozen is set globally", :bundler => "< 2" do
-      bundle! "config --global frozen 1"
-      bundle "update", :all => bundle_update_requires_all?
-      expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m).
-        and match(/freeze \nby running `bundle config --delete frozen`./m)
-    end
-
-    it "should suggest different command when frozen is set globally", :bundler => "2" do
-      bundle! "config --global deployment true"
-      bundle "update", :all => bundle_update_requires_all?
-      expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m).
-        and match(/freeze \nby running `bundle config --delete deployment`./m)
-    end
-  end
-
-  describe "with --source option" do
-    it "should not update gems not included in the source that happen to have the same name", :bundler => "< 2" do
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport"
-      G
-      update_repo2 { build_gem "activesupport", "3.0" }
-
-      bundle! "update --source activesupport"
-      expect(the_bundle).to include_gem "activesupport 3.0"
-    end
-
-    it "should not update gems not included in the source that happen to have the same name", :bundler => "2" do
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "activesupport"
-      G
-      update_repo2 { build_gem "activesupport", "3.0" }
-
-      bundle! "update --source activesupport"
-      expect(the_bundle).not_to include_gem "activesupport 3.0"
-    end
-
-    context "with unlock_source_unlocks_spec set to false" do
-      before { bundle! "config unlock_source_unlocks_spec false" }
-
-      it "should not update gems not included in the source that happen to have the same name" do
-        install_gemfile <<-G
-          source "file://#{gem_repo2}"
-          gem "activesupport"
-        G
-        update_repo2 { build_gem "activesupport", "3.0" }
-
-        bundle "update --source activesupport"
-        expect(the_bundle).not_to include_gems "activesupport 3.0"
-      end
-    end
-  end
-
-  context "when there is a child dependency that is also in the gemfile" do
-    before do
-      build_repo2 do
-        build_gem "fred", "1.0"
-        build_gem "harry", "1.0" do |s|
-          s.add_dependency "fred"
-        end
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "harry"
-        gem "fred"
-      G
-    end
-
-    it "should not update the child dependencies of a gem that has the same name as the source", :bundler => "< 2" do
-      update_repo2 do
-        build_gem "fred", "2.0"
-        build_gem "harry", "2.0" do |s|
-          s.add_dependency "fred"
-        end
-      end
-
-      bundle "update --source harry"
-      expect(the_bundle).to include_gems "harry 2.0"
-      expect(the_bundle).to include_gems "fred 1.0"
-    end
-
-    it "should not update the child dependencies of a gem that has the same name as the source", :bundler => "2" do
-      update_repo2 do
-        build_gem "fred", "2.0"
-        build_gem "harry", "2.0" do |s|
-          s.add_dependency "fred"
-        end
-      end
-
-      bundle "update --source harry"
-      expect(the_bundle).to include_gems "harry 1.0", "fred 1.0"
-    end
-  end
-
-  context "when there is a child dependency that appears elsewhere in the dependency graph" do
-    before do
-      build_repo2 do
-        build_gem "fred", "1.0" do |s|
-          s.add_dependency "george"
-        end
-        build_gem "george", "1.0"
-        build_gem "harry", "1.0" do |s|
-          s.add_dependency "george"
-        end
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "harry"
-        gem "fred"
-      G
-    end
-
-    it "should not update the child dependencies of a gem that has the same name as the source", :bundler => "< 2" do
-      update_repo2 do
-        build_gem "george", "2.0"
-        build_gem "harry", "2.0" do |s|
-          s.add_dependency "george"
-        end
-      end
-
-      bundle "update --source harry"
-      expect(the_bundle).to include_gems "harry 2.0"
-      expect(the_bundle).to include_gems "fred 1.0"
-      expect(the_bundle).to include_gems "george 1.0"
-    end
-
-    it "should not update the child dependencies of a gem that has the same name as the source", :bundler => "2" do
-      update_repo2 do
-        build_gem "george", "2.0"
-        build_gem "harry", "2.0" do |s|
-          s.add_dependency "george"
-        end
-      end
-
-      bundle "update --source harry"
-      expect(the_bundle).to include_gems "harry 1.0", "fred 1.0", "george 1.0"
-    end
-  end
-end
-
-RSpec.describe "bundle update in more complicated situations" do
-  before :each do
-    build_repo2
-  end
-
-  it "will eagerly unlock dependencies of a specified gem" do
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "thin"
-      gem "rack-obama"
-    G
-
-    update_repo2 do
-      build_gem "thin", "2.0" do |s|
-        s.add_dependency "rack"
-      end
-    end
-
-    bundle "update thin"
-    expect(the_bundle).to include_gems "thin 2.0", "rack 1.2", "rack-obama 1.0"
-  end
-
-  it "will warn when some explicitly updated gems are not updated" do
-    install_gemfile! <<-G
-      source "file:#{gem_repo2}"
-
-      gem "thin"
-      gem "rack-obama"
-    G
-
-    update_repo2 do
-      build_gem("thin", "2.0") {|s| s.add_dependency "rack" }
-      build_gem "rack", "10.0"
-    end
-
-    bundle! "update thin rack-obama"
-    expect(last_command.stdboth).to include "Bundler attempted to update rack-obama but its version stayed the same"
-    expect(the_bundle).to include_gems "thin 2.0", "rack 10.0", "rack-obama 1.0"
-  end
-
-  it "will update only from pinned source" do
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      source "file://#{gem_repo1}" do
-        gem "thin"
-      end
-    G
-
-    update_repo2 do
-      build_gem "thin", "2.0"
-    end
-
-    bundle "update"
-    expect(the_bundle).to include_gems "thin 1.0"
-  end
-
-  context "when the lockfile is for a different platform" do
-    before do
-      build_repo4 do
-        build_gem("a", "0.9")
-        build_gem("a", "0.9") {|s| s.platform = "java" }
-        build_gem("a", "1.1")
-        build_gem("a", "1.1") {|s| s.platform = "java" }
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem "a"
-      G
-
-      lockfile <<-L
-        GEM
-          remote: file://#{gem_repo4}
-          specs:
-            a (0.9-java)
-
-        PLATFORMS
-          java
-
-        DEPENDENCIES
-          a
-      L
-
-      simulate_platform linux
-    end
-
-    it "allows updating" do
-      bundle! :update, :all => true
-      expect(the_bundle).to include_gem "a 1.1"
-    end
-
-    it "allows updating a specific gem" do
-      bundle! "update a"
-      expect(the_bundle).to include_gem "a 1.1"
-    end
-  end
-end
-
-RSpec.describe "bundle update without a Gemfile.lock" do
-  it "should not explode" do
-    build_repo2
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-
-      gem "rack", "1.0"
-    G
-
-    bundle "update", :all => bundle_update_requires_all?
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-end
-
-RSpec.describe "bundle update when a gem depends on a newer version of bundler" do
-  before(:each) do
-    build_repo2 do
-      build_gem "rails", "3.0.1" do |s|
-        s.add_dependency "bundler", Bundler::VERSION.succ
-      end
-    end
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "rails", "3.0.1"
-    G
-  end
-
-  it "should explain that bundler conflicted", :bundler => "< 2" do
-    bundle "update", :all => bundle_update_requires_all?
-    expect(last_command.stdboth).not_to match(/in snapshot/i)
-    expect(last_command.bundler_err).to match(/current Bundler version/i).
-      and match(/perhaps you need to update bundler/i)
-  end
-
-  it "should warn that the newer version of Bundler would conflict", :bundler => "2" do
-    bundle! "update", :all => true
-    expect(last_command.bundler_err).to include("rails (3.0.1) has dependency bundler").
-      and include("so the dependency is being ignored")
-    expect(the_bundle).to include_gem "rails 3.0.1"
-  end
-end
-
-RSpec.describe "bundle update" do
-  it "shows the previous version of the gem when updated from rubygems source", :bundler => "< 2" do
-    build_repo2
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "activesupport"
-    G
-
-    bundle "update", :all => bundle_update_requires_all?
-    expect(out).to include("Using activesupport 2.3.5")
-
-    update_repo2 do
-      build_gem "activesupport", "3.0"
-    end
-
-    bundle "update", :all => bundle_update_requires_all?
-    expect(out).to include("Installing activesupport 3.0 (was 2.3.5)")
-  end
-
-  context "with suppress_install_using_messages set" do
-    before { bundle! "config suppress_install_using_messages true" }
-
-    it "only prints `Using` for versions that have changed" do
-      build_repo4 do
-        build_gem "bar"
-        build_gem "foo"
-      end
-
-      install_gemfile! <<-G
-        source "file://#{gem_repo4}"
-        gem "bar"
-        gem "foo"
-      G
-
-      bundle! "update", :all => bundle_update_requires_all?
-      out.gsub!(/RubyGems [\d\.]+ is not threadsafe.*\n?/, "")
-      expect(out).to include "Resolving dependencies...\nBundle updated!"
-
-      update_repo4 do
-        build_gem "foo", "2.0"
-      end
-
-      bundle! "update", :all => bundle_update_requires_all?
-      out.sub!("Removing foo (1.0)\n", "")
-      out.gsub!(/RubyGems [\d\.]+ is not threadsafe.*\n?/, "")
-      expect(out).to include strip_whitespace(<<-EOS).strip
-        Resolving dependencies...
-        Fetching foo 2.0 (was 1.0)
-        Installing foo 2.0 (was 1.0)
-        Bundle updated
-      EOS
-    end
-  end
-
-  it "shows error message when Gemfile.lock is not preset and gem is specified" do
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "activesupport"
-    G
-
-    bundle "update nonexisting"
-    expect(out).to include("This Bundle hasn't been installed yet. Run `bundle install` to update and install the bundled gems.")
-    expect(exitstatus).to eq(22) if exitstatus
-  end
-end
-
-RSpec.describe "bundle update --ruby" do
-  before do
-    install_gemfile <<-G
-        ::RUBY_VERSION = '2.1.3'
-        ::RUBY_PATCHLEVEL = 100
-        ruby '~> 2.1.0'
-    G
-    bundle "update --ruby"
-  end
-
-  context "when the Gemfile removes the ruby" do
-    before do
-      install_gemfile <<-G
-          ::RUBY_VERSION = '2.1.4'
-          ::RUBY_PATCHLEVEL = 222
-      G
-    end
-    it "removes the Ruby from the Gemfile.lock" do
-      bundle "update --ruby"
-
-      lockfile_should_be <<-L
-       GEM
-         specs:
-
-       PLATFORMS
-         #{lockfile_platforms}
-
-       DEPENDENCIES
-
-       BUNDLED WITH
-          #{Bundler::VERSION}
-      L
-    end
-  end
-
-  context "when the Gemfile specified an updated Ruby version" do
-    before do
-      install_gemfile <<-G
-          ::RUBY_VERSION = '2.1.4'
-          ::RUBY_PATCHLEVEL = 222
-          ruby '~> 2.1.0'
-      G
-    end
-    it "updates the Gemfile.lock with the latest version" do
-      bundle "update --ruby"
-
-      lockfile_should_be <<-L
-       GEM
-         specs:
-
-       PLATFORMS
-         #{lockfile_platforms}
-
-       DEPENDENCIES
-
-       RUBY VERSION
-          ruby 2.1.4p222
-
-       BUNDLED WITH
-          #{Bundler::VERSION}
-      L
-    end
-  end
-
-  context "when a different Ruby is being used than has been versioned" do
-    before do
-      install_gemfile <<-G
-          ::RUBY_VERSION = '2.2.2'
-          ::RUBY_PATCHLEVEL = 505
-          ruby '~> 2.1.0'
-      G
-    end
-    it "shows a helpful error message" do
-      bundle "update --ruby"
-
-      expect(out).to include("Your Ruby version is 2.2.2, but your Gemfile specified ~> 2.1.0")
-    end
-  end
-
-  context "when updating Ruby version and Gemfile `ruby`" do
-    before do
-      install_gemfile <<-G
-          ::RUBY_VERSION = '1.8.3'
-          ::RUBY_PATCHLEVEL = 55
-          ruby '~> 1.8.0'
-      G
-    end
-    it "updates the Gemfile.lock with the latest version" do
-      bundle "update --ruby"
-
-      lockfile_should_be <<-L
-       GEM
-         specs:
-
-       PLATFORMS
-         #{lockfile_platforms}
-
-       DEPENDENCIES
-
-       RUBY VERSION
-          ruby 1.8.3p55
-
-       BUNDLED WITH
-          #{Bundler::VERSION}
-      L
-    end
-  end
-end
-
-RSpec.describe "bundle update --bundler" do
-  it "updates the bundler version in the lockfile without re-resolving" do
-    build_repo4 do
-      build_gem "rack", "1.0"
-    end
-
-    install_gemfile! <<-G
-      source "file:#{gem_repo4}"
-      gem "rack"
-    G
-    lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, '\11.0.0\2')
-
-    FileUtils.rm_r gem_repo4
-
-    bundle! :update, :bundler => true, :verbose => true
-    expect(the_bundle).to include_gem "rack 1.0"
-
-    expect(the_bundle.locked_gems.bundler_version).to eq v(Bundler::VERSION)
-  end
-end
-
-# these specs are slow and focus on integration and therefore are not exhaustive. unit specs elsewhere handle that.
-RSpec.describe "bundle update conservative" do
-  context "patch and minor options" do
-    before do
-      build_repo4 do
-        build_gem "foo", %w[1.4.3 1.4.4] do |s|
-          s.add_dependency "bar", "~> 2.0"
-        end
-        build_gem "foo", %w[1.4.5 1.5.0] do |s|
-          s.add_dependency "bar", "~> 2.1"
-        end
-        build_gem "foo", %w[1.5.1] do |s|
-          s.add_dependency "bar", "~> 3.0"
-        end
-        build_gem "bar", %w[2.0.3 2.0.4 2.0.5 2.1.0 2.1.1 3.0.0]
-        build_gem "qux", %w[1.0.0 1.0.1 1.1.0 2.0.0]
-      end
-
-      # establish a lockfile set to 1.4.3
-      install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'foo', '1.4.3'
-        gem 'bar', '2.0.3'
-        gem 'qux', '1.0.0'
-      G
-
-      # remove 1.4.3 requirement and bar altogether
-      # to setup update specs below
-      gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'foo'
-        gem 'qux'
-      G
-    end
-
-    context "patch preferred" do
-      it "single gem updates dependent gem to minor" do
-        bundle! "update --patch foo"
-
-        expect(the_bundle).to include_gems "foo 1.4.5", "bar 2.1.1", "qux 1.0.0"
-      end
-
-      it "update all" do
-        bundle! "update --patch", :all => bundle_update_requires_all?
-
-        expect(the_bundle).to include_gems "foo 1.4.5", "bar 2.1.1", "qux 1.0.1"
-      end
-    end
-
-    context "minor preferred" do
-      it "single gem updates dependent gem to major" do
-        bundle! "update --minor foo"
-
-        expect(the_bundle).to include_gems "foo 1.5.1", "bar 3.0.0", "qux 1.0.0"
-      end
-    end
-
-    context "strict" do
-      it "patch preferred" do
-        bundle! "update --patch foo bar --strict"
-
-        expect(the_bundle).to include_gems "foo 1.4.4", "bar 2.0.5", "qux 1.0.0"
-      end
-
-      it "minor preferred" do
-        bundle! "update --minor --strict", :all => bundle_update_requires_all?
-
-        expect(the_bundle).to include_gems "foo 1.5.0", "bar 2.1.1", "qux 1.1.0"
-      end
-    end
-  end
-
-  context "eager unlocking" do
-    before do
-      build_repo4 do
-        build_gem "isolated_owner", %w[1.0.1 1.0.2] do |s|
-          s.add_dependency "isolated_dep", "~> 2.0"
-        end
-        build_gem "isolated_dep", %w[2.0.1 2.0.2]
-
-        build_gem "shared_owner_a", %w[3.0.1 3.0.2] do |s|
-          s.add_dependency "shared_dep", "~> 5.0"
-        end
-        build_gem "shared_owner_b", %w[4.0.1 4.0.2] do |s|
-          s.add_dependency "shared_dep", "~> 5.0"
-        end
-        build_gem "shared_dep", %w[5.0.1 5.0.2]
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'isolated_owner'
-
-        gem 'shared_owner_a'
-        gem 'shared_owner_b'
-      G
-
-      lockfile <<-L
-        GEM
-          remote: file://#{gem_repo4}
-          specs:
-            isolated_dep (2.0.1)
-            isolated_owner (1.0.1)
-              isolated_dep (~> 2.0)
-            shared_dep (5.0.1)
-            shared_owner_a (3.0.1)
-              shared_dep (~> 5.0)
-            shared_owner_b (4.0.1)
-              shared_dep (~> 5.0)
-
-        PLATFORMS
-          ruby
-
-        DEPENDENCIES
-          shared_owner_a
-          shared_owner_b
-          isolated_owner
-
-        BUNDLED WITH
-           1.13.0
-      L
-    end
-
-    it "should eagerly unlock isolated dependency" do
-      bundle "update isolated_owner"
-
-      expect(the_bundle).to include_gems "isolated_owner 1.0.2", "isolated_dep 2.0.2", "shared_dep 5.0.1", "shared_owner_a 3.0.1", "shared_owner_b 4.0.1"
-    end
-
-    it "should eagerly unlock shared dependency" do
-      bundle "update shared_owner_a"
-
-      expect(the_bundle).to include_gems "isolated_owner 1.0.1", "isolated_dep 2.0.1", "shared_dep 5.0.2", "shared_owner_a 3.0.2", "shared_owner_b 4.0.1"
-    end
-
-    it "should not eagerly unlock with --conservative" do
-      bundle "update --conservative shared_owner_a isolated_owner"
-
-      expect(the_bundle).to include_gems "isolated_owner 1.0.2", "isolated_dep 2.0.2", "shared_dep 5.0.1", "shared_owner_a 3.0.2", "shared_owner_b 4.0.1"
-    end
-
-    it "should match bundle install conservative update behavior when not eagerly unlocking" do
-      gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem 'isolated_owner', '1.0.2'
-
-        gem 'shared_owner_a', '3.0.2'
-        gem 'shared_owner_b'
-      G
-
-      bundle "install"
-
-      expect(the_bundle).to include_gems "isolated_owner 1.0.2", "isolated_dep 2.0.2", "shared_dep 5.0.1", "shared_owner_a 3.0.2", "shared_owner_b 4.0.1"
-    end
-  end
-
-  context "error handling" do
-    before do
-      gemfile ""
-    end
-
-    it "raises if too many flags are provided" do
-      bundle "update --patch --minor", :all => bundle_update_requires_all?
-
-      expect(last_command.bundler_err).to eq "Provide only one of the following options: minor, patch"
-    end
-  end
-end
diff --git a/spec/bundler/commands/version_spec.rb b/spec/bundler/commands/version_spec.rb
deleted file mode 100644
index b919c25e0f..0000000000
--- a/spec/bundler/commands/version_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle version" do
-  context "with -v" do
-    it "outputs the version", :bundler => "< 2" do
-      bundle! "-v"
-      expect(out).to eq("Bundler version #{Bundler::VERSION}")
-    end
-
-    it "outputs the version", :bundler => "2" do
-      bundle! "-v"
-      expect(out).to eq(Bundler::VERSION)
-    end
-  end
-
-  context "with --version" do
-    it "outputs the version", :bundler => "< 2" do
-      bundle! "--version"
-      expect(out).to eq("Bundler version #{Bundler::VERSION}")
-    end
-
-    it "outputs the version", :bundler => "2" do
-      bundle! "--version"
-      expect(out).to eq(Bundler::VERSION)
-    end
-  end
-
-  context "with version" do
-    it "outputs the version with build metadata", :bundler => "< 2" do
-      bundle! "version"
-      expect(out).to match(/\ABundler version #{Regexp.escape(Bundler::VERSION)} \(\d{4}-\d{2}-\d{2} commit [a-fA-F0-9]{7,}\)\z/)
-    end
-
-    it "outputs the version with build metadata", :bundler => "2" do
-      bundle! "version"
-      expect(out).to match(/\A#{Regexp.escape(Bundler::VERSION)} \(\d{4}-\d{2}-\d{2} commit [a-fA-F0-9]{7,}\)\z/)
-    end
-  end
-end
diff --git a/spec/bundler/commands/viz_spec.rb b/spec/bundler/commands/viz_spec.rb
deleted file mode 100644
index 3804d3561c..0000000000
--- a/spec/bundler/commands/viz_spec.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle viz", :ruby => "1.9.3", :bundler => "< 2", :if => Bundler.which("dot") do
-  let(:ruby_graphviz) do
-    graphviz_glob = base_system_gems.join("cache/ruby-graphviz*")
-    Pathname.glob(graphviz_glob).first
-  end
-
-  before do
-    system_gems ruby_graphviz
-  end
-
-  it "graphs gems from the Gemfile" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      gem "rack-obama"
-    G
-
-    bundle! "viz"
-    expect(out).to include("gem_graph.png")
-
-    bundle! "viz", :format => "debug"
-    expect(out).to eq(strip_whitespace(<<-DOT).strip)
-      digraph Gemfile {
-      concentrate = "true";
-      normalize = "true";
-      nodesep = "0.55";
-      edge[ weight  =  "2"];
-      node[ fontname  =  "Arial, Helvetica, SansSerif"];
-      edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
-      default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-      rack [style = "filled", fillcolor = "#B9B9D5", label = "rack"];
-        default -> rack [constraint = "false"];
-      "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama"];
-        default -> "rack-obama" [constraint = "false"];
-        "rack-obama" -> rack;
-      }
-      debugging bundle viz...
-    DOT
-  end
-
-  it "graphs gems that are prereleases" do
-    build_repo2 do
-      build_gem "rack", "1.3.pre"
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "rack", "= 1.3.pre"
-      gem "rack-obama"
-    G
-
-    bundle! "viz"
-    expect(out).to include("gem_graph.png")
-
-    bundle! "viz", :format => :debug, :version => true
-    expect(out).to eq(strip_whitespace(<<-EOS).strip)
-      digraph Gemfile {
-      concentrate = "true";
-      normalize = "true";
-      nodesep = "0.55";
-      edge[ weight  =  "2"];
-      node[ fontname  =  "Arial, Helvetica, SansSerif"];
-      edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
-      default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-      rack [style = "filled", fillcolor = "#B9B9D5", label = "rack\\n1.3.pre"];
-        default -> rack [constraint = "false"];
-      "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama\\n1.0"];
-        default -> "rack-obama" [constraint = "false"];
-        "rack-obama" -> rack;
-      }
-      debugging bundle viz...
-    EOS
-  end
-
-  context "with another gem that has a graphviz file" do
-    before do
-      build_repo4 do
-        build_gem "graphviz", "999" do |s|
-          s.write("lib/graphviz.rb", "abort 'wrong graphviz gem loaded'")
-        end
-      end
-
-      system_gems ruby_graphviz, "graphviz-999", :gem_repo => gem_repo4
-    end
-
-    it "loads the correct ruby-graphviz gem" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      bundle! "viz", :format => "debug"
-      expect(out).to eq(strip_whitespace(<<-DOT).strip)
-        digraph Gemfile {
-        concentrate = "true";
-        normalize = "true";
-        nodesep = "0.55";
-        edge[ weight  =  "2"];
-        node[ fontname  =  "Arial, Helvetica, SansSerif"];
-        edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
-        default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-        rack [style = "filled", fillcolor = "#B9B9D5", label = "rack"];
-          default -> rack [constraint = "false"];
-        "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama"];
-          default -> "rack-obama" [constraint = "false"];
-          "rack-obama" -> rack;
-        }
-        debugging bundle viz...
-      DOT
-    end
-  end
-
-  context "--without option" do
-    it "one group" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activesupport"
-
-        group :rails do
-          gem "rails"
-        end
-      G
-
-      bundle! "viz --without=rails"
-      expect(out).to include("gem_graph.png")
-    end
-
-    it "two groups" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activesupport"
-
-        group :rack do
-          gem "rack"
-        end
-
-        group :rails do
-          gem "rails"
-        end
-      G
-
-      bundle! "viz --without=rails:rack"
-      expect(out).to include("gem_graph.png")
-    end
-  end
-end
diff --git a/spec/bundler/install/allow_offline_install_spec.rb b/spec/bundler/install/allow_offline_install_spec.rb
deleted file mode 100644
index d4bb595771..0000000000
--- a/spec/bundler/install/allow_offline_install_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with :allow_offline_install" do
-  before do
-    bundle "config allow_offline_install true"
-  end
-
-  context "with no cached data locally" do
-    it "still installs" do
-      install_gemfile! <<-G, :artifice => "compact_index"
-        source "http://testgemserver.local"
-        gem "rack-obama"
-      G
-      expect(the_bundle).to include_gem("rack 1.0")
-    end
-
-    it "still fails when the network is down" do
-      install_gemfile <<-G, :artifice => "fail"
-        source "http://testgemserver.local"
-        gem "rack-obama"
-      G
-      expect(out).to include("Could not reach host testgemserver.local.")
-      expect(the_bundle).to_not be_locked
-    end
-  end
-
-  context "with cached data locally" do
-    it "will install from the compact index" do
-      system_gems ["rack-1.0.0"], :path => :bundle_path
-
-      bundle! "config clean false"
-      install_gemfile! <<-G, :artifice => "compact_index"
-        source "http://testgemserver.local"
-        gem "rack-obama"
-        gem "rack", "< 1.0"
-      G
-
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 0.9.1")
-
-      gemfile <<-G
-        source "http://testgemserver.local"
-        gem "rack-obama"
-      G
-
-      bundle! :update, :artifice => "fail", :all => true
-      expect(last_command.stdboth).to include "Using the cached data for the new index because of a network error"
-
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 1.0.0")
-    end
-
-    def break_git_remote_ops!
-      FileUtils.mkdir_p(tmp("broken_path"))
-      File.open(tmp("broken_path/git"), "w", 0o755) do |f|
-        f.puts strip_whitespace(<<-RUBY)
-          #!/usr/bin/env ruby
-          if %w(fetch --force --quiet --tags refs/heads/*:refs/heads/*).-(ARGV).empty? || %w(clone --bare --no-hardlinks --quiet).-(ARGV).empty?
-            warn "git remote ops have been disabled"
-            exit 1
-          end
-          ENV["PATH"] = ENV["PATH"].sub(/^.*?:/, "")
-          exec("git", *ARGV)
-        RUBY
-      end
-
-      old_path = ENV["PATH"]
-      ENV["PATH"] = "#{tmp("broken_path")}:#{ENV["PATH"]}"
-      yield if block_given?
-    ensure
-      ENV["PATH"] = old_path if block_given?
-    end
-
-    it "will install from a cached git repo" do
-      git = build_git "a", "1.0.0", :path => lib_path("a")
-      update_git("a", :path => git.path, :branch => "new_branch")
-      install_gemfile! <<-G
-        gem "a", :git => #{git.path.to_s.dump}
-      G
-
-      break_git_remote_ops! { bundle! :update, :all => true }
-      expect(out).to include("Using cached git data because of network errors")
-      expect(the_bundle).to be_locked
-
-      break_git_remote_ops! do
-        install_gemfile! <<-G
-          gem "a", :git => #{git.path.to_s.dump}, :branch => "new_branch"
-        G
-      end
-      expect(out).to include("Using cached git data because of network errors")
-      expect(the_bundle).to be_locked
-    end
-  end
-end
diff --git a/spec/bundler/install/binstubs_spec.rb b/spec/bundler/install/binstubs_spec.rb
deleted file mode 100644
index 23eb691ab8..0000000000
--- a/spec/bundler/install/binstubs_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install", :bundler => "< 2" do
-  describe "when system_bindir is set" do
-    # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
-    # you want to avoid sudo installs for system gems with OS X's default ruby
-    it "overrides Gem.bindir" do
-      expect(Pathname.new("/usr/bin")).not_to be_writable unless Process.euid == 0
-      gemfile <<-G
-        require 'rubygems'
-        def Gem.bindir; "/usr/bin"; end
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      config "BUNDLE_SYSTEM_BINDIR" => system_gem_path("altbin").to_s
-      bundle :install
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(system_gem_path("altbin/rackup")).to exist
-    end
-  end
-
-  describe "when multiple gems contain the same exe", :bundler => "< 2" do
-    before do
-      build_repo2 do
-        build_gem "fake", "14" do |s|
-          s.executables = "rackup"
-        end
-      end
-
-      install_gemfile <<-G, :binstubs => true
-        source "file://#{gem_repo2}"
-        gem "fake"
-        gem "rack"
-      G
-    end
-
-    it "loads the correct spec's executable" do
-      gembin("rackup")
-      expect(out).to eq("1.2")
-    end
-  end
-end
diff --git a/spec/bundler/install/bundler_spec.rb b/spec/bundler/install/bundler_spec.rb
deleted file mode 100644
index 42863ed89b..0000000000
--- a/spec/bundler/install/bundler_spec.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  describe "with bundler dependencies" do
-    before(:each) do
-      build_repo2 do
-        build_gem "rails", "3.0" do |s|
-          s.add_dependency "bundler", ">= 0.9.0.pre"
-        end
-        build_gem "bundler", "0.9.1"
-        build_gem "bundler", Bundler::VERSION
-      end
-    end
-
-    it "are forced to the current bundler version" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      expect(the_bundle).to include_gems "bundler #{Bundler::VERSION}"
-    end
-
-    it "are not added if not already present" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      expect(the_bundle).not_to include_gems "bundler #{Bundler::VERSION}"
-    end
-
-    it "causes a conflict if explicitly requesting a different version" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-        gem "bundler", "0.9.2"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, "")
-        Bundler could not find compatible versions for gem "bundler":
-          In Gemfile:
-            bundler (= 0.9.2)
-
-          Current Bundler version:
-            bundler (#{Bundler::VERSION})
-        This Gemfile requires a different version of Bundler.
-        Perhaps you need to update Bundler by running `gem install bundler`?
-
-        Could not find gem 'bundler (= 0.9.2)' in any
-        E
-      expect(last_command.bundler_err).to include(nice_error)
-    end
-
-    it "works for gems with multiple versions in its dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "multiple_versioned_deps"
-      G
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "multiple_versioned_deps"
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems "multiple_versioned_deps 1.0.0"
-    end
-
-    it "includes bundler in the bundle when it's a child dependency" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError; puts 'FAIL'; end"
-      expect(out).to eq("WIN")
-    end
-
-    it "allows gem 'bundler' when Bundler is not in the Gemfile or its dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-
-      run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError => e; puts e.backtrace; end"
-      expect(out).to eq("WIN")
-    end
-
-    it "causes a conflict if child dependencies conflict" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activemerchant"
-        gem "rails_fail"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, "")
-        Bundler could not find compatible versions for gem "activesupport":
-          In Gemfile:
-            activemerchant was resolved to 1.0, which depends on
-              activesupport (>= 2.0.0)
-
-            rails_fail was resolved to 1.0, which depends on
-              activesupport (= 1.2.3)
-      E
-      expect(last_command.bundler_err).to include(nice_error)
-    end
-
-    it "causes a conflict if a child dependency conflicts with the Gemfile" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails_fail"
-        gem "activesupport", "2.3.5"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, "")
-        Bundler could not find compatible versions for gem "activesupport":
-          In Gemfile:
-            activesupport (= 2.3.5)
-
-            rails_fail was resolved to 1.0, which depends on
-              activesupport (= 1.2.3)
-      E
-      expect(last_command.bundler_err).to include(nice_error)
-    end
-
-    it "can install dependencies with newer bundler version with system gems", :ruby => "> 2" do
-      bundle! "config path.system true"
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      simulate_bundler_version "99999999.99.1"
-
-      bundle! "check", :env => { "BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD" => "1" }
-      expect(out).to include("The Gemfile's dependencies are satisfied")
-    end
-
-    it "can install dependencies with newer bundler version with a local path", :ruby => "> 2" do
-      bundle! "config path .bundle"
-      bundle! "config global_path_appends_ruby_scope true"
-      install_gemfile! <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      simulate_bundler_version "99999999.99.1"
-
-      bundle! "check", :env => { "BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD" => "1" }
-      expect(out).to include("The Gemfile's dependencies are satisfied")
-    end
-
-    context "with allow_bundler_dependency_conflicts set" do
-      before { bundle! "config allow_bundler_dependency_conflicts true" }
-
-      it "are forced to the current bundler version with warnings when no compatible version is found" do
-        build_repo4 do
-          build_gem "requires_nonexistant_bundler" do |s|
-            s.add_runtime_dependency "bundler", "99.99.99.99"
-          end
-        end
-
-        install_gemfile! <<-G
-          source "file://#{gem_repo4}"
-          gem "requires_nonexistant_bundler"
-        G
-
-        expect(out).to include "requires_nonexistant_bundler (1.0) has dependency bundler (= 99.99.99.99), " \
-                               "which is unsatisfied by the current bundler version #{Bundler::VERSION}, so the dependency is being ignored"
-
-        expect(the_bundle).to include_gems "bundler #{Bundler::VERSION}", "requires_nonexistant_bundler 1.0"
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb
deleted file mode 100644
index 3b9d68982a..0000000000
--- a/spec/bundler/install/deploy_spec.rb
+++ /dev/null
@@ -1,423 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "install with --deployment or --frozen" do
-  before do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-  end
-
-  context "with CLI flags", :bundler => "< 2" do
-    it "fails without a lockfile and says that --deployment requires a lock" do
-      bundle "install --deployment"
-      expect(out).to include("The --deployment flag requires a Gemfile.lock")
-    end
-
-    it "fails without a lockfile and says that --frozen requires a lock" do
-      bundle "install --frozen"
-      expect(out).to include("The --frozen flag requires a Gemfile.lock")
-    end
-
-    it "disallows --deployment --system" do
-      bundle "install --deployment --system"
-      expect(out).to include("You have specified both --deployment")
-      expect(out).to include("Please choose only one option")
-      expect(exitstatus).to eq(15) if exitstatus
-    end
-
-    it "disallows --deployment --path --system" do
-      bundle "install --deployment --path . --system"
-      expect(out).to include("You have specified both --path")
-      expect(out).to include("as well as --system")
-      expect(out).to include("Please choose only one option")
-      expect(exitstatus).to eq(15) if exitstatus
-    end
-
-    it "works after you try to deploy without a lock" do
-      bundle "install --deployment"
-      bundle! :install
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  it "still works if you are not in the app directory and specify --gemfile" do
-    bundle "install"
-    Dir.chdir tmp do
-      simulate_new_machine
-      bundle! :install,
-        forgotten_command_line_options(:gemfile => "#{tmp}/bundled_app/Gemfile",
-                                       :deployment => true,
-                                       :path => "vendor/bundle")
-    end
-    expect(the_bundle).to include_gems "rack 1.0"
-  end
-
-  it "works if you exclude a group with a git gem" do
-    build_git "foo"
-    gemfile <<-G
-      group :test do
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      end
-    G
-    bundle :install
-    bundle! :install, forgotten_command_line_options(:deployment => true, :without => "test")
-  end
-
-  it "works when you bundle exec bundle", :ruby_repo do
-    bundle :install
-    bundle "install --deployment"
-    bundle! "exec bundle check"
-  end
-
-  it "works when using path gems from the same path and the version is specified" do
-    build_lib "foo", :path => lib_path("nested/foo")
-    build_lib "bar", :path => lib_path("nested/bar")
-    gemfile <<-G
-      gem "foo", "1.0", :path => "#{lib_path("nested")}"
-      gem "bar", :path => "#{lib_path("nested")}"
-    G
-
-    bundle! :install
-    bundle! :install, forgotten_command_line_options(:deployment => true)
-  end
-
-  it "works when there are credentials in the source URL" do
-    install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
-      source "http://user:pass@localgemserver.test/"
-
-      gem "rack-obama", ">= 1.0"
-    G
-
-    bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "endpoint_strict_basic_authentication")
-  end
-
-  it "works with sources given by a block" do
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}" do
-        gem "rack"
-      end
-    G
-
-    bundle! :install, forgotten_command_line_options(:deployment => true)
-
-    expect(the_bundle).to include_gems "rack 1.0"
-  end
-
-  describe "with an existing lockfile" do
-    before do
-      bundle "install"
-    end
-
-    it "works with the --deployment flag if you didn't change anything", :bundler => "< 2" do
-      bundle! "install --deployment"
-    end
-
-    it "works with the --frozen flag if you didn't change anything", :bundler => "< 2" do
-      bundle! "install --frozen"
-    end
-
-    it "works with BUNDLE_FROZEN if you didn't change anything" do
-      bundle! :install, :env => { "BUNDLE_FROZEN" => "true" }
-    end
-
-    it "explodes with the --deployment flag if you make a change and don't check in the lockfile" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      bundle :install, forgotten_command_line_options(:deployment => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama")
-      expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "works if a path gem is missing but is in a without group" do
-      build_lib "path_gem"
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rake"
-        gem "path_gem", :path => "#{lib_path("path_gem-1.0")}", :group => :development
-      G
-      expect(the_bundle).to include_gems "path_gem 1.0"
-      FileUtils.rm_r lib_path("path_gem-1.0")
-
-      bundle! :install, forgotten_command_line_options(:path => ".bundle", :without => "development", :deployment => true).merge(:env => { :DEBUG => "1" })
-      run! "puts :WIN"
-      expect(out).to eq("WIN")
-    end
-
-    it "explodes if a path gem is missing" do
-      build_lib "path_gem"
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rake"
-        gem "path_gem", :path => "#{lib_path("path_gem-1.0")}", :group => :development
-      G
-      expect(the_bundle).to include_gems "path_gem 1.0"
-      FileUtils.rm_r lib_path("path_gem-1.0")
-
-      bundle :install, forgotten_command_line_options(:path => ".bundle", :deployment => true)
-      expect(out).to include("The path `#{lib_path("path_gem-1.0")}` does not exist.")
-    end
-
-    it "can have --frozen set via an environment variable", :bundler => "< 2" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      ENV["BUNDLE_FROZEN"] = "1"
-      bundle "install"
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama")
-      expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "can have --deployment set via an environment variable" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      ENV["BUNDLE_DEPLOYMENT"] = "true"
-      bundle "install"
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama")
-      expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "can have --frozen set to false via an environment variable" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      ENV["BUNDLE_FROZEN"] = "false"
-      ENV["BUNDLE_DEPLOYMENT"] = "false"
-      bundle "install"
-      expect(out).not_to include("deployment mode")
-      expect(out).not_to include("You have added to the Gemfile")
-      expect(out).not_to include("* rack-obama")
-    end
-
-    it "explodes with the --frozen flag if you make a change and don't check in the lockfile", :bundler => "< 2" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama", "1.1"
-      G
-
-      bundle :install, forgotten_command_line_options(:frozen => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama (= 1.1)")
-      expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "explodes if you remove a gem and don't check in the lockfile" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activesupport"
-      G
-
-      bundle :install, forgotten_command_line_options(:deployment => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile:\n* activesupport\n\n")
-      expect(out).to include("You have deleted from the Gemfile:\n* rack")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "explodes if you add a source" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", :git => "git://hubz.com"
-      G
-
-      bundle :install, forgotten_command_line_options(:deployment => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "explodes if you unpin a source" do
-      build_git "rack"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-1.0")}"
-      G
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle :install, forgotten_command_line_options(:deployment => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master@#{revision_for(lib_path("rack-1.0"))[0..6]}")
-      expect(out).not_to include("You have added to the Gemfile")
-      expect(out).not_to include("You have changed in the Gemfile")
-    end
-
-    it "explodes if you unpin a source, leaving it pinned somewhere else" do
-      build_lib "foo", :path => lib_path("rack/foo")
-      build_git "rack", :path => lib_path("rack")
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack")}"
-        gem "foo", :git => "#{lib_path("rack")}"
-      G
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "foo", :git => "#{lib_path("rack")}"
-      G
-
-      bundle :install, forgotten_command_line_options(:deployment => true)
-      expect(out).to include("deployment mode")
-      expect(out).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master@#{revision_for(lib_path("rack"))[0..6]})`")
-      expect(out).not_to include("You have added to the Gemfile")
-      expect(out).not_to include("You have deleted from the Gemfile")
-    end
-
-    context "when replacing a host with the same host with credentials" do
-      let(:success_message) do
-        if Bundler::VERSION.split(".", 2).first == "1"
-          "Could not reach host localgemserver.test"
-        else
-          "Bundle complete!"
-        end
-      end
-
-      before do
-        install_gemfile <<-G
-        source "http://user_name:password@localgemserver.test/"
-        gem "rack"
-        G
-
-        lockfile <<-G
-        GEM
-          remote: http://localgemserver.test/
-          specs:
-            rack (1.0.0)
-
-        PLATFORMS
-          #{local}
-
-        DEPENDENCIES
-          rack
-        G
-      end
-
-      it "prevents the replace by default" do
-        bundle :install, forgotten_command_line_options(:deployment => true)
-
-        expect(out).to match(/The list of sources changed/)
-      end
-
-      context "when allow_deployment_source_credential_changes is true" do
-        before { bundle! "config allow_deployment_source_credential_changes true" }
-
-        it "allows the replace" do
-          bundle :install, forgotten_command_line_options(:deployment => true)
-
-          expect(out).to match(/#{success_message}/)
-        end
-      end
-
-      context "when allow_deployment_source_credential_changes is false" do
-        before { bundle! "config allow_deployment_source_credential_changes false" }
-
-        it "prevents the replace" do
-          bundle :install, forgotten_command_line_options(:deployment => true)
-
-          expect(out).to match(/The list of sources changed/)
-        end
-      end
-
-      context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is true" do
-        before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "true" }
-
-        it "allows the replace" do
-          bundle :install, forgotten_command_line_options(:deployment => true)
-
-          expect(out).to match(/#{success_message}/)
-        end
-      end
-
-      context "when BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES env var is false" do
-        before { ENV["BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES"] = "false" }
-
-        it "prevents the replace" do
-          bundle :install, forgotten_command_line_options(:deployment => true)
-
-          expect(out).to match(/The list of sources changed/)
-        end
-      end
-    end
-
-    it "remembers that the bundle is frozen at runtime" do
-      bundle! :lock
-
-      bundle! "config deployment true"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "1.0.0"
-        gem "rack-obama"
-      G
-
-      expect(the_bundle).not_to include_gems "rack 1.0.0"
-      expect(err).to include strip_whitespace(<<-E).strip
-The dependencies in your gemfile changed
-
-You have added to the Gemfile:
-* rack (= 1.0.0)
-* rack-obama
-
-You have deleted from the Gemfile:
-* rack
-      E
-    end
-  end
-
-  context "with path in Gemfile and packed" do
-    it "works fine after bundle package and bundle install --local" do
-      build_lib "foo", :path => lib_path("foo")
-      install_gemfile! <<-G
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-
-      bundle! :install
-      expect(the_bundle).to include_gems "foo 1.0"
-      bundle! :package, forgotten_command_line_options([:all, :cache_all] => true)
-      expect(bundled_app("vendor/cache/foo")).to be_directory
-
-      bundle! "install --local"
-      expect(out).to include("Updating files in vendor/cache")
-
-      simulate_new_machine
-      bundle! "install --verbose", forgotten_command_line_options(:deployment => true)
-      expect(out).not_to include("You are trying to install in deployment mode after changing your Gemfile")
-      expect(out).not_to include("You have added to the Gemfile")
-      expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).to include("vendor/cache/foo")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-  end
-end
diff --git a/spec/bundler/install/failure_spec.rb b/spec/bundler/install/failure_spec.rb
deleted file mode 100644
index b4cdf13857..0000000000
--- a/spec/bundler/install/failure_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  context "installing a gem fails" do
-    it "prints out why that gem was being installed" do
-      build_repo2 do
-        build_gem "activesupport", "2.3.2" do |s|
-          s.extensions << "Rakefile"
-          s.write "Rakefile", <<-RUBY
-            task :default do
-              abort "make installing activesupport-2.3.2 fail"
-            end
-          RUBY
-        end
-      end
-
-      install_gemfile <<-G
-        source "file:\/\/localhost#{gem_repo2}"
-        gem "rails"
-      G
-      expect(last_command.bundler_err).to end_with(normalize_uri_file(<<-M.strip))
-An error occurred while installing activesupport (2.3.2), and Bundler cannot continue.
-Make sure that `gem install activesupport -v '2.3.2' --source 'file://localhost#{gem_repo2}/'` succeeds before bundling.
-
-In Gemfile:
-  rails was resolved to 2.3.2, which depends on
-    actionmailer was resolved to 2.3.2, which depends on
-      activesupport
-                     M
-    end
-
-    context "when installing a git gem" do
-      it "does not tell the user to run 'gem install'" do
-        build_git "activesupport", "2.3.2", :path => lib_path("activesupport") do |s|
-          s.extensions << "Rakefile"
-          s.write "Rakefile", <<-RUBY
-            task :default do
-              abort "make installing activesupport-2.3.2 fail"
-            end
-          RUBY
-        end
-
-        install_gemfile <<-G
-          source "file:\/\/localhost#{gem_repo1}"
-          gem "rails"
-          gem "activesupport", :git => "#{lib_path("activesupport")}"
-        G
-
-        expect(last_command.bundler_err).to end_with(<<-M.strip)
-An error occurred while installing activesupport (2.3.2), and Bundler cannot continue.
-
-In Gemfile:
-  rails was resolved to 2.3.2, which depends on
-    actionmailer was resolved to 2.3.2, which depends on
-      activesupport
-                     M
-      end
-    end
-
-    context "when installing a gem using a git block" do
-      it "does not tell the user to run 'gem install'" do
-        build_git "activesupport", "2.3.2", :path => lib_path("activesupport") do |s|
-          s.extensions << "Rakefile"
-          s.write "Rakefile", <<-RUBY
-            task :default do
-              abort "make installing activesupport-2.3.2 fail"
-            end
-          RUBY
-        end
-
-        install_gemfile <<-G
-          source "file:\/\/localhost#{gem_repo1}"
-          gem "rails"
-
-          git "#{lib_path("activesupport")}" do
-            gem "activesupport"
-          end
-        G
-
-        expect(last_command.bundler_err).to end_with(<<-M.strip)
-An error occurred while installing activesupport (2.3.2), and Bundler cannot continue.
-
-
-In Gemfile:
-  rails was resolved to 2.3.2, which depends on
-    actionmailer was resolved to 2.3.2, which depends on
-      activesupport
-                     M
-      end
-    end
-
-    it "prints out the hint for the remote source when available" do
-      build_repo2 do
-        build_gem "activesupport", "2.3.2" do |s|
-          s.extensions << "Rakefile"
-          s.write "Rakefile", <<-RUBY
-            task :default do
-              abort "make installing activesupport-2.3.2 fail"
-            end
-          RUBY
-        end
-      end
-
-      build_repo4 do
-        build_gem "a"
-      end
-
-      install_gemfile <<-G
-        source "file:\/\/localhost#{gem_repo4}"
-        source "file:\/\/localhost#{gem_repo2}" do
-          gem "rails"
-        end
-      G
-      expect(last_command.bundler_err).to end_with(normalize_uri_file(<<-M.strip))
-An error occurred while installing activesupport (2.3.2), and Bundler cannot continue.
-Make sure that `gem install activesupport -v '2.3.2' --source 'file://localhost#{gem_repo2}/'` succeeds before bundling.
-
-In Gemfile:
-  rails was resolved to 2.3.2, which depends on
-    actionmailer was resolved to 2.3.2, which depends on
-      activesupport
-                     M
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/eval_gemfile_spec.rb b/spec/bundler/install/gemfile/eval_gemfile_spec.rb
deleted file mode 100644
index 035d3692aa..0000000000
--- a/spec/bundler/install/gemfile/eval_gemfile_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with gemfile that uses eval_gemfile" do
-  before do
-    build_lib("gunks", :path => bundled_app.join("gems/gunks")) do |s|
-      s.name    = "gunks"
-      s.version = "0.0.1"
-    end
-  end
-
-  context "eval-ed Gemfile points to an internal gemspec" do
-    before do
-      create_file "Gemfile-other", <<-G
-        gemspec :path => 'gems/gunks'
-      G
-    end
-
-    it "installs the gemspec specified gem" do
-      install_gemfile <<-G
-        eval_gemfile 'Gemfile-other'
-      G
-      expect(out).to include("Resolving dependencies")
-      expect(out).to include("Bundle complete")
-
-      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
-    end
-  end
-
-  context "eval-ed Gemfile has relative-path gems" do
-    before do
-      build_lib("a", :path => "gems/a")
-      create_file "nested/Gemfile-nested", <<-G
-        gem "a", :path => "../gems/a"
-      G
-
-      gemfile <<-G
-        eval_gemfile "nested/Gemfile-nested"
-      G
-    end
-
-    it "installs the path gem" do
-      bundle! :install
-      expect(the_bundle).to include_gem("a 1.0")
-    end
-
-    # Make sure that we are properly comparing path based gems between the
-    # parsed lockfile and the evaluated gemfile.
-    it "bundles with --deployment" do
-      bundle! :install
-      bundle! :install, forgotten_command_line_options(:deployment => true)
-    end
-  end
-
-  context "Gemfile uses gemspec paths after eval-ing a Gemfile" do
-    before { create_file "other/Gemfile-other" }
-
-    it "installs the gemspec specified gem" do
-      install_gemfile <<-G
-        eval_gemfile 'other/Gemfile-other'
-        gemspec :path => 'gems/gunks'
-      G
-      expect(out).to include("Resolving dependencies")
-      expect(out).to include("Bundle complete")
-
-      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
-    end
-  end
-
-  context "eval-ed Gemfile references other gemfiles" do
-    it "works with relative paths" do
-      create_file "other/Gemfile-other", "gem 'rack'"
-      create_file "other/Gemfile", "eval_gemfile 'Gemfile-other'"
-      create_file "Gemfile-alt", <<-G
-        source "file:#{gem_repo1}"
-        eval_gemfile "other/Gemfile"
-      G
-      install_gemfile! "eval_gemfile File.expand_path('Gemfile-alt')"
-
-      expect(the_bundle).to include_gem "rack 1.0.0"
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb
deleted file mode 100644
index 7ce037730e..0000000000
--- a/spec/bundler/install/gemfile/gemspec_spec.rb
+++ /dev/null
@@ -1,672 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install from an existing gemspec" do
-  before(:each) do
-    build_repo2 do
-      build_gem "bar"
-      build_gem "bar-dev"
-    end
-  end
-
-  it "should install runtime and development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source :rubygems\ngemspec")
-      s.add_dependency "bar", "=1.0.0"
-      s.add_development_dependency "bar-dev", "=1.0.0"
-    end
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
-  end
-
-  it "that is hidden should install runtime and development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source :rubygems\ngemspec")
-      s.add_dependency "bar", "=1.0.0"
-      s.add_development_dependency "bar-dev", "=1.0.0"
-    end
-    FileUtils.mv tmp.join("foo", "foo.gemspec"), tmp.join("foo", ".gemspec")
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
-  end
-
-  it "should handle a list of requirements" do
-    update_repo2 do
-      build_gem "baz", "1.0"
-      build_gem "baz", "1.1"
-    end
-
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source :rubygems\ngemspec")
-      s.add_dependency "baz", ">= 1.0", "< 1.1"
-    end
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    expect(the_bundle).to include_gems "baz 1.0"
-  end
-
-  it "should raise if there are no gemspecs available" do
-    build_lib("foo", :path => tmp.join("foo"), :gemspec => false)
-
-    install_gemfile(<<-G)
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-    expect(last_command.bundler_err).to match(/There are no gemspecs at #{tmp.join('foo')}/)
-  end
-
-  it "should raise if there are too many gemspecs available" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("foo2.gemspec", build_spec("foo", "4.0").first.to_ruby)
-    end
-
-    install_gemfile(<<-G)
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-    expect(last_command.bundler_err).to match(/There are multiple gemspecs at #{tmp.join('foo')}/)
-  end
-
-  it "should pick a specific gemspec" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("foo2.gemspec", "")
-      s.add_dependency "bar", "=1.0.0"
-      s.add_development_dependency "bar-dev", "=1.0.0"
-    end
-
-    install_gemfile(<<-G)
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-    G
-
-    expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
-  end
-
-  it "should use a specific group for development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("foo2.gemspec", "")
-      s.add_dependency "bar", "=1.0.0"
-      s.add_development_dependency "bar-dev", "=1.0.0"
-    end
-
-    install_gemfile(<<-G)
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo', :development_group => :dev
-    G
-
-    expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).not_to include_gems "bar-dev 1.0.0", :groups => :development
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :dev
-  end
-
-  it "should match a lockfile even if the gemspec defines development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
-      s.add_dependency "actionpack", "=2.3.2"
-      s.add_development_dependency "rake", "=10.0.2"
-    end
-
-    Dir.chdir(tmp.join("foo")) do
-      bundle "install"
-      # This should really be able to rely on $stderr, but, it's not written
-      # right, so we can't. In fact, this is a bug negation test, and so it'll
-      # ghost pass in future, and will only catch a regression if the message
-      # doesn't change. Exit codes should be used correctly (they can be more
-      # than just 0 and 1).
-      output = bundle("install --deployment")
-      expect(output).not_to match(/You have added to the Gemfile/)
-      expect(output).not_to match(/You have deleted from the Gemfile/)
-      expect(output).not_to match(/install in deployment mode after changing/)
-    end
-  end
-
-  it "should match a lockfile without needing to re-resolve" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.add_dependency "rack"
-    end
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    bundle! "install", :verbose => true
-
-    message = "Found no changes, using resolution from the lockfile"
-    expect(out.scan(message).size).to eq(1)
-  end
-
-  it "should match a lockfile without needing to re-resolve with development dependencies" do
-    simulate_platform java
-
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.add_dependency "rack"
-      s.add_development_dependency "thin"
-    end
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    bundle! "install", :verbose => true
-
-    message = "Found no changes, using resolution from the lockfile"
-    expect(out.scan(message).size).to eq(1)
-  end
-
-  it "should match a lockfile on non-ruby platforms with a transitive platform dependency" do
-    simulate_platform java
-    simulate_ruby_engine "jruby"
-
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.add_dependency "platform_specific"
-    end
-
-    system_gems "platform_specific-1.0-java", :path => :bundle_path, :keep_path => true
-
-    install_gemfile! <<-G
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    bundle! "update --bundler", :verbose => true
-    expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 JAVA"
-  end
-
-  it "should evaluate the gemspec in its directory" do
-    build_lib("foo", :path => tmp.join("foo"))
-    File.open(tmp.join("foo/foo.gemspec"), "w") do |s|
-      s.write "raise 'ahh' unless Dir.pwd == '#{tmp.join("foo")}'"
-    end
-
-    install_gemfile <<-G
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-    expect(last_command.stdboth).not_to include("ahh")
-  end
-
-  it "allows the gemspec to activate other gems" do
-    ENV["BUNDLE_PATH__SYSTEM"] = "true"
-    # see https://github.com/bundler/bundler/issues/5409
-    #
-    # issue was caused by rubygems having an unresolved gem during a require,
-    # so emulate that
-    system_gems %w[rack-1.0.0 rack-0.9.1 rack-obama-1.0]
-
-    build_lib("foo", :path => bundled_app)
-    gemspec = bundled_app("foo.gemspec").read
-    bundled_app("foo.gemspec").open("w") do |f|
-      f.write "#{gemspec.strip}.tap { gem 'rack-obama'; require 'rack-obama' }"
-    end
-
-    install_gemfile! <<-G
-      gemspec
-    G
-
-    expect(the_bundle).to include_gem "foo 1.0"
-  end
-
-  it "allows conflicts" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.version = "1.0.0"
-      s.add_dependency "bar", "= 1.0.0"
-    end
-    build_gem "deps", :to_bundle => true do |s|
-      s.add_dependency "foo", "= 0.0.1"
-    end
-    build_gem "foo", "0.0.1", :to_bundle => true
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "deps"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0.0"
-  end
-
-  it "does not break Gem.finish_resolve with conflicts", :rubygems => ">= 2" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.version = "1.0.0"
-      s.add_dependency "bar", "= 1.0.0"
-    end
-    update_repo2 do
-      build_gem "deps" do |s|
-        s.add_dependency "foo", "= 0.0.1"
-      end
-      build_gem "foo", "0.0.1"
-    end
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo2}"
-      gem "deps"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0.0"
-
-    run! "Gem.finish_resolve; puts 'WIN'"
-    expect(out).to eq("WIN")
-  end
-
-  context "in deployment mode" do
-    context "when the lockfile was not updated after a change to the gemspec's dependencies" do
-      it "reports that installation failed" do
-        build_lib "cocoapods", :path => bundled_app do |s|
-          s.add_dependency "activesupport", ">= 1"
-        end
-
-        install_gemfile! <<-G
-          source "file://#{gem_repo1}"
-          gemspec
-        G
-
-        expect(the_bundle).to include_gems("cocoapods 1.0", "activesupport 2.3.5")
-
-        build_lib "cocoapods", :path => bundled_app do |s|
-          s.add_dependency "activesupport", ">= 1.0.1"
-        end
-
-        bundle :install, forgotten_command_line_options(:deployment => true)
-
-        expect(out).to include("changed")
-      end
-    end
-  end
-
-  context "when child gemspecs conflict with a released gemspec" do
-    before do
-      # build the "parent" gem that depends on another gem in the same repo
-      build_lib "source_conflict", :path => bundled_app do |s|
-        s.add_dependency "rack_middleware"
-      end
-
-      # build the "child" gem that is the same version as a released gem, but
-      # has completely different and conflicting dependency requirements
-      build_lib "rack_middleware", "1.0", :path => bundled_app("rack_middleware") do |s|
-        s.add_dependency "rack", "1.0" # anything other than 0.9.1
-      end
-    end
-
-    it "should install the child gemspec's deps" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gemspec
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  context "with a lockfile and some missing dependencies" do
-    let(:source_uri) { "http://localgemserver.test" }
-
-    context "previously bundled for Ruby" do
-      let(:platform) { "ruby" }
-      let(:explicit_platform) { false }
-
-      before do
-        build_lib("foo", :path => tmp.join("foo")) do |s|
-          s.add_dependency "rack", "=1.0.0"
-        end
-
-        if explicit_platform
-          create_file(
-            tmp.join("foo", "foo-#{platform}.gemspec"),
-            build_spec("foo", "1.0", platform) do
-              dep "rack", "=1.0.0"
-              @spec.authors = "authors"
-              @spec.summary = "summary"
-            end.first.to_ruby
-          )
-        end
-
-        gemfile <<-G
-          source "#{source_uri}"
-          gemspec :path => "../foo"
-        G
-
-        lockfile <<-L
-          PATH
-            remote: ../foo
-            specs:
-              foo (1.0)
-                rack (= 1.0.0)
-
-          GEM
-            remote: #{source_uri}
-            specs:
-              rack (1.0.0)
-
-          PLATFORMS
-            #{generic_local_platform}
-
-          DEPENDENCIES
-            foo!
-
-          BUNDLED WITH
-             #{Bundler::VERSION}
-        L
-      end
-
-      context "using JRuby with explicit platform" do
-        let(:platform) { "java" }
-        let(:explicit_platform) { true }
-
-        it "should install" do
-          simulate_ruby_engine "jruby" do
-            simulate_platform "java" do
-              results = bundle "install", :artifice => "endpoint"
-              expect(results).to include("Installing rack 1.0.0")
-              expect(the_bundle).to include_gems "rack 1.0.0"
-            end
-          end
-        end
-      end
-
-      context "using JRuby" do
-        let(:platform) { "java" }
-
-        it "should install" do
-          simulate_ruby_engine "jruby" do
-            simulate_platform "java" do
-              results = bundle "install", :artifice => "endpoint"
-              expect(results).to include("Installing rack 1.0.0")
-              expect(the_bundle).to include_gems "rack 1.0.0"
-            end
-          end
-        end
-      end
-
-      context "using Windows" do
-        it "should install" do
-          simulate_windows do
-            results = bundle "install", :artifice => "endpoint"
-            expect(results).to include("Installing rack 1.0.0")
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-        end
-      end
-    end
-
-    context "bundled for ruby and jruby" do
-      let(:platform_specific_type) { :runtime }
-      let(:dependency) { "platform_specific" }
-      before do
-        build_repo2 do
-          build_gem "indirect_platform_specific" do |s|
-            s.add_runtime_dependency "platform_specific"
-          end
-        end
-
-        build_lib "foo", :path => "." do |s|
-          if platform_specific_type == :runtime
-            s.add_runtime_dependency dependency
-          elsif platform_specific_type == :development
-            s.add_development_dependency dependency
-          else
-            raise "wrong dependency type #{platform_specific_type}, can only be :development or :runtime"
-          end
-        end
-
-        %w[ruby jruby].each do |platform|
-          simulate_platform(platform) do
-            install_gemfile <<-G
-              source "file://localhost#{gem_repo2}"
-              gemspec
-            G
-          end
-        end
-      end
-
-      context "on ruby", :bundler => "< 2" do
-        before do
-          simulate_platform("ruby")
-          bundle :install
-        end
-
-        context "as a runtime dependency" do
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-                    platform_specific
-
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-
-        context "as a development dependency" do
-          let(:platform_specific_type) { :development }
-
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-                platform_specific
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-
-        context "with an indirect platform-specific development dependency" do
-          let(:platform_specific_type) { :development }
-          let(:dependency) { "indirect_platform_specific" }
-
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "indirect_platform_specific 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  indirect_platform_specific (1.0)
-                    platform_specific
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-                indirect_platform_specific
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-      end
-
-      context "on ruby", :bundler => "2" do
-        before do
-          simulate_platform("ruby")
-          bundle :install
-        end
-
-        context "as a runtime dependency" do
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-                    platform_specific
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-
-        context "as a development dependency" do
-          let(:platform_specific_type) { :development }
-
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-                platform_specific
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-
-        context "with an indirect platform-specific development dependency" do
-          let(:platform_specific_type) { :development }
-          let(:dependency) { "indirect_platform_specific" }
-
-          it "keeps java dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "indirect_platform_specific 1.0", "platform_specific 1.0 RUBY"
-            expect(lockfile).to eq normalize_uri_file(strip_whitespace(<<-L))
-              GEM
-                remote: file://localhost#{gem_repo2}/
-                specs:
-                  indirect_platform_specific (1.0)
-                    platform_specific
-                  platform_specific (1.0)
-                  platform_specific (1.0-java)
-
-              PATH
-                remote: .
-                specs:
-                  foo (1.0)
-
-              PLATFORMS
-                java
-                ruby
-
-              DEPENDENCIES
-                foo!
-                indirect_platform_specific
-
-              BUNDLED WITH
-                 #{Bundler::VERSION}
-            L
-          end
-        end
-      end
-    end
-  end
-
-  context "with multiple platforms" do
-    before do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
-        s.version = "1.0.0"
-        s.add_development_dependency "rack"
-        s.write "foo-universal-java.gemspec", build_spec("foo", "1.0.0", "universal-java") {|sj| sj.runtime "rack", "1.0.0" }.first.to_ruby
-      end
-    end
-
-    it "installs the ruby platform gemspec" do
-      simulate_platform "ruby"
-
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-      G
-
-      expect(the_bundle).to include_gems "foo 1.0.0", "rack 1.0.0"
-    end
-
-    it "installs the ruby platform gemspec and skips dev deps with --without development" do
-      simulate_platform "ruby"
-
-      install_gemfile! <<-G, forgotten_command_line_options(:without => "development")
-        source "file://#{gem_repo1}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
-      G
-
-      expect(the_bundle).to include_gem "foo 1.0.0"
-      expect(the_bundle).not_to include_gem "rack"
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
deleted file mode 100644
index 57d83a5295..0000000000
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ /dev/null
@@ -1,1351 +0,0 @@
-# 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://#{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 => "< 2" do
-      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have_attributes :size => 1
-    end
-
-    it "caches the git repo globally" do
-      simulate_new_machine
-      bundle! "config global_gem_cache true"
-      bundle! :install
-      expect(Dir["#{home}/.bundle/cache/git/foo-1.0-*"]).to have_attributes :size => 1
-    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"
-
-      in_app_root2 do
-        install_gemfile bundled_app2("Gemfile"), <<-G
-          git "#{lib_path("foo-1.0")}" do
-            gem 'foo'
-          end
-        G
-      end
-
-      in_app_root do
-        run <<-RUBY
-          require 'foo'
-          puts "fail" if defined?(FOO_PREV_REF)
-        RUBY
-
-        expect(out).to be_empty
-      end
-    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
-        gem "foo", "1.1", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      expect(out).to include("The source contains 'foo' at: 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
-        platforms :jruby do
-          gem "only_java", "1.2", :git => "#{lib_path("only_java-1.0-java")}"
-        end
-      G
-
-      expect(out).to include("The source contains 'only_java' at: 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
-        platforms :jruby do
-          gem "only_java", "1.2", :git => "#{lib_path("only_java-1.1-java")}"
-        end
-      G
-
-      expect(out).to include("The source contains 'only_java' at: 1.0 java, 1.1 java")
-    end
-
-    it "still works after moving the application directory" do
-      bundle "install --path vendor/bundle"
-      FileUtils.mv bundled_app, tmp("bundled_app.bck")
-
-      Dir.chdir tmp("bundled_app.bck")
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "can still install after moving the application directory" do
-      bundle "install --path vendor/bundle"
-      FileUtils.mv bundled_app, tmp("bundled_app.bck")
-
-      update_git "foo", "1.1", :path => lib_path("foo-1.0")
-
-      Dir.chdir tmp("bundled_app.bck")
-      gemfile tmp("bundled_app.bck/Gemfile"), <<-G
-        source "file://#{gem_repo1}"
-        git "#{lib_path("foo-1.0")}" do
-          gem 'foo'
-        end
-
-        gem "rack", "1.0"
-      G
-
-      bundle "update foo"
-
-      expect(the_bundle).to include_gems "foo 1.1", "rack 1.0"
-    end
-  end
-
-  describe "with an empty git block" do
-    before do
-      build_git "foo"
-      gemfile <<-G
-        source "file://#{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
-        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
-        git "#{lib_path("foo-1.0")}", :ref => #{@revision.to_sym.inspect} do
-          gem "foo"
-        end
-      G
-      expect(err).to lack_errors
-
-      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
-
-      Dir.chdir(lib_path("foo-1.0")) do
-        `git update-ref -m 'Bundler Spec!' refs/bundler/1 master~1`
-      end
-
-      # 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'")
-      end
-
-      install_gemfile! <<-G
-        git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
-          gem "foo"
-        end
-      G
-      expect(err).to lack_errors
-
-      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
-        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
-
-      Dir.chdir(lib_path("foo-1.0")) do
-        `git update-ref -m 'Bundler Spec!' refs/bundler/1 master~1`
-      end
-
-      # 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'")
-      end
-
-      install_gemfile! <<-G
-        git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
-          gem "foo"
-        end
-      G
-      expect(err).to lack_errors
-
-      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
-      Dir.chdir(lib_path("foo-1.0")) do
-        sys_exec!("git update-ref -m 'Bundler Spec!' refs/bundler/1 master~1")
-      end
-
-      bundle! "config global_gem_cache true"
-
-      install_gemfile! <<-G
-        git "#{lib_path("foo-1.0")}" do
-          gem "foo"
-        end
-      G
-
-      # ensure we also git fetch after cloning
-      bundle! :update, :all => bundle_update_requires_all?
-
-      Dir.chdir(Dir[home(".bundle/cache/git/foo-*")].first) do
-        sys_exec("git ls-remote .")
-      end
-
-      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 }
-    before(:each) do
-      update_git("foo", :path => repo, :branch => branch)
-    end
-
-    it "works" do
-      install_gemfile <<-G
-        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
-        install_gemfile <<-G
-          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
-        install_gemfile <<-G
-          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 }
-    before(:each) do
-      update_git("foo", :path => repo, :tag => tag)
-    end
-
-    it "works" do
-      install_gemfile <<-G
-        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
-        install_gemfile <<-G
-          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
-        install_gemfile <<-G
-          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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle! %(config 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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle %(config 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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle! %(config 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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      lockfile0 = File.read(bundled_app("Gemfile.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 local.rack #{lib_path("local-rack")})
-      run "require 'rack'"
-
-      lockfile1 = File.read(bundled_app("Gemfile.lock"))
-      expect(lockfile1).not_to eq(lockfile0)
-    end
-
-    it "updates ref on install" do
-      build_git "rack", "0.8"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      lockfile0 = File.read(bundled_app("Gemfile.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 local.rack #{lib_path("local-rack")})
-      bundle :install
-
-      lockfile1 = File.read(bundled_app("Gemfile.lock"))
-      expect(lockfile1).not_to eq(lockfile0)
-    end
-
-    it "explodes if given path does not exist on install" do
-      build_git "rack", "0.8"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
-    end
-
-    it "explodes 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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
-      G
-
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/cannot use local override/i)
-    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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
-      G
-
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle %(config 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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).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://#{gem_repo1}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
-      G
-
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/The Gemfile lock is pointing to revision \w+/)
-    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://#{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://#{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://#{gem_repo1}"
-        gem "rack", "0.9.1"
-      G
-
-      build_git "rack", :path => lib_path("rack")
-
-      install_gemfile <<-G
-        source "file://#{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://#{gem_repo1}"
-        gem "rack"
-      G
-
-      build_git "rack", "1.2", :path => lib_path("rack")
-
-      install_gemfile <<-G
-        source "file://#{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
-        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
-      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://#{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 # For 1.9
-        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://#{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
-      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://#{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
-      gem "foo", "1.0", :git => "omgomg"
-    G
-
-    bundle :install
-
-    expect(out).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
-      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
-      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 => bundle_update_requires_all?
-    expect(the_bundle).to include_gems "forced 1.1"
-
-    Dir.chdir(lib_path("forced-1.0")) do
-      `git reset --hard HEAD^`
-    end
-
-    bundle "update", :all => bundle_update_requires_all?
-    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
-    Dir.chdir(lib_path("has_submodule-1.0")) do
-      sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0"
-      `git commit -m "submodulator"`
-    end
-
-    install_gemfile <<-G
-      git "#{lib_path("has_submodule-1.0")}" do
-        gem "has_submodule"
-      end
-    G
-    expect(out).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
-    Dir.chdir(lib_path("has_submodule-1.0")) do
-      sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0"
-      `git commit -m "submodulator"`
-    end
-
-    install_gemfile <<-G
-      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 "handles implicit updates when modifying the source info" do
-    git = build_git "foo"
-
-    install_gemfile <<-G
-      git "#{lib_path("foo-1.0")}" do
-        gem "foo"
-      end
-    G
-
-    update_git "foo"
-    update_git "foo"
-
-    install_gemfile <<-G
-      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
-      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
-      gem "foo", :git => "#{lib_path("foo-1.0")}"
-    G
-
-    bundle "install"
-    bundle "install"
-    expect(exitstatus).to eq(0) if exitstatus
-  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
-      gem "foo", :git => "#{lib_path("foo-1.0")}"
-    G
-
-    expect(exitstatus).to_not eq(0) if exitstatus
-    expect(out).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")
-
-    gemfile <<-G
-      gem "foo", :git => "#{lib_path("nested")}"
-      gem "bar", :git => "#{lib_path("nested")}"
-    G
-
-    bundle "install"
-    expect(File.read(bundled_app("Gemfile.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://#{gem_repo1}"
-        gem "bar", :path => "#{lib_path("bar")}"
-      G
-
-      install_gemfile <<-G
-        source "file://#{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://#{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://#{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
-        gem "valim", :git => "file://#{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"))
-
-      lockfile = File.read(bundled_app("Gemfile.lock"))
-      File.open(bundled_app("Gemfile.lock"), "w") do |file|
-        file.puts lockfile.gsub(/revision: #{old_revision}/, "revision: #{new_revision}")
-      end
-
-      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
-        gem "foo", :git => "file://#{lib_path("foo-1.0")}", :ref => "#{revision}"
-      G
-      bundle "install"
-      expect(out).to_not match(/Revision.*does not exist/)
-
-      install_gemfile <<-G
-        gem "foo", :git => "file://#{lib_path("foo-1.0")}", :ref => "deadbeef"
-      G
-      bundle "install"
-      expect(out).to include("Revision deadbeef does not exist in the repository")
-    end
-  end
-
-  describe "bundle install --deployment with git sources" do
-    it "works" do
-      build_git "valim", :path => lib_path("valim")
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "valim", "= 1.0", :git => "#{lib_path("valim")}"
-      G
-
-      simulate_new_machine
-
-      bundle! :install, forgotten_command_line_options(:deployment => true)
-    end
-  end
-
-  describe "gem install hooks" do
-    it "runs pre-install hooks" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          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).to eq_err("Ran pre-install hook: foo-1.0")
-    end
-
-    it "runs post-install hooks" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          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).to eq_err("Ran post-install hook: foo-1.0")
-    end
-
-    it "complains if the install hook fails" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          Gem.pre_install_hooks << lambda do |inst|
-            false
-          end
-        H
-      end
-
-      bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
-      expect(out).to include("failed for foo-1.0")
-    end
-  end
-
-  context "with an extension" do
-    it "installs the extension", :ruby_repo 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://#{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 eq(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|
-        Dir.chdir(git_reader.path) do
-          File.open("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
-          `git commit -m 'commit for iteration #{i}' ext/foo.c`
-        end
-        git_commit_sha = git_reader.ref_for("HEAD")
-
-        install_gemfile <<-G
-          source "file://#{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
-        source "file://#{gem_repo1}"
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      expect(last_command.bundler_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", :ruby_repo, :rubygems => ">= 2.3.0" 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://#{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://#{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
-  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://#{gem_repo1}"
-        git "#{lib_path("xxxxxx-1.0")}" do
-          gem 'xxxxxx'
-        end
-      G
-
-      expect(exitstatus).to eq(0) if exitstatus
-      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
-        git "#{lib_path("foo-1.0")}" do
-          gem 'foo'
-        end
-      G
-
-      with_path_as("") do
-        bundle "update", :all => bundle_update_requires_all?
-      end
-      expect(last_command.bundler_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
-        git "#{lib_path("foo-1.0")}" do
-          gem 'foo'
-        end
-      G
-      bundle :package, forgotten_command_line_options([:all, :cache_all] => true)
-      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 --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
-          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
-          git "https://#{credentials}@github.com/company/private-repo" do
-            gem "foo"
-          end
-        G
-
-        bundle :install
-        expect(last_command.stdboth).to_not include("password1")
-        expect(last_command.stdout).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
-          git "https://#{credentials}:x-oauth-basic@github.com/company/private-repo" do
-            gem "foo"
-          end
-        G
-
-        bundle :install
-        expect(last_command.stdboth).to_not include("oauth_token")
-        expect(last_command.stdout).to include("Fetching https://x-oauth-basic@github.com/company/private-repo")
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb
deleted file mode 100644
index 19c379e188..0000000000
--- a/spec/bundler/install/gemfile/groups_spec.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with groups" do
-  describe "installing with no options" do
-    before :each do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        group :emo do
-          gem "activesupport", "2.3.5"
-        end
-        gem "thin", :groups => [:emo]
-      G
-    end
-
-    it "installs gems in the default group" do
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "installs gems in a group block into that group" do
-      expect(the_bundle).to include_gems "activesupport 2.3.5"
-
-      load_error_run <<-R, "activesupport", :default
-        require 'activesupport'
-        puts ACTIVESUPPORT
-      R
-
-      expect(err).to eq_err("ZOMG LOAD ERROR")
-    end
-
-    it "installs gems with inline :groups into those groups" do
-      expect(the_bundle).to include_gems "thin 1.0"
-
-      load_error_run <<-R, "thin", :default
-        require 'thin'
-        puts THIN
-      R
-
-      expect(err).to eq_err("ZOMG LOAD ERROR")
-    end
-
-    it "sets up everything if Bundler.setup is used with no groups" do
-      output = run("require 'rack'; puts RACK")
-      expect(output).to eq("1.0.0")
-
-      output = run("require 'activesupport'; puts ACTIVESUPPORT")
-      expect(output).to eq("2.3.5")
-
-      output = run("require 'thin'; puts THIN")
-      expect(output).to eq("1.0")
-    end
-
-    it "removes old groups when new groups are set up" do
-      load_error_run <<-RUBY, "thin", :emo
-        Bundler.setup(:default)
-        require 'thin'
-        puts THIN
-      RUBY
-
-      expect(err).to eq_err("ZOMG LOAD ERROR")
-    end
-
-    it "sets up old groups when they have previously been removed" do
-      output = run <<-RUBY, :emo
-        Bundler.setup(:default)
-        Bundler.setup(:default, :emo)
-        require 'thin'; puts THIN
-      RUBY
-      expect(output).to eq("1.0")
-    end
-  end
-
-  describe "installing --without" do
-    describe "with gems assigned to a single group" do
-      before :each do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-          group :emo do
-            gem "activesupport", "2.3.5"
-          end
-          group :debugging, :optional => true do
-            gem "thin"
-          end
-        G
-      end
-
-      it "installs gems in the default group" do
-        bundle! :install, forgotten_command_line_options(:without => "emo")
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
-      end
-
-      it "does not install gems from the excluded group" do
-        bundle :install, :without => "emo"
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :groups => [:default]
-      end
-
-      it "does not install gems from the previously excluded group" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-        bundle :install
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-      end
-
-      it "does not say it installed gems from the excluded group" do
-        bundle! :install, forgotten_command_line_options(:without => "emo")
-        expect(out).not_to include("activesupport")
-      end
-
-      it "allows Bundler.setup for specific groups" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-        run!("require 'rack'; puts RACK", :default)
-        expect(out).to eq("1.0.0")
-      end
-
-      it "does not effect the resolve" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "activesupport"
-          group :emo do
-            gem "rails", "2.3.2"
-          end
-        G
-
-        bundle :install, forgotten_command_line_options(:without => "emo")
-        expect(the_bundle).to include_gems "activesupport 2.3.2", :groups => [:default]
-      end
-
-      it "still works on a different machine and excludes gems" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-
-        simulate_new_machine
-        bundle :install, forgotten_command_line_options(:without => "emo")
-
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :groups => [:default]
-      end
-
-      it "still works when BUNDLE_WITHOUT is set" do
-        ENV["BUNDLE_WITHOUT"] = "emo"
-
-        bundle :install
-        expect(out).not_to include("activesupport")
-
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :groups => [:default]
-
-        ENV["BUNDLE_WITHOUT"] = nil
-      end
-
-      it "clears without when passed an empty list" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-
-        bundle :install, forgotten_command_line_options(:without => "")
-        expect(the_bundle).to include_gems "activesupport 2.3.5"
-      end
-
-      it "doesn't clear without when nothing is passed" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-
-        bundle :install
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-      end
-
-      it "does not install gems from the optional group" do
-        bundle :install
-        expect(the_bundle).not_to include_gems "thin 1.0"
-      end
-
-      it "does install gems from the optional group when requested" do
-        bundle :install, forgotten_command_line_options(:with => "debugging")
-        expect(the_bundle).to include_gems "thin 1.0"
-      end
-
-      it "does install gems from the previously requested group" do
-        bundle :install, forgotten_command_line_options(:with => "debugging")
-        expect(the_bundle).to include_gems "thin 1.0"
-        bundle :install
-        expect(the_bundle).to include_gems "thin 1.0"
-      end
-
-      it "does install gems from the optional groups requested with BUNDLE_WITH" do
-        ENV["BUNDLE_WITH"] = "debugging"
-        bundle :install
-        expect(the_bundle).to include_gems "thin 1.0"
-        ENV["BUNDLE_WITH"] = nil
-      end
-
-      it "clears with when passed an empty list" do
-        bundle :install, forgotten_command_line_options(:with => "debugging")
-        bundle :install, forgotten_command_line_options(:with => "")
-        expect(the_bundle).not_to include_gems "thin 1.0"
-      end
-
-      it "does remove groups from without when passed at --with", :bundler => "< 2" do
-        bundle :install, forgotten_command_line_options(:without => "emo")
-        bundle :install, forgotten_command_line_options(:with => "emo")
-        expect(the_bundle).to include_gems "activesupport 2.3.5"
-      end
-
-      it "does remove groups from with when passed at --without", :bundler => "< 2" do
-        bundle :install, forgotten_command_line_options(:with => "debugging")
-        bundle :install, forgotten_command_line_options(:without => "debugging")
-        expect(the_bundle).not_to include_gem "thin 1.0"
-      end
-
-      it "errors out when passing a group to with and without via CLI flags", :bundler => "< 2" do
-        bundle :install, forgotten_command_line_options(:with => "emo debugging", :without => "emo")
-        expect(last_command).to be_failure
-        expect(out).to include("The offending groups are: emo")
-      end
-
-      it "allows the BUNDLE_WITH setting to override BUNDLE_WITHOUT" do
-        ENV["BUNDLE_WITH"] = "debugging"
-
-        bundle! :install
-        expect(the_bundle).to include_gem "thin 1.0"
-
-        ENV["BUNDLE_WITHOUT"] = "debugging"
-        expect(the_bundle).to include_gem "thin 1.0"
-
-        bundle! :install
-        expect(the_bundle).to include_gem "thin 1.0"
-      end
-
-      it "can add and remove a group at the same time" do
-        bundle :install, forgotten_command_line_options(:with => "debugging", :without => "emo")
-        expect(the_bundle).to include_gems "thin 1.0"
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-      end
-
-      it "does have no effect when listing a not optional group in with" do
-        bundle :install, forgotten_command_line_options(:with => "emo")
-        expect(the_bundle).to include_gems "activesupport 2.3.5"
-      end
-
-      it "does have no effect when listing an optional group in without" do
-        bundle :install, forgotten_command_line_options(:without => "debugging")
-        expect(the_bundle).not_to include_gems "thin 1.0"
-      end
-    end
-
-    describe "with gems assigned to multiple groups" do
-      before :each do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-          group :emo, :lolercoaster do
-            gem "activesupport", "2.3.5"
-          end
-        G
-      end
-
-      it "installs gems in the default group" do
-        bundle! :install, forgotten_command_line_options(:without => "emo lolercoaster")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "installs the gem if any of its groups are installed" do
-        bundle! :install, forgotten_command_line_options(:without => "emo")
-        expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
-      end
-
-      describe "with a gem defined multiple times in different groups" do
-        before :each do
-          gemfile <<-G
-            source "file://#{gem_repo1}"
-            gem "rack"
-
-            group :emo do
-              gem "activesupport", "2.3.5"
-            end
-
-            group :lolercoaster do
-              gem "activesupport", "2.3.5"
-            end
-          G
-        end
-
-        it "installs the gem w/ option --without emo" do
-          bundle :install, forgotten_command_line_options(:without => "emo")
-          expect(the_bundle).to include_gems "activesupport 2.3.5"
-        end
-
-        it "installs the gem w/ option --without lolercoaster" do
-          bundle :install, forgotten_command_line_options(:without => "lolercoaster")
-          expect(the_bundle).to include_gems "activesupport 2.3.5"
-        end
-
-        it "does not install the gem w/ option --without emo lolercoaster" do
-          bundle :install, forgotten_command_line_options(:without => "emo lolercoaster")
-          expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-        end
-
-        it "does not install the gem w/ option --without 'emo lolercoaster'" do
-          bundle :install, forgotten_command_line_options(:without => "'emo lolercoaster'")
-          expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-        end
-      end
-    end
-
-    describe "nesting groups" do
-      before :each do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-          group :emo do
-            group :lolercoaster do
-              gem "activesupport", "2.3.5"
-            end
-          end
-        G
-      end
-
-      it "installs gems in the default group" do
-        bundle! :install, forgotten_command_line_options(:without => "emo lolercoaster")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "installs the gem if any of its groups are installed" do
-        bundle! :install, forgotten_command_line_options(:without => "emo")
-        expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
-      end
-    end
-  end
-
-  describe "when loading only the default group" do
-    it "should not load all groups" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "activesupport", :groups => :development
-      G
-
-      ruby <<-R
-        require "bundler"
-        Bundler.setup :default
-        Bundler.require :default
-        puts RACK
-        begin
-          require "activesupport"
-        rescue LoadError
-          puts "no activesupport"
-        end
-      R
-
-      expect(out).to include("1.0")
-      expect(out).to include("no activesupport")
-    end
-  end
-
-  describe "when locked and installed with --without" do
-    before(:each) do
-      build_repo2
-      system_gems "rack-0.9.1" do
-        install_gemfile <<-G, forgotten_command_line_options(:without => "rack")
-          source "file://#{gem_repo2}"
-          gem "rack"
-
-          group :rack do
-            gem "rack_middleware"
-          end
-        G
-      end
-    end
-
-    it "uses the correct versions even if --without was used on the original" do
-      expect(the_bundle).to include_gems "rack 0.9.1"
-      expect(the_bundle).not_to include_gems "rack_middleware 1.0"
-      simulate_new_machine
-
-      bundle :install
-
-      expect(the_bundle).to include_gems "rack 0.9.1"
-      expect(the_bundle).to include_gems "rack_middleware 1.0"
-    end
-
-    it "does not hit the remote a second time" do
-      FileUtils.rm_rf gem_repo2
-      bundle! :install, forgotten_command_line_options(:without => "rack").merge(:verbose => true)
-      expect(last_command.stdboth).not_to match(/fetching/i)
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/install_if.rb b/spec/bundler/install/gemfile/install_if.rb
deleted file mode 100644
index 1319051fdb..0000000000
--- a/spec/bundler/install/gemfile/install_if.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-describe "bundle install with install_if conditionals" do
-  it "follows the install_if DSL" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      install_if(lambda { true }) do
-        gem "activesupport", "2.3.5"
-      end
-      gem "thin", :install_if => false
-      install_if(lambda { false }) do
-        gem "foo"
-      end
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems("rack 1.0", "activesupport 2.3.5")
-    expect(the_bundle).not_to include_gems("thin")
-    expect(the_bundle).not_to include_gems("foo")
-
-    lockfile_should_be <<-L
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          activesupport (2.3.5)
-          foo (1.0)
-          rack (1.0.0)
-          thin (1.0)
-            rack
-
-      PLATFORMS
-        ruby
-
-      DEPENDENCIES
-        activesupport (= 2.3.5)
-        foo
-        rack
-        thin
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
-  end
-end
diff --git a/spec/bundler/install/gemfile/lockfile_spec.rb b/spec/bundler/install/gemfile/lockfile_spec.rb
deleted file mode 100644
index dc1baca6ea..0000000000
--- a/spec/bundler/install/gemfile/lockfile_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with a lockfile present" do
-  let(:gf) { <<-G }
-    source "file://#{gem_repo1}"
-
-    gem "rack", "1.0.0"
-  G
-
-  subject do
-    install_gemfile(gf)
-  end
-
-  context "gemfile evaluation" do
-    let(:gf) { super() + "\n\n File.open('evals', 'a') {|f| f << %(1\n) } unless ENV['BUNDLER_SPEC_NO_APPEND']" }
-
-    context "with plugins disabled" do
-      before do
-        bundle! "config plugins false"
-        subject
-      end
-
-      it "does not evaluate the gemfile twice" do
-        bundle! :install
-
-        with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" }
-
-        # The first eval is from the initial install, we're testing that the
-        # second install doesn't double-eval
-        expect(bundled_app("evals").read.lines.to_a.size).to eq(2)
-      end
-
-      context "when the gem is not installed" do
-        before { FileUtils.rm_rf ".bundle" }
-
-        it "does not evaluate the gemfile twice" do
-          bundle! :install
-
-          with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" }
-
-          # The first eval is from the initial install, we're testing that the
-          # second install doesn't double-eval
-          expect(bundled_app("evals").read.lines.to_a.size).to eq(2)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb
deleted file mode 100644
index f7789e7ea5..0000000000
--- a/spec/bundler/install/gemfile/path_spec.rb
+++ /dev/null
@@ -1,630 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with explicit source paths" do
-  it "fetches gems with a global path source", :bundler => "< 2" do
-    build_lib "foo"
-
-    install_gemfile <<-G
-      path "#{lib_path("foo-1.0")}"
-      gem 'foo'
-    G
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "fetches gems" do
-    build_lib "foo"
-
-    install_gemfile <<-G
-      path "#{lib_path("foo-1.0")}" do
-        gem 'foo'
-      end
-    G
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "supports pinned paths" do
-    build_lib "foo"
-
-    install_gemfile <<-G
-      gem 'foo', :path => "#{lib_path("foo-1.0")}"
-    G
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "supports relative paths" do
-    build_lib "foo"
-
-    relative_path = lib_path("foo-1.0").relative_path_from(Pathname.new(Dir.pwd))
-
-    install_gemfile <<-G
-      gem 'foo', :path => "#{relative_path}"
-    G
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "expands paths" do
-    build_lib "foo"
-
-    relative_path = lib_path("foo-1.0").relative_path_from(Pathname.new("~").expand_path)
-
-    install_gemfile <<-G
-      gem 'foo', :path => "~/#{relative_path}"
-    G
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "expands paths raise error with not existing user's home dir" do
-    build_lib "foo"
-    username = "some_unexisting_user"
-    relative_path = lib_path("foo-1.0").relative_path_from(Pathname.new("/home/#{username}").expand_path)
-
-    install_gemfile <<-G
-      gem 'foo', :path => "~#{username}/#{relative_path}"
-    G
-    expect(out).to match("There was an error while trying to use the path `~#{username}/#{relative_path}`.")
-    expect(out).to match("user #{username} doesn't exist")
-  end
-
-  it "expands paths relative to Bundler.root" do
-    build_lib "foo", :path => bundled_app("foo-1.0")
-
-    install_gemfile <<-G
-      gem 'foo', :path => "./foo-1.0"
-    G
-
-    bundled_app("subdir").mkpath
-    Dir.chdir(bundled_app("subdir")) do
-      expect(the_bundle).to include_gems("foo 1.0")
-    end
-  end
-
-  it "expands paths when comparing locked paths to Gemfile paths" do
-    build_lib "foo", :path => bundled_app("foo-1.0")
-
-    install_gemfile <<-G
-      gem 'foo', :path => File.expand_path("../foo-1.0", __FILE__)
-    G
-
-    bundle! :install, forgotten_command_line_options(:frozen => true)
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-
-  it "installs dependencies from the path 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_lib "foo", :path => lib_path("nested") do |s|
-      s.add_dependency "rack", "= 1.0"
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "foo", :path => "#{lib_path("nested")}"
-    G
-
-    run "require 'rack'"
-    expect(out).to eq("WIN OVERRIDE")
-  end
-
-  it "works" do
-    build_gem "foo", "1.0.0", :to_system => true do |s|
-      s.write "lib/foo.rb", "puts 'FAIL'"
-    end
-
-    build_lib "omg", "1.0", :path => lib_path("omg") do |s|
-      s.add_dependency "foo"
-    end
-
-    build_lib "foo", "1.0.0", :path => lib_path("omg/foo")
-
-    install_gemfile <<-G
-      gem "omg", :path => "#{lib_path("omg")}"
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "prefers gemspecs closer to the path root" do
-    build_lib "premailer", "1.0.0", :path => lib_path("premailer") do |s|
-      s.write "gemfiles/ruby187.gemspec", <<-G
-        Gem::Specification.new do |s|
-          s.name    = 'premailer'
-          s.version = '1.0.0'
-          s.summary = 'Hi'
-          s.authors = 'Me'
-        end
-      G
-    end
-
-    install_gemfile <<-G
-      gem "premailer", :path => "#{lib_path("premailer")}"
-    G
-
-    # Installation of the 'gemfiles' gemspec would fail since it will be unable
-    # to require 'premailer.rb'
-    expect(the_bundle).to include_gems "premailer 1.0.0"
-  end
-
-  it "warns on invalid specs", :rubygems => "1.7" do
-    build_lib "foo"
-
-    gemspec = lib_path("foo-1.0").join("foo.gemspec").to_s
-    File.open(gemspec, "w") do |f|
-      f.write <<-G
-        Gem::Specification.new do |s|
-          s.name = "foo"
-        end
-      G
-    end
-
-    install_gemfile <<-G
-      gem "foo", :path => "#{lib_path("foo-1.0")}"
-    G
-
-    expect(out).to_not include("ERROR REPORT")
-    expect(out).to_not include("Your Gemfile has no gem server sources.")
-    expect(out).to match(/is not valid. Please fix this gemspec./)
-    expect(out).to match(/The validation error was 'missing value for attribute version'/)
-    expect(out).to match(/You have one or more invalid gemspecs that need to be fixed/)
-  end
-
-  it "supports gemspec syntax" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", "1.0"
-    end
-
-    gemfile = <<-G
-      source "file://#{gem_repo1}"
-      gemspec
-    G
-
-    File.open(lib_path("foo/Gemfile"), "w") {|f| f.puts gemfile }
-
-    Dir.chdir(lib_path("foo")) do
-      bundle "install"
-      expect(the_bundle).to include_gems "foo 1.0"
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  it "supports gemspec syntax with an alternative path" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", "1.0"
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gemspec :path => "#{lib_path("foo")}"
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0"
-    expect(the_bundle).to include_gems "rack 1.0"
-  end
-
-  it "doesn't automatically unlock dependencies when using the gemspec syntax" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
-    end
-
-    Dir.chdir lib_path("foo")
-
-    install_gemfile lib_path("foo/Gemfile"), <<-G
-      source "file://#{gem_repo1}"
-      gemspec
-    G
-
-    build_gem "rack", "1.0.1", :to_system => true
-
-    bundle "install"
-
-    expect(the_bundle).to include_gems "foo 1.0"
-    expect(the_bundle).to include_gems "rack 1.0"
-  end
-
-  it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
-      s.add_development_dependency "activesupport"
-    end
-
-    Dir.chdir lib_path("foo")
-
-    install_gemfile lib_path("foo/Gemfile"), <<-G
-      source "file://#{gem_repo1}"
-      gemspec
-    G
-
-    build_gem "rack", "1.0.1", :to_system => true
-
-    bundle "install"
-
-    expect(the_bundle).to include_gems "foo 1.0"
-    expect(the_bundle).to include_gems "rack 1.0"
-  end
-
-  it "raises if there are multiple gemspecs" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.write "bar.gemspec", build_spec("bar", "1.0").first.to_ruby
-    end
-
-    install_gemfile <<-G
-      gemspec :path => "#{lib_path("foo")}"
-    G
-
-    expect(exitstatus).to eq(15) if exitstatus
-    expect(out).to match(/There are multiple gemspecs/)
-  end
-
-  it "allows :name to be specified to resolve ambiguity" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.write "bar.gemspec"
-    end
-
-    install_gemfile <<-G
-      gemspec :path => "#{lib_path("foo")}", :name => "foo"
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "sets up executables" do
-    build_lib "foo" do |s|
-      s.executables = "foobar"
-    end
-
-    install_gemfile <<-G
-      path "#{lib_path("foo-1.0")}" do
-        gem 'foo'
-      end
-    G
-    expect(the_bundle).to include_gems "foo 1.0"
-
-    bundle "exec foobar"
-    expect(out).to eq("1.0")
-  end
-
-  it "handles directories in bin/" do
-    build_lib "foo"
-    lib_path("foo-1.0").join("foo.gemspec").rmtree
-    lib_path("foo-1.0").join("bin/performance").mkpath
-
-    install_gemfile <<-G
-      gem 'foo', '1.0', :path => "#{lib_path("foo-1.0")}"
-    G
-    expect(err).to lack_errors
-  end
-
-  it "removes the .gem file after installing" do
-    build_lib "foo"
-
-    install_gemfile <<-G
-      gem 'foo', :path => "#{lib_path("foo-1.0")}"
-    G
-
-    expect(lib_path("foo-1.0").join("foo-1.0.gem")).not_to exist
-  end
-
-  describe "block syntax" do
-    it "pulls all gems from a path block" do
-      build_lib "omg"
-      build_lib "hi2u"
-
-      install_gemfile <<-G
-        path "#{lib_path}" do
-          gem "omg"
-          gem "hi2u"
-        end
-      G
-
-      expect(the_bundle).to include_gems "omg 1.0", "hi2u 1.0"
-    end
-  end
-
-  it "keeps source pinning" do
-    build_lib "foo", "1.0", :path => lib_path("foo")
-    build_lib "omg", "1.0", :path => lib_path("omg")
-    build_lib "foo", "1.0", :path => lib_path("omg/foo") do |s|
-      s.write "lib/foo.rb", "puts 'FAIL'"
-    end
-
-    install_gemfile <<-G
-      gem "foo", :path => "#{lib_path("foo")}"
-      gem "omg", :path => "#{lib_path("omg")}"
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "works when the path does not have a gemspec" do
-    build_lib "foo", :gemspec => false
-
-    gemfile <<-G
-      gem "foo", "1.0", :path => "#{lib_path("foo-1.0")}"
-    G
-
-    expect(the_bundle).to include_gems "foo 1.0"
-
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "works when the path does not have a gemspec but there is a lockfile" do
-    lockfile <<-L
-    PATH
-      remote: vendor/bar
-      specs:
-
-    GEM
-      remote: http://rubygems.org
-    L
-
-    in_app_root { FileUtils.mkdir_p("vendor/bar") }
-
-    install_gemfile <<-G
-      gem "bar", "1.0.0", path: "vendor/bar", require: "bar/nyard"
-    G
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-
-  context "existing lockfile" do
-    it "rubygems gems don't re-resolve without changes" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack-obama', '1.0'
-        gem 'net-ssh', '1.0'
-      G
-
-      bundle :check, :env => { "DEBUG" => 1 }
-      expect(out).to match(/using resolution from the lockfile/)
-      expect(the_bundle).to include_gems "rack-obama 1.0", "net-ssh 1.0"
-    end
-
-    it "source path gems w/deps don't re-resolve without changes" do
-      build_lib "rack-obama", "1.0", :path => lib_path("omg") do |s|
-        s.add_dependency "yard"
-      end
-
-      build_lib "net-ssh", "1.0", :path => lib_path("omg") do |s|
-        s.add_dependency "yard"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack-obama', :path => "#{lib_path("omg")}"
-        gem 'net-ssh', :path => "#{lib_path("omg")}"
-      G
-
-      bundle :check, :env => { "DEBUG" => 1 }
-      expect(out).to match(/using resolution from the lockfile/)
-      expect(the_bundle).to include_gems "rack-obama 1.0", "net-ssh 1.0"
-    end
-  end
-
-  it "installs executable stubs" do
-    build_lib "foo" do |s|
-      s.executables = ["foo"]
-    end
-
-    install_gemfile <<-G
-      gem "foo", :path => "#{lib_path("foo-1.0")}"
-    G
-
-    bundle "exec foo"
-    expect(out).to eq("1.0")
-  end
-
-  describe "when the gem version in the path is updated" do
-    before :each do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "bar"
-      end
-      build_lib "bar", "1.0", :path => lib_path("foo/bar")
-
-      install_gemfile <<-G
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-    end
-
-    it "unlocks all gems when the top level gem is updated" do
-      build_lib "foo", "2.0", :path => lib_path("foo") do |s|
-        s.add_dependency "bar"
-      end
-
-      bundle "install"
-
-      expect(the_bundle).to include_gems "foo 2.0", "bar 1.0"
-    end
-
-    it "unlocks all gems when a child dependency gem is updated" do
-      build_lib "bar", "2.0", :path => lib_path("foo/bar")
-
-      bundle "install"
-
-      expect(the_bundle).to include_gems "foo 1.0", "bar 2.0"
-    end
-  end
-
-  describe "when dependencies in the path are updated" do
-    before :each do
-      build_lib "foo", "1.0", :path => lib_path("foo")
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "foo", :path => "#{lib_path("foo")}"
-      G
-    end
-
-    it "gets dependencies that are updated in the path" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack"
-      end
-
-      bundle "install"
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  describe "switching sources" do
-    it "doesn't switch pinned git sources to rubygems when pinning the parent gem to a path source" 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://#{gem_repo1}"
-        gem "bar", :git => "#{lib_path("bar")}"
-      G
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "bar", :path => "#{lib_path("bar")}"
-      G
-
-      expect(the_bundle).to include_gems "foo 1.0", "bar 1.0"
-    end
-
-    it "switches the source when the gem existed in rubygems and the path was already being used for another gem" do
-      build_lib "foo", "1.0", :path => lib_path("foo")
-      build_gem "bar", "1.0", :to_system => true do |s|
-        s.write "lib/bar.rb", "raise 'fail'"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "bar"
-        path "#{lib_path("foo")}" do
-          gem "foo"
-        end
-      G
-
-      build_lib "bar", "1.0", :path => lib_path("foo/bar")
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        path "#{lib_path("foo")}" do
-          gem "foo"
-          gem "bar"
-        end
-      G
-
-      expect(the_bundle).to include_gems "bar 1.0"
-    end
-  end
-
-  describe "when there are both a gemspec and remote gems" do
-    it "doesn't query rubygems for local gemspec name" do
-      build_lib "private_lib", "2.2", :path => lib_path("private_lib")
-      gemfile = <<-G
-        source "http://localgemserver.test"
-        gemspec
-        gem 'rack'
-      G
-      File.open(lib_path("private_lib/Gemfile"), "w") {|f| f.puts gemfile }
-
-      Dir.chdir(lib_path("private_lib")) do
-        bundle :install, :env => { "DEBUG" => 1 }, :artifice => "endpoint"
-        expect(out).to match(%r{^HTTP GET http://localgemserver\.test/api/v1/dependencies\?gems=rack$})
-        expect(out).not_to match(/^HTTP GET.*private_lib/)
-        expect(the_bundle).to include_gems "private_lib 2.2"
-        expect(the_bundle).to include_gems "rack 1.0"
-      end
-    end
-  end
-
-  describe "gem install hooks" do
-    it "runs pre-install hooks" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          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).to eq_err("Ran pre-install hook: foo-1.0")
-    end
-
-    it "runs post-install hooks" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          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).to eq_err("Ran post-install hook: foo-1.0")
-    end
-
-    it "complains if the install hook fails" do
-      build_git "foo"
-      gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      G
-
-      File.open(lib_path("install_hooks.rb"), "w") do |h|
-        h.write <<-H
-          require 'rubygems'
-          Gem.pre_install_hooks << lambda do |inst|
-            false
-          end
-        H
-      end
-
-      bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
-      expect(out).to include("failed for foo-1.0")
-    end
-
-    it "loads plugins from the path gem" do
-      foo_file = home("foo_plugin_loaded")
-      bar_file = home("bar_plugin_loaded")
-      expect(foo_file).not_to be_file
-      expect(bar_file).not_to be_file
-
-      build_lib "foo" do |s|
-        s.write("lib/rubygems_plugin.rb", "FileUtils.touch('#{foo_file}')")
-      end
-
-      build_git "bar" do |s|
-        s.write("lib/rubygems_plugin.rb", "FileUtils.touch('#{bar_file}')")
-      end
-
-      install_gemfile! <<-G
-        gem "foo", :path => "#{lib_path("foo-1.0")}"
-        gem "bar", :path => "#{lib_path("bar-1.0")}"
-      G
-
-      expect(foo_file).to be_file
-      expect(bar_file).to be_file
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/platform_spec.rb b/spec/bundler/install/gemfile/platform_spec.rb
deleted file mode 100644
index bfdf9b68c8..0000000000
--- a/spec/bundler/install/gemfile/platform_spec.rb
+++ /dev/null
@@ -1,426 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install across platforms" do
-  it "maintains the same lockfile if all gems are compatible across platforms" do
-    lockfile <<-G
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          rack (0.9.1)
-
-      PLATFORMS
-        #{not_local}
-
-      DEPENDENCIES
-        rack
-    G
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems "rack 0.9.1"
-  end
-
-  it "pulls in the correct platform specific gem" do
-    lockfile <<-G
-      GEM
-        remote: file:#{gem_repo1}
-        specs:
-          platform_specific (1.0)
-          platform_specific (1.0-java)
-          platform_specific (1.0-x86-mswin32)
-
-      PLATFORMS
-        ruby
-
-      DEPENDENCIES
-        platform_specific
-    G
-
-    simulate_platform "java"
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "platform_specific"
-    G
-
-    expect(the_bundle).to include_gems "platform_specific 1.0 JAVA"
-  end
-
-  it "works with gems that have different dependencies" do
-    simulate_platform "java"
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "nokogiri"
-    G
-
-    expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
-
-    simulate_new_machine
-
-    simulate_platform "ruby"
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "nokogiri"
-    G
-
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
-    expect(the_bundle).not_to include_gems "weakling"
-  end
-
-  it "does not keep unneeded platforms for gems that are used" do
-    build_repo4 do
-      build_gem "empyrean", "0.1.0"
-      build_gem "coderay", "1.1.2"
-      build_gem "method_source", "0.9.0"
-      build_gem("spoon", "0.0.6") {|s| s.add_runtime_dependency "ffi" }
-      build_gem "pry", "0.11.3" do |s|
-        s.platform = "java"
-        s.add_runtime_dependency "coderay", "~> 1.1.0"
-        s.add_runtime_dependency "method_source", "~> 0.9.0"
-        s.add_runtime_dependency "spoon", "~> 0.0"
-      end
-      build_gem "pry", "0.11.3" do |s|
-        s.add_runtime_dependency "coderay", "~> 1.1.0"
-        s.add_runtime_dependency "method_source", "~> 0.9.0"
-      end
-      build_gem("ffi", "1.9.23") {|s| s.platform = "java" }
-      build_gem("ffi", "1.9.23")
-    end
-
-    simulate_platform java
-
-    install_gemfile! <<-G
-      source "file://localhost/#{gem_repo4}"
-
-      gem "empyrean", "0.1.0"
-      gem "pry"
-    G
-
-    expect(the_bundle.lockfile).to read_as normalize_uri_file(strip_whitespace(<<-L))
-      GEM
-        remote: file://localhost/#{gem_repo4}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
-
-      PLATFORMS
-        java
-
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
-
-    bundle! "lock --add-platform ruby"
-
-    good_lockfile = strip_whitespace(<<-L)
-      GEM
-        remote: file://localhost/#{gem_repo4}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
-
-      PLATFORMS
-        java
-        ruby
-
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
-
-    expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-
-    bad_lockfile = strip_whitespace <<-L
-      GEM
-        remote: file://localhost/#{gem_repo4}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
-
-      PLATFORMS
-        java
-        ruby
-
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
-
-      BUNDLED WITH
-        #{Bundler::VERSION}
-    L
-
-    aggregate_failures do
-      lockfile bad_lockfile
-      bundle! :install
-      expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-
-      lockfile bad_lockfile
-      bundle! :update, :all => true
-      expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-
-      lockfile bad_lockfile
-      bundle! "update ffi"
-      expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-
-      lockfile bad_lockfile
-      bundle! "update empyrean"
-      expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-
-      lockfile bad_lockfile
-      bundle! :lock
-      expect(the_bundle.lockfile).to read_as normalize_uri_file(good_lockfile)
-    end
-  end
-
-  it "works the other way with gems that have different dependencies" do
-    simulate_platform "ruby"
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "nokogiri"
-    G
-
-    simulate_platform "java"
-    bundle "install"
-
-    expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
-  end
-
-  it "works with gems that have extra platform-specific runtime dependencies", :bundler => "< 2" do
-    simulate_platform x64_mac
-
-    update_repo2 do
-      build_gem "facter", "2.4.6"
-      build_gem "facter", "2.4.6" do |s|
-        s.platform = "universal-darwin"
-        s.add_runtime_dependency "CFPropertyList"
-      end
-      build_gem "CFPropertyList"
-    end
-
-    install_gemfile! <<-G
-      source "file://#{gem_repo2}"
-
-      gem "facter"
-    G
-
-    expect(out).to include "Unable to use the platform-specific (universal-darwin) version of facter (2.4.6) " \
-      "because it has different dependencies from the ruby version. " \
-      "To use the platform-specific version of the gem, run `bundle config specific_platform true` and install again."
-
-    expect(the_bundle).to include_gem "facter 2.4.6"
-    expect(the_bundle).not_to include_gem "CFPropertyList"
-  end
-
-  it "fetches gems again after changing the version of Ruby" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-    G
-
-    bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
-
-    new_version = Gem::ConfigMap[:ruby_version] == "1.8" ? "1.9.1" : "1.8"
-    FileUtils.mv(vendored_gems, bundled_app("vendor/bundle", Gem.ruby_engine, new_version))
-
-    bundle! :install
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
-  end
-end
-
-RSpec.describe "bundle install with platform conditionals" do
-  it "installs gems tagged w/ the current platforms" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      platforms :#{local_tag} do
-        gem "nokogiri"
-      end
-    G
-
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
-  end
-
-  it "does not install gems tagged w/ another platforms" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      platforms :#{not_local_tag} do
-        gem "nokogiri"
-      end
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0"
-    expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
-  end
-
-  it "installs gems tagged w/ the current platforms inline" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "nokogiri", :platforms => :#{local_tag}
-    G
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
-  end
-
-  it "does not install gems tagged w/ another platforms inline" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      gem "nokogiri", :platforms => :#{not_local_tag}
-    G
-    expect(the_bundle).to include_gems "rack 1.0"
-    expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
-  end
-
-  it "installs gems tagged w/ the current platform inline" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "nokogiri", :platform => :#{local_tag}
-    G
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
-  end
-
-  it "doesn't install gems tagged w/ another platform inline" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "nokogiri", :platform => :#{not_local_tag}
-    G
-    expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
-  end
-
-  it "does not blow up on sources with all platform-excluded specs" do
-    build_git "foo"
-
-    install_gemfile <<-G
-      platform :#{not_local_tag} do
-        gem "foo", :git => "#{lib_path("foo-1.0")}"
-      end
-    G
-
-    bundle :list
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-
-  it "does not attempt to install gems from :rbx when using --local" do
-    simulate_platform "ruby"
-    simulate_ruby_engine "ruby"
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "some_gem", :platform => :rbx
-    G
-
-    bundle "install --local"
-    expect(out).not_to match(/Could not find gem 'some_gem/)
-  end
-
-  it "does not attempt to install gems from other rubies when using --local" do
-    simulate_platform "ruby"
-    simulate_ruby_engine "ruby"
-    other_ruby_version_tag = RUBY_VERSION =~ /^1\.8/ ? :ruby_19 : :ruby_18
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "some_gem", platform: :#{other_ruby_version_tag}
-    G
-
-    bundle "install --local"
-    expect(out).not_to match(/Could not find gem 'some_gem/)
-  end
-
-  it "prints a helpful warning when a dependency is unused on any platform" do
-    simulate_platform "ruby"
-    simulate_ruby_engine "ruby"
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", :platform => [:mingw, :mswin, :x64_mingw, :jruby]
-    G
-
-    bundle! "install"
-
-    expect(out).to include <<-O.strip
-The dependency #{Gem::Dependency.new("rack", ">= 0")} will be unused by any of the platforms Bundler is installing for. Bundler is installing for ruby but the dependency is only for x86-mingw32, x86-mswin32, x64-mingw32, java. To add those platforms to the bundle, run `bundle lock --add-platform x86-mingw32 x86-mswin32 x64-mingw32 java`.
-    O
-  end
-
-  context "when disable_platform_warnings is true" do
-    before { bundle! "config disable_platform_warnings true" }
-
-    it "does not print the warning when a dependency is unused on any platform" do
-      simulate_platform "ruby"
-      simulate_ruby_engine "ruby"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "rack", :platform => [:mingw, :mswin, :x64_mingw, :jruby]
-      G
-
-      bundle! "install"
-
-      expect(out).not_to match(/The dependency (.*) will be unused/)
-    end
-  end
-end
-
-RSpec.describe "when a gem has no architecture" do
-  it "still installs correctly" do
-    simulate_platform mswin
-
-    gemfile <<-G
-      # Try to install gem with nil arch
-      source "http://localgemserver.test/"
-      gem "rcov"
-    G
-
-    bundle :install, :artifice => "windows"
-    expect(the_bundle).to include_gems "rcov 1.0.0"
-  end
-end
diff --git a/spec/bundler/install/gemfile/ruby_spec.rb b/spec/bundler/install/gemfile/ruby_spec.rb
deleted file mode 100644
index 24fe021fa3..0000000000
--- a/spec/bundler/install/gemfile/ruby_spec.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "ruby requirement" do
-  def locked_ruby_version
-    Bundler::RubyVersion.from_string(Bundler::LockfileParser.new(lockfile).ruby_version)
-  end
-
-  # As discovered by https://github.com/bundler/bundler/issues/4147, there is
-  # no test coverage to ensure that adding a gem is possible with a ruby
-  # requirement. This test verifies the fix, committed in bfbad5c5.
-  it "allows adding gems" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby "#{RUBY_VERSION}"
-      gem "rack"
-    G
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby "#{RUBY_VERSION}"
-      gem "rack"
-      gem "rack-obama"
-    G
-
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(the_bundle).to include_gems "rack-obama 1.0"
-  end
-
-  it "allows removing the ruby version requirement" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby "~> #{RUBY_VERSION}"
-      gem "rack"
-    G
-
-    expect(lockfile).to include("RUBY VERSION")
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(lockfile).not_to include("RUBY VERSION")
-  end
-
-  it "allows changing the ruby version requirement to something compatible" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby ">= 1.0.0"
-      gem "rack"
-    G
-
-    expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
-
-    simulate_ruby_version "5100"
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby ">= 1.0.1"
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
-  end
-
-  it "allows changing the ruby version requirement to something incompatible" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby ">= 1.0.0"
-      gem "rack"
-    G
-
-    expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
-
-    simulate_ruby_version "5100"
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby ">= 5000.0"
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(locked_ruby_version.versions).to eq(["5100"])
-  end
-
-  it "allows requirements with trailing whitespace" do
-    install_gemfile! <<-G
-      source "file://#{gem_repo1}"
-      ruby "#{RUBY_VERSION}\\n \t\\n"
-      gem "rack"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "fails gracefully with malformed requirements" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      ruby ">= 0", "-.\\0"
-      gem "rack"
-    G
-
-    expect(out).to include("There was an error parsing") # i.e. DSL error, not error template
-  end
-end
diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb
deleted file mode 100644
index c814d0de76..0000000000
--- a/spec/bundler/install/gemfile/sources_spec.rb
+++ /dev/null
@@ -1,619 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with gems on multiple sources" do
-  # repo1 is built automatically before all of the specs run
-  # it contains rack-obama 1.0.0 and rack 0.9.1 & 1.0.0 amongst other gems
-
-  context "without source affinity" do
-    before do
-      # Oh no! Someone evil is trying to hijack rack :(
-      # need this to be broken to check for correct source ordering
-      build_repo gem_repo3 do
-        build_gem "rack", repo3_rack_version do |s|
-          s.write "lib/rack.rb", "RACK = 'FAIL'"
-        end
-      end
-    end
-
-    context "with multiple toplevel sources" do
-      let(:repo3_rack_version) { "1.0.0" }
-
-      before do
-        gemfile <<-G
-          source "file://localhost#{gem_repo3}"
-          source "file://localhost#{gem_repo1}"
-          gem "rack-obama"
-          gem "rack"
-        G
-        bundle "config major_deprecations true"
-      end
-
-      it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 2" do
-        bundle :install
-
-        expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
-        expect(out).to include("Warning: the gem 'rack' was found in multiple sources.")
-        expect(out).to include(normalize_uri_file("Installed from: file://localhost#{gem_repo1}"))
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
-      end
-
-      it "errors when disable_multisource is set" do
-        bundle "config disable_multisource true"
-        bundle :install
-        expect(out).to include("Each source after the first must include a block")
-        expect(exitstatus).to eq(4) if exitstatus
-      end
-    end
-
-    context "when different versions of the same gem are in multiple sources" do
-      let(:repo3_rack_version) { "1.2" }
-
-      before do
-        gemfile <<-G
-          source "file://localhost#{gem_repo3}"
-          source "file://localhost#{gem_repo1}"
-          gem "rack-obama"
-          gem "rack", "1.0.0" # force it to install the working version in repo1
-        G
-        bundle "config major_deprecations true"
-      end
-
-      it "warns about ambiguous gems, but installs anyway", :bundler => "< 2" do
-        bundle :install
-
-        expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
-        expect(out).to include("Warning: the gem 'rack' was found in multiple sources.")
-        expect(out).to include(normalize_uri_file("Installed from: file://localhost#{gem_repo1}"))
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
-      end
-    end
-  end
-
-  context "with source affinity" do
-    context "with sources given by a block" do
-      before do
-        # Oh no! Someone evil is trying to hijack rack :(
-        # need this to be broken to check for correct source ordering
-        build_repo gem_repo3 do
-          build_gem "rack", "1.0.0" do |s|
-            s.write "lib/rack.rb", "RACK = 'FAIL'"
-          end
-
-          build_gem "rack-obama" do |s|
-            s.add_dependency "rack"
-          end
-        end
-
-        gemfile <<-G
-          source "file://#{gem_repo3}"
-          source "file://#{gem_repo1}" do
-            gem "thin" # comes first to test name sorting
-            gem "rack"
-          end
-          gem "rack-obama" # shoud come from repo3!
-        G
-      end
-
-      it "installs the gems without any warning" do
-        bundle! :install
-        expect(out).not_to include("Warning")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0")
-        expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote1")
-      end
-
-      it "can cache and deploy" do
-        bundle! :package
-
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        expect(bundled_app("vendor/cache/rack-obama-1.0.gem")).to exist
-
-        bundle! :install, forgotten_command_line_options(:deployment => true)
-
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
-      end
-    end
-
-    context "with sources set by an option" do
-      before do
-        # Oh no! Someone evil is trying to hijack rack :(
-        # need this to be broken to check for correct source ordering
-        build_repo gem_repo3 do
-          build_gem "rack", "1.0.0" do |s|
-            s.write "lib/rack.rb", "RACK = 'FAIL'"
-          end
-
-          build_gem "rack-obama" do |s|
-            s.add_dependency "rack"
-          end
-        end
-
-        gemfile <<-G
-          source "file://#{gem_repo3}"
-          gem "rack-obama" # should come from repo3!
-          gem "rack", :source => "file://#{gem_repo1}"
-        G
-      end
-
-      it "installs the gems without any warning" do
-        bundle :install
-        expect(out).not_to include("Warning")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
-      end
-    end
-
-    context "when a pinned gem has an indirect dependency" do
-      before do
-        build_repo gem_repo3 do
-          build_gem "depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "rack"
-          end
-        end
-      end
-
-      context "when the indirect dependency is in the pinned source" do
-        before do
-          # we need a working rack gem in repo3
-          update_repo gem_repo3 do
-            build_gem "rack", "1.0.0"
-          end
-
-          gemfile <<-G
-            source "file://#{gem_repo2}"
-            source "file://#{gem_repo3}" do
-              gem "depends_on_rack"
-            end
-          G
-        end
-
-        context "and not in any other sources" do
-          before do
-            build_repo(gem_repo2) {}
-          end
-
-          it "installs from the same source without any warning" do
-            bundle :install
-            expect(out).not_to include("Warning")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-          end
-        end
-
-        context "and in another source" do
-          before do
-            # need this to be broken to check for correct source ordering
-            build_repo gem_repo2 do
-              build_gem "rack", "1.0.0" do |s|
-                s.write "lib/rack.rb", "RACK = 'FAIL'"
-              end
-            end
-          end
-
-          context "when lockfile_uses_separate_rubygems_sources is set" do
-            before do
-              bundle! "config lockfile_uses_separate_rubygems_sources true"
-              bundle! "config disable_multisource true"
-            end
-
-            it "installs from the same source without any warning" do
-              bundle! :install
-
-              expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-              expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-              expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-
-              # when there is already a lock file, and the gems are missing, so try again
-              system_gems []
-              bundle! :install
-
-              expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-              expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-              expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-            end
-          end
-        end
-      end
-
-      context "when the indirect dependency is in a different source" do
-        before do
-          # In these tests, we need a working rack gem in repo2 and not repo3
-          build_repo gem_repo2 do
-            build_gem "rack", "1.0.0"
-          end
-        end
-
-        context "and not in any other sources" do
-          before do
-            gemfile <<-G
-              source "file://#{gem_repo2}"
-              source "file://#{gem_repo3}" do
-                gem "depends_on_rack"
-              end
-            G
-          end
-
-          it "installs from the other source without any warning" do
-            bundle :install
-            expect(out).not_to include("Warning")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-          end
-        end
-
-        context "and in yet another source" do
-          before do
-            gemfile <<-G
-              source "file://localhost#{gem_repo1}"
-              source "file://localhost#{gem_repo2}"
-              source "file://localhost#{gem_repo3}" do
-                gem "depends_on_rack"
-              end
-            G
-          end
-
-          it "installs from the other source and warns about ambiguous gems", :bundler => "< 2" do
-            bundle "config major_deprecations true"
-            bundle :install
-            expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.")
-            expect(out).to include("Warning: the gem 'rack' was found in multiple sources.")
-            expect(out).to include(normalize_uri_file("Installed from: file://localhost#{gem_repo2}"))
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-          end
-        end
-
-        context "and only the dependency is pinned" do
-          before do
-            # need this to be broken to check for correct source ordering
-            build_repo gem_repo2 do
-              build_gem "rack", "1.0.0" do |s|
-                s.write "lib/rack.rb", "RACK = 'FAIL'"
-              end
-            end
-
-            gemfile <<-G
-              source "file://#{gem_repo3}" # contains depends_on_rack
-              source "file://#{gem_repo2}" # contains broken rack
-
-              gem "depends_on_rack" # installed from gem_repo3
-              gem "rack", :source => "file://#{gem_repo1}"
-            G
-          end
-
-          it "installs the dependency from the pinned source without warning", :bundler => "< 2" do
-            bundle :install
-
-            expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-
-            # In https://github.com/bundler/bundler/issues/3585 this failed
-            # when there is already a lock file, and the gems are missing, so try again
-            system_gems []
-            bundle :install
-
-            expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
-          end
-        end
-      end
-    end
-
-    context "when a top-level gem has an indirect dependency" do
-      context "when lockfile_uses_separate_rubygems_sources is set" do
-        before do
-          bundle! "config lockfile_uses_separate_rubygems_sources true"
-          bundle! "config disable_multisource true"
-        end
-
-        before do
-          build_repo gem_repo2 do
-            build_gem "depends_on_rack", "1.0.1" do |s|
-              s.add_dependency "rack"
-            end
-          end
-
-          build_repo gem_repo3 do
-            build_gem "unrelated_gem", "1.0.0"
-          end
-
-          gemfile <<-G
-            source "file://#{gem_repo2}"
-
-            gem "depends_on_rack"
-
-            source "file://#{gem_repo3}" do
-              gem "unrelated_gem"
-            end
-          G
-        end
-
-        context "and the dependency is only in the top-level source" do
-          before do
-            update_repo gem_repo2 do
-              build_gem "rack", "1.0.0"
-            end
-          end
-
-          it "installs all gems without warning" do
-            bundle :install
-            expect(out).not_to include("Warning")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
-          end
-        end
-
-        context "and the dependency is only in a pinned source" do
-          before do
-            update_repo gem_repo3 do
-              build_gem "rack", "1.0.0" do |s|
-                s.write "lib/rack.rb", "RACK = 'FAIL'"
-              end
-            end
-          end
-
-          it "does not find the dependency" do
-            bundle :install
-            expect(out).to include("Could not find gem 'rack', which is required by gem 'depends_on_rack', in any of the relevant sources")
-          end
-        end
-
-        context "and the dependency is in both the top-level and a pinned source" do
-          before do
-            update_repo gem_repo2 do
-              build_gem "rack", "1.0.0"
-            end
-
-            update_repo gem_repo3 do
-              build_gem "rack", "1.0.0" do |s|
-                s.write "lib/rack.rb", "RACK = 'FAIL'"
-              end
-            end
-          end
-
-          it "installs the dependency from the top-level source without warning" do
-            bundle :install
-            expect(out).not_to include("Warning")
-            expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
-          end
-        end
-      end
-    end
-
-    context "with a gem that is only found in the wrong source" do
-      before do
-        build_repo gem_repo3 do
-          build_gem "not_in_repo1", "1.0.0"
-        end
-
-        gemfile <<-G
-          source "file://#{gem_repo3}"
-          gem "not_in_repo1", :source => "file://#{gem_repo1}"
-        G
-      end
-
-      it "does not install the gem" do
-        bundle :install
-        expect(out).to include("Could not find gem 'not_in_repo1'")
-      end
-    end
-
-    context "with an existing lockfile" do
-      before do
-        system_gems "rack-0.9.1", "rack-1.0.0", :path => :bundle_path
-
-        lockfile <<-L
-          GEM
-            remote: file:#{gem_repo1}
-            remote: file:#{gem_repo3}
-            specs:
-              rack (0.9.1)
-
-          PLATFORMS
-            ruby
-
-          DEPENDENCIES
-            rack!
-        L
-
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          source "file://#{gem_repo3}" do
-            gem 'rack'
-          end
-        G
-      end
-
-      # Reproduction of https://github.com/bundler/bundler/issues/3298
-      it "does not unlock the installed gem on exec" do
-        expect(the_bundle).to include_gems("rack 0.9.1")
-      end
-    end
-
-    context "with a path gem in the same Gemfile" do
-      before do
-        build_lib "foo"
-
-        gemfile <<-G
-          gem "rack", :source => "file://#{gem_repo1}"
-          gem "foo", :path => "#{lib_path("foo-1.0")}"
-        G
-      end
-
-      it "does not unlock the non-path gem after install" do
-        bundle! :install
-
-        bundle! %(exec ruby -e 'puts "OK"'), :env => { :RUBYOPT => "-r#{spec_dir.join("support/hax")}" }
-
-        expect(out).to include("OK")
-      end
-    end
-  end
-
-  context "when an older version of the same gem also ships with Ruby" do
-    before do
-      system_gems "rack-0.9.1"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack" # shoud come from repo1!
-      G
-    end
-
-    it "installs the gems without any warning" do
-      bundle :install
-      expect(out).not_to include("Warning")
-      expect(the_bundle).to include_gems("rack 1.0.0")
-    end
-  end
-
-  context "when a single source contains multiple locked gems" do
-    before do
-      # 1. With these gems,
-      build_repo4 do
-        build_gem "foo", "0.1"
-        build_gem "bar", "0.1"
-      end
-
-      # 2. Installing this gemfile will produce...
-      gemfile <<-G
-        source 'file://#{gem_repo1}'
-        gem 'rack'
-        gem 'foo', '~> 0.1', :source => 'file://#{gem_repo4}'
-        gem 'bar', '~> 0.1', :source => 'file://#{gem_repo4}'
-      G
-
-      # 3. this lockfile.
-      lockfile <<-L
-        GEM
-          remote: file:/Users/andre/src/bundler/bundler/tmp/gems/remote1/
-          remote: file:/Users/andre/src/bundler/bundler/tmp/gems/remote4/
-          specs:
-            bar (0.1)
-            foo (0.1)
-            rack (1.0.0)
-
-        PLATFORMS
-          ruby
-
-        DEPENDENCIES
-          bar (~> 0.1)!
-          foo (~> 0.1)!
-          rack
-      L
-
-      bundle! :install, forgotten_command_line_options(:path => "../gems/system")
-
-      # 4. Then we add some new versions...
-      update_repo4 do
-        build_gem "foo", "0.2"
-        build_gem "bar", "0.3"
-      end
-    end
-
-    it "allows them to be unlocked separately" do
-      # 5. and install this gemfile, updating only foo.
-      install_gemfile <<-G
-        source 'file://#{gem_repo1}'
-        gem 'rack'
-        gem 'foo', '~> 0.2', :source => 'file://#{gem_repo4}'
-        gem 'bar', '~> 0.1', :source => 'file://#{gem_repo4}'
-      G
-
-      # 6. Which should update foo to 0.2, but not the (locked) bar 0.1
-      expect(the_bundle).to include_gems("foo 0.2", "bar 0.1")
-    end
-  end
-
-  context "re-resolving" do
-    context "when there is a mix of sources in the gemfile" do
-      before do
-        build_repo3
-        build_lib "path1"
-        build_lib "path2"
-        build_git "git1"
-        build_git "git2"
-
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rails"
-
-          source "file://#{gem_repo3}" do
-            gem "rack"
-          end
-
-          gem "path1", :path => "#{lib_path("path1-1.0")}"
-          gem "path2", :path => "#{lib_path("path2-1.0")}"
-          gem "git1",  :git  => "#{lib_path("git1-1.0")}"
-          gem "git2",  :git  => "#{lib_path("git2-1.0")}"
-        G
-      end
-
-      it "does not re-resolve" do
-        bundle :install, :verbose => true
-        expect(out).to include("using resolution from the lockfile")
-        expect(out).not_to include("re-resolving dependencies")
-      end
-    end
-  end
-
-  context "when a gem is installed to system gems" do
-    before do
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    context "and the gemfile changes" do
-      it "is still able to find that gem from remote sources" do
-        source_uri = "file://#{gem_repo1}"
-        second_uri = "file://#{gem_repo4}"
-
-        build_repo4 do
-          build_gem "rack", "2.0.1.1.forked"
-          build_gem "thor", "0.19.1.1.forked"
-        end
-
-        # When this gemfile is installed...
-        gemfile <<-G
-          source "#{source_uri}"
-
-          source "#{second_uri}" do
-            gem "rack", "2.0.1.1.forked"
-            gem "thor"
-          end
-          gem "rack-obama"
-        G
-
-        # It creates this lockfile.
-        lockfile <<-L
-          GEM
-            remote: #{source_uri}/
-            remote: #{second_uri}/
-            specs:
-              rack (2.0.1.1.forked)
-              rack-obama (1.0)
-                rack
-              thor (0.19.1.1.forked)
-
-          PLATFORMS
-            ruby
-
-          DEPENDENCIES
-            rack (= 2.0.1.1.forked)!
-            rack-obama
-            thor!
-        L
-
-        # Then we change the Gemfile by adding a version to thor
-        gemfile <<-G
-          source "#{source_uri}"
-
-          source "#{second_uri}" do
-            gem "rack", "2.0.1.1.forked"
-            gem "thor", "0.19.1.1.forked"
-          end
-          gem "rack-obama"
-        G
-
-        # But we should still be able to find rack 2.0.1.1.forked and install it
-        bundle! :install
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb
deleted file mode 100644
index 9c725416d5..0000000000
--- a/spec/bundler/install/gemfile/specific_platform_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with specific_platform enabled" do
-  before do
-    bundle "config specific_platform true"
-
-    build_repo2 do
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1")
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x86-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x86-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x64-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "universal-darwin" }
-
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x86-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x64-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x86-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5")
-
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "universal-darwin" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "x86-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "x86-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "x64-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.4")
-
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3")
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3") {|s| s.platform = "x86-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3") {|s| s.platform = "x86-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3") {|s| s.platform = "x64-mingw32" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.3") {|s| s.platform = "universal-darwin" }
-
-      build_gem("google-protobuf", "3.0.0.alpha.4.0")
-      build_gem("google-protobuf", "3.0.0.alpha.3.1.pre")
-      build_gem("google-protobuf", "3.0.0.alpha.3")
-      build_gem("google-protobuf", "3.0.0.alpha.2.0")
-      build_gem("google-protobuf", "3.0.0.alpha.1.1")
-      build_gem("google-protobuf", "3.0.0.alpha.1.0")
-
-      build_gem("facter", "2.4.6")
-      build_gem("facter", "2.4.6") do |s|
-        s.platform = "universal-darwin"
-        s.add_runtime_dependency "CFPropertyList"
-      end
-      build_gem("CFPropertyList")
-    end
-  end
-
-  let(:google_protobuf) { <<-G }
-    source "file:#{gem_repo2}"
-    gem "google-protobuf"
-  G
-
-  context "when on a darwin machine" do
-    before { simulate_platform "x86_64-darwin-15" }
-
-    it "locks to both the specific darwin platform and ruby" do
-      install_gemfile!(google_protobuf)
-      expect(the_bundle.locked_gems.platforms).to eq([pl("ruby"), pl("x86_64-darwin-15")])
-      expect(the_bundle).to include_gem("google-protobuf 3.0.0.alpha.5.0.5.1 universal-darwin")
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
-        google-protobuf-3.0.0.alpha.5.0.5.1
-        google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-      ])
-    end
-
-    it "caches both the universal-darwin and ruby gems when --all-platforms is passed" do
-      gemfile(google_protobuf)
-      bundle! "package --all-platforms"
-      expect([cached_gem("google-protobuf-3.0.0.alpha.5.0.5.1"), cached_gem("google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin")]).
-        to all(exist)
-    end
-
-    it "uses the platform-specific gem with extra dependencies" do
-      install_gemfile! <<-G
-        source "file:#{gem_repo2}"
-        gem "facter"
-      G
-
-      expect(the_bundle.locked_gems.platforms).to eq([pl("ruby"), pl("x86_64-darwin-15")])
-      expect(the_bundle).to include_gems("facter 2.4.6 universal-darwin", "CFPropertyList 1.0")
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(["CFPropertyList-1.0",
-                                                                   "facter-2.4.6",
-                                                                   "facter-2.4.6-universal-darwin"])
-    end
-
-    context "when adding a platform via lock --add_platform" do
-      it "adds the foreign platform" do
-        install_gemfile!(google_protobuf)
-        bundle! "lock --add-platform=#{x64_mingw}"
-
-        expect(the_bundle.locked_gems.platforms).to eq([rb, x64_mingw, pl("x86_64-darwin-15")])
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
-          google-protobuf-3.0.0.alpha.5.0.5.1
-          google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-          google-protobuf-3.0.0.alpha.5.0.5.1-x64-mingw32
-        ])
-      end
-
-      it "falls back on plain ruby when that version doesnt have a platform-specific gem" do
-        install_gemfile!(google_protobuf)
-        bundle! "lock --add-platform=#{java}"
-
-        expect(the_bundle.locked_gems.platforms).to eq([java, rb, pl("x86_64-darwin-15")])
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
-          google-protobuf-3.0.0.alpha.5.0.5.1
-          google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-        ])
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/gemfile_spec.rb b/spec/bundler/install/gemfile_spec.rb
deleted file mode 100644
index e74c5ffe59..0000000000
--- a/spec/bundler/install/gemfile_spec.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  context "with duplicated gems" do
-    it "will display a warning" do
-      install_gemfile <<-G
-        gem 'rails', '~> 4.0.0'
-        gem 'rails', '~> 4.0.0'
-      G
-      expect(out).to include("more than once")
-    end
-  end
-
-  context "with --gemfile" do
-    it "finds the gemfile" do
-      gemfile bundled_app("NotGemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle :install, :gemfile => bundled_app("NotGemfile")
-
-      # Specify BUNDLE_GEMFILE for `the_bundle`
-      # to retrieve the proper Gemfile
-      ENV["BUNDLE_GEMFILE"] = "NotGemfile"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  context "with gemfile set via config" do
-    before do
-      gemfile bundled_app("NotGemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle "config --local gemfile #{bundled_app("NotGemfile")}"
-    end
-    it "uses the gemfile to install" do
-      bundle "install"
-      bundle "list"
-
-      expect(out).to include("rack (1.0.0)")
-    end
-    it "uses the gemfile while in a subdirectory" do
-      bundled_app("subdir").mkpath
-      Dir.chdir(bundled_app("subdir")) do
-        bundle "install"
-        bundle "list"
-
-        expect(out).to include("rack (1.0.0)")
-      end
-    end
-  end
-
-  context "with deprecated features" do
-    before :each do
-      in_app_root
-    end
-
-    it "reports that lib is an invalid option" do
-      gemfile <<-G
-        gem "rack", :lib => "rack"
-      G
-
-      bundle :install
-      expect(out).to match(/You passed :lib as an option for gem 'rack', but it is invalid/)
-    end
-  end
-
-  context "with prefer_gems_rb set" do
-    before { bundle! "config prefer_gems_rb true" }
-
-    it "prefers gems.rb to Gemfile" do
-      create_file("gems.rb", "gem 'bundler'")
-      create_file("Gemfile", "raise 'wrong Gemfile!'")
-
-      bundle! :install
-
-      expect(bundled_app("gems.rb")).to be_file
-      expect(bundled_app("Gemfile.lock")).not_to be_file
-
-      expect(the_bundle).to include_gem "bundler #{Bundler::VERSION}"
-    end
-  end
-
-  context "with engine specified in symbol" do
-    it "does not raise any error parsing Gemfile" do
-      simulate_ruby_version "2.3.0" do
-        simulate_ruby_engine "jruby", "9.1.2.0" do
-          install_gemfile! <<-G
-            source "file://#{gem_repo1}"
-            ruby "2.3.0", :engine => :jruby, :engine_version => "9.1.2.0"
-          G
-
-          expect(out).to match(/Bundle complete!/)
-        end
-      end
-    end
-
-    it "installation succeeds" do
-      simulate_ruby_version "2.3.0" do
-        simulate_ruby_engine "jruby", "9.1.2.0" do
-          install_gemfile! <<-G
-            source "file://#{gem_repo1}"
-            ruby "2.3.0", :engine => :jruby, :engine_version => "9.1.2.0"
-            gem "rack"
-          G
-
-          expect(the_bundle).to include_gems "rack 1.0.0"
-        end
-      end
-    end
-  end
-
-  context "with a Gemfile containing non-US-ASCII characters" do
-    it "reads the Gemfile with the UTF-8 encoding by default" do
-      skip "Ruby 1.8 has no encodings" if RUBY_VERSION < "1.9"
-
-      install_gemfile <<-G
-        str = "Il était une fois ..."
-        puts "The source encoding is: " + str.encoding.name
-      G
-
-      expect(out).to include("The source encoding is: UTF-8")
-      expect(out).not_to include("The source encoding is: ASCII-8BIT")
-      expect(out).to include("Bundle complete!")
-    end
-
-    it "respects the magic encoding comment" do
-      skip "Ruby 1.8 has no encodings" if RUBY_VERSION < "1.9"
-
-      # NOTE: This works thanks to #eval interpreting the magic encoding comment
-      install_gemfile <<-G
-        # encoding: iso-8859-1
-        str = "Il #{"\xE9".dup.force_encoding("binary")}tait une fois ..."
-        puts "The source encoding is: " + str.encoding.name
-      G
-
-      expect(out).to include("The source encoding is: ISO-8859-1")
-      expect(out).to include("Bundle complete!")
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb
deleted file mode 100644
index 02a37a77d5..0000000000
--- a/spec/bundler/install/gems/compact_index_spec.rb
+++ /dev/null
@@ -1,940 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "compact index api" do
-  let(:source_hostname) { "localgemserver.test" }
-  let(:source_uri) { "http://#{source_hostname}" }
-
-  it "should use the API" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "should URI encode gem names" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem " sinatra"
-    G
-
-    bundle :install, :artifice => "compact_index"
-    expect(out).to include("' sinatra' is not a valid gem name because it contains whitespace.")
-  end
-
-  it "should handle nested dependencies" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rails"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems(
-      "rails 2.3.2",
-      "actionpack 2.3.2",
-      "activerecord 2.3.2",
-      "actionmailer 2.3.2",
-      "activeresource 2.3.2",
-      "activesupport 2.3.2"
-    )
-  end
-
-  it "should handle case sensitivity conflicts" do
-    build_repo4 do
-      build_gem "rack", "1.0" do |s|
-        s.add_runtime_dependency("Rack", "0.1")
-      end
-      build_gem "Rack", "0.1"
-    end
-
-    install_gemfile! <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4 }
-      source "#{source_uri}"
-      gem "rack", "1.0"
-      gem "Rack", "0.1"
-    G
-
-    # can't use `include_gems` here since the `require` will conflict on a
-    # case-insensitive FS
-    run! "Bundler.require; puts Gem.loaded_specs.values_at('rack', 'Rack').map(&:full_name)"
-    expect(last_command.stdout).to eq("rack-1.0\nRack-0.1")
-  end
-
-  it "should handle multiple gem dependencies on the same gem" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "net-sftp"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(the_bundle).to include_gems "net-sftp 1.1.1"
-  end
-
-  it "should use the endpoint when using --deployment" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-    bundle! :install, :artifice => "compact_index"
-
-    bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle").merge(:artifice => "compact_index")
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles git dependencies that are in rubygems" do
-    build_git "foo" do |s|
-      s.executables = "foobar"
-      s.add_dependency "rails", "2.3.2"
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      git "file:///#{lib_path("foo-1.0")}" do
-        gem 'foo'
-      end
-    G
-
-    bundle! :install, :artifice => "compact_index"
-
-    expect(the_bundle).to include_gems("rails 2.3.2")
-  end
-
-  it "handles git dependencies that are in rubygems using --deployment" do
-    build_git "foo" do |s|
-      s.executables = "foobar"
-      s.add_dependency "rails", "2.3.2"
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'foo', :git => "file:///#{lib_path("foo-1.0")}"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-
-    bundle "install --deployment", :artifice => "compact_index"
-
-    expect(the_bundle).to include_gems("rails 2.3.2")
-  end
-
-  it "doesn't fail if you only have a git gem with no deps when using --deployment" do
-    build_git "foo"
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'foo', :git => "file:///#{lib_path("foo-1.0")}"
-    G
-
-    bundle "install", :artifice => "compact_index"
-    bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "compact_index")
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "falls back when the API errors out" do
-    simulate_platform mswin
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rcov"
-    G
-
-    bundle! :install, :artifice => "windows"
-    expect(out).to include("Fetching source index from #{source_uri}")
-    expect(the_bundle).to include_gems "rcov 1.0.0"
-  end
-
-  it "falls back when the API URL returns 403 Forbidden" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle! :install, :verbose => true, :artifice => "compact_index_forbidden"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "falls back when the versions endpoint has a checksum mismatch" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle! :install, :verbose => true, :artifice => "compact_index_checksum_mismatch"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(out).to include <<-'WARN'
-The checksum of /versions does not match the checksum provided by the server! Something is wrong (local checksum is "\"d41d8cd98f00b204e9800998ecf8427e\"", was expecting "\"123\"").
-    WARN
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "falls back when the user's home directory does not exist or is not writable" do
-    ENV["HOME"] = tmp("missing_home").to_s
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles host redirects" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle! :install, :artifice => "compact_index_host_redirect"
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles host redirects without Net::HTTP::Persistent" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    FileUtils.mkdir_p lib_path
-    File.open(lib_path("disable_net_http_persistent.rb"), "w") do |h|
-      h.write <<-H
-        module Kernel
-          alias require_without_disabled_net_http require
-          def require(*args)
-            raise LoadError, 'simulated' if args.first == 'openssl' && !caller.grep(/vendored_persistent/).empty?
-            require_without_disabled_net_http(*args)
-          end
-        end
-      H
-    end
-
-    bundle! :install, :artifice => "compact_index_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
-    expect(out).to_not match(/Too many redirects/)
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "times out when Bundler::Fetcher redirects too much" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :artifice => "compact_index_redirects"
-    expect(out).to match(/Too many redirects/)
-  end
-
-  context "when --full-index is specified" do
-    it "should use the modern index for install" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem "rack"
-      G
-
-      bundle "install --full-index", :artifice => "compact_index"
-      expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "should use the modern index for update" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem "rack"
-      G
-
-      bundle! "update --full-index", :artifice => "compact_index", :all => bundle_update_requires_all?
-      expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  it "does not double check for gems that are only installed locally" do
-    system_gems %w[rack-1.0.0 thin-1.0 net_a-1.0]
-    bundle! "config --local path.system true"
-    ENV["BUNDLER_SPEC_ALL_REQUESTS"] = strip_whitespace(<<-EOS).strip
-      #{source_uri}/versions
-      #{source_uri}/info/rack
-    EOS
-
-    install_gemfile! <<-G, :artifice => "compact_index", :verbose => true
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    expect(last_command.stdboth).not_to include "Double checking"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources", :bundler => "< 2" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem "back_deps"
-    G
-
-    bundle! :install, :artifice => "compact_index_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources with source blocks" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    install_gemfile! <<-G, :artifice => "compact_index_extra", :verbose => true
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
-  end
-
-  it "fetches gem versions even when those gems are already installed" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack", "1.0.0"
-    G
-    bundle! :install, :artifice => "compact_index_extra_api"
-    expect(the_bundle).to include_gems "rack 1.0.0"
-
-    build_repo4 do
-      build_gem "rack", "1.2" do |s|
-        s.executables = "rackup"
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}" do; end
-      source "#{source_uri}/extra"
-      gem "rack", "1.2"
-    G
-    bundle! :install, :artifice => "compact_index_extra_api"
-    expect(the_bundle).to include_gems "rack 1.2"
-  end
-
-  it "considers all possible versions of dependencies from all api gem sources", :bundler => "< 2" do
-    # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
-    # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
-    # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
-    # repo and installs it.
-    build_repo4 do
-      build_gem "activesupport", "1.2.0"
-      build_gem "somegem", "1.0.0" do |s|
-        s.add_dependency "activesupport", "1.2.3" # This version exists only in repo1
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem 'somegem', '1.0.0'
-    G
-
-    bundle! :install, :artifice => "compact_index_extra_api"
-
-    expect(the_bundle).to include_gems "somegem 1.0.0"
-    expect(the_bundle).to include_gems "activesupport 1.2.3"
-  end
-
-  it "considers all possible versions of dependencies from all api gem sources when using blocks", :bundler => "< 2" do
-    # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
-    # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
-    # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
-    # repo and installs it.
-    build_repo4 do
-      build_gem "activesupport", "1.2.0"
-      build_gem "somegem", "1.0.0" do |s|
-        s.add_dependency "activesupport", "1.2.3" # This version exists only in repo1
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem 'somegem', '1.0.0'
-      end
-    G
-
-    bundle! :install, :artifice => "compact_index_extra_api"
-
-    expect(the_bundle).to include_gems "somegem 1.0.0"
-    expect(the_bundle).to include_gems "activesupport 1.2.3"
-  end
-
-  it "prints API output properly with back deps" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle! :install, :artifice => "compact_index_extra"
-
-    expect(out).to include("Fetching gem metadata from http://localgemserver.test/")
-    expect(out).to include("Fetching source index from http://localgemserver.test/extra")
-  end
-
-  it "does not fetch every spec if the index of gems is large when doing back deps" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      build_gem "missing"
-      # need to hit the limit
-      1.upto(Bundler::Source::Rubygems::API_REQUEST_LIMIT) do |i|
-        build_gem "gem#{i}"
-      end
-
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle! :install, :artifice => "compact_index_extra_missing"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "does not fetch every spec if the index of gems is large when doing back deps & everything is the compact index" do
-    build_repo4 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      build_gem "missing"
-      # need to hit the limit
-      1.upto(Bundler::Source::Rubygems::API_REQUEST_LIMIT) do |i|
-        build_gem "gem#{i}"
-      end
-
-      FileUtils.rm_rf Dir[gem_repo4("gems/foo-*.gem")]
-    end
-
-    install_gemfile! <<-G, :artifice => "compact_index_extra_api_missing"
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    expect(the_bundle).to include_gem "back_deps 1.0"
-  end
-
-  it "uses the endpoint if all sources support it" do
-    gemfile <<-G
-      source "#{source_uri}"
-
-      gem 'foo'
-    G
-
-    bundle! :install, :artifice => "compact_index_api_missing"
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources using --deployment", :bundler => "< 2" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem "back_deps"
-    G
-
-    bundle! :install, :artifice => "compact_index_extra"
-
-    bundle "install --deployment", :artifice => "compact_index_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources using --deployment with blocks" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle! :install, :artifice => "compact_index_extra"
-
-    bundle "install --deployment", :artifice => "compact_index_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "does not refetch if the only unmet dependency is bundler" do
-    gemfile <<-G
-      source "#{source_uri}"
-
-      gem "bundler_dep"
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-  end
-
-  it "should install when EndpointSpecification has a bin dir owned by root", :sudo => true do
-    sudo "mkdir -p #{system_gem_path("bin")}"
-    sudo "chown -R root #{system_gem_path("bin")}"
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rails"
-    G
-    bundle! :install, :artifice => "compact_index"
-    expect(the_bundle).to include_gems "rails 2.3.2"
-  end
-
-  it "installs the binstubs", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --binstubs", :artifice => "compact_index"
-
-    gembin "rackup"
-    expect(out).to eq("1.0.0")
-  end
-
-  it "installs the bins when using --path and uses autoclean", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --path vendor/bundle", :artifice => "compact_index"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "installs the bins when using --path and uses bundle clean", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --path vendor/bundle --no-clean", :artifice => "compact_index"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "prints post_install_messages" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack-obama'
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Post-install message from rack:")
-  end
-
-  it "should display the post install message for a dependency" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack_middleware'
-    G
-
-    bundle! :install, :artifice => "compact_index"
-    expect(out).to include("Post-install message from rack:")
-    expect(out).to include("Rack's post install message")
-  end
-
-  context "when using basic authentication" do
-    let(:user)     { "user" }
-    let(:password) { "pass" }
-    let(:basic_auth_source_uri) do
-      uri          = URI.parse(source_uri)
-      uri.user     = user
-      uri.password = password
-
-      uri
-    end
-
-    it "passes basic authentication details and strips out creds" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle! :install, :artifice => "compact_index_basic_authentication"
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "strips http basic authentication creds for modern index" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle! :install, :artifice => "endopint_marshal_fail_basic_authentication"
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "strips http basic auth creds when it can't reach the server" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endpoint_500"
-      expect(out).not_to include("#{user}:#{password}")
-    end
-
-    it "strips http basic auth creds when warning about ambiguous sources", :bundler => "< 2" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle! :install, :artifice => "compact_index_basic_authentication"
-      expect(out).to include("Warning: the gem 'rack' was found in multiple sources.")
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "does not pass the user / password to different hosts on redirect" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle! :install, :artifice => "compact_index_creds_diff_host"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    describe "with authentication details in bundle config" do
-      before do
-        gemfile <<-G
-          source "#{source_uri}"
-          gem "rack"
-        G
-      end
-
-      it "reads authentication details by host name from bundle config" do
-        bundle "config #{source_hostname} #{user}:#{password}"
-
-        bundle! :install, :artifice => "compact_index_strict_basic_authentication"
-
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "reads authentication details by full url from bundle config" do
-        # The trailing slash is necessary here; Fetcher canonicalizes the URI.
-        bundle "config #{source_uri}/ #{user}:#{password}"
-
-        bundle! :install, :artifice => "compact_index_strict_basic_authentication"
-
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "should use the API" do
-        bundle "config #{source_hostname} #{user}:#{password}"
-        bundle! :install, :artifice => "compact_index_strict_basic_authentication"
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "prefers auth supplied in the source uri" do
-        gemfile <<-G
-          source "#{basic_auth_source_uri}"
-          gem "rack"
-        G
-
-        bundle "config #{source_hostname} otheruser:wrong"
-
-        bundle! :install, :artifice => "compact_index_strict_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "shows instructions if auth is not provided for the source" do
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
-        expect(out).to include("bundle config #{source_hostname} username:password")
-      end
-
-      it "fails if authentication has already been provided, but failed" do
-        bundle "config #{source_hostname} #{user}:wrong"
-
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
-        expect(out).to include("Bad username or password")
-      end
-    end
-
-    describe "with no password" do
-      let(:password) { nil }
-
-      it "passes basic authentication details" do
-        gemfile <<-G
-          source "#{basic_auth_source_uri}"
-          gem "rack"
-        G
-
-        bundle! :install, :artifice => "compact_index_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-    end
-  end
-
-  context "when ruby is compiled without openssl" do
-    before do
-      # Install a monkeypatch that reproduces the effects of openssl being
-      # missing when the fetcher runs, as happens in real life. The reason
-      # we can't just overwrite openssl.rb is that Artifice uses it.
-      bundled_app("broken_ssl").mkpath
-      bundled_app("broken_ssl/openssl.rb").open("w") do |f|
-        f.write <<-RUBY
-          raise LoadError, "cannot load such file -- openssl"
-        RUBY
-      end
-    end
-
-    it "explains what to do to get it" do
-      gemfile <<-G
-        source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
-      G
-
-      bundle :install, :env => { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }
-      expect(out).to include("OpenSSL")
-    end
-  end
-
-  context "when SSL certificate verification fails" do
-    it "explains what happened" do
-      # Install a monkeypatch that reproduces the effects of openssl raising
-      # a certificate validation error when RubyGems tries to connect.
-      gemfile <<-G
-        class Net::HTTP
-          def start
-            raise OpenSSL::SSL::SSLError, "certificate verify failed"
-          end
-        end
-
-        source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
-      G
-
-      bundle :install
-      expect(out).to match(/could not verify the SSL certificate/i)
-    end
-  end
-
-  context ".gemrc with sources is present" do
-    before do
-      File.open(home(".gemrc"), "w") do |file|
-        file.puts({ :sources => ["https://rubygems.org"] }.to_yaml)
-      end
-    end
-
-    after do
-      home(".gemrc").rmtree
-    end
-
-    it "uses other sources declared in the Gemfile" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem 'rack'
-      G
-
-      bundle! :install, :artifice => "compact_index_forbidden"
-    end
-  end
-
-  it "performs partial update with a non-empty range" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack', '0.9.1'
-    G
-
-    # Initial install creates the cached versions file
-    bundle! :install, :artifice => "compact_index"
-
-    # Update the Gemfile so we can check subsequent install was successful
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack', '1.0.0'
-    G
-
-    # Second install should make only a partial request to /versions
-    bundle! :install, :artifice => "compact_index_partial_update"
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "performs partial update while local cache is updated by another process" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack'
-    G
-
-    # Create an empty file to trigger a partial download
-    versions = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
-      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions")
-    FileUtils.mkdir_p(File.dirname(versions))
-    FileUtils.touch(versions)
-
-    bundle! :install, :artifice => "compact_index_concurrent_download"
-
-    expect(File.read(versions)).to start_with("created_at")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "performs full update of compact index info cache if range is not satisfiable" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack', '0.9.1'
-    G
-
-    rake_info_path = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
-      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "info", "rack")
-
-    bundle! :install, :artifice => "compact_index"
-
-    expected_rack_info_content = File.read(rake_info_path)
-
-    # Modify the cache files. We expect them to be reset to the normal ones when we re-run :install
-    File.open(rake_info_path, "w") {|f| f << (expected_rack_info_content + "this is different") }
-
-    # Update the Gemfile so the next install does its normal things
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack', '1.0.0'
-    G
-
-    # The cache files now being longer means the requested range is going to be not satisfiable
-    # Bundler must end up requesting the whole file to fix things up.
-    bundle! :install, :artifice => "compact_index_range_not_satisfiable"
-
-    resulting_rack_info_content = File.read(rake_info_path)
-
-    expect(resulting_rack_info_content).to eq(expected_rack_info_content)
-  end
-
-  it "fails gracefully when the source URI has an invalid scheme" do
-    install_gemfile <<-G
-      source "htps://rubygems.org"
-      gem "rack"
-    G
-    expect(exitstatus).to eq(15) if exitstatus
-    expect(out).to end_with(<<-E.strip)
-      The request uri `htps://index.rubygems.org/versions` has an invalid scheme (`htps`). Did you mean `http` or `https`?
-    E
-  end
-
-  describe "checksum validation", :rubygems => ">= 2.3.0" do
-    it "raises when the checksum does not match" do
-      install_gemfile <<-G, :artifice => "compact_index_wrong_gem_checksum"
-        source "#{source_uri}"
-        gem "rack"
-      G
-
-      expect(exitstatus).to eq(19) if exitstatus
-      expect(out).
-        to  include("Bundler cannot continue installing rack (1.0.0).").
-        and include("The checksum for the downloaded `rack-1.0.0.gem` does not match the checksum given by the server.").
-        and include("This means the contents of the downloaded gem is different from what was uploaded to the server, and could be a potential security issue.").
-        and include("To resolve this issue:").
-        and include("1. delete the downloaded gem located at: `#{default_bundle_path}/gems/rack-1.0.0/rack-1.0.0.gem`").
-        and include("2. run `bundle install`").
-        and include("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:").
-        and include("1. run `bundle config disable_checksum_validation true` to turn off checksum verification").
-        and include("2. run `bundle install`").
-        and match(/\(More info: The expected SHA256 checksum was "#{"ab" * 22}", but the checksum for the downloaded gem was ".+?"\.\)/)
-    end
-
-    it "raises when the checksum is the wrong length" do
-      install_gemfile <<-G, :artifice => "compact_index_wrong_gem_checksum", :env => { "BUNDLER_SPEC_RACK_CHECKSUM" => "checksum!" }
-        source "#{source_uri}"
-        gem "rack"
-      G
-      expect(exitstatus).to eq(5) if exitstatus
-      expect(out).to include("The given checksum for rack-1.0.0 (\"checksum!\") is not a valid SHA256 hexdigest nor base64digest")
-    end
-
-    it "does not raise when disable_checksum_validation is set" do
-      bundle! "config disable_checksum_validation true"
-      install_gemfile! <<-G, :artifice => "compact_index_wrong_gem_checksum"
-        source "#{source_uri}"
-        gem "rack"
-      G
-    end
-  end
-
-  it "works when cache dir is world-writable" do
-    install_gemfile! <<-G, :artifice => "compact_index"
-      File.umask(0000)
-      source "#{source_uri}"
-      gem "rack"
-    G
-  end
-
-  it "doesn't explode when the API dependencies are wrong" do
-    install_gemfile <<-G, :artifice => "compact_index_wrong_dependencies", :env => { "DEBUG" => "true" }
-      source "#{source_uri}"
-      gem "rails"
-    G
-    deps = [Gem::Dependency.new("rake", "= 10.0.2"),
-            Gem::Dependency.new("actionpack", "= 2.3.2"),
-            Gem::Dependency.new("activerecord", "= 2.3.2"),
-            Gem::Dependency.new("actionmailer", "= 2.3.2"),
-            Gem::Dependency.new("activeresource", "= 2.3.2")]
-    expect(out).to include(<<-E.strip).and include("rails-2.3.2 from rubygems remote at #{source_uri}/ has either corrupted API or lockfile dependencies")
-Bundler::APIResponseMismatchError: Downloading rails-2.3.2 revealed dependencies not in the API or the lockfile (#{deps.map(&:to_s).join(", ")}).
-Either installing with `--full-index` or running `bundle update rails` should fix the problem.
-    E
-  end
-
-  it "does not duplicate specs in the lockfile when updating and a dependency is not installed" do
-    install_gemfile! <<-G, :artifice => "compact_index"
-      source "#{source_uri}" do
-        gem "rails"
-        gem "activemerchant"
-      end
-    G
-    gem_command! :uninstall, "activemerchant"
-    bundle! "update rails", :artifice => "compact_index"
-    expect(lockfile.scan(/activemerchant \(/).size).to eq(1)
-  end
-end
diff --git a/spec/bundler/install/gems/dependency_api_spec.rb b/spec/bundler/install/gems/dependency_api_spec.rb
deleted file mode 100644
index 2ffe4b62d7..0000000000
--- a/spec/bundler/install/gems/dependency_api_spec.rb
+++ /dev/null
@@ -1,760 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "gemcutter's dependency API" do
-  let(:source_hostname) { "localgemserver.test" }
-  let(:source_uri) { "http://#{source_hostname}" }
-
-  it "should use the API" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "should URI encode gem names" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem " sinatra"
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("' sinatra' is not a valid gem name because it contains whitespace.")
-  end
-
-  it "should handle nested dependencies" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rails"
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Fetching gem metadata from #{source_uri}/...")
-    expect(the_bundle).to include_gems(
-      "rails 2.3.2",
-      "actionpack 2.3.2",
-      "activerecord 2.3.2",
-      "actionmailer 2.3.2",
-      "activeresource 2.3.2",
-      "activesupport 2.3.2"
-    )
-  end
-
-  it "should handle multiple gem dependencies on the same gem" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "net-sftp"
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(the_bundle).to include_gems "net-sftp 1.1.1"
-  end
-
-  it "should use the endpoint when using --deployment" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-    bundle :install, :artifice => "endpoint"
-
-    bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle").merge(:artifice => "endpoint")
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles git dependencies that are in rubygems" do
-    build_git "foo" do |s|
-      s.executables = "foobar"
-      s.add_dependency "rails", "2.3.2"
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      git "file:///#{lib_path("foo-1.0")}" do
-        gem 'foo'
-      end
-    G
-
-    bundle :install, :artifice => "endpoint"
-
-    expect(the_bundle).to include_gems("rails 2.3.2")
-  end
-
-  it "handles git dependencies that are in rubygems using --deployment" do
-    build_git "foo" do |s|
-      s.executables = "foobar"
-      s.add_dependency "rails", "2.3.2"
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'foo', :git => "file:///#{lib_path("foo-1.0")}"
-    G
-
-    bundle :install, :artifice => "endpoint"
-
-    bundle "install --deployment", :artifice => "endpoint"
-
-    expect(the_bundle).to include_gems("rails 2.3.2")
-  end
-
-  it "doesn't fail if you only have a git gem with no deps when using --deployment" do
-    build_git "foo"
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'foo', :git => "file:///#{lib_path("foo-1.0")}"
-    G
-
-    bundle "install", :artifice => "endpoint"
-    bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "endpoint")
-
-    expect(the_bundle).to include_gems("foo 1.0")
-  end
-
-  it "falls back when the API errors out" do
-    simulate_platform mswin
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rcov"
-    G
-
-    bundle :install, :artifice => "windows"
-    expect(out).to include("Fetching source index from #{source_uri}")
-    expect(the_bundle).to include_gems "rcov 1.0.0"
-  end
-
-  it "falls back when hitting the Gemcutter Dependency Limit" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "activesupport"
-      gem "actionpack"
-      gem "actionmailer"
-      gem "activeresource"
-      gem "thin"
-      gem "rack"
-      gem "rails"
-    G
-    bundle :install, :artifice => "endpoint_fallback"
-    expect(out).to include("Fetching source index from #{source_uri}")
-
-    expect(the_bundle).to include_gems(
-      "activesupport 2.3.2",
-      "actionpack 2.3.2",
-      "actionmailer 2.3.2",
-      "activeresource 2.3.2",
-      "activesupport 2.3.2",
-      "thin 1.0.0",
-      "rack 1.0.0",
-      "rails 2.3.2"
-    )
-  end
-
-  it "falls back when Gemcutter API doesn't return proper Marshal format" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :verbose => true, :artifice => "endpoint_marshal_fail"
-    expect(out).to include("could not fetch from the dependency API, trying the full index")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "falls back when the API URL returns 403 Forbidden" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :verbose => true, :artifice => "endpoint_api_forbidden"
-    expect(out).to include("Fetching source index from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles host redirects" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :artifice => "endpoint_host_redirect"
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "handles host redirects without Net::HTTP::Persistent" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    FileUtils.mkdir_p lib_path
-    File.open(lib_path("disable_net_http_persistent.rb"), "w") do |h|
-      h.write <<-H
-        module Kernel
-          alias require_without_disabled_net_http require
-          def require(*args)
-            raise LoadError, 'simulated' if args.first == 'openssl' && !caller.grep(/vendored_persistent/).empty?
-            require_without_disabled_net_http(*args)
-          end
-        end
-      H
-    end
-
-    bundle :install, :artifice => "endpoint_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
-    expect(out).to_not match(/Too many redirects/)
-    expect(the_bundle).to include_gems "rack 1.0.0"
-  end
-
-  it "timeouts when Bundler::Fetcher redirects too much" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :artifice => "endpoint_redirect"
-    expect(out).to match(/Too many redirects/)
-  end
-
-  context "when --full-index is specified" do
-    it "should use the modern index for install" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem "rack"
-      G
-
-      bundle "install --full-index", :artifice => "endpoint"
-      expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "should use the modern index for update" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem "rack"
-      G
-
-      bundle! "update --full-index", :artifice => "endpoint", :all => bundle_update_requires_all?
-      expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources", :bundler => "< 2" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem "back_deps"
-    G
-
-    bundle :install, :artifice => "endpoint_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources using blocks" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle :install, :artifice => "endpoint_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
-  end
-
-  it "fetches gem versions even when those gems are already installed" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack", "1.0.0"
-    G
-    bundle :install, :artifice => "endpoint_extra_api"
-
-    build_repo4 do
-      build_gem "rack", "1.2" do |s|
-        s.executables = "rackup"
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}" do; end
-      source "#{source_uri}/extra"
-      gem "rack", "1.2"
-    G
-    bundle :install, :artifice => "endpoint_extra_api"
-    expect(the_bundle).to include_gems "rack 1.2"
-  end
-
-  it "considers all possible versions of dependencies from all api gem sources", :bundler => "< 2" do
-    # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
-    # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
-    # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
-    # repo and installs it.
-    build_repo4 do
-      build_gem "activesupport", "1.2.0"
-      build_gem "somegem", "1.0.0" do |s|
-        s.add_dependency "activesupport", "1.2.3" # This version exists only in repo1
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem 'somegem', '1.0.0'
-    G
-
-    bundle! :install, :artifice => "endpoint_extra_api"
-
-    expect(the_bundle).to include_gems "somegem 1.0.0"
-    expect(the_bundle).to include_gems "activesupport 1.2.3"
-  end
-
-  it "considers all possible versions of dependencies from all api gem sources using blocks" do
-    # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
-    # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
-    # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
-    # repo and installs it.
-    build_repo4 do
-      build_gem "activesupport", "1.2.0"
-      build_gem "somegem", "1.0.0" do |s|
-        s.add_dependency "activesupport", "1.2.3" # This version exists only in repo1
-      end
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem 'somegem', '1.0.0'
-      end
-    G
-
-    bundle :install, :artifice => "endpoint_extra_api"
-
-    expect(the_bundle).to include_gems "somegem 1.0.0"
-    expect(the_bundle).to include_gems "activesupport 1.2.3"
-  end
-
-  it "prints API output properly with back deps" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle :install, :artifice => "endpoint_extra"
-
-    expect(out).to include("Fetching gem metadata from http://localgemserver.test/.")
-    expect(out).to include("Fetching source index from http://localgemserver.test/extra")
-  end
-
-  it "does not fetch every spec if the index of gems is large when doing back deps", :bundler => "< 2" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      build_gem "missing"
-      # need to hit the limit
-      1.upto(Bundler::Source::Rubygems::API_REQUEST_LIMIT) do |i|
-        build_gem "gem#{i}"
-      end
-
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem "back_deps"
-    G
-
-    bundle :install, :artifice => "endpoint_extra_missing"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "does not fetch every spec if the index of gems is large when doing back deps using blocks" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      build_gem "missing"
-      # need to hit the limit
-      1.upto(Bundler::Source::Rubygems::API_REQUEST_LIMIT) do |i|
-        build_gem "gem#{i}"
-      end
-
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle :install, :artifice => "endpoint_extra_missing"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "uses the endpoint if all sources support it" do
-    gemfile <<-G
-      source "#{source_uri}"
-
-      gem 'foo'
-    G
-
-    bundle :install, :artifice => "endpoint_api_missing"
-    expect(the_bundle).to include_gems "foo 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources using --deployment", :bundler => "< 2" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra"
-      gem "back_deps"
-    G
-
-    bundle :install, :artifice => "endpoint_extra"
-
-    bundle "install --deployment", :artifice => "endpoint_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "fetches again when more dependencies are found in subsequent sources using --deployment with blocks" do
-    build_repo2 do
-      build_gem "back_deps" do |s|
-        s.add_dependency "foo"
-      end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
-    end
-
-    gemfile <<-G
-      source "#{source_uri}"
-      source "#{source_uri}/extra" do
-        gem "back_deps"
-      end
-    G
-
-    bundle :install, :artifice => "endpoint_extra"
-
-    bundle "install --deployment", :artifice => "endpoint_extra"
-    expect(the_bundle).to include_gems "back_deps 1.0"
-  end
-
-  it "does not refetch if the only unmet dependency is bundler" do
-    gemfile <<-G
-      source "#{source_uri}"
-
-      gem "bundler_dep"
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Fetching gem metadata from #{source_uri}")
-  end
-
-  it "should install when EndpointSpecification has a bin dir owned by root", :sudo => true do
-    sudo "mkdir -p #{system_gem_path("bin")}"
-    sudo "chown -R root #{system_gem_path("bin")}"
-
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rails"
-    G
-    bundle :install, :artifice => "endpoint"
-    expect(the_bundle).to include_gems "rails 2.3.2"
-  end
-
-  it "installs the binstubs", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --binstubs", :artifice => "endpoint"
-
-    gembin "rackup"
-    expect(out).to eq("1.0.0")
-  end
-
-  it "installs the bins when using --path and uses autoclean", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --path vendor/bundle", :artifice => "endpoint"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "installs the bins when using --path and uses bundle clean", :bundler => "< 2" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle "install --path vendor/bundle --no-clean", :artifice => "endpoint"
-
-    expect(vendored_gems("bin/rackup")).to exist
-  end
-
-  it "prints post_install_messages" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack-obama'
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Post-install message from rack:")
-  end
-
-  it "should display the post install message for a dependency" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem 'rack_middleware'
-    G
-
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Post-install message from rack:")
-    expect(out).to include("Rack's post install message")
-  end
-
-  context "when using basic authentication" do
-    let(:user)     { "user" }
-    let(:password) { "pass" }
-    let(:basic_auth_source_uri) do
-      uri          = URI.parse(source_uri)
-      uri.user     = user
-      uri.password = password
-
-      uri
-    end
-
-    it "passes basic authentication details and strips out creds" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endpoint_basic_authentication"
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "strips http basic authentication creds for modern index" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endopint_marshal_fail_basic_authentication"
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "strips http basic auth creds when it can't reach the server" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endpoint_500"
-      expect(out).not_to include("#{user}:#{password}")
-    end
-
-    it "strips http basic auth creds when warning about ambiguous sources", :bundler => "< 2" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endpoint_basic_authentication"
-      expect(out).to include("Warning: the gem 'rack' was found in multiple sources.")
-      expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "does not pass the user / password to different hosts on redirect" do
-      gemfile <<-G
-        source "#{basic_auth_source_uri}"
-        gem "rack"
-      G
-
-      bundle :install, :artifice => "endpoint_creds_diff_host"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    describe "with authentication details in bundle config" do
-      before do
-        gemfile <<-G
-          source "#{source_uri}"
-          gem "rack"
-        G
-      end
-
-      it "reads authentication details by host name from bundle config" do
-        bundle "config #{source_hostname} #{user}:#{password}"
-
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "reads authentication details by full url from bundle config" do
-        # The trailing slash is necessary here; Fetcher canonicalizes the URI.
-        bundle "config #{source_uri}/ #{user}:#{password}"
-
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "should use the API" do
-        bundle "config #{source_hostname} #{user}:#{password}"
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-        expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "prefers auth supplied in the source uri" do
-        gemfile <<-G
-          source "#{basic_auth_source_uri}"
-          gem "rack"
-        G
-
-        bundle "config #{source_hostname} otheruser:wrong"
-
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "shows instructions if auth is not provided for the source" do
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-        expect(out).to include("bundle config #{source_hostname} username:password")
-      end
-
-      it "fails if authentication has already been provided, but failed" do
-        bundle "config #{source_hostname} #{user}:wrong"
-
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-        expect(out).to include("Bad username or password")
-      end
-    end
-
-    describe "with no password" do
-      let(:password) { nil }
-
-      it "passes basic authentication details" do
-        gemfile <<-G
-          source "#{basic_auth_source_uri}"
-          gem "rack"
-        G
-
-        bundle :install, :artifice => "endpoint_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-    end
-  end
-
-  context "when ruby is compiled without openssl" do
-    before do
-      # Install a monkeypatch that reproduces the effects of openssl being
-      # missing when the fetcher runs, as happens in real life. The reason
-      # we can't just overwrite openssl.rb is that Artifice uses it.
-      bundled_app("broken_ssl").mkpath
-      bundled_app("broken_ssl/openssl.rb").open("w") do |f|
-        f.write <<-RUBY
-          raise LoadError, "cannot load such file -- openssl"
-        RUBY
-      end
-    end
-
-    it "explains what to do to get it" do
-      gemfile <<-G
-        source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
-      G
-
-      bundle :install, :env => { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }
-      expect(out).to include("OpenSSL")
-    end
-  end
-
-  context "when SSL certificate verification fails" do
-    it "explains what happened" do
-      # Install a monkeypatch that reproduces the effects of openssl raising
-      # a certificate validation error when RubyGems tries to connect.
-      gemfile <<-G
-        class Net::HTTP
-          def start
-            raise OpenSSL::SSL::SSLError, "certificate verify failed"
-          end
-        end
-
-        source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
-      G
-
-      bundle :install
-      expect(out).to match(/could not verify the SSL certificate/i)
-    end
-  end
-
-  context ".gemrc with sources is present" do
-    before do
-      File.open(home(".gemrc"), "w") do |file|
-        file.puts({ :sources => ["https://rubygems.org"] }.to_yaml)
-      end
-    end
-
-    after do
-      home(".gemrc").rmtree
-    end
-
-    it "uses other sources declared in the Gemfile" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem 'rack'
-      G
-
-      bundle "install", :artifice => "endpoint_marshal_fail"
-
-      expect(exitstatus).to eq(0) if exitstatus
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/env_spec.rb b/spec/bundler/install/gems/env_spec.rb
deleted file mode 100644
index 0dccbbfd24..0000000000
--- a/spec/bundler/install/gems/env_spec.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with ENV conditionals" do
-  describe "when just setting an ENV key as a string" do
-    before :each do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        env "BUNDLER_TEST" do
-          gem "rack"
-        end
-      G
-    end
-
-    it "excludes the gems when the ENV variable is not set" do
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "includes the gems when the ENV variable is set" do
-      ENV["BUNDLER_TEST"] = "1"
-      bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  describe "when just setting an ENV key as a symbol" do
-    before :each do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        env :BUNDLER_TEST do
-          gem "rack"
-        end
-      G
-    end
-
-    it "excludes the gems when the ENV variable is not set" do
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "includes the gems when the ENV variable is set" do
-      ENV["BUNDLER_TEST"] = "1"
-      bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  describe "when setting a string to match the env" do
-    before :each do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        env "BUNDLER_TEST" => "foo" do
-          gem "rack"
-        end
-      G
-    end
-
-    it "excludes the gems when the ENV variable is not set" do
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "excludes the gems when the ENV variable is set but does not match the condition" do
-      ENV["BUNDLER_TEST"] = "1"
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "includes the gems when the ENV variable is set and matches the condition" do
-      ENV["BUNDLER_TEST"] = "foo"
-      bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  describe "when setting a regex to match the env" do
-    before :each do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        env "BUNDLER_TEST" => /foo/ do
-          gem "rack"
-        end
-      G
-    end
-
-    it "excludes the gems when the ENV variable is not set" do
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "excludes the gems when the ENV variable is set but does not match the condition" do
-      ENV["BUNDLER_TEST"] = "fo"
-      bundle :install
-      expect(the_bundle).not_to include_gems "rack"
-    end
-
-    it "includes the gems when the ENV variable is set and matches the condition" do
-      ENV["BUNDLER_TEST"] = "foobar"
-      bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/flex_spec.rb b/spec/bundler/install/gems/flex_spec.rb
deleted file mode 100644
index 37d2e4958a..0000000000
--- a/spec/bundler/install/gems/flex_spec.rb
+++ /dev/null
@@ -1,351 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle flex_install" do
-  it "installs the gems as expected" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'rack'
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(the_bundle).to be_locked
-  end
-
-  it "installs even when the lockfile is invalid" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'rack'
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(the_bundle).to be_locked
-
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'rack', '1.0'
-    G
-
-    bundle :install
-    expect(the_bundle).to include_gems "rack 1.0.0"
-    expect(the_bundle).to be_locked
-  end
-
-  it "keeps child dependencies at the same version" do
-    build_repo2
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "rack-obama"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0"
-
-    update_repo2
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "rack-obama", "1.0"
-    G
-
-    expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0"
-  end
-
-  describe "adding new gems" do
-    it "installs added gems without updating previously installed gems" do
-      build_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-      G
-
-      update_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-        gem 'activesupport', '2.3.5'
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
-    end
-
-    it "keeps child dependencies pinned" do
-      build_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack-obama"
-      G
-
-      update_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack-obama"
-        gem "thin"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0", "thin 1.0"
-    end
-  end
-
-  describe "removing gems" do
-    it "removes gems without changing the versions of remaining gems" do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-        gem 'activesupport', '2.3.5'
-      G
-
-      update_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-        gem 'activesupport', '2.3.2'
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.2"
-    end
-
-    it "removes top level dependencies when removed from the Gemfile while leaving other dependencies intact" do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-        gem 'activesupport', '2.3.5'
-      G
-
-      update_repo2
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack'
-      G
-
-      expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-    end
-
-    it "removes child dependencies" do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'rack-obama'
-        gem 'activesupport'
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0", "activesupport 2.3.5"
-
-      update_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'activesupport'
-      G
-
-      expect(the_bundle).to include_gems "activesupport 2.3.5"
-      expect(the_bundle).not_to include_gems "rack-obama", "rack"
-    end
-  end
-
-  describe "when Gemfile conflicts with lockfile" do
-    before(:each) do
-      build_repo2
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack_middleware"
-      G
-
-      expect(the_bundle).to include_gems "rack_middleware 1.0", "rack 0.9.1"
-
-      build_repo2
-      update_repo2 do
-        build_gem "rack-obama", "2.0" do |s|
-          s.add_dependency "rack", "=1.2"
-        end
-        build_gem "rack_middleware", "2.0" do |s|
-          s.add_dependency "rack", ">=1.0"
-        end
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack-obama", "2.0"
-        gem "rack_middleware"
-      G
-    end
-
-    it "does not install gems whose dependencies are not met" do
-      bundle :install
-      ruby <<-RUBY
-        require 'bundler/setup'
-      RUBY
-      expect(err).to match(/could not find gem 'rack-obama/i)
-    end
-
-    it "suggests bundle update when the Gemfile requires different versions than the lock" do
-      nice_error = <<-E.strip.gsub(/^ {8}/, "")
-        Bundler could not find compatible versions for gem "rack":
-          In snapshot (Gemfile.lock):
-            rack (= 0.9.1)
-
-          In Gemfile:
-            rack-obama (= 2.0) was resolved to 2.0, which depends on
-              rack (= 1.2)
-
-            rack_middleware was resolved to 1.0, which depends on
-              rack (= 0.9.1)
-
-        Running `bundle update` will rebuild your snapshot from scratch, using only
-        the gems in your Gemfile, which may resolve the conflict.
-      E
-
-      bundle :install, :retry => 0
-      expect(last_command.bundler_err).to end_with(nice_error)
-    end
-  end
-
-  describe "subtler cases" do
-    before :each do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "rack-obama"
-      G
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "0.9.1"
-        gem "rack-obama"
-      G
-    end
-
-    it "does something" do
-      expect do
-        bundle "install"
-      end.not_to change { File.read(bundled_app("Gemfile.lock")) }
-
-      expect(out).to include("rack = 0.9.1")
-      expect(out).to include("locked at 1.0.0")
-      expect(out).to include("bundle update rack")
-    end
-
-    it "should work when you update" do
-      bundle "update rack"
-    end
-  end
-
-  describe "when adding a new source" do
-    it "updates the lockfile", :bundler => "< 2" do
-      build_repo2
-      install_gemfile! <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "rack"
-      G
-      install_gemfile! <<-G
-        source "file://localhost#{gem_repo1}"
-        source "file://localhost#{gem_repo2}"
-        gem "rack"
-      G
-
-      lockfile_should_be <<-L
-      GEM
-        remote: file://localhost#{gem_repo1}/
-        remote: file://localhost#{gem_repo2}/
-        specs:
-          rack (1.0.0)
-
-      PLATFORMS
-        ruby
-
-      DEPENDENCIES
-        rack
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-      L
-    end
-
-    it "updates the lockfile", :bundler => "2" do
-      build_repo2
-      install_gemfile! <<-G
-        source "file://localhost#{gem_repo1}"
-        gem "rack"
-      G
-
-      install_gemfile! <<-G
-        source "file://localhost#{gem_repo1}"
-        source "file://localhost#{gem_repo2}" do
-        end
-        gem "rack"
-      G
-
-      lockfile_should_be <<-L
-      GEM
-        remote: file://localhost#{gem_repo1}/
-        specs:
-          rack (1.0.0)
-
-      GEM
-        remote: file://localhost#{gem_repo2}/
-        specs:
-
-      PLATFORMS
-        #{lockfile_platforms}
-
-      DEPENDENCIES
-        rack
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-      L
-    end
-  end
-
-  # This was written to test github issue #636
-  describe "when a locked child dependency conflicts" do
-    before(:each) do
-      build_repo2 do
-        build_gem "capybara", "0.3.9" do |s|
-          s.add_dependency "rack", ">= 1.0.0"
-        end
-
-        build_gem "rack", "1.1.0"
-        build_gem "rails", "3.0.0.rc4" do |s|
-          s.add_dependency "rack", "~> 1.1.0"
-        end
-
-        build_gem "rack", "1.2.1"
-        build_gem "rails", "3.0.0" do |s|
-          s.add_dependency "rack", "~> 1.2.1"
-        end
-      end
-    end
-
-    it "prints the correct error message" do
-      # install Rails 3.0.0.rc
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0.0.rc4"
-        gem "capybara", "0.3.9"
-      G
-
-      # upgrade Rails to 3.0.0 and then install again
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0.0"
-        gem "capybara", "0.3.9"
-      G
-
-      expect(out).to include("Gemfile.lock")
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/mirror_spec.rb b/spec/bundler/install/gems/mirror_spec.rb
deleted file mode 100644
index 4c35b8f206..0000000000
--- a/spec/bundler/install/gems/mirror_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with a mirror configured" do
-  describe "when the mirror does not match the gem source" do
-    before :each do
-      gemfile <<-G
-        source "file://localhost#{gem_repo1}"
-
-        gem "rack"
-      G
-      bundle "config --local mirror.http://gems.example.org http://gem-mirror.example.org"
-    end
-
-    it "installs from the normal location" do
-      bundle :install
-      expect(out).to include(normalize_uri_file("Fetching source index from file://localhost#{gem_repo1}"))
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-
-  describe "when the gem source matches a configured mirror" do
-    before :each do
-      gemfile <<-G
-        # This source is bogus and doesn't have the gem we're looking for
-        source "file://localhost#{gem_repo2}"
-
-        gem "rack"
-      G
-      bundle "config --local mirror.file://localhost#{gem_repo2} file://localhost#{gem_repo1}"
-    end
-
-    it "installs the gem from the mirror" do
-      bundle :install
-      expect(out).to include(normalize_uri_file("Fetching source index from file://localhost#{gem_repo1}"))
-      expect(out).not_to include(normalize_uri_file("Fetching source index from file://localhost#{gem_repo2}"))
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/native_extensions_spec.rb b/spec/bundler/install/gems/native_extensions_spec.rb
deleted file mode 100644
index ea616f60d3..0000000000
--- a/spec/bundler/install/gems/native_extensions_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "installing a gem with native extensions", :ruby_repo do
-  it "installs" do
-    build_repo2 do
-      build_gem "c_extension" do |s|
-        s.extensions = ["ext/extconf.rb"]
-        s.write "ext/extconf.rb", <<-E
-          require "mkmf"
-          name = "c_extension_bundle"
-          dir_config(name)
-          raise "OMG" unless with_config("c_extension") == "hello"
-          create_makefile(name)
-        E
-
-        s.write "ext/c_extension.c", <<-C
-          #include "ruby.h"
-
-          VALUE c_extension_true(VALUE self) {
-            return Qtrue;
-          }
-
-          void Init_c_extension_bundle() {
-            VALUE c_Extension = rb_define_class("CExtension", rb_cObject);
-            rb_define_method(c_Extension, "its_true", c_extension_true, 0);
-          }
-        C
-
-        s.write "lib/c_extension.rb", <<-C
-          require "c_extension_bundle"
-        C
-      end
-    end
-
-    gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "c_extension"
-    G
-
-    bundle "config build.c_extension --with-c_extension=hello"
-    bundle "install"
-
-    expect(out).not_to include("extconf.rb failed")
-    expect(out).to include("Installing c_extension 1.0 with native extensions")
-
-    run "Bundler.require; puts CExtension.new.its_true"
-    expect(out).to eq("true")
-  end
-
-  it "installs from git" do
-    build_git "c_extension" do |s|
-      s.extensions = ["ext/extconf.rb"]
-      s.write "ext/extconf.rb", <<-E
-        require "mkmf"
-        name = "c_extension_bundle"
-        dir_config(name)
-        raise "OMG" unless with_config("c_extension") == "hello"
-        create_makefile(name)
-      E
-
-      s.write "ext/c_extension.c", <<-C
-        #include "ruby.h"
-
-        VALUE c_extension_true(VALUE self) {
-          return Qtrue;
-        }
-
-        void Init_c_extension_bundle() {
-          VALUE c_Extension = rb_define_class("CExtension", rb_cObject);
-          rb_define_method(c_Extension, "its_true", c_extension_true, 0);
-        }
-      C
-
-      s.write "lib/c_extension.rb", <<-C
-        require "c_extension_bundle"
-      C
-    end
-
-    bundle! "config build.c_extension --with-c_extension=hello"
-
-    install_gemfile! <<-G
-      gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump}
-    G
-
-    expect(out).not_to include("extconf.rb failed")
-
-    run! "Bundler.require; puts CExtension.new.its_true"
-    expect(out).to eq("true")
-  end
-end
diff --git a/spec/bundler/install/gems/post_install_spec.rb b/spec/bundler/install/gems/post_install_spec.rb
deleted file mode 100644
index c6e348fb65..0000000000
--- a/spec/bundler/install/gems/post_install_spec.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  context "with gem sources" do
-    context "when gems include post install messages" do
-      it "should display the post-install messages after installing" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'rack'
-          gem 'thin'
-          gem 'rack-obama'
-        G
-
-        bundle :install
-        expect(out).to include("Post-install message from rack:")
-        expect(out).to include("Rack's post install message")
-        expect(out).to include("Post-install message from thin:")
-        expect(out).to include("Thin's post install message")
-        expect(out).to include("Post-install message from rack-obama:")
-        expect(out).to include("Rack-obama's post install message")
-      end
-    end
-
-    context "when gems do not include post install messages" do
-      it "should not display any post-install messages" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "activesupport"
-        G
-
-        bundle :install
-        expect(out).not_to include("Post-install message")
-      end
-    end
-
-    context "when a dependecy includes a post install message" do
-      it "should display the post install message" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'rack_middleware'
-        G
-
-        bundle :install
-        expect(out).to include("Post-install message from rack:")
-        expect(out).to include("Rack's post install message")
-      end
-    end
-  end
-
-  context "with git sources" do
-    context "when gems include post install messages" do
-      it "should display the post-install messages after installing" do
-        build_git "foo" do |s|
-          s.post_install_message = "Foo's post install message"
-        end
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'foo', :git => '#{lib_path("foo-1.0")}'
-        G
-
-        bundle :install
-        expect(out).to include("Post-install message from foo:")
-        expect(out).to include("Foo's post install message")
-      end
-
-      it "should display the post-install messages if repo is updated" do
-        build_git "foo" do |s|
-          s.post_install_message = "Foo's post install message"
-        end
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'foo', :git => '#{lib_path("foo-1.0")}'
-        G
-        bundle :install
-
-        build_git "foo", "1.1" do |s|
-          s.post_install_message = "Foo's 1.1 post install message"
-        end
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'foo', :git => '#{lib_path("foo-1.1")}'
-        G
-        bundle :install
-
-        expect(out).to include("Post-install message from foo:")
-        expect(out).to include("Foo's 1.1 post install message")
-      end
-
-      it "should not display the post-install messages if repo is not updated" do
-        build_git "foo" do |s|
-          s.post_install_message = "Foo's post install message"
-        end
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'foo', :git => '#{lib_path("foo-1.0")}'
-        G
-
-        bundle :install
-        expect(out).to include("Post-install message from foo:")
-        expect(out).to include("Foo's post install message")
-
-        bundle :install
-        expect(out).not_to include("Post-install message")
-      end
-    end
-
-    context "when gems do not include post install messages" do
-      it "should not display any post-install messages" do
-        build_git "foo" do |s|
-          s.post_install_message = nil
-        end
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem 'foo', :git => '#{lib_path("foo-1.0")}'
-        G
-
-        bundle :install
-        expect(out).not_to include("Post-install message")
-      end
-    end
-  end
-
-  context "when ignore post-install messages for gem is set" do
-    it "doesn't display any post-install messages" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "config ignore_messages.rack true"
-
-      bundle :install
-      expect(out).not_to include("Post-install message")
-    end
-  end
-
-  context "when ignore post-install messages for all gems" do
-    it "doesn't display any post-install messages" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "config ignore_messages true"
-
-      bundle :install
-      expect(out).not_to include("Post-install message")
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/resolving_spec.rb b/spec/bundler/install/gems/resolving_spec.rb
deleted file mode 100644
index 01c03ac793..0000000000
--- a/spec/bundler/install/gems/resolving_spec.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with install-time dependencies" do
-  it "installs gems with implicit rake dependencies", :ruby_repo do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "with_implicit_rake_dep"
-      gem "another_implicit_rake_dep"
-      gem "rake"
-    G
-
-    run <<-R
-      require 'implicit_rake_dep'
-      require 'another_implicit_rake_dep'
-      puts IMPLICIT_RAKE_DEP
-      puts ANOTHER_IMPLICIT_RAKE_DEP
-    R
-    expect(out).to eq("YES\nYES")
-  end
-
-  it "installs gems with a dependency with no type" do
-    build_repo2
-
-    path = "#{gem_repo2}/#{Gem::MARSHAL_SPEC_DIR}/actionpack-2.3.2.gemspec.rz"
-    spec = Marshal.load(Bundler.rubygems.inflate(File.read(path)))
-    spec.dependencies.each do |d|
-      d.instance_variable_set(:@type, :fail)
-    end
-    File.open(path, "w") do |f|
-      f.write Gem.deflate(Marshal.dump(spec))
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gem "actionpack", "2.3.2"
-    G
-
-    expect(the_bundle).to include_gems "actionpack 2.3.2", "activesupport 2.3.2"
-  end
-
-  describe "with crazy rubygem plugin stuff" do
-    it "installs plugins" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "net_b"
-      G
-
-      expect(the_bundle).to include_gems "net_b 1.0"
-    end
-
-    it "installs plugins depended on by other plugins", :ruby_repo do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "net_a"
-      G
-
-      expect(the_bundle).to include_gems "net_a 1.0", "net_b 1.0"
-    end
-
-    it "installs multiple levels of dependencies", :ruby_repo do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "net_c"
-        gem "net_e"
-      G
-
-      expect(the_bundle).to include_gems "net_a 1.0", "net_b 1.0", "net_c 1.0", "net_d 1.0", "net_e 1.0"
-    end
-
-    context "with ENV['DEBUG_RESOLVER'] set" do
-      it "produces debug output" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "net_c"
-          gem "net_e"
-        G
-
-        bundle :install, :env => { "DEBUG_RESOLVER" => "1" }
-
-        expect(err).to include("Creating possibility state for net_c")
-      end
-    end
-
-    context "with ENV['DEBUG_RESOLVER_TREE'] set" do
-      it "produces debug output" do
-        gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "net_c"
-          gem "net_e"
-        G
-
-        bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1" }
-
-        expect(err).to include(" net_b").
-          and include("Starting resolution").
-          and include("Finished resolution").
-          and include("Attempting to activate")
-      end
-    end
-  end
-
-  describe "when a required ruby version" do
-    context "allows only an older version" do
-      it "installs the older version" do
-        build_repo2 do
-          build_gem "rack", "9001.0.0" do |s|
-            s.required_ruby_version = "> 9000"
-          end
-        end
-
-        install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2 }
-          ruby "#{RUBY_VERSION}"
-          source "http://localgemserver.test/"
-          gem 'rack'
-        G
-
-        expect(out).to_not include("rack-9001.0.0 requires ruby version > 9000")
-        expect(the_bundle).to include_gems("rack 1.2")
-      end
-    end
-
-    context "allows no gems" do
-      before do
-        build_repo2 do
-          build_gem "require_ruby" do |s|
-            s.required_ruby_version = "> 9000"
-          end
-        end
-      end
-
-      let(:ruby_requirement) { %("#{RUBY_VERSION}") }
-      let(:error_message_requirement) { "~> #{RUBY_VERSION}.0" }
-
-      shared_examples_for "ruby version conflicts" do
-        it "raises an error during resolution" do
-          install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2 }
-            source "http://localgemserver.test/"
-            ruby #{ruby_requirement}
-            gem 'require_ruby'
-          G
-
-          expect(out).to_not include("Gem::InstallError: require_ruby requires Ruby version > 9000")
-
-          nice_error = strip_whitespace(<<-E).strip
-            Bundler could not find compatible versions for gem "ruby\0":
-              In Gemfile:
-                ruby\0 (#{error_message_requirement})
-
-                require_ruby was resolved to 1.0, which depends on
-                  ruby\0 (> 9000)
-
-            Could not find gem 'ruby\0 (> 9000)', which is required by gem 'require_ruby', in any of the relevant sources:
-              the local ruby installation
-          E
-          expect(last_command.bundler_err).to end_with(nice_error)
-        end
-      end
-
-      it_behaves_like "ruby version conflicts"
-
-      describe "with a < requirement" do
-        let(:ruby_requirement) { %("< 5000") }
-        let(:error_message_requirement) { "< 5000" }
-
-        it_behaves_like "ruby version conflicts"
-      end
-
-      describe "with a compound requirement" do
-        let(:reqs) { ["> 0.1", "< 5000"] }
-        let(:ruby_requirement) { reqs.map(&:dump).join(", ") }
-        let(:error_message_requirement) { Gem::Requirement.new(reqs).to_s }
-
-        it_behaves_like "ruby version conflicts"
-      end
-    end
-  end
-
-  describe "when a required rubygems version disallows a gem" do
-    it "does not try to install those gems" do
-      build_repo2 do
-        build_gem "require_rubygems" do |s|
-          s.required_rubygems_version = "> 9000"
-        end
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'require_rubygems'
-      G
-
-      expect(out).to_not include("Gem::InstallError: require_rubygems requires RubyGems version > 9000")
-      expect(out).to include("require_rubygems-1.0 requires rubygems version > 9000, which is incompatible with the current version, #{Gem::VERSION}")
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb
deleted file mode 100644
index 10ce589eef..0000000000
--- a/spec/bundler/install/gems/standalone_spec.rb
+++ /dev/null
@@ -1,337 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples "bundle install --standalone" do
-  shared_examples "common functionality" do
-    it "still makes the gems available to normal bundler" do
-      args = expected_gems.map {|k, v| "#{k} #{v}" }
-      expect(the_bundle).to include_gems(*args)
-    end
-
-    it "generates a bundle/bundler/setup.rb" do
-      expect(bundled_app("bundle/bundler/setup.rb")).to exist
-    end
-
-    it "makes the gems available without bundler" do
-      testrb = String.new <<-RUBY
-        $:.unshift File.expand_path("bundle")
-        require "bundler/setup"
-
-      RUBY
-      expected_gems.each do |k, _|
-        testrb << "\nrequire \"#{k}\""
-        testrb << "\nputs #{k.upcase}"
-      end
-      Dir.chdir(bundled_app) do
-        ruby testrb, :no_lib => true
-      end
-
-      expect(out).to eq(expected_gems.values.join("\n"))
-    end
-
-    it "works on a different system" do
-      FileUtils.mv(bundled_app, "#{bundled_app}2")
-
-      testrb = String.new <<-RUBY
-        $:.unshift File.expand_path("bundle")
-        require "bundler/setup"
-
-      RUBY
-      expected_gems.each do |k, _|
-        testrb << "\nrequire \"#{k}\""
-        testrb << "\nputs #{k.upcase}"
-      end
-      Dir.chdir("#{bundled_app}2") do
-        ruby testrb, :no_lib => true
-      end
-
-      expect(out).to eq(expected_gems.values.join("\n"))
-    end
-  end
-
-  describe "with simple gems" do
-    before do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-    end
-
-    let(:expected_gems) do
-      {
-        "actionpack" => "2.3.2",
-        "rails" => "2.3.2",
-      }
-    end
-
-    include_examples "common functionality"
-  end
-
-  describe "with gems with native extension", :ruby_repo do
-    before do
-      install_gemfile <<-G, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-        source "file://#{gem_repo1}"
-        gem "very_simple_binary"
-      G
-    end
-
-    it "generates a bundle/bundler/setup.rb with the proper paths", :rubygems => "2.4" do
-      expected_path = bundled_app("bundle/bundler/setup.rb")
-      extension_line = File.read(expected_path).each_line.find {|line| line.include? "/extensions/" }.strip
-      expect(extension_line).to start_with '$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/'
-      expect(extension_line).to end_with '/very_simple_binary-1.0"'
-    end
-  end
-
-  describe "with gem that has an invalid gemspec" do
-    before do
-      build_git "bar", :gemspec => false do |s|
-        s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0')
-        s.write "bar.gemspec", <<-G
-          lib = File.expand_path('../lib/', __FILE__)
-          $:.unshift lib unless $:.include?(lib)
-          require 'bar/version'
-
-          Gem::Specification.new do |s|
-            s.name        = 'bar'
-            s.version     = BAR_VERSION
-            s.summary     = 'Bar'
-            s.files       = Dir["lib/**/*.rb"]
-            s.author      = 'Anonymous'
-            s.require_path = [1,2]
-          end
-        G
-      end
-      install_gemfile <<-G, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-        gem "bar", :git => "#{lib_path("bar-1.0")}"
-      G
-    end
-
-    it "outputs a helpful error message" do
-      expect(out).to include("You have one or more invalid gemspecs that need to be fixed.")
-      expect(out).to include("bar 1.0 has an invalid gemspec")
-    end
-  end
-
-  describe "with a combination of gems and git repos" do
-    before do
-      build_git "devise", "1.0"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-        gem "devise", :git => "#{lib_path("devise-1.0")}"
-      G
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-    end
-
-    let(:expected_gems) do
-      {
-        "actionpack" => "2.3.2",
-        "devise" => "1.0",
-        "rails" => "2.3.2",
-      }
-    end
-
-    include_examples "common functionality"
-  end
-
-  describe "with groups" do
-    before do
-      build_git "devise", "1.0"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-
-        group :test do
-          gem "rspec"
-          gem "rack-test"
-        end
-      G
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-    end
-
-    let(:expected_gems) do
-      {
-        "actionpack" => "2.3.2",
-        "rails" => "2.3.2",
-      }
-    end
-
-    include_examples "common functionality"
-
-    it "allows creating a standalone file with limited groups" do
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => "default")
-
-      Dir.chdir(bundled_app) do
-        load_error_ruby <<-RUBY, "spec", :no_lib => true
-          $:.unshift File.expand_path("bundle")
-          require "bundler/setup"
-
-          require "actionpack"
-          puts ACTIONPACK
-          require "spec"
-        RUBY
-      end
-
-      expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
-    end
-
-    it "allows --without to limit the groups used in a standalone" do
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle"), :without => "test").merge(:standalone => true)
-
-      Dir.chdir(bundled_app) do
-        load_error_ruby <<-RUBY, "spec", :no_lib => true
-          $:.unshift File.expand_path("bundle")
-          require "bundler/setup"
-
-          require "actionpack"
-          puts ACTIONPACK
-          require "spec"
-        RUBY
-      end
-
-      expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
-    end
-
-    it "allows --path to change the location of the standalone bundle", :bundler => "< 2" do
-      bundle! "install", forgotten_command_line_options(:path => "path/to/bundle").merge(:standalone => true)
-
-      Dir.chdir(bundled_app) do
-        ruby <<-RUBY, :no_lib => true
-          $:.unshift File.expand_path("path/to/bundle")
-          require "bundler/setup"
-
-          require "actionpack"
-          puts ACTIONPACK
-        RUBY
-      end
-
-      expect(last_command.stdout).to eq("2.3.2")
-    end
-
-    it "allows --path to change the location of the standalone bundle", :bundler => "2" do
-      bundle! "install", forgotten_command_line_options(:path => "path/to/bundle").merge(:standalone => true)
-      path = File.expand_path("path/to/bundle")
-
-      Dir.chdir(bundled_app) do
-        ruby <<-RUBY, :no_lib => true
-          $:.unshift File.expand_path(#{path.dump})
-          require "bundler/setup"
-
-          require "actionpack"
-          puts ACTIONPACK
-        RUBY
-      end
-
-      expect(last_command.stdout).to eq("2.3.2")
-    end
-
-    it "allows remembered --without to limit the groups used in a standalone" do
-      bundle! :install, forgotten_command_line_options(:without => "test")
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
-
-      Dir.chdir(bundled_app) do
-        load_error_ruby <<-RUBY, "spec", :no_lib => true
-          $:.unshift File.expand_path("bundle")
-          require "bundler/setup"
-
-          require "actionpack"
-          puts ACTIONPACK
-          require "spec"
-        RUBY
-      end
-
-      expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
-    end
-  end
-
-  describe "with gemcutter's dependency API" do
-    let(:source_uri) { "http://localgemserver.test" }
-
-    describe "simple gems" do
-      before do
-        gemfile <<-G
-          source "#{source_uri}"
-          gem "rails"
-        G
-        bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true, :artifice => "endpoint")
-      end
-
-      let(:expected_gems) do
-        {
-          "actionpack" => "2.3.2",
-          "rails" => "2.3.2",
-        }
-      end
-
-      include_examples "common functionality"
-    end
-  end
-
-  describe "with --binstubs", :bundler => "< 2" do
-    before do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rails"
-      G
-      bundle! :install, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true, :binstubs => true)
-    end
-
-    let(:expected_gems) do
-      {
-        "actionpack" => "2.3.2",
-        "rails" => "2.3.2",
-      }
-    end
-
-    include_examples "common functionality"
-
-    it "creates stubs that use the standalone load path" do
-      Dir.chdir(bundled_app) do
-        expect(`bin/rails -v`.chomp).to eql "2.3.2"
-      end
-    end
-
-    it "creates stubs that can be executed from anywhere" do
-      require "tmpdir"
-      Dir.chdir(Dir.tmpdir) do
-        sys_exec!(%(#{bundled_app("bin/rails")} -v))
-        expect(out).to eq("2.3.2")
-      end
-    end
-
-    it "creates stubs that can be symlinked" do
-      pending "File.symlink is unsupported on Windows" if Bundler::WINDOWS
-
-      symlink_dir = tmp("symlink")
-      FileUtils.mkdir_p(symlink_dir)
-      symlink = File.join(symlink_dir, "rails")
-
-      File.symlink(bundled_app("bin/rails"), symlink)
-      sys_exec!("#{symlink} -v")
-      expect(out).to eq("2.3.2")
-    end
-
-    it "creates stubs with the correct load path" do
-      extension_line = File.read(bundled_app("bin/rails")).each_line.find {|line| line.include? "$:.unshift" }.strip
-      expect(extension_line).to eq %($:.unshift File.expand_path "../../bundle", path.realpath)
-    end
-  end
-end
-
-RSpec.describe "bundle install --standalone" do
-  include_examples("bundle install --standalone")
-end
-
-RSpec.describe "bundle install --standalone run in a subdirectory" do
-  before do
-    Dir.chdir(bundled_app("bob").tap(&:mkpath))
-  end
-
-  include_examples("bundle install --standalone")
-end
diff --git a/spec/bundler/install/gems/sudo_spec.rb b/spec/bundler/install/gems/sudo_spec.rb
deleted file mode 100644
index 1781451c98..0000000000
--- a/spec/bundler/install/gems/sudo_spec.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "when using sudo", :sudo => true do
-  describe "and BUNDLE_PATH is writable" do
-    context "but BUNDLE_PATH/build_info is not writable" do
-      before do
-        bundle! "config path.system true"
-        subdir = system_gem_path("cache")
-        subdir.mkpath
-        sudo "chmod u-w #{subdir}"
-      end
-
-      it "installs" do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        expect(out).to_not match(/an error occurred/i)
-        expect(system_gem_path("cache/rack-1.0.0.gem")).to exist
-        expect(the_bundle).to include_gems "rack 1.0"
-      end
-    end
-  end
-
-  describe "and GEM_HOME is owned by root" do
-    before :each do
-      bundle! "config path.system true"
-      chown_system_gems_to_root
-    end
-
-    it "installs" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-        gem "thin"
-      G
-
-      expect(system_gem_path("gems/rack-1.0.0")).to exist
-      expect(system_gem_path("gems/rack-1.0.0").stat.uid).to eq(0)
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    it "installs rake and a gem dependent on rake in the same session" do
-      gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rake"
-          gem "another_implicit_rake_dep"
-      G
-      bundle "install"
-      expect(system_gem_path("gems/another_implicit_rake_dep-1.0")).to exist
-    end
-
-    it "installs when BUNDLE_PATH is owned by root" do
-      bundle! "config global_path_appends_ruby_scope false" # consistency in tests between 1.x and 2.x modes
-
-      bundle_path = tmp("owned_by_root")
-      FileUtils.mkdir_p bundle_path
-      sudo "chown -R root #{bundle_path}"
-
-      ENV["BUNDLE_PATH"] = bundle_path.to_s
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-      G
-
-      expect(bundle_path.join("gems/rack-1.0.0")).to exist
-      expect(bundle_path.join("gems/rack-1.0.0").stat.uid).to eq(0)
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    it "installs when BUNDLE_PATH does not exist" do
-      bundle! "config global_path_appends_ruby_scope false" # consistency in tests between 1.x and 2.x modes
-
-      root_path = tmp("owned_by_root")
-      FileUtils.mkdir_p root_path
-      sudo "chown -R root #{root_path}"
-      bundle_path = root_path.join("does_not_exist")
-
-      ENV["BUNDLE_PATH"] = bundle_path.to_s
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-      G
-
-      expect(bundle_path.join("gems/rack-1.0.0")).to exist
-      expect(bundle_path.join("gems/rack-1.0.0").stat.uid).to eq(0)
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    it "installs extensions/ compiled by RubyGems 2.2", :rubygems => "2.2" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "very_simple_binary"
-      G
-
-      expect(system_gem_path("gems/very_simple_binary-1.0")).to exist
-      binary_glob = system_gem_path("extensions/*/*/very_simple_binary-1.0")
-      expect(Dir.glob(binary_glob).first).to be
-    end
-  end
-
-  describe "and BUNDLE_PATH is not writable" do
-    before do
-      sudo "chmod ugo-w #{default_bundle_path}"
-    end
-
-    it "installs" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-      G
-
-      expect(default_bundle_path("gems/rack-1.0.0")).to exist
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    it "cleans up the tmpdirs generated" do
-      require "tmpdir"
-      Dir.glob("#{Dir.tmpdir}/bundler*").each do |tmpdir|
-        FileUtils.remove_entry_secure(tmpdir)
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      tmpdirs = Dir.glob("#{Dir.tmpdir}/bundler*")
-
-      expect(tmpdirs).to be_empty
-    end
-  end
-
-  describe "and GEM_HOME is not writable" do
-    it "installs" do
-      bundle! "config path.system true"
-      gem_home = tmp("sudo_gem_home")
-      sudo "mkdir -p #{gem_home}"
-      sudo "chmod ugo-w #{gem_home}"
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-      G
-
-      bundle :install, :env => { "GEM_HOME" => gem_home.to_s, "GEM_PATH" => nil }
-      expect(gem_home.join("bin/rackup")).to exist
-      expect(the_bundle).to include_gems "rack 1.0", :env => { "GEM_HOME" => gem_home.to_s, "GEM_PATH" => nil }
-    end
-  end
-
-  describe "and root runs install" do
-    let(:warning) { "Don't run Bundler as root." }
-
-    before do
-      gemfile %(source "file://#{gem_repo1}")
-    end
-
-    it "warns against that" do
-      bundle :install, :sudo => true
-      expect(out).to include(warning)
-    end
-
-    context "when ENV['BUNDLE_SILENCE_ROOT_WARNING'] is set" do
-      it "skips the warning" do
-        bundle :install, :sudo => :preserve_env, :env => { "BUNDLE_SILENCE_ROOT_WARNING" => true }
-        expect(out).to_not include(warning)
-      end
-    end
-
-    context "when silence_root_warning = false" do
-      it "warns against that" do
-        bundle :install, :sudo => true, :env => { "BUNDLE_SILENCE_ROOT_WARNING" => "false" }
-        expect(out).to include(warning)
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/gems/win32_spec.rb b/spec/bundler/install/gems/win32_spec.rb
deleted file mode 100644
index ad758b94fa..0000000000
--- a/spec/bundler/install/gems/win32_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install with win32-generated lockfile" do
-  it "should read lockfile" do
-    File.open(bundled_app("Gemfile.lock"), "wb") do |f|
-      f << "GEM\r\n"
-      f << "  remote: file:#{gem_repo1}/\r\n"
-      f << "  specs:\r\n"
-      f << "\r\n"
-      f << "    rack (1.0.0)\r\n"
-      f << "\r\n"
-      f << "PLATFORMS\r\n"
-      f << "  ruby\r\n"
-      f << "\r\n"
-      f << "DEPENDENCIES\r\n"
-      f << "  rack\r\n"
-    end
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-    G
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-end
diff --git a/spec/bundler/install/gemspecs_spec.rb b/spec/bundler/install/gemspecs_spec.rb
deleted file mode 100644
index 666707b295..0000000000
--- a/spec/bundler/install/gemspecs_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  describe "when a gem has a YAML gemspec" do
-    before :each do
-      build_repo2 do
-        build_gem "yaml_spec", :gemspec => :yaml
-      end
-    end
-
-    it "still installs correctly" do
-      gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "yaml_spec"
-      G
-      bundle :install
-      expect(err).to lack_errors
-    end
-
-    it "still installs correctly when using path" do
-      build_lib "yaml_spec", :gemspec => :yaml
-
-      install_gemfile <<-G
-        gem 'yaml_spec', :path => "#{lib_path("yaml_spec-1.0")}"
-      G
-      expect(err).to lack_errors
-    end
-  end
-
-  it "should use gemspecs in the system cache when available" do
-    gemfile <<-G
-      source "http://localtestserver.gem"
-      gem 'rack'
-    G
-
-    FileUtils.mkdir_p "#{default_bundle_path}/specifications"
-    File.open("#{default_bundle_path}/specifications/rack-1.0.0.gemspec", "w+") do |f|
-      spec = Gem::Specification.new do |s|
-        s.name = "rack"
-        s.version = "1.0.0"
-        s.add_runtime_dependency "activesupport", "2.3.2"
-      end
-      f.write spec.to_ruby
-    end
-    bundle :install, :artifice => "endpoint_marshal_fail" # force gemspec load
-    expect(the_bundle).to include_gems "activesupport 2.3.2"
-  end
-
-  it "does not hang when gemspec has incompatible encoding" do
-    create_file "foo.gemspec", <<-G
-      Gem::Specification.new do |gem|
-        gem.name = "pry-byebug"
-        gem.version = "3.4.2"
-        gem.author = "David Rodriguez"
-        gem.summary = "Good stuff"
-      end
-    G
-
-    install_gemfile <<-G, :env => { "LANG" => "C" }
-      gemspec
-    G
-
-    expect(out).to include("Bundle complete!")
-  end
-
-  it "reads gemspecs respecting their encoding" do
-    skip "Unicode is not supported on Ruby 1.x without extra work" if RUBY_VERSION < "2.0"
-
-    create_file "version.rb", <<-RUBY
-      module Persistent💎
-        VERSION = "0.0.1"
-      end
-    RUBY
-
-    create_file "persistent-dmnd.gemspec", <<-G
-      require_relative "version"
-
-      Gem::Specification.new do |gem|
-        gem.name = "persistent-dmnd"
-        gem.version = Persistent💎::VERSION
-        gem.author = "Ivo Anjo"
-        gem.summary = "Unscratchable stuff"
-      end
-    G
-
-    install_gemfile <<-G
-      gemspec
-    G
-
-    expect(out).to include("Bundle complete!")
-  end
-
-  context "when ruby version is specified in gemspec and gemfile" do
-    it "installs when patch level is not specified and the version matches" do
-      build_lib("foo", :path => bundled_app) do |s|
-        s.required_ruby_version = "~> #{RUBY_VERSION}.0"
-      end
-
-      install_gemfile <<-G
-        ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby'
-        gemspec
-      G
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "installs when patch level is specified and the version still matches the current version",
-      :if => RUBY_PATCHLEVEL >= 0 do
-      build_lib("foo", :path => bundled_app) do |s|
-        s.required_ruby_version = "#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
-      end
-
-      install_gemfile <<-G
-        ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby', :patchlevel => '#{RUBY_PATCHLEVEL}'
-        gemspec
-      G
-      expect(the_bundle).to include_gems "foo 1.0"
-    end
-
-    it "fails and complains about patchlevel on patchlevel mismatch",
-      :if => RUBY_PATCHLEVEL >= 0 do
-      patchlevel = RUBY_PATCHLEVEL.to_i + 1
-      build_lib("foo", :path => bundled_app) do |s|
-        s.required_ruby_version = "#{RUBY_VERSION}.#{patchlevel}"
-      end
-
-      install_gemfile <<-G
-        ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby', :patchlevel => '#{patchlevel}'
-        gemspec
-      G
-
-      expect(out).to include("Ruby patchlevel")
-      expect(out).to include("but your Gemfile specified")
-      expect(exitstatus).to eq(18) if exitstatus
-    end
-
-    it "fails and complains about version on version mismatch" do
-      version = Gem::Requirement.create(RUBY_VERSION).requirements.first.last.bump.version
-
-      build_lib("foo", :path => bundled_app) do |s|
-        s.required_ruby_version = version
-      end
-
-      install_gemfile <<-G
-        ruby '#{version}', :engine_version => '#{version}', :engine => 'ruby'
-        gemspec
-      G
-
-      expect(out).to include("Ruby version")
-      expect(out).to include("but your Gemfile specified")
-      expect(exitstatus).to eq(18) if exitstatus
-    end
-  end
-end
diff --git a/spec/bundler/install/git_spec.rb b/spec/bundler/install/git_spec.rb
deleted file mode 100644
index 6ae718c2a4..0000000000
--- a/spec/bundler/install/git_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  context "git sources" do
-    it "displays the revision hash of the gem repository", :bundler => "< 2" do
-      build_git "foo", "1.0", :path => lib_path("foo")
-
-      install_gemfile <<-G
-        gem "foo", :git => "#{lib_path("foo")}"
-      G
-
-      bundle! :install
-      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at master@#{revision_for(lib_path("foo"))[0..6]})")
-      expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
-    end
-
-    it "displays the ref of the gem repository when using branch~num as a ref", :bundler => "< 2" do
-      build_git "foo", "1.0", :path => lib_path("foo")
-      rev = revision_for(lib_path("foo"))[0..6]
-      update_git "foo", "2.0", :path => lib_path("foo"), :gemspec => true
-      rev2 = revision_for(lib_path("foo"))[0..6]
-      update_git "foo", "3.0", :path => lib_path("foo"), :gemspec => true
-
-      install_gemfile! <<-G
-        gem "foo", :git => "#{lib_path("foo")}", :ref => "master~2"
-      G
-
-      bundle! :install
-      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at master~2@#{rev})")
-      expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
-
-      update_git "foo", "4.0", :path => lib_path("foo"), :gemspec => true
-
-      bundle! :update, :all => bundle_update_requires_all?
-      expect(out).to include("Using foo 2.0 (was 1.0) from #{lib_path("foo")} (at master~2@#{rev2})")
-      expect(the_bundle).to include_gems "foo 2.0", :source => "git@#{lib_path("foo")}"
-    end
-
-    it "should allows git repos that are missing but not being installed" do
-      revision = build_git("foo").ref_for("HEAD")
-
-      gemfile <<-G
-        gem "foo", :git => "file://#{lib_path("foo-1.0")}", :group => :development
-      G
-
-      lockfile <<-L
-        GIT
-          remote: file://#{lib_path("foo-1.0")}
-          revision: #{revision}
-          specs:
-            foo (1.0)
-
-        PLATFORMS
-          ruby
-
-        DEPENDENCIES
-          foo!
-      L
-
-      bundle! :install, forgotten_command_line_options(:path => "vendor/bundle", :without => "development")
-
-      expect(out).to include("Bundle complete!")
-    end
-  end
-end
diff --git a/spec/bundler/install/global_cache_spec.rb b/spec/bundler/install/global_cache_spec.rb
deleted file mode 100644
index e41e7e0157..0000000000
--- a/spec/bundler/install/global_cache_spec.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "global gem caching" do
-  before { bundle! "config global_gem_cache true" }
-
-  describe "using the cross-application user cache" do
-    let(:source)  { "http://localgemserver.test" }
-    let(:source2) { "http://gemserver.example.org" }
-
-    def source_global_cache(*segments)
-      home(".bundle", "cache", "gems", "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", *segments)
-    end
-
-    def source2_global_cache(*segments)
-      home(".bundle", "cache", "gems", "gemserver.example.org.80.1ae1663619ffe0a3c9d97712f44c705b", *segments)
-    end
-
-    it "caches gems into the global cache on download" do
-      install_gemfile! <<-G, :artifice => "compact_index"
-        source "#{source}"
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(source_global_cache("rack-1.0.0.gem")).to exist
-    end
-
-    it "uses globally cached gems if they exist" do
-      source_global_cache.mkpath
-      FileUtils.cp(gem_repo1("gems/rack-1.0.0.gem"), source_global_cache("rack-1.0.0.gem"))
-
-      install_gemfile! <<-G, :artifice => "compact_index_no_gem"
-        source "#{source}"
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    describe "when the same gem from different sources is installed" do
-      it "should use the appropriate one from the global cache" do
-        install_gemfile! <<-G, :artifice => "compact_index"
-          source "#{source}"
-          gem "rack"
-        G
-
-        FileUtils.rm_r(default_bundle_path)
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        # rack 1.0.0 is not installed and it is in the global cache
-
-        install_gemfile! <<-G, :artifice => "compact_index"
-          source "#{source2}"
-          gem "rack", "0.9.1"
-        G
-
-        FileUtils.rm_r(default_bundle_path)
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        # rack 0.9.1 is not installed and it is in the global cache
-
-        gemfile <<-G
-          source "#{source}"
-          gem "rack", "1.0.0"
-        G
-
-        bundle! :install, :artifice => "compact_index_no_gem"
-        # rack 1.0.0 is installed and rack 0.9.1 is not
-        expect(the_bundle).to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        FileUtils.rm_r(default_bundle_path)
-
-        gemfile <<-G
-          source "#{source2}"
-          gem "rack", "0.9.1"
-        G
-
-        bundle! :install, :artifice => "compact_index_no_gem"
-        # rack 0.9.1 is installed and rack 1.0.0 is not
-        expect(the_bundle).to include_gems "rack 0.9.1"
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-      end
-
-      it "should not install if the wrong source is provided" do
-        gemfile <<-G
-          source "#{source}"
-          gem "rack"
-        G
-
-        bundle! :install, :artifice => "compact_index"
-        FileUtils.rm_r(default_bundle_path)
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        # rack 1.0.0 is not installed and it is in the global cache
-
-        gemfile <<-G
-          source "#{source2}"
-          gem "rack", "0.9.1"
-        G
-
-        bundle! :install, :artifice => "compact_index"
-        FileUtils.rm_r(default_bundle_path)
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        # rack 0.9.1 is not installed and it is in the global cache
-
-        gemfile <<-G
-          source "#{source2}"
-          gem "rack", "1.0.0"
-        G
-
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        bundle :install, :artifice => "compact_index_no_gem"
-        expect(out).to include("Internal Server Error 500")
-        # rack 1.0.0 is not installed and rack 0.9.1 is not
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-
-        gemfile <<-G
-          source "#{source}"
-          gem "rack", "0.9.1"
-        G
-
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        bundle :install, :artifice => "compact_index_no_gem"
-        expect(out).to include("Internal Server Error 500")
-        # rack 0.9.1 is not installed and rack 1.0.0 is not
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-      end
-    end
-
-    describe "when installing gems from a different directory" do
-      it "uses the global cache as a source" do
-        install_gemfile! <<-G, :artifice => "compact_index"
-          source "#{source}"
-          gem "rack"
-          gem "activesupport"
-        G
-
-        # Both gems are installed and in the global cache
-        expect(the_bundle).to include_gems "rack 1.0.0"
-        expect(the_bundle).to include_gems "activesupport 2.3.5"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source_global_cache("activesupport-2.3.5.gem")).to exist
-        FileUtils.rm_r(default_bundle_path)
-        # Both gems are now only in the global cache
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-
-        install_gemfile! <<-G, :artifice => "compact_index_no_gem"
-          source "#{source}"
-          gem "rack"
-        G
-
-        # rack is installed and both are in the global cache
-        expect(the_bundle).to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source_global_cache("activesupport-2.3.5.gem")).to exist
-
-        Dir.chdir bundled_app2 do
-          create_file bundled_app2("gems.rb"), <<-G
-            source "#{source}"
-            gem "activesupport"
-          G
-
-          # Neither gem is installed and both are in the global cache
-          expect(the_bundle).not_to include_gems "rack 1.0.0"
-          expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-          expect(source_global_cache("rack-1.0.0.gem")).to exist
-          expect(source_global_cache("activesupport-2.3.5.gem")).to exist
-
-          # Install using the global cache instead of by downloading the .gem
-          # from the server
-          bundle! :install, :artifice => "compact_index_no_gem"
-
-          # activesupport is installed and both are in the global cache
-          expect(the_bundle).not_to include_gems "rack 1.0.0"
-          expect(the_bundle).to include_gems "activesupport 2.3.5"
-          expect(source_global_cache("rack-1.0.0.gem")).to exist
-          expect(source_global_cache("activesupport-2.3.5.gem")).to exist
-        end
-      end
-    end
-  end
-
-  describe "extension caching", :ruby_repo, :rubygems => "2.2" do
-    it "works" do
-      build_git "very_simple_git_binary", &:add_c_extension
-      build_lib "very_simple_path_binary", &:add_c_extension
-      revision = revision_for(lib_path("very_simple_git_binary-1.0"))[0, 12]
-
-      install_gemfile! <<-G
-        source "file:#{gem_repo1}"
-
-        gem "very_simple_binary"
-        gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}"
-        gem "very_simple_path_binary", :path => "#{lib_path("very_simple_path_binary-1.0")}"
-      G
-
-      gem_binary_cache = home(".bundle", "cache", "extensions", specific_local_platform.to_s, Bundler.ruby_scope,
-        Digest(:MD5).hexdigest("#{gem_repo1}/"), "very_simple_binary-1.0")
-      git_binary_cache = home(".bundle", "cache", "extensions", specific_local_platform.to_s, Bundler.ruby_scope,
-        "very_simple_git_binary-1.0-#{revision}", "very_simple_git_binary-1.0")
-
-      cached_extensions = Pathname.glob(home(".bundle", "cache", "extensions", "*", "*", "*", "*", "*")).sort
-      expect(cached_extensions).to eq [gem_binary_cache, git_binary_cache].sort
-
-      run! <<-R
-        require 'very_simple_binary_c'; puts ::VERY_SIMPLE_BINARY_IN_C
-        require 'very_simple_git_binary_c'; puts ::VERY_SIMPLE_GIT_BINARY_IN_C
-      R
-      expect(out).to eq "VERY_SIMPLE_BINARY_IN_C\nVERY_SIMPLE_GIT_BINARY_IN_C"
-
-      FileUtils.rm Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]
-
-      gem_binary_cache.join("very_simple_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
-      git_binary_cache.join("very_simple_git_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
-
-      bundle! "config --local path different_path"
-      bundle! :install
-
-      expect(Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]).to all(end_with(".rb"))
-
-      run! <<-R
-        require 'very_simple_binary_c'
-        require 'very_simple_git_binary_c'
-      R
-      expect(out).to eq "very_simple_binary_c.rb\nvery_simple_git_binary_c.rb"
-    end
-  end
-end
diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb
deleted file mode 100644
index 44439c275e..0000000000
--- a/spec/bundler/install/path_spec.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  describe "with --path" do
-    before :each do
-      build_gem "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "puts 'FAIL'"
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    it "does not use available system gems with bundle --path vendor/bundle", :bundler => "< 2" do
-      bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "handles paths with regex characters in them" do
-      dir = bundled_app("bun++dle")
-      dir.mkpath
-
-      Dir.chdir(dir) do
-        bundle! :install, forgotten_command_line_options(:path => dir.join("vendor/bundle"))
-        expect(out).to include("installed into `./vendor/bundle`")
-      end
-
-      dir.rmtree
-    end
-
-    it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do
-      bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
-      expect(out).to include("gems are installed into `./vendor/bundle`")
-    end
-
-    it "disallows --path vendor/bundle --system", :bundler => "< 2" do
-      bundle "install --path vendor/bundle --system"
-      expect(out).to include("Please choose only one option.")
-      expect(exitstatus).to eq(15) if exitstatus
-    end
-
-    it "remembers to disable system gems after the first time with bundle --path vendor/bundle", :bundler => "< 2" do
-      bundle "install --path vendor/bundle"
-      FileUtils.rm_rf bundled_app("vendor")
-      bundle "install"
-
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    context "with path_relative_to_cwd set to true" do
-      before { bundle! "config path_relative_to_cwd true" }
-
-      it "installs the bundle relatively to current working directory", :bundler => "< 2" do
-        Dir.chdir(bundled_app.parent) do
-          bundle! "install --gemfile='#{bundled_app}/Gemfile' --path vendor/bundle"
-          expect(out).to include("installed into `./vendor/bundle`")
-          expect(bundled_app("../vendor/bundle")).to be_directory
-        end
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
-
-      it "installs the standalone bundle relative to the cwd" do
-        Dir.chdir(bundled_app.parent) do
-          bundle! :install, :gemfile => bundled_app("Gemfile"), :standalone => true
-          expect(out).to include("installed into `./bundled_app/bundle`")
-          expect(bundled_app("bundle")).to be_directory
-          expect(bundled_app("bundle/ruby")).to be_directory
-        end
-
-        bundle! "config unset path"
-
-        Dir.chdir(bundled_app("subdir").tap(&:mkpath)) do
-          bundle! :install, :gemfile => bundled_app("Gemfile"), :standalone => true
-          expect(out).to include("installed into `../bundle`")
-          expect(bundled_app("bundle")).to be_directory
-          expect(bundled_app("bundle/ruby")).to be_directory
-        end
-      end
-    end
-  end
-
-  describe "when BUNDLE_PATH or the global path config is set" do
-    before :each do
-      build_lib "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "raise 'FAIL'"
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    def set_bundle_path(type, location)
-      if type == :env
-        ENV["BUNDLE_PATH"] = location
-      elsif type == :global
-        bundle! "config path #{location}", "no-color" => nil
-      end
-    end
-
-    [:env, :global].each do |type|
-      context "when set via #{type}" do
-        it "installs gems to a path if one is specified" do
-          set_bundle_path(type, bundled_app("vendor2").to_s)
-          bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
-
-          expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-          expect(bundled_app("vendor2")).not_to be_directory
-          expect(the_bundle).to include_gems "rack 1.0.0"
-        end
-
-        context "with global_path_appends_ruby_scope set", :bundler => "2" do
-          it "installs gems to ." do
-            set_bundle_path(type, ".")
-            bundle! "config --global disable_shared_gems true"
-
-            bundle! :install
-
-            paths_to_exist = %w[cache/rack-1.0.0.gem gems/rack-1.0.0 specifications/rack-1.0.0.gemspec].map {|path| bundled_app(Bundler.ruby_scope, path) }
-            expect(paths_to_exist).to all exist
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-
-          it "installs gems to the path" do
-            set_bundle_path(type, bundled_app("vendor").to_s)
-
-            bundle! :install
-
-            expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-
-          it "installs gems to the path relative to root when relative" do
-            set_bundle_path(type, "vendor")
-
-            FileUtils.mkdir_p bundled_app("lol")
-            Dir.chdir(bundled_app("lol")) do
-              bundle! :install
-            end
-
-            expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-        end
-
-        context "with global_path_appends_ruby_scope unset", :bundler => "< 2" do
-          it "installs gems to ." do
-            set_bundle_path(type, ".")
-            bundle! "config --global disable_shared_gems true"
-
-            bundle! :install
-
-            expect([bundled_app("cache/rack-1.0.0.gem"), bundled_app("gems/rack-1.0.0"), bundled_app("specifications/rack-1.0.0.gemspec")]).to all exist
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-
-          it "installs gems to BUNDLE_PATH with #{type}" do
-            set_bundle_path(type, bundled_app("vendor").to_s)
-
-            bundle :install
-
-            expect(bundled_app("vendor/gems/rack-1.0.0")).to be_directory
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-
-          it "installs gems to BUNDLE_PATH relative to root when relative" do
-            set_bundle_path(type, "vendor")
-
-            FileUtils.mkdir_p bundled_app("lol")
-            Dir.chdir(bundled_app("lol")) do
-              bundle :install
-            end
-
-            expect(bundled_app("vendor/gems/rack-1.0.0")).to be_directory
-            expect(the_bundle).to include_gems "rack 1.0.0"
-          end
-        end
-      end
-    end
-
-    it "installs gems to BUNDLE_PATH from .bundle/config" do
-      config "BUNDLE_PATH" => bundled_app("vendor/bundle").to_s
-
-      bundle :install
-
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "sets BUNDLE_PATH as the first argument to bundle install" do
-      bundle! :install, forgotten_command_line_options(:path => "./vendor/bundle")
-
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "disables system gems when passing a path to install" do
-      # This is so that vendored gems can be distributed to others
-      build_gem "rack", "1.1.0", :to_system => true
-      bundle! :install, forgotten_command_line_options(:path => "./vendor/bundle")
-
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "re-installs gems whose extensions have been deleted", :ruby_repo, :rubygems => ">= 2.3" do
-      build_lib "very_simple_binary", "1.0.0", :to_system => true do |s|
-        s.write "lib/very_simple_binary.rb", "raise 'FAIL'"
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "very_simple_binary"
-      G
-
-      bundle! :install, forgotten_command_line_options(:path => "./vendor/bundle")
-
-      expect(vendored_gems("gems/very_simple_binary-1.0")).to be_directory
-      expect(vendored_gems("extensions")).to be_directory
-      expect(the_bundle).to include_gems "very_simple_binary 1.0", :source => "remote1"
-
-      vendored_gems("extensions").rmtree
-
-      run "require 'very_simple_binary_c'"
-      expect(err).to include("Bundler::GemNotFound")
-
-      bundle :install, forgotten_command_line_options(:path => "./vendor/bundle")
-
-      expect(vendored_gems("gems/very_simple_binary-1.0")).to be_directory
-      expect(vendored_gems("extensions")).to be_directory
-      expect(the_bundle).to include_gems "very_simple_binary 1.0", :source => "remote1"
-    end
-  end
-
-  describe "to a file" do
-    before do
-      in_app_root do
-        FileUtils.touch "bundle"
-      end
-    end
-
-    it "reports the file exists" do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle :install, forgotten_command_line_options(:path => "bundle")
-      expect(out).to include("file already exists")
-    end
-  end
-end
diff --git a/spec/bundler/install/post_bundle_message_spec.rb b/spec/bundler/install/post_bundle_message_spec.rb
deleted file mode 100644
index eadc8a4d85..0000000000
--- a/spec/bundler/install/post_bundle_message_spec.rb
+++ /dev/null
@@ -1,206 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "post bundle message" do
-  before :each do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-      gem "activesupport", "2.3.5", :group => [:emo, :test]
-      group :test do
-        gem "rspec"
-      end
-      gem "rack-obama", :group => :obama
-    G
-  end
-
-  let(:bundle_path)                { "./.bundle" }
-  let(:bundle_show_system_message) { "Use `bundle info [gemname]` to see where a bundled gem is installed." }
-  let(:bundle_show_path_message)   { "Bundled gems are installed into `#{bundle_path}`" }
-  let(:bundle_complete_message)    { "Bundle complete!" }
-  let(:bundle_updated_message)     { "Bundle updated!" }
-  let(:installed_gems_stats)       { "4 Gemfile dependencies, 5 gems now installed." }
-  let(:bundle_show_message)        { Bundler::VERSION.split(".").first.to_i < 2 ? bundle_show_system_message : bundle_show_path_message }
-
-  describe "for fresh bundle install" do
-    it "without any options" do
-      bundle :install
-      expect(out).to include(bundle_show_message)
-      expect(out).not_to include("Gems in the group")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include(installed_gems_stats)
-    end
-
-    it "with --without one group" do
-      bundle! :install, forgotten_command_line_options(:without => "emo")
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the group emo were not installed")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include(installed_gems_stats)
-    end
-
-    it "with --without two groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo test")
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the groups emo and test were not installed")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include("4 Gemfile dependencies, 3 gems now installed.")
-    end
-
-    it "with --without more groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo obama test")
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the groups emo, obama and test were not installed")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include("4 Gemfile dependencies, 2 gems now installed.")
-    end
-
-    describe "with --path and" do
-      let(:bundle_path) { "./vendor" }
-
-      it "without any options" do
-        bundle! :install, forgotten_command_line_options(:path => "vendor")
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to_not include("Gems in the group")
-        expect(out).to include(bundle_complete_message)
-      end
-
-      it "with --without one group" do
-        bundle! :install, forgotten_command_line_options(:without => "emo", :path => "vendor")
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the group emo were not installed")
-        expect(out).to include(bundle_complete_message)
-      end
-
-      it "with --without two groups" do
-        bundle! :install, forgotten_command_line_options(:without => "emo test", :path => "vendor")
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the groups emo and test were not installed")
-        expect(out).to include(bundle_complete_message)
-      end
-
-      it "with --without more groups" do
-        bundle! :install, forgotten_command_line_options(:without => "emo obama test", :path => "vendor")
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the groups emo, obama and test were not installed")
-        expect(out).to include(bundle_complete_message)
-      end
-
-      it "with an absolute --path inside the cwd" do
-        bundle! :install, forgotten_command_line_options(:path => bundled_app("cache"))
-        expect(out).to include("Bundled gems are installed into `./cache`")
-        expect(out).to_not include("Gems in the group")
-        expect(out).to include(bundle_complete_message)
-      end
-
-      it "with an absolute --path outside the cwd" do
-        bundle! :install, forgotten_command_line_options(:path => tmp("not_bundled_app"))
-        expect(out).to include("Bundled gems are installed into `#{tmp("not_bundled_app")}`")
-        expect(out).to_not include("Gems in the group")
-        expect(out).to include(bundle_complete_message)
-      end
-    end
-
-    describe "with misspelled or non-existent gem name" do
-      it "should report a helpful error message", :bundler => "< 2" do
-        install_gemfile <<-G
-          source "file://localhost#{gem_repo1}"
-          gem "rack"
-          gem "not-a-gem", :group => :development
-        G
-        expect(out).to include("Could not find gem 'not-a-gem' in any of the gem sources listed in your Gemfile.")
-      end
-
-      it "should report a helpful error message", :bundler => "2" do
-        install_gemfile <<-G
-          source "file://localhost#{gem_repo1}"
-          gem "rack"
-          gem "not-a-gem", :group => :development
-        G
-        expect(out).to include normalize_uri_file(<<-EOS.strip)
-Could not find gem 'not-a-gem' in rubygems repository file://localhost#{gem_repo1}/ or installed locally.
-The source does not contain any versions of 'not-a-gem'
-        EOS
-      end
-
-      it "should report a helpful error message with reference to cache if available" do
-        install_gemfile <<-G
-          source "file://localhost#{gem_repo1}"
-          gem "rack"
-        G
-        bundle :cache
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        install_gemfile <<-G
-          source "file://localhost#{gem_repo1}"
-          gem "rack"
-          gem "not-a-gem", :group => :development
-        G
-        expect(out).to include("Could not find gem 'not-a-gem' in").
-          and include("or in gems cached in vendor/cache.")
-      end
-    end
-  end
-
-  describe "for second bundle install run" do
-    it "without any options" do
-      2.times { bundle :install }
-      expect(out).to include(bundle_show_message)
-      expect(out).to_not include("Gems in the groups")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include(installed_gems_stats)
-    end
-
-    it "with --without one group" do
-      bundle! :install, forgotten_command_line_options(:without => "emo")
-      bundle! :install
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the group emo were not installed")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include(installed_gems_stats)
-    end
-
-    it "with --without two groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo test")
-      bundle! :install
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the groups emo and test were not installed")
-      expect(out).to include(bundle_complete_message)
-    end
-
-    it "with --without more groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo obama test")
-      bundle :install
-      expect(out).to include(bundle_show_message)
-      expect(out).to include("Gems in the groups emo, obama and test were not installed")
-      expect(out).to include(bundle_complete_message)
-    end
-  end
-
-  describe "for bundle update" do
-    it "without any options" do
-      bundle! :update, :all => bundle_update_requires_all?
-      expect(out).not_to include("Gems in the groups")
-      expect(out).to include(bundle_updated_message)
-    end
-
-    it "with --without one group" do
-      bundle! :install, forgotten_command_line_options(:without => "emo")
-      bundle! :update, :all => bundle_update_requires_all?
-      expect(out).to include("Gems in the group emo were not installed")
-      expect(out).to include(bundle_updated_message)
-    end
-
-    it "with --without two groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo test")
-      bundle! :update, :all => bundle_update_requires_all?
-      expect(out).to include("Gems in the groups emo and test were not installed")
-      expect(out).to include(bundle_updated_message)
-    end
-
-    it "with --without more groups" do
-      bundle! :install, forgotten_command_line_options(:without => "emo obama test")
-      bundle! :update, :all => bundle_update_requires_all?
-      expect(out).to include("Gems in the groups emo, obama and test were not installed")
-      expect(out).to include(bundle_updated_message)
-    end
-  end
-end
diff --git a/spec/bundler/install/prereleases_spec.rb b/spec/bundler/install/prereleases_spec.rb
deleted file mode 100644
index 7af8c3b304..0000000000
--- a/spec/bundler/install/prereleases_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install" do
-  describe "when prerelease gems are available" do
-    it "finds prereleases" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "not_released"
-      G
-      expect(the_bundle).to include_gems "not_released 1.0.pre"
-    end
-
-    it "uses regular releases if available" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "has_prerelease"
-      G
-      expect(the_bundle).to include_gems "has_prerelease 1.0"
-    end
-
-    it "uses prereleases if requested" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "has_prerelease", "1.1.pre"
-      G
-      expect(the_bundle).to include_gems "has_prerelease 1.1.pre"
-    end
-  end
-
-  describe "when prerelease gems are not available" do
-    it "still works" do
-      build_repo3
-      install_gemfile <<-G
-        source "file://#{gem_repo3}"
-        gem "rack"
-      G
-
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-  end
-end
diff --git a/spec/bundler/install/process_lock_spec.rb b/spec/bundler/install/process_lock_spec.rb
deleted file mode 100644
index be8fd04fdd..0000000000
--- a/spec/bundler/install/process_lock_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "process lock spec" do
-  describe "when an install operation is already holding a process lock" do
-    before { FileUtils.mkdir_p(default_bundle_path) }
-
-    it "will not run a second concurrent bundle install until the lock is released" do
-      thread = Thread.new do
-        Bundler::ProcessLock.lock(default_bundle_path) do
-          sleep 1 # ignore quality_spec
-          expect(the_bundle).not_to include_gems "rack 1.0"
-        end
-      end
-
-      install_gemfile! <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      thread.join
-      expect(the_bundle).to include_gems "rack 1.0"
-    end
-
-    context "when creating a lock raises Errno::ENOTSUP", :ruby => ">= 1.9" do
-      before { allow(File).to receive(:open).and_raise(Errno::ENOTSUP) }
-
-      it "skips creating the lock file and yields" do
-        processed = false
-        Bundler::ProcessLock.lock(default_bundle_path) { processed = true }
-
-        expect(processed).to eq true
-      end
-    end
-  end
-end
diff --git a/spec/bundler/install/redownload_spec.rb b/spec/bundler/install/redownload_spec.rb
deleted file mode 100644
index 665c64d49a..0000000000
--- a/spec/bundler/install/redownload_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle install", :bundler => "< 2", :ruby => ">= 2.0" do
-  before :each do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-  end
-
-  before { bundle "config major_deprecations yes" }
-
-  shared_examples_for "an option to force redownloading gems" do
-    it "re-installs installed gems" do
-      rack_lib = default_bundle_path("gems/rack-1.0.0/lib/rack.rb")
-
-      bundle! :install
-      rack_lib.open("w") {|f| f.write("blah blah blah") }
-      bundle! :install, flag => true
-
-      expect(out).to include "Installing rack 1.0.0"
-      expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    it "works on first bundle install" do
-      bundle! :install, flag => true
-
-      expect(out).to include "Installing rack 1.0.0"
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-
-    context "with a git gem" do
-      let!(:ref) { build_git("foo", "1.0").ref_for("HEAD", 11) }
-
-      before do
-        gemfile <<-G
-          gem "foo", :git => "#{lib_path("foo-1.0")}"
-        G
-      end
-
-      it "re-installs installed gems" do
-        foo_lib = default_bundle_path("bundler/gems/foo-1.0-#{ref}/lib/foo.rb")
-
-        bundle! :install
-        foo_lib.open("w") {|f| f.write("blah blah blah") }
-        bundle! :install, flag => true
-
-        expect(foo_lib.open(&:read)).to eq("FOO = '1.0'\n")
-        expect(the_bundle).to include_gems "foo 1.0"
-      end
-
-      it "works on first bundle install" do
-        bundle! :install, flag => true
-
-        expect(the_bundle).to include_gems "foo 1.0"
-      end
-    end
-  end
-
-  describe "with --force" do
-    it_behaves_like "an option to force redownloading gems" do
-      let(:flag) { "force" }
-    end
-
-    it "shows a deprecation when single flag passed" do
-      bundle! "install --force"
-      expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
-    end
-
-    it "shows a deprecation when multiple flags passed" do
-      bundle! "install --no-color --force"
-      expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
-    end
-  end
-
-  describe "with --redownload" do
-    it_behaves_like "an option to force redownloading gems" do
-      let(:flag) { "redownload" }
-    end
-
-    it "does not show a deprecation when single flag passed" do
-      bundle! "install --redownload"
-      expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
-    end
-
-    it "does not show a deprecation when single multiple flags passed" do
-      bundle! "install --no-color --redownload"
-      expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
-    end
-  end
-end
diff --git a/spec/bundler/install/security_policy_spec.rb b/spec/bundler/install/security_policy_spec.rb
deleted file mode 100644
index 7be09d6bd4..0000000000
--- a/spec/bundler/install/security_policy_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/security"
-
-# unfortunately, testing signed gems with a provided CA is extremely difficult
-# as 'gem cert' is currently the only way to add CAs to the system.
-
-RSpec.describe "policies with unsigned gems" do
-  before do
-    build_security_repo
-    gemfile <<-G
-      source "file://#{security_repo}"
-      gem "rack"
-      gem "signed_gem"
-    G
-  end
-
-  it "will work after you try to deploy without a lock" do
-    bundle "install --deployment"
-    bundle :install
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(the_bundle).to include_gems "rack 1.0", "signed_gem 1.0"
-  end
-
-  it "will fail when given invalid security policy" do
-    bundle "install --trust-policy=InvalidPolicyName"
-    expect(out).to include("RubyGems doesn't know about trust policy")
-  end
-
-  it "will fail with High Security setting due to presence of unsigned gem" do
-    bundle "install --trust-policy=HighSecurity"
-    expect(out).to include("security policy didn't allow")
-  end
-
-  # This spec will fail on RubyGems 2 rc1 due to a bug in policy.rb. the bug is fixed in rc3.
-  it "will fail with Medium Security setting due to presence of unsigned gem", :unless => ENV["RGV"] == "v2.0.0.rc.1" do
-    bundle "install --trust-policy=MediumSecurity"
-    expect(out).to include("security policy didn't allow")
-  end
-
-  it "will succeed with no policy" do
-    bundle "install"
-    expect(exitstatus).to eq(0) if exitstatus
-  end
-end
-
-RSpec.describe "policies with signed gems and no CA" do
-  before do
-    build_security_repo
-    gemfile <<-G
-      source "file://#{security_repo}"
-      gem "signed_gem"
-    G
-  end
-
-  it "will fail with High Security setting, gem is self-signed" do
-    bundle "install --trust-policy=HighSecurity"
-    expect(out).to include("security policy didn't allow")
-  end
-
-  it "will fail with Medium Security setting, gem is self-signed" do
-    bundle "install --trust-policy=MediumSecurity"
-    expect(out).to include("security policy didn't allow")
-  end
-
-  it "will succeed with Low Security setting, low security accepts self signed gem" do
-    bundle "install --trust-policy=LowSecurity"
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(the_bundle).to include_gems "signed_gem 1.0"
-  end
-
-  it "will succeed with no policy" do
-    bundle "install"
-    expect(exitstatus).to eq(0) if exitstatus
-    expect(the_bundle).to include_gems "signed_gem 1.0"
-  end
-end
diff --git a/spec/bundler/install/yanked_spec.rb b/spec/bundler/install/yanked_spec.rb
deleted file mode 100644
index 7c4b98bfdf..0000000000
--- a/spec/bundler/install/yanked_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.context "when installing a bundle that includes yanked gems" do
-  before(:each) do
-    build_repo4 do
-      build_gem "foo", "9.0.0"
-    end
-  end
-
-  it "throws an error when the original gem version is yanked" do
-    lockfile <<-L
-       GEM
-         remote: file://#{gem_repo4}
-         specs:
-           foo (10.0.0)
-
-       PLATFORMS
-         ruby
-
-       DEPENDENCIES
-         foo (= 10.0.0)
-
-    L
-
-    install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem "foo", "10.0.0"
-    G
-
-    expect(out).to include("Your bundle is locked to foo (10.0.0)")
-  end
-
-  it "throws the original error when only the Gemfile specifies a gem version that doesn't exist" do
-    install_gemfile <<-G
-        source "file://#{gem_repo4}"
-        gem "foo", "10.0.0"
-    G
-
-    expect(out).not_to include("Your bundle is locked to foo (10.0.0)")
-    expect(out).to include("Could not find gem 'foo (= 10.0.0)' in")
-  end
-end
-
-RSpec.context "when using gem before installing" do
-  it "does not suggest the author has yanked the gem" do
-    gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "0.9.1"
-    G
-
-    lockfile <<-L
-       GEM
-         remote: file://#{gem_repo1}
-         specs:
-           rack (0.9.1)
-
-       PLATFORMS
-         ruby
-
-       DEPENDENCIES
-         rack (= 0.9.1)
-    L
-
-    bundle :list
-
-    expect(out).to include("Could not find rack-0.9.1 in any of the sources")
-    expect(out).to_not include("Your bundle is locked to rack (0.9.1), but that version could not be found in any of the sources listed in your Gemfile.")
-    expect(out).to_not include("If you haven't changed sources, that means the author of rack (0.9.1) has removed it.")
-    expect(out).to_not include("You'll need to update your bundle to a different version of rack (0.9.1) that hasn't been removed in order to install.")
-  end
-end
diff --git a/spec/bundler/lock/git_spec.rb b/spec/bundler/lock/git_spec.rb
deleted file mode 100644
index 14b80483ee..0000000000
--- a/spec/bundler/lock/git_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundle lock with git gems" do
-  before :each do
-    build_git "foo"
-
-    install_gemfile <<-G
-      gem 'foo', :git => "#{lib_path("foo-1.0")}"
-    G
-  end
-
-  it "doesn't break right after running lock" do
-    expect(the_bundle).to include_gems "foo 1.0.0"
-  end
-
-  it "locks a git source to the current ref" do
-    update_git "foo"
-    bundle :install
-
-    run <<-RUBY
-      require 'foo'
-      puts "WIN" unless defined?(FOO_PREV_REF)
-    RUBY
-
-    expect(out).to eq("WIN")
-  end
-
-  it "provides correct #full_gem_path" do
-    run <<-RUBY
-      puts Bundler.rubygems.find_name('foo').first.full_gem_path
-    RUBY
-    expect(out).to eq(bundle("info foo --path"))
-  end
-end
diff --git a/spec/bundler/lock/lockfile_bundler_1_spec.rb b/spec/bundler/lock/lockfile_bundler_1_spec.rb
deleted file mode 100644